1268 files changed, 140915 insertions, 105695 deletions

diff --git a/.cirrus.yml b/.cirrus.yml
index c2f5fe385a..e114ffee1a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -2,8 +2,15 @@ env:
   CIRRUS_CLONE_DEPTH: 1
 
 freebsd_12_task:
+  env:
+    GIT_PROVE_OPTS: "--timer --jobs 10"
+    GIT_TEST_OPTS: "--no-chain-lint --no-bin-wrappers"
+    MAKEFLAGS: "-j4"
+    DEFAULT_TEST_TARGET: prove
+    DEVELOPER: 1
   freebsd_instance:
-    image: freebsd-12-1-release-amd64
+    image_family: freebsd-12-2
+    memory: 2G
   install_script:
     pkg install -y gettext gmake perl5
   create_user_script:
diff --git a/.github/workflows/check-whitespace.yml b/.github/workflows/check-whitespace.yml
index f1483059c7..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:
@@ -12,15 +13,9 @@ jobs:
   check-whitespace:
     runs-on: ubuntu-latest
     steps:
-    - name: Set commit count
-      shell: bash
-      run: echo "COMMIT_DEPTH=$((1+$COMMITS))" >>$GITHUB_ENV
-      env:
-        COMMITS: ${{ github.event.pull_request.commits }}
-
     - uses: actions/checkout@v2
       with:
-        fetch-depth: ${{ env.COMMIT_DEPTH }}
+        fetch-depth: 0
 
     - name: git log --check
       id: check_out
@@ -47,25 +42,9 @@ jobs:
             echo "${dash} ${etc}"
             ;;
           esac
-        done <<< $(git log --check --pretty=format:"---% h% s" -${{github.event.pull_request.commits}})
+        done <<< $(git log --check --pretty=format:"---% h% s" ${{github.event.pull_request.base.sha}}..)
 
         if test -n "${log}"
         then
-          echo "::set-output name=checkout::"${log}""
           exit 2
         fi
-
-    - name: Add Check Output as Comment
-      uses: actions/github-script@v3
-      id: add-comment
-      env:
-        log: ${{ steps.check_out.outputs.checkout }}
-      with:
-        script: |
-            await github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Whitespace errors found in workflow ${{ github.workflow }}:\n\n\`\`\`\n${process.env.log.replace(/\\n/g, "\n")}\n\`\`\``
-            })
-      if: ${{ failure() }}
diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml
new file mode 100644
index 0000000000..27f72f0ff3
--- /dev/null
+++ b/.github/workflows/l10n.yml
@@ -0,0 +1,105 @@
+name: git-l10n
+
+on: [push, pull_request_target]
+
+jobs:
+  git-po-helper:
+    if: >-
+      endsWith(github.repository, '/git-po') ||
+      contains(github.head_ref, 'l10n') ||
+      contains(github.ref, 'l10n')
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Setup base and head objects
+        id: setup-tips
+        run: |
+          if test "${{ github.event_name }}" = "pull_request_target"
+          then
+            base=${{ github.event.pull_request.base.sha }}
+            head=${{ github.event.pull_request.head.sha }}
+          else
+            base=${{ github.event.before }}
+            head=${{ github.event.after }}
+          fi
+          echo "::set-output name=base::$base"
+          echo "::set-output name=head::$head"
+      - name: Run partial clone
+        run: |
+          git -c init.defaultBranch=master init --bare .
+          git remote add \
+            --mirror=fetch \
+            origin \
+            https://github.com/${{ github.repository }}
+          # Fetch tips that may be unreachable from github.ref:
+          # - For a forced push, "$base" may be unreachable.
+          # - For a "pull_request_target" event, "$head" may be unreachable.
+          args=
+          for commit in \
+            ${{ steps.setup-tips.outputs.base }} \
+            ${{ steps.setup-tips.outputs.head }}
+          do
+            case $commit in
+            *[^0]*)
+              args="$args $commit"
+              ;;
+            *)
+              # Should not fetch ZERO-OID.
+              ;;
+            esac
+          done
+          git -c protocol.version=2 fetch \
+            --progress \
+            --no-tags \
+            --no-write-fetch-head \
+            --filter=blob:none \
+            origin \
+            ${{ github.ref }} \
+            $args
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '>=1.16'
+      - name: Install git-po-helper
+        run: go install github.com/git-l10n/git-po-helper@main
+      - name: Install other dependencies
+        run: |
+          sudo apt-get update -q &&
+          sudo apt-get install -q -y gettext
+      - name: Run git-po-helper
+        id: check-commits
+        run: |
+          exit_code=0
+          git-po-helper check-commits \
+            --github-action-event="${{ github.event_name }}" -- \
+            ${{ steps.setup-tips.outputs.base }}..${{ steps.setup-tips.outputs.head }} \
+            >git-po-helper.out 2>&1 || exit_code=$?
+          if test $exit_code -ne 0 || grep -q WARNING git-po-helper.out
+          then
+            # Remove ANSI colors which are proper for console logs but not
+            # proper for PR comment.
+            echo "COMMENT_BODY<<EOF" >>$GITHUB_ENV
+            perl -pe 's/\e\[[0-9;]*m//g; s/\bEOF$//g' git-po-helper.out >>$GITHUB_ENV
+            echo "EOF" >>$GITHUB_ENV
+          fi
+          cat git-po-helper.out
+          exit $exit_code
+      - name: Create comment in pull request for report
+        uses: mshick/add-pr-comment@v1
+        if: >-
+          always() &&
+          github.event_name == 'pull_request_target' &&
+          env.COMMENT_BODY != ''
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          repo-token-user-login: 'github-actions[bot]'
+          message: >
+            ${{ steps.check-commits.outcome == 'failure' && 'Errors and warnings' || 'Warnings' }}
+            found by [git-po-helper](https://github.com/git-l10n/git-po-helper#readme) in workflow
+            [#${{ github.run_number }}](${{ env.GITHUB_SERVER_URL }}/${{ github.repository }}/actions/runs/${{ github.run_id }}):
+
+            ```
+
+            ${{ env.COMMENT_BODY }}
+
+            ```
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e6f99e29a3..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
@@ -88,7 +90,7 @@ jobs:
       env:
         HOME: ${{runner.workspace}}
         NO_PERL: 1
-      run: ci/make-test-artifacts.sh artifacts
+      run: . /etc/profile && ci/make-test-artifacts.sh artifacts
     - name: zip up tracked files
       run: git archive -o artifacts/tracked.tar.gz HEAD
     - name: upload tracked files and build artifacts
@@ -97,6 +99,7 @@ jobs:
         name: windows-artifacts
         path: artifacts
   windows-test:
+    name: win test
     runs-on: windows-latest
     needs: [windows-build]
     strategy:
@@ -115,7 +118,7 @@ jobs:
     - uses: git-for-windows/setup-git-for-windows-sdk@v1
     - name: test
       shell: bash
-      run: ci/run-test-slice.sh ${{matrix.nr}} 10
+      run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
     - name: ci/print-test-failures.sh
       if: failure()
       shell: bash
@@ -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:
@@ -198,8 +203,7 @@ jobs:
       shell: bash
       env:
         NO_SVN_TESTS: 1
-        GIT_TEST_SKIP_REBASE_P: 1
-      run: ci/run-test-slice.sh ${{matrix.nr}} 10
+      run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
     - name: ci/print-test-failures.sh
       if: failure()
       shell: bash
@@ -211,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:
@@ -220,21 +225,37 @@ 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
             pool: ubuntu-latest
+          - jobname: linux-leaks
+            cc: gcc
+            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
@@ -249,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:
@@ -257,8 +279,11 @@ jobs:
         vector:
         - jobname: linux-musl
           image: alpine
-        - jobname: Linux32
+        - jobname: linux32
+          os: ubuntu32
           image: daald/ubuntu32:xenial
+        - jobname: pedantic
+          image: fedora
     env:
       jobname: ${{matrix.vector.jobname}}
     runs-on: ubuntu-latest
@@ -271,7 +296,7 @@ jobs:
       if: failure()
     - name: Upload failed tests' directories
       if: failure() && env.FAILED_TEST_ARTIFACTS != ''
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v1
       with:
         name: failed-tests-${{matrix.vector.jobname}}
         path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -285,7 +310,29 @@ 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'
+    env:
+      jobname: sparse
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Download a current `sparse` package
+      # Ubuntu's `sparse` version is too old for us
+      uses: git-for-windows/get-azure-pipelines-artifact@v0
+      with:
+        repository: git/git
+        definitionId: 10
+        artifact: sparse-20.04
+    - name: Install the current `sparse` package
+      run: sudo dpkg -i sparse-20.04/sparse_*.deb
+    - uses: actions/checkout@v2
+    - name: Install other dependencies
+      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/.gitignore b/.gitignore
index 311841f9be..f817c509ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,6 +77,7 @@
 /git-grep
 /git-hash-object
 /git-help
+/git-hook
 /git-http-backend
 /git-http-fetch
 /git-http-push
@@ -125,7 +126,6 @@
 /git-range-diff
 /git-read-tree
 /git-rebase
-/git-rebase--preserve-merges
 /git-receive-pack
 /git-reflog
 /git-remote
@@ -190,6 +190,7 @@
 /gitweb/static/gitweb.min.*
 /config-list.h
 /command-list.h
+/hook-list.h
 *.tar.gz
 *.dsc
 *.deb
@@ -224,6 +225,7 @@
 *.lib
 *.res
 *.sln
+*.sp
 *.suo
 *.ncb
 *.vcproj
diff --git a/.mailmap b/.mailmap
index 9c6a446bdf..07db36a9bb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -59,8 +59,9 @@ David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
 David S. Miller <davem@davemloft.net>
 David Turner <novalis@novalis.org> <dturner@twopensource.com>
 David Turner <novalis@novalis.org> <dturner@twosigma.com>
-Derrick Stolee <dstolee@microsoft.com> <stolee@gmail.com>
-Derrick Stolee <dstolee@microsoft.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
+Derrick Stolee <derrickstolee@github.com> <stolee@gmail.com>
+Derrick Stolee <derrickstolee@github.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
+Derrick Stolee <derrickstolee@github.com> <dstolee@microsoft.com>
 Deskin Miller <deskinm@umich.edu>
 �oàn Trần Công Danh <congdanhqx@gmail.com> Doan Tran Cong Danh
 Dirk Süsserott <newsletter@dirk.my1.cc>
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/.gitignore b/Documentation/.gitignore
index 9022d48355..1c3771e7d7 100644
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -14,4 +14,5 @@ manpage-base-url.xsl
 SubmittingPatches.txt
 tmp-doc-diff/
 GIT-ASCIIDOCFLAGS
+/.build/
 /GIT-EXCLUDED-PROGRAMS
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index e3af089ecf..c37c43186e 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -26,6 +26,13 @@ code.  For Git in general, a few rough rules are:
    go and fix it up."
    Cf. http://lkml.iu.edu/hypermail/linux/kernel/1001.3/01069.html
 
+ - Log messages to explain your changes are as important as the
+   changes themselves.  Clearly written code and in-code comments
+   explain how the code works and what is assumed from the surrounding
+   context.  The log messages explain what the changes wanted to
+   achieve and why the changes were necessary (more on this in the
+   accompanying SubmittingPatches document).
+
 Make your code readable and sensible, and don't try to be clever.
 
 As for more concrete guidelines, just imitate the existing code
@@ -499,6 +506,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.
@@ -551,6 +585,51 @@ Writing Documentation:
  documentation, please see the documentation-related advice in the
  Documentation/SubmittingPatches file).
 
+ In order to ensure the documentation is inclusive, avoid assuming
+ that an unspecified example person is male or female, and think
+ twice before using "he", "him", "she", or "her".  Here are some
+ tips to avoid use of gendered pronouns:
+
+  - Prefer succinctness and matter-of-factly describing functionality
+    in the abstract.  E.g.
+
+     --short:: Emit output in the short-format.
+
+    and avoid something like these overly verbose alternatives:
+
+     --short:: Use this to emit output in the short-format.
+     --short:: You can use this to get output in the short-format.
+     --short:: A user who prefers shorter output could....
+     --short:: Should a person and/or program want shorter output, he
+               she/they/it can...
+
+    This practice often eliminates the need to involve human actors in
+    your description, but it is a good practice regardless of the
+    avoidance of gendered pronouns.
+
+  - When it becomes awkward to stick to this style, prefer "you" when
+    addressing the the hypothetical user, and possibly "we" when
+    discussing how the program might react to the user.  E.g.
+
+      You can use this option instead of --xyz, but we might remove
+      support for it in future versions.
+
+    while keeping in mind that you can probably be less verbose, e.g.
+
+      Use this instead of --xyz. This option might be removed in future
+      versions.
+
+  - If you still need to refer to an example person that is
+    third-person singular, you may resort to "singular they" to avoid
+    "he/she/him/her", e.g.
+
+      A contributor asks their upstream to pull from them.
+
+    Note that this sounds ungrammatical and unnatural to those who
+    learned that "they" is only used for third-person plural, e.g.
+    those who learn English as a second language in some parts of the
+    world.
+
  Every user-visible change should be reflected in the documentation.
  The same general rule as for code applies -- imitate the existing
  conventions.
diff --git a/Documentation/Makefile b/Documentation/Makefile
index f5605b7767..ed656db2ae 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -90,6 +90,7 @@ SP_ARTICLES += $(API_DOCS)
 TECH_DOCS += MyFirstContribution
 TECH_DOCS += MyFirstObjectWalk
 TECH_DOCS += SubmittingPatches
+TECH_DOCS += technical/bundle-format
 TECH_DOCS += technical/hash-function-transition
 TECH_DOCS += technical/http-protocol
 TECH_DOCS += technical/index-format
@@ -225,6 +226,7 @@ endif
 
 ifneq ($(findstring $(MAKEFLAGS),s),s)
 ifndef V
+	QUIET		= @
 	QUIET_ASCIIDOC	= @echo '   ' ASCIIDOC $@;
 	QUIET_XMLTO	= @echo '   ' XMLTO $@;
 	QUIET_DB2TEXI	= @echo '   ' DB2TEXI $@;
@@ -232,11 +234,15 @@ ifndef V
 	QUIET_DBLATEX	= @echo '   ' DBLATEX $@;
 	QUIET_XSLTPROC	= @echo '   ' XSLTPROC $@;
 	QUIET_GEN	= @echo '   ' GEN $@;
-	QUIET_LINT	= @echo '   ' LINT $@;
 	QUIET_STDERR	= 2> /dev/null
 	QUIET_SUBDIR0	= +@subdir=
 	QUIET_SUBDIR1	= ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
 			  $(MAKE) $(PRINT_DIR) -C $$subdir
+
+	QUIET_LINT_GITLINK	= @echo '   ' LINT GITLINK $<;
+	QUIET_LINT_MANSEC	= @echo '   ' LINT MAN SEC $<;
+	QUIET_LINT_MANEND	= @echo '   ' LINT MAN END $<;
+
 	export V
 endif
 endif
@@ -284,7 +290,7 @@ install-html: html
 ../GIT-VERSION-FILE: FORCE
 	$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
 
-ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(filter-out lint-docs clean,$(MAKECMDGOALS)),)
 -include ../GIT-VERSION-FILE
 endif
 
@@ -343,6 +349,7 @@ GIT-ASCIIDOCFLAGS: FORCE
             fi
 
 clean:
+	$(RM) -rf .build/
 	$(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7
 	$(RM) *.texi *.texi+ *.texi++ git.info gitman.info
 	$(RM) *.pdf
@@ -456,14 +463,61 @@ quick-install-html: require-htmlrepo
 print-man1:
 	@for i in $(MAN1_TXT); do echo $$i; done
 
-lint-docs::
-	$(QUIET_LINT)$(PERL_PATH) lint-gitlink.perl \
+## Lint: Common
+.build:
+	$(QUIET)mkdir $@
+.build/lint-docs: | .build
+	$(QUIET)mkdir $@
+
+## Lint: gitlink
+.build/lint-docs/gitlink: | .build/lint-docs
+	$(QUIET)mkdir $@
+.build/lint-docs/gitlink/howto: | .build/lint-docs/gitlink
+	$(QUIET)mkdir $@
+.build/lint-docs/gitlink/config: | .build/lint-docs/gitlink
+	$(QUIET)mkdir $@
+LINT_DOCS_GITLINK = $(patsubst %.txt,.build/lint-docs/gitlink/%.ok,$(HOWTO_TXT) $(DOC_DEP_TXT))
+$(LINT_DOCS_GITLINK): | .build/lint-docs/gitlink
+$(LINT_DOCS_GITLINK): | .build/lint-docs/gitlink/howto
+$(LINT_DOCS_GITLINK): | .build/lint-docs/gitlink/config
+$(LINT_DOCS_GITLINK): lint-gitlink.perl
+$(LINT_DOCS_GITLINK): .build/lint-docs/gitlink/%.ok: %.txt
+	$(QUIET_LINT_GITLINK)$(PERL_PATH) lint-gitlink.perl \
+		$< \
 		$(HOWTO_TXT) $(DOC_DEP_TXT) \
 		--section=1 $(MAN1_TXT) \
 		--section=5 $(MAN5_TXT) \
-		--section=7 $(MAN7_TXT); \
-	$(PERL_PATH) lint-man-end-blurb.perl $(MAN_TXT); \
-	$(PERL_PATH) lint-man-section-order.perl $(MAN_TXT);
+		--section=7 $(MAN7_TXT) >$@
+.PHONY: lint-docs-gitlink
+lint-docs-gitlink: $(LINT_DOCS_GITLINK)
+
+## Lint: man-end-blurb
+.build/lint-docs/man-end-blurb: | .build/lint-docs
+	$(QUIET)mkdir $@
+LINT_DOCS_MAN_END_BLURB = $(patsubst %.txt,.build/lint-docs/man-end-blurb/%.ok,$(MAN_TXT))
+$(LINT_DOCS_MAN_END_BLURB): | .build/lint-docs/man-end-blurb
+$(LINT_DOCS_MAN_END_BLURB): lint-man-end-blurb.perl
+$(LINT_DOCS_MAN_END_BLURB): .build/lint-docs/man-end-blurb/%.ok: %.txt
+	$(QUIET_LINT_MANEND)$(PERL_PATH) lint-man-end-blurb.perl $< >$@
+.PHONY: lint-docs-man-end-blurb
+lint-docs-man-end-blurb: $(LINT_DOCS_MAN_END_BLURB)
+
+## Lint: man-section-order
+.build/lint-docs/man-section-order: | .build/lint-docs
+	$(QUIET)mkdir $@
+LINT_DOCS_MAN_SECTION_ORDER = $(patsubst %.txt,.build/lint-docs/man-section-order/%.ok,$(MAN_TXT))
+$(LINT_DOCS_MAN_SECTION_ORDER): | .build/lint-docs/man-section-order
+$(LINT_DOCS_MAN_SECTION_ORDER): lint-man-section-order.perl
+$(LINT_DOCS_MAN_SECTION_ORDER): .build/lint-docs/man-section-order/%.ok: %.txt
+	$(QUIET_LINT_MANSEC)$(PERL_PATH) lint-man-section-order.perl $< >$@
+.PHONY: lint-docs-man-section-order
+lint-docs-man-section-order: $(LINT_DOCS_MAN_SECTION_ORDER)
+
+## Lint: list of targets above
+.PHONY: lint-docs
+lint-docs: lint-docs-gitlink
+lint-docs: lint-docs-man-end-blurb
+lint-docs: lint-docs-man-section-order
 
 ifeq ($(wildcard po/Makefile),po/Makefile)
 doc-l10n install-l10n::
diff --git a/Documentation/MyFirstContribution.txt b/Documentation/MyFirstContribution.txt
index 015cf24631..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
@@ -1029,22 +1044,42 @@ kidding - be patient!)
 [[v2-git-send-email]]
 === Sending v2
 
-Skip ahead to <<reviewing,Responding to Reviews>> for information on how to
-handle comments from reviewers. Continue this section when your topic branch is
-shaped the way you want it to look for your patchset v2.
+This section will focus on how to send a v2 of your patchset. To learn what
+should go into v2, skip ahead to <<reviewing,Responding to Reviews>> for
+information on how to handle comments from reviewers.
 
-When you're ready with the next iteration of your patch, the process is fairly
-similar.
+We'll reuse our `psuh` topic branch for v2. Before we make any changes, we'll
+mark the tip of our v1 branch for easy reference:
 
-First, generate your v2 patches again:
+----
+$ git checkout psuh
+$ git branch psuh-v1
+----
+
+Refine your patch series by using `git rebase -i` to adjust commits based upon
+reviewer comments. Once the patch series is ready for submission, generate your
+patches again, but with some new flags:
 
 ----
-$ git format-patch -v2 --cover-letter -o psuh/ master..psuh
+$ git format-patch -v2 --cover-letter -o psuh/ --range-diff master..psuh-v1 master..
 ----
 
-This will add your v2 patches, all named like `v2-000n-my-commit-subject.patch`,
-to the `psuh/` directory. You may notice that they are sitting alongside the v1
-patches; that's fine, but be careful when you are ready to send them.
+The `--range-diff master..psuh-v1` parameter tells `format-patch` to include a
+range-diff between `psuh-v1` and `psuh` in the cover letter (see
+linkgit:git-range-diff[1]). This helps tell reviewers about the differences
+between your v1 and v2 patches.
+
+The `-v2` parameter tells `format-patch` to output your patches
+as version "2". For instance, you may notice that your v2 patches are
+all named like `v2-000n-my-commit-subject.patch`. `-v2` will also format
+your patches by prefixing them with "[PATCH v2]" instead of "[PATCH]",
+and your range-diff will be prefaced with "Range-diff against v1".
+
+Afer you run this command, `format-patch` will output the patches to the `psuh/`
+directory, alongside the v1 patches. Using a single directory makes it easy to
+refer to the old v1 patches while proofreading the v2 patches, but you will need
+to be careful to send out only the v2 patches. We will use a pattern like
+"psuh/v2-*.patch" (not "psuh/*.patch", which would match v1 and v2 patches).
 
 Edit your cover letter again. Now is a good time to mention what's different
 between your last version and now, if it's something significant. You do not
@@ -1082,7 +1117,7 @@ to the command:
 ----
 $ git send-email --to=target@example.com
 		 --in-reply-to="<foo.12345.author@example.com>"
-		 psuh/v2*
+		 psuh/v2-*.patch
 ----
 
 [[single-patch]]
diff --git a/Documentation/MyFirstObjectWalk.txt b/Documentation/MyFirstObjectWalk.txt
index 2d10eea7a9..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,
@@ -691,13 +712,13 @@ help understand. In our case, that means we omit trees and blobs not directly
 referenced by `HEAD` or `HEAD`'s history, because we begin the walk with only
 `HEAD` in the `pending` list.)
 
-First, we'll need to `#include "list-objects-filter-options.h`" and set up the
+First, we'll need to `#include "list-objects-filter-options.h"` and set up the
 `struct list_objects_filter_options` at the top of the function.
 
 ----
 static void walken_object_walk(struct rev_info *rev)
 {
-	struct list_objects_filter_options filter_options = {};
+	struct list_objects_filter_options filter_options = { 0 };
 
 	...
 ----
@@ -779,7 +800,7 @@ Count all the objects within and modify the print statement:
 	while ((oid = oidset_iter_next(&oit)))
 		omitted_count++;
 
-	printf("commits %d\nblobs %d\ntags %d\ntrees%d\nomitted %d\n",
+	printf("commits %d\nblobs %d\ntags %d\ntrees %d\nomitted %d\n",
 		commit_count, blob_count, tag_count, tree_count, omitted_count);
 ----
 
diff --git a/Documentation/RelNotes/2.33.0.txt b/Documentation/RelNotes/2.33.0.txt
index a69531c1ef..893c18bfdd 100644
--- a/Documentation/RelNotes/2.33.0.txt
+++ b/Documentation/RelNotes/2.33.0.txt
@@ -1,18 +1,6 @@
 Git 2.33 Release Notes
 ======================
 
-Backward compatibility notes
-----------------------------
-
- * The "-m" option in "git log -m" that does not specify which format,
-   if any, of diff is desired did not have any visible effect; it now
-   implies some form of diff (by default "--patch") is produced.
-
-   You can disable the diff output with "git log -m --no-patch", but
-   then there probably isn't much point in passing "-m" in the first
-   place ;-).
-
-
 Updates since Git 2.32
 ----------------------
 
@@ -24,15 +12,14 @@ UI, Workflows & Features
    "smtp-server" that is meant to name the server to instead name the
    command to talk to the server.
 
- * The "-m" option in "git log -m" that does not specify which format,
-   if any, of diff is desired did not have any visible effect; it now
-   implies some form of diff (by default "--patch") is produced.
-
  * The userdiff pattern for C# learned the token "record".
 
  * "git rev-list" learns to omit the "commit <object-name>" header
    lines from the output with the `--no-commit-header` option.
 
+ * "git worktree add --lock" learned to record why the worktree is
+   locked with a custom message.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -45,7 +32,7 @@ Performance, Internal Implementation, Development Support etc.
    reduce code duplication.
 
  * Repeated rename detections in a sequence of mergy operations have
-   been optimize out.
+   been optimized out for the 'ort' merge strategy.
 
  * Preliminary clean-up of tests before the main reftable changes
    hits the codebase.
@@ -62,6 +49,44 @@ Performance, Internal Implementation, Development Support etc.
  * GitHub Actions / CI update.
    (merge 0dc787a9f2 js/ci-windows-update later to maint).
 
+ * Object accesses in repositories with many alternate object store
+   have been optimized.
+
+ * "git log" has been optimized not to waste cycles to load ref
+   decoration data that may not be needed.
+
+ * Many "printf"-like helper functions we have have been annotated
+   with __attribute__() to catch placeholder/parameter mismatches.
+
+ * Tests that cover protocol bits have been updated and helpers
+   used there have been consolidated.
+
+ * The CI gained a new job to run "make sparse" check.
+
+ * "git status" codepath learned to work with sparsely populated index
+   without hydrating it fully.
+
+ * A guideline for gender neutral documentation has been added.
+
+ * Documentation on "git diff -l<n>" and diff.renameLimit have been
+   updated, and the defaults for these limits have been raised.
+
+ * The completion support used to offer alternate spelling of options
+   that exist only for compatibility, which has been corrected.
+
+ * "TEST_OUTPUT_DIRECTORY=there make test" failed to work, which has
+   been corrected.
+
+ * "git bundle" gained more test coverage.
+
+ * "git read-tree" had a codepath where blobs are fetched one-by-one
+   from the promisor remote, which has been corrected to fetch in bulk.
+
+ * Rewrite of "git submodule" in C continues.
+
+ * "git checkout" and "git commit" learn to work without unnecessarily
+   expanding sparse indexes.
+
 
 Fixes since v2.32
 -----------------
@@ -183,6 +208,32 @@ Fixes since v2.32
    and adds to guidelines to do so.
    (merge 46a237f42f ds/gender-neutral-doc later to maint).
 
+ * "git commit --allow-empty-message" won't abort the operation upon
+   an empty message, but the hint shown in the editor said otherwise.
+   (merge 6f70f00b4f hj/commit-allow-empty-message later to maint).
+
+ * The code that gives an error message in "git multi-pack-index" when
+   no subcommand is given tried to print a NULL pointer as a strong,
+   which has been corrected.
+   (merge 88617d11f9 tb/reverse-midx later to maint).
+
+ * CI update.
+   (merge a066a90db6 js/ci-check-whitespace-updates later to maint).
+
+ * Documentation fix for "git pull --rebase=no".
+   (merge d3236becec fc/pull-no-rebase-merges-theirs-into-ours later to maint).
+
+ * A race between repacking and using pack bitmaps has been corrected.
+   (merge dc1daacdcc jk/check-pack-valid-before-opening-bitmap later to maint).
+
+ * The local changes stashed by "git merge --autostash" were lost when
+   the merge failed in certain ways, which has been corrected.
+
+ * Windows rmdir() equivalent behaves differently from POSIX ones in
+   that when used on a symbolic link that points at a directory, the
+   target directory gets removed, which has been corrected.
+   (merge 3e7d4888e5 tb/mingw-rmdir-symlink-to-directory later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge bfe35a6165 ah/doc-describe later to maint).
    (merge f302c1e4aa jc/clarify-revision-range later to maint).
@@ -218,3 +269,11 @@ Fixes since v2.32
    (merge 5632e838f8 rs/khash-alloc-cleanup later to maint).
    (merge b1d87fbaf1 jk/typofix later to maint).
    (merge e04170697a ab/gitignore-discovery-doc later to maint).
+   (merge 8232a0ff48 dl/packet-read-response-end-fix later to maint).
+   (merge eb448631fb dl/diff-merge-base later to maint).
+   (merge c510928a25 hn/refs-debug-empty-prefix later to maint).
+   (merge ddcb189d9d tb/bitmap-type-filter-comment-fix later to maint).
+   (merge 878b399734 pb/submodule-recurse-doc later to maint).
+   (merge 734283855f jk/config-env-doc later to maint).
+   (merge 482e1488a9 ab/getcwd-test later to maint).
+   (merge f0b922473e ar/doc-markup-fix later to maint).
diff --git a/Documentation/RelNotes/2.33.1.txt b/Documentation/RelNotes/2.33.1.txt
new file mode 100644
index 0000000000..b71738e654
--- /dev/null
+++ b/Documentation/RelNotes/2.33.1.txt
@@ -0,0 +1,138 @@
+Git 2.33.1 Release Notes
+========================
+
+This primarily is to backport various fixes accumulated during the
+development towards Git 2.34, the next feature release.
+
+
+Fixes since v2.33
+-----------------
+
+ * The unicode character width table (used for output alignment) has
+   been updated.
+
+ * Input validation of "git pack-objects --stdin-packs" has been
+   corrected.
+
+ * Bugfix for common ancestor negotiation recently introduced in "git
+   push" codepath.
+
+ * "git pull" had various corner cases that were not well thought out
+   around its --rebase backend, e.g. "git pull --ff-only" did not stop
+   but went ahead and rebased when the history on other side is not a
+   descendant of our history.  The series tries to fix them up.
+
+ * "git apply" miscounted the bytes and failed to read to the end of
+   binary hunks.
+
+ * "git range-diff" code clean-up.
+
+ * "git commit --fixup" now works with "--edit" again, after it was
+   broken in v2.32.
+
+ * Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the
+   new version has a blocker bug for that architecture.
+
+ * Checking out all the paths from HEAD during the last conflicted
+   step in "git rebase" and continuing would cause the step to be
+   skipped (which is expected), but leaves MERGE_MSG file behind in
+   $GIT_DIR and confuses the next "git commit", which has been
+   corrected.
+
+ * Various bugs in "git rebase -r" have been fixed.
+
+ * mmap() imitation used to call xmalloc() that dies upon malloc()
+   failure, which has been corrected to just return an error to the
+   caller to be handled.
+
+ * "git diff --relative" segfaulted and/or produced incorrect result
+   when there are unmerged paths.
+
+ * The delayed checkout code path in "git checkout" etc. were chatty
+   even when --quiet and/or --no-progress options were given.
+
+ * "git branch -D <branch>" used to refuse to remove a broken branch
+   ref that points at a missing commit, which has been corrected.
+
+ * Build update for Apple clang.
+
+ * The parser for the "--nl" option of "git column" has been
+   corrected.
+
+ * "git upload-pack" which runs on the other side of "git fetch"
+   forgot to take the ref namespaces into account when handling
+   want-ref requests.
+
+ * The sparse-index support can corrupt the index structure by storing
+   a stale and/or uninitialized data, which has been corrected.
+
+ * Buggy tests could damage repositories outside the throw-away test
+   area we created.  We now by default export GIT_CEILING_DIRECTORIES
+   to limit the damage from such a stray test.
+
+ * Even when running "git send-email" without its own threaded
+   discussion support, a threading related header in one message is
+   carried over to the subsequent message to result in an unwanted
+   threading, which has been corrected.
+
+ * The output from "git fast-export", when its anonymization feature
+   is in use, showed an annotated tag incorrectly.
+
+ * Recent "diff -m" changes broke "gitk", which has been corrected.
+
+ * "git maintenance" scheduler fix for macOS.
+
+ * A pathname in an advice message has been made cut-and-paste ready.
+
+ * The "git apply -3" code path learned not to bother the lower level
+   merge machinery when the three-way merge can be trivially resolved
+   without the content level merge.
+
+ * The code that optionally creates the *.rev reverse index file has
+   been optimized to avoid needless computation when it is not writing
+   the file out.
+
+ * "git range-diff -I... <range> <range>" segfaulted, which has been
+   corrected.
+
+ * The order in which various files that make up a single (conceptual)
+   packfile has been reevaluated and straightened up.  This matters in
+   correctness, as an incomplete set of files must not be shown to a
+   running Git.
+
+ * The "mode" word is useless in a call to open(2) that does not
+   create a new file.  Such a call in the files backend of the ref
+   subsystem has been cleaned up.
+
+ * "git update-ref --stdin" failed to flush its output as needed,
+   which potentially led the conversation to a deadlock.
+
+ * When "git am --abort" fails to abort correctly, it still exited
+   with exit status of 0, which has been corrected.
+
+ * Correct nr and alloc members of strvec struct to be of type size_t.
+
+ * "git stash", where the tentative change involves changing a
+   directory to a file (or vice versa), was confused, which has been
+   corrected.
+
+ * "git clone" from a repository whose HEAD is unborn into a bare
+   repository didn't follow the branch name the other side used, which
+   is corrected.
+
+ * "git cvsserver" had a long-standing bug in its authentication code,
+   which has finally been corrected (it is unclear and is a separate
+   question if anybody is seriously using it, though).
+
+ * "git difftool --dir-diff" mishandled symbolic links.
+
+ * Sensitive data in the HTTP trace were supposed to be redacted, but
+   we failed to do so in HTTP/2 requests.
+
+ * "make clean" has been updated to remove leftover .depend/
+   directories, even when it is not told to use them to compute header
+   dependencies.
+
+ * Protocol v0 clients can get stuck parsing a malformed feature line.
+
+Also contains various documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.34.0.txt b/Documentation/RelNotes/2.34.0.txt
new file mode 100644
index 0000000000..75d4fdfde7
--- /dev/null
+++ b/Documentation/RelNotes/2.34.0.txt
@@ -0,0 +1,438 @@
+Git 2.34 Release Notes
+======================
+
+Updates since Git 2.33
+----------------------
+
+Backward compatibility notes
+
+ * The "--preserve-merges" option of "git rebase" has been removed.
+
+
+UI, Workflows & Features
+
+ * Pathname expansion (like "~username/") learned a way to specify a
+   location relative to Git installation (e.g. its $sharedir which is
+   $(prefix)/share), with "%(prefix)".
+
+ * The `ort` strategy is used instead of `recursive` as the default
+   merge strategy.
+
+ * The userdiff pattern for "java" language has been updated.
+
+ * "git rebase" by default skips changes that are equivalent to
+   commits that are already in the history the branch is rebased onto;
+   give messages when this happens to let the users be aware of
+   skipped commits, and also teach them how to tell "rebase" to keep
+   duplicated changes.
+
+ * The advice message that "git cherry-pick" gives when it asks
+   conflicted replay of a commit to be resolved by the end user has
+   been updated.
+
+ * After "git clone --recurse-submodules", all submodules are cloned
+   but they are not by default recursed into by other commands.  With
+   submodule.stickyRecursiveClone configuration set, submodule.recurse
+   configuration is set to true in a repository created by "clone"
+   with "--recurse-submodules" option.
+
+ * The logic for auto-correction of misspelt subcommands learned to go
+   interactive when the help.autocorrect configuration variable is set
+   to 'prompt'.
+
+ * "git maintenance" scheduler learned to use systemd timers as a
+   possible backend.
+
+ * "git diff --submodule=diff" showed failure from run_command() when
+   trying to run diff inside a submodule, when the user manually
+   removes the submodule directory.
+
+ * "git bundle unbundle" learned to show progress display.
+
+ * In cone mode, the sparse-index code path learned to remove ignored
+   files (like build artifacts) outside the sparse cone, allowing the
+   entire directory outside the sparse cone to be removed, which is
+   especially useful when the sparse patterns change.
+
+ * Taking advantage of the CGI interface, http-backend has been
+   updated to enable protocol v2 automatically when the other side
+   asks for it.
+
+ * The credential-cache helper has been adjusted to Windows.
+
+ * The error in "git help no-such-git-command" is handled better.
+
+ * The unicode character width table (used for output alignment) has
+   been updated.
+
+ * The ref iteration code used to optionally allow dangling refs to be
+   shown, which has been tightened up.
+
+ * "git add", "git mv", and "git rm" have been adjusted to avoid
+   updating paths outside of the sparse-checkout definition unless
+   the user specifies a "--sparse" option.
+
+ * "git repack" has been taught to generate multi-pack reachability
+   bitmaps.
+
+ * "git fsck" has been taught to report mismatch between expected and
+   actual types of an object better.
+
+ * In addition to GnuPG, ssh public crypto can be used for object and
+   push-cert signing.  Note that this feature cannot be used with
+   ssh-keygen from OpenSSH 8.7, whose support for it is broken.  Avoid
+   using it unless you update to OpenSSH 8.8.
+
+ * "git log --grep=string --author=name" learns to highlight hits just
+   like "git grep string" does.
+
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * "git bisect" spawned "git show-branch" only to pretty-print the
+   title of the commit after checking out the next version to be
+   tested; this has been rewritten in C.
+
+ * "git add" can work better with the sparse index.
+
+ * Support for ancient versions of cURL library (pre 7.19.4) has been
+   dropped.
+
+ * A handful of tests that assumed implementation details of files
+   backend for refs have been cleaned up.
+
+ * trace2 logs learned to show parent process name to see in what
+   context Git was invoked.
+
+ * Loading of ref tips to prepare for common ancestry negotiation in
+   "git fetch-pack" has been optimized by taking advantage of the
+   commit graph when available.
+
+ * Remind developers that the userdiff patterns should be kept simple
+   and permissive, assuming that the contents they apply are always
+   syntactically correct.
+
+ * The current implementation of GIT_TEST_FAIL_PREREQS is broken in
+   that checking for the lack of a prerequisite would not work.  Avoid
+   the use of "if ! test_have_prereq X" in a test script.
+
+ * The revision traversal API has been optimized by taking advantage
+   of the commit-graph, when available, to determine if a commit is
+   reachable from any of the existing refs.
+
+ * "git fetch --quiet" optimization to avoid useless computation of
+   info that will never be displayed.
+
+ * Callers from older advice_config[] based API has been updated to
+   use the newer advice_if_enabled() and advice_enabled() API.
+
+ * Teach "test_pause" and "debug" helpers to allow using the HOME and
+   TERM environment variables the user usually uses.
+
+ * "make INSTALL_STRIP=-s install" allows the installation step to use
+   "install -s" to strip the binaries as they get installed.
+
+ * Code that handles large number of refs in the "git fetch" code
+   path has been optimized.
+
+ * The reachability bitmap file used to be generated only for a single
+   pack, but now we've learned to generate bitmaps for history that
+   span across multiple packfiles.
+
+ * The code to make "git grep" recurse into submodules has been
+   updated to migrate away from the "add submodule's object store as
+   an alternate object store" mechanism (which is suboptimal).
+
+ * The tracing of process ancestry information has been enhanced.
+
+ * Reduce number of write(2) system calls while sending the
+   ref advertisement.
+
+ * Update the build procedure to use the "-pedantic" build when
+   DEVELOPER makefile macro is in effect.
+
+ * Large part of "git submodule add" gets rewritten in C.
+
+ * The run-command API has been updated so that the callers can easily
+   ask the file descriptors open for packfiles to be closed immediately
+   before spawning commands that may trigger auto-gc.
+
+ * An oddball OPTION_ARGUMENT feature has been removed from the
+   parse-options API.
+
+ * The mergesort implementation used to sort linked list has been
+   optimized.
+
+ * Remove external declaration of functions that no longer exist.
+
+ * "git multi-pack-index write --bitmap" learns to propagate the
+   hashcache from original bitmap to resulting bitmap.
+
+ * CI learns to run the leak sanitizer builds.
+
+ * "git grep --recurse-submodules" takes trees and blobs from the
+   submodule repository, but the textconv settings when processing a
+   blob from the submodule is not taken from the submodule repository.
+   A test is added to demonstrate the issue, without fixing it.
+
+ * Teach "git help -c" into helping the command line completion of
+   configuration variables.
+
+ * When "git cmd -h" shows more than one line of usage text (e.g.
+   the cmd subcommand may take sub-sub-command), parse-options API
+   learned to align these lines, even across i18n/l10n.
+
+ * Prevent "make sparse" from running for the source files that
+   haven't been modified.
+
+ * The code path to write a new version of .midx multi-pack index files
+   has learned to release the mmaped memory holding the current
+   version of .midx before removing them from the disk, as some
+   platforms do not allow removal of a file that still has mapping.
+
+ * A new feature has been added to abort early in the test framework.
+
+
+Fixes since v2.33
+-----------------
+
+ * Input validation of "git pack-objects --stdin-packs" has been
+   corrected.
+
+ * Bugfix for common ancestor negotiation recently introduced in "git
+   push" code path.
+
+ * "git pull" had various corner cases that were not well thought out
+   around its --rebase backend, e.g. "git pull --ff-only" did not stop
+   but went ahead and rebased when the history on other side is not a
+   descendant of our history.  The series tries to fix them up.
+
+ * "git apply" miscounted the bytes and failed to read to the end of
+   binary hunks.
+
+ * "git range-diff" code clean-up.
+
+ * "git commit --fixup" now works with "--edit" again, after it was
+   broken in v2.32.
+
+ * Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the
+   new version has a blocker bug for that architecture.
+
+ * Checking out all the paths from HEAD during the last conflicted
+   step in "git rebase" and continuing would cause the step to be
+   skipped (which is expected), but leaves MERGE_MSG file behind in
+   $GIT_DIR and confuses the next "git commit", which has been
+   corrected.
+
+ * Various bugs in "git rebase -r" have been fixed.
+
+ * mmap() imitation used to call xmalloc() that dies upon malloc()
+   failure, which has been corrected to just return an error to the
+   caller to be handled.
+
+ * "git diff --relative" segfaulted and/or produced incorrect result
+   when there are unmerged paths.
+
+ * The delayed checkout code path in "git checkout" etc. were chatty
+   even when --quiet and/or --no-progress options were given.
+
+ * "git branch -D <branch>" used to refuse to remove a broken branch
+   ref that points at a missing commit, which has been corrected.
+
+ * Build update for Apple clang.
+
+ * The parser for the "--nl" option of "git column" has been
+   corrected.
+
+ * "git upload-pack" which runs on the other side of "git fetch"
+   forgot to take the ref namespaces into account when handling
+   want-ref requests.
+
+ * The sparse-index support can corrupt the index structure by storing
+   a stale and/or uninitialized data, which has been corrected.
+
+ * Buggy tests could damage repositories outside the throw-away test
+   area we created.  We now by default export GIT_CEILING_DIRECTORIES
+   to limit the damage from such a stray test.
+
+ * Even when running "git send-email" without its own threaded
+   discussion support, a threading related header in one message is
+   carried over to the subsequent message to result in an unwanted
+   threading, which has been corrected.
+
+ * The output from "git fast-export", when its anonymization feature
+   is in use, showed an annotated tag incorrectly.
+
+ * Recent "diff -m" changes broke "gitk", which has been corrected.
+
+ * The "git apply -3" code path learned not to bother the lower level
+   merge machinery when the three-way merge can be trivially resolved
+   without the content level merge.  This fixes a regression caused by
+   recent "-3way first and fall back to direct application" change.
+
+ * The code that optionally creates the *.rev reverse index file has
+   been optimized to avoid needless computation when it is not writing
+   the file out.
+
+ * "git range-diff -I... <range> <range>" segfaulted, which has been
+   corrected.
+
+ * The order in which various files that make up a single (conceptual)
+   packfile has been reevaluated and straightened up.  This matters in
+   correctness, as an incomplete set of files must not be shown to a
+   running Git.
+
+ * The "mode" word is useless in a call to open(2) that does not
+   create a new file.  Such a call in the files backend of the ref
+   subsystem has been cleaned up.
+
+ * "git update-ref --stdin" failed to flush its output as needed,
+   which potentially led the conversation to a deadlock.
+
+ * When "git am --abort" fails to abort correctly, it still exited
+   with exit status of 0, which has been corrected.
+
+ * Correct nr and alloc members of strvec struct to be of type size_t.
+
+ * "git stash", where the tentative change involves changing a
+   directory to a file (or vice versa), was confused, which has been
+   corrected.
+
+ * "git clone" from a repository whose HEAD is unborn into a bare
+   repository didn't follow the branch name the other side used, which
+   is corrected.
+
+ * "git cvsserver" had a long-standing bug in its authentication code,
+   which has finally been corrected (it is unclear and is a separate
+   question if anybody is seriously using it, though).
+
+ * "git difftool --dir-diff" mishandled symbolic links.
+
+ * Sensitive data in the HTTP trace were supposed to be redacted, but
+   we failed to do so in HTTP/2 requests.
+
+ * "make clean" has been updated to remove leftover .depend/
+   directories, even when it is not told to use them to compute header
+   dependencies.
+
+ * Protocol v0 clients can get stuck parsing a malformed feature line.
+
+ * A few kinds of changes "git status" can show were not documented.
+   (merge d2a534c515 ja/doc-status-types-and-copies later to maint).
+
+ * The mergesort implementation used to sort linked list has been
+   optimized.
+   (merge c90cfc225b rs/mergesort later to maint).
+
+ * An editor session launched during a Git operation (e.g. during 'git
+   commit') can leave the terminal in a funny state.  The code path
+   has updated to save the terminal state before, and restore it
+   after, it spawns an editor.
+   (merge 3d411afabc cm/save-restore-terminal later to maint).
+
+ * "git cat-file --batch" with the "--batch-all-objects" option is
+   supposed to iterate over all the objects found in a repository, but
+   it used to translate these object names using the replace mechanism,
+   which defeats the point of enumerating all objects in the repository.
+   This has been corrected.
+   (merge bf972896d7 jk/cat-file-batch-all-wo-replace later to maint).
+
+ * Recent sparse-index work broke safety against attempts to add paths
+   with trailing slashes to the index, which has been corrected.
+   (merge c8ad9d04c6 rs/make-verify-path-really-verify-again later to maint).
+
+ * The "--color-lines" and "--color-by-age" options of "git blame"
+   have been missing, which are now documented.
+   (merge 8c32856133 bs/doc-blame-color-lines later to maint).
+
+ * The PATH used in CI job may be too wide and let incompatible dlls
+   to be grabbed, which can cause the build&test to fail.  Tighten it.
+   (merge 7491ef6198 js/windows-ci-path-fix later to maint).
+
+ * Avoid performance measurements from getting ruined by gc and other
+   housekeeping pauses interfering in the middle.
+   (merge be79131a53 rs/disable-gc-during-perf-tests later to maint).
+
+ * Stop "git add --dry-run" from creating new blob and tree objects.
+   (merge e578d0311d rs/add-dry-run-without-objects later to maint).
+
+ * "git commit" gave duplicated error message when the object store
+   was unwritable, which has been corrected.
+   (merge 4ef91a2d79 ab/fix-commit-error-message-upon-unwritable-object-store later to maint).
+
+ * Recent sparse-index addition, namely any use of index_name_pos(),
+   can expand sparse index entries and breaks any code that walks
+   cache-tree or existing index entries.  One such instance of such a
+   breakage has been corrected.
+
+ * The xxdiff difftool backend can exit with status 128, which the
+   difftool-helper that launches the backend takes as a significant
+   failure, when it is not significant at all.  Work it around.
+   (merge 571f4348dd da/mergetools-special-case-xxdiff-exit-128 later to maint).
+
+ * Improve test framework around unwritable directories.
+   (merge 5d22e18965 ab/test-cleanly-recreate-trash-directory later to maint).
+
+ * "git push" client talking to an HTTP server did not diagnose the
+   lack of the final status report from the other side correctly,
+   which has been corrected.
+   (merge c5c3486f38 jk/http-push-status-fix later to maint).
+
+ * Update "git archive" documentation and give explicit mention on the
+   compression level for both zip and tar.gz format.
+   (merge c4b208c309 bs/archive-doc-compression-level later to maint).
+
+ * Drop "git sparse-checkout" from the list of common commands.
+   (merge 6a9a50a8af sg/sparse-index-not-that-common-a-command later to maint).
+
+ * "git branch -c/-m new old" was not described to copy config, which
+   has been corrected.
+   (merge 8252ec300e jc/branch-copy-doc later to maint).
+
+ * Squelch over-eager warning message added during this cycle.
+
+ * Fix long-standing shell syntax error in the completion script.
+   (merge 46b0585286 re/completion-fix-test-equality later to maint).
+
+ * Teach "git commit-graph" command not to allow using replace objects
+   at all, as we do not use the commit-graph at runtime when we see
+   object replacement.
+   (merge 095d112f8c ab/ignore-replace-while-working-on-commit-graph later to maint).
+
+ * "git pull --no-verify" did not affect the underlying "git merge".
+   (merge 47bfdfb3fd ar/fix-git-pull-no-verify later to maint).
+
+ * One CI task based on Fedora image noticed a not-quite-kosher
+   construct recently, which has been corrected.
+
+ * "git pull --ff-only" and "git pull --rebase --ff-only" should make
+   it a no-op to attempt pulling from a remote that is behind us, but
+   instead the command errored out by saying it was impossible to
+   fast-forward, which may technically be true, but not a useful thing
+   to diagnose as an error.  This has been corrected.
+   (merge 361cb52383 jc/fix-pull-ff-only-when-already-up-to-date later to maint).
+
+ * The way Cygwin emulates a unix-domain socket, on top of which the
+   simple-ipc mechanism is implemented, can race with the program on
+   the other side that wants to use the socket, and briefly make it
+   appear as a regular file before lstat(2) starts reporting it as a
+   socket.  We now have a workaround on the side that connects to a
+   unix domain socket.
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge f188160be9 ab/bundle-remove-verbose-option later to maint).
+   (merge 8c6b4332b4 rs/close-pack-leakfix later to maint).
+   (merge 51b04c05b7 bs/difftool-msg-tweak later to maint).
+   (merge dd20e4a6db ab/make-compdb-fix later to maint).
+   (merge 6ffb990dc4 os/status-docfix later to maint).
+   (merge 100c2da2d3 rs/p3400-lose-tac later to maint).
+   (merge 76f3b69896 tb/aggregate-ignore-leading-whitespaces later to maint).
+   (merge 6e4fd8bfcd tz/doc-link-to-bundle-format-fix later to maint).
+   (merge f6c013dfa1 jc/doc-commit-header-continuation-line later to maint).
+   (merge ec9a37d69b ab/pkt-line-cleanup later to maint).
+   (merge 8650c6298c ab/fix-make-lint-docs later to maint).
+   (merge 1c720357ce ab/test-lib-diff-cleanup later to maint).
+   (merge 6b615dbece ks/submodule-add-message-fix later to maint).
+   (merge 203eb8381a jc/doc-format-patch-clarify-auto-base later to maint).
+   (merge 559664c792 ab/test-lib later to maint).
diff --git a/Documentation/RelNotes/2.34.1.txt b/Documentation/RelNotes/2.34.1.txt
new file mode 100644
index 0000000000..ad404e9aa0
--- /dev/null
+++ b/Documentation/RelNotes/2.34.1.txt
@@ -0,0 +1,23 @@
+Git v2.34.1 Release Notes
+=========================
+
+This release is primarily to fix a handful of regressions in Git 2.34.
+
+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.
+
+ * "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.
+
+ * SubmittingPatches document gained a syntactically incorrect mark-up,
+   which has been corrected.
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.36.0.txt b/Documentation/RelNotes/2.36.0.txt
new file mode 100644
index 0000000000..78e037b865
--- /dev/null
+++ b/Documentation/RelNotes/2.36.0.txt
@@ -0,0 +1,229 @@
+Git 2.36 Release Notes
+======================
+
+Updates since Git 2.35
+----------------------
+
+Backward compatibility warts
+
+ * "git name-rev --stdin" has been deprecated and issues a warning
+   when used; use "git name-rev --annotate-stdin" instead.
+
+
+Note to those who build from the source
+
+ *
+
+
+UI, Workflows & Features
+
+ * Assorted updates to "git cat-file", especially "-h".
+
+ * The command line completion (in contrib/) learns to complete
+   arguments to give to "git sparse-checkout" command.
+
+ * "git log --remerge-diff" shows the difference from mechanical merge
+   result and the result that is actually recorded in a merge commit.
+
+ * "git log" and friends learned an option --exclude-first-parent-only
+   to propagate UNINTERESTING bit down only along the first-parent
+   chain, just like --first-parent option shows commits that lack the
+   UNINTERESTING bit only along the first-parent chain.
+
+ * The command line completion script (in contrib/) learned to
+   complete all Git subcommands, including the ones that are normally
+   hidden, when GIT_COMPLETION_SHOW_ALL_COMMANDS is used.
+
+ * "git branch" learned the "--recurse-submodules" option.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * "git apply" (ab)used the util pointer of the string-list to keep
+   track of how each symbolic link needs to be handled, which has been
+   simplified by using strset.
+
+ * Fix a hand-rolled alloca() imitation that may have violated
+   alignment requirement of data being sorted in compatibility
+   implementation of qsort_s() and stable qsort().
+
+ * Use the parse-options API in "git reflog" command.
+
+ * The conditional inclusion mechanism of configuration files using
+   "[includeIf <condition>]" learns to base its decision on the
+   URL of the remote repository the repository interacts with.
+   (merge 399b198489 jt/conditional-config-on-remote-url later to maint).
+
+ * "git name-rev --stdin" does not behave like usual "--stdin" at
+   all.  Start the process of renaming it to "--annotate-stdin".
+   (merge a2585719b3 jc/name-rev-stdin later to maint).
+
+ * "git update-index", "git checkout-index", and "git clean" are
+   taught to work better with the sparse checkout feature.
+
+ * Use an internal call to reset_head() helper function instead of
+   spawning "git checkout" in "rebase", and update code paths that are
+   involved in the change.
+
+
+Fixes since v2.35
+-----------------
+
+ * "rebase" and "stash" in secondary worktrees are broken in
+   Git 2.35.0, which has been corrected.
+
+ * "git pull --rebase" ignored the rebase.autostash configuration
+   variable when the remote history is a descendant of our history,
+   which has been corrected.
+   (merge 3013d98d7a pb/pull-rebase-autostash-fix later to maint).
+
+ * "git update-index --refresh" has been taught to deal better with
+   racy timestamps (just like "git status" already does).
+   (merge 2ede073fd2 ms/update-index-racy later to maint).
+
+ * Avoid tests that are run under GIT_TRACE2 set from failing
+   unnecessarily.
+   (merge 944d808e42 js/test-unset-trace2-parents later to maint).
+
+ * The merge-ort misbehaved when merge.renameLimit configuration is
+   set too low and failed to find all renames.
+   (merge 9ae39fef7f en/merge-ort-restart-optim-fix later to maint).
+
+ * We explain that revs come first before the pathspec among command
+   line arguments, but did not spell out that dashed options come
+   before other args, which has been corrected.
+   (merge c11f95010c tl/doc-cli-options-first later to maint).
+
+ * "git add -p" rewritten in C regressed hunk splitting in some cases,
+   which has been corrected.
+   (merge 7008ddc645 pw/add-p-hunk-split-fix later to maint).
+
+ * "git fetch --negotiate-only" is an internal command used by "git
+   push" to figure out which part of our history is missing from the
+   other side.  It should never recurse into submodules even when
+   fetch.recursesubmodules configuration variable is set, nor it
+   should trigger "gc".  The code has been tightened up to ensure it
+   only does common ancestry discovery and nothing else.
+   (merge de4eaae63a gc/fetch-negotiate-only-early-return later to maint).
+
+ * The code path that verifies signatures made with ssh were made to
+   work better on a system with CRLF line endings.
+   (merge caeef01ea7 fs/ssh-signing-crlf later to maint).
+
+ * "git sparse-checkout init" failed to write into $GIT_DIR/info
+   directory when the repository was created without one, which has
+   been corrected to auto-create it.
+   (merge 7f44842ac1 jt/sparse-checkout-leading-dir-fix later to maint).
+
+ * Cloning from a repository that does not yet have any branches or
+   tags but has other refs resulted in a "remote transport reported
+   error", which has been corrected.
+   (merge dccea605b6 jt/clone-not-quite-empty later to maint).
+
+ * Mark in various places in the code that the sparse index and the
+   split index features are mutually incompatible.
+   (merge 451b66c533 js/sparse-vs-split-index later to maint).
+
+ * Update the logic to compute alignment requirement for our mem-pool.
+   (merge e38bcc66d8 jc/mem-pool-alignment later to maint).
+
+ * Pick a better random number generator and use it when we prepare
+   temporary filenames.
+   (merge 47efda967c bc/csprng-mktemps later to maint).
+
+ * Update the contributor-facing documents on proposed log messages.
+   (merge cdba0295b0 jc/doc-log-messages later to maint).
+
+ * When "git fetch --prune" failed to prune the refs it wanted to
+   prune, the command issued error messages but exited with exit
+   status 0, which has been corrected.
+   (merge c9e04d905e tg/fetch-prune-exit-code-fix later to maint).
+
+ * Problems identified by Coverity in the reftable code have been
+   corrected.
+   (merge 01033de49f hn/reftable-coverity-fixes later to maint).
+
+ * A bug that made multi-pack bitmap and the object order out-of-sync,
+   making the .midx data corrupt, has been fixed.
+   (merge f8b60cf99b tb/midx-bitmap-corruption-fix later to maint).
+
+ * The build procedure has been taught to notice older version of zlib
+   and enable our replacement uncompress2() automatically.
+   (merge 07564773c2 ab/auto-detect-zlib-compress2 later to maint).
+
+ * Interaction between fetch.negotiationAlgorithm and
+   feature.experimental configuration variables has been corrected.
+   (merge 714edc620c en/fetch-negotiation-default-fix later to maint).
+
+ * "git diff --diff-filter=aR" is now parsed correctly.
+   (merge 75408ca949 js/diff-filter-negation-fix later to maint).
+
+ * When "git subtree" wants to create a merge, it used "git merge" and
+   let it be affected by end-user's "merge.ff" configuration, which
+   has been corrected.
+   (merge 9158a3564a tk/subtree-merge-not-ff-only later to maint).
+
+ * Unlike "git apply", "git patch-id" did not handle patches with
+   hunks that has only 1 line in either preimage or postimage, which
+   has been corrected.
+   (merge 757e75c81e jz/patch-id-hunk-header-parsing-fix later to maint).
+
+ * "receive-pack" checks if it will do any ref updates (various
+   conditions could reject a push) before received objects are taken
+   out of the temporary directory used for quarantine purposes, so
+   that a push that is known-to-fail will not leave crufts that a
+   future "gc" needs to clean up.
+   (merge 5407764069 cb/clear-quarantine-early-on-all-ref-update-errors later to maint).
+
+ * Because a deletion of ref would need to remove it from both the
+   loose ref store and the packed ref store, a delete-ref operation
+   that logically removes one ref may end up invoking ref-transaction
+   hook twice, which has been corrected.
+   (merge 2ed1b64ebd ps/avoid-unnecessary-hook-invocation-with-packed-refs later to maint).
+
+ * When there is no object to write .bitmap file for, "git
+   multi-pack-index" triggered an error, instead of just skipping,
+   which has been corrected.
+   (merge eb57277ba3 tb/midx-no-bitmap-for-no-objects later to maint).
+
+ * "git cmd -h" outside a repository should error out cleanly for many
+   commands, but instead it hit a BUG(), which has been corrected.
+   (merge 87ad07d735 js/short-help-outside-repo-fix later to maint).
+
+ * "working tree" and "per-worktree ref" were in glossary, but
+   "worktree" itself wasn't, which has been corrected.
+   (merge 2df5387ed0 jc/glossary-worktree later to maint).
+
+ * L10n support for a few error messages.
+   (merge 3d3c23b3a7 bs/forbid-i18n-of-protocol-token-in-fetch-pack later to maint).
+
+ * Test modernization.
+   (merge d4fe066e4b sy/t0001-use-path-is-helper later to maint).
+
+ * "git log --graph --graph" used to leak a graph structure, and there
+   was no way to countermand "--graph" that appear earlier on the
+   command line.  A "--no-graph" option has been added and resource
+   leakage has been plugged.
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge cfc5cf428b jc/find-header later to maint).
+   (merge 40e7cfdd46 jh/p4-fix-use-of-process-error-exception later to maint).
+   (merge 727e6ea350 jh/p4-spawning-external-commands-cleanup later to maint).
+   (merge 0a6adc26e2 rs/grep-expr-cleanup later to maint).
+   (merge 4ed7dfa713 po/readme-mention-contributor-hints later to maint).
+   (merge 6046f7a91c en/plug-leaks-in-merge later to maint).
+   (merge 8c591dbfce bc/clarify-eol-attr later to maint).
+   (merge 518e15db74 rs/parse-options-lithelp-help later to maint).
+   (merge cbac0076ef gh/doc-typos later to maint).
+   (merge ce14de03db ab/no-errno-from-resolve-ref-unsafe later to maint).
+   (merge 2826ffad8c rc/negotiate-only-typofix later to maint).
+   (merge 0f03f04c5c en/sparse-checkout-leakfix later to maint).
+   (merge 74f3390dde sy/diff-usage-typofix later to maint).
+   (merge 45d0212a71 ll/doc-mktree-typofix later to maint).
+   (merge e9b272e4c1 js/no-more-legacy-stash later to maint).
+   (merge 6798b08e84 ab/do-not-hide-failures-in-git-dot-pm later to maint).
+   (merge 9325285df4 po/doc-check-ignore-markup-fix later to maint).
+   (merge cd26cd6c7c sy/modernize-t-lib-read-tree-m-3way later to maint).
+   (merge d17294a05e ab/hash-object-leakfix later to maint).
+   (merge b8403129d3 jd/t0015-modernize later to maint).
+   (merge 332acc248d ds/mailmap later to maint).
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 3e215f4d80..a6121d1d42 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,13 +73,17 @@ 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.
-
-If you have an account at GitHub (and you can get one for free to work
-on open source projects), you can use their Travis CI integration to
-test your changes on Linux, Mac (and hopefully soon Windows).  See
-GitHub-Travis CI hints section for details.
+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
+<<GHCI,GitHub CI>> section for details.
 
 Do not forget to update the documentation to describe the updated
 behavior and make sure that the resulting documentation set formats
@@ -104,6 +110,35 @@ run `git diff --check` on your changes before you commit.
 [[describe-changes]]
 === Describe your changes well.
 
+The log message that explains your changes is just as important as the
+changes themselves.  Your code may be clearly written with in-code
+comment to sufficiently explain how it works with the surrounding
+code, but those who need to fix or enhance your code in the future
+will need to know _why_ your code does what it does, for a few
+reasons:
+
+. Your code may be doing something differently from what you wanted it
+  to do.  Writing down what you actually wanted to achieve will help
+  them fix your code and make it do what it should have been doing
+  (also, you often discover your own bugs yourself, while writing the
+  log message to summarize the thought behind it).
+
+. Your code may be doing things that were only necessary for your
+  immediate needs (e.g. "do X to directories" without implementing or
+  even designing what is to be done on files).  Writing down why you
+  excluded what the code does not do will help guide future developers.
+  Writing down "we do X to directories, because directories have
+  characteristic Y" would help them infer "oh, files also have the same
+  characteristic Y, so perhaps doing X to them would also make sense?".
+  Saying "we don't do the same X to files, because ..." will help them
+  decide if the reasoning is sound (in which case they do not waste
+  time extending your code to cover files), or reason differently (in
+  which case, they can explain why they extend your code to cover
+  files, too).
+
+The goal of your log message is to convey the _why_ behind your
+change to help future developers.
+
 The first line of the commit message should be a short description (50
 characters is the soft limit, see DISCUSSION in linkgit:git-commit[1]),
 and should skip the full stop.  It is also conventional in most cases to
@@ -136,6 +171,13 @@ The body should provide a meaningful commit message, which:
 
 . alternate solutions considered but discarded, if any.
 
+[[present-tense]]
+The problem statement that describes the status quo is written in the
+present tense.  Write "The code does X when it is given input Y",
+instead of "The code used to do Y when given input X".  You do not
+have to say "Currently"---the status quo in the problem statement is
+about the code _without_ your change, by project convention.
+
 [[imperative-mood]]
 Describe your changes in imperative mood, e.g. "make xyzzy do frotz"
 instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy
@@ -145,8 +187,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)
@@ -167,6 +222,85 @@ or, on an older version of Git without support for --pretty=reference:
 	git show -s --date=short --pretty='format:%h (%s, %ad)' <commit>
 ....
 
+[[sign-off]]
+=== Certify your work by adding your `Signed-off-by` trailer
+
+To improve tracking of who did what, we ask you to certify that you
+wrote the patch or have the right to pass it on under the same license
+as ours, by "signing off" your patch.  Without sign-off, we cannot
+accept your patches.
+
+If (and only if) you certify the below D-C-O:
+
+[[dco]]
+.Developer's Certificate of Origin 1.1
+____
+By making a contribution to this project, I certify that:
+
+a. The contribution was created in whole or in part by me and I
+   have the right to submit it under the open source license
+   indicated in the file; or
+
+b. The contribution is based upon previous work that, to the best
+   of my knowledge, is covered under an appropriate open source
+   license and I have the right under that license to submit that
+   work with modifications, whether created in whole or in part
+   by me, under the same open source license (unless I am
+   permitted to submit under a different license), as indicated
+   in the file; or
+
+c. The contribution was provided directly to me by some other
+   person who certified (a), (b) or (c) and I have not modified
+   it.
+
+d. I understand and agree that this project and the contribution
+   are public and that a record of the contribution (including all
+   personal information I submit with it, including my sign-off) is
+   maintained indefinitely and may be redistributed consistent with
+   this project or the open source license(s) involved.
+____
+
+you add a "Signed-off-by" trailer to your commit, that looks like
+this:
+
+....
+	Signed-off-by: Random J Developer <random@developer.example.org>
+....
+
+This line can be added by Git if you run the git-commit command with
+the -s option.
+
+Notice that you can place your own `Signed-off-by` trailer when
+forwarding somebody else's patch with the above rules for
+D-C-O.  Indeed you are encouraged to do so.  Do not forget to
+place an in-body "From: " line at the beginning to properly attribute
+the change to its true author (see (2) above).
+
+This procedure originally came from the Linux kernel project, so our
+rule is quite similar to theirs, but what exactly it means to sign-off
+your patch differs from project to project, so it may be different
+from that of the project you are accustomed to.
+
+[[real-name]]
+Also notice that a real name is used in the `Signed-off-by` trailer. Please
+don't hide your real name.
+
+[[commit-trailers]]
+If you like, you can put extra tags at the end:
+
+. `Reported-by:` is used to credit someone who found the bug that
+  the patch attempts to fix.
+. `Acked-by:` says that the person who is more familiar with the area
+  the patch attempts to modify liked the patch.
+. `Reviewed-by:`, unlike the other tags, can only be offered by the
+  reviewers themselves when they are completely satisfied with the
+  patch after a detailed analysis.
+. `Tested-by:` is used to indicate that the person applied the patch
+  and found it to have the desired effect.
+
+You can also create your own tag or use one that's in common usage
+such as "Thanks-to:", "Based-on-patch-by:", or "Mentored-by:".
+
 [[git-tools]]
 === Generate your patch using Git tools out of your commits.
 
@@ -181,9 +315,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.
@@ -287,7 +423,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]
@@ -302,85 +441,6 @@ Do not forget to add trailers such as `Acked-by:`, `Reviewed-by:` and
 `Tested-by:` lines as necessary to credit people who helped your
 patch, and "cc:" them when sending such a final version for inclusion.
 
-[[sign-off]]
-=== Certify your work by adding your `Signed-off-by` trailer
-
-To improve tracking of who did what, we ask you to certify that you
-wrote the patch or have the right to pass it on under the same license
-as ours, by "signing off" your patch.  Without sign-off, we cannot
-accept your patches.
-
-If (and only if) you certify the below D-C-O:
-
-[[dco]]
-.Developer's Certificate of Origin 1.1
-____
-By making a contribution to this project, I certify that:
-
-a. The contribution was created in whole or in part by me and I
-   have the right to submit it under the open source license
-   indicated in the file; or
-
-b. The contribution is based upon previous work that, to the best
-   of my knowledge, is covered under an appropriate open source
-   license and I have the right under that license to submit that
-   work with modifications, whether created in whole or in part
-   by me, under the same open source license (unless I am
-   permitted to submit under a different license), as indicated
-   in the file; or
-
-c. The contribution was provided directly to me by some other
-   person who certified (a), (b) or (c) and I have not modified
-   it.
-
-d. I understand and agree that this project and the contribution
-   are public and that a record of the contribution (including all
-   personal information I submit with it, including my sign-off) is
-   maintained indefinitely and may be redistributed consistent with
-   this project or the open source license(s) involved.
-____
-
-you add a "Signed-off-by" trailer to your commit, that looks like
-this:
-
-....
-	Signed-off-by: Random J Developer <random@developer.example.org>
-....
-
-This line can be added by Git if you run the git-commit command with
-the -s option.
-
-Notice that you can place your own `Signed-off-by` trailer when
-forwarding somebody else's patch with the above rules for
-D-C-O.  Indeed you are encouraged to do so.  Do not forget to
-place an in-body "From: " line at the beginning to properly attribute
-the change to its true author (see (2) above).
-
-This procedure originally came from the Linux kernel project, so our
-rule is quite similar to theirs, but what exactly it means to sign-off
-your patch differs from project to project, so it may be different
-from that of the project you are accustomed to.
-
-[[real-name]]
-Also notice that a real name is used in the `Signed-off-by` trailer. Please
-don't hide your real name.
-
-[[commit-trailers]]
-If you like, you can put extra tags at the end:
-
-. `Reported-by:` is used to credit someone who found the bug that
-  the patch attempts to fix.
-. `Acked-by:` says that the person who is more familiar with the area
-  the patch attempts to modify liked the patch.
-. `Reviewed-by:`, unlike the other tags, can only be offered by the
-  reviewers themselves when they are completely satisfied with the
-  patch after a detailed analysis.
-. `Tested-by:` is used to indicate that the person applied the patch
-  and found it to have the desired effect.
-
-You can also create your own tag or use one that's in common usage
-such as "Thanks-to:", "Based-on-patch-by:", or "Mentored-by:".
-
 == Subsystems with dedicated maintainers
 
 Some parts of the system have dedicated maintainers with their own
@@ -449,13 +509,12 @@ their trees themselves.
   entitled "What's cooking in git.git" and "What's in git.git" giving
   the status of various proposed changes.
 
-[[travis]]
-== GitHub-Travis CI hints
+== GitHub CI[[GHCI]]
 
-With an account at GitHub (you can get one for free to work on open
-source projects), you can use Travis CI to test your changes on Linux,
-Mac (and hopefully soon Windows).  You can find a successful example
-test build here: https://travis-ci.org/git/git/builds/120473209
+With an account at GitHub, you can use GitHub CI to test your changes
+on Linux, Mac and Windows. See
+https://github.com/git/git/actions/workflows/main.yml for examples of
+recent CI runs.
 
 Follow these steps for the initial setup:
 
@@ -463,31 +522,18 @@ Follow these steps for the initial setup:
   You can find detailed instructions how to fork here:
   https://help.github.com/articles/fork-a-repo/
 
-. Open the Travis CI website: https://travis-ci.org
-
-. Press the "Sign in with GitHub" button.
-
-. Grant Travis CI permissions to access your GitHub account.
-  You can find more information about the required permissions here:
-  https://docs.travis-ci.com/user/github-oauth-scopes
-
-. Open your Travis CI profile page: https://travis-ci.org/profile
-
-. Enable Travis CI builds for your Git fork.
-
-After the initial setup, Travis CI will run whenever you push new changes
+After the initial setup, CI will run whenever you push new changes
 to your fork of Git on GitHub.  You can monitor the test state of all your
-branches here: https://travis-ci.org/__<Your GitHub handle>__/git/branches
+branches here: `https://github.com/<Your GitHub handle>/git/actions/workflows/main.yml`
 
 If a branch did not pass all test cases then it is marked with a red
-cross.  In that case you can click on the failing Travis CI job and
-scroll all the way down in the log.  Find the line "<-- Click here to see
-detailed test output!" and click on the triangle next to the log line
-number to expand the detailed test output.  Here is such a failing
-example: https://travis-ci.org/git/git/jobs/122676187
-
-Fix the problem and push your fix to your Git fork.  This will trigger
-a new Travis CI build to ensure all tests pass.
+cross. In that case you can click on the failing job and navigate to
+"ci/run-build-and-tests.sh" and/or "ci/print-test-failures.sh". You
+can also download "Artifacts" which are tarred (or zipped) archives
+with test data relevant for debugging.
+
+Then fix the problem and push your fix to your GitHub fork. This will
+trigger a new CI build to ensure all tests pass.
 
 [[mua]]
 == MUA specific hints
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 117f4cf806..9a663535f4 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -136,5 +136,16 @@ take effect.
 	option.  An empty file name, `""`, will clear the list of revs from
 	previously processed files.
 
+--color-lines::
+	Color line annotations in the default format differently if they come from
+	the same commit as the preceding line. This makes it easier to distinguish
+	code blocks introduced by different commits. The color defaults to cyan and
+	can be adjusted using the `color.blame.repeatedLines` config option.
+
+--color-by-age::
+	Color line annotations depending on the age of the line in the default format.
+	The `color.blame.highlightRecent` config option controls what color is used for
+	each range of age.
+
 -h::
 	Show help message.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index bf82766a6a..bf3e512921 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -159,6 +159,33 @@ all branches that begin with `foo/`. This is useful if your branches are
 organized hierarchically and you would like to apply a configuration to
 all the branches in that hierarchy.
 
+`hasconfig:remote.*.url:`::
+	The data that follows this keyword is taken to
+	be a pattern with standard globbing wildcards and two
+	additional ones, `**/` and `/**`, that can match multiple
+	components. The first time this keyword is seen, the rest of
+	the config files will be scanned for remote URLs (without
+	applying any values). If there exists at least one remote URL
+	that matches this pattern, the include condition is met.
++
+Files included by this option (directly or indirectly) are not allowed
+to contain remote URLs.
++
+Note that unlike other includeIf conditions, resolving this condition
+relies on information that is not yet known at the point of reading the
+condition. A typical use case is this option being present as a
+system-level or global-level config, and the remote URL being in a
+local-level config; hence the need to scan ahead when resolving this
+condition. In order to avoid the chicken-and-egg problem in which
+potentially-included files can affect whether such files are potentially
+included, Git breaks the cycle by prohibiting these files from affecting
+the resolution of these conditions (thus, prohibiting them from
+declaring remote URLs).
++
+As for the naming of this keyword, it is for forwards compatibiliy with
+a naming scheme that supports more variable-based include conditions,
+but currently Git only supports the exact keyword described above.
+
 A few more notes on matching via `gitdir` and `gitdir/i`:
 
  * Symlinks in `$GIT_DIR` are not resolved before matching.
@@ -226,6 +253,14 @@ Example
 ; currently checked out
 [includeIf "onbranch:foo-branch"]
 	path = foo.inc
+
+; include only if a remote with the given URL exists (note
+; that such a URL may be provided later in a file or in a
+; file read after this file is read, as seen in this example)
+[includeIf "hasconfig:remote.*.url:https://example.com/**"]
+	path = foo.inc
+[remote "origin"]
+	url = https://example.com/git
 ----
 
 Values
@@ -262,11 +297,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 +323,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.
 +
@@ -298,6 +346,15 @@ pathname::
 	tilde expansion happens to such a string: `~/`
 	is expanded to the value of `$HOME`, and `~user/` to the
 	specified user's home directory.
++
+If a path starts with `%(prefix)/`, the remainder is interpreted as a
+path relative to Git's "runtime prefix", i.e. relative to the location
+where Git itself was installed. For example, `%(prefix)/bin/` refers to
+the directory in which the Git executable itself lives. If Git was
+compiled without runtime prefix support, the compiled-in prefix will be
+substituted instead. In the unlikely event that a literal path needs to
+be specified that should _not_ be expanded, it needs to be prefixed by
+`./`, like so: `./%(prefix)/bin`.
 
 
 Variables
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index 8b2849ff7b..adee26fbbb 100644
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -44,6 +44,9 @@ advice.*::
 		Shown when linkgit:git-push[1] rejects a forced update of
 		a branch when its remote-tracking ref has updates that we
 		do not have locally.
+	skippedCherryPicks::
+		Shown when linkgit:git-rebase[1] skips a commit that has already
+		been cherry-picked onto the upstream branch.
 	statusAheadBehind::
 		Shown when linkgit:git-status[1] computes the ahead/behind
 		counts for a local ref compared to its remote tracking ref,
@@ -113,6 +116,9 @@ advice.*::
 	submoduleAlternateErrorStrategyDie::
 		Advice shown when a submodule.alternateErrorStrategy option
 		configured to "die" causes a fatal error.
+	submodulesNotUpdated::
+		Advice shown when a user runs a submodule command that fails
+		because `git submodule update --init` was not run.
 	addIgnoredFile::
 		Advice shown if a user attempts to add an ignored file to
 		the index.
diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt
index cc5f3249fc..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::
@@ -85,10 +86,6 @@ When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase'
 so that the local merge commits are included in the rebase (see
 linkgit:git-rebase[1] for details).
 +
-When `preserve` (or just 'p', deprecated in favor of `merges`), also pass
-`--preserve-merges` along to 'git rebase' so that locally committed merge
-commits will not be flattened by running 'git pull'.
-+
 When the value is `interactive` (or just 'i'), the rebase is run in interactive
 mode.
 +
diff --git a/Documentation/config/color.txt b/Documentation/config/color.txt
index e05d520a86..1795b2d16b 100644
--- a/Documentation/config/color.txt
+++ b/Documentation/config/color.txt
@@ -9,26 +9,27 @@ color.advice.hint::
 	Use customized color for hints.
 
 color.blame.highlightRecent::
-	This can be used to color the metadata of a blame line depending
-	on age of the line.
+	Specify the line annotation color for `git blame --color-by-age`
+	depending upon the age of the line.
 +
-This setting should be set to a comma-separated list of color and date settings,
-starting and ending with a color, the dates should be set from oldest to newest.
-The metadata will be colored given the colors if the line was introduced
-before the given timestamp, overwriting older timestamped colors.
+This setting should be set to a comma-separated list of color and
+date settings, starting and ending with a color, the dates should be
+set from oldest to newest. The metadata will be colored with the
+specified colors if the line was introduced before the given
+timestamp, overwriting older timestamped colors.
 +
-Instead of an absolute timestamp relative timestamps work as well, e.g.
-2.weeks.ago is valid to address anything older than 2 weeks.
+Instead of an absolute timestamp relative timestamps work as well,
+e.g. `2.weeks.ago` is valid to address anything older than 2 weeks.
 +
-It defaults to 'blue,12 month ago,white,1 month ago,red', which colors
-everything older than one year blue, recent changes between one month and
-one year old are kept white, and lines introduced within the last month are
-colored red.
+It defaults to `blue,12 month ago,white,1 month ago,red`, which
+colors everything older than one year blue, recent changes between
+one month and one year old are kept white, and lines introduced
+within the last month are colored red.
 
 color.blame.repeatedLines::
-	Use the customized color for the part of git-blame output that
-	is repeated meta information per line (such as commit id,
-	author name, date and timezone). Defaults to cyan.
+	Use the specified color to colorize line annotations for
+	`git blame --color-lines`, if they come from the same commit as the
+	preceding line. Defaults to cyan.
 
 color.branch::
 	A boolean to enable/disable color in the output of
@@ -104,9 +105,12 @@ color.grep.<slot>::
 `matchContext`;;
 	matching text in context lines
 `matchSelected`;;
-	matching text in selected lines
+	matching text in selected lines. Also, used to customize the following
+	linkgit:git-log[1] subcommands: `--grep`, `--author` and `--committer`.
 `selected`;;
-	non-matching text in selected lines
+	non-matching text in selected lines. Also, used to customize the
+	following linkgit:git-log[1] subcommands: `--grep`, `--author` and
+	`--committer`.
 `separator`;;
 	separators between fields on a line (`:`, `-`, and `=`)
 	and between hunks (`--`)
diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt
index 2d3331f55c..32f84838ac 100644
--- a/Documentation/config/diff.txt
+++ b/Documentation/config/diff.txt
@@ -118,9 +118,10 @@ diff.orderFile::
 	relative to the top of the working tree.
 
 diff.renameLimit::
-	The number of files to consider when performing the copy/rename
-	detection; equivalent to the 'git diff' option `-l`. This setting
-	has no effect if rename detection is turned off.
+	The number of files to consider in the exhaustive portion of
+	copy/rename detection; equivalent to the 'git diff' option
+	`-l`.  If not set, the default value is currently 1000.  This
+	setting has no effect if rename detection is turned off.
 
 diff.renames::
 	Whether and how Git detects renames.  If set to "false",
diff --git a/Documentation/config/extensions.txt b/Documentation/config/extensions.txt
index 4e23d73cdc..bccaec7a96 100644
--- a/Documentation/config/extensions.txt
+++ b/Documentation/config/extensions.txt
@@ -6,3 +6,34 @@ extensions.objectFormat::
 Note that this setting should only be set by linkgit:git-init[1] or
 linkgit:git-clone[1].  Trying to change it after initialization will not
 work and will produce hard-to-diagnose issues.
+
+extensions.worktreeConfig::
+	If enabled, then worktrees will load config settings from the
+	`$GIT_DIR/config.worktree` file in addition to the
+	`$GIT_COMMON_DIR/config` file. Note that `$GIT_COMMON_DIR` and
+	`$GIT_DIR` are the same for the main working tree, while other
+	working trees have `$GIT_DIR` equal to
+	`$GIT_COMMON_DIR/worktrees/<id>/`. The settings in the
+	`config.worktree` file will override settings from any other
+	config files.
++
+When enabling `extensions.worktreeConfig`, you must be careful to move
+certain values from the common config file to the main working tree's
+`config.worktree` file, if present:
++
+* `core.worktree` must be moved from `$GIT_COMMON_DIR/config` to
+  `$GIT_COMMON_DIR/config.worktree`.
+* If `core.bare` is true, then it must be moved from `$GIT_COMMON_DIR/config`
+  to `$GIT_COMMON_DIR/config.worktree`.
++
+It may also be beneficial to adjust the locations of `core.sparseCheckout`
+and `core.sparseCheckoutCone` depending on your desire for customizable
+sparse-checkout settings for each worktree. By default, the `git
+sparse-checkout` builtin enables `extensions.worktreeConfig`, assigns
+these config values on a per-worktree basis, and uses the
+`$GIT_DIR/info/sparse-checkout` file to specify the sparsity for each
+worktree independently. See linkgit:git-sparse-checkout[1] for more
+details.
++
+For historical reasons, `extensions.worktreeConfig` is respected
+regardless of the `core.repositoryFormatVersion` setting.
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt
index 63748c02b7..cd65d236b4 100644
--- a/Documentation/config/fetch.txt
+++ b/Documentation/config/fetch.txt
@@ -56,18 +56,19 @@ fetch.output::
 	OUTPUT in linkgit:git-fetch[1] for detail.
 
 fetch.negotiationAlgorithm::
-	Control how information about the commits in the local repository is
-	sent when negotiating the contents of the packfile to be sent by the
-	server. Set to "skipping" to use an algorithm that skips commits in an
-	effort to converge faster, but may result in a larger-than-necessary
-	packfile; or set to "noop" to not send any information at all, which
-	will almost certainly result in a larger-than-necessary packfile, but
-	will skip the negotiation step.
-	The default is "default" which instructs Git to use the default algorithm
-	that never skips commits (unless the server has acknowledged it or one
-	of its descendants). If `feature.experimental` is enabled, then this
-	setting defaults to "skipping".
-	Unknown values will cause 'git fetch' to error out.
+	Control how information about the commits in the local repository
+	is sent when negotiating the contents of the packfile to be sent by
+	the server.  Set to "consecutive" to use an algorithm that walks
+	over consecutive commits checking each one.  Set to "skipping" to
+	use an algorithm that skips commits in an effort to converge
+	faster, but may result in a larger-than-necessary packfile; or set
+	to "noop" to not send any information at all, which will almost
+	certainly result in a larger-than-necessary packfile, but will skip
+	the negotiation step.  Set to "default" to override settings made
+	previously and use the default behaviour.  The default is normally
+	"consecutive", but if `feature.experimental` is true, then the
+	default is "skipping".  Unknown values will cause 'git fetch' to
+	error out.
 +
 See also the `--negotiate-only` and `--negotiation-tip` options to
 linkgit:git-fetch[1].
diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt
index d94025cb36..86892ada77 100644
--- a/Documentation/config/gpg.txt
+++ b/Documentation/config/gpg.txt
@@ -11,13 +11,13 @@ gpg.program::
 
 gpg.format::
 	Specifies which key format to use when signing with `--gpg-sign`.
-	Default is "openpgp" and another possible value is "x509".
+	Default is "openpgp". Other possible values are "x509", "ssh".
 
 gpg.<format>.program::
 	Use this to customize the program used for the signing format you
 	chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still
 	be used as a legacy synonym for `gpg.openpgp.program`. The default
-	value for `gpg.x509.program` is "gpgsm".
+	value for `gpg.x509.program` is "gpgsm" and `gpg.ssh.program` is "ssh-keygen".
 
 gpg.minTrustLevel::
 	Specifies a minimum trust level for signature verification.  If
@@ -33,3 +33,47 @@ gpg.minTrustLevel::
 * `marginal`
 * `fully`
 * `ultimate`
+
+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
+	available key from your ssh-agent set this to "ssh-add -L".
+
+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...`
+	See ssh-keygen(1) "ALLOWED SIGNERS" for details.
+	The principal is only used to identify the key and is available when
+	verifying a signature.
++
+SSH has no concept of trust levels like gpg does. To be able to differentiate
+between valid signatures and trusted signatures the trust level of a signature
+verification is set to `fully` when the public key is present in the allowedSignersFile.
+Otherwise the trust level is `undefined` and git verify-commit/tag will fail.
++
+This file can be set to a location outside of the repository and every developer
+maintains their own trust store. A central repository server could generate this
+file automatically from ssh keys with push access to verify the code against.
+In a corporate setting this file is probably generated at a global location
+from automation that already handles developer ssh keys.
++
+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 signature's 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.
+
+gpg.ssh.revocationFile::
+	Either a SSH KRL or a list of revoked public keys (without the principal prefix).
+	See ssh-keygen(1) for details.
+	If a public key is found in this file then it will always be treated
+	as having trust level "never" and signatures will show as invalid.
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/gui.txt b/Documentation/config/gui.txt
index d30831a130..0c087fd8c9 100644
--- a/Documentation/config/gui.txt
+++ b/Documentation/config/gui.txt
@@ -11,7 +11,7 @@ gui.displayUntracked::
 	in the file list. The default is "true".
 
 gui.encoding::
-	Specifies the default encoding to use for displaying of
+	Specifies the default character encoding to use for displaying of
 	file contents in linkgit:git-gui[1] and linkgit:gitk[1].
 	It can be overridden by setting the 'encoding' attribute
 	for relevant files (see linkgit:gitattributes[5]).
diff --git a/Documentation/config/help.txt b/Documentation/config/help.txt
index 783a90a0f9..610701f9a3 100644
--- a/Documentation/config/help.txt
+++ b/Documentation/config/help.txt
@@ -9,13 +9,15 @@ help.format::
 
 help.autoCorrect::
 	If git detects typos and can identify exactly one valid command similar
-	to the error, git will automatically run the intended command after
-	waiting a duration of time defined by this configuration value in
-	deciseconds (0.1 sec).  If this value is 0, the suggested corrections
-	will be shown, but not executed. If it is a negative integer, or
-	"immediate", the suggested command
-	is run immediately. If "never", suggestions are not shown at all. The
-	default value is zero.
+	to the error, git will try to suggest the correct command or even
+	run the suggestion automatically. Possible config values are:
+	 - 0 (default): show the suggested command.
+	 - positive number: run the suggested command after specified
+deciseconds (0.1 sec).
+	 - "immediate": run the suggested command immediately.
+	 - "prompt": show the suggestion and prompt for confirmation to run
+the command.
+	 - "never": don't run or show any suggested command.
 
 help.htmlPath::
 	Specify the path where the HTML documentation resides. File system paths
diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt
index 6b66c83eab..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
@@ -33,10 +40,12 @@ merge.verifySignatures::
 include::fmt-merge-msg.txt[]
 
 merge.renameLimit::
-	The number of files to consider when performing rename detection
-	during a merge; if not specified, defaults to the value of
-	diff.renameLimit. This setting has no effect if rename detection
-	is turned off.
+	The number of files to consider in the exhaustive portion of
+	rename detection during a merge.  If not specified, defaults
+	to the value of diff.renameLimit.  If neither
+	merge.renameLimit nor diff.renameLimit are specified,
+	currently defaults to 7000.  This setting has no effect if
+	rename detection is turned off.
 
 merge.renames::
 	Whether Git detects renames.  If set to "false", rename detection
diff --git a/Documentation/config/pack.txt b/Documentation/config/pack.txt
index 763f7af7c4..ad7f73a1ea 100644
--- a/Documentation/config/pack.txt
+++ b/Documentation/config/pack.txt
@@ -159,6 +159,10 @@ pack.writeBitmapHashCache::
 	between an older, bitmapped pack and objects that have been
 	pushed since the last gc). The downside is that it consumes 4
 	bytes per object of disk space. Defaults to true.
++
+When writing a multi-pack reachability bitmap, no new namehashes are
+computed; instead, any namehashes stored in an existing bitmap are
+permuted into their appropriate location when writing a new bitmap.
 
 pack.writeReverseIndex::
 	When true, git will write a corresponding .rev file (see:
diff --git a/Documentation/config/pull.txt b/Documentation/config/pull.txt
index 5404830609..9349e09261 100644
--- a/Documentation/config/pull.txt
+++ b/Documentation/config/pull.txt
@@ -18,10 +18,6 @@ When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase'
 so that the local merge commits are included in the rebase (see
 linkgit:git-rebase[1] for details).
 +
-When `preserve` (or just 'p', deprecated in favor of `merges`), also pass
-`--preserve-merges` along to 'git rebase' so that locally committed merge
-commits will not be flattened by running 'git pull'.
-+
 When the value is `interactive` (or just 'i'), the rebase is run in interactive
 mode.
 +
diff --git a/Documentation/config/stash.txt b/Documentation/config/stash.txt
index 9ed775281f..b9f609ed76 100644
--- a/Documentation/config/stash.txt
+++ b/Documentation/config/stash.txt
@@ -1,10 +1,3 @@
-stash.useBuiltin::
-	Unused configuration variable.  Used in Git versions 2.22 to
-	2.26 as an escape hatch to enable the legacy shellscript
-	implementation of stash.  Now the built-in rewrite of it in C
-	is always used. Setting this will emit a warning, to alert any
-	remaining users that setting this now does nothing.
-
 stash.showIncludeUntracked::
 	If this is set to true, the `git stash show` command will show
 	the untracked files of a stash entry.  Defaults to false. See
diff --git a/Documentation/config/submodule.txt b/Documentation/config/submodule.txt
index d7a63c8c12..6490527b45 100644
--- a/Documentation/config/submodule.txt
+++ b/Documentation/config/submodule.txt
@@ -58,18 +58,34 @@ submodule.active::
 	commands. See linkgit:gitsubmodules[7] for details.
 
 submodule.recurse::
-	Specifies if commands recurse into submodules by default. This
-	applies to all commands that have a `--recurse-submodules` option
-	(`checkout`, `fetch`, `grep`, `pull`, `push`, `read-tree`, `reset`,
-	`restore` and `switch`) except `clone` and `ls-files`.
+	A boolean indicating if commands should enable the `--recurse-submodules`
+	option by default. Defaults to false.
++
+When set to true, it can be deactivated via the
+`--no-recurse-submodules` option. Note that some Git commands
+lacking this option may call some of the above commands affected by
+`submodule.recurse`; for instance `git remote update` will call
+`git fetch` but does not have a `--no-recurse-submodules` option.
+For these commands a workaround is to temporarily change the
+configuration value by using `git -c submodule.recurse=0`.
++
+The following list shows the commands that accept
+`--recurse-submodules` and whether they are supported by this
+setting.
+
+* `checkout`, `fetch`, `grep`, `pull`, `push`, `read-tree`,
+`reset`, `restore` and `switch` are always supported.
+* `clone` and `ls-files` are not supported.
+* `branch` is supported only if `submodule.propagateBranches` is
+enabled
+
+submodule.propagateBranches::
+	[EXPERIMENTAL] A boolean that enables branching support when
+	using `--recurse-submodules` or `submodule.recurse=true`.
+	Enabling this will allow certain commands to accept
+	`--recurse-submodules` and certain commands that already accept
+	`--recurse-submodules` will now consider branches.
 	Defaults to false.
-	When set to true, it can be deactivated via the
-	`--no-recurse-submodules` option. Note that some Git commands
-	lacking this option may call some of the above commands affected by
-	`submodule.recurse`; for instance `git remote update` will call
-	`git fetch` but does not have a `--no-recurse-submodules` option.
-	For these commands a workaround is to temporarily change the
-	configuration value by using `git -c submodule.recurse=0`.
 
 submodule.fetchJobs::
 	Specifies how many submodules are fetched/cloned at the same time.
diff --git a/Documentation/config/transfer.txt b/Documentation/config/transfer.txt
index 505126a780..b49429eb4d 100644
--- a/Documentation/config/transfer.txt
+++ b/Documentation/config/transfer.txt
@@ -52,13 +52,17 @@ If you have multiple hideRefs values, later entries override earlier ones
 (and entries in more-specific config files override less-specific ones).
 +
 If a namespace is in use, the namespace prefix is stripped from each
-reference before it is matched against `transfer.hiderefs` patterns.
+reference before it is matched against `transfer.hiderefs` patterns. In
+order to match refs before stripping, add a `^` in front of the ref name. If
+you combine `!` and `^`, `!` must be specified first.
++
 For example, if `refs/heads/master` is specified in `transfer.hideRefs` and
 the current namespace is `foo`, then `refs/namespaces/foo/refs/heads/master`
-is omitted from the advertisements but `refs/heads/master` and
-`refs/namespaces/bar/refs/heads/master` are still advertised as so-called
-"have" lines. In order to match refs before stripping, add a `^` in front of
-the ref name. If you combine `!` and `^`, `!` must be specified first.
+is omitted from the advertisements. If `uploadpack.allowRefInWant` is set,
+`upload-pack` will treat `want-ref refs/heads/master` in a protocol v2
+`fetch` command as if `refs/namespaces/foo/refs/heads/master` did not exist.
+`receive-pack`, on the other hand, will still advertise the object id the
+ref is pointing to without mentioning its name (a so-called ".have" line).
 +
 Even if you hide refs, a client may still be able to steal the target
 objects via the techniques described in the "SECURITY" section of the
diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt
index 59aec7c3ae..ec9233b060 100644
--- a/Documentation/config/user.txt
+++ b/Documentation/config/user.txt
@@ -36,3 +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 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/diff-format.txt b/Documentation/diff-format.txt
index fbbd410a84..7a9c3b6ff4 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -59,7 +59,7 @@ Possible status letters are:
 - D: deletion of a file
 - M: modification of the contents or mode of a file
 - R: renaming of a file
-- T: change in the type of the file
+- T: change in the type of the file (regular file, symbolic link or submodule)
 - U: file is unmerged (you must complete the merge before it can
   be committed)
 - X: "unknown" change type (most probably a bug, please report it)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 32e6dee5ac..3674ac48e9 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -34,7 +34,7 @@ endif::git-diff[]
 endif::git-format-patch[]
 
 ifdef::git-log[]
---diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc)::
+--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc|remerge|r)::
 --no-diff-merges::
 	Specify diff format to be used for merge commits. Default is
 	{diff-merges-default} unless `--first-parent` is in use, in which case
@@ -49,9 +49,10 @@ ifdef::git-log[]
 --diff-merges=m:::
 -m:::
 	This option makes diff output for merge commits to be shown in
-	the default format. The default format could be changed using
+	the default format. `-m` will produce the output only if `-p`
+	is given as well. The default format could be changed using
 	`log.diffMerges` configuration parameter, which default value
-	is `separate`. `-m` implies `-p`.
+	is `separate`.
 +
 --diff-merges=first-parent:::
 --diff-merges=1:::
@@ -61,8 +62,19 @@ ifdef::git-log[]
 --diff-merges=separate:::
 	This makes merge commits show the full diff with respect to
 	each of the parents. Separate log entry and diff is generated
-	for each parent. This is the format that `-m` produced
-	historically.
+	for each parent.
++
+--diff-merges=remerge:::
+--diff-merges=r:::
+--remerge-diff:::
+	With this option, two-parent merge commits are remerged to
+	create a temporary tree object -- potentially containing files
+	with conflict markers and such.  A diff is then shown between
+	that temporary tree and the actual merge commit.
++
+The output emitted when this option is used is subject to change, and
+so is its interaction with other options (unless explicitly
+documented).
 +
 --diff-merges=combined:::
 --diff-merges=c:::
@@ -588,11 +600,17 @@ When used together with `-B`, omit also the preimage in the deletion part
 of a delete/create pair.
 
 -l<num>::
-	The `-M` and `-C` options require O(n^2) processing time where n
-	is the number of potential rename/copy targets.  This
-	option prevents rename/copy detection from running if
-	the number of rename/copy targets exceeds the specified
-	number.
+	The `-M` and `-C` options involve some preliminary steps that
+	can detect subsets of renames/copies cheaply, followed by an
+	exhaustive fallback portion that compares all remaining
+	unpaired destinations to all relevant sources.  (For renames,
+	only remaining unpaired sources are relevant; for copies, all
+	original sources are relevant.)  For N sources and
+	destinations, this exhaustive check is O(N^2).  This option
+	prevents the exhaustive portion of rename/copy detection from
+	running if the number of source/destination files involved
+	exceeds the specified number.  Defaults to diff.renameLimit.
+	Note that a value of 0 is treated as unlimited.
 
 ifndef::git-format-patch[]
 --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]::
@@ -610,11 +628,8 @@ ifndef::git-format-patch[]
 Also, these upper-case letters can be downcased to exclude.  E.g.
 `--diff-filter=ad` excludes added and deleted paths.
 +
-Note that not all diffs can feature all types. For instance, diffs
-from the index to the working tree can never have Added entries
-(because the set of paths included in the diff is limited by what is in
-the index).  Similarly, copied and renamed entries cannot appear if
-detection for those types is disabled.
+Note that not all diffs can feature all types. For instance, copied and
+renamed entries cannot appear if detection for those types is disabled.
 
 -S<string>::
 	Look for differences that change the number of occurrences of
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index e967ff1874..f903683189 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -71,6 +71,7 @@ configuration variables documented in linkgit:git-config[1], and the
 	ancestors of the provided `--negotiation-tip=*` arguments,
 	which we have in common with the server.
 +
+This is incompatible with `--recurse-submodules=[yes|on-demand]`.
 Internally this is used to implement the `push.negotiate` option, see
 linkgit:git-config[1].
 
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index be5e3ac54b..11eb70f16c 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
-	  [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]
+	  [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] [--sparse]
 	  [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
 	  [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]
 	  [--] [<pathspec>...]
@@ -79,6 +79,13 @@ in linkgit:gitglossary[7].
 --force::
 	Allow adding otherwise ignored files.
 
+--sparse::
+	Allow updating index entries outside of the sparse-checkout cone.
+	Normally, `git add` refuses to update index entries whose paths do
+	not fit within the sparse-checkout cone, since those files might
+	be removed from the working tree without warning. See
+	linkgit:git-sparse-checkout[1] for more details.
+
 -i::
 --interactive::
 	Add modified contents in the working tree interactively to
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 8714dfcb76..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]),
@@ -178,6 +187,8 @@ default.   You can use `--no-utf8` to override this.
 
 --abort::
 	Restore the original branch and abort the patching operation.
+	Revert contents of files involved in the am operation to their
+	pre-am state.
 
 --quit::
 	Abort the patching operation but keep HEAD and the index
@@ -189,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-archive.txt b/Documentation/git-archive.txt
index 9f8172828d..bc4e76a783 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -93,12 +93,19 @@ BACKEND EXTRA OPTIONS
 
 zip
 ~~~
--0::
-	Store the files instead of deflating them.
--9::
-	Highest and slowest compression level.  You can specify any
-	number from 1 to 9 to adjust compression speed and ratio.
+-<digit>::
+	Specify compression level.  Larger values allow the command
+	to spend more time to compress to smaller size.  Supported
+	values are from `-0` (store-only) to `-9` (best ratio).
+	Default is `-6` if not given.
 
+tar
+~~~
+-<number>::
+	Specify compression level. The value will be passed to the
+	compression command configured in `tar.<format>.command`. See
+	manual page of the configured command for the list of supported
+	levels and the default level if this option isn't specified.
 
 CONFIGURATION
 -------------
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 3bf5d5d8b4..d7a46cc674 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -11,8 +11,8 @@ SYNOPSIS
 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]
 	    [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
 	    [--ignore-rev <rev>] [--ignore-revs-file <file>]
-	    [--progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>..<rev>]
-	    [--] <file>
+	    [--color-lines] [--color-by-age] [--progress] [--abbrev=<n>]
+	    [<rev> | --contents <file> | --reverse <rev>..<rev>] [--] <file>
 
 DESCRIPTION
 -----------
@@ -93,6 +93,19 @@ include::blame-options.txt[]
 	is used for a caret to mark the boundary commit.
 
 
+THE DEFAULT FORMAT
+------------------
+
+When neither `--porcelain` nor `--incremental` option is specified,
+`git blame` will output annotation for each line with:
+
+- abbreviated object name for the commit the line came from;
+- author ident (by default author name and date, unless `-s` or `-e`
+  is specified); and
+- line number
+
+before the line contents.
+
 THE PORCELAIN FORMAT
 --------------------
 
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 94dc9a54f2..c8b4f9ce3c 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -16,7 +16,8 @@ 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]
+	[--recurse-submodules] <branchname> [<start-point>]
 'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
 'git branch' --unset-upstream [<branchname>]
 'git branch' (-m | -M) [<oldbranch>] <newbranch>
@@ -118,20 +119,21 @@ OPTIONS
 	Reset <branchname> to <startpoint>, even if <branchname> exists
 	already. Without `-f`, 'git branch' refuses to change an existing branch.
 	In combination with `-d` (or `--delete`), allow deleting the
-	branch irrespective of its merged status. In combination with
+	branch irrespective of its merged status, or whether it even
+	points to a valid commit. In combination with
 	`-m` (or `--move`), allow renaming the branch even if the new
 	branch name already exists, the same applies for `-c` (or `--copy`).
 
 -m::
 --move::
-	Move/rename a branch and the corresponding reflog.
+	Move/rename a branch, together with its config and reflog.
 
 -M::
 	Shortcut for `--move --force`.
 
 -c::
 --copy::
-	Copy a branch and the corresponding reflog.
+	Copy a branch, together with its config and reflog.
 
 -C::
 	Shortcut for `--copy --force`.
@@ -205,24 +207,50 @@ 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.
+
+--recurse-submodules::
+	THIS OPTION IS EXPERIMENTAL! Causes the current command to
+	recurse into submodules if `submodule.propagateBranches` is
+	enabled. See `submodule.propagateBranches` in
+	linkgit:git-config[1]. Currently, only branch creation is
+	supported.
++
+When used in branch creation, a new branch <branchname> will be created
+in the superproject and all of the submodules in the superproject's
+<start-point>. In submodules, the branch will point to the submodule
+commit in the superproject's <start-point> but the branch's tracking
+information will be set up based on the submodule's branches and remotes
+e.g. `git branch --recurse-submodules topic origin/main` will create the
+submodule branch "topic" that points to the submodule commit in the
+superproject's "origin/main", but tracks the submodule's "origin/main".
 
 --set-upstream::
 	As this option had confusing syntax, it is no longer supported.
diff --git a/Documentation/git-bugreport.txt b/Documentation/git-bugreport.txt
index 66e88c2e31..d8817bf3ce 100644
--- a/Documentation/git-bugreport.txt
+++ b/Documentation/git-bugreport.txt
@@ -40,8 +40,8 @@ OPTIONS
 -------
 -o <path>::
 --output-directory <path>::
-	Place the resulting bug report file in `<path>` instead of the root of
-	the Git repository.
+	Place the resulting bug report file in `<path>` instead of the current
+	directory.
 
 -s <format>::
 --suffix <format>::
diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt
index 53804cad4b..72ab813905 100644
--- a/Documentation/git-bundle.txt
+++ b/Documentation/git-bundle.txt
@@ -13,26 +13,53 @@ SYNOPSIS
 		    [--version=<version>] <file> <git-rev-list-args>
 'git bundle' verify [-q | --quiet] <file>
 'git bundle' list-heads <file> [<refname>...]
-'git bundle' unbundle <file> [<refname>...]
+'git bundle' unbundle [--progress] <file> [<refname>...]
 
 DESCRIPTION
 -----------
 
-Some workflows require that one or more branches of development on one
-machine be replicated on another machine, but the two machines cannot
-be directly connected, and therefore the interactive Git protocols (git,
-ssh, http) cannot be used.
+Create, unpack, and manipulate "bundle" files. Bundles are used for
+the "offline" transfer of Git objects without an active "server"
+sitting on the other side of the network connection.
 
-The 'git bundle' command packages objects and references in an archive
-at the originating machine, which can then be imported into another
-repository using 'git fetch', 'git pull', or 'git clone',
-after moving the archive by some means (e.g., by sneakernet).
+They can be used to create both incremental and full backups of a
+repository, and to relay the state of the references in one repository
+to another.
 
-As no
-direct connection between the repositories exists, the user must specify a
-basis for the bundle that is held by the destination repository: the
-bundle assumes that all objects in the basis are already in the
-destination repository.
+Git commands that fetch or otherwise "read" via protocols such as
+`ssh://` and `https://` can also operate on bundle files. It is
+possible linkgit:git-clone[1] a new repository from a bundle, to use
+linkgit:git-fetch[1] to fetch from one, and to list the references
+contained within it with linkgit:git-ls-remote[1]. There's no
+corresponding "write" support, i.e.a 'git push' into a bundle is not
+supported.
+
+See the "EXAMPLES" section below for examples of how to use bundles.
+
+BUNDLE FORMAT
+-------------
+
+Bundles are `.pack` files (see linkgit:git-pack-objects[1]) with a
+header indicating what references are contained within the bundle.
+
+Like the the packed archive format itself bundles can either be
+self-contained, or be created using exclusions.
+See the "OBJECT PREREQUISITES" section below.
+
+Bundles created using revision exclusions are "thin packs" created
+using the `--thin` option to linkgit:git-pack-objects[1], and
+unbundled using the `--fix-thin` option to linkgit:git-index-pack[1].
+
+There is no option to create a "thick pack" when using revision
+exclusions, and users should not be concerned about the difference. By
+using "thin packs", bundles created using exclusions are smaller in
+size. That they're "thin" under the hood is merely noted here as a
+curiosity, and as a reference to other documentation.
+
+See link:technical/bundle-format.html[the `bundle-format`
+documentation] for more details and the discussion of "thin pack" in
+link:technical/pack-format.html[the pack format documentation] for
+further details.
 
 OPTIONS
 -------
@@ -117,28 +144,88 @@ unbundle <file>::
 SPECIFYING REFERENCES
 ---------------------
 
-'git bundle' will only package references that are shown by
-'git show-ref': this includes heads, tags, and remote heads.  References
-such as `master~1` cannot be packaged, but are perfectly suitable for
-defining the basis.  More than one reference may be packaged, and more
-than one basis can be specified.  The objects packaged are those not
-contained in the union of the given bases.  Each basis can be
-specified explicitly (e.g. `^master~10`), or implicitly (e.g.
-`master~10..master`, `--since=10.days.ago master`).
+Revisions must be accompanied by reference names to be packaged in a
+bundle.
+
+More than one reference may be packaged, and more than one set of prerequisite objects can
+be specified.  The objects packaged are those not contained in the
+union of the prerequisites.
+
+The 'git bundle create' command resolves the reference names for you
+using the same rules as `git rev-parse --abbrev-ref=loose`. Each
+prerequisite can be specified explicitly (e.g. `^master~10`), or implicitly
+(e.g. `master~10..master`, `--since=10.days.ago master`).
+
+All of these simple cases are OK (assuming we have a "master" and
+"next" branch):
+
+----------------
+$ git bundle create master.bundle master
+$ echo master | git bundle create master.bundle --stdin
+$ git bundle create master-and-next.bundle master next
+$ (echo master; echo next) | git bundle create master-and-next.bundle --stdin
+----------------
+
+And so are these (and the same but omitted `--stdin` examples):
+
+----------------
+$ git bundle create recent-master.bundle master~10..master
+$ git bundle create recent-updates.bundle master~10..master next~5..next
+----------------
+
+A revision name or a range whose right-hand-side cannot be resolved to
+a reference is not accepted:
+
+----------------
+$ git bundle create HEAD.bundle $(git rev-parse HEAD)
+fatal: Refusing to create empty bundle.
+$ git bundle create master-yesterday.bundle master~10..master~5
+fatal: Refusing to create empty bundle.
+----------------
+
+OBJECT PREREQUISITES
+--------------------
+
+When creating bundles it is possible to create a self-contained bundle
+that can be unbundled in a repository with no common history, as well
+as providing negative revisions to exclude objects needed in the
+earlier parts of the history.
+
+Feeding a revision such as `new` to `git bundle create` will create a
+bundle file that contains all the objects reachable from the revision
+`new`. That bundle can be unbundled in any repository to obtain a full
+history that leads to the revision `new`:
+
+----------------
+$ git bundle create full.bundle new
+----------------
+
+A revision range such as `old..new` will produce a bundle file that
+will require the revision `old` (and any objects reachable from it)
+to exist for the bundle to be "unbundle"-able:
+
+----------------
+$ git bundle create full.bundle old..new
+----------------
+
+A self-contained bundle without any prerequisites can be extracted
+into anywhere, even into an empty repository, or be cloned from
+(i.e., `new`, but not `old..new`).
 
-It is very important that the basis used be held by the destination.
 It is okay to err on the side of caution, causing the bundle file
 to contain objects already in the destination, as these are ignored
 when unpacking at the destination.
 
-`git clone` can use any bundle created without negative refspecs
-(e.g., `new`, but not `old..new`).
 If you want to match `git clone --mirror`, which would include your
 refs such as `refs/remotes/*`, use `--all`.
 If you want to provide the same set of refs that a clone directly
 from the source repository would get, use `--branches --tags` for
 the `<git-rev-list-args>`.
 
+The 'git bundle verify' command can be used to check whether your
+recipient repository has the required prerequisite commits for a
+bundle.
+
 EXAMPLES
 --------
 
@@ -149,7 +236,7 @@ but we can move data from A to B via some mechanism (CD, email, etc.).
 We want to update R2 with development made on the branch master in R1.
 
 To bootstrap the process, you can first create a bundle that does not have
-any basis. You can use a tag to remember up to what commit you last
+any prerequisites. You can use a tag to remember up to what commit you last
 processed, in order to make it easy to later update the other repository
 with an incremental bundle:
 
@@ -200,7 +287,7 @@ machineB$ git pull
 
 If you know up to what commit the intended recipient repository should
 have the necessary objects, you can use that knowledge to specify the
-basis, giving a cut-off point to limit the revisions and objects that go
+prerequisites, giving a cut-off point to limit the revisions and objects that go
 in the resulting bundle. The previous example used the lastR2bundle tag
 for this purpose, but you can use any other options that you would give to
 the linkgit:git-log[1] command. Here are more examples:
@@ -211,7 +298,7 @@ You can use a tag that is present in both:
 $ git bundle create mybundle v1.0.0..master
 ----------------
 
-You can use a basis based on time:
+You can use a prerequisite based on time:
 
 ----------------
 $ git bundle create mybundle --since=10.days master
@@ -224,7 +311,7 @@ $ git bundle create mybundle -10 master
 ----------------
 
 You can run `git-bundle verify` to see if you can extract from a bundle
-that was created with a basis:
+that was created with a prerequisite:
 
 ----------------
 $ git bundle verify mybundle
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 4eb0421b3f..bef76f4dd0 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -9,8 +9,14 @@ git-cat-file - Provide content or type and size information for repository objec
 SYNOPSIS
 --------
 [verse]
-'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>
-'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]
+'git cat-file' <type> <object>
+'git cat-file' (-e | -p) <object>
+'git cat-file' (-t | -s) [--allow-unknown-type] <object>
+'git cat-file' (--batch | --batch-check) [--batch-all-objects]
+	     [--buffer] [--follow-symlinks] [--unordered]
+	     [--textconv | --filters]
+'git cat-file' (--textconv | --filters)
+	     [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
 
 DESCRIPTION
 -----------
@@ -94,8 +100,10 @@ OPTIONS
 	Instead of reading a list of objects on stdin, perform the
 	requested batch operation on all objects in the repository and
 	any alternate object stores (not just reachable objects).
-	Requires `--batch` or `--batch-check` be specified. Note that
-	the objects are visited in order sorted by their hashes.
+	Requires `--batch` or `--batch-check` be specified. By default,
+	the objects are visited in order sorted by their hashes; see
+	also `--unordered` below. Objects are presented as-is, without
+	respecting the "replace" mechanism of linkgit:git-replace[1].
 
 --buffer::
 	Normally batch output is flushed after each object is output, so
diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt
index 0c3924a63d..2892799e32 100644
--- a/Documentation/git-check-ignore.txt
+++ b/Documentation/git-check-ignore.txt
@@ -33,7 +33,7 @@ OPTIONS
 	Instead of printing the paths that are excluded, for each path
 	that matches an exclude pattern, print the exclude pattern
 	together with the path.  (Matching an exclude pattern usually
-	means the path is excluded, but if the pattern begins with '!'
+	means the path is excluded, but if the pattern begins with "`!`"
 	then it is a negated pattern and matching it means the path is
 	NOT excluded.)
 +
@@ -77,7 +77,7 @@ If `--verbose` is specified, the output is a series of lines of the form:
 <pathname> is the path of a file being queried, <pattern> is the
 matching pattern, <source> is the pattern's source file, and <linenum>
 is the line number of the pattern within that source.  If the pattern
-contained a `!` prefix or `/` suffix, it will be preserved in the
+contained a "`!`" prefix or "`/`" suffix, it will be preserved in the
 output.  <source> will be an absolute path when referring to the file
 configured by `core.excludesFile`, or relative to the repository root
 when referring to `.git/info/exclude` or a per-directory exclude file.
diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt
index 4d33e7be0f..01dbd5cbf5 100644
--- a/Documentation/git-checkout-index.txt
+++ b/Documentation/git-checkout-index.txt
@@ -12,6 +12,7 @@ SYNOPSIS
 'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
 		   [--stage=<number>|all]
 		   [--temp]
+		   [--ignore-skip-worktree-bits]
 		   [-z] [--stdin]
 		   [--] [<file>...]
 
@@ -37,8 +38,9 @@ OPTIONS
 
 -a::
 --all::
-	checks out all files in the index.  Cannot be used
-	together with explicit filenames.
+	checks out all files in the index except for those with the
+	skip-worktree bit set (see `--ignore-skip-worktree-bits`).
+	Cannot be used together with explicit filenames.
 
 -n::
 --no-create::
@@ -59,6 +61,10 @@ OPTIONS
 	write the content to temporary files.  The temporary name
 	associations will be written to stdout.
 
+--ignore-skip-worktree-bits::
+	Check out all files, including those with the skip-worktree bit
+	set.
+
 --stdin::
 	Instead of taking list of paths from the command line,
 	read list of paths from the standard input.  Paths are
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index b1a6fe4499..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>
 ------------
 +
@@ -118,8 +118,9 @@ OPTIONS
 -f::
 --force::
 	When switching branches, proceed even if the index or the
-	working tree differs from `HEAD`.  This is used to throw away
-	local changes.
+	working tree differs from `HEAD`, and even if there are untracked
+	files in the way.  This is used to throw away local changes and
+	any untracked files or directories that are in the way.
 +
 When checking out paths from the index, do not fail upon unmerged
 entries; instead, unmerged entries are ignored.
@@ -144,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.
 +
@@ -209,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
@@ -228,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
@@ -265,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::
@@ -340,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-column.txt b/Documentation/git-column.txt
index f58e9c43e6..6cea9ab463 100644
--- a/Documentation/git-column.txt
+++ b/Documentation/git-column.txt
@@ -39,7 +39,7 @@ OPTIONS
 --indent=<string>::
 	String to be printed at the beginning of each line.
 
---nl=<N>::
+--nl=<string>::
 	String to be printed at the end of each line,
 	including newline character.
 
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 95fec5f069..6c60bf98f9 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -212,8 +212,9 @@ include::signoff-option.txt[]
 	each trailer would appear, and other details.
 
 -n::
---no-verify::
-	This option bypasses the pre-commit and commit-msg hooks.
+--[no-]verify::
+	By default, the pre-commit and commit-msg hooks are run.
+	When any of `--no-verify` or `-n` is given, these are bypassed.
 	See also linkgit:githooks[5].
 
 --allow-empty::
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 5cddadafd2..bdcfd94b64 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
@@ -71,6 +71,10 @@ codes are:
 
 On success, the command returns the exit code 0.
 
+A list of all available configuration variables can be obtained using the
+`git help --config` command.
+
+[[OPTIONS]]
 OPTIONS
 -------
 
@@ -98,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
@@ -137,15 +141,25 @@ from all available files.
 See also <<FILES>>.
 
 --worktree::
-	Similar to `--local` except that `.git/config.worktree` is
+	Similar to `--local` except that `$GIT_DIR/config.worktree` is
 	read from or written to if `extensions.worktreeConfig` is
-	present. If not it's the same as `--local`.
-
--f config-file::
---file config-file::
-	Use the given config file instead of the one specified by GIT_CONFIG.
+	enabled. If not it's the same as `--local`. Note that `$GIT_DIR`
+	is equal to `$GIT_COMMON_DIR` for the main working tree, but is of
+	the form `$GIT_DIR/worktrees/<id>/` for other working trees. See
+	linkgit:git-worktree[1] to learn how to enable
+	`extensions.worktreeConfig`.
+
+-f <config-file>::
+--file <config-file>::
+	For writing options: write to the specified file rather than the
+	repository `.git/config`.
++
+For reading options: read only from the specified file rather than from all
+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"
@@ -236,18 +250,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
@@ -325,21 +339,14 @@ All writing options will per default write to the repository specific
 configuration file. Note that this also affects options like `--replace-all`
 and `--unset`. *'git config' will only ever change one file at a time*.
 
-You can override these rules either by command-line options or by environment
-variables. The `--global`, `--system` and `--worktree` options will limit
-the file used to the global, system-wide or per-worktree file respectively.
-The `GIT_CONFIG` environment variable has a similar effect, but you
-can specify any filename you want.
+You can override these rules using the `--global`, `--system`,
+`--local`, `--worktree`, and `--file` command-line options; see
+<<OPTIONS>> above.
 
 
 ENVIRONMENT
 -----------
 
-GIT_CONFIG::
-	Take the configuration from the given file instead of .git/config.
-	Using the "--global" option forces this to ~/.gitconfig. Using the
-	"--system" option forces this to $(prefix)/etc/gitconfig.
-
 GIT_CONFIG_GLOBAL::
 GIT_CONFIG_SYSTEM::
 	Take the configuration from the given files instead from global or
@@ -367,6 +374,12 @@ This is useful for cases where you want to spawn multiple git commands
 with a common configuration but cannot depend on a configuration file,
 for example when writing scripts.
 
+GIT_CONFIG::
+	If no `--file` option is provided to `git config`, use the file
+	given by `GIT_CONFIG` as if it were provided via `--file`. This
+	variable has no effect on other Git commands, and is mostly for
+	historical compatibility; there is generally no reason to use it
+	instead of the `--file` option.
 
 [[EXAMPLES]]
 EXAMPLES
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-cvsserver.txt b/Documentation/git-cvsserver.txt
index f2e4a47ebe..4dc57ed254 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -99,7 +99,7 @@ looks like
 
 ------
 
-Only anonymous access is provided by pserve by default. To commit you
+Only anonymous access is provided by pserver by default. To commit you
 will have to create pserver accounts, simply add a gitcvs.authdb
 setting in the config file of the repositories you want the cvsserver
 to allow writes to, for example:
@@ -114,21 +114,20 @@ The format of these files is username followed by the encrypted password,
 for example:
 
 ------
-   myuser:$1Oyx5r9mdGZ2
-   myuser:$1$BA)@$vbnMJMDym7tA32AamXrm./
+   myuser:sqkNi8zPf01HI
+   myuser:$1$9K7FzU28$VfF6EoPYCJEYcVQwATgOP/
+   myuser:$5$.NqmNH1vwfzGpV8B$znZIcumu1tNLATgV2l6e1/mY8RzhUDHMOaVOeL1cxV3
 ------
 You can use the 'htpasswd' facility that comes with Apache to make these
-files, but Apache's MD5 crypt method differs from the one used by most C
-library's crypt() function, so don't use the -m option.
+files, but only with the -d option (or -B if your system suports it).
 
-Alternatively you can produce the password with perl's crypt() operator:
------
-   perl -e 'my ($user, $pass) = @ARGV; printf "%s:%s\n", $user, crypt($user, $pass)' $USER password
------
+Preferably use the system specific utility that manages password hash
+creation in your platform (e.g. mkpasswd in Linux, encrypt in OpenBSD or
+pwhash in NetBSD) and paste it in the right location.
 
 Then provide your password via the pserver method, for example:
 ------
-   cvs -d:pserver:someuser:somepassword <at> server/path/repo.git co <HEAD_name>
+   cvs -d:pserver:someuser:somepassword@server:/path/repo.git co <HEAD_name>
 ------
 No special setup is needed for SSH access, other than having Git tools
 in the PATH. If you have clients that do not accept the CVS_SERVER
@@ -138,7 +137,7 @@ Note: Newer CVS versions (>= 1.12.11) also support specifying
 CVS_SERVER directly in CVSROOT like
 
 ------
-cvs -d ":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git" co <HEAD_name>
+   cvs -d ":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git" co <HEAD_name>
 ------
 This has the advantage that it will be saved in your 'CVS/Root' files and
 you don't need to worry about always setting the correct environment
@@ -186,8 +185,8 @@ allowing access over SSH.
 +
 --
 ------
-     export CVSROOT=:ext:user@server:/var/git/project.git
-     export CVS_SERVER="git cvsserver"
+   export CVSROOT=:ext:user@server:/var/git/project.git
+   export CVS_SERVER="git cvsserver"
 ------
 --
 4. For SSH clients that will make commits, make sure their server-side
@@ -203,7 +202,7 @@ allowing access over SSH.
    `project-master` directory:
 +
 ------
-     cvs co -d project-master master
+   cvs co -d project-master master
 ------
 
 [[dbbackend]]
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-diff.txt b/Documentation/git-diff.txt
index 7f4c8a8ce7..6236c75c9b 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -51,16 +51,20 @@ files on disk.
 	--staged is a synonym of --cached.
 +
 If --merge-base is given, instead of using <commit>, use the merge base
-of <commit> and HEAD.  `git diff --merge-base A` is equivalent to
-`git diff $(git merge-base A HEAD)`.
+of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to
+`git diff --cached $(git merge-base A HEAD)`.
 
-'git diff' [<options>] <commit> [--] [<path>...]::
+'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]::
 
 	This form is to view the changes you have in your
 	working tree relative to the named <commit>.  You can
 	use HEAD to compare it with the latest commit, or a
 	branch name to compare with the tip of a different
 	branch.
++
+If --merge-base is given, instead of using <commit>, use the merge base
+of <commit> and HEAD.  `git diff --merge-base A` is equivalent to
+`git diff $(git merge-base A HEAD)`.
 
 'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]::
 
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 9067c2079e..550c16ca61 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -133,7 +133,7 @@ remember to run that, set `fetch.prune` globally, or
 linkgit:git-config[1].
 
 Here's where things get tricky and more specific. The pruning feature
-doesn't actually care about branches, instead it'll prune local <->
+doesn't actually care about branches, instead it'll prune local <-->
 remote-references as a function of the refspec of the remote (see
 `<refspec>` and <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> above).
 
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-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index 2ae2478de7..6da899c629 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -235,6 +235,15 @@ and `date` to extract the named component.  For email fields (`authoremail`,
 without angle brackets, and `:localpart` to get the part before the `@` symbol
 out of the trimmed email.
 
+The raw data in an object is `raw`.
+
+raw:size::
+	The raw data size of the object.
+
+Note that `--format=%(raw)` can not be used with `--python`, `--shell`, `--tcl`,
+because such language may not support arbitrary binary data in their string
+variable type.
+
 The message in a commit or a tag object is `contents`, from which
 `contents:<part>` can be used to extract various parts out of:
 
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index fe2f69d36e..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.
@@ -689,10 +693,10 @@ You can also use `git format-patch --base=P -3 C` to generate patches
 for A, B and C, and the identifiers for P, X, Y, Z are appended at the
 end of the first message.
 
-If set `--base=auto` in cmdline, it will track base commit automatically,
-the base commit will be the merge base of tip commit of the remote-tracking
+If set `--base=auto` in cmdline, it will automatically compute
+the base commit as the merge base of tip commit of the remote-tracking
 branch and revision-range specified in cmdline.
-For a local branch, you need to track a remote branch by `git branch
+For a local branch, you need to make it to track a remote branch by `git branch
 --set-upstream-to` before using this option.
 
 EXAMPLES
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 44fe8860b3..44ea63cc6d 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -8,13 +8,15 @@ git-help - Display help information about Git
 SYNOPSIS
 --------
 [verse]
-'git help' [-a|--all [--[no-]verbose]] [-g|--guides]
-	   [-i|--info|-m|--man|-w|--web] [COMMAND|GUIDE]
+'git help' [-a|--all [--[no-]verbose]]
+	   [[-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.
 
@@ -31,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.
@@ -58,8 +60,7 @@ OPTIONS
 
 -g::
 --guides::
-	Prints a list of the Git concept guides on the standard output. This
-	option overrides any given command or guide name.
+	Prints a list of the Git concept guides on the standard output.
 
 -i::
 --info::
diff --git a/Documentation/git-hook.txt b/Documentation/git-hook.txt
new file mode 100644
index 0000000000..77c3a8ad90
--- /dev/null
+++ b/Documentation/git-hook.txt
@@ -0,0 +1,45 @@
+git-hook(1)
+===========
+
+NAME
+----
+git-hook - Run git hooks
+
+SYNOPSIS
+--------
+[verse]
+'git hook' run [--ignore-missing] <hook-name> [-- <hook-args>]
+
+DESCRIPTION
+-----------
+
+A command interface to running git hooks (see linkgit:githooks[5]),
+for use by other scripted git commands.
+
+SUBCOMMANDS
+-----------
+
+run::
+	Run the `<hook-name>` hook. See linkgit:githooks[5] for
+	supported hook names.
++
+
+Any positional arguments to the hook should be passed after a
+mandatory `--` (or `--end-of-options`, see linkgit:gitcli[7]). See
+linkgit:githooks[5] for arguments hooks might expect (if any).
+
+OPTIONS
+-------
+
+--ignore-missing::
+	Ignore any missing hook by quietly returning zero. Used for
+	tools that want to do a blind one-shot run of a hook that may
+	or may not be present.
+
+SEE ALSO
+--------
+linkgit:githooks[5]
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt
index 558966aa83..0c5c0dde19 100644
--- a/Documentation/git-http-backend.txt
+++ b/Documentation/git-http-backend.txt
@@ -16,7 +16,9 @@ A simple CGI program to serve the contents of a Git repository to Git
 clients accessing the repository over http:// and https:// protocols.
 The program supports clients fetching using both the smart HTTP protocol
 and the backwards-compatible dumb HTTP protocol, as well as clients
-pushing using the smart HTTP protocol.
+pushing using the smart HTTP protocol. It also supports Git's
+more-efficient "v2" protocol if properly configured; see the
+discussion of `GIT_PROTOCOL` in the ENVIRONMENT section below.
 
 It verifies that the directory has the magic file
 "git-daemon-export-ok", and it will refuse to export any Git directory
@@ -77,6 +79,18 @@ Apache 2.x::
 SetEnv GIT_PROJECT_ROOT /var/www/git
 SetEnv GIT_HTTP_EXPORT_ALL
 ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/
+
+# This is not strictly necessary using Apache and a modern version of
+# git-http-backend, as the webserver will pass along the header in the
+# environment as HTTP_GIT_PROTOCOL, and http-backend will copy that into
+# GIT_PROTOCOL. But you may need this line (or something similar if you
+# are using a different webserver), or if you want to support older Git
+# versions that did not do that copying.
+#
+# Having the webserver set up GIT_PROTOCOL is perfectly fine even with
+# modern versions (and will take precedence over HTTP_GIT_PROTOCOL,
+# which means it can be used to override the client's request).
+SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0
 ----------------------------------------------------------------
 +
 To enable anonymous read access but authenticated write access,
@@ -264,6 +278,16 @@ a repository with an extremely large number of refs.  The value can be
 specified with a unit (e.g., `100M` for 100 megabytes). The default is
 10 megabytes.
 
+Clients may probe for optional protocol capabilities (like the v2
+protocol) using the `Git-Protocol` HTTP header. In order to support
+these, the contents of that header must appear in the `GIT_PROTOCOL`
+environment variable. Most webservers will pass this header to the CGI
+via the `HTTP_GIT_PROTOCOL` variable, and `git-http-backend` will
+automatically copy that to `GIT_PROTOCOL`. However, some webservers may
+be more selective about which headers they'll pass, in which case they
+need to be configured explicitly (see the mention of `Git-Protocol` in
+the Apache config from the earlier EXAMPLES section).
+
 The backend process sets GIT_COMMITTER_NAME to '$REMOTE_USER' and
 GIT_COMMITTER_EMAIL to '$\{REMOTE_USER}@http.$\{REMOTE_ADDR\}',
 ensuring that any reflogs created by 'git-receive-pack' contain some
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-index-pack.txt b/Documentation/git-index-pack.txt
index 7fa74b9e79..1f1e359225 100644
--- a/Documentation/git-index-pack.txt
+++ b/Documentation/git-index-pack.txt
@@ -82,6 +82,12 @@ OPTIONS
 --strict::
 	Die, if the pack contains broken objects or links.
 
+--progress-title::
+	For internal use only.
++
+Set the title of the progress bar. The title is "Receiving objects" by
+default and "Indexing objects" when `--stdin` is specified.
+
 --check-self-contained-and-connected::
 	Die if the pack contains broken links. For internal use only.
 
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-maintenance.txt b/Documentation/git-maintenance.txt
index 1e738ad398..e2cfb68ab5 100644
--- a/Documentation/git-maintenance.txt
+++ b/Documentation/git-maintenance.txt
@@ -179,6 +179,17 @@ OPTIONS
 	`maintenance.<task>.enabled` configured as `true` are considered.
 	See the 'TASKS' section for the list of accepted `<task>` values.
 
+--scheduler=auto|crontab|systemd-timer|launchctl|schtasks::
+	When combined with the `start` subcommand, specify the scheduler
+	for running the hourly, daily and weekly executions of
+	`git maintenance run`.
+	Possible values for `<scheduler>` are `auto`, `crontab`
+	(POSIX), `systemd-timer` (Linux), `launchctl` (macOS), and
+	`schtasks` (Windows). When `auto` is specified, the
+	appropriate platform-specific scheduler is used; on Linux,
+	`systemd-timer` is used if available, otherwise
+	`crontab`. Default is `auto`.
+
 
 TROUBLESHOOTING
 ---------------
@@ -277,6 +288,52 @@ schedule to ensure you are executing the correct binaries in your
 schedule.
 
 
+BACKGROUND MAINTENANCE ON LINUX SYSTEMD SYSTEMS
+-----------------------------------------------
+
+While Linux supports `cron`, depending on the distribution, `cron` may
+be an optional package not necessarily installed. On modern Linux
+distributions, systemd timers are superseding it.
+
+If user systemd timers are available, they will be used as a replacement
+of `cron`.
+
+In this case, `git maintenance start` will create user systemd timer units
+and start the timers. The current list of user-scheduled tasks can be found
+by running `systemctl --user list-timers`. The timers written by `git
+maintenance start` are similar to this:
+
+-----------------------------------------------------------------------
+$ systemctl --user list-timers
+NEXT                         LEFT          LAST                         PASSED     UNIT                         ACTIVATES
+Thu 2021-04-29 19:00:00 CEST 42min left    Thu 2021-04-29 18:00:11 CEST 17min ago  git-maintenance@hourly.timer git-maintenance@hourly.service
+Fri 2021-04-30 00:00:00 CEST 5h 42min left Thu 2021-04-29 00:00:11 CEST 18h ago    git-maintenance@daily.timer  git-maintenance@daily.service
+Mon 2021-05-03 00:00:00 CEST 3 days left   Mon 2021-04-26 00:00:11 CEST 3 days ago git-maintenance@weekly.timer git-maintenance@weekly.service
+-----------------------------------------------------------------------
+
+One timer is registered for each `--schedule=<frequency>` option.
+
+The definition of the systemd units can be inspected in the following files:
+
+-----------------------------------------------------------------------
+~/.config/systemd/user/git-maintenance@.timer
+~/.config/systemd/user/git-maintenance@.service
+~/.config/systemd/user/timers.target.wants/git-maintenance@hourly.timer
+~/.config/systemd/user/timers.target.wants/git-maintenance@daily.timer
+~/.config/systemd/user/timers.target.wants/git-maintenance@weekly.timer
+-----------------------------------------------------------------------
+
+`git maintenance start` will overwrite these files and start the timer
+again with `systemctl --user`, so any customization should be done by
+creating a drop-in file, i.e. a `.conf` suffixed file in the
+`~/.config/systemd/user/git-maintenance@.service.d` directory.
+
+`git maintenance stop` will stop the user systemd timers and delete
+the above mentioned files.
+
+For more details, see `systemd.timer(5)`.
+
+
 BACKGROUND MAINTENANCE ON MACOS SYSTEMS
 ---------------------------------------
 
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 3819fadac1..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
@@ -61,6 +62,8 @@ merge has resulted in conflicts.
 
 OPTIONS
 -------
+:git-merge: 1
+
 include::merge-options.txt[]
 
 -m <msg>::
@@ -74,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
@@ -238,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.
@@ -259,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-mktree.txt b/Documentation/git-mktree.txt
index 27fe2b32e1..76b44f4da1 100644
--- a/Documentation/git-mktree.txt
+++ b/Documentation/git-mktree.txt
@@ -31,7 +31,7 @@ OPTIONS
 
 --batch::
 	Allow building of more than one tree object before exiting.  Each
-	tree is separated by as single blank line. The final new-line is
+	tree is separated by a single blank line. The final new-line is
 	optional.  Note - if the `-z` option is used, lines are terminated
 	with NUL.
 
diff --git a/Documentation/git-multi-pack-index.txt b/Documentation/git-multi-pack-index.txt
index ffd601bc17..c588fb91af 100644
--- a/Documentation/git-multi-pack-index.txt
+++ b/Documentation/git-multi-pack-index.txt
@@ -9,8 +9,7 @@ git-multi-pack-index - Write and verify multi-pack-indexes
 SYNOPSIS
 --------
 [verse]
-'git multi-pack-index' [--object-dir=<dir>] [--[no-]progress]
-	[--preferred-pack=<pack>] <subcommand>
+'git multi-pack-index' [--object-dir=<dir>] [--[no-]bitmap] <sub-command>
 
 DESCRIPTION
 -----------
@@ -23,10 +22,13 @@ OPTIONS
 	Use given directory for the location of Git objects. We check
 	`<dir>/packs/multi-pack-index` for the current MIDX file, and
 	`<dir>/packs` for the pack-files to index.
++
+`<dir>` must be an alternate of the current repository.
 
 --[no-]progress::
 	Turn progress on/off explicitly. If neither is specified, progress is
-	shown if standard error is connected to a terminal.
+	shown if standard error is connected to a terminal. Supported by
+	sub-commands `write`, `verify`, `expire`, and `repack.
 
 The following subcommands are available:
 
@@ -37,9 +39,31 @@ write::
 --
 	--preferred-pack=<pack>::
 		Optionally specify the tie-breaking pack used when
-		multiple packs contain the same object. If not given,
-		ties are broken in favor of the pack with the lowest
-		mtime.
+		multiple packs contain the same object. `<pack>` must
+		contain at least one object. If not given, ties are
+		broken in favor of the pack with the lowest mtime.
+
+	--[no-]bitmap::
+		Control whether or not a multi-pack bitmap is written.
+
+	--stdin-packs::
+		Write a multi-pack index containing only the set of
+		line-delimited pack index basenames provided over stdin.
+
+	--refs-snapshot=<path>::
+		With `--bitmap`, optionally specify a file which
+		contains a "refs snapshot" taken prior to repacking.
++
+A reference snapshot is composed of line-delimited OIDs corresponding to
+the reference tips, usually taken by `git repack` prior to generating a
+new pack. A line may optionally start with a `+` character to indicate
+that the reference which corresponds to that OID is "preferred" (see
+linkgit:git-config[1]'s `pack.preferBitmapTips`.)
++
+The file given at `<path>` is expected to be readable, and can contain
+duplicates. (If a given OID is given more than once, it is marked as
+preferred if at least one instance of it begins with the special `+`
+marker).
 --
 
 verify::
@@ -75,19 +99,26 @@ associated `.keep` file will not be selected for the batch to repack.
 EXAMPLES
 --------
 
-* Write a MIDX file for the packfiles in the current .git folder.
+* Write a MIDX file for the packfiles in the current `.git` directory.
 +
 -----------------------------------------------
 $ git multi-pack-index write
 -----------------------------------------------
 
+* Write a MIDX file for the packfiles in the current `.git` directory with a
+corresponding bitmap.
++
+-------------------------------------------------------------
+$ git multi-pack-index write --preferred-pack=<pack> --bitmap
+-------------------------------------------------------------
+
 * Write a MIDX file for the packfiles in an alternate object store.
 +
 -----------------------------------------------
 $ git multi-pack-index --object-dir <alt> write
 -----------------------------------------------
 
-* Verify the MIDX file for the packfiles in the current .git folder.
+* Verify the MIDX file for the packfiles in the current `.git` directory.
 +
 -----------------------------------------------
 $ git multi-pack-index verify
diff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.txt
index 5cb0eb0855..ec8a27ce8b 100644
--- a/Documentation/git-name-rev.txt
+++ b/Documentation/git-name-rev.txt
@@ -42,11 +42,37 @@ OPTIONS
 --all::
 	List all commits reachable from all refs
 
---stdin::
+--annotate-stdin::
 	Transform stdin by substituting all the 40-character SHA-1
 	hexes (say $hex) with "$hex ($rev_name)".  When used with
 	--name-only, substitute with "$rev_name", omitting $hex
-	altogether.  Intended for the scripter's use.
+	altogether.
++
+For example:
++
+-----------
+$ cat sample.txt
+
+An abbreviated revision 2ae0a9cb82 will not be substituted.
+The full name after substitution is 2ae0a9cb8298185a94e5998086f380a355dd8907,
+while its tree object is 70d105cc79e63b81cfdcb08a15297c23e60b07ad
+
+$ git name-rev --annotate-stdin <sample.txt
+
+An abbreviated revision 2ae0a9cb82 will not be substituted.
+The full name after substitution is 2ae0a9cb8298185a94e5998086f380a355dd8907 (master),
+while its tree object is 70d105cc79e63b81cfdcb08a15297c23e60b07ad
+
+$ git name-rev --name-only --annotate-stdin <sample.txt
+
+An abbreviated revision 2ae0a9cb82 will not be substituted.
+The full name after substitution is master,
+while its tree object is 70d105cc79e63b81cfdcb08a15297c23e60b07ad
+-----------
+
+--stdin::
+	This option is deprecated in favor of 'git name-rev --annotate-stdin'.
+	They are functionally equivalent.
 
 --name-only::
 	Instead of printing both the SHA-1 and the name, print only
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-pull.txt b/Documentation/git-pull.txt
index 5c3fb67c01..0e14f8b5b2 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -15,14 +15,17 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-Incorporates changes from a remote repository into the current
-branch.  In its default mode, `git pull` is shorthand for
-`git fetch` followed by `git merge FETCH_HEAD`.
-
-More precisely, 'git pull' runs 'git fetch' with the given
-parameters and calls 'git merge' to merge the retrieved branch
-heads into the current branch.
-With `--rebase`, it runs 'git rebase' instead of 'git merge'.
+Incorporates changes from a remote repository into the current branch.
+If the current branch is behind the remote, then by default it will
+fast-forward the current branch to match the remote.  If the current
+branch and the remote have diverged, the user needs to specify how to
+reconcile the divergent branches with `--rebase` or `--no-rebase` (or
+the corresponding configuration option in `pull.rebase`).
+
+More precisely, `git pull` runs `git fetch` with the given parameters
+and then depending on configuration options or command line flags,
+will call either `git rebase` or `git merge` to reconcile diverging
+branches.
 
 <repository> should be the name of a remote repository as
 passed to linkgit:git-fetch[1].  <refspec> can name an
@@ -102,7 +105,7 @@ Options related to merging
 include::merge-options.txt[]
 
 -r::
---rebase[=false|true|merges|preserve|interactive]::
+--rebase[=false|true|merges|interactive]::
 	When true, rebase the current branch on top of the upstream
 	branch after fetching. If there is a remote-tracking branch
 	corresponding to the upstream branch and the upstream branch
@@ -113,11 +116,7 @@ When set to `merges`, rebase using `git rebase --rebase-merges` so that
 the local merge commits are included in the rebase (see
 linkgit:git-rebase[1] for details).
 +
-When set to `preserve` (deprecated in favor of `merges`), rebase with the
-`--preserve-merges` option passed to `git rebase` so that locally created
-merge commits will not be flattened.
-+
-When false, merge the current branch into the upstream branch.
+When false, merge the upstream branch into the current branch.
 +
 When `interactive`, enable the interactive mode of rebase.
 +
@@ -132,7 +131,7 @@ published that history already.  Do *not* use this option
 unless you have read linkgit:git-rebase[1] carefully.
 
 --no-rebase::
-	Override earlier --rebase.
+	This is shorthand for --rebase=false.
 
 Options related to fetching
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 5fa8bab64c..8c3aceb832 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -10,8 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git read-tree' [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>]
-		[-u [--exclude-per-directory=<gitignore>] | -i]]
-		[--index-output=<file>] [--no-sparse-checkout]
+		[-u | -i]] [--index-output=<file>] [--no-sparse-checkout]
 		(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])
 
 
@@ -39,8 +38,9 @@ OPTIONS
 
 --reset::
 	Same as -m, except that unmerged entries are discarded instead
-	of failing. When used with `-u`, updates leading to loss of
-	working tree changes will not abort the operation.
+	of failing.  When used with `-u`, updates leading to loss of
+	working tree changes or untracked files or directories will not
+	abort the operation.
 
 -u::
 	After a successful merge, update the files in the work
@@ -88,21 +88,6 @@ OPTIONS
 	The command will refuse to overwrite entries that already
 	existed in the original index file.
 
---exclude-per-directory=<gitignore>::
-	When running the command with `-u` and `-m` options, the
-	merge result may need to overwrite paths that are not
-	tracked in the current branch.  The command usually
-	refuses to proceed with the merge to avoid losing such a
-	path.  However this safety valve sometimes gets in the
-	way.  For example, it often happens that the other
-	branch added a file that used to be a generated file in
-	your branch, and the safety valve triggers when you try
-	to switch to that branch after you ran `make` but before
-	running `make clean` to remove the generated file.  This
-	option tells the command to read per-directory exclude
-	file (usually '.gitignore') and allows such an untracked
-	but explicitly ignored file to be overwritten.
-
 --index-output=<file>::
 	Instead of writing the results out to `$GIT_INDEX_FILE`,
 	write the resulting index in the named file.  While the
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 55af6fd24e..9da4647061 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -79,9 +79,10 @@ remain the checked-out branch.
 
 If the upstream branch already contains a change you have made (e.g.,
 because you mailed a patch which was applied upstream), then that commit
-will be skipped. For example, running `git rebase master` on the
-following history (in which `A'` and `A` introduce the same set of changes,
-but have different committer information):
+will be skipped and warnings will be issued (if the `merge` backend is
+used).  For example, running `git rebase master` on the following
+history (in which `A'` and `A` introduce the same set of changes, but
+have different committer information):
 
 ------------
           A---B---C topic
@@ -312,7 +313,10 @@ See also INCOMPATIBLE OPTIONS below.
 By default (or if `--no-reapply-cherry-picks` is given), these commits
 will be automatically dropped.  Because this necessitates reading all
 upstream commits, this can be expensive in repos with a large number
-of upstream commits that need to be read.
+of upstream commits that need to be read.  When using the `merge`
+backend, warnings will be issued for each dropped commit (unless
+`--quiet` is given). Advice will also be issued unless
+`advice.skippedCherryPicks` is set to false (see linkgit:git-config[1]).
 +
 `--reapply-cherry-picks` allows rebase to forgo reading all upstream
 commits, potentially improving performance.
@@ -340,9 +344,7 @@ See also INCOMPATIBLE OPTIONS below.
 
 -m::
 --merge::
-	Use merging strategies to rebase.  When the recursive (default) merge
-	strategy is used, this allows rebase to be aware of renames on the
-	upstream side.  This is the default.
+	Using merging strategies to rebase (default).
 +
 Note that a rebase merge works by replaying each commit from the working
 branch on top of the <upstream> branch.  Because of this, when a merge
@@ -354,9 +356,8 @@ See also INCOMPATIBLE OPTIONS below.
 
 -s <strategy>::
 --strategy=<strategy>::
-	Use the given merge strategy.
-	If there is no `-s` option 'git merge-recursive' is used
-	instead.  This implies --merge.
+	Use the given merge strategy, instead of the default `ort`.
+	This implies `--merge`.
 +
 Because 'git rebase' replays each commit from the working branch
 on top of the <upstream> branch using the given strategy, using
@@ -369,7 +370,7 @@ See also INCOMPATIBLE OPTIONS below.
 --strategy-option=<strategy-option>::
 	Pass the <strategy-option> through to the merge strategy.
 	This implies `--merge` and, if no strategy has been
-	specified, `-s recursive`.  Note the reversal of 'ours' and
+	specified, `-s ort`.  Note the reversal of 'ours' and
 	'theirs' as noted above for the `-m` option.
 +
 See also INCOMPATIBLE OPTIONS below.
@@ -445,7 +446,8 @@ When --fork-point is active, 'fork_point' will be used instead of
 ends up being empty, the <upstream> will be used as a fallback.
 +
 If <upstream> is given on the command line, then the default is
-`--no-fork-point`, otherwise the default is `--fork-point`.
+`--no-fork-point`, otherwise the default is `--fork-point`. See also
+`rebase.forkpoint` in linkgit:git-config[1].
 +
 If your branch was based on <upstream> but <upstream> was rewound and
 your branch contains commits which were dropped, this option can be used
@@ -525,29 +527,12 @@ i.e. commits that would be excluded by linkgit:git-log[1]'s
 the `rebase-cousins` mode is turned on, such commits are instead rebased
 onto `<upstream>` (or `<onto>`, if specified).
 +
-The `--rebase-merges` mode is similar in spirit to the deprecated
-`--preserve-merges` but works with interactive rebases,
-where commits can be reordered, inserted and dropped at will.
-+
 It is currently only possible to recreate the merge commits using the
-`recursive` merge strategy; Different merge strategies can be used only via
+`ort` merge strategy; different merge strategies can be used only via
 explicit `exec git merge -s <strategy> [...]` commands.
 +
 See also REBASING MERGES and INCOMPATIBLE OPTIONS below.
 
--p::
---preserve-merges::
-	[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits
-	instead of flattening the history by replaying commits a merge commit
-	introduces. Merge conflict resolutions or manual amendments to merge
-	commits are not preserved.
-+
-This uses the `--interactive` machinery internally, but combining it
-with the `--interactive` option explicitly is generally not a good
-idea unless you know what you are doing (see BUGS below).
-+
-See also INCOMPATIBLE OPTIONS below.
-
 -x <cmd>::
 --exec <cmd>::
 	Append "exec <cmd>" after each line creating a commit in the
@@ -579,9 +564,6 @@ See also INCOMPATIBLE OPTIONS below.
 	the root commit(s) on a branch.  When used with --onto, it
 	will skip changes already contained in <newbase> (instead of
 	<upstream>) whereas without --onto it will operate on every change.
-	When used together with both --onto and --preserve-merges,
-	'all' root commits will be rewritten to have <newbase> as parent
-	instead.
 +
 See also INCOMPATIBLE OPTIONS below.
 
@@ -643,7 +625,6 @@ are incompatible with the following options:
  * --allow-empty-message
  * --[no-]autosquash
  * --rebase-merges
- * --preserve-merges
  * --interactive
  * --exec
  * --no-keep-empty
@@ -654,13 +635,6 @@ are incompatible with the following options:
 
 In addition, the following pairs of options are incompatible:
 
- * --preserve-merges and --interactive
- * --preserve-merges and --signoff
- * --preserve-merges and --rebase-merges
- * --preserve-merges and --empty=
- * --preserve-merges and --ignore-whitespace
- * --preserve-merges and --committer-date-is-author-date
- * --preserve-merges and --ignore-date
  * --keep-base and --onto
  * --keep-base and --root
  * --fork-point and --root
@@ -740,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.
@@ -1219,12 +1193,16 @@ successful merge so that the user can edit the message.
 If a `merge` command fails for any reason other than merge conflicts (i.e.
 when the merge operation did not even start), it is rescheduled immediately.
 
-At this time, the `merge` command will *always* use the `recursive`
-merge strategy for regular merges, and `octopus` for octopus merges,
-with no way to choose a different one. To work around
-this, an `exec` command can be used to call `git merge` explicitly,
-using the fact that the labels are worktree-local refs (the ref
-`refs/rewritten/onto` would correspond to the label `onto`, for example).
+By default, the `merge` command will use the `ort` merge strategy for
+regular merges, and `octopus` for octopus merges.  One can specify a
+default strategy for all merges using the `--strategy` argument when
+invoking rebase, or can override specific merges in the interactive
+list of commands by using an `exec` command to call `git merge`
+explicitly with a `--strategy` argument.  Note that when calling `git
+merge` explicitly like this, you can make use of the fact that the
+labels are worktree-local refs (the ref `refs/rewritten/onto` would
+correspond to the label `onto`, for example) in order to refer to the
+branches you want to merge.
 
 Note: the first command (`label onto`) labels the revision onto which
 the commits are rebased; The name `onto` is just a convention, as a nod
@@ -1274,29 +1252,6 @@ CONFIGURATION
 include::config/rebase.txt[]
 include::config/sequencer.txt[]
 
-BUGS
-----
-The todo list presented by the deprecated `--preserve-merges --interactive`
-does not represent the topology of the revision graph (use `--rebase-merges`
-instead).  Editing commits and rewording their commit messages should work
-fine, but attempts to reorder commits tend to produce counterintuitive results.
-Use `--rebase-merges` in such scenarios instead.
-
-For example, an attempt to rearrange
-------------
-1 --- 2 --- 3 --- 4 --- 5
-------------
-to
-------------
-1 --- 2 --- 4 --- 3 --- 5
-------------
-by moving the "pick 4" line will result in the following history:
-------------
-	3
-       /
-1 --- 2 --- 4 --- 5
-------------
-
 GIT
 ---
 Part of the linkgit:git[1] suite
diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt
index 25702ed730..014a78409b 100644
--- a/Documentation/git-receive-pack.txt
+++ b/Documentation/git-receive-pack.txt
@@ -41,6 +41,11 @@ OPTIONS
 <directory>::
 	The repository to sync into.
 
+--http-backend-info-refs::
+	Used by linkgit:git-http-backend[1] to serve up
+	`$GIT_URL/info/refs?service=git-receive-pack` requests. See
+	`--http-backend-info-refs` in linkgit:git-upload-pack[1].
+
 PRE-RECEIVE HOOK
 ----------------
 Before any ref is updated, if $GIT_DIR/hooks/pre-receive file exists
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 24c00c9384..ee30edc178 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -9,7 +9,7 @@ git-repack - Pack unpacked objects in a repository
 SYNOPSIS
 --------
 [verse]
-'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]
+'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>] [--write-midx]
 
 DESCRIPTION
 -----------
@@ -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
@@ -128,10 +129,11 @@ depth is 4095.
 -b::
 --write-bitmap-index::
 	Write a reachability bitmap index as part of the repack. This
-	only makes sense when used with `-a` or `-A`, as the bitmaps
+	only makes sense when used with `-a`, `-A` or `-m`, as the bitmaps
 	must be able to refer to all reachable objects. This option
-	overrides the setting of `repack.writeBitmaps`.  This option
-	has no effect if multiple packfiles are created.
+	overrides the setting of `repack.writeBitmaps`. This option
+	has no effect if multiple packfiles are created, unless writing a
+	MIDX (in which case a multi-pack bitmap is created).
 
 --pack-kept-objects::
 	Include objects in `.keep` files when repacking.  Note that we
@@ -189,6 +191,15 @@ this "roll-up", without respect to their reachability. This is subject
 to change in the future. This option (implying a drastically different
 repack mode) is not guaranteed to work with all other combinations of
 option to `git repack`.
++
+When writing a multi-pack bitmap, `git repack` selects the largest resulting
+pack as the preferred pack for object selection by the MIDX (see
+linkgit:git-multi-pack-index[1]).
+
+-m::
+--write-midx::
+	Write a multi-pack index (see linkgit:git-multi-pack-index[1])
+	containing the non-redundant packs.
 
 CONFIGURATION
 -------------
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-reset.txt b/Documentation/git-reset.txt
index 252e2d4e47..6f7685f53d 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -69,7 +69,8 @@ linkgit:git-add[1]).
 
 --hard::
 	Resets the index and working tree. Any changes to tracked files in the
-	working tree since `<commit>` are discarded.
+	working tree since `<commit>` are discarded.  Any untracked files or
+	directories in the way of writing any tracked files are simply deleted.
 
 --merge::
 	Resets the index and updates the files in the working tree that are
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-rm.txt b/Documentation/git-rm.txt
index 26e9b28470..81bc23f3cd 100644
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -72,6 +72,12 @@ For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
 --ignore-unmatch::
 	Exit with a zero status even if no files matched.
 
+--sparse::
+	Allow updating index entries outside of the sparse-checkout cone.
+	Normally, `git rm` refuses to update index entries whose paths do
+	not fit within the sparse-checkout cone. See
+	linkgit:git-sparse-checkout[1] for more.
+
 -q::
 --quiet::
 	`git rm` normally outputs one line (in the form of an `rm` command)
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-send-pack.txt b/Documentation/git-send-pack.txt
index 44fd146b91..be41f11974 100644
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@ -9,10 +9,10 @@ git-send-pack - Push objects over Git protocol to another repository
 SYNOPSIS
 --------
 [verse]
-'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>]
+'git send-pack' [--dry-run] [--force] [--receive-pack=<git-receive-pack>]
 		[--verbose] [--thin] [--atomic]
 		[--[no-]signed|--signed=(true|false|if-asked)]
-		[<host>:]<directory> [<ref>...]
+		[<host>:]<directory> (--all | <ref>...)
 
 DESCRIPTION
 -----------
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 fdcf43f87c..94dad137b9 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,44 @@ 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 sparse-checkout config settings
+	(`core.sparseCheckout`, `core.sparseCheckoutCone`, and
+	`index.sparse`) if they are not already set to the desired values,
+	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 ensure that adjusting the sparse-checkout settings within a worktree
+does not alter the sparse-checkout settings in other worktrees, the 'set'
+subcommand will upgrade your repository config to use worktree-specific
+config if not already present. The sparsity defined by the arguments to
+the 'set' subcommand are stored in the worktree-specific sparse-checkout
+file. See linkgit:git-worktree[1] and the documentation of
+`extensions.worktreeConfig` in linkgit:git-config[1] for more details.
 +
-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 +76,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 +92,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 +129,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 +139,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.
@@ -210,6 +230,16 @@ case-insensitive check. This corrects for case mismatched filenames in the
 'git sparse-checkout set' command to reflect the expected cone in the working
 directory.
 
+When changing the sparse-checkout patterns in cone mode, Git will inspect each
+tracked directory that is not within the sparse-checkout cone to see if it
+contains any untracked files. If all of those files are ignored due to the
+`.gitignore` patterns, then the directory will be deleted. If any of the
+untracked files within that directory is not ignored, then no deletions will
+occur within that directory and a warning message will appear. If these files
+are important, then reset your sparse-checkout definition so they are included,
+use `git add` and `git commit` to store them, then remove any remaining files
+manually to ensure Git can behave optimally.
+
 
 SUBMODULES
 ----------
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 83f38e3198..54a4b29b47 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -207,26 +207,29 @@ show tracked paths:
 
 * ' ' = unmodified
 * 'M' = modified
+* 'T' = file type changed (regular file, symbolic link or submodule)
 * 'A' = added
 * 'D' = deleted
 * 'R' = renamed
-* 'C' = copied
+* 'C' = copied (if config option status.renames is set to "copies")
 * 'U' = updated but unmerged
 
 ....
 X          Y     Meaning
 -------------------------------------------------
 	 [AMD]   not updated
-M        [ MD]   updated in index
-A        [ MD]   added to index
+M        [ MTD]  updated in index
+T        [ MTD]  type changed in index
+A        [ MTD]  added to index
 D                deleted from index
-R        [ MD]   renamed in index
-C        [ MD]   copied in index
-[MARC]           index and work tree matches
-[ MARC]     M    work tree changed since index
-[ MARC]     D    deleted in work tree
-[ D]        R    renamed in work tree
-[ D]        C    copied in work tree
+R        [ MTD]  renamed in index
+C        [ MTD]  copied in index
+[MTARC]          index and work tree matches
+[ MTARC]    M    work tree changed since index
+[ MTARC]    T    type changed in work tree since index
+[ MTARC]    D    deleted in work tree
+	    R    renamed in work tree
+	    C    copied in work tree
 -------------------------------------------------
 D           D    unmerged, both deleted
 A           U    unmerged, added by us
@@ -311,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
 ^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -363,7 +374,7 @@ Field       Meaning
 Unmerged entries have the following format; the first character is
 a "u" to distinguish from ordinary changed entries.
 
-    u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
+    u <XY> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
 
 ....
 Field       Meaning
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index d5776ffcfd..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'.
 
@@ -678,7 +678,6 @@ config key: svn.authorsProg
 --strategy=<strategy>::
 -p::
 --rebase-merges::
---preserve-merges (DEPRECATED)::
 	These are only used with the 'dcommit' and 'rebase' commands.
 +
 Passed directly to 'git rebase' when using 'dcommit' if a
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-upload-pack.txt b/Documentation/git-upload-pack.txt
index 9822c1eb1a..8f87b23ea8 100644
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -36,14 +36,26 @@ OPTIONS
 	This fits with the HTTP POST request processing model where
 	a program may read the request, write a response, and must exit.
 
---advertise-refs::
-	Only the initial ref advertisement is output, and the program exits
-	immediately. This fits with the HTTP GET request model, where
-	no request content is received but a response must be produced.
+--http-backend-info-refs::
+	Used by linkgit:git-http-backend[1] to serve up
+	`$GIT_URL/info/refs?service=git-upload-pack` requests. See
+	"Smart Clients" in link:technical/http-protocol.html[the HTTP
+	transfer protocols] documentation and "HTTP Transport" in
+	link:technical/protocol-v2.html[the Git Wire Protocol, Version
+	2] documentation. Also understood by
+	linkgit:git-receive-pack[1].
 
 <directory>::
 	The repository to sync from.
 
+ENVIRONMENT
+-----------
+
+`GIT_PROTOCOL`::
+	Internal variable used for handshaking the wire protocol. Server
+	admins may need to configure some transports to allow this
+	variable to be passed. See the discussion in linkgit:git[1].
+
 SEE ALSO
 --------
 linkgit:gitnamespaces[7]
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-version.txt b/Documentation/git-version.txt
new file mode 100644
index 0000000000..80fa7754a6
--- /dev/null
+++ b/Documentation/git-version.txt
@@ -0,0 +1,28 @@
+git-version(1)
+==============
+
+NAME
+----
+git-version - Display version information about Git
+
+SYNOPSIS
+--------
+[verse]
+'git version' [--build-options]
+
+DESCRIPTION
+-----------
+With no options given, the version of 'git' is printed on the standard output.
+
+Note that `git --version` is identical to `git version` because the
+former is internally converted into the latter.
+
+OPTIONS
+-------
+--build-options::
+	Include additional information about how git was built for diagnostic
+	purposes.
+
+GIT
+---
+Part of the linkgit:git[1] suite
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 66e67e6cbf..b8d53c4830 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -9,8 +9,8 @@ git-worktree - Manage multiple working trees
 SYNOPSIS
 --------
 [verse]
-'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]
-'git worktree list' [--porcelain]
+'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]
+'git worktree list' [-v | --porcelain]
 'git worktree lock' [--reason <string>] <worktree>
 'git worktree move' <worktree> <new-path>
 'git worktree prune' [-n] [-v] [--expire <expire>]
@@ -242,7 +242,7 @@ With `list`, annotate missing working trees as prunable if they are
 older than `<time>`.
 
 --reason <string>::
-	With `lock`, an explanation why the working tree is locked.
+	With `lock` or with `add --lock`, an explanation why the working tree is locked.
 
 <worktree>::
 	Working trees can be identified by path, either relative or
@@ -286,8 +286,8 @@ CONFIGURATION FILE
 ------------------
 By default, the repository `config` file is shared across all working
 trees. If the config variables `core.bare` or `core.worktree` are
-already present in the config file, they will be applied to the main
-working trees only.
+present in the common config file and `extensions.worktreeConfig` is
+disabled, then they will be applied to the main working tree only.
 
 In order to have configuration specific to working trees, you can turn
 on the `worktreeConfig` extension, e.g.:
@@ -307,11 +307,16 @@ them to the `config.worktree` of the main working tree. You may also
 take this opportunity to review and move other configuration that you
 do not want to share to all working trees:
 
- - `core.worktree` and `core.bare` should never be shared
+ - `core.worktree` should never be shared.
+
+ - `core.bare` should not be shared if the value is `core.bare=true`.
 
  - `core.sparseCheckout` is recommended per working tree, unless you
    are sure you always use sparse checkout for all working trees.
 
+See the documentation of `extensions.worktreeConfig` in
+linkgit:git-config[1] for more details.
+
 DETAILS
 -------
 Each linked working tree has a private sub-directory in the repository's
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 6dd241ef83..13f83a2a3a 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -41,6 +41,10 @@ OPTIONS
 -------
 --version::
 	Prints the Git suite version that the 'git' program came from.
++
+This option is internally converted to `git version ...` and accepts
+the same options as the linkgit:git-version[1] command. If `--help` is
+also given, it takes precedence over `--version`.
 
 --help::
 	Prints the synopsis and a list of the most commonly used
@@ -828,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
@@ -863,15 +868,16 @@ for full details.
 	end user, to be recorded in the body of the reflog.
 
 `GIT_REF_PARANOIA`::
-	If set to `1`, include broken or badly named refs when iterating
-	over lists of refs. In a normal, non-corrupted repository, this
-	does nothing. However, enabling it may help git to detect and
-	abort some operations in the presence of broken refs. Git sets
-	this variable automatically when performing destructive
-	operations like linkgit:git-prune[1]. You should not need to set
-	it yourself unless you want to be paranoid about making sure
-	an operation has touched every ref (e.g., because you are
-	cloning a repository to make a backup).
+	If set to `0`, ignore broken or badly named refs when iterating
+	over lists of refs. Normally Git will try to include any such
+	refs, which may cause some operations to fail. This is usually
+	preferable, as potentially destructive operations (e.g.,
+	linkgit:git-prune[1]) are better off aborting rather than
+	ignoring broken refs (and thus considering the history they
+	point to as not worth saving). The default value is `1` (i.e.,
+	be paranoid about detecting and aborting all operations). You
+	should not normally need to set this to `0`, but it may be
+	useful when trying to salvage data from a corrupted repository.
 
 `GIT_ALLOW_PROTOCOL`::
 	If set to a colon-separated list of protocols, behave as if
@@ -894,6 +900,21 @@ for full details.
 	Contains a colon ':' separated list of keys with optional values
 	'key[=value]'.  Presence of unknown keys and values must be
 	ignored.
++
+Note that servers may need to be configured to allow this variable to
+pass over some transports. It will be propagated automatically when
+accessing local repositories (i.e., `file://` or a filesystem path), as
+well as over the `git://` protocol. For git-over-http, it should work
+automatically in most configurations, but see the discussion in
+linkgit:git-http-backend[1]. For git-over-ssh, the ssh server may need
+to be configured to allow clients to pass this variable (e.g., by using
+`AcceptEnv GIT_PROTOCOL` with OpenSSH).
++
+This configuration is optional. If the variable is not propagated, then
+clients will fall back to the original "v0" protocol (but may miss out
+on some performance improvements or features). This variable currently
+only affects clones and fetches; it is not yet used for pushes (but may
+be in the future).
 
 `GIT_OPTIONAL_LOCKS`::
 	If set to `0`, Git will complete any requested operation without
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 83fd4e19a4..a71dad2674 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -160,11 +160,13 @@ unspecified.
 ^^^^^
 
 This attribute sets a specific line-ending style to be used in the
-working directory.  It enables end-of-line conversion without any
-content checks, effectively setting the `text` attribute.  Note that
-setting this attribute on paths which are in the index with CRLF line
-endings may make the paths to be considered dirty.  Adding the path to
-the index again will normalize the line endings in the index.
+working directory.  This attribute has effect only if the `text`
+attribute is set or unspecified, or if it is set to `auto`, the file is
+detected as text, and it is stored with LF endings in the index.  Note
+that setting this attribute on paths which are in the index with CRLF
+line endings may make the paths to be considered dirty unless
+`text=auto` is set. Adding the path to the index again will normalize
+the line endings in the index.
 
 Set to string value "crlf"::
 
diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
index 92e4ba6a2f..1819a5a185 100644
--- a/Documentation/gitcli.txt
+++ b/Documentation/gitcli.txt
@@ -19,6 +19,15 @@ Many commands take revisions (most often "commits", but sometimes
 "tree-ish", depending on the context and command) and paths as their
 arguments.  Here are the rules:
 
+ * Options come first and then args.
+    A subcommand may take dashed options (which may take their own
+    arguments, e.g. "--max-parents 2") and arguments.  You SHOULD
+    give dashed options first and then arguments.  Some commands may
+    accept dashed options after you have already gave non-option
+    arguments (which may make the command ambiguous), but you should
+    not rely on it (because eventually we may find a way to fix
+    these ambiguity by enforcing the "options then args" rule).
+
  * Revisions come first and then paths.
    E.g. in `git diff v1.0 v2.0 arch/x86 include/asm-x86`,
    `v1.0` and `v2.0` are revisions and `arch/x86` and `include/asm-x86`
@@ -72,24 +81,24 @@ you will.
 Here are the rules regarding the "flags" that you should follow when you are
 scripting Git:
 
- * it's preferred to use the non-dashed form of Git commands, which means that
+ * It's preferred to use the non-dashed form of Git commands, which means that
    you should prefer `git foo` to `git-foo`.
 
- * splitting short options to separate words (prefer `git foo -a -b`
+ * Splitting short options to separate words (prefer `git foo -a -b`
    to `git foo -ab`, the latter may not even work).
 
- * when a command-line option takes an argument, use the 'stuck' form.  In
+ * When a command-line option takes an argument, use the 'stuck' form.  In
    other words, write `git foo -oArg` instead of `git foo -o Arg` for short
    options, and `git foo --long-opt=Arg` instead of `git foo --long-opt Arg`
    for long options.  An option that takes optional option-argument must be
    written in the 'stuck' form.
 
- * when you give a revision parameter to a command, make sure the parameter is
+ * When you give a revision parameter to a command, make sure the parameter is
    not ambiguous with a name of a file in the work tree.  E.g. do not write
    `git log -1 HEAD` but write `git log -1 HEAD --`; the former will not work
    if you happen to have a file called `HEAD` in the work tree.
 
- * many commands allow a long option `--option` to be abbreviated
+ * Many commands allow a long option `--option` to be abbreviated
    only to their unique prefix (e.g. if there is no other option
    whose name begins with `opt`, you may be able to spell `--opt` to
    invoke the `--option` flag), but you should fully spell them out
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/gitfaq.txt b/Documentation/gitfaq.txt
index afdaeab850..8c1f2d5675 100644
--- a/Documentation/gitfaq.txt
+++ b/Documentation/gitfaq.txt
@@ -275,7 +275,7 @@ best to always use a regular merge commit.
 
 [[merge-two-revert-one]]
 If I make a change on two branches but revert it on one, why does the merge of those branches include the change?::
-	By default, when Git does a merge, it uses a strategy called the recursive
+	By default, when Git does a merge, it uses a strategy called the `ort`
 	strategy, which does a fancy three-way merge.  In such a case, when Git
 	performs the merge, it considers exactly three points: the two heads and a
 	third point, called the _merge base_, which is usually the common ancestor of
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index b51959ff94..a16e62bc8c 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -698,6 +698,10 @@ and "0" meaning they were not.
 Only one parameter should be set to "1" when the hook runs.  The hook
 running passing "1", "1" should not be possible.
 
+SEE ALSO
+--------
+linkgit:git-hook[1]
+
 GIT
 ---
 Part of the linkgit:git[1] suite
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index f8a1fc2014..f2738b10db 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -155,7 +155,7 @@ accessed from the index or a tree versus from the filesystem.
 EXAMPLES
 --------
 
- - The pattern `hello.*` matches any file or folder
+ - The pattern `hello.*` matches any file or directory
    whose name begins with `hello.`. If one wants to restrict
    this only to the directory and not in its subdirectories,
    one can prepend the pattern with a slash, i.e. `/hello.*`;
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/gittutorial.txt b/Documentation/gittutorial.txt
index 59ef5cef1f..0e0b863105 100644
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -322,7 +322,7 @@ initiating this "pull".  If Bob's work conflicts with what Alice did since
 their histories forked, Alice will use her working tree and the index to
 resolve conflicts, and existing local changes will interfere with the
 conflict resolution process (Git will still perform the fetch but will
-refuse to merge --- Alice will have to get rid of her local changes in
+refuse to merge -- Alice will have to get rid of her local changes in
 some way and pull again when this happens).
 
 Alice can peek at what Bob did without merging first, using the "fetch"
diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt
index 3cc9b034c4..7cee9d3689 100644
--- a/Documentation/gitweb.txt
+++ b/Documentation/gitweb.txt
@@ -547,7 +547,7 @@ like this:
     # make the front page an internal rewrite to the gitweb script
     RewriteRule ^/$  /cgi-bin/gitweb.cgi  [QSA,L,PT]
 
-    # look for a public_git folder in unix users' home
+    # look for a public_git directory in unix users' home
     # http://git.example.org/~<user>/
     RewriteRule ^/\~([^\/]+)(/|/gitweb.cgi)?$	/cgi-bin/gitweb.cgi \
 		[QSA,E=GITWEB_PROJECTROOT:/home/$1/public_git/,L,PT]
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/glossary-content.txt b/Documentation/glossary-content.txt
index c077971335..aa2f41f5e7 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -312,7 +312,7 @@ Pathspecs are used on the command line of "git ls-files", "git
 ls-tree", "git add", "git grep", "git diff", "git checkout",
 and many other commands to
 limit the scope of operations to some subset of the tree or
-worktree.  See the documentation of each command for whether
+working tree.  See the documentation of each command for whether
 paths are relative to the current directory or toplevel.  The
 pathspec syntax is as follows:
 +
@@ -446,7 +446,7 @@ exclude;;
 	interface than the <<def_plumbing,plumbing>>.
 
 [[def_per_worktree_ref]]per-worktree ref::
-	Refs that are per-<<def_working_tree,worktree>>, rather than
+	Refs that are per-<<def_worktree,worktree>>, rather than
 	global.  This is presently only <<def_HEAD,HEAD>> and any refs
 	that start with `refs/bisect/`, but might later include other
 	unusual refs.
@@ -669,3 +669,12 @@ The most notable example is `HEAD`.
 	The tree of actual checked out files.  The working tree normally
 	contains the contents of the <<def_HEAD,HEAD>> commit's tree,
 	plus any local changes that you have made but not yet committed.
+
+[[def_worktree]]worktree::
+	A repository can have zero (i.e. bare repository) or one or
+	more worktrees attached to it. One "worktree" consists of a
+	"working tree" and repository metadata, most of which are
+	shared among other worktrees of a single repository, and
+	some of which are maintained separately per worktree
+	(e.g. the index, HEAD and pseudorefs like MERGE_HEAD,
+	per-worktree refs and per-worktree configuration file).
diff --git a/Documentation/lint-gitlink.perl b/Documentation/lint-gitlink.perl
index b22a367844..1c61dd9512 100755
--- a/Documentation/lint-gitlink.perl
+++ b/Documentation/lint-gitlink.perl
@@ -5,11 +5,12 @@ use warnings;
 
 # Parse arguments, a simple state machine for input like:
 #
-# howto/*.txt config/*.txt --section=1 git.txt git-add.txt [...] --to-lint git-add.txt a-file.txt [...]
+# <file-to-check.txt> <valid-files-to-link-to> --section=1 git.txt git-add.txt [...] --to-lint git-add.txt a-file.txt [...]
 my %TXT;
 my %SECTION;
 my $section;
 my $lint_these = 0;
+my $to_check = shift @ARGV;
 for my $arg (@ARGV) {
 	if (my ($sec) = $arg =~ /^--section=(\d+)$/s) {
 		$section = $sec;
@@ -30,13 +31,14 @@ sub report {
 	my ($pos, $line, $target, $msg) = @_;
 	substr($line, $pos) = "' <-- HERE";
 	$line =~ s/^\s+//;
-	print "$ARGV:$.: error: $target: $msg, shown with 'HERE' below:\n";
-	print "$ARGV:$.:\t'$line\n";
+	print STDERR "$ARGV:$.: error: $target: $msg, shown with 'HERE' below:\n";
+	print STDERR "$ARGV:$.:\t'$line\n";
 	$exit_code = 1;
 }
 
 @ARGV = sort values %TXT;
-die "BUG: Nothing to process!" unless @ARGV;
+die "BUG: No list of valid linkgit:* files given" unless @ARGV;
+@ARGV = $to_check;
 while (<>) {
 	my $line = $_;
 	while ($line =~ m/linkgit:((.*?)\[(\d)\])/g) {
diff --git a/Documentation/lint-man-end-blurb.perl b/Documentation/lint-man-end-blurb.perl
index d69312e5db..6bdb13ad9f 100755
--- a/Documentation/lint-man-end-blurb.perl
+++ b/Documentation/lint-man-end-blurb.perl
@@ -6,7 +6,7 @@ use warnings;
 my $exit_code = 0;
 sub report {
 	my ($target, $msg) = @_;
-	print "error: $target: $msg\n";
+	print STDERR "error: $target: $msg\n";
 	$exit_code = 1;
 }
 
diff --git a/Documentation/lint-man-section-order.perl b/Documentation/lint-man-section-order.perl
index b05f9156dd..425377dfeb 100755
--- a/Documentation/lint-man-section-order.perl
+++ b/Documentation/lint-man-section-order.perl
@@ -46,7 +46,7 @@ my $SECTION_RX = do {
 my $exit_code = 0;
 sub report {
 	my ($msg) = @_;
-	print "$ARGV:$.: $msg\n";
+	print STDERR "$ARGV:$.: $msg\n";
 	$exit_code = 1;
 }
 
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index eb0aabd396..d8f7cd7ca0 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -2,6 +2,9 @@
 --no-commit::
 	Perform the merge and commit the result. This option can
 	be used to override --no-commit.
+ifdef::git-pull[]
+	Only useful when merging.
+endif::git-pull[]
 +
 With --no-commit perform the merge and stop just before creating
 a merge commit, to give the user a chance to inspect and further
@@ -39,6 +42,7 @@ set to `no` at the beginning of them.
 	to `MERGE_MSG` before being passed on to the commit machinery in the
 	case of a merge conflict.
 
+ifdef::git-merge[]
 --ff::
 --no-ff::
 --ff-only::
@@ -47,6 +51,22 @@ set to `no` at the beginning of them.
 	default unless merging an annotated (and possibly signed) tag
 	that is not stored in its natural place in the `refs/tags/`
 	hierarchy, in which case `--no-ff` is assumed.
+endif::git-merge[]
+ifdef::git-pull[]
+--ff-only::
+	Only update to the new history if there is no divergent local
+	history.  This is the default when no method for reconciling
+	divergent histories is provided (via the --rebase=* flags).
+
+--ff::
+--no-ff::
+	When merging rather than rebasing, specifies how a merge is
+	handled when the merged-in history is already a descendant of
+	the current history.  If merging is requested, `--ff` is the
+	default unless merging an annotated (and possibly signed) tag
+	that is not stored in its natural place in the `refs/tags/`
+	hierarchy, in which case `--no-ff` is assumed.
+endif::git-pull[]
 +
 With `--ff`, when possible resolve the merge as a fast-forward (only
 update the branch pointer to match the merged branch; do not create a
@@ -55,9 +75,11 @@ descendant of the current history), create a merge commit.
 +
 With `--no-ff`, create a merge commit in all cases, even when the merge
 could instead be resolved as a fast-forward.
+ifdef::git-merge[]
 +
 With `--ff-only`, resolve the merge as a fast-forward when possible.
 When not possible, refuse to merge and exit with a non-zero status.
+endif::git-merge[]
 
 -S[<keyid>]::
 --gpg-sign[=<keyid>]::
@@ -73,6 +95,9 @@ When not possible, refuse to merge and exit with a non-zero status.
 	In addition to branch names, populate the log message with
 	one-line descriptions from at most <n> actual commits that are being
 	merged. See also linkgit:git-fmt-merge-msg[1].
+ifdef::git-pull[]
+	Only useful when merging.
+endif::git-pull[]
 +
 With --no-log do not list one-line descriptions from the
 actual commits being merged.
@@ -102,18 +127,26 @@ With --no-squash perform the merge and commit the result. This
 option can be used to override --squash.
 +
 With --squash, --commit is not allowed, and will fail.
+ifdef::git-pull[]
++
+Only useful when merging.
+endif::git-pull[]
 
---no-verify::
-	This option bypasses the pre-merge and commit-msg hooks.
+--[no-]verify::
+	By default, the pre-merge and commit-msg hooks are run.
+	When `--no-verify` is given, these are bypassed.
 	See also linkgit:githooks[5].
+ifdef::git-pull[]
+	Only useful when merging.
+endif::git-pull[]
 
 -s <strategy>::
 --strategy=<strategy>::
 	Use the given merge strategy; can be supplied more than
 	once to specify them in the order they should be tried.
 	If there is no `-s` option, a built-in list of strategies
-	is used instead ('git merge-recursive' when merging a single
-	head, 'git merge-octopus' otherwise).
+	is used instead (`ort` when merging a single head,
+	`octopus` otherwise).
 
 -X <option>::
 --strategy-option=<option>::
@@ -127,6 +160,10 @@ With --squash, --commit is not allowed, and will fail.
 	default trust model, this means the signing key has been signed by
 	a trusted key.  If the tip commit of the side branch is not signed
 	with a valid key, the merge is aborted.
+ifdef::git-pull[]
++
+Only useful when merging.
+endif::git-pull[]
 
 --summary::
 --no-summary::
@@ -154,7 +191,8 @@ endif::git-pull[]
 --autostash::
 --no-autostash::
 	Automatically create a temporary stash entry before the operation
-	begins, and apply it after the operation ends.  This means
+	begins, record it in the special ref `MERGE_AUTOSTASH`
+	and apply it after the operation ends.  This means
 	that you can run the operation on a dirty worktree.  However, use
 	with care: the final stash application after a successful
 	merge might result in non-trivial conflicts.
@@ -166,3 +204,7 @@ endif::git-pull[]
 	projects that started their lives independently. As that is
 	a very rare occasion, no configuration variable to enable
 	this by default exists and will not be added.
+ifdef::git-pull[]
++
+Only useful when merging.
+endif::git-pull[]
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 2912de706b..5fc54ec060 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -6,28 +6,23 @@ backend 'merge strategies' to be chosen with `-s` option.  Some strategies
 can also take their own options, which can be passed by giving `-X<option>`
 arguments to `git merge` and/or `git pull`.
 
-resolve::
-	This can only resolve two heads (i.e. the current branch
-	and another branch you pulled from) using a 3-way merge
-	algorithm.  It tries to carefully detect criss-cross
-	merge ambiguities and is considered generally safe and
-	fast.
-
-recursive::
-	This can only resolve two heads using a 3-way merge
-	algorithm.  When there is more than one common
-	ancestor that can be used for 3-way merge, it creates a
-	merged tree of the common ancestors and uses that as
-	the reference tree for the 3-way merge.  This has been
-	reported to result in fewer merge conflicts without
-	causing mismerges by tests done on actual merge commits
-	taken from Linux 2.6 kernel development history.
-	Additionally this can detect and handle merges involving
-	renames, but currently cannot make use of detected
-	copies.  This is the default merge strategy when pulling
-	or merging one branch.
+ort::
+	This is the default merge strategy when pulling or merging one
+	branch.  This strategy can only resolve two heads using a
+	3-way merge algorithm.  When there is more than one common
+	ancestor that can be used for 3-way merge, it creates a merged
+	tree of the common ancestors and uses that as the reference
+	tree for the 3-way merge.  This has been reported to result in
+	fewer merge conflicts without causing mismerges by tests done
+	on actual merge commits taken from Linux 2.6 kernel
+	development history.  Additionally this strategy can detect
+	and handle merges involving renames.  It does not make use of
+	detected copies.  The name for this algorithm is an acronym
+	("Ostensibly Recursive's Twin") and came from the fact that it
+	was written as a replacement for the previous default
+	algorithm, `recursive`.
 +
-The 'recursive' strategy can take the following options:
+The 'ort' strategy can take the following options:
 
 ours;;
 	This option forces conflicting hunks to be auto-resolved cleanly by
@@ -43,19 +38,6 @@ theirs;;
 	This is the opposite of 'ours'; note that, unlike 'ours', there is
 	no 'theirs' merge strategy to confuse this merge option with.
 
-patience;;
-	With this option, 'merge-recursive' spends a little extra time
-	to avoid mismerges that sometimes occur due to unimportant
-	matching lines (e.g., braces from distinct functions).  Use
-	this when the branches to be merged have diverged wildly.
-	See also linkgit:git-diff[1] `--patience`.
-
-diff-algorithm=[patience|minimal|histogram|myers];;
-	Tells 'merge-recursive' to use a different diff algorithm, which
-	can help avoid mismerges that occur due to unimportant matching
-	lines (such as braces from distinct functions).  See also
-	linkgit:git-diff[1] `--diff-algorithm`.
-
 ignore-space-change;;
 ignore-all-space;;
 ignore-space-at-eol;;
@@ -84,11 +66,6 @@ no-renormalize;;
 	Disables the `renormalize` option.  This overrides the
 	`merge.renormalize` configuration variable.
 
-no-renames;;
-	Turn off rename detection. This overrides the `merge.renames`
-	configuration variable.
-	See also linkgit:git-diff[1] `--no-renames`.
-
 find-renames[=<n>];;
 	Turn on rename detection, optionally setting the similarity
 	threshold.  This is the default. This overrides the
@@ -105,6 +82,46 @@ subtree[=<path>];;
 	is prefixed (or stripped from the beginning) to make the shape of
 	two trees to match.
 
+recursive::
+	This can only resolve two heads using a 3-way merge
+	algorithm.  When there is more than one common
+	ancestor that can be used for 3-way merge, it creates a
+	merged tree of the common ancestors and uses that as
+	the reference tree for the 3-way merge.  This has been
+	reported to result in fewer merge conflicts without
+	causing mismerges by tests done on actual merge commits
+	taken from Linux 2.6 kernel development history.
+	Additionally this can detect and handle merges involving
+	renames.  It does not make use of detected copies.  This was
+	the default strategy for resolving two heads from Git v0.99.9k
+	until v2.33.0.
++
+The 'recursive' strategy takes the same options as 'ort'.  However,
+there are three additional options that 'ort' ignores (not documented
+above) that are potentially useful with the 'recursive' strategy:
+
+patience;;
+	Deprecated synonym for `diff-algorithm=patience`.
+
+diff-algorithm=[patience|minimal|histogram|myers];;
+	Use a different diff algorithm while merging, which can help
+	avoid mismerges that occur due to unimportant matching lines
+	(such as braces from distinct functions).  See also
+	linkgit:git-diff[1] `--diff-algorithm`.  Note that `ort`
+	specifically uses `diff-algorithm=histogram`, while `recursive`
+	defaults to the `diff.algorithm` config setting.
+
+no-renames;;
+	Turn off rename detection. This overrides the `merge.renames`
+	configuration variable.
+	See also linkgit:git-diff[1] `--no-renames`.
+
+resolve::
+	This can only resolve two heads (i.e. the current branch
+	and another branch you pulled from) using a 3-way merge
+	algorithm.  It tries to carefully detect criss-cross
+	merge ambiguities.  It does not handle renames.
+
 octopus::
 	This resolves cases with more than two heads, but refuses to do
 	a complex merge that needs manual resolution.  It is
@@ -121,13 +138,13 @@ ours::
 	the 'recursive' merge strategy.
 
 subtree::
-	This is a modified recursive strategy. When merging trees A and
+	This is a modified `ort` strategy. When merging trees A and
 	B, if B corresponds to a subtree of A, B is first adjusted to
 	match the tree structure of A, instead of reading the trees at
 	the same level. This adjustment is also done to the common
 	ancestor tree.
 
-With the strategies that use 3-way merge (including the default, 'recursive'),
+With the strategies that use 3-way merge (including the default, 'ort'),
 if a change is made on both branches, but later reverted on one of the
 branches, that change will be present in the merged result; some people find
 this behavior confusing.  It occurs because only the heads and the merge base
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/pretty-options.txt b/Documentation/pretty-options.txt
index 27ddaf84a1..dc685be363 100644
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -33,14 +33,16 @@ people using 80-column terminals.
 	used together.
 
 --encoding=<encoding>::
-	The commit objects record the encoding used for the log message
+	Commit objects record the character encoding used for the log message
 	in their encoding header; this option can be used to tell the
 	command to re-code the commit log message in the encoding
 	preferred by the user.  For non plumbing commands this
 	defaults to UTF-8. Note that if an object claims to be encoded
 	in `X` and we are outputting in `X`, we will output the object
 	verbatim; this means that invalid sequences in the original
-	commit may be copied to the output.
+	commit may be copied to the output. Likewise, if iconv(3) fails
+	to convert the commit, we will quietly output the original
+	object verbatim.
 
 --expand-tabs=<n>::
 --expand-tabs::
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 24569b06d1..fd4f4e26c9 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -122,19 +122,27 @@ again.  Equivalent forms are `--min-parents=0` (any commit has 0 or more
 parents) and `--max-parents=-1` (negative numbers denote no upper limit).
 
 --first-parent::
-	Follow only the first parent commit upon seeing a merge
-	commit.  This option can give a better overview when
-	viewing the evolution of a particular topic branch,
-	because merges into a topic branch tend to be only about
-	adjusting to updated upstream from time to time, and
-	this option allows you to ignore the individual commits
-	brought in to your history by such a merge.
+	When finding commits to include, follow only the first
+	parent commit upon seeing a merge commit.  This option
+	can give a better overview when viewing the evolution of
+	a particular topic branch, because merges into a topic
+	branch tend to be only about adjusting to updated upstream
+	from time to time, and this option allows you to ignore
+	the individual commits brought in to your history by such
+	a merge.
 ifdef::git-log[]
 +
 This option also changes default diff format for merge commits
 to `first-parent`, see `--diff-merges=first-parent` for details.
 endif::git-log[]
 
+--exclude-first-parent-only::
+	When finding commits to exclude (with a '{caret}'), follow only
+	the first parent commit upon seeing a merge commit.
+	This can be used to find the set of changes in a topic branch
+	from the point where it diverged from the remote branch, given
+	that arbitrary merges can be valid topic branch changes.
+
 --not::
 	Reverses the meaning of the '{caret}' prefix (or lack thereof)
 	for all following revision specifiers, up to the next `--not`.
@@ -1047,7 +1055,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/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
index 5a60bbfa7f..acfd5dc1d8 100644
--- a/Documentation/technical/api-parse-options.txt
+++ b/Documentation/technical/api-parse-options.txt
@@ -198,11 +198,6 @@ There are some macros to easily define options:
 	The filename will be prefixed by passing the filename along with
 	the prefix argument of `parse_options()` to `prefix_filename()`.
 
-`OPT_ARGUMENT(long, &int_var, description)`::
-	Introduce a long-option argument that will be kept in `argv[]`.
-	If this option was seen, `int_var` will be set to one (except
-	if a `NULL` pointer was passed).
-
 `OPT_NUMBER_CALLBACK(&var, description, func_ptr)`::
 	Recognize numerical options like -123 and feed the integer as
 	if it was an argument to the function given by `func_ptr`.
diff --git a/Documentation/technical/api-trace2.txt b/Documentation/technical/api-trace2.txt
index 037a91cbca..bb13ca3db8 100644
--- a/Documentation/technical/api-trace2.txt
+++ b/Documentation/technical/api-trace2.txt
@@ -128,7 +128,7 @@ yields
 
 ------------
 $ cat ~/log.event
-{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"2","exe":"2.20.1.155.g426c96fcdb"}
+{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"3","exe":"2.20.1.155.g426c96fcdb"}
 {"event":"start","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621027Z","file":"common-main.c","line":39,"t_abs":0.001173,"argv":["git","version"]}
 {"event":"cmd_name","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621122Z","file":"git.c","line":432,"name":"version","hierarchy":"version"}
 {"event":"exit","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621236Z","file":"git.c","line":662,"t_abs":0.001227,"code":0}
@@ -391,7 +391,7 @@ only present on the "start" and "atexit" events.
 {
 	"event":"version",
 	...
-	"evt":"2",		       # EVENT format version
+	"evt":"3",		       # EVENT format version
 	"exe":"2.20.1.155.g426c96fcdb" # git version
 }
 ------------
@@ -493,6 +493,20 @@ about specific error arguments.
 }
 ------------
 
+`"cmd_ancestry"`::
+	This event contains the text command name for the parent (and earlier
+	generations of parents) of the current process, in an array ordered from
+	nearest parent to furthest great-grandparent. It may not be implemented
+	on all platforms.
++
+------------
+{
+	"event":"cmd_ancestry",
+	...
+	"ancestry":["bash","tmux: server","systemd"]
+}
+------------
+
 `"cmd_name"`::
 	This event contains the command name for this git process
 	and the hierarchy of commands from parent git processes.
@@ -599,6 +613,46 @@ stopping after the waitpid() and includes OS process creation overhead).
 So this time will be slightly larger than the atexit time reported by
 the child process itself.
 
+`"child_ready"`::
+	This event is generated after the current process has started
+	a background process and released all handles to it.
++
+------------
+{
+	"event":"child_ready",
+	...
+	"child_id":2,
+	"pid":14708,	 # child PID
+	"ready":"ready", # child ready state
+	"t_rel":0.110605 # observed run-time of child process
+}
+------------
++
+Note that the session-id of the child process is not available to
+the current/spawning process, so the child's PID is reported here as
+a hint for post-processing.  (But it is only a hint because the child
+process may be a shell script which doesn't have a session-id.)
++
+This event is generated after the child is started in the background
+and given a little time to boot up and start working.  If the child
+startups normally and while the parent is still waiting, the "ready"
+field will have the value "ready".
+If the child is too slow to start and the parent times out, the field
+will have the value "timeout".
+If the child starts but the parent is unable to probe it, the field
+will have the value "error".
++
+After the parent process emits this event, it will release all of its
+handles to the child process and treat the child as a background
+daemon.  So even if the child does eventually finish booting up,
+the parent will not emit an updated event.
++
+Note that the `t_rel` field contains the observed run time in seconds
+when the parent released the child process into the background.
+The child is assumed to be a long-running daemon process and may
+outlive the parent process.  So the parent's child event times should
+not be compared to the child's atexit times.
+
 `"exec"`::
 	This event is generated before git attempts to `exec()`
 	another command rather than starting a child process.
diff --git a/Documentation/technical/bitmap-format.txt b/Documentation/technical/bitmap-format.txt
index f8c18a0f7a..04b3ec2178 100644
--- a/Documentation/technical/bitmap-format.txt
+++ b/Documentation/technical/bitmap-format.txt
@@ -1,6 +1,44 @@
 GIT bitmap v1 format
 ====================
 
+== Pack and multi-pack bitmaps
+
+Bitmaps store reachability information about the set of objects in a packfile,
+or a multi-pack index (MIDX). The former is defined obviously, and the latter is
+defined as the union of objects in packs contained in the MIDX.
+
+A bitmap may belong to either one pack, or the repository's multi-pack index (if
+it exists). A repository may have at most one bitmap.
+
+An object is uniquely described by its bit position within a bitmap:
+
+	- If the bitmap belongs to a packfile, the __n__th bit corresponds to
+	the __n__th object in pack order. For a function `offset` which maps
+	objects to their byte offset within a pack, pack order is defined as
+	follows:
+
+		o1 <= o2 <==> offset(o1) <= offset(o2)
+
+	- If the bitmap belongs to a MIDX, the __n__th bit corresponds to the
+	__n__th object in MIDX order. With an additional function `pack` which
+	maps objects to the pack they were selected from by the MIDX, MIDX order
+	is defined as follows:
+
+		o1 <= o2 <==> pack(o1) <= pack(o2) /\ offset(o1) <= offset(o2)
+
+	The ordering between packs is done according to the MIDX's .rev file.
+	Notably, the preferred pack sorts ahead of all other packs.
+
+The on-disk representation (described below) of a bitmap is the same regardless
+of whether or not that bitmap belongs to a packfile or a MIDX. The only
+difference is the interpretation of the bits, which is described above.
+
+Certain bitmap extensions are supported (see: Appendix B). No extensions are
+required for bitmaps corresponding to packfiles. For bitmaps that correspond to
+MIDXs, both the bit-cache and rev-cache extensions are required.
+
+== On-disk format
+
 	- A header appears at the beginning:
 
 		4-byte signature: {'B', 'I', 'T', 'M'}
@@ -14,17 +52,19 @@ GIT bitmap v1 format
 			The following flags are supported:
 
 			- BITMAP_OPT_FULL_DAG (0x1) REQUIRED
-			This flag must always be present. It implies that the bitmap
-			index has been generated for a packfile with full closure
-			(i.e. where every single object in the packfile can find
-			 its parent links inside the same packfile). This is a
-			requirement for the bitmap index format, also present in JGit,
-			that greatly reduces the complexity of the implementation.
+			This flag must always be present. It implies that the
+			bitmap index has been generated for a packfile or
+			multi-pack index (MIDX) with full closure (i.e. where
+			every single object in the packfile/MIDX can find its
+			parent links inside the same packfile/MIDX). This is a
+			requirement for the bitmap index format, also present in
+			JGit, that greatly reduces the complexity of the
+			implementation.
 
 			- BITMAP_OPT_HASH_CACHE (0x4)
 			If present, the end of the bitmap file contains
 			`N` 32-bit name-hash values, one per object in the
-			pack. The format and meaning of the name-hash is
+			pack/MIDX. The format and meaning of the name-hash is
 			described below.
 
 		4-byte entry count (network byte order)
@@ -33,7 +73,8 @@ GIT bitmap v1 format
 
 		20-byte checksum
 
-			The SHA1 checksum of the pack this bitmap index belongs to.
+			The SHA1 checksum of the pack/MIDX this bitmap index
+			belongs to.
 
 	- 4 EWAH bitmaps that act as type indexes
 
@@ -50,7 +91,7 @@ GIT bitmap v1 format
 			- Tags
 
 		In each bitmap, the `n`th bit is set to true if the `n`th object
-		in the packfile is of that type.
+		in the packfile or multi-pack index is of that type.
 
 		The obvious consequence is that the OR of all 4 bitmaps will result
 		in a full set (all bits set), and the AND of all 4 bitmaps will
@@ -62,8 +103,9 @@ GIT bitmap v1 format
 		Each entry contains the following:
 
 		- 4-byte object position (network byte order)
-			The position **in the index for the packfile** where the
-			bitmap for this commit is found.
+			The position **in the index for the packfile or
+			multi-pack index** where the bitmap for this commit is
+			found.
 
 		- 1-byte XOR-offset
 			The xor offset used to compress this bitmap. For an entry
@@ -146,10 +188,11 @@ Name-hash cache
 ---------------
 
 If the BITMAP_OPT_HASH_CACHE flag is set, the end of the bitmap contains
-a cache of 32-bit values, one per object in the pack. The value at
+a cache of 32-bit values, one per object in the pack/MIDX. The value at
 position `i` is the hash of the pathname at which the `i`th object
-(counting in index order) in the pack can be found.  This can be fed
-into the delta heuristics to compare objects with similar pathnames.
+(counting in index or multi-pack index order) in the pack/MIDX can be found.
+This can be fed into the delta heuristics to compare objects with similar
+pathnames.
 
 The hash algorithm used is:
 
diff --git a/Documentation/technical/directory-rename-detection.txt b/Documentation/technical/directory-rename-detection.txt
index 49b83ef3cc..029ee2cedc 100644
--- a/Documentation/technical/directory-rename-detection.txt
+++ b/Documentation/technical/directory-rename-detection.txt
@@ -2,9 +2,9 @@ Directory rename detection
 ==========================
 
 Rename detection logic in diffcore-rename that checks for renames of
-individual files is aggregated and analyzed in merge-recursive for cases
-where combinations of renames indicate that a full directory has been
-renamed.
+individual files is also aggregated there and then analyzed in either
+merge-ort or merge-recursive for cases where combinations of renames
+indicate that a full directory has been renamed.
 
 Scope of abilities
 ------------------
@@ -88,9 +88,11 @@ directory rename detection support in:
     Folks have requested in the past that `git diff` detect directory
     renames and somehow simplify its output.  It is not clear whether this
     would be desirable or how the output should be simplified, so this was
-    simply not implemented.  Further, to implement this, directory rename
-    detection logic would need to move from merge-recursive to
-    diffcore-rename.
+    simply not implemented.  Also, while diffcore-rename has most of the
+    logic for detecting directory renames, some of the logic is still found
+    within merge-ort and merge-recursive.  Fully supporting directory
+    rename detection in diffs would require copying or moving the remaining
+    bits of logic to the diff machinery.
 
   * am
 
diff --git a/Documentation/technical/http-protocol.txt b/Documentation/technical/http-protocol.txt
index 96d89ea9b2..cc5126cfed 100644
--- a/Documentation/technical/http-protocol.txt
+++ b/Documentation/technical/http-protocol.txt
@@ -225,6 +225,9 @@ The client may send Extra Parameters (see
 Documentation/technical/pack-protocol.txt) as a colon-separated string
 in the Git-Protocol HTTP header.
 
+Uses the `--http-backend-info-refs` option to
+linkgit:git-upload-pack[1].
+
 Dumb Server Response
 ^^^^^^^^^^^^^^^^^^^^
 Dumb servers MUST respond with the dumb server reply format.
diff --git a/Documentation/technical/multi-pack-index.txt b/Documentation/technical/multi-pack-index.txt
index fb688976c4..f2221d2b44 100644
--- a/Documentation/technical/multi-pack-index.txt
+++ b/Documentation/technical/multi-pack-index.txt
@@ -17,13 +17,14 @@ 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.
+- An optional list of objects in pseudo-pack order (used with MIDX bitmaps).
 
 Thus, we can provide O(log N) lookup time for any number
 of packfiles.
@@ -36,7 +37,9 @@ Design Details
   directory of an alternate. It refers only to packfiles in that
   same directory.
 
-- The core.multiPackIndex config setting must be on to consume MIDX files.
+- The core.multiPackIndex config setting must be on (which is the
+  default) to consume MIDX files.  Setting it to `false` prevents
+  Git from reading a MIDX file, even if one exists.
 
 - The file format includes parameters for the object ID hash
   function, so a future change of hash algorithm does not require
@@ -71,14 +74,10 @@ Future Work
   still reducing the number of binary searches required for object
   lookups.
 
-- The reachability bitmap is currently paired directly with a single
-  packfile, using the pack-order as the object order to hopefully
-  compress the bitmaps well using run-length encoding. This could be
-  extended to pair a reachability bitmap with a multi-pack-index. If
-  the multi-pack-index is extended to store a "stable object order"
+- If the multi-pack-index is extended to store a "stable object order"
   (a function Order(hash) = integer that is constant for a given hash,
-  even as the multi-pack-index is updated) then a reachability bitmap
-  could point to a multi-pack-index and be updated independently.
+  even as the multi-pack-index is updated) then MIDX bitmaps could be
+  updated independently of the MIDX.
 
 - Packfiles can be marked as "special" using empty files that share
   the initial name but replace ".pack" with ".keep" or ".promisor".
@@ -89,11 +88,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/pack-format.txt b/Documentation/technical/pack-format.txt
index 8d2f42f29e..6d3efb7d16 100644
--- a/Documentation/technical/pack-format.txt
+++ b/Documentation/technical/pack-format.txt
@@ -376,6 +376,11 @@ CHUNK DATA:
 	[Optional] Object Large Offsets (ID: {'L', 'O', 'F', 'F'})
 	    8-byte offsets into large packfiles.
 
+	[Optional] Bitmap pack order (ID: {'R', 'I', 'D', 'X'})
+	    A list of MIDX positions (one per object in the MIDX, num_objects in
+	    total, each a 4-byte unsigned integer in network byte order), sorted
+	    according to their relative bitmap/pseudo-pack positions.
+
 TRAILER:
 
 	Index checksum of the above contents.
@@ -456,9 +461,5 @@ In short, a MIDX's pseudo-pack is the de-duplicated concatenation of
 objects in packs stored by the MIDX, laid out in pack order, and the
 packs arranged in MIDX order (with the preferred pack coming first).
 
-Finally, note that the MIDX's reverse index is not stored as a chunk in
-the multi-pack-index itself. This is done because the reverse index
-includes the checksum of the pack or MIDX to which it belongs, which
-makes it impossible to write in the MIDX. To avoid races when rewriting
-the MIDX, a MIDX reverse index includes the MIDX's checksum in its
-filename (e.g., `multi-pack-index-xyz.rev`).
+The MIDX's reverse index is stored in the optional 'RIDX' chunk within
+the MIDX itself.
diff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt
index 1040d85319..8a877d27e2 100644
--- a/Documentation/technical/protocol-v2.txt
+++ b/Documentation/technical/protocol-v2.txt
@@ -42,7 +42,8 @@ Initial Client Request
 In general a client can request to speak protocol v2 by sending
 `version=2` through the respective side-channel for the transport being
 used which inevitably sets `GIT_PROTOCOL`.  More information can be
-found in `pack-protocol.txt` and `http-protocol.txt`.  In all cases the
+found in `pack-protocol.txt` and `http-protocol.txt`, as well as the
+`GIT_PROTOCOL` definition in `git.txt`. In all cases the
 response from the server is the capability advertisement.
 
 Git Transport
@@ -58,6 +59,8 @@ SSH and File Transport
 
 When using either the ssh:// or file:// transport, the GIT_PROTOCOL
 environment variable must be set explicitly to include "version=2".
+The server may need to be configured to allow this environment variable
+to pass.
 
 HTTP Transport
 ~~~~~~~~~~~~~~
@@ -81,6 +84,12 @@ A v2 server would reply:
 Subsequent requests are then made directly to the service
 `$GIT_URL/git-upload-pack`. (This works the same for git-receive-pack).
 
+Uses the `--http-backend-info-refs` option to
+linkgit:git-upload-pack[1].
+
+The server may need to be configured to pass this header's contents via
+the `GIT_PROTOCOL` variable. See the discussion in `git-http-backend.txt`.
+
 Capability Advertisement
 ------------------------
 
@@ -116,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.
@@ -190,7 +199,11 @@ ls-refs takes in the following arguments:
 	Show peeled tags.
     ref-prefix <prefix>
 	When specified, only references having a prefix matching one of
-	the provided prefixes are displayed.
+	the provided prefixes are displayed. Multiple instances may be
+	given, in which case references matching any prefix will be
+	shown. Note that this is purely for optimization; a server MAY
+	show refs not matching the prefix if it chooses, and clients
+	should filter the result themselves.
 
 If the 'unborn' feature is advertised the following argument can be
 included in the client's request.
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/technical/signature-format.txt b/Documentation/technical/signature-format.txt
index 2c9406a56a..166721be6f 100644
--- a/Documentation/technical/signature-format.txt
+++ b/Documentation/technical/signature-format.txt
@@ -13,6 +13,22 @@ Signatures always begin with `-----BEGIN PGP SIGNATURE-----`
 and end with `-----END PGP SIGNATURE-----`, unless gpg is told to
 produce RFC1991 signatures which use `MESSAGE` instead of `SIGNATURE`.
 
+Signatures sometimes appear as a part of the normal payload
+(e.g. a signed tag has the signature block appended after the payload
+that the signature applies to), and sometimes appear in the value of
+an object header (e.g. a merge commit that merged a signed tag would
+have the entire tag contents on its "mergetag" header).  In the case
+of the latter, the usual multi-line formatting rule for object
+headers applies.  I.e. the second and subsequent lines are prefixed
+with a SP to signal that the line is continued from the previous
+line.
+
+This is even true for an originally empty line.  In the following
+examples, the end of line that ends with a whitespace letter is
+highlighted with a `$` sign; if you are trying to recreate these
+example by hand, do not cut and paste them---they are there
+primarily to highlight extra whitespace at the end of some lines.
+
 The signed payload and the way the signature is embedded depends
 on the type of the object resp. transaction.
 
@@ -78,7 +94,7 @@ author A U Thor <author@example.com> 1465981137 +0000
 committer C O Mitter <committer@example.com> 1465981137 +0000
 gpgsig -----BEGIN PGP SIGNATURE-----
  Version: GnuPG v1
-
+ $
  iQEcBAABAgAGBQJXYRjRAAoJEGEJLoW3InGJ3IwIAIY4SA6GxY3BjL60YyvsJPh/
  HRCJwH+w7wt3Yc/9/bW2F+gF72kdHOOs2jfv+OZhq0q4OAN6fvVSczISY/82LpS7
  DVdMQj2/YcHDT4xrDNBnXnviDO9G7am/9OE77kEbXrp7QPxvhjkicHNwy2rEflAA
@@ -128,13 +144,13 @@ mergetag object 04b871796dc0420f8e7561a895b52484b701d51a
  type commit
  tag signedtag
  tagger C O Mitter <committer@example.com> 1465981006 +0000
-
+ $
  signed tag
-
+ $
  signed tag message body
  -----BEGIN PGP SIGNATURE-----
  Version: GnuPG v1
-
+ $
  iQEcBAABAgAGBQJXYRhOAAoJEGEJLoW3InGJklkIAIcnhL7RwEb/+QeX9enkXhxn
  rxfdqrvWd1K80sl2TOt8Bg/NYwrUBw/RWJ+sg/hhHp4WtvE1HDGHlkEz3y11Lkuh
  8tSxS3qKTxXUGozyPGuE90sJfExhZlW4knIQ1wt/yWqM+33E9pN4hzPqLwyrdods
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/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 96240598e3..865074bed4 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -3190,7 +3190,7 @@ that *updated* thing--the old state that you added originally ends up
 not being pointed to by any commit or tree, so it's now a dangling blob
 object.
 
-Similarly, when the "recursive" merge strategy runs, and finds that
+Similarly, when the "ort" merge strategy runs, and finds that
 there are criss-cross merges and thus more than one merge base (which is
 fairly unusual, but it does happen), it will generate one temporary
 midway tree (or possibly even more, if you had lots of criss-crossing
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 9c125f298a..f964f9ba7d 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.32.0
+DEF_VER=v2.35.GIT
 
 LF='
 '
diff --git a/INSTALL b/INSTALL
index 66389ce059..4140a3f5c8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -138,12 +138,15 @@ Issues of note:
 	  BLK_SHA1.  Also included is a version optimized for PowerPC
 	  (PPC_SHA1).
 
-	- "libcurl" library is used by git-http-fetch, git-fetch, and, if
-	  the curl version >= 7.34.0, for git-imap-send.  You might also
-	  want the "curl" executable for debugging purposes. If you do not
-	  use http:// or https:// repositories, and do not want to put
-	  patches into an IMAP mailbox, you do not have to have them
-	  (use NO_CURL).
+	- "libcurl" library is used for fetching and pushing
+	  repositories over http:// or https://, as well as by
+	  git-imap-send if the curl version is >= 7.34.0. If you do
+	  not need that functionality, use NO_CURL to build without
+	  it.
+
+	  Git requires version "7.19.4" or later of "libcurl" to build
+	  without NO_CURL. This version requirement may be bumped in
+	  the future.
 
 	- "expat" library; git-http-push uses it for remote lock
 	  management over DAV.  Similar to "curl" above, this is optional
diff --git a/Makefile b/Makefile
index e79534b192..6f0b4b775f 100644
--- a/Makefile
+++ b/Makefile
@@ -234,6 +234,14 @@ all::
 # Define NO_TRUSTABLE_FILEMODE if your filesystem may claim to support
 # the executable mode bit, but doesn't really do so.
 #
+# Define CSPRNG_METHOD to "arc4random" if your system has arc4random and
+# arc4random_buf, "libbsd" if your system has those functions from libbsd,
+# "getrandom" if your system has getrandom, "getentropy" if your system has
+# getentropy, "rtlgenrandom" for RtlGenRandom (Windows only), or "openssl" if
+# you'd want to use the OpenSSL CSPRNG.  You may set multiple options with
+# spaces, in which case a suitable option will be chosen.  If unset or set to
+# anything else, defaults to using "/dev/urandom".
+#
 # Define NEEDS_MODE_TRANSLATION if your OS strays from the typical file type
 # bits in mode values (e.g. z/OS defines I_SFMT to 0xFF000000 as opposed to the
 # usual 0xF000).
@@ -305,9 +313,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'.
@@ -409,15 +414,6 @@ all::
 # Define NEEDS_LIBRT if your platform requires linking with librt (glibc version
 # before 2.17) for clock_gettime and CLOCK_MONOTONIC.
 #
-# Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily
-# compiles the following initialization:
-#
-#   static const char s[] = ("FOO");
-#
-# and define it to "no" if you need to remove the parentheses () around the
-# constant.  The default is "auto", which means to use parentheses if your
-# compiler is detected to support it.
-#
 # Define HAVE_BSD_SYSCTL if your platform has a BSD-compatible sysctl function.
 #
 # Define HAVE_GETDELIM if your system has the getdelim() function.
@@ -465,6 +461,9 @@ all::
 # the global variable _wpgmptr containing the absolute path of the current
 # executable (this is the case on Windows).
 #
+# INSTALL_STRIP can be set to "-s" to strip binaries during installation,
+# if your $(INSTALL) command supports the option.
+#
 # Define GENERATE_COMPILATION_DATABASE to "yes" to generate JSON compilation
 # database entries during compilation if your compiler supports it, using the
 # `-MJ` flag. The JSON entries will be placed in the `compile_commands/`
@@ -495,10 +494,9 @@ all::
 #        setting this flag the exceptions are removed, and all of
 #        -Wextra is used.
 #
-#    pedantic:
+#    no-pedantic:
 #
-#        Enable -pedantic compilation. This also disables
-#        USE_PARENS_AROUND_GETTEXT_N to produce only relevant warnings.
+#        Disable -pedantic compilation.
 
 GIT-VERSION-FILE: FORCE
 	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -616,7 +614,6 @@ SCRIPT_SH += git-submodule.sh
 SCRIPT_SH += git-web--browse.sh
 
 SCRIPT_LIB += git-mergetool--lib
-SCRIPT_LIB += git-rebase--preserve-merges
 SCRIPT_LIB += git-sh-i18n
 SCRIPT_LIB += git-sh-setup
 
@@ -702,6 +699,7 @@ TEST_BUILTINS_OBJS += test-bloom.o
 TEST_BUILTINS_OBJS += test-chmtime.o
 TEST_BUILTINS_OBJS += test-config.o
 TEST_BUILTINS_OBJS += test-crontab.o
+TEST_BUILTINS_OBJS += test-csprng.o
 TEST_BUILTINS_OBJS += test-ctype.o
 TEST_BUILTINS_OBJS += test-date.o
 TEST_BUILTINS_OBJS += test-delta.o
@@ -715,6 +713,7 @@ TEST_BUILTINS_OBJS += test-example-decorate.o
 TEST_BUILTINS_OBJS += test-fast-rebase.o
 TEST_BUILTINS_OBJS += test-genrandom.o
 TEST_BUILTINS_OBJS += test-genzeros.o
+TEST_BUILTINS_OBJS += test-getcwd.o
 TEST_BUILTINS_OBJS += test-hash-speed.o
 TEST_BUILTINS_OBJS += test-hash.o
 TEST_BUILTINS_OBJS += test-hashmap.o
@@ -726,6 +725,7 @@ TEST_BUILTINS_OBJS += test-mergesort.o
 TEST_BUILTINS_OBJS += test-mktemp.o
 TEST_BUILTINS_OBJS += test-oid-array.o
 TEST_BUILTINS_OBJS += test-oidmap.o
+TEST_BUILTINS_OBJS += test-oidtree.o
 TEST_BUILTINS_OBJS += test-online-cpus.o
 TEST_BUILTINS_OBJS += test-parse-options.o
 TEST_BUILTINS_OBJS += test-parse-pathspec-file.o
@@ -741,6 +741,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
@@ -819,9 +820,15 @@ 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
+GENERATED_H += hook-list.h
+
+.PHONY: generated-hdrs
+generated-hdrs: $(GENERATED_H)
 
 LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
 	$(FIND) . \
@@ -850,6 +857,7 @@ LIB_OBJS += branch.o
 LIB_OBJS += bulk-checkin.o
 LIB_OBJS += bundle.o
 LIB_OBJS += cache-tree.o
+LIB_OBJS += cbtree.o
 LIB_OBJS += chdir-notify.o
 LIB_OBJS += checkout.o
 LIB_OBJS += chunk-format.o
@@ -861,6 +869,7 @@ LIB_OBJS += commit-reach.o
 LIB_OBJS += commit.o
 LIB_OBJS += compat/obstack.o
 LIB_OBJS += compat/terminal.o
+LIB_OBJS += compat/zlib-uncompress2.o
 LIB_OBJS += config.o
 LIB_OBJS += connect.o
 LIB_OBJS += connected.o
@@ -906,6 +915,7 @@ LIB_OBJS += hash-lookup.o
 LIB_OBJS += hashmap.o
 LIB_OBJS += help.o
 LIB_OBJS += hex.o
+LIB_OBJS += hook.o
 LIB_OBJS += ident.o
 LIB_OBJS += json-writer.o
 LIB_OBJS += kwset.o
@@ -945,6 +955,7 @@ LIB_OBJS += object.o
 LIB_OBJS += oid-array.o
 LIB_OBJS += oidmap.o
 LIB_OBJS += oidset.o
+LIB_OBJS += oidtree.o
 LIB_OBJS += pack-bitmap-write.o
 LIB_OBJS += pack-bitmap.o
 LIB_OBJS += pack-check.o
@@ -1106,6 +1117,7 @@ BUILTIN_OBJS += builtin/get-tar-commit-id.o
 BUILTIN_OBJS += builtin/grep.o
 BUILTIN_OBJS += builtin/hash-object.o
 BUILTIN_OBJS += builtin/help.o
+BUILTIN_OBJS += builtin/hook.o
 BUILTIN_OBJS += builtin/index-pack.o
 BUILTIN_OBJS += builtin/init-db.o
 BUILTIN_OBJS += builtin/interpret-trailers.o
@@ -1191,7 +1203,8 @@ THIRD_PARTY_SOURCES += compat/regex/%
 THIRD_PARTY_SOURCES += sha1collisiondetection/%
 THIRD_PARTY_SOURCES += sha1dc/%
 
-GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB)
+# xdiff and reftable libs may in turn depend on what is in libgit.a
+GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(LIB_FILE)
 EXTLIBS =
 
 GIT_USER_AGENT = git/$(GIT_VERSION)
@@ -1203,6 +1216,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,
@@ -1214,9 +1228,12 @@ 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
+SANITIZE_LEAK =
+
 # For the 'coccicheck' target; setting SPATCH_BATCH_SIZE higher will
 # usually result in less CPU usage at the cost of higher peak memory.
 # Setting it to 0 will feed all files in a single spatch invocation.
@@ -1261,6 +1278,7 @@ BASIC_CFLAGS += -DSHA1DC_FORCE_ALIGNED_ACCESS
 endif
 ifneq ($(filter leak,$(SANITIZERS)),)
 BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS
+SANITIZE_LEAK = YesCompiledWithIt
 endif
 ifneq ($(filter address,$(SANITIZERS)),)
 NO_REGEX = NeededForASAN
@@ -1281,6 +1299,7 @@ endif
 
 ifeq ($(COMPUTE_HEADER_DEPENDENCIES),auto)
 dep_check = $(shell $(CC) $(ALL_CFLAGS) \
+	-Wno-pedantic \
 	-c -MF /dev/null -MQ /dev/null -MMD -MP \
 	-x c /dev/null -o /dev/null 2>&1; \
 	echo $$?)
@@ -1306,6 +1325,7 @@ endif
 
 ifeq ($(GENERATE_COMPILATION_DATABASE),yes)
 compdb_check = $(shell $(CC) $(ALL_CFLAGS) \
+	-Wno-pedantic \
 	-c -MJ /dev/null \
 	-x c /dev/null -o /dev/null 2>&1; \
 	echo $$?)
@@ -1343,14 +1363,6 @@ ifneq (,$(SOCKLEN_T))
 	BASIC_CFLAGS += -Dsocklen_t=$(SOCKLEN_T)
 endif
 
-ifeq (yes,$(USE_PARENS_AROUND_GETTEXT_N))
-	BASIC_CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=1
-else
-ifeq (no,$(USE_PARENS_AROUND_GETTEXT_N))
-	BASIC_CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=0
-endif
-endif
-
 ifeq ($(uname_S),Darwin)
 	ifndef NO_FINK
 		ifeq ($(shell test -d /sw/lib && echo y),y)
@@ -1432,15 +1444,8 @@ else
 	REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)
 	PROGRAM_OBJS += http-fetch.o
 	PROGRAMS += $(REMOTE_CURL_NAMES)
-	curl_check := $(shell (echo 070908; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p)
-	ifeq "$(curl_check)" "070908"
-		ifndef NO_EXPAT
-			PROGRAM_OBJS += http-push.o
-		else
-			EXCLUDED_PROGRAMS += git-http-push
-		endif
-	else
-		EXCLUDED_PROGRAMS += git-http-push
+	ifndef NO_EXPAT
+		PROGRAM_OBJS += http-push.o
 	endif
 	curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p)
 	ifeq "$(curl_check)" "072200"
@@ -1881,7 +1886,7 @@ ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT
 endif
 
 ifndef NO_MSGFMT_EXTENDED_OPTIONS
-	MSGFMT += --check --statistics
+	MSGFMT += --check
 endif
 
 ifdef HAVE_CLOCK_GETTIME
@@ -1908,11 +1913,40 @@ ifdef HAVE_GETDELIM
 	BASIC_CFLAGS += -DHAVE_GETDELIM
 endif
 
+ifneq ($(findstring arc4random,$(CSPRNG_METHOD)),)
+	BASIC_CFLAGS += -DHAVE_ARC4RANDOM
+endif
+
+ifneq ($(findstring libbsd,$(CSPRNG_METHOD)),)
+	BASIC_CFLAGS += -DHAVE_ARC4RANDOM_LIBBSD
+	EXTLIBS += -lbsd
+endif
+
+ifneq ($(findstring getrandom,$(CSPRNG_METHOD)),)
+	BASIC_CFLAGS += -DHAVE_GETRANDOM
+endif
+
+ifneq ($(findstring getentropy,$(CSPRNG_METHOD)),)
+	BASIC_CFLAGS += -DHAVE_GETENTROPY
+endif
+
+ifneq ($(findstring rtlgenrandom,$(CSPRNG_METHOD)),)
+	BASIC_CFLAGS += -DHAVE_RTLGENRANDOM
+endif
+
+ifneq ($(findstring openssl,$(CSPRNG_METHOD)),)
+	BASIC_CFLAGS += -DHAVE_OPENSSL_CSPRNG
+endif
+
 ifneq ($(PROCFS_EXECUTABLE_PATH),)
 	procfs_executable_path_SQ = $(subst ','\'',$(PROCFS_EXECUTABLE_PATH))
 	BASIC_CFLAGS += '-DPROCFS_EXECUTABLE_PATH="$(procfs_executable_path_SQ)"'
 endif
 
+ifndef HAVE_PLATFORM_PROCINFO
+	COMPAT_OBJS += compat/stub/procinfo.o
+endif
+
 ifdef HAVE_NS_GET_EXECUTABLE_PATH
 	BASIC_CFLAGS += -DHAVE_NS_GET_EXECUTABLE_PATH
 endif
@@ -2108,11 +2142,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)
 
@@ -2219,6 +2248,7 @@ git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
 		$(filter %.o,$^) $(LIBS)
 
 help.sp help.s help.o: command-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 GIT-PREFIX
 builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
@@ -2226,6 +2256,12 @@ builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
 	'-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)"' \
@@ -2243,43 +2279,42 @@ $(BUILT_INS): git$X
 config-list.h: generate-configlist.sh
 
 config-list.h: Documentation/*config.txt Documentation/config/*.txt
-	$(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh \
-		>$@+ && mv $@+ $@
+	$(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh >$@
 
 command-list.h: generate-cmdlist.sh command-list.txt
 
 command-list.h: $(wildcard Documentation/git*.txt)
 	$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh \
 		$(patsubst %,--exclude-program %,$(EXCLUDED_PROGRAMS)) \
-		command-list.txt >$@+ && mv $@+ $@
+		command-list.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 $@+ && \
@@ -2438,7 +2473,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)
 
@@ -2454,9 +2518,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)
 
@@ -2473,7 +2544,6 @@ dep_args = -MF $(dep_file) -MQ $@ -MMD -MP
 endif
 
 ifneq ($(COMPUTE_HEADER_DEPENDENCIES),yes)
-dep_dirs =
 missing_dep_dirs =
 dep_args =
 endif
@@ -2514,13 +2584,6 @@ ifneq ($(dep_files_present),)
 include $(dep_files_present)
 endif
 else
-# Dependencies on header files, for platforms that do not support
-# the gcc -MMD option.
-#
-# Dependencies on automatically generated headers such as command-list.h
-# should _not_ be included here, since they are necessary even when
-# building an object for the first time.
-
 $(OBJECTS): $(LIB_H) $(GENERATED_H)
 endif
 
@@ -2598,11 +2661,21 @@ $(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)$(AR) $(ARFLAGS) $@ $^
+	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
 
 $(XDIFF_LIB): $(XDIFF_OBJS)
-	$(QUIET_AR)$(AR) $(ARFLAGS) $@ $^
+	$(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
 
@@ -2645,7 +2718,6 @@ XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \
 	--keyword=__ --keyword=N__ --keyword="__n:1,2"
 LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
 LOCALIZED_SH = $(SCRIPT_SH)
-LOCALIZED_SH += git-rebase--preserve-merges.sh
 LOCALIZED_SH += git-sh-setup.sh
 LOCALIZED_PERL = $(SCRIPT_PERL)
 
@@ -2742,19 +2814,25 @@ FIND_SOURCE_FILES = ( \
 		| sed -e 's|^\./||' \
 	)
 
-$(ETAGS_TARGET): FORCE
-	$(QUIET_GEN)$(RM) "$(ETAGS_TARGET)+" && \
-	$(FIND_SOURCE_FILES) | xargs etags -a -o "$(ETAGS_TARGET)+" && \
-	mv "$(ETAGS_TARGET)+" "$(ETAGS_TARGET)"
+FOUND_SOURCE_FILES = $(shell $(FIND_SOURCE_FILES))
 
-tags: FORCE
-	$(QUIET_GEN)$(RM) tags+ && \
-	$(FIND_SOURCE_FILES) | xargs ctags -a -o tags+ && \
-	mv tags+ tags
+$(ETAGS_TARGET): $(FOUND_SOURCE_FILES)
+	$(QUIET_GEN)$(RM) $@+ && \
+	echo $(FOUND_SOURCE_FILES) | xargs etags -a -o $@+ && \
+	mv $@+ $@
 
-cscope:
-	$(RM) cscope*
-	$(FIND_SOURCE_FILES) | xargs cscope -b
+tags: $(FOUND_SOURCE_FILES)
+	$(QUIET_GEN)$(RM) $@+ && \
+	echo $(FOUND_SOURCE_FILES) | xargs ctags -a -o $@+ && \
+	mv $@+ $@
+
+cscope.out: $(FOUND_SOURCE_FILES)
+	$(QUIET_GEN)$(RM) $@+ && \
+	echo $(FOUND_SOURCE_FILES) | xargs cscope -f$@+ -b && \
+	mv $@+ $@
+
+.PHONY: cscope
+cscope: cscope.out
 
 ### Detect prefix changes
 TRACK_PREFIX = $(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ):\
@@ -2804,6 +2882,7 @@ GIT-BUILD-OPTIONS: FORCE
 	@echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SOCKETS)))'\' >>$@+
 	@echo PAGER_ENV=\''$(subst ','\'',$(subst ','\'',$(PAGER_ENV)))'\' >>$@+
 	@echo DC_SHA1=\''$(subst ','\'',$(subst ','\'',$(DC_SHA1)))'\' >>$@+
+	@echo SANITIZE_LEAK=\''$(subst ','\'',$(subst ','\'',$(SANITIZE_LEAK)))'\' >>$@+
 	@echo X=\'$(X)\' >>$@+
 ifdef TEST_OUTPUT_DIRECTORY
 	@echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@+
@@ -2845,6 +2924,11 @@ endif
 ifdef GIT_TEST_PERL_FATAL_WARNINGS
 	@echo GIT_TEST_PERL_FATAL_WARNINGS=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_PERL_FATAL_WARNINGS)))'\' >>$@+
 endif
+ifdef RUNTIME_PREFIX
+	@echo RUNTIME_PREFIX=\'true\' >>$@+
+else
+	@echo RUNTIME_PREFIX=\'false\' >>$@+
+endif
 	@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi
 
 ### Detect Python interpreter path changes
@@ -2891,7 +2975,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
@@ -2899,14 +2983,16 @@ check-sha1:: t/helper/test-tool$X
 
 SP_OBJ = $(patsubst %.o,%.sp,$(C_OBJ))
 
-$(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE
+$(SP_OBJ): %.sp: %.c %.o
 	$(QUIET_SP)cgcc -no-compile $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) \
-		$(SPARSE_FLAGS) $(SP_EXTRA_FLAGS) $<
+		-Wsparse-error \
+		$(SPARSE_FLAGS) $(SP_EXTRA_FLAGS) $< && \
+	>$@
 
-.PHONY: sparse $(SP_OBJ)
+.PHONY: sparse
 sparse: $(SP_OBJ)
 
-EXCEPT_HDRS := command-list.h config-list.h unicode-width.h compat/% xdiff/%
+EXCEPT_HDRS := $(GENERATED_H) unicode-width.h compat/% xdiff/%
 ifndef GCRYPT_SHA256
 	EXCEPT_HDRS += sha256/gcrypt.h
 endif
@@ -2928,7 +3014,8 @@ hdr-check: $(HCO)
 style:
 	git clang-format --style file --diff --extensions c,h
 
-check: config-list.h command-list.h
+.PHONY: check
+check: $(GENERATED_H)
 	@if sparse; \
 	then \
 		echo >&2 "Use 'make sparse' instead"; \
@@ -2938,7 +3025,7 @@ check: config-list.h command-list.h
 		exit 1; \
 	fi
 
-FOUND_C_SOURCES = $(filter %.c,$(shell $(FIND_SOURCE_FILES)))
+FOUND_C_SOURCES = $(filter %.c,$(FOUND_SOURCE_FILES))
 COCCI_SOURCES = $(filter-out $(THIRD_PARTY_SOURCES),$(FOUND_C_SOURCES))
 
 %.cocci.patch: %.cocci $(COCCI_SOURCES)
@@ -2991,7 +3078,8 @@ mergetools_instdir = $(prefix)/$(mergetoolsdir)
 endif
 mergetools_instdir_SQ = $(subst ','\'',$(mergetools_instdir))
 
-install_bindir_programs := $(patsubst %,%$X,$(BINDIR_PROGRAMS_NEED_X)) $(BINDIR_PROGRAMS_NO_X)
+install_bindir_xprograms := $(patsubst %,%$X,$(BINDIR_PROGRAMS_NEED_X))
+install_bindir_programs := $(install_bindir_xprograms) $(BINDIR_PROGRAMS_NO_X)
 
 .PHONY: profile-install profile-fast-install
 profile-install: profile
@@ -3000,12 +3088,17 @@ profile-install: profile
 profile-fast-install: profile-fast
 	$(MAKE) install
 
+INSTALL_STRIP =
+
 install: all
 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+	$(INSTALL) $(INSTALL_STRIP) $(PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+	$(INSTALL) $(SCRIPTS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 	$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-	$(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)'
+	$(INSTALL) $(INSTALL_STRIP) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)'
+	$(INSTALL) $(BINDIR_PROGRAMS_NO_X) '$(DESTDIR_SQ)$(bindir_SQ)'
+
 ifdef MSVC
 	# We DO NOT install the individual foo.o.pdb files because they
 	# have already been rolled up into the exe's pdb file.
@@ -3086,8 +3179,7 @@ endif
 		  ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
 		  ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
 		  cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; } \
-	done && \
-	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
+	done
 
 .PHONY: install-gitweb install-doc install-man install-man-perl install-html install-info install-pdf
 .PHONY: quick-install-doc quick-install-man quick-install-html
@@ -3221,10 +3313,11 @@ 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)
+	$(RM) $(SP_OBJ)
 	$(RM) $(HCC)
 	$(RM) -r bin-wrappers $(dep_dirs) $(compdb_dir) compile_commands.json
 	$(RM) -r po/build/
@@ -3263,7 +3356,7 @@ endif
 
 .PHONY: all install profile-clean cocciclean clean strip
 .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
-.PHONY: FORCE cscope
+.PHONY: FORCE
 
 ### Check documentation
 #
diff --git a/README.md b/README.md
index eb8115e6b0..7ce4f05bae 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
 =========================================================
@@ -32,10 +32,16 @@ installed).
 The user discussion and development of Git take place on the Git
 mailing list -- everyone is welcome to post bug reports, feature
 requests, comments and patches to git@vger.kernel.org (read
-[Documentation/SubmittingPatches][] for instructions on patch submission).
+[Documentation/SubmittingPatches][] for instructions on patch submission
+and [Documentation/CodingGuidelines][]).
+
+Those wishing to help with error message, usage and informational message
+string translations (localization l10) should see [po/README.md][]
+(a `po` file is a Portable Object file that holds the translations).
+
 To subscribe to the list, send an email with just "subscribe git" in
-the body to majordomo@vger.kernel.org. The mailing list archives are
-available at <https://lore.kernel.org/git/>,
+the body to majordomo@vger.kernel.org (not the Git list). The mailing
+list archives are available at <https://lore.kernel.org/git/>,
 <http://marc.info/?l=git> and other archival sites.
 
 Issues which are security relevant should be disclosed privately to
@@ -64,3 +70,5 @@ and the name as (depending on your mood):
 [Documentation/giteveryday.txt]: Documentation/giteveryday.txt
 [Documentation/gitcvs-migration.txt]: Documentation/gitcvs-migration.txt
 [Documentation/SubmittingPatches]: Documentation/SubmittingPatches
+[Documentation/CodingGuidelines]: Documentation/CodingGuidelines
+[po/README.md]: po/README.md
diff --git a/RelNotes b/RelNotes
index f071367dc3..81052262e0 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.33.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.36.0.txt
\ No newline at end of file
diff --git a/add-interactive.c b/add-interactive.c
index 36ebdbdf7e..6498ae196f 100644
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -102,8 +102,12 @@ struct prefix_item_list {
 	int *selected; /* for multi-selections */
 	size_t min_length, max_length;
 };
-#define PREFIX_ITEM_LIST_INIT \
-	{ STRING_LIST_INIT_DUP, STRING_LIST_INIT_NODUP, NULL, 1, 4 }
+#define PREFIX_ITEM_LIST_INIT { \
+	.items = STRING_LIST_INIT_DUP, \
+	.sorted = STRING_LIST_INIT_NODUP, \
+	.min_length = 1, \
+	.max_length = 4, \
+}
 
 static void prefix_item_list_clear(struct prefix_item_list *list)
 {
diff --git a/add-patch.c b/add-patch.c
index 2fad92ca37..55d719f784 100644
--- a/add-patch.c
+++ b/add-patch.c
@@ -280,6 +280,7 @@ static void add_p_state_clear(struct add_p_state *s)
 	clear_add_i_state(&s->s);
 }
 
+__attribute__((format (printf, 2, 3)))
 static void err(struct add_p_state *s, const char *fmt, ...)
 {
 	va_list args;
@@ -382,6 +383,17 @@ static int is_octal(const char *p, size_t len)
 	return 1;
 }
 
+static void complete_file(char marker, struct hunk *hunk)
+{
+	if (marker == '-' || marker == '+')
+		/*
+		 * Last hunk ended in non-context line (i.e. it
+		 * appended lines to the file, so there are no
+		 * trailing context lines).
+		 */
+		hunk->splittable_into++;
+}
+
 static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
 {
 	struct strvec args = STRVEC_INIT;
@@ -412,7 +424,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);
@@ -430,7 +442,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);
@@ -471,6 +483,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
 			eol = pend;
 
 		if (starts_with(p, "diff ")) {
+			complete_file(marker, hunk);
 			ALLOC_GROW_BY(s->file_diff, s->file_diff_nr, 1,
 				   file_diff_alloc);
 			file_diff = s->file_diff + s->file_diff_nr - 1;
@@ -597,13 +610,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
 				file_diff->hunk->colored_end = hunk->colored_end;
 		}
 	}
-
-	if (marker == '-' || marker == '+')
-		/*
-		 * Last hunk ended in non-context line (i.e. it appended lines
-		 * to the file, so there are no trailing context lines).
-		 */
-		hunk->splittable_into++;
+	complete_file(marker, hunk);
 
 	/* non-colored shorter than colored? */
 	if (colored_p != colored_pend) {
diff --git a/advice.c b/advice.c
index 0b9c89c48a..e00d30254c 100644
--- a/advice.c
+++ b/advice.c
@@ -4,37 +4,6 @@
 #include "help.h"
 #include "string-list.h"
 
-int advice_fetch_show_forced_updates = 1;
-int advice_push_update_rejected = 1;
-int advice_push_non_ff_current = 1;
-int advice_push_non_ff_matching = 1;
-int advice_push_already_exists = 1;
-int advice_push_fetch_first = 1;
-int advice_push_needs_force = 1;
-int advice_push_unqualified_ref_name = 1;
-int advice_push_ref_needs_update = 1;
-int advice_status_hints = 1;
-int advice_status_u_option = 1;
-int advice_status_ahead_behind_warning = 1;
-int advice_commit_before_merge = 1;
-int advice_reset_quiet_warning = 1;
-int advice_resolve_conflict = 1;
-int advice_sequencer_in_use = 1;
-int advice_implicit_identity = 1;
-int advice_detached_head = 1;
-int advice_set_upstream_failure = 1;
-int advice_object_name_warning = 1;
-int advice_amworkdir = 1;
-int advice_rm_hints = 1;
-int advice_add_embedded_repo = 1;
-int advice_ignored_hook = 1;
-int advice_waiting_for_editor = 1;
-int advice_graft_file_deprecated = 1;
-int advice_checkout_ambiguous_remote_branch_name = 1;
-int advice_submodule_alternate_error_strategy_die = 1;
-int advice_add_ignored_file = 1;
-int advice_add_empty_pathspec = 1;
-
 static int advice_use_color = -1;
 static char advice_colors[][COLOR_MAXLEN] = {
 	GIT_COLOR_RESET,
@@ -63,49 +32,12 @@ static const char *advise_get_color(enum color_advice ix)
 }
 
 static struct {
-	const char *name;
-	int *preference;
-} advice_config[] = {
-	{ "fetchShowForcedUpdates", &advice_fetch_show_forced_updates },
-	{ "pushUpdateRejected", &advice_push_update_rejected },
-	{ "pushNonFFCurrent", &advice_push_non_ff_current },
-	{ "pushNonFFMatching", &advice_push_non_ff_matching },
-	{ "pushAlreadyExists", &advice_push_already_exists },
-	{ "pushFetchFirst", &advice_push_fetch_first },
-	{ "pushNeedsForce", &advice_push_needs_force },
-	{ "pushUnqualifiedRefName", &advice_push_unqualified_ref_name },
-	{ "pushRefNeedsUpdate", &advice_push_ref_needs_update },
-	{ "statusHints", &advice_status_hints },
-	{ "statusUoption", &advice_status_u_option },
-	{ "statusAheadBehindWarning", &advice_status_ahead_behind_warning },
-	{ "commitBeforeMerge", &advice_commit_before_merge },
-	{ "resetQuiet", &advice_reset_quiet_warning },
-	{ "resolveConflict", &advice_resolve_conflict },
-	{ "sequencerInUse", &advice_sequencer_in_use },
-	{ "implicitIdentity", &advice_implicit_identity },
-	{ "detachedHead", &advice_detached_head },
-	{ "setUpstreamFailure", &advice_set_upstream_failure },
-	{ "objectNameWarning", &advice_object_name_warning },
-	{ "amWorkDir", &advice_amworkdir },
-	{ "rmHints", &advice_rm_hints },
-	{ "addEmbeddedRepo", &advice_add_embedded_repo },
-	{ "ignoredHook", &advice_ignored_hook },
-	{ "waitingForEditor", &advice_waiting_for_editor },
-	{ "graftFileDeprecated", &advice_graft_file_deprecated },
-	{ "checkoutAmbiguousRemoteBranchName", &advice_checkout_ambiguous_remote_branch_name },
-	{ "submoduleAlternateErrorStrategyDie", &advice_submodule_alternate_error_strategy_die },
-	{ "addIgnoredFile", &advice_add_ignored_file },
-	{ "addEmptyPathspec", &advice_add_empty_pathspec },
-
-	/* make this an alias for backward compatibility */
-	{ "pushNonFastForward", &advice_push_update_rejected }
-};
-
-static struct {
 	const char *key;
 	int enabled;
 } advice_setting[] = {
 	[ADVICE_ADD_EMBEDDED_REPO]			= { "addEmbeddedRepo", 1 },
+	[ADVICE_ADD_EMPTY_PATHSPEC]			= { "addEmptyPathspec", 1 },
+	[ADVICE_ADD_IGNORED_FILE]			= { "addIgnoredFile", 1 },
 	[ADVICE_AM_WORK_DIR] 				= { "amWorkDir", 1 },
 	[ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME] 	= { "checkoutAmbiguousRemoteBranchName", 1 },
 	[ADVICE_COMMIT_BEFORE_MERGE]			= { "commitBeforeMerge", 1 },
@@ -133,10 +65,12 @@ static struct {
 	[ADVICE_RM_HINTS]				= { "rmHints", 1 },
 	[ADVICE_SEQUENCER_IN_USE]			= { "sequencerInUse", 1 },
 	[ADVICE_SET_UPSTREAM_FAILURE]			= { "setUpstreamFailure", 1 },
+	[ADVICE_SKIPPED_CHERRY_PICKS]			= { "skippedCherryPicks", 1 },
 	[ADVICE_STATUS_AHEAD_BEHIND_WARNING]		= { "statusAheadBehindWarning", 1 },
 	[ADVICE_STATUS_HINTS]				= { "statusHints", 1 },
 	[ADVICE_STATUS_U_OPTION]			= { "statusUoption", 1 },
 	[ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE] = { "submoduleAlternateErrorStrategyDie", 1 },
+	[ADVICE_SUBMODULES_NOT_UPDATED] 		= { "submodulesNotUpdated", 1 },
 	[ADVICE_UPDATE_SPARSE_PATH]			= { "updateSparsePath", 1 },
 	[ADVICE_WAITING_FOR_EDITOR]			= { "waitingForEditor", 1 },
 };
@@ -221,13 +155,6 @@ int git_default_advice_config(const char *var, const char *value)
 	if (!skip_prefix(var, "advice.", &k))
 		return 0;
 
-	for (i = 0; i < ARRAY_SIZE(advice_config); i++) {
-		if (strcasecmp(k, advice_config[i].name))
-			continue;
-		*advice_config[i].preference = git_config_bool(var, value);
-		break;
-	}
-
 	for (i = 0; i < ARRAY_SIZE(advice_setting); i++) {
 		if (strcasecmp(k, advice_setting[i].key))
 			continue;
@@ -262,7 +189,7 @@ int error_resolve_conflict(const char *me)
 		error(_("It is not possible to %s because you have unmerged files."),
 			me);
 
-	if (advice_resolve_conflict)
+	if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
 		/*
 		 * Message used both when 'git commit' fails and when
 		 * other commands doing a merge do.
@@ -281,11 +208,16 @@ void NORETURN die_resolve_conflict(const char *me)
 void NORETURN die_conclude_merge(void)
 {
 	error(_("You have not concluded your merge (MERGE_HEAD exists)."));
-	if (advice_resolve_conflict)
+	if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
 		advise(_("Please, commit your changes before merging."));
 	die(_("Exiting because of unfinished merge."));
 }
 
+void NORETURN die_ff_impossible(void)
+{
+	die(_("Not possible to fast-forward, aborting."));
+}
+
 void advise_on_updating_sparse_paths(struct string_list *pathspec_list)
 {
 	struct string_list_item *item;
@@ -293,15 +225,16 @@ void advise_on_updating_sparse_paths(struct string_list *pathspec_list)
 	if (!pathspec_list->nr)
 		return;
 
-	fprintf(stderr, _("The following pathspecs didn't match any"
-			  " eligible path, but they do match index\n"
-			  "entries outside the current sparse checkout:\n"));
+	fprintf(stderr, _("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"));
 	for_each_string_list_item(item, pathspec_list)
 		fprintf(stderr, "%s\n", item->string);
 
 	advise_if_enabled(ADVICE_UPDATE_SPARSE_PATH,
-			  _("Disable or modify the sparsity rules if you intend"
-			    " to update such entries."));
+			  _("If you intend to update such entries, try one of the following:\n"
+			    "* Use the --sparse option.\n"
+			    "* Disable or modify the sparsity rules."));
 }
 
 void detach_advice(const char *new_name)
diff --git a/advice.h b/advice.h
index bd26c385d0..a7521d6087 100644
--- a/advice.h
+++ b/advice.h
@@ -5,37 +5,6 @@
 
 struct string_list;
 
-extern int advice_fetch_show_forced_updates;
-extern int advice_push_update_rejected;
-extern int advice_push_non_ff_current;
-extern int advice_push_non_ff_matching;
-extern int advice_push_already_exists;
-extern int advice_push_fetch_first;
-extern int advice_push_needs_force;
-extern int advice_push_unqualified_ref_name;
-extern int advice_push_ref_needs_update;
-extern int advice_status_hints;
-extern int advice_status_u_option;
-extern int advice_status_ahead_behind_warning;
-extern int advice_commit_before_merge;
-extern int advice_reset_quiet_warning;
-extern int advice_resolve_conflict;
-extern int advice_sequencer_in_use;
-extern int advice_implicit_identity;
-extern int advice_detached_head;
-extern int advice_set_upstream_failure;
-extern int advice_object_name_warning;
-extern int advice_amworkdir;
-extern int advice_rm_hints;
-extern int advice_add_embedded_repo;
-extern int advice_ignored_hook;
-extern int advice_waiting_for_editor;
-extern int advice_graft_file_deprecated;
-extern int advice_checkout_ambiguous_remote_branch_name;
-extern int advice_submodule_alternate_error_strategy_die;
-extern int advice_add_ignored_file;
-extern int advice_add_empty_pathspec;
-
 /*
  * To add a new advice, you need to:
  * Define a new advice_type.
@@ -45,6 +14,8 @@ extern int advice_add_empty_pathspec;
  */
  enum advice_type {
 	ADVICE_ADD_EMBEDDED_REPO,
+	ADVICE_ADD_EMPTY_PATHSPEC,
+	ADVICE_ADD_IGNORED_FILE,
 	ADVICE_AM_WORK_DIR,
 	ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME,
 	ADVICE_COMMIT_BEFORE_MERGE,
@@ -73,8 +44,10 @@ extern int advice_add_empty_pathspec;
 	ADVICE_STATUS_HINTS,
 	ADVICE_STATUS_U_OPTION,
 	ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE,
+	ADVICE_SUBMODULES_NOT_UPDATED,
 	ADVICE_UPDATE_SPARSE_PATH,
 	ADVICE_WAITING_FOR_EDITOR,
+	ADVICE_SKIPPED_CHERRY_PICKS,
 };
 
 int git_default_advice_config(const char *var, const char *value);
@@ -90,11 +63,13 @@ int advice_enabled(enum advice_type type);
 /**
  * Checks the visibility of the advice before printing.
  */
+__attribute__((format (printf, 2, 3)))
 void advise_if_enabled(enum advice_type type, const char *advice, ...);
 
 int error_resolve_conflict(const char *me);
 void NORETURN die_resolve_conflict(const char *me);
 void NORETURN die_conclude_merge(void);
+void NORETURN die_ff_impossible(void);
 void advise_on_updating_sparse_paths(struct string_list *pathspec_list);
 void detach_advice(const char *new_name);
 
diff --git a/apply.c b/apply.c
index 44bc31d6eb..0912307bd9 100644
--- a/apply.c
+++ b/apply.c
@@ -103,7 +103,8 @@ int init_apply_state(struct apply_state *state,
 	state->linenr = 1;
 	string_list_init_nodup(&state->fn_table);
 	string_list_init_nodup(&state->limit_by_name);
-	string_list_init_nodup(&state->symlink_changes);
+	strset_init(&state->removed_symlinks);
+	strset_init(&state->kept_symlinks);
 	strbuf_init(&state->root, 0);
 
 	git_apply_config();
@@ -117,7 +118,8 @@ int init_apply_state(struct apply_state *state,
 void clear_apply_state(struct apply_state *state)
 {
 	string_list_clear(&state->limit_by_name, 0);
-	string_list_clear(&state->symlink_changes, 0);
+	strset_clear(&state->removed_symlinks);
+	strset_clear(&state->kept_symlinks);
 	strbuf_release(&state->root);
 
 	/* &state->fn_table is cleared at the end of apply_patch() */
@@ -133,10 +135,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 +149,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))
@@ -1917,6 +1919,7 @@ static struct fragment *parse_binary_hunk(struct apply_state *state,
 
 	state->linenr++;
 	buffer += llen;
+	size -= llen;
 	while (1) {
 		int byte_length, max_byte_length, newsize;
 		llen = linelen(buffer, size);
@@ -3467,6 +3470,21 @@ static int load_preimage(struct apply_state *state,
 	return 0;
 }
 
+static int resolve_to(struct image *image, const struct object_id *result_id)
+{
+	unsigned long size;
+	enum object_type type;
+
+	clear_image(image);
+
+	image->buf = read_object_file(result_id, &type, &size);
+	if (!image->buf || type != OBJ_BLOB)
+		die("unable to read blob object %s", oid_to_hex(result_id));
+	image->len = size;
+
+	return 0;
+}
+
 static int three_way_merge(struct apply_state *state,
 			   struct image *image,
 			   char *path,
@@ -3476,7 +3494,13 @@ static int three_way_merge(struct apply_state *state,
 {
 	mmfile_t base_file, our_file, their_file;
 	mmbuffer_t result = { NULL };
-	int status;
+	enum ll_merge_result status;
+
+	/* resolve trivial cases first */
+	if (oideq(base, ours))
+		return resolve_to(image, theirs);
+	else if (oideq(base, theirs) || oideq(ours, theirs))
+		return resolve_to(image, ours);
 
 	read_mmblob(&base_file, base);
 	read_mmblob(&our_file, ours);
@@ -3487,6 +3511,9 @@ static int three_way_merge(struct apply_state *state,
 			  &their_file, "theirs",
 			  state->repo->index,
 			  NULL);
+	if (status == LL_MERGE_BINARY_CONFLICT)
+		warning("Cannot merge binary files: %s (%s vs. %s)",
+			path, "ours", "theirs");
 	free(base_file.ptr);
 	free(our_file.ptr);
 	free(their_file.ptr);
@@ -3560,7 +3587,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 */
@@ -3790,59 +3819,31 @@ static int check_to_create(struct apply_state *state,
 	return 0;
 }
 
-static uintptr_t register_symlink_changes(struct apply_state *state,
-					  const char *path,
-					  uintptr_t what)
-{
-	struct string_list_item *ent;
-
-	ent = string_list_lookup(&state->symlink_changes, path);
-	if (!ent) {
-		ent = string_list_insert(&state->symlink_changes, path);
-		ent->util = (void *)0;
-	}
-	ent->util = (void *)(what | ((uintptr_t)ent->util));
-	return (uintptr_t)ent->util;
-}
-
-static uintptr_t check_symlink_changes(struct apply_state *state, const char *path)
-{
-	struct string_list_item *ent;
-
-	ent = string_list_lookup(&state->symlink_changes, path);
-	if (!ent)
-		return 0;
-	return (uintptr_t)ent->util;
-}
-
 static void prepare_symlink_changes(struct apply_state *state, struct patch *patch)
 {
 	for ( ; patch; patch = patch->next) {
 		if ((patch->old_name && S_ISLNK(patch->old_mode)) &&
 		    (patch->is_rename || patch->is_delete))
 			/* the symlink at patch->old_name is removed */
-			register_symlink_changes(state, patch->old_name, APPLY_SYMLINK_GOES_AWAY);
+			strset_add(&state->removed_symlinks, patch->old_name);
 
 		if (patch->new_name && S_ISLNK(patch->new_mode))
 			/* the symlink at patch->new_name is created or remains */
-			register_symlink_changes(state, patch->new_name, APPLY_SYMLINK_IN_RESULT);
+			strset_add(&state->kept_symlinks, patch->new_name);
 	}
 }
 
 static int path_is_beyond_symlink_1(struct apply_state *state, struct strbuf *name)
 {
 	do {
-		unsigned int change;
-
 		while (--name->len && name->buf[name->len] != '/')
 			; /* scan backwards */
 		if (!name->len)
 			break;
 		name->buf[name->len] = '\0';
-		change = check_symlink_changes(state, name->buf);
-		if (change & APPLY_SYMLINK_IN_RESULT)
+		if (strset_contains(&state->kept_symlinks, name->buf))
 			return 1;
-		if (change & APPLY_SYMLINK_GOES_AWAY)
+		if (strset_contains(&state->removed_symlinks, name->buf))
 			/*
 			 * This cannot be "return 0", because we may
 			 * see a new one created at a higher level.
@@ -4730,8 +4731,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;
 	}
 
@@ -5049,7 +5052,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),
@@ -5059,6 +5062,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..4052da50c0 100644
--- a/apply.h
+++ b/apply.h
@@ -4,6 +4,7 @@
 #include "hash.h"
 #include "lockfile.h"
 #include "string-list.h"
+#include "strmap.h"
 
 struct repository;
 
@@ -25,20 +26,6 @@ enum apply_verbosity {
 	verbosity_verbose = 1
 };
 
-/*
- * We need to keep track of how symlinks in the preimage are
- * manipulated by the patches.  A patch to add a/b/c where a/b
- * is a symlink should not be allowed to affect the directory
- * the symlink points at, but if the same patch removes a/b,
- * it is perfectly fine, as the patch removes a/b to make room
- * to create a directory a/b so that a/b/c can be created.
- *
- * See also "struct string_list symlink_changes" in "struct
- * apply_state".
- */
-#define APPLY_SYMLINK_GOES_AWAY 01
-#define APPLY_SYMLINK_IN_RESULT 02
-
 struct apply_state {
 	const char *prefix;
 
@@ -66,6 +53,7 @@ struct apply_state {
 	int threeway;
 	int unidiff_zero;
 	int unsafe_paths;
+	int allow_empty;
 
 	/* Other non boolean parameters */
 	struct repository *repo;
@@ -85,7 +73,16 @@ struct apply_state {
 
 	/* Various "current state" */
 	int linenr; /* current line number */
-	struct string_list symlink_changes; /* we have to track symlinks */
+	/*
+	 * We need to keep track of how symlinks in the preimage are
+	 * manipulated by the patches.  A patch to add a/b/c where a/b
+	 * is a symlink should not be allowed to affect the directory
+	 * the symlink points at, but if the same patch removes a/b,
+	 * it is perfectly fine, as the patch removes a/b to make room
+	 * to create a directory a/b so that a/b/c can be created.
+	 */
+	struct strset removed_symlinks;
+	struct strset kept_symlinks;
 
 	/*
 	 * For "diff-stat" like behaviour, we keep track of the biggest change
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 3c266d1d7b..d571249cf3 100644
--- a/archive.c
+++ b/archive.c
@@ -185,13 +185,13 @@ 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;
 }
 
-static void queue_directory(const unsigned char *sha1,
+static void queue_directory(const struct object_id *oid,
 		struct strbuf *base, const char *filename,
 		unsigned mode, struct archiver_context *c)
 {
@@ -203,7 +203,7 @@ static void queue_directory(const unsigned char *sha1,
 	d->mode	   = mode;
 	c->bottom  = d;
 	d->len = xsnprintf(d->path, len, "%.*s%s/", (int)base->len, base->buf, filename);
-	oidread(&d->oid, sha1);
+	oidcpy(&d->oid, oid);
 }
 
 static int write_directory(struct archiver_context *c)
@@ -250,8 +250,7 @@ static int queue_or_write_archive_entry(const struct object_id *oid,
 
 		if (check_attr_export_ignore(check))
 			return 0;
-		queue_directory(oid->hash, base, filename,
-				mode, c);
+		queue_directory(oid, base, filename, mode, c);
 		return READ_TREE_RECURSIVE;
 	}
 
@@ -339,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,
@@ -578,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/attr.c b/attr.c
index d029e681f2..79adaa50ea 100644
--- a/attr.c
+++ b/attr.c
@@ -14,6 +14,7 @@
 #include "utf8.h"
 #include "quote.h"
 #include "thread-utils.h"
+#include "dir.h"
 
 const char git_attr__true[] = "(builtin)true";
 const char git_attr__false[] = "\0(builtin)false";
@@ -744,6 +745,20 @@ static struct attr_stack *read_attr_from_index(struct index_state *istate,
 	if (!istate)
 		return NULL;
 
+	/*
+	 * The .gitattributes file only applies to files within its
+	 * parent directory. In the case of cone-mode sparse-checkout,
+	 * the .gitattributes file is sparse if and only if all paths
+	 * within that directory are also sparse. Thus, don't load the
+	 * .gitattributes file since it will not matter.
+	 *
+	 * In the case of a sparse index, it is critical that we don't go
+	 * looking for a .gitattributes file, as doing so would cause the
+	 * index to expand.
+	 */
+	if (!path_in_cone_mode_sparse_checkout(path, istate))
+		return NULL;
+
 	buf = read_blob_data_from_index(istate, path, NULL);
 	if (!buf)
 		return NULL;
diff --git a/bisect.c b/bisect.c
index af2863d044..888949fba6 100644
--- a/bisect.c
+++ b/bisect.c
@@ -23,7 +23,6 @@ static struct oid_array skipped_revs;
 static struct object_id *current_bad_oid;
 
 static const char *argv_checkout[] = {"checkout", "-q", NULL, "--", NULL};
-static const char *argv_show_branch[] = {"show-branch", NULL, NULL};
 
 static const char *term_bad;
 static const char *term_good;
@@ -728,7 +727,9 @@ static int is_expected_rev(const struct object_id *oid)
 static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
 {
 	char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
-	enum bisect_error res = BISECT_OK;
+	struct commit *commit;
+	struct pretty_print_context pp = {0};
+	struct strbuf commit_msg = STRBUF_INIT;
 
 	oid_to_hex_r(bisect_rev_hex, bisect_rev);
 	update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
@@ -738,24 +739,21 @@ static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int
 		update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0,
 			   UPDATE_REFS_DIE_ON_ERR);
 	} else {
-		res = run_command_v_opt(argv_checkout, RUN_GIT_CMD);
-		if (res)
+		if (run_command_v_opt(argv_checkout, RUN_GIT_CMD))
 			/*
 			 * Errors in `run_command()` itself, signaled by res < 0,
 			 * and errors in the child process, signaled by res > 0
-			 * can both be treated as regular BISECT_FAILURE (-1).
+			 * can both be treated as regular BISECT_FAILED (-1).
 			 */
-			return -abs(res);
+			return BISECT_FAILED;
 	}
 
-	argv_show_branch[1] = bisect_rev_hex;
-	res = run_command_v_opt(argv_show_branch, RUN_GIT_CMD);
-	/*
-	 * Errors in `run_command()` itself, signaled by res < 0,
-	 * and errors in the child process, signaled by res > 0
-	 * can both be treated as regular BISECT_FAILURE (-1).
-	 */
-	return -abs(res);
+	commit = lookup_commit_reference(the_repository, bisect_rev);
+	format_commit_message(commit, "[%H] %s%n", &commit_msg, &pp);
+	fputs(commit_msg.buf, stdout);
+	strbuf_release(&commit_msg);
+
+	return BISECT_OK;
 }
 
 static struct commit *get_commit_reference(struct repository *r,
diff --git a/blame.c b/blame.c
index 206c295660..083d99fdbc 100644
--- a/blame.c
+++ b/blame.c
@@ -2615,7 +2615,7 @@ void assign_blame(struct blame_scoreboard *sb, int opt)
 		else {
 			commit->object.flags |= UNINTERESTING;
 			if (commit->object.parsed)
-				mark_parents_uninteresting(commit);
+				mark_parents_uninteresting(sb->revs, commit);
 		}
 		/* treat root commit as boundary */
 		if (!commit->parents && !sb->show_root)
diff --git a/branch.c b/branch.c
index 7a88a4861e..6b31df539a 100644
--- a/branch.c
+++ b/branch.c
@@ -8,10 +8,12 @@
 #include "sequencer.h"
 #include "commit.h"
 #include "worktree.h"
+#include "submodule-config.h"
+#include "run-command.h"
 
 struct tracking {
 	struct refspec_item spec;
-	char *src;
+	struct string_list *srcs;
 	const char *remote;
 	int matches;
 };
@@ -22,11 +24,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 +51,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 +98,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,80 +119,151 @@ 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
- * config.
+ * Used internally to set the branch.<new_ref>.{remote,merge} config
+ * settings so that branch 'new_ref' tracks 'orig_ref'. Unlike
+ * dwim_and_setup_tracking(), this does not do DWIM, i.e. "origin/main"
+ * will not be expanded to "refs/remotes/origin/main", so it is not safe
+ * for 'orig_ref' to be raw user input.
  */
 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))
-		return;
+	tracking.srcs = &tracking_srcs;
+	if (track != BRANCH_TRACK_INHERIT)
+		for_each_remote(find_tracked_branch, &tracking);
+	else if (inherit_tracking(&tracking, orig_ref))
+		goto cleanup;
 
 	if (!tracking.matches)
 		switch (track) {
 		case BRANCH_TRACK_ALWAYS:
 		case BRANCH_TRACK_EXPLICIT:
 		case BRANCH_TRACK_OVERRIDE:
+		case BRANCH_TRACK_INHERIT:
 			break;
 		default:
-			return;
+			goto cleanup;
 		}
 
 	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);
+cleanup:
+	string_list_clear(&tracking_srcs, 0);
 }
 
 int read_branch_desc(struct strbuf *buf, const char *branch_name)
@@ -186,7 +289,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 +302,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 +338,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[] =
@@ -243,42 +351,48 @@ N_("\n"
 "will track its remote counterpart, you may want to use\n"
 "\"git push -u\" to set the upstream config as you push.");
 
-void create_branch(struct repository *r,
-		   const char *name, const char *start_name,
-		   int force, int clobber_head_ok, int reflog,
-		   int quiet, enum branch_track track)
+/**
+ * DWIMs a user-provided ref to determine the starting point for a
+ * branch and validates it, where:
+ *
+ *   - r is the repository to validate the branch for
+ *
+ *   - start_name is the ref that we would like to test. This is
+ *     expanded with DWIM and assigned to out_real_ref.
+ *
+ *   - track is the tracking mode of the new branch. If tracking is
+ *     explicitly requested, start_name must be a branch (because
+ *     otherwise start_name cannot be tracked)
+ *
+ *   - out_oid is an out parameter containing the object_id of start_name
+ *
+ *   - out_real_ref is an out parameter containing the full, 'real' form
+ *     of start_name e.g. refs/heads/main instead of main
+ *
+ */
+static void dwim_branch_start(struct repository *r, const char *start_name,
+			   enum branch_track track, char **out_real_ref,
+			   struct object_id *out_oid)
 {
 	struct commit *commit;
 	struct object_id oid;
 	char *real_ref;
-	struct strbuf ref = STRBUF_INIT;
-	int forcing = 0;
-	int dont_change_ref = 0;
 	int explicit_tracking = 0;
 
 	if (track == BRANCH_TRACK_EXPLICIT || track == BRANCH_TRACK_OVERRIDE)
 		explicit_tracking = 1;
 
-	if ((track == BRANCH_TRACK_OVERRIDE || clobber_head_ok)
-	    ? validate_branchname(name, &ref)
-	    : validate_new_branchname(name, &ref, force)) {
-		if (!force)
-			dont_change_ref = 1;
-		else
-			forcing = 1;
-	}
-
 	real_ref = NULL;
 	if (get_oid_mb(start_name, &oid)) {
 		if (explicit_tracking) {
-			if (advice_set_upstream_failure) {
+			if (advice_enabled(ADVICE_SET_UPSTREAM_FAILURE)) {
 				error(_(upstream_missing), start_name);
 				advise(_(upstream_advice));
 				exit(1);
 			}
 			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,46 +412,224 @@ 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);
-	oidcpy(&oid, &commit->object.oid);
+		die(_("not a valid branch point: '%s'"), start_name);
+	if (out_real_ref) {
+		*out_real_ref = real_ref;
+		real_ref = NULL;
+	}
+	if (out_oid)
+		oidcpy(out_oid, &commit->object.oid);
+
+	FREE_AND_NULL(real_ref);
+}
+
+void create_branch(struct repository *r,
+		   const char *name, const char *start_name,
+		   int force, int clobber_head_ok, int reflog,
+		   int quiet, enum branch_track track, int dry_run)
+{
+	struct object_id oid;
+	char *real_ref;
+	struct strbuf ref = STRBUF_INIT;
+	int forcing = 0;
+	struct ref_transaction *transaction;
+	struct strbuf err = STRBUF_INIT;
+	char *msg;
+
+	if (track == BRANCH_TRACK_OVERRIDE)
+		BUG("'track' cannot be BRANCH_TRACK_OVERRIDE. Did you mean to call dwim_and_setup_tracking()?");
+	if (clobber_head_ok && !force)
+		BUG("'clobber_head_ok' can only be used with 'force'");
+
+	if (clobber_head_ok ?
+			  validate_branchname(name, &ref) :
+			  validate_new_branchname(name, &ref, force)) {
+		forcing = 1;
+	}
+
+	dwim_branch_start(r, start_name, track, &real_ref, &oid);
+	if (dry_run)
+		goto cleanup;
 
 	if (reflog)
 		log_all_ref_updates = LOG_REFS_NORMAL;
 
-	if (!dont_change_ref) {
-		struct ref_transaction *transaction;
-		struct strbuf err = STRBUF_INIT;
-		char *msg;
-
-		if (forcing)
-			msg = xstrfmt("branch: Reset to %s", start_name);
-		else
-			msg = xstrfmt("branch: Created from %s", start_name);
-
-		transaction = ref_transaction_begin(&err);
-		if (!transaction ||
-		    ref_transaction_update(transaction, ref.buf,
-					   &oid, forcing ? NULL : null_oid(),
-					   0, msg, &err) ||
-		    ref_transaction_commit(transaction, &err))
-			die("%s", err.buf);
-		ref_transaction_free(transaction);
-		strbuf_release(&err);
-		free(msg);
-	}
+	if (forcing)
+		msg = xstrfmt("branch: Reset to %s", start_name);
+	else
+		msg = xstrfmt("branch: Created from %s", start_name);
+	transaction = ref_transaction_begin(&err);
+	if (!transaction ||
+		ref_transaction_update(transaction, ref.buf,
+					&oid, forcing ? NULL : null_oid(),
+					0, msg, &err) ||
+		ref_transaction_commit(transaction, &err))
+		die("%s", err.buf);
+	ref_transaction_free(transaction);
+	strbuf_release(&err);
+	free(msg);
 
 	if (real_ref && track)
 		setup_tracking(ref.buf + 11, real_ref, track, quiet);
 
+cleanup:
 	strbuf_release(&ref);
 	free(real_ref);
 }
 
+void dwim_and_setup_tracking(struct repository *r, const char *new_ref,
+			     const char *orig_ref, enum branch_track track,
+			     int quiet)
+{
+	char *real_orig_ref;
+	dwim_branch_start(r, orig_ref, track, &real_orig_ref, NULL);
+	setup_tracking(new_ref, real_orig_ref, track, quiet);
+}
+
+/**
+ * Creates a branch in a submodule by calling
+ * create_branches_recursively() in a child process. The child process
+ * is necessary because install_branch_config_multiple_remotes() (which
+ * is called by setup_tracking()) does not support writing configs to
+ * submodules.
+ */
+static int submodule_create_branch(struct repository *r,
+				   const struct submodule *submodule,
+				   const char *name, const char *start_oid,
+				   const char *tracking_name, int force,
+				   int reflog, int quiet,
+				   enum branch_track track, int dry_run)
+{
+	int ret = 0;
+	struct child_process child = CHILD_PROCESS_INIT;
+	struct strbuf child_err = STRBUF_INIT;
+	struct strbuf out_buf = STRBUF_INIT;
+	char *out_prefix = xstrfmt("submodule '%s': ", submodule->name);
+	child.git_cmd = 1;
+	child.err = -1;
+	child.stdout_to_stderr = 1;
+
+	prepare_other_repo_env(&child.env_array, r->gitdir);
+	/*
+	 * submodule_create_branch() is indirectly invoked by "git
+	 * branch", but we cannot invoke "git branch" in the child
+	 * process. "git branch" accepts a branch name and start point,
+	 * where the start point is assumed to provide both the OID
+	 * (start_oid) and the branch to use for tracking
+	 * (tracking_name). But when recursing through submodules,
+	 * start_oid and tracking name need to be specified separately
+	 * (see create_branches_recursively()).
+	 */
+	strvec_pushl(&child.args, "submodule--helper", "create-branch", NULL);
+	if (dry_run)
+		strvec_push(&child.args, "--dry-run");
+	if (force)
+		strvec_push(&child.args, "--force");
+	if (quiet)
+		strvec_push(&child.args, "--quiet");
+	if (reflog)
+		strvec_push(&child.args, "--create-reflog");
+	if (track == BRANCH_TRACK_ALWAYS || track == BRANCH_TRACK_EXPLICIT)
+		strvec_push(&child.args, "--track");
+
+	strvec_pushl(&child.args, name, start_oid, tracking_name, NULL);
+
+	if ((ret = start_command(&child)))
+		return ret;
+	ret = finish_command(&child);
+	strbuf_read(&child_err, child.err, 0);
+	strbuf_add_lines(&out_buf, out_prefix, child_err.buf, child_err.len);
+
+	if (ret)
+		fprintf(stderr, "%s", out_buf.buf);
+	else
+		printf("%s", out_buf.buf);
+
+	strbuf_release(&child_err);
+	strbuf_release(&out_buf);
+	return ret;
+}
+
+void create_branches_recursively(struct repository *r, const char *name,
+				 const char *start_commitish,
+				 const char *tracking_name, int force,
+				 int reflog, int quiet, enum branch_track track,
+				 int dry_run)
+{
+	int i = 0;
+	char *branch_point = NULL;
+	struct object_id super_oid;
+	struct submodule_entry_list submodule_entry_list;
+
+	/* Perform dwim on start_commitish to get super_oid and branch_point. */
+	dwim_branch_start(r, start_commitish, BRANCH_TRACK_NEVER,
+			  &branch_point, &super_oid);
+
+	/*
+	 * If we were not given an explicit name to track, then assume we are at
+	 * the top level and, just like the non-recursive case, the tracking
+	 * name is the branch point.
+	 */
+	if (!tracking_name)
+		tracking_name = branch_point;
+
+	submodules_of_tree(r, &super_oid, &submodule_entry_list);
+	/*
+	 * Before creating any branches, first check that the branch can
+	 * be created in every submodule.
+	 */
+	for (i = 0; i < submodule_entry_list.entry_nr; i++) {
+		if (submodule_entry_list.entries[i].repo == NULL) {
+			if (advice_enabled(ADVICE_SUBMODULES_NOT_UPDATED))
+				advise(_("You may try updating the submodules using 'git checkout %s && git submodule update --init'"),
+				       start_commitish);
+			die(_("submodule '%s': unable to find submodule"),
+			    submodule_entry_list.entries[i].submodule->name);
+		}
+
+		if (submodule_create_branch(
+			    submodule_entry_list.entries[i].repo,
+			    submodule_entry_list.entries[i].submodule, name,
+			    oid_to_hex(&submodule_entry_list.entries[i]
+						.name_entry->oid),
+			    tracking_name, force, reflog, quiet, track, 1))
+			die(_("submodule '%s': cannot create branch '%s'"),
+			    submodule_entry_list.entries[i].submodule->name,
+			    name);
+	}
+
+	create_branch(the_repository, name, start_commitish, force, 0, reflog, quiet,
+		      BRANCH_TRACK_NEVER, dry_run);
+	if (dry_run)
+		return;
+	/*
+	 * NEEDSWORK If tracking was set up in the superproject but not the
+	 * submodule, users might expect "git branch --recurse-submodules" to
+	 * fail or give a warning, but this is not yet implemented because it is
+	 * tedious to determine whether or not tracking was set up in the
+	 * superproject.
+	 */
+	setup_tracking(name, tracking_name, track, quiet);
+
+	for (i = 0; i < submodule_entry_list.entry_nr; i++) {
+		if (submodule_create_branch(
+			    submodule_entry_list.entries[i].repo,
+			    submodule_entry_list.entries[i].submodule, name,
+			    oid_to_hex(&submodule_entry_list.entries[i]
+						.name_entry->oid),
+			    tracking_name, force, reflog, quiet, track, 0))
+			die(_("submodule '%s': cannot create branch '%s'"),
+			    submodule_entry_list.entries[i].submodule->name,
+			    name);
+		repo_clear(submodule_entry_list.entries[i].repo);
+	}
+}
+
 void remove_merge_branch_state(struct repository *r)
 {
 	unlink(git_path_merge_head(r));
@@ -357,14 +649,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..04df2aa5b5 100644
--- a/branch.h
+++ b/branch.h
@@ -10,13 +10,36 @@ 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;
 
 /* Functions for acting on the information about branches. */
 
+/**
+ * Sets branch.<new_ref>.{remote,merge} config settings such that
+ * new_ref tracks orig_ref according to the specified tracking mode.
+ *
+ *   - new_ref is the name of the branch that we are setting tracking
+ *     for.
+ *
+ *   - orig_ref is the name of the ref that is 'upstream' of new_ref.
+ *     orig_ref will be expanded with DWIM so that the config settings
+ *     are in the correct format e.g. "refs/remotes/origin/main" instead
+ *     of "origin/main".
+ *
+ *   - track is the tracking mode e.g. BRANCH_TRACK_REMOTE causes
+ *     new_ref to track orig_ref directly, whereas BRANCH_TRACK_INHERIT
+ *     causes new_ref to track whatever orig_ref tracks.
+ *
+ *   - quiet suppresses tracking information.
+ */
+void dwim_and_setup_tracking(struct repository *r, const char *new_ref,
+			     const char *orig_ref, enum branch_track track,
+			     int quiet);
+
 /*
  * Creates a new branch, where:
  *
@@ -29,8 +52,8 @@ extern enum branch_track git_branch_track;
  *
  *   - force enables overwriting an existing (non-head) branch
  *
- *   - clobber_head_ok allows the currently checked out (hence existing)
- *     branch to be overwritten; without 'force', it has no effect.
+ *   - clobber_head_ok, when enabled with 'force', allows the currently
+ *     checked out (head) branch to be overwritten
  *
  *   - reflog creates a reflog for the branch
  *
@@ -39,13 +62,45 @@ extern enum branch_track git_branch_track;
  *   - track causes the new branch to be configured to merge the remote branch
  *     that start_name is a tracking branch for (if any).
  *
+ *   - dry_run causes the branch to be validated but not created.
+ *
  */
 void create_branch(struct repository *r,
 		   const char *name, const char *start_name,
 		   int force, int clobber_head_ok,
-		   int reflog, int quiet, enum branch_track track);
+		   int reflog, int quiet, enum branch_track track,
+		   int dry_run);
 
 /*
+ * Creates a new branch in a repository and its submodules (and its
+ * submodules, recursively). The parameters are mostly analogous to
+ * those of create_branch() except for start_name, which is represented
+ * by two different parameters:
+ *
+ * - start_commitish is the commit-ish, in repository r, that determines
+ *   which commits the branches will point to. The superproject branch
+ *   will point to the commit of start_commitish and the submodule
+ *   branches will point to the gitlink commit oids in start_commitish's
+ *   tree.
+ *
+ * - tracking_name is the name of the ref, in repository r, that will be
+ *   used to set up tracking information. This value is propagated to
+ *   all submodules, which will evaluate the ref using their own ref
+ *   stores. If NULL, this defaults to start_commitish.
+ *
+ * When this function is called on the superproject, start_commitish
+ * can be any user-provided ref and tracking_name can be NULL (similar
+ * to create_branches()). But when recursing through submodules,
+ * start_commitish is the plain gitlink commit oid. Since the oid cannot
+ * be used for tracking information, tracking_name is propagated and
+ * used for tracking instead.
+ */
+void create_branches_recursively(struct repository *r, const char *name,
+				 const char *start_commitish,
+				 const char *tracking_name, int force,
+				 int reflog, int quiet, enum branch_track track,
+				 int dry_run);
+/*
  * Check if 'name' can be a valid name for a branch; die otherwise.
  * Return 1 if the named branch already exists; return 0 otherwise.
  * Fill ref with the full refname for the branch.
diff --git a/builtin.h b/builtin.h
index 16ecd5586f..83379f3832 100644
--- a/builtin.h
+++ b/builtin.h
@@ -164,6 +164,7 @@ int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix);
 int cmd_grep(int argc, const char **argv, const char *prefix);
 int cmd_hash_object(int argc, const char **argv, const char *prefix);
 int cmd_help(int argc, const char **argv, const char *prefix);
+int cmd_hook(int argc, const char **argv, const char *prefix);
 int cmd_index_pack(int argc, const char **argv, const char *prefix);
 int cmd_init_db(int argc, const char **argv, const char *prefix);
 int cmd_interpret_trailers(int argc, const char **argv, const char *prefix);
@@ -225,7 +226,6 @@ int cmd_submodule__helper(int argc, const char **argv, const char *prefix);
 int cmd_switch(int argc, const char **argv, const char *prefix);
 int cmd_symbolic_ref(int argc, const char **argv, const char *prefix);
 int cmd_tag(int argc, const char **argv, const char *prefix);
-int cmd_tar_tree(int argc, const char **argv, const char *prefix);
 int cmd_unpack_file(int argc, const char **argv, const char *prefix);
 int cmd_unpack_objects(int argc, const char **argv, const char *prefix);
 int cmd_update_index(int argc, const char **argv, const char *prefix);
diff --git a/builtin/add.c b/builtin/add.c
index 09e684585d..3ffb86a433 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -30,8 +30,8 @@ static int patch_interactive, add_interactive, edit_interactive;
 static int take_worktree_changes;
 static int add_renormalize;
 static int pathspec_file_nul;
+static int include_sparse;
 static const char *pathspec_from_file;
-static int legacy_stash_p; /* support for the scripted `git stash` */
 
 struct update_callback_data {
 	int flags;
@@ -46,7 +46,9 @@ static int chmod_pathspec(struct pathspec *pathspec, char flip, int show_only)
 		struct cache_entry *ce = active_cache[i];
 		int err;
 
-		if (ce_skip_worktree(ce))
+		if (!include_sparse &&
+		    (ce_skip_worktree(ce) ||
+		     !path_in_sparse_checkout(ce->name, &the_index)))
 			continue;
 
 		if (pathspec && !ce_path_match(&the_index, ce, pathspec, NULL))
@@ -94,6 +96,10 @@ static void update_callback(struct diff_queue_struct *q,
 	for (i = 0; i < q->nr; i++) {
 		struct diff_filepair *p = q->queue[i];
 		const char *path = p->one->path;
+
+		if (!include_sparse && !path_in_sparse_checkout(path, &the_index))
+			continue;
+
 		switch (fix_unmerged_status(p, data)) {
 		default:
 			die(_("unexpected diff status %c"), p->status);
@@ -144,12 +150,12 @@ static int renormalize_tracked_files(const struct pathspec *pathspec, int flags)
 {
 	int i, retval = 0;
 
-	/* TODO: audit for interaction with sparse-index. */
-	ensure_full_index(&the_index);
 	for (i = 0; i < active_nr; i++) {
 		struct cache_entry *ce = active_cache[i];
 
-		if (ce_skip_worktree(ce))
+		if (!include_sparse &&
+		    (ce_skip_worktree(ce) ||
+		     !path_in_sparse_checkout(ce->name, &the_index)))
 			continue;
 		if (ce_stage(ce))
 			continue; /* do not touch unmerged paths */
@@ -198,7 +204,10 @@ static int refresh(int verbose, const struct pathspec *pathspec)
 		      _("Unstaged changes after refreshing the index:"));
 	for (i = 0; i < pathspec->nr; i++) {
 		if (!seen[i]) {
-			if (matches_skip_worktree(pathspec, i, &skip_worktree_seen)) {
+			const char *path = pathspec->items[i].original;
+
+			if (matches_skip_worktree(pathspec, i, &skip_worktree_seen) ||
+			    !path_in_sparse_checkout(path, &the_index)) {
 				string_list_append(&only_match_skip_worktree,
 						   pathspec->items[i].original);
 			} else {
@@ -292,15 +301,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)
@@ -313,9 +318,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
 	rev.diffopt.output_format = DIFF_FORMAT_PATCH;
 	rev.diffopt.use_color = 0;
 	rev.diffopt.flags.ignore_dirty_submodules = 1;
-	out = open(file, O_CREAT | O_WRONLY | O_TRUNC, 0666);
-	if (out < 0)
-		die(_("Could not open '%s' for writing."), file);
+	out = xopen(file, O_CREAT | O_WRONLY | O_TRUNC, 0666);
 	rev.diffopt.file = xfdopen(out, "w");
 	rev.diffopt.close_file = 1;
 	if (run_diff_files(&rev, 0))
@@ -330,7 +333,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);
 
@@ -378,12 +382,11 @@ static struct option builtin_add_options[] = {
 	OPT_BOOL( 0 , "refresh", &refresh_only, N_("don't add, only refresh the index")),
 	OPT_BOOL( 0 , "ignore-errors", &ignore_add_errors, N_("just skip files which cannot be added because of errors")),
 	OPT_BOOL( 0 , "ignore-missing", &ignore_missing, N_("check if - even missing - files are ignored in dry run")),
+	OPT_BOOL(0, "sparse", &include_sparse, N_("allow updating entries outside of the sparse-checkout cone")),
 	OPT_STRING(0, "chmod", &chmod_arg, "(+|-)x",
 		   N_("override the executable bit of the listed files")),
 	OPT_HIDDEN_BOOL(0, "warn-embedded-repo", &warn_on_embedded_repo,
 			N_("warn when adding an embedded repository")),
-	OPT_HIDDEN_BOOL(0, "legacy-stash-p", &legacy_stash_p,
-			N_("backend for `git stash -p`")),
 	OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
 	OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
 	OPT_END(),
@@ -419,6 +422,7 @@ static const char embedded_advice[] = N_(
 static void check_embedded_repo(const char *path)
 {
 	struct strbuf name = STRBUF_INIT;
+	static int adviced_on_embedded_repo = 0;
 
 	if (!warn_on_embedded_repo)
 		return;
@@ -430,10 +434,10 @@ static void check_embedded_repo(const char *path)
 	strbuf_strip_suffix(&name, "/");
 
 	warning(_("adding embedded git repository: %s"), name.buf);
-	if (advice_add_embedded_repo) {
+	if (!adviced_on_embedded_repo &&
+	    advice_enabled(ADVICE_ADD_EMBEDDED_REPO)) {
 		advise(embedded_advice, name.buf, name.buf);
-		/* there may be multiple entries; advise only once */
-		advice_add_embedded_repo = 0;
+		adviced_on_embedded_repo = 1;
 	}
 
 	strbuf_release(&name);
@@ -442,12 +446,13 @@ static void check_embedded_repo(const char *path)
 static int add_files(struct dir_struct *dir, int flags)
 {
 	int i, exit_status = 0;
+	struct string_list matched_sparse_paths = STRING_LIST_INIT_NODUP;
 
 	if (dir->ignored_nr) {
 		fprintf(stderr, _(ignore_error));
 		for (i = 0; i < dir->ignored_nr; i++)
 			fprintf(stderr, "%s\n", dir->ignored[i]->name);
-		if (advice_add_ignored_file)
+		if (advice_enabled(ADVICE_ADD_IGNORED_FILE))
 			advise(_("Use -f if you really want to add them.\n"
 				"Turn this message off by running\n"
 				"\"git config advice.addIgnoredFile false\""));
@@ -455,6 +460,12 @@ static int add_files(struct dir_struct *dir, int flags)
 	}
 
 	for (i = 0; i < dir->nr; i++) {
+		if (!include_sparse &&
+		    !path_in_sparse_checkout(dir->entries[i]->name, &the_index)) {
+			string_list_append(&matched_sparse_paths,
+					   dir->entries[i]->name);
+			continue;
+		}
 		if (add_file_to_index(&the_index, dir->entries[i]->name, flags)) {
 			if (!ignore_add_errors)
 				die(_("adding files failed"));
@@ -463,6 +474,14 @@ static int add_files(struct dir_struct *dir, int flags)
 			check_embedded_repo(dir->entries[i]->name);
 		}
 	}
+
+	if (matched_sparse_paths.nr) {
+		advise_on_updating_sparse_paths(&matched_sparse_paths);
+		exit_status = 1;
+	}
+
+	string_list_clear(&matched_sparse_paths, 0);
+
 	return exit_status;
 }
 
@@ -485,26 +504,15 @@ 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) {
-		struct pathspec pathspec;
-
-		parse_pathspec(&pathspec, 0,
-			PATHSPEC_PREFER_FULL |
-			PATHSPEC_SYMLINK_LEADING_PATH |
-			PATHSPEC_PREFIX_ORIGIN,
-			prefix, argv);
-
-		return run_add_interactive(NULL, "--patch=stash", &pathspec);
-	}
 
 	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--;
@@ -516,10 +524,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]))
@@ -528,6 +536,9 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 	add_new_files = !take_worktree_changes && !refresh_only && !add_renormalize;
 	require_pathspec = !(take_worktree_changes || (0 < addremove_explicit));
 
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
+
 	hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
 
 	/*
@@ -541,19 +552,19 @@ 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) {
 		fprintf(stderr, _("Nothing specified, nothing added.\n"));
-		if (advice_add_empty_pathspec)
+		if (advice_enabled(ADVICE_ADD_EMPTY_PATHSPEC))
 			advise( _("Maybe you wanted to say 'git add .'?\n"
 				"Turn this message off by running\n"
 				"\"git config advice.addEmptyPathspec false\""));
@@ -624,7 +635,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 			if (seen[i])
 				continue;
 
-			if (matches_skip_worktree(&pathspec, i, &skip_worktree_seen)) {
+			if (!include_sparse &&
+			    matches_skip_worktree(&pathspec, i, &skip_worktree_seen)) {
 				string_list_append(&only_match_skip_worktree,
 						   pathspec.items[i].original);
 				continue;
diff --git a/builtin/am.c b/builtin/am.c
index 0b2d886c81..7de2c89ef2 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -11,6 +11,7 @@
 #include "parse-options.h"
 #include "dir.h"
 #include "run-command.h"
+#include "hook.h"
 #include "quote.h"
 #include "tempfile.h"
 #include "lockfile.h"
@@ -86,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;
@@ -117,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;
@@ -177,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.
  */
@@ -210,6 +237,7 @@ static void write_state_bool(const struct am_state *state,
  * If state->quiet is false, calls fprintf(fp, fmt, ...), and appends a newline
  * at the end.
  */
+__attribute__((format (printf, 3, 4)))
 static void say(const struct am_state *state, FILE *fp, const char *fmt, ...)
 {
 	va_list ap;
@@ -446,7 +474,7 @@ static int run_applypatch_msg_hook(struct am_state *state)
 	int ret;
 
 	assert(state->msg);
-	ret = run_hook_le(NULL, "applypatch-msg", am_path(state, "final-commit"), NULL);
+	ret = run_hooks_l("applypatch-msg", am_path(state, "final-commit"), NULL);
 
 	if (!ret) {
 		FREE_AND_NULL(state->msg);
@@ -1124,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);
 	}
 
@@ -1246,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);
@@ -1607,7 +1636,7 @@ static void do_commit(const struct am_state *state)
 	const char *reflog_msg, *author, *committer = NULL;
 	struct strbuf sb = STRBUF_INIT;
 
-	if (run_hook_le(NULL, "pre-applypatch", NULL))
+	if (run_hooks("pre-applypatch"))
 		exit(1);
 
 	if (write_cache_as_tree(&tree, 0, NULL))
@@ -1659,7 +1688,7 @@ static void do_commit(const struct am_state *state)
 		fclose(fp);
 	}
 
-	run_hook_le(NULL, "post-applypatch", NULL);
+	run_hooks("post-applypatch");
 
 	strbuf_release(&sb);
 }
@@ -1761,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();
 
@@ -1790,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);
 
@@ -1819,12 +1870,13 @@ static void am_run(struct am_state *state, int resume)
 			printf_ln(_("Patch failed at %s %.*s"), msgnum(state),
 				linelen(state->msg), state->msg);
 
-			if (advice_amworkdir)
+			if (advice_enabled(ADVICE_AM_WORK_DIR))
 				advise(_("Use 'git am --show-current-patch=diff' to see the failed patch"));
 
 			die_user_resolve(state);
 		}
 
+commit:
 		do_commit(state);
 
 next:
@@ -1847,7 +1899,6 @@ next:
 	 */
 	if (!state->rebasing) {
 		am_destroy(state);
-		close_object_store(the_repository->objects);
 		run_auto_maintenance(state->quiet);
 	}
 }
@@ -1855,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()) {
@@ -1917,7 +1973,8 @@ static int fast_forward_to(struct tree *head, struct tree *remote, int reset)
 	opts.dst_index = &the_index;
 	opts.update = 1;
 	opts.merge = 1;
-	opts.reset = reset;
+	opts.reset = reset ? UNPACK_RESET_PROTECT_UNTRACKED : 0;
+	opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
 	opts.fn = twoway_merge;
 	init_tree_desc(&t[0], head->buffer, head->size);
 	init_tree_desc(&t[1], remote->buffer, remote->size);
@@ -2105,7 +2162,8 @@ static void am_abort(struct am_state *state)
 	if (!has_orig_head)
 		oidcpy(&orig_head, the_hash_algo->empty_tree);
 
-	clean_index(&curr_head, &orig_head);
+	if (clean_index(&curr_head, &orig_head))
+		die(_("failed to clean index"));
 
 	if (has_orig_head)
 		update_ref("am --abort", "HEAD", &orig_head,
@@ -2192,7 +2250,8 @@ enum resume_type {
 	RESUME_SKIP,
 	RESUME_ABORT,
 	RESUME_QUIT,
-	RESUME_SHOW_PATCH
+	RESUME_SHOW_PATCH,
+	RESUME_ALLOW_EMPTY,
 };
 
 struct resume_mode {
@@ -2227,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;
@@ -2345,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")),
@@ -2354,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()
@@ -2450,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/archive.c b/builtin/archive.c
index 45d11669aa..7176b041b6 100644
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -12,9 +12,7 @@
 
 static void create_output_file(const char *output_file)
 {
-	int output_fd = open(output_file, O_CREAT | O_WRONLY | O_TRUNC, 0666);
-	if (output_fd < 0)
-		die_errno(_("could not create archive file '%s'"), output_file);
+	int output_fd = xopen(output_file, O_CREAT | O_WRONLY | O_TRUNC, 0666);
 	if (output_fd != 1) {
 		if (dup2(output_fd, 1) < 0)
 			die_errno(_("could not redirect output"));
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 9d9540a0ab..28a2e6a575 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -18,10 +18,10 @@ static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG")
 static GIT_PATH_FUNC(git_path_head_name, "head-name")
 static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
 static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
+static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
 
 static const char * const git_bisect_helper_usage[] = {
 	N_("git bisect--helper --bisect-reset [<commit>]"),
-	N_("git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"),
 	N_("git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]"),
 	N_("git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}=<term>]"
 					    " [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]"),
@@ -30,6 +30,8 @@ static const char * const git_bisect_helper_usage[] = {
 	N_("git bisect--helper --bisect-state (good|old) [<rev>...]"),
 	N_("git bisect--helper --bisect-replay <filename>"),
 	N_("git bisect--helper --bisect-skip [(<rev>|<range>)...]"),
+	N_("git bisect--helper --bisect-visualize"),
+	N_("git bisect--helper --bisect-run <cmd>..."),
 	NULL
 };
 
@@ -117,6 +119,7 @@ static int write_in_file(const char *path, const char *mode, const char *format,
 	return fclose(fp);
 }
 
+__attribute__((format (printf, 2, 3)))
 static int write_to_file(const char *path, const char *format, ...)
 {
 	int res;
@@ -129,6 +132,7 @@ static int write_to_file(const char *path, const char *format, ...)
 	return res;
 }
 
+__attribute__((format (printf, 2, 3)))
 static int append_to_file(const char *path, const char *format, ...)
 {
 	int res;
@@ -141,6 +145,19 @@ static int append_to_file(const char *path, const char *format, ...)
 	return res;
 }
 
+static int print_file_to_stdout(const char *path)
+{
+	int fd = open(path, O_RDONLY);
+	int ret = 0;
+
+	if (fd < 0)
+		return error_errno(_("cannot open file '%s' for reading"), path);
+	if (copy_fd(fd, 1) < 0)
+		ret = error_errno(_("failed to read '%s'"), path);
+	close(fd);
+	return ret;
+}
+
 static int check_term_format(const char *term, const char *orig_term)
 {
 	int res;
@@ -1034,6 +1051,125 @@ static enum bisect_error bisect_skip(struct bisect_terms *terms, const char **ar
 	return res;
 }
 
+static int bisect_visualize(struct bisect_terms *terms, const char **argv, int argc)
+{
+	struct strvec args = STRVEC_INIT;
+	int flags = RUN_COMMAND_NO_STDIN, res = 0;
+	struct strbuf sb = STRBUF_INIT;
+
+	if (bisect_next_check(terms, NULL) != 0)
+		return BISECT_FAILED;
+
+	if (!argc) {
+		if ((getenv("DISPLAY") || getenv("SESSIONNAME") || getenv("MSYSTEM") ||
+		     getenv("SECURITYSESSIONID")) && exists_in_PATH("gitk")) {
+			strvec_push(&args, "gitk");
+		} else {
+			strvec_push(&args, "log");
+			flags |= RUN_GIT_CMD;
+		}
+	} else {
+		if (argv[0][0] == '-') {
+			strvec_push(&args, "log");
+			flags |= RUN_GIT_CMD;
+		} else if (strcmp(argv[0], "tig") && !starts_with(argv[0], "git"))
+			flags |= RUN_GIT_CMD;
+
+		strvec_pushv(&args, argv);
+	}
+
+	strvec_pushl(&args, "--bisect", "--", NULL);
+
+	strbuf_read_file(&sb, git_path_bisect_names(), 0);
+	sq_dequote_to_strvec(sb.buf, &args);
+	strbuf_release(&sb);
+
+	res = run_command_v_opt(args.v, flags);
+	strvec_clear(&args);
+	return res;
+}
+
+static int bisect_run(struct bisect_terms *terms, const char **argv, int argc)
+{
+	int res = BISECT_OK;
+	struct strbuf command = STRBUF_INIT;
+	struct strvec args = STRVEC_INIT;
+	struct strvec run_args = STRVEC_INIT;
+	const char *new_state;
+	int temporary_stdout_fd, saved_stdout;
+
+	if (bisect_next_check(terms, NULL))
+		return BISECT_FAILED;
+
+	if (argc)
+		sq_quote_argv(&command, argv);
+	else {
+		error(_("bisect run failed: no command provided."));
+		return BISECT_FAILED;
+	}
+
+	strvec_push(&run_args, command.buf);
+
+	while (1) {
+		strvec_clear(&args);
+
+		printf(_("running %s\n"), command.buf);
+		res = run_command_v_opt(run_args.v, RUN_USING_SHELL);
+
+		if (res < 0 || 128 <= res) {
+			error(_("bisect run failed: exit code %d from"
+				" '%s' is < 0 or >= 128"), res, command.buf);
+			strbuf_release(&command);
+			return res;
+		}
+
+		if (res == 125)
+			new_state = "skip";
+		else if (!res)
+			new_state = terms->term_good;
+		else
+			new_state = terms->term_bad;
+
+		temporary_stdout_fd = open(git_path_bisect_run(), O_CREAT | O_WRONLY | O_TRUNC, 0666);
+
+		if (temporary_stdout_fd < 0)
+			return error_errno(_("cannot open file '%s' for writing"), git_path_bisect_run());
+
+		fflush(stdout);
+		saved_stdout = dup(1);
+		dup2(temporary_stdout_fd, 1);
+
+		res = bisect_state(terms, &new_state, 1);
+
+		fflush(stdout);
+		dup2(saved_stdout, 1);
+		close(saved_stdout);
+		close(temporary_stdout_fd);
+
+		print_file_to_stdout(git_path_bisect_run());
+
+		if (res == BISECT_ONLY_SKIPPED_LEFT)
+			error(_("bisect run cannot continue any more"));
+		else if (res == BISECT_INTERNAL_SUCCESS_MERGE_BASE) {
+			printf(_("bisect run success"));
+			res = BISECT_OK;
+		} else if (res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND) {
+			printf(_("bisect found first bad commit"));
+			res = BISECT_OK;
+		} else if (res) {
+			error(_("bisect run failed: 'git bisect--helper --bisect-state"
+			" %s' exited with error code %d"), args.v[0], res);
+		} else {
+			continue;
+		}
+
+		strbuf_release(&command);
+		strvec_clear(&args);
+		strvec_clear(&run_args);
+		return res;
+	}
+}
+
 int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 {
 	enum {
@@ -1046,7 +1182,9 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 		BISECT_STATE,
 		BISECT_LOG,
 		BISECT_REPLAY,
-		BISECT_SKIP
+		BISECT_SKIP,
+		BISECT_VISUALIZE,
+		BISECT_RUN,
 	} cmdmode = 0;
 	int res = 0, nolog = 0;
 	struct option options[] = {
@@ -1068,6 +1206,10 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 			 N_("replay the bisection process from the given file"), BISECT_REPLAY),
 		OPT_CMDMODE(0, "bisect-skip", &cmdmode,
 			 N_("skip some commits for checkout"), BISECT_SKIP),
+		OPT_CMDMODE(0, "bisect-visualize", &cmdmode,
+			 N_("visualize the bisection"), BISECT_VISUALIZE),
+		OPT_CMDMODE(0, "bisect-run", &cmdmode,
+			 N_("use <cmd>... to automatically bisect."), BISECT_RUN),
 		OPT_BOOL(0, "no-log", &nolog,
 			 N_("no log for BISECT_WRITE")),
 		OPT_END()
@@ -1087,12 +1229,6 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 			return error(_("--bisect-reset requires either no argument or a commit"));
 		res = bisect_reset(argc ? argv[0] : NULL);
 		break;
-	case BISECT_NEXT_CHECK:
-		if (argc != 2 && argc != 3)
-			return error(_("--bisect-next-check requires 2 or 3 arguments"));
-		set_terms(&terms, argv[1], argv[0]);
-		res = bisect_next_check(&terms, argc == 3 ? argv[2] : NULL);
-		break;
 	case BISECT_TERMS:
 		if (argc > 1)
 			return error(_("--bisect-terms requires 0 or 1 argument"));
@@ -1129,6 +1265,16 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 		get_terms(&terms);
 		res = bisect_skip(&terms, argv, argc);
 		break;
+	case BISECT_VISUALIZE:
+		get_terms(&terms);
+		res = bisect_visualize(&terms, argv, argc);
+		break;
+	case BISECT_RUN:
+		if (!argc)
+			return error(_("bisect run failed: no command provided."));
+		get_terms(&terms);
+		res = bisect_run(&terms, argv, argc);
+		break;
 	default:
 		BUG("unknown subcommand %d", cmdmode);
 	}
diff --git a/builtin/blame.c b/builtin/blame.c
index 641523ff9a..ef831de5ac 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -101,6 +101,16 @@ struct commit_info {
 	struct strbuf summary;
 };
 
+#define COMMIT_INFO_INIT { \
+	.author = STRBUF_INIT, \
+	.author_mail = STRBUF_INIT, \
+	.author_tz = STRBUF_INIT, \
+	.committer = STRBUF_INIT, \
+	.committer_mail = STRBUF_INIT, \
+	.committer_tz = STRBUF_INIT, \
+	.summary = STRBUF_INIT, \
+}
+
 /*
  * Parse author/committer line in the commit object buffer
  */
@@ -160,18 +170,6 @@ static void get_ac_line(const char *inbuf, const char *what,
 	strbuf_add(name, namebuf, namelen);
 }
 
-static void commit_info_init(struct commit_info *ci)
-{
-
-	strbuf_init(&ci->author, 0);
-	strbuf_init(&ci->author_mail, 0);
-	strbuf_init(&ci->author_tz, 0);
-	strbuf_init(&ci->committer, 0);
-	strbuf_init(&ci->committer_mail, 0);
-	strbuf_init(&ci->committer_tz, 0);
-	strbuf_init(&ci->summary, 0);
-}
-
 static void commit_info_destroy(struct commit_info *ci)
 {
 
@@ -192,8 +190,6 @@ static void get_commit_info(struct commit *commit,
 	const char *subject, *encoding;
 	const char *message;
 
-	commit_info_init(ret);
-
 	encoding = get_log_output_encoding();
 	message = logmsg_reencode(commit, NULL, encoding);
 	get_ac_line(message, "\nauthor ",
@@ -246,7 +242,7 @@ static void write_filename_info(struct blame_origin *suspect)
  */
 static int emit_one_suspect_detail(struct blame_origin *suspect, int repeat)
 {
-	struct commit_info ci;
+	struct commit_info ci = COMMIT_INFO_INIT;
 
 	if (!repeat && (suspect->commit->object.flags & METAINFO_SHOWN))
 		return 0;
@@ -440,7 +436,7 @@ static void emit_other(struct blame_scoreboard *sb, struct blame_entry *ent, int
 	int cnt;
 	const char *cp;
 	struct blame_origin *suspect = ent->suspect;
-	struct commit_info ci;
+	struct commit_info ci = COMMIT_INFO_INIT;
 	char hex[GIT_MAX_HEXSZ + 1];
 	int show_raw_time = !!(opt & OUTPUT_RAW_TIMESTAMP);
 	const char *default_color = NULL, *color = NULL, *reset = NULL;
@@ -630,7 +626,7 @@ static void find_alignment(struct blame_scoreboard *sb, int *option)
 		if (longest_file < num)
 			longest_file = num;
 		if (!(suspect->commit->object.flags & METAINFO_SHOWN)) {
-			struct commit_info ci;
+			struct commit_info ci = COMMIT_INFO_INIT;
 			suspect->commit->object.flags |= METAINFO_SHOWN;
 			get_commit_info(suspect->commit, &ci, 1);
 			if (*option & OUTPUT_SHOW_EMAIL)
@@ -917,6 +913,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 			    PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_ARGV0);
 	for (;;) {
 		switch (parse_options_step(&ctx, options, blame_opt_usage)) {
+		case PARSE_OPT_NON_OPTION:
+		case PARSE_OPT_UNKNOWN:
+			break;
 		case PARSE_OPT_HELP:
 		case PARSE_OPT_ERROR:
 			exit(129);
@@ -935,11 +934,15 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 		parse_revision_opt(&revs, &ctx, options, blame_opt_usage);
 	}
 parse_done:
+	revision_opts_finish(&revs);
 	no_whole_file_rename = !revs.diffopt.flags.follow_renames;
 	xdl_opts |= revs.diffopt.xdl_opts & XDF_INDENT_HEURISTIC;
 	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 b23b1d1752..5d00d0b8d3 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -27,7 +27,8 @@
 
 static const char * const builtin_branch_usage[] = {
 	N_("git branch [<options>] [-r | -a] [--merged] [--no-merged]"),
-	N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"),
+	N_("git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-point>]"),
+	N_("git branch [<options>] [-l] [<pattern>...]"),
 	N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."),
 	N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"),
 	N_("git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"),
@@ -38,6 +39,8 @@ static const char * const builtin_branch_usage[] = {
 
 static const char *head;
 static struct object_id head_oid;
+static int recurse_submodules = 0;
+static int submodule_propagate_branches = 0;
 
 static int branch_use_color = -1;
 static char branch_colors[][COLOR_MAXLEN] = {
@@ -77,12 +80,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;
 	}
 
@@ -100,6 +102,15 @@ static int git_branch_config(const char *var, const char *value, void *cb)
 			return config_error_nonbool(var);
 		return color_parse(value, branch_colors[slot]);
 	}
+	if (!strcmp(var, "submodule.recurse")) {
+		recurse_submodules = git_config_bool(var, value);
+		return 0;
+	}
+	if (!strcasecmp(var, "submodule.propagateBranches")) {
+		submodule_propagate_branches = git_config_bool(var, value);
+		return 0;
+	}
+
 	return git_color_default_config(var, value, cb);
 }
 
@@ -168,7 +179,7 @@ static int check_branch_commit(const char *branchname, const char *refname,
 			       int kinds, int force)
 {
 	struct commit *rev = lookup_commit_reference(the_repository, oid);
-	if (!rev) {
+	if (!force && !rev) {
 		error(_("Couldn't look up commit object for '%s'"), refname);
 		return -1;
 	}
@@ -193,6 +204,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 +241,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 +254,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 +315,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 
 	free(name);
 	strbuf_release(&bname);
+	free_worktrees(worktrees);
 
 	return ret;
 }
@@ -407,7 +423,8 @@ static char *build_format(struct ref_filter *filter, int maxwidth, const char *r
 	return strbuf_detach(&fmt, NULL);
 }
 
-static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sorting, struct ref_format *format)
+static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sorting,
+			   struct ref_format *format, struct string_list *output)
 {
 	int i;
 	struct ref_array array;
@@ -427,7 +444,7 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin
 
 	memset(&array, 0, sizeof(array));
 
-	filter_refs(&array, filter, filter->kind | FILTER_REFS_INCLUDE_BROKEN);
+	filter_refs(&array, filter, filter->kind);
 
 	if (filter->verbose)
 		maxwidth = calc_maxwidth(&array, strlen(remote_prefix));
@@ -449,7 +466,7 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin
 		if (column_active(colopts)) {
 			assert(!filter->verbose && "--column and --verbose are incompatible");
 			 /* format to a string_list to let print_columns() do its job */
-			string_list_append(&output, out.buf);
+			string_list_append(output, out.buf);
 		} else {
 			fwrite(out.buf, 1, out.len, stdout);
 			putchar('\n');
@@ -616,15 +633,18 @@ static int edit_branch_description(const char *branch_name)
 
 int cmd_branch(int argc, const char **argv, const char *prefix)
 {
-	int delete = 0, rename = 0, copy = 0, force = 0, list = 0;
-	int show_current = 0;
-	int reflog = 0, edit_description = 0;
-	int quiet = 0, unset_upstream = 0;
+	/* possible actions */
+	int delete = 0, rename = 0, copy = 0, list = 0,
+	    unset_upstream = 0, show_current = 0, edit_description = 0;
 	const char *new_upstream = NULL;
+	int noncreate_actions = 0;
+	/* possible options */
+	int reflog = 0, quiet = 0, icase = 0, force = 0,
+	    recurse_submodules_explicit = 0;
 	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[] = {
@@ -632,8 +652,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")),
@@ -665,10 +687,11 @@ 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")),
+		OPT_BOOL(0, "recurse-submodules", &recurse_submodules_explicit, N_("recurse through submodules")),
 		OPT_STRING(  0 , "format", &format.format, N_("format"), N_("format to use for the output")),
 		OPT_END(),
 	};
@@ -682,7 +705,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;
 
@@ -705,10 +728,23 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 	    filter.reachable_from || filter.unreachable_from || filter.points_at.nr)
 		list = 1;
 
-	if (!!delete + !!rename + !!copy + !!new_upstream + !!show_current +
-	    list + edit_description + unset_upstream > 1)
+	noncreate_actions = !!delete + !!rename + !!copy + !!new_upstream +
+			    !!show_current + !!list + !!edit_description +
+			    !!unset_upstream;
+	if (noncreate_actions > 1)
 		usage_with_options(builtin_branch_usage, options);
 
+	if (recurse_submodules_explicit) {
+		if (!submodule_propagate_branches)
+			die(_("branch with --recurse-submodules can only be used if submodule.propagateBranches is enabled"));
+		if (noncreate_actions)
+			die(_("--recurse-submodules can only be used to create branches"));
+	}
+
+	recurse_submodules =
+		(recurse_submodules || recurse_submodules_explicit) &&
+		submodule_propagate_branches;
+
 	if (filter.abbrev == -1)
 		filter.abbrev = DEFAULT_ABBREV;
 	filter.ignore_case = icase;
@@ -716,7 +752,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;
 	}
 
@@ -748,14 +784,14 @@ 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);
-		print_ref_list(&filter, sorting, &format);
+		print_ref_list(&filter, sorting, &format, &output);
 		print_columns(&output, colopts, NULL);
 		string_list_clear(&output, 0);
+		ref_sorting_release(sorting);
 		return 0;
 	} else if (edit_description) {
 		const char *branch_name;
@@ -820,12 +856,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		if (!ref_exists(branch->refname))
 			die(_("branch '%s' does not exist"), branch->name);
 
-		/*
-		 * create_branch takes care of setting up the tracking
-		 * info and making sure new_upstream is correct
-		 */
-		create_branch(the_repository, branch->name, new_upstream,
-			      0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE);
+		dwim_and_setup_tracking(the_repository, branch->name,
+					new_upstream, BRANCH_TRACK_OVERRIDE,
+					quiet);
 	} else if (unset_upstream) {
 		struct branch *branch = branch_get(argv[0]);
 		struct strbuf buf = STRBUF_INIT;
@@ -849,7 +882,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		strbuf_addf(&buf, "branch.%s.merge", branch->name);
 		git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
 		strbuf_release(&buf);
-	} else if (argc > 0 && argc <= 2) {
+	} else if (!noncreate_actions && argc > 0 && argc <= 2) {
+		const char *branch_name = argv[0];
+		const char *start_name = argc == 2 ? argv[1] : head;
+
 		if (filter.kind != FILTER_REFS_BRANCHES)
 			die(_("The -a, and -r, options to 'git branch' do not take a branch name.\n"
 				  "Did you mean to use: -a|-r --list <pattern>?"));
@@ -857,10 +893,14 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		if (track == BRANCH_TRACK_OVERRIDE)
 			die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead."));
 
-		create_branch(the_repository,
-			      argv[0], (argc == 2) ? argv[1] : head,
-			      force, 0, reflog, quiet, track);
-
+		if (recurse_submodules) {
+			create_branches_recursively(the_repository, branch_name,
+						    start_name, NULL, force,
+						    reflog, quiet, track, 0);
+			return 0;
+		}
+		create_branch(the_repository, branch_name, start_name, force, 0,
+			      reflog, quiet, track, 0);
 	} else
 		usage_with_options(builtin_branch_usage, options);
 
diff --git a/builtin/bugreport.c b/builtin/bugreport.c
index 9915a5841d..9de32bc96e 100644
--- a/builtin/bugreport.c
+++ b/builtin/bugreport.c
@@ -3,7 +3,8 @@
 #include "strbuf.h"
 #include "help.h"
 #include "compat/compiler.h"
-#include "run-command.h"
+#include "hook.h"
+#include "hook-list.h"
 
 
 static void get_system_info(struct strbuf *sys_info)
@@ -41,39 +42,7 @@ static void get_system_info(struct strbuf *sys_info)
 
 static void get_populated_hooks(struct strbuf *hook_info, int nongit)
 {
-	/*
-	 * NEEDSWORK: Doesn't look like there is a list of all possible hooks;
-	 * so below is a transcription of `git help hooks`. Later, this should
-	 * be replaced with some programmatically generated list (generated from
-	 * doc or else taken from some library which tells us about all the
-	 * hooks)
-	 */
-	static const char *hook[] = {
-		"applypatch-msg",
-		"pre-applypatch",
-		"post-applypatch",
-		"pre-commit",
-		"pre-merge-commit",
-		"prepare-commit-msg",
-		"commit-msg",
-		"post-commit",
-		"pre-rebase",
-		"post-checkout",
-		"post-merge",
-		"pre-push",
-		"pre-receive",
-		"update",
-		"post-receive",
-		"post-update",
-		"push-to-checkout",
-		"pre-auto-gc",
-		"post-rewrite",
-		"sendemail-validate",
-		"fsmonitor-watchman",
-		"p4-pre-submit",
-		"post-index-change",
-	};
-	int i;
+	const char **p;
 
 	if (nongit) {
 		strbuf_addstr(hook_info,
@@ -81,9 +50,12 @@ static void get_populated_hooks(struct strbuf *hook_info, int nongit)
 		return;
 	}
 
-	for (i = 0; i < ARRAY_SIZE(hook); i++)
-		if (find_hook(hook[i]))
-			strbuf_addf(hook_info, "%s\n", hook[i]);
+	for (p = hook_name_list; *p; p++) {
+		const char *hook = *p;
+
+		if (hook_exists(hook))
+			strbuf_addf(hook_info, "%s\n", hook);
+	}
 }
 
 static const char * const bugreport_usage[] = {
@@ -171,10 +143,7 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix)
 	get_populated_hooks(&buffer, !startup_info->have_repository);
 
 	/* fopen doesn't offer us an O_EXCL alternative, except with glibc. */
-	report = open(report_path.buf, O_CREAT | O_EXCL | O_WRONLY, 0666);
-
-	if (report < 0)
-		die(_("couldn't create a new file at '%s'"), report_path.buf);
+	report = xopen(report_path.buf, O_CREAT | O_EXCL | O_WRONLY, 0666);
 
 	if (write_in_full(report, buffer.buf, buffer.len) < 0)
 		die_errno(_("unable to write to %s"), report_path.buf);
diff --git a/builtin/bundle.c b/builtin/bundle.c
index 053a51bea1..5a85d7cd0f 100644
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -39,8 +39,6 @@ static const char * const builtin_bundle_unbundle_usage[] = {
   NULL
 };
 
-static int verbose;
-
 static int parse_options_cmd_bundle(int argc,
 		const char **argv,
 		const char* prefix,
@@ -162,10 +160,15 @@ static int cmd_bundle_unbundle(int argc, const char **argv, const char *prefix)
 	struct bundle_header header = BUNDLE_HEADER_INIT;
 	int bundle_fd = -1;
 	int ret;
+	int progress = isatty(2);
+
 	struct option options[] = {
+		OPT_BOOL(0, "progress", &progress,
+			 N_("show progress meter")),
 		OPT_END()
 	};
 	char *bundle_file;
+	struct strvec extra_index_pack_args = STRVEC_INIT;
 
 	argc = parse_options_cmd_bundle(argc, argv, prefix,
 			builtin_bundle_unbundle_usage, options, &bundle_file);
@@ -177,7 +180,11 @@ static int cmd_bundle_unbundle(int argc, const char **argv, const char *prefix)
 	}
 	if (!startup_info->have_repository)
 		die(_("Need a repository to unbundle."));
-	ret = !!unbundle(the_repository, &header, bundle_fd, 0) ||
+	if (progress)
+		strvec_pushl(&extra_index_pack_args, "-v", "--progress-title",
+			     _("Unbundling objects"), NULL);
+	ret = !!unbundle(the_repository, &header, bundle_fd,
+			 &extra_index_pack_args) ||
 		list_bundle_refs(&header, argc, argv);
 	bundle_header_release(&header);
 cleanup:
@@ -188,7 +195,6 @@ cleanup:
 int cmd_bundle(int argc, const char **argv, const char *prefix)
 {
 	struct option options[] = {
-		OPT__VERBOSE(&verbose, N_("be verbose; must be placed before a subcommand")),
 		OPT_END()
 	};
 	int result;
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 243fe6844b..7b3f42950e 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -73,14 +73,17 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
 	struct object_info oi = OBJECT_INFO_INIT;
 	struct strbuf sb = STRBUF_INIT;
 	unsigned flags = OBJECT_INFO_LOOKUP_REPLACE;
+	unsigned get_oid_flags = GET_OID_RECORD_PATH | GET_OID_ONLY_TO_DIE;
 	const char *path = force_path;
+	const int opt_cw = (opt == 'c' || opt == 'w');
+	if (!path && opt_cw)
+		get_oid_flags |= GET_OID_REQUIRE_PATH;
 
 	if (unknown_type)
 		flags |= OBJECT_INFO_ALLOW_UNKNOWN_TYPE;
 
-	if (get_oid_with_context(the_repository, obj_name,
-				 GET_OID_RECORD_PATH,
-				 &oid, &obj_context))
+	if (get_oid_with_context(the_repository, obj_name, get_oid_flags, &oid,
+				 &obj_context))
 		die("Not a valid object name %s", obj_name);
 
 	if (!path)
@@ -112,9 +115,6 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
 		return !has_object_file(&oid);
 
 	case 'w':
-		if (!path)
-			die("git cat-file --filters %s: <object> must be "
-			    "<sha1:path>", obj_name);
 
 		if (filter_object(path, obj_context.mode,
 				  &oid, &buf, &size))
@@ -122,10 +122,6 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
 		break;
 
 	case 'c':
-		if (!path)
-			die("git cat-file --textconv %s: <object> must be <sha1:path>",
-			    obj_name);
-
 		if (textconv_object(the_repository, path, obj_context.mode,
 				    &oid, 1, &buf, &size))
 			break;
@@ -355,18 +351,34 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
 	}
 }
 
+/*
+ * If "pack" is non-NULL, then "offset" is the byte offset within the pack from
+ * which the object may be accessed (though note that we may also rely on
+ * data->oid, too). If "pack" is NULL, then offset is ignored.
+ */
 static void batch_object_write(const char *obj_name,
 			       struct strbuf *scratch,
 			       struct batch_options *opt,
-			       struct expand_data *data)
+			       struct expand_data *data,
+			       struct packed_git *pack,
+			       off_t offset)
 {
-	if (!data->skip_object_info &&
-	    oid_object_info_extended(the_repository, &data->oid, &data->info,
-				     OBJECT_INFO_LOOKUP_REPLACE) < 0) {
-		printf("%s missing\n",
-		       obj_name ? obj_name : oid_to_hex(&data->oid));
-		fflush(stdout);
-		return;
+	if (!data->skip_object_info) {
+		int ret;
+
+		if (pack)
+			ret = packed_object_info(the_repository, pack, offset,
+						 &data->info);
+		else
+			ret = oid_object_info_extended(the_repository,
+						       &data->oid, &data->info,
+						       OBJECT_INFO_LOOKUP_REPLACE);
+		if (ret < 0) {
+			printf("%s missing\n",
+			       obj_name ? obj_name : oid_to_hex(&data->oid));
+			fflush(stdout);
+			return;
+		}
 	}
 
 	strbuf_reset(scratch);
@@ -428,7 +440,7 @@ static void batch_one_object(const char *obj_name,
 		return;
 	}
 
-	batch_object_write(obj_name, scratch, opt, data);
+	batch_object_write(obj_name, scratch, opt, data, NULL, 0);
 }
 
 struct object_cb_data {
@@ -442,7 +454,8 @@ static int batch_object_cb(const struct object_id *oid, void *vdata)
 {
 	struct object_cb_data *data = vdata;
 	oidcpy(&data->expand->oid, oid);
-	batch_object_write(NULL, data->scratch, data->opt, data->expand);
+	batch_object_write(NULL, data->scratch, data->opt, data->expand,
+			   NULL, 0);
 	return 0;
 }
 
@@ -463,21 +476,26 @@ static int collect_packed_object(const struct object_id *oid,
 	return 0;
 }
 
-static int batch_unordered_object(const struct object_id *oid, void *vdata)
+static int batch_unordered_object(const struct object_id *oid,
+				  struct packed_git *pack, off_t offset,
+				  void *vdata)
 {
 	struct object_cb_data *data = vdata;
 
 	if (oidset_insert(data->seen, oid))
 		return 0;
 
-	return batch_object_cb(oid, data);
+	oidcpy(&data->expand->oid, oid);
+	batch_object_write(NULL, data->scratch, data->opt, data->expand,
+			   pack, offset);
+	return 0;
 }
 
 static int batch_unordered_loose(const struct object_id *oid,
 				 const char *path,
 				 void *data)
 {
-	return batch_unordered_object(oid, data);
+	return batch_unordered_object(oid, NULL, 0, data);
 }
 
 static int batch_unordered_packed(const struct object_id *oid,
@@ -485,7 +503,9 @@ static int batch_unordered_packed(const struct object_id *oid,
 				  uint32_t pos,
 				  void *data)
 {
-	return batch_unordered_object(oid, data);
+	return batch_unordered_object(oid, pack,
+				      nth_packed_object_offset(pack, pos),
+				      data);
 }
 
 static int batch_objects(struct batch_options *opt)
@@ -529,6 +549,8 @@ static int batch_objects(struct batch_options *opt)
 		if (has_promisor_remote())
 			warning("This repository uses promisor remotes. Some objects may not be loaded.");
 
+		read_replace_refs = 0;
+
 		cb.opt = opt;
 		cb.expand = &data;
 		cb.scratch = &output;
@@ -592,12 +614,6 @@ static int batch_objects(struct batch_options *opt)
 	return retval;
 }
 
-static const char * const cat_file_usage[] = {
-	N_("git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>"),
-	N_("git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-symlinks] [--textconv | --filters]"),
-	NULL
-};
-
 static int git_cat_file_config(const char *var, const char *value, void *cb)
 {
 	if (userdiff_config(var, value) < 0)
@@ -628,90 +644,138 @@ static int batch_option_callback(const struct option *opt,
 int cmd_cat_file(int argc, const char **argv, const char *prefix)
 {
 	int opt = 0;
+	int opt_cw = 0;
+	int opt_epts = 0;
 	const char *exp_type = NULL, *obj_name = NULL;
 	struct batch_options batch = {0};
 	int unknown_type = 0;
 
+	const char * const usage[] = {
+		N_("git cat-file <type> <object>"),
+		N_("git cat-file (-e | -p) <object>"),
+		N_("git cat-file (-t | -s) [--allow-unknown-type] <object>"),
+		N_("git cat-file (--batch | --batch-check) [--batch-all-objects]\n"
+		   "             [--buffer] [--follow-symlinks] [--unordered]\n"
+		   "             [--textconv | --filters]"),
+		N_("git cat-file (--textconv | --filters)\n"
+		   "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"),
+		NULL
+	};
 	const struct option options[] = {
-		OPT_GROUP(N_("<type> can be one of: blob, tree, commit, tag")),
-		OPT_CMDMODE('t', NULL, &opt, N_("show object type"), 't'),
-		OPT_CMDMODE('s', NULL, &opt, N_("show object size"), 's'),
+		/* Simple queries */
+		OPT_GROUP(N_("Check object existence or emit object contents")),
 		OPT_CMDMODE('e', NULL, &opt,
-			    N_("exit with zero when there's no error"), 'e'),
-		OPT_CMDMODE('p', NULL, &opt, N_("pretty-print object's content"), 'p'),
-		OPT_CMDMODE(0, "textconv", &opt,
-			    N_("for blob objects, run textconv on object's content"), 'c'),
-		OPT_CMDMODE(0, "filters", &opt,
-			    N_("for blob objects, run filters on object's content"), 'w'),
-		OPT_STRING(0, "path", &force_path, N_("blob"),
-			   N_("use a specific path for --textconv/--filters")),
+			    N_("check if <object> exists"), 'e'),
+		OPT_CMDMODE('p', NULL, &opt, N_("pretty-print <object> content"), 'p'),
+
+		OPT_GROUP(N_("Emit [broken] object attributes")),
+		OPT_CMDMODE('t', NULL, &opt, N_("show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"), 't'),
+		OPT_CMDMODE('s', NULL, &opt, N_("show object size"), 's'),
 		OPT_BOOL(0, "allow-unknown-type", &unknown_type,
 			  N_("allow -s and -t to work with broken/corrupt objects")),
-		OPT_BOOL(0, "buffer", &batch.buffer_output, N_("buffer --batch output")),
-		OPT_CALLBACK_F(0, "batch", &batch, "format",
-			N_("show info and content of objects fed from the standard input"),
+		/* Batch mode */
+		OPT_GROUP(N_("Batch objects requested on stdin (or --batch-all-objects)")),
+		OPT_CALLBACK_F(0, "batch", &batch, N_("format"),
+			N_("show full <object> or <rev> contents"),
 			PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
 			batch_option_callback),
-		OPT_CALLBACK_F(0, "batch-check", &batch, "format",
-			N_("show info about objects fed from the standard input"),
+		OPT_CALLBACK_F(0, "batch-check", &batch, N_("format"),
+			N_("like --batch, but don't emit <contents>"),
 			PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
 			batch_option_callback),
+		OPT_CMDMODE(0, "batch-all-objects", &opt,
+			    N_("with --batch[-check]: ignores stdin, batches all known objects"), 'b'),
+		/* Batch-specific options */
+		OPT_GROUP(N_("Change or optimize batch output")),
+		OPT_BOOL(0, "buffer", &batch.buffer_output, N_("buffer --batch output")),
 		OPT_BOOL(0, "follow-symlinks", &batch.follow_symlinks,
-			 N_("follow in-tree symlinks (used with --batch or --batch-check)")),
-		OPT_BOOL(0, "batch-all-objects", &batch.all_objects,
-			 N_("show all objects with --batch or --batch-check")),
+			 N_("follow in-tree symlinks")),
 		OPT_BOOL(0, "unordered", &batch.unordered,
-			 N_("do not order --batch-all-objects output")),
+			 N_("do not order objects before emitting them")),
+		/* Textconv options, stand-ole*/
+		OPT_GROUP(N_("Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)")),
+		OPT_CMDMODE(0, "textconv", &opt,
+			    N_("run textconv on object's content"), 'c'),
+		OPT_CMDMODE(0, "filters", &opt,
+			    N_("run filters on object's content"), 'w'),
+		OPT_STRING(0, "path", &force_path, N_("blob|tree"),
+			   N_("use a <path> for (--textconv | --filters); Not with 'batch'")),
 		OPT_END()
 	};
 
 	git_config(git_cat_file_config, NULL);
 
 	batch.buffer_output = -1;
-	argc = parse_options(argc, argv, prefix, options, cat_file_usage, 0);
 
-	if (opt) {
-		if (batch.enabled && (opt == 'c' || opt == 'w'))
-			batch.cmdmode = opt;
-		else if (argc == 1)
-			obj_name = argv[0];
-		else
-			usage_with_options(cat_file_usage, options);
-	}
-	if (!opt && !batch.enabled) {
-		if (argc == 2) {
-			exp_type = argv[0];
-			obj_name = argv[1];
-		} else
-			usage_with_options(cat_file_usage, options);
-	}
-	if (batch.enabled) {
-		if (batch.cmdmode != opt || argc)
-			usage_with_options(cat_file_usage, options);
-		if (batch.cmdmode && batch.all_objects)
-			die("--batch-all-objects cannot be combined with "
-			    "--textconv nor with --filters");
-	}
-
-	if ((batch.follow_symlinks || batch.all_objects) && !batch.enabled) {
-		usage_with_options(cat_file_usage, options);
-	}
+	argc = parse_options(argc, argv, prefix, options, usage, 0);
+	opt_cw = (opt == 'c' || opt == 'w');
+	opt_epts = (opt == 'e' || opt == 'p' || opt == 't' || opt == 's');
 
-	if (force_path && opt != 'c' && opt != 'w') {
-		error("--path=<path> needs --textconv or --filters");
-		usage_with_options(cat_file_usage, options);
-	}
+	/* --batch-all-objects? */
+	if (opt == 'b')
+		batch.all_objects = 1;
 
-	if (force_path && batch.enabled) {
-		error("--path=<path> incompatible with --batch");
-		usage_with_options(cat_file_usage, options);
-	}
+	/* Option compatibility */
+	if (force_path && !opt_cw)
+		usage_msg_optf(_("'%s=<%s>' needs '%s' or '%s'"),
+			       usage, options,
+			       "--path", _("path|tree-ish"), "--filters",
+			       "--textconv");
 
+	/* Option compatibility with batch mode */
+	if (batch.enabled)
+		;
+	else if (batch.follow_symlinks)
+		usage_msg_optf(_("'%s' requires a batch mode"), usage, options,
+			       "--follow-symlinks");
+	else if (batch.buffer_output >= 0)
+		usage_msg_optf(_("'%s' requires a batch mode"), usage, options,
+			       "--buffer");
+	else if (batch.all_objects)
+		usage_msg_optf(_("'%s' requires a batch mode"), usage, options,
+			       "--batch-all-objects");
+
+	/* Batch defaults */
 	if (batch.buffer_output < 0)
 		batch.buffer_output = batch.all_objects;
 
-	if (batch.enabled)
+	/* Return early if we're in batch mode? */
+	if (batch.enabled) {
+		if (opt_cw)
+			batch.cmdmode = opt;
+		else if (opt && opt != 'b')
+			usage_msg_optf(_("'-%c' is incompatible with batch mode"),
+				       usage, options, opt);
+		else if (argc)
+			usage_msg_opt(_("batch modes take no arguments"), usage,
+				      options);
+
 		return batch_objects(&batch);
+	}
+
+	if (opt) {
+		if (!argc && opt == 'c')
+			usage_msg_optf(_("<rev> required with '%s'"),
+				       usage, options, "--textconv");
+		else if (!argc && opt == 'w')
+			usage_msg_optf(_("<rev> required with '%s'"),
+				       usage, options, "--filters");
+		else if (!argc && opt_epts)
+			usage_msg_optf(_("<object> required with '-%c'"),
+				       usage, options, opt);
+		else if (argc == 1)
+			obj_name = argv[0];
+		else
+			usage_msg_opt(_("too many arguments"), usage, options);
+	} else if (!argc) {
+		usage_with_options(usage, options);
+	} else if (argc != 2) {
+		usage_msg_optf(_("only two arguments allowed in <type> <object> mode, not %d"),
+			      usage, options, argc);
+	} else if (argc) {
+		exp_type = argv[0];
+		obj_name = argv[1];
+	}
 
 	if (unknown_type && opt != 't' && opt != 's')
 		die("git cat-file --allow-unknown-type: use with -s or -t");
diff --git a/builtin/checkout--worker.c b/builtin/checkout--worker.c
index fb9fd13b73..ede7dc32a4 100644
--- a/builtin/checkout--worker.c
+++ b/builtin/checkout--worker.c
@@ -82,8 +82,8 @@ static void worker_loop(struct checkout *state)
 	size_t i, nr = 0, alloc = 0;
 
 	while (1) {
-		int len = packet_read(0, NULL, NULL, packet_buffer,
-				      sizeof(packet_buffer), 0);
+		int len = packet_read(0, packet_buffer, sizeof(packet_buffer),
+				      0);
 
 		if (len < 0)
 			BUG("packet_read() returned negative value");
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index e21620d964..97e06e8c52 100644
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -7,6 +7,7 @@
 #define USE_THE_INDEX_COMPATIBILITY_MACROS
 #include "builtin.h"
 #include "config.h"
+#include "dir.h"
 #include "lockfile.h"
 #include "quote.h"
 #include "cache-tree.h"
@@ -17,6 +18,7 @@
 #define CHECKOUT_ALL 4
 static int nul_term_line;
 static int checkout_stage; /* default to checkout stage0 */
+static int ignore_skip_worktree; /* default to 0 */
 static int to_tempfile;
 static char topath[4][TEMPORARY_FILENAME_LENGTH + 1];
 
@@ -65,6 +67,8 @@ static int checkout_file(const char *name, const char *prefix)
 	int namelen = strlen(name);
 	int pos = cache_name_pos(name, namelen);
 	int has_same_name = 0;
+	int is_file = 0;
+	int is_skipped = 1;
 	int did_checkout = 0;
 	int errs = 0;
 
@@ -78,6 +82,12 @@ static int checkout_file(const char *name, const char *prefix)
 			break;
 		has_same_name = 1;
 		pos++;
+		if (S_ISSPARSEDIR(ce->ce_mode))
+			break;
+		is_file = 1;
+		if (!ignore_skip_worktree && ce_skip_worktree(ce))
+			break;
+		is_skipped = 0;
 		if (ce_stage(ce) != checkout_stage
 		    && (CHECKOUT_ALL != checkout_stage || !ce_stage(ce)))
 			continue;
@@ -106,6 +116,11 @@ static int checkout_file(const char *name, const char *prefix)
 		fprintf(stderr, "git checkout-index: %s ", name);
 		if (!has_same_name)
 			fprintf(stderr, "is not in the cache");
+		else if (!is_file)
+			fprintf(stderr, "is a sparse directory");
+		else if (is_skipped)
+			fprintf(stderr, "has skip-worktree enabled; "
+					"use '--ignore-skip-worktree-bits' to checkout");
 		else if (checkout_stage)
 			fprintf(stderr, "does not exist at stage %d",
 				checkout_stage);
@@ -121,10 +136,27 @@ static int checkout_all(const char *prefix, int prefix_length)
 	int i, errs = 0;
 	struct cache_entry *last_ce = NULL;
 
-	/* TODO: audit for interaction with sparse-index. */
-	ensure_full_index(&the_index);
 	for (i = 0; i < active_nr ; i++) {
 		struct cache_entry *ce = active_cache[i];
+
+		if (S_ISSPARSEDIR(ce->ce_mode)) {
+			if (!ce_skip_worktree(ce))
+				BUG("sparse directory '%s' does not have skip-worktree set", ce->name);
+
+			/*
+			 * If the current entry is a sparse directory and skip-worktree
+			 * entries are being checked out, expand the index and continue
+			 * the loop on the current index position (now pointing to the
+			 * first entry inside the expanded sparse directory).
+			 */
+			if (ignore_skip_worktree) {
+				ensure_full_index(&the_index);
+				ce = active_cache[i];
+			}
+		}
+
+		if (!ignore_skip_worktree && ce_skip_worktree(ce))
+			continue;
 		if (ce_stage(ce) != checkout_stage
 		    && (CHECKOUT_ALL != checkout_stage || !ce_stage(ce)))
 			continue;
@@ -185,6 +217,8 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
 	struct option builtin_checkout_index_options[] = {
 		OPT_BOOL('a', "all", &all,
 			N_("check out all files in the index")),
+		OPT_BOOL(0, "ignore-skip-worktree-bits", &ignore_skip_worktree,
+			N_("do not skip files with skip-worktree set")),
 		OPT__FORCE(&force, N_("force overwrite of existing files"), 0),
 		OPT__QUIET(&quiet,
 			N_("no warning for existing files and files not in index")),
@@ -212,6 +246,9 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
 	git_config(git_default_config, NULL);
 	prefix_length = prefix ? strlen(prefix) : 0;
 
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
+
 	if (read_cache() < 0) {
 		die("invalid cache");
 	}
diff --git a/builtin/checkout.c b/builtin/checkout.c
index f4cd7747d3..d9b31bbb6d 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -9,6 +9,7 @@
 #include "config.h"
 #include "diff.h"
 #include "dir.h"
+#include "hook.h"
 #include "ll-merge.h"
 #include "lockfile.h"
 #include "merge-recursive.h"
@@ -91,8 +92,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,10 +104,18 @@ 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)
 {
-	return run_hook_le(NULL, "post-checkout",
+	return run_hooks_l("post-checkout",
 			   oid_to_hex(old_commit ? &old_commit->object.oid : null_oid()),
 			   oid_to_hex(new_commit ? &new_commit->object.oid : null_oid()),
 			   changed ? "1" : "0", NULL);
@@ -237,6 +246,7 @@ static int checkout_merged(int pos, const struct checkout *state,
 	struct cache_entry *ce = active_cache[pos];
 	const char *path = ce->name;
 	mmfile_t ancestor, ours, theirs;
+	enum ll_merge_result merge_status;
 	int status;
 	struct object_id oid;
 	mmbuffer_t result_buf;
@@ -267,13 +277,16 @@ static int checkout_merged(int pos, const struct checkout *state,
 	memset(&ll_opts, 0, sizeof(ll_opts));
 	git_config_get_bool("merge.renormalize", &renormalize);
 	ll_opts.renormalize = renormalize;
-	status = ll_merge(&result_buf, path, &ancestor, "base",
-			  &ours, "ours", &theirs, "theirs",
-			  state->istate, &ll_opts);
+	merge_status = ll_merge(&result_buf, path, &ancestor, "base",
+				&ours, "ours", &theirs, "theirs",
+				state->istate, &ll_opts);
 	free(ancestor.ptr);
 	free(ours.ptr);
 	free(theirs.ptr);
-	if (status < 0 || !result_buf.ptr) {
+	if (merge_status == LL_MERGE_BINARY_CONFLICT)
+		warning("Cannot merge binary files: %s (%s vs. %s)",
+			path, "ours", "theirs");
+	if (merge_status < 0 || !result_buf.ptr) {
 		free(result_buf.ptr);
 		return error(_("path '%s': cannot merge"), path);
 	}
@@ -378,9 +391,6 @@ static int checkout_worktree(const struct checkout_opts *opts,
 	if (pc_workers > 1)
 		init_parallel_checkout();
 
-	/* TODO: audit for interaction with sparse-index. */
-	ensure_full_index(&the_index);
-
 	for (pos = 0; pos < active_nr; pos++) {
 		struct cache_entry *ce = active_cache[pos];
 		if (ce->ce_flags & CE_MATCHED) {
@@ -407,7 +417,7 @@ static int checkout_worktree(const struct checkout_opts *opts,
 	mem_pool_discard(&ce_mem_pool, should_validate_cache_entries());
 	remove_marked_cache_entries(&the_index, 1);
 	remove_scheduled_dirs();
-	errs |= finish_delayed_checkout(&state, &nr_checkouts);
+	errs |= finish_delayed_checkout(&state, &nr_checkouts, opts->show_progress);
 
 	if (opts->count_checkout_paths) {
 		if (nr_unmerged)
@@ -459,10 +469,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)
@@ -530,8 +540,6 @@ static int checkout_paths(const struct checkout_opts *opts,
 	 * Make sure all pathspecs participated in locating the paths
 	 * to be checked out.
 	 */
-	/* TODO: audit for interaction with sparse-index. */
-	ensure_full_index(&the_index);
 	for (pos = 0; pos < active_nr; pos++)
 		if (opts->overlay_mode)
 			mark_ce_for_checkout_overlay(active_cache[pos],
@@ -651,7 +659,9 @@ static int reset_tree(struct tree *tree, const struct checkout_opts *o,
 	opts.head_idx = -1;
 	opts.update = worktree;
 	opts.skip_unmerged = !worktree;
-	opts.reset = 1;
+	opts.reset = o->force ? UNPACK_RESET_OVERWRITE_UNTRACKED :
+				UNPACK_RESET_PROTECT_UNTRACKED;
+	opts.preserve_ignored = (!o->force && !o->overwrite_ignore);
 	opts.merge = 1;
 	opts.fn = oneway_merge;
 	opts.verbose_update = o->show_progress;
@@ -691,9 +701,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);
 }
 
@@ -751,11 +764,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
 				       new_branch_info->commit ?
 				       &new_branch_info->commit->object.oid :
 				       &new_branch_info->oid, NULL);
-		if (opts->overwrite_ignore) {
-			topts.dir = xcalloc(1, sizeof(*topts.dir));
-			topts.dir->flags |= DIR_SHOW_IGNORED;
-			setup_standard_excludes(topts.dir);
-		}
+		topts.preserve_ignored = !opts->overwrite_ignore;
 		tree = parse_tree_indirect(old_branch_info->commit ?
 					   &old_branch_info->commit->object.oid :
 					   the_hash_algo->empty_tree);
@@ -881,7 +890,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);
@@ -900,8 +909,11 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
 				      opts->new_branch_force ? 1 : 0,
 				      opts->new_branch_log,
 				      opts->quiet,
-				      opts->track);
-		new_branch_info->name = opts->new_branch;
+				      opts->track,
+				      0);
+		free(new_branch_info->name);
+		free(new_branch_info->refname);
+		new_branch_info->name = xstrdup(opts->new_branch);
 		setup_branch_path(new_branch_info);
 	}
 
@@ -923,7 +935,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
 			   REF_NO_DEREF, UPDATE_REFS_DIE_ON_ERR);
 		if (!opts->quiet) {
 			if (old_branch_info->path &&
-			    advice_detached_head && !opts->force_detach)
+			    advice_enabled(ADVICE_DETACHED_HEAD) && !opts->force_detach)
 				detach_advice(new_branch_info->name);
 			describe_detached_head(_("HEAD is now at"), new_branch_info->commit);
 		}
@@ -1016,7 +1028,7 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)
 		sb.buf);
 	strbuf_release(&sb);
 
-	if (advice_detached_head)
+	if (advice_enabled(ADVICE_DETACHED_HEAD))
 		fprintf(stderr,
 			Q_(
 			/* The singular version */
@@ -1069,8 +1081,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;
@@ -1078,25 +1089,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"));
@@ -1109,7 +1124,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;
 		}
 	}
@@ -1120,7 +1135,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;
 }
 
@@ -1152,16 +1168,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) {
@@ -1187,7 +1202,7 @@ static const char *parse_remote_branch(const char *arg,
 	}
 
 	if (!remote && num_matches > 1) {
-	    if (advice_checkout_ambiguous_remote_branch_name) {
+	    if (advice_enabled(ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME)) {
 		    advise(_("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"
 			     "\n"
@@ -1524,7 +1539,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);
@@ -1537,8 +1552,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")),
@@ -1581,17 +1598,20 @@ 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;
 
 	git_config(git_checkout_config, opts);
+	if (the_repository->gitdir) {
+		prepare_repo_settings(the_repository);
+		the_repository->settings.command_requires_full_index = 0;
+	}
 
 	opts->track = BRANCH_TRACK_UNSPECIFIED;
 
@@ -1621,11 +1641,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)
@@ -1692,7 +1712,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) {
@@ -1701,7 +1721,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);
 
@@ -1721,7 +1741,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);
 
@@ -1732,19 +1752,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;
@@ -1770,11 +1790,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)
@@ -1793,6 +1812,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;
@@ -1823,7 +1843,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;
 }
@@ -1844,6 +1866,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;
@@ -1863,7 +1886,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;
 }
@@ -1885,6 +1909,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;
@@ -1900,7 +1925,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..5466636e66 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;
@@ -983,6 +1009,9 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 		dir.flags |= DIR_KEEP_UNTRACKED_CONTENTS;
 	}
 
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
+
 	if (read_cache() < 0)
 		die(_("index file corrupt"));
 
diff --git a/builtin/clone.c b/builtin/clone.c
index 66fe66679c..0d80b135c9 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -32,6 +32,7 @@
 #include "connected.h"
 #include "packfile.h"
 #include "list-objects-filter-options.h"
+#include "hook.h"
 
 /*
  * Overall FIXMEs:
@@ -217,120 +218,6 @@ static char *get_repo_path(const char *repo, int *is_bundle)
 	return canon;
 }
 
-static char *guess_dir_name(const char *repo, int is_bundle, int is_bare)
-{
-	const char *end = repo + strlen(repo), *start, *ptr;
-	size_t len;
-	char *dir;
-
-	/*
-	 * Skip scheme.
-	 */
-	start = strstr(repo, "://");
-	if (start == NULL)
-		start = repo;
-	else
-		start += 3;
-
-	/*
-	 * Skip authentication data. The stripping does happen
-	 * greedily, such that we strip up to the last '@' inside
-	 * the host part.
-	 */
-	for (ptr = start; ptr < end && !is_dir_sep(*ptr); ptr++) {
-		if (*ptr == '@')
-			start = ptr + 1;
-	}
-
-	/*
-	 * Strip trailing spaces, slashes and /.git
-	 */
-	while (start < end && (is_dir_sep(end[-1]) || isspace(end[-1])))
-		end--;
-	if (end - start > 5 && is_dir_sep(end[-5]) &&
-	    !strncmp(end - 4, ".git", 4)) {
-		end -= 5;
-		while (start < end && is_dir_sep(end[-1]))
-			end--;
-	}
-
-	/*
-	 * Strip trailing port number if we've got only a
-	 * hostname (that is, there is no dir separator but a
-	 * colon). This check is required such that we do not
-	 * strip URI's like '/foo/bar:2222.git', which should
-	 * result in a dir '2222' being guessed due to backwards
-	 * compatibility.
-	 */
-	if (memchr(start, '/', end - start) == NULL
-	    && memchr(start, ':', end - start) != NULL) {
-		ptr = end;
-		while (start < ptr && isdigit(ptr[-1]) && ptr[-1] != ':')
-			ptr--;
-		if (start < ptr && ptr[-1] == ':')
-			end = ptr - 1;
-	}
-
-	/*
-	 * Find last component. To remain backwards compatible we
-	 * also regard colons as path separators, such that
-	 * cloning a repository 'foo:bar.git' would result in a
-	 * directory 'bar' being guessed.
-	 */
-	ptr = end;
-	while (start < ptr && !is_dir_sep(ptr[-1]) && ptr[-1] != ':')
-		ptr--;
-	start = ptr;
-
-	/*
-	 * Strip .{bundle,git}.
-	 */
-	len = end - start;
-	strip_suffix_mem(start, &len, is_bundle ? ".bundle" : ".git");
-
-	if (!len || (len == 1 && *start == '/'))
-		die(_("No directory name could be guessed.\n"
-		      "Please specify a directory on the command line"));
-
-	if (is_bare)
-		dir = xstrfmt("%.*s.git", (int)len, start);
-	else
-		dir = xstrndup(start, len);
-	/*
-	 * Replace sequences of 'control' characters and whitespace
-	 * with one ascii space, remove leading and trailing spaces.
-	 */
-	if (*dir) {
-		char *out = dir;
-		int prev_space = 1 /* strip leading whitespace */;
-		for (end = dir; *end; ++end) {
-			char ch = *end;
-			if ((unsigned char)ch < '\x20')
-				ch = '\x20';
-			if (isspace(ch)) {
-				if (prev_space)
-					continue;
-				prev_space = 1;
-			} else
-				prev_space = 0;
-			*out++ = ch;
-		}
-		*out = '\0';
-		if (out > dir && prev_space)
-			out[-1] = '\0';
-	}
-	return dir;
-}
-
-static void strip_trailing_slashes(char *dir)
-{
-	char *end = dir + strlen(dir);
-
-	while (dir < end - 1 && is_dir_sep(end[-1]))
-		end--;
-	*end = '\0';
-}
-
 static int add_one_reference(struct string_list_item *item, void *cb_data)
 {
 	struct strbuf err = STRBUF_INIT;
@@ -657,7 +544,7 @@ static void write_followtags(const struct ref *refs, const char *msg)
 	}
 }
 
-static int iterate_ref_map(void *cb_data, struct object_id *oid)
+static const struct object_id *iterate_ref_map(void *cb_data)
 {
 	struct ref **rm = cb_data;
 	struct ref *ref = *rm;
@@ -668,13 +555,11 @@ static int iterate_ref_map(void *cb_data, struct object_id *oid)
 	 */
 	while (ref && !ref->peer_ref)
 		ref = ref->next;
-	/* Returning -1 notes "end of list" to the caller. */
 	if (!ref)
-		return -1;
+		return NULL;
 
-	oidcpy(oid, &ref->old_oid);
 	*rm = ref->next;
-	return 0;
+	return &ref->old_oid;
 }
 
 static void update_remote_refs(const struct ref *refs,
@@ -749,7 +634,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
@@ -786,7 +671,7 @@ static int checkout(int submodule_progress)
 		return 0;
 	}
 	if (!strcmp(head, "HEAD")) {
-		if (advice_detached_head)
+		if (advice_enabled(ADVICE_DETACHED_HEAD))
 			detach_advice(oid_to_hex(&oid));
 		FREE_AND_NULL(head);
 	} else {
@@ -803,6 +688,7 @@ static int checkout(int submodule_progress)
 	opts.update = 1;
 	opts.merge = 1;
 	opts.clone = 1;
+	opts.preserve_ignored = 0;
 	opts.fn = oneway_merge;
 	opts.verbose_update = (option_verbosity >= 0);
 	opts.src_index = &the_index;
@@ -820,7 +706,7 @@ static int checkout(int submodule_progress)
 	if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
 		die(_("unable to write new index file"));
 
-	err |= run_hook_le(NULL, "post-checkout", oid_to_hex(null_oid()),
+	err |= run_hooks_l("post-checkout", oid_to_hex(null_oid()),
 			   oid_to_hex(&oid), "1", NULL);
 
 	if (!err && (option_recurse_submodules.nr > 0)) {
@@ -977,7 +863,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	const struct ref *refs, *remote_head;
 	struct ref *remote_head_points_at = NULL;
 	const struct ref *our_head_points_at;
-	struct ref *mapped_refs;
+	struct ref *mapped_refs = NULL;
 	const struct ref *ref;
 	struct strbuf key = STRBUF_INIT;
 	struct strbuf branch_top = STRBUF_INIT, reflog_msg = STRBUF_INIT;
@@ -1015,10 +901,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;
 	}
 
@@ -1041,8 +927,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	if (argc == 2)
 		dir = xstrdup(argv[1]);
 	else
-		dir = guess_dir_name(repo_name, is_bundle, option_bare);
-	strip_trailing_slashes(dir);
+		dir = git_url_basename(repo_name, is_bundle, option_bare);
+	strip_dir_trailing_slashes(dir);
 
 	dest_exists = path_exists(dir);
 	if (dest_exists && !is_empty_dir(dir))
@@ -1114,6 +1000,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	if (option_recurse_submodules.nr > 0) {
 		struct string_list_item *item;
 		struct strbuf sb = STRBUF_INIT;
+		int val;
 
 		/* remove duplicates */
 		string_list_sort(&option_recurse_submodules);
@@ -1130,6 +1017,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 					   strbuf_detach(&sb, NULL));
 		}
 
+		if (!git_config_get_bool("submodule.stickyRecursiveClone", &val) &&
+		    val)
+			string_list_append(&option_config, "submodule.recurse=true");
+
 		if (option_required_reference.nr &&
 		    option_optional_reference.nr)
 			die(_("clone --recursive is not compatible with "
@@ -1150,8 +1041,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	init_db(git_dir, real_git_dir, option_template, GIT_HASH_UNKNOWN, NULL,
 		INIT_DB_QUIET);
 
-	if (real_git_dir)
+	if (real_git_dir) {
+		free((char *)git_dir);
 		git_dir = real_git_dir;
+	}
 
 	/*
 	 * additional config can be injected with -c, make sure it's included
@@ -1292,7 +1185,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 
 	refs = transport_get_remote_refs(transport, &transport_ls_refs_options);
 
-	if (refs) {
+	if (refs)
+		mapped_refs = wanted_peer_refs(refs, &remote->fetch);
+
+	if (mapped_refs) {
 		int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport));
 
 		/*
@@ -1301,8 +1197,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 		 */
 		initialize_repository_version(hash_algo, 1);
 		repo_set_hash_algo(the_repository, hash_algo);
-
-		mapped_refs = wanted_peer_refs(refs, &remote->fetch);
 		/*
 		 * transport_get_remote_refs() may return refs with null sha-1
 		 * in mapped_refs (see struct transport->get_refs_list
@@ -1340,34 +1234,34 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 			our_head_points_at = remote_head_points_at;
 	}
 	else {
+		const char *branch;
+		const char *ref;
+		char *ref_free = NULL;
+
 		if (option_branch)
 			die(_("Remote branch %s not found in upstream %s"),
 					option_branch, remote_name);
 
 		warning(_("You appear to have cloned an empty repository."));
-		mapped_refs = NULL;
 		our_head_points_at = NULL;
 		remote_head_points_at = NULL;
 		remote_head = NULL;
 		option_no_checkout = 1;
-		if (!option_bare) {
-			const char *branch;
-			char *ref;
-
-			if (transport_ls_refs_options.unborn_head_target &&
-			    skip_prefix(transport_ls_refs_options.unborn_head_target,
-					"refs/heads/", &branch)) {
-				ref = transport_ls_refs_options.unborn_head_target;
-				transport_ls_refs_options.unborn_head_target = NULL;
-				create_symref("HEAD", ref, reflog_msg.buf);
-			} else {
-				branch = git_default_branch_name(0);
-				ref = xstrfmt("refs/heads/%s", branch);
-			}
 
-			install_branch_config(0, branch, remote_name, ref);
-			free(ref);
+		if (transport_ls_refs_options.unborn_head_target &&
+		    skip_prefix(transport_ls_refs_options.unborn_head_target,
+				"refs/heads/", &branch)) {
+			ref = transport_ls_refs_options.unborn_head_target;
+			create_symref("HEAD", ref, reflog_msg.buf);
+		} else {
+			branch = git_default_branch_name(0);
+			ref_free = xstrfmt("refs/heads/%s", branch);
+			ref = ref_free;
 		}
+
+		if (!option_bare)
+			install_branch_config(0, branch, remote_name, ref);
+		free(ref_free);
 	}
 
 	write_refspec_config(src_ref_prefix, our_head_points_at,
@@ -1378,7 +1272,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 
 	if (is_local)
 		clone_local(path, git_dir);
-	else if (refs && complete_refs_before_fetch) {
+	else if (mapped_refs && complete_refs_before_fetch) {
 		if (transport_fetch_refs(transport, mapped_refs))
 			die(_("remote transport reported error"));
 	}
@@ -1397,7 +1291,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) {
@@ -1419,7 +1313,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	UNLEAK(repo);
 	junk_mode = JUNK_LEAVE_ALL;
 
-	strvec_clear(&transport_ls_refs_options.ref_prefixes);
-	free(transport_ls_refs_options.unborn_head_target);
+	transport_ls_refs_options_release(&transport_ls_refs_options);
 	return err;
 }
diff --git a/builtin/column.c b/builtin/column.c
index 40d4b3bee2..158fdf53d9 100644
--- a/builtin/column.c
+++ b/builtin/column.c
@@ -29,7 +29,7 @@ int cmd_column(int argc, const char **argv, const char *prefix)
 		OPT_INTEGER(0, "raw-mode", &colopts, N_("layout to use")),
 		OPT_INTEGER(0, "width", &copts.width, N_("maximum width")),
 		OPT_STRING(0, "indent", &copts.indent, N_("string"), N_("padding space on left border")),
-		OPT_INTEGER(0, "nl", &copts.nl, N_("padding space on right border")),
+		OPT_STRING(0, "nl", &copts.nl, N_("string"), N_("padding space on right border")),
 		OPT_INTEGER(0, "padding", &copts.padding, N_("padding space between columns")),
 		OPT_END()
 	};
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index cd86315221..4247fbde95 100644
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -9,26 +9,29 @@
 #include "progress.h"
 #include "tag.h"
 
-static char const * const builtin_commit_graph_usage[] = {
-	N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"),
-	N_("git commit-graph write [--object-dir <objdir>] [--append] "
-	   "[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
-	   "[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] "
-	   "<split options>"),
+#define BUILTIN_COMMIT_GRAPH_VERIFY_USAGE \
+	N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]")
+
+#define BUILTIN_COMMIT_GRAPH_WRITE_USAGE \
+	N_("git commit-graph write [--object-dir <objdir>] [--append] " \
+	   "[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] " \
+	   "[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] " \
+	   "<split options>")
+
+static const char * builtin_commit_graph_verify_usage[] = {
+	BUILTIN_COMMIT_GRAPH_VERIFY_USAGE,
 	NULL
 };
 
-static const char * const builtin_commit_graph_verify_usage[] = {
-	N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"),
+static const char * builtin_commit_graph_write_usage[] = {
+	BUILTIN_COMMIT_GRAPH_WRITE_USAGE,
 	NULL
 };
 
-static const char * const builtin_commit_graph_write_usage[] = {
-	N_("git commit-graph write [--object-dir <objdir>] [--append] "
-	   "[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
-	   "[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] "
-	   "<split options>"),
-	NULL
+static char const * const builtin_commit_graph_usage[] = {
+	BUILTIN_COMMIT_GRAPH_VERIFY_USAGE,
+	BUILTIN_COMMIT_GRAPH_WRITE_USAGE,
+	NULL,
 };
 
 static struct opts_commit_graph {
@@ -43,26 +46,16 @@ static struct opts_commit_graph {
 	int enable_changed_paths;
 } opts;
 
-static struct object_directory *find_odb(struct repository *r,
-					 const char *obj_dir)
-{
-	struct object_directory *odb;
-	char *obj_dir_real = real_pathdup(obj_dir, 1);
-	struct strbuf odb_path_real = STRBUF_INIT;
-
-	prepare_alt_odb(r);
-	for (odb = r->objects->odb; odb; odb = odb->next) {
-		strbuf_realpath(&odb_path_real, odb->path, 1);
-		if (!strcmp(obj_dir_real, odb_path_real.buf))
-			break;
-	}
-
-	free(obj_dir_real);
-	strbuf_release(&odb_path_real);
+static struct option common_opts[] = {
+	OPT_STRING(0, "object-dir", &opts.obj_dir,
+		   N_("dir"),
+		   N_("the object directory to store the graph")),
+	OPT_END()
+};
 
-	if (!odb)
-		die(_("could not find object directory matching %s"), obj_dir);
-	return odb;
+static struct option *add_common_options(struct option *to)
+{
+	return parse_options_concat(common_opts, to);
 }
 
 static int graph_verify(int argc, const char **argv)
@@ -76,21 +69,22 @@ static int graph_verify(int argc, const char **argv)
 	int flags = 0;
 
 	static struct option builtin_commit_graph_verify_options[] = {
-		OPT_STRING(0, "object-dir", &opts.obj_dir,
-			   N_("dir"),
-			   N_("the object directory to store the graph")),
 		OPT_BOOL(0, "shallow", &opts.shallow,
 			 N_("if the commit-graph is split, only verify the tip file")),
-		OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")),
+		OPT_BOOL(0, "progress", &opts.progress,
+			 N_("force progress reporting")),
 		OPT_END(),
 	};
+	struct option *options = add_common_options(builtin_commit_graph_verify_options);
 
 	trace2_cmd_mode("verify");
 
 	opts.progress = isatty(2);
 	argc = parse_options(argc, argv, NULL,
-			     builtin_commit_graph_verify_options,
+			     options,
 			     builtin_commit_graph_verify_usage, 0);
+	if (argc)
+		usage_with_options(builtin_commit_graph_verify_usage, options);
 
 	if (!opts.obj_dir)
 		opts.obj_dir = get_object_directory();
@@ -106,6 +100,7 @@ static int graph_verify(int argc, const char **argv)
 		die_errno(_("Could not open commit-graph '%s'"), graph_name);
 
 	FREE_AND_NULL(graph_name);
+	FREE_AND_NULL(options);
 
 	if (open_ok)
 		graph = load_commit_graph_one_fd_st(the_repository, fd, &st, odb);
@@ -177,8 +172,8 @@ static int write_option_max_new_filters(const struct option *opt,
 		const char *s;
 		*to = strtol(arg, (char **)&s, 10);
 		if (*s)
-			return error(_("%s expects a numerical value"),
-				     optname(opt, opt->flags));
+			return error(_("option `%s' expects a numerical value"),
+				     "max-new-filters");
 	}
 	return 0;
 }
@@ -206,9 +201,6 @@ static int graph_write(int argc, const char **argv)
 	struct progress *progress = NULL;
 
 	static struct option builtin_commit_graph_write_options[] = {
-		OPT_STRING(0, "object-dir", &opts.obj_dir,
-			N_("dir"),
-			N_("the object directory to store the graph")),
 		OPT_BOOL(0, "reachable", &opts.reachable,
 			N_("start walk at all refs")),
 		OPT_BOOL(0, "stdin-packs", &opts.stdin_packs,
@@ -219,7 +211,6 @@ static int graph_write(int argc, const char **argv)
 			N_("include all commits already in the commit-graph file")),
 		OPT_BOOL(0, "changed-paths", &opts.enable_changed_paths,
 			N_("enable computation for changed paths")),
-		OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")),
 		OPT_CALLBACK_F(0, "split", &write_opts.split_flags, NULL,
 			N_("allow writing an incremental commit-graph file"),
 			PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
@@ -233,8 +224,11 @@ static int graph_write(int argc, const char **argv)
 		OPT_CALLBACK_F(0, "max-new-filters", &write_opts.max_new_filters,
 			NULL, N_("maximum number of changed-path Bloom filters to compute"),
 			0, write_option_max_new_filters),
+		OPT_BOOL(0, "progress", &opts.progress,
+			 N_("force progress reporting")),
 		OPT_END(),
 	};
+	struct option *options = add_common_options(builtin_commit_graph_write_options);
 
 	opts.progress = isatty(2);
 	opts.enable_changed_paths = -1;
@@ -248,8 +242,10 @@ static int graph_write(int argc, const char **argv)
 	git_config(git_commit_graph_write_config, &opts);
 
 	argc = parse_options(argc, argv, NULL,
-			     builtin_commit_graph_write_options,
+			     options,
 			     builtin_commit_graph_write_usage, 0);
+	if (argc)
+		usage_with_options(builtin_commit_graph_write_usage, options);
 
 	if (opts.reachable + opts.stdin_packs + opts.stdin_commits > 1)
 		die(_("use at most one of --reachable, --stdin-commits, or --stdin-packs"));
@@ -267,7 +263,6 @@ static int graph_write(int argc, const char **argv)
 	    git_env_bool(GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS, 0))
 		flags |= COMMIT_GRAPH_WRITE_BLOOM_FILTERS;
 
-	read_replace_refs = 0;
 	odb = find_odb(the_repository, opts.obj_dir);
 
 	if (opts.reachable) {
@@ -304,6 +299,7 @@ static int graph_write(int argc, const char **argv)
 		result = 1;
 
 cleanup:
+	FREE_AND_NULL(options);
 	string_list_clear(&pack_indexes, 0);
 	strbuf_release(&buf);
 	return result;
@@ -311,32 +307,26 @@ cleanup:
 
 int cmd_commit_graph(int argc, const char **argv, const char *prefix)
 {
-	static struct option builtin_commit_graph_options[] = {
-		OPT_STRING(0, "object-dir", &opts.obj_dir,
-			N_("dir"),
-			N_("the object directory to store the graph")),
-		OPT_END(),
-	};
-
-	if (argc == 2 && !strcmp(argv[1], "-h"))
-		usage_with_options(builtin_commit_graph_usage,
-				   builtin_commit_graph_options);
+	struct option *builtin_commit_graph_options = common_opts;
 
 	git_config(git_default_config, NULL);
 	argc = parse_options(argc, argv, prefix,
 			     builtin_commit_graph_options,
 			     builtin_commit_graph_usage,
 			     PARSE_OPT_STOP_AT_NON_OPTION);
+	if (!argc)
+		goto usage;
 
+	read_replace_refs = 0;
 	save_commit_buffer = 0;
 
-	if (argc > 0) {
-		if (!strcmp(argv[0], "verify"))
-			return graph_verify(argc, argv);
-		if (!strcmp(argv[0], "write"))
-			return graph_write(argc, argv);
-	}
+	if (!strcmp(argv[0], "verify"))
+		return graph_verify(argc, argv);
+	else if (argc && !strcmp(argv[0], "write"))
+		return graph_write(argc, argv);
 
+	error(_("unrecognized subcommand: %s"), argv[0]);
+usage:
 	usage_with_options(builtin_commit_graph_usage,
 			   builtin_commit_graph_options);
 }
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index 1031b9a491..63ea322933 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -88,9 +88,7 @@ static int parse_file_arg_callback(const struct option *opt,
 	if (!strcmp(arg, "-"))
 		fd = 0;
 	else {
-		fd = open(arg, O_RDONLY);
-		if (fd < 0)
-			die_errno(_("git commit-tree: failed to open '%s'"), arg);
+		fd = xopen(arg, O_RDONLY);
 	}
 	if (strbuf_read(buf, fd, 0) < 0)
 		die_errno(_("git commit-tree: failed to read '%s'"), arg);
diff --git a/builtin/commit.c b/builtin/commit.c
index 190d215d43..b9ed0374e3 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -19,6 +19,7 @@
 #include "revision.h"
 #include "wt-status.h"
 #include "run-command.h"
+#include "hook.h"
 #include "refs.h"
 #include "log-tree.h"
 #include "strbuf.h"
@@ -203,7 +204,7 @@ static void status_init_config(struct wt_status *s, config_fn_t fn)
 	init_diff_ui_defaults();
 	git_config(fn, s);
 	determine_whence(s);
-	s->hints = advice_status_hints; /* must come after git_config() */
+	s->hints = advice_enabled(ADVICE_STATUS_HINTS); /* must come after git_config() */
 }
 
 static void rollback_index_files(void)
@@ -354,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 &&
@@ -798,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)) {
@@ -889,7 +890,22 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 		int ident_shown = 0;
 		int saved_color_setting;
 		struct ident_split ci, ai;
-
+		const char *hint_cleanup_all = allow_empty_message ?
+			_("Please enter the commit message for your changes."
+			  " Lines starting\nwith '%c' will be ignored.\n") :
+			_("Please enter the commit message for your changes."
+			  " Lines starting\nwith '%c' will be ignored, and an empty"
+			  " message aborts the commit.\n");
+		const char *hint_cleanup_space = allow_empty_message ?
+			_("Please enter the commit message for your changes."
+			  " Lines starting\n"
+			  "with '%c' will be kept; you may remove them"
+			  " yourself if you want to.\n") :
+			_("Please enter the commit message for your changes."
+			  " Lines starting\n"
+			  "with '%c' will be kept; you may remove them"
+			  " yourself if you want to.\n"
+			  "An empty message aborts the commit.\n");
 		if (whence != FROM_COMMIT) {
 			if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS &&
 				!merge_contains_scissors)
@@ -911,20 +927,12 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 
 		fprintf(s->fp, "\n");
 		if (cleanup_mode == COMMIT_MSG_CLEANUP_ALL)
-			status_printf(s, GIT_COLOR_NORMAL,
-				_("Please enter the commit message for your changes."
-				  " Lines starting\nwith '%c' will be ignored, and an empty"
-				  " message aborts the commit.\n"), comment_line_char);
+			status_printf(s, GIT_COLOR_NORMAL, hint_cleanup_all, comment_line_char);
 		else if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS) {
 			if (whence == FROM_COMMIT && !merge_contains_scissors)
 				wt_status_add_cut_line(s->fp);
 		} else /* COMMIT_MSG_CLEANUP_SPACE, that is. */
-			status_printf(s, GIT_COLOR_NORMAL,
-				_("Please enter the commit message for your changes."
-				  " Lines starting\n"
-				  "with '%c' will be kept; you may remove them"
-				  " yourself if you want to.\n"
-				  "An empty message aborts the commit.\n"), comment_line_char);
+			status_printf(s, GIT_COLOR_NORMAL, hint_cleanup_space, comment_line_char);
 
 		/*
 		 * These should never fail because they come from our own
@@ -1026,7 +1034,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 	 */
 	if (!committable && whence != FROM_MERGE && !allow_empty &&
 	    !(amend && is_a_merge(current_head))) {
-		s->hints = advice_status_hints;
+		s->hints = advice_enabled(ADVICE_STATUS_HINTS);
 		s->display_comment_prefix = old_display_comment_prefix;
 		run_status(stdout, index_file, prefix, 0, s);
 		if (amend)
@@ -1044,7 +1052,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 		return 0;
 	}
 
-	if (!no_verify && find_hook("pre-commit")) {
+	if (!no_verify && hook_exists("pre-commit")) {
 		/*
 		 * Re-read the index as pre-commit hook could have updated it,
 		 * and write it out as a tree.  We must do this before we invoke
@@ -1185,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)
@@ -1221,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[],
@@ -1246,8 +1255,6 @@ static int parse_and_validate_options(int argc, const char *argv[],
 
 	if (logfile || have_option_m || use_message)
 		use_editor = 0;
-	if (0 <= edit_flag)
-		use_editor = edit_flag;
 
 	/* Sanity check options */
 	if (amend && !current_head)
@@ -1337,6 +1344,9 @@ static int parse_and_validate_options(int argc, const char *argv[],
 		}
 	}
 
+	if (0 <= edit_flag)
+		use_editor = edit_flag;
+
 	cleanup_mode = get_cleanup_mode(cleanup_arg, use_editor);
 
 	handle_untracked_files_arg(s);
@@ -1510,6 +1520,9 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage_with_options(builtin_status_usage, builtin_status_options);
 
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
+
 	status_init_config(&s, git_status_config);
 	argc = parse_options(argc, argv, prefix,
 			     builtin_status_options,
@@ -1679,6 +1692,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage_with_options(builtin_commit_usage, builtin_commit_options);
 
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
+
 	status_init_config(&s, git_commit_config);
 	s.commit_template = 1;
 	status_format = STATUS_FORMAT_NONE; /* Ignore status.short */
diff --git a/builtin/config.c b/builtin/config.c
index 865fddd6ce..542d8d02b2 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -575,7 +575,7 @@ static int get_urlmatch(const char *var, const char *url)
 	int ret;
 	char *section_tail;
 	struct string_list_item *item;
-	struct urlmatch_config config = { STRING_LIST_INIT_DUP };
+	struct urlmatch_config config = URLMATCH_CONFIG_INIT;
 	struct string_list values = STRING_LIST_INIT_DUP;
 
 	config.collect_fn = urlmatch_collect_fn;
diff --git a/builtin/credential-cache.c b/builtin/credential-cache.c
index 76a6ba3722..78c02ad531 100644
--- a/builtin/credential-cache.c
+++ b/builtin/credential-cache.c
@@ -11,6 +11,32 @@
 #define FLAG_SPAWN 0x1
 #define FLAG_RELAY 0x2
 
+#ifdef GIT_WINDOWS_NATIVE
+
+static int connection_closed(int error)
+{
+	return (error == EINVAL);
+}
+
+static int connection_fatally_broken(int error)
+{
+	return (error != ENOENT) && (error != ENETDOWN);
+}
+
+#else
+
+static int connection_closed(int error)
+{
+	return (error == ECONNRESET);
+}
+
+static int connection_fatally_broken(int error)
+{
+	return (error != ENOENT) && (error != ECONNREFUSED);
+}
+
+#endif
+
 static int send_request(const char *socket, const struct strbuf *out)
 {
 	int got_data = 0;
@@ -28,7 +54,7 @@ static int send_request(const char *socket, const struct strbuf *out)
 		int r;
 
 		r = read_in_full(fd, in, sizeof(in));
-		if (r == 0 || (r < 0 && errno == ECONNRESET))
+		if (r == 0 || (r < 0 && connection_closed(errno)))
 			break;
 		if (r < 0)
 			die_errno("read error from cache daemon");
@@ -75,7 +101,7 @@ static void do_cache(const char *socket, const char *action, int timeout,
 	}
 
 	if (send_request(socket, &buf) < 0) {
-		if (errno != ENOENT && errno != ECONNREFUSED)
+		if (connection_fatally_broken(errno))
 			die_errno("unable to connect to cache daemon");
 		if (flags & FLAG_SPAWN) {
 			spawn_daemon(socket);
@@ -90,7 +116,7 @@ static char *get_socket_path(void)
 {
 	struct stat sb;
 	char *old_dir, *socket;
-	old_dir = expand_user_path("~/.git-credential-cache", 0);
+	old_dir = interpolate_path("~/.git-credential-cache", 0);
 	if (old_dir && !stat(old_dir, &sb) && S_ISDIR(sb.st_mode))
 		socket = xstrfmt("%s/socket", old_dir);
 	else
diff --git a/builtin/credential-store.c b/builtin/credential-store.c
index ae3c1ba75f..62a4f3c265 100644
--- a/builtin/credential-store.c
+++ b/builtin/credential-store.c
@@ -173,7 +173,7 @@ int cmd_credential_store(int argc, const char **argv, const char *prefix)
 	if (file) {
 		string_list_append(&fns, file);
 	} else {
-		if ((file = expand_user_path("~/.git-credentials", 0)))
+		if ((file = interpolate_path("~/.git-credentials", 0)))
 			string_list_append_nodup(&fns, file);
 		file = xdg_config_home("credentials");
 		if (file)
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-index.c b/builtin/diff-index.c
index cf09559e42..5fd23ab5b6 100644
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -29,10 +29,10 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
 	prefix = precompose_argv_prefix(argc, argv, prefix);
 
 	/*
-	 * We need no diff for merges options, and we need to avoid conflict
-	 * with our own meaning of "-m".
+	 * We need (some of) diff for merges options (e.g., --cc), and we need
+	 * to avoid conflict with our own meaning of "-m".
 	 */
-	diff_merges_suppress_options_parsing();
+	diff_merges_suppress_m_parsing();
 
 	argc = setup_revisions(argc, argv, &rev, NULL);
 	for (i = 1; i < argc; i++) {
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 2d87c37a17..bb7fafca61 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -26,11 +26,11 @@
 
 static const char builtin_diff_usage[] =
 "git diff [<options>] [<commit>] [--] [<path>...]\n"
-"   or: git diff [<options>] --cached [<commit>] [--] [<path>...]\n"
-"   or: git diff [<options>] <commit> [--merge-base] [<commit>...] <commit> [--] [<path>...]\n"
-"   or: git diff [<options>] <commit>...<commit>] [--] [<path>...]\n"
-"   or: git diff [<options>] <blob> <blob>]\n"
-"   or: git diff [<options>] --no-index [--] <path> <path>]\n"
+"   or: git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"   or: git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"   or: git diff [<options>] <commit>...<commit> [--] [<path>...]\n"
+"   or: git diff [<options>] <blob> <blob>\n"
+"   or: git diff [<options>] --no-index [--] <path> <path>\n"
 COMMON_DIFF_OPTIONS_HELP;
 
 static const char *blob_path(struct object_array_entry *entry)
@@ -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 6a9242a803..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,20 +243,9 @@ 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);
 }
 
-static NORETURN void exit_cleanup(const char *tmpdir, int exit_code)
-{
-	struct strbuf buf = STRBUF_INIT;
-	strbuf_addstr(&buf, tmpdir);
-	remove_dir_recursively(&buf, 0);
-	if (exit_code)
-		warning(_("failed: %d"), exit_code);
-	exit(exit_code);
-}
-
 static int ensure_leading_directories(char *path)
 {
 	switch (safe_create_leading_directories(path)) {
@@ -330,19 +314,44 @@ static int checkout_path(unsigned mode, struct object_id *oid,
 	return ret;
 }
 
+static void write_file_in_directory(struct strbuf *dir, size_t dir_len,
+			const char *path, const char *content)
+{
+	add_path(dir, dir_len, path);
+	ensure_leading_directories(dir->buf);
+	unlink(dir->buf);
+	write_file(dir->buf, "%s", content);
+}
+
+/* Write the file contents for the left and right sides of the difftool
+ * dir-diff representation for submodules and symlinks. Symlinks and submodules
+ * are written as regular text files so that external diff tools can diff them
+ * as text files, resulting in behavior that is analogous to to what "git diff"
+ * displays for symlink and submodule diffs.
+ */
+static void write_standin_files(struct pair_entry *entry,
+			struct strbuf *ldir, size_t ldir_len,
+			struct strbuf *rdir, size_t rdir_len)
+{
+	if (*entry->left)
+		write_file_in_directory(ldir, ldir_len, entry->path, entry->left);
+	if (*entry->right)
+		write_file_in_directory(rdir, rdir_len, entry->path, entry->right);
+}
+
 static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
-			int argc, const char **argv)
+			struct child_process *child)
 {
-	char tmpdir[PATH_MAX];
 	struct strbuf info = STRBUF_INIT, lpath = STRBUF_INIT;
 	struct strbuf rpath = STRBUF_INIT, buf = STRBUF_INIT;
 	struct strbuf ldir = STRBUF_INIT, rdir = STRBUF_INIT;
 	struct strbuf wtdir = STRBUF_INIT;
-	char *lbase_dir, *rbase_dir;
+	struct strbuf tmpdir = STRBUF_INIT;
+	char *lbase_dir = NULL, *rbase_dir = NULL;
 	size_t ldir_len, rdir_len, wtdir_len;
 	const char *workdir, *tmp;
 	int ret = 0, i;
-	FILE *fp;
+	FILE *fp = NULL;
 	struct hashmap working_tree_dups = HASHMAP_INIT(working_tree_entry_cmp,
 							NULL);
 	struct hashmap submodules = HASHMAP_INIT(pair_cmp, NULL);
@@ -351,8 +360,7 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 	struct pair_entry *entry;
 	struct index_state wtindex;
 	struct checkout lstate, rstate;
-	int rc, flags = RUN_GIT_CMD, err = 0;
-	struct child_process child = CHILD_PROCESS_INIT;
+	int flags = RUN_GIT_CMD, err = 0;
 	const char *helper_argv[] = { "difftool--helper", NULL, NULL, NULL };
 	struct hashmap wt_modified, tmp_modified;
 	int indices_loaded = 0;
@@ -361,11 +369,15 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 
 	/* Setup temp directories */
 	tmp = getenv("TMPDIR");
-	xsnprintf(tmpdir, sizeof(tmpdir), "%s/git-difftool.XXXXXX", tmp ? tmp : "/tmp");
-	if (!mkdtemp(tmpdir))
-		return error("could not create '%s'", tmpdir);
-	strbuf_addf(&ldir, "%s/left/", tmpdir);
-	strbuf_addf(&rdir, "%s/right/", tmpdir);
+	strbuf_add_absolute_path(&tmpdir, tmp ? tmp : "/tmp");
+	strbuf_trim_trailing_dir_sep(&tmpdir);
+	strbuf_addstr(&tmpdir, "/git-difftool.XXXXXX");
+	if (!mkdtemp(tmpdir.buf)) {
+		ret = error("could not create '%s'", tmpdir.buf);
+		goto finish;
+	}
+	strbuf_addf(&ldir, "%s/left/", tmpdir.buf);
+	strbuf_addf(&rdir, "%s/right/", tmpdir.buf);
 	strbuf_addstr(&wtdir, workdir);
 	if (!wtdir.len || !is_dir_sep(wtdir.buf[wtdir.len - 1]))
 		strbuf_addch(&wtdir, '/');
@@ -387,19 +399,15 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 	rdir_len = rdir.len;
 	wtdir_len = wtdir.len;
 
-	child.no_stdin = 1;
-	child.git_cmd = 1;
-	child.use_shell = 0;
-	child.clean_on_exit = 1;
-	child.dir = prefix;
-	child.out = -1;
-	strvec_pushl(&child.args, "diff", "--raw", "--no-abbrev", "-z",
-		     NULL);
-	for (i = 0; i < argc; i++)
-		strvec_push(&child.args, argv[i]);
-	if (start_command(&child))
+	child->no_stdin = 1;
+	child->git_cmd = 1;
+	child->use_shell = 0;
+	child->clean_on_exit = 1;
+	child->dir = prefix;
+	child->out = -1;
+	if (start_command(child))
 		die("could not obtain raw diff");
-	fp = xfdopen(child.out, "r");
+	fp = xfdopen(child->out, "r");
 
 	/* Build index info for left and right sides of the diff */
 	i = 0;
@@ -410,9 +418,9 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 		const char *src_path, *dst_path;
 
 		if (starts_with(info.buf, "::"))
-			die(N_("combined diff formats('-c' and '--cc') are "
+			die(N_("combined diff formats ('-c' and '--cc') are "
 			       "not supported in\n"
-			       "directory diff mode('-d' and '--dir-diff')."));
+			       "directory diff mode ('-d' and '--dir-diff')."));
 
 		if (parse_index_info(info.buf, &lmode, &rmode, &loid, &roid,
 				     &status))
@@ -525,7 +533,7 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 
 	fclose(fp);
 	fp = NULL;
-	if (finish_command(&child)) {
+	if (finish_command(child)) {
 		ret = error("error occurred running diff --raw");
 		goto finish;
 	}
@@ -540,38 +548,19 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 	 */
 	hashmap_for_each_entry(&submodules, &iter, entry,
 				entry /* member name */) {
-		if (*entry->left) {
-			add_path(&ldir, ldir_len, entry->path);
-			ensure_leading_directories(ldir.buf);
-			write_file(ldir.buf, "%s", entry->left);
-		}
-		if (*entry->right) {
-			add_path(&rdir, rdir_len, entry->path);
-			ensure_leading_directories(rdir.buf);
-			write_file(rdir.buf, "%s", entry->right);
-		}
+		write_standin_files(entry, &ldir, ldir_len, &rdir, rdir_len);
 	}
 
 	/*
-	 * Symbolic links require special treatment.The standard "git diff"
+	 * Symbolic links require special treatment. The standard "git diff"
 	 * shows only the link itself, not the contents of the link target.
 	 * This loop replicates that behavior.
 	 */
 	hashmap_for_each_entry(&symlinks2, &iter, entry,
 				entry /* member name */) {
-		if (*entry->left) {
-			add_path(&ldir, ldir_len, entry->path);
-			ensure_leading_directories(ldir.buf);
-			write_file(ldir.buf, "%s", entry->left);
-		}
-		if (*entry->right) {
-			add_path(&rdir, rdir_len, entry->path);
-			ensure_leading_directories(rdir.buf);
-			write_file(rdir.buf, "%s", entry->right);
-		}
-	}
 
-	strbuf_release(&buf);
+		write_standin_files(entry, &ldir, ldir_len, &rdir, rdir_len);
+	}
 
 	strbuf_setlen(&ldir, ldir_len);
 	helper_argv[1] = ldir.buf;
@@ -583,7 +572,7 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 		flags = 0;
 	} else
 		setenv("GIT_DIFFTOOL_DIRDIFF", "true", 1);
-	rc = run_command_v_opt(helper_argv, flags);
+	ret = run_command_v_opt(helper_argv, flags);
 
 	/* TODO: audit for interaction with sparse-index. */
 	ensure_full_index(&wtindex);
@@ -617,7 +606,7 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 		if (!indices_loaded) {
 			struct lock_file lock = LOCK_INIT;
 			strbuf_reset(&buf);
-			strbuf_addf(&buf, "%s/wtindex", tmpdir);
+			strbuf_addf(&buf, "%s/wtindex", tmpdir.buf);
 			if (hold_lock_file_for_update(&lock, buf.buf, 0) < 0 ||
 			    write_locked_index(&wtindex, &lock, COMMIT_LOCK)) {
 				ret = error("could not write %s", buf.buf);
@@ -647,11 +636,14 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 	}
 
 	if (err) {
-		warning(_("temporary files exist in '%s'."), tmpdir);
+		warning(_("temporary files exist in '%s'."), tmpdir.buf);
 		warning(_("you may want to cleanup or recover these."));
-		exit(1);
-	} else
-		exit_cleanup(tmpdir, rc);
+		ret = 1;
+	} else {
+		remove_dir_recursively(&tmpdir, 0);
+		if (ret)
+			warning(_("failed: %d"), ret);
+	}
 
 finish:
 	if (fp)
@@ -663,30 +655,29 @@ finish:
 	strbuf_release(&rdir);
 	strbuf_release(&wtdir);
 	strbuf_release(&buf);
+	strbuf_release(&tmpdir);
 
-	return ret;
+	return (ret < 0) ? 1 : ret;
 }
 
 static int run_file_diff(int prompt, const char *prefix,
-			 int argc, const char **argv)
+			 struct child_process *child)
 {
-	struct strvec args = STRVEC_INIT;
 	const char *env[] = {
 		"GIT_PAGER=", "GIT_EXTERNAL_DIFF=git-difftool--helper", NULL,
 		NULL
 	};
-	int i;
 
 	if (prompt > 0)
 		env[2] = "GIT_DIFFTOOL_PROMPT=true";
 	else if (!prompt)
 		env[2] = "GIT_DIFFTOOL_NO_PROMPT=true";
 
+	child->git_cmd = 1;
+	child->dir = prefix;
+	strvec_pushv(&child->env_array, env);
 
-	strvec_push(&args, "diff");
-	for (i = 0; i < argc; i++)
-		strvec_push(&args, argv[i]);
-	return run_command_v_opt_cd_env(args.v, RUN_GIT_CMD, prefix, env);
+	return run_command(child);
 }
 
 int cmd_difftool(int argc, const char **argv, const char *prefix)
@@ -713,12 +704,13 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
 			    "`--tool`")),
 		OPT_BOOL(0, "trust-exit-code", &trust_exit_code,
 			 N_("make 'git-difftool' exit when an invoked diff "
-			    "tool returns a non - zero exit code")),
+			    "tool returns a non-zero exit code")),
 		OPT_STRING('x', "extcmd", &extcmd, N_("command"),
 			   N_("specify a custom command for viewing diffs")),
-		OPT_ARGUMENT("no-index", &no_index, N_("passed to `diff`")),
+		OPT_BOOL(0, "no-index", &no_index, N_("passed to `diff`")),
 		OPT_END()
 	};
+	struct child_process child = CHILD_PROCESS_INIT;
 
 	git_config(difftool_config, NULL);
 	symlinks = has_symlinks;
@@ -738,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);
@@ -768,7 +760,14 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
 	 * will invoke a separate instance of 'git-difftool--helper' for
 	 * each file that changed.
 	 */
+	strvec_push(&child.args, "diff");
+	if (no_index)
+		strvec_push(&child.args, "--no-index");
+	if (dir_diff)
+		strvec_pushl(&child.args, "--raw", "--no-abbrev", "-z", NULL);
+	strvec_pushv(&child.args, argv);
+
 	if (dir_diff)
-		return run_dir_diff(extcmd, symlinks, prefix, argc, argv);
-	return run_file_diff(prompt, prefix, argc, argv);
+		return run_dir_diff(extcmd, symlinks, prefix, &child);
+	return run_file_diff(prompt, prefix, &child);
 }
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 3c20f164f0..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;
@@ -312,7 +300,7 @@ static void export_blob(const struct object_id *oid)
 		if (!buf)
 			die("could not read blob %s", oid_to_hex(oid));
 		if (check_object_signature(the_repository, oid, buf, size,
-					   type_name(type)) < 0)
+					   type_name(type), NULL) < 0)
 			die("oid mismatch in blob %s", oid_to_hex(oid));
 		object = parse_object_buffer(the_repository, oid, type,
 					     size, buf, &eaten);
@@ -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)
 {
@@ -821,6 +795,7 @@ static void handle_tag(const char *name, struct tag *tag)
 			static struct hashmap tags;
 			message = anonymize_str(&tags, anonymize_tag,
 						message, message_size, NULL);
+			message_size = strlen(message);
 		}
 	}
 
@@ -1184,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,
@@ -1253,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;
@@ -1268,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)
@@ -1282,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 25740c13df..79ee959185 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)
 
@@ -75,6 +76,7 @@ static struct transport *gtransport;
 static struct transport *gsecondary;
 static const char *submodule_prefix = "";
 static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
+static int recurse_submodules_cli = RECURSE_SUBMODULES_DEFAULT;
 static int recurse_submodules_default = RECURSE_SUBMODULES_ON_DEMAND;
 static int shown_url = 0;
 static struct refspec refmap = REFSPEC_INIT_FETCH;
@@ -166,7 +168,7 @@ static struct option builtin_fetch_options[] = {
 		 N_("prune remote-tracking branches no longer on remote")),
 	OPT_BOOL('P', "prune-tags", &prune_tags,
 		 N_("prune local tags no longer on remote and clobber changed tags")),
-	OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
+	OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules_cli, N_("on-demand"),
 		    N_("control recursive fetching of submodules"),
 		    PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules),
 	OPT_BOOL(0, "dry-run", &dry_run,
@@ -222,17 +224,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 +559,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 +590,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;
 		}
@@ -712,7 +719,7 @@ static void adjust_refcol_width(const struct ref *ref)
 	int max, rlen, llen, len;
 
 	/* uptodate lines are only shown on high verbosity level */
-	if (!verbosity && oideq(&ref->peer_ref->old_oid, &ref->old_oid))
+	if (verbosity <= 0 && oideq(&ref->peer_ref->old_oid, &ref->old_oid))
 		return;
 
 	max    = term_columns();
@@ -748,6 +755,9 @@ static void prepare_format_display(struct ref *ref_map)
 	struct ref *rm;
 	const char *format = "full";
 
+	if (verbosity < 0)
+		return;
+
 	git_config_get_string_tmp("fetch.output", &format);
 	if (!strcasecmp(format, "full"))
 		compact_format = 0;
@@ -827,7 +837,12 @@ static void format_display(struct strbuf *display, char code,
 			   const char *remote, const char *local,
 			   int summary_width)
 {
-	int width = (summary_width + strlen(summary) - gettext_width(summary));
+	int width;
+
+	if (verbosity < 0)
+		return;
+
+	width = (summary_width + strlen(summary) - gettext_width(summary));
 
 	strbuf_addf(display, "%c %-*s ", code, width, summary);
 	if (!compact_format)
@@ -840,19 +855,16 @@ 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;
-	enum object_type type;
-	struct branch *current_branch = branch_get(NULL);
+	const struct worktree *wt;
 	const char *pretty_ref = prettify_refname(ref->name);
 	int fast_forward = 0;
 
-	type = oid_object_info(the_repository, &ref->new_oid, NULL);
-	if (type < 0)
+	if (!repo_has_object_file(the_repository, &ref->new_oid))
 		die(_("object %s not found"), oid_to_hex(&ref->new_oid));
 
 	if (oideq(&ref->old_oid, &ref->new_oid)) {
@@ -862,16 +874,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;
 	}
@@ -964,7 +977,7 @@ static int update_local_ref(struct ref *ref,
 	}
 }
 
-static int iterate_ref_map(void *cb_data, struct object_id *oid)
+static const struct object_id *iterate_ref_map(void *cb_data)
 {
 	struct ref **rm = cb_data;
 	struct ref *ref = *rm;
@@ -972,10 +985,9 @@ static int iterate_ref_map(void *cb_data, struct object_id *oid)
 	while (ref && ref->status == REF_STATUS_REJECT_SHALLOW)
 		ref = ref->next;
 	if (!ref)
-		return -1; /* end of the list */
+		return NULL;
 	*rm = ref->next;
-	oidcpy(oid, &ref->old_oid);
-	return 0;
+	return &ref->old_oid;
 }
 
 struct fetch_head {
@@ -990,7 +1002,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;
@@ -1062,19 +1074,19 @@ 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;
-	struct commit *commit;
 	int url_len, i, rc = 0;
 	struct strbuf note = STRBUF_INIT, err = STRBUF_INIT;
 	struct ref_transaction *transaction = NULL;
@@ -1082,12 +1094,15 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 	struct ref *rm;
 	char *url;
 	int want_status;
-	int summary_width = transport_summary_width(ref_map);
+	int summary_width = 0;
 
 	rc = open_fetch_head(&fetch_head);
 	if (rc)
 		return -1;
 
+	if (verbosity >= 0)
+		summary_width = transport_summary_width(ref_map);
+
 	if (raw_url)
 		url = transport_anonymize_url(raw_url);
 	else
@@ -1122,6 +1137,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 	     want_status <= FETCH_HEAD_IGNORE;
 	     want_status++) {
 		for (rm = ref_map; rm; rm = rm->next) {
+			struct commit *commit = NULL;
 			struct ref *ref = NULL;
 
 			if (rm->status == REF_STATUS_REJECT_SHALLOW) {
@@ -1131,11 +1147,23 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 				continue;
 			}
 
-			commit = lookup_commit_reference_gently(the_repository,
-								&rm->old_oid,
-								1);
-			if (!commit)
-				rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
+			/*
+			 * References in "refs/tags/" are often going to point
+			 * to annotated tags, which are not part of the
+			 * commit-graph. We thus only try to look up refs in
+			 * the graph which are not in that namespace to not
+			 * regress performance in repositories with many
+			 * annotated tags.
+			 */
+			if (!starts_with(rm->name, "refs/tags/"))
+				commit = lookup_commit_in_graph(the_repository, &rm->old_oid);
+			if (!commit) {
+				commit = lookup_commit_reference_gently(the_repository,
+									&rm->old_oid,
+									1);
+				if (!commit)
+					rm->fetch_head_status = FETCH_HEAD_NOT_FOR_MERGE;
+			}
 
 			if (rm->fetch_head_status != want_status)
 				continue;
@@ -1188,7 +1216,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) {
 				/*
@@ -1202,13 +1231,12 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 					       "FETCH_HEAD", summary_width);
 			}
 			if (note.len) {
-				if (verbosity >= 0 && !shown_url) {
+				if (!shown_url) {
 					fprintf(stderr, _("From %.*s\n"),
 							url_len, url);
 					shown_url = 1;
 				}
-				if (verbosity >= 0)
-					fprintf(stderr, " %s\n", note.buf);
+				fprintf(stderr, " %s\n", note.buf);
 			}
 		}
 	}
@@ -1229,7 +1257,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 		      " 'git remote prune %s' to remove any old, conflicting "
 		      "branches"), remote_name);
 
-	if (advice_fetch_show_forced_updates) {
+	if (advice_enabled(ADVICE_FETCH_SHOW_FORCED_UPDATES)) {
 		if (!fetch_show_forced_updates) {
 			warning(_(warn_show_forced_updates));
 		} else if (forced_updates_ms > FORCED_UPDATES_DELAY_WARNING_IN_MS) {
@@ -1282,37 +1310,35 @@ static int check_exist_and_connected(struct ref *ref_map)
 	return check_connected(iterate_ref_map, &rm, &opt);
 }
 
-static int fetch_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 ret = check_exist_and_connected(ref_map);
+	int connectivity_checked = 1;
+	int ret;
+
+	/*
+	 * We don't need to perform a fetch in case we can already satisfy all
+	 * refs.
+	 */
+	ret = check_exist_and_connected(ref_map);
 	if (ret) {
 		trace2_region_enter("fetch", "fetch_refs", the_repository);
 		ret = transport_fetch_refs(transport, ref_map);
 		trace2_region_leave("fetch", "fetch_refs", the_repository);
+		if (ret)
+			goto out;
+		connectivity_checked = transport->smart_options ?
+			transport->smart_options->connectivity_checked : 0;
 	}
-	if (!ret)
-		/*
-		 * Keep the new pack's ".keep" file around to allow the caller
-		 * time to update refs to reference the new objects.
-		 */
-		return 0;
-	transport_unlock_pack(transport);
-	return ret;
-}
 
-/* Update local refs based on the ref values fetched from a remote */
-static int consume_refs(struct transport *transport, struct ref *ref_map)
-{
-	int connectivity_checked = transport->smart_options
-		? transport->smart_options->connectivity_checked : 0;
-	int ret;
 	trace2_region_enter("fetch", "consume_refs", the_repository);
-	ret = store_updated_refs(transport->url,
-				 transport->remote->name,
-				 connectivity_checked,
-				 ref_map);
-	transport_unlock_pack(transport);
+	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, 0);
 	return ret;
 }
 
@@ -1322,7 +1348,6 @@ static int prune_refs(struct refspec *rs, struct ref *ref_map,
 	int url_len, i, result = 0;
 	struct ref *ref, *stale_refs = get_stale_heads(rs, ref_map);
 	char *url;
-	int summary_width = transport_summary_width(stale_refs);
 	const char *dangling_msg = dry_run
 		? _("   (%s will become dangling)")
 		: _("   (%s has become dangling)");
@@ -1351,6 +1376,8 @@ static int prune_refs(struct refspec *rs, struct ref *ref_map,
 	}
 
 	if (verbosity >= 0) {
+		int summary_width = transport_summary_width(stale_refs);
+
 		for (ref = stale_refs; ref; ref = ref->next) {
 			struct strbuf sb = STRBUF_INIT;
 			if (!shown_url) {
@@ -1371,18 +1398,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)
@@ -1391,7 +1418,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;
 }
@@ -1400,10 +1427,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);
 }
 
@@ -1428,14 +1455,16 @@ static void add_negotiation_tips(struct git_transport_options *smart_options)
 		if (!has_glob_specials(s)) {
 			struct object_id oid;
 			if (get_oid(s, &oid))
-				die("%s is not a valid object", s);
+				die(_("%s is not a valid object"), s);
+			if (!has_object(the_repository, &oid, 0))
+				die(_("the object %s does not exist"), s);
 			oid_array_append(oids, &oid);
 			continue;
 		}
 		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;
@@ -1473,12 +1502,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;
 
@@ -1499,8 +1529,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);
-	if (!fetch_refs(transport, ref_map))
-		consume_refs(transport, ref_map);
+	fetch_and_consume_refs(transport, ref_map, worktrees);
 
 	if (gsecondary) {
 		transport_disconnect(gsecondary);
@@ -1518,6 +1547,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)
@@ -1568,12 +1598,12 @@ static int do_fetch(struct transport *transport,
 	} else
 		remote_refs = NULL;
 
-	strvec_clear(&transport_ls_refs_options.ref_prefixes);
+	transport_ls_refs_options_release(&transport_ls_refs_options);
 
 	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");
@@ -1584,14 +1614,16 @@ static int do_fetch(struct transport *transport,
 		 * don't care whether --tags was specified.
 		 */
 		if (rs->nr) {
-			prune_refs(rs, ref_map, transport->url);
+			retcode = prune_refs(rs, ref_map, transport->url);
 		} else {
-			prune_refs(&transport->remote->fetch,
-				   ref_map,
-				   transport->url);
+			retcode = prune_refs(&transport->remote->fetch,
+					     ref_map,
+					     transport->url);
 		}
+		if (retcode != 0)
+			retcode = 1;
 	}
-	if (fetch_refs(transport, ref_map) || consume_refs(transport, ref_map)) {
+	if (fetch_and_consume_refs(transport, ref_map, worktrees)) {
 		free_refs(ref_map);
 		retcode = 1;
 		goto cleanup;
@@ -1623,6 +1655,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,
@@ -1636,11 +1678,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
@@ -1650,11 +1692,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;
 }
 
@@ -1775,7 +1818,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;
 }
@@ -1830,7 +1873,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);
@@ -1891,8 +1934,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);
 
@@ -1927,7 +1970,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]);
@@ -1947,7 +1990,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);
@@ -1978,9 +2021,35 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	}
 
 	git_config(git_fetch_config, NULL);
+	if (the_repository->gitdir) {
+		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);
+
+	if (recurse_submodules_cli != RECURSE_SUBMODULES_DEFAULT)
+		recurse_submodules = recurse_submodules_cli;
+
+	if (negotiate_only) {
+		switch (recurse_submodules_cli) {
+		case RECURSE_SUBMODULES_OFF:
+		case RECURSE_SUBMODULES_DEFAULT:
+			/*
+			 * --negotiate-only should never recurse into
+			 * submodules. Skip it by setting recurse_submodules to
+			 * RECURSE_SUBMODULES_OFF.
+			 */
+			recurse_submodules = RECURSE_SUBMODULES_OFF;
+			break;
+
+		default:
+			die(_("options '%s' and '%s' cannot be used together"),
+			    "--negotiate-only", "--recurse-submodules");
+		}
+	}
+
 	if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
 		int *sfjc = submodule_fetch_jobs_config == -1
 			    ? &submodule_fetch_jobs_config : NULL;
@@ -1991,18 +2060,18 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	}
 
 	if (negotiate_only && !negotiation_tip.nr)
-		die(_("--negotiate-only needs one or more --negotiate-tip=*"));
+		die(_("--negotiate-only needs one or more --negotiation-tip=*"));
 
 	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
@@ -2032,14 +2101,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]);
@@ -2060,8 +2130,9 @@ 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."));
-			return 1;
+			warning(_("protocol does not support --negotiate-only, exiting"));
+			result = 1;
+			goto cleanup;
 		}
 		if (server_options.nr)
 			gtransport->server_options = &server_options;
@@ -2117,7 +2188,16 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 		strvec_clear(&options);
 	}
 
-	string_list_clear(&list, 0);
+	/*
+	 * Skip irrelevant tasks because we know objects were not
+	 * fetched.
+	 *
+	 * NEEDSWORK: as a future optimization, we can return early
+	 * whenever objects were not fetched e.g. if we already have all
+	 * of them.
+	 */
+	if (negotiate_only)
+		goto cleanup;
 
 	prepare_repo_settings(the_repository);
 	if (fetch_write_commit_graph > 0 ||
@@ -2133,10 +2213,10 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 					     NULL);
 	}
 
-	close_object_store(the_repository->objects);
-
 	if (enable_auto_gc)
 		run_auto_maintenance(verbosity < 0);
 
+ cleanup:
+	string_list_clear(&list, 0);
 	return result;
 }
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 89cb6307d4..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,14 +71,13 @@ 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;
 
 	filter.name_patterns = argv;
 	filter.match_as_path = 1;
-	filter_refs(&array, &filter, FILTER_REFS_ALL | FILTER_REFS_INCLUDE_BROKEN);
+	filter_refs(&array, &filter, FILTER_REFS_ALL);
 	ref_array_sort(sorting, &array);
 
 	if (!maxcount || array.nr < maxcount)
@@ -96,6 +96,6 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
 	ref_array_clear(&array);
 	free_commit_list(filter.with_commit);
 	free_commit_list(filter.no_commit);
-	UNLEAK(sorting);
+	ref_sorting_release(sorting);
 	return 0;
 }
diff --git a/builtin/for-each-repo.c b/builtin/for-each-repo.c
index 52be64a437..fd86e5a861 100644
--- a/builtin/for-each-repo.c
+++ b/builtin/for-each-repo.c
@@ -10,18 +10,16 @@ static const char * const for_each_repo_usage[] = {
 	NULL
 };
 
-static int run_command_on_repo(const char *path,
-			       void *cbdata)
+static int run_command_on_repo(const char *path, int argc, const char ** argv)
 {
 	int i;
 	struct child_process child = CHILD_PROCESS_INIT;
-	struct strvec *args = (struct strvec *)cbdata;
 
 	child.git_cmd = 1;
 	strvec_pushl(&child.args, "-C", path, NULL);
 
-	for (i = 0; i < args->nr; i++)
-		strvec_push(&child.args, args->v[i]);
+	for (i = 0; i < argc; i++)
+		strvec_push(&child.args, argv[i]);
 
 	return run_command(&child);
 }
@@ -31,7 +29,6 @@ int cmd_for_each_repo(int argc, const char **argv, const char *prefix)
 	static const char *config_key = NULL;
 	int i, result = 0;
 	const struct string_list *values;
-	struct strvec args = STRVEC_INIT;
 
 	const struct option options[] = {
 		OPT_STRING(0, "config", &config_key, N_("config"),
@@ -45,9 +42,6 @@ int cmd_for_each_repo(int argc, const char **argv, const char *prefix)
 	if (!config_key)
 		die(_("missing --config=<config>"));
 
-	for (i = 0; i < argc; i++)
-		strvec_push(&args, argv[i]);
-
 	values = repo_config_get_value_multi(the_repository,
 					     config_key);
 
@@ -59,7 +53,7 @@ int cmd_for_each_repo(int argc, const char **argv, const char *prefix)
 		return 0;
 
 	for (i = 0; !result && i < values->nr; i++)
-		result = run_command_on_repo(values->items[i].string, &args);
+		result = run_command_on_repo(values->items[i].string, argc, argv);
 
 	return result;
 }
diff --git a/builtin/fsck.c b/builtin/fsck.c
index b42b6fe21f..9e54892311 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -593,18 +593,44 @@ static void get_default_heads(void)
 	}
 }
 
+struct for_each_loose_cb
+{
+	struct progress *progress;
+	struct strbuf obj_type;
+};
+
 static int fsck_loose(const struct object_id *oid, const char *path, void *data)
 {
+	struct for_each_loose_cb *cb_data = data;
 	struct object *obj;
-	enum object_type type;
+	enum object_type type = OBJ_NONE;
 	unsigned long size;
-	void *contents;
+	void *contents = NULL;
 	int eaten;
+	struct object_info oi = OBJECT_INFO_INIT;
+	struct object_id real_oid = *null_oid();
+	int err = 0;
 
-	if (read_loose_object(path, oid, &type, &size, &contents) < 0) {
+	strbuf_reset(&cb_data->obj_type);
+	oi.type_name = &cb_data->obj_type;
+	oi.sizep = &size;
+	oi.typep = &type;
+
+	if (read_loose_object(path, oid, &real_oid, &contents, &oi) < 0) {
+		if (contents && !oideq(&real_oid, oid))
+			err = error(_("%s: hash-path mismatch, found at: %s"),
+				    oid_to_hex(&real_oid), path);
+		else
+			err = error(_("%s: object corrupt or missing: %s"),
+				    oid_to_hex(oid), path);
+	}
+	if (type != OBJ_NONE && type < 0)
+		err = error(_("%s: object is of unknown type '%s': %s"),
+			    oid_to_hex(&real_oid), cb_data->obj_type.buf,
+			    path);
+	if (err < 0) {
 		errors_found |= ERROR_OBJECT;
-		error(_("%s: object corrupt or missing: %s"),
-		      oid_to_hex(oid), path);
+		free(contents);
 		return 0; /* keep checking other objects */
 	}
 
@@ -640,8 +666,10 @@ static int fsck_cruft(const char *basename, const char *path, void *data)
 	return 0;
 }
 
-static int fsck_subdir(unsigned int nr, const char *path, void *progress)
+static int fsck_subdir(unsigned int nr, const char *path, void *data)
 {
+	struct for_each_loose_cb *cb_data = data;
+	struct progress *progress = cb_data->progress;
 	display_progress(progress, nr + 1);
 	return 0;
 }
@@ -649,6 +677,10 @@ static int fsck_subdir(unsigned int nr, const char *path, void *progress)
 static void fsck_object_dir(const char *path)
 {
 	struct progress *progress = NULL;
+	struct for_each_loose_cb cb_data = {
+		.obj_type = STRBUF_INIT,
+		.progress = progress,
+	};
 
 	if (verbose)
 		fprintf_ln(stderr, _("Checking object directory"));
@@ -657,9 +689,10 @@ static void fsck_object_dir(const char *path)
 		progress = start_progress(_("Checking object directories"), 256);
 
 	for_each_loose_file_in_objdir(path, fsck_loose, fsck_cruft, fsck_subdir,
-				      progress);
+				      &cb_data);
 	display_progress(progress, 256);
 	stop_progress(&progress);
+	strbuf_release(&cb_data.obj_type);
 }
 
 static int fsck_head_link(const char *head_ref_name,
@@ -803,6 +836,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 		fsck_enable_object_names(&fsck_walk_options);
 
 	git_config(git_fsck_config, &fsck_obj_options);
+	prepare_repo_settings(the_repository);
 
 	if (connectivity_only) {
 		for_each_loose_object(mark_loose_for_connectivity, NULL, 0);
@@ -908,33 +942,29 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 
 	check_connectivity();
 
-	if (!git_config_get_bool("core.commitgraph", &i) && i) {
+	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;
 		}
 	}
 
-	if (!git_config_get_bool("core.multipackindex", &i) && i) {
+	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 f05d2f0a1a..ffaf0daf5d 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -32,6 +32,7 @@
 #include "remote.h"
 #include "object-store.h"
 #include "exec-cmd.h"
+#include "hook.h"
 
 #define FAILED_RUN "failed to run %s"
 
@@ -394,7 +395,7 @@ static int need_to_gc(void)
 	else
 		return 0;
 
-	if (run_hook_le(NULL, "pre-auto-gc", NULL))
+	if (run_hooks("pre-auto-gc"))
 		return 0;
 	return 1;
 }
@@ -470,7 +471,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 +486,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 +495,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
@@ -502,7 +504,7 @@ static int report_last_gc_error(void)
 		 */
 		warning(_("The last gc run reported the following. "
 			       "Please correct the root cause\n"
-			       "and remove %s.\n"
+			       "and remove %s\n"
 			       "Automatic cleanup will not be performed "
 			       "until the file is removed.\n\n"
 			       "%s"),
@@ -611,12 +613,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;
@@ -663,8 +666,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 	gc_before_repack();
 
 	if (!repository_format_precious_objects) {
-		close_object_store(the_repository->objects);
-		if (run_command_v_opt(repack.v, RUN_GIT_CMD))
+		if (run_command_v_opt(repack.v,
+				      RUN_GIT_CMD | RUN_CLOSE_OBJECT_STORE))
 			die(FAILED_RUN, repack.v[0]);
 
 		if (prune_expire) {
@@ -848,7 +851,7 @@ static int run_write_commit_graph(struct maintenance_run_opts *opts)
 {
 	struct child_process child = CHILD_PROCESS_INIT;
 
-	child.git_cmd = 1;
+	child.git_cmd = child.close_object_store = 1;
 	strvec_pushl(&child.args, "commit-graph", "write",
 		     "--split", "--reachable", NULL);
 
@@ -864,7 +867,6 @@ static int maintenance_task_commit_graph(struct maintenance_run_opts *opts)
 	if (!the_repository->settings.core_commit_graph)
 		return 0;
 
-	close_object_store(the_repository->objects);
 	if (run_write_commit_graph(opts)) {
 		error(_("failed to write commit-graph"));
 		return 1;
@@ -913,7 +915,7 @@ static int maintenance_task_gc(struct maintenance_run_opts *opts)
 {
 	struct child_process child = CHILD_PROCESS_INIT;
 
-	child.git_cmd = 1;
+	child.git_cmd = child.close_object_store = 1;
 	strvec_push(&child.args, "gc");
 
 	if (opts->auto_flag)
@@ -923,7 +925,6 @@ static int maintenance_task_gc(struct maintenance_run_opts *opts)
 	else
 		strvec_push(&child.args, "--no-quiet");
 
-	close_object_store(the_repository->objects);
 	return run_command(&child);
 }
 
@@ -1051,12 +1052,11 @@ static int maintenance_task_loose_objects(struct maintenance_run_opts *opts)
 static int incremental_repack_auto_condition(void)
 {
 	struct packed_git *p;
-	int enabled;
 	int incremental_repack_auto_limit = 10;
 	int count = 0;
 
-	if (git_config_get_bool("core.multiPackIndex", &enabled) ||
-	    !enabled)
+	prepare_repo_settings(the_repository);
+	if (!the_repository->settings.core_multi_pack_index)
 		return 0;
 
 	git_config_get_int("maintenance.incremental-repack.auto",
@@ -1097,14 +1097,12 @@ static int multi_pack_index_expire(struct maintenance_run_opts *opts)
 {
 	struct child_process child = CHILD_PROCESS_INIT;
 
-	child.git_cmd = 1;
+	child.git_cmd = child.close_object_store = 1;
 	strvec_pushl(&child.args, "multi-pack-index", "expire", NULL);
 
 	if (opts->quiet)
 		strvec_push(&child.args, "--no-progress");
 
-	close_object_store(the_repository->objects);
-
 	if (run_command(&child))
 		return error(_("'git multi-pack-index expire' failed"));
 
@@ -1155,7 +1153,7 @@ static int multi_pack_index_repack(struct maintenance_run_opts *opts)
 {
 	struct child_process child = CHILD_PROCESS_INIT;
 
-	child.git_cmd = 1;
+	child.git_cmd = child.close_object_store = 1;
 	strvec_pushl(&child.args, "multi-pack-index", "repack", NULL);
 
 	if (opts->quiet)
@@ -1164,8 +1162,6 @@ static int multi_pack_index_repack(struct maintenance_run_opts *opts)
 	strvec_pushf(&child.args, "--batch-size=%"PRIuMAX,
 				  (uintmax_t)get_auto_pack_size());
 
-	close_object_store(the_repository->objects);
-
 	if (run_command(&child))
 		return error(_("'git multi-pack-index repack' failed"));
 
@@ -1529,6 +1525,93 @@ static const char *get_frequency(enum schedule_priority schedule)
 	}
 }
 
+/*
+ * get_schedule_cmd` reads the GIT_TEST_MAINT_SCHEDULER environment variable
+ * to mock the schedulers that `git maintenance start` rely on.
+ *
+ * For test purpose, GIT_TEST_MAINT_SCHEDULER can be set to a comma-separated
+ * list of colon-separated key/value pairs where each pair contains a scheduler
+ * and its corresponding mock.
+ *
+ * * If $GIT_TEST_MAINT_SCHEDULER is not set, return false and leave the
+ *   arguments unmodified.
+ *
+ * * If $GIT_TEST_MAINT_SCHEDULER is set, return true.
+ *   In this case, the *cmd value is read as input.
+ *
+ *   * if the input value *cmd is the key of one of the comma-separated list
+ *     item, then *is_available is set to true and *cmd is modified and becomes
+ *     the mock command.
+ *
+ *   * if the input value *cmd isn’t the key of any of the comma-separated list
+ *     item, then *is_available is set to false.
+ *
+ * Ex.:
+ *   GIT_TEST_MAINT_SCHEDULER not set
+ *     +-------+-------------------------------------------------+
+ *     | Input |                     Output                      |
+ *     | *cmd  | return code |       *cmd        | *is_available |
+ *     +-------+-------------+-------------------+---------------+
+ *     | "foo" |    false    | "foo" (unchanged) |  (unchanged)  |
+ *     +-------+-------------+-------------------+---------------+
+ *
+ *   GIT_TEST_MAINT_SCHEDULER set to “foo:./mock_foo.sh,bar:./mock_bar.sh�
+ *     +-------+-------------------------------------------------+
+ *     | Input |                     Output                      |
+ *     | *cmd  | return code |       *cmd        | *is_available |
+ *     +-------+-------------+-------------------+---------------+
+ *     | "foo" |    true     |  "./mock.foo.sh"  |     true      |
+ *     | "qux" |    true     | "qux" (unchanged) |     false     |
+ *     +-------+-------------+-------------------+---------------+
+ */
+static int get_schedule_cmd(const char **cmd, int *is_available)
+{
+	char *testing = xstrdup_or_null(getenv("GIT_TEST_MAINT_SCHEDULER"));
+	struct string_list_item *item;
+	struct string_list list = STRING_LIST_INIT_NODUP;
+
+	if (!testing)
+		return 0;
+
+	if (is_available)
+		*is_available = 0;
+
+	string_list_split_in_place(&list, testing, ',', -1);
+	for_each_string_list_item(item, &list) {
+		struct string_list pair = STRING_LIST_INIT_NODUP;
+
+		if (string_list_split_in_place(&pair, item->string, ':', 2) != 2)
+			continue;
+
+		if (!strcmp(*cmd, pair.items[0].string)) {
+			*cmd = pair.items[1].string;
+			if (is_available)
+				*is_available = 1;
+			string_list_clear(&list, 0);
+			UNLEAK(testing);
+			return 1;
+		}
+	}
+
+	string_list_clear(&list, 0);
+	free(testing);
+	return 1;
+}
+
+static int is_launchctl_available(void)
+{
+	const char *cmd = "launchctl";
+	int is_available;
+	if (get_schedule_cmd(&cmd, &is_available))
+		return is_available;
+
+#ifdef __APPLE__
+	return 1;
+#else
+	return 0;
+#endif
+}
+
 static char *launchctl_service_name(const char *frequency)
 {
 	struct strbuf label = STRBUF_INIT;
@@ -1542,7 +1625,7 @@ static char *launchctl_service_filename(const char *name)
 	struct strbuf filename = STRBUF_INIT;
 	strbuf_addf(&filename, "~/Library/LaunchAgents/%s.plist", name);
 
-	expanded = expand_user_path(filename.buf, 1);
+	expanded = interpolate_path(filename.buf, 1);
 	if (!expanded)
 		die(_("failed to expand path '%s'"), filename.buf);
 
@@ -1555,19 +1638,17 @@ static char *launchctl_get_uid(void)
 	return xstrfmt("gui/%d", getuid());
 }
 
-static int launchctl_boot_plist(int enable, const char *filename, const char *cmd)
+static int launchctl_boot_plist(int enable, const char *filename)
 {
+	const char *cmd = "launchctl";
 	int result;
 	struct child_process child = CHILD_PROCESS_INIT;
 	char *uid = launchctl_get_uid();
 
+	get_schedule_cmd(&cmd, NULL);
 	strvec_split(&child.args, cmd);
-	if (enable)
-		strvec_push(&child.args, "bootstrap");
-	else
-		strvec_push(&child.args, "bootout");
-	strvec_push(&child.args, uid);
-	strvec_push(&child.args, filename);
+	strvec_pushl(&child.args, enable ? "bootstrap" : "bootout", uid,
+		     filename, NULL);
 
 	child.no_stderr = 1;
 	child.no_stdout = 1;
@@ -1581,38 +1662,56 @@ static int launchctl_boot_plist(int enable, const char *filename, const char *cm
 	return result;
 }
 
-static int launchctl_remove_plist(enum schedule_priority schedule, const char *cmd)
+static int launchctl_remove_plist(enum schedule_priority schedule)
 {
 	const char *frequency = get_frequency(schedule);
 	char *name = launchctl_service_name(frequency);
 	char *filename = launchctl_service_filename(name);
-	int result = launchctl_boot_plist(0, filename, cmd);
+	int result = launchctl_boot_plist(0, filename);
 	unlink(filename);
 	free(filename);
 	free(name);
 	return result;
 }
 
-static int launchctl_remove_plists(const char *cmd)
+static int launchctl_remove_plists(void)
 {
-	return launchctl_remove_plist(SCHEDULE_HOURLY, cmd) ||
-		launchctl_remove_plist(SCHEDULE_DAILY, cmd) ||
-		launchctl_remove_plist(SCHEDULE_WEEKLY, cmd);
+	return launchctl_remove_plist(SCHEDULE_HOURLY) ||
+	       launchctl_remove_plist(SCHEDULE_DAILY) ||
+	       launchctl_remove_plist(SCHEDULE_WEEKLY);
 }
 
-static int launchctl_schedule_plist(const char *exec_path, enum schedule_priority schedule, const char *cmd)
+static int launchctl_list_contains_plist(const char *name, const char *cmd)
 {
-	FILE *plist;
-	int i;
+	struct child_process child = CHILD_PROCESS_INIT;
+
+	strvec_split(&child.args, cmd);
+	strvec_pushl(&child.args, "list", name, NULL);
+
+	child.no_stderr = 1;
+	child.no_stdout = 1;
+
+	if (start_command(&child))
+		die(_("failed to start launchctl"));
+
+	/* Returns failure if 'name' doesn't exist. */
+	return !finish_command(&child);
+}
+
+static int launchctl_schedule_plist(const char *exec_path, enum schedule_priority schedule)
+{
+	int i, fd;
 	const char *preamble, *repeat;
 	const char *frequency = get_frequency(schedule);
 	char *name = launchctl_service_name(frequency);
 	char *filename = launchctl_service_filename(name);
+	struct lock_file lk = LOCK_INIT;
+	static unsigned long lock_file_timeout_ms = ULONG_MAX;
+	struct strbuf plist = STRBUF_INIT, plist2 = STRBUF_INIT;
+	struct stat st;
+	const char *cmd = "launchctl";
 
-	if (safe_create_leading_directories(filename))
-		die(_("failed to create directories for '%s'"), filename);
-	plist = xfopen(filename, "w");
-
+	get_schedule_cmd(&cmd, NULL);
 	preamble = "<?xml version=\"1.0\"?>\n"
 		   "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
 		   "<plist version=\"1.0\">"
@@ -1630,7 +1729,7 @@ static int launchctl_schedule_plist(const char *exec_path, enum schedule_priorit
 		   "</array>\n"
 		   "<key>StartCalendarInterval</key>\n"
 		   "<array>\n";
-	fprintf(plist, preamble, name, exec_path, exec_path, frequency);
+	strbuf_addf(&plist, preamble, name, exec_path, exec_path, frequency);
 
 	switch (schedule) {
 	case SCHEDULE_HOURLY:
@@ -1639,7 +1738,7 @@ static int launchctl_schedule_plist(const char *exec_path, enum schedule_priorit
 			 "<key>Minute</key><integer>0</integer>\n"
 			 "</dict>\n";
 		for (i = 1; i <= 23; i++)
-			fprintf(plist, repeat, i);
+			strbuf_addf(&plist, repeat, i);
 		break;
 
 	case SCHEDULE_DAILY:
@@ -1649,50 +1748,91 @@ static int launchctl_schedule_plist(const char *exec_path, enum schedule_priorit
 			 "<key>Minute</key><integer>0</integer>\n"
 			 "</dict>\n";
 		for (i = 1; i <= 6; i++)
-			fprintf(plist, repeat, i);
+			strbuf_addf(&plist, repeat, i);
 		break;
 
 	case SCHEDULE_WEEKLY:
-		fprintf(plist,
-			"<dict>\n"
-			"<key>Day</key><integer>0</integer>\n"
-			"<key>Hour</key><integer>0</integer>\n"
-			"<key>Minute</key><integer>0</integer>\n"
-			"</dict>\n");
+		strbuf_addstr(&plist,
+			      "<dict>\n"
+			      "<key>Day</key><integer>0</integer>\n"
+			      "<key>Hour</key><integer>0</integer>\n"
+			      "<key>Minute</key><integer>0</integer>\n"
+			      "</dict>\n");
 		break;
 
 	default:
 		/* unreachable */
 		break;
 	}
-	fprintf(plist, "</array>\n</dict>\n</plist>\n");
-	fclose(plist);
+	strbuf_addstr(&plist, "</array>\n</dict>\n</plist>\n");
+
+	if (safe_create_leading_directories(filename))
+		die(_("failed to create directories for '%s'"), filename);
 
-	/* bootout might fail if not already running, so ignore */
-	launchctl_boot_plist(0, filename, cmd);
-	if (launchctl_boot_plist(1, filename, cmd))
-		die(_("failed to bootstrap service %s"), filename);
+	if ((long)lock_file_timeout_ms < 0 &&
+	    git_config_get_ulong("gc.launchctlplistlocktimeoutms",
+				 &lock_file_timeout_ms))
+		lock_file_timeout_ms = 150;
+
+	fd = hold_lock_file_for_update_timeout(&lk, filename, LOCK_DIE_ON_ERROR,
+					       lock_file_timeout_ms);
+
+	/*
+	 * Does this file already exist? With the intended contents? Is it
+	 * registered already? Then it does not need to be re-registered.
+	 */
+	if (!stat(filename, &st) && st.st_size == plist.len &&
+	    strbuf_read_file(&plist2, filename, plist.len) == plist.len &&
+	    !strbuf_cmp(&plist, &plist2) &&
+	    launchctl_list_contains_plist(name, cmd))
+		rollback_lock_file(&lk);
+	else {
+		if (write_in_full(fd, plist.buf, plist.len) < 0 ||
+		    commit_lock_file(&lk))
+			die_errno(_("could not write '%s'"), filename);
+
+		/* bootout might fail if not already running, so ignore */
+		launchctl_boot_plist(0, filename);
+		if (launchctl_boot_plist(1, filename))
+			die(_("failed to bootstrap service %s"), filename);
+	}
 
 	free(filename);
 	free(name);
+	strbuf_release(&plist);
+	strbuf_release(&plist2);
 	return 0;
 }
 
-static int launchctl_add_plists(const char *cmd)
+static int launchctl_add_plists(void)
 {
 	const char *exec_path = git_exec_path();
 
-	return launchctl_schedule_plist(exec_path, SCHEDULE_HOURLY, cmd) ||
-		launchctl_schedule_plist(exec_path, SCHEDULE_DAILY, cmd) ||
-		launchctl_schedule_plist(exec_path, SCHEDULE_WEEKLY, cmd);
+	return launchctl_schedule_plist(exec_path, SCHEDULE_HOURLY) ||
+	       launchctl_schedule_plist(exec_path, SCHEDULE_DAILY) ||
+	       launchctl_schedule_plist(exec_path, SCHEDULE_WEEKLY);
 }
 
-static int launchctl_update_schedule(int run_maintenance, int fd, const char *cmd)
+static int launchctl_update_schedule(int run_maintenance, int fd)
 {
 	if (run_maintenance)
-		return launchctl_add_plists(cmd);
+		return launchctl_add_plists();
 	else
-		return launchctl_remove_plists(cmd);
+		return launchctl_remove_plists();
+}
+
+static int is_schtasks_available(void)
+{
+	const char *cmd = "schtasks";
+	int is_available;
+	if (get_schedule_cmd(&cmd, &is_available))
+		return is_available;
+
+#ifdef GIT_WINDOWS_NATIVE
+	return 1;
+#else
+	return 0;
+#endif
 }
 
 static char *schtasks_task_name(const char *frequency)
@@ -1702,13 +1842,15 @@ static char *schtasks_task_name(const char *frequency)
 	return strbuf_detach(&label, NULL);
 }
 
-static int schtasks_remove_task(enum schedule_priority schedule, const char *cmd)
+static int schtasks_remove_task(enum schedule_priority schedule)
 {
+	const char *cmd = "schtasks";
 	int result;
 	struct strvec args = STRVEC_INIT;
 	const char *frequency = get_frequency(schedule);
 	char *name = schtasks_task_name(frequency);
 
+	get_schedule_cmd(&cmd, NULL);
 	strvec_split(&args, cmd);
 	strvec_pushl(&args, "/delete", "/tn", name, "/f", NULL);
 
@@ -1719,15 +1861,16 @@ static int schtasks_remove_task(enum schedule_priority schedule, const char *cmd
 	return result;
 }
 
-static int schtasks_remove_tasks(const char *cmd)
+static int schtasks_remove_tasks(void)
 {
-	return schtasks_remove_task(SCHEDULE_HOURLY, cmd) ||
-		schtasks_remove_task(SCHEDULE_DAILY, cmd) ||
-		schtasks_remove_task(SCHEDULE_WEEKLY, cmd);
+	return schtasks_remove_task(SCHEDULE_HOURLY) ||
+	       schtasks_remove_task(SCHEDULE_DAILY) ||
+	       schtasks_remove_task(SCHEDULE_WEEKLY);
 }
 
-static int schtasks_schedule_task(const char *exec_path, enum schedule_priority schedule, const char *cmd)
+static int schtasks_schedule_task(const char *exec_path, enum schedule_priority schedule)
 {
+	const char *cmd = "schtasks";
 	int result;
 	struct child_process child = CHILD_PROCESS_INIT;
 	const char *xml;
@@ -1736,6 +1879,8 @@ static int schtasks_schedule_task(const char *exec_path, enum schedule_priority
 	char *name = schtasks_task_name(frequency);
 	struct strbuf tfilename = STRBUF_INIT;
 
+	get_schedule_cmd(&cmd, NULL);
+
 	strbuf_addf(&tfilename, "%s/schedule_%s_XXXXXX",
 		    get_git_common_dir(), frequency);
 	tfile = xmks_tempfile(tfilename.buf);
@@ -1840,28 +1985,67 @@ static int schtasks_schedule_task(const char *exec_path, enum schedule_priority
 	return result;
 }
 
-static int schtasks_schedule_tasks(const char *cmd)
+static int schtasks_schedule_tasks(void)
 {
 	const char *exec_path = git_exec_path();
 
-	return schtasks_schedule_task(exec_path, SCHEDULE_HOURLY, cmd) ||
-		schtasks_schedule_task(exec_path, SCHEDULE_DAILY, cmd) ||
-		schtasks_schedule_task(exec_path, SCHEDULE_WEEKLY, cmd);
+	return schtasks_schedule_task(exec_path, SCHEDULE_HOURLY) ||
+	       schtasks_schedule_task(exec_path, SCHEDULE_DAILY) ||
+	       schtasks_schedule_task(exec_path, SCHEDULE_WEEKLY);
 }
 
-static int schtasks_update_schedule(int run_maintenance, int fd, const char *cmd)
+static int schtasks_update_schedule(int run_maintenance, int fd)
 {
 	if (run_maintenance)
-		return schtasks_schedule_tasks(cmd);
+		return schtasks_schedule_tasks();
 	else
-		return schtasks_remove_tasks(cmd);
+		return schtasks_remove_tasks();
+}
+
+MAYBE_UNUSED
+static int check_crontab_process(const char *cmd)
+{
+	struct child_process child = CHILD_PROCESS_INIT;
+
+	strvec_split(&child.args, cmd);
+	strvec_push(&child.args, "-l");
+	child.no_stdin = 1;
+	child.no_stdout = 1;
+	child.no_stderr = 1;
+	child.silent_exec_failure = 1;
+
+	if (start_command(&child))
+		return 0;
+	/* Ignore exit code, as an empty crontab will return error. */
+	finish_command(&child);
+	return 1;
+}
+
+static int is_crontab_available(void)
+{
+	const char *cmd = "crontab";
+	int is_available;
+
+	if (get_schedule_cmd(&cmd, &is_available))
+		return is_available;
+
+#ifdef __APPLE__
+	/*
+	 * macOS has cron, but it requires special permissions and will
+	 * create a UI alert when attempting to run this command.
+	 */
+	return 0;
+#else
+	return check_crontab_process(cmd);
+#endif
 }
 
 #define BEGIN_LINE "# BEGIN GIT MAINTENANCE SCHEDULE"
 #define END_LINE "# END GIT MAINTENANCE SCHEDULE"
 
-static int crontab_update_schedule(int run_maintenance, int fd, const char *cmd)
+static int crontab_update_schedule(int run_maintenance, int fd)
 {
+	const char *cmd = "crontab";
 	int result = 0;
 	int in_old_region = 0;
 	struct child_process crontab_list = CHILD_PROCESS_INIT;
@@ -1869,6 +2053,7 @@ static int crontab_update_schedule(int run_maintenance, int fd, const char *cmd)
 	FILE *cron_list, *cron_in;
 	struct strbuf line = STRBUF_INIT;
 
+	get_schedule_cmd(&cmd, NULL);
 	strvec_split(&crontab_list.args, cmd);
 	strvec_push(&crontab_list.args, "-l");
 	crontab_list.in = -1;
@@ -1945,66 +2130,376 @@ done_editing:
 	return result;
 }
 
+static int real_is_systemd_timer_available(void)
+{
+	struct child_process child = CHILD_PROCESS_INIT;
+
+	strvec_pushl(&child.args, "systemctl", "--user", "list-timers", NULL);
+	child.no_stdin = 1;
+	child.no_stdout = 1;
+	child.no_stderr = 1;
+	child.silent_exec_failure = 1;
+
+	if (start_command(&child))
+		return 0;
+	if (finish_command(&child))
+		return 0;
+	return 1;
+}
+
+static int is_systemd_timer_available(void)
+{
+	const char *cmd = "systemctl";
+	int is_available;
+
+	if (get_schedule_cmd(&cmd, &is_available))
+		return is_available;
+
+	return real_is_systemd_timer_available();
+}
+
+static char *xdg_config_home_systemd(const char *filename)
+{
+	return xdg_config_home_for("systemd/user", filename);
+}
+
+static int systemd_timer_enable_unit(int enable,
+				     enum schedule_priority schedule)
+{
+	const char *cmd = "systemctl";
+	struct child_process child = CHILD_PROCESS_INIT;
+	const char *frequency = get_frequency(schedule);
+
+	/*
+	 * Disabling the systemd unit while it is already disabled makes
+	 * systemctl print an error.
+	 * Let's ignore it since it means we already are in the expected state:
+	 * the unit is disabled.
+	 *
+	 * On the other hand, enabling a systemd unit which is already enabled
+	 * produces no error.
+	 */
+	if (!enable)
+		child.no_stderr = 1;
+
+	get_schedule_cmd(&cmd, NULL);
+	strvec_split(&child.args, cmd);
+	strvec_pushl(&child.args, "--user", enable ? "enable" : "disable",
+		     "--now", NULL);
+	strvec_pushf(&child.args, "git-maintenance@%s.timer", frequency);
+
+	if (start_command(&child))
+		return error(_("failed to start systemctl"));
+	if (finish_command(&child))
+		/*
+		 * Disabling an already disabled systemd unit makes
+		 * systemctl fail.
+		 * Let's ignore this failure.
+		 *
+		 * Enabling an enabled systemd unit doesn't fail.
+		 */
+		if (enable)
+			return error(_("failed to run systemctl"));
+	return 0;
+}
+
+static int systemd_timer_delete_unit_templates(void)
+{
+	int ret = 0;
+	char *filename = xdg_config_home_systemd("git-maintenance@.timer");
+	if (unlink(filename) && !is_missing_file_error(errno))
+		ret = error_errno(_("failed to delete '%s'"), filename);
+	FREE_AND_NULL(filename);
+
+	filename = xdg_config_home_systemd("git-maintenance@.service");
+	if (unlink(filename) && !is_missing_file_error(errno))
+		ret = error_errno(_("failed to delete '%s'"), filename);
+
+	free(filename);
+	return ret;
+}
+
+static int systemd_timer_delete_units(void)
+{
+	return systemd_timer_enable_unit(0, SCHEDULE_HOURLY) ||
+	       systemd_timer_enable_unit(0, SCHEDULE_DAILY) ||
+	       systemd_timer_enable_unit(0, SCHEDULE_WEEKLY) ||
+	       systemd_timer_delete_unit_templates();
+}
+
+static int systemd_timer_write_unit_templates(const char *exec_path)
+{
+	char *filename;
+	FILE *file;
+	const char *unit;
+
+	filename = xdg_config_home_systemd("git-maintenance@.timer");
+	if (safe_create_leading_directories(filename)) {
+		error(_("failed to create directories for '%s'"), filename);
+		goto error;
+	}
+	file = fopen_or_warn(filename, "w");
+	if (file == NULL)
+		goto error;
+
+	unit = "# This file was created and is maintained by Git.\n"
+	       "# Any edits made in this file might be replaced in the future\n"
+	       "# by a Git command.\n"
+	       "\n"
+	       "[Unit]\n"
+	       "Description=Optimize Git repositories data\n"
+	       "\n"
+	       "[Timer]\n"
+	       "OnCalendar=%i\n"
+	       "Persistent=true\n"
+	       "\n"
+	       "[Install]\n"
+	       "WantedBy=timers.target\n";
+	if (fputs(unit, file) == EOF) {
+		error(_("failed to write to '%s'"), filename);
+		fclose(file);
+		goto error;
+	}
+	if (fclose(file) == EOF) {
+		error_errno(_("failed to flush '%s'"), filename);
+		goto error;
+	}
+	free(filename);
+
+	filename = xdg_config_home_systemd("git-maintenance@.service");
+	file = fopen_or_warn(filename, "w");
+	if (file == NULL)
+		goto error;
+
+	unit = "# This file was created and is maintained by Git.\n"
+	       "# Any edits made in this file might be replaced in the future\n"
+	       "# by a Git command.\n"
+	       "\n"
+	       "[Unit]\n"
+	       "Description=Optimize Git repositories data\n"
+	       "\n"
+	       "[Service]\n"
+	       "Type=oneshot\n"
+	       "ExecStart=\"%s/git\" --exec-path=\"%s\" for-each-repo --config=maintenance.repo maintenance run --schedule=%%i\n"
+	       "LockPersonality=yes\n"
+	       "MemoryDenyWriteExecute=yes\n"
+	       "NoNewPrivileges=yes\n"
+	       "RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6\n"
+	       "RestrictNamespaces=yes\n"
+	       "RestrictRealtime=yes\n"
+	       "RestrictSUIDSGID=yes\n"
+	       "SystemCallArchitectures=native\n"
+	       "SystemCallFilter=@system-service\n";
+	if (fprintf(file, unit, exec_path, exec_path) < 0) {
+		error(_("failed to write to '%s'"), filename);
+		fclose(file);
+		goto error;
+	}
+	if (fclose(file) == EOF) {
+		error_errno(_("failed to flush '%s'"), filename);
+		goto error;
+	}
+	free(filename);
+	return 0;
+
+error:
+	free(filename);
+	systemd_timer_delete_unit_templates();
+	return -1;
+}
+
+static int systemd_timer_setup_units(void)
+{
+	const char *exec_path = git_exec_path();
+
+	int ret = systemd_timer_write_unit_templates(exec_path) ||
+		  systemd_timer_enable_unit(1, SCHEDULE_HOURLY) ||
+		  systemd_timer_enable_unit(1, SCHEDULE_DAILY) ||
+		  systemd_timer_enable_unit(1, SCHEDULE_WEEKLY);
+	if (ret)
+		systemd_timer_delete_units();
+	return ret;
+}
+
+static int systemd_timer_update_schedule(int run_maintenance, int fd)
+{
+	if (run_maintenance)
+		return systemd_timer_setup_units();
+	else
+		return systemd_timer_delete_units();
+}
+
+enum scheduler {
+	SCHEDULER_INVALID = -1,
+	SCHEDULER_AUTO,
+	SCHEDULER_CRON,
+	SCHEDULER_SYSTEMD,
+	SCHEDULER_LAUNCHCTL,
+	SCHEDULER_SCHTASKS,
+};
+
+static const struct {
+	const char *name;
+	int (*is_available)(void);
+	int (*update_schedule)(int run_maintenance, int fd);
+} scheduler_fn[] = {
+	[SCHEDULER_CRON] = {
+		.name = "crontab",
+		.is_available = is_crontab_available,
+		.update_schedule = crontab_update_schedule,
+	},
+	[SCHEDULER_SYSTEMD] = {
+		.name = "systemctl",
+		.is_available = is_systemd_timer_available,
+		.update_schedule = systemd_timer_update_schedule,
+	},
+	[SCHEDULER_LAUNCHCTL] = {
+		.name = "launchctl",
+		.is_available = is_launchctl_available,
+		.update_schedule = launchctl_update_schedule,
+	},
+	[SCHEDULER_SCHTASKS] = {
+		.name = "schtasks",
+		.is_available = is_schtasks_available,
+		.update_schedule = schtasks_update_schedule,
+	},
+};
+
+static enum scheduler parse_scheduler(const char *value)
+{
+	if (!value)
+		return SCHEDULER_INVALID;
+	else if (!strcasecmp(value, "auto"))
+		return SCHEDULER_AUTO;
+	else if (!strcasecmp(value, "cron") || !strcasecmp(value, "crontab"))
+		return SCHEDULER_CRON;
+	else if (!strcasecmp(value, "systemd") ||
+		 !strcasecmp(value, "systemd-timer"))
+		return SCHEDULER_SYSTEMD;
+	else if (!strcasecmp(value, "launchctl"))
+		return SCHEDULER_LAUNCHCTL;
+	else if (!strcasecmp(value, "schtasks"))
+		return SCHEDULER_SCHTASKS;
+	else
+		return SCHEDULER_INVALID;
+}
+
+static int maintenance_opt_scheduler(const struct option *opt, const char *arg,
+				     int unset)
+{
+	enum scheduler *scheduler = opt->value;
+
+	BUG_ON_OPT_NEG(unset);
+
+	*scheduler = parse_scheduler(arg);
+	if (*scheduler == SCHEDULER_INVALID)
+		return error(_("unrecognized --scheduler argument '%s'"), arg);
+	return 0;
+}
+
+struct maintenance_start_opts {
+	enum scheduler scheduler;
+};
+
+static enum scheduler resolve_scheduler(enum scheduler scheduler)
+{
+	if (scheduler != SCHEDULER_AUTO)
+		return scheduler;
+
 #if defined(__APPLE__)
-static const char platform_scheduler[] = "launchctl";
+	return SCHEDULER_LAUNCHCTL;
+
 #elif defined(GIT_WINDOWS_NATIVE)
-static const char platform_scheduler[] = "schtasks";
+	return SCHEDULER_SCHTASKS;
+
+#elif defined(__linux__)
+	if (is_systemd_timer_available())
+		return SCHEDULER_SYSTEMD;
+	else if (is_crontab_available())
+		return SCHEDULER_CRON;
+	else
+		die(_("neither systemd timers nor crontab are available"));
+
 #else
-static const char platform_scheduler[] = "crontab";
+	return SCHEDULER_CRON;
 #endif
+}
 
-static int update_background_schedule(int enable)
+static void validate_scheduler(enum scheduler scheduler)
 {
-	int result;
-	const char *scheduler = platform_scheduler;
-	const char *cmd = scheduler;
-	char *testing;
+	if (scheduler == SCHEDULER_INVALID)
+		BUG("invalid scheduler");
+	if (scheduler == SCHEDULER_AUTO)
+		BUG("resolve_scheduler should have been called before");
+
+	if (!scheduler_fn[scheduler].is_available())
+		die(_("%s scheduler is not available"),
+		    scheduler_fn[scheduler].name);
+}
+
+static int update_background_schedule(const struct maintenance_start_opts *opts,
+				      int enable)
+{
+	unsigned int i;
+	int result = 0;
 	struct lock_file lk;
 	char *lock_path = xstrfmt("%s/schedule", the_repository->objects->odb->path);
 
-	testing = xstrdup_or_null(getenv("GIT_TEST_MAINT_SCHEDULER"));
-	if (testing) {
-		char *sep = strchr(testing, ':');
-		if (!sep)
-			die("GIT_TEST_MAINT_SCHEDULER unparseable: %s", testing);
-		*sep = '\0';
-		scheduler = testing;
-		cmd = sep + 1;
+	if (hold_lock_file_for_update(&lk, lock_path, LOCK_NO_DEREF) < 0) {
+		free(lock_path);
+		return error(_("another process is scheduling background maintenance"));
 	}
 
-	if (hold_lock_file_for_update(&lk, lock_path, LOCK_NO_DEREF) < 0) {
-		result = error(_("another process is scheduling background maintenance"));
-		goto cleanup;
+	for (i = 1; i < ARRAY_SIZE(scheduler_fn); i++) {
+		if (enable && opts->scheduler == i)
+			continue;
+		if (!scheduler_fn[i].is_available())
+			continue;
+		scheduler_fn[i].update_schedule(0, get_lock_file_fd(&lk));
 	}
 
-	if (!strcmp(scheduler, "launchctl"))
-		result = launchctl_update_schedule(enable, get_lock_file_fd(&lk), cmd);
-	else if (!strcmp(scheduler, "schtasks"))
-		result = schtasks_update_schedule(enable, get_lock_file_fd(&lk), cmd);
-	else if (!strcmp(scheduler, "crontab"))
-		result = crontab_update_schedule(enable, get_lock_file_fd(&lk), cmd);
-	else
-		die("unknown background scheduler: %s", scheduler);
+	if (enable)
+		result = scheduler_fn[opts->scheduler].update_schedule(
+			1, get_lock_file_fd(&lk));
 
 	rollback_lock_file(&lk);
 
-cleanup:
 	free(lock_path);
-	free(testing);
 	return result;
 }
 
-static int maintenance_start(void)
+static const char *const builtin_maintenance_start_usage[] = {
+	N_("git maintenance start [--scheduler=<scheduler>]"),
+	NULL
+};
+
+static int maintenance_start(int argc, const char **argv, const char *prefix)
 {
+	struct maintenance_start_opts opts = { 0 };
+	struct option options[] = {
+		OPT_CALLBACK_F(
+			0, "scheduler", &opts.scheduler, N_("scheduler"),
+			N_("scheduler to trigger git maintenance run"),
+			PARSE_OPT_NONEG, maintenance_opt_scheduler),
+		OPT_END()
+	};
+
+	argc = parse_options(argc, argv, prefix, options,
+			     builtin_maintenance_start_usage, 0);
+	if (argc)
+		usage_with_options(builtin_maintenance_start_usage, options);
+
+	opts.scheduler = resolve_scheduler(opts.scheduler);
+	validate_scheduler(opts.scheduler);
+
 	if (maintenance_register())
 		warning(_("failed to add repo to global config"));
-
-	return update_background_schedule(1);
+	return update_background_schedule(&opts, 1);
 }
 
 static int maintenance_stop(void)
 {
-	return update_background_schedule(0);
+	return update_background_schedule(NULL, 0);
 }
 
 static const char builtin_maintenance_usage[] =	N_("git maintenance <subcommand> [<options>]");
@@ -2018,7 +2513,7 @@ int cmd_maintenance(int argc, const char **argv, const char *prefix)
 	if (!strcmp(argv[1], "run"))
 		return maintenance_run(argc - 1, argv + 1, prefix);
 	if (!strcmp(argv[1], "start"))
-		return maintenance_start();
+		return maintenance_start(argc - 1, argv + 1, prefix);
 	if (!strcmp(argv[1], "stop"))
 		return maintenance_stop();
 	if (!strcmp(argv[1], "register"))
diff --git a/builtin/grep.c b/builtin/grep.c
index 7d2f8e5adb..9e34a820ad 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -65,6 +65,9 @@ static int todo_done;
 /* Has all work items been added? */
 static int all_work_added;
 
+static struct repository **repos_to_free;
+static size_t repos_to_free_nr, repos_to_free_alloc;
+
 /* This lock protects all the variables above. */
 static pthread_mutex_t grep_mutex;
 
@@ -168,6 +171,19 @@ static void work_done(struct work_item *w)
 	grep_unlock();
 }
 
+static void free_repos(void)
+{
+	int i;
+
+	for (i = 0; i < repos_to_free_nr; i++) {
+		repo_clear(repos_to_free[i]);
+		free(repos_to_free[i]);
+	}
+	FREE_AND_NULL(repos_to_free);
+	repos_to_free_nr = 0;
+	repos_to_free_alloc = 0;
+}
+
 static void *run(void *arg)
 {
 	int hit = 0;
@@ -183,8 +199,8 @@ static void *run(void *arg)
 		grep_source_clear_data(&w->source);
 		work_done(w);
 	}
-	free_grep_patterns(arg);
-	free(arg);
+	free_grep_patterns(opt);
+	free(opt);
 
 	return (void*) (intptr_t) hit;
 }
@@ -333,7 +349,7 @@ static int grep_oid(struct grep_opt *opt, const struct object_id *oid,
 	struct grep_source gs;
 
 	grep_source_name(opt, filename, tree_name_len, &pathbuf);
-	grep_source_init(&gs, GREP_SOURCE_OID, pathbuf.buf, path, oid);
+	grep_source_init_oid(&gs, pathbuf.buf, path, oid, opt->repo);
 	strbuf_release(&pathbuf);
 
 	if (num_threads > 1) {
@@ -359,7 +375,7 @@ static int grep_file(struct grep_opt *opt, const char *filename)
 	struct grep_source gs;
 
 	grep_source_name(opt, filename, 0, &buf);
-	grep_source_init(&gs, GREP_SOURCE_FILE, buf.buf, filename, filename);
+	grep_source_init_file(&gs, buf.buf, filename);
 	strbuf_release(&buf);
 
 	if (num_threads > 1) {
@@ -385,7 +401,7 @@ static void append_path(struct grep_opt *opt, const void *data, size_t len)
 
 	if (len == 1 && *(const char *)data == '\0')
 		return;
-	string_list_append(path_list, xstrndup(data, len));
+	string_list_append_nodup(path_list, xstrndup(data, len));
 }
 
 static void run_pager(struct grep_opt *opt, const char *prefix)
@@ -415,19 +431,21 @@ static int grep_submodule(struct grep_opt *opt,
 			  const struct object_id *oid,
 			  const char *filename, const char *path, int cached)
 {
-	struct repository subrepo;
+	struct repository *subrepo;
 	struct repository *superproject = opt->repo;
-	const struct submodule *sub;
 	struct grep_opt subopt;
-	int hit;
-
-	sub = submodule_from_path(superproject, null_oid(), path);
+	int hit = 0;
 
 	if (!is_submodule_active(superproject, path))
 		return 0;
 
-	if (repo_submodule_init(&subrepo, superproject, sub))
+	subrepo = xmalloc(sizeof(*subrepo));
+	if (repo_submodule_init(subrepo, superproject, path, null_oid())) {
+		free(subrepo);
 		return 0;
+	}
+	ALLOC_GROW(repos_to_free, repos_to_free_nr + 1, repos_to_free_alloc);
+	repos_to_free[repos_to_free_nr++] = subrepo;
 
 	/*
 	 * NEEDSWORK: repo_read_gitmodules() might call
@@ -438,53 +456,49 @@ static int grep_submodule(struct grep_opt *opt,
 	 * subrepo's odbs to the in-memory alternates list.
 	 */
 	obj_read_lock();
-	repo_read_gitmodules(&subrepo, 0);
+	repo_read_gitmodules(subrepo, 0);
 
 	/*
-	 * NEEDSWORK: This adds the submodule's object directory to the list of
-	 * alternates for the single in-memory object store.  This has some bad
-	 * consequences for memory (processed objects will never be freed) and
-	 * performance (this increases the number of pack files git has to pay
-	 * attention to, to the sum of the number of pack files in all the
-	 * repositories processed so far).  This can be removed once the object
-	 * store is no longer global and instead is a member of the repository
-	 * object.
+	 * All code paths tested by test code no longer need submodule ODBs to
+	 * be added as alternates, but add it to the list just in case.
+	 * Submodule ODBs added through add_submodule_odb_by_path() will be
+	 * lazily registered as alternates when needed (and except in an
+	 * unexpected code interaction, it won't be needed).
 	 */
-	add_to_alternates_memory(subrepo.objects->odb->path);
+	add_submodule_odb_by_path(subrepo->objects->odb->path);
 	obj_read_unlock();
 
 	memcpy(&subopt, opt, sizeof(subopt));
-	subopt.repo = &subrepo;
+	subopt.repo = subrepo;
 
 	if (oid) {
-		struct object *object;
+		enum object_type object_type;
 		struct tree_desc tree;
 		void *data;
 		unsigned long size;
 		struct strbuf base = STRBUF_INIT;
 
 		obj_read_lock();
-		object = parse_object_or_die(oid, NULL);
+		object_type = oid_object_info(subrepo, oid, NULL);
 		obj_read_unlock();
-		data = read_object_with_reference(&subrepo,
-						  &object->oid, tree_type,
+		data = read_object_with_reference(subrepo,
+						  oid, tree_type,
 						  &size, NULL);
 		if (!data)
-			die(_("unable to read tree (%s)"), oid_to_hex(&object->oid));
+			die(_("unable to read tree (%s)"), oid_to_hex(oid));
 
 		strbuf_addstr(&base, filename);
 		strbuf_addch(&base, '/');
 
 		init_tree_desc(&tree, data, size);
 		hit = grep_tree(&subopt, pathspec, &tree, &base, base.len,
-				object->type == OBJ_COMMIT);
+				object_type == OBJ_COMMIT);
 		strbuf_release(&base);
 		free(data);
 	} else {
 		hit = grep_cache(&subopt, pathspec, cached);
 	}
 
-	repo_clear(&subrepo);
 	return hit;
 }
 
@@ -825,7 +839,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 	struct grep_opt opt;
 	struct object_array list = OBJECT_ARRAY_INIT;
 	struct pathspec pathspec;
-	struct string_list path_list = STRING_LIST_INIT_NODUP;
+	struct string_list path_list = STRING_LIST_INIT_DUP;
 	int i;
 	int dummy;
 	int use_index = 1;
@@ -1145,8 +1159,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 			strbuf_addf(&buf, "+/%s%s",
 					strcmp("less", pager) ? "" : "*",
 					opt.pattern_list->pattern);
-			string_list_append(&path_list,
-					   strbuf_detach(&buf, NULL));
+			string_list_append_nodup(&path_list,
+						 strbuf_detach(&buf, NULL));
 		}
 	}
 
@@ -1181,6 +1195,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 	if (hit && show_in_pager)
 		run_pager(&opt, prefix);
 	clear_pathspec(&pathspec);
+	string_list_clear(&path_list, 0);
 	free_grep_patterns(&opt);
+	object_array_clear(&list);
+	free_repos();
 	return !hit;
 }
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 640ef4ded5..db9b253527 100644
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -53,9 +53,7 @@ static void hash_object(const char *path, const char *type, const char *vpath,
 			unsigned flags, int literally)
 {
 	int fd;
-	fd = open(path, O_RDONLY);
-	if (fd < 0)
-		die_errno("Cannot open '%s'", path);
+	fd = xopen(path, O_RDONLY);
 	hash_fd(fd, type, vpath, flags, literally);
 }
 
@@ -94,6 +92,7 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
 	int nongit = 0;
 	unsigned flags = HASH_FORMAT_CHECK;
 	const char *vpath = NULL;
+	char *vpath_free = NULL;
 	const struct option hash_object_options[] = {
 		OPT_STRING('t', NULL, &type, N_("type"), N_("object type")),
 		OPT_BIT('w', NULL, &flags, N_("write the object into the object database"),
@@ -116,8 +115,10 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
 	else
 		prefix = setup_git_directory_gently(&nongit);
 
-	if (vpath && prefix)
-		vpath = xstrdup(prefix_filename(prefix, vpath));
+	if (vpath && prefix) {
+		vpath_free = prefix_filename(prefix, vpath);
+		vpath = vpath_free;
+	}
 
 	git_config(git_default_config, NULL);
 
@@ -158,5 +159,7 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
 	if (stdin_paths)
 		hash_stdin_paths(type, no_filters, flags, literally);
 
+	free(vpath_free);
+
 	return 0;
 }
diff --git a/builtin/help.c b/builtin/help.c
index b7eec06c3d..d387131dd8 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -7,7 +7,6 @@
 #include "exec-cmd.h"
 #include "parse-options.h"
 #include "run-command.h"
-#include "column.h"
 #include "config-list.h"
 #include "help.h"
 #include "alias.h"
@@ -34,32 +33,52 @@ enum help_format {
 	HELP_FORMAT_WEB
 };
 
-static const char *html_path;
+enum show_config_type {
+	SHOW_CONFIG_HUMAN,
+	SHOW_CONFIG_VARS,
+	SHOW_CONFIG_SECTIONS,
+};
+
+static enum help_action {
+	HELP_ACTION_ALL = 1,
+	HELP_ACTION_GUIDES,
+	HELP_ACTION_CONFIG,
+	HELP_ACTION_CONFIG_FOR_COMPLETION,
+	HELP_ACTION_CONFIG_SECTIONS_FOR_COMPLETION,
+} cmd_mode;
 
-static int show_all = 0;
-static int show_guides = 0;
-static int show_config;
+static const char *html_path;
 static int verbose = 1;
-static unsigned int colopts;
 static enum help_format help_format = HELP_FORMAT_NONE;
 static int exclude_guides;
 static struct option builtin_help_options[] = {
-	OPT_BOOL('a', "all", &show_all, N_("print all available commands")),
+	OPT_CMDMODE('a', "all", &cmd_mode, N_("print all available commands"),
+		    HELP_ACTION_ALL),
 	OPT_HIDDEN_BOOL(0, "exclude-guides", &exclude_guides, N_("exclude guides")),
-	OPT_BOOL('g', "guides", &show_guides, N_("print list of useful guides")),
-	OPT_BOOL('c', "config", &show_config, N_("print all configuration variable names")),
-	OPT_SET_INT_F(0, "config-for-completion", &show_config, "", 2, PARSE_OPT_HIDDEN),
 	OPT_SET_INT('m', "man", &help_format, N_("show man page"), HELP_FORMAT_MAN),
 	OPT_SET_INT('w', "web", &help_format, N_("show manual in web browser"),
 			HELP_FORMAT_WEB),
 	OPT_SET_INT('i', "info", &help_format, N_("show info page"),
 			HELP_FORMAT_INFO),
 	OPT__VERBOSE(&verbose, N_("print command description")),
+
+	OPT_CMDMODE('g', "guides", &cmd_mode, N_("print list of useful guides"),
+		    HELP_ACTION_GUIDES),
+	OPT_CMDMODE('c', "config", &cmd_mode, N_("print all configuration variable names"),
+		    HELP_ACTION_CONFIG),
+	OPT_CMDMODE_F(0, "config-for-completion", &cmd_mode, "",
+		    HELP_ACTION_CONFIG_FOR_COMPLETION, PARSE_OPT_HIDDEN),
+	OPT_CMDMODE_F(0, "config-sections-for-completion", &cmd_mode, "",
+		    HELP_ACTION_CONFIG_SECTIONS_FOR_COMPLETION, PARSE_OPT_HIDDEN),
+
 	OPT_END(),
 };
 
 static const char * const builtin_help_usage[] = {
-	N_("git help [--all] [--guides] [--man | --web | --info] [<command>]"),
+	N_("git help [-a|--all] [--[no-]verbose]]\n"
+	   "         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"),
+	N_("git help [-g|--guides]"),
+	N_("git help [-c|--config]"),
 	NULL
 };
 
@@ -70,7 +89,7 @@ struct slot_expansion {
 	int found;
 };
 
-static void list_config_help(int for_human)
+static void list_config_help(enum show_config_type type)
 {
 	struct slot_expansion slot_expansions[] = {
 		{ "advice", "*", list_config_advices },
@@ -88,6 +107,8 @@ static void list_config_help(int for_human)
 	const char **p;
 	struct slot_expansion *e;
 	struct string_list keys = STRING_LIST_INIT_DUP;
+	struct string_list keys_uniq = STRING_LIST_INIT_DUP;
+	struct string_list_item *item;
 	int i;
 
 	for (p = config_name_list; *p; p++) {
@@ -118,34 +139,46 @@ static void list_config_help(int for_human)
 	for (i = 0; i < keys.nr; i++) {
 		const char *var = keys.items[i].string;
 		const char *wildcard, *tag, *cut;
+		const char *dot = NULL;
+		struct strbuf sb = STRBUF_INIT;
 
-		if (for_human) {
+		switch (type) {
+		case SHOW_CONFIG_HUMAN:
 			puts(var);
 			continue;
+		case SHOW_CONFIG_SECTIONS:
+			dot = strchr(var, '.');
+			break;
+		case SHOW_CONFIG_VARS:
+			break;
 		}
-
 		wildcard = strchr(var, '*');
 		tag = strchr(var, '<');
 
-		if (!wildcard && !tag) {
-			puts(var);
+		if (!dot && !wildcard && !tag) {
+			string_list_append(&keys_uniq, var);
 			continue;
 		}
 
-		if (wildcard && !tag)
+		if (dot)
+			cut = dot;
+		else if (wildcard && !tag)
 			cut = wildcard;
 		else if (!wildcard && tag)
 			cut = tag;
 		else
 			cut = wildcard < tag ? wildcard : tag;
 
-		/*
-		 * We may produce duplicates, but that's up to
-		 * git-completion.bash to handle
-		 */
-		printf("%.*s\n", (int)(cut - var), var);
+		strbuf_add(&sb, var, cut - var);
+		string_list_append(&keys_uniq, sb.buf);
+		strbuf_release(&sb);
+
 	}
 	string_list_clear(&keys, 0);
+	string_list_remove_duplicates(&keys_uniq, 0);
+	for_each_string_list_item(item, &keys_uniq)
+		puts(item->string);
+	string_list_clear(&keys_uniq, 0);
 }
 
 static enum help_format parse_help_format(const char *format)
@@ -179,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))
@@ -349,8 +381,6 @@ static int add_man_viewer_info(const char *var, const char *value)
 
 static int git_help_config(const char *var, const char *value, void *cb)
 {
-	if (starts_with(var, "column."))
-		return git_column_config(var, value, "help", &colopts);
 	if (!strcmp(var, "help.format")) {
 		if (!value)
 			return config_error_nonbool(var);
@@ -467,11 +497,14 @@ static void get_html_page_path(struct strbuf *page_path, const char *page)
 	if (!html_path)
 		html_path = to_free = system_path(GIT_HTML_PATH);
 
-	/* Check that we have a git documentation directory. */
+	/*
+	 * Check that the page we're looking for exists.
+	 */
 	if (!strstr(html_path, "://")) {
-		if (stat(mkpath("%s/git.html", html_path), &st)
+		if (stat(mkpath("%s/%s.html", html_path, page), &st)
 		    || !S_ISREG(st.st_mode))
-			die("'%s': not a documentation directory.", html_path);
+			die("'%s/%s.html': documentation file not found.",
+				html_path, page);
 	}
 
 	strbuf_init(page_path, 0);
@@ -541,6 +574,13 @@ static const char *check_git_cmd(const char* cmd)
 	return cmd;
 }
 
+static void no_extra_argc(int argc)
+{
+	if (argc)
+		usage_msg_opt(_("this option doesn't take any other arguments"),
+			      builtin_help_usage, builtin_help_options);
+}
+
 int cmd_help(int argc, const char **argv, const char *prefix)
 {
 	int nongit;
@@ -551,8 +591,8 @@ int cmd_help(int argc, const char **argv, const char *prefix)
 			builtin_help_usage, 0);
 	parsed_help_format = help_format;
 
-	if (show_all) {
-		git_config(git_help_config, NULL);
+	switch (cmd_mode) {
+	case HELP_ACTION_ALL:
 		if (verbose) {
 			setup_pager();
 			list_all_cmds_help();
@@ -560,30 +600,27 @@ int cmd_help(int argc, const char **argv, const char *prefix)
 		}
 		printf(_("usage: %s%s"), _(git_usage_string), "\n\n");
 		load_command_list("git-", &main_cmds, &other_cmds);
-		list_commands(colopts, &main_cmds, &other_cmds);
-	}
-
-	if (show_config) {
-		int for_human = show_config == 1;
-
-		if (!for_human) {
-			list_config_help(for_human);
-			return 0;
-		}
-		setup_pager();
-		list_config_help(for_human);
-		printf("\n%s\n", _("'git help config' for more information"));
-		return 0;
-	}
-
-	if (show_guides)
+		list_commands(&main_cmds, &other_cmds);
+		printf("%s\n", _(git_more_info_string));
+		break;
+	case HELP_ACTION_GUIDES:
+		no_extra_argc(argc);
 		list_guides_help();
-
-	if (show_all || show_guides) {
 		printf("%s\n", _(git_more_info_string));
-		/*
-		* We're done. Ignore any remaining args
-		*/
+		return 0;
+	case HELP_ACTION_CONFIG_FOR_COMPLETION:
+		no_extra_argc(argc);
+		list_config_help(SHOW_CONFIG_VARS);
+		return 0;
+	case HELP_ACTION_CONFIG_SECTIONS_FOR_COMPLETION:
+		no_extra_argc(argc);
+		list_config_help(SHOW_CONFIG_SECTIONS);
+		return 0;
+	case HELP_ACTION_CONFIG:
+		no_extra_argc(argc);
+		setup_pager();
+		list_config_help(SHOW_CONFIG_HUMAN);
+		printf("\n%s\n", _("'git help config' for more information"));
 		return 0;
 	}
 
diff --git a/builtin/hook.c b/builtin/hook.c
new file mode 100644
index 0000000000..54e5c6ec93
--- /dev/null
+++ b/builtin/hook.c
@@ -0,0 +1,84 @@
+#include "cache.h"
+#include "builtin.h"
+#include "config.h"
+#include "hook.h"
+#include "parse-options.h"
+#include "strbuf.h"
+#include "strvec.h"
+
+#define BUILTIN_HOOK_RUN_USAGE \
+	N_("git hook run [--ignore-missing] <hook-name> [-- <hook-args>]")
+
+static const char * const builtin_hook_usage[] = {
+	BUILTIN_HOOK_RUN_USAGE,
+	NULL
+};
+
+static const char * const builtin_hook_run_usage[] = {
+	BUILTIN_HOOK_RUN_USAGE,
+	NULL
+};
+
+static int run(int argc, const char **argv, const char *prefix)
+{
+	int i;
+	struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
+	int ignore_missing = 0;
+	const char *hook_name;
+	struct option run_options[] = {
+		OPT_BOOL(0, "ignore-missing", &ignore_missing,
+			 N_("silently ignore missing requested <hook-name>")),
+		OPT_END(),
+	};
+	int ret;
+
+	argc = parse_options(argc, argv, prefix, run_options,
+			     builtin_hook_run_usage,
+			     PARSE_OPT_KEEP_DASHDASH);
+
+	if (!argc)
+		goto usage;
+
+	/*
+	 * Having a -- for "run" when providing <hook-args> is
+	 * mandatory.
+	 */
+	if (argc > 1 && strcmp(argv[1], "--") &&
+	    strcmp(argv[1], "--end-of-options"))
+		goto usage;
+
+	/* Add our arguments, start after -- */
+	for (i = 2 ; i < argc; i++)
+		strvec_push(&opt.args, argv[i]);
+
+	/* Need to take into account core.hooksPath */
+	git_config(git_default_config, NULL);
+
+	hook_name = argv[0];
+	if (!ignore_missing)
+		opt.error_if_missing = 1;
+	ret = run_hooks_opt(hook_name, &opt);
+	if (ret < 0) /* error() return */
+		ret = 1;
+	return ret;
+usage:
+	usage_with_options(builtin_hook_run_usage, run_options);
+}
+
+int cmd_hook(int argc, const char **argv, const char *prefix)
+{
+	struct option builtin_hook_options[] = {
+		OPT_END(),
+	};
+
+	argc = parse_options(argc, argv, NULL, builtin_hook_options,
+			     builtin_hook_usage, PARSE_OPT_STOP_AT_NON_OPTION);
+	if (!argc)
+		goto usage;
+
+	if (!strcmp(argv[0], "run"))
+		return run(argc, argv, prefix);
+
+usage:
+	usage_with_options(builtin_hook_usage, builtin_hook_options);
+}
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 3fbc5d7077..3c2e6aee3c 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -122,6 +122,7 @@ static int strict;
 static int do_fsck_object;
 static struct fsck_options fsck_options = FSCK_OPTIONS_MISSING_GITMODULES;
 static int verbose;
+static const char *progress_title;
 static int show_resolving_progress;
 static int show_stat;
 static int check_self_contained_and_connected;
@@ -187,9 +188,7 @@ static void init_thread(void)
 	pthread_key_create(&key, NULL);
 	CALLOC_ARRAY(thread_data, nr_threads);
 	for (i = 0; i < nr_threads; i++) {
-		thread_data[i].pack_fd = open(curr_pack, O_RDONLY);
-		if (thread_data[i].pack_fd == -1)
-			die_errno(_("unable to open %s"), curr_pack);
+		thread_data[i].pack_fd = xopen(curr_pack, O_RDONLY);
 	}
 
 	threads_active = 1;
@@ -338,15 +337,11 @@ static const char *open_pack_file(const char *pack_name)
 						"pack/tmp_pack_XXXXXX");
 			pack_name = strbuf_detach(&tmp_file, NULL);
 		} else {
-			output_fd = open(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600);
-			if (output_fd < 0)
-				die_errno(_("unable to create '%s'"), pack_name);
+			output_fd = xopen(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600);
 		}
 		nothread_data.pack_fd = output_fd;
 	} else {
-		input_fd = open(pack_name, O_RDONLY);
-		if (input_fd < 0)
-			die_errno(_("cannot open packfile '%s'"), pack_name);
+		input_fd = xopen(pack_name, O_RDONLY);
 		output_fd = -1;
 		nothread_data.pack_fd = input_fd;
 	}
@@ -369,9 +364,7 @@ static void parse_pack_header(void)
 	use(sizeof(struct pack_header));
 }
 
-static NORETURN void bad_object(off_t offset, const char *format,
-		       ...) __attribute__((format (printf, 2, 3)));
-
+__attribute__((format (printf, 2, 3)))
 static NORETURN void bad_object(off_t offset, const char *format, ...)
 {
 	va_list params;
@@ -1159,6 +1152,7 @@ static void parse_pack_objects(unsigned char *hash)
 
 	if (verbose)
 		progress = start_progress(
+				progress_title ? progress_title :
 				from_stdin ? _("Receiving objects") : _("Indexing objects"),
 				nr_objects);
 	for (i = 0; i < nr_objects; i++) {
@@ -1421,7 +1415,7 @@ static void fix_unresolved_deltas(struct hashfile *f)
 
 		if (check_object_signature(the_repository, &d->oid,
 					   data, size,
-					   type_name(type)))
+					   type_name(type), NULL))
 			die(_("local object %s is corrupt"), oid_to_hex(&d->oid));
 
 		/*
@@ -1483,6 +1477,22 @@ static void write_special_file(const char *suffix, const char *msg,
 	strbuf_release(&name_buf);
 }
 
+static void rename_tmp_packfile(const char **final_name,
+				const char *curr_name,
+				struct strbuf *name, unsigned char *hash,
+				const char *ext, int make_read_only_if_same)
+{
+	if (*final_name != curr_name) {
+		if (!*final_name)
+			*final_name = odb_pack_name(name, hash, ext);
+		if (finalize_object_file(curr_name, *final_name))
+			die(_("unable to rename temporary '*.%s' file to '%s'"),
+			    ext, *final_name);
+	} else if (make_read_only_if_same) {
+		chmod(*final_name, 0444);
+	}
+}
+
 static void final(const char *final_pack_name, const char *curr_pack_name,
 		  const char *final_index_name, const char *curr_index_name,
 		  const char *final_rev_index_name, const char *curr_rev_index_name,
@@ -1511,31 +1521,13 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
 		write_special_file("promisor", promisor_msg, final_pack_name,
 				   hash, NULL);
 
-	if (final_pack_name != curr_pack_name) {
-		if (!final_pack_name)
-			final_pack_name = odb_pack_name(&pack_name, hash, "pack");
-		if (finalize_object_file(curr_pack_name, final_pack_name))
-			die(_("cannot store pack file"));
-	} else if (from_stdin)
-		chmod(final_pack_name, 0444);
-
-	if (final_index_name != curr_index_name) {
-		if (!final_index_name)
-			final_index_name = odb_pack_name(&index_name, hash, "idx");
-		if (finalize_object_file(curr_index_name, final_index_name))
-			die(_("cannot store index file"));
-	} else
-		chmod(final_index_name, 0444);
-
-	if (curr_rev_index_name) {
-		if (final_rev_index_name != curr_rev_index_name) {
-			if (!final_rev_index_name)
-				final_rev_index_name = odb_pack_name(&rev_index_name, hash, "rev");
-			if (finalize_object_file(curr_rev_index_name, final_rev_index_name))
-				die(_("cannot store reverse index file"));
-		} else
-			chmod(final_rev_index_name, 0444);
-	}
+	rename_tmp_packfile(&final_pack_name, curr_pack_name, &pack_name,
+			    hash, "pack", from_stdin);
+	if (curr_rev_index_name)
+		rename_tmp_packfile(&final_rev_index_name, curr_rev_index_name,
+				    &rev_index_name, hash, "rev", 1);
+	rename_tmp_packfile(&final_index_name, curr_index_name, &index_name,
+			    hash, "idx", 1);
 
 	if (do_fsck_object) {
 		struct packed_git *p;
@@ -1808,6 +1800,10 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 				input_len = sizeof(*hdr);
 			} else if (!strcmp(arg, "-v")) {
 				verbose = 1;
+			} else if (!strcmp(arg, "--progress-title")) {
+				if (progress_title || (i+1) >= argc)
+					usage(index_pack_usage);
+				progress_title = argv[++i];
 			} else if (!strcmp(arg, "--show-resolving-progress")) {
 				show_resolving_progress = 1;
 			} else if (!strcmp(arg, "--report-end-of-input")) {
@@ -1849,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 516a1142dd..093d0d2655 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -35,6 +35,7 @@
 #include "repository.h"
 #include "commit-reach.h"
 #include "range-diff.h"
+#include "tmp-objdir.h"
 
 #define MAIL_DEFAULT_WRAP 72
 #define COVER_FROM_AUTO_MAX_SUBJECT_LEN 100
@@ -245,7 +246,24 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 			rev->abbrev_commit = 0;
 	}
 
-	if (decoration_style) {
+	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 || rev->simplify_by_decoration) {
 		const struct string_list *config_exclude =
 			repo_config_get_value_multi(the_repository,
 						    "log.excludeDecoration");
@@ -257,7 +275,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);
 	}
@@ -404,6 +423,13 @@ static int cmd_log_walk(struct rev_info *rev)
 	int saved_nrl = 0;
 	int saved_dcctc = 0;
 
+	if (rev->remerge_diff) {
+		rev->remerge_objdir = tmp_objdir_create("remerge-diff");
+		if (!rev->remerge_objdir)
+			die(_("unable to create temporary object directory"));
+		tmp_objdir_replace_primary_odb(rev->remerge_objdir, 1);
+	}
+
 	if (rev->early_output)
 		setup_early_output();
 
@@ -446,6 +472,11 @@ static int cmd_log_walk(struct rev_info *rev)
 	rev->diffopt.no_free = 0;
 	diff_free(&rev->diffopt);
 
+	if (rev->remerge_diff) {
+		tmp_objdir_destroy(rev->remerge_objdir);
+		rev->remerge_objdir = NULL;
+	}
+
 	if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
 	    rev->diffopt.flags.check_failed) {
 		return 02;
@@ -634,7 +665,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
 	repo_init_revisions(the_repository, &rev, prefix);
 	rev.diff = 1;
 	rev.always_show_header = 1;
-	rev.no_walk = REVISION_WALK_NO_WALK_SORTED;
+	rev.no_walk = 1;
 	rev.diffopt.stat_width = -1; 	/* Scale to real terminal size */
 
 	memset(&opt, 0, sizeof(opt));
@@ -1925,9 +1956,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);
@@ -1940,6 +1971,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		die(_("--name-status does not make sense"));
 	if (rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF)
 		die(_("--check does not make sense"));
+	if (rev.remerge_diff)
+		die(_("--remerge-diff does not make sense"));
 
 	if (!use_patch_format &&
 		(!rev.diffopt.output_format ||
@@ -1961,7 +1994,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();
@@ -2094,7 +2127,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)
@@ -2238,6 +2271,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 29a26ad8ae..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;
@@ -209,10 +210,8 @@ static void show_submodule(struct repository *superproject,
 			   struct dir_struct *dir, const char *path)
 {
 	struct repository subrepo;
-	const struct submodule *sub = submodule_from_path(superproject,
-							  null_oid(), path);
 
-	if (repo_submodule_init(&subrepo, superproject, sub))
+	if (repo_submodule_init(&subrepo, superproject, path, null_oid()))
 		return;
 
 	if (repo_read_index(&subrepo) < 0)
@@ -317,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;
@@ -614,7 +615,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 	struct option builtin_ls_files_options[] = {
 		/* Think twice before adding "--nul" synonym to this */
 		OPT_SET_INT('z', NULL, &line_terminator,
-			N_("paths are separated with NUL character"), '\0'),
+			N_("separate paths with the NUL character"), '\0'),
 		OPT_BOOL('t', NULL, &show_tag,
 			N_("identify the file status with tags")),
 		OPT_BOOL('v', NULL, &show_valid_bit,
@@ -651,7 +652,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 			N_("skip files matching pattern"),
 			PARSE_OPT_NONEG, option_parse_exclude),
 		OPT_CALLBACK_F('X', "exclude-from", &dir, N_("file"),
-			N_("exclude patterns are read from <file>"),
+			N_("read exclude patterns from <file>"),
 			PARSE_OPT_NONEG, option_parse_exclude_from),
 		OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, N_("file"),
 			N_("read additional per-directory exclude patterns in <file>")),
@@ -672,12 +673,18 @@ 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;
 
 	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);
@@ -768,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);
 	}
 
@@ -777,16 +784,13 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 	if (show_resolve_undo)
 		show_ru_info(the_repository->index);
 
-	if (ps_matched) {
-		int bad;
-		bad = report_path_error(ps_matched, &pathspec);
-		if (bad)
-			fprintf(stderr, "Did you forget to 'git add'?\n");
-
-		return bad ? 1 : 0;
+	if (ps_matched && report_path_error(ps_matched, &pathspec)) {
+		fprintf(stderr, "Did you forget to 'git add'?\n");
+		ret = 1;
 	}
 
+	string_list_clear(&exclude_list, 0);
 	dir_clear(&dir);
 	free(max_prefix);
-	return 0;
+	return ret;
 }
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index 1794548c71..d856085e94 100644
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -7,8 +7,8 @@
 
 static const char * const ls_remote_usage[] = {
 	N_("git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-	   "                     [-q | --quiet] [--exit-code] [--get-url]\n"
-	   "                     [--symref] [<repository> [<refs>...]]"),
+	   "              [-q | --quiet] [--exit-code] [--get-url]\n"
+	   "              [--symref] [<repository> [<refs>...]]"),
 	NULL
 };
 
@@ -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),
@@ -84,7 +84,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 			     PARSE_OPT_STOP_AT_NON_OPTION);
 	dest = argv[0];
 
-	UNLEAK(sorting);
+	packet_trace_identity("ls-remote");
 
 	if (argc > 1) {
 		int i;
@@ -137,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];
@@ -150,6 +155,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 
 	ref_array_clear(&ref_array);
 	if (transport_disconnect(transport))
-		return 1;
+		status = 1;
+	transport_ls_refs_options_release(&transport_options);
 	return status;
 }
diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
index 664400b816..7baef30569 100644
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@ -75,9 +75,7 @@ static int split_one(FILE *mbox, const char *name, int allow_bare)
 		fprintf(stderr, "corrupt mailbox\n");
 		exit(1);
 	}
-	fd = open(name, O_WRONLY | O_CREAT | O_EXCL, 0666);
-	if (fd < 0)
-		die_errno("cannot open output file '%s'", name);
+	fd = xopen(name, O_WRONLY | O_CREAT | O_EXCL, 0666);
 	output = xfdopen(fd, "w");
 
 	/* Copy it out, while searching for a line that begins with
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 a8a843b1f5..a94a03384a 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -13,6 +13,7 @@
 #include "builtin.h"
 #include "lockfile.h"
 #include "run-command.h"
+#include "hook.h"
 #include "diff.h"
 #include "diff-merges.h"
 #include "refs.h"
@@ -86,11 +87,12 @@ 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",  DEFAULT_TWOHEAD | NO_TRIVIAL },
+	{ "recursive",  NO_TRIVIAL },
 	{ "octopus",    DEFAULT_OCTOPUS },
-	{ "ort",        NO_TRIVIAL },
+	{ "ort",        DEFAULT_TWOHEAD | NO_TRIVIAL },
 	{ "resolve",    0 },
 	{ "ours",       NO_FAST_FORWARD | NO_TRIVIAL },
 	{ "subtree",    NO_FAST_FORWARD | NO_TRIVIAL },
@@ -285,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")),
@@ -309,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;
 
@@ -469,7 +472,6 @@ static void finish(struct commit *head_commit,
 			 * We ignore errors in 'gc --auto', since the
 			 * user should see them.
 			 */
-			close_object_store(the_repository->objects);
 			run_auto_maintenance(verbosity < 0);
 		}
 	}
@@ -488,7 +490,7 @@ static void finish(struct commit *head_commit,
 	}
 
 	/* Run a post-merge hook */
-	run_hook_le(NULL, "post-merge", squash ? "1" : "0", NULL);
+	run_hooks_l("post-merge", squash ? "1" : "0", NULL);
 
 	apply_autostash(git_path_merge_autostash(the_repository));
 	strbuf_release(&reflog_message);
@@ -503,7 +505,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
 	struct strbuf bname = STRBUF_INIT;
 	struct merge_remote_desc *desc;
 	const char *ptr;
-	char *found_ref;
+	char *found_ref = NULL;
 	int len, early;
 
 	strbuf_branchname(&bname, remote, 0);
@@ -586,6 +588,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
 	strbuf_addf(msg, "%s\t\tcommit '%s'\n",
 		oid_to_hex(&remote_head->object.oid), remote);
 cleanup:
+	free(found_ref);
 	strbuf_release(&buf);
 	strbuf_release(&bname);
 }
@@ -680,6 +683,7 @@ static int read_tree_trivial(struct object_id *common, struct object_id *head,
 	opts.verbose_update = 1;
 	opts.trivial_merges_only = 1;
 	opts.merge = 1;
+	opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
 	trees[nr_trees] = parse_tree_indirect(common);
 	if (!trees[nr_trees++])
 		return -1;
@@ -738,7 +742,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
 
 		for (x = 0; x < xopts_nr; x++)
 			if (parse_merge_opt(&o, xopts[x]))
-				die(_("Unknown option for merge-recursive: -X%s"), xopts[x]);
+				die(_("unknown strategy option: -X%s"), xopts[x]);
 
 		o.branch1 = head_arg;
 		o.branch2 = merge_remote_util(remoteheads->item)->name;
@@ -848,7 +852,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
 	 * and write it out as a tree.  We must do this before we invoke
 	 * the editor and after we invoke run_status above.
 	 */
-	if (find_hook("pre-merge-commit"))
+	if (hook_exists("pre-merge-commit"))
 		discard_cache();
 	read_cache_from(index_file);
 	strbuf_addbuf(&msg, &merge_msg);
@@ -861,9 +865,11 @@ static void prepare_to_commit(struct commit_list *remoteheads)
 			strbuf_commented_addf(&msg, "\n");
 		}
 		strbuf_commented_addf(&msg, _(merge_editor_comment));
-		strbuf_commented_addf(&msg, _(cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS ?
-			scissors_editor_comment :
-			no_scissors_editor_comment), comment_line_char);
+		if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS)
+			strbuf_commented_addf(&msg, _(scissors_editor_comment));
+		else
+			strbuf_commented_addf(&msg,
+				_(no_scissors_editor_comment), comment_line_char);
 	}
 	if (signoff)
 		append_signoff(&msg, ignore_non_trailer(msg.buf, msg.len), 0);
@@ -1118,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)
@@ -1135,9 +1142,7 @@ static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge
 		merge_names = &fetch_head_file;
 
 	filename = git_path_fetch_head(the_repository);
-	fd = open(filename, O_RDONLY);
-	if (fd < 0)
-		die_errno(_("could not open '%s' for reading"), filename);
+	fd = xopen(filename, O_RDONLY);
 
 	if (strbuf_read(merge_names, fd, 0) < 0)
 		die_errno(_("could not read '%s'"), filename);
@@ -1268,13 +1273,16 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0;
 	struct commit_list *common = NULL;
 	const char *best_strategy = NULL, *wt_strategy = NULL;
-	struct commit_list *remoteheads, *p;
+	struct commit_list *remoteheads = NULL, *p;
 	void *branch_to_free;
 	int orig_argc = argc;
 
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage_with_options(builtin_merge_usage, builtin_merge_options);
 
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
+
 	/*
 	 * Check if we are _not_ on a detached HEAD, i.e. if there is a
 	 * current branch.
@@ -1367,14 +1375,14 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 		 * There is no unmerged entry, don't advise 'git
 		 * add/rm <file>', just 'git commit'.
 		 */
-		if (advice_resolve_conflict)
+		if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
 			die(_("You have not concluded your merge (MERGE_HEAD exists).\n"
 				  "Please, commit your changes before you merge."));
 		else
 			die(_("You have not concluded your merge (MERGE_HEAD exists)."));
 	}
 	if (ref_exists("CHERRY_PICK_HEAD")) {
-		if (advice_resolve_conflict)
+		if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
 			die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 			    "Please, commit your changes before you merge."));
 		else
@@ -1392,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
@@ -1484,6 +1492,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 			fast_forward = FF_NO;
 	}
 
+	if (!use_strategies && !pull_twohead &&
+	    remoteheads && !remoteheads->next) {
+		char *default_strategy = getenv("GIT_TEST_MERGE_ALGORITHM");
+		if (default_strategy)
+			append_strategy(get_strategy(default_strategy));
+	}
 	if (!use_strategies) {
 		if (!remoteheads)
 			; /* already up-to-date */
@@ -1554,18 +1568,19 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 
 		if (autostash)
 			create_autostash(the_repository,
-					 git_path_merge_autostash(the_repository),
-					 "merge");
+					 git_path_merge_autostash(the_repository));
 		if (checkout_fast_forward(the_repository,
 					  &head_commit->object.oid,
 					  &commit->object.oid,
 					  overwrite_ignore)) {
+			apply_autostash(git_path_merge_autostash(the_repository));
 			ret = 1;
 			goto done;
 		}
 
 		finish(head_commit, remoteheads, &commit->object.oid, msg.buf);
 		remove_merge_branch_state(the_repository);
+		strbuf_release(&msg);
 		goto done;
 	} else if (!remoteheads->next && common->next)
 		;
@@ -1620,12 +1635,11 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	}
 
 	if (fast_forward == FF_ONLY)
-		die(_("Not possible to fast-forward, aborting."));
+		die_ff_impossible();
 
 	if (autostash)
 		create_autostash(the_repository,
-				 git_path_merge_autostash(the_repository),
-				 "merge");
+				 git_path_merge_autostash(the_repository));
 
 	/* We are going to make a new commit. */
 	git_committer_info(IDENT_STRICT);
@@ -1708,6 +1722,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 		else
 			fprintf(stderr, _("Merge with strategy %s failed.\n"),
 				use_strategies[0]->name);
+		apply_autostash(git_path_merge_autostash(the_repository));
 		ret = 2;
 		goto done;
 	} else if (best_strategy == wt_strategy)
@@ -1715,7 +1730,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	else {
 		printf(_("Rewinding the tree to pristine...\n"));
 		restore_state(&head_commit->object.oid, &stash);
-		printf(_("Using the %s to prepare resolving by hand.\n"),
+		printf(_("Using the %s strategy to prepare resolving by hand.\n"),
 			best_strategy);
 		try_merge_strategy(best_strategy, common, remoteheads,
 				   head_commit);
@@ -1735,6 +1750,11 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 		ret = suggest_conflicts();
 
 done:
+	if (!automerge_was_ok) {
+		free_commit_list(common);
+		free_commit_list(remoteheads);
+	}
+	strbuf_release(&buf);
 	free(branch_to_free);
 	return ret;
 }
diff --git a/builtin/mktag.c b/builtin/mktag.c
index dddcccdd36..3b2dbbb37e 100644
--- a/builtin/mktag.c
+++ b/builtin/mktag.c
@@ -62,7 +62,8 @@ static int verify_object_in_tag(struct object_id *tagged_oid, int *tagged_type)
 
 	repl = lookup_replace_object(the_repository, tagged_oid);
 	ret = check_object_signature(the_repository, repl,
-				     buffer, size, type_name(*tagged_type));
+				     buffer, size, type_name(*tagged_type),
+				     NULL);
 	free(buffer);
 
 	return ret;
diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index 5d3ea445fd..4480ba3982 100644
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -7,7 +7,8 @@
 #include "object-store.h"
 
 #define BUILTIN_MIDX_WRITE_USAGE \
-	N_("git multi-pack-index [<options>] write [--preferred-pack=<pack>]")
+	N_("git multi-pack-index [<options>] write [--preferred-pack=<pack>]" \
+	   "[--refs-snapshot=<path>]")
 
 #define BUILTIN_MIDX_VERIFY_USAGE \
 	N_("git multi-pack-index [<options>] verify")
@@ -45,14 +46,15 @@ static char const * const builtin_multi_pack_index_usage[] = {
 static struct opts_multi_pack_index {
 	const char *object_dir;
 	const char *preferred_pack;
+	const char *refs_snapshot;
 	unsigned long batch_size;
 	unsigned flags;
+	int stdin_packs;
 } opts;
 
 static struct option common_opts[] = {
 	OPT_FILENAME(0, "object-dir", &opts.object_dir,
 	  N_("object directory containing set of packfile and pack-index pairs")),
-	OPT_BIT(0, "progress", &opts.flags, N_("force progress reporting"), MIDX_PROGRESS),
 	OPT_END(),
 };
 
@@ -61,6 +63,33 @@ static struct option *add_common_options(struct option *prev)
 	return parse_options_concat(common_opts, prev);
 }
 
+static int git_multi_pack_index_write_config(const char *var, const char *value,
+					     void *cb)
+{
+	if (!strcmp(var, "pack.writebitmaphashcache")) {
+		if (git_config_bool(var, value))
+			opts.flags |= MIDX_WRITE_BITMAP_HASH_CACHE;
+		else
+			opts.flags &= ~MIDX_WRITE_BITMAP_HASH_CACHE;
+	}
+
+	/*
+	 * We should never make a fall-back call to 'git_default_config', since
+	 * this was already called in 'cmd_multi_pack_index()'.
+	 */
+	return 0;
+}
+
+static void read_packs_from_stdin(struct string_list *to)
+{
+	struct strbuf buf = STRBUF_INIT;
+	while (strbuf_getline(&buf, stdin) != EOF)
+		string_list_append(to, buf.buf);
+	string_list_sort(to);
+
+	strbuf_release(&buf);
+}
+
 static int cmd_multi_pack_index_write(int argc, const char **argv)
 {
 	struct option *options;
@@ -68,13 +97,27 @@ static int cmd_multi_pack_index_write(int argc, const char **argv)
 		OPT_STRING(0, "preferred-pack", &opts.preferred_pack,
 			   N_("preferred-pack"),
 			   N_("pack for reuse when computing a multi-pack bitmap")),
+		OPT_BIT(0, "bitmap", &opts.flags, N_("write multi-pack bitmap"),
+			MIDX_WRITE_BITMAP | MIDX_WRITE_REV_INDEX),
+		OPT_BIT(0, "progress", &opts.flags,
+			N_("force progress reporting"), MIDX_PROGRESS),
+		OPT_BOOL(0, "stdin-packs", &opts.stdin_packs,
+			 N_("write multi-pack index containing only given indexes")),
+		OPT_FILENAME(0, "refs-snapshot", &opts.refs_snapshot,
+			     N_("refs snapshot for selecting bitmap commits")),
 		OPT_END(),
 	};
 
+	opts.flags |= MIDX_WRITE_BITMAP_HASH_CACHE;
+
+	git_config(git_multi_pack_index_write_config, NULL);
+
 	options = add_common_options(builtin_multi_pack_index_write_options);
 
 	trace2_cmd_mode(argv[0]);
 
+	if (isatty(2))
+		opts.flags |= MIDX_PROGRESS;
 	argc = parse_options(argc, argv, NULL,
 			     options, builtin_multi_pack_index_write_usage,
 			     PARSE_OPT_KEEP_UNKNOWN);
@@ -84,16 +127,39 @@ static int cmd_multi_pack_index_write(int argc, const char **argv)
 
 	FREE_AND_NULL(options);
 
+	if (opts.stdin_packs) {
+		struct string_list packs = STRING_LIST_INIT_DUP;
+		int ret;
+
+		read_packs_from_stdin(&packs);
+
+		ret = write_midx_file_only(opts.object_dir, &packs,
+					   opts.preferred_pack,
+					   opts.refs_snapshot, opts.flags);
+
+		string_list_clear(&packs, 0);
+
+		return ret;
+
+	}
 	return write_midx_file(opts.object_dir, opts.preferred_pack,
-			       opts.flags);
+			       opts.refs_snapshot, opts.flags);
 }
 
 static int cmd_multi_pack_index_verify(int argc, const char **argv)
 {
-	struct option *options = common_opts;
+	struct option *options;
+	static struct option builtin_multi_pack_index_verify_options[] = {
+		OPT_BIT(0, "progress", &opts.flags,
+			N_("force progress reporting"), MIDX_PROGRESS),
+		OPT_END(),
+	};
+	options = add_common_options(builtin_multi_pack_index_verify_options);
 
 	trace2_cmd_mode(argv[0]);
 
+	if (isatty(2))
+		opts.flags |= MIDX_PROGRESS;
 	argc = parse_options(argc, argv, NULL,
 			     options, builtin_multi_pack_index_verify_usage,
 			     PARSE_OPT_KEEP_UNKNOWN);
@@ -101,15 +167,25 @@ 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);
 }
 
 static int cmd_multi_pack_index_expire(int argc, const char **argv)
 {
-	struct option *options = common_opts;
+	struct option *options;
+	static struct option builtin_multi_pack_index_expire_options[] = {
+		OPT_BIT(0, "progress", &opts.flags,
+			N_("force progress reporting"), MIDX_PROGRESS),
+		OPT_END(),
+	};
+	options = add_common_options(builtin_multi_pack_index_expire_options);
 
 	trace2_cmd_mode(argv[0]);
 
+	if (isatty(2))
+		opts.flags |= MIDX_PROGRESS;
 	argc = parse_options(argc, argv, NULL,
 			     options, builtin_multi_pack_index_expire_usage,
 			     PARSE_OPT_KEEP_UNKNOWN);
@@ -117,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);
 }
 
@@ -126,6 +204,8 @@ static int cmd_multi_pack_index_repack(int argc, const char **argv)
 	static struct option builtin_multi_pack_index_repack_options[] = {
 		OPT_MAGNITUDE(0, "batch-size", &opts.batch_size,
 		  N_("during repack, collect pack-files of smaller size into a batch that is larger than this size")),
+		OPT_BIT(0, "progress", &opts.flags,
+		  N_("force progress reporting"), MIDX_PROGRESS),
 		OPT_END(),
 	};
 
@@ -133,6 +213,8 @@ static int cmd_multi_pack_index_repack(int argc, const char **argv)
 
 	trace2_cmd_mode(argv[0]);
 
+	if (isatty(2))
+		opts.flags |= MIDX_PROGRESS;
 	argc = parse_options(argc, argv, NULL,
 			     options,
 			     builtin_multi_pack_index_repack_usage,
@@ -154,8 +236,6 @@ int cmd_multi_pack_index(int argc, const char **argv,
 
 	git_config(git_default_config, NULL);
 
-	if (isatty(2))
-		opts.flags |= MIDX_PROGRESS;
 	argc = parse_options(argc, argv, prefix,
 			     builtin_multi_pack_index_options,
 			     builtin_multi_pack_index_usage,
@@ -164,7 +244,7 @@ int cmd_multi_pack_index(int argc, const char **argv,
 	if (!opts.object_dir)
 		opts.object_dir = get_object_directory();
 
-	if (argc == 0)
+	if (!argc)
 		goto usage;
 
 	if (!strcmp(argv[0], "repack"))
@@ -175,10 +255,9 @@ int cmd_multi_pack_index(int argc, const char **argv,
 		return cmd_multi_pack_index_verify(argc, argv);
 	else if (!strcmp(argv[0], "expire"))
 		return cmd_multi_pack_index_expire(argc, argv);
-	else {
+
+	error(_("unrecognized subcommand: %s"), argv[0]);
 usage:
-		error(_("unrecognized subcommand: %s"), argv[0]);
-		usage_with_options(builtin_multi_pack_index_usage,
-				   builtin_multi_pack_index_options);
-	}
+	usage_with_options(builtin_multi_pack_index_usage,
+			   builtin_multi_pack_index_options);
 }
diff --git a/builtin/mv.c b/builtin/mv.c
index 3fccdcb645..83a465ba83 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -118,21 +118,23 @@ static int index_range_of_same_dir(const char *src, int length,
 int cmd_mv(int argc, const char **argv, const char *prefix)
 {
 	int i, flags, gitmodules_modified = 0;
-	int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
+	int verbose = 0, show_only = 0, force = 0, ignore_errors = 0, ignore_sparse = 0;
 	struct option builtin_mv_options[] = {
 		OPT__VERBOSE(&verbose, N_("be verbose")),
 		OPT__DRY_RUN(&show_only, N_("dry run")),
 		OPT__FORCE(&force, N_("force move/rename even if target exists"),
 			   PARSE_OPT_NOCOMPLETE),
 		OPT_BOOL('k', NULL, &ignore_errors, N_("skip move/rename errors")),
+		OPT_BOOL(0, "sparse", &ignore_sparse, N_("allow updating entries outside of the sparse-checkout cone")),
 		OPT_END(),
 	};
 	const char **source, **destination, **dest_path, **submodule_gitfile;
-	enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes;
+	enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX, SPARSE } *modes;
 	struct stat st;
 	struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
 	struct lock_file lock_file = LOCK_INIT;
 	struct cache_entry *ce;
+	struct string_list only_match_skip_worktree = STRING_LIST_INIT_NODUP;
 
 	git_config(git_default_config, NULL);
 
@@ -176,14 +178,17 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 		const char *src = source[i], *dst = destination[i];
 		int length, src_is_dir;
 		const char *bad = NULL;
+		int skip_sparse = 0;
 
 		if (show_only)
 			printf(_("Checking rename of '%s' to '%s'\n"), src, dst);
 
 		length = strlen(src);
-		if (lstat(src, &st) < 0)
-			bad = _("bad source");
-		else if (!strncmp(src, dst, length) &&
+		if (lstat(src, &st) < 0) {
+			/* only error if existence is expected. */
+			if (modes[i] != SPARSE)
+				bad = _("bad source");
+		} else if (!strncmp(src, dst, length) &&
 				(dst[length] == 0 || dst[length] == '/')) {
 			bad = _("can not move directory into itself");
 		} else if ((src_is_dir = S_ISDIR(st.st_mode))
@@ -212,11 +217,12 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 				dst_len = strlen(dst);
 
 				for (j = 0; j < last - first; j++) {
-					const char *path = active_cache[first + j]->name;
+					const struct cache_entry *ce = active_cache[first + j];
+					const char *path = ce->name;
 					source[argc + j] = path;
 					destination[argc + j] =
 						prefix_path(dst, dst_len, path + length + 1);
-					modes[argc + j] = INDEX;
+					modes[argc + j] = ce_skip_worktree(ce) ? SPARSE : INDEX;
 					submodule_gitfile[argc + j] = NULL;
 				}
 				argc += last - first;
@@ -244,14 +250,36 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 			bad = _("multiple sources for the same target");
 		else if (is_dir_sep(dst[strlen(dst) - 1]))
 			bad = _("destination directory does not exist");
-		else
+		else {
+			/*
+			 * We check if the paths are in the sparse-checkout
+			 * definition as a very final check, since that
+			 * allows us to point the user to the --sparse
+			 * option as a way to have a successful run.
+			 */
+			if (!ignore_sparse &&
+			    !path_in_sparse_checkout(src, &the_index)) {
+				string_list_append(&only_match_skip_worktree, src);
+				skip_sparse = 1;
+			}
+			if (!ignore_sparse &&
+			    !path_in_sparse_checkout(dst, &the_index)) {
+				string_list_append(&only_match_skip_worktree, dst);
+				skip_sparse = 1;
+			}
+
+			if (skip_sparse)
+				goto remove_entry;
+
 			string_list_insert(&src_for_dst, dst);
+		}
 
 		if (!bad)
 			continue;
 		if (!ignore_errors)
 			die(_("%s, source=%s, destination=%s"),
 			     bad, src, dst);
+remove_entry:
 		if (--argc > 0) {
 			int n = argc - i;
 			memmove(source + i, source + i + 1,
@@ -266,6 +294,12 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 		}
 	}
 
+	if (only_match_skip_worktree.nr) {
+		advise_on_updating_sparse_paths(&only_match_skip_worktree);
+		if (!ignore_errors)
+			return 1;
+	}
+
 	for (i = 0; i < argc; i++) {
 		const char *src = source[i], *dst = destination[i];
 		enum update_mode mode = modes[i];
@@ -274,7 +308,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 			printf(_("Renaming %s to %s\n"), src, dst);
 		if (show_only)
 			continue;
-		if (mode != INDEX && rename(src, dst) < 0) {
+		if (mode != INDEX && mode != SPARSE && rename(src, dst) < 0) {
 			if (ignore_errors)
 				continue;
 			die_errno(_("renaming '%s' failed"), src);
@@ -303,5 +337,10 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
 		die(_("Unable to write new index file"));
 
+	string_list_clear(&src_for_dst, 0);
+	UNLEAK(source);
+	UNLEAK(dest_path);
+	free(submodule_gitfile);
+	free(modes);
 	return 0;
 }
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index b221d30014..138e3c30a2 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;
 
 		/*
@@ -518,7 +527,7 @@ static void name_rev_line(char *p, struct name_ref_data *data)
 int cmd_name_rev(int argc, const char **argv, const char *prefix)
 {
 	struct object_array revs = OBJECT_ARRAY_INIT;
-	int all = 0, transform_stdin = 0, allow_undefined = 1, always = 0, peel_tag = 0;
+	int all = 0, annotate_stdin = 0, transform_stdin = 0, allow_undefined = 1, always = 0, peel_tag = 0;
 	struct name_ref_data data = { 0, 0, STRING_LIST_INIT_NODUP, STRING_LIST_INIT_NODUP };
 	struct option opts[] = {
 		OPT_BOOL(0, "name-only", &data.name_only, N_("print only ref-based names (no object names)")),
@@ -529,7 +538,8 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
 				   N_("ignore refs matching <pattern>")),
 		OPT_GROUP(""),
 		OPT_BOOL(0, "all", &all, N_("list all commits reachable from all refs")),
-		OPT_BOOL(0, "stdin", &transform_stdin, N_("read from stdin")),
+		OPT_BOOL(0, "stdin", &transform_stdin, N_("deprecated: use annotate-stdin instead")),
+		OPT_BOOL(0, "annotate-stdin", &annotate_stdin, N_("annotate text from stdin")),
 		OPT_BOOL(0, "undefined", &allow_undefined, N_("allow to print `undefined` names (default)")),
 		OPT_BOOL(0, "always",     &always,
 			   N_("show abbreviated commit object as fallback")),
@@ -545,11 +555,19 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
 	init_commit_rev_name(&rev_names);
 	git_config(git_default_config, NULL);
 	argc = parse_options(argc, argv, prefix, opts, name_rev_usage, 0);
-	if (all + transform_stdin + !!argc > 1) {
+
+	if (transform_stdin) {
+		warning("--stdin is deprecated. Please use --annotate-stdin instead, "
+					"which is functionally equivalent.\n"
+					"This option will be removed in a future release.");
+		annotate_stdin = 1;
+	}
+
+	if (all + annotate_stdin + !!argc > 1) {
 		error("Specify either a list, or --all, not both!");
 		usage_with_options(name_rev_usage, opts);
 	}
-	if (all || transform_stdin)
+	if (all || annotate_stdin)
 		cutoff = 0;
 
 	for (; argc; argc--, argv++) {
@@ -604,15 +622,14 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
 	for_each_ref(name_ref, &data);
 	name_tips();
 
-	if (transform_stdin) {
-		char buffer[2048];
+	if (annotate_stdin) {
+		struct strbuf sb = STRBUF_INIT;
 
-		while (!feof(stdin)) {
-			char *p = fgets(buffer, sizeof(buffer), stdin);
-			if (!p)
-				break;
-			name_rev_line(p, &data);
+		while (strbuf_getline(&sb, stdin) != EOF) {
+			strbuf_addch(&sb, '\n');
+			name_rev_line(sb.buf, &data);
 		}
+		strbuf_release(&sb);
 	} else if (all) {
 		int i, max;
 
diff --git a/builtin/notes.c b/builtin/notes.c
index 74bba39ca8..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;
@@ -172,9 +171,7 @@ static void prepare_note_data(const struct object_id *object, struct note_data *
 
 		/* write the template message before editing: */
 		d->edit_path = git_pathdup("NOTES_EDITMSG");
-		fd = open(d->edit_path, O_CREAT | O_TRUNC | O_WRONLY, 0600);
-		if (fd < 0)
-			die_errno(_("could not create file '%s'"), d->edit_path);
+		fd = xopen(d->edit_path, O_CREAT | O_TRUNC | O_WRONLY, 0600);
 
 		if (d->given)
 			write_or_die(fd, d->buf.buf, d->buf.len);
@@ -203,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);
 	}
 }
 
@@ -863,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 de00adbb9e..87cb7b45c3 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1124,6 +1124,11 @@ static void write_reused_pack(struct hashfile *f)
 				break;
 
 			offset += ewah_bit_ctz64(word >> offset);
+			/*
+			 * Can use bit positions directly, even for MIDX
+			 * bitmaps. See comment in try_partial_reuse()
+			 * for why.
+			 */
 			write_reused_pack_one(pos + offset, f, &w_curs);
 			display_progress(progress_state, ++written);
 		}
@@ -1217,6 +1222,7 @@ static void write_pack_file(void)
 		if (!pack_to_stdout) {
 			struct stat st;
 			struct strbuf tmpname = STRBUF_INIT;
+			char *idx_tmp_name = NULL;
 
 			/*
 			 * Packs are runtime accessed in their mtime
@@ -1237,7 +1243,8 @@ static void write_pack_file(void)
 					warning_errno(_("failed utime() on %s"), pack_tmp_name);
 			}
 
-			strbuf_addf(&tmpname, "%s-", base_name);
+			strbuf_addf(&tmpname, "%s-%s.", base_name,
+				    hash_to_hex(hash));
 
 			if (write_bitmap_index) {
 				bitmap_writer_set_checksum(hash);
@@ -1245,23 +1252,29 @@ static void write_pack_file(void)
 					&to_pack, written_list, nr_written);
 			}
 
-			finish_tmp_packfile(&tmpname, pack_tmp_name,
+			stage_tmp_packfiles(&tmpname, pack_tmp_name,
 					    written_list, nr_written,
-					    &pack_idx_opts, hash);
+					    &pack_idx_opts, hash, &idx_tmp_name);
 
 			if (write_bitmap_index) {
-				strbuf_addf(&tmpname, "%s.bitmap", hash_to_hex(hash));
+				size_t tmpname_len = tmpname.len;
 
+				strbuf_addstr(&tmpname, "bitmap");
 				stop_progress(&progress_state);
 
 				bitmap_writer_show_progress(progress);
 				bitmap_writer_select_commits(indexed_commits, indexed_commits_nr, -1);
-				bitmap_writer_build(&to_pack);
+				if (bitmap_writer_build(&to_pack) < 0)
+					die(_("failed to write bitmap index"));
 				bitmap_writer_finish(written_list, nr_written,
 						     tmpname.buf, write_bitmap_options);
 				write_bitmap_index = 0;
+				strbuf_setlen(&tmpname, tmpname_len);
 			}
 
+			rename_tmp_packfile_idx(&tmpname, &idx_tmp_name);
+
+			free(idx_tmp_name);
 			strbuf_release(&tmpname);
 			free(pack_tmp_name);
 			puts(hash_to_hex(hash));
@@ -3311,9 +3324,26 @@ static void read_packs_list_from_stdin(void)
 	}
 
 	/*
-	 * First handle all of the excluded packs, marking them as kept in-core
-	 * so that later calls to add_object_entry() discards any objects that
-	 * are also found in excluded packs.
+	 * Arguments we got on stdin may not even be packs. First
+	 * check that to avoid segfaulting later on in
+	 * e.g. pack_mtime_cmp(), excluded packs are handled below.
+	 *
+	 * Since we first parsed our STDIN and then sorted the input
+	 * lines the pack we error on will be whatever line happens to
+	 * sort first. This is lazy, it's enough that we report one
+	 * bad case here, we don't need to report the first/last one,
+	 * or all of them.
+	 */
+	for_each_string_list_item(item, &include_packs) {
+		struct packed_git *p = item->util;
+		if (!p)
+			die(_("could not find pack '%s'"), item->string);
+	}
+
+	/*
+	 * Then, handle all of the excluded packs, marking them as
+	 * kept in-core so that later calls to add_object_entry()
+	 * discards any objects that are also found in excluded packs.
 	 */
 	for_each_string_list_item(item, &exclude_packs) {
 		struct packed_git *p = item->util;
@@ -3367,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);
@@ -3388,13 +3418,9 @@ static void read_object_list_from_stdin(void)
 	}
 }
 
-/* Remember to update object flag allocation in object.h */
-#define OBJECT_ADDED (1u<<20)
-
 static void show_commit(struct commit *commit, void *data)
 {
 	add_object_entry(&commit->object.oid, OBJ_COMMIT, NULL, 0);
-	commit->object.flags |= OBJECT_ADDED;
 
 	if (write_bitmap_index)
 		index_commit_for_bitmap(commit);
@@ -3407,7 +3433,6 @@ static void show_object(struct object *obj, const char *name, void *data)
 {
 	add_preferred_base_object(name);
 	add_object_entry(&obj->oid, obj->type, name, 0);
-	obj->flags |= OBJECT_ADDED;
 
 	if (use_delta_islands) {
 		const char *p;
@@ -3488,79 +3513,23 @@ static void show_edge(struct commit *commit)
 	add_preferred_base(&commit->object.oid);
 }
 
-struct in_pack_object {
-	off_t offset;
-	struct object *object;
-};
-
-struct in_pack {
-	unsigned int alloc;
-	unsigned int nr;
-	struct in_pack_object *array;
-};
-
-static void mark_in_pack_object(struct object *object, struct packed_git *p, struct in_pack *in_pack)
+static int add_object_in_unpacked_pack(const struct object_id *oid,
+				       struct packed_git *pack,
+				       uint32_t pos,
+				       void *_data)
 {
-	in_pack->array[in_pack->nr].offset = find_pack_entry_one(object->oid.hash, p);
-	in_pack->array[in_pack->nr].object = object;
-	in_pack->nr++;
-}
-
-/*
- * Compare the objects in the offset order, in order to emulate the
- * "git rev-list --objects" output that produced the pack originally.
- */
-static int ofscmp(const void *a_, const void *b_)
-{
-	struct in_pack_object *a = (struct in_pack_object *)a_;
-	struct in_pack_object *b = (struct in_pack_object *)b_;
-
-	if (a->offset < b->offset)
-		return -1;
-	else if (a->offset > b->offset)
-		return 1;
-	else
-		return oidcmp(&a->object->oid, &b->object->oid);
+	add_object_entry(oid, OBJ_NONE, "", 0);
+	return 0;
 }
 
 static void add_objects_in_unpacked_packs(void)
 {
-	struct packed_git *p;
-	struct in_pack in_pack;
-	uint32_t i;
-
-	memset(&in_pack, 0, sizeof(in_pack));
-
-	for (p = get_all_packs(the_repository); p; p = p->next) {
-		struct object_id oid;
-		struct object *o;
-
-		if (!p->pack_local || p->pack_keep || p->pack_keep_in_core)
-			continue;
-		if (open_pack_index(p))
-			die(_("cannot open pack index"));
-
-		ALLOC_GROW(in_pack.array,
-			   in_pack.nr + p->num_objects,
-			   in_pack.alloc);
-
-		for (i = 0; i < p->num_objects; i++) {
-			nth_packed_object_id(&oid, p, i);
-			o = lookup_unknown_object(the_repository, &oid);
-			if (!(o->flags & OBJECT_ADDED))
-				mark_in_pack_object(o, p, &in_pack);
-			o->flags |= OBJECT_ADDED;
-		}
-	}
-
-	if (in_pack.nr) {
-		QSORT(in_pack.array, in_pack.nr, ofscmp);
-		for (i = 0; i < in_pack.nr; i++) {
-			struct object *o = in_pack.array[i].object;
-			add_object_entry(&o->oid, o->type, "", 0);
-		}
-	}
-	free(in_pack.array);
+	if (for_each_packed_object(add_object_in_unpacked_pack, NULL,
+				   FOR_EACH_OBJECT_PACK_ORDER |
+				   FOR_EACH_OBJECT_LOCAL_ONLY |
+				   FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS |
+				   FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS))
+		die(_("cannot open pack index"));
 }
 
 static int add_loose_object(const struct object_id *oid, const char *path,
@@ -4007,9 +3976,11 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 	read_replace_refs = 0;
 
 	sparse = git_env_bool("GIT_TEST_PACK_SPARSE", -1);
-	prepare_repo_settings(the_repository);
-	if (sparse < 0)
-		sparse = the_repository->settings.pack_use_sparse;
+	if (the_repository->gitdir) {
+		prepare_repo_settings(the_repository);
+		if (sparse < 0)
+			sparse = the_repository->settings.pack_use_sparse;
+	}
 
 	reset_pack_idx_option(&pack_idx_opts);
 	git_config(git_pack_config, NULL);
@@ -4101,7 +4072,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;
 
@@ -4179,11 +4150,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)
@@ -4193,7 +4163,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);
@@ -4214,5 +4184,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/patch-id.c b/builtin/patch-id.c
index 822ffff51f..881fcf3273 100644
--- a/builtin/patch-id.c
+++ b/builtin/patch-id.c
@@ -32,8 +32,12 @@ static int scan_hunk_header(const char *p, int *p_before, int *p_after)
 	n = strspn(q, digits);
 	if (q[n] == ',') {
 		q += n + 1;
+		*p_before = atoi(q);
 		n = strspn(q, digits);
+	} else {
+		*p_before = 1;
 	}
+
 	if (n == 0 || q[n] != ' ' || q[n+1] != '+')
 		return 0;
 
@@ -41,13 +45,14 @@ static int scan_hunk_header(const char *p, int *p_before, int *p_after)
 	n = strspn(r, digits);
 	if (r[n] == ',') {
 		r += n + 1;
+		*p_after = atoi(r);
 		n = strspn(r, digits);
+	} else {
+		*p_after = 1;
 	}
 	if (n == 0)
 		return 0;
 
-	*p_before = atoi(q);
-	*p_after = atoi(r);
 	return 1;
 }
 
diff --git a/builtin/prune.c b/builtin/prune.c
index 02c6ab7cba..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;
 }
 
@@ -143,7 +155,6 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
 	expire = TIME_MAX;
 	save_commit_buffer = 0;
 	read_replace_refs = 0;
-	ref_paranoia = 1;
 	repo_init_revisions(the_repository, &revs, prefix);
 
 	argc = parse_options(argc, argv, prefix, options, prune_usage, 0);
diff --git a/builtin/pull.c b/builtin/pull.c
index 3e13f81084..3768552e68 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -26,13 +26,13 @@
 #include "wt-status.h"
 #include "commit-reach.h"
 #include "sequencer.h"
+#include "packfile.h"
 
 /**
  * Parses the value of --rebase. If value is a false value, returns
  * REBASE_FALSE. If value is a true value, returns REBASE_TRUE. If value is
- * "merges", returns REBASE_MERGES. If value is "preserve", returns
- * REBASE_PRESERVE. If value is a invalid value, dies with a fatal error if
- * fatal is true, otherwise returns REBASE_INVALID.
+ * "merges", returns REBASE_MERGES. If value is a invalid value, dies with
+ * a fatal error if fatal is true, otherwise returns REBASE_INVALID.
  */
 static enum rebase_type parse_config_rebase(const char *key, const char *value,
 		int fatal)
@@ -84,6 +84,7 @@ static char *opt_edit;
 static char *cleanup_arg;
 static char *opt_ff;
 static char *opt_verify_signatures;
+static char *opt_verify;
 static int opt_autostash = -1;
 static int config_autostash;
 static int check_trust_level = 1;
@@ -126,7 +127,7 @@ static struct option pull_options[] = {
 	/* Options passed to git-merge or git-rebase */
 	OPT_GROUP(N_("Options related to merging")),
 	OPT_CALLBACK_F('r', "rebase", &opt_rebase,
-		"(false|true|merges|preserve|interactive)",
+		"(false|true|merges|interactive)",
 		N_("incorporate changes by rebasing rather than merging"),
 		PARSE_OPT_OPTARG, parse_opt_rebase),
 	OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,
@@ -160,6 +161,9 @@ static struct option pull_options[] = {
 	OPT_PASSTHRU(0, "ff-only", &opt_ff, NULL,
 		N_("abort if fast-forward is not possible"),
 		PARSE_OPT_NOARG | PARSE_OPT_NONEG),
+	OPT_PASSTHRU(0, "verify", &opt_verify, NULL,
+		N_("control use of pre-merge-commit and commit-msg hooks"),
+		PARSE_OPT_NOARG),
 	OPT_PASSTHRU(0, "verify-signatures", &opt_verify_signatures, NULL,
 		N_("verify that the named commit has a valid GPG signature"),
 		PARSE_OPT_NOARG),
@@ -577,7 +581,7 @@ static int run_fetch(const char *repo, const char **refspecs)
 		strvec_pushv(&args, refspecs);
 	} else if (*refspecs)
 		BUG("refspecs without repo?");
-	ret = run_command_v_opt(args.v, RUN_GIT_CMD);
+	ret = run_command_v_opt(args.v, RUN_GIT_CMD | RUN_CLOSE_OBJECT_STORE);
 	strvec_clear(&args);
 	return ret;
 }
@@ -675,6 +679,8 @@ static int run_merge(void)
 		strvec_pushf(&args, "--cleanup=%s", cleanup_arg);
 	if (opt_ff)
 		strvec_push(&args, opt_ff);
+	if (opt_verify)
+		strvec_push(&args, opt_verify);
 	if (opt_verify_signatures)
 		strvec_push(&args, opt_verify_signatures);
 	strvec_pushv(&args, opt_strategies.v);
@@ -883,8 +889,6 @@ static int run_rebase(const struct object_id *newbase,
 	/* Options passed to git-rebase */
 	if (opt_rebase == REBASE_MERGES)
 		strvec_push(&args, "--rebase-merges");
-	else if (opt_rebase == REBASE_PRESERVE)
-		strvec_push(&args, "--preserve-merges");
 	else if (opt_rebase == REBASE_INTERACTIVE)
 		strvec_push(&args, "--interactive");
 	if (opt_diffstat)
@@ -893,6 +897,8 @@ static int run_rebase(const struct object_id *newbase,
 	strvec_pushv(&args, opt_strategy_opts.v);
 	if (opt_gpg_sign)
 		strvec_push(&args, opt_gpg_sign);
+	if (opt_signoff)
+		strvec_push(&args, opt_signoff);
 	if (opt_autostash == 0)
 		strvec_push(&args, "--no-autostash");
 	else if (opt_autostash == 1)
@@ -911,12 +917,18 @@ static int run_rebase(const struct object_id *newbase,
 	return ret;
 }
 
-static int get_can_ff(struct object_id *orig_head, struct object_id *orig_merge_head)
+static int get_can_ff(struct object_id *orig_head,
+		      struct oid_array *merge_heads)
 {
 	int ret;
 	struct commit_list *list = NULL;
 	struct commit *merge_head, *head;
+	struct object_id *orig_merge_head;
+
+	if (merge_heads->nr > 1)
+		return 0;
 
+	orig_merge_head = &merge_heads->oid[0];
 	head = lookup_commit_reference(the_repository, orig_head);
 	commit_list_insert(head, &list);
 	merge_head = lookup_commit_reference(the_repository, orig_merge_head);
@@ -925,13 +937,40 @@ static int get_can_ff(struct object_id *orig_head, struct object_id *orig_merge_
 	return ret;
 }
 
+/*
+ * Is orig_head a descendant of _all_ merge_heads?
+ * Unfortunately is_descendant_of() cannot be used as it asks
+ * if orig_head is a descendant of at least one of them.
+ */
+static int already_up_to_date(struct object_id *orig_head,
+			      struct oid_array *merge_heads)
+{
+	int i;
+	struct commit *ours;
+
+	ours = lookup_commit_reference(the_repository, orig_head);
+	for (i = 0; i < merge_heads->nr; i++) {
+		struct commit_list *list = NULL;
+		struct commit *theirs;
+		int ok;
+
+		theirs = lookup_commit_reference(the_repository, &merge_heads->oid[i]);
+		commit_list_insert(theirs, &list);
+		ok = repo_is_descendant_of(the_repository, ours, list);
+		free_commit_list(list);
+		if (!ok)
+			return 0;
+	}
+	return 1;
+}
+
 static void show_advice_pull_non_ff(void)
 {
-	advise(_("Pulling without specifying how to reconcile divergent branches is\n"
-		 "discouraged. You can squelch this message by running one of the following\n"
-		 "commands sometime before your next pull:\n"
+	advise(_("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"
@@ -949,11 +988,16 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 	struct object_id rebase_fork_point;
 	int rebase_unspecified = 0;
 	int can_ff;
+	int divergent;
 
 	if (!getenv("GIT_REFLOG_ACTION"))
 		set_reflog_message(argc, argv);
 
 	git_config(git_pull_config, NULL);
+	if (the_repository->gitdir) {
+		prepare_repo_settings(the_repository);
+		the_repository->settings.command_requires_full_index = 0;
+	}
 
 	argc = parse_options(argc, argv, prefix, pull_options, pull_usage, 0);
 
@@ -966,8 +1010,22 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 
 	parse_repo_refspecs(argc, argv, &repo, &refspecs);
 
-	if (!opt_ff)
+	if (!opt_ff) {
 		opt_ff = xstrdup_or_null(config_get_ff());
+		/*
+		 * A subtle point: opt_ff was set on the line above via
+		 * reading from config.  opt_rebase, in contrast, is set
+		 * before this point via command line options.  The setting
+		 * of opt_rebase via reading from config (using
+		 * config_get_rebase()) does not happen until later.  We
+		 * are relying on the next if-condition happening before
+		 * the config_get_rebase() call so that an explicit
+		 * "--rebase" can override a config setting of
+		 * pull.ff=only.
+		 */
+		if (opt_rebase >= 0 && opt_ff && !strcmp(opt_ff, "--ff-only"))
+			opt_ff = "--ff";
+	}
 
 	if (opt_rebase < 0)
 		opt_rebase = config_get_rebase(&rebase_unspecified);
@@ -982,14 +1040,13 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 		oidclr(&orig_head);
 
 	if (opt_rebase) {
-		int autostash = config_autostash;
-		if (opt_autostash != -1)
-			autostash = opt_autostash;
+		if (opt_autostash == -1)
+			opt_autostash = config_autostash;
 
 		if (is_null_oid(&orig_head) && !is_cache_unborn())
 			die(_("Updating an unborn branch with changes added to the index."));
 
-		if (!autostash)
+		if (!opt_autostash)
 			require_clean_work_tree(the_repository,
 				N_("pull with rebase"),
 				_("please commit or stash them."), 1, 0);
@@ -1041,14 +1098,26 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 			die(_("Cannot merge multiple branches into empty head."));
 		return pull_into_void(merge_heads.oid, &curr_head);
 	}
-	if (opt_rebase && merge_heads.nr > 1)
-		die(_("Cannot rebase onto multiple branches."));
+	if (merge_heads.nr > 1) {
+		if (opt_rebase)
+			die(_("Cannot rebase onto multiple branches."));
+		if (opt_ff && !strcmp(opt_ff, "--ff-only"))
+			die(_("Cannot fast-forward to multiple branches."));
+	}
 
-	can_ff = get_can_ff(&orig_head, &merge_heads.oid[0]);
+	can_ff = get_can_ff(&orig_head, &merge_heads);
+	divergent = !can_ff && !already_up_to_date(&orig_head, &merge_heads);
 
-	if (rebase_unspecified && !opt_ff && !can_ff) {
-		if (opt_verbosity >= 0)
-			show_advice_pull_non_ff();
+	/* ff-only takes precedence over rebase */
+	if (opt_ff && !strcmp(opt_ff, "--ff-only")) {
+		if (divergent)
+			die_ff_impossible();
+		opt_rebase = REBASE_FALSE;
+	}
+	/* If no action specified and we can't fast forward, then warn. */
+	if (!opt_ff && rebase_unspecified && divergent) {
+		show_advice_pull_non_ff();
+		die(_("Need to specify how to reconcile divergent branches."));
 	}
 
 	if (opt_rebase) {
diff --git a/builtin/push.c b/builtin/push.c
index e8b10a9b7e..359db90321 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -289,42 +289,42 @@ static const char message_advice_ref_needs_update[] =
 
 static void advise_pull_before_push(void)
 {
-	if (!advice_push_non_ff_current || !advice_push_update_rejected)
+	if (!advice_enabled(ADVICE_PUSH_NON_FF_CURRENT) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
 		return;
 	advise(_(message_advice_pull_before_push));
 }
 
 static void advise_checkout_pull_push(void)
 {
-	if (!advice_push_non_ff_matching || !advice_push_update_rejected)
+	if (!advice_enabled(ADVICE_PUSH_NON_FF_MATCHING) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
 		return;
 	advise(_(message_advice_checkout_pull_push));
 }
 
 static void advise_ref_already_exists(void)
 {
-	if (!advice_push_already_exists || !advice_push_update_rejected)
+	if (!advice_enabled(ADVICE_PUSH_ALREADY_EXISTS) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
 		return;
 	advise(_(message_advice_ref_already_exists));
 }
 
 static void advise_ref_fetch_first(void)
 {
-	if (!advice_push_fetch_first || !advice_push_update_rejected)
+	if (!advice_enabled(ADVICE_PUSH_FETCH_FIRST) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
 		return;
 	advise(_(message_advice_ref_fetch_first));
 }
 
 static void advise_ref_needs_force(void)
 {
-	if (!advice_push_needs_force || !advice_push_update_rejected)
+	if (!advice_enabled(ADVICE_PUSH_NEEDS_FORCE) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
 		return;
 	advise(_(message_advice_ref_needs_force));
 }
 
 static void advise_ref_needs_update(void)
 {
-	if (!advice_push_ref_needs_update || !advice_push_update_rejected)
+	if (!advice_enabled(ADVICE_PUSH_REF_NEEDS_UPDATE) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
 		return;
 	advise(_(message_advice_ref_needs_update));
 }
@@ -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/read-tree.c b/builtin/read-tree.c
index 485e7b0479..2109c4c9e5 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -38,7 +38,7 @@ static int list_tree(struct object_id *oid)
 }
 
 static const char * const read_tree_usage[] = {
-	N_("git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"),
+	N_("git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"),
 	NULL
 };
 
@@ -53,24 +53,16 @@ static int index_output_cb(const struct option *opt, const char *arg,
 static int exclude_per_directory_cb(const struct option *opt, const char *arg,
 				    int unset)
 {
-	struct dir_struct *dir;
 	struct unpack_trees_options *opts;
 
 	BUG_ON_OPT_NEG(unset);
 
 	opts = (struct unpack_trees_options *)opt->value;
 
-	if (opts->dir)
-		die("more than one --exclude-per-directory given.");
-
-	dir = xcalloc(1, sizeof(*opts->dir));
-	dir->flags |= DIR_SHOW_IGNORED;
-	dir->exclude_per_dir = arg;
-	opts->dir = dir;
-	/* We do not need to nor want to do read-directory
-	 * here; we are merely interested in reusing the
-	 * per directory ignore stack mechanism.
-	 */
+	if (!opts->update)
+		die("--exclude-per-directory is meaningless unless -u");
+	if (strcmp(arg, ".gitignore"))
+		die("--exclude-per-directory argument must be .gitignore");
 	return 0;
 }
 
@@ -174,6 +166,9 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
 	if (1 < opts.merge + opts.reset + prefix_set)
 		die("Which one? -m, --reset, or --prefix?");
 
+	if (opts.reset)
+		opts.reset = UNPACK_RESET_OVERWRITE_UNTRACKED;
+
 	/*
 	 * NEEDSWORK
 	 *
@@ -209,8 +204,9 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
 	if ((opts.update || opts.index_only) && !opts.merge)
 		die("%s is meaningless without -m, --reset, or --prefix",
 		    opts.update ? "-u" : "-i");
-	if ((opts.dir && !opts.update))
-		die("--exclude-per-directory is meaningless unless -u");
+	if (opts.update && !opts.reset)
+		opts.preserve_ignored = 0;
+	/* otherwise, opts.preserve_ignored is irrelevant */
 	if (opts.merge && !opts.index_only)
 		setup_work_tree();
 
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 12f093121d..d858add3fe 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -28,6 +28,7 @@
 #include "sequencer.h"
 #include "rebase-interactive.h"
 #include "reset.h"
+#include "hook.h"
 
 #define DEFAULT_REFLOG_ACTION "rebase"
 
@@ -48,8 +49,7 @@ static GIT_PATH_FUNC(merge_dir, "rebase-merge")
 enum rebase_type {
 	REBASE_UNSPECIFIED = -1,
 	REBASE_APPLY,
-	REBASE_MERGE,
-	REBASE_PRESERVE_MERGES
+	REBASE_MERGE
 };
 
 enum empty_type {
@@ -139,7 +139,7 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
 	replay.ignore_date = opts->ignore_date;
 	replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt);
 	if (opts->strategy)
-		replay.strategy = opts->strategy;
+		replay.strategy = xstrdup_or_null(opts->strategy);
 	else if (!replay.strategy && replay.default_strategy) {
 		replay.strategy = replay.default_strategy;
 		replay.default_strategy = NULL;
@@ -163,12 +163,7 @@ enum action {
 	ACTION_ABORT,
 	ACTION_QUIT,
 	ACTION_EDIT_TODO,
-	ACTION_SHOW_CURRENT_PATCH,
-	ACTION_SHORTEN_OIDS,
-	ACTION_EXPAND_OIDS,
-	ACTION_CHECK_TODO_LIST,
-	ACTION_REARRANGE_SQUASH,
-	ACTION_ADD_EXEC
+	ACTION_SHOW_CURRENT_PATCH
 };
 
 static const char *action_names[] = { "undefined",
@@ -179,81 +174,6 @@ static const char *action_names[] = { "undefined",
 				      "edit_todo",
 				      "show_current_patch" };
 
-static int add_exec_commands(struct string_list *commands)
-{
-	const char *todo_file = rebase_path_todo();
-	struct todo_list todo_list = TODO_LIST_INIT;
-	int res;
-
-	if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
-		return error_errno(_("could not read '%s'."), todo_file);
-
-	if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
-					&todo_list)) {
-		todo_list_release(&todo_list);
-		return error(_("unusable todo list: '%s'"), todo_file);
-	}
-
-	todo_list_add_exec_commands(&todo_list, commands);
-	res = todo_list_write_to_file(the_repository, &todo_list,
-				      todo_file, NULL, NULL, -1, 0);
-	todo_list_release(&todo_list);
-
-	if (res)
-		return error_errno(_("could not write '%s'."), todo_file);
-	return 0;
-}
-
-static int rearrange_squash_in_todo_file(void)
-{
-	const char *todo_file = rebase_path_todo();
-	struct todo_list todo_list = TODO_LIST_INIT;
-	int res = 0;
-
-	if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
-		return error_errno(_("could not read '%s'."), todo_file);
-	if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
-					&todo_list)) {
-		todo_list_release(&todo_list);
-		return error(_("unusable todo list: '%s'"), todo_file);
-	}
-
-	res = todo_list_rearrange_squash(&todo_list);
-	if (!res)
-		res = todo_list_write_to_file(the_repository, &todo_list,
-					      todo_file, NULL, NULL, -1, 0);
-
-	todo_list_release(&todo_list);
-
-	if (res)
-		return error_errno(_("could not write '%s'."), todo_file);
-	return 0;
-}
-
-static int transform_todo_file(unsigned flags)
-{
-	const char *todo_file = rebase_path_todo();
-	struct todo_list todo_list = TODO_LIST_INIT;
-	int res;
-
-	if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
-		return error_errno(_("could not read '%s'."), todo_file);
-
-	if (todo_list_parse_insn_buffer(the_repository, todo_list.buf.buf,
-					&todo_list)) {
-		todo_list_release(&todo_list);
-		return error(_("unusable todo list: '%s'"), todo_file);
-	}
-
-	res = todo_list_write_to_file(the_repository, &todo_list, todo_file,
-				      NULL, NULL, -1, flags);
-	todo_list_release(&todo_list);
-
-	if (res)
-		return error_errno(_("could not write '%s'."), todo_file);
-	return 0;
-}
-
 static int edit_todo_file(unsigned flags)
 {
 	const char *todo_file = rebase_path_todo();
@@ -403,8 +323,8 @@ static int run_sequencer_rebase(struct rebase_options *opts,
 	flags |= opts->rebase_merges ? TODO_LIST_REBASE_MERGES : 0;
 	flags |= opts->rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0;
 	flags |= opts->root_with_onto ? TODO_LIST_ROOT_WITH_ONTO : 0;
-	flags |= command == ACTION_SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0;
 	flags |= opts->reapply_cherry_picks ? TODO_LIST_REAPPLY_CHERRY_PICKS : 0;
+	flags |= opts->flags & REBASE_NO_QUIET ? TODO_LIST_WARN_SKIPPED_CHERRY_PICKS : 0;
 
 	switch (command) {
 	case ACTION_NONE: {
@@ -438,24 +358,6 @@ static int run_sequencer_rebase(struct rebase_options *opts,
 
 		break;
 	}
-	case ACTION_SHORTEN_OIDS:
-	case ACTION_EXPAND_OIDS:
-		ret = transform_todo_file(flags);
-		break;
-	case ACTION_CHECK_TODO_LIST:
-		ret = check_todo_list_from_file(the_repository);
-		break;
-	case ACTION_REARRANGE_SQUASH:
-		ret = rearrange_squash_in_todo_file();
-		break;
-	case ACTION_ADD_EXEC: {
-		struct string_list commands = STRING_LIST_INIT_DUP;
-
-		split_exec_commands(opts->cmd, &commands);
-		ret = add_exec_commands(&commands);
-		string_list_clear(&commands, 0);
-		break;
-	}
 	default:
 		BUG("invalid command '%d'", command);
 	}
@@ -477,102 +379,9 @@ static int parse_opt_keep_empty(const struct option *opt, const char *arg,
 	return 0;
 }
 
-static const char * const builtin_rebase_interactive_usage[] = {
-	N_("git rebase--interactive [<options>]"),
-	NULL
-};
-
-int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
-{
-	struct rebase_options opts = REBASE_OPTIONS_INIT;
-	struct object_id squash_onto = *null_oid();
-	enum action command = ACTION_NONE;
-	struct option options[] = {
-		OPT_NEGBIT(0, "ff", &opts.flags, N_("allow fast-forward"),
-			   REBASE_FORCE),
-		OPT_CALLBACK_F('k', "keep-empty", &options, NULL,
-			N_("keep commits which start empty"),
-			PARSE_OPT_NOARG | PARSE_OPT_HIDDEN,
-			parse_opt_keep_empty),
-		OPT_BOOL_F(0, "allow-empty-message", &opts.allow_empty_message,
-			   N_("allow commits with empty messages"),
-			   PARSE_OPT_HIDDEN),
-		OPT_BOOL(0, "rebase-merges", &opts.rebase_merges, N_("rebase merge commits")),
-		OPT_BOOL(0, "rebase-cousins", &opts.rebase_cousins,
-			 N_("keep original branch points of cousins")),
-		OPT_BOOL(0, "autosquash", &opts.autosquash,
-			 N_("move commits that begin with squash!/fixup!")),
-		OPT_BOOL(0, "signoff", &opts.signoff, N_("sign commits")),
-		OPT_BIT('v', "verbose", &opts.flags,
-			N_("display a diffstat of what changed upstream"),
-			REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
-		OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
-			    ACTION_CONTINUE),
-		OPT_CMDMODE(0, "skip", &command, N_("skip commit"), ACTION_SKIP),
-		OPT_CMDMODE(0, "edit-todo", &command, N_("edit the todo list"),
-			    ACTION_EDIT_TODO),
-		OPT_CMDMODE(0, "show-current-patch", &command, N_("show the current patch"),
-			    ACTION_SHOW_CURRENT_PATCH),
-		OPT_CMDMODE(0, "shorten-ids", &command,
-			N_("shorten commit ids in the todo list"), ACTION_SHORTEN_OIDS),
-		OPT_CMDMODE(0, "expand-ids", &command,
-			N_("expand commit ids in the todo list"), ACTION_EXPAND_OIDS),
-		OPT_CMDMODE(0, "check-todo-list", &command,
-			N_("check the todo list"), ACTION_CHECK_TODO_LIST),
-		OPT_CMDMODE(0, "rearrange-squash", &command,
-			N_("rearrange fixup/squash lines"), ACTION_REARRANGE_SQUASH),
-		OPT_CMDMODE(0, "add-exec-commands", &command,
-			N_("insert exec commands in todo list"), ACTION_ADD_EXEC),
-		{ OPTION_CALLBACK, 0, "onto", &opts.onto, N_("onto"), N_("onto"),
-		  PARSE_OPT_NONEG, parse_opt_commit, 0 },
-		{ OPTION_CALLBACK, 0, "restrict-revision", &opts.restrict_revision,
-		  N_("restrict-revision"), N_("restrict revision"),
-		  PARSE_OPT_NONEG, parse_opt_commit, 0 },
-		{ OPTION_CALLBACK, 0, "squash-onto", &squash_onto, N_("squash-onto"),
-		  N_("squash onto"), PARSE_OPT_NONEG, parse_opt_object_id, 0 },
-		{ OPTION_CALLBACK, 0, "upstream", &opts.upstream, N_("upstream"),
-		  N_("the upstream commit"), PARSE_OPT_NONEG, parse_opt_commit,
-		  0 },
-		OPT_STRING(0, "head-name", &opts.head_name, N_("head-name"), N_("head name")),
-		{ OPTION_STRING, 'S', "gpg-sign", &opts.gpg_sign_opt, N_("key-id"),
-			N_("GPG-sign commits"),
-			PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
-		OPT_STRING(0, "strategy", &opts.strategy, N_("strategy"),
-			   N_("rebase strategy")),
-		OPT_STRING(0, "strategy-opts", &opts.strategy_opts, N_("strategy-opts"),
-			   N_("strategy options")),
-		OPT_STRING(0, "switch-to", &opts.switch_to, N_("switch-to"),
-			   N_("the branch or commit to checkout")),
-		OPT_STRING(0, "onto-name", &opts.onto_name, N_("onto-name"), N_("onto name")),
-		OPT_STRING(0, "cmd", &opts.cmd, N_("cmd"), N_("the command to run")),
-		OPT_RERERE_AUTOUPDATE(&opts.allow_rerere_autoupdate),
-		OPT_BOOL(0, "reschedule-failed-exec", &opts.reschedule_failed_exec,
-			 N_("automatically re-schedule any `exec` that fails")),
-		OPT_END()
-	};
-
-	opts.rebase_cousins = -1;
-
-	if (argc == 1)
-		usage_with_options(builtin_rebase_interactive_usage, options);
-
-	argc = parse_options(argc, argv, prefix, options,
-			builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
-
-	if (!is_null_oid(&squash_onto))
-		opts.squash_onto = &squash_onto;
-
-	if (opts.rebase_cousins >= 0 && !opts.rebase_merges)
-		warning(_("--[no-]rebase-cousins has no effect without "
-			  "--rebase-merges"));
-
-	return !!run_sequencer_rebase(&opts, command);
-}
-
 static int is_merge(struct rebase_options *opts)
 {
-	return opts->type == REBASE_MERGE ||
-		opts->type == REBASE_PRESERVE_MERGES;
+	return opts->type == REBASE_MERGE;
 }
 
 static void imply_merge(struct rebase_options *opts, const char *option)
@@ -582,7 +391,6 @@ static void imply_merge(struct rebase_options *opts, const char *option)
 		die(_("%s requires the merge backend"), option);
 		break;
 	case REBASE_MERGE:
-	case REBASE_PRESERVE_MERGES:
 		break;
 	default:
 		opts->type = REBASE_MERGE; /* implied */
@@ -740,7 +548,6 @@ static int finish_rebase(struct rebase_options *opts)
 	delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
 	unlink(git_path_auto_merge(the_repository));
 	apply_autostash(state_dir_path("autostash", opts));
-	close_object_store(the_repository->objects);
 	/*
 	 * We ignore errors in 'git maintenance run --auto', since the
 	 * user should see them.
@@ -762,31 +569,10 @@ static int finish_rebase(struct rebase_options *opts)
 	return ret;
 }
 
-static struct commit *peel_committish(const char *name)
-{
-	struct object *obj;
-	struct object_id oid;
-
-	if (get_oid(name, &oid))
-		return NULL;
-	obj = parse_object(the_repository, &oid);
-	return (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
-}
-
-static void add_var(struct strbuf *buf, const char *name, const char *value)
-{
-	if (!value)
-		strbuf_addf(buf, "unset %s; ", name);
-	else {
-		strbuf_addf(buf, "%s=", name);
-		sq_quote_buf(buf, value);
-		strbuf_addstr(buf, "; ");
-	}
-}
-
 static int move_to_original_branch(struct rebase_options *opts)
 {
-	struct strbuf orig_head_reflog = STRBUF_INIT, head_reflog = STRBUF_INIT;
+	struct strbuf branch_reflog = STRBUF_INIT, head_reflog = STRBUF_INIT;
+	struct reset_head_opts ropts = { 0 };
 	int ret;
 
 	if (!opts->head_name)
@@ -795,16 +581,17 @@ static int move_to_original_branch(struct rebase_options *opts)
 	if (!opts->onto)
 		BUG("move_to_original_branch without onto");
 
-	strbuf_addf(&orig_head_reflog, "rebase finished: %s onto %s",
+	strbuf_addf(&branch_reflog, "rebase finished: %s onto %s",
 		    opts->head_name, oid_to_hex(&opts->onto->object.oid));
 	strbuf_addf(&head_reflog, "rebase finished: returning to %s",
 		    opts->head_name);
-	ret = reset_head(the_repository, NULL, "", opts->head_name,
-			 RESET_HEAD_REFS_ONLY,
-			 orig_head_reflog.buf, head_reflog.buf,
-			 DEFAULT_REFLOG_ACTION);
+	ropts.branch = opts->head_name;
+	ropts.flags = RESET_HEAD_REFS_ONLY;
+	ropts.branch_msg = branch_reflog.buf;
+	ropts.head_msg = head_reflog.buf;
+	ret = reset_head(the_repository, &ropts);
 
-	strbuf_release(&orig_head_reflog);
+	strbuf_release(&branch_reflog);
 	strbuf_release(&head_reflog);
 	return ret;
 }
@@ -886,13 +673,15 @@ static int run_am(struct rebase_options *opts)
 
 	status = run_command(&format_patch);
 	if (status) {
+		struct reset_head_opts ropts = { 0 };
 		unlink(rebased_patches);
 		free(rebased_patches);
 		strvec_clear(&am.args);
 
-		reset_head(the_repository, &opts->orig_head, "checkout",
-			   opts->head_name, 0,
-			   "HEAD", NULL, DEFAULT_REFLOG_ACTION);
+		ropts.oid = &opts->orig_head;
+		ropts.branch = opts->head_name;
+		ropts.default_reflog_action = DEFAULT_REFLOG_ACTION;
+		reset_head(the_repository, &ropts);
 		error(_("\ngit encountered an error while preparing the "
 			"patches to replay\n"
 			"these revisions:\n"
@@ -940,10 +729,7 @@ static int run_am(struct rebase_options *opts)
 
 static int run_specific_rebase(struct rebase_options *opts, enum action action)
 {
-	const char *argv[] = { NULL, NULL };
-	struct strbuf script_snippet = STRBUF_INIT, buf = STRBUF_INIT;
 	int status;
-	const char *backend, *backend_func;
 
 	if (opts->type == REBASE_MERGE) {
 		/* Run sequencer-based rebase */
@@ -960,87 +746,11 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
 		}
 
 		status = run_sequencer_rebase(opts, action);
-		goto finished_rebase;
-	}
-
-	if (opts->type == REBASE_APPLY) {
+	} else if (opts->type == REBASE_APPLY)
 		status = run_am(opts);
-		goto finished_rebase;
-	}
-
-	add_var(&script_snippet, "GIT_DIR", absolute_path(get_git_dir()));
-	add_var(&script_snippet, "state_dir", opts->state_dir);
-
-	add_var(&script_snippet, "upstream_name", opts->upstream_name);
-	add_var(&script_snippet, "upstream", opts->upstream ?
-		oid_to_hex(&opts->upstream->object.oid) : NULL);
-	add_var(&script_snippet, "head_name",
-		opts->head_name ? opts->head_name : "detached HEAD");
-	add_var(&script_snippet, "orig_head", oid_to_hex(&opts->orig_head));
-	add_var(&script_snippet, "onto", opts->onto ?
-		oid_to_hex(&opts->onto->object.oid) : NULL);
-	add_var(&script_snippet, "onto_name", opts->onto_name);
-	add_var(&script_snippet, "revisions", opts->revisions);
-	add_var(&script_snippet, "restrict_revision", opts->restrict_revision ?
-		oid_to_hex(&opts->restrict_revision->object.oid) : NULL);
-	sq_quote_argv_pretty(&buf, opts->git_am_opts.v);
-	add_var(&script_snippet, "git_am_opt", buf.buf);
-	strbuf_release(&buf);
-	add_var(&script_snippet, "verbose",
-		opts->flags & REBASE_VERBOSE ? "t" : "");
-	add_var(&script_snippet, "diffstat",
-		opts->flags & REBASE_DIFFSTAT ? "t" : "");
-	add_var(&script_snippet, "force_rebase",
-		opts->flags & REBASE_FORCE ? "t" : "");
-	if (opts->switch_to)
-		add_var(&script_snippet, "switch_to", opts->switch_to);
-	add_var(&script_snippet, "action", opts->action ? opts->action : "");
-	add_var(&script_snippet, "signoff", opts->signoff ? "--signoff" : "");
-	add_var(&script_snippet, "allow_rerere_autoupdate",
-		opts->allow_rerere_autoupdate ?
-			opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE ?
-			"--rerere-autoupdate" : "--no-rerere-autoupdate" : "");
-	add_var(&script_snippet, "keep_empty", opts->keep_empty ? "yes" : "");
-	add_var(&script_snippet, "autosquash", opts->autosquash ? "t" : "");
-	add_var(&script_snippet, "gpg_sign_opt", opts->gpg_sign_opt);
-	add_var(&script_snippet, "cmd", opts->cmd);
-	add_var(&script_snippet, "allow_empty_message",
-		opts->allow_empty_message ?  "--allow-empty-message" : "");
-	add_var(&script_snippet, "rebase_merges",
-		opts->rebase_merges ? "t" : "");
-	add_var(&script_snippet, "rebase_cousins",
-		opts->rebase_cousins ? "t" : "");
-	add_var(&script_snippet, "strategy", opts->strategy);
-	add_var(&script_snippet, "strategy_opts", opts->strategy_opts);
-	add_var(&script_snippet, "rebase_root", opts->root ? "t" : "");
-	add_var(&script_snippet, "squash_onto",
-		opts->squash_onto ? oid_to_hex(opts->squash_onto) : "");
-	add_var(&script_snippet, "git_format_patch_opt",
-		opts->git_format_patch_opt.buf);
-
-	if (is_merge(opts) &&
-	    !(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
-		strbuf_addstr(&script_snippet,
-			      "GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; ");
-		opts->autosquash = 0;
-	}
-
-	switch (opts->type) {
-	case REBASE_PRESERVE_MERGES:
-		backend = "git-rebase--preserve-merges";
-		backend_func = "git_rebase__preserve_merges";
-		break;
-	default:
+	else
 		BUG("Unhandled rebase type %d", opts->type);
-		break;
-	}
 
-	strbuf_addf(&script_snippet,
-		    ". git-sh-setup && . %s && %s", backend, backend_func);
-	argv[0] = script_snippet.buf;
-
-	status = run_command_v_opt(argv, RUN_USING_SHELL);
-finished_rebase:
 	if (opts->dont_finish_rebase)
 		; /* do nothing */
 	else if (opts->type == REBASE_MERGE)
@@ -1058,8 +768,6 @@ finished_rebase:
 		die("Nothing to do");
 	}
 
-	strbuf_release(&script_snippet);
-
 	return status ? -1 : 0;
 }
 
@@ -1109,6 +817,26 @@ static int rebase_config(const char *var, const char *value, void *data)
 	return git_default_config(var, value, data);
 }
 
+static int checkout_up_to_date(struct rebase_options *options)
+{
+	struct strbuf buf = STRBUF_INIT;
+	struct reset_head_opts ropts = { 0 };
+	int ret = 0;
+
+	strbuf_addf(&buf, "%s: checkout %s",
+		    getenv(GIT_REFLOG_ACTION_ENVIRONMENT),
+		    options->switch_to);
+	ropts.oid = &options->orig_head;
+	ropts.branch = options->head_name;
+	ropts.flags = RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
+	ropts.head_msg = buf.buf;
+	if (reset_head(the_repository, &ropts) < 0)
+		ret = error(_("could not switch to %s"), options->switch_to);
+	strbuf_release(&buf);
+
+	return ret;
+}
+
 /*
  * Determines whether the commits in from..to are linear, i.e. contain
  * no merge commits. This function *expects* `from` to be an ancestor of
@@ -1195,7 +923,7 @@ static int parse_opt_merge(const struct option *opt, const char *arg, int unset)
 	return 0;
 }
 
-/* -i followed by -p is still explicitly interactive, but -p alone is not */
+/* -i followed by -r is still explicitly interactive, but -r alone is not */
 static int parse_opt_interactive(const struct option *opt, const char *arg,
 				 int unset)
 {
@@ -1313,6 +1041,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	char *squash_onto_name = NULL;
 	int reschedule_failed_exec = -1;
 	int allow_preemptive_ff = 1;
+	int preserve_merges_selected = 0;
+	struct reset_head_opts ropts = { 0 };
 	struct option builtin_rebase_options[] = {
 		OPT_STRING(0, "onto", &options.onto_name,
 			   N_("revision"),
@@ -1377,10 +1107,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			N_("let the user edit the list of commits to rebase"),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
 			parse_opt_interactive),
-		OPT_SET_INT_F('p', "preserve-merges", &options.type,
+		OPT_SET_INT_F('p', "preserve-merges", &preserve_merges_selected,
 			      N_("(DEPRECATED) try to recreate merges instead of "
 				 "ignoring them"),
-			      REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
+			      1, PARSE_OPT_HIDDEN),
 		OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
 		OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
 			       N_("how to handle commits that become empty"),
@@ -1430,6 +1160,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		usage_with_options(builtin_rebase_usage,
 				   builtin_rebase_options);
 
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
+
 	options.allow_empty_message = 1;
 	git_config(rebase_config, &options);
 	/* options.gpg_sign_opt will be either "-S" or NULL */
@@ -1448,8 +1181,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		strbuf_reset(&buf);
 		strbuf_addf(&buf, "%s/rewritten", merge_dir());
 		if (is_directory(buf.buf)) {
-			options.type = REBASE_PRESERVE_MERGES;
-			options.flags |= REBASE_INTERACTIVE_EXPLICIT;
+			die("`rebase -p` is no longer supported");
 		} else {
 			strbuf_reset(&buf);
 			strbuf_addf(&buf, "%s/interactive", merge_dir());
@@ -1470,6 +1202,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			     builtin_rebase_options,
 			     builtin_rebase_usage, 0);
 
+	if (preserve_merges_selected)
+		die(_("--preserve-merges was replaced by --rebase-merges"));
+
 	if (action != ACTION_NONE && total_argc != 2) {
 		usage_with_options(builtin_rebase_usage,
 				   builtin_rebase_options);
@@ -1479,19 +1214,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		usage_with_options(builtin_rebase_usage,
 				   builtin_rebase_options);
 
-	if (options.type == REBASE_PRESERVE_MERGES)
-		warning(_("git rebase --preserve-merges is deprecated. "
-			  "Use --rebase-merges instead."));
-
 	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?"));
@@ -1549,9 +1280,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 
 		rerere_clear(the_repository, &merge_rr);
 		string_list_clear(&merge_rr, 1);
-
-		if (reset_head(the_repository, NULL, "reset", NULL, RESET_HEAD_HARD,
-			       NULL, NULL, DEFAULT_REFLOG_ACTION) < 0)
+		ropts.flags = RESET_HEAD_HARD;
+		if (reset_head(the_repository, &ropts) < 0)
 			die(_("could not discard worktree changes"));
 		remove_branch_state(the_repository, 0);
 		if (read_basic_state(&options))
@@ -1568,13 +1298,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 
 		if (read_basic_state(&options))
 			exit(1);
-		if (reset_head(the_repository, &options.orig_head, "reset",
-			       options.head_name, RESET_HEAD_HARD,
-			       NULL, NULL, DEFAULT_REFLOG_ACTION) < 0)
+		ropts.oid = &options.orig_head;
+		ropts.branch = options.head_name;
+		ropts.flags = RESET_HEAD_HARD;
+		ropts.default_reflog_action = DEFAULT_REFLOG_ACTION;
+		if (reset_head(the_repository, &ropts) < 0)
 			die(_("could not move back to %s"),
 			    oid_to_hex(&options.orig_head));
 		remove_branch_state(the_repository, 0);
-		ret = !!finish_rebase(&options);
+		ret = finish_rebase(&options);
 		goto cleanup;
 	}
 	case ACTION_QUIT: {
@@ -1583,11 +1315,11 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			struct replay_opts replay = REPLAY_OPTS_INIT;
 
 			replay.action = REPLAY_INTERACTIVE_REBASE;
-			ret = !!sequencer_remove_state(&replay);
+			ret = sequencer_remove_state(&replay);
 		} else {
 			strbuf_reset(&buf);
 			strbuf_addstr(&buf, options.state_dir);
-			ret = !!remove_dir_recursively(&buf, 0);
+			ret = remove_dir_recursively(&buf, 0);
 			if (ret)
 				error(_("could not remove '%s'"),
 				       options.state_dir);
@@ -1702,7 +1434,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		if (options.ignore_date)
 			strvec_push(&options.git_am_opts, "--ignore-date");
 	} else {
-		/* REBASE_MERGE and PRESERVE_MERGES */
+		/* REBASE_MERGE */
 		if (ignore_whitespace) {
 			string_list_append(&strategy_options,
 					   "ignore-space-change");
@@ -1713,7 +1445,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		int i;
 
 		if (!options.strategy)
-			options.strategy = "recursive";
+			options.strategy = "ort";
 
 		strbuf_reset(&buf);
 		for (i = 0; i < strategy_options.nr; i++)
@@ -1728,7 +1460,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		case REBASE_APPLY:
 			die(_("--strategy requires --merge or --interactive"));
 		case REBASE_MERGE:
-		case REBASE_PRESERVE_MERGES:
 			/* compatible */
 			break;
 		case REBASE_UNSPECIFIED:
@@ -1756,8 +1487,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;
 		}
@@ -1780,7 +1511,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 
 	switch (options.type) {
 	case REBASE_MERGE:
-	case REBASE_PRESERVE_MERGES:
 		options.state_dir = merge_dir();
 		break;
 	case REBASE_APPLY:
@@ -1805,28 +1535,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		options.reschedule_failed_exec = reschedule_failed_exec;
 
 	if (options.signoff) {
-		if (options.type == REBASE_PRESERVE_MERGES)
-			die("cannot combine '--signoff' with "
-			    "'--preserve-merges'");
 		strvec_push(&options.git_am_opts, "--signoff");
 		options.flags |= REBASE_FORCE;
 	}
 
-	if (options.type == REBASE_PRESERVE_MERGES) {
-		/*
-		 * Note: incompatibility with --signoff handled in signoff block above
-		 * Note: incompatibility with --interactive is just a strong warning;
-		 *       git-rebase.txt caveats with "unless you know what you are doing"
-		 */
-		if (options.rebase_merges)
-			die(_("cannot combine '--preserve-merges' with "
-			      "'--rebase-merges'"));
-
-		if (options.reschedule_failed_exec)
-			die(_("error: cannot combine '--preserve-merges' with "
-			      "'--reschedule-failed-exec'"));
-	}
-
 	if (!options.root) {
 		if (argc < 1) {
 			struct branch *branch;
@@ -1845,7 +1557,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			if (!strcmp(options.upstream_name, "-"))
 				options.upstream_name = "@{-1}";
 		}
-		options.upstream = peel_committish(options.upstream_name);
+		options.upstream =
+			lookup_commit_reference_by_name(options.upstream_name);
 		if (!options.upstream)
 			die(_("invalid upstream '%s'"), options.upstream_name);
 		options.upstream_arg = options.upstream_name;
@@ -1888,7 +1601,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		options.onto = lookup_commit_or_die(&merge_base,
 						    options.onto_name);
 	} else {
-		options.onto = peel_committish(options.onto_name);
+		options.onto =
+			lookup_commit_reference_by_name(options.onto_name);
 		if (!options.onto)
 			die(_("Does not point to a valid commit '%s'"),
 				options.onto_name);
@@ -1913,13 +1627,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			die_if_checked_out(buf.buf, 1);
 			options.head_name = xstrdup(buf.buf);
 		/* If not is it a valid ref (branch or commit)? */
-		} else if (!get_oid(branch_name, &options.orig_head) &&
-			   lookup_commit_reference(the_repository,
-						   &options.orig_head))
+		} else {
+			struct commit *commit =
+				lookup_commit_reference_by_name(branch_name);
+			if (!commit)
+				die(_("no such branch/commit '%s'"),
+				    branch_name);
+			oidcpy(&options.orig_head, &commit->object.oid);
 			options.head_name = NULL;
-		else
-			die(_("fatal: no such branch/commit '%s'"),
-			    branch_name);
+		}
 	} else if (argc == 0) {
 		/* Do not need to switch branches, we are already on it. */
 		options.head_name =
@@ -1952,14 +1668,14 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	if (repo_read_index(the_repository) < 0)
 		die(_("could not read index"));
 
-	if (options.autostash) {
-		create_autostash(the_repository, state_dir_path("autostash", &options),
-				 DEFAULT_REFLOG_ACTION);
-	}
+	if (options.autostash)
+		create_autostash(the_repository,
+				 state_dir_path("autostash", &options));
+
 
 	if (require_clean_work_tree(the_repository, "rebase",
 				    _("Please commit or stash them."), 1, 1)) {
-		ret = 1;
+		ret = -1;
 		goto cleanup;
 	}
 
@@ -1984,21 +1700,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		if (!(options.flags & REBASE_FORCE)) {
 			/* Lazily switch to the target branch if needed... */
 			if (options.switch_to) {
-				strbuf_reset(&buf);
-				strbuf_addf(&buf, "%s: checkout %s",
-					    getenv(GIT_REFLOG_ACTION_ENVIRONMENT),
-					    options.switch_to);
-				if (reset_head(the_repository,
-					       &options.orig_head, "checkout",
-					       options.head_name,
-					       RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
-					       NULL, buf.buf,
-					       DEFAULT_REFLOG_ACTION) < 0) {
-					ret = !!error(_("could not switch to "
-							"%s"),
-						      options.switch_to);
+				ret = checkout_up_to_date(&options);
+				if (ret)
 					goto cleanup;
-				}
 			}
 
 			if (!(options.flags & REBASE_NO_QUIET))
@@ -2009,7 +1713,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			else
 				printf(_("Current branch %s is up to date.\n"),
 				       branch_name);
-			ret = !!finish_rebase(&options);
+			ret = finish_rebase(&options);
 			goto cleanup;
 		} else if (!(options.flags & REBASE_NO_QUIET))
 			; /* be quiet */
@@ -2023,7 +1727,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 
 	/* If a hook exists, give it a chance to interrupt*/
 	if (!ok_to_skip_pre_rebase &&
-	    run_hook_le(NULL, "pre-rebase", options.upstream_arg,
+	    run_hooks_l("pre-rebase", options.upstream_arg,
 			argc ? argv[0] : NULL, NULL))
 		die(_("The pre-rebase hook refused to rebase."));
 
@@ -2065,10 +1769,13 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 
 	strbuf_addf(&msg, "%s: checkout %s",
 		    getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name);
-	if (reset_head(the_repository, &options.onto->object.oid, "checkout", NULL,
-		       RESET_HEAD_DETACH | RESET_ORIG_HEAD |
-		       RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
-		       NULL, msg.buf, DEFAULT_REFLOG_ACTION))
+	ropts.oid = &options.onto->object.oid;
+	ropts.orig_head = &options.orig_head,
+	ropts.flags = RESET_HEAD_DETACH | RESET_ORIG_HEAD |
+			RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
+	ropts.head_msg = msg.buf;
+	ropts.default_reflog_action = DEFAULT_REFLOG_ACTION;
+	if (reset_head(the_repository, &ropts))
 		die(_("Could not detach HEAD"));
 	strbuf_release(&msg);
 
@@ -2083,11 +1790,13 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		strbuf_addf(&msg, "rebase finished: %s onto %s",
 			options.head_name ? options.head_name : "detached HEAD",
 			oid_to_hex(&options.onto->object.oid));
-		reset_head(the_repository, NULL, "Fast-forwarded", options.head_name,
-			   RESET_HEAD_REFS_ONLY, "HEAD", msg.buf,
-			   DEFAULT_REFLOG_ACTION);
+		memset(&ropts, 0, sizeof(ropts));
+		ropts.branch = options.head_name;
+		ropts.flags = RESET_HEAD_REFS_ONLY;
+		ropts.head_msg = msg.buf;
+		reset_head(the_repository, &ropts);
 		strbuf_release(&msg);
-		ret = !!finish_rebase(&options);
+		ret = finish_rebase(&options);
 		goto cleanup;
 	}
 
@@ -2101,7 +1810,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	options.revisions = revisions.buf;
 
 run_rebase:
-	ret = !!run_specific_rebase(&options, action);
+	ret = run_specific_rebase(&options, action);
 
 cleanup:
 	strbuf_release(&buf);
@@ -2109,7 +1818,8 @@ cleanup:
 	free(options.head_name);
 	free(options.gpg_sign_opt);
 	free(options.cmd);
+	free(options.strategy);
 	strbuf_release(&options.git_format_patch_opt);
 	free(squash_onto_name);
-	return ret;
+	return !!ret;
 }
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index a34742513a..d10aeb7e78 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -7,6 +7,7 @@
 #include "pkt-line.h"
 #include "sideband.h"
 #include "run-command.h"
+#include "hook.h"
 #include "exec-cmd.h"
 #include "commit.h"
 #include "object.h"
@@ -134,6 +135,10 @@ static int receive_pack_config(const char *var, const char *value, void *cb)
 	if (status)
 		return status;
 
+	status = git_gpg_config(var, value, NULL);
+	if (status)
+		return status;
+
 	if (strcmp(var, "receive.denydeletes") == 0) {
 		deny_deletes = git_config_bool(var, value);
 		return 0;
@@ -170,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;
 	}
 
@@ -425,9 +430,6 @@ static int proc_receive_ref_matches(struct command *cmd)
 	return 0;
 }
 
-static void rp_error(const char *err, ...) __attribute__((format (printf, 1, 2)));
-static void rp_warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
-
 static void report_message(const char *prefix, const char *err, va_list params)
 {
 	int sz;
@@ -445,6 +447,7 @@ static void report_message(const char *prefix, const char *err, va_list params)
 		xwrite(2, msg, sz);
 }
 
+__attribute__((format (printf, 1, 2)))
 static void rp_warning(const char *err, ...)
 {
 	va_list params;
@@ -453,6 +456,7 @@ static void rp_warning(const char *err, ...)
 	va_end(params);
 }
 
+__attribute__((format (printf, 1, 2)))
 static void rp_error(const char *err, ...)
 {
 	va_list params;
@@ -577,32 +581,19 @@ static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp)
 	return strbuf_detach(&buf, NULL);
 }
 
-/*
- * NEEDSWORK: reuse find_commit_header() from jk/commit-author-parsing
- * after dropping "_commit" from its name and possibly moving it out
- * of commit.c
- */
 static char *find_header(const char *msg, size_t len, const char *key,
 			 const char **next_line)
 {
-	int key_len = strlen(key);
-	const char *line = msg;
-
-	while (line && line < msg + len) {
-		const char *eol = strchrnul(line, '\n');
-
-		if ((msg + len <= eol) || line == eol)
-			return NULL;
-		if (line + key_len < eol &&
-		    !memcmp(line, key, key_len) && line[key_len] == ' ') {
-			int offset = key_len + 1;
-			if (next_line)
-				*next_line = *eol ? eol + 1 : eol;
-			return xmemdupz(line + offset, (eol - line) - offset);
-		}
-		line = *eol ? eol + 1 : NULL;
-	}
-	return NULL;
+	size_t out_len;
+	const char *val = find_header_mem(msg, len, key, &out_len);
+
+	if (!val)
+		return NULL;
+
+	if (next_line)
+		*next_line = val + out_len + 1;
+
+	return xmemdupz(val, out_len);
 }
 
 /*
@@ -765,8 +756,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);
 	}
@@ -808,16 +801,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;
@@ -939,23 +929,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);
@@ -1113,22 +1101,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";
@@ -1307,7 +1293,7 @@ static void refuse_unconfigured_deny_delete_current(void)
 	rp_error("%s", _(refuse_unconfigured_deny_delete_current_msg));
 }
 
-static int command_singleton_iterator(void *cb_data, struct object_id *oid);
+static const struct object_id *command_singleton_iterator(void *cb_data);
 static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
 {
 	struct shallow_lock shallow_lock = SHALLOW_LOCK_INIT;
@@ -1366,23 +1352,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;
@@ -1392,8 +1366,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;
@@ -1401,12 +1376,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;
@@ -1414,10 +1390,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;
@@ -1435,9 +1411,12 @@ static const char *push_to_checkout(unsigned char *hash,
 				    struct strvec *env,
 				    const char *work_tree)
 {
+	struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
+
 	strvec_pushf(env, "GIT_WORK_TREE=%s", absolute_path(work_tree));
-	if (run_hook_le(env->v, push_to_checkout_hook,
-			hash_to_hex(hash), NULL))
+	strvec_pushv(&opt.env, env->v);
+	strvec_push(&opt.args, hash_to_hex(hash));
+	if (run_hooks_opt(push_to_checkout_hook, &opt))
 		return "push-to-checkout hook declined";
 	else
 		return NULL;
@@ -1445,29 +1424,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 (!find_hook(push_to_checkout_hook))
-		retval = push_to_deploy(sha1, &env, work_tree);
+	if (!hook_exists(push_to_checkout_hook))
+		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;
@@ -1482,19 +1454,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;
@@ -1506,7 +1481,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;
@@ -1517,13 +1493,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))) {
@@ -1539,9 +1517,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;
 			}
 		}
 	}
@@ -1559,25 +1539,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)) {
@@ -1585,9 +1568,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;
 			}
 		}
@@ -1596,17 +1579,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,
@@ -1614,14 +1599,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)
@@ -1732,16 +1719,15 @@ static void check_aliased_updates(struct command *commands)
 	string_list_clear(&ref_list, 0);
 }
 
-static int command_singleton_iterator(void *cb_data, struct object_id *oid)
+static const struct object_id *command_singleton_iterator(void *cb_data)
 {
 	struct command **cmd_list = cb_data;
 	struct command *cmd = *cmd_list;
 
 	if (!cmd || is_null_oid(&cmd->new_oid))
-		return -1; /* end of list */
+		return NULL;
 	*cmd_list = NULL; /* this returns only one */
-	oidcpy(oid, &cmd->new_oid);
-	return 0;
+	return &cmd->new_oid;
 }
 
 static void set_connectivity_errors(struct command *commands,
@@ -1771,7 +1757,7 @@ struct iterate_data {
 	struct shallow_info *si;
 };
 
-static int iterate_receive_command_list(void *cb_data, struct object_id *oid)
+static const struct object_id *iterate_receive_command_list(void *cb_data)
 {
 	struct iterate_data *data = cb_data;
 	struct command **cmd_list = &data->cmds;
@@ -1782,13 +1768,11 @@ static int iterate_receive_command_list(void *cb_data, struct object_id *oid)
 			/* to be checked in update_shallow_ref() */
 			continue;
 		if (!is_null_oid(&cmd->new_oid) && !cmd->skip_update) {
-			oidcpy(oid, &cmd->new_oid);
 			*cmd_list = cmd->next;
-			return 0;
+			return &cmd->new_oid;
 		}
 	}
-	*cmd_list = NULL;
-	return -1; /* end of list */
+	return NULL;
 }
 
 static void reject_updates_to_hidden(struct command *commands)
@@ -1978,6 +1962,15 @@ static void execute_commands(struct command *commands,
 	}
 
 	/*
+	 * If there is no command ready to run, should return directly to destroy
+	 * temporary data in the quarantine area.
+	 */
+	for (cmd = commands; cmd && cmd->error_string; cmd = cmd->next)
+		; /* nothing */
+	if (!cmd)
+		return;
+
+	/*
 	 * Now we'll start writing out refs, which means the objects need
 	 * to be in their final positions so that other processes can see them.
 	 */
@@ -2212,13 +2205,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
@@ -2478,7 +2472,8 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
 	struct option options[] = {
 		OPT__QUIET(&quiet, N_("quiet")),
 		OPT_HIDDEN_BOOL(0, "stateless-rpc", &stateless_rpc, NULL),
-		OPT_HIDDEN_BOOL(0, "advertise-refs", &advertise_refs, NULL),
+		OPT_HIDDEN_BOOL(0, "http-backend-info-refs", &advertise_refs, NULL),
+		OPT_ALIAS(0, "advertise-refs", "http-backend-info-refs"),
 		OPT_HIDDEN_BOOL(0, "reject-thin-pack-for-testing", &reject_thin, NULL),
 		OPT_END()
 	};
@@ -2488,9 +2483,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];
 
@@ -2564,27 +2559,26 @@ 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 = 1;
-			proc.argv = argv_gc_auto;
+			proc.git_cmd = proc.close_object_store = 1;
+			strvec_pushl(&proc.args, "gc", "--auto", "--quiet",
+				     NULL);
 
-			close_object_store(the_repository->objects);
 			if (!start_command(&proc)) {
 				if (use_sideband)
 					copy_to_sideband(proc.err, -1, NULL);
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 09541d1c80..85b838720c 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -12,15 +12,6 @@
 #include "reachable.h"
 #include "worktree.h"
 
-/* NEEDSWORK: switch to using parse_options */
-static const char reflog_expire_usage[] =
-N_("git reflog expire [--expire=<time>] "
-   "[--expire-unreachable=<time>] "
-   "[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] "
-   "[--verbose] [--all] <refs>...");
-static const char reflog_delete_usage[] =
-N_("git reflog delete [--rewrite] [--updateref] "
-   "[--dry-run | -n] [--verbose] <refs>...");
 static const char reflog_exists_usage[] =
 N_("git reflog exists <ref>");
 
@@ -28,8 +19,8 @@ static timestamp_t default_reflog_expire;
 static timestamp_t default_reflog_expire_unreachable;
 
 struct cmd_reflog_expire_cb {
-	struct rev_info revs;
 	int stalefix;
+	int explicit_expiry;
 	timestamp_t expire_total;
 	timestamp_t expire_unreachable;
 	int recno;
@@ -46,18 +37,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 +295,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 +312,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 +367,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;
 }
 
@@ -504,18 +512,18 @@ static int reflog_expire_config(const char *var, const char *value, void *cb)
 	return 0;
 }
 
-static void set_reflog_expiry_param(struct cmd_reflog_expire_cb *cb, int slot, const char *ref)
+static void set_reflog_expiry_param(struct cmd_reflog_expire_cb *cb, const char *ref)
 {
 	struct reflog_expire_cfg *ent;
 
-	if (slot == (EXPIRE_TOTAL|EXPIRE_UNREACH))
+	if (cb->explicit_expiry == (EXPIRE_TOTAL|EXPIRE_UNREACH))
 		return; /* both given explicitly -- nothing to tweak */
 
 	for (ent = reflog_expire_cfg; ent; ent = ent->next) {
 		if (!wildmatch(ent->pattern, ref, 0)) {
-			if (!(slot & EXPIRE_TOTAL))
+			if (!(cb->explicit_expiry & EXPIRE_TOTAL))
 				cb->expire_total = ent->expire_total;
-			if (!(slot & EXPIRE_UNREACH))
+			if (!(cb->explicit_expiry & EXPIRE_UNREACH))
 				cb->expire_unreachable = ent->expire_unreachable;
 			return;
 		}
@@ -525,27 +533,89 @@ static void set_reflog_expiry_param(struct cmd_reflog_expire_cb *cb, int slot, c
 	 * If unconfigured, make stash never expire
 	 */
 	if (!strcmp(ref, "refs/stash")) {
-		if (!(slot & EXPIRE_TOTAL))
+		if (!(cb->explicit_expiry & EXPIRE_TOTAL))
 			cb->expire_total = 0;
-		if (!(slot & EXPIRE_UNREACH))
+		if (!(cb->explicit_expiry & EXPIRE_UNREACH))
 			cb->expire_unreachable = 0;
 		return;
 	}
 
 	/* Nothing matched -- use the default value */
-	if (!(slot & EXPIRE_TOTAL))
+	if (!(cb->explicit_expiry & EXPIRE_TOTAL))
 		cb->expire_total = default_reflog_expire;
-	if (!(slot & EXPIRE_UNREACH))
+	if (!(cb->explicit_expiry & EXPIRE_UNREACH))
 		cb->expire_unreachable = default_reflog_expire_unreachable;
 }
 
+static const char * reflog_expire_usage[] = {
+	N_("git reflog expire [--expire=<time>] "
+	   "[--expire-unreachable=<time>] "
+	   "[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] "
+	   "[--verbose] [--all] <refs>..."),
+	NULL
+};
+
+static int expire_unreachable_callback(const struct option *opt,
+				 const char *arg,
+				 int unset)
+{
+	struct cmd_reflog_expire_cb *cmd = opt->value;
+
+	if (parse_expiry_date(arg, &cmd->expire_unreachable))
+		die(_("invalid timestamp '%s' given to '--%s'"),
+		    arg, opt->long_name);
+
+	cmd->explicit_expiry |= EXPIRE_UNREACH;
+	return 0;
+}
+
+static int expire_total_callback(const struct option *opt,
+				 const char *arg,
+				 int unset)
+{
+	struct cmd_reflog_expire_cb *cmd = opt->value;
+
+	if (parse_expiry_date(arg, &cmd->expire_total))
+		die(_("invalid timestamp '%s' given to '--%s'"),
+		    arg, opt->long_name);
+
+	cmd->explicit_expiry |= EXPIRE_TOTAL;
+	return 0;
+}
+
 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;
+	const struct option options[] = {
+		OPT_BIT(0, "dry-run", &flags, N_("do not actually prune any entries"),
+			EXPIRE_REFLOGS_DRY_RUN),
+		OPT_BIT(0, "rewrite", &flags,
+			N_("rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"),
+			EXPIRE_REFLOGS_REWRITE),
+		OPT_BIT(0, "updateref", &flags,
+			N_("update the reference to the value of the top reflog entry"),
+			EXPIRE_REFLOGS_UPDATE_REF),
+		OPT_BOOL(0, "verbose", &verbose, N_("print extra information on screen.")),
+		OPT_CALLBACK_F(0, "expire", &cmd, N_("timestamp"),
+			       N_("prune entries older than the specified time"),
+			       PARSE_OPT_NONEG,
+			       expire_total_callback),
+		OPT_CALLBACK_F(0, "expire-unreachable", &cmd, N_("timestamp"),
+			       N_("prune entries older than <time> that are not reachable from the current tip of the branch"),
+			       PARSE_OPT_NONEG,
+			       expire_unreachable_callback),
+		OPT_BOOL(0, "stale-fix", &cmd.stalefix,
+			 N_("prune any reflog entries that point to broken commits")),
+		OPT_BOOL(0, "all", &do_all, N_("process the reflogs of all references")),
+		OPT_BOOL(1, "single-worktree", &all_worktrees,
+			 N_("limits processing to reflogs from the current worktree only.")),
+		OPT_END()
+	};
 
 	default_reflog_expire_unreachable = now - 30 * 24 * 3600;
 	default_reflog_expire = now - 90 * 24 * 3600;
@@ -553,106 +623,83 @@ 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.explicit_expiry = 0;
+	cmd.expire_total = default_reflog_expire;
+	cmd.expire_unreachable = default_reflog_expire_unreachable;
 
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
+	argc = parse_options(argc, argv, prefix, options, reflog_expire_usage, 0);
 
-		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))
-				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))
-				die(_("'%s' is not a valid timestamp"), arg);
-			explicit_expiry |= EXPIRE_UNREACH;
-		}
-		else if (!strcmp(arg, "--stale-fix"))
-			cb.cmd.stalefix = 1;
-		else if (!strcmp(arg, "--rewrite"))
-			flags |= EXPIRE_REFLOGS_REWRITE;
-		else if (!strcmp(arg, "--updateref"))
-			flags |= EXPIRE_REFLOGS_UPDATE_REF;
-		else if (!strcmp(arg, "--all"))
-			do_all = 1;
-		else if (!strcmp(arg, "--single-worktree"))
-			all_worktrees = 0;
-		else if (!strcmp(arg, "--verbose"))
-			flags |= EXPIRE_REFLOGS_VERBOSE;
-		else if (!strcmp(arg, "--")) {
-			i++;
-			break;
-		}
-		else if (arg[0] == '-')
-			usage(_(reflog_expire_usage));
-		else
-			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, &e->oid, 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,  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++) {
+	for (i = 0; i < argc; i++) {
 		char *ref;
-		struct object_id oid;
-		if (!dwim_log(argv[i], strlen(argv[i]), &oid, &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;
 		}
-		set_reflog_expiry_param(&cb.cmd, explicit_expiry, ref);
-		status |= reflog_expire(ref, &oid, flags,
+		set_reflog_expiry_param(&cb.cmd, ref);
+		status |= reflog_expire(ref, flags,
 					reflog_expiry_prepare,
-					should_expire_reflog_ent,
+					should_prune_fn,
 					reflog_expiry_cleanup,
 					&cb);
+		free(ref);
 	}
 	return status;
 }
@@ -661,72 +708,78 @@ 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 const char * reflog_delete_usage[] = {
+	N_("git reflog delete [--rewrite] [--updateref] "
+	   "[--dry-run | -n] [--verbose] <refs>..."),
+	NULL
+};
+
 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));
-
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
-		if (!strcmp(arg, "--dry-run") || !strcmp(arg, "-n"))
-			flags |= EXPIRE_REFLOGS_DRY_RUN;
-		else if (!strcmp(arg, "--rewrite"))
-			flags |= EXPIRE_REFLOGS_REWRITE;
-		else if (!strcmp(arg, "--updateref"))
-			flags |= EXPIRE_REFLOGS_UPDATE_REF;
-		else if (!strcmp(arg, "--verbose"))
-			flags |= EXPIRE_REFLOGS_VERBOSE;
-		else if (!strcmp(arg, "--")) {
-			i++;
-			break;
-		}
-		else if (arg[0] == '-')
-			usage(_(reflog_delete_usage));
-		else
-			break;
-	}
-
-	if (argc - i < 1)
+	int verbose = 0;
+	reflog_expiry_should_prune_fn *should_prune_fn = should_expire_reflog_ent;
+	const struct option options[] = {
+		OPT_BIT(0, "dry-run", &flags, N_("do not actually prune any entries"),
+			EXPIRE_REFLOGS_DRY_RUN),
+		OPT_BIT(0, "rewrite", &flags,
+			N_("rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"),
+			EXPIRE_REFLOGS_REWRITE),
+		OPT_BIT(0, "updateref", &flags,
+			N_("update the reference to the value of the top reflog entry"),
+			EXPIRE_REFLOGS_UPDATE_REF),
+		OPT_BOOL(0, "verbose", &verbose, N_("print extra information on screen.")),
+		OPT_END()
+	};
+
+	argc = parse_options(argc, argv, prefix, options, reflog_delete_usage, 0);
+
+	if (verbose)
+		should_prune_fn = should_expire_reflog_ent_verbose;
+
+	if (argc < 1)
 		return error(_("no reflog specified to delete"));
 
-	for ( ; i < argc; i++) {
+	for (i = 0; i < argc; i++) {
 		const char *spec = strstr(argv[i], "@{");
-		struct object_id oid;
 		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]);
 			continue;
 		}
 
-		if (!dwim_log(argv[i], spec - argv[i], &oid, &ref)) {
+		if (!dwim_log(argv[i], spec - argv[i], NULL, &ref)) {
 			status |= error(_("no reflog for '%s'"), argv[i]);
 			continue;
 		}
 
 		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;
 		}
 
-		status |= reflog_expire(ref, &oid, flags,
+		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/remote.c b/builtin/remote.c
index 7f88e6ce9d..299c466116 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -318,6 +318,9 @@ static int config_read_branches(const char *key, const char *value, void *cb)
 		 * truth value with >= REBASE_TRUE.
 		 */
 		info->rebase = rebase_parse_value(value);
+		if (info->rebase == REBASE_INVALID)
+			warning(_("unhandled branch.%s.rebase=%s; assuming "
+				  "'true'"), name, value);
 		break;
 	case PUSH_REMOTE:
 		if (info->push_remote_name)
@@ -344,6 +347,14 @@ struct ref_states {
 	int queried;
 };
 
+#define REF_STATES_INIT { \
+	.new_refs = STRING_LIST_INIT_DUP, \
+	.stale = STRING_LIST_INIT_DUP, \
+	.tracked = STRING_LIST_INIT_DUP, \
+	.heads = STRING_LIST_INIT_DUP, \
+	.push = STRING_LIST_INIT_DUP, \
+}
+
 static int get_ref_states(const struct ref *remote_refs, struct ref_states *states)
 {
 	struct ref *fetch_map = NULL, **tail = &fetch_map;
@@ -355,9 +366,6 @@ static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat
 			die(_("Could not get fetch map for refspec %s"),
 				states->remote->fetch.raw[i]);
 
-	states->new_refs.strdup_strings = 1;
-	states->tracked.strdup_strings = 1;
-	states->stale.strdup_strings = 1;
 	for (ref = fetch_map; ref; ref = ref->next) {
 		if (!ref->peer_ref || !ref_exists(ref->peer_ref->name))
 			string_list_append(&states->new_refs, abbrev_branch(ref->name));
@@ -406,7 +414,6 @@ static int get_push_ref_states(const struct ref *remote_refs,
 
 	match_push_refs(local_refs, &push_map, &remote->push, MATCH_REFS_NONE);
 
-	states->push.strdup_strings = 1;
 	for (ref = push_map; ref; ref = ref->next) {
 		struct string_list_item *item;
 		struct push_info *info;
@@ -449,7 +456,6 @@ static int get_push_ref_states_noquery(struct ref_states *states)
 	if (remote->mirror)
 		return 0;
 
-	states->push.strdup_strings = 1;
 	if (!remote->push.nr) {
 		item = string_list_append(&states->push, _("(matching)"));
 		info = item->util = xcalloc(1, sizeof(struct push_info));
@@ -483,7 +489,6 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *stat
 	refspec.force = 0;
 	refspec.pattern = 1;
 	refspec.src = refspec.dst = "refs/heads/*";
-	states->heads.strdup_strings = 1;
 	get_fetch_map(remote_refs, &refspec, &fetch_map_tail, 0);
 	matches = guess_remote_head(find_ref_by_name(remote_refs, "HEAD"),
 				    fetch_map, 1);
@@ -970,26 +975,31 @@ static int get_remote_ref_states(const char *name,
 }
 
 struct show_info {
-	struct string_list *list;
-	struct ref_states *states;
+	struct string_list list;
+	struct ref_states states;
 	int width, width2;
 	int any_rebase;
 };
 
+#define SHOW_INFO_INIT { \
+	.list = STRING_LIST_INIT_DUP, \
+	.states = REF_STATES_INIT, \
+}
+
 static int add_remote_to_show_info(struct string_list_item *item, void *cb_data)
 {
 	struct show_info *info = cb_data;
 	int n = strlen(item->string);
 	if (n > info->width)
 		info->width = n;
-	string_list_insert(info->list, item->string);
+	string_list_insert(&info->list, item->string);
 	return 0;
 }
 
 static int show_remote_info_item(struct string_list_item *item, void *cb_data)
 {
 	struct show_info *info = cb_data;
-	struct ref_states *states = info->states;
+	struct ref_states *states = &info->states;
 	const char *name = item->string;
 
 	if (states->queried) {
@@ -1016,7 +1026,7 @@ static int show_remote_info_item(struct string_list_item *item, void *cb_data)
 static int add_local_to_show_info(struct string_list_item *branch_item, void *cb_data)
 {
 	struct show_info *show_info = cb_data;
-	struct ref_states *states = show_info->states;
+	struct ref_states *states = &show_info->states;
 	struct branch_info *branch_info = branch_item->util;
 	struct string_list_item *item;
 	int n;
@@ -1029,7 +1039,7 @@ static int add_local_to_show_info(struct string_list_item *branch_item, void *cb
 	if (branch_info->rebase >= REBASE_TRUE)
 		show_info->any_rebase = 1;
 
-	item = string_list_insert(show_info->list, branch_item->string);
+	item = string_list_insert(&show_info->list, branch_item->string);
 	item->util = branch_info;
 
 	return 0;
@@ -1084,7 +1094,7 @@ static int add_push_to_show_info(struct string_list_item *push_item, void *cb_da
 		show_info->width = n;
 	if ((n = strlen(push_info->dest)) > show_info->width2)
 		show_info->width2 = n;
-	item = string_list_append(show_info->list, push_item->string);
+	item = string_list_append(&show_info->list, push_item->string);
 	item->util = push_item->util;
 	return 0;
 }
@@ -1212,9 +1222,7 @@ static int show(int argc, const char **argv)
 		OPT_BOOL('n', NULL, &no_query, N_("do not query remotes")),
 		OPT_END()
 	};
-	struct ref_states states;
-	struct string_list info_list = STRING_LIST_INIT_NODUP;
-	struct show_info info;
+	struct show_info info = SHOW_INFO_INIT;
 
 	argc = parse_options(argc, argv, NULL, options, builtin_remote_show_usage,
 			     0);
@@ -1225,26 +1233,22 @@ static int show(int argc, const char **argv)
 	if (!no_query)
 		query_flag = (GET_REF_STATES | GET_HEAD_NAMES | GET_PUSH_REF_STATES);
 
-	memset(&states, 0, sizeof(states));
-	memset(&info, 0, sizeof(info));
-	info.states = &states;
-	info.list = &info_list;
 	for (; argc; argc--, argv++) {
 		int i;
 		const char **url;
 		int url_nr;
 
-		get_remote_ref_states(*argv, &states, query_flag);
+		get_remote_ref_states(*argv, &info.states, query_flag);
 
 		printf_ln(_("* remote %s"), *argv);
-		printf_ln(_("  Fetch URL: %s"), states.remote->url_nr > 0 ?
-		       states.remote->url[0] : _("(no URL)"));
-		if (states.remote->pushurl_nr) {
-			url = states.remote->pushurl;
-			url_nr = states.remote->pushurl_nr;
+		printf_ln(_("  Fetch URL: %s"), info.states.remote->url_nr > 0 ?
+		       info.states.remote->url[0] : _("(no URL)"));
+		if (info.states.remote->pushurl_nr) {
+			url = info.states.remote->pushurl;
+			url_nr = info.states.remote->pushurl_nr;
 		} else {
-			url = states.remote->url;
-			url_nr = states.remote->url_nr;
+			url = info.states.remote->url;
+			url_nr = info.states.remote->url_nr;
 		}
 		for (i = 0; i < url_nr; i++)
 			/*
@@ -1257,57 +1261,57 @@ static int show(int argc, const char **argv)
 			printf_ln(_("  Push  URL: %s"), _("(no URL)"));
 		if (no_query)
 			printf_ln(_("  HEAD branch: %s"), _("(not queried)"));
-		else if (!states.heads.nr)
+		else if (!info.states.heads.nr)
 			printf_ln(_("  HEAD branch: %s"), _("(unknown)"));
-		else if (states.heads.nr == 1)
-			printf_ln(_("  HEAD branch: %s"), states.heads.items[0].string);
+		else if (info.states.heads.nr == 1)
+			printf_ln(_("  HEAD branch: %s"), info.states.heads.items[0].string);
 		else {
 			printf(_("  HEAD branch (remote HEAD is ambiguous,"
 				 " may be one of the following):\n"));
-			for (i = 0; i < states.heads.nr; i++)
-				printf("    %s\n", states.heads.items[i].string);
+			for (i = 0; i < info.states.heads.nr; i++)
+				printf("    %s\n", info.states.heads.items[i].string);
 		}
 
 		/* remote branch info */
 		info.width = 0;
-		for_each_string_list(&states.new_refs, add_remote_to_show_info, &info);
-		for_each_string_list(&states.tracked, add_remote_to_show_info, &info);
-		for_each_string_list(&states.stale, add_remote_to_show_info, &info);
-		if (info.list->nr)
+		for_each_string_list(&info.states.new_refs, add_remote_to_show_info, &info);
+		for_each_string_list(&info.states.tracked, add_remote_to_show_info, &info);
+		for_each_string_list(&info.states.stale, add_remote_to_show_info, &info);
+		if (info.list.nr)
 			printf_ln(Q_("  Remote branch:%s",
 				     "  Remote branches:%s",
-				     info.list->nr),
+				     info.list.nr),
 				  no_query ? _(" (status not queried)") : "");
-		for_each_string_list(info.list, show_remote_info_item, &info);
-		string_list_clear(info.list, 0);
+		for_each_string_list(&info.list, show_remote_info_item, &info);
+		string_list_clear(&info.list, 0);
 
 		/* git pull info */
 		info.width = 0;
 		info.any_rebase = 0;
 		for_each_string_list(&branch_list, add_local_to_show_info, &info);
-		if (info.list->nr)
+		if (info.list.nr)
 			printf_ln(Q_("  Local branch configured for 'git pull':",
 				     "  Local branches configured for 'git pull':",
-				     info.list->nr));
-		for_each_string_list(info.list, show_local_info_item, &info);
-		string_list_clear(info.list, 0);
+				     info.list.nr));
+		for_each_string_list(&info.list, show_local_info_item, &info);
+		string_list_clear(&info.list, 0);
 
 		/* git push info */
-		if (states.remote->mirror)
+		if (info.states.remote->mirror)
 			printf_ln(_("  Local refs will be mirrored by 'git push'"));
 
 		info.width = info.width2 = 0;
-		for_each_string_list(&states.push, add_push_to_show_info, &info);
-		QSORT(info.list->items, info.list->nr, cmp_string_with_push);
-		if (info.list->nr)
+		for_each_string_list(&info.states.push, add_push_to_show_info, &info);
+		QSORT(info.list.items, info.list.nr, cmp_string_with_push);
+		if (info.list.nr)
 			printf_ln(Q_("  Local ref configured for 'git push'%s:",
 				     "  Local refs configured for 'git push'%s:",
-				     info.list->nr),
+				     info.list.nr),
 				  no_query ? _(" (status not queried)") : "");
-		for_each_string_list(info.list, show_push_info_item, &info);
-		string_list_clear(info.list, 0);
+		for_each_string_list(&info.list, show_push_info_item, &info);
+		string_list_clear(&info.list, 0);
 
-		free_remote_ref_states(&states);
+		free_remote_ref_states(&info.states);
 	}
 
 	return result;
@@ -1334,8 +1338,7 @@ static int set_head(int argc, const char **argv)
 	if (!opt_a && !opt_d && argc == 2) {
 		head_name = xstrdup(argv[1]);
 	} else if (opt_a && !opt_d && argc == 1) {
-		struct ref_states states;
-		memset(&states, 0, sizeof(states));
+		struct ref_states states = REF_STATES_INIT;
 		get_remote_ref_states(argv[0], &states, GET_HEAD_NAMES);
 		if (!states.heads.nr)
 			result |= error(_("Cannot determine remote HEAD"));
@@ -1374,14 +1377,13 @@ static int set_head(int argc, const char **argv)
 static int prune_remote(const char *remote, int dry_run)
 {
 	int result = 0;
-	struct ref_states states;
+	struct ref_states states = REF_STATES_INIT;
 	struct string_list refs_to_prune = STRING_LIST_INIT_NODUP;
 	struct string_list_item *item;
 	const char *dangling_msg = dry_run
 		? _(" %s will become dangling!")
 		: _(" %s has become dangling!");
 
-	memset(&states, 0, sizeof(states));
 	get_remote_ref_states(remote, &states, GET_REF_STATES);
 
 	if (!states.stale.nr) {
diff --git a/builtin/repack.c b/builtin/repack.c
index 5f9bc74adc..da1e364a75 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -15,6 +15,8 @@
 #include "promisor-remote.h"
 #include "shallow.h"
 #include "pack.h"
+#include "pack-bitmap.h"
+#include "refs.h"
 
 static int delta_base_offset = 1;
 static int pack_kept_objects = -1;
@@ -94,12 +96,14 @@ static void remove_pack_on_signal(int signo)
 }
 
 /*
- * Adds all packs hex strings to the fname list, which do not
- * have a corresponding .keep file. These packs are not to
- * be kept if we are going to pack everything into one file.
+ * Adds all packs hex strings to either fname_nonkept_list or
+ * fname_kept_list based on whether each pack has a corresponding
+ * .keep file or not.  Packs without a .keep file are not to be kept
+ * if we are going to pack everything into one file.
  */
-static void get_non_kept_pack_filenames(struct string_list *fname_list,
-					const struct string_list *extra_keep)
+static void collect_pack_filenames(struct string_list *fname_nonkept_list,
+				   struct string_list *fname_kept_list,
+				   const struct string_list *extra_keep)
 {
 	DIR *dir;
 	struct dirent *e;
@@ -112,21 +116,20 @@ static void get_non_kept_pack_filenames(struct string_list *fname_list,
 		size_t len;
 		int i;
 
+		if (!strip_suffix(e->d_name, ".pack", &len))
+			continue;
+
 		for (i = 0; i < extra_keep->nr; i++)
 			if (!fspathcmp(e->d_name, extra_keep->items[i].string))
 				break;
-		if (extra_keep->nr > 0 && i < extra_keep->nr)
-			continue;
-
-		if (!strip_suffix(e->d_name, ".pack", &len))
-			continue;
 
 		fname = xmemdupz(e->d_name, len);
 
-		if (!file_exists(mkpath("%s/%s.keep", packdir, fname)))
-			string_list_append_nodup(fname_list, fname);
+		if ((extra_keep->nr > 0 && i < extra_keep->nr) ||
+		    (file_exists(mkpath("%s/%s.keep", packdir, fname))))
+			string_list_append_nodup(fname_kept_list, fname);
 		else
-			free(fname);
+			string_list_append_nodup(fname_nonkept_list, fname);
 	}
 	closedir(dir);
 }
@@ -208,10 +211,10 @@ static struct {
 	unsigned optional:1;
 } exts[] = {
 	{".pack"},
-	{".idx"},
 	{".rev", 1},
 	{".bitmap", 1},
 	{".promisor", 1},
+	{".idx"},
 };
 
 static unsigned populate_pack_exts(char *name)
@@ -255,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);
 
@@ -422,6 +427,25 @@ static void split_pack_geometry(struct pack_geometry *geometry, int factor)
 	geometry->split = split;
 }
 
+static struct packed_git *get_largest_active_pack(struct pack_geometry *geometry)
+{
+	if (!geometry) {
+		/*
+		 * No geometry means either an all-into-one repack (in which
+		 * case there is only one pack left and it is the largest) or an
+		 * incremental one.
+		 *
+		 * If repacking incrementally, then we could check the size of
+		 * all packs to determine which should be preferred, but leave
+		 * this for later.
+		 */
+		return NULL;
+	}
+	if (geometry->split == geometry->pack_nr)
+		return NULL;
+	return geometry->pack[geometry->pack_nr - 1];
+}
+
 static void clear_pack_geometry(struct pack_geometry *geometry)
 {
 	if (!geometry)
@@ -433,17 +457,162 @@ static void clear_pack_geometry(struct pack_geometry *geometry)
 	geometry->split = 0;
 }
 
+struct midx_snapshot_ref_data {
+	struct tempfile *f;
+	struct oidset seen;
+	int preferred;
+};
+
+static int midx_snapshot_ref_one(const char *refname,
+				 const struct object_id *oid,
+				 int flag, void *_data)
+{
+	struct midx_snapshot_ref_data *data = _data;
+	struct object_id peeled;
+
+	if (!peel_iterated_oid(oid, &peeled))
+		oid = &peeled;
+
+	if (oidset_insert(&data->seen, oid))
+		return 0; /* already seen */
+
+	if (oid_object_info(the_repository, oid, NULL) != OBJ_COMMIT)
+		return 0;
+
+	fprintf(data->f->fp, "%s%s\n", data->preferred ? "+" : "",
+		oid_to_hex(oid));
+
+	return 0;
+}
+
+static void midx_snapshot_refs(struct tempfile *f)
+{
+	struct midx_snapshot_ref_data data;
+	const struct string_list *preferred = bitmap_preferred_tips(the_repository);
+
+	data.f = f;
+	data.preferred = 0;
+	oidset_init(&data.seen, 0);
+
+	if (!fdopen_tempfile(f, "w"))
+		 die(_("could not open tempfile %s for writing"),
+		     get_tempfile_path(f));
+
+	if (preferred) {
+		struct string_list_item *item;
+
+		data.preferred = 1;
+		for_each_string_list_item(item, preferred)
+			for_each_ref_in(item->string, midx_snapshot_ref_one, &data);
+		data.preferred = 0;
+	}
+
+	for_each_ref(midx_snapshot_ref_one, &data);
+
+	if (close_tempfile_gently(f)) {
+		int save_errno = errno;
+		delete_tempfile(&f);
+		errno = save_errno;
+		die_errno(_("could not close refs snapshot tempfile"));
+	}
+
+	oidset_clear(&data.seen);
+}
+
+static void midx_included_packs(struct string_list *include,
+				struct string_list *existing_nonkept_packs,
+				struct string_list *existing_kept_packs,
+				struct string_list *names,
+				struct pack_geometry *geometry)
+{
+	struct string_list_item *item;
+
+	for_each_string_list_item(item, existing_kept_packs)
+		string_list_insert(include, xstrfmt("%s.idx", item->string));
+	for_each_string_list_item(item, names)
+		string_list_insert(include, xstrfmt("pack-%s.idx", item->string));
+	if (geometry) {
+		struct strbuf buf = STRBUF_INIT;
+		uint32_t i;
+		for (i = geometry->split; i < geometry->pack_nr; i++) {
+			struct packed_git *p = geometry->pack[i];
+
+			strbuf_addstr(&buf, pack_basename(p));
+			strbuf_strip_suffix(&buf, ".pack");
+			strbuf_addstr(&buf, ".idx");
+
+			string_list_insert(include, strbuf_detach(&buf, NULL));
+		}
+	} else {
+		for_each_string_list_item(item, existing_nonkept_packs) {
+			if (item->util)
+				continue;
+			string_list_insert(include, xstrfmt("%s.idx", item->string));
+		}
+	}
+}
+
+static int write_midx_included_packs(struct string_list *include,
+				     struct pack_geometry *geometry,
+				     const char *refs_snapshot,
+				     int show_progress, int write_bitmaps)
+{
+	struct child_process cmd = CHILD_PROCESS_INIT;
+	struct string_list_item *item;
+	struct packed_git *largest = get_largest_active_pack(geometry);
+	FILE *in;
+	int ret;
+
+	if (!include->nr)
+		return 0;
+
+	cmd.in = -1;
+	cmd.git_cmd = 1;
+
+	strvec_push(&cmd.args, "multi-pack-index");
+	strvec_pushl(&cmd.args, "write", "--stdin-packs", NULL);
+
+	if (show_progress)
+		strvec_push(&cmd.args, "--progress");
+	else
+		strvec_push(&cmd.args, "--no-progress");
+
+	if (write_bitmaps)
+		strvec_push(&cmd.args, "--bitmap");
+
+	if (largest)
+		strvec_pushf(&cmd.args, "--preferred-pack=%s",
+			     pack_basename(largest));
+
+	if (refs_snapshot)
+		strvec_pushf(&cmd.args, "--refs-snapshot=%s", refs_snapshot);
+
+	ret = start_command(&cmd);
+	if (ret)
+		return ret;
+
+	in = xfdopen(cmd.in, "w");
+	for_each_string_list_item(item, include)
+		fprintf(in, "%s\n", item->string);
+	fclose(in);
+
+	return finish_command(&cmd);
+}
+
 int cmd_repack(int argc, const char **argv, const char *prefix)
 {
 	struct child_process cmd = CHILD_PROCESS_INIT;
 	struct string_list_item *item;
 	struct string_list names = STRING_LIST_INIT_DUP;
 	struct string_list rollback = STRING_LIST_INIT_NODUP;
-	struct string_list existing_packs = STRING_LIST_INIT_DUP;
+	struct string_list existing_nonkept_packs = STRING_LIST_INIT_DUP;
+	struct string_list existing_kept_packs = STRING_LIST_INIT_DUP;
 	struct pack_geometry *geometry = NULL;
 	struct strbuf line = STRBUF_INIT;
+	struct tempfile *refs_snapshot = NULL;
 	int i, ext, ret;
 	FILE *out;
+	int show_progress;
 
 	/* variables to be filled by option parsing */
 	int pack_everything = 0;
@@ -454,6 +623,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	int no_update_server_info = 0;
 	struct pack_objects_args po_args = {NULL};
 	int geometric_factor = 0;
+	int write_midx = 0;
 
 	struct option builtin_repack_options[] = {
 		OPT_BIT('a', NULL, &pack_everything,
@@ -496,6 +666,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 				N_("do not repack this pack")),
 		OPT_INTEGER('g', "geometric", &geometric_factor,
 			    N_("find a geometric progression with factor <N>")),
+		OPT_BOOL('m', "write-midx", &write_midx,
+			   N_("write a multi-pack index of the resulting packs")),
 		OPT_END()
 	};
 
@@ -509,22 +681,38 @@ 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 (!(pack_everything & ALL_INTO_ONE) ||
-		    !is_bare_repository())
+		if (!write_midx &&
+		    (!(pack_everything & ALL_INTO_ONE) || !is_bare_repository()))
 			write_bitmaps = 0;
+	} else if (write_bitmaps &&
+		   git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0) &&
+		   git_env_bool(GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP, 0)) {
+		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))
+	if (write_bitmaps && !(pack_everything & ALL_INTO_ONE) && !write_midx)
 		die(_(incremental_bitmap_conflict_error));
 
+	if (write_midx && write_bitmaps) {
+		struct strbuf path = STRBUF_INIT;
+
+		strbuf_addf(&path, "%s/%s_XXXXXX", get_object_directory(),
+			    "bitmap-ref-tips");
+
+		refs_snapshot = xmks_tempfile(path.buf);
+		midx_snapshot_refs(refs_snapshot);
+
+		strbuf_release(&path);
+	}
+
 	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);
 	}
@@ -537,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");
@@ -561,19 +751,22 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	}
 	if (has_promisor_remote())
 		strvec_push(&cmd.args, "--exclude-promisor-objects");
-	if (write_bitmaps > 0)
-		strvec_push(&cmd.args, "--write-bitmap-index");
-	else if (write_bitmaps < 0)
-		strvec_push(&cmd.args, "--write-bitmap-index-quiet");
+	if (!write_midx) {
+		if (write_bitmaps > 0)
+			strvec_push(&cmd.args, "--write-bitmap-index");
+		else if (write_bitmaps < 0)
+			strvec_push(&cmd.args, "--write-bitmap-index-quiet");
+	}
 	if (use_delta_islands)
 		strvec_push(&cmd.args, "--delta-islands");
 
-	if (pack_everything & ALL_INTO_ONE) {
-		get_non_kept_pack_filenames(&existing_packs, &keep_pack_list);
+	collect_pack_filenames(&existing_nonkept_packs, &existing_kept_packs,
+			       &keep_pack_list);
 
+	if (pack_everything & ALL_INTO_ONE) {
 		repack_promisor_objects(&po_args, &names);
 
-		if (existing_packs.nr && delete_redundant) {
+		if (existing_nonkept_packs.nr && delete_redundant) {
 			for_each_string_list_item(item, &names) {
 				strvec_pushf(&cmd.args, "--keep-pack=%s-%s.pack",
 					     packtmp_name, item->string);
@@ -582,15 +775,12 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 				strvec_pushf(&cmd.args,
 					     "--unpack-unreachable=%s",
 					     unpack_unreachable);
-				strvec_push(&cmd.env_array, "GIT_REF_PARANOIA=1");
 			} else if (pack_everything & LOOSEN_UNREACHABLE) {
 				strvec_push(&cmd.args,
 					    "--unpack-unreachable");
 			} else if (keep_unreachable) {
 				strvec_push(&cmd.args, "--keep-unreachable");
 				strvec_push(&cmd.args, "--pack-loose-unreachable");
-			} else {
-				strvec_push(&cmd.env_array, "GIT_REF_PARANOIA=1");
 			}
 		}
 	} else if (geometry) {
@@ -656,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);
@@ -676,20 +866,48 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	}
 	/* End of pack replacement. */
 
-	reprepare_packed_git(the_repository);
-
-	if (delete_redundant) {
+	if (delete_redundant && pack_everything & ALL_INTO_ONE) {
 		const int hexsz = the_hash_algo->hexsz;
-		int opts = 0;
 		string_list_sort(&names);
-		for_each_string_list_item(item, &existing_packs) {
+		for_each_string_list_item(item, &existing_nonkept_packs) {
 			char *sha1;
 			size_t len = strlen(item->string);
 			if (len < hexsz)
 				continue;
 			sha1 = item->string + len - hexsz;
-			if (!string_list_has_string(&names, sha1))
-				remove_redundant_pack(packdir, item->string);
+			/*
+			 * Mark this pack for deletion, which ensures that this
+			 * pack won't be included in a MIDX (if `--write-midx`
+			 * was given) and that we will actually delete this pack
+			 * (if `-d` was given).
+			 */
+			item->util = (void*)(intptr_t)!string_list_has_string(&names, sha1);
+		}
+	}
+
+	if (write_midx) {
+		struct string_list include = STRING_LIST_INIT_NODUP;
+		midx_included_packs(&include, &existing_nonkept_packs,
+				    &existing_kept_packs, &names, geometry);
+
+		ret = write_midx_included_packs(&include, geometry,
+						refs_snapshot ? get_tempfile_path(refs_snapshot) : NULL,
+						show_progress, write_bitmaps > 0);
+
+		string_list_clear(&include, 0);
+
+		if (ret)
+			return ret;
+	}
+
+	reprepare_packed_git(the_repository);
+
+	if (delete_redundant) {
+		int opts = 0;
+		for_each_string_list_item(item, &existing_nonkept_packs) {
+			if (!item->util)
+				continue;
+			remove_redundant_pack(packdir, item->string);
 		}
 
 		if (geometry) {
@@ -710,7 +928,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 			}
 			strbuf_release(&buf);
 		}
-		if (!po_args.quiet && isatty(2))
+		if (show_progress)
 			opts |= PRUNE_PACKED_VERBOSE;
 		prune_packed_objects(opts);
 
@@ -725,12 +943,17 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 		update_server_info(0);
 	remove_temporary_files();
 
-	if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0))
-		write_midx_file(get_object_directory(), NULL, 0);
+	if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0)) {
+		unsigned flags = 0;
+		if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP, 0))
+			flags |= MIDX_WRITE_BITMAP | MIDX_WRITE_REV_INDEX;
+		write_midx_file(get_object_directory(), NULL, NULL, flags);
+	}
 
 	string_list_clear(&names, 0);
 	string_list_clear(&rollback, 0);
-	string_list_clear(&existing_packs, 0);
+	string_list_clear(&existing_nonkept_packs, 0);
+	string_list_clear(&existing_kept_packs, 0);
 	clear_pack_geometry(geometry);
 	strbuf_release(&line);
 
diff --git a/builtin/replace.c b/builtin/replace.c
index cd48765911..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;
@@ -507,7 +506,7 @@ static int convert_graft_file(int force)
 	if (!fp)
 		return -1;
 
-	advice_graft_file_deprecated = 0;
+	no_graft_file_deprecated_advice = 1;
 	while (strbuf_getline(&buf, fp) != EOF) {
 		if (*buf.buf == '#')
 			continue;
diff --git a/builtin/reset.c b/builtin/reset.c
index 43e855cb88..75b8d86481 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)
 
@@ -67,12 +68,18 @@ static int reset_index(const char *ref, const struct object_id *oid, int reset_t
 	case KEEP:
 	case MERGE:
 		opts.update = 1;
+		opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
 		break;
 	case HARD:
 		opts.update = 1;
-		/* fallthrough */
+		opts.reset = UNPACK_RESET_OVERWRITE_UNTRACKED;
+		break;
+	case MIXED:
+		opts.reset = UNPACK_RESET_PROTECT_UNTRACKED;
+		/* but opts.update=0, so working tree not updated */
+		break;
 	default:
-		opts.reset = 1;
+		BUG("invalid reset_type passed to reset_index");
 	}
 
 	read_cache_unmerged();
@@ -130,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);
 		}
@@ -152,6 +174,88 @@ 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 know we don't need to
+			 * expand the index.
+			 *
+			 * Examples:
+			 * - in-cone/foo***: doesn't need expanded index
+			 * - not-in-cone/bar*: may need expanded index
+			 * - **.c: may need expanded index
+			 */
+			if (strspn(item.original + item.nowildcard_len, "*") == item.len - item.nowildcard_len &&
+			    path_in_cone_mode_sparse_checkout(item.original, &the_index))
+				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)
@@ -164,7 +268,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;
@@ -243,9 +353,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),
@@ -322,16 +429,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);
@@ -358,7 +465,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);
 	}
@@ -389,7 +496,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
@@ -412,7 +525,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 				refresh_index(&the_index, flags, NULL, NULL,
 					      _("Unstaged changes after reset:"));
 				t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
-				if (advice_reset_quiet_warning && t_delta_in_ms > REFRESH_INDEX_DELAY_WARNING_IN_MS) {
+				if (advice_enabled(ADVICE_RESET_QUIET_WARNING) && t_delta_in_ms > REFRESH_INDEX_DELAY_WARNING_IN_MS) {
 					printf(_("\nIt 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"), t_delta_in_ms / 1000.0);
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/rev-parse.c b/builtin/rev-parse.c
index 22c4e1a4ff..8480a59f57 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -863,8 +863,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 				continue;
 			}
 			if (!strcmp(arg, "--bisect")) {
-				for_each_fullref_in("refs/bisect/bad", show_reference, NULL, 0);
-				for_each_fullref_in("refs/bisect/good", anti_reference, NULL, 0);
+				for_each_fullref_in("refs/bisect/bad", show_reference, NULL);
+				for_each_fullref_in("refs/bisect/good", anti_reference, NULL);
 				continue;
 			}
 			if (opt_with_value(arg, "--branches", &arg)) {
diff --git a/builtin/revert.c b/builtin/revert.c
index 237f2f18d4..51776abea6 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -136,6 +136,9 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts)
 			PARSE_OPT_KEEP_ARGV0 |
 			PARSE_OPT_KEEP_UNKNOWN);
 
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
+
 	/* implies allow_empty */
 	if (opts->keep_redundant_commits)
 		opts->allow_empty = 1;
@@ -191,7 +194,8 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts)
 		struct setup_revision_opt s_r_opt;
 		opts->revs = xmalloc(sizeof(*opts->revs));
 		repo_init_revisions(the_repository, opts->revs, NULL);
-		opts->revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
+		opts->revs->no_walk = 1;
+		opts->revs->unsorted_input = 1;
 		if (argc < 2)
 			usage_with_options(usage_str, options);
 		if (!strcmp(argv[1], "-"))
diff --git a/builtin/rm.c b/builtin/rm.c
index 8a24c715e0..84a935a16e 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -55,7 +55,7 @@ static void print_error_files(struct string_list *files_list,
 			strbuf_addf(&err_msg,
 				    "\n    %s",
 				    files_list->items[i].string);
-		if (advice_rm_hints)
+		if (advice_enabled(ADVICE_RM_HINTS))
 			strbuf_addstr(&err_msg, hints_msg);
 		*errs = error("%s", err_msg.buf);
 		strbuf_release(&err_msg);
@@ -237,6 +237,7 @@ static int check_local_mod(struct object_id *head, int index_only)
 
 static int show_only = 0, force = 0, index_only = 0, recursive = 0, quiet = 0;
 static int ignore_unmatch = 0, pathspec_file_nul;
+static int include_sparse;
 static char *pathspec_from_file;
 
 static struct option builtin_rm_options[] = {
@@ -247,6 +248,7 @@ static struct option builtin_rm_options[] = {
 	OPT_BOOL('r', NULL,             &recursive,  N_("allow recursive removal")),
 	OPT_BOOL( 0 , "ignore-unmatch", &ignore_unmatch,
 				N_("exit with a zero status even if nothing matched")),
+	OPT_BOOL(0, "sparse", &include_sparse, N_("allow updating entries outside of the sparse-checkout cone")),
 	OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
 	OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
 	OPT_END(),
@@ -270,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)
@@ -298,7 +300,10 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 	ensure_full_index(&the_index);
 	for (i = 0; i < active_nr; i++) {
 		const struct cache_entry *ce = active_cache[i];
-		if (ce_skip_worktree(ce))
+
+		if (!include_sparse &&
+		    (ce_skip_worktree(ce) ||
+		     !path_in_sparse_checkout(ce->name, &the_index)))
 			continue;
 		if (!ce_path_match(&the_index, ce, &pathspec, seen))
 			continue;
@@ -322,7 +327,8 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 				seen_any = 1;
 			else if (ignore_unmatch)
 				continue;
-			else if (matches_skip_worktree(&pathspec, i, &skip_worktree_seen))
+			else if (!include_sparse &&
+				 matches_skip_worktree(&pathspec, i, &skip_worktree_seen))
 				string_list_append(&only_match_skip_worktree, original);
 			else
 				die(_("pathspec '%s' did not match any files"), original);
@@ -393,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/send-pack.c b/builtin/send-pack.c
index a7e01667b0..69c432ef1a 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -17,10 +17,10 @@
 #include "protocol.h"
 
 static const char * const send_pack_usage[] = {
-	N_("git send-pack [--all | --mirror] [--dry-run] [--force] "
-	  "[--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] "
-	  "[<host>:]<directory> [<ref>...]\n"
-	  "  --all and explicit <ref> specification are mutually exclusive."),
+	N_("git send-pack [--mirror] [--dry-run] [--force]\n"
+	   "              [--receive-pack=<git-receive-pack>]\n"
+	   "              [--verbose] [--thin] [--atomic]\n"
+	   "              [<host>:]<directory> (--all | <ref>...)"),
 	NULL,
 };
 
@@ -87,6 +87,10 @@ static void print_helper_status(struct ref *ref)
 			break;
 
 		case REF_STATUS_EXPECTING_REPORT:
+			res = "error";
+			msg = "expecting report";
+			break;
+
 		default:
 			continue;
 		}
@@ -230,6 +234,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
 	args.atomic = atomic;
 	args.stateless_rpc = stateless_rpc;
 	args.push_options = push_options.nr ? &push_options : NULL;
+	args.url = dest;
 
 	if (from_stdin) {
 		if (args.stateless_rpc) {
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 3e7ab1ca82..228d782754 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -374,6 +374,9 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
 
 	for (;;) {
 		switch (parse_options_step(&ctx, options, shortlog_usage)) {
+		case PARSE_OPT_NON_OPTION:
+		case PARSE_OPT_UNKNOWN:
+			break;
 		case PARSE_OPT_HELP:
 		case PARSE_OPT_ERROR:
 			exit(129);
@@ -385,6 +388,7 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
 		parse_revision_opt(&rev, &ctx, options, shortlog_usage);
 	}
 parse_done:
+	revision_opts_finish(&rev);
 	argc = parse_options_end(&ctx);
 
 	if (nongit && argc > 1) {
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index d77ce7aeb3..e12c5e80e3 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -11,9 +11,9 @@
 
 static const char* show_branch_usage[] = {
     N_("git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-       "		[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-       "		[--more=<n> | --list | --independent | --merge-base]\n"
-       "		[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
+       "                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+       "                [--more=<n> | --list | --independent | --merge-base]\n"
+       "                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
     N_("git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"),
     NULL
 };
@@ -482,10 +482,9 @@ static void snarf_refs(int head, int remotes)
 	}
 }
 
-static int rev_is_head(const char *head, const char *name,
-		       unsigned char *head_sha1, unsigned char *sha1)
+static int rev_is_head(const char *head, const char *name)
 {
-	if (!head || (head_sha1 && sha1 && !hasheq(head_sha1, sha1)))
+	if (!head)
 		return 0;
 	skip_prefix(head, "refs/heads/", &head);
 	if (!skip_prefix(name, "refs/heads/", &name))
@@ -708,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 */
@@ -762,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;
 
@@ -771,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)),
@@ -806,9 +807,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
 			/* We are only interested in adding the branch
 			 * HEAD points at.
 			 */
-			if (rev_is_head(head,
-					ref_name[i],
-					head_oid.hash, NULL))
+			if (rev_is_head(head, ref_name[i]))
 				has_head++;
 		}
 		if (!has_head) {
@@ -867,10 +866,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
 	if (1 < num_rev || extra < 0) {
 		for (i = 0; i < num_rev; i++) {
 			int j;
-			int is_head = rev_is_head(head,
-						  ref_name[i],
-						  head_oid.hash,
-						  rev[i]->object.oid.hash);
+			int is_head = rev_is_head(head, ref_name[i]) &&
+				      oideq(&head_oid, &rev[i]->object.oid);
 			if (extra < 0)
 				printf("%c [%s] ",
 				       is_head ? '*' : ' ', ref_name[i]);
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
index a4bdd7c494..f2356554e5 100644
--- a/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@ -15,6 +15,7 @@
 #include "wt-status.h"
 #include "quote.h"
 #include "sparse-index.h"
+#include "worktree.h"
 
 static const char *empty_base = "";
 
@@ -56,6 +57,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);
@@ -100,6 +104,100 @@ static int sparse_checkout_list(int argc, const char **argv)
 	return 0;
 }
 
+static void clean_tracked_sparse_directories(struct repository *r)
+{
+	int i, was_full = 0;
+	struct strbuf path = STRBUF_INIT;
+	size_t pathlen;
+	struct string_list_item *item;
+	struct string_list sparse_dirs = STRING_LIST_INIT_DUP;
+
+	/*
+	 * If we are not using cone mode patterns, then we cannot
+	 * delete directories outside of the sparse cone.
+	 */
+	if (!r || !r->index || !r->worktree)
+		return;
+	if (init_sparse_checkout_patterns(r->index) ||
+	    !r->index->sparse_checkout_patterns->use_cone_patterns)
+		return;
+
+	/*
+	 * Use the sparse index as a data structure to assist finding
+	 * directories that are safe to delete. This conversion to a
+	 * sparse index will not delete directories that contain
+	 * conflicted entries or submodules.
+	 */
+	if (!r->index->sparse_index) {
+		/*
+		 * If something, such as a merge conflict or other concern,
+		 * prevents us from converting to a sparse index, then do
+		 * not try deleting files.
+		 */
+		if (convert_to_sparse(r->index, SPARSE_INDEX_MEMORY_ONLY))
+			return;
+		was_full = 1;
+	}
+
+	strbuf_addstr(&path, r->worktree);
+	strbuf_complete(&path, '/');
+	pathlen = path.len;
+
+	/*
+	 * Collect directories that have gone out of scope but also
+	 * exist on disk, so there is some work to be done. We need to
+	 * store the entries in a list before exploring, since that might
+	 * expand the sparse-index again.
+	 */
+	for (i = 0; i < r->index->cache_nr; i++) {
+		struct cache_entry *ce = r->index->cache[i];
+
+		if (S_ISSPARSEDIR(ce->ce_mode) &&
+		    repo_file_exists(r, ce->name))
+			string_list_append(&sparse_dirs, ce->name);
+	}
+
+	for_each_string_list_item(item, &sparse_dirs) {
+		struct dir_struct dir = DIR_INIT;
+		struct pathspec p = { 0 };
+		struct strvec s = STRVEC_INIT;
+
+		strbuf_setlen(&path, pathlen);
+		strbuf_addstr(&path, item->string);
+
+		dir.flags |= DIR_SHOW_IGNORED_TOO;
+
+		setup_standard_excludes(&dir);
+		strvec_push(&s, path.buf);
+
+		parse_pathspec(&p, PATHSPEC_GLOB, 0, NULL, s.v);
+		fill_directory(&dir, r->index, &p);
+
+		if (dir.nr) {
+			warning(_("directory '%s' contains untracked files,"
+				  " but is not in the sparse-checkout cone"),
+				item->string);
+		} else if (remove_dir_recursively(&path, 0)) {
+			/*
+			 * Removal is "best effort". If something blocks
+			 * the deletion, then continue with a warning.
+			 */
+			warning(_("failed to remove directory '%s'"),
+				item->string);
+		}
+
+		strvec_clear(&s);
+		clear_pathspec(&p);
+		dir_clear(&dir);
+	}
+
+	string_list_clear(&sparse_dirs, 0);
+	strbuf_release(&path);
+
+	if (was_full)
+		ensure_full_index(r->index);
+}
+
 static int update_working_directory(struct pattern_list *pl)
 {
 	enum update_sparsity_result result;
@@ -141,6 +239,8 @@ static int update_working_directory(struct pattern_list *pl)
 	else
 		rollback_lock_file(&lock_file);
 
+	clean_tracked_sparse_directories(r);
+
 	r->index->sparse_checkout_patterns = NULL;
 	return result;
 }
@@ -262,26 +362,58 @@ enum sparse_checkout_mode {
 
 static int set_config(enum sparse_checkout_mode mode)
 {
-	const char *config_path;
-
-	if (upgrade_repository_format(1) < 0)
-		die(_("unable to upgrade repository format to enable worktreeConfig"));
-	if (git_config_set_gently("extensions.worktreeConfig", "true")) {
-		error(_("failed to set extensions.worktreeConfig setting"));
+	/* Update to use worktree config, if not already. */
+	if (init_worktree_config(the_repository)) {
+		error(_("failed to initialize worktree config"));
 		return 1;
 	}
 
-	config_path = git_path("config.worktree");
-	git_config_set_in_file_gently(config_path,
-				      "core.sparseCheckout",
-				      mode ? "true" : NULL);
-
-	git_config_set_in_file_gently(config_path,
-				      "core.sparseCheckoutCone",
-				      mode == MODE_CONE_PATTERNS ? "true" : NULL);
+	if (repo_config_set_worktree_gently(the_repository,
+					    "core.sparseCheckout",
+					    mode ? "true" : "false") ||
+	    repo_config_set_worktree_gently(the_repository,
+					    "core.sparseCheckoutCone",
+					    mode == MODE_CONE_PATTERNS ?
+						"true" : "false"))
+		return 1;
 
 	if (mode == MODE_NO_PATTERNS)
-		set_sparse_index_config(the_repository, 0);
+		return set_sparse_index_config(the_repository, 0);
+
+	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;
 }
@@ -302,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[] = {
@@ -315,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));
@@ -335,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);
@@ -356,6 +471,9 @@ static int sparse_checkout_init(int argc, const char **argv)
 		FILE *fp;
 
 		/* assume we are in a fresh repo, but update the sparse-checkout file */
+		if (safe_create_leading_directories(sparse_filename))
+			die(_("unable to create leading directories of %s"),
+			    sparse_filename);
 		fp = xfopen(sparse_filename, "w");
 		if (!fp)
 			die(_("failed to open '%s'"), sparse_filename);
@@ -380,10 +498,7 @@ static void insert_recursive_pattern(struct pattern_list *pl, struct strbuf *pat
 	struct pattern_entry *e = xmalloc(sizeof(*e));
 	e->patternlen = path->len;
 	e->pattern = strbuf_detach(path, NULL);
-	hashmap_entry_init(&e->ent,
-			   ignore_case ?
-			   strihash(e->pattern) :
-			   strhash(e->pattern));
+	hashmap_entry_init(&e->ent, fspathhash(e->pattern));
 
 	hashmap_add(&pl->recursive_hashmap, &e->ent);
 
@@ -392,17 +507,14 @@ 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;
 		e = xmalloc(sizeof(struct pattern_entry));
 		e->patternlen = newlen;
 		e->pattern = xstrndup(oldpattern, newlen);
-		hashmap_entry_init(&e->ent,
-				   ignore_case ?
-				   strihash(e->pattern) :
-				   strhash(e->pattern));
+		hashmap_entry_init(&e->ent, fspathhash(e->pattern));
 
 		if (!hashmap_get_entry(&pl->parent_hashmap, e, ent, NULL))
 			hashmap_add(&pl->parent_hashmap, &e->ent);
@@ -427,17 +539,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) {
@@ -447,7 +551,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] == '"') {
@@ -471,7 +575,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)) {
@@ -492,7 +596,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;
@@ -500,7 +605,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;
@@ -510,6 +615,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) ||
@@ -526,17 +634,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;
@@ -545,13 +655,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;
 	}
 
@@ -571,41 +681,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);
 }
 
@@ -622,6 +815,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);
@@ -670,9 +874,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 8f42360ca9..5897febfbe 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
 };
@@ -85,7 +85,7 @@ static const char * const git_stash_push_usage[] = {
 
 static const char * const git_stash_save_usage[] = {
 	N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-	   "          [-u|--include-untracked] [-a|--all] [<message>]"),
+	   "               [-u|--include-untracked] [-a|--all] [<message>]"),
 	NULL
 };
 
@@ -256,8 +256,10 @@ static int reset_tree(struct object_id *i_tree, int update, int reset)
 	opts.src_index = &the_index;
 	opts.dst_index = &the_index;
 	opts.merge = 1;
-	opts.reset = reset;
+	opts.reset = reset ? UNPACK_RESET_PROTECT_UNTRACKED : 0;
 	opts.update = update;
+	if (update)
+		opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
 	opts.fn = oneway_merge;
 
 	if (unpack_trees(nr_trees, t, &opts))
@@ -313,6 +315,17 @@ static int reset_head(void)
 	return run_command(&cp);
 }
 
+static int is_path_a_directory(const char *path)
+{
+	/*
+	 * This function differs from abspath.c:is_directory() in that
+	 * here we use lstat() instead of stat(); we do not want to
+	 * follow symbolic links here.
+	 */
+	struct stat st;
+	return (!lstat(path, &st) && S_ISDIR(st.st_mode));
+}
+
 static void add_diff_to_buf(struct diff_queue_struct *q,
 			    struct diff_options *options,
 			    void *data)
@@ -320,6 +333,9 @@ static void add_diff_to_buf(struct diff_queue_struct *q,
 	int i;
 
 	for (i = 0; i < q->nr; i++) {
+		if (is_path_a_directory(q->queue[i]->one->path))
+			continue;
+
 		strbuf_addstr(data, q->queue[i]->one->path);
 
 		/* NUL-terminate: will be fed to update-index -z */
@@ -521,9 +537,6 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
 		}
 	}
 
-	if (info->has_u && restore_untracked(&info->u_tree))
-		return error(_("could not restore untracked files from stash"));
-
 	init_merge_options(&o, the_repository);
 
 	o.branch1 = "Updated upstream";
@@ -548,16 +561,20 @@ 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))
+		ret = error(_("could not restore untracked files from stash"));
+
 	if (!quiet) {
 		struct child_process cp = CHILD_PROCESS_INIT;
 
@@ -576,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)
@@ -771,7 +788,6 @@ static int list_stash(int argc, const char **argv, const char *prefix)
 static int show_stat = 1;
 static int show_patch;
 static int show_include_untracked;
-static int use_legacy_stash;
 
 static int git_stash_config(const char *var, const char *value, void *cb)
 {
@@ -787,10 +803,6 @@ static int git_stash_config(const char *var, const char *value, void *cb)
 		show_include_untracked = git_config_bool(var, value);
 		return 0;
 	}
-	if (!strcmp(var, "stash.usebuiltin")) {
-		use_legacy_stash = !git_config_bool(var, value);
-		return 0;
-	}
 	return git_diff_basic_config(var, value, cb);
 }
 
@@ -1116,6 +1128,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)
 {
@@ -1242,7 +1286,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)
 {
@@ -1321,6 +1365,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)
@@ -1379,7 +1433,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));
@@ -1389,7 +1443,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;
@@ -1407,6 +1461,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;
@@ -1447,7 +1512,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;
@@ -1464,13 +1529,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)) {
@@ -1519,6 +1590,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 		} else {
 			struct child_process cp = CHILD_PROCESS_INIT;
 			cp.git_cmd = 1;
+			/* BUG: this nukes untracked files in the way */
 			strvec_pushl(&cp.args, "reset", "--hard", "-q",
 				     "--no-recurse-submodules", NULL);
 			if (run_command(&cp)) {
@@ -1581,6 +1653,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;
@@ -1591,6 +1664,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")),
@@ -1608,6 +1683,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);
 	}
@@ -1627,25 +1703,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;
@@ -1656,6 +1736,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")),
@@ -1677,7 +1759,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;
@@ -1695,11 +1777,6 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
 
 	git_config(git_stash_config, NULL);
 
-	if (use_legacy_stash ||
-	    !git_env_bool("GIT_TEST_STASH_USE_BUILTIN", -1))
-		warning(_("the stash.useBuiltin support has been removed!\n"
-			  "See its entry in 'git help config' for details."));
-
 	argc = parse_options(argc, argv, prefix, options, git_stash_usage,
 			     PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH);
 
@@ -1732,8 +1809,8 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
 	else if (!strcmp(argv[0], "save"))
 		return !!save_stash(argc, argv, prefix);
 	else if (*argv[0] != '-')
-		usage_msg_opt(xstrfmt(_("unknown subcommand: %s"), argv[0]),
-			      git_stash_usage, options);
+		usage_msg_optf(_("unknown subcommand: %s"),
+			       git_stash_usage, options, argv[0]);
 
 	/* Assume 'stash push' */
 	strvec_push(&args, "push");
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index f73963ad67..33c82c3ab9 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -20,6 +20,7 @@
 #include "diff.h"
 #include "object-store.h"
 #include "advice.h"
+#include "branch.h"
 
 #define OPT_QUIET (1 << 0)
 #define OPT_CACHED (1 << 1)
@@ -187,44 +188,40 @@ static char *relative_url(const char *remote_url,
 		out = xstrdup(sb.buf + 2);
 	else
 		out = xstrdup(sb.buf);
-	strbuf_reset(&sb);
 
-	if (!up_path || !is_relative)
+	if (!up_path || !is_relative) {
+		strbuf_release(&sb);
 		return out;
+	}
 
+	strbuf_reset(&sb);
 	strbuf_addf(&sb, "%s%s", up_path, out);
 	free(out);
 	return strbuf_detach(&sb, NULL);
 }
 
-static int resolve_relative_url(int argc, const char **argv, const char *prefix)
+static char *resolve_relative_url(const char *rel_url, const char *up_path, int quiet)
 {
-	char *remoteurl = NULL;
+	char *remoteurl, *resolved_url;
 	char *remote = get_default_remote();
-	const char *up_path = NULL;
-	char *res;
-	const char *url;
-	struct strbuf sb = STRBUF_INIT;
-
-	if (argc != 2 && argc != 3)
-		die("resolve-relative-url only accepts one or two arguments");
-
-	url = argv[1];
-	strbuf_addf(&sb, "remote.%s.url", remote);
-	free(remote);
+	struct strbuf remotesb = STRBUF_INIT;
 
-	if (git_config_get_string(sb.buf, &remoteurl))
-		/* the repository is its own authoritative upstream */
+	strbuf_addf(&remotesb, "remote.%s.url", remote);
+	if (git_config_get_string(remotesb.buf, &remoteurl)) {
+		if (!quiet)
+			warning(_("could not look up configuration '%s'. "
+				  "Assuming this repository is its own "
+				  "authoritative upstream."),
+				remotesb.buf);
 		remoteurl = xgetcwd();
+	}
+	resolved_url = relative_url(remoteurl, rel_url, up_path);
 
-	if (argc == 3)
-		up_path = argv[2];
-
-	res = relative_url(remoteurl, url, up_path);
-	puts(res);
-	free(res);
+	free(remote);
 	free(remoteurl);
-	return 0;
+	strbuf_release(&remotesb);
+
+	return resolved_url;
 }
 
 static int resolve_relative_url_test(int argc, const char **argv, const char *prefix)
@@ -311,7 +308,7 @@ struct module_list {
 	const struct cache_entry **entries;
 	int alloc, nr;
 };
-#define MODULE_LIST_INIT { NULL, 0, 0 }
+#define MODULE_LIST_INIT { 0 }
 
 static int module_list_compute(int argc, const char **argv,
 			       const char *prefix,
@@ -588,31 +585,11 @@ static int module_foreach(int argc, const char **argv, const char *prefix)
 	return 0;
 }
 
-static char *compute_submodule_clone_url(const char *rel_url)
-{
-	char *remoteurl, *relurl;
-	char *remote = get_default_remote();
-	struct strbuf remotesb = STRBUF_INIT;
-
-	strbuf_addf(&remotesb, "remote.%s.url", remote);
-	if (git_config_get_string(remotesb.buf, &remoteurl)) {
-		warning(_("could not look up configuration '%s'. Assuming this repository is its own authoritative upstream."), remotesb.buf);
-		remoteurl = xgetcwd();
-	}
-	relurl = relative_url(remoteurl, rel_url, NULL);
-
-	free(remote);
-	free(remoteurl);
-	strbuf_release(&remotesb);
-
-	return relurl;
-}
-
 struct init_cb {
 	const char *prefix;
 	unsigned int flags;
 };
-#define INIT_CB_INIT { NULL, 0 }
+#define INIT_CB_INIT { 0 }
 
 static void init_submodule(const char *path, const char *prefix,
 			   unsigned int flags)
@@ -658,7 +635,7 @@ static void init_submodule(const char *path, const char *prefix,
 		if (starts_with_dot_dot_slash(url) ||
 		    starts_with_dot_slash(url)) {
 			char *oldurl = url;
-			url = compute_submodule_clone_url(oldurl);
+			url = resolve_relative_url(oldurl, NULL, 0);
 			free(oldurl);
 		}
 
@@ -741,7 +718,7 @@ struct status_cb {
 	const char *prefix;
 	unsigned int flags;
 };
-#define STATUS_CB_INIT { NULL, 0 }
+#define STATUS_CB_INIT { 0 }
 
 static void print_status(unsigned int flags, char state, const char *path,
 			 const struct object_id *oid, const char *displaypath)
@@ -935,13 +912,13 @@ struct module_cb {
 	char status;
 	const char *sm_path;
 };
-#define MODULE_CB_INIT { 0, 0, NULL, NULL, '\0', NULL }
+#define MODULE_CB_INIT { 0 }
 
 struct module_cb_list {
 	struct module_cb **entries;
 	int alloc, nr;
 };
-#define MODULE_CB_LIST_INIT { NULL, 0, 0 }
+#define MODULE_CB_LIST_INIT { 0 }
 
 struct summary_cb {
 	int argc;
@@ -952,7 +929,7 @@ struct summary_cb {
 	unsigned int files: 1;
 	int summary_limit;
 };
-#define SUMMARY_CB_INIT { 0, NULL, NULL, 0, 0, 0, 0 }
+#define SUMMARY_CB_INIT { 0 }
 
 enum diff_cmd {
 	DIFF_INDEX,
@@ -1337,7 +1314,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;
 	}
 
@@ -1358,7 +1335,7 @@ struct sync_cb {
 	const char *prefix;
 	unsigned int flags;
 };
-#define SYNC_CB_INIT { NULL, 0 }
+#define SYNC_CB_INIT { 0 }
 
 static void sync_submodule(const char *path, const char *prefix,
 			   unsigned int flags)
@@ -1378,20 +1355,10 @@ static void sync_submodule(const char *path, const char *prefix,
 	if (sub && sub->url) {
 		if (starts_with_dot_dot_slash(sub->url) ||
 		    starts_with_dot_slash(sub->url)) {
-			char *remote_url, *up_path;
-			char *remote = get_default_remote();
-			strbuf_addf(&sb, "remote.%s.url", remote);
-
-			if (git_config_get_string(sb.buf, &remote_url))
-				remote_url = xgetcwd();
-
-			up_path = get_up_path(path);
-			sub_origin_url = relative_url(remote_url, sub->url, up_path);
-			super_config_url = relative_url(remote_url, sub->url, NULL);
-
-			free(remote);
+			char *up_path = get_up_path(path);
+			sub_origin_url = resolve_relative_url(sub->url, up_path, 1);
+			super_config_url = resolve_relative_url(sub->url, NULL, 1);
 			free(up_path);
-			free(remote_url);
 		} else {
 			sub_origin_url = xstrdup(sub->url);
 			super_config_url = xstrdup(sub->url);
@@ -1514,7 +1481,7 @@ struct deinit_cb {
 	const char *prefix;
 	unsigned int flags;
 };
-#define DEINIT_CB_INIT { NULL, 0 }
+#define DEINIT_CB_INIT { 0 }
 
 static void deinit_submodule(const char *path, const char *prefix,
 			     unsigned int flags)
@@ -1537,16 +1504,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;
@@ -1657,45 +1625,20 @@ static int module_deinit(int argc, const char **argv, const char *prefix)
 	return 0;
 }
 
-static int clone_submodule(const char *path, const char *gitdir, const char *url,
-			   const char *depth, struct string_list *reference, int dissociate,
-			   int quiet, int progress, int single_branch)
-{
-	struct child_process cp = CHILD_PROCESS_INIT;
-
-	strvec_push(&cp.args, "clone");
-	strvec_push(&cp.args, "--no-checkout");
-	if (quiet)
-		strvec_push(&cp.args, "--quiet");
-	if (progress)
-		strvec_push(&cp.args, "--progress");
-	if (depth && *depth)
-		strvec_pushl(&cp.args, "--depth", depth, NULL);
-	if (reference->nr) {
-		struct string_list_item *item;
-		for_each_string_list_item(item, reference)
-			strvec_pushl(&cp.args, "--reference",
-				     item->string, NULL);
-	}
-	if (dissociate)
-		strvec_push(&cp.args, "--dissociate");
-	if (gitdir && *gitdir)
-		strvec_pushl(&cp.args, "--separate-git-dir", gitdir, NULL);
-	if (single_branch >= 0)
-		strvec_push(&cp.args, single_branch ?
-					  "--single-branch" :
-					  "--no-single-branch");
-
-	strvec_push(&cp.args, "--");
-	strvec_push(&cp.args, url);
-	strvec_push(&cp.args, path);
-
-	cp.git_cmd = 1;
-	prepare_submodule_repo_env(&cp.env_array);
-	cp.no_stdin = 1;
-
-	return run_command(&cp);
-}
+struct module_clone_data {
+	const char *prefix;
+	const char *path;
+	const char *name;
+	const char *url;
+	const char *depth;
+	struct string_list reference;
+	unsigned int quiet: 1;
+	unsigned int progress: 1;
+	unsigned int dissociate: 1;
+	unsigned int require_init: 1;
+	int single_branch;
+};
+#define MODULE_CLONE_DATA_INIT { .reference = STRING_LIST_INIT_NODUP, .single_branch = -1 }
 
 struct submodule_alternate_setup {
 	const char *submodule_name;
@@ -1706,8 +1649,9 @@ struct submodule_alternate_setup {
 	} error_mode;
 	struct string_list *reference;
 };
-#define SUBMODULE_ALTERNATE_SETUP_INIT { NULL, \
-	SUBMODULE_ALTERNATE_ERROR_IGNORE, NULL }
+#define SUBMODULE_ALTERNATE_SETUP_INIT { \
+	.error_mode = SUBMODULE_ALTERNATE_ERROR_IGNORE, \
+}
 
 static const char alternate_error_advice[] = N_(
 "An alternate computed from a superproject's alternate is invalid.\n"
@@ -1727,18 +1671,24 @@ static int add_possible_reference_from_superproject(
 	 * standard layout with .git/(modules/<name>)+/objects
 	 */
 	if (strip_suffix(odb->path, "/objects", &len)) {
+		struct repository alternate;
 		char *sm_alternate;
 		struct strbuf sb = STRBUF_INIT;
 		struct strbuf err = STRBUF_INIT;
 		strbuf_add(&sb, odb->path, len);
 
+		repo_init(&alternate, sb.buf, NULL);
+
 		/*
 		 * We need to end the new path with '/' to mark it as a dir,
 		 * otherwise a submodule name containing '/' will be broken
 		 * as the last part of a missing submodule reference would
 		 * be taken as a file name.
 		 */
-		strbuf_addf(&sb, "/modules/%s/", sas->submodule_name);
+		strbuf_reset(&sb);
+		submodule_name_to_gitdir(&sb, &alternate, sas->submodule_name);
+		strbuf_addch(&sb, '/');
+		repo_clear(&alternate);
 
 		sm_alternate = compute_alternate_path(sb.buf, &err);
 		if (sm_alternate) {
@@ -1747,7 +1697,7 @@ static int add_possible_reference_from_superproject(
 		} else {
 			switch (sas->error_mode) {
 			case SUBMODULE_ALTERNATE_ERROR_DIE:
-				if (advice_submodule_alternate_error_strategy_die)
+				if (advice_enabled(ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE))
 					advise(_(alternate_error_advice));
 				die(_("submodule '%s' cannot add alternate: %s"),
 				    sas->submodule_name, err.buf);
@@ -1801,37 +1751,128 @@ static void prepare_possible_alternates(const char *sm_name,
 	free(error_strategy);
 }
 
-static int module_clone(int argc, const char **argv, const char *prefix)
+static int clone_submodule(struct module_clone_data *clone_data)
 {
-	const char *name = NULL, *url = NULL, *depth = NULL;
-	int quiet = 0;
-	int progress = 0;
-	char *p, *path = NULL, *sm_gitdir;
-	struct strbuf sb = STRBUF_INIT;
-	struct string_list reference = STRING_LIST_INIT_NODUP;
-	int dissociate = 0, require_init = 0;
+	char *p, *sm_gitdir;
 	char *sm_alternate = NULL, *error_strategy = NULL;
-	int single_branch = -1;
+	struct strbuf sb = STRBUF_INIT;
+	struct child_process cp = CHILD_PROCESS_INIT;
+
+	submodule_name_to_gitdir(&sb, the_repository, clone_data->name);
+	sm_gitdir = absolute_pathdup(sb.buf);
+	strbuf_reset(&sb);
+
+	if (!is_absolute_path(clone_data->path)) {
+		strbuf_addf(&sb, "%s/%s", get_git_work_tree(), clone_data->path);
+		clone_data->path = strbuf_detach(&sb, NULL);
+	} else {
+		clone_data->path = xstrdup(clone_data->path);
+	}
+
+	if (validate_submodule_git_dir(sm_gitdir, clone_data->name) < 0)
+		die(_("refusing to create/use '%s' in another submodule's "
+		      "git dir"), sm_gitdir);
+
+	if (!file_exists(sm_gitdir)) {
+		if (safe_create_leading_directories_const(sm_gitdir) < 0)
+			die(_("could not create directory '%s'"), sm_gitdir);
+
+		prepare_possible_alternates(clone_data->name, &clone_data->reference);
+
+		strvec_push(&cp.args, "clone");
+		strvec_push(&cp.args, "--no-checkout");
+		if (clone_data->quiet)
+			strvec_push(&cp.args, "--quiet");
+		if (clone_data->progress)
+			strvec_push(&cp.args, "--progress");
+		if (clone_data->depth && *(clone_data->depth))
+			strvec_pushl(&cp.args, "--depth", clone_data->depth, NULL);
+		if (clone_data->reference.nr) {
+			struct string_list_item *item;
+			for_each_string_list_item(item, &clone_data->reference)
+				strvec_pushl(&cp.args, "--reference",
+					     item->string, NULL);
+		}
+		if (clone_data->dissociate)
+			strvec_push(&cp.args, "--dissociate");
+		if (sm_gitdir && *sm_gitdir)
+			strvec_pushl(&cp.args, "--separate-git-dir", sm_gitdir, NULL);
+		if (clone_data->single_branch >= 0)
+			strvec_push(&cp.args, clone_data->single_branch ?
+				    "--single-branch" :
+				    "--no-single-branch");
+
+		strvec_push(&cp.args, "--");
+		strvec_push(&cp.args, clone_data->url);
+		strvec_push(&cp.args, clone_data->path);
+
+		cp.git_cmd = 1;
+		prepare_submodule_repo_env(&cp.env_array);
+		cp.no_stdin = 1;
+
+		if(run_command(&cp))
+			die(_("clone of '%s' into submodule path '%s' failed"),
+			    clone_data->url, clone_data->path);
+	} else {
+		if (clone_data->require_init && !access(clone_data->path, X_OK) &&
+		    !is_empty_dir(clone_data->path))
+			die(_("directory not empty: '%s'"), clone_data->path);
+		if (safe_create_leading_directories_const(clone_data->path) < 0)
+			die(_("could not create directory '%s'"), clone_data->path);
+		strbuf_addf(&sb, "%s/index", sm_gitdir);
+		unlink_or_warn(sb.buf);
+		strbuf_reset(&sb);
+	}
+
+	connect_work_tree_and_git_dir(clone_data->path, sm_gitdir, 0);
+
+	p = git_pathdup_submodule(clone_data->path, "config");
+	if (!p)
+		die(_("could not get submodule directory for '%s'"), clone_data->path);
+
+	/* setup alternateLocation and alternateErrorStrategy in the cloned submodule if needed */
+	git_config_get_string("submodule.alternateLocation", &sm_alternate);
+	if (sm_alternate)
+		git_config_set_in_file(p, "submodule.alternateLocation",
+				       sm_alternate);
+	git_config_get_string("submodule.alternateErrorStrategy", &error_strategy);
+	if (error_strategy)
+		git_config_set_in_file(p, "submodule.alternateErrorStrategy",
+				       error_strategy);
+
+	free(sm_alternate);
+	free(error_strategy);
+
+	strbuf_release(&sb);
+	free(sm_gitdir);
+	free(p);
+	return 0;
+}
+
+static int module_clone(int argc, const char **argv, const char *prefix)
+{
+	int dissociate = 0, quiet = 0, progress = 0, require_init = 0;
+	struct module_clone_data clone_data = MODULE_CLONE_DATA_INIT;
 
 	struct option module_clone_options[] = {
-		OPT_STRING(0, "prefix", &prefix,
+		OPT_STRING(0, "prefix", &clone_data.prefix,
 			   N_("path"),
 			   N_("alternative anchor for relative paths")),
-		OPT_STRING(0, "path", &path,
+		OPT_STRING(0, "path", &clone_data.path,
 			   N_("path"),
 			   N_("where the new submodule will be cloned to")),
-		OPT_STRING(0, "name", &name,
+		OPT_STRING(0, "name", &clone_data.name,
 			   N_("string"),
 			   N_("name of the new submodule")),
-		OPT_STRING(0, "url", &url,
+		OPT_STRING(0, "url", &clone_data.url,
 			   N_("string"),
 			   N_("url where to clone the submodule from")),
-		OPT_STRING_LIST(0, "reference", &reference,
+		OPT_STRING_LIST(0, "reference", &clone_data.reference,
 			   N_("repo"),
 			   N_("reference repository")),
 		OPT_BOOL(0, "dissociate", &dissociate,
 			   N_("use --reference only while cloning")),
-		OPT_STRING(0, "depth", &depth,
+		OPT_STRING(0, "depth", &clone_data.depth,
 			   N_("string"),
 			   N_("depth for shallow clones")),
 		OPT__QUIET(&quiet, "Suppress output for cloning a submodule"),
@@ -1839,7 +1880,7 @@ static int module_clone(int argc, const char **argv, const char *prefix)
 			   N_("force cloning progress")),
 		OPT_BOOL(0, "require-init", &require_init,
 			   N_("disallow cloning into non-empty directory")),
-		OPT_BOOL(0, "single-branch", &single_branch,
+		OPT_BOOL(0, "single-branch", &clone_data.single_branch,
 			 N_("clone only one branch, HEAD or --branch")),
 		OPT_END()
 	};
@@ -1855,67 +1896,16 @@ static int module_clone(int argc, const char **argv, const char *prefix)
 	argc = parse_options(argc, argv, prefix, module_clone_options,
 			     git_submodule_helper_usage, 0);
 
-	if (argc || !url || !path || !*path)
+	clone_data.dissociate = !!dissociate;
+	clone_data.quiet = !!quiet;
+	clone_data.progress = !!progress;
+	clone_data.require_init = !!require_init;
+
+	if (argc || !clone_data.url || !clone_data.path || !*(clone_data.path))
 		usage_with_options(git_submodule_helper_usage,
 				   module_clone_options);
 
-	strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), name);
-	sm_gitdir = absolute_pathdup(sb.buf);
-	strbuf_reset(&sb);
-
-	if (!is_absolute_path(path)) {
-		strbuf_addf(&sb, "%s/%s", get_git_work_tree(), path);
-		path = strbuf_detach(&sb, NULL);
-	} else
-		path = xstrdup(path);
-
-	if (validate_submodule_git_dir(sm_gitdir, name) < 0)
-		die(_("refusing to create/use '%s' in another submodule's "
-			"git dir"), sm_gitdir);
-
-	if (!file_exists(sm_gitdir)) {
-		if (safe_create_leading_directories_const(sm_gitdir) < 0)
-			die(_("could not create directory '%s'"), sm_gitdir);
-
-		prepare_possible_alternates(name, &reference);
-
-		if (clone_submodule(path, sm_gitdir, url, depth, &reference, dissociate,
-				    quiet, progress, single_branch))
-			die(_("clone of '%s' into submodule path '%s' failed"),
-			    url, path);
-	} else {
-		if (require_init && !access(path, X_OK) && !is_empty_dir(path))
-			die(_("directory not empty: '%s'"), path);
-		if (safe_create_leading_directories_const(path) < 0)
-			die(_("could not create directory '%s'"), path);
-		strbuf_addf(&sb, "%s/index", sm_gitdir);
-		unlink_or_warn(sb.buf);
-		strbuf_reset(&sb);
-	}
-
-	connect_work_tree_and_git_dir(path, sm_gitdir, 0);
-
-	p = git_pathdup_submodule(path, "config");
-	if (!p)
-		die(_("could not get submodule directory for '%s'"), path);
-
-	/* setup alternateLocation and alternateErrorStrategy in the cloned submodule if needed */
-	git_config_get_string("submodule.alternateLocation", &sm_alternate);
-	if (sm_alternate)
-		git_config_set_in_file(p, "submodule.alternateLocation",
-					   sm_alternate);
-	git_config_get_string("submodule.alternateErrorStrategy", &error_strategy);
-	if (error_strategy)
-		git_config_set_in_file(p, "submodule.alternateErrorStrategy",
-					   error_strategy);
-
-	free(sm_alternate);
-	free(error_strategy);
-
-	strbuf_release(&sb);
-	free(sm_gitdir);
-	free(path);
-	free(p);
+	clone_submodule(&clone_data);
 	return 0;
 }
 
@@ -2028,6 +2018,20 @@ struct submodule_update_clone {
 	.max_jobs = 1, \
 }
 
+struct update_data {
+	const char *recursive_prefix;
+	const char *sm_path;
+	const char *displaypath;
+	struct object_id oid;
+	struct object_id suboid;
+	struct submodule_update_strategy update_strategy;
+	int depth;
+	unsigned int force: 1;
+	unsigned int quiet: 1;
+	unsigned int nofetch: 1;
+	unsigned int just_cloned: 1;
+};
+#define UPDATE_DATA_INIT { .update_strategy = SUBMODULE_UPDATE_STRATEGY_INIT }
 
 static void next_submodule_warn_missing(struct submodule_update_clone *suc,
 		struct strbuf *out, const char *displaypath)
@@ -2117,7 +2121,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
 	if (repo_config_get_string_tmp(the_repository, sb.buf, &url)) {
 		if (starts_with_dot_slash(sub->url) ||
 		    starts_with_dot_dot_slash(sub->url)) {
-			url = compute_submodule_clone_url(sub->url);
+			url = resolve_relative_url(sub->url, NULL, 0);
 			need_free_url = 1;
 		} else
 			url = sub->url;
@@ -2281,6 +2285,181 @@ static int git_update_clone_config(const char *var, const char *value,
 	return 0;
 }
 
+static int is_tip_reachable(const char *path, struct object_id *oid)
+{
+	struct child_process cp = CHILD_PROCESS_INIT;
+	struct strbuf rev = STRBUF_INIT;
+	char *hex = oid_to_hex(oid);
+
+	cp.git_cmd = 1;
+	cp.dir = xstrdup(path);
+	cp.no_stderr = 1;
+	strvec_pushl(&cp.args, "rev-list", "-n", "1", hex, "--not", "--all", NULL);
+
+	prepare_submodule_repo_env(&cp.env_array);
+
+	if (capture_command(&cp, &rev, GIT_MAX_HEXSZ + 1) || rev.len)
+		return 0;
+
+	return 1;
+}
+
+static int fetch_in_submodule(const char *module_path, int depth, int quiet, struct object_id *oid)
+{
+	struct child_process cp = CHILD_PROCESS_INIT;
+
+	prepare_submodule_repo_env(&cp.env_array);
+	cp.git_cmd = 1;
+	cp.dir = xstrdup(module_path);
+
+	strvec_push(&cp.args, "fetch");
+	if (quiet)
+		strvec_push(&cp.args, "--quiet");
+	if (depth)
+		strvec_pushf(&cp.args, "--depth=%d", depth);
+	if (oid) {
+		char *hex = oid_to_hex(oid);
+		char *remote = get_default_remote();
+		strvec_pushl(&cp.args, remote, hex, NULL);
+	}
+
+	return run_command(&cp);
+}
+
+static int run_update_command(struct update_data *ud, int subforce)
+{
+	struct strvec args = STRVEC_INIT;
+	struct strvec child_env = STRVEC_INIT;
+	char *oid = oid_to_hex(&ud->oid);
+	int must_die_on_failure = 0;
+	int git_cmd;
+
+	switch (ud->update_strategy.type) {
+	case SM_UPDATE_CHECKOUT:
+		git_cmd = 1;
+		strvec_pushl(&args, "checkout", "-q", NULL);
+		if (subforce)
+			strvec_push(&args, "-f");
+		break;
+	case SM_UPDATE_REBASE:
+		git_cmd = 1;
+		strvec_push(&args, "rebase");
+		if (ud->quiet)
+			strvec_push(&args, "--quiet");
+		must_die_on_failure = 1;
+		break;
+	case SM_UPDATE_MERGE:
+		git_cmd = 1;
+		strvec_push(&args, "merge");
+		if (ud->quiet)
+			strvec_push(&args, "--quiet");
+		must_die_on_failure = 1;
+		break;
+	case SM_UPDATE_COMMAND:
+		git_cmd = 0;
+		strvec_push(&args, ud->update_strategy.command);
+		must_die_on_failure = 1;
+		break;
+	default:
+		BUG("unexpected update strategy type: %s",
+		    submodule_strategy_to_string(&ud->update_strategy));
+	}
+	strvec_push(&args, oid);
+
+	prepare_submodule_repo_env(&child_env);
+	if (run_command_v_opt_cd_env(args.v, git_cmd ? RUN_GIT_CMD : RUN_USING_SHELL,
+				     ud->sm_path, child_env.v)) {
+		switch (ud->update_strategy.type) {
+		case SM_UPDATE_CHECKOUT:
+			printf(_("Unable to checkout '%s' in submodule path '%s'"),
+			       oid, ud->displaypath);
+			break;
+		case SM_UPDATE_REBASE:
+			printf(_("Unable to rebase '%s' in submodule path '%s'"),
+			       oid, ud->displaypath);
+			break;
+		case SM_UPDATE_MERGE:
+			printf(_("Unable to merge '%s' in submodule path '%s'"),
+			       oid, ud->displaypath);
+			break;
+		case SM_UPDATE_COMMAND:
+			printf(_("Execution of '%s %s' failed in submodule path '%s'"),
+			       ud->update_strategy.command, oid, ud->displaypath);
+			break;
+		default:
+			BUG("unexpected update strategy type: %s",
+			    submodule_strategy_to_string(&ud->update_strategy));
+		}
+		/*
+		 * NEEDSWORK: We are currently printing to stdout with error
+		 * return so that the shell caller handles the error output
+		 * properly. Once we start handling the error messages within
+		 * C, we should use die() instead.
+		 */
+		if (must_die_on_failure)
+			return 2;
+		/*
+		 * This signifies to the caller in shell that the command
+		 * failed without dying
+		 */
+		return 1;
+	}
+
+	switch (ud->update_strategy.type) {
+	case SM_UPDATE_CHECKOUT:
+		printf(_("Submodule path '%s': checked out '%s'\n"),
+		       ud->displaypath, oid);
+		break;
+	case SM_UPDATE_REBASE:
+		printf(_("Submodule path '%s': rebased into '%s'\n"),
+		       ud->displaypath, oid);
+		break;
+	case SM_UPDATE_MERGE:
+		printf(_("Submodule path '%s': merged in '%s'\n"),
+		       ud->displaypath, oid);
+		break;
+	case SM_UPDATE_COMMAND:
+		printf(_("Submodule path '%s': '%s %s'\n"),
+		       ud->displaypath, ud->update_strategy.command, oid);
+		break;
+	default:
+		BUG("unexpected update strategy type: %s",
+		    submodule_strategy_to_string(&ud->update_strategy));
+	}
+
+	return 0;
+}
+
+static int do_run_update_procedure(struct update_data *ud)
+{
+	int subforce = is_null_oid(&ud->suboid) || ud->force;
+
+	if (!ud->nofetch) {
+		/*
+		 * Run fetch only if `oid` isn't present or it
+		 * is not reachable from a ref.
+		 */
+		if (!is_tip_reachable(ud->sm_path, &ud->oid) &&
+		    fetch_in_submodule(ud->sm_path, ud->depth, ud->quiet, NULL) &&
+		    !ud->quiet)
+			fprintf_ln(stderr,
+				   _("Unable to fetch in submodule path '%s'; "
+				     "trying to directly fetch %s:"),
+				   ud->displaypath, oid_to_hex(&ud->oid));
+		/*
+		 * Now we tried the usual fetch, but `oid` may
+		 * not be reachable from any of the refs.
+		 */
+		if (!is_tip_reachable(ud->sm_path, &ud->oid) &&
+		    fetch_in_submodule(ud->sm_path, ud->depth, ud->quiet, &ud->oid))
+			die(_("Fetched in submodule path '%s', but it did not "
+			      "contain %s. Direct fetching of that commit failed."),
+			    ud->displaypath, oid_to_hex(&ud->oid));
+	}
+
+	return run_update_command(ud, subforce);
+}
+
 static void update_submodule(struct update_clone_data *ucd)
 {
 	fprintf(stdout, "dummy %s %d\t%s\n",
@@ -2378,6 +2557,73 @@ static int update_clone(int argc, const char **argv, const char *prefix)
 	return update_submodules(&suc);
 }
 
+static int run_update_procedure(int argc, const char **argv, const char *prefix)
+{
+	int force = 0, quiet = 0, nofetch = 0, just_cloned = 0;
+	char *prefixed_path, *update = NULL;
+	struct update_data update_data = UPDATE_DATA_INIT;
+
+	struct option options[] = {
+		OPT__QUIET(&quiet, N_("suppress output for update by rebase or merge")),
+		OPT__FORCE(&force, N_("force checkout updates"), 0),
+		OPT_BOOL('N', "no-fetch", &nofetch,
+			 N_("don't fetch new objects from the remote site")),
+		OPT_BOOL(0, "just-cloned", &just_cloned,
+			 N_("overrides update mode in case the repository is a fresh clone")),
+		OPT_INTEGER(0, "depth", &update_data.depth, N_("depth for shallow fetch")),
+		OPT_STRING(0, "prefix", &prefix,
+			   N_("path"),
+			   N_("path into the working tree")),
+		OPT_STRING(0, "update", &update,
+			   N_("string"),
+			   N_("rebase, merge, checkout or none")),
+		OPT_STRING(0, "recursive-prefix", &update_data.recursive_prefix, N_("path"),
+			   N_("path into the working tree, across nested "
+			      "submodule boundaries")),
+		OPT_CALLBACK_F(0, "oid", &update_data.oid, N_("sha1"),
+			       N_("SHA1 expected by superproject"), PARSE_OPT_NONEG,
+			       parse_opt_object_id),
+		OPT_CALLBACK_F(0, "suboid", &update_data.suboid, N_("subsha1"),
+			       N_("SHA1 of submodule's HEAD"), PARSE_OPT_NONEG,
+			       parse_opt_object_id),
+		OPT_END()
+	};
+
+	const char *const usage[] = {
+		N_("git submodule--helper run-update-procedure [<options>] <path>"),
+		NULL
+	};
+
+	argc = parse_options(argc, argv, prefix, options, usage, 0);
+
+	if (argc != 1)
+		usage_with_options(usage, options);
+
+	update_data.force = !!force;
+	update_data.quiet = !!quiet;
+	update_data.nofetch = !!nofetch;
+	update_data.just_cloned = !!just_cloned;
+	update_data.sm_path = argv[0];
+
+	if (update_data.recursive_prefix)
+		prefixed_path = xstrfmt("%s%s", update_data.recursive_prefix, update_data.sm_path);
+	else
+		prefixed_path = xstrdup(update_data.sm_path);
+
+	update_data.displaypath = get_submodule_displaypath(prefixed_path, prefix);
+
+	determine_submodule_update_strategy(the_repository, update_data.just_cloned,
+					    update_data.sm_path, update,
+					    &update_data.update_strategy);
+
+	free(prefixed_path);
+
+	if (!oideq(&update_data.oid, &update_data.suboid) || update_data.force)
+		return do_run_update_procedure(&update_data);
+
+	return 3;
+}
+
 static int resolve_relative_path(int argc, const char **argv, const char *prefix)
 {
 	struct strbuf sb = STRBUF_INIT;
@@ -2523,7 +2769,6 @@ static int push_check(int argc, const char **argv, const char *prefix)
 
 static int ensure_core_worktree(int argc, const char **argv, const char *prefix)
 {
-	const struct submodule *sub;
 	const char *path;
 	const char *cw;
 	struct repository subrepo;
@@ -2533,11 +2778,7 @@ static int ensure_core_worktree(int argc, const char **argv, const char *prefix)
 
 	path = argv[1];
 
-	sub = submodule_from_path(the_repository, null_oid(), path);
-	if (!sub)
-		BUG("We could get the submodule handle before?");
-
-	if (repo_submodule_init(&subrepo, the_repository, sub))
+	if (repo_submodule_init(&subrepo, the_repository, path, null_oid()))
 		die(_("could not get a repository handle for submodule '%s'"), path);
 
 	if (!repo_config_get_string_tmp(&subrepo, "core.worktree", &cw)) {
@@ -2732,7 +2973,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);
@@ -2744,6 +2985,414 @@ static int module_set_branch(int argc, const char **argv, const char *prefix)
 	return !!ret;
 }
 
+static int module_create_branch(int argc, const char **argv, const char *prefix)
+{
+	enum branch_track track;
+	int quiet = 0, force = 0, reflog = 0, dry_run = 0;
+
+	struct option options[] = {
+		OPT__QUIET(&quiet, N_("print only error messages")),
+		OPT__FORCE(&force, N_("force creation"), 0),
+		OPT_BOOL(0, "create-reflog", &reflog,
+			 N_("create the branch's reflog")),
+		OPT_SET_INT('t', "track", &track,
+			    N_("set up tracking mode (see git-pull(1))"),
+			    BRANCH_TRACK_EXPLICIT),
+		OPT__DRY_RUN(&dry_run,
+			     N_("show whether the branch would be created")),
+		OPT_END()
+	};
+	const char *const usage[] = {
+		N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"),
+		NULL
+	};
+
+	git_config(git_default_config, NULL);
+	track = git_branch_track;
+	argc = parse_options(argc, argv, prefix, options, usage, 0);
+
+	if (argc != 3)
+		usage_with_options(usage, options);
+
+	if (!quiet && !dry_run)
+		printf_ln(_("creating branch '%s'"), argv[0]);
+
+	create_branches_recursively(the_repository, argv[0], argv[1], argv[2],
+				    force, reflog, quiet, track, dry_run);
+	return 0;
+}
+struct add_data {
+	const char *prefix;
+	const char *branch;
+	const char *reference_path;
+	char *sm_path;
+	const char *sm_name;
+	const char *repo;
+	const char *realrepo;
+	int depth;
+	unsigned int force: 1;
+	unsigned int quiet: 1;
+	unsigned int progress: 1;
+	unsigned int dissociate: 1;
+};
+#define ADD_DATA_INIT { .depth = -1 }
+
+static void append_fetch_remotes(struct strbuf *msg, const char *git_dir_path)
+{
+	struct child_process cp_remote = CHILD_PROCESS_INIT;
+	struct strbuf sb_remote_out = STRBUF_INIT;
+
+	cp_remote.git_cmd = 1;
+	strvec_pushf(&cp_remote.env_array,
+		     "GIT_DIR=%s", git_dir_path);
+	strvec_push(&cp_remote.env_array, "GIT_WORK_TREE=.");
+	strvec_pushl(&cp_remote.args, "remote", "-v", NULL);
+	if (!capture_command(&cp_remote, &sb_remote_out, 0)) {
+		char *next_line;
+		char *line = sb_remote_out.buf;
+		while ((next_line = strchr(line, '\n')) != NULL) {
+			size_t len = next_line - line;
+			if (strip_suffix_mem(line, &len, " (fetch)"))
+				strbuf_addf(msg, "  %.*s\n", (int)len, line);
+			line = next_line + 1;
+		}
+	}
+
+	strbuf_release(&sb_remote_out);
+}
+
+static int add_submodule(const struct add_data *add_data)
+{
+	char *submod_gitdir_path;
+	struct module_clone_data clone_data = MODULE_CLONE_DATA_INIT;
+
+	/* perhaps the path already exists and is already a git repo, else clone it */
+	if (is_directory(add_data->sm_path)) {
+		struct strbuf sm_path = STRBUF_INIT;
+		strbuf_addstr(&sm_path, add_data->sm_path);
+		submod_gitdir_path = xstrfmt("%s/.git", add_data->sm_path);
+		if (is_nonbare_repository_dir(&sm_path))
+			printf(_("Adding existing repo at '%s' to the index\n"),
+			       add_data->sm_path);
+		else
+			die(_("'%s' already exists and is not a valid git repo"),
+			    add_data->sm_path);
+		strbuf_release(&sm_path);
+		free(submod_gitdir_path);
+	} else {
+		struct child_process cp = CHILD_PROCESS_INIT;
+		submod_gitdir_path = xstrfmt(".git/modules/%s", add_data->sm_name);
+
+		if (is_directory(submod_gitdir_path)) {
+			if (!add_data->force) {
+				struct strbuf msg = STRBUF_INIT;
+				char *die_msg;
+
+				strbuf_addf(&msg, _("A git directory for '%s' is found "
+						    "locally with remote(s):\n"),
+					    add_data->sm_name);
+
+				append_fetch_remotes(&msg, submod_gitdir_path);
+				free(submod_gitdir_path);
+
+				strbuf_addf(&msg, _("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."),
+					    add_data->realrepo);
+
+				die_msg = strbuf_detach(&msg, NULL);
+				die("%s", die_msg);
+			} else {
+				printf(_("Reactivating local git directory for "
+					 "submodule '%s'\n"), add_data->sm_name);
+			}
+		}
+		free(submod_gitdir_path);
+
+		clone_data.prefix = add_data->prefix;
+		clone_data.path = add_data->sm_path;
+		clone_data.name = add_data->sm_name;
+		clone_data.url = add_data->realrepo;
+		clone_data.quiet = add_data->quiet;
+		clone_data.progress = add_data->progress;
+		if (add_data->reference_path)
+			string_list_append(&clone_data.reference,
+					   xstrdup(add_data->reference_path));
+		clone_data.dissociate = add_data->dissociate;
+		if (add_data->depth >= 0)
+			clone_data.depth = xstrfmt("%d", add_data->depth);
+
+		if (clone_submodule(&clone_data))
+			return -1;
+
+		prepare_submodule_repo_env(&cp.env_array);
+		cp.git_cmd = 1;
+		cp.dir = add_data->sm_path;
+		/*
+		 * NOTE: we only get here if add_data->force is true, so
+		 * passing --force to checkout is reasonable.
+		 */
+		strvec_pushl(&cp.args, "checkout", "-f", "-q", NULL);
+
+		if (add_data->branch) {
+			strvec_pushl(&cp.args, "-B", add_data->branch, NULL);
+			strvec_pushf(&cp.args, "origin/%s", add_data->branch);
+		}
+
+		if (run_command(&cp))
+			die(_("unable to checkout submodule '%s'"), add_data->sm_path);
+	}
+	return 0;
+}
+
+static int config_submodule_in_gitmodules(const char *name, const char *var, const char *value)
+{
+	char *key;
+	int ret;
+
+	if (!is_writing_gitmodules_ok())
+		die(_("please make sure that the .gitmodules file is in the working tree"));
+
+	key = xstrfmt("submodule.%s.%s", name, var);
+	ret = config_set_in_gitmodules_file_gently(key, value);
+	free(key);
+
+	return ret;
+}
+
+static void configure_added_submodule(struct add_data *add_data)
+{
+	char *key;
+	char *val = NULL;
+	struct child_process add_submod = CHILD_PROCESS_INIT;
+	struct child_process add_gitmodules = CHILD_PROCESS_INIT;
+
+	key = xstrfmt("submodule.%s.url", add_data->sm_name);
+	git_config_set_gently(key, add_data->realrepo);
+	free(key);
+
+	add_submod.git_cmd = 1;
+	strvec_pushl(&add_submod.args, "add",
+		     "--no-warn-embedded-repo", NULL);
+	if (add_data->force)
+		strvec_push(&add_submod.args, "--force");
+	strvec_pushl(&add_submod.args, "--", add_data->sm_path, NULL);
+
+	if (run_command(&add_submod))
+		die(_("Failed to add submodule '%s'"), add_data->sm_path);
+
+	if (config_submodule_in_gitmodules(add_data->sm_name, "path", add_data->sm_path) ||
+	    config_submodule_in_gitmodules(add_data->sm_name, "url", add_data->repo))
+		die(_("Failed to register submodule '%s'"), add_data->sm_path);
+
+	if (add_data->branch) {
+		if (config_submodule_in_gitmodules(add_data->sm_name,
+						   "branch", add_data->branch))
+			die(_("Failed to register submodule '%s'"), add_data->sm_path);
+	}
+
+	add_gitmodules.git_cmd = 1;
+	strvec_pushl(&add_gitmodules.args,
+		     "add", "--force", "--", ".gitmodules", NULL);
+
+	if (run_command(&add_gitmodules))
+		die(_("Failed to register submodule '%s'"), add_data->sm_path);
+
+	/*
+	 * NEEDSWORK: In a multi-working-tree world this needs to be
+	 * set in the per-worktree config.
+	 */
+	/*
+	 * NEEDSWORK: In the longer run, we need to get rid of this
+	 * pattern of querying "submodule.active" before calling
+	 * is_submodule_active(), since that function needs to find
+	 * out the value of "submodule.active" again anyway.
+	 */
+	if (!git_config_get_string("submodule.active", &val) && val) {
+		/*
+		 * If the submodule being added isn't already covered by the
+		 * current configured pathspec, set the submodule's active flag
+		 */
+		if (!is_submodule_active(the_repository, add_data->sm_path)) {
+			key = xstrfmt("submodule.%s.active", add_data->sm_name);
+			git_config_set_gently(key, "true");
+			free(key);
+		}
+	} else {
+		key = xstrfmt("submodule.%s.active", add_data->sm_name);
+		git_config_set_gently(key, "true");
+		free(key);
+	}
+}
+
+static void die_on_index_match(const char *path, int force)
+{
+	struct pathspec ps;
+	const char *args[] = { path, NULL };
+	parse_pathspec(&ps, 0, PATHSPEC_PREFER_CWD, NULL, args);
+
+	if (read_cache_preload(NULL) < 0)
+		die(_("index file corrupt"));
+
+	if (ps.nr) {
+		int i;
+		char *ps_matched = xcalloc(ps.nr, 1);
+
+		/* TODO: audit for interaction with sparse-index. */
+		ensure_full_index(&the_index);
+
+		/*
+		 * Since there is only one pathspec, we just need
+		 * need to check ps_matched[0] to know if a cache
+		 * entry matched.
+		 */
+		for (i = 0; i < active_nr; i++) {
+			ce_path_match(&the_index, active_cache[i], &ps,
+				      ps_matched);
+
+			if (ps_matched[0]) {
+				if (!force)
+					die(_("'%s' already exists in the index"),
+					    path);
+				if (!S_ISGITLINK(active_cache[i]->ce_mode))
+					die(_("'%s' already exists in the index "
+					      "and is not a submodule"), path);
+				break;
+			}
+		}
+		free(ps_matched);
+	}
+	clear_pathspec(&ps);
+}
+
+static void die_on_repo_without_commits(const char *path)
+{
+	struct strbuf sb = STRBUF_INIT;
+	strbuf_addstr(&sb, path);
+	if (is_nonbare_repository_dir(&sb)) {
+		struct object_id oid;
+		if (resolve_gitlink_ref(path, "HEAD", &oid) < 0)
+			die(_("'%s' does not have a commit checked out"), path);
+	}
+	strbuf_release(&sb);
+}
+
+static int module_add(int argc, const char **argv, const char *prefix)
+{
+	int force = 0, quiet = 0, progress = 0, dissociate = 0;
+	struct add_data add_data = ADD_DATA_INIT;
+
+	struct option options[] = {
+		OPT_STRING('b', "branch", &add_data.branch, N_("branch"),
+			   N_("branch of repository to add as submodule")),
+		OPT__FORCE(&force, N_("allow adding an otherwise ignored submodule path"),
+			   PARSE_OPT_NOCOMPLETE),
+		OPT__QUIET(&quiet, N_("print only error messages")),
+		OPT_BOOL(0, "progress", &progress, N_("force cloning progress")),
+		OPT_STRING(0, "reference", &add_data.reference_path, N_("repository"),
+			   N_("reference repository")),
+		OPT_BOOL(0, "dissociate", &dissociate, N_("borrow the objects from reference repositories")),
+		OPT_STRING(0, "name", &add_data.sm_name, N_("name"),
+			   N_("sets the submodule’s name to the given string "
+			      "instead of defaulting to its path")),
+		OPT_INTEGER(0, "depth", &add_data.depth, N_("depth for shallow clones")),
+		OPT_END()
+	};
+
+	const char *const usage[] = {
+		N_("git submodule--helper add [<options>] [--] <repository> [<path>]"),
+		NULL
+	};
+
+	argc = parse_options(argc, argv, prefix, options, usage, 0);
+
+	if (!is_writing_gitmodules_ok())
+		die(_("please make sure that the .gitmodules file is in the working tree"));
+
+	if (prefix && *prefix &&
+	    add_data.reference_path && !is_absolute_path(add_data.reference_path))
+		add_data.reference_path = xstrfmt("%s%s", prefix, add_data.reference_path);
+
+	if (argc == 0 || argc > 2)
+		usage_with_options(usage, options);
+
+	add_data.repo = argv[0];
+	if (argc == 1)
+		add_data.sm_path = git_url_basename(add_data.repo, 0, 0);
+	else
+		add_data.sm_path = xstrdup(argv[1]);
+
+	if (prefix && *prefix && !is_absolute_path(add_data.sm_path))
+		add_data.sm_path = xstrfmt("%s%s", prefix, add_data.sm_path);
+
+	if (starts_with_dot_dot_slash(add_data.repo) ||
+	    starts_with_dot_slash(add_data.repo)) {
+		if (prefix)
+			die(_("Relative path can only be used from the toplevel "
+			      "of the working tree"));
+
+		/* dereference source url relative to parent's url */
+		add_data.realrepo = resolve_relative_url(add_data.repo, NULL, 1);
+	} else if (is_dir_sep(add_data.repo[0]) || strchr(add_data.repo, ':')) {
+		add_data.realrepo = add_data.repo;
+	} else {
+		die(_("repo URL: '%s' must be absolute or begin with ./|../"),
+		    add_data.repo);
+	}
+
+	/*
+	 * normalize path:
+	 * multiple //; leading ./; /./; /../;
+	 */
+	normalize_path_copy(add_data.sm_path, add_data.sm_path);
+	strip_dir_trailing_slashes(add_data.sm_path);
+
+	die_on_index_match(add_data.sm_path, force);
+	die_on_repo_without_commits(add_data.sm_path);
+
+	if (!force) {
+		int exit_code = -1;
+		struct strbuf sb = STRBUF_INIT;
+		struct child_process cp = CHILD_PROCESS_INIT;
+		cp.git_cmd = 1;
+		cp.no_stdout = 1;
+		strvec_pushl(&cp.args, "add", "--dry-run", "--ignore-missing",
+			     "--no-warn-embedded-repo", add_data.sm_path, NULL);
+		if ((exit_code = pipe_command(&cp, NULL, 0, NULL, 0, &sb, 0))) {
+			strbuf_complete_line(&sb);
+			fputs(sb.buf, stderr);
+			free(add_data.sm_path);
+			return exit_code;
+		}
+		strbuf_release(&sb);
+	}
+
+	if(!add_data.sm_name)
+		add_data.sm_name = add_data.sm_path;
+
+	if (check_submodule_name(add_data.sm_name))
+		die(_("'%s' is not a valid submodule name"), add_data.sm_name);
+
+	add_data.prefix = prefix;
+	add_data.force = !!force;
+	add_data.quiet = !!quiet;
+	add_data.progress = !!progress;
+	add_data.dissociate = !!dissociate;
+
+	if (add_submodule(&add_data)) {
+		free(add_data.sm_path);
+		return 1;
+	}
+	configure_added_submodule(&add_data);
+	free(add_data.sm_path);
+
+	return 0;
+}
+
 #define SUPPORT_SUPER_PREFIX (1<<0)
 
 struct cmd_struct {
@@ -2756,11 +3405,12 @@ static struct cmd_struct commands[] = {
 	{"list", module_list, 0},
 	{"name", module_name, 0},
 	{"clone", module_clone, 0},
+	{"add", module_add, SUPPORT_SUPER_PREFIX},
 	{"update-module-mode", module_update_module_mode, 0},
 	{"update-clone", update_clone, 0},
+	{"run-update-procedure", run_update_procedure, 0},
 	{"ensure-core-worktree", ensure_core_worktree, 0},
 	{"relative-path", resolve_relative_path, 0},
-	{"resolve-relative-url", resolve_relative_url, 0},
 	{"resolve-relative-url-test", resolve_relative_url_test, 0},
 	{"foreach", module_foreach, SUPPORT_SUPER_PREFIX},
 	{"init", module_init, SUPPORT_SUPER_PREFIX},
@@ -2777,6 +3427,7 @@ static struct cmd_struct commands[] = {
 	{"config", module_config, 0},
 	{"set-url", module_set_url, 0},
 	{"set-branch", module_set_branch, 0},
+	{"create-branch", module_create_branch, 0},
 };
 
 int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
diff --git a/builtin/tag.c b/builtin/tag.c
index 82fcfc0982..134b3f1edf 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -23,10 +23,10 @@
 
 static const char * const git_tag_usage[] = {
 	N_("git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-		"\t\t<tagname> [<head>]"),
+	   "        <tagname> [<head>]"),
 	N_("git tag -d <tagname>..."),
 	N_("git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
-		"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"),
+	   "        [--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"),
 	N_("git tag -v [--format=<format>] <tagname>..."),
 	NULL
 };
@@ -146,7 +146,7 @@ static int verify_tag(const char *name, const char *ref,
 		      const struct object_id *oid, void *cb_data)
 {
 	int flags;
-	const struct ref_format *format = cb_data;
+	struct ref_format *format = cb_data;
 	flags = GPG_VERIFY_VERBOSE;
 
 	if (format->format)
@@ -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;
 	}
 
@@ -293,9 +292,7 @@ static void create_tag(const struct object_id *object, const char *object_ref,
 
 		/* write the template message before editing: */
 		path = git_pathdup("TAG_EDITMSG");
-		fd = open(path, O_CREAT | O_TRUNC | O_WRONLY, 0600);
-		if (fd < 0)
-			die_errno(_("could not create file '%s'"), path);
+		fd = xopen(path, O_CREAT | O_TRUNC | O_WRONLY, 0600);
 
 		if (opt->message_given) {
 			write_or_die(fd, buf->buf, buf->len);
@@ -434,11 +431,12 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 	int annotate = 0, force = 0;
 	int cmdmode = 0, create_tag_object = 0;
 	const char *msgfile = NULL, *keyid = NULL;
-	struct msg_arg msg = { 0, STRBUF_INIT };
+	struct msg_arg msg = { .buf = STRBUF_INIT };
 	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;
@@ -472,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,
@@ -484,10 +482,12 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		OPT_BOOL('i', "ignore-case", &icase, N_("sorting and filtering are case insensitive")),
 		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));
@@ -523,15 +523,13 @@ 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') {
-		int ret;
 		if (column_active(colopts)) {
 			struct column_options copts;
 			memset(&copts, 0, sizeof(copts));
@@ -542,29 +540,36 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		ret = list_tags(&filter, sorting, &format);
 		if (column_active(colopts))
 			stop_column_filter();
-		return ret;
+		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"));
-	if (cmdmode == 'd')
-		return delete_tags(argv);
+		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;
+	}
 	if (cmdmode == 'v') {
 		if (format.format && verify_ref_format(&format))
 			usage_with_options(git_tag_usage, options);
-		return for_each_tag_name(argv, verify_tag, &format);
+		ret = for_each_tag_name(argv, verify_tag, &format);
+		goto cleanup;
 	}
 
 	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 {
@@ -628,10 +633,12 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		printf(_("Updated tag '%s' (was %s)\n"), tag,
 		       find_unique_abbrev(&prev, DEFAULT_ABBREV));
 
-	UNLEAK(buf);
-	UNLEAK(ref);
-	UNLEAK(reflog_msg);
-	UNLEAK(msg);
-	UNLEAK(err);
-	return 0;
+cleanup:
+	ref_sorting_release(sorting);
+	strbuf_release(&buf);
+	strbuf_release(&ref);
+	strbuf_release(&reflog_msg);
+	strbuf_release(&msg.buf);
+	strbuf_release(&err);
+	return ret;
 }
diff --git a/builtin/update-index.c b/builtin/update-index.c
index f1f16f2de5..aafe7eeac2 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -95,9 +95,7 @@ static int create_file(const char *path)
 {
 	int fd;
 	path = get_mtime_path(path);
-	fd = open(path, O_CREAT | O_RDWR, 0644);
-	if (fd < 0)
-		die_errno(_("failed to create file %s"), path);
+	fd = xopen(path, O_CREAT | O_RDWR, 0644);
 	return fd;
 }
 
@@ -608,7 +606,7 @@ static struct cache_entry *read_one_ent(const char *which,
 			error("%s: not in %s branch.", path, which);
 		return NULL;
 	}
-	if (mode == S_IFDIR) {
+	if (!the_index.sparse_index && mode == S_IFDIR) {
 		if (which)
 			error("%s: not a blob in %s branch.", path, which);
 		return NULL;
@@ -745,8 +743,6 @@ static int do_reupdate(int ac, const char **av,
 		 */
 		has_head = 0;
  redo:
-	/* TODO: audit for interaction with sparse-index. */
-	ensure_full_index(&the_index);
 	for (pos = 0; pos < active_nr; pos++) {
 		const struct cache_entry *ce = active_cache[pos];
 		struct cache_entry *old = NULL;
@@ -763,6 +759,16 @@ static int do_reupdate(int ac, const char **av,
 			discard_cache_entry(old);
 			continue; /* unchanged */
 		}
+
+		/* At this point, we know the contents of the sparse directory are
+		 * modified with respect to HEAD, so we expand the index and restart
+		 * to process each path individually
+		 */
+		if (S_ISSPARSEDIR(ce->ce_mode)) {
+			ensure_full_index(&the_index);
+			goto redo;
+		}
+
 		/* Be careful.  The working tree may not have the
 		 * path anymore, in which case, under 'allow_remove',
 		 * or worse yet 'allow_replace', active_nr may decrease.
@@ -789,6 +795,17 @@ static int refresh(struct refresh_params *o, unsigned int flag)
 	setup_work_tree();
 	read_cache();
 	*o->has_errors |= refresh_cache(o->flags | flag);
+	if (has_racy_timestamp(&the_index)) {
+		/*
+		 * Even if nothing else has changed, updating the file
+		 * increases the chance that racy timestamps become
+		 * non-racy, helping future run-time performance.
+		 * We do that even in case of "errors" returned by
+		 * refresh_cache() as these are no actual errors.
+		 * cmd_status() does the same.
+		 */
+		active_cache_changed |= SOMETHING_CHANGED;
+	}
 	return 0;
 }
 
@@ -1079,6 +1096,9 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 
 	git_config(git_default_config, NULL);
 
+	prepare_repo_settings(r);
+	the_repository->settings.command_requires_full_index = 0;
+
 	/* we will diagnose later if it turns out that we need to update it */
 	newfd = hold_locked_index(&lock_file, 0);
 	if (newfd < 0)
diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 6029a80544..a84e7b47a2 100644
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -302,6 +302,12 @@ static void parse_cmd_verify(struct ref_transaction *transaction,
 	strbuf_release(&err);
 }
 
+static void report_ok(const char *command)
+{
+	fprintf(stdout, "%s: ok\n", command);
+	fflush(stdout);
+}
+
 static void parse_cmd_option(struct ref_transaction *transaction,
 			     const char *next, const char *end)
 {
@@ -317,7 +323,7 @@ static void parse_cmd_start(struct ref_transaction *transaction,
 {
 	if (*next != line_termination)
 		die("start: extra input: %s", next);
-	puts("start: ok");
+	report_ok("start");
 }
 
 static void parse_cmd_prepare(struct ref_transaction *transaction,
@@ -328,7 +334,7 @@ static void parse_cmd_prepare(struct ref_transaction *transaction,
 		die("prepare: extra input: %s", next);
 	if (ref_transaction_prepare(transaction, &error))
 		die("prepare: %s", error.buf);
-	puts("prepare: ok");
+	report_ok("prepare");
 }
 
 static void parse_cmd_abort(struct ref_transaction *transaction,
@@ -339,7 +345,7 @@ static void parse_cmd_abort(struct ref_transaction *transaction,
 		die("abort: extra input: %s", next);
 	if (ref_transaction_abort(transaction, &error))
 		die("abort: %s", error.buf);
-	puts("abort: ok");
+	report_ok("abort");
 }
 
 static void parse_cmd_commit(struct ref_transaction *transaction,
@@ -350,7 +356,7 @@ static void parse_cmd_commit(struct ref_transaction *transaction,
 		die("commit: extra input: %s", next);
 	if (ref_transaction_commit(transaction, &error))
 		die("commit: %s", error.buf);
-	puts("commit: ok");
+	report_ok("commit");
 	ref_transaction_free(transaction);
 }
 
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/upload-pack.c b/builtin/upload-pack.c
index 6da8fa2607..125af53885 100644
--- a/builtin/upload-pack.c
+++ b/builtin/upload-pack.c
@@ -16,16 +16,18 @@ int cmd_upload_pack(int argc, const char **argv, const char *prefix)
 {
 	const char *dir;
 	int strict = 0;
-	struct upload_pack_options opts = { 0 };
-	struct serve_options serve_opts = SERVE_OPTIONS_INIT;
+	int advertise_refs = 0;
+	int stateless_rpc = 0;
+	int timeout = 0;
 	struct option options[] = {
-		OPT_BOOL(0, "stateless-rpc", &opts.stateless_rpc,
+		OPT_BOOL(0, "stateless-rpc", &stateless_rpc,
 			 N_("quit after a single request/response exchange")),
-		OPT_BOOL(0, "advertise-refs", &opts.advertise_refs,
-			 N_("exit immediately after initial ref advertisement")),
+		OPT_HIDDEN_BOOL(0, "http-backend-info-refs", &advertise_refs,
+				N_("serve up the info/refs for git-http-backend")),
+		OPT_ALIAS(0, "advertise-refs", "http-backend-info-refs"),
 		OPT_BOOL(0, "strict", &strict,
 			 N_("do not try <directory>/.git/ if <directory> is no Git directory")),
-		OPT_INTEGER(0, "timeout", &opts.timeout,
+		OPT_INTEGER(0, "timeout", &timeout,
 			    N_("interrupt transfer after <n> seconds of inactivity")),
 		OPT_END()
 	};
@@ -38,9 +40,6 @@ int cmd_upload_pack(int argc, const char **argv, const char *prefix)
 	if (argc != 1)
 		usage_with_options(upload_pack_usage, options);
 
-	if (opts.timeout)
-		opts.daemon_mode = 1;
-
 	setup_path();
 
 	dir = argv[0];
@@ -50,21 +49,22 @@ int cmd_upload_pack(int argc, const char **argv, const char *prefix)
 
 	switch (determine_protocol_version_server()) {
 	case protocol_v2:
-		serve_opts.advertise_capabilities = opts.advertise_refs;
-		serve_opts.stateless_rpc = opts.stateless_rpc;
-		serve(&serve_opts);
+		if (advertise_refs)
+			protocol_v2_advertise_capabilities();
+		else
+			protocol_v2_serve_loop(stateless_rpc);
 		break;
 	case protocol_v1:
 		/*
 		 * v1 is just the original protocol with a version string,
 		 * so just fall through after writing the version string.
 		 */
-		if (opts.advertise_refs || !opts.stateless_rpc)
+		if (advertise_refs || !stateless_rpc)
 			packet_write_fmt(1, "version 1\n");
 
 		/* fallthrough */
 	case protocol_v0:
-		upload_pack(&opts);
+		upload_pack(advertise_refs, stateless_rpc, timeout);
 		break;
 	case protocol_unknown_version:
 		BUG("unknown protocol version");
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 976bf8ed06..e23e6343d0 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -8,6 +8,7 @@
 #include "branch.h"
 #include "refs.h"
 #include "run-command.h"
+#include "hook.h"
 #include "sigchain.h"
 #include "submodule.h"
 #include "utf8.h"
@@ -30,7 +31,7 @@ struct add_opts {
 	int detach;
 	int quiet;
 	int checkout;
-	int keep_locked;
+	const char *keep_locked;
 };
 
 static int show_only;
@@ -71,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);
 }
@@ -302,10 +303,10 @@ static int add_worktree(const char *path, const char *refname,
 	 * after the preparation is over.
 	 */
 	strbuf_addf(&sb, "%s/locked", sb_repo.buf);
-	if (!opts->keep_locked)
-		write_file(sb.buf, "initializing");
+	if (opts->keep_locked)
+		write_file(sb.buf, "%s", opts->keep_locked);
 	else
-		write_file(sb.buf, "added with --lock");
+		write_file(sb.buf, _("initializing"));
 
 	strbuf_addf(&sb_git, "%s/.git", path);
 	if (safe_create_leading_directories_const(sb_git.buf))
@@ -334,6 +335,69 @@ static int add_worktree(const char *path, const char *refname,
 	strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
 	write_file(sb.buf, "../..");
 
+	/*
+	 * If the current worktree has sparse-checkout enabled, then copy
+	 * the sparse-checkout patterns from the current worktree.
+	 */
+	if (core_apply_sparse_checkout) {
+		char *from_file = git_pathdup("info/sparse-checkout");
+		char *to_file = xstrfmt("%s/info/sparse-checkout",
+					sb_repo.buf);
+
+		if (file_exists(from_file)) {
+			if (safe_create_leading_directories(to_file) ||
+			    copy_file(to_file, from_file, 0666))
+				error(_("failed to copy '%s' to '%s'; sparse-checkout may not work correctly"),
+				      from_file, to_file);
+		}
+
+		free(from_file);
+		free(to_file);
+	}
+
+	/*
+	 * If we are using worktree config, then copy all current config
+	 * values from the current worktree into the new one, that way the
+	 * new worktree behaves the same as this one.
+	 */
+	if (repository_format_worktree_config) {
+		char *from_file = git_pathdup("config.worktree");
+		char *to_file = xstrfmt("%s/config.worktree",
+					sb_repo.buf);
+
+		if (file_exists(from_file)) {
+			struct config_set cs = { { 0 } };
+			const char *core_worktree;
+			int bare;
+
+			if (safe_create_leading_directories(to_file) ||
+			    copy_file(to_file, from_file, 0666)) {
+				error(_("failed to copy worktree config from '%s' to '%s'"),
+				      from_file, to_file);
+				goto worktree_copy_cleanup;
+			}
+
+			git_configset_init(&cs);
+			git_configset_add_file(&cs, from_file);
+
+			if (!git_configset_get_bool(&cs, "core.bare", &bare) &&
+			    bare &&
+			    git_config_set_multivar_in_file_gently(
+					to_file, "core.bare", NULL, "true", 0))
+				error(_("failed to unset 'core.bare' in '%s'"), to_file);
+			if (!git_configset_get_value(&cs, "core.worktree", &core_worktree) &&
+			    git_config_set_in_file_gently(to_file,
+							  "core.worktree", NULL))
+				error(_("failed to unset 'core.worktree' in '%s'"), to_file);
+
+			git_configset_clear(&cs);
+		}
+
+worktree_copy_cleanup:
+		free(from_file);
+		free(to_file);
+	}
+
 	strvec_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf);
 	strvec_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
 	cp.git_cmd = 1;
@@ -348,18 +412,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;
@@ -381,22 +445,17 @@ done:
 	 * is_junk is cleared, but do return appropriate code when hook fails.
 	 */
 	if (!ret && opts->checkout) {
-		const char *hook = find_hook("post-checkout");
-		if (hook) {
-			const char *env[] = { "GIT_DIR", "GIT_WORK_TREE", NULL };
-			cp.git_cmd = 0;
-			cp.no_stdin = 1;
-			cp.stdout_to_stderr = 1;
-			cp.dir = path;
-			cp.env = env;
-			cp.argv = NULL;
-			cp.trace2_hook_name = "post-checkout";
-			strvec_pushl(&cp.args, absolute_path(hook),
-				     oid_to_hex(null_oid()),
-				     oid_to_hex(&commit->object.oid),
-				     "1", NULL);
-			ret = run_command(&cp);
-		}
+		struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
+
+		strvec_pushl(&opt.env, "GIT_DIR", "GIT_WORK_TREE", NULL);
+		strvec_pushl(&opt.args,
+			     oid_to_hex(null_oid()),
+			     oid_to_hex(&commit->object.oid),
+			     "1",
+			     NULL);
+		opt.dir = path;
+
+		ret = run_hooks_opt("post-checkout", &opt);
 	}
 
 	strvec_clear(&child_env);
@@ -417,24 +476,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);
@@ -475,6 +534,8 @@ static int add(int ac, const char **av, const char *prefix)
 	const char *branch;
 	const char *new_branch = NULL;
 	const char *opt_track = NULL;
+	const char *lock_reason = NULL;
+	int keep_locked = 0;
 	struct option options[] = {
 		OPT__FORCE(&opts.force,
 			   N_("checkout <branch> even if already checked out in other worktree"),
@@ -485,7 +546,9 @@ static int add(int ac, const char **av, const char *prefix)
 			   N_("create or reset a branch")),
 		OPT_BOOL('d', "detach", &opts.detach, N_("detach HEAD at named commit")),
 		OPT_BOOL(0, "checkout", &opts.checkout, N_("populate the new working tree")),
-		OPT_BOOL(0, "lock", &opts.keep_locked, N_("keep the new working tree locked")),
+		OPT_BOOL(0, "lock", &keep_locked, N_("keep the new working tree locked")),
+		OPT_STRING(0, "reason", &lock_reason, N_("string"),
+			   N_("reason for locking")),
 		OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),
 		OPT_PASSTHRU(0, "track", &opt_track, NULL,
 			     N_("set up tracking mode (see git-branch(1))"),
@@ -499,7 +562,14 @@ 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(_("the option '%s' requires '%s'"), "--reason", "--lock");
+	if (lock_reason)
+		opts.keep_locked = lock_reason;
+	else if (keep_locked)
+		opts.keep_locked = _("added with --lock");
+
 	if (ac < 1 || ac > 2)
 		usage_with_options(worktree_usage, options);
 
@@ -688,7 +758,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;
@@ -994,7 +1064,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/bulk-checkin.c b/bulk-checkin.c
index b023d9959a..8785b2ac80 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -23,9 +23,25 @@ static struct bulk_checkin_state {
 	uint32_t nr_written;
 } state;
 
+static void finish_tmp_packfile(struct strbuf *basename,
+				const char *pack_tmp_name,
+				struct pack_idx_entry **written_list,
+				uint32_t nr_written,
+				struct pack_idx_option *pack_idx_opts,
+				unsigned char hash[])
+{
+	char *idx_tmp_name = NULL;
+
+	stage_tmp_packfiles(basename, pack_tmp_name, written_list, nr_written,
+			    pack_idx_opts, hash, &idx_tmp_name);
+	rename_tmp_packfile_idx(basename, &idx_tmp_name);
+
+	free(idx_tmp_name);
+}
+
 static void finish_bulk_checkin(struct bulk_checkin_state *state)
 {
-	struct object_id oid;
+	unsigned char hash[GIT_MAX_RAWSZ];
 	struct strbuf packname = STRBUF_INIT;
 	int i;
 
@@ -37,19 +53,20 @@ static void finish_bulk_checkin(struct bulk_checkin_state *state)
 		unlink(state->pack_tmp_name);
 		goto clear_exit;
 	} else if (state->nr_written == 1) {
-		finalize_hashfile(state->f, oid.hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE);
+		finalize_hashfile(state->f, hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE);
 	} else {
-		int fd = finalize_hashfile(state->f, oid.hash, 0);
-		fixup_pack_header_footer(fd, oid.hash, state->pack_tmp_name,
-					 state->nr_written, oid.hash,
+		int fd = finalize_hashfile(state->f, hash, 0);
+		fixup_pack_header_footer(fd, hash, state->pack_tmp_name,
+					 state->nr_written, hash,
 					 state->offset);
 		close(fd);
 	}
 
-	strbuf_addf(&packname, "%s/pack/pack-", get_object_directory());
+	strbuf_addf(&packname, "%s/pack/pack-%s.", get_object_directory(),
+		    hash_to_hex(hash));
 	finish_tmp_packfile(&packname, state->pack_tmp_name,
 			    state->written, state->nr_written,
-			    &state->pack_idx_opts, oid.hash);
+			    &state->pack_idx_opts, hash);
 	for (i = 0; i < state->nr_written; i++)
 		free(state->written[i]);
 
diff --git a/bundle.c b/bundle.c
index ab63f40226..a0bb687b0f 100644
--- a/bundle.c
+++ b/bundle.c
@@ -569,18 +569,18 @@ err:
 }
 
 int unbundle(struct repository *r, struct bundle_header *header,
-	     int bundle_fd, int flags)
+	     int bundle_fd, struct strvec *extra_index_pack_args)
 {
-	const char *argv_index_pack[] = {"index-pack",
-					 "--fix-thin", "--stdin", NULL, NULL};
 	struct child_process ip = CHILD_PROCESS_INIT;
+	strvec_pushl(&ip.args, "index-pack", "--fix-thin", "--stdin", NULL);
 
-	if (flags & BUNDLE_VERBOSE)
-		argv_index_pack[3] = "-v";
+	if (extra_index_pack_args) {
+		strvec_pushv(&ip.args, extra_index_pack_args->v);
+		strvec_clear(extra_index_pack_args);
+	}
 
 	if (verify_bundle(r, header, 0))
 		return -1;
-	ip.argv = argv_index_pack;
 	ip.in = bundle_fd;
 	ip.no_stdout = 1;
 	ip.git_cmd = 1;
diff --git a/bundle.h b/bundle.h
index 1927d8cd6a..06009fe6b1 100644
--- a/bundle.h
+++ b/bundle.h
@@ -26,9 +26,19 @@ int create_bundle(struct repository *r, const char *path,
 		  int argc, const char **argv, struct strvec *pack_options,
 		  int version);
 int verify_bundle(struct repository *r, struct bundle_header *header, int verbose);
-#define BUNDLE_VERBOSE 1
+
+/**
+ * Unbundle after reading the header with read_bundle_header().
+ *
+ * We'll invoke "git index-pack --stdin --fix-thin" for you on the
+ * provided `bundle_fd` from read_bundle_header().
+ *
+ * Provide "extra_index_pack_args" to pass any extra arguments
+ * (e.g. "-v" for verbose/progress), NULL otherwise. The provided
+ * "extra_index_pack_args" (if any) will be strvec_clear()'d for you.
+ */
 int unbundle(struct repository *r, struct bundle_header *header,
-	     int bundle_fd, int flags);
+	     int bundle_fd, struct strvec *extra_index_pack_args);
 int list_bundle_refs(struct bundle_header *header,
 		int argc, const char **argv);
 
diff --git a/cache-tree.c b/cache-tree.c
index 45e58666af..65ca993361 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -237,6 +237,11 @@ int cache_tree_fully_valid(struct cache_tree *it)
 	return 1;
 }
 
+static int must_check_existence(const struct cache_entry *ce)
+{
+	return !(has_promisor_remote() && ce_skip_worktree(ce));
+}
+
 static int update_one(struct cache_tree *it,
 		      struct cache_entry **cache,
 		      int entries,
@@ -378,8 +383,7 @@ static int update_one(struct cache_tree *it,
 		}
 
 		ce_missing_ok = mode == S_IFGITLINK || missing_ok ||
-			(has_promisor_remote() &&
-			 ce_skip_worktree(ce));
+			!must_check_existence(ce);
 		if (is_null_oid(oid) ||
 		    (!ce_missing_ok && !has_object_file(oid))) {
 			strbuf_release(&buffer);
@@ -436,8 +440,9 @@ static int update_one(struct cache_tree *it,
 	} else if (dryrun) {
 		hash_object_file(the_hash_algo, buffer.buf, buffer.len,
 				 tree_type, &it->oid);
-	} else if (write_object_file(buffer.buf, buffer.len, tree_type,
-				     &it->oid)) {
+	} else if (write_object_file_flags(buffer.buf, buffer.len, tree_type,
+					   &it->oid, flags & WRITE_TREE_SILENT
+					   ? HASH_SILENT : 0)) {
 		strbuf_release(&buffer);
 		return -1;
 	}
@@ -461,11 +466,12 @@ int cache_tree_update(struct index_state *istate, int flags)
 	if (i)
 		return i;
 
-	ensure_full_index(istate);
-
 	if (!istate->cache_tree)
 		istate->cache_tree = cache_tree();
 
+	if (!(flags & WRITE_TREE_MISSING_OK) && has_promisor_remote())
+		prefetch_cache_entries(istate, must_check_existence);
+
 	trace_performance_enter();
 	trace2_region_enter("cache_tree", "update", the_repository);
 	i = update_one(istate->cache_tree, istate->cache, istate->cache_nr,
@@ -735,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)) {
@@ -752,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;
 }
 
@@ -767,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);
 }
@@ -821,10 +867,17 @@ static void verify_one_sparse(struct repository *r,
 		    path->buf);
 }
 
-static void verify_one(struct repository *r,
-		       struct index_state *istate,
-		       struct cache_tree *it,
-		       struct strbuf *path)
+/*
+ * Returns:
+ *  0 - Verification completed.
+ *  1 - Restart verification - a call to ensure_full_index() freed the cache
+ *      tree that is being verified and verification needs to be restarted from
+ *      the new toplevel cache tree.
+ */
+static int verify_one(struct repository *r,
+		      struct index_state *istate,
+		      struct cache_tree *it,
+		      struct strbuf *path)
 {
 	int i, pos, len = path->len;
 	struct strbuf tree_buf = STRBUF_INIT;
@@ -832,21 +885,30 @@ static void verify_one(struct repository *r,
 
 	for (i = 0; i < it->subtree_nr; i++) {
 		strbuf_addf(path, "%s/", it->down[i]->name);
-		verify_one(r, istate, it->down[i]->cache_tree, path);
+		if (verify_one(r, istate, it->down[i]->cache_tree, path))
+			return 1;
 		strbuf_setlen(path, len);
 	}
 
 	if (it->entry_count < 0 ||
 	    /* no verification on tests (t7003) that replace trees */
 	    lookup_replace_object(r, &it->oid) != &it->oid)
-		return;
+		return 0;
 
 	if (path->len) {
+		/*
+		 * If the index is sparse and the cache tree is not
+		 * index_name_pos() may trigger ensure_full_index() which will
+		 * free the tree that is being verified.
+		 */
+		int is_sparse = istate->sparse_index;
 		pos = index_name_pos(istate, path->buf, path->len);
+		if (is_sparse && !istate->sparse_index)
+			return 1;
 
 		if (pos >= 0) {
 			verify_one_sparse(r, istate, it, path, pos);
-			return;
+			return 0;
 		}
 
 		pos = -pos - 1;
@@ -894,6 +956,7 @@ static void verify_one(struct repository *r,
 		    oid_to_hex(&new_oid), oid_to_hex(&it->oid));
 	strbuf_setlen(path, len);
 	strbuf_release(&tree_buf);
+	return 0;
 }
 
 void cache_tree_verify(struct repository *r, struct index_state *istate)
@@ -902,6 +965,10 @@ void cache_tree_verify(struct repository *r, struct index_state *istate)
 
 	if (!istate->cache_tree)
 		return;
-	verify_one(r, istate, istate->cache_tree, &path);
+	if (verify_one(r, istate, istate->cache_tree, &path)) {
+		strbuf_reset(&path);
+		if (verify_one(r, istate, istate->cache_tree, &path))
+			BUG("ensure_full_index() called twice while verifying cache tree");
+	}
 	strbuf_release(&path);
 }
diff --git a/cache.h b/cache.h
index ba04ff8bd3..825ec17198 100644
--- a/cache.h
+++ b/cache.h
@@ -18,7 +18,6 @@
 #include "repository.h"
 #include "mem-pool.h"
 
-#include <zlib.h>
 typedef struct git_zstream {
 	z_stream z;
 	unsigned long avail_in;
@@ -350,8 +349,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 */
 
 /*
@@ -410,6 +407,15 @@ struct cache_entry *dup_cache_entry(const struct cache_entry *ce, struct index_s
  */
 void validate_cache_entries(const struct index_state *istate);
 
+/*
+ * Bulk prefetch all missing cache entries that are not GITLINKs and that match
+ * the given predicate. This function should only be called if
+ * has_promisor_remote() returns true.
+ */
+typedef int (*must_prefetch_predicate)(const struct cache_entry *);
+void prefetch_cache_entries(const struct index_state *istate,
+			    must_prefetch_predicate must_prefetch);
+
 #ifdef USE_THE_INDEX_COMPATIBILITY_MACROS
 extern struct index_state the_index;
 
@@ -808,6 +814,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
@@ -872,12 +888,14 @@ void *read_blob_data_from_index(struct index_state *, const char *, unsigned lon
 #define CE_MATCH_IGNORE_FSMONITOR 0X20
 int is_racy_timestamp(const struct index_state *istate,
 		      const struct cache_entry *ce);
+int has_racy_timestamp(struct index_state *istate);
 int ie_match_stat(struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
 int ie_modified(struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
 
 #define HASH_WRITE_OBJECT 1
 #define HASH_FORMAT_CHECK 2
 #define HASH_RENORMALIZE  4
+#define HASH_SILENT 8
 int index_fd(struct index_state *istate, struct object_id *oid, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);
 int index_path(struct index_state *istate, struct object_id *oid, const char *path, struct stat *st, unsigned flags);
 
@@ -949,7 +967,6 @@ extern char *apply_default_ignorewhitespace;
 extern const char *git_attributes_file;
 extern const char *git_hooks_path;
 extern int zlib_compression_level;
-extern int core_compression_level;
 extern int pack_compression_level;
 extern size_t packed_git_window_size;
 extern size_t packed_git_limit;
@@ -977,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;
@@ -987,14 +1005,6 @@ extern int core_apply_sparse_checkout;
 extern int core_sparse_checkout_cone;
 
 /*
- * Include broken refs in all ref iterations, which will
- * generally choke dangerous operations rather than letting
- * them silently proceed without taking the broken ref into
- * account.
- */
-extern int ref_paranoia;
-
-/*
  * Returns the boolean value of $GIT_OPTIONAL_LOCKS (or the default value).
  */
 int use_optional_locks(void);
@@ -1202,51 +1212,10 @@ enum scld_error safe_create_leading_directories(char *path);
 enum scld_error safe_create_leading_directories_const(const char *path);
 enum scld_error safe_create_leading_directories_no_share(char *path);
 
-/*
- * Callback function for raceproof_create_file(). This function is
- * expected to do something that makes dirname(path) permanent despite
- * the fact that other processes might be cleaning up empty
- * directories at the same time. Usually it will create a file named
- * path, but alternatively it could create another file in that
- * directory, or even chdir() into that directory. The function should
- * return 0 if the action was completed successfully. On error, it
- * should return a nonzero result and set errno.
- * raceproof_create_file() treats two errno values specially:
- *
- * - ENOENT -- dirname(path) does not exist. In this case,
- *             raceproof_create_file() tries creating dirname(path)
- *             (and any parent directories, if necessary) and calls
- *             the function again.
- *
- * - EISDIR -- the file already exists and is a directory. In this
- *             case, raceproof_create_file() removes the directory if
- *             it is empty (and recursively any empty directories that
- *             it contains) and calls the function again.
- *
- * Any other errno causes raceproof_create_file() to fail with the
- * callback's return value and errno.
- *
- * Obviously, this function should be OK with being called again if it
- * fails with ENOENT or EISDIR. In other scenarios it will not be
- * called again.
- */
-typedef int create_file_fn(const char *path, void *cb);
-
-/*
- * Create a file in dirname(path) by calling fn, creating leading
- * directories if necessary. Retry a few times in case we are racing
- * with another process that is trying to clean up the directory that
- * contains path. See the documentation for create_file_fn for more
- * details.
- *
- * Return the value and set the errno that resulted from the most
- * recent call of fn. fn is always called at least once, and will be
- * called more than once if it returns ENOENT or EISDIR.
- */
-int raceproof_create_file(const char *path, create_file_fn fn, void *cb);
-
 int mkdir_in_gitdir(const char *path);
-char *expand_user_path(const char *path, int real_home);
+char *interpolate_path(const char *path, int real_home);
+/* NEEDSWORK: remove this synonym once in-flight topics have migrated */
+#define expand_user_path interpolate_path
 const char *enter_repo(const char *path, int strict);
 static inline int is_absolute_path(const char *path)
 {
@@ -1288,6 +1257,13 @@ int looks_like_command_line_option(const char *str);
 
 /**
  * Return a newly allocated string with the evaluation of
+ * "$XDG_CONFIG_HOME/$subdir/$filename" if $XDG_CONFIG_HOME is non-empty, otherwise
+ * "$HOME/.config/$subdir/$filename". Return NULL upon error.
+ */
+char *xdg_config_home_for(const char *subdir, const char *filename);
+
+/**
+ * Return a newly allocated string with the evaluation of
  * "$XDG_CONFIG_HOME/git/$filename" if $XDG_CONFIG_HOME is non-empty, otherwise
  * "$HOME/.config/git/$filename". Return NULL upon error.
  */
@@ -1302,11 +1278,50 @@ char *xdg_cache_home(const char *filename);
 
 int git_open_cloexec(const char *name, int flags);
 #define git_open(name) git_open_cloexec(name, O_RDONLY)
-int unpack_loose_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz);
-int parse_loose_header(const char *hdr, unsigned long *sizep);
+
+/**
+ * unpack_loose_header() initializes the data stream needed to unpack
+ * a loose object header.
+ *
+ * Returns:
+ *
+ * - ULHR_OK on success
+ * - ULHR_BAD on error
+ * - ULHR_TOO_LONG if the header was too long
+ *
+ * It will only parse up to MAX_HEADER_LEN bytes unless an optional
+ * "hdrbuf" argument is non-NULL. This is intended for use with
+ * OBJECT_INFO_ALLOW_UNKNOWN_TYPE to extract the bad type for (error)
+ * reporting. The full header will be extracted to "hdrbuf" for use
+ * with parse_loose_header(), ULHR_TOO_LONG will still be returned
+ * from this function to indicate that the header was too long.
+ */
+enum unpack_loose_header_result {
+	ULHR_OK,
+	ULHR_BAD,
+	ULHR_TOO_LONG,
+};
+enum unpack_loose_header_result unpack_loose_header(git_zstream *stream,
+						    unsigned char *map,
+						    unsigned long mapsize,
+						    void *buffer,
+						    unsigned long bufsiz,
+						    struct strbuf *hdrbuf);
+
+/**
+ * parse_loose_header() parses the starting "<type> <len>\0" of an
+ * object. If it doesn't follow that format -1 is returned. To check
+ * the validity of the <type> populate the "typep" in the "struct
+ * object_info". It will be OBJ_BAD if the object type is unknown. The
+ * parsed <len> can be retrieved via "oi->sizep", and from there
+ * passed to unpack_loose_rest().
+ */
+struct object_info;
+int parse_loose_header(const char *hdr, struct object_info *oi);
 
 int check_object_signature(struct repository *r, const struct object_id *oid,
-			   void *buf, unsigned long size, const char *type);
+			   void *buf, unsigned long size, const char *type,
+			   struct object_id *real_oidp);
 
 int finalize_object_file(const char *tmpfile, const char *filename);
 
@@ -1360,6 +1375,7 @@ struct object_context {
 #define GET_OID_FOLLOW_SYMLINKS 0100
 #define GET_OID_RECORD_PATH     0200
 #define GET_OID_ONLY_TO_DIE    04000
+#define GET_OID_REQUIRE_PATH  010000
 
 #define GET_OID_DISAMBIGUATORS \
 	(GET_OID_COMMIT | GET_OID_COMMITTISH | \
@@ -1385,6 +1401,7 @@ enum get_oid_result {
 };
 
 int repo_get_oid(struct repository *r, const char *str, struct object_id *oid);
+__attribute__((format (printf, 2, 3)))
 int get_oidf(struct object_id *oid, const char *fmt, ...);
 int repo_get_oid_commit(struct repository *r, const char *str, struct object_id *oid);
 int repo_get_oid_committish(struct repository *r, const char *str, struct object_id *oid);
@@ -1581,6 +1598,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
@@ -1650,7 +1668,9 @@ struct cache_def {
 	int track_flags;
 	int prefix_len_stat_func;
 };
-#define CACHE_DEF_INIT { STRBUF_INIT, 0, 0, 0 }
+#define CACHE_DEF_INIT { \
+	.path = STRBUF_INIT, \
+}
 static inline void cache_def_clear(struct cache_def *cache)
 {
 	strbuf_release(&cache->path);
@@ -1707,13 +1727,6 @@ int update_server_info(int);
 const char *get_log_output_encoding(void);
 const char *get_commit_output_encoding(void);
 
-/*
- * This is a hack for test programs like test-dump-untracked-cache to
- * ensure that they do not modify the untracked cache when reading it.
- * Do not use it otherwise!
- */
-extern int ignore_untracked_cache_config;
-
 int committer_ident_sufficiently_given(void);
 int author_ident_sufficiently_given(void);
 
@@ -1726,6 +1739,8 @@ extern const char *git_mailmap_blob;
 void maybe_flush_or_die(FILE *, const char *);
 __attribute__((format (printf, 2, 3)))
 void fprintf_or_die(FILE *, const char *fmt, ...);
+void fwrite_or_die(FILE *f, const void *buf, size_t count);
+void fflush_or_die(FILE *f);
 
 #define COPY_READ_ERROR (-2)
 #define COPY_WRITE_ERROR (-3)
@@ -1830,8 +1845,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
new file mode 100644
index 0000000000..336e46dbba
--- /dev/null
+++ b/cbtree.c
@@ -0,0 +1,135 @@
+/*
+ * crit-bit tree implementation, does no allocations internally
+ * For more information on crit-bit trees: https://cr.yp.to/critbit.html
+ * Based on Adam Langley's adaptation of Dan Bernstein's public domain code
+ * git clone https://github.com/agl/critbit.git
+ */
+#include "cbtree.h"
+
+static struct cb_node *cb_node_of(const void *p)
+{
+	return (struct cb_node *)((uintptr_t)p - 1);
+}
+
+/* locate the best match, does not do a final comparision */
+static struct cb_node *cb_internal_best_match(struct cb_node *p,
+					const uint8_t *k, size_t klen)
+{
+	while (1 & (uintptr_t)p) {
+		struct cb_node *q = cb_node_of(p);
+		uint8_t c = q->byte < klen ? k[q->byte] : 0;
+		size_t direction = (1 + (q->otherbits | c)) >> 8;
+
+		p = q->child[direction];
+	}
+	return p;
+}
+
+/* returns NULL if successful, existing cb_node if duplicate */
+struct cb_node *cb_insert(struct cb_tree *t, struct cb_node *node, size_t klen)
+{
+	size_t newbyte, newotherbits;
+	uint8_t c;
+	int newdirection;
+	struct cb_node **wherep, *p;
+
+	assert(!((uintptr_t)node & 1)); /* allocations must be aligned */
+
+	if (!t->root) {		/* insert into empty tree */
+		t->root = node;
+		return NULL;	/* success */
+	}
+
+	/* see if a node already exists */
+	p = cb_internal_best_match(t->root, node->k, klen);
+
+	/* find first differing byte */
+	for (newbyte = 0; newbyte < klen; newbyte++) {
+		if (p->k[newbyte] != node->k[newbyte])
+			goto different_byte_found;
+	}
+	return p;	/* element exists, let user deal with it */
+
+different_byte_found:
+	newotherbits = p->k[newbyte] ^ node->k[newbyte];
+	newotherbits |= newotherbits >> 1;
+	newotherbits |= newotherbits >> 2;
+	newotherbits |= newotherbits >> 4;
+	newotherbits = (newotherbits & ~(newotherbits >> 1)) ^ 255;
+	c = p->k[newbyte];
+	newdirection = (1 + (newotherbits | c)) >> 8;
+
+	node->byte = newbyte;
+	node->otherbits = newotherbits;
+	node->child[1 - newdirection] = node;
+
+	/* find a place to insert it */
+	wherep = &t->root;
+	for (;;) {
+		struct cb_node *q;
+		size_t direction;
+
+		p = *wherep;
+		if (!(1 & (uintptr_t)p))
+			break;
+		q = cb_node_of(p);
+		if (q->byte > newbyte)
+			break;
+		if (q->byte == newbyte && q->otherbits > newotherbits)
+			break;
+		c = q->byte < klen ? node->k[q->byte] : 0;
+		direction = (1 + (q->otherbits | c)) >> 8;
+		wherep = q->child + direction;
+	}
+
+	node->child[newdirection] = *wherep;
+	*wherep = (struct cb_node *)(1 + (uintptr_t)node);
+
+	return NULL; /* success */
+}
+
+struct cb_node *cb_lookup(struct cb_tree *t, const uint8_t *k, size_t klen)
+{
+	struct cb_node *p = cb_internal_best_match(t->root, k, klen);
+
+	return p && !memcmp(p->k, k, klen) ? p : NULL;
+}
+
+static enum cb_next cb_descend(struct cb_node *p, cb_iter fn, void *arg)
+{
+	if (1 & (uintptr_t)p) {
+		struct cb_node *q = cb_node_of(p);
+		enum cb_next n = cb_descend(q->child[0], fn, arg);
+
+		return n == CB_BREAK ? n : cb_descend(q->child[1], fn, arg);
+	} else {
+		return fn(p, arg);
+	}
+}
+
+void cb_each(struct cb_tree *t, const uint8_t *kpfx, size_t klen,
+			cb_iter fn, void *arg)
+{
+	struct cb_node *p = t->root;
+	struct cb_node *top = p;
+	size_t i = 0;
+
+	if (!p) return; /* empty tree */
+
+	/* Walk tree, maintaining top pointer */
+	while (1 & (uintptr_t)p) {
+		struct cb_node *q = cb_node_of(p);
+		uint8_t c = q->byte < klen ? kpfx[q->byte] : 0;
+		size_t direction = (1 + (q->otherbits | c)) >> 8;
+
+		p = q->child[direction];
+		if (q->byte < klen)
+			top = p;
+	}
+
+	for (i = 0; i < klen; i++) {
+		if (p->k[i] != kpfx[i])
+			return; /* "best" match failed */
+	}
+	cb_descend(top, fn, arg);
+}
diff --git a/cbtree.h b/cbtree.h
new file mode 100644
index 0000000000..0be14fb7ee
--- /dev/null
+++ b/cbtree.h
@@ -0,0 +1,56 @@
+/*
+ * crit-bit tree implementation, does no allocations internally
+ * For more information on crit-bit trees: https://cr.yp.to/critbit.html
+ * Based on Adam Langley's adaptation of Dan Bernstein's public domain code
+ * git clone https://github.com/agl/critbit.git
+ *
+ * This is adapted to store arbitrary data (not just NUL-terminated C strings
+ * and allocates no memory internally.  The user needs to allocate
+ * "struct cb_node" and fill cb_node.k[] with arbitrary match data
+ * for memcmp.
+ * If "klen" is variable, then it should be embedded into "c_node.k[]"
+ * Recursion is bound by the maximum value of "klen" used.
+ */
+#ifndef CBTREE_H
+#define CBTREE_H
+
+#include "git-compat-util.h"
+
+struct cb_node;
+struct cb_node {
+	struct cb_node *child[2];
+	/*
+	 * n.b. uint32_t for `byte' is excessive for OIDs,
+	 * we may consider shorter variants if nothing else gets stored.
+	 */
+	uint32_t byte;
+	uint8_t otherbits;
+	uint8_t k[FLEX_ARRAY]; /* arbitrary data, unaligned */
+};
+
+struct cb_tree {
+	struct cb_node *root;
+};
+
+enum cb_next {
+	CB_CONTINUE = 0,
+	CB_BREAK = 1
+};
+
+#define CBTREE_INIT { 0 }
+
+static inline void cb_init(struct cb_tree *t)
+{
+	struct cb_tree blank = CBTREE_INIT;
+	memcpy(t, &blank, sizeof(*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);
+
+typedef enum cb_next (*cb_iter)(struct cb_node *, void *arg);
+
+void cb_each(struct cb_tree *, const uint8_t *kpfx, size_t klen,
+		cb_iter, void *arg);
+
+#endif /* CBTREE_H */
diff --git a/check_bindir b/check_bindir
deleted file mode 100755
index 623eadcbb7..0000000000
--- a/check_bindir
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-bindir="$1"
-gitexecdir="$2"
-gitcmd="$3"
-if test "$bindir" != "$gitexecdir" && test -x "$gitcmd"
-then
-	echo
-	echo "!! You have installed git-* commands to new gitexecdir."
-	echo "!! Old version git-* commands still remain in bindir."
-	echo "!! Mixing two versions of Git will lead to problems."
-	echo "!! Please remove old version commands in bindir now."
-	echo
-fi
diff --git a/checkout.c b/checkout.c
index 6586e30ca5..2e39dae684 100644
--- a/checkout.c
+++ b/checkout.c
@@ -14,7 +14,7 @@ struct tracking_name_data {
 	struct object_id *default_dst_oid;
 };
 
-#define TRACKING_NAME_DATA_INIT { NULL, NULL, NULL, 0, NULL, NULL, NULL }
+#define TRACKING_NAME_DATA_INIT { 0 }
 
 static int check_tracking_name(struct remote *remote, void *cb_data)
 {
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 67852d0d37..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)
-	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)
 		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,20 +44,27 @@ 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 \
 		libexpat-dev gettext make
 	;;
+sparse)
+	sudo apt-get -q update -q
+	sudo apt-get -q -y install libssl-dev libcurl4-openssl-dev \
+		libexpat-dev gettext zlib1g-dev
+	;;
 Documentation)
 	sudo apt-get -q update
 	sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make
@@ -72,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 26a6689766..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 \
@@ -15,4 +15,8 @@ linux-musl)
 	apk add --update build-base curl-dev openssl-dev expat-dev gettext \
 		pcre2-dev python3 musl-libintl perl-utils ncurses >/dev/null
 	;;
+pedantic)
+	dnf -yq update >/dev/null &&
+	dnf -yq install make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null
+	;;
 esac
diff --git a/ci/lib.sh b/ci/lib.sh
index 476c3f369f..cbc2f8f1ca 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)
+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,23 +184,18 @@ linux-clang|linux-gcc)
 	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
 	;;
 linux-musl)
@@ -231,6 +204,10 @@ linux-musl)
 	MAKEFLAGS="$MAKEFLAGS NO_REGEX=Yes ICONV_OMITS_BOM=Yes"
 	MAKEFLAGS="$MAKEFLAGS GIT_TEST_UTF8_LOCALE=C.UTF-8"
 	;;
+linux-leaks)
+	export SANITIZE=leak
+	export GIT_TEST_PASSING_SANITIZE_LEAK=true
+	;;
 esac
 
 MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}"
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 3ce81ffee9..280dda7d28 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -10,11 +10,13 @@ windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
 *) ln -s "$cache_dir/.prove" t/.prove;;
 esac
 
-make
+export MAKE_TARGETS="all test"
+
 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
@@ -23,28 +25,30 @@ linux-gcc)
 	export GIT_TEST_COMMIT_GRAPH=1
 	export GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1
 	export GIT_TEST_MULTI_PACK_INDEX=1
+	export GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=1
 	export GIT_TEST_ADD_I_USE_BUILTIN=1
 	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)
 	# Don't run the tests; we only care about whether Git can be
-	# built with GCC 4.8, as it errors out on some undesired (C99)
-	# constructs that newer compilers seem to quietly accept.
-	;;
-*)
-	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 a289f09ed6..9bd6f3c48f 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
@@ -103,6 +103,7 @@ git-grep                                mainporcelain           info
 git-gui                                 mainporcelain
 git-hash-object                         plumbingmanipulators
 git-help                                ancillaryinterrogators          complete
+git-hook                                purehelpers
 git-http-backend                        synchingrepositories
 git-http-fetch                          synchelpers
 git-http-push                           synchelpers
@@ -111,7 +112,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 +124,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 +154,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           worktree
-git-stash                               mainporcelain
+git-sparse-checkout                     mainporcelain
 git-stage                                                               complete
+git-stash                               mainporcelain
 git-status                              mainporcelain           info
 git-stripspace                          purehelpers
 git-submodule                           mainporcelain
@@ -189,7 +189,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 +203,7 @@ gitfaq                                  guide
 gitglossary                             guide
 githooks                                guide
 gitignore                               guide
+gitk                                    mainporcelain
 gitmailmap                              guide
 gitmodules                              guide
 gitnamespaces                           guide
@@ -211,6 +211,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 1a2602da61..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)
@@ -713,6 +716,7 @@ static void close_commit_graph_one(struct commit_graph *g)
 	if (!g)
 		return;
 
+	clear_commit_graph_data_slab(&commit_graph_data_slab);
 	close_commit_graph_one(g->base_graph);
 	free_commit_graph(g);
 }
@@ -723,7 +727,7 @@ void close_commit_graph(struct raw_object_store *o)
 	o->commit_graph = NULL;
 }
 
-static int bsearch_graph(struct commit_graph *g, struct object_id *oid, uint32_t *pos)
+static int bsearch_graph(struct commit_graph *g, const struct object_id *oid, uint32_t *pos)
 {
 	return bsearch_hash(oid->hash, g->chunk_oid_fanout,
 			    g->chunk_oid_lookup, g->hash_len, pos);
@@ -864,26 +868,55 @@ static int fill_commit_in_graph(struct repository *r,
 	return 1;
 }
 
-static int find_commit_in_graph(struct commit *item, struct commit_graph *g, uint32_t *pos)
+static int search_commit_pos_in_graph(const struct object_id *id, struct commit_graph *g, uint32_t *pos)
+{
+	struct commit_graph *cur_g = g;
+	uint32_t lex_index;
+
+	while (cur_g && !bsearch_graph(cur_g, id, &lex_index))
+		cur_g = cur_g->base_graph;
+
+	if (cur_g) {
+		*pos = lex_index + cur_g->num_commits_in_base;
+		return 1;
+	}
+
+	return 0;
+}
+
+static int find_commit_pos_in_graph(struct commit *item, struct commit_graph *g, uint32_t *pos)
 {
 	uint32_t graph_pos = commit_graph_position(item);
 	if (graph_pos != COMMIT_NOT_FROM_GRAPH) {
 		*pos = graph_pos;
 		return 1;
 	} else {
-		struct commit_graph *cur_g = g;
-		uint32_t lex_index;
+		return search_commit_pos_in_graph(&item->object.oid, g, pos);
+	}
+}
 
-		while (cur_g && !bsearch_graph(cur_g, &(item->object.oid), &lex_index))
-			cur_g = cur_g->base_graph;
+struct commit *lookup_commit_in_graph(struct repository *repo, const struct object_id *id)
+{
+	struct commit *commit;
+	uint32_t pos;
 
-		if (cur_g) {
-			*pos = lex_index + cur_g->num_commits_in_base;
-			return 1;
-		}
+	if (!repo->objects->commit_graph)
+		return NULL;
+	if (!search_commit_pos_in_graph(id, repo->objects->commit_graph, &pos))
+		return NULL;
+	if (!repo_has_object_file(repo, id))
+		return NULL;
 
-		return 0;
-	}
+	commit = lookup_commit(repo, id);
+	if (!commit)
+		return NULL;
+	if (commit->object.parsed)
+		return commit;
+
+	if (!fill_commit_in_graph(repo, commit, repo->objects->commit_graph, pos))
+		return NULL;
+
+	return commit;
 }
 
 static int parse_commit_in_graph_one(struct repository *r,
@@ -895,7 +928,7 @@ static int parse_commit_in_graph_one(struct repository *r,
 	if (item->object.parsed)
 		return 1;
 
-	if (find_commit_in_graph(item, g, &pos))
+	if (find_commit_pos_in_graph(item, g, &pos))
 		return fill_commit_in_graph(r, item, g, pos);
 
 	return 0;
@@ -921,7 +954,7 @@ void load_commit_graph_info(struct repository *r, struct commit *item)
 	uint32_t pos;
 	if (!prepare_commit_graph(r))
 		return;
-	if (find_commit_in_graph(item, r->objects->commit_graph, &pos))
+	if (find_commit_pos_in_graph(item, r->objects->commit_graph, &pos))
 		fill_commit_graph_info(item, r->objects->commit_graph, pos);
 }
 
@@ -1091,9 +1124,9 @@ static int write_graph_chunk_data(struct hashfile *f,
 				edge_value += ctx->new_num_commits_in_base;
 			else if (ctx->new_base_graph) {
 				uint32_t pos;
-				if (find_commit_in_graph(parent->item,
-							 ctx->new_base_graph,
-							 &pos))
+				if (find_commit_pos_in_graph(parent->item,
+							     ctx->new_base_graph,
+							     &pos))
 					edge_value = pos;
 			}
 
@@ -1122,9 +1155,9 @@ static int write_graph_chunk_data(struct hashfile *f,
 				edge_value += ctx->new_num_commits_in_base;
 			else if (ctx->new_base_graph) {
 				uint32_t pos;
-				if (find_commit_in_graph(parent->item,
-							 ctx->new_base_graph,
-							 &pos))
+				if (find_commit_pos_in_graph(parent->item,
+							     ctx->new_base_graph,
+							     &pos))
 					edge_value = pos;
 			}
 
@@ -1235,9 +1268,9 @@ static int write_graph_chunk_extra_edges(struct hashfile *f,
 				edge_value += ctx->new_num_commits_in_base;
 			else if (ctx->new_base_graph) {
 				uint32_t pos;
-				if (find_commit_in_graph(parent->item,
-							 ctx->new_base_graph,
-							 &pos))
+				if (find_commit_pos_in_graph(parent->item,
+							     ctx->new_base_graph,
+							     &pos))
 					edge_value = pos;
 			}
 
@@ -2096,7 +2129,7 @@ static void sort_and_scan_merged_commits(struct write_commit_graph_context *ctx)
 
 	ctx->num_extra_edges = 0;
 	for (i = 0; i < ctx->commits.nr; i++) {
-		display_progress(ctx->progress, i);
+		display_progress(ctx->progress, i + 1);
 
 		if (i && oideq(&ctx->commits.list[i - 1]->object.oid,
 			  &ctx->commits.list[i]->object.oid)) {
@@ -2408,6 +2441,7 @@ cleanup:
 #define VERIFY_COMMIT_GRAPH_ERROR_HASH 2
 static int verify_commit_graph_error;
 
+__attribute__((format (printf, 1, 2)))
 static void graph_report(const char *fmt, ...)
 {
 	va_list ap;
diff --git a/commit-graph.h b/commit-graph.h
index 96c24fb577..04a94e1830 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -41,6 +41,14 @@ int open_commit_graph(const char *graph_file, int *fd, struct stat *st);
 int parse_commit_in_graph(struct repository *r, struct commit *item);
 
 /*
+ * Look up the given commit ID in the commit-graph. This will only return a
+ * commit if the ID exists both in the graph and in the object database such
+ * that we don't return commits whose object has been pruned. Otherwise, this
+ * function returns `NULL`.
+ */
+struct commit *lookup_commit_in_graph(struct repository *repo, const struct object_id *id);
+
+/*
  * It is possible that we loaded commit contents from the commit buffer,
  * but we also want to ensure the commit-graph content is correctly
  * checked and filled. Fill the graph_pos and generation members of
diff --git a/commit.c b/commit.c
index 143f472c0f..d400f5dfa2 100644
--- a/commit.c
+++ b/commit.c
@@ -21,10 +21,12 @@
 #include "commit-reach.h"
 #include "run-command.h"
 #include "shallow.h"
+#include "hook.h"
 
 static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
 
 int save_commit_buffer = 1;
+int no_graft_file_deprecated_advice;
 
 const char *commit_type = "commit";
 
@@ -190,7 +192,8 @@ static int read_graft_file(struct repository *r, const char *graft_file)
 	struct strbuf buf = STRBUF_INIT;
 	if (!fp)
 		return -1;
-	if (advice_graft_file_deprecated)
+	if (!no_graft_file_deprecated_advice &&
+	    advice_enabled(ADVICE_GRAFT_FILE_DEPRECATED))
 		advise(_("Support for <GIT_DIR>/info/grafts is deprecated\n"
 			 "and will be removed in a future Git version.\n"
 			 "\n"
@@ -1210,8 +1213,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);
@@ -1627,12 +1632,20 @@ struct commit_list **commit_list_append(struct commit *commit,
 	return &new_commit->next;
 }
 
-const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
+const char *find_header_mem(const char *msg, size_t len,
+			const char *key, size_t *out_len)
 {
 	int key_len = strlen(key);
 	const char *line = msg;
 
-	while (line) {
+	/*
+	 * NEEDSWORK: It's possible for strchrnul() to scan beyond the range
+	 * given by len. However, current callers are safe because they compute
+	 * len by scanning a NUL-terminated block of memory starting at msg.
+	 * Nonetheless, it would be better to ensure the function does not look
+	 * at msg beyond the len provided by the caller.
+	 */
+	while (line && line < msg + len) {
 		const char *eol = strchrnul(line, '\n');
 
 		if (line == eol)
@@ -1649,6 +1662,10 @@ const char *find_commit_header(const char *msg, const char *key, size_t *out_len
 	return NULL;
 }
 
+const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
+{
+	return find_header_mem(msg, strlen(msg), key, out_len);
+}
 /*
  * Inspect the given string and determine the true "end" of the log message, in
  * order to find where to put a new Signed-off-by trailer.  Ignored are
@@ -1698,22 +1715,22 @@ size_t ignore_non_trailer(const char *buf, size_t len)
 int run_commit_hook(int editor_is_used, const char *index_file,
 		    const char *name, ...)
 {
-	struct strvec hook_env = STRVEC_INIT;
+	struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
 	va_list args;
-	int ret;
+	const char *arg;
 
-	strvec_pushf(&hook_env, "GIT_INDEX_FILE=%s", index_file);
+	strvec_pushf(&opt.env, "GIT_INDEX_FILE=%s", index_file);
 
 	/*
 	 * Let the hook know that no editor will be launched.
 	 */
 	if (!editor_is_used)
-		strvec_push(&hook_env, "GIT_EDITOR=:");
+		strvec_push(&opt.env, "GIT_EDITOR=:");
 
 	va_start(args, name);
-	ret = run_hook_ve(hook_env.v, name, args);
+	while ((arg = va_arg(args, const char *)))
+		strvec_push(&opt.args, arg);
 	va_end(args);
-	strvec_clear(&hook_env);
 
-	return ret;
+	return run_hooks_opt(name, &opt);
 }
diff --git a/commit.h b/commit.h
index df42eb434f..38cc542661 100644
--- a/commit.h
+++ b/commit.h
@@ -41,6 +41,7 @@ struct commit {
 };
 
 extern int save_commit_buffer;
+extern int no_graft_file_deprecated_advice;
 extern const char *commit_type;
 
 /* While we can decorate any object with a name, it's only used for commits.. */
@@ -289,12 +290,17 @@ void free_commit_extra_headers(struct commit_extra_header *extra);
 
 /*
  * Search the commit object contents given by "msg" for the header "key".
+ * Reads up to "len" bytes of "msg".
  * Returns a pointer to the start of the header contents, or NULL. The length
  * of the header, up to the first newline, is returned via out_len.
  *
  * Note that some headers (like mergetag) may be multi-line. It is the caller's
  * responsibility to parse further in this case!
  */
+const char *find_header_mem(const char *msg, size_t len,
+			const char *key,
+			size_t *out_len);
+
 const char *find_commit_header(const char *msg, const char *key,
 			       size_t *out_len);
 
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/linux/procinfo.c b/compat/linux/procinfo.c
new file mode 100644
index 0000000000..bc2f9382a1
--- /dev/null
+++ b/compat/linux/procinfo.c
@@ -0,0 +1,176 @@
+#include "cache.h"
+
+#include "strbuf.h"
+#include "strvec.h"
+#include "trace2.h"
+
+/*
+ * We need more complex parsing in stat_parent_pid() and
+ * parse_proc_stat() below than a dumb fscanf(). That's because while
+ * the statcomm field is surrounded by parentheses, the process itself
+ * is free to insert any arbitrary byte sequence its its name. That
+ * can include newlines, spaces, closing parentheses etc.
+ *
+ * See do_task_stat() in fs/proc/array.c in linux.git, this is in
+ * contrast with the escaped version of the name found in
+ * /proc/%d/status.
+ *
+ * So instead of using fscanf() we'll read N bytes from it, look for
+ * the first "(", and then the last ")", anything in-between is our
+ * process name.
+ *
+ * How much N do we need? On Linux /proc/sys/kernel/pid_max is 2^15 by
+ * default, but it can be raised set to values of up to 2^22. So
+ * that's 7 digits for a PID. We have 2 PIDs in the first four fields
+ * we're interested in, so 2 * 7 = 14.
+ *
+ * We then have 3 spaces between those four values, and we'd like to
+ * get to the space between the 4th and the 5th (the "pgrp" field) to
+ * make sure we read the entire "ppid" field. So that brings us up to
+ * 14 + 3 + 1 = 18. Add the two parentheses around the "comm" value
+ * and it's 20. The "state" value itself is then one character (now at
+ * 21).
+ *
+ * Finally the maximum length of the "comm" name itself is 15
+ * characters, e.g. a setting of "123456789abcdefg" will be truncated
+ * to "123456789abcdef". See PR_SET_NAME in prctl(2). So all in all
+ * we'd need to read 21 + 15 = 36 bytes.
+ *
+ * Let's just read 2^6 (64) instead for good measure. If PID_MAX ever
+ * grows past 2^22 we'll be future-proof. We'll then anchor at the
+ * last ")" we find to locate the parent PID.
+ */
+#define STAT_PARENT_PID_READ_N 64
+
+static int parse_proc_stat(struct strbuf *sb, struct strbuf *name,
+			    int *statppid)
+{
+	const char *comm_lhs = strchr(sb->buf, '(');
+	const char *comm_rhs = strrchr(sb->buf, ')');
+	const char *ppid_lhs, *ppid_rhs;
+	char *p;
+	pid_t ppid;
+
+	if (!comm_lhs || !comm_rhs)
+		goto bad_kernel;
+
+	/*
+	 * We're at the ")", that's followed by " X ", where X is a
+	 * single "state" character. So advance by 4 bytes.
+	 */
+	ppid_lhs = comm_rhs + 4;
+
+	/*
+	 * Read until the space between the "ppid" and "pgrp" fields
+	 * to make sure we're anchored after the untruncated "ppid"
+	 * field..
+	 */
+	ppid_rhs = strchr(ppid_lhs, ' ');
+	if (!ppid_rhs)
+		goto bad_kernel;
+
+	ppid = strtol(ppid_lhs, &p, 10);
+	if (ppid_rhs == p) {
+		const char *comm = comm_lhs + 1;
+		size_t commlen = comm_rhs - comm;
+
+		strbuf_add(name, comm, commlen);
+		*statppid = ppid;
+
+		return 0;
+	}
+
+bad_kernel:
+	/*
+	 * We were able to read our STAT_PARENT_PID_READ_N bytes from
+	 * /proc/%d/stat, but the content is bad. Broken kernel?
+	 * Should not happen, but handle it gracefully.
+	 */
+	return -1;
+}
+
+static int stat_parent_pid(pid_t pid, struct strbuf *name, int *statppid)
+{
+	struct strbuf procfs_path = STRBUF_INIT;
+	struct strbuf sb = STRBUF_INIT;
+	FILE *fp;
+	int ret = -1;
+
+	/* try to use procfs if it's present. */
+	strbuf_addf(&procfs_path, "/proc/%d/stat", pid);
+	fp = fopen(procfs_path.buf, "r");
+	if (!fp)
+		goto cleanup;
+
+	/*
+	 * We could be more strict here and assert that we read at
+	 * least STAT_PARENT_PID_READ_N. My reading of procfs(5) is
+	 * that on any modern kernel (at least since 2.6.0 released in
+	 * 2003) even if all the mandatory numeric fields were zero'd
+	 * out we'd get at least 100 bytes, but let's just check that
+	 * we got anything at all and trust the parse_proc_stat()
+	 * function to handle its "Bad Kernel?" error checking.
+	 */
+	if (!strbuf_fread(&sb, STAT_PARENT_PID_READ_N, fp))
+		goto cleanup;
+	if (parse_proc_stat(&sb, name, statppid) < 0)
+		goto cleanup;
+
+	ret = 0;
+cleanup:
+	if (fp)
+		fclose(fp);
+	strbuf_release(&procfs_path);
+	strbuf_release(&sb);
+
+	return ret;
+}
+
+static void push_ancestry_name(struct strvec *names, pid_t pid)
+{
+	struct strbuf name = STRBUF_INIT;
+	int ppid;
+
+	if (stat_parent_pid(pid, &name, &ppid) < 0)
+		goto cleanup;
+
+	strvec_push(names, name.buf);
+
+	/*
+	 * Both errors and reaching the end of the process chain are
+	 * reported as fields of 0 by proc(5)
+	 */
+	if (ppid)
+		push_ancestry_name(names, ppid);
+cleanup:
+	strbuf_release(&name);
+
+	return;
+}
+
+void trace2_collect_process_info(enum trace2_process_info_reason reason)
+{
+	struct strvec names = STRVEC_INIT;
+
+	if (!trace2_is_enabled())
+		return;
+
+	switch (reason) {
+	case TRACE2_PROCESS_INFO_EXIT:
+		/*
+		 * The Windows version of this calls its
+		 * get_peak_memory_info() here. We may want to insert
+		 * similar process-end statistics here in the future.
+		 */
+		break;
+	case TRACE2_PROCESS_INFO_STARTUP:
+		push_ancestry_name(&names, getppid());
+
+		if (names.nr)
+			trace2_cmd_ancestry(names.v);
+		strvec_clear(&names);
+		break;
+	}
+
+	return;
+}
diff --git a/compat/mingw.c b/compat/mingw.c
index aa647b367b..03af369b2b 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -8,6 +8,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)
 
@@ -341,6 +343,27 @@ int mingw_rmdir(const char *pathname)
 {
 	int ret, tries = 0;
 	wchar_t wpathname[MAX_PATH];
+	struct stat st;
+
+	/*
+	 * Contrary to Linux' `rmdir()`, Windows' _wrmdir() and _rmdir()
+	 * (and `RemoveDirectoryW()`) will attempt to remove the target of a
+	 * symbolic link (if it points to a directory).
+	 *
+	 * This behavior breaks the assumption of e.g. `remove_path()` which
+	 * upon successful deletion of a file will attempt to remove its parent
+	 * directories recursively until failure (which usually happens when
+	 * the directory is not empty).
+	 *
+	 * Therefore, before calling `_wrmdir()`, we first check if the path is
+	 * a symbolic link. If it is, we exit and return the same error as
+	 * Linux' `rmdir()` would, i.e. `ENOTDIR`.
+	 */
+	if (!mingw_lstat(pathname, &st) && S_ISLNK(st.st_mode)) {
+		errno = ENOTDIR;
+		return -1;
+	}
+
 	if (xutftowcs_path(wpathname, pathname) < 0)
 		return -1;
 
@@ -987,7 +1010,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))
@@ -1062,6 +1085,7 @@ int pipe(int filedes[2])
 	return 0;
 }
 
+#ifndef __MINGW64__
 struct tm *gmtime_r(const time_t *timep, struct tm *result)
 {
 	if (gmtime_s(result, timep) == 0)
@@ -1075,6 +1099,7 @@ struct tm *localtime_r(const time_t *timep, struct tm *result)
 		return result;
 	return NULL;
 }
+#endif
 
 char *mingw_getcwd(char *pointer, int len)
 {
@@ -1102,6 +1127,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);
@@ -2162,7 +2191,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/mmap.c b/compat/mmap.c
index 14d31010df..8d6c02d4bc 100644
--- a/compat/mmap.c
+++ b/compat/mmap.c
@@ -7,7 +7,12 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of
 	if (start != NULL || flags != MAP_PRIVATE || prot != PROT_READ)
 		die("Invalid usage of mmap when built with NO_MMAP");
 
-	start = xmalloc(length);
+	if (length == 0) {
+		errno = EINVAL;
+		return MAP_FAILED;
+	}
+
+	start = malloc(length);
 	if (start == NULL) {
 		errno = ENOMEM;
 		return MAP_FAILED;
diff --git a/compat/nedmalloc/nedmalloc.c b/compat/nedmalloc/nedmalloc.c
index 1cc31c3502..edb438a777 100644
--- a/compat/nedmalloc/nedmalloc.c
+++ b/compat/nedmalloc/nedmalloc.c
@@ -510,7 +510,7 @@ static void threadcache_free(nedpool *p, threadcache *tc, int mymspace, void *me
 	assert(idx<=THREADCACHEMAXBINS);
 	if(tck==*binsptr)
 	{
-		fprintf(stderr, "Attempt to free already freed memory block %p - aborting!\n", tck);
+		fprintf(stderr, "Attempt to free already freed memory block %p - aborting!\n", (void *)tck);
 		abort();
 	}
 #ifdef FULLSANITYCHECKS
diff --git a/compat/qsort_s.c b/compat/qsort_s.c
index 52d1f0a73d..0f7ff30f5f 100644
--- a/compat/qsort_s.c
+++ b/compat/qsort_s.c
@@ -49,21 +49,15 @@ int git_qsort_s(void *b, size_t n, size_t s,
 		int (*cmp)(const void *, const void *, void *), void *ctx)
 {
 	const size_t size = st_mult(n, s);
-	char buf[1024];
+	char *tmp;
 
 	if (!n)
 		return 0;
 	if (!b || !cmp)
 		return -1;
 
-	if (size < sizeof(buf)) {
-		/* The temporary array fits on the small on-stack buffer. */
-		msort_with_tmp(b, n, s, cmp, buf, ctx);
-	} else {
-		/* It's somewhat large, so malloc it.  */
-		char *tmp = xmalloc(size);
-		msort_with_tmp(b, n, s, cmp, tmp, ctx);
-		free(tmp);
-	}
+	tmp = xmalloc(size);
+	msort_with_tmp(b, n, s, cmp, tmp, ctx);
+	free(tmp);
 	return 0;
 }
diff --git a/compat/simple-ipc/ipc-unix-socket.c b/compat/simple-ipc/ipc-unix-socket.c
index 1927e6ef4b..28a79289d4 100644
--- a/compat/simple-ipc/ipc-unix-socket.c
+++ b/compat/simple-ipc/ipc-unix-socket.c
@@ -35,6 +35,28 @@ enum ipc_active_state ipc_get_active_state(const char *path)
 		}
 	}
 
+#ifdef __CYGWIN__
+	/*
+	 * Cygwin emulates Unix sockets by writing special-crafted files whose
+	 * `system` bit is set.
+	 *
+	 * If we are too fast, Cygwin might still be in the process of marking
+	 * the underlying file as a system file. Until then, we will not see a
+	 * Unix socket here, but a plain file instead. Just in case that this
+	 * is happening, wait a little and try again.
+	 */
+	{
+		static const int delay[] = { 1, 10, 20, 40, -1 };
+		int i;
+
+		for (i = 0; S_ISREG(st.st_mode) && delay[i] > 0; i++) {
+			sleep_millisec(delay[i]);
+			if (lstat(path, &st) == -1)
+				return IPC_STATE__INVALID_PATH;
+		}
+	}
+#endif
+
 	/* also complain if a plain file is in the way */
 	if ((st.st_mode & S_IFMT) != S_IFSOCK)
 		return IPC_STATE__INVALID_PATH;
@@ -168,7 +190,8 @@ void ipc_client_close_connection(struct ipc_client_connection *connection)
 
 int ipc_client_send_command_to_connection(
 	struct ipc_client_connection *connection,
-	const char *message, struct strbuf *answer)
+	const char *message, size_t message_len,
+	struct strbuf *answer)
 {
 	int ret = 0;
 
@@ -176,7 +199,7 @@ int ipc_client_send_command_to_connection(
 
 	trace2_region_enter("ipc-client", "send-command", NULL);
 
-	if (write_packetized_from_buf_no_flush(message, strlen(message),
+	if (write_packetized_from_buf_no_flush(message, message_len,
 					       connection->fd) < 0 ||
 	    packet_flush_gently(connection->fd) < 0) {
 		ret = error(_("could not send IPC command"));
@@ -197,7 +220,8 @@ done:
 
 int ipc_client_send_command(const char *path,
 			    const struct ipc_client_connect_options *options,
-			    const char *message, struct strbuf *answer)
+			    const char *message, size_t message_len,
+			    struct strbuf *answer)
 {
 	int ret = -1;
 	enum ipc_active_state state;
@@ -208,7 +232,9 @@ int ipc_client_send_command(const char *path,
 	if (state != IPC_STATE__LISTENING)
 		return ret;
 
-	ret = ipc_client_send_command_to_connection(connection, message, answer);
+	ret = ipc_client_send_command_to_connection(connection,
+						    message, message_len,
+						    answer);
 
 	ipc_client_close_connection(connection);
 
@@ -503,7 +529,7 @@ static int worker_thread__do_io(
 	if (ret >= 0) {
 		ret = worker_thread_data->server_data->application_cb(
 			worker_thread_data->server_data->application_data,
-			buf.buf, do_io_reply_callback, &reply_data);
+			buf.buf, buf.len, do_io_reply_callback, &reply_data);
 
 		packet_flush_gently(reply_data.fd);
 	}
diff --git a/compat/simple-ipc/ipc-win32.c b/compat/simple-ipc/ipc-win32.c
index 8dc7bda087..20ea7b65e0 100644
--- a/compat/simple-ipc/ipc-win32.c
+++ b/compat/simple-ipc/ipc-win32.c
@@ -3,6 +3,8 @@
 #include "strbuf.h"
 #include "pkt-line.h"
 #include "thread-utils.h"
+#include "accctrl.h"
+#include "aclapi.h"
 
 #ifndef SUPPORTS_SIMPLE_IPC
 /*
@@ -49,6 +51,9 @@ static enum ipc_active_state get_active_state(wchar_t *pipe_path)
 	if (GetLastError() == ERROR_FILE_NOT_FOUND)
 		return IPC_STATE__PATH_NOT_FOUND;
 
+	trace2_data_intmax("ipc-debug", NULL, "getstate/waitpipe/gle",
+			   (intmax_t)GetLastError());
+
 	return IPC_STATE__OTHER_ERROR;
 }
 
@@ -109,9 +114,15 @@ static enum ipc_active_state connect_to_server(
 			t_start_ms = (DWORD)(getnanotime() / 1000000);
 
 			if (!WaitNamedPipeW(wpath, timeout_ms)) {
-				if (GetLastError() == ERROR_SEM_TIMEOUT)
+				DWORD gleWait = GetLastError();
+
+				if (gleWait == ERROR_SEM_TIMEOUT)
 					return IPC_STATE__NOT_LISTENING;
 
+				trace2_data_intmax("ipc-debug", NULL,
+						   "connect/waitpipe/gle",
+						   (intmax_t)gleWait);
+
 				return IPC_STATE__OTHER_ERROR;
 			}
 
@@ -133,17 +144,31 @@ static enum ipc_active_state connect_to_server(
 			break; /* try again */
 
 		default:
+			trace2_data_intmax("ipc-debug", NULL,
+					   "connect/createfile/gle",
+					   (intmax_t)gle);
+
 			return IPC_STATE__OTHER_ERROR;
 		}
 	}
 
 	if (!SetNamedPipeHandleState(hPipe, &mode, NULL, NULL)) {
+		gle = GetLastError();
+		trace2_data_intmax("ipc-debug", NULL,
+				   "connect/setpipestate/gle",
+				   (intmax_t)gle);
+
 		CloseHandle(hPipe);
 		return IPC_STATE__OTHER_ERROR;
 	}
 
 	*pfd = _open_osfhandle((intptr_t)hPipe, O_RDWR|O_BINARY);
 	if (*pfd < 0) {
+		gle = GetLastError();
+		trace2_data_intmax("ipc-debug", NULL,
+				   "connect/openosfhandle/gle",
+				   (intmax_t)gle);
+
 		CloseHandle(hPipe);
 		return IPC_STATE__OTHER_ERROR;
 	}
@@ -208,7 +233,8 @@ void ipc_client_close_connection(struct ipc_client_connection *connection)
 
 int ipc_client_send_command_to_connection(
 	struct ipc_client_connection *connection,
-	const char *message, struct strbuf *answer)
+	const char *message, size_t message_len,
+	struct strbuf *answer)
 {
 	int ret = 0;
 
@@ -216,7 +242,7 @@ int ipc_client_send_command_to_connection(
 
 	trace2_region_enter("ipc-client", "send-command", NULL);
 
-	if (write_packetized_from_buf_no_flush(message, strlen(message),
+	if (write_packetized_from_buf_no_flush(message, message_len,
 					       connection->fd) < 0 ||
 	    packet_flush_gently(connection->fd) < 0) {
 		ret = error(_("could not send IPC command"));
@@ -239,7 +265,8 @@ done:
 
 int ipc_client_send_command(const char *path,
 			    const struct ipc_client_connect_options *options,
-			    const char *message, struct strbuf *response)
+			    const char *message, size_t message_len,
+			    struct strbuf *response)
 {
 	int ret = -1;
 	enum ipc_active_state state;
@@ -250,7 +277,9 @@ int ipc_client_send_command(const char *path,
 	if (state != IPC_STATE__LISTENING)
 		return ret;
 
-	ret = ipc_client_send_command_to_connection(connection, message, response);
+	ret = ipc_client_send_command_to_connection(connection,
+						    message, message_len,
+						    response);
 
 	ipc_client_close_connection(connection);
 
@@ -458,7 +487,7 @@ static int do_io(struct ipc_server_thread_data *server_thread_data)
 	if (ret >= 0) {
 		ret = server_thread_data->server_data->application_cb(
 			server_thread_data->server_data->application_data,
-			buf.buf, do_io_reply_callback, &reply_data);
+			buf.buf, buf.len, do_io_reply_callback, &reply_data);
 
 		packet_flush_gently(reply_data.fd);
 
@@ -565,11 +594,132 @@ finished:
 	return NULL;
 }
 
+/*
+ * We need to build a Windows "SECURITY_ATTRIBUTES" object and use it
+ * to apply an ACL when we create the initial instance of the Named
+ * Pipe.  The construction is somewhat involved and consists of
+ * several sequential steps and intermediate objects.
+ *
+ * We use this structure to hold these intermediate pointers so that
+ * we can free them as a group.  (It is unclear from the docs whether
+ * some of these intermediate pointers can be freed before we are
+ * finished using the "lpSA" member.)
+ */
+struct my_sa_data
+{
+	PSID pEveryoneSID;
+	PACL pACL;
+	PSECURITY_DESCRIPTOR pSD;
+	LPSECURITY_ATTRIBUTES lpSA;
+};
+
+static void init_sa(struct my_sa_data *d)
+{
+	memset(d, 0, sizeof(*d));
+}
+
+static void release_sa(struct my_sa_data *d)
+{
+	if (d->pEveryoneSID)
+		FreeSid(d->pEveryoneSID);
+	if (d->pACL)
+		LocalFree(d->pACL);
+	if (d->pSD)
+		LocalFree(d->pSD);
+	if (d->lpSA)
+		LocalFree(d->lpSA);
+
+	memset(d, 0, sizeof(*d));
+}
+
+/*
+ * Create SECURITY_ATTRIBUTES to apply to the initial named pipe.  The
+ * creator of the first server instance gets to set the ACLs on it.
+ *
+ * We allow the well-known group `EVERYONE` to have read+write access
+ * to the named pipe so that clients can send queries to the daemon
+ * and receive the response.
+ *
+ * Normally, this is not necessary since the daemon is usually
+ * automatically started by a foreground command like `git status`,
+ * but in those cases where an elevated Git command started the daemon
+ * (such that the daemon itself runs with elevation), we need to add
+ * the ACL so that non-elevated commands can write to it.
+ *
+ * The following document was helpful:
+ * https://docs.microsoft.com/en-us/windows/win32/secauthz/creating-a-security-descriptor-for-a-new-object-in-c--
+ *
+ * Returns d->lpSA set to a SA or NULL.
+ */
+static LPSECURITY_ATTRIBUTES get_sa(struct my_sa_data *d)
+{
+	SID_IDENTIFIER_AUTHORITY sid_auth_world = SECURITY_WORLD_SID_AUTHORITY;
+#define NR_EA (1)
+	EXPLICIT_ACCESS ea[NR_EA];
+	DWORD dwResult;
+
+	if (!AllocateAndInitializeSid(&sid_auth_world, 1,
+				      SECURITY_WORLD_RID, 0,0,0,0,0,0,0,
+				      &d->pEveryoneSID)) {
+		DWORD gle = GetLastError();
+		trace2_data_intmax("ipc-debug", NULL, "alloc-world-sid/gle",
+				   (intmax_t)gle);
+		goto fail;
+	}
+
+	memset(ea, 0, NR_EA * sizeof(EXPLICIT_ACCESS));
+
+	ea[0].grfAccessPermissions = GENERIC_READ | GENERIC_WRITE;
+	ea[0].grfAccessMode = SET_ACCESS;
+	ea[0].grfInheritance = NO_INHERITANCE;
+	ea[0].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
+	ea[0].Trustee.TrusteeForm = TRUSTEE_IS_SID;
+	ea[0].Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP;
+	ea[0].Trustee.ptstrName = (LPTSTR)d->pEveryoneSID;
+
+	dwResult = SetEntriesInAcl(NR_EA, ea, NULL, &d->pACL);
+	if (dwResult != ERROR_SUCCESS) {
+		DWORD gle = GetLastError();
+		trace2_data_intmax("ipc-debug", NULL, "set-acl-entry/gle",
+				   (intmax_t)gle);
+		trace2_data_intmax("ipc-debug", NULL, "set-acl-entry/dw",
+				   (intmax_t)dwResult);
+		goto fail;
+	}
+
+	d->pSD = (PSECURITY_DESCRIPTOR)LocalAlloc(
+		LPTR, SECURITY_DESCRIPTOR_MIN_LENGTH);
+	if (!InitializeSecurityDescriptor(d->pSD, SECURITY_DESCRIPTOR_REVISION)) {
+		DWORD gle = GetLastError();
+		trace2_data_intmax("ipc-debug", NULL, "init-sd/gle", (intmax_t)gle);
+		goto fail;
+	}
+
+	if (!SetSecurityDescriptorDacl(d->pSD, TRUE, d->pACL, FALSE)) {
+		DWORD gle = GetLastError();
+		trace2_data_intmax("ipc-debug", NULL, "set-sd-dacl/gle", (intmax_t)gle);
+		goto fail;
+	}
+
+	d->lpSA = (LPSECURITY_ATTRIBUTES)LocalAlloc(LPTR, sizeof(SECURITY_ATTRIBUTES));
+	d->lpSA->nLength = sizeof(SECURITY_ATTRIBUTES);
+	d->lpSA->lpSecurityDescriptor = d->pSD;
+	d->lpSA->bInheritHandle = FALSE;
+
+	return d->lpSA;
+
+fail:
+	release_sa(d);
+	return NULL;
+}
+
 static HANDLE create_new_pipe(wchar_t *wpath, int is_first)
 {
 	HANDLE hPipe;
 	DWORD dwOpenMode, dwPipeMode;
-	LPSECURITY_ATTRIBUTES lpsa = NULL;
+	struct my_sa_data my_sa_data;
+
+	init_sa(&my_sa_data);
 
 	dwOpenMode = PIPE_ACCESS_INBOUND | PIPE_ACCESS_OUTBOUND |
 		FILE_FLAG_OVERLAPPED;
@@ -585,20 +735,15 @@ static HANDLE create_new_pipe(wchar_t *wpath, int is_first)
 		 * set the ACL / Security Attributes on the named
 		 * pipe; subsequent instances inherit and cannot
 		 * change them.
-		 *
-		 * TODO Should we allow the application layer to
-		 * specify security attributes, such as `LocalService`
-		 * or `LocalSystem`, when we create the named pipe?
-		 * This question is probably not important when the
-		 * daemon is started by a foreground user process and
-		 * only needs to talk to the current user, but may be
-		 * if the daemon is run via the Control Panel as a
-		 * System Service.
 		 */
+		get_sa(&my_sa_data);
 	}
 
 	hPipe = CreateNamedPipeW(wpath, dwOpenMode, dwPipeMode,
-				 PIPE_UNLIMITED_INSTANCES, 1024, 1024, 0, lpsa);
+				 PIPE_UNLIMITED_INSTANCES, 1024, 1024, 0,
+				 my_sa_data.lpSA);
+
+	release_sa(&my_sa_data);
 
 	return hPipe;
 }
diff --git a/compat/stub/procinfo.c b/compat/stub/procinfo.c
new file mode 100644
index 0000000000..12c0a23c9e
--- /dev/null
+++ b/compat/stub/procinfo.c
@@ -0,0 +1,11 @@
+#include "git-compat-util.h"
+
+#include "trace2.h"
+
+/*
+ * Stub. See sample implementations in compat/linux/procinfo.c and
+ * compat/win32/trace2_win32_process_info.c.
+ */
+void trace2_collect_process_info(enum trace2_process_info_reason reason)
+{
+}
diff --git a/compat/terminal.c b/compat/terminal.c
index 43b73ddc75..5b903e7c7e 100644
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -8,8 +8,6 @@
 
 #if defined(HAVE_DEV_TTY) || defined(GIT_WINDOWS_NATIVE)
 
-static void restore_term(void);
-
 static void restore_term_on_signal(int sig)
 {
 	restore_term();
@@ -25,7 +23,7 @@ static void restore_term_on_signal(int sig)
 static int term_fd = -1;
 static struct termios old_term;
 
-static void restore_term(void)
+void restore_term(void)
 {
 	if (term_fd < 0)
 		return;
@@ -35,15 +33,22 @@ static void restore_term(void)
 	term_fd = -1;
 }
 
+int save_term(int full_duplex)
+{
+	if (term_fd < 0)
+		term_fd = open("/dev/tty", O_RDWR);
+
+	return (term_fd < 0) ? -1 : tcgetattr(term_fd, &old_term);
+}
+
 static int disable_bits(tcflag_t bits)
 {
 	struct termios t;
 
-	term_fd = open("/dev/tty", O_RDWR);
-	if (tcgetattr(term_fd, &t) < 0)
+	if (save_term(0) < 0)
 		goto error;
 
-	old_term = t;
+	t = old_term;
 	sigchain_push_common(restore_term_on_signal);
 
 	t.c_lflag &= ~bits;
@@ -75,9 +80,10 @@ static int enable_non_canonical(void)
 static int use_stty = 1;
 static struct string_list stty_restore = STRING_LIST_INIT_DUP;
 static HANDLE hconin = INVALID_HANDLE_VALUE;
-static DWORD cmode;
+static HANDLE hconout = INVALID_HANDLE_VALUE;
+static DWORD cmode_in, cmode_out;
 
-static void restore_term(void)
+void restore_term(void)
 {
 	if (use_stty) {
 		int i;
@@ -97,9 +103,42 @@ static void restore_term(void)
 	if (hconin == INVALID_HANDLE_VALUE)
 		return;
 
-	SetConsoleMode(hconin, cmode);
+	SetConsoleMode(hconin, cmode_in);
+	CloseHandle(hconin);
+	if (cmode_out) {
+		assert(hconout != INVALID_HANDLE_VALUE);
+		SetConsoleMode(hconout, cmode_out);
+		CloseHandle(hconout);
+	}
+
+	hconin = hconout = INVALID_HANDLE_VALUE;
+}
+
+int save_term(int full_duplex)
+{
+	hconin = CreateFileA("CONIN$", GENERIC_READ | GENERIC_WRITE,
+	    FILE_SHARE_READ, NULL, OPEN_EXISTING,
+	    FILE_ATTRIBUTE_NORMAL, NULL);
+	if (hconin == INVALID_HANDLE_VALUE)
+		return -1;
+
+	if (full_duplex) {
+		hconout = CreateFileA("CONOUT$", GENERIC_READ | GENERIC_WRITE,
+			FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
+			FILE_ATTRIBUTE_NORMAL, NULL);
+		if (hconout == INVALID_HANDLE_VALUE)
+			goto error;
+
+		GetConsoleMode(hconout, &cmode_out);
+	}
+
+	GetConsoleMode(hconin, &cmode_in);
+	use_stty = 0;
+	return 0;
+error:
 	CloseHandle(hconin);
 	hconin = INVALID_HANDLE_VALUE;
+	return -1;
 }
 
 static int disable_bits(DWORD bits)
@@ -135,15 +174,11 @@ static int disable_bits(DWORD bits)
 		use_stty = 0;
 	}
 
-	hconin = CreateFile("CONIN$", GENERIC_READ | GENERIC_WRITE,
-	    FILE_SHARE_READ, NULL, OPEN_EXISTING,
-	    FILE_ATTRIBUTE_NORMAL, NULL);
-	if (hconin == INVALID_HANDLE_VALUE)
+	if (save_term(0) < 0)
 		return -1;
 
-	GetConsoleMode(hconin, &cmode);
 	sigchain_push_common(restore_term_on_signal);
-	if (!SetConsoleMode(hconin, cmode & ~bits)) {
+	if (!SetConsoleMode(hconin, cmode_in & ~bits)) {
 		CloseHandle(hconin);
 		hconin = INVALID_HANDLE_VALUE;
 		return -1;
@@ -361,6 +396,16 @@ int read_key_without_echo(struct strbuf *buf)
 
 #else
 
+int save_term(int full_duplex)
+{
+	/* full_duplex == 1, but no support available */
+	return -full_duplex;
+}
+
+void restore_term(void)
+{
+}
+
 char *git_terminal_prompt(const char *prompt, int echo)
 {
 	return getpass(prompt);
diff --git a/compat/terminal.h b/compat/terminal.h
index a9d52b8464..e1770c575b 100644
--- a/compat/terminal.h
+++ b/compat/terminal.h
@@ -1,6 +1,9 @@
 #ifndef COMPAT_TERMINAL_H
 #define COMPAT_TERMINAL_H
 
+int save_term(int full_duplex);
+void restore_term(void);
+
 char *git_terminal_prompt(const char *prompt, int echo);
 
 /* Read a single keystroke, without echoing it to the terminal */
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/vcbuild/README b/compat/vcbuild/README
index 51fb083dbb..29ec1d0f10 100644
--- a/compat/vcbuild/README
+++ b/compat/vcbuild/README
@@ -92,7 +92,7 @@ The Steps of Build Git with VS2008
    the git operations.
 
 3. Inside Git's directory run the command:
-       make command-list.h config-list.h
+       make generated-hdrs
    to generate the header file needed to compile git.
 
 4. Then either build Git with the GNU Make Makefile in the Git projects
diff --git a/compat/win32/lazyload.h b/compat/win32/lazyload.h
index 9e631c8593..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))
@@ -15,18 +15,21 @@
  *                        source, target);
  */
 
+typedef void (*FARVOIDPROC)(void);
+
 struct proc_addr {
 	const char *const dll;
 	const char *const function;
-	FARPROC pfunction;
+	FARVOIDPROC pfunction;
 	unsigned initialized : 1;
 };
 
 /* 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 }; \
-	static rettype (WINAPI *function)(__VA_ARGS__)
+	typedef rettype (convention *proc_type_##function)(__VA_ARGS__); \
+	static proc_type_##function function
 
 /*
  * Loads a function from a DLL (once-only).
@@ -35,9 +38,9 @@ struct proc_addr {
  * This function is not thread-safe.
  */
 #define INIT_PROC_ADDR(function) \
-	(function = get_proc_addr(&proc_addr_##function))
+	(function = (proc_type_##function)get_proc_addr(&proc_addr_##function))
 
-static inline void *get_proc_addr(struct proc_addr *proc)
+static inline FARVOIDPROC get_proc_addr(struct proc_addr *proc)
 {
 	/* only do this once */
 	if (!proc->initialized) {
@@ -46,7 +49,8 @@ static inline void *get_proc_addr(struct proc_addr *proc)
 		hnd = LoadLibraryExA(proc->dll, NULL,
 				     LOAD_LIBRARY_SEARCH_SYSTEM32);
 		if (hnd)
-			proc->pfunction = GetProcAddress(hnd, proc->function);
+			proc->pfunction = (FARVOIDPROC)GetProcAddress(hnd,
+							proc->function);
 	}
 	/* set ENOSYS if DLL or function was not found */
 	if (!proc->pfunction)
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..936a80a5f0 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -3,6 +3,12 @@
  */
 
 #undef NOGDI
+
+/*
+ * Including the appropriate header file for RtlGenRandom causes MSVC to see a
+ * redefinition of types in an incompatible way when including headers below.
+ */
+#undef HAVE_RTLGENRANDOM
 #include "../git-compat-util.h"
 #include <wingdi.h>
 #include <winreg.h>
@@ -45,8 +51,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..77a1b08048
--- /dev/null
+++ b/compat/zlib-uncompress2.c
@@ -0,0 +1,96 @@
+#include "git-compat-util.h"
+
+#if ZLIB_VERNUM < 0x1290
+/* 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
+
+*/
+
+/*
+ * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in 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;
+}
+#else
+static void *dummy_variable = &dummy_variable;
+#endif
diff --git a/config.c b/config.c
index f33abeab85..be4cd2d353 100644
--- a/config.c
+++ b/config.c
@@ -21,6 +21,7 @@
 #include "dir.h"
 #include "color.h"
 #include "refs.h"
+#include "worktree.h"
 
 struct config_source {
 	struct config_source *prev;
@@ -76,7 +77,6 @@ static struct key_value_info *current_config_kvi;
  */
 static enum config_scope current_parsing_scope;
 
-static int core_compression_seen;
 static int pack_compression_seen;
 static int zlib_compression_seen;
 
@@ -121,6 +121,22 @@ static long config_buf_ftell(struct config_source *conf)
 	return conf->u.buf.pos;
 }
 
+struct config_include_data {
+	int depth;
+	config_fn_t fn;
+	void *data;
+	const struct config_options *opts;
+	struct git_config_source *config_source;
+
+	/*
+	 * All remote URLs discovered when reading all config files.
+	 */
+	struct string_list *remote_urls;
+};
+#define CONFIG_INCLUDE_INIT { 0 }
+
+static int git_config_include(const char *var, const char *value, void *data);
+
 #define MAX_INCLUDE_DEPTH 10
 static const char include_depth_advice[] = N_(
 "exceeded maximum include depth (%d) while including\n"
@@ -137,7 +153,7 @@ static int handle_path_include(const char *path, struct config_include_data *inc
 	if (!path)
 		return config_error_nonbool("include.path");
 
-	expanded = expand_user_path(path, 0);
+	expanded = interpolate_path(path, 0);
 	if (!expanded)
 		return error(_("could not expand include path '%s'"), path);
 	path = expanded;
@@ -149,8 +165,10 @@ static int handle_path_include(const char *path, struct config_include_data *inc
 	if (!is_absolute_path(path)) {
 		char *slash;
 
-		if (!cf || !cf->path)
-			return error(_("relative config includes must come from files"));
+		if (!cf || !cf->path) {
+			ret = error(_("relative config includes must come from files"));
+			goto cleanup;
+		}
 
 		slash = find_last_dir_sep(cf->path);
 		if (slash)
@@ -168,6 +186,7 @@ static int handle_path_include(const char *path, struct config_include_data *inc
 		ret = git_config_from_file(git_config_include, path, inc);
 		inc->depth--;
 	}
+cleanup:
 	strbuf_release(&buf);
 	free(expanded);
 	return ret;
@@ -185,7 +204,7 @@ static int prepare_include_condition_pattern(struct strbuf *pat)
 	char *expanded;
 	int prefix = 0;
 
-	expanded = expand_user_path(pat->buf, 1);
+	expanded = interpolate_path(pat->buf, 1);
 	if (expanded) {
 		strbuf_reset(pat);
 		strbuf_addstr(pat, expanded);
@@ -292,9 +311,92 @@ static int include_by_branch(const char *cond, size_t cond_len)
 	return ret;
 }
 
-static int include_condition_is_true(const struct config_options *opts,
+static int add_remote_url(const char *var, const char *value, void *data)
+{
+	struct string_list *remote_urls = data;
+	const char *remote_name;
+	size_t remote_name_len;
+	const char *key;
+
+	if (!parse_config_key(var, "remote", &remote_name, &remote_name_len,
+			      &key) &&
+	    remote_name &&
+	    !strcmp(key, "url"))
+		string_list_append(remote_urls, value);
+	return 0;
+}
+
+static void populate_remote_urls(struct config_include_data *inc)
+{
+	struct config_options opts;
+
+	struct config_source *store_cf = cf;
+	struct key_value_info *store_kvi = current_config_kvi;
+	enum config_scope store_scope = current_parsing_scope;
+
+	opts = *inc->opts;
+	opts.unconditional_remote_url = 1;
+
+	cf = NULL;
+	current_config_kvi = NULL;
+	current_parsing_scope = 0;
+
+	inc->remote_urls = xmalloc(sizeof(*inc->remote_urls));
+	string_list_init_dup(inc->remote_urls);
+	config_with_options(add_remote_url, inc->remote_urls, inc->config_source, &opts);
+
+	cf = store_cf;
+	current_config_kvi = store_kvi;
+	current_parsing_scope = store_scope;
+}
+
+static int forbid_remote_url(const char *var, const char *value, void *data)
+{
+	const char *remote_name;
+	size_t remote_name_len;
+	const char *key;
+
+	if (!parse_config_key(var, "remote", &remote_name, &remote_name_len,
+			      &key) &&
+	    remote_name &&
+	    !strcmp(key, "url"))
+		die(_("remote URLs cannot be configured in file directly or indirectly included by includeIf.hasconfig:remote.*.url"));
+	return 0;
+}
+
+static int at_least_one_url_matches_glob(const char *glob, int glob_len,
+					 struct string_list *remote_urls)
+{
+	struct strbuf pattern = STRBUF_INIT;
+	struct string_list_item *url_item;
+	int found = 0;
+
+	strbuf_add(&pattern, glob, glob_len);
+	for_each_string_list_item(url_item, remote_urls) {
+		if (!wildmatch(pattern.buf, url_item->string, WM_PATHNAME)) {
+			found = 1;
+			break;
+		}
+	}
+	strbuf_release(&pattern);
+	return found;
+}
+
+static int include_by_remote_url(struct config_include_data *inc,
+		const char *cond, size_t cond_len)
+{
+	if (inc->opts->unconditional_remote_url)
+		return 1;
+	if (!inc->remote_urls)
+		populate_remote_urls(inc);
+	return at_least_one_url_matches_glob(cond, cond_len,
+					     inc->remote_urls);
+}
+
+static int include_condition_is_true(struct config_include_data *inc,
 				     const char *cond, size_t cond_len)
 {
+	const struct config_options *opts = inc->opts;
 
 	if (skip_prefix_mem(cond, cond_len, "gitdir:", &cond, &cond_len))
 		return include_by_gitdir(opts, cond, cond_len, 0);
@@ -302,12 +404,15 @@ static int include_condition_is_true(const struct config_options *opts,
 		return include_by_gitdir(opts, cond, cond_len, 1);
 	else if (skip_prefix_mem(cond, cond_len, "onbranch:", &cond, &cond_len))
 		return include_by_branch(cond, cond_len);
+	else if (skip_prefix_mem(cond, cond_len, "hasconfig:remote.*.url:", &cond,
+				   &cond_len))
+		return include_by_remote_url(inc, cond, cond_len);
 
 	/* unknown conditionals are always false */
 	return 0;
 }
 
-int git_config_include(const char *var, const char *value, void *data)
+static int git_config_include(const char *var, const char *value, void *data)
 {
 	struct config_include_data *inc = data;
 	const char *cond, *key;
@@ -326,9 +431,15 @@ int git_config_include(const char *var, const char *value, void *data)
 		ret = handle_path_include(value, inc);
 
 	if (!parse_config_key(var, "includeif", &cond, &cond_len, &key) &&
-	    (cond && include_condition_is_true(inc->opts, cond, cond_len)) &&
-	    !strcmp(key, "path"))
+	    cond && include_condition_is_true(inc, cond, cond_len) &&
+	    !strcmp(key, "path")) {
+		config_fn_t old_fn = inc->fn;
+
+		if (inc->opts->unconditional_remote_url)
+			inc->fn = forbid_remote_url;
 		ret = handle_path_include(value, inc);
+		inc->fn = old_fn;
+	}
 
 	return ret;
 }
@@ -426,7 +537,7 @@ static inline int iskeychar(int c)
  * baselen - pointer to size_t which will hold the length of the
  *           section + subsection part, can be NULL
  */
-static int git_config_parse_key_1(const char *key, char **store_key, size_t *baselen_, int quiet)
+int git_config_parse_key(const char *key, char **store_key, size_t *baselen_)
 {
 	size_t i, baselen;
 	int dot;
@@ -438,14 +549,12 @@ static int git_config_parse_key_1(const char *key, char **store_key, size_t *bas
 	 */
 
 	if (last_dot == NULL || last_dot == key) {
-		if (!quiet)
-			error(_("key does not contain a section: %s"), key);
+		error(_("key does not contain a section: %s"), key);
 		return -CONFIG_NO_SECTION_OR_NAME;
 	}
 
 	if (!last_dot[1]) {
-		if (!quiet)
-			error(_("key does not contain variable name: %s"), key);
+		error(_("key does not contain variable name: %s"), key);
 		return -CONFIG_NO_SECTION_OR_NAME;
 	}
 
@@ -456,8 +565,7 @@ static int git_config_parse_key_1(const char *key, char **store_key, size_t *bas
 	/*
 	 * Validate the key and while at it, lower case it for matching.
 	 */
-	if (store_key)
-		*store_key = xmallocz(strlen(key));
+	*store_key = xmallocz(strlen(key));
 
 	dot = 0;
 	for (i = 0; key[i]; i++) {
@@ -468,39 +576,24 @@ static int git_config_parse_key_1(const char *key, char **store_key, size_t *bas
 		if (!dot || i > baselen) {
 			if (!iskeychar(c) ||
 			    (i == baselen + 1 && !isalpha(c))) {
-				if (!quiet)
-					error(_("invalid key: %s"), key);
+				error(_("invalid key: %s"), key);
 				goto out_free_ret_1;
 			}
 			c = tolower(c);
 		} else if (c == '\n') {
-			if (!quiet)
-				error(_("invalid key (newline): %s"), key);
+			error(_("invalid key (newline): %s"), key);
 			goto out_free_ret_1;
 		}
-		if (store_key)
-			(*store_key)[i] = c;
+		(*store_key)[i] = c;
 	}
 
 	return 0;
 
 out_free_ret_1:
-	if (store_key) {
-		FREE_AND_NULL(*store_key);
-	}
+	FREE_AND_NULL(*store_key);
 	return -CONFIG_INVALID_KEY;
 }
 
-int git_config_parse_key(const char *key, char **store_key, size_t *baselen)
-{
-	return git_config_parse_key_1(key, store_key, baselen, 0);
-}
-
-int git_config_key_is_valid(const char *key)
-{
-	return !git_config_parse_key_1(key, NULL, NULL, 1);
-}
-
 static int config_parse_pair(const char *key, const char *value,
 			  config_fn_t fn, void *data)
 {
@@ -1270,7 +1363,7 @@ int git_config_pathname(const char **dest, const char *var, const char *value)
 {
 	if (!value)
 		return config_error_nonbool(var);
-	*dest = expand_user_path(value, 0);
+	*dest = interpolate_path(value, 0);
 	if (!*dest)
 		die(_("failed to expand user dir in: '%s'"), value);
 	return 0;
@@ -1400,8 +1493,6 @@ static int git_default_core_config(const char *var, const char *value, void *cb)
 			level = Z_DEFAULT_COMPRESSION;
 		else if (level < 0 || level > Z_BEST_COMPRESSION)
 			die(_("bad zlib compression level %d"), level);
-		core_compression_level = level;
-		core_compression_seen = 1;
 		if (!zlib_compression_seen)
 			zlib_compression_level = level;
 		if (!pack_compression_seen)
@@ -1577,9 +1668,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;
@@ -1796,6 +1890,7 @@ int git_config_from_mem(config_fn_t fn,
 
 int git_config_from_blob_oid(config_fn_t fn,
 			      const char *name,
+			      struct repository *repo,
 			      const struct object_id *oid,
 			      void *data)
 {
@@ -1804,7 +1899,7 @@ int git_config_from_blob_oid(config_fn_t fn,
 	unsigned long size;
 	int ret;
 
-	buf = read_object_file(oid, &type, &size);
+	buf = repo_read_object_file(repo, oid, &type, &size);
 	if (!buf)
 		return error(_("unable to load config blob object '%s'"), name);
 	if (type != OBJ_BLOB) {
@@ -1820,14 +1915,15 @@ int git_config_from_blob_oid(config_fn_t fn,
 }
 
 static int git_config_from_blob_ref(config_fn_t fn,
+				    struct repository *repo,
 				    const char *name,
 				    void *data)
 {
 	struct object_id oid;
 
-	if (get_oid(name, &oid) < 0)
+	if (repo_get_oid(repo, name, &oid) < 0)
 		return error(_("unable to resolve config blob '%s'"), name);
-	return git_config_from_blob_oid(fn, name, &oid, data);
+	return git_config_from_blob_oid(fn, name, repo, &oid, data);
 }
 
 char *git_system_config(void)
@@ -1845,7 +1941,7 @@ void git_global_config(char **user_out, char **xdg_out)
 	char *xdg_config = NULL;
 
 	if (!user_config) {
-		user_config = expand_user_path("~/.gitconfig", 0);
+		user_config = interpolate_path("~/.gitconfig", 0);
 		xdg_config = xdg_config_home("config");
 	}
 
@@ -1942,11 +2038,13 @@ int config_with_options(config_fn_t fn, void *data,
 			const struct config_options *opts)
 {
 	struct config_include_data inc = CONFIG_INCLUDE_INIT;
+	int ret;
 
 	if (opts->respect_includes) {
 		inc.fn = fn;
 		inc.data = data;
 		inc.opts = opts;
+		inc.config_source = config_source;
 		fn = git_config_include;
 		data = &inc;
 	}
@@ -1958,14 +2056,24 @@ int config_with_options(config_fn_t fn, void *data,
 	 * If we have a specific filename, use it. Otherwise, follow the
 	 * regular lookup sequence.
 	 */
-	if (config_source && config_source->use_stdin)
-		return git_config_from_stdin(fn, data);
-	else if (config_source && config_source->file)
-		return git_config_from_file(fn, config_source->file, data);
-	else if (config_source && config_source->blob)
-		return git_config_from_blob_ref(fn, config_source->blob, data);
+	if (config_source && config_source->use_stdin) {
+		ret = git_config_from_stdin(fn, data);
+	} else if (config_source && config_source->file) {
+		ret = git_config_from_file(fn, config_source->file, data);
+	} else if (config_source && config_source->blob) {
+		struct repository *repo = config_source->repo ?
+			config_source->repo : the_repository;
+		ret = git_config_from_blob_ref(fn, repo, config_source->blob,
+						data);
+	} else {
+		ret = do_git_config_sequence(opts, fn, data);
+	}
 
-	return do_git_config_sequence(opts, fn, data);
+	if (inc.remote_urls) {
+		string_list_clear(inc.remote_urls, 0);
+		FREE_AND_NULL(inc.remote_urls);
+	}
+	return ret;
 }
 
 static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
@@ -2187,8 +2295,8 @@ int git_configset_get_string(struct config_set *cs, const char *key, char **dest
 		return 1;
 }
 
-int git_configset_get_string_tmp(struct config_set *cs, const char *key,
-				 const char **dest)
+static int git_configset_get_string_tmp(struct config_set *cs, const char *key,
+					const char **dest)
 {
 	const char *value;
 	if (!git_configset_get_value(cs, key, &value)) {
@@ -2567,11 +2675,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);
@@ -2892,6 +3001,20 @@ int git_config_set_gently(const char *key, const char *value)
 	return git_config_set_multivar_gently(key, value, NULL, 0);
 }
 
+int repo_config_set_worktree_gently(struct repository *r,
+				    const char *key, const char *value)
+{
+	/* Only use worktree-specific config if it is is already enabled. */
+	if (repository_format_worktree_config) {
+		char *file = repo_git_path(r, "config.worktree");
+		int ret = git_config_set_multivar_in_file_gently(
+					file, key, value, NULL, 0);
+		free(file);
+		return ret;
+	}
+	return repo_config_set_multivar_gently(r, key, value, NULL, 0);
+}
+
 void git_config_set(const char *key, const char *value)
 {
 	git_config_set_multivar(key, value, NULL, 0);
@@ -3189,14 +3312,28 @@ void git_config_set_multivar_in_file(const char *config_filename,
 int git_config_set_multivar_gently(const char *key, const char *value,
 				   const char *value_pattern, unsigned flags)
 {
-	return git_config_set_multivar_in_file_gently(NULL, key, value, value_pattern,
-						      flags);
+	return repo_config_set_multivar_gently(the_repository, key, value,
+					       value_pattern, flags);
+}
+
+int repo_config_set_multivar_gently(struct repository *r, const char *key,
+				    const char *value,
+				    const char *value_pattern, unsigned flags)
+{
+	char *file = repo_git_path(r, "config");
+	int res = git_config_set_multivar_in_file_gently(file,
+							 key, value,
+							 value_pattern,
+							 flags);
+	free(file);
+	return res;
 }
 
 void git_config_set_multivar(const char *key, const char *value,
 			     const char *value_pattern, unsigned flags)
 {
-	git_config_set_multivar_in_file(NULL, key, value, value_pattern,
+	git_config_set_multivar_in_file(git_path("config"),
+					key, value, value_pattern,
 					flags);
 }
 
diff --git a/config.h b/config.h
index a2200f3111..bb49baf1ee 100644
--- a/config.h
+++ b/config.h
@@ -49,6 +49,8 @@ const char *config_scope_name(enum config_scope scope);
 struct git_config_source {
 	unsigned int use_stdin:1;
 	const char *file;
+	/* The repository if blob is not NULL; leave blank for the_repository */
+	struct repository *repo;
 	const char *blob;
 	enum config_scope scope;
 };
@@ -87,6 +89,15 @@ struct config_options {
 	unsigned int ignore_worktree : 1;
 	unsigned int ignore_cmdline : 1;
 	unsigned int system_gently : 1;
+
+	/*
+	 * For internal use. Include all includeif.hasremoteurl paths without
+	 * checking if the repo has that remote URL, and when doing so, verify
+	 * that files included in this way do not configure any remote URLs
+	 * themselves.
+	 */
+	unsigned int unconditional_remote_url : 1;
+
 	const char *commondir;
 	const char *git_dir;
 	config_parser_event_fn_t event_fn;
@@ -124,6 +135,8 @@ int git_default_config(const char *, const char *, void *);
 /**
  * Read a specific file in git-config format.
  * This function takes the same callback and data parameters as `git_config`.
+ *
+ * Unlike git_config(), this function does not respect includes.
  */
 int git_config_from_file(config_fn_t fn, const char *, void *);
 
@@ -136,6 +149,7 @@ int git_config_from_mem(config_fn_t fn,
 			const char *buf, size_t len,
 			void *data, const struct config_options *opts);
 int git_config_from_blob_oid(config_fn_t fn, const char *name,
+			     struct repository *repo,
 			     const struct object_id *oid, void *data);
 void git_config_push_parameter(const char *text);
 void git_config_push_env(const char *spec);
@@ -155,6 +169,8 @@ void read_very_early_config(config_fn_t cb, void *data);
  * will first feed the user-wide one to the callback, and then the
  * repo-specific one; by overwriting, the higher-priority repo-specific
  * value is left at the end).
+ *
+ * Unlike git_config_from_file(), this function respects includes.
  */
 void git_config(config_fn_t fn, void *);
 
@@ -251,12 +267,18 @@ void git_config_set_in_file(const char *, const char *, const char *);
 int git_config_set_gently(const char *, const char *);
 
 /**
+ * Write a config value that should apply to the current worktree. If
+ * extensions.worktreeConfig is enabled, then the write will happen in the
+ * current worktree's config. Otherwise, write to the common config file.
+ */
+int repo_config_set_worktree_gently(struct repository *, const char *, const char *);
+
+/**
  * write config values to `.git/config`, takes a key/value pair as parameter.
  */
 void git_config_set(const char *, const char *);
 
 int git_config_parse_key(const char *, char **, size_t *);
-int git_config_key_is_valid(const char *key);
 
 /*
  * The following macros specify flag bits that alter the behavior
@@ -279,6 +301,7 @@ int git_config_key_is_valid(const char *key);
 
 int git_config_set_multivar_gently(const char *, const char *, const char *, unsigned);
 void git_config_set_multivar(const char *, const char *, const char *, unsigned);
+int repo_config_set_multivar_gently(struct repository *, const char *, const char *, const char *, unsigned);
 int git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, unsigned);
 
 /**
@@ -336,39 +359,6 @@ const char *current_config_origin_type(void);
 const char *current_config_name(void);
 int current_config_line(void);
 
-/**
- * Include Directives
- * ------------------
- *
- * By default, the config parser does not respect include directives.
- * However, a caller can use the special `git_config_include` wrapper
- * callback to support them. To do so, you simply wrap your "real" callback
- * function and data pointer in a `struct config_include_data`, and pass
- * the wrapper to the regular config-reading functions. For example:
- *
- * -------------------------------------------
- * int read_file_with_include(const char *file, config_fn_t fn, void *data)
- * {
- * struct config_include_data inc = CONFIG_INCLUDE_INIT;
- * inc.fn = fn;
- * inc.data = data;
- * return git_config_from_file(git_config_include, file, &inc);
- * }
- * -------------------------------------------
- *
- * `git_config` respects includes automatically. The lower-level
- * `git_config_from_file` does not.
- *
- */
-struct config_include_data {
-	int depth;
-	config_fn_t fn;
-	void *data;
-	const struct config_options *opts;
-};
-#define CONFIG_INCLUDE_INIT { 0 }
-int git_config_include(const char *name, const char *value, void *data);
-
 /*
  * Match and parse a config key of the form:
  *
@@ -484,7 +474,6 @@ void git_configset_clear(struct config_set *cs);
 int git_configset_get_value(struct config_set *cs, const char *key, const char **dest);
 
 int git_configset_get_string(struct config_set *cs, const char *key, char **dest);
-int git_configset_get_string_tmp(struct config_set *cs, const char *key, const char **dest);
 int git_configset_get_int(struct config_set *cs, const char *key, int *dest);
 int git_configset_get_ulong(struct config_set *cs, const char *key, unsigned long *dest);
 int git_configset_get_bool(struct config_set *cs, const char *key, int *dest);
@@ -606,7 +595,6 @@ int git_config_get_maybe_bool(const char *key, int *dest);
 int git_config_get_pathname(const char *key, const char **dest);
 
 int git_config_get_index_threads(int *dest);
-int git_config_get_untracked_cache(void);
 int git_config_get_split_index(void);
 int git_config_get_max_percent_split_change(void);
 int git_config_get_fsmonitor(void);
diff --git a/config.mak.dev b/config.mak.dev
index 022fb58218..3deb076d5e 100644
--- a/config.mak.dev
+++ b/config.mak.dev
@@ -1,13 +1,34 @@
+ifndef COMPILER_FEATURES
+COMPILER_FEATURES := $(shell ./detect-compiler $(CC))
+endif
+
 ifeq ($(filter no-error,$(DEVOPTS)),)
 DEVELOPER_CFLAGS += -Werror
 SPARSE_FLAGS += -Wsparse-error
 endif
-ifneq ($(filter pedantic,$(DEVOPTS)),)
+
+DEVELOPER_CFLAGS += -Wall
+ifeq ($(filter no-pedantic,$(DEVOPTS)),)
 DEVELOPER_CFLAGS += -pedantic
-# don't warn for each N_ use
-DEVELOPER_CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=0
+ifneq (($or $(filter gcc5,$(COMPILER_FEATURES)),$(filter clang4,$(COMPILER_FEATURES))),)
+DEVELOPER_CFLAGS += -Wpedantic
+ifneq ($(filter gcc10,$(COMPILER_FEATURES)),)
+ifeq ($(uname_S),MINGW)
+DEVELOPER_CFLAGS += -Wno-pedantic-ms-format
 endif
-DEVELOPER_CFLAGS += -Wall
+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
@@ -18,10 +39,6 @@ DEVELOPER_CFLAGS += -Wunused
 DEVELOPER_CFLAGS += -Wvla
 DEVELOPER_CFLAGS += -fno-common
 
-ifndef COMPILER_FEATURES
-COMPILER_FEATURES := $(shell ./detect-compiler $(CC))
-endif
-
 ifneq ($(filter clang4,$(COMPILER_FEATURES)),)
 DEVELOPER_CFLAGS += -Wtautological-constant-out-of-range-compare
 endif
diff --git a/config.mak.uname b/config.mak.uname
index 69413fb3dc..4352ea39e9 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -11,6 +11,10 @@ uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
 uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
 uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
 
+ifneq ($(findstring MINGW,$(uname_S)),)
+	uname_S := MINGW
+endif
+
 ifdef MSVC
 	# avoid the MingW and Cygwin configuration sections
 	uname_S := Windows
@@ -54,10 +58,15 @@ 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
+	endif
 endif
 ifeq ($(uname_S),GNU/kFreeBSD)
 	HAVE_ALLOCA_H = YesPlease
@@ -136,6 +145,7 @@ ifeq ($(uname_S),Darwin)
 	HAVE_BSD_SYSCTL = YesPlease
 	FREAD_READS_DIRECTORIES = UnfortunatelyYes
 	HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
+	CSPRNG_METHOD = arc4random
 
 	# Workaround for `gettext` being keg-only and not even being linked via
 	# `brew link --force gettext`, should be obsolete as of
@@ -251,6 +261,7 @@ ifeq ($(uname_S),FreeBSD)
 	HAVE_PATHS_H = YesPlease
 	HAVE_BSD_SYSCTL = YesPlease
 	HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
+	CSPRNG_METHOD = arc4random
 	PAGER_ENV = LESS=FRX LV=-c MORE=FRX
 	FREAD_READS_DIRECTORIES = UnfortunatelyYes
 	FILENO_IS_A_MACRO = UnfortunatelyYes
@@ -265,6 +276,7 @@ ifeq ($(uname_S),OpenBSD)
 	HAVE_PATHS_H = YesPlease
 	HAVE_BSD_SYSCTL = YesPlease
 	HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
+	CSPRNG_METHOD = arc4random
 	PROCFS_EXECUTABLE_PATH = /proc/curproc/file
 	FREAD_READS_DIRECTORIES = UnfortunatelyYes
 	FILENO_IS_A_MACRO = UnfortunatelyYes
@@ -276,6 +288,7 @@ ifeq ($(uname_S),MirBSD)
 	NEEDS_LIBICONV = YesPlease
 	HAVE_PATHS_H = YesPlease
 	HAVE_BSD_SYSCTL = YesPlease
+	CSPRNG_METHOD = arc4random
 endif
 ifeq ($(uname_S),NetBSD)
 	ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -287,6 +300,7 @@ ifeq ($(uname_S),NetBSD)
 	HAVE_PATHS_H = YesPlease
 	HAVE_BSD_SYSCTL = YesPlease
 	HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
+	CSPRNG_METHOD = arc4random
 	PROCFS_EXECUTABLE_PATH = /proc/curproc/exe
 endif
 ifeq ($(uname_S),AIX)
@@ -416,6 +430,7 @@ ifeq ($(uname_S),Windows)
 	NO_STRTOUMAX = YesPlease
 	NO_MKDTEMP = YesPlease
 	NO_INTTYPES_H = YesPlease
+	CSPRNG_METHOD = rtlgenrandom
 	# VS2015 with UCRT claims that snprintf and friends are C99 compliant,
 	# so we don't need this:
 	#
@@ -583,10 +598,11 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
 	NO_MMAP = YesPlease
 	NO_POLL = YesPlease
 	NO_INTPTR_T = UnfortunatelyYes
+	CSPRNG_METHOD = openssl
 	SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin
 	SHELL_PATH = /usr/coreutils/bin/bash
 endif
-ifneq (,$(findstring MINGW,$(uname_S)))
+ifeq ($(uname_S),MINGW)
 	pathsep = ;
 	HAVE_ALLOCA_H = YesPlease
 	NO_PREAD = YesPlease
@@ -617,6 +633,8 @@ ifneq (,$(findstring MINGW,$(uname_S)))
 	ETAGS_TARGET = ETAGS
 	NO_POSIX_GOODIES = UnfortunatelyYes
 	DEFAULT_HELP_FORMAT = html
+	HAVE_PLATFORM_PROCINFO = YesPlease
+	CSPRNG_METHOD = rtlgenrandom
 	BASIC_LDFLAGS += -municode
 	COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
 	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
@@ -732,9 +750,9 @@ vcxproj:
 	 echo '</Project>') >git-remote-http/LinkOrCopyRemoteHttp.targets
 	git add -f git/LinkOrCopyBuiltins.targets git-remote-http/LinkOrCopyRemoteHttp.targets
 
-	# Add command-list.h and config-list.h
-	$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 config-list.h command-list.h
-	git add -f config-list.h command-list.h
+	# Add generated headers
+	$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(GENERATED_H)
+	git add -f $(GENERATED_H)
 
 	# Add scripts
 	rm -f perl/perl.mak
diff --git a/configure.ac b/configure.ac
index 031e8d3fee..5ee25ec95c 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])
 #
diff --git a/connect.c b/connect.c
index 70b13389ba..afc79a6236 100644
--- a/connect.c
+++ b/connect.c
@@ -164,6 +164,8 @@ enum protocol_version discover_version(struct packet_reader *reader)
 		BUG("unknown protocol version");
 	}
 
+	trace2_data_intmax("transfer", NULL, "negotiated-version", version);
+
 	return version;
 }
 
@@ -377,7 +379,7 @@ struct ref **get_remote_heads(struct packet_reader *reader,
 
 /* Returns 1 when a valid ref has been added to `list`, 0 otherwise */
 static int process_ref_v2(struct packet_reader *reader, struct ref ***list,
-			  char **unborn_head_target)
+			  const char **unborn_head_target)
 {
 	int ret = 1;
 	int i = 0;
@@ -481,7 +483,7 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
 	const char *hash_name;
 	struct strvec *ref_prefixes = transport_options ?
 		&transport_options->ref_prefixes : NULL;
-	char **unborn_head_target = transport_options ?
+	const char **unborn_head_target = transport_options ?
 		&transport_options->unborn_head_target : NULL;
 	*list = NULL;
 
@@ -555,6 +557,8 @@ const char *parse_feature_value(const char *feature_list, const char *feature, i
 			if (!*value || isspace(*value)) {
 				if (lenp)
 					*lenp = 0;
+				if (offset)
+					*offset = found + len - feature_list;
 				return value;
 			}
 			/* feature with a value (e.g., "agent=git/1.2.3") */
diff --git a/connected.c b/connected.c
index b18299fdf0..ed3025e7a2 100644
--- a/connected.c
+++ b/connected.c
@@ -24,7 +24,7 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
 	struct child_process rev_list = CHILD_PROCESS_INIT;
 	FILE *rev_list_in;
 	struct check_connected_options defaults = CHECK_CONNECTED_INIT;
-	struct object_id oid;
+	const struct object_id *oid;
 	int err = 0;
 	struct packed_git *new_pack = NULL;
 	struct transport *transport;
@@ -34,7 +34,8 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
 		opt = &defaults;
 	transport = opt->transport;
 
-	if (fn(cb_data, &oid)) {
+	oid = fn(cb_data);
+	if (!oid) {
 		if (opt->err_fd)
 			close(opt->err_fd);
 		return err;
@@ -73,7 +74,7 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
 			for (p = get_all_packs(the_repository); p; p = p->next) {
 				if (!p->pack_promisor)
 					continue;
-				if (find_pack_entry_one(oid.hash, p))
+				if (find_pack_entry_one(oid->hash, p))
 					goto promisor_pack_found;
 			}
 			/*
@@ -83,7 +84,7 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
 			goto no_promisor_pack_found;
 promisor_pack_found:
 			;
-		} while (!fn(cb_data, &oid));
+		} while ((oid = fn(cb_data)) != NULL);
 		return 0;
 	}
 
@@ -108,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)
@@ -132,12 +134,12 @@ no_promisor_pack_found:
 		 * are sure the ref is good and not sending it to
 		 * rev-list for verification.
 		 */
-		if (new_pack && find_pack_entry_one(oid.hash, new_pack))
+		if (new_pack && find_pack_entry_one(oid->hash, new_pack))
 			continue;
 
-		if (fprintf(rev_list_in, "%s\n", oid_to_hex(&oid)) < 0)
+		if (fprintf(rev_list_in, "%s\n", oid_to_hex(oid)) < 0)
 			break;
-	} while (!fn(cb_data, &oid));
+	} while ((oid = fn(cb_data)) != NULL);
 
 	if (ferror(rev_list_in) || fflush(rev_list_in)) {
 		if (errno != EPIPE && errno != EINVAL)
diff --git a/connected.h b/connected.h
index 8d5a6b3ad6..6e59c92aa3 100644
--- a/connected.h
+++ b/connected.h
@@ -9,7 +9,7 @@ struct transport;
  * When called after returning the name for the last object, return -1
  * to signal EOF, otherwise return 0.
  */
-typedef int (*oid_iterate_fn)(void *, struct object_id *oid);
+typedef const struct object_id *(*oid_iterate_fn)(void *);
 
 /*
  * Named-arguments struct for check_connected. All arguments are
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 171b4124af..e44232f85d 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
@@ -260,7 +260,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
 				_CONSOLE DETECT_MSYS_TTY STRIP_EXTENSION=".exe"  NO_SYMLINK_HEAD UNRELIABLE_FSTAT
 				NOGDI OBJECT_CREATION_MODE=1 __USE_MINGW_ANSI_STDIO=0
 				USE_NED_ALLOCATOR OVERRIDE_STRDUP MMAP_PREVENTS_DELETE USE_WIN32_MMAP
-				UNICODE _UNICODE HAVE_WPGMPTR ENSURE_MSYSTEM_IS_SET)
+				UNICODE _UNICODE HAVE_WPGMPTR ENSURE_MSYSTEM_IS_SET HAVE_RTLGENRANDOM)
 	list(APPEND compat_SOURCES compat/mingw.c compat/winansi.c compat/win32/path-utils.c
 		compat/win32/pthread.c compat/win32mmap.c compat/win32/syslog.c
 		compat/win32/trace2_win32_process_info.c compat/win32/dirent.c
@@ -624,6 +624,13 @@ if(NOT EXISTS ${CMAKE_BINARY_DIR}/config-list.h)
 			OUTPUT_FILE ${CMAKE_BINARY_DIR}/config-list.h)
 endif()
 
+if(NOT EXISTS ${CMAKE_BINARY_DIR}/hook-list.h)
+	message("Generating hook-list.h")
+	execute_process(COMMAND ${SH_EXE} ${CMAKE_SOURCE_DIR}/generate-hooklist.sh
+			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+			OUTPUT_FILE ${CMAKE_BINARY_DIR}/hook-list.h)
+endif()
+
 include_directories(${CMAKE_BINARY_DIR})
 
 #build
@@ -640,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
@@ -662,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()
@@ -774,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()
@@ -902,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/coccinelle/xopen.cocci b/contrib/coccinelle/xopen.cocci
new file mode 100644
index 0000000000..b71db67019
--- /dev/null
+++ b/contrib/coccinelle/xopen.cocci
@@ -0,0 +1,19 @@
+@@
+identifier fd;
+identifier die_fn =~ "^(die|die_errno)$";
+@@
+  int fd =
+- open
++ xopen
+  (...);
+- if ( \( fd < 0 \| fd == -1 \) ) { die_fn(...); }
+
+@@
+expression fd;
+identifier die_fn =~ "^(die|die_errno)$";
+@@
+  fd =
+- open
++ xopen
+  (...);
+- if ( \( fd < 0 \| fd == -1 \) ) { die_fn(...); }
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 4bdd27ddc8..49a328aa8a 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -49,6 +49,11 @@
 #     and git-switch completion (e.g., completing "foo" when "origin/foo"
 #     exists).
 #
+#   GIT_COMPLETION_SHOW_ALL_COMMANDS
+#
+#     When set to "1" suggest all commands, including plumbing commands
+#     which are hidden by default (e.g. "cat-file" on "git ca<TAB>").
+#
 #   GIT_COMPLETION_SHOW_ALL
 #
 #     When set to "1" suggest all options, including options which are
@@ -356,7 +361,7 @@ __gitcomp ()
 	local cur_="${3-$cur}"
 
 	case "$cur_" in
-	--*=)
+	*=)
 		;;
 	--no-*)
 		local c i=0 IFS=$' \t\n'
@@ -421,7 +426,7 @@ __gitcomp_builtin ()
 	local incl="${2-}"
 	local excl="${3-}"
 
-	local var=__gitcomp_builtin_"${cmd/-/_}"
+	local var=__gitcomp_builtin_"${cmd//-/_}"
 	local options
 	eval "options=\${$var-}"
 
@@ -515,7 +520,7 @@ __gitcomp_file ()
 # argument, and using the options specified in the second argument.
 __git_ls_files_helper ()
 {
-	if [ "$2" == "--committable" ]; then
+	if [ "$2" = "--committable" ]; then
 		__git -C "$1" -c core.quotePath=false diff-index \
 			--name-only --relative HEAD -- "${3//\\/\\\\}*"
 	else
@@ -1566,7 +1571,7 @@ _git_checkout ()
 
 	case "$cur" in
 	--conflict=*)
-		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		__gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
 		;;
 	--*)
 		__gitcomp_builtin checkout
@@ -2001,7 +2006,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 +2364,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 +2442,7 @@ _git_switch ()
 
 	case "$cur" in
 	--conflict=*)
-		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		__gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
 		;;
 	--*)
 		__gitcomp_builtin switch
@@ -2503,7 +2499,14 @@ __git_config_vars=
 __git_compute_config_vars ()
 {
 	test -n "$__git_config_vars" ||
-	__git_config_vars="$(git help --config-for-completion | sort -u)"
+	__git_config_vars="$(git help --config-for-completion)"
+}
+
+__git_config_sections=
+__git_compute_config_sections ()
+{
+	test -n "$__git_config_sections" ||
+	__git_config_sections="$(git help --config-sections-for-completion)"
 }
 
 # Completes possible values of various configuration variables.
@@ -2543,7 +2546,7 @@ __git_complete_config_variable_value ()
 		return
 		;;
 	branch.*.rebase)
-		__gitcomp "false true merges preserve interactive" "" "$cur_"
+		__gitcomp "false true merges interactive" "" "$cur_"
 		return
 		;;
 	remote.pushdefault)
@@ -2650,10 +2653,10 @@ __git_complete_config_variable_name ()
 		return
 		;;
 	branch.*)
-		local pfx="${cur%.*}."
-		cur_="${cur#*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_#*.}"
 		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
-		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "$sfx"
+		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "${sfx- }"
 		return
 		;;
 	guitool.*.*)
@@ -2687,7 +2690,7 @@ __git_complete_config_variable_name ()
 		local pfx="${cur_%.*}."
 		cur_="${cur_#*.}"
 		__git_compute_all_commands
-		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "$sfx"
+		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "${sfx- }"
 		return
 		;;
 	remote.*.*)
@@ -2703,7 +2706,7 @@ __git_complete_config_variable_name ()
 		local pfx="${cur_%.*}."
 		cur_="${cur_#*.}"
 		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
-		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "$sfx"
+		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "${sfx- }"
 		return
 		;;
 	url.*.*)
@@ -2717,16 +2720,8 @@ __git_complete_config_variable_name ()
 		__gitcomp "$__git_config_vars" "" "$cur_" "$sfx"
 		;;
 	*)
-		__git_compute_config_vars
-		__gitcomp "$(echo "$__git_config_vars" |
-				awk -F . '{
-					sections[$1] = 1
-				}
-				END {
-					for (s in sections)
-						print s "."
-				}
-				')" "" "$cur_"
+		__git_compute_config_sections
+		__gitcomp "$__git_config_sections" "" "$cur_" "."
 		;;
 	esac
 }
@@ -2887,7 +2882,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=}"
@@ -2996,9 +2991,37 @@ _git_show_branch ()
 	__git_complete_revlist
 }
 
+__gitcomp_directories ()
+{
+	local _tmp_dir _tmp_completions _found=0
+
+	# Get the directory of the current token; this differs from dirname
+	# in that it keeps up to the final trailing slash.  If no slash found
+	# that's fine too.
+	[[ "$cur" =~ .*/ ]]
+	_tmp_dir=$BASH_REMATCH
+
+	# Find possible directory completions, adding trailing '/' characters,
+	# de-quoting, and handling unusual characters.
+	while IFS= read -r -d $'\0' c ; do
+		# If there are directory completions, find ones that start
+		# with "$cur", the current token, and put those in COMPREPLY
+		if [[ $c == "$cur"* ]]; then
+			COMPREPLY+=("$c/")
+			_found=1
+		fi
+	done < <(git ls-tree -z -d --name-only HEAD $_tmp_dir)
+
+	if [[ $_found == 0 ]] && [[ "$cur" =~ /$ ]]; then
+		# No possible further completions any deeper, so assume we're at
+		# a leaf directory and just consider it complete
+		__gitcomp_direct_append "$cur "
+	fi
+}
+
 _git_sparse_checkout ()
 {
-	local subcommands="list init set disable"
+	local subcommands="list init set disable add reapply"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		__gitcomp "$subcommands"
@@ -3006,14 +3029,14 @@ _git_sparse_checkout ()
 	fi
 
 	case "$subcommand,$cur" in
-	init,--*)
-		__gitcomp "--cone"
-		;;
-	set,--*)
-		__gitcomp "--stdin"
-		;;
-	*)
+	*,--*)
+		__gitcomp_builtin sparse-checkout_$subcommand "" "--"
 		;;
+	set,*|add,*)
+		if [ "$(__git config core.sparseCheckoutCone)" == "true" ] ||
+		[ -n "$(__git_find_on_cmdline --cone)" ]; then
+			__gitcomp_directories
+		fi
 	esac
 }
 
@@ -3465,7 +3488,13 @@ __git_main ()
 			then
 				__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
 			else
-				__gitcomp "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
+				local list_cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config
+
+				if test "${GIT_COMPLETION_SHOW_ALL_COMMANDS-}" = "1"
+				then
+					list_cmds=builtins,$list_cmds
+				fi
+				__gitcomp "$(__git --list-cmds=$list_cmds)"
 			fi
 			;;
 		esac
diff --git a/contrib/completion/git-completion.tcsh b/contrib/completion/git-completion.tcsh
index 4a790d8f4e..ba797e5b3c 100644
--- a/contrib/completion/git-completion.tcsh
+++ b/contrib/completion/git-completion.tcsh
@@ -80,8 +80,9 @@ else
 	COMP_CWORD=\$((\${#COMP_WORDS[@]}-1))
 fi
 
-# Call _git() or _gitk() of the bash script, based on the first argument
-_\${1}
+# Call __git_wrap__git_main() or __git_wrap__gitk_main() of the bash script,
+# based on the first argument
+__git_wrap__\${1}_main
 
 IFS=\$'\n'
 if [ \${#COMPREPLY[*]} -eq 0 ]; then
diff --git a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
index d389bfadce..5927e27ae6 100644
--- a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
+++ b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
@@ -138,7 +138,7 @@ struct credential {
 	char *password;
 };
 
-#define CREDENTIAL_INIT { NULL, NULL, 0, NULL, NULL, NULL }
+#define CREDENTIAL_INIT { 0 }
 
 typedef int (*credential_op_cb)(struct credential *);
 
diff --git a/contrib/credential/libsecret/git-credential-libsecret.c b/contrib/credential/libsecret/git-credential-libsecret.c
index e6598b6383..2c5d76d789 100644
--- a/contrib/credential/libsecret/git-credential-libsecret.c
+++ b/contrib/credential/libsecret/git-credential-libsecret.c
@@ -41,7 +41,7 @@ struct credential {
 	char *password;
 };
 
-#define CREDENTIAL_INIT { NULL, NULL, 0, NULL, NULL, NULL }
+#define CREDENTIAL_INIT { 0 }
 
 typedef int (*credential_op_cb)(struct credential *);
 
diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
index bcd3f575a3..0b44a9b7cc 100644
--- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c
+++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
@@ -10,6 +10,7 @@ static char *username;
 static char *password;
 static UInt16 port;
 
+__attribute__((format (printf, 1, 2)))
 static void die(const char *err, ...)
 {
 	char msg[4096];
diff --git a/contrib/credential/wincred/git-credential-wincred.c b/contrib/credential/wincred/git-credential-wincred.c
index 5bdad41de1..5091048f9c 100644
--- a/contrib/credential/wincred/git-credential-wincred.c
+++ b/contrib/credential/wincred/git-credential-wincred.c
@@ -11,6 +11,7 @@
 
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 
+__attribute__((format (printf, 1, 2)))
 static void die(const char *err, ...)
 {
 	char msg[4096];
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/rerere-train.sh b/contrib/rerere-train.sh
index eeee45dd34..75125d6ae0 100755
--- a/contrib/rerere-train.sh
+++ b/contrib/rerere-train.sh
@@ -91,7 +91,7 @@ do
 		git checkout -q $commit -- .
 		git rerere
 	fi
-	git reset -q --hard
+	git reset -q --hard  # Might nuke untracked files...
 done
 
 if test -z "$branch"
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..7db2a97416
--- /dev/null
+++ b/contrib/scalar/scalar.c
@@ -0,0 +1,846 @@
+/*
+ * 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;
+
+	while (argc > 1 && *argv[1] == '-') {
+		if (!strcmp(argv[1], "-C")) {
+			if (argc < 3)
+				die(_("-C requires a <directory>"));
+			if (chdir(argv[2]) < 0)
+				die_errno(_("could not change to '%s'"),
+					  argv[2]);
+			argc -= 2;
+			argv += 2;
+		} else if (!strcmp(argv[1], "-c")) {
+			if (argc < 3)
+				die(_("-c requires a <key>=<value> argument"));
+			git_config_push_parameter(argv[2]);
+			argc -= 2;
+			argv += 2;
+		} else
+			break;
+	}
+
+	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 [-C <directory>] [-c <key>=<value>] "
+			 "<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..cf4e5b889c
--- /dev/null
+++ b/contrib/scalar/scalar.txt
@@ -0,0 +1,155 @@
+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.
+
+The following options can be specified _before_ the subcommand:
+
+-C <directory>::
+	Before running the subcommand, change the working directory. This
+	option imitates the same option of linkgit:git[1].
+
+-c <key>=<value>::
+	For the duration of running the specified subcommand, configure this
+	setting. This option imitates the same option of linkgit:git[1].
+
+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..89781568f4
--- /dev/null
+++ b/contrib/scalar/t/t9099-scalar.sh
@@ -0,0 +1,96 @@
+#!/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_expect_success 'scalar supports -c/-C' '
+	test_when_finished "scalar delete sub" &&
+	git init sub &&
+	scalar -C sub -c status.aheadBehind=bogus register &&
+	test -z "$(git -C sub config --local status.aheadBehind)" &&
+	test true = "$(git -C sub config core.preloadIndex)"
+'
+
+test_done
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 7f767b5c38..1af1d9653e 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"
 
@@ -976,10 +975,10 @@ cmd_merge () {
 
 	if test -n "$arg_addmerge_message"
 	then
-		git merge -Xsubtree="$arg_prefix" \
+		git merge --no-ff -Xsubtree="$arg_prefix" \
 			--message="$arg_addmerge_message" "$rev"
 	else
-		git merge -Xsubtree="$arg_prefix" $rev
+		git merge --no-ff -Xsubtree="$arg_prefix" $rev
 	fi
 }
 
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 fd9c84b025..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;
@@ -916,6 +916,7 @@ done:
 	else
 		strbuf_swap(dst, &nbuf);
 	strbuf_release(&nbuf);
+	strbuf_release(&filter_status);
 	return !err;
 }
 
@@ -966,6 +967,7 @@ done:
 
 	if (err)
 		handle_filter_error(&filter_status, entry, 0);
+	strbuf_release(&filter_status);
 	return !err;
 }
 
diff --git a/credential.c b/credential.c
index 3c05c7c669..e7240f3f63 100644
--- a/credential.c
+++ b/credential.c
@@ -105,7 +105,7 @@ static int match_partial_url(const char *url, void *cb)
 static void credential_apply_config(struct credential *c)
 {
 	char *normalized_url;
-	struct urlmatch_config config = { STRING_LIST_INIT_DUP };
+	struct urlmatch_config config = URLMATCH_CONFIG_INIT;
 	struct strbuf url = STRBUF_INIT;
 
 	if (!c->host)
@@ -128,6 +128,7 @@ static void credential_apply_config(struct credential *c)
 	normalized_url = url_normalize(url.buf, &config.url);
 
 	git_config(urlmatch_config_entry, &config);
+	string_list_clear(&config.vars, 1);
 	free(normalized_url);
 	strbuf_release(&url);
 
diff --git a/csum-file.c b/csum-file.c
index c951cf8277..26e8a6df44 100644
--- a/csum-file.c
+++ b/csum-file.c
@@ -131,12 +131,8 @@ struct hashfile *hashfd_check(const char *name)
 	int sink, check;
 	struct hashfile *f;
 
-	sink = open("/dev/null", O_WRONLY);
-	if (sink < 0)
-		die_errno("unable to open /dev/null");
-	check = open(name, O_RDONLY);
-	if (check < 0)
-		die_errno("unable to open '%s'", name);
+	sink = xopen("/dev/null", O_WRONLY);
+	check = xopen(name, O_RDONLY);
 	f = hashfd(sink, name);
 	f->check_fd = check;
 	f->check_buffer = xmalloc(f->buffer_len);
diff --git a/daemon.c b/daemon.c
index 5c4cbad62d..94a5b8a364 100644
--- a/daemon.c
+++ b/daemon.c
@@ -63,6 +63,12 @@ struct hostinfo {
 	unsigned int hostname_lookup_done:1;
 	unsigned int saw_extended_args:1;
 };
+#define HOSTINFO_INIT { \
+	.hostname = STRBUF_INIT, \
+	.canon_hostname = STRBUF_INIT, \
+	.ip_address = STRBUF_INIT, \
+	.tcp_port = STRBUF_INIT, \
+}
 
 static void lookup_hostname(struct hostinfo *hi);
 
@@ -226,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;
@@ -320,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;
@@ -727,15 +729,6 @@ static void lookup_hostname(struct hostinfo *hi)
 	}
 }
 
-static void hostinfo_init(struct hostinfo *hi)
-{
-	memset(hi, 0, sizeof(*hi));
-	strbuf_init(&hi->hostname, 0);
-	strbuf_init(&hi->canon_hostname, 0);
-	strbuf_init(&hi->ip_address, 0);
-	strbuf_init(&hi->tcp_port, 0);
-}
-
 static void hostinfo_clear(struct hostinfo *hi)
 {
 	strbuf_release(&hi->hostname);
@@ -760,17 +753,15 @@ static int execute(void)
 	char *line = packet_buffer;
 	int pktlen, len, i;
 	char *addr = getenv("REMOTE_ADDR"), *port = getenv("REMOTE_PORT");
-	struct hostinfo hi;
+	struct hostinfo hi = HOSTINFO_INIT;
 	struct strvec env = STRVEC_INIT;
 
-	hostinfo_init(&hi);
-
 	if (addr)
 		loginfo("Connection from %s:%s", addr, port);
 
 	set_keep_alive(0);
 	alarm(init_timeout ? init_timeout : timeout);
-	pktlen = packet_read(0, NULL, NULL, packet_buffer, sizeof(packet_buffer), 0);
+	pktlen = packet_read(0, packet_buffer, sizeof(packet_buffer), 0);
 	alarm(0);
 
 	len = strlen(line);
@@ -927,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/detect-compiler b/detect-compiler
index 70b754481c..11d60da5b7 100755
--- a/detect-compiler
+++ b/detect-compiler
@@ -13,11 +13,11 @@ get_version_line() {
 }
 
 get_family() {
-	get_version_line | sed 's/^\(.*\) version [0-9][^ ]* .*/\1/'
+	get_version_line | sed 's/^\(.*\) version [0-9].*/\1/'
 }
 
 get_version() {
-	get_version_line | sed 's/^.* version \([0-9][^ ]*\) .*/\1/'
+	get_version_line | sed 's/^.* version \([0-9][^ ]*\).*/\1/'
 }
 
 print_flags() {
@@ -38,10 +38,7 @@ case "$(get_family)" in
 gcc)
 	print_flags gcc
 	;;
-clang)
-	print_flags clang
-	;;
-"FreeBSD clang")
+clang | *" clang")
 	print_flags clang
 	;;
 "Apple LLVM")
diff --git a/diff-lib.c b/diff-lib.c
index c2ac9250fe..ca085a03ef 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -117,6 +117,10 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
 		if (!ce_path_match(istate, ce, &revs->prune_data, NULL))
 			continue;
 
+		if (revs->diffopt.prefix &&
+		    strncmp(ce->name, revs->diffopt.prefix, revs->diffopt.prefix_length))
+			continue;
+
 		if (ce_stage(ce)) {
 			struct combine_diff_path *dpath;
 			struct diff_filepair *pair;
@@ -325,6 +329,11 @@ static void show_new_file(struct rev_info *revs,
 	unsigned dirty_submodule = 0;
 	struct index_state *istate = revs->diffopt.repo->index;
 
+	if (new_file && S_ISSPARSEDIR(new_file->ce_mode)) {
+		diff_tree_oid(NULL, &new_file->oid, new_file->name, &revs->diffopt);
+		return;
+	}
+
 	/*
 	 * New file in the index: it might actually be different in
 	 * the working tree.
@@ -347,6 +356,20 @@ static int show_modified(struct rev_info *revs,
 	unsigned dirty_submodule = 0;
 	struct index_state *istate = revs->diffopt.repo->index;
 
+	assert(S_ISSPARSEDIR(old_entry->ce_mode) ==
+	       S_ISSPARSEDIR(new_entry->ce_mode));
+
+	/*
+	 * If both are sparse directory entries, then expand the
+	 * modifications to the file level. If only one was a sparse
+	 * directory, then they appear as an add and delete instead of
+	 * a modification.
+	 */
+	if (S_ISSPARSEDIR(new_entry->ce_mode)) {
+		diff_tree_oid(&old_entry->oid, &new_entry->oid, new_entry->name, &revs->diffopt);
+		return 0;
+	}
+
 	if (get_stat_data(istate, new_entry, &oid, &mode, cached, match_missing,
 			  &dirty_submodule, &revs->diffopt) < 0) {
 		if (report_missing)
diff --git a/diff-merges.c b/diff-merges.c
index 0dfcaa1b11..a833fd747a 100644
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -6,7 +6,7 @@ typedef void (*diff_merges_setup_func_t)(struct rev_info *);
 static void set_separate(struct rev_info *revs);
 
 static diff_merges_setup_func_t set_to_default = set_separate;
-static int suppress_parsing;
+static int suppress_m_parsing;
 
 static void suppress(struct rev_info *revs)
 {
@@ -17,12 +17,14 @@ static void suppress(struct rev_info *revs)
 	revs->combined_all_paths = 0;
 	revs->merges_imply_patch = 0;
 	revs->merges_need_diff = 0;
+	revs->remerge_diff = 0;
 }
 
 static void set_separate(struct rev_info *revs)
 {
 	suppress(revs);
 	revs->separate_merges = 1;
+	revs->simplify_history = 0;
 }
 
 static void set_first_parent(struct rev_info *revs)
@@ -45,6 +47,13 @@ static void set_dense_combined(struct rev_info *revs)
 	revs->dense_combined_merges = 1;
 }
 
+static void set_remerge_diff(struct rev_info *revs)
+{
+	suppress(revs);
+	revs->remerge_diff = 1;
+	revs->simplify_history = 0;
+}
+
 static diff_merges_setup_func_t func_by_opt(const char *optarg)
 {
 	if (!strcmp(optarg, "off") || !strcmp(optarg, "none"))
@@ -57,6 +66,8 @@ static diff_merges_setup_func_t func_by_opt(const char *optarg)
 		return set_combined;
 	else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
 		return set_dense_combined;
+	else if (!strcmp(optarg, "r") || !strcmp(optarg, "remerge"))
+		return set_remerge_diff;
 	else if (!strcmp(optarg, "m") || !strcmp(optarg, "on"))
 		return set_to_default;
 	return NULL;
@@ -91,9 +102,9 @@ int diff_merges_config(const char *value)
 	return 0;
 }
 
-void diff_merges_suppress_options_parsing(void)
+void diff_merges_suppress_m_parsing(void)
 {
-	suppress_parsing = 1;
+	suppress_m_parsing = 1;
 }
 
 int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
@@ -102,18 +113,17 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
 	const char *optarg;
 	const char *arg = argv[0];
 
-	if (suppress_parsing)
-		return 0;
-
-	if (!strcmp(arg, "-m")) {
+	if (!suppress_m_parsing && !strcmp(arg, "-m")) {
 		set_to_default(revs);
-		revs->merges_imply_patch = 1;
 	} else if (!strcmp(arg, "-c")) {
 		set_combined(revs);
 		revs->merges_imply_patch = 1;
 	} else if (!strcmp(arg, "--cc")) {
 		set_dense_combined(revs);
 		revs->merges_imply_patch = 1;
+	} else if (!strcmp(arg, "--remerge-diff")) {
+		set_remerge_diff(revs);
+		revs->merges_imply_patch = 1;
 	} else if (!strcmp(arg, "--no-diff-merges")) {
 		suppress(revs);
 	} else if (!strcmp(arg, "--combined-all-paths")) {
@@ -154,9 +164,6 @@ void diff_merges_set_dense_combined_if_unset(struct rev_info *revs)
 
 void diff_merges_setup_revs(struct rev_info *revs)
 {
-	if (suppress_parsing)
-		return;
-
 	if (revs->combine_merges == 0)
 		revs->dense_combined_merges = 0;
 	if (revs->separate_merges == 0)
diff --git a/diff-merges.h b/diff-merges.h
index b5d57f6563..19639689bb 100644
--- a/diff-merges.h
+++ b/diff-merges.h
@@ -11,7 +11,7 @@ struct rev_info;
 
 int diff_merges_config(const char *value);
 
-void diff_merges_suppress_options_parsing(void);
+void diff_merges_suppress_m_parsing(void);
 
 int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
 
diff --git a/diff.c b/diff.c
index 260dc37d4b..7d5cfd325e 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"
@@ -26,6 +27,8 @@
 #include "parse-options.h"
 #include "help.h"
 #include "promisor-remote.h"
+#include "dir.h"
+#include "strmap.h"
 
 #ifdef NO_FAST_WORKING_DIRECTORY
 #define FAST_WORKING_DIRECTORY 0
@@ -35,7 +38,7 @@
 
 static int diff_detect_rename_default;
 static int diff_indent_heuristic = 1;
-static int diff_rename_limit_default = 400;
+static int diff_rename_limit_default = 1000;
 static int diff_suppress_blank_empty;
 static int diff_use_color_default = -1;
 static int diff_color_moved_default;
@@ -772,15 +775,16 @@ 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 {NULL}
+#define EMITTED_DIFF_SYMBOL_INIT { 0 }
 
 struct emitted_diff_symbols {
 	struct emitted_diff_symbol *buf;
 	int nr, alloc;
 };
-#define EMITTED_DIFF_SYMBOLS_INIT {NULL, 0, 0}
+#define EMITTED_DIFF_SYMBOLS_INIT { 0 }
 
 static void append_emitted_diff_symbol(struct diff_options *o,
 				       struct emitted_diff_symbol *e)
@@ -797,9 +801,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 {
@@ -807,11 +811,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)
@@ -855,79 +854,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_width == INDENT_BLANKLINE && b_width == INDENT_BLANKLINE)
+		return INDENT_BLANKLINE;
 
-	if (a_len - a_off != b_len - b_off ||
-	    memcmp(a->line + a_off, b->line + b_off, a_len - a_off))
-		return 0;
-
-	*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
@@ -936,166 +897,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);
+	unsigned int hash = xdiff_hash_string(l->line + l->indent_off,
+					      l->len - l->indent_off, flags);
 
-	hashmap_entry_init(&ret->ent, hash);
-	ret->es = l;
-	ret->next_line = NULL;
-
-	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;
 }
 
 /*
@@ -1114,6 +1074,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;
@@ -1130,95 +1092,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;
 		}
 
@@ -1228,17 +1180,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;
@@ -1572,7 +1519,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);
@@ -3405,6 +3354,31 @@ struct userdiff_driver *get_textconv(struct repository *r,
 	return userdiff_get_textconv(r, one->driver);
 }
 
+static struct strbuf *additional_headers(struct diff_options *o,
+					 const char *path)
+{
+	if (!o->additional_path_headers)
+		return NULL;
+	return strmap_get(o->additional_path_headers, path);
+}
+
+static void add_formatted_headers(struct strbuf *msg,
+				  struct strbuf *more_headers,
+				  const char *line_prefix,
+				  const char *meta,
+				  const char *reset)
+{
+	char *next, *newline;
+
+	for (next = more_headers->buf; *next; next = newline) {
+		newline = strchrnul(next, '\n');
+		strbuf_addf(msg, "%s%s%.*s%s\n", line_prefix, meta,
+			    (int)(newline - next), next, reset);
+		if (*newline)
+			newline++;
+	}
+}
+
 static void builtin_diff(const char *name_a,
 			 const char *name_b,
 			 struct diff_filespec *one,
@@ -3463,6 +3437,17 @@ static void builtin_diff(const char *name_a,
 	b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
 	lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
 	lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
+	if (!DIFF_FILE_VALID(one) && !DIFF_FILE_VALID(two)) {
+		/*
+		 * We should only reach this point for pairs from
+		 * create_filepairs_for_header_only_notifications().  For
+		 * these, we should avoid the "/dev/null" special casing
+		 * above, meaning we avoid showing such pairs as either
+		 * "new file" or "deleted file" below.
+		 */
+		lbl[0] = a_one;
+		lbl[1] = b_two;
+	}
 	strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, meta, a_one, b_two, reset);
 	if (lbl[0][0] == '/') {
 		/* /dev/null */
@@ -3907,6 +3892,13 @@ static int reuse_worktree_file(struct index_state *istate,
 	if (!want_file && would_convert_to_git(istate, name))
 		return 0;
 
+	/*
+	 * If this path does not match our sparse-checkout definition,
+	 * then the file will not be in the working directory.
+	 */
+	if (!path_in_sparse_checkout(name, istate))
+		return 0;
+
 	len = strlen(name);
 	pos = index_name_pos(istate, name, len);
 	if (pos < 0)
@@ -4320,6 +4312,7 @@ static void fill_metainfo(struct strbuf *msg,
 	const char *set = diff_get_color(use_color, DIFF_METAINFO);
 	const char *reset = diff_get_color(use_color, DIFF_RESET);
 	const char *line_prefix = diff_line_prefix(o);
+	struct strbuf *more_headers = NULL;
 
 	*must_show_header = 1;
 	strbuf_init(msg, PATH_MAX * 2 + 300);
@@ -4356,6 +4349,11 @@ static void fill_metainfo(struct strbuf *msg,
 	default:
 		*must_show_header = 0;
 	}
+	if ((more_headers = additional_headers(o, name))) {
+		add_formatted_headers(msg, more_headers,
+				      line_prefix, set, reset);
+		*must_show_header = 1;
+	}
 	if (one && two && !oideq(&one->oid, &two->oid)) {
 		const unsigned hexsz = the_hash_algo->hexsz;
 		int abbrev = o->abbrev ? o->abbrev : DEFAULT_ABBREV;
@@ -4615,6 +4613,43 @@ void repo_diff_setup(struct repository *r, struct diff_options *options)
 	prep_parse_options(options);
 }
 
+static const char diff_status_letters[] = {
+	DIFF_STATUS_ADDED,
+	DIFF_STATUS_COPIED,
+	DIFF_STATUS_DELETED,
+	DIFF_STATUS_MODIFIED,
+	DIFF_STATUS_RENAMED,
+	DIFF_STATUS_TYPE_CHANGED,
+	DIFF_STATUS_UNKNOWN,
+	DIFF_STATUS_UNMERGED,
+	DIFF_STATUS_FILTER_AON,
+	DIFF_STATUS_FILTER_BROKEN,
+	'\0',
+};
+
+static unsigned int filter_bit['Z' + 1];
+
+static void prepare_filter_bits(void)
+{
+	int i;
+
+	if (!filter_bit[DIFF_STATUS_ADDED]) {
+		for (i = 0; diff_status_letters[i]; i++)
+			filter_bit[(int) diff_status_letters[i]] = (1 << i);
+	}
+}
+
+static unsigned filter_bit_tst(char status, const struct diff_options *opt)
+{
+	return opt->filter & filter_bit[(int) status];
+}
+
+unsigned diff_filter_bit(char status)
+{
+	prepare_filter_bits();
+	return filter_bit[(int) status];
+}
+
 void diff_setup_done(struct diff_options *options)
 {
 	unsigned check_mask = DIFF_FORMAT_NAME |
@@ -4631,16 +4666,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"
@@ -4724,6 +4763,12 @@ void diff_setup_done(struct diff_options *options)
 	if (!options->use_color || external_diff())
 		options->color_moved = 0;
 
+	if (options->filter_not) {
+		if (!options->filter)
+			options->filter = ~filter_bit[DIFF_STATUS_FILTER_AON];
+		options->filter &= ~options->filter_not;
+	}
+
 	FREE_AND_NULL(options->parseopts);
 }
 
@@ -4815,43 +4860,6 @@ static int parse_dirstat_opt(struct diff_options *options, const char *params)
 	return 1;
 }
 
-static const char diff_status_letters[] = {
-	DIFF_STATUS_ADDED,
-	DIFF_STATUS_COPIED,
-	DIFF_STATUS_DELETED,
-	DIFF_STATUS_MODIFIED,
-	DIFF_STATUS_RENAMED,
-	DIFF_STATUS_TYPE_CHANGED,
-	DIFF_STATUS_UNKNOWN,
-	DIFF_STATUS_UNMERGED,
-	DIFF_STATUS_FILTER_AON,
-	DIFF_STATUS_FILTER_BROKEN,
-	'\0',
-};
-
-static unsigned int filter_bit['Z' + 1];
-
-static void prepare_filter_bits(void)
-{
-	int i;
-
-	if (!filter_bit[DIFF_STATUS_ADDED]) {
-		for (i = 0; diff_status_letters[i]; i++)
-			filter_bit[(int) diff_status_letters[i]] = (1 << i);
-	}
-}
-
-static unsigned filter_bit_tst(char status, const struct diff_options *opt)
-{
-	return opt->filter & filter_bit[(int) status];
-}
-
-unsigned diff_filter_bit(char status)
-{
-	prepare_filter_bits();
-	return filter_bit[(int) status];
-}
-
 static int diff_opt_diff_filter(const struct option *option,
 				const char *optarg, int unset)
 {
@@ -4861,21 +4869,6 @@ static int diff_opt_diff_filter(const struct option *option,
 	BUG_ON_OPT_NEG(unset);
 	prepare_filter_bits();
 
-	/*
-	 * If there is a negation e.g. 'd' in the input, and we haven't
-	 * initialized the filter field with another --diff-filter, start
-	 * from full set of bits, except for AON.
-	 */
-	if (!opt->filter) {
-		for (i = 0; (optch = optarg[i]) != '\0'; i++) {
-			if (optch < 'a' || 'z' < optch)
-				continue;
-			opt->filter = (1 << (ARRAY_SIZE(diff_status_letters) - 1)) - 1;
-			opt->filter &= ~filter_bit[DIFF_STATUS_FILTER_AON];
-			break;
-		}
-	}
-
 	for (i = 0; (optch = optarg[i]) != '\0'; i++) {
 		unsigned int bit;
 		int negate;
@@ -4892,7 +4885,7 @@ static int diff_opt_diff_filter(const struct option *option,
 			return error(_("unknown change class '%c' in --diff-filter=%s"),
 				     optarg[i], optarg);
 		if (negate)
-			opt->filter &= ~bit;
+			opt->filter_not |= bit;
 		else
 			opt->filter |= bit;
 	}
@@ -5844,12 +5837,27 @@ int diff_unmodified_pair(struct diff_filepair *p)
 
 static void diff_flush_patch(struct diff_filepair *p, struct diff_options *o)
 {
-	if (diff_unmodified_pair(p))
+	int include_conflict_headers =
+	    (additional_headers(o, p->one->path) &&
+	     (!o->filter || filter_bit_tst(DIFF_STATUS_UNMERGED, o)));
+
+	/*
+	 * Check if we can return early without showing a diff.  Note that
+	 * diff_filepair only stores {oid, path, mode, is_valid}
+	 * information for each path, and thus diff_unmodified_pair() only
+	 * considers those bits of info.  However, we do not want pairs
+	 * created by create_filepairs_for_header_only_notifications()
+	 * (which always look like unmodified pairs) to be ignored, so
+	 * return early if both p is unmodified AND we don't want to
+	 * include_conflict_headers.
+	 */
+	if (diff_unmodified_pair(p) && !include_conflict_headers)
 		return;
 
+	/* Actually, we can also return early to avoid showing tree diffs */
 	if ((DIFF_FILE_VALID(p->one) && S_ISDIR(p->one->mode)) ||
 	    (DIFF_FILE_VALID(p->two) && S_ISDIR(p->two->mode)))
-		return; /* no tree diffs in patch format */
+		return;
 
 	run_diff(p, o);
 }
@@ -5880,10 +5888,17 @@ static void diff_flush_checkdiff(struct diff_filepair *p,
 	run_checkdiff(p, o);
 }
 
-int diff_queue_is_empty(void)
+int diff_queue_is_empty(struct diff_options *o)
 {
 	struct diff_queue_struct *q = &diff_queued_diff;
 	int i;
+	int include_conflict_headers =
+	    (o->additional_path_headers &&
+	     (!o->filter || filter_bit_tst(DIFF_STATUS_UNMERGED, o)));
+
+	if (include_conflict_headers)
+		return 0;
+
 	for (i = 0; i < q->nr; i++)
 		if (!diff_unmodified_pair(q->queue[i]))
 			return 0;
@@ -6295,7 +6310,7 @@ static int is_summary_empty(const struct diff_queue_struct *q)
 }
 
 static const char rename_limit_warning[] =
-N_("inexact rename detection was skipped due to too many files.");
+N_("exhaustive rename detection was skipped due to too many files.");
 
 static const char degrade_cc_to_c_warning[] =
 N_("only found copies from modified paths due to too many files.");
@@ -6317,6 +6332,54 @@ void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)
 		warning(_(rename_limit_advice), varname, needed);
 }
 
+static void create_filepairs_for_header_only_notifications(struct diff_options *o)
+{
+	struct strset present;
+	struct diff_queue_struct *q = &diff_queued_diff;
+	struct hashmap_iter iter;
+	struct strmap_entry *e;
+	int i;
+
+	strset_init_with_options(&present, /*pool*/ NULL, /*strdup*/ 0);
+
+	/*
+	 * Find out which paths exist in diff_queued_diff, preferring
+	 * one->path for any pair that has multiple paths.
+	 */
+	for (i = 0; i < q->nr; i++) {
+		struct diff_filepair *p = q->queue[i];
+		char *path = p->one->path ? p->one->path : p->two->path;
+
+		if (strmap_contains(o->additional_path_headers, path))
+			strset_add(&present, path);
+	}
+
+	/*
+	 * Loop over paths in additional_path_headers; for each NOT already
+	 * in diff_queued_diff, create a synthetic filepair and insert that
+	 * into diff_queued_diff.
+	 */
+	strmap_for_each_entry(o->additional_path_headers, &iter, e) {
+		if (!strset_contains(&present, e->key)) {
+			struct diff_filespec *one, *two;
+			struct diff_filepair *p;
+
+			one = alloc_filespec(e->key);
+			two = alloc_filespec(e->key);
+			fill_filespec(one, null_oid(), 0, 0);
+			fill_filespec(two, null_oid(), 0, 0);
+			p = diff_queue(q, one, two);
+			p->status = DIFF_STATUS_MODIFIED;
+		}
+	}
+
+	/* Re-sort the filepairs */
+	diffcore_fix_diff_index();
+
+	/* Cleanup */
+	strset_clear(&present);
+}
+
 static void diff_flush_patch_all_file_pairs(struct diff_options *o)
 {
 	int i;
@@ -6329,6 +6392,9 @@ static void diff_flush_patch_all_file_pairs(struct diff_options *o)
 	if (o->color_moved)
 		o->emitted_symbols = &esm;
 
+	if (o->additional_path_headers)
+		create_filepairs_for_header_only_notifications(o);
+
 	for (i = 0; i < q->nr; i++) {
 		struct diff_filepair *p = q->queue[i];
 		if (check_pair_status(p))
@@ -6337,24 +6403,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++)
@@ -6405,7 +6465,7 @@ void diff_flush(struct diff_options *options)
 	 * Order: raw, stat, summary, patch
 	 * or:    name/name-status/checkdiff (other bits clear)
 	 */
-	if (!q->nr)
+	if (!q->nr && !options->additional_path_headers)
 		goto free_queue;
 
 	if (output_format & (DIFF_FORMAT_RAW |
@@ -6913,19 +6973,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/diff.h b/diff.h
index 8ba85c5e60..8ae18e5ab1 100644
--- a/diff.h
+++ b/diff.h
@@ -283,7 +283,7 @@ struct diff_options {
 	struct diff_flags flags;
 
 	/* diff-filter bits */
-	unsigned int filter;
+	unsigned int filter, filter_not;
 
 	int use_color;
 
@@ -395,6 +395,7 @@ struct diff_options {
 
 	struct repository *repo;
 	struct option *parseopts;
+	struct strmap *additional_path_headers;
 
 	int no_free;
 };
@@ -593,7 +594,7 @@ void diffcore_fix_diff_index(void);
 "                show all files diff when -S is used and hit is found.\n" \
 "  -a  --text    treat all files as text.\n"
 
-int diff_queue_is_empty(void);
+int diff_queue_is_empty(struct diff_options *o);
 void diff_flush(struct diff_options*);
 void diff_free(struct diff_options*);
 void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
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/diffcore-rename.c b/diffcore-rename.c
index 4ef0459cfb..bebd4ed6a4 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -317,10 +317,11 @@ static int find_identical_files(struct hashmap *srcs,
 }
 
 static void insert_file_table(struct repository *r,
+			      struct mem_pool *pool,
 			      struct hashmap *table, int index,
 			      struct diff_filespec *filespec)
 {
-	struct file_similarity *entry = xmalloc(sizeof(*entry));
+	struct file_similarity *entry = mem_pool_alloc(pool, sizeof(*entry));
 
 	entry->index = index;
 	entry->filespec = filespec;
@@ -336,7 +337,8 @@ static void insert_file_table(struct repository *r,
  * and then during the second round we try to match
  * cache-dirty entries as well.
  */
-static int find_exact_renames(struct diff_options *options)
+static int find_exact_renames(struct diff_options *options,
+			      struct mem_pool *pool)
 {
 	int i, renames = 0;
 	struct hashmap file_table;
@@ -346,7 +348,7 @@ static int find_exact_renames(struct diff_options *options)
 	 */
 	hashmap_init(&file_table, NULL, NULL, rename_src_nr);
 	for (i = rename_src_nr-1; i >= 0; i--)
-		insert_file_table(options->repo,
+		insert_file_table(options->repo, pool,
 				  &file_table, i,
 				  rename_src[i].p->one);
 
@@ -354,8 +356,8 @@ static int find_exact_renames(struct diff_options *options)
 	for (i = 0; i < rename_dst_nr; i++)
 		renames += find_identical_files(&file_table, i, options);
 
-	/* Free the hash data structure and entries */
-	hashmap_clear_and_free(&file_table, struct file_similarity, entry);
+	/* Free the hash data structure (entries will be freed with the pool) */
+	hashmap_clear(&file_table);
 
 	return renames;
 }
@@ -448,9 +450,9 @@ static void update_dir_rename_counts(struct dir_rename_info *info,
 				     const char *oldname,
 				     const char *newname)
 {
-	char *old_dir = xstrdup(oldname);
-	char *new_dir = xstrdup(newname);
-	char new_dir_first_char = new_dir[0];
+	char *old_dir;
+	char *new_dir;
+	const char new_dir_first_char = newname[0];
 	int first_time_in_loop = 1;
 
 	if (!info->setup)
@@ -475,6 +477,10 @@ static void update_dir_rename_counts(struct dir_rename_info *info,
 		 */
 		return;
 
+
+	old_dir = xstrdup(oldname);
+	new_dir = xstrdup(newname);
+
 	while (1) {
 		int drd_flag = NOT_RELEVANT;
 
@@ -1091,7 +1097,7 @@ static int too_many_rename_candidates(int num_destinations, int num_sources,
 	 * memory for the matrix anyway.
 	 */
 	if (rename_limit <= 0)
-		rename_limit = 32767;
+		return 0; /* treat as unlimited */
 	if (st_mult(num_destinations, num_sources)
 	    <= st_mult(rename_limit, rename_limit))
 		return 0;
@@ -1326,7 +1332,47 @@ static void handle_early_known_dir_renames(struct dir_rename_info *info,
 	rename_src_nr = new_num_src;
 }
 
+static void free_filespec_data(struct diff_filespec *spec)
+{
+	if (!--spec->count)
+		diff_free_filespec_data(spec);
+}
+
+static void pool_free_filespec(struct mem_pool *pool,
+			       struct diff_filespec *spec)
+{
+	if (!pool) {
+		free_filespec(spec);
+		return;
+	}
+
+	/*
+	 * Similar to free_filespec(), but only frees the data.  The spec
+	 * itself was allocated in the pool and should not be individually
+	 * freed.
+	 */
+	free_filespec_data(spec);
+}
+
+void pool_diff_free_filepair(struct mem_pool *pool,
+			     struct diff_filepair *p)
+{
+	if (!pool) {
+		diff_free_filepair(p);
+		return;
+	}
+
+	/*
+	 * Similar to diff_free_filepair() but only frees the data from the
+	 * filespecs; not the filespecs or the filepair which were
+	 * allocated from the pool.
+	 */
+	free_filespec_data(p->one);
+	free_filespec_data(p->two);
+}
+
 void diffcore_rename_extended(struct diff_options *options,
+			      struct mem_pool *pool,
 			      struct strintmap *relevant_sources,
 			      struct strintmap *dirs_removed,
 			      struct strmap *dir_rename_count,
@@ -1341,6 +1387,7 @@ void diffcore_rename_extended(struct diff_options *options,
 	int num_destinations, dst_cnt;
 	int num_sources, want_copies;
 	struct progress *progress = NULL;
+	struct mem_pool local_pool;
 	struct dir_rename_info info;
 	struct diff_populate_filespec_options dpf_options = {
 		.check_binary = 0,
@@ -1409,11 +1456,18 @@ void diffcore_rename_extended(struct diff_options *options,
 		goto cleanup; /* nothing to do */
 
 	trace2_region_enter("diff", "exact renames", options->repo);
+	mem_pool_init(&local_pool, 32*1024);
 	/*
 	 * We really want to cull the candidates list early
 	 * with cheap tests in order to avoid doing deltas.
 	 */
-	rename_count = find_exact_renames(options);
+	rename_count = find_exact_renames(options, &local_pool);
+	/*
+	 * Discard local_pool immediately instead of at "cleanup:" in order
+	 * to reduce maximum memory usage; inexact rename detection uses up
+	 * a fair amount of memory, and mem_pools can too.
+	 */
+	mem_pool_discard(&local_pool, 0);
 	trace2_region_leave("diff", "exact renames", options->repo);
 
 	/* Did we only want exact renames? */
@@ -1632,7 +1686,7 @@ void diffcore_rename_extended(struct diff_options *options,
 			pair_to_free = p;
 
 		if (pair_to_free)
-			diff_free_filepair(pair_to_free);
+			pool_diff_free_filepair(pool, pair_to_free);
 	}
 	diff_debug_queue("done copying original", &outq);
 
@@ -1642,7 +1696,7 @@ void diffcore_rename_extended(struct diff_options *options,
 
 	for (i = 0; i < rename_dst_nr; i++)
 		if (rename_dst[i].filespec_to_free)
-			free_filespec(rename_dst[i].filespec_to_free);
+			pool_free_filespec(pool, rename_dst[i].filespec_to_free);
 
 	cleanup_dir_rename_info(&info, dirs_removed, dir_rename_count != NULL);
 	FREE_AND_NULL(rename_dst);
@@ -1659,5 +1713,5 @@ void diffcore_rename_extended(struct diff_options *options,
 
 void diffcore_rename(struct diff_options *options)
 {
-	diffcore_rename_extended(options, NULL, NULL, NULL, NULL);
+	diffcore_rename_extended(options, NULL, NULL, NULL, NULL, NULL);
 }
diff --git a/diffcore.h b/diffcore.h
index 533b30e21e..badc2261c2 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -127,6 +127,8 @@ struct diff_filepair {
 #define DIFF_PAIR_MODE_CHANGED(p) ((p)->one->mode != (p)->two->mode)
 
 void diff_free_filepair(struct diff_filepair *);
+void pool_diff_free_filepair(struct mem_pool *pool,
+			     struct diff_filepair *p);
 
 int diff_unmodified_pair(struct diff_filepair *);
 
@@ -179,6 +181,7 @@ void partial_clear_dir_rename_count(struct strmap *dir_rename_count);
 void diffcore_break(struct repository *, int);
 void diffcore_rename(struct diff_options *);
 void diffcore_rename_extended(struct diff_options *options,
+			      struct mem_pool *pool,
 			      struct strintmap *relevant_sources,
 			      struct strintmap *dirs_removed,
 			      struct strmap *dir_rename_count,
diff --git a/dir.c b/dir.c
index 313e932459..d91295f2bc 100644
--- a/dir.c
+++ b/dir.c
@@ -78,11 +78,21 @@ int fspathcmp(const char *a, const char *b)
 	return ignore_case ? strcasecmp(a, b) : strcmp(a, b);
 }
 
+int fspatheq(const char *a, const char *b)
+{
+	return !fspathcmp(a, b);
+}
+
 int fspathncmp(const char *a, const char *b, size_t count)
 {
 	return ignore_case ? strncasecmp(a, b, count) : strncmp(a, b, count);
 }
 
+unsigned int fspathhash(const char *str)
+{
+	return ignore_case ? strihash(str) : strhash(str);
+}
+
 int git_fnmatch(const struct pathspec_item *item,
 		const char *pattern, const char *string,
 		int prefix)
@@ -717,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);
@@ -772,9 +782,7 @@ static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern
 		translated->pattern = truncated;
 		translated->patternlen = given->patternlen - 2;
 		hashmap_entry_init(&translated->ent,
-				   ignore_case ?
-				   strihash(translated->pattern) :
-				   strhash(translated->pattern));
+				   fspathhash(translated->pattern));
 
 		if (!hashmap_get_entry(&pl->recursive_hashmap,
 				       translated, ent, NULL)) {
@@ -803,9 +811,7 @@ static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern
 	translated->pattern = dup_and_filter_pattern(given->pattern);
 	translated->patternlen = given->patternlen;
 	hashmap_entry_init(&translated->ent,
-			   ignore_case ?
-			   strihash(translated->pattern) :
-			   strhash(translated->pattern));
+			   fspathhash(translated->pattern));
 
 	hashmap_add(&pl->recursive_hashmap, &translated->ent);
 
@@ -813,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;
@@ -835,10 +839,7 @@ static int hashmap_contains_path(struct hashmap *map,
 	/* Check straight mapping */
 	p.pattern = pattern->buf;
 	p.patternlen = pattern->len;
-	hashmap_entry_init(&p.ent,
-			   ignore_case ?
-			   strihash(p.pattern) :
-			   strhash(p.pattern));
+	hashmap_entry_init(&p.ent, fspathhash(p.pattern));
 	return !!hashmap_get_entry(map, &p, ent, NULL);
 }
 
@@ -1370,7 +1371,7 @@ enum pattern_match_result path_matches_pattern_list(
 	struct path_pattern *pattern;
 	struct strbuf parent_pathname = STRBUF_INIT;
 	int result = NOT_MATCHED;
-	const char *slash_pos;
+	size_t slash_pos;
 
 	if (!pl->use_cone_patterns) {
 		pattern = last_matching_pattern_from_list(pathname, pathlen, basename,
@@ -1391,21 +1392,35 @@ enum pattern_match_result path_matches_pattern_list(
 	strbuf_addch(&parent_pathname, '/');
 	strbuf_add(&parent_pathname, pathname, pathlen);
 
+	/*
+	 * Directory entries are matched if and only if a file
+	 * contained immediately within them is matched. For the
+	 * case of a directory entry, modify the path to create
+	 * a fake filename within this directory, allowing us to
+	 * use the file-base matching logic in an equivalent way.
+	 */
+	if (parent_pathname.len > 0 &&
+	    parent_pathname.buf[parent_pathname.len - 1] == '/') {
+		slash_pos = parent_pathname.len - 1;
+		strbuf_add(&parent_pathname, "-", 1);
+	} else {
+		const char *slash_ptr = strrchr(parent_pathname.buf, '/');
+		slash_pos = slash_ptr ? slash_ptr - parent_pathname.buf : 0;
+	}
+
 	if (hashmap_contains_path(&pl->recursive_hashmap,
 				  &parent_pathname)) {
 		result = MATCHED_RECURSIVE;
 		goto done;
 	}
 
-	slash_pos = strrchr(parent_pathname.buf, '/');
-
-	if (slash_pos == parent_pathname.buf) {
+	if (!slash_pos) {
 		/* include every file in root */
 		result = MATCHED;
 		goto done;
 	}
 
-	strbuf_setlen(&parent_pathname, slash_pos - parent_pathname.buf);
+	strbuf_setlen(&parent_pathname, slash_pos);
 
 	if (hashmap_contains_path(&pl->parent_hashmap, &parent_pathname)) {
 		result = MATCHED;
@@ -1422,6 +1437,75 @@ done:
 	return result;
 }
 
+int init_sparse_checkout_patterns(struct index_state *istate)
+{
+	if (!core_apply_sparse_checkout)
+		return 1;
+	if (istate->sparse_checkout_patterns)
+		return 0;
+
+	CALLOC_ARRAY(istate->sparse_checkout_patterns, 1);
+
+	if (get_sparse_checkout_patterns(istate->sparse_checkout_patterns) < 0) {
+		FREE_AND_NULL(istate->sparse_checkout_patterns);
+		return -1;
+	}
+
+	return 0;
+}
+
+static int path_in_sparse_checkout_1(const char *path,
+				     struct index_state *istate,
+				     int require_cone_mode)
+{
+	int dtype = DT_REG;
+	enum pattern_match_result match = UNDECIDED;
+	const char *end, *slash;
+
+	/*
+	 * We default to accepting a path if there are no patterns or
+	 * they are of the wrong type.
+	 */
+	if (init_sparse_checkout_patterns(istate) ||
+	    (require_cone_mode &&
+	     !istate->sparse_checkout_patterns->use_cone_patterns))
+		return 1;
+
+	/*
+	 * If UNDECIDED, use the match from the parent dir (recursively), or
+	 * fall back to NOT_MATCHED at the topmost level. Note that cone mode
+	 * never returns UNDECIDED, so we will execute only one iteration in
+	 * this case.
+	 */
+	for (end = path + strlen(path);
+	     end > path && match == UNDECIDED;
+	     end = slash) {
+
+		for (slash = end - 1; slash > path && *slash != '/'; slash--)
+			; /* do nothing */
+
+		match = path_matches_pattern_list(path, end - path,
+				slash > path ? slash + 1 : path, &dtype,
+				istate->sparse_checkout_patterns, istate);
+
+		/* We are going to match the parent dir now */
+		dtype = DT_DIR;
+	}
+	return match > 0;
+}
+
+int path_in_sparse_checkout(const char *path,
+			    struct index_state *istate)
+{
+	return path_in_sparse_checkout_1(path, istate, 0);
+}
+
+int path_in_cone_mode_sparse_checkout(const char *path,
+				     struct index_state *istate)
+{
+	return path_in_sparse_checkout_1(path, istate, 1);
+}
+
 static struct path_pattern *last_matching_pattern_from_lists(
 		struct dir_struct *dir, struct index_state *istate,
 		const char *pathname, int pathlen,
@@ -2953,6 +3037,120 @@ int is_empty_dir(const char *path)
 	return ret;
 }
 
+char *git_url_basename(const char *repo, int is_bundle, int is_bare)
+{
+	const char *end = repo + strlen(repo), *start, *ptr;
+	size_t len;
+	char *dir;
+
+	/*
+	 * Skip scheme.
+	 */
+	start = strstr(repo, "://");
+	if (start == NULL)
+		start = repo;
+	else
+		start += 3;
+
+	/*
+	 * Skip authentication data. The stripping does happen
+	 * greedily, such that we strip up to the last '@' inside
+	 * the host part.
+	 */
+	for (ptr = start; ptr < end && !is_dir_sep(*ptr); ptr++) {
+		if (*ptr == '@')
+			start = ptr + 1;
+	}
+
+	/*
+	 * Strip trailing spaces, slashes and /.git
+	 */
+	while (start < end && (is_dir_sep(end[-1]) || isspace(end[-1])))
+		end--;
+	if (end - start > 5 && is_dir_sep(end[-5]) &&
+	    !strncmp(end - 4, ".git", 4)) {
+		end -= 5;
+		while (start < end && is_dir_sep(end[-1]))
+			end--;
+	}
+
+	/*
+	 * Strip trailing port number if we've got only a
+	 * hostname (that is, there is no dir separator but a
+	 * colon). This check is required such that we do not
+	 * strip URI's like '/foo/bar:2222.git', which should
+	 * result in a dir '2222' being guessed due to backwards
+	 * compatibility.
+	 */
+	if (memchr(start, '/', end - start) == NULL
+	    && memchr(start, ':', end - start) != NULL) {
+		ptr = end;
+		while (start < ptr && isdigit(ptr[-1]) && ptr[-1] != ':')
+			ptr--;
+		if (start < ptr && ptr[-1] == ':')
+			end = ptr - 1;
+	}
+
+	/*
+	 * Find last component. To remain backwards compatible we
+	 * also regard colons as path separators, such that
+	 * cloning a repository 'foo:bar.git' would result in a
+	 * directory 'bar' being guessed.
+	 */
+	ptr = end;
+	while (start < ptr && !is_dir_sep(ptr[-1]) && ptr[-1] != ':')
+		ptr--;
+	start = ptr;
+
+	/*
+	 * Strip .{bundle,git}.
+	 */
+	len = end - start;
+	strip_suffix_mem(start, &len, is_bundle ? ".bundle" : ".git");
+
+	if (!len || (len == 1 && *start == '/'))
+		die(_("No directory name could be guessed.\n"
+		      "Please specify a directory on the command line"));
+
+	if (is_bare)
+		dir = xstrfmt("%.*s.git", (int)len, start);
+	else
+		dir = xstrndup(start, len);
+	/*
+	 * Replace sequences of 'control' characters and whitespace
+	 * with one ascii space, remove leading and trailing spaces.
+	 */
+	if (*dir) {
+		char *out = dir;
+		int prev_space = 1 /* strip leading whitespace */;
+		for (end = dir; *end; ++end) {
+			char ch = *end;
+			if ((unsigned char)ch < '\x20')
+				ch = '\x20';
+			if (isspace(ch)) {
+				if (prev_space)
+					continue;
+				prev_space = 1;
+			} else
+				prev_space = 0;
+			*out++ = ch;
+		}
+		*out = '\0';
+		if (out > dir && prev_space)
+			out[-1] = '\0';
+	}
+	return dir;
+}
+
+void strip_dir_trailing_slashes(char *dir)
+{
+	char *end = dir + strlen(dir);
+
+	while (dir < end - 1 && is_dir_sep(end[-1]))
+		end--;
+	*end = '\0';
+}
+
 static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
 {
 	DIR *dir;
@@ -2960,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) &&
@@ -3015,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.
@@ -3083,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);
 	}
@@ -3616,7 +3823,7 @@ static void connect_wt_gitdir_in_nested(const char *sub_worktree,
 		strbuf_reset(&sub_wt);
 		strbuf_reset(&sub_gd);
 		strbuf_addf(&sub_wt, "%s/%s", sub_worktree, sub->path);
-		strbuf_addf(&sub_gd, "%s/modules/%s", sub_gitdir, sub->name);
+		submodule_name_to_gitdir(&sub_gd, &subrepo, sub->name);
 
 		connect_work_tree_and_git_dir(sub_wt.buf, sub_gd.buf, 1);
 	}
diff --git a/dir.h b/dir.h
index 8d0ddd8f18..8e02dfb505 100644
--- a/dir.h
+++ b/dir.h
@@ -394,6 +394,14 @@ enum pattern_match_result path_matches_pattern_list(const char *pathname,
 				const char *basename, int *dtype,
 				struct pattern_list *pl,
 				struct index_state *istate);
+
+int init_sparse_checkout_patterns(struct index_state *state);
+
+int path_in_sparse_checkout(const char *path,
+			    struct index_state *istate);
+int path_in_cone_mode_sparse_checkout(const char *path,
+				      struct index_state *istate);
+
 struct dir_entry *dir_add_ignored(struct dir_struct *dir,
 				  struct index_state *istate,
 				  const char *pathname, int len);
@@ -453,6 +461,17 @@ static inline int is_dot_or_dotdot(const char *name)
 
 int is_empty_dir(const char *dir);
 
+/*
+ * Retrieve the "humanish" basename of the given Git URL.
+ *
+ * For example:
+ * 	/path/to/repo.git => "repo"
+ * 	host.xz:foo/.git => "foo"
+ * 	http://example.com/user/bar.baz => "bar.baz"
+ */
+char *git_url_basename(const char *repo, int is_bundle, int is_bare);
+void strip_dir_trailing_slashes(char *dir);
+
 void setup_standard_excludes(struct dir_struct *dir);
 
 char *get_sparse_checkout_filename(void);
@@ -476,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.
@@ -485,11 +507,17 @@ 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);
+int fspatheq(const char *a, const char *b);
 int fspathncmp(const char *a, const char *b, size_t count);
+unsigned int fspathhash(const char *str);
 
 /*
  * The prefix part of pattern must not contains wildcards.
diff --git a/editor.c b/editor.c
index 6303ae0ab0..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,10 +56,9 @@ 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_waiting_for_editor && isatty(2);
+		int print_waiting_for_editor = advice_enabled(ADVICE_WAITING_FOR_EDITOR) && isatty(2);
 
 		if (print_waiting_for_editor) {
 			/*
@@ -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 125fabdbd5..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;
@@ -159,25 +161,25 @@ static int remove_available_paths(struct string_list_item *item, void *cb_data)
 	return !available;
 }
 
-int finish_delayed_checkout(struct checkout *state, int *nr_checkouts)
+int finish_delayed_checkout(struct checkout *state, int *nr_checkouts,
+			    int show_progress)
 {
 	int errs = 0;
-	unsigned delayed_object_count;
+	unsigned processed_paths = 0;
 	off_t filtered_bytes = 0;
 	struct string_list_item *filter, *path;
-	struct progress *progress;
+	struct progress *progress = NULL;
 	struct delayed_checkout *dco = state->delayed_checkout;
 
 	if (!state->delayed_checkout)
 		return errs;
 
 	dco->state = CE_RETRY;
-	delayed_object_count = dco->paths.nr;
-	progress = start_delayed_progress(_("Filtering content"), delayed_object_count);
+	if (show_progress)
+		progress = start_delayed_progress(_("Filtering content"), dco->paths.nr);
 	while (dco->filters.nr > 0) {
 		for_each_string_list_item(filter, &dco->filters) {
 			struct string_list available_paths = STRING_LIST_INIT_NODUP;
-			display_progress(progress, delayed_object_count - dco->paths.nr);
 
 			if (!async_query_available_blobs(filter->string, &available_paths)) {
 				/* Filter reported an error */
@@ -224,6 +226,7 @@ int finish_delayed_checkout(struct checkout *state, int *nr_checkouts)
 				ce = index_file_exists(state->istate, path->string,
 						       strlen(path->string), 0);
 				if (ce) {
+					display_progress(progress, ++processed_paths);
 					errs |= checkout_entry(ce, state, NULL, nr_checkouts);
 					filtered_bytes += ce->ce_stat_data.sd_size;
 					display_throughput(progress, filtered_bytes);
@@ -270,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 b8c0e170dc..252fd24c2e 100644
--- a/entry.h
+++ b/entry.h
@@ -16,7 +16,7 @@ struct checkout {
 		 clone:1,
 		 refresh_cache:1;
 };
-#define CHECKOUT_INIT { NULL, "" }
+#define CHECKOUT_INIT { .base_dir = "" }
 
 #define TEMPORARY_FILENAME_LENGTH 25
 /*
@@ -43,7 +43,8 @@ static inline int checkout_entry(struct cache_entry *ce,
 }
 
 void enable_delayed_checkout(struct checkout *state);
-int finish_delayed_checkout(struct checkout *state, int *nr_checkouts);
+int finish_delayed_checkout(struct checkout *state, int *nr_checkouts,
+			    int show_progress);
 
 /*
  * Unlink the last component and schedule the leading directories for
@@ -51,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 2f27008424..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"
 
@@ -31,7 +32,6 @@ int prefer_symlink_refs;
 int is_bare_repository_cfg = -1; /* unspecified */
 int warn_ambiguous_refs = 1;
 int warn_on_object_refname_ambiguity = 1;
-int ref_paranoia = -1;
 int repository_format_precious_objects;
 int repository_format_worktree_config;
 const char *git_commit_encoding;
@@ -41,9 +41,9 @@ char *apply_default_ignorewhitespace;
 const char *git_attributes_file;
 const char *git_hooks_path;
 int zlib_compression_level = Z_BEST_SPEED;
-int core_compression_level;
 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;
@@ -96,13 +96,6 @@ int auto_comment_line_char;
 /* Parallel index stat data preload? */
 int core_preload_index = 1;
 
-/*
- * This is a hack for test programs like test-dump-untracked-cache to
- * ensure that they do not modify the untracked cache when reading it.
- * Do not use it otherwise!
- */
-int ignore_untracked_cache_config;
-
 /* This is set by setup_git_dir_gently() and/or git_default_config() */
 char *git_work_tree_cfg;
 
@@ -177,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);
 
@@ -253,21 +250,20 @@ static int git_work_tree_initialized;
  */
 void set_git_work_tree(const char *new_work_tree)
 {
-	struct strbuf realpath = STRBUF_INIT;
-
 	if (git_work_tree_initialized) {
+		struct strbuf realpath = STRBUF_INIT;
+
 		strbuf_realpath(&realpath, new_work_tree, 1);
 		new_work_tree = realpath.buf;
 		if (strcmp(new_work_tree, the_repository->worktree))
 			die("internal error: work tree has already been set\n"
 			    "Current worktree: %s\nNew worktree: %s",
 			    the_repository->worktree, new_work_tree);
+		strbuf_release(&realpath);
 		return;
 	}
 	git_work_tree_initialized = 1;
 	repo_set_worktree(the_repository, new_work_tree);
-
-	strbuf_release(&realpath);
 }
 
 const char *get_git_work_tree(void)
@@ -331,8 +327,7 @@ char *get_graft_file(struct repository *r)
 
 static void set_git_dir_1(const char *path)
 {
-	if (setenv(GIT_DIR_ENVIRONMENT, path, 1))
-		die(_("could not set GIT_DIR to '%s'"), path);
+	xsetenv(GIT_DIR_ENVIRONMENT, path, 1);
 	setup_git_env(path);
 }
 
@@ -342,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-negotiator.c b/fetch-negotiator.c
index 57ed5784e1..874797d767 100644
--- a/fetch-negotiator.c
+++ b/fetch-negotiator.c
@@ -18,8 +18,7 @@ void fetch_negotiator_init(struct repository *r,
 		noop_negotiator_init(negotiator);
 		return;
 
-	case FETCH_NEGOTIATION_DEFAULT:
-	default:
+	case FETCH_NEGOTIATION_CONSECUTIVE:
 		default_negotiator_init(negotiator);
 		return;
 	}
diff --git a/fetch-pack.c b/fetch-pack.c
index b0c7be717c..87657907e7 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;
@@ -119,6 +120,11 @@ static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
 {
 	enum object_type type;
 	struct object_info info = { .typep = &type };
+	struct commit *commit;
+
+	commit = lookup_commit_in_graph(the_repository, oid);
+	if (commit)
+		return commit;
 
 	while (1) {
 		if (oid_object_info_extended(the_repository, oid, &info,
@@ -137,8 +143,14 @@ static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
 			break;
 		}
 	}
-	if (type == OBJ_COMMIT)
-		return (struct commit *) parse_object(the_repository, oid);
+
+	if (type == OBJ_COMMIT) {
+		struct commit *commit = lookup_commit(the_repository, oid);
+		if (!commit || repo_parse_commit(the_repository, commit))
+			return NULL;
+		return commit;
+	}
+
 	return NULL;
 }
 
@@ -285,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 |
@@ -684,26 +696,30 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
 
 	trace2_region_enter("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL);
 	for (ref = *refs; ref; ref = ref->next) {
-		struct object *o;
+		struct commit *commit;
 
-		if (!has_object_file_with_flags(&ref->old_oid,
+		commit = lookup_commit_in_graph(the_repository, &ref->old_oid);
+		if (!commit) {
+			struct object *o;
+
+			if (!has_object_file_with_flags(&ref->old_oid,
 						OBJECT_INFO_QUICK |
-							OBJECT_INFO_SKIP_FETCH_OBJECT))
-			continue;
-		o = parse_object(the_repository, &ref->old_oid);
-		if (!o)
-			continue;
+						OBJECT_INFO_SKIP_FETCH_OBJECT))
+				continue;
+			o = parse_object(the_repository, &ref->old_oid);
+			if (!o || o->type != OBJ_COMMIT)
+				continue;
+
+			commit = (struct commit *)o;
+		}
 
 		/*
 		 * We already have it -- which may mean that we were
 		 * in sync with the other side at some time after
 		 * that (it is OK if we guess wrong here).
 		 */
-		if (o->type == OBJ_COMMIT) {
-			struct commit *commit = (struct commit *)o;
-			if (!cutoff || cutoff < commit->date)
-				cutoff = commit->date;
-		}
+		if (!cutoff || cutoff < commit->date)
+			cutoff = commit->date;
 	}
 	trace2_region_leave("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL);
 
@@ -945,6 +961,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))
@@ -975,6 +993,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
@@ -1399,9 +1419,17 @@ static int process_ack(struct fetch_negotiator *negotiator,
 	 * otherwise.
 	 */
 	if (*received_ready && reader->status != PACKET_READ_DELIM)
-		die(_("expected packfile to be sent after 'ready'"));
+		/*
+		 * TRANSLATORS: The parameter will be 'ready', a protocol
+		 * keyword.
+		 */
+		die(_("expected packfile to be sent after '%s'"), "ready");
 	if (!*received_ready && reader->status != PACKET_READ_FLUSH)
-		die(_("expected no other sections to be sent after no 'ready'"));
+		/*
+		 * TRANSLATORS: The parameter will be 'ready', a protocol
+		 * keyword.
+		 */
+		die(_("expected no other sections to be sent after no '%s'"), "ready");
 
 	return 0;
 }
@@ -1642,8 +1670,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);
 
 			/*
@@ -1906,16 +1939,15 @@ static void update_shallow(struct fetch_pack_args *args,
 	oid_array_clear(&ref);
 }
 
-static int iterate_ref_map(void *cb_data, struct object_id *oid)
+static const struct object_id *iterate_ref_map(void *cb_data)
 {
 	struct ref **rm = cb_data;
 	struct ref *ref = *rm;
 
 	if (!ref)
-		return -1; /* end of the list */
+		return NULL;
 	*rm = ref->next;
-	oidcpy(oid, &ref->old_oid);
-	return 0;
+	return &ref->old_oid;
 }
 
 struct ref *fetch_pack(struct fetch_pack_args *args,
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index 0f66818e0f..baca57d5b6 100644
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -9,6 +9,7 @@
 #include "branch.h"
 #include "fmt-merge-msg.h"
 #include "commit-reach.h"
+#include "gpg-interface.h"
 
 static int use_branch_desc;
 static int suppress_dest_pattern_seen;
@@ -16,6 +17,8 @@ static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP;
 
 int fmt_merge_msg_config(const char *key, const char *value, void *cb)
 {
+	int status = 0;
+
 	if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) {
 		int is_bool;
 		merge_log_config = git_config_bool_or_int(key, value, &is_bool);
@@ -34,6 +37,9 @@ int fmt_merge_msg_config(const char *key, const char *value, void *cb)
 			string_list_append(&suppress_dest_patterns, value);
 		suppress_dest_pattern_seen = 1;
 	} else {
+		status = git_gpg_config(key, value, NULL);
+		if (status)
+			return status;
 		return git_default_config(key, value, cb);
 	}
 	return 0;
@@ -108,6 +114,7 @@ static int handle_line(char *line, struct merge_parents *merge_parents)
 	struct origin_data *origin_data;
 	char *src;
 	const char *origin, *tag_name;
+	char *to_free = NULL;
 	struct src_data *src_data;
 	struct string_list_item *item;
 	int pulling_head = 0;
@@ -183,12 +190,13 @@ static int handle_line(char *line, struct merge_parents *merge_parents)
 	if (!strcmp(".", src) || !strcmp(src, origin)) {
 		int len = strlen(origin);
 		if (origin[0] == '\'' && origin[len - 1] == '\'')
-			origin = xmemdupz(origin + 1, len - 2);
+			origin = to_free = xmemdupz(origin + 1, len - 2);
 	} else
-		origin = xstrfmt("%s of %s", origin, src);
+		origin = to_free = xstrfmt("%s of %s", origin, src);
 	if (strcmp(".", src))
 		origin_data->is_local_branch = 0;
 	string_list_append(&origins, origin)->util = origin_data;
+	free(to_free);
 	return 0;
 }
 
@@ -525,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.gpg_output)
+			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.gpg_output);
+				strbuf_addstr(&sig, sigc.output);
 		}
-		signature_check_clear(&sigc);
 
 		if (!tag_number++) {
 			fmt_tag_signature(&tagbuf, &sig, buf, len);
@@ -556,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);
 	}
@@ -641,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/generate-hooklist.sh b/generate-hooklist.sh
new file mode 100755
index 0000000000..2f9f54eb54
--- /dev/null
+++ b/generate-hooklist.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Usage: ./generate-hooklist.sh >hook-list.h
+
+cat <<EOF
+/* Automatically generated by generate-hooklist.sh */
+
+static const char *hook_name_list[] = {
+EOF
+
+sed -n \
+	-e '/^~~~~*$/ {x; s/^.*$/	"&",/; p;}' \
+	-e 'x' \
+	<Documentation/githooks.txt |
+	LC_ALL=C sort
+
+cat <<EOF
+	NULL,
+};
+EOF
diff --git a/gettext.c b/gettext.c
index af2413b47e..bb5ba1fe7c 100644
--- a/gettext.c
+++ b/gettext.c
@@ -66,6 +66,7 @@ const char *get_preferred_languages(void)
 }
 
 #ifndef NO_GETTEXT
+__attribute__((format (printf, 1, 2)))
 static int test_vsnprintf(const char *fmt, ...)
 {
 	char buf[26];
diff --git a/gettext.h b/gettext.h
index c8b34fd612..d209911ebb 100644
--- a/gettext.h
+++ b/gettext.h
@@ -55,31 +55,7 @@ const char *Q_(const char *msgid, const char *plu, unsigned long n)
 }
 
 /* Mark msgid for translation but do not translate it. */
-#if !USE_PARENS_AROUND_GETTEXT_N
 #define N_(msgid) msgid
-#else
-/*
- * Strictly speaking, this will lead to invalid C when
- * used this way:
- *	static const char s[] = N_("FOO");
- * which will expand to
- *	static const char s[] = ("FOO");
- * and in valid C, the initializer on the right hand side must
- * be without the parentheses.  But many compilers do accept it
- * as a language extension and it will allow us to catch mistakes
- * like:
- *	static const char *msgs[] = {
- *		N_("one")
- *		N_("two"),
- *		N_("three"),
- *		NULL
- *	};
- * (notice the missing comma on one of the lines) by forcing
- * a compilation error, because parenthesised ("one") ("two")
- * will not get silently turned into ("onetwo").
- */
-#define N_(msgid) (msgid)
-#endif
 
 const char *get_preferred_languages(void);
 int is_utf8_locale(void);
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-bisect.sh b/git-bisect.sh
index 6a7afaea8d..405cf76f2a 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -34,94 +34,9 @@ Please use "git help bisect" to get the full man page.'
 OPTIONS_SPEC=
 . git-sh-setup
 
-_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
-_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
 TERM_BAD=bad
 TERM_GOOD=good
 
-bisect_visualize() {
-	git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit
-
-	if test $# = 0
-	then
-		if test -n "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" &&
-			type gitk >/dev/null 2>&1
-		then
-			set gitk
-		else
-			set git log
-		fi
-	else
-		case "$1" in
-		git*|tig) ;;
-		-*)	set git log "$@" ;;
-		*)	set git "$@" ;;
-		esac
-	fi
-
-	eval '"$@"' --bisect -- $(cat "$GIT_DIR/BISECT_NAMES")
-}
-
-bisect_run () {
-	git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit
-
-	test -n "$*" || die "$(gettext "bisect run failed: no command provided.")"
-
-	while true
-	do
-		command="$@"
-		eval_gettextln "running \$command"
-		"$@"
-		res=$?
-
-		# Check for really bad run error.
-		if [ $res -lt 0 -o $res -ge 128 ]
-		then
-			eval_gettextln "bisect run failed:
-exit code \$res from '\$command' is < 0 or >= 128" >&2
-			exit $res
-		fi
-
-		# Find current state depending on run success or failure.
-		# A special exit code of 125 means cannot test.
-		if [ $res -eq 125 ]
-		then
-			state='skip'
-		elif [ $res -gt 0 ]
-		then
-			state="$TERM_BAD"
-		else
-			state="$TERM_GOOD"
-		fi
-
-		git bisect--helper --bisect-state $state >"$GIT_DIR/BISECT_RUN"
-		res=$?
-
-		cat "$GIT_DIR/BISECT_RUN"
-
-		if sane_grep "first $TERM_BAD commit could be any of" "$GIT_DIR/BISECT_RUN" \
-			>/dev/null
-		then
-			gettextln "bisect run cannot continue any more" >&2
-			exit $res
-		fi
-
-		if [ $res -ne 0 ]
-		then
-			eval_gettextln "bisect run failed:
-'bisect-state \$state' exited with error code \$res" >&2
-			exit $res
-		fi
-
-		if sane_grep "is the first $TERM_BAD commit" "$GIT_DIR/BISECT_RUN" >/dev/null
-		then
-			gettextln "bisect run success"
-			exit 0;
-		fi
-
-	done
-}
-
 get_terms () {
 	if test -s "$GIT_DIR/BISECT_TERMS"
 	then
@@ -152,7 +67,7 @@ case "$#" in
 		# Not sure we want "next" at the UI level anymore.
 		git bisect--helper --bisect-next "$@" || exit ;;
 	visualize|view)
-		bisect_visualize "$@" ;;
+		git bisect--helper --bisect-visualize "$@" || exit;;
 	reset)
 		git bisect--helper --bisect-reset "$@" ;;
 	replay)
@@ -160,7 +75,7 @@ case "$#" in
 	log)
 		git bisect--helper --bisect-log || exit ;;
 	run)
-		bisect_run "$@" ;;
+		git bisect--helper --bisect-run "$@" || exit;;
 	terms)
 		git bisect--helper --bisect-terms "$@" || exit;;
 	*)
diff --git a/git-compat-util.h b/git-compat-util.h
index b46605300a..876907b9df 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
@@ -127,7 +157,9 @@
 /* Approximation of the length of the decimal representation of this type. */
 #define decimal_length(x)	((int)(sizeof(x) * 2.56 + 0.5) + 1)
 
-#if defined(__sun__)
+#ifdef __MINGW64__
+#define _POSIX_C_SOURCE 1
+#elif defined(__sun__)
  /*
   * On Solaris, when _XOPEN_EXTENDED is set, its header file
   * forces the programs to be XPG4v2, defeating any _XOPEN_SOURCE
@@ -160,8 +192,17 @@
 # endif
 #define WIN32_LEAN_AND_MEAN  /* stops windows.h including winsock.h */
 #include <winsock2.h>
+#ifndef NO_UNIX_SOCKETS
+#include <afunix.h>
+#endif
 #include <windows.h>
 #define GIT_WINDOWS_NATIVE
+#ifdef HAVE_RTLGENRANDOM
+/* This is required to get access to RtlGenRandom. */
+#define SystemFunction036 NTAPI SystemFunction036
+#include <NTSecAPI.h>
+#undef SystemFunction036
+#endif
 #endif
 
 #include <unistd.h>
@@ -232,6 +273,12 @@
 #else
 #include <stdint.h>
 #endif
+#ifdef HAVE_ARC4RANDOM_LIBBSD
+#include <bsd/stdlib.h>
+#endif
+#ifdef HAVE_GETRANDOM
+#include <sys/random.h>
+#endif
 #ifdef NO_INTPTR_T
 /*
  * On I16LP32, ILP32 and LP64 "long" is the safe bet, however
@@ -463,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)));
@@ -502,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);
@@ -726,7 +775,7 @@ char *gitmkdtemp(char *);
 
 #ifdef NO_UNSETENV
 #define unsetenv gitunsetenv
-void gitunsetenv(const char *);
+int gitunsetenv(const char *);
 #endif
 
 #ifdef NO_STRCASESTR
@@ -859,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))
@@ -875,6 +941,7 @@ void *xmemdupz(const void *data, size_t len);
 char *xstrndup(const char *str, size_t len);
 void *xrealloc(void *ptr, size_t size);
 void *xcalloc(size_t nmemb, size_t size);
+void xsetenv(const char *name, const char *value, int overwrite);
 void *xmmap(void *start, size_t length, int prot, int flags, int fd, off_t offset);
 const char *mmap_os_err(void);
 void *xmmap_gently(void *start, size_t length, int prot, int flags, int fd, off_t offset);
@@ -1253,10 +1320,6 @@ int warn_on_fopen_errors(const char *path);
  */
 int open_nofollow(const char *path, int flags);
 
-#if !defined(USE_PARENS_AROUND_GETTEXT_N) && defined(__GNUC__)
-#define USE_PARENS_AROUND_GETTEXT_N 1
-#endif
-
 #ifndef SHELL_PATH
 # define SHELL_PATH "/bin/sh"
 #endif
@@ -1335,6 +1398,18 @@ void unleak_memory(const void *ptr, size_t len);
 #define UNLEAK(var) do {} while (0)
 #endif
 
+#define z_const
+#include <zlib.h>
+
+#if ZLIB_VERNUM < 0x1290
+/*
+ * This is uncompress2, which is only available in zlib >= 1.2.9
+ * (released as of early 2017). See compat/zlib-uncompress2.c.
+ */
+int uncompress2(Bytef *dest, uLongf *destLen, const Bytef *source,
+		uLong *sourceLen);
+#endif
+
 /*
  * This include must come after system headers, since it introduces macros that
  * replace system names.
@@ -1381,4 +1456,11 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset)
 
 void sleep_millisec(int millisec);
 
+/*
+ * Generate len bytes from the system cryptographically secure PRNG.
+ * Returns 0 on success and -1 on error, setting errno.  The inability to
+ * satisfy the full request is an error.
+ */
+int csprng_bytes(void *buf, size_t len);
+
 #endif
diff --git a/git-curl-compat.h b/git-curl-compat.h
new file mode 100644
index 0000000000..56a83b6bbd
--- /dev/null
+++ b/git-curl-compat.h
@@ -0,0 +1,129 @@
+#ifndef GIT_CURL_COMPAT_H
+#define GIT_CURL_COMPAT_H
+#include <curl/curl.h>
+
+/**
+ * This header centralizes the declaration of our libcurl dependencies
+ * to make it easy to discover the oldest versions we support, and to
+ * inform decisions about removing support for older libcurl in the
+ * future.
+ *
+ * The oldest supported version of curl is documented in the "INSTALL"
+ * document.
+ *
+ * The source of truth for what versions have which symbols is
+ * https://github.com/curl/curl/blob/master/docs/libcurl/symbols-in-versions;
+ * the release dates are taken from curl.git (at
+ * https://github.com/curl/curl/).
+ *
+ * For each X symbol we need from curl we define our own
+ * GIT_CURL_HAVE_X. If multiple similar symbols with the same prefix
+ * were defined in the same version we pick one and check for that name.
+ *
+ * We may also define a missing CURL_* symbol to its known value, if
+ * doing so is sufficient to add support for it to older versions that
+ * don't have it.
+ *
+ * Keep any symbols in date order of when their support was
+ * introduced, oldest first, in the official version of cURL library.
+ */
+
+/**
+ * CURL_SOCKOPT_OK was added in 7.21.5, released in April 2011.
+ */
+#if LIBCURL_VERSION_NUM < 0x071505
+#define CURL_SOCKOPT_OK 0
+#endif
+
+/**
+ * CURLOPT_TCP_KEEPALIVE was added in 7.25.0, released in March 2012.
+ */
+#if LIBCURL_VERSION_NUM >= 0x071900
+#define GITCURL_HAVE_CURLOPT_TCP_KEEPALIVE 1
+#endif
+
+
+/**
+ * CURLOPT_LOGIN_OPTIONS was added in 7.34.0, released in December
+ * 2013.
+ *
+ * If we start requiring 7.34.0 we might also be able to remove the
+ * code conditional on USE_CURL_FOR_IMAP_SEND in imap-send.c, see
+ * 1e16b255b95 (git-imap-send: use libcurl for implementation,
+ * 2014-11-09) and the check it added for "072200" in the Makefile.
+
+ */
+#if LIBCURL_VERSION_NUM >= 0x072200
+#define GIT_CURL_HAVE_CURLOPT_LOGIN_OPTIONS 1
+#endif
+
+/**
+ * CURL_SSLVERSION_TLSv1_[012] was added in 7.34.0, released in
+ * December 2013.
+ */
+#if LIBCURL_VERSION_NUM >= 0x072200
+#define GIT_CURL_HAVE_CURL_SSLVERSION_TLSv1_0
+#endif
+
+/**
+ * CURLOPT_PINNEDPUBLICKEY was added in 7.39.0, released in November
+ * 2014. CURLE_SSL_PINNEDPUBKEYNOTMATCH was added in that same version.
+ */
+#if LIBCURL_VERSION_NUM >= 0x072c00
+#define GIT_CURL_HAVE_CURLOPT_PINNEDPUBLICKEY 1
+#define GIT_CURL_HAVE_CURLE_SSL_PINNEDPUBKEYNOTMATCH 1
+#endif
+
+/**
+ * CURL_HTTP_VERSION_2 was added in 7.43.0, released in June 2015.
+ *
+ * The CURL_HTTP_VERSION_2 alias (but not CURL_HTTP_VERSION_2_0) has
+ * always been a macro, not an enum field (checked on curl version
+ * 7.78.0)
+ */
+#if LIBCURL_VERSION_NUM >= 0x072b00
+#define GIT_CURL_HAVE_CURL_HTTP_VERSION_2 1
+#endif
+
+/**
+ * CURLSSLOPT_NO_REVOKE was added in 7.44.0, released in August 2015.
+ *
+ * The CURLSSLOPT_NO_REVOKE is, has always been a macro, not an enum
+ * field (checked on curl version 7.78.0)
+ */
+#if LIBCURL_VERSION_NUM >= 0x072c00
+#define GIT_CURL_HAVE_CURLSSLOPT_NO_REVOKE 1
+#endif
+
+/**
+ * CURLOPT_PROXY_CAINFO was added in 7.52.0, released in August 2017.
+ */
+#if LIBCURL_VERSION_NUM >= 0x073400
+#define GIT_CURL_HAVE_CURLOPT_PROXY_CAINFO 1
+#endif
+
+/**
+ * CURLOPT_PROXY_{KEYPASSWD,SSLCERT,SSLKEY} was added in 7.52.0,
+ * released in August 2017.
+ */
+#if LIBCURL_VERSION_NUM >= 0x073400
+#define GIT_CURL_HAVE_CURLOPT_PROXY_KEYPASSWD 1
+#endif
+
+/**
+ * CURL_SSLVERSION_TLSv1_3 was added in 7.53.0, released in February
+ * 2017.
+ */
+#if LIBCURL_VERSION_NUM >= 0x073400
+#define GIT_CURL_HAVE_CURL_SSLVERSION_TLSv1_3 1
+#endif
+
+/**
+ * CURLSSLSET_{NO_BACKENDS,OK,TOO_LATE,UNKNOWN_BACKEND} were added in
+ * 7.56.0, released in September 2017.
+ */
+#if LIBCURL_VERSION_NUM >= 0x073800
+#define GIT_CURL_HAVE_CURLSSLSET_NO_BACKENDS
+#endif
+
+#endif
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index ed035f32c2..4c8118010a 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -222,10 +222,11 @@ if ($state->{method} eq 'pserver') {
         open my $passwd, "<", $authdb or die $!;
         while (<$passwd>) {
             if (m{^\Q$user\E:(.*)}) {
-                if (crypt($user, descramble($password)) eq $1) {
+                my $hash = crypt(descramble($password), $1);
+                if (defined $hash and $hash eq $1) {
                     $auth_ok = 1;
                 }
-            };
+            }
         }
         close $passwd;
 
@@ -3606,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
 
@@ -3675,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..a9b1f90441 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.
 
@@ -93,10 +108,7 @@ def p4_build_cmd(cmd):
         # Provide a way to not pass this option by setting git-p4.retries to 0
         real_cmd += ["-r", str(retries)]
 
-    if not isinstance(cmd, list):
-        real_cmd = ' '.join(real_cmd) + ' ' + cmd
-    else:
-        real_cmd += cmd
+    real_cmd += cmd
 
     # now check that we can actually talk to the server
     global p4_access_checked
@@ -208,151 +220,93 @@ def decode_path(path):
 
 def run_git_hook(cmd, param=[]):
     """Execute a hook if the hook exists."""
+    args = ['git', 'hook', 'run', '--ignore-missing', cmd]
+    if param:
+        args.append("--")
+        for p in param:
+            args.append(p)
+    return subprocess.call(args) == 0
+
+def write_pipe(c, stdin, *k, **kw):
     if verbose:
-        sys.stderr.write("Looking for hook: %s\n" % cmd)
-        sys.stderr.flush()
-
-    hooks_path = gitConfig("core.hooksPath")
-    if len(hooks_path) <= 0:
-        hooks_path = os.path.join(os.environ["GIT_DIR"], "hooks")
-
-    if not isinstance(param, list):
-        param=[param]
-
-    # resolve hook file name, OS depdenent
-    hook_file = os.path.join(hooks_path, cmd)
-    if platform.system() == 'Windows':
-        if not os.path.isfile(hook_file):
-            # look for the file with an extension
-            files = glob.glob(hook_file + ".*")
-            if not files:
-                return True
-            files.sort()
-            hook_file = files.pop()
-            while hook_file.upper().endswith(".SAMPLE"):
-                # The file is a sample hook. We don't want it
-                if len(files) > 0:
-                    hook_file = files.pop()
-                else:
-                    return True
-
-    if not os.path.isfile(hook_file) or not os.access(hook_file, os.X_OK):
-        return True
-
-    return run_hook_command(hook_file, param) == 0
-
-def run_hook_command(cmd, param):
-    """Executes a git hook command
-       cmd = the command line file to be executed. This can be
-       a file that is run by OS association.
-
-       param = a list of parameters to pass to the cmd command
-
-       On windows, the extension is checked to see if it should
-       be run with the Git for Windows Bash shell.  If there
-       is no file extension, the file is deemed a bash shell
-       and will be handed off to sh.exe. Otherwise, Windows
-       will be called with the shell to handle the file assocation.
-
-       For non Windows operating systems, the file is called
-       as an executable.
-    """
-    cli = [cmd] + param
-    use_shell = False
-    if platform.system() == 'Windows':
-        (root,ext) = os.path.splitext(cmd)
-        if ext == "":
-            exe_path = os.environ.get("EXEPATH")
-            if exe_path is None:
-                exe_path = ""
-            else:
-                exe_path = os.path.join(exe_path, "bin")
-            cli = [os.path.join(exe_path, "SH.EXE")] + cli
-        else:
-            use_shell = True
-    return subprocess.call(cli, shell=use_shell)
-
-
-def write_pipe(c, stdin):
-    if verbose:
-        sys.stderr.write('Writing pipe: %s\n' % str(c))
+        sys.stderr.write('Writing pipe: {}\n'.format(' '.join(c)))
 
-    expand = not isinstance(c, list)
-    p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand)
+    p = subprocess.Popen(c, stdin=subprocess.PIPE, *k, **kw)
     pipe = p.stdin
     val = pipe.write(stdin)
     pipe.close()
     if p.wait():
-        die('Command failed: %s' % str(c))
+        die('Command failed: {}'.format(' '.join(c)))
 
     return val
 
-def p4_write_pipe(c, stdin):
+def p4_write_pipe(c, stdin, *k, **kw):
     real_cmd = p4_build_cmd(c)
     if bytes is not str and isinstance(stdin, str):
         stdin = encode_text_stream(stdin)
-    return write_pipe(real_cmd, stdin)
+    return write_pipe(real_cmd, stdin, *k, **kw)
 
-def read_pipe_full(c):
+def read_pipe_full(c, *k, **kw):
     """ Read output from  command. Returns a tuple
         of the return status, stdout text and stderr
         text.
     """
     if verbose:
-        sys.stderr.write('Reading pipe: %s\n' % str(c))
+        sys.stderr.write('Reading pipe: {}\n'.format(' '.join(c)))
 
-    expand = not isinstance(c, list)
-    p = subprocess.Popen(c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=expand)
+    p = subprocess.Popen(
+        c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, *k, **kw)
     (out, err) = p.communicate()
     return (p.returncode, out, decode_text_stream(err))
 
-def read_pipe(c, ignore_error=False, raw=False):
+def read_pipe(c, ignore_error=False, raw=False, *k, **kw):
     """ Read output from  command. Returns the output text on
         success. On failure, terminates execution, unless
         ignore_error is True, when it returns an empty string.
 
         If raw is True, do not attempt to decode output text.
     """
-    (retcode, out, err) = read_pipe_full(c)
+    (retcode, out, err) = read_pipe_full(c, *k, **kw)
     if retcode != 0:
         if ignore_error:
             out = ""
         else:
-            die('Command failed: %s\nError: %s' % (str(c), err))
+            die('Command failed: {}\nError: {}'.format(' '.join(c), err))
     if not raw:
         out = decode_text_stream(out)
     return out
 
-def read_pipe_text(c):
+def read_pipe_text(c, *k, **kw):
     """ Read output from a command with trailing whitespace stripped.
         On error, returns None.
     """
-    (retcode, out, err) = read_pipe_full(c)
+    (retcode, out, err) = read_pipe_full(c, *k, **kw)
     if retcode != 0:
         return None
     else:
         return decode_text_stream(out).rstrip()
 
-def p4_read_pipe(c, ignore_error=False, raw=False):
+def p4_read_pipe(c, ignore_error=False, raw=False, *k, **kw):
     real_cmd = p4_build_cmd(c)
-    return read_pipe(real_cmd, ignore_error, raw=raw)
+    return read_pipe(real_cmd, ignore_error, raw=raw, *k, **kw)
 
-def read_pipe_lines(c):
+def read_pipe_lines(c, raw=False, *k, **kw):
     if verbose:
-        sys.stderr.write('Reading pipe: %s\n' % str(c))
+        sys.stderr.write('Reading pipe: {}\n'.format(' '.join(c)))
 
-    expand = not isinstance(c, list)
-    p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand)
+    p = subprocess.Popen(c, stdout=subprocess.PIPE, *k, **kw)
     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
+        die('Command failed: {}'.format(' '.join(c)))
+    return lines
 
-def p4_read_pipe_lines(c):
+def p4_read_pipe_lines(c, *k, **kw):
     """Specifically invoke p4 on the command supplied. """
     real_cmd = p4_build_cmd(c)
-    return read_pipe_lines(real_cmd)
+    return read_pipe_lines(real_cmd, *k, **kw)
 
 def p4_has_command(cmd):
     """Ask p4 for help on this command.  If it returns an error, the
@@ -383,23 +337,22 @@ def p4_has_move_command():
     # assume it failed because @... was invalid changelist
     return True
 
-def system(cmd, ignore_error=False):
-    expand = not isinstance(cmd, list)
+def system(cmd, ignore_error=False, *k, **kw):
     if verbose:
-        sys.stderr.write("executing %s\n" % str(cmd))
-    retcode = subprocess.call(cmd, shell=expand)
+        sys.stderr.write("executing {}\n".format(
+            ' '.join(cmd) if isinstance(cmd, list) else cmd))
+    retcode = subprocess.call(cmd, *k, **kw)
     if retcode and not ignore_error:
-        raise CalledProcessError(retcode, cmd)
+        raise subprocess.CalledProcessError(retcode, cmd)
 
     return retcode
 
-def p4_system(cmd):
+def p4_system(cmd, *k, **kw):
     """Specifically invoke p4 as the system command. """
     real_cmd = p4_build_cmd(cmd)
-    expand = not isinstance(real_cmd, list)
-    retcode = subprocess.call(real_cmd, shell=expand)
+    retcode = subprocess.call(real_cmd, *k, **kw)
     if retcode:
-        raise CalledProcessError(retcode, real_cmd)
+        raise subprocess.CalledProcessError(retcode, real_cmd)
 
 def die_bad_access(s):
     die("failure accessing depot: {0}".format(s.rstrip()))
@@ -577,20 +530,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
 
@@ -726,18 +671,11 @@ def isModeExecChanged(src_mode, dst_mode):
     return isModeExec(src_mode) != isModeExec(dst_mode)
 
 def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
-        errors_as_exceptions=False):
-
-    if not isinstance(cmd, list):
-        cmd = "-G " + cmd
-        expand = True
-    else:
-        cmd = ["-G"] + cmd
-        expand = False
+        errors_as_exceptions=False, *k, **kw):
 
-    cmd = p4_build_cmd(cmd)
+    cmd = p4_build_cmd(["-G"] + cmd)
     if verbose:
-        sys.stderr.write("Opening pipe: %s\n" % str(cmd))
+        sys.stderr.write("Opening pipe: {}\n".format(' '.join(cmd)))
 
     # Use a temporary file to avoid deadlocks without
     # subprocess.communicate(), which would put another copy
@@ -754,10 +692,8 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
         stdin_file.flush()
         stdin_file.seek(0)
 
-    p4 = subprocess.Popen(cmd,
-                          shell=expand,
-                          stdin=stdin_file,
-                          stdout=subprocess.PIPE)
+    p4 = subprocess.Popen(
+        cmd, stdin=stdin_file, stdout=subprocess.PIPE, *k, **kw)
 
     result = []
     try:
@@ -810,8 +746,8 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
 
     return result
 
-def p4Cmd(cmd):
-    list = p4CmdList(cmd)
+def p4Cmd(cmd, *k, **kw):
+    list = p4CmdList(cmd, *k, **kw)
     result = {}
     for entry in list:
         result.update(entry)
@@ -860,7 +796,7 @@ def isValidGitDir(path):
     return git_dir(path) != None
 
 def parseRevision(ref):
-    return read_pipe("git rev-parse %s" % ref).strip()
+    return read_pipe(["git", "rev-parse", ref]).strip()
 
 def branchExists(ref):
     rev = read_pipe(["git", "rev-parse", "-q", "--verify", ref],
@@ -966,11 +902,11 @@ def p4BranchesInGit(branchesAreInRemotes=True):
 
     branches = {}
 
-    cmdline = "git rev-parse --symbolic "
+    cmdline = ["git", "rev-parse", "--symbolic"]
     if branchesAreInRemotes:
-        cmdline += "--remotes"
+        cmdline.append("--remotes")
     else:
-        cmdline += "--branches"
+        cmdline.append("--branches")
 
     for line in read_pipe_lines(cmdline):
         line = line.strip()
@@ -1035,7 +971,7 @@ def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent
 
     originPrefix = "origin/p4/"
 
-    for line in read_pipe_lines("git rev-parse --symbolic --remotes"):
+    for line in read_pipe_lines(["git", "rev-parse", "--symbolic", "--remotes"]):
         line = line.strip()
         if (not line.startswith(originPrefix)) or line.endswith("HEAD"):
             continue
@@ -1073,7 +1009,7 @@ def createOrUpdateBranchesFromOrigin(localRefPrefix = "refs/remotes/p4/", silent
                               remoteHead, ','.join(settings['depot-paths'])))
 
         if update:
-            system("git update-ref %s %s" % (remoteHead, originHead))
+            system(["git", "update-ref", remoteHead, originHead])
 
 def originP4BranchesExist():
         return gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
@@ -1187,7 +1123,7 @@ def getClientSpec():
     """Look at the p4 client spec, create a View() object that contains
        all the mappings, and return it."""
 
-    specList = p4CmdList("client -o")
+    specList = p4CmdList(["client", "-o"])
     if len(specList) != 1:
         die('Output from "client -o" is %d lines, expecting 1' %
             len(specList))
@@ -1216,7 +1152,7 @@ def getClientSpec():
 def getClientRoot():
     """Grab the client directory."""
 
-    output = p4CmdList("client -o")
+    output = p4CmdList(["client", "-o"])
     if len(output) != 1:
         die('Output from "client -o" is %d lines, expecting 1' % len(output))
 
@@ -1471,7 +1407,7 @@ class P4UserMap:
         if self.myP4UserId:
             return self.myP4UserId
 
-        results = p4CmdList("user -o")
+        results = p4CmdList(["user", "-o"])
         for r in results:
             if 'User' in r:
                 self.myP4UserId = r['User']
@@ -1496,7 +1432,7 @@ class P4UserMap:
         self.users = {}
         self.emails = {}
 
-        for output in p4CmdList("users"):
+        for output in p4CmdList(["users"]):
             if "User" not in output:
                 continue
             self.users[output["User"]] = output["FullName"] + " <" + output["Email"] + ">"
@@ -1532,80 +1468,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")
@@ -1694,7 +1556,7 @@ class P4Submit(Command, P4UserMap):
             die("Large file system not supported for git-p4 submit command. Please remove it from config.")
 
     def check(self):
-        if len(p4CmdList("opened ...")) > 0:
+        if len(p4CmdList(["opened", "..."])) > 0:
             die("You have files opened with perforce! Close them before starting the sync.")
 
     def separate_jobs_from_description(self, message):
@@ -1753,18 +1615,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)
@@ -1803,7 +1660,7 @@ class P4Submit(Command, P4UserMap):
         # then gets used to patch up the username in the change. If the same
         # client spec is being used by multiple processes then this might go
         # wrong.
-        results = p4CmdList("client -o")        # find the current client
+        results = p4CmdList(["client", "-o"])        # find the current client
         client = None
         for r in results:
             if 'Client' in r:
@@ -1819,7 +1676,7 @@ class P4Submit(Command, P4UserMap):
 
     def modifyChangelistUser(self, changelist, newUser):
         # fixup the user field of a changelist after it has been submitted.
-        changes = p4CmdList("change -o %s" % changelist)
+        changes = p4CmdList(["change", "-o", changelist])
         if len(changes) != 1:
             die("Bad output from p4 change modifying %s to user %s" %
                 (changelist, newUser))
@@ -1830,7 +1687,7 @@ class P4Submit(Command, P4UserMap):
         # p4 does not understand format version 3 and above
         input = marshal.dumps(c, 2)
 
-        result = p4CmdList("change -f -i", stdin=input)
+        result = p4CmdList(["change", "-f", "-i"], stdin=input)
         for r in result:
             if 'code' in r:
                 if r['code'] == 'error':
@@ -1936,7 +1793,7 @@ class P4Submit(Command, P4UserMap):
         if "P4EDITOR" in os.environ and (os.environ.get("P4EDITOR") != ""):
             editor = os.environ.get("P4EDITOR")
         else:
-            editor = read_pipe("git var GIT_EDITOR").strip()
+            editor = read_pipe(["git", "var", "GIT_EDITOR"]).strip()
         system(["sh", "-c", ('%s "$@"' % editor), editor, template_file])
 
         # If the file was not saved, prompt to see if this patch should
@@ -1994,7 +1851,8 @@ class P4Submit(Command, P4UserMap):
 
         (p4User, gitEmail) = self.p4UserForCommit(id)
 
-        diff = read_pipe_lines("git diff-tree -r %s \"%s^\" \"%s\"" % (self.diffOpts, id, id))
+        diff = read_pipe_lines(
+            ["git", "diff-tree", "-r"] + self.diffOpts + ["{}^".format(id), id])
         filesToAdd = set()
         filesToChangeType = set()
         filesToDelete = set()
@@ -2091,25 +1949,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:
@@ -2131,7 +1988,7 @@ class P4Submit(Command, P4UserMap):
         #
         # Apply the patch for real, and do add/delete/+x handling.
         #
-        system(applyPatchCmd)
+        system(applyPatchCmd, shell=True)
 
         for f in filesToChangeType:
             p4_edit(f, "-t", "auto")
@@ -2481,17 +2338,17 @@ class P4Submit(Command, P4UserMap):
         #
         if self.detectRenames:
             # command-line -M arg
-            self.diffOpts = "-M"
+            self.diffOpts = ["-M"]
         else:
             # If not explicitly set check the config variable
             detectRenames = gitConfig("git-p4.detectRenames")
 
             if detectRenames.lower() == "false" or detectRenames == "":
-                self.diffOpts = ""
+                self.diffOpts = []
             elif detectRenames.lower() == "true":
-                self.diffOpts = "-M"
+                self.diffOpts = ["-M"]
             else:
-                self.diffOpts = "-M%s" % detectRenames
+                self.diffOpts = ["-M{}".format(detectRenames)]
 
         # no command-line arg for -C or --find-copies-harder, just
         # config variables
@@ -2499,12 +2356,12 @@ class P4Submit(Command, P4UserMap):
         if detectCopies.lower() == "false" or detectCopies == "":
             pass
         elif detectCopies.lower() == "true":
-            self.diffOpts += " -C"
+            self.diffOpts.append("-C")
         else:
-            self.diffOpts += " -C%s" % detectCopies
+            self.diffOpts.append("-C{}".format(detectCopies))
 
         if gitConfigBool("git-p4.detectCopiesHarder"):
-            self.diffOpts += " --find-copies-harder"
+            self.diffOpts.append("--find-copies-harder")
 
         num_shelves = len(self.update_shelve)
         if num_shelves > 0 and num_shelves != len(commits):
@@ -2966,7 +2823,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 +2887,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 +2919,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 +2964,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
@@ -3453,12 +3309,9 @@ class P4Sync(Command, P4UserMap):
         lostAndFoundBranches = set()
 
         user = gitConfig("git-p4.branchUser")
-        if len(user) > 0:
-            command = "branches -u %s" % user
-        else:
-            command = "branches"
 
-        for info in p4CmdList(command):
+        for info in p4CmdList(
+            ["branches"] + (["-u", user] if len(user) > 0 else [])):
             details = p4Cmd(["branch", "-o", info["branch"]])
             viewIdx = 0
             while "View%s" % viewIdx in details:
@@ -3549,7 +3402,8 @@ class P4Sync(Command, P4UserMap):
         while True:
             if self.verbose:
                 print("trying: earliest %s latest %s" % (earliestCommit, latestCommit))
-            next = read_pipe("git rev-list --bisect %s %s" % (latestCommit, earliestCommit)).strip()
+            next = read_pipe(["git", "rev-list", "--bisect",
+                latestCommit, earliestCommit]).strip()
             if len(next) == 0:
                 if self.verbose:
                     print("argh")
@@ -3623,7 +3477,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
 
@@ -3704,7 +3559,7 @@ class P4Sync(Command, P4UserMap):
             if self.hasOrigin:
                 if not self.silent:
                     print('Syncing with origin first, using "git fetch origin"')
-                system("git fetch origin")
+                system(["git", "fetch", "origin"])
 
     def importHeadRevision(self, revision):
         print("Doing initial import of %s from revision %s into %s" % (' '.join(self.depotPaths), revision, self.branch))
@@ -3871,8 +3726,8 @@ class P4Sync(Command, P4UserMap):
         if len(self.branch) == 0:
             self.branch = self.refPrefix + "master"
             if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
-                system("git update-ref %s refs/heads/p4" % self.branch)
-                system("git branch -D p4")
+                system(["git", "update-ref", self.branch, "refs/heads/p4"])
+                system(["git", "branch", "-D", "p4"])
 
         # accept either the command-line option, or the configuration variable
         if self.useClientSpec:
@@ -4075,7 +3930,7 @@ class P4Sync(Command, P4UserMap):
         # Cleanup temporary branches created during import
         if self.tempBranches != []:
             for branch in self.tempBranches:
-                read_pipe("git update-ref -d %s" % branch)
+                read_pipe(["git", "update-ref", "-d", branch])
             os.rmdir(os.path.join(os.environ.get("GIT_DIR", ".git"), self.tempBranchLocation))
 
         # Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow
@@ -4107,7 +3962,7 @@ class P4Rebase(Command):
     def rebase(self):
         if os.system("git update-index --refresh") != 0:
             die("Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up to date or stash away all your changes with git stash.");
-        if len(read_pipe("git diff-index HEAD --")) > 0:
+        if len(read_pipe(["git", "diff-index", "HEAD", "--"])) > 0:
             die("You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.");
 
         [upstream, settings] = findUpstreamBranchPoint()
@@ -4118,9 +3973,10 @@ class P4Rebase(Command):
         upstream = re.sub("~[0-9]+$", "", upstream)
 
         print("Rebasing the current branch onto %s" % upstream)
-        oldHead = read_pipe("git rev-parse HEAD").strip()
-        system("git rebase %s" % upstream)
-        system("git diff-tree --stat --summary -M %s HEAD --" % oldHead)
+        oldHead = read_pipe(["git", "rev-parse", "HEAD"]).strip()
+        system(["git", "rebase", upstream])
+        system(["git", "diff-tree", "--stat", "--summary", "-M", oldHead,
+            "HEAD", "--"])
         return True
 
 class P4Clone(P4Sync):
@@ -4181,7 +4037,7 @@ class P4Clone(P4Sync):
             init_cmd.append("--bare")
         retcode = subprocess.call(init_cmd)
         if retcode:
-            raise CalledProcessError(retcode, init_cmd)
+            raise subprocess.CalledProcessError(retcode, init_cmd)
 
         if not P4Sync.run(self, depotPaths):
             return False
@@ -4197,7 +4053,7 @@ class P4Clone(P4Sync):
 
         # auto-set this variable if invoked with --use-client-spec
         if self.useClientSpec_from_options:
-            system("git config --bool git-p4.useclientspec true")
+            system(["git", "config", "--bool", "git-p4.useclientspec", "true"])
 
         return True
 
@@ -4328,10 +4184,7 @@ class P4Branches(Command):
         if originP4BranchesExist():
             createOrUpdateBranchesFromOrigin()
 
-        cmdline = "git rev-parse --symbolic "
-        cmdline += " --remotes"
-
-        for line in read_pipe_lines(cmdline):
+        for line in read_pipe_lines(["git", "rev-parse", "--symbolic", "--remotes"]):
             line = line.strip()
 
             if not line.startswith('p4/') or line == "p4/HEAD":
@@ -4363,13 +4216,11 @@ def printUsage(commands):
     print("")
 
 commands = {
-    "debug" : P4Debug,
     "submit" : P4Submit,
     "commit" : P4Submit,
     "sync" : P4Sync,
     "rebase" : P4Rebase,
     "clone" : P4Clone,
-    "rollback" : P4RollBack,
     "branches" : P4Branches,
     "unshelve" : P4Unshelve,
 }
@@ -4416,9 +4267,9 @@ def main():
             cmd.gitdir = os.path.abspath(".git")
             if not isValidGitDir(cmd.gitdir):
                 # "rev-parse --git-dir" without arguments will try $PWD/.git
-                cmd.gitdir = read_pipe("git rev-parse --git-dir").strip()
+                cmd.gitdir = read_pipe(["git", "rev-parse", "--git-dir"]).strip()
                 if os.path.exists(cmd.gitdir):
-                    cdup = read_pipe("git rev-parse --show-cdup").strip()
+                    cdup = read_pipe(["git", "rev-parse", "--show-cdup"]).strip()
                     if len(cdup) > 0:
                         chdir(cdup);
 
diff --git a/git-rebase--preserve-merges.sh b/git-rebase--preserve-merges.sh
deleted file mode 100644
index b9c71d2a71..0000000000
--- a/git-rebase--preserve-merges.sh
+++ /dev/null
@@ -1,1057 +0,0 @@
-# This shell script fragment is sourced by git-rebase to implement its
-# preserve-merges mode.
-#
-# Copyright (c) 2006 Johannes E. Schindelin
-#
-# The file containing rebase commands, comments, and empty lines.
-# This file is created by "git rebase -i" then edited by the user.  As
-# the lines are processed, they are removed from the front of this
-# file and written to the tail of $done.
-todo="$state_dir"/git-rebase-todo
-
-# The rebase command lines that have already been processed.  A line
-# is moved here when it is first handled, before any associated user
-# actions.
-done="$state_dir"/done
-
-# The commit message that is planned to be used for any changes that
-# need to be committed following a user interaction.
-msg="$state_dir"/message
-
-# The file into which is accumulated the suggested commit message for
-# squash/fixup commands.  When the first of a series of squash/fixups
-# is seen, the file is created and the commit message from the
-# previous commit and from the first squash/fixup commit are written
-# to it.  The commit message for each subsequent squash/fixup commit
-# is appended to the file as it is processed.
-#
-# The first line of the file is of the form
-#     # This is a combination of $count commits.
-# where $count is the number of commits whose messages have been
-# written to the file so far (including the initial "pick" commit).
-# Each time that a commit message is processed, this line is read and
-# updated.  It is deleted just before the combined commit is made.
-squash_msg="$state_dir"/message-squash
-
-# If the current series of squash/fixups has not yet included a squash
-# command, then this file exists and holds the commit message of the
-# original "pick" commit.  (If the series ends without a "squash"
-# command, then this can be used as the commit message of the combined
-# commit without opening the editor.)
-fixup_msg="$state_dir"/message-fixup
-
-# $rewritten is the name of a directory containing files for each
-# commit that is reachable by at least one merge base of $head and
-# $upstream. They are not necessarily rewritten, but their children
-# might be.  This ensures that commits on merged, but otherwise
-# unrelated side branches are left alone. (Think "X" in the man page's
-# example.)
-rewritten="$state_dir"/rewritten
-
-dropped="$state_dir"/dropped
-
-end="$state_dir"/end
-msgnum="$state_dir"/msgnum
-
-# A script to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
-# GIT_AUTHOR_DATE that will be used for the commit that is currently
-# being rebased.
-author_script="$state_dir"/author-script
-
-# When an "edit" rebase command is being processed, the SHA1 of the
-# commit to be edited is recorded in this file.  When "git rebase
-# --continue" is executed, if there are any staged changes then they
-# will be amended to the HEAD commit, but only provided the HEAD
-# commit is still the commit to be edited.  When any other rebase
-# command is processed, this file is deleted.
-amend="$state_dir"/amend
-
-# For the post-rewrite hook, we make a list of rewritten commits and
-# their new sha1s.  The rewritten-pending list keeps the sha1s of
-# commits that have been processed, but not committed yet,
-# e.g. because they are waiting for a 'squash' command.
-rewritten_list="$state_dir"/rewritten-list
-rewritten_pending="$state_dir"/rewritten-pending
-
-# Work around Git for Windows' Bash whose "read" does not strip CRLF
-# and leaves CR at the end instead.
-cr=$(printf "\015")
-
-resolvemsg="
-$(gettext 'Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".')
-"
-
-write_basic_state () {
-	echo "$head_name" > "$state_dir"/head-name &&
-	echo "$onto" > "$state_dir"/onto &&
-	echo "$orig_head" > "$state_dir"/orig-head &&
-	test t = "$GIT_QUIET" && : > "$state_dir"/quiet
-	test t = "$verbose" && : > "$state_dir"/verbose
-	test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy
-	test -n "$strategy_opts" && echo "$strategy_opts" > \
-		"$state_dir"/strategy_opts
-	test -n "$allow_rerere_autoupdate" && echo "$allow_rerere_autoupdate" > \
-		"$state_dir"/allow_rerere_autoupdate
-	test -n "$gpg_sign_opt" && echo "$gpg_sign_opt" > "$state_dir"/gpg_sign_opt
-	test -n "$signoff" && echo "$signoff" >"$state_dir"/signoff
-	test -n "$reschedule_failed_exec" && : > "$state_dir"/reschedule-failed-exec
-}
-
-apply_autostash () {
-	if test -f "$state_dir/autostash"
-	then
-		stash_sha1=$(cat "$state_dir/autostash")
-		if git stash apply $stash_sha1 >/dev/null 2>&1
-		then
-			echo "$(gettext 'Applied autostash.')" >&2
-		else
-			git stash store -m "autostash" -q $stash_sha1 ||
-			die "$(eval_gettext "Cannot store \$stash_sha1")"
-			gettext 'Applying autostash resulted in conflicts.
-Your changes are safe in the stash.
-You can run "git stash pop" or "git stash drop" at any time.
-' >&2
-		fi
-	fi
-}
-
-output () {
-	case "$verbose" in
-	'')
-		output=$("$@" 2>&1 )
-		status=$?
-		test $status != 0 && printf "%s\n" "$output"
-		return $status
-		;;
-	*)
-		"$@"
-		;;
-	esac
-}
-
-strategy_args=${strategy:+--strategy=$strategy}
-test -n "$strategy_opts" &&
-eval '
-	for strategy_opt in '"$strategy_opts"'
-	do
-		strategy_args="$strategy_args -X$(git rev-parse --sq-quote "${strategy_opt#--}")"
-	done
-'
-
-GIT_CHERRY_PICK_HELP="$resolvemsg"
-export GIT_CHERRY_PICK_HELP
-
-comment_char=$(git config --get core.commentchar 2>/dev/null)
-case "$comment_char" in
-'' | auto)
-	comment_char="#"
-	;;
-?)
-	;;
-*)
-	comment_char=$(echo "$comment_char" | cut -c1)
-	;;
-esac
-
-warn () {
-	printf '%s\n' "$*" >&2
-}
-
-# Output the commit message for the specified commit.
-commit_message () {
-	git cat-file commit "$1" | sed "1,/^$/d"
-}
-
-orig_reflog_action="$GIT_REFLOG_ACTION"
-
-comment_for_reflog () {
-	case "$orig_reflog_action" in
-	''|rebase*)
-		GIT_REFLOG_ACTION="rebase -i ($1)"
-		export GIT_REFLOG_ACTION
-		;;
-	esac
-}
-
-last_count=
-mark_action_done () {
-	sed -e 1q < "$todo" >> "$done"
-	sed -e 1d < "$todo" >> "$todo".new
-	mv -f "$todo".new "$todo"
-	new_count=$(( $(git stripspace --strip-comments <"$done" | wc -l) ))
-	echo $new_count >"$msgnum"
-	total=$(($new_count + $(git stripspace --strip-comments <"$todo" | wc -l)))
-	echo $total >"$end"
-	if test "$last_count" != "$new_count"
-	then
-		last_count=$new_count
-		eval_gettext "Rebasing (\$new_count/\$total)"; printf "\r"
-		test -z "$verbose" || echo
-	fi
-}
-
-append_todo_help () {
-	gettext "
-Commands:
-p, pick <commit> = use commit
-r, reword <commit> = use commit, but edit the commit message
-e, edit <commit> = use commit, but stop for amending
-s, squash <commit> = use commit, but meld into previous commit
-f, fixup <commit> = like \"squash\", but discard this commit's log message
-x, exec <commit> = run command (the rest of the line) using shell
-d, drop <commit> = remove commit
-l, label <label> = label current HEAD with a name
-t, reset <label> = reset HEAD to a label
-m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
-.       create a merge commit using the original merge commit's
-.       message (or the oneline, if no original merge commit was
-.       specified). Use -c <commit> to reword the commit message.
-
-These lines can be re-ordered; they are executed from top to bottom.
-" | git stripspace --comment-lines >>"$todo"
-
-	if test $(get_missing_commit_check_level) = error
-	then
-		gettext "
-Do not remove any line. Use 'drop' explicitly to remove a commit.
-" | git stripspace --comment-lines >>"$todo"
-	else
-		gettext "
-If you remove a line here THAT COMMIT WILL BE LOST.
-" | git stripspace --comment-lines >>"$todo"
-	fi
-}
-
-make_patch () {
-	sha1_and_parents="$(git rev-list --parents -1 "$1")"
-	case "$sha1_and_parents" in
-	?*' '?*' '?*)
-		git diff --cc $sha1_and_parents
-		;;
-	?*' '?*)
-		git diff-tree -p "$1^!"
-		;;
-	*)
-		echo "Root commit"
-		;;
-	esac > "$state_dir"/patch
-	test -f "$msg" ||
-		commit_message "$1" > "$msg"
-	test -f "$author_script" ||
-		get_author_ident_from_commit "$1" > "$author_script"
-}
-
-die_with_patch () {
-	echo "$1" > "$state_dir"/stopped-sha
-	git update-ref REBASE_HEAD "$1"
-	make_patch "$1"
-	die "$2"
-}
-
-exit_with_patch () {
-	echo "$1" > "$state_dir"/stopped-sha
-	git update-ref REBASE_HEAD "$1"
-	make_patch $1
-	git rev-parse --verify HEAD > "$amend"
-	gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
-	warn "$(eval_gettext "\
-You can amend the commit now, with
-
-	git commit --amend \$gpg_sign_opt_quoted
-
-Once you are satisfied with your changes, run
-
-	git rebase --continue")"
-	warn
-	exit $2
-}
-
-die_abort () {
-	apply_autostash
-	rm -rf "$state_dir"
-	die "$1"
-}
-
-has_action () {
-	test -n "$(git stripspace --strip-comments <"$1")"
-}
-
-is_empty_commit() {
-	tree=$(git rev-parse -q --verify "$1"^{tree} 2>/dev/null) || {
-		sha1=$1
-		die "$(eval_gettext "\$sha1: not a commit that can be picked")"
-	}
-	ptree=$(git rev-parse -q --verify "$1"^^{tree} 2>/dev/null) ||
-		ptree=4b825dc642cb6eb9a060e54bf8d69288fbee4904
-	test "$tree" = "$ptree"
-}
-
-is_merge_commit()
-{
-	git rev-parse --verify --quiet "$1"^2 >/dev/null 2>&1
-}
-
-# Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
-# GIT_AUTHOR_DATE exported from the current environment.
-do_with_author () {
-	(
-		export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
-		"$@"
-	)
-}
-
-git_sequence_editor () {
-	if test -z "$GIT_SEQUENCE_EDITOR"
-	then
-		GIT_SEQUENCE_EDITOR="$(git config sequence.editor)"
-		if [ -z "$GIT_SEQUENCE_EDITOR" ]
-		then
-			GIT_SEQUENCE_EDITOR="$(git var GIT_EDITOR)" || return $?
-		fi
-	fi
-
-	eval "$GIT_SEQUENCE_EDITOR" '"$@"'
-}
-
-pick_one () {
-	ff=--ff
-
-	case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac
-	case "$force_rebase" in '') ;; ?*) ff= ;; esac
-	output git rev-parse --verify $sha1 || die "$(eval_gettext "Invalid commit name: \$sha1")"
-
-	if is_empty_commit "$sha1"
-	then
-		empty_args="--allow-empty"
-	fi
-
-	pick_one_preserving_merges "$@"
-}
-
-pick_one_preserving_merges () {
-	fast_forward=t
-	case "$1" in
-	-n)
-		fast_forward=f
-		sha1=$2
-		;;
-	*)
-		sha1=$1
-		;;
-	esac
-	sha1=$(git rev-parse $sha1)
-
-	if test -f "$state_dir"/current-commit && test "$fast_forward" = t
-	then
-		while read current_commit
-		do
-			git rev-parse HEAD > "$rewritten"/$current_commit
-		done <"$state_dir"/current-commit
-		rm "$state_dir"/current-commit ||
-			die "$(gettext "Cannot write current commit's replacement sha1")"
-	fi
-
-	echo $sha1 >> "$state_dir"/current-commit
-
-	# rewrite parents; if none were rewritten, we can fast-forward.
-	new_parents=
-	pend=" $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)"
-	if test "$pend" = " "
-	then
-		pend=" root"
-	fi
-	while [ "$pend" != "" ]
-	do
-		p=$(expr "$pend" : ' \([^ ]*\)')
-		pend="${pend# $p}"
-
-		if test -f "$rewritten"/$p
-		then
-			new_p=$(cat "$rewritten"/$p)
-
-			# If the todo reordered commits, and our parent is marked for
-			# rewriting, but hasn't been gotten to yet, assume the user meant to
-			# drop it on top of the current HEAD
-			if test -z "$new_p"
-			then
-				new_p=$(git rev-parse HEAD)
-			fi
-
-			test $p != $new_p && fast_forward=f
-			case "$new_parents" in
-			*$new_p*)
-				;; # do nothing; that parent is already there
-			*)
-				new_parents="$new_parents $new_p"
-				;;
-			esac
-		else
-			if test -f "$dropped"/$p
-			then
-				fast_forward=f
-				replacement="$(cat "$dropped"/$p)"
-				test -z "$replacement" && replacement=root
-				pend=" $replacement$pend"
-			else
-				new_parents="$new_parents $p"
-			fi
-		fi
-	done
-	case $fast_forward in
-	t)
-		output warn "$(eval_gettext "Fast-forward to \$sha1")"
-		output git reset --hard $sha1 ||
-			die "$(eval_gettext "Cannot fast-forward to \$sha1")"
-		;;
-	f)
-		first_parent=$(expr "$new_parents" : ' \([^ ]*\)')
-
-		if [ "$1" != "-n" ]
-		then
-			# detach HEAD to current parent
-			output git checkout $first_parent 2> /dev/null ||
-				die "$(eval_gettext "Cannot move HEAD to \$first_parent")"
-		fi
-
-		case "$new_parents" in
-		' '*' '*)
-			test "a$1" = a-n && die "$(eval_gettext "Refusing to squash a merge: \$sha1")"
-
-			# redo merge
-			author_script_content=$(get_author_ident_from_commit $sha1)
-			eval "$author_script_content"
-			msg_content="$(commit_message $sha1)"
-			# No point in merging the first parent, that's HEAD
-			new_parents=${new_parents# $first_parent}
-			merge_args="--no-log --no-ff"
-			if ! do_with_author output eval \
-				git merge ${gpg_sign_opt:+$(git rev-parse \
-					--sq-quote "$gpg_sign_opt")} \
-				$allow_rerere_autoupdate "$merge_args" \
-				"$strategy_args" \
-				-m "$(git rev-parse --sq-quote "$msg_content")" \
-				"$new_parents"
-			then
-				printf "%s\n" "$msg_content" > "$GIT_DIR"/MERGE_MSG
-				die_with_patch $sha1 "$(eval_gettext "Error redoing merge \$sha1")"
-			fi
-			echo "$sha1 $(git rev-parse HEAD^0)" >> "$rewritten_list"
-			;;
-		*)
-			output eval git cherry-pick $allow_rerere_autoupdate \
-				$allow_empty_message \
-				${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")} \
-				"$strategy_args" "$@" ||
-				die_with_patch $sha1 "$(eval_gettext "Could not pick \$sha1")"
-			;;
-		esac
-		;;
-	esac
-}
-
-this_nth_commit_message () {
-	n=$1
-	eval_gettext "This is the commit message #\${n}:"
-}
-
-skip_nth_commit_message () {
-	n=$1
-	eval_gettext "The commit message #\${n} will be skipped:"
-}
-
-update_squash_messages () {
-	if test -f "$squash_msg"; then
-		mv "$squash_msg" "$squash_msg".bak || exit
-		count=$(($(sed -n \
-			-e "1s/^$comment_char[^0-9]*\([0-9][0-9]*\).*/\1/p" \
-			-e "q" < "$squash_msg".bak)+1))
-		{
-			printf '%s\n' "$comment_char $(eval_ngettext \
-				"This is a combination of \$count commit." \
-				"This is a combination of \$count commits." \
-				$count)"
-			sed -e 1d -e '2,/^./{
-				/^$/d
-			}' <"$squash_msg".bak
-		} >"$squash_msg"
-	else
-		commit_message HEAD >"$fixup_msg" ||
-		die "$(eval_gettext "Cannot write \$fixup_msg")"
-		count=2
-		{
-			printf '%s\n' "$comment_char $(gettext "This is a combination of 2 commits.")"
-			printf '%s\n' "$comment_char $(gettext "This is the 1st commit message:")"
-			echo
-			cat "$fixup_msg"
-		} >"$squash_msg"
-	fi
-	case $1 in
-	squash)
-		rm -f "$fixup_msg"
-		echo
-		printf '%s\n' "$comment_char $(this_nth_commit_message $count)"
-		echo
-		commit_message $2
-		;;
-	fixup)
-		echo
-		printf '%s\n' "$comment_char $(skip_nth_commit_message $count)"
-		echo
-		# Change the space after the comment character to TAB:
-		commit_message $2 | git stripspace --comment-lines | sed -e 's/ /	/'
-		;;
-	esac >>"$squash_msg"
-}
-
-peek_next_command () {
-	git stripspace --strip-comments <"$todo" | sed -n -e 's/ .*//p' -e q
-}
-
-# A squash/fixup has failed.  Prepare the long version of the squash
-# commit message, then die_with_patch.  This code path requires the
-# user to edit the combined commit message for all commits that have
-# been squashed/fixedup so far.  So also erase the old squash
-# messages, effectively causing the combined commit to be used as the
-# new basis for any further squash/fixups.  Args: sha1 rest
-die_failed_squash() {
-	sha1=$1
-	rest=$2
-	mv "$squash_msg" "$msg" || exit
-	rm -f "$fixup_msg"
-	cp "$msg" "$GIT_DIR"/MERGE_MSG || exit
-	warn
-	warn "$(eval_gettext "Could not apply \$sha1... \$rest")"
-	die_with_patch $sha1 ""
-}
-
-flush_rewritten_pending() {
-	test -s "$rewritten_pending" || return
-	newsha1="$(git rev-parse HEAD^0)"
-	sed "s/$/ $newsha1/" < "$rewritten_pending" >> "$rewritten_list"
-	rm -f "$rewritten_pending"
-}
-
-record_in_rewritten() {
-	oldsha1="$(git rev-parse $1)"
-	echo "$oldsha1" >> "$rewritten_pending"
-
-	case "$(peek_next_command)" in
-	squash|s|fixup|f)
-		;;
-	*)
-		flush_rewritten_pending
-		;;
-	esac
-}
-
-do_pick () {
-	sha1=$1
-	rest=$2
-	if test "$(git rev-parse HEAD)" = "$squash_onto"
-	then
-		# Set the correct commit message and author info on the
-		# sentinel root before cherry-picking the original changes
-		# without committing (-n).  Finally, update the sentinel again
-		# to include these changes.  If the cherry-pick results in a
-		# conflict, this means our behaviour is similar to a standard
-		# failed cherry-pick during rebase, with a dirty index to
-		# resolve before manually running git commit --amend then git
-		# rebase --continue.
-		git commit --allow-empty --allow-empty-message --amend \
-			   --no-post-rewrite -n -q -C $sha1 $signoff &&
-			pick_one -n $sha1 &&
-			git commit --allow-empty --allow-empty-message \
-				   --amend --no-post-rewrite -n -q -C $sha1 $signoff \
-				   ${gpg_sign_opt:+"$gpg_sign_opt"} ||
-				   die_with_patch $sha1 "$(eval_gettext "Could not apply \$sha1... \$rest")"
-	else
-		pick_one $sha1 ||
-			die_with_patch $sha1 "$(eval_gettext "Could not apply \$sha1... \$rest")"
-	fi
-}
-
-do_next () {
-	rm -f "$msg" "$author_script" "$amend" "$state_dir"/stopped-sha || exit
-	read -r command sha1 rest < "$todo"
-	case "$command" in
-	"$comment_char"*|''|noop|drop|d)
-		mark_action_done
-		;;
-	"$cr")
-		# Work around CR left by "read" (e.g. with Git for Windows' Bash).
-		mark_action_done
-		;;
-	pick|p)
-		comment_for_reflog pick
-
-		mark_action_done
-		do_pick $sha1 "$rest"
-		record_in_rewritten $sha1
-		;;
-	reword|r)
-		comment_for_reflog reword
-
-		mark_action_done
-		do_pick $sha1 "$rest"
-		git commit --amend --no-post-rewrite ${gpg_sign_opt:+"$gpg_sign_opt"} \
-			$allow_empty_message || {
-			warn "$(eval_gettext "\
-Could not amend commit after successfully picking \$sha1... \$rest
-This is most likely due to an empty commit message, or the pre-commit hook
-failed. If the pre-commit hook failed, you may need to resolve the issue before
-you are able to reword the commit.")"
-			exit_with_patch $sha1 1
-		}
-		record_in_rewritten $sha1
-		;;
-	edit|e)
-		comment_for_reflog edit
-
-		mark_action_done
-		do_pick $sha1 "$rest"
-		sha1_abbrev=$(git rev-parse --short $sha1)
-		warn "$(eval_gettext "Stopped at \$sha1_abbrev... \$rest")"
-		exit_with_patch $sha1 0
-		;;
-	squash|s|fixup|f)
-		case "$command" in
-		squash|s)
-			squash_style=squash
-			;;
-		fixup|f)
-			squash_style=fixup
-			;;
-		esac
-		comment_for_reflog $squash_style
-
-		test -f "$done" && has_action "$done" ||
-			die "$(eval_gettext "Cannot '\$squash_style' without a previous commit")"
-
-		mark_action_done
-		update_squash_messages $squash_style $sha1
-		author_script_content=$(get_author_ident_from_commit HEAD)
-		echo "$author_script_content" > "$author_script"
-		eval "$author_script_content"
-		if ! pick_one -n $sha1
-		then
-			git rev-parse --verify HEAD >"$amend"
-			die_failed_squash $sha1 "$rest"
-		fi
-		case "$(peek_next_command)" in
-		squash|s|fixup|f)
-			# This is an intermediate commit; its message will only be
-			# used in case of trouble.  So use the long version:
-			do_with_author output git commit --amend --no-verify -F "$squash_msg" \
-				${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
-				die_failed_squash $sha1 "$rest"
-			;;
-		*)
-			# This is the final command of this squash/fixup group
-			if test -f "$fixup_msg"
-			then
-				do_with_author git commit --amend --no-verify -F "$fixup_msg" \
-					${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
-					die_failed_squash $sha1 "$rest"
-			else
-				cp "$squash_msg" "$GIT_DIR"/SQUASH_MSG || exit
-				rm -f "$GIT_DIR"/MERGE_MSG
-				do_with_author git commit --amend --no-verify -F "$GIT_DIR"/SQUASH_MSG -e \
-					${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
-					die_failed_squash $sha1 "$rest"
-			fi
-			rm -f "$squash_msg" "$fixup_msg"
-			;;
-		esac
-		record_in_rewritten $sha1
-		;;
-	x|"exec")
-		read -r command rest < "$todo"
-		mark_action_done
-		eval_gettextln "Executing: \$rest"
-		"${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution
-		status=$?
-		# Run in subshell because require_clean_work_tree can die.
-		dirty=f
-		(require_clean_work_tree "rebase" 2>/dev/null) || dirty=t
-		if test "$status" -ne 0
-		then
-			warn "$(eval_gettext "Execution failed: \$rest")"
-			test "$dirty" = f ||
-				warn "$(gettext "and made changes to the index and/or the working tree")"
-
-			warn "$(gettext "\
-You can fix the problem, and then run
-
-	git rebase --continue")"
-			warn
-			if test $status -eq 127		# command not found
-			then
-				status=1
-			fi
-			exit "$status"
-		elif test "$dirty" = t
-		then
-			# TRANSLATORS: after these lines is a command to be issued by the user
-			warn "$(eval_gettext "\
-Execution succeeded: \$rest
-but left changes to the index and/or the working tree
-Commit or stash your changes, and then run
-
-	git rebase --continue")"
-			warn
-			exit 1
-		fi
-		;;
-	*)
-		warn "$(eval_gettext "Unknown command: \$command \$sha1 \$rest")"
-		fixtodo="$(gettext "Please fix this using 'git rebase --edit-todo'.")"
-		if git rev-parse --verify -q "$sha1" >/dev/null
-		then
-			die_with_patch $sha1 "$fixtodo"
-		else
-			die "$fixtodo"
-		fi
-		;;
-	esac
-	test -s "$todo" && return
-
-	comment_for_reflog finish &&
-	newhead=$(git rev-parse HEAD) &&
-	case $head_name in
-	refs/*)
-		message="$GIT_REFLOG_ACTION: $head_name onto $onto" &&
-		git update-ref -m "$message" $head_name $newhead $orig_head &&
-		git symbolic-ref \
-		  -m "$GIT_REFLOG_ACTION: returning to $head_name" \
-		  HEAD $head_name
-		;;
-	esac && {
-		test ! -f "$state_dir"/verbose ||
-			git diff-tree --stat $orig_head..HEAD
-	} &&
-	{
-		test -s "$rewritten_list" &&
-		git notes copy --for-rewrite=rebase < "$rewritten_list" ||
-		true # we don't care if this copying failed
-	} &&
-	hook="$(git rev-parse --git-path hooks/post-rewrite)"
-	if test -x "$hook" && test -s "$rewritten_list"; then
-		"$hook" rebase < "$rewritten_list"
-		true # we don't care if this hook failed
-	fi &&
-		warn "$(eval_gettext "Successfully rebased and updated \$head_name.")"
-
-	return 1 # not failure; just to break the do_rest loop
-}
-
-# can only return 0, when the infinite loop breaks
-do_rest () {
-	while :
-	do
-		do_next || break
-	done
-}
-
-expand_todo_ids() {
-	git rebase--interactive --expand-ids
-}
-
-collapse_todo_ids() {
-	git rebase--interactive --shorten-ids
-}
-
-# Switch to the branch in $into and notify it in the reflog
-checkout_onto () {
-	GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name"
-	output git checkout $onto || die_abort "$(gettext "could not detach HEAD")"
-	git update-ref ORIG_HEAD $orig_head
-}
-
-get_missing_commit_check_level () {
-	check_level=$(git config --get rebase.missingCommitsCheck)
-	check_level=${check_level:-ignore}
-	# Don't be case sensitive
-	printf '%s' "$check_level" | tr 'A-Z' 'a-z'
-}
-
-# Initiate an action. If the cannot be any
-# further action it  may exec a command
-# or exit and not return.
-#
-# TODO: Consider a cleaner return model so it
-# never exits and always return 0 if process
-# is complete.
-#
-# Parameter 1 is the action to initiate.
-#
-# Returns 0 if the action was able to complete
-# and if 1 if further processing is required.
-initiate_action () {
-	case "$1" in
-	continue)
-		# do we have anything to commit?
-		if git diff-index --cached --quiet HEAD --
-		then
-			# Nothing to commit -- skip this commit
-
-			test ! -f "$GIT_DIR"/CHERRY_PICK_HEAD ||
-			rm "$GIT_DIR"/CHERRY_PICK_HEAD ||
-			die "$(gettext "Could not remove CHERRY_PICK_HEAD")"
-		else
-			if ! test -f "$author_script"
-			then
-				gpg_sign_opt_quoted=${gpg_sign_opt:+$(git rev-parse --sq-quote "$gpg_sign_opt")}
-				die "$(eval_gettext "\
-You have staged changes in your working tree.
-If these changes are meant to be
-squashed into the previous commit, run:
-
-  git commit --amend \$gpg_sign_opt_quoted
-
-If they are meant to go into a new commit, run:
-
-  git commit \$gpg_sign_opt_quoted
-
-In both cases, once you're done, continue with:
-
-  git rebase --continue
-")"
-			fi
-			. "$author_script" ||
-				die "$(gettext "Error trying to find the author identity to amend commit")"
-			if test -f "$amend"
-			then
-				current_head=$(git rev-parse --verify HEAD)
-				test "$current_head" = $(cat "$amend") ||
-				die "$(gettext "\
-You have uncommitted changes in your working tree. Please commit them
-first and then run 'git rebase --continue' again.")"
-				do_with_author git commit --amend --no-verify -F "$msg" -e \
-					${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
-					die "$(gettext "Could not commit staged changes.")"
-			else
-				do_with_author git commit --no-verify -F "$msg" -e \
-					${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message ||
-					die "$(gettext "Could not commit staged changes.")"
-			fi
-		fi
-
-		if test -r "$state_dir"/stopped-sha
-		then
-			record_in_rewritten "$(cat "$state_dir"/stopped-sha)"
-		fi
-
-		require_clean_work_tree "rebase"
-		do_rest
-		return 0
-		;;
-	skip)
-		git rerere clear
-		do_rest
-		return 0
-		;;
-	edit-todo)
-		git stripspace --strip-comments <"$todo" >"$todo".new
-		mv -f "$todo".new "$todo"
-		collapse_todo_ids
-		append_todo_help
-		gettext "
-You are editing the todo file of an ongoing interactive rebase.
-To continue rebase after editing, run:
-    git rebase --continue
-
-" | git stripspace --comment-lines >>"$todo"
-
-		git_sequence_editor "$todo" ||
-			die "$(gettext "Could not execute editor")"
-		expand_todo_ids
-
-		exit
-		;;
-	show-current-patch)
-		exec git show REBASE_HEAD --
-		;;
-	*)
-		return 1 # continue
-		;;
-	esac
-}
-
-setup_reflog_action () {
-	comment_for_reflog start
-
-	if test ! -z "$switch_to"
-	then
-		GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to"
-		output git checkout "$switch_to" -- ||
-			die "$(eval_gettext "Could not checkout \$switch_to")"
-
-		comment_for_reflog start
-	fi
-}
-
-init_basic_state () {
-	orig_head=$(git rev-parse --verify HEAD) || die "$(gettext "No HEAD?")"
-	mkdir -p "$state_dir" || die "$(eval_gettext "Could not create temporary \$state_dir")"
-	rm -f "$(git rev-parse --git-path REBASE_HEAD)"
-
-	: > "$state_dir"/interactive || die "$(gettext "Could not mark as interactive")"
-	write_basic_state
-}
-
-init_revisions_and_shortrevisions () {
-	shorthead=$(git rev-parse --short $orig_head)
-	shortonto=$(git rev-parse --short $onto)
-	if test -z "$rebase_root"
-		# this is now equivalent to ! -z "$upstream"
-	then
-		shortupstream=$(git rev-parse --short $upstream)
-		revisions=$upstream...$orig_head
-		shortrevisions=$shortupstream..$shorthead
-	else
-		revisions=$onto...$orig_head
-		shortrevisions=$shorthead
-		test -z "$squash_onto" ||
-		echo "$squash_onto" >"$state_dir"/squash-onto
-	fi
-}
-
-complete_action() {
-	test -s "$todo" || echo noop >> "$todo"
-	test -z "$autosquash" || git rebase--interactive --rearrange-squash || exit
-	test -n "$cmd" && git rebase--interactive --add-exec-commands --cmd "$cmd"
-
-	todocount=$(git stripspace --strip-comments <"$todo" | wc -l)
-	todocount=${todocount##* }
-
-cat >>"$todo" <<EOF
-
-$comment_char $(eval_ngettext \
-	"Rebase \$shortrevisions onto \$shortonto (\$todocount command)" \
-	"Rebase \$shortrevisions onto \$shortonto (\$todocount commands)" \
-	"$todocount")
-EOF
-	append_todo_help
-	gettext "
-However, if you remove everything, the rebase will be aborted.
-
-" | git stripspace --comment-lines >>"$todo"
-
-	if test -z "$keep_empty"
-	then
-		printf '%s\n' "$comment_char $(gettext "Note that empty commits are commented out")" >>"$todo"
-	fi
-
-
-	has_action "$todo" ||
-		return 2
-
-	cp "$todo" "$todo".backup
-	collapse_todo_ids
-	git_sequence_editor "$todo" ||
-		die_abort "$(gettext "Could not execute editor")"
-
-	has_action "$todo" ||
-		return 2
-
-	git rebase--interactive --check-todo-list || {
-		ret=$?
-		checkout_onto
-		exit $ret
-	}
-
-	expand_todo_ids
-	checkout_onto
-	do_rest
-}
-
-git_rebase__preserve_merges () {
-	initiate_action "$action"
-	ret=$?
-	if test $ret = 0; then
-		return 0
-	fi
-
-	setup_reflog_action
-	init_basic_state
-
-	if test -z "$rebase_root"
-	then
-		mkdir "$rewritten" &&
-		for c in $(git merge-base --all $orig_head $upstream)
-		do
-			echo $onto > "$rewritten"/$c ||
-				die "$(gettext "Could not init rewritten commits")"
-		done
-	else
-		mkdir "$rewritten" &&
-		echo $onto > "$rewritten"/root ||
-			die "$(gettext "Could not init rewritten commits")"
-	fi
-
-	init_revisions_and_shortrevisions
-
-	format=$(git config --get rebase.instructionFormat)
-	# the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse
-	git rev-list --format="%m%H ${format:-%s}" \
-		--reverse --left-right --topo-order \
-		$revisions ${restrict_revision+^$restrict_revision} | \
-		sed -n "s/^>//p" |
-	while read -r sha1 rest
-	do
-		if test -z "$keep_empty" && is_empty_commit $sha1 && ! is_merge_commit $sha1
-		then
-			comment_out="$comment_char "
-		else
-			comment_out=
-		fi
-
-		if test -z "$rebase_root"
-		then
-			preserve=t
-			for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -s -f2-)
-			do
-				if test -f "$rewritten"/$p
-				then
-					preserve=f
-				fi
-			done
-		else
-			preserve=f
-		fi
-		if test f = "$preserve"
-		then
-			touch "$rewritten"/$sha1
-			printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo"
-		fi
-	done
-
-	# Watch for commits that been dropped by --cherry-pick
-	mkdir "$dropped"
-	# Save all non-cherry-picked changes
-	git rev-list $revisions --left-right --cherry-pick | \
-		sed -n "s/^>//p" > "$state_dir"/not-cherry-picks
-	# Now all commits and note which ones are missing in
-	# not-cherry-picks and hence being dropped
-	git rev-list $revisions |
-	while read rev
-	do
-		if test -f "$rewritten"/$rev &&
-		   ! sane_grep "$rev" "$state_dir"/not-cherry-picks >/dev/null
-		then
-			# Use -f2 because if rev-list is telling us this commit is
-			# not worthwhile, we don't want to track its multiple heads,
-			# just the history of its first-parent for others that will
-			# be rebasing on top of it
-			git rev-list --parents -1 $rev | cut -d' ' -s -f2 > "$dropped"/$rev
-			sha1=$(git rev-list -1 $rev)
-			sane_grep -v "^[a-z][a-z]* $sha1" <"$todo" > "${todo}2" ; mv "${todo}2" "$todo"
-			rm "$rewritten"/$rev
-		fi
-	done
-
-	complete_action
-}
diff --git a/git-send-email.perl b/git-send-email.perl
index e65d969d0b..a98460bdb9 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...
@@ -195,13 +225,13 @@ my $multiedit;
 my $editor;
 
 sub system_or_msg {
-	my ($args, $msg) = @_;
+	my ($args, $msg, $cmd_name) = @_;
 	system(@$args);
 	my $signalled = $? & 127;
 	my $exit_code = $? >> 8;
 	return unless $signalled or $exit_code;
 
-	my @sprintf_args = ($args->[0], $exit_code);
+	my @sprintf_args = ($cmd_name ? $cmd_name : $args->[0], $exit_code);
 	if (defined $msg) {
 		# Quiet the 'redundant' warning category, except we
 		# need to support down to Perl 5.8, so we can't do a
@@ -376,7 +406,7 @@ sub read_config {
 			@$target = @values;
 		}
 		else {
-			my $v = $known_keys->{$key}->[0];
+			my $v = $known_keys->{$key}->[-1];
 			next unless defined $v;
 			next if $configured->{$setting}++;
 			$$target = $v;
@@ -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();
 }
@@ -1697,7 +1733,6 @@ EOF
 
 $in_reply_to = $initial_in_reply_to;
 $references = $initial_in_reply_to || '';
-$subject = $initial_subject;
 $message_num = 0;
 
 # Prepares the email, prompts the user, sends it out
@@ -1720,6 +1755,7 @@ sub process_file {
 	@xh = ();
 	my $input_format = undef;
 	my @header = ();
+	$subject = $initial_subject;
 	$message = "";
 	$message_num++;
 	# First unfold multiline header fields
@@ -1926,15 +1962,23 @@ sub process_file {
 	}
 
 	# set up for the next message
-	if ($thread && $message_was_sent &&
-		($chain_reply_to || !defined $in_reply_to || length($in_reply_to) == 0 ||
-		$message_num == 1)) {
-		$in_reply_to = $message_id;
-		if (length $references > 0) {
-			$references .= "\n $message_id";
-		} else {
-			$references = "$message_id";
+	if ($thread) {
+		if ($message_was_sent &&
+		  ($chain_reply_to || !defined $in_reply_to || length($in_reply_to) == 0 ||
+		  $message_num == 1)) {
+			$in_reply_to = $message_id;
+			if (length $references > 0) {
+				$references .= "\n $message_id";
+			} else {
+				$references = "$message_id";
+			}
 		}
+	} elsif (!defined $initial_in_reply_to) {
+		# --thread and --in-reply-to manage the "In-Reply-To" header and by
+		# extension the "References" header. If these commands are not used, reset
+		# the header values to their defaults.
+		$in_reply_to = undef;
+		$references = '';
 	}
 	$message_id = undef;
 	$num_sent++;
@@ -2031,10 +2075,10 @@ sub validate_patch {
 	my ($fn, $xfer_encoding) = @_;
 
 	if ($repo) {
+		my $hook_name = 'sendemail-validate';
 		my $hooks_path = $repo->command_oneline('rev-parse', '--git-path', 'hooks');
 		require File::Spec;
-		my $validate_hook = File::Spec->catfile($hooks_path,
-					    'sendemail-validate');
+		my $validate_hook = File::Spec->catfile($hooks_path, $hook_name);
 		my $hook_error;
 		if (-x $validate_hook) {
 			require Cwd;
@@ -2044,13 +2088,19 @@ sub validate_patch {
 			chdir($repo->wc_path() or $repo->repo_path())
 				or die("chdir: $!");
 			local $ENV{"GIT_DIR"} = $repo->repo_path();
-			$hook_error = system_or_msg([$validate_hook, $target]);
+			my @cmd = ("git", "hook", "run", "--ignore-missing",
+				    $hook_name, "--");
+			my @cmd_msg = (@cmd, "<patch>");
+			my @cmd_run = (@cmd, $target);
+			$hook_error = system_or_msg(\@cmd_run, undef, "@cmd_msg");
 			chdir($cwd_save) or die("chdir: $!");
 		}
 		if ($hook_error) {
-			die sprintf(__("fatal: %s: rejected by sendemail-validate hook\n" .
-				       "%s\n" .
-				       "warning: no patches were sent\n"), $fn, $hook_error);
+			$hook_error = sprintf(__("fatal: %s: rejected by %s hook\n" .
+						 $hook_error . "\n" .
+						 "warning: no patches were sent\n"),
+					      $fn, $hook_name);
+			die $hook_error;
 		}
 	}
 
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index e3d9f4836d..a15c0620db 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -51,12 +51,6 @@ gettext_without_eval_gettext)
 		)
 	}
 
-	eval_ngettext () {
-		ngettext "$1" "$2" "$3" | (
-			export PATH $(git sh-i18n--envsubst --variables "$2");
-			git sh-i18n--envsubst "$2"
-		)
-	}
 	;;
 *)
 	gettext () {
@@ -70,12 +64,6 @@ gettext_without_eval_gettext)
 		)
 	}
 
-	eval_ngettext () {
-		(test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | (
-			export PATH $(git sh-i18n--envsubst --variables "$2");
-			git sh-i18n--envsubst "$2"
-		)
-	}
 	;;
 esac
 
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 10d9764185..d92df37e99 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -101,7 +101,6 @@ $LONG_USAGE")"
 	case "$1" in
 		-h)
 		echo "$LONG_USAGE"
-		case "$0" in *git-legacy-stash) exit 129;; esac
 		exit
 	esac
 fi
@@ -173,14 +172,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
 }
@@ -217,15 +208,9 @@ require_clean_work_tree () {
 	then
 		action=$1
 		case "$action" in
-		rebase)
-			gettextln "Cannot rebase: You have unstaged changes." >&2
-			;;
 		"rewrite branches")
 			gettextln "Cannot rewrite branches: You have unstaged changes." >&2
 			;;
-		"pull with rebase")
-			gettextln "Cannot pull with rebase: You have unstaged changes." >&2
-			;;
 		*)
 			eval_gettextln "Cannot \$action: You have unstaged changes." >&2
 			;;
@@ -238,17 +223,7 @@ require_clean_work_tree () {
 		if test $err = 0
 		then
 			action=$1
-			case "$action" in
-			rebase)
-				gettextln "Cannot rebase: Your index contains uncommitted changes." >&2
-				;;
-			"pull with rebase")
-				gettextln "Cannot pull with rebase: Your index contains uncommitted changes." >&2
-				;;
-			*)
-				eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
-				;;
-			esac
+			eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
 		else
 		    gettextln "Additionally, your index contains uncommitted changes." >&2
 		fi
diff --git a/git-submodule.sh b/git-submodule.sh
index cb06aa02c8..652861aa66 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -63,11 +63,6 @@ isnumber()
 	n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1"
 }
 
-# Given a full hex object ID, is this the zero OID?
-is_zero_oid () {
-	echo "$1" | sane_egrep '^0+$' >/dev/null 2>&1
-}
-
 # Sanitize the local git environment for use within a submodule. We
 # can't simply use clear_local_git_env since we want to preserve some
 # of the settings from GIT_CONFIG_PARAMETERS.
@@ -145,166 +140,12 @@ cmd_add()
 		shift
 	done
 
-	if ! git submodule--helper config --check-writeable >/dev/null 2>&1
-	then
-		 die "$(eval_gettext "please make sure that the .gitmodules file is in the working tree")"
-	fi
-
-	if test -n "$reference_path"
+	if test -z "$1"
 	then
-		is_absolute_path "$reference_path" ||
-		reference_path="$wt_prefix$reference_path"
-
-		reference="--reference=$reference_path"
-	fi
-
-	repo=$1
-	sm_path=$2
-
-	if test -z "$sm_path"; then
-		sm_path=$(printf '%s\n' "$repo" |
-			sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
-	fi
-
-	if test -z "$repo" || test -z "$sm_path"; then
 		usage
 	fi
 
-	is_absolute_path "$sm_path" || sm_path="$wt_prefix$sm_path"
-
-	# assure repo is absolute or relative to parent
-	case "$repo" in
-	./*|../*)
-		test -z "$wt_prefix" ||
-		die "$(gettext "Relative path can only be used from the toplevel of the working tree")"
-
-		# dereference source url relative to parent's url
-		realrepo=$(git submodule--helper resolve-relative-url "$repo") || exit
-		;;
-	*:*|/*)
-		# absolute url
-		realrepo=$repo
-		;;
-	*)
-		die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")"
-	;;
-	esac
-
-	# normalize path:
-	# multiple //; leading ./; /./; /../; trailing /
-	sm_path=$(printf '%s/\n' "$sm_path" |
-		sed -e '
-			s|//*|/|g
-			s|^\(\./\)*||
-			s|/\(\./\)*|/|g
-			:start
-			s|\([^/]*\)/\.\./||
-			tstart
-			s|/*$||
-		')
-	if test -z "$force"
-	then
-		git ls-files --error-unmatch "$sm_path" > /dev/null 2>&1 &&
-		die "$(eval_gettext "'\$sm_path' already exists in the index")"
-	else
-		git ls-files -s "$sm_path" | sane_grep -v "^160000" > /dev/null 2>&1 &&
-		die "$(eval_gettext "'\$sm_path' already exists in the index and is not a submodule")"
-	fi
-
-	if test -d "$sm_path" &&
-		test -z $(git -C "$sm_path" rev-parse --show-cdup 2>/dev/null)
-	then
-	    git -C "$sm_path" rev-parse --verify -q HEAD >/dev/null ||
-	    die "$(eval_gettext "'\$sm_path' does not have a commit checked out")"
-	fi
-
-	if test -z "$force"
-	then
-	    dryerr=$(git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" 2>&1 >/dev/null)
-	    res=$?
-	    if test $res -ne 0
-	    then
-		 echo >&2 "$dryerr"
-		 exit $res
-	    fi
-	fi
-
-	if test -n "$custom_name"
-	then
-		sm_name="$custom_name"
-	else
-		sm_name="$sm_path"
-	fi
-
-	if ! git submodule--helper check-name "$sm_name"
-	then
-		die "$(eval_gettext "'$sm_name' is not a valid submodule name")"
-	fi
-
-	# perhaps the path exists and is already a git repo, else clone it
-	if test -e "$sm_path"
-	then
-		if test -d "$sm_path"/.git || test -f "$sm_path"/.git
-		then
-			eval_gettextln "Adding existing repo at '\$sm_path' to the index"
-		else
-			die "$(eval_gettext "'\$sm_path' already exists and is not a valid git repo")"
-		fi
-
-	else
-		if test -d ".git/modules/$sm_name"
-		then
-			if test -z "$force"
-			then
-				eval_gettextln >&2 "A git directory for '\$sm_name' is found locally with remote(s):"
-				GIT_DIR=".git/modules/$sm_name" GIT_WORK_TREE=. git remote -v | grep '(fetch)' | sed -e s,^,"  ", -e s,' (fetch)',, >&2
-				die "$(eval_gettextln "\
-If you want to reuse this local git directory instead of cloning again from
-  \$realrepo
-use the '--force' option. If the local git directory is not the correct repo
-or you are unsure what this means choose another name with the '--name' option.")"
-			else
-				eval_gettextln "Reactivating local git directory for submodule '\$sm_name'."
-			fi
-		fi
-		git submodule--helper clone ${GIT_QUIET:+--quiet} ${progress:+"--progress"} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${dissociate:+"--dissociate"} ${depth:+"$depth"} || exit
-		(
-			sanitize_submodule_env
-			cd "$sm_path" &&
-			# ash fails to wordsplit ${branch:+-b "$branch"...}
-			case "$branch" in
-			'') git checkout -f -q ;;
-			?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
-			esac
-		) || die "$(eval_gettext "Unable to checkout submodule '\$sm_path'")"
-	fi
-	git config submodule."$sm_name".url "$realrepo"
-
-	git add --no-warn-embedded-repo $force "$sm_path" ||
-	die "$(eval_gettext "Failed to add submodule '\$sm_path'")"
-
-	git submodule--helper config submodule."$sm_name".path "$sm_path" &&
-	git submodule--helper config submodule."$sm_name".url "$repo" &&
-	if test -n "$branch"
-	then
-		git submodule--helper config submodule."$sm_name".branch "$branch"
-	fi &&
-	git add --force .gitmodules ||
-	die "$(eval_gettext "Failed to register submodule '\$sm_path'")"
-
-	# NEEDSWORK: In a multi-working-tree world, this needs to be
-	# set in the per-worktree config.
-	if git config --get submodule.active >/dev/null
-	then
-		# If the submodule being adding isn't already covered by the
-		# current configured pathspec, set the submodule's active flag
-		if ! git submodule--helper is-active "$sm_path"
-		then
-			git config submodule."$sm_name".active "true"
-		fi
-	else
-		git config submodule."$sm_name".active "true"
-	fi
+	git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper add ${GIT_QUIET:+--quiet} ${force:+--force} ${progress:+"--progress"} ${branch:+--branch "$branch"} ${reference_path:+--reference "$reference_path"} ${dissociate:+--dissociate} ${custom_name:+--name "$custom_name"} ${depth:+"$depth"} -- "$@"
 }
 
 #
@@ -405,13 +246,6 @@ cmd_deinit()
 	git ${wt_prefix:+-C "$wt_prefix"} submodule--helper deinit ${GIT_QUIET:+--quiet} ${force:+--force} ${deinit_all:+--all} -- "$@"
 }
 
-is_tip_reachable () (
-	sanitize_submodule_env &&
-	cd "$1" &&
-	rev=$(git rev-list -n 1 "$2" --not --all 2>/dev/null) &&
-	test -z "$rev"
-)
-
 # usage: fetch_in_submodule <module_path> [<depth>] [<sha1>]
 # Because arguments are positional, use an empty string to omit <depth>
 # but include <sha1>.
@@ -555,17 +389,16 @@ cmd_update()
 
 		git submodule--helper ensure-core-worktree "$sm_path" || exit 1
 
-		update_module=$(git submodule--helper update-module-mode $just_cloned "$sm_path" $update)
-
 		displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
 
 		if test $just_cloned -eq 1
 		then
 			subsha1=
 		else
+			just_cloned=
 			subsha1=$(sanitize_submodule_env; cd "$sm_path" &&
 				git rev-parse --verify HEAD) ||
-			die "$(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")"
+			die "fatal: $(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")"
 		fi
 
 		if test -n "$remote"
@@ -575,78 +408,46 @@ cmd_update()
 			then
 				# Fetch remote before determining tracking $sha1
 				fetch_in_submodule "$sm_path" $depth ||
-				die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
+				die "fatal: $(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
 			fi
 			remote_name=$(sanitize_submodule_env; cd "$sm_path" && git submodule--helper print-default-remote)
 			sha1=$(sanitize_submodule_env; cd "$sm_path" &&
 				git rev-parse --verify "${remote_name}/${branch}") ||
-			die "$(eval_gettext "Unable to find current \${remote_name}/\${branch} revision in submodule path '\$sm_path'")"
+			die "fatal: $(eval_gettext "Unable to find current \${remote_name}/\${branch} revision in submodule path '\$sm_path'")"
 		fi
 
-		if test "$subsha1" != "$sha1" || test -n "$force"
-		then
-			subforce=$force
-			# If we don't already have a -f flag and the submodule has never been checked out
-			if test -z "$subsha1" && test -z "$force"
-			then
-				subforce="-f"
-			fi
-
-			if test -z "$nofetch"
-			then
-				# Run fetch only if $sha1 isn't present or it
-				# is not reachable from a ref.
-				is_tip_reachable "$sm_path" "$sha1" ||
-				fetch_in_submodule "$sm_path" $depth ||
-				say "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'; trying to directly fetch \$sha1:")"
-
-				# Now we tried the usual fetch, but $sha1 may
-				# not be reachable from any of the refs
-				is_tip_reachable "$sm_path" "$sha1" ||
-				fetch_in_submodule "$sm_path" "$depth" "$sha1" ||
-				die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain \$sha1. Direct fetching of that commit failed.")"
-			fi
-
-			must_die_on_failure=
-			case "$update_module" in
-			checkout)
-				command="git checkout $subforce -q"
-				die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$displaypath'")"
-				say_msg="$(eval_gettext "Submodule path '\$displaypath': checked out '\$sha1'")"
-				;;
-			rebase)
-				command="git rebase ${GIT_QUIET:+--quiet}"
-				die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$displaypath'")"
-				say_msg="$(eval_gettext "Submodule path '\$displaypath': rebased into '\$sha1'")"
-				must_die_on_failure=yes
-				;;
-			merge)
-				command="git merge ${GIT_QUIET:+--quiet}"
-				die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$displaypath'")"
-				say_msg="$(eval_gettext "Submodule path '\$displaypath': merged in '\$sha1'")"
-				must_die_on_failure=yes
-				;;
-			!*)
-				command="${update_module#!}"
-				die_msg="$(eval_gettext "Execution of '\$command \$sha1' failed in submodule path '\$displaypath'")"
-				say_msg="$(eval_gettext "Submodule path '\$displaypath': '\$command \$sha1'")"
-				must_die_on_failure=yes
-				;;
-			*)
-				die "$(eval_gettext "Invalid update mode '$update_module' for submodule path '$path'")"
-			esac
-
-			if (sanitize_submodule_env; cd "$sm_path" && $command "$sha1")
-			then
-				say "$say_msg"
-			elif test -n "$must_die_on_failure"
-			then
-				die_with_status 2 "$die_msg"
-			else
-				err="${err};$die_msg"
-				continue
-			fi
-		fi
+		out=$(git submodule--helper run-update-procedure \
+			  ${wt_prefix:+--prefix "$wt_prefix"} \
+			  ${GIT_QUIET:+--quiet} \
+			  ${force:+--force} \
+			  ${just_cloned:+--just-cloned} \
+			  ${nofetch:+--no-fetch} \
+			  ${depth:+"$depth"} \
+			  ${update:+--update "$update"} \
+			  ${prefix:+--recursive-prefix "$prefix"} \
+			  ${sha1:+--oid "$sha1"} \
+			  ${subsha1:+--suboid "$subsha1"} \
+			  "--" \
+			  "$sm_path")
+
+		# exit codes for run-update-procedure:
+		# 0: update was successful, say command output
+		# 1: update procedure failed, but should not die
+		# 2 or 128: subcommand died during execution
+		# 3: no update procedure was run
+		res="$?"
+		case $res in
+		0)
+			say "$out"
+			;;
+		1)
+			err="${err};fatal: $out"
+			continue
+			;;
+		2|128)
+			die_with_status $res "fatal: $out"
+			;;
+		esac
 
 		if test -n "$recursive"
 		then
@@ -660,7 +461,7 @@ cmd_update()
 			res=$?
 			if test $res -gt 0
 			then
-				die_msg="$(eval_gettext "Failed to recurse into submodule path '\$displaypath'")"
+				die_msg="fatal: $(eval_gettext "Failed to recurse into submodule path '\$displaypath'")"
 				if test $res -ne 2
 				then
 					err="${err};$die_msg"
diff --git a/git-svn.perl b/git-svn.perl
index 70cb5e2a83..be987e316f 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -273,7 +273,6 @@ my %cmd = (
 			  'fetch-all|all' => \$_fetch_all,
 			  'dry-run|n' => \$_dry_run,
 			  'rebase-merges|p' => \$_rebase_merges,
-			  'preserve-merges|p' => \$_rebase_merges,
 			  %fc_opts } ],
 	'commit-diff' => [ \&cmd_commit_diff,
 	                   'Commit a diff between two trees',
diff --git a/git.c b/git.c
index 18bed9a996..340665d4a0 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()) {
@@ -538,6 +541,7 @@ static struct cmd_struct commands[] = {
 	{ "grep", cmd_grep, RUN_SETUP_GENTLY },
 	{ "hash-object", cmd_hash_object },
 	{ "help", cmd_help },
+	{ "hook", cmd_hook, RUN_SETUP },
 	{ "index-pack", cmd_index_pack, RUN_SETUP_GENTLY | NO_PARSEOPT },
 	{ "init", cmd_init_db },
 	{ "init-db", cmd_init_db },
@@ -561,7 +565,7 @@ static struct cmd_struct commands[] = {
 	{ "merge-tree", cmd_merge_tree, RUN_SETUP | NO_PARSEOPT },
 	{ "mktag", cmd_mktag, RUN_SETUP | NO_PARSEOPT },
 	{ "mktree", cmd_mktree, RUN_SETUP },
-	{ "multi-pack-index", cmd_multi_pack_index, RUN_SETUP_GENTLY },
+	{ "multi-pack-index", cmd_multi_pack_index, RUN_SETUP },
 	{ "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE },
 	{ "name-rev", cmd_name_rev, RUN_SETUP },
 	{ "notes", cmd_notes, RUN_SETUP },
@@ -577,7 +581,6 @@ static struct cmd_struct commands[] = {
 	{ "range-diff", cmd_range_diff, RUN_SETUP | USE_PAGER },
 	{ "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
 	{ "rebase", cmd_rebase, RUN_SETUP | NEED_WORK_TREE },
-	{ "rebase--interactive", cmd_rebase__interactive, RUN_SETUP | NEED_WORK_TREE },
 	{ "receive-pack", cmd_receive_pack },
 	{ "reflog", cmd_reflog, RUN_SETUP },
 	{ "remote", cmd_remote, RUN_SETUP },
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index e09e024a09..fbd1c20a23 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3796,7 +3796,8 @@ sub git_get_heads_list {
 	my @headslist;
 
 	open my $fd, '-|', git_cmd(), 'for-each-ref',
-		($limit ? '--count='.($limit+1) : ()), '--sort=-committerdate',
+		($limit ? '--count='.($limit+1) : ()),
+		'--sort=-HEAD', '--sort=-committerdate',
 		'--format=%(objectname) %(refname) %(subject)%00%(committer)',
 		@patterns
 		or return;
diff --git a/gpg-interface.c b/gpg-interface.c
index 127aecfc2b..17b1e44baa 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -3,11 +3,14 @@
 #include "config.h"
 #include "run-command.h"
 #include "strbuf.h"
+#include "dir.h"
 #include "gpg-interface.h"
 #include "sigchain.h"
 #include "tempfile.h"
+#include "alias.h"
 
 static char *configured_signing_key;
+static const char *ssh_default_key_command, *ssh_allowed_signers, *ssh_revocation_file;
 static enum signature_trust_level configured_min_trust_level = TRUST_UNDEFINED;
 
 struct gpg_format {
@@ -15,6 +18,14 @@ struct gpg_format {
 	const char *program;
 	const char **verify_args;
 	const char **sigs;
+	int (*verify_signed_buffer)(struct signature_check *sigc,
+				    struct gpg_format *fmt,
+				    const char *signature,
+				    size_t signature_size);
+	int (*sign_buffer)(struct strbuf *buffer, struct strbuf *signature,
+			   const char *signing_key);
+	const char *(*get_default_key)(void);
+	const char *(*get_key_id)(void);
 };
 
 static const char *openpgp_verify_args[] = {
@@ -35,14 +46,59 @@ static const char *x509_sigs[] = {
 	NULL
 };
 
+static const char *ssh_verify_args[] = { NULL };
+static const char *ssh_sigs[] = {
+	"-----BEGIN SSH SIGNATURE-----",
+	NULL
+};
+
+static int verify_gpg_signed_buffer(struct signature_check *sigc,
+				    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 *signature,
+				    size_t signature_size);
+static int sign_buffer_gpg(struct strbuf *buffer, struct strbuf *signature,
+			   const char *signing_key);
+static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
+			   const char *signing_key);
+
+static const char *get_default_ssh_signing_key(void);
+
+static const char *get_ssh_key_id(void);
+
 static struct gpg_format gpg_format[] = {
-	{ .name = "openpgp", .program = "gpg",
-	  .verify_args = openpgp_verify_args,
-	  .sigs = openpgp_sigs
+	{
+		.name = "openpgp",
+		.program = "gpg",
+		.verify_args = openpgp_verify_args,
+		.sigs = openpgp_sigs,
+		.verify_signed_buffer = verify_gpg_signed_buffer,
+		.sign_buffer = sign_buffer_gpg,
+		.get_default_key = NULL,
+		.get_key_id = NULL,
 	},
-	{ .name = "x509", .program = "gpgsm",
-	  .verify_args = x509_verify_args,
-	  .sigs = x509_sigs
+	{
+		.name = "x509",
+		.program = "gpgsm",
+		.verify_args = x509_verify_args,
+		.sigs = x509_sigs,
+		.verify_signed_buffer = verify_gpg_signed_buffer,
+		.sign_buffer = sign_buffer_gpg,
+		.get_default_key = NULL,
+		.get_key_id = NULL,
+	},
+	{
+		.name = "ssh",
+		.program = "ssh-keygen",
+		.verify_args = ssh_verify_args,
+		.sigs = ssh_sigs,
+		.verify_signed_buffer = verify_ssh_signed_buffer,
+		.sign_buffer = sign_buffer_ssh,
+		.get_default_key = get_default_ssh_signing_key,
+		.get_key_id = get_ssh_key_id,
 	},
 };
 
@@ -72,7 +128,7 @@ static struct gpg_format *get_format_by_sig(const char *sig)
 void signature_check_clear(struct signature_check *sigc)
 {
 	FREE_AND_NULL(sigc->payload);
-	FREE_AND_NULL(sigc->gpg_output);
+	FREE_AND_NULL(sigc->output);
 	FREE_AND_NULL(sigc->gpg_status);
 	FREE_AND_NULL(sigc->signer);
 	FREE_AND_NULL(sigc->key);
@@ -257,16 +313,16 @@ error:
 	FREE_AND_NULL(sigc->key);
 }
 
-static int verify_signed_buffer(const char *payload, size_t payload_size,
-				const char *signature, size_t signature_size,
-				struct strbuf *gpg_output,
-				struct strbuf *gpg_status)
+static int verify_gpg_signed_buffer(struct signature_check *sigc,
+				    struct gpg_format *fmt,
+				    const char *signature,
+				    size_t signature_size)
 {
 	struct child_process gpg = CHILD_PROCESS_INIT;
-	struct gpg_format *fmt;
 	struct tempfile *temp;
 	int ret;
-	struct strbuf buf = STRBUF_INIT;
+	struct strbuf gpg_stdout = STRBUF_INIT;
+	struct strbuf gpg_stderr = STRBUF_INIT;
 
 	temp = mks_tempfile_t(".git_vtag_tmpXXXXXX");
 	if (!temp)
@@ -279,10 +335,6 @@ static int verify_signed_buffer(const char *payload, size_t payload_size,
 		return -1;
 	}
 
-	fmt = get_format_by_sig(signature);
-	if (!fmt)
-		BUG("bad signature '%s'", signature);
-
 	strvec_push(&gpg.args, fmt->program);
 	strvec_pushv(&gpg.args, fmt->verify_args);
 	strvec_pushl(&gpg.args,
@@ -290,57 +342,322 @@ static int verify_signed_buffer(const char *payload, size_t payload_size,
 		     "--verify", temp->filename.buf, "-",
 		     NULL);
 
-	if (!gpg_status)
-		gpg_status = &buf;
-
 	sigchain_push(SIGPIPE, SIG_IGN);
-	ret = pipe_command(&gpg, payload, payload_size,
-			   gpg_status, 0, gpg_output, 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_status->buf, "\n[GNUPG:] GOODSIG ");
-	strbuf_release(&buf); /* no matter it was used or not */
+	ret |= !strstr(gpg_stdout.buf, "\n[GNUPG:] GOODSIG ");
+	sigc->output = strbuf_detach(&gpg_stderr, NULL);
+	sigc->gpg_status = strbuf_detach(&gpg_stdout, NULL);
+
+	parse_gpg_output(sigc);
+
+	strbuf_release(&gpg_stdout);
+	strbuf_release(&gpg_stderr);
 
 	return ret;
 }
 
-int check_signature(const char *payload, size_t plen, const char *signature,
-	size_t slen, struct signature_check *sigc)
+static void parse_ssh_output(struct signature_check *sigc)
 {
-	struct strbuf gpg_output = STRBUF_INIT;
-	struct strbuf gpg_status = STRBUF_INIT;
+	const char *line, *principal, *search;
+	char *to_free;
+	char *key = NULL;
+
+	/*
+	 * ssh-keygen output should be:
+	 * Good "git" signature for PRINCIPAL with RSA key SHA256:FINGERPRINT
+	 *
+	 * or for valid but unknown keys:
+	 * Good "git" signature with RSA key SHA256:FINGERPRINT
+	 *
+	 * Note that "PRINCIPAL" can contain whitespace, "RSA" and
+	 * "SHA256" part could be a different token that names of
+	 * the algorithms used, and "FINGERPRINT" is a hexadecimal
+	 * string.  By finding the last occurence of " with ", we can
+	 * reliably parse out the PRINCIPAL.
+	 */
+	sigc->result = 'B';
+	sigc->trust_level = TRUST_NEVER;
+
+	line = to_free = xmemdupz(sigc->output, strcspn(sigc->output, "\n"));
+
+	if (skip_prefix(line, "Good \"git\" signature for ", &line)) {
+		/* Search for the last "with" to get the full principal */
+		principal = line;
+		do {
+			search = strstr(line, " with ");
+			if (search)
+				line = search + 1;
+		} while (search != NULL);
+		if (line == principal)
+			goto cleanup;
+
+		/* Valid signature and known principal */
+		sigc->result = 'G';
+		sigc->trust_level = TRUST_FULLY;
+		sigc->signer = xmemdupz(principal, line - principal - 1);
+	} else if (skip_prefix(line, "Good \"git\" signature with ", &line)) {
+		/* Valid signature, but key unknown */
+		sigc->result = 'G';
+		sigc->trust_level = TRUST_UNDEFINED;
+	} else {
+		goto cleanup;
+	}
+
+	key = strstr(line, "key ");
+	if (key) {
+		sigc->fingerprint = xstrdup(strstr(line, "key ") + 4);
+		sigc->key = xstrdup(sigc->fingerprint);
+	} else {
+		/*
+		 * Output did not match what we expected
+		 * Treat the signature as bad
+		 */
+		sigc->result = 'B';
+	}
+
+cleanup:
+	free(to_free);
+}
+
+static int verify_ssh_signed_buffer(struct signature_check *sigc,
+				    struct gpg_format *fmt,
+				    const char *signature,
+				    size_t signature_size)
+{
+	struct child_process ssh_keygen = CHILD_PROCESS_INIT;
+	struct tempfile *buffer_file;
+	int ret = -1;
+	const char *line;
+	char *principal;
+	struct strbuf ssh_principals_out = STRBUF_INIT;
+	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"));
+		return -1;
+	}
+
+	buffer_file = mks_tempfile_t(".git_vtag_tmpXXXXXX");
+	if (!buffer_file)
+		return error_errno(_("could not create temporary file"));
+	if (write_in_full(buffer_file->fd, signature, signature_size) < 0 ||
+	    close_tempfile_gently(buffer_file) < 0) {
+		error_errno(_("failed writing detached signature to '%s'"),
+			    buffer_file->filename.buf);
+		delete_tempfile(&buffer_file);
+		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);
+	if (ret && strstr(ssh_principals_err.buf, "usage:")) {
+		error(_("ssh-keygen -Y find-principals/verify is needed for ssh signature verification (available in openssh version 8.2p1+)"));
+		goto out;
+	}
+	if (ret || !ssh_principals_out.len) {
+		/*
+		 * We did not find a matching principal in the allowedSigners
+		 * Check without validation
+		 */
+		child_process_init(&ssh_keygen);
+		strvec_pushl(&ssh_keygen.args, fmt->program,
+			     "-Y", "check-novalidate",
+			     "-n", "git",
+			     "-s", buffer_file->filename.buf,
+			     verify_time.buf,
+			     NULL);
+		pipe_command(&ssh_keygen, sigc->payload, sigc->payload_len,
+				   &ssh_keygen_out, 0, &ssh_keygen_err, 0);
+
+		/*
+		 * Fail on unknown keys
+		 * we still call check-novalidate to display the signature info
+		 */
+		ret = -1;
+	} else {
+		/* Check every principal we found (one per line) */
+		const char *next;
+		for (line = ssh_principals_out.buf;
+		     *line;
+		     line = next) {
+			const char *end_of_text;
+
+			next = end_of_text = strchrnul(line, '\n');
+
+			 /* Did we find a LF, and did we have CR before it? */
+			if (*end_of_text &&
+			    line < end_of_text &&
+			    end_of_text[-1] == '\r')
+				end_of_text--;
+
+			/* Unless we hit NUL, skip over the LF we found */
+			if (*next)
+				next++;
+
+			/* Not all lines are data.  Skip empty ones */
+			if (line == end_of_text)
+				continue;
+
+			/* We now know we have an non-empty line. Process it */
+			principal = xmemdupz(line, end_of_text - line);
+
+			child_process_init(&ssh_keygen);
+			strbuf_release(&ssh_keygen_out);
+			strbuf_release(&ssh_keygen_err);
+			strvec_push(&ssh_keygen.args, fmt->program);
+			/*
+			 * We found principals
+			 * Try with each until we find a match
+			 */
+			strvec_pushl(&ssh_keygen.args, "-Y", "verify",
+				     "-n", "git",
+				     "-f", ssh_allowed_signers,
+				     "-I", principal,
+				     "-s", buffer_file->filename.buf,
+				     verify_time.buf,
+				     NULL);
+
+			if (ssh_revocation_file) {
+				if (file_exists(ssh_revocation_file)) {
+					strvec_pushl(&ssh_keygen.args, "-r",
+						     ssh_revocation_file, NULL);
+				} else {
+					warning(_("ssh signing revocation file configured but not found: %s"),
+						ssh_revocation_file);
+				}
+			}
+
+			sigchain_push(SIGPIPE, SIG_IGN);
+			ret = pipe_command(&ssh_keygen, sigc->payload, sigc->payload_len,
+					   &ssh_keygen_out, 0, &ssh_keygen_err, 0);
+			sigchain_pop(SIGPIPE);
+
+			FREE_AND_NULL(principal);
+
+			if (!ret)
+				ret = !starts_with(ssh_keygen_out.buf, "Good");
+
+			if (!ret)
+				break;
+		}
+	}
+
+	strbuf_stripspace(&ssh_keygen_out, 0);
+	strbuf_stripspace(&ssh_keygen_err, 0);
+	/* Add stderr outputs to show the user actual ssh-keygen errors */
+	strbuf_add(&ssh_keygen_out, ssh_principals_err.buf, ssh_principals_err.len);
+	strbuf_add(&ssh_keygen_out, ssh_keygen_err.buf, ssh_keygen_err.len);
+	sigc->output = strbuf_detach(&ssh_keygen_out, NULL);
+	sigc->gpg_status = xstrdup(sigc->output);
+
+	parse_ssh_output(sigc);
+
+out:
+	if (buffer_file)
+		delete_tempfile(&buffer_file);
+	strbuf_release(&ssh_principals_out);
+	strbuf_release(&ssh_principals_err);
+	strbuf_release(&ssh_keygen_out);
+	strbuf_release(&ssh_keygen_err);
+	strbuf_release(&verify_time);
+
+	return ret;
+}
+
+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;
 
 	sigc->result = 'N';
 	sigc->trust_level = -1;
 
-	status = verify_signed_buffer(payload, plen, signature, slen,
-				      &gpg_output, &gpg_status);
-	if (status && !gpg_output.len)
-		goto out;
-	sigc->payload = xmemdupz(payload, plen);
-	sigc->gpg_output = strbuf_detach(&gpg_output, NULL);
-	sigc->gpg_status = strbuf_detach(&gpg_status, NULL);
-	parse_gpg_output(sigc);
+	fmt = get_format_by_sig(signature);
+	if (!fmt)
+		die(_("bad/incompatible signature '%s'"), signature);
+
+	if (parse_payload_metadata(sigc))
+		return 1;
+
+	status = fmt->verify_signed_buffer(sigc, fmt, signature, slen);
+
+	if (status && !sigc->output)
+		return !!status;
+
 	status |= sigc->result != 'G';
 	status |= sigc->trust_level < configured_min_trust_level;
 
- out:
-	strbuf_release(&gpg_status);
-	strbuf_release(&gpg_output);
-
 	return !!status;
 }
 
 void print_signature_buffer(const struct signature_check *sigc, unsigned flags)
 {
-	const char *output = flags & GPG_VERIFY_RAW ?
-		sigc->gpg_status : sigc->gpg_output;
+	const char *output = flags & GPG_VERIFY_RAW ? sigc->gpg_status :
+							    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);
@@ -419,12 +736,33 @@ int git_gpg_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
+	if (!strcmp(var, "gpg.ssh.defaultkeycommand")) {
+		if (!value)
+			return config_error_nonbool(var);
+		return git_config_string(&ssh_default_key_command, var, value);
+	}
+
+	if (!strcmp(var, "gpg.ssh.allowedsignersfile")) {
+		if (!value)
+			return config_error_nonbool(var);
+		return git_config_pathname(&ssh_allowed_signers, var, value);
+	}
+
+	if (!strcmp(var, "gpg.ssh.revocationfile")) {
+		if (!value)
+			return config_error_nonbool(var);
+		return git_config_pathname(&ssh_revocation_file, var, value);
+	}
+
 	if (!strcmp(var, "gpg.program") || !strcmp(var, "gpg.openpgp.program"))
 		fmtname = "openpgp";
 
 	if (!strcmp(var, "gpg.x509.program"))
 		fmtname = "x509";
 
+	if (!strcmp(var, "gpg.ssh.program"))
+		fmtname = "ssh";
+
 	if (fmtname) {
 		fmt = get_format_by_name(fmtname);
 		return git_config_string(&fmt->program, var, value);
@@ -433,18 +771,169 @@ 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;
+	int ret = -1;
+	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 (is_literal_ssh_key(signing_key, &literal_key)) {
+		strvec_pushl(&ssh_keygen.args, "ssh-keygen", "-lf", "-", NULL);
+		ret = pipe_command(&ssh_keygen, literal_key,
+				   strlen(literal_key), &fingerprint_stdout, 0,
+				   NULL, 0);
+	} else {
+		strvec_pushl(&ssh_keygen.args, "ssh-keygen", "-lf",
+			     configured_signing_key, NULL);
+		ret = pipe_command(&ssh_keygen, NULL, 0, &fingerprint_stdout, 0,
+				   NULL, 0);
+	}
+
+	if (!!ret)
+		die_errno(_("failed to get the ssh fingerprint for key '%s'"),
+			  signing_key);
+
+	fingerprint = strbuf_split_max(&fingerprint_stdout, ' ', 3);
+	if (!fingerprint[1])
+		die_errno(_("failed to get the ssh fingerprint for key '%s'"),
+			  signing_key);
+
+	fingerprint_ret = strbuf_detach(fingerprint[1], NULL);
+	strbuf_list_free(fingerprint);
+	strbuf_release(&fingerprint_stdout);
+	return fingerprint_ret;
+}
+
+/* Returns the first public key from an ssh-agent to use for signing */
+static const char *get_default_ssh_signing_key(void)
+{
+	struct child_process ssh_default_key = CHILD_PROCESS_INIT;
+	int ret = -1;
+	struct strbuf key_stdout = STRBUF_INIT, key_stderr = STRBUF_INIT;
+	struct strbuf **keys;
+	char *key_command = NULL;
+	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"));
+
+	key_command = xstrdup(ssh_default_key_command);
+	n = split_cmdline(key_command, &argv);
+
+	if (n < 0)
+		die("malformed build-time gpg.ssh.defaultKeyCommand: %s",
+		    split_cmdline_strerror(n));
+
+	strvec_pushv(&ssh_default_key.args, argv);
+	ret = pipe_command(&ssh_default_key, NULL, 0, &key_stdout, 0,
+			   &key_stderr, 0);
+
+	if (!ret) {
+		keys = strbuf_split_max(&key_stdout, '\n', 2);
+		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"),
+				key_stderr.buf, key_stdout.buf);
+		}
+
+		strbuf_list_free(keys);
+	} else {
+		warning(_("gpg.ssh.defaultKeyCommand failed: %s %s"),
+			key_stderr.buf, key_stdout.buf);
+	}
+
+	free(key_command);
+	free(argv);
+	strbuf_release(&key_stdout);
+
+	return default_key;
+}
+
+static const char *get_ssh_key_id(void) {
+	return get_ssh_key_fingerprint(get_signing_key());
+}
+
+/* Returns a textual but unique representation of the signing key */
+const char *get_signing_key_id(void)
+{
+	if (use_format->get_key_id) {
+		return use_format->get_key_id();
+	}
+
+	/* GPG/GPGSM only store a key id on this variable */
+	return get_signing_key();
+}
+
 const char *get_signing_key(void)
 {
 	if (configured_signing_key)
 		return configured_signing_key;
-	return git_committer_info(IDENT_STRICT|IDENT_NO_DATE);
+	if (use_format->get_default_key) {
+		return use_format->get_default_key();
+	}
+
+	return git_committer_info(IDENT_STRICT | IDENT_NO_DATE);
 }
 
 int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key)
 {
+	return use_format->sign_buffer(buffer, signature, signing_key);
+}
+
+/*
+ * Strip CR from the line endings, in case we are on Windows.
+ * NEEDSWORK: make it trim only CRs before LFs and rename
+ */
+static void remove_cr_after(struct strbuf *buffer, size_t offset)
+{
+	size_t i, j;
+
+	for (i = j = offset; i < buffer->len; i++) {
+		if (buffer->buf[i] != '\r') {
+			if (i != j)
+				buffer->buf[j] = buffer->buf[i];
+			j++;
+		}
+	}
+	strbuf_setlen(buffer, j);
+}
+
+static int sign_buffer_gpg(struct strbuf *buffer, struct strbuf *signature,
+			  const char *signing_key)
+{
 	struct child_process gpg = CHILD_PROCESS_INIT;
 	int ret;
-	size_t i, j, bottom;
+	size_t bottom;
 	struct strbuf gpg_status = STRBUF_INIT;
 
 	strvec_pushl(&gpg.args,
@@ -470,13 +959,99 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *sig
 		return error(_("gpg failed to sign the data"));
 
 	/* Strip CR from the line endings, in case we are on Windows. */
-	for (i = j = bottom; i < signature->len; i++)
-		if (signature->buf[i] != '\r') {
-			if (i != j)
-				signature->buf[j] = signature->buf[i];
-			j++;
-		}
-	strbuf_setlen(signature, j);
+	remove_cr_after(signature, bottom);
 
 	return 0;
 }
+
+static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
+			   const char *signing_key)
+{
+	struct child_process signer = CHILD_PROCESS_INIT;
+	int ret = -1;
+	size_t bottom, keylen;
+	struct strbuf signer_stderr = STRBUF_INIT;
+	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 (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(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);
+			goto out;
+		}
+		ssh_signing_key_file = strbuf_detach(&key_file->filename, NULL);
+	} else {
+		/* We assume a file */
+		ssh_signing_key_file = expand_user_path(signing_key, 1);
+	}
+
+	buffer_file = mks_tempfile_t(".git_signing_buffer_tmpXXXXXX");
+	if (!buffer_file) {
+		error_errno(_("could not create temporary file"));
+		goto out;
+	}
+
+	if (write_in_full(buffer_file->fd, buffer->buf, buffer->len) < 0 ||
+	    close_tempfile_gently(buffer_file) < 0) {
+		error_errno(_("failed writing ssh signing key buffer to '%s'"),
+			    buffer_file->filename.buf);
+		goto out;
+	}
+
+	strvec_pushl(&signer.args, use_format->program,
+		     "-Y", "sign",
+		     "-n", "git",
+		     "-f", ssh_signing_key_file,
+		     buffer_file->filename.buf,
+		     NULL);
+
+	sigchain_push(SIGPIPE, SIG_IGN);
+	ret = pipe_command(&signer, NULL, 0, NULL, 0, &signer_stderr, 0);
+	sigchain_pop(SIGPIPE);
+
+	if (ret) {
+		if (strstr(signer_stderr.buf, "usage:"))
+			error(_("ssh-keygen -Y sign is needed for ssh signing (available in openssh version 8.2p1+)"));
+
+		error("%s", signer_stderr.buf);
+		goto out;
+	}
+
+	bottom = signature->len;
+
+	strbuf_addbuf(&ssh_signature_filename, &buffer_file->filename);
+	strbuf_addstr(&ssh_signature_filename, ".sig");
+	if (strbuf_read_file(signature, ssh_signature_filename.buf, 0) < 0) {
+		error_errno(
+			_("failed reading ssh signing data buffer from '%s'"),
+			ssh_signature_filename.buf);
+	}
+	unlink_or_warn(ssh_signature_filename.buf);
+
+	/* Strip CR from the line endings, in case we are on Windows. */
+	remove_cr_after(signature, bottom);
+
+out:
+	if (key_file)
+		delete_tempfile(&key_file);
+	if (buffer_file)
+		delete_tempfile(&buffer_file);
+	strbuf_release(&signer_stderr);
+	strbuf_release(&ssh_signature_filename);
+	FREE_AND_NULL(ssh_signing_key_file);
+	return ret;
+}
diff --git a/gpg-interface.h b/gpg-interface.h
index 80567e4894..b30cbdcd3d 100644
--- a/gpg-interface.h
+++ b/gpg-interface.h
@@ -15,9 +15,19 @@ 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;
-	char *gpg_output;
+	size_t payload_len;
+	enum payload_type payload_type;
+	timestamp_t payload_timestamp;
+	char *output;
 	char *gpg_status;
 
 	/*
@@ -64,9 +74,14 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature,
 int git_gpg_config(const char *, const char *, void *);
 void set_signing_key(const char *);
 const char *get_signing_key(void);
-int check_signature(const char *payload, size_t plen,
-		    const char *signature, size_t slen,
-		    struct signature_check *sigc);
+
+/*
+ * Returns a textual unique representation of the signing key in use
+ * Either a GPG KeyID or a SSH Key Fingerprint
+ */
+const char *get_signing_key_id(void);
+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/graph.c b/graph.c
index e3828eb8f2..568b6e7cd4 100644
--- a/graph.c
+++ b/graph.c
@@ -401,6 +401,18 @@ struct git_graph *graph_init(struct rev_info *opt)
 	return graph;
 }
 
+void graph_clear(struct git_graph *graph)
+{
+	if (!graph)
+		return;
+
+	free(graph->columns);
+	free(graph->new_columns);
+	free(graph->mapping);
+	free(graph->old_mapping);
+	free(graph);
+}
+
 static void graph_update_state(struct git_graph *graph, enum graph_state s)
 {
 	graph->prev_state = graph->state;
diff --git a/graph.h b/graph.h
index 8313e293c7..e88632a014 100644
--- a/graph.h
+++ b/graph.h
@@ -140,6 +140,11 @@ void graph_set_column_colors(const char **colors, unsigned short colors_max);
 struct git_graph *graph_init(struct rev_info *opt);
 
 /*
+ * Free a struct git_graph.
+ */
+void graph_clear(struct git_graph *graph);
+
+/*
  * Update a git_graph with a new commit.
  * This will cause the graph to begin outputting lines for the new commit
  * the next time graph_next_line() is called.
diff --git a/grep.c b/grep.c
index 424a39591b..5bec7fd793 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
@@ -595,6 +595,35 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
 	}
 }
 
+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_binexp(enum grep_expr_node kind,
+				     struct grep_expr *left,
+				     struct grep_expr *right)
+{
+	struct grep_expr *z = xcalloc(1, sizeof(*z));
+	z->node = kind;
+	z->u.binary.left = left;
+	z->u.binary.right = right;
+	return z;
+}
+
+static struct grep_expr *grep_or_expr(struct grep_expr *left, struct grep_expr *right)
+{
+	return grep_binexp(GREP_NODE_OR, left, right);
+}
+
+static struct grep_expr *grep_and_expr(struct grep_expr *left, struct grep_expr *right)
+{
+	return grep_binexp(GREP_NODE_AND, left, right);
+}
+
 static struct grep_expr *compile_pattern_or(struct grep_pat **);
 static struct grep_expr *compile_pattern_atom(struct grep_pat **list)
 {
@@ -638,12 +667,10 @@ static struct grep_expr *compile_pattern_not(struct grep_pat **list)
 		if (!p->next)
 			die("--not not followed by pattern expression");
 		*list = p->next;
-		CALLOC_ARRAY(x, 1);
-		x->node = GREP_NODE_NOT;
-		x->u.unary = compile_pattern_not(list);
-		if (!x->u.unary)
+		x = compile_pattern_not(list);
+		if (!x)
 			die("--not followed by non pattern expression");
-		return x;
+		return grep_not_expr(x);
 	default:
 		return compile_pattern_atom(list);
 	}
@@ -652,7 +679,7 @@ static struct grep_expr *compile_pattern_not(struct grep_pat **list)
 static struct grep_expr *compile_pattern_and(struct grep_pat **list)
 {
 	struct grep_pat *p;
-	struct grep_expr *x, *y, *z;
+	struct grep_expr *x, *y;
 
 	x = compile_pattern_not(list);
 	p = *list;
@@ -665,11 +692,7 @@ static struct grep_expr *compile_pattern_and(struct grep_pat **list)
 		y = compile_pattern_and(list);
 		if (!y)
 			die("--and not followed by pattern expression");
-		CALLOC_ARRAY(z, 1);
-		z->node = GREP_NODE_AND;
-		z->u.binary.left = x;
-		z->u.binary.right = y;
-		return z;
+		return grep_and_expr(x, y);
 	}
 	return x;
 }
@@ -677,7 +700,7 @@ static struct grep_expr *compile_pattern_and(struct grep_pat **list)
 static struct grep_expr *compile_pattern_or(struct grep_pat **list)
 {
 	struct grep_pat *p;
-	struct grep_expr *x, *y, *z;
+	struct grep_expr *x, *y;
 
 	x = compile_pattern_and(list);
 	p = *list;
@@ -685,11 +708,7 @@ static struct grep_expr *compile_pattern_or(struct grep_pat **list)
 		y = compile_pattern_or(list);
 		if (!y)
 			die("not a pattern expression %s", p->pattern);
-		CALLOC_ARRAY(z, 1);
-		z->node = GREP_NODE_OR;
-		z->u.binary.left = x;
-		z->u.binary.right = y;
-		return z;
+		return grep_or_expr(x, y);
 	}
 	return x;
 }
@@ -706,15 +725,6 @@ static struct grep_expr *grep_true_expr(void)
 	return z;
 }
 
-static struct grep_expr *grep_or_expr(struct grep_expr *left, struct grep_expr *right)
-{
-	struct grep_expr *z = xcalloc(1, sizeof(*z));
-	z->node = GREP_NODE_OR;
-	z->u.binary.left = left;
-	z->u.binary.right = right;
-	return z;
-}
-
 static struct grep_expr *prep_header_patterns(struct grep_opt *opt)
 {
 	struct grep_pat *p;
@@ -797,7 +807,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 +818,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;
 
@@ -867,7 +880,7 @@ void free_grep_patterns(struct grep_opt *opt)
 	free_pattern_expr(opt->pattern_expression);
 }
 
-static char *end_of_line(char *cp, unsigned long *left)
+static const char *end_of_line(const char *cp, unsigned long *left)
 {
 	unsigned long l = *left;
 	while (l && *cp != '\n') {
@@ -908,7 +921,8 @@ static void show_name(struct grep_opt *opt, const char *name)
 	opt->output(opt, opt->null_following_name ? "\0" : "\n", 1);
 }
 
-static int patmatch(struct grep_pat *p, char *line, char *eol,
+static int patmatch(struct grep_pat *p,
+		    const char *line, const char *eol,
 		    regmatch_t *match, int eflags)
 {
 	int hit;
@@ -922,20 +936,16 @@ static int patmatch(struct grep_pat *p, char *line, char *eol,
 	return hit;
 }
 
-static int strip_timestamp(char *bol, char **eol_p)
+static void strip_timestamp(const char *bol, const char **eol_p)
 {
-	char *eol = *eol_p;
-	int ch;
+	const char *eol = *eol_p;
 
 	while (bol < --eol) {
 		if (*eol != '>')
 			continue;
 		*eol_p = ++eol;
-		ch = *eol;
-		*eol = '\0';
-		return ch;
+		break;
 	}
-	return 0;
 }
 
 static struct {
@@ -947,37 +957,18 @@ static struct {
 	{ "reflog ", 7 },
 };
 
-static int match_one_pattern(struct grep_pat *p, char *bol, char *eol,
-			     enum grep_context ctx,
-			     regmatch_t *pmatch, int eflags)
+static int headerless_match_one_pattern(struct grep_pat *p,
+					const char *bol, const char *eol,
+					enum grep_context ctx,
+					regmatch_t *pmatch, int eflags)
 {
 	int hit = 0;
-	int saved_ch = 0;
 	const char *start = bol;
 
 	if ((p->token != GREP_PATTERN) &&
 	    ((p->token == GREP_PATTERN_HEAD) != (ctx == GREP_CONTEXT_HEAD)))
 		return 0;
 
-	if (p->token == GREP_PATTERN_HEAD) {
-		const char *field;
-		size_t len;
-		assert(p->field < ARRAY_SIZE(header_field));
-		field = header_field[p->field].field;
-		len = header_field[p->field].len;
-		if (strncmp(bol, field, len))
-			return 0;
-		bol += len;
-		switch (p->field) {
-		case GREP_HEADER_AUTHOR:
-		case GREP_HEADER_COMMITTER:
-			saved_ch = strip_timestamp(bol, &eol);
-			break;
-		default:
-			break;
-		}
-	}
-
  again:
 	hit = patmatch(p, bol, eol, pmatch, eflags);
 
@@ -1021,8 +1012,6 @@ static int match_one_pattern(struct grep_pat *p, char *bol, char *eol,
 				goto again;
 		}
 	}
-	if (p->token == GREP_PATTERN_HEAD && saved_ch)
-		*eol = saved_ch;
 	if (hit) {
 		pmatch[0].rm_so += bol - start;
 		pmatch[0].rm_eo += bol - start;
@@ -1030,8 +1019,39 @@ static int match_one_pattern(struct grep_pat *p, char *bol, char *eol,
 	return hit;
 }
 
-static int match_expr_eval(struct grep_opt *opt, struct grep_expr *x, char *bol,
-			   char *eol, enum grep_context ctx, ssize_t *col,
+static int match_one_pattern(struct grep_pat *p,
+			     const char *bol, const char *eol,
+			     enum grep_context ctx, regmatch_t *pmatch,
+			     int eflags)
+{
+	const char *field;
+	size_t len;
+
+	if (p->token == GREP_PATTERN_HEAD) {
+		assert(p->field < ARRAY_SIZE(header_field));
+		field = header_field[p->field].field;
+		len = header_field[p->field].len;
+		if (strncmp(bol, field, len))
+			return 0;
+		bol += len;
+
+		switch (p->field) {
+		case GREP_HEADER_AUTHOR:
+		case GREP_HEADER_COMMITTER:
+			strip_timestamp(bol, &eol);
+			break;
+		default:
+			break;
+		}
+	}
+
+	return headerless_match_one_pattern(p, bol, eol, ctx, pmatch, eflags);
+}
+
+
+static int match_expr_eval(struct grep_opt *opt, struct grep_expr *x,
+			   const char *bol, const char *eol,
+			   enum grep_context ctx, ssize_t *col,
 			   ssize_t *icol, int collect_hits)
 {
 	int h = 0;
@@ -1050,6 +1070,8 @@ static int match_expr_eval(struct grep_opt *opt, struct grep_expr *x, char *bol,
 			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:
 		/*
@@ -1098,7 +1120,8 @@ static int match_expr_eval(struct grep_opt *opt, struct grep_expr *x, char *bol,
 	return h;
 }
 
-static int match_expr(struct grep_opt *opt, char *bol, char *eol,
+static int match_expr(struct grep_opt *opt,
+		      const char *bol, const char *eol,
 		      enum grep_context ctx, ssize_t *col,
 		      ssize_t *icol, int collect_hits)
 {
@@ -1106,7 +1129,8 @@ static int match_expr(struct grep_opt *opt, char *bol, char *eol,
 	return match_expr_eval(opt, x, bol, eol, ctx, col, icol, collect_hits);
 }
 
-static int match_line(struct grep_opt *opt, char *bol, char *eol,
+static int match_line(struct grep_opt *opt,
+		      const char *bol, const char *eol,
 		      ssize_t *col, ssize_t *icol,
 		      enum grep_context ctx, int collect_hits)
 {
@@ -1138,13 +1162,14 @@ static int match_line(struct grep_opt *opt, char *bol, char *eol,
 	return hit;
 }
 
-static int match_next_pattern(struct grep_pat *p, char *bol, char *eol,
+static int match_next_pattern(struct grep_pat *p,
+			      const char *bol, const char *eol,
 			      enum grep_context ctx,
 			      regmatch_t *pmatch, int eflags)
 {
 	regmatch_t match;
 
-	if (!match_one_pattern(p, bol, eol, ctx, &match, eflags))
+	if (!headerless_match_one_pattern(p, bol, eol, ctx, &match, eflags))
 		return 0;
 	if (match.rm_so < 0 || match.rm_eo < 0)
 		return 0;
@@ -1159,18 +1184,26 @@ static int match_next_pattern(struct grep_pat *p, char *bol, char *eol,
 	return 1;
 }
 
-static int next_match(struct grep_opt *opt, char *bol, char *eol,
-		      enum grep_context ctx, regmatch_t *pmatch, int eflags)
+int grep_next_match(struct grep_opt *opt,
+		    const char *bol, const char *eol,
+		    enum grep_context ctx, regmatch_t *pmatch,
+		    enum grep_header_field field, int eflags)
 {
 	struct grep_pat *p;
 	int hit = 0;
 
 	pmatch->rm_so = pmatch->rm_eo = -1;
 	if (bol < eol) {
-		for (p = opt->pattern_list; p; p = p->next) {
+		for (p = ((ctx == GREP_CONTEXT_HEAD)
+			   ? opt->header_list : opt->pattern_list);
+			  p; p = p->next) {
 			switch (p->token) {
-			case GREP_PATTERN: /* atom */
 			case GREP_PATTERN_HEAD:
+				if ((field != GREP_HEADER_FIELD_MAX) &&
+				    (p->field != field))
+					continue;
+				/* fall thru */
+			case GREP_PATTERN: /* atom */
 			case GREP_PATTERN_BODY:
 				hit |= match_next_pattern(p, bol, eol, ctx,
 							  pmatch, eflags);
@@ -1215,7 +1248,8 @@ static void show_line_header(struct grep_opt *opt, const char *name,
 	}
 }
 
-static void show_line(struct grep_opt *opt, char *bol, char *eol,
+static void show_line(struct grep_opt *opt,
+		      const char *bol, const char *eol,
 		      const char *name, unsigned lno, ssize_t cno, char sign)
 {
 	int rest = eol - bol;
@@ -1246,7 +1280,6 @@ static void show_line(struct grep_opt *opt, char *bol, char *eol,
 	if (opt->color || opt->only_matching) {
 		regmatch_t match;
 		enum grep_context ctx = GREP_CONTEXT_BODY;
-		int ch = *eol;
 		int eflags = 0;
 
 		if (opt->color) {
@@ -1261,8 +1294,8 @@ static void show_line(struct grep_opt *opt, char *bol, char *eol,
 			else if (sign == '=')
 				line_color = opt->colors[GREP_COLOR_FUNCTION];
 		}
-		*eol = '\0';
-		while (next_match(opt, bol, eol, ctx, &match, eflags)) {
+		while (grep_next_match(opt, bol, eol, ctx, &match,
+				       GREP_HEADER_FIELD_MAX, eflags)) {
 			if (match.rm_so == match.rm_eo)
 				break;
 
@@ -1279,7 +1312,6 @@ static void show_line(struct grep_opt *opt, char *bol, char *eol,
 			rest -= match.rm_eo;
 			eflags = REG_NOTBOL;
 		}
-		*eol = ch;
 	}
 	if (!opt->only_matching) {
 		output_color(opt, bol, rest, line_color);
@@ -1307,7 +1339,8 @@ static inline void grep_attr_unlock(void)
 		pthread_mutex_unlock(&grep_attr_mutex);
 }
 
-static int match_funcname(struct grep_opt *opt, struct grep_source *gs, char *bol, char *eol)
+static int match_funcname(struct grep_opt *opt, struct grep_source *gs,
+			  const char *bol, const char *eol)
 {
 	xdemitconf_t *xecfg = opt->priv;
 	if (xecfg && !xecfg->find_func) {
@@ -1334,10 +1367,10 @@ static int match_funcname(struct grep_opt *opt, struct grep_source *gs, char *bo
 }
 
 static void show_funcname_line(struct grep_opt *opt, struct grep_source *gs,
-			       char *bol, unsigned lno)
+			       const char *bol, unsigned lno)
 {
 	while (bol > gs->buf) {
-		char *eol = --bol;
+		const char *eol = --bol;
 
 		while (bol > gs->buf && bol[-1] != '\n')
 			bol--;
@@ -1356,7 +1389,7 @@ static void show_funcname_line(struct grep_opt *opt, struct grep_source *gs,
 static int is_empty_line(const char *bol, const char *eol);
 
 static void show_pre_context(struct grep_opt *opt, struct grep_source *gs,
-			     char *bol, char *end, unsigned lno)
+			     const char *bol, const char *end, unsigned lno)
 {
 	unsigned cur = lno, from = 1, funcname_lno = 0, orig_from;
 	int funcname_needed = !!opt->funcname, comment_needed = 0;
@@ -1376,8 +1409,8 @@ static void show_pre_context(struct grep_opt *opt, struct grep_source *gs,
 
 	/* Rewind. */
 	while (bol > gs->buf && cur > from) {
-		char *next_bol = bol;
-		char *eol = --bol;
+		const char *next_bol = bol;
+		const char *eol = --bol;
 
 		while (bol > gs->buf && bol[-1] != '\n')
 			bol--;
@@ -1408,7 +1441,7 @@ static void show_pre_context(struct grep_opt *opt, struct grep_source *gs,
 
 	/* Back forward. */
 	while (cur < lno) {
-		char *eol = bol, sign = (cur == funcname_lno) ? '=' : '-';
+		const char *eol = bol, sign = (cur == funcname_lno) ? '=' : '-';
 
 		while (*eol != '\n')
 			eol++;
@@ -1436,12 +1469,12 @@ static int should_lookahead(struct grep_opt *opt)
 static int look_ahead(struct grep_opt *opt,
 		      unsigned long *left_p,
 		      unsigned *lno_p,
-		      char **bol_p)
+		      const char **bol_p)
 {
 	unsigned lno = *lno_p;
-	char *bol = *bol_p;
+	const char *bol = *bol_p;
 	struct grep_pat *p;
-	char *sp, *last_bol;
+	const char *sp, *last_bol;
 	regoff_t earliest = -1;
 
 	for (p = opt->pattern_list; p; p = p->next) {
@@ -1543,8 +1576,8 @@ static int is_empty_line(const char *bol, const char *eol)
 
 static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int collect_hits)
 {
-	char *bol;
-	char *peek_bol = NULL;
+	const char *bol;
+	const char *peek_bol = NULL;
 	unsigned long left;
 	unsigned lno = 1;
 	unsigned last_hit = 0;
@@ -1626,7 +1659,7 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
 	bol = gs->buf;
 	left = gs->size;
 	while (left) {
-		char *eol, ch;
+		const char *eol;
 		int hit;
 		ssize_t cno;
 		ssize_t col = -1, icol = -1;
@@ -1647,14 +1680,11 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
 		    && look_ahead(opt, &left, &lno, &bol))
 			break;
 		eol = end_of_line(bol, &left);
-		ch = *eol;
-		*eol = 0;
 
 		if ((ctx == GREP_CONTEXT_HEAD) && (eol == bol))
 			ctx = GREP_CONTEXT_BODY;
 
 		hit = match_line(opt, bol, eol, &col, &icol, ctx, collect_hits);
-		*eol = ch;
 
 		if (collect_hits)
 			goto next_line;
@@ -1713,7 +1743,7 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
 		}
 		if (show_function && (!peek_bol || peek_bol < bol)) {
 			unsigned long peek_left = left;
-			char *peek_eol = eol;
+			const char *peek_eol = eol;
 
 			/*
 			 * Trailing empty lines are not interesting.
@@ -1810,29 +1840,43 @@ 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);
 }
 
-int grep_buffer(struct grep_opt *opt, char *buf, unsigned long size)
+static void grep_source_init_buf(struct grep_source *gs,
+				 const char *buf,
+				 unsigned long size)
+{
+	gs->type = GREP_SOURCE_BUF;
+	gs->name = NULL;
+	gs->path = NULL;
+	gs->buf = buf;
+	gs->size = size;
+	gs->driver = NULL;
+	gs->identifier = NULL;
+}
+
+int grep_buffer(struct grep_opt *opt, const char *buf, unsigned long size)
 {
 	struct grep_source gs;
 	int r;
 
-	grep_source_init(&gs, GREP_SOURCE_BUF, NULL, NULL, NULL);
-	gs.buf = buf;
-	gs.size = size;
+	grep_source_init_buf(&gs, buf, size);
 
 	r = grep_source(opt, &gs);
 
@@ -1840,28 +1884,30 @@ int grep_buffer(struct grep_opt *opt, char *buf, unsigned long size)
 	return r;
 }
 
-void grep_source_init(struct grep_source *gs, enum grep_source_type type,
-		      const char *name, const char *path,
-		      const void *identifier)
+void grep_source_init_file(struct grep_source *gs, const char *name,
+			   const char *path)
 {
-	gs->type = type;
+	gs->type = GREP_SOURCE_FILE;
 	gs->name = xstrdup_or_null(name);
 	gs->path = xstrdup_or_null(path);
 	gs->buf = NULL;
 	gs->size = 0;
 	gs->driver = NULL;
+	gs->identifier = xstrdup(path);
+}
 
-	switch (type) {
-	case GREP_SOURCE_FILE:
-		gs->identifier = xstrdup(identifier);
-		break;
-	case GREP_SOURCE_OID:
-		gs->identifier = oiddup(identifier);
-		break;
-	case GREP_SOURCE_BUF:
-		gs->identifier = NULL;
-		break;
-	}
+void grep_source_init_oid(struct grep_source *gs, const char *name,
+			  const char *path, const struct object_id *oid,
+			  struct repository *repo)
+{
+	gs->type = GREP_SOURCE_OID;
+	gs->name = xstrdup_or_null(name);
+	gs->path = xstrdup_or_null(path);
+	gs->buf = NULL;
+	gs->size = 0;
+	gs->driver = NULL;
+	gs->identifier = oiddup(oid);
+	gs->repo = repo;
 }
 
 void grep_source_clear(struct grep_source *gs)
@@ -1877,7 +1923,9 @@ void grep_source_clear_data(struct grep_source *gs)
 	switch (gs->type) {
 	case GREP_SOURCE_FILE:
 	case GREP_SOURCE_OID:
-		FREE_AND_NULL(gs->buf);
+		/* these types own the buffer */
+		free((char *)gs->buf);
+		gs->buf = NULL;
 		gs->size = 0;
 		break;
 	case GREP_SOURCE_BUF:
@@ -1890,7 +1938,8 @@ static int grep_source_load_oid(struct grep_source *gs)
 {
 	enum object_type type;
 
-	gs->buf = read_object_file(gs->identifier, &type, &gs->size);
+	gs->buf = repo_read_object_file(gs->repo, gs->identifier, &type,
+					&gs->size);
 	if (!gs->buf)
 		return error(_("'%s': unable to read %s"),
 			     gs->name,
diff --git a/grep.h b/grep.h
index 72f82b1e30..6a1f0ab017 100644
--- a/grep.h
+++ b/grep.h
@@ -120,7 +120,20 @@ struct grep_opt {
 	struct grep_pat *header_list;
 	struct grep_pat **header_tail;
 	struct grep_expr *pattern_expression;
+
+	/*
+	 * NEEDSWORK: See if we can remove this field, because the repository
+	 * should probably be per-source. That is, grep.c functions using this
+	 * field should probably start using "repo" in "struct grep_source"
+	 * instead.
+	 *
+	 * This is potentially the cause of at least one bug - "git grep"
+	 * using the textconv attributes from the superproject on the
+	 * submodules. See the failing "git grep --textconv" tests in
+	 * t7814-grep-recurse-submodules.sh for more information.
+	 */
 	struct repository *repo;
+
 	const char *prefix;
 	int prefix_length;
 	regex_t regexp;
@@ -135,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
@@ -176,7 +191,16 @@ void append_grep_pattern(struct grep_opt *opt, const char *pat, const char *orig
 void append_header_grep_pattern(struct grep_opt *, enum grep_header_field, const char *);
 void compile_grep_patterns(struct grep_opt *opt);
 void free_grep_patterns(struct grep_opt *opt);
-int grep_buffer(struct grep_opt *opt, char *buf, unsigned long size);
+int grep_buffer(struct grep_opt *opt, const char *buf, unsigned long size);
+
+/* The field parameter is only used to filter header patterns
+ * (where appropriate). If filtering isn't desirable
+ * GREP_HEADER_FIELD_MAX should be supplied.
+ */
+int grep_next_match(struct grep_opt *opt,
+		    const char *bol, const char *eol,
+		    enum grep_context ctx, regmatch_t *pmatch,
+		    enum grep_header_field field, int eflags);
 
 struct grep_source {
 	char *name;
@@ -187,17 +211,20 @@ struct grep_source {
 		GREP_SOURCE_BUF,
 	} type;
 	void *identifier;
+	struct repository *repo; /* if GREP_SOURCE_OID */
 
-	char *buf;
+	const char *buf;
 	unsigned long size;
 
 	char *path; /* for attribute lookups */
 	struct userdiff_driver *driver;
 };
 
-void grep_source_init(struct grep_source *gs, enum grep_source_type type,
-		      const char *name, const char *path,
-		      const void *identifier);
+void grep_source_init_file(struct grep_source *gs, const char *name,
+			   const char *path);
+void grep_source_init_oid(struct grep_source *gs, const char *name,
+			  const char *path, const struct object_id *oid,
+			  struct repository *repo);
 void grep_source_clear_data(struct grep_source *gs);
 void grep_source_clear(struct grep_source *gs);
 void grep_source_load_driver(struct grep_source *gs,
@@ -207,7 +234,6 @@ void grep_source_load_driver(struct grep_source *gs,
 int grep_source(struct grep_opt *opt, struct grep_source *gs);
 
 struct grep_opt *grep_opt_dup(const struct grep_opt *opt);
-int grep_threads_ok(const struct grep_opt *opt);
 
 /*
  * Mutex used around access to the attributes machinery if
diff --git a/hash.h b/hash.h
index 9c6df4d952..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)
@@ -115,7 +121,7 @@ static inline void git_SHA256_Clone(git_SHA256_CTX *dst, const git_SHA256_CTX *s
 
 struct object_id {
 	unsigned char hash[GIT_MAX_RAWSZ];
-	int algo;
+	int algo;	/* XXX requires 4-byte alignment */
 };
 
 /* A suitably aligned type for stack allocations of hash contexts. */
@@ -265,7 +271,7 @@ static inline void oidcpy(struct object_id *dst, const struct object_id *src)
 
 /* Like oidcpy() but zero-pads the unused bytes in dst's hash array. */
 static inline void oidcpy_with_padding(struct object_id *dst,
-				       struct object_id *src)
+				       const struct object_id *src)
 {
 	size_t hashsz;
 
diff --git a/help.c b/help.c
index 3c3bdec213..71444906dd 100644
--- a/help.c
+++ b/help.c
@@ -11,6 +11,7 @@
 #include "version.h"
 #include "refs.h"
 #include "parse-options.h"
+#include "prompt.h"
 
 struct category_description {
 	uint32_t category;
@@ -292,9 +293,21 @@ void load_command_list(const char *prefix,
 	exclude_cmds(other_cmds, main_cmds);
 }
 
-void list_commands(unsigned int colopts,
-		   struct cmdnames *main_cmds, struct cmdnames *other_cmds)
+static int get_colopts(const char *var, const char *value, void *data)
 {
+	unsigned int *colopts = data;
+
+	if (starts_with(var, "column."))
+		return git_column_config(var, value, "help", colopts);
+
+	return 0;
+}
+
+void list_commands(struct cmdnames *main_cmds, struct cmdnames *other_cmds)
+{
+	unsigned int colopts = 0;
+	git_config(get_colopts, &colopts);
+
 	if (main_cmds->cnt) {
 		const char *exec_path = git_exec_path();
 		printf_ln(_("available git commands in '%s'"), exec_path);
@@ -472,6 +485,7 @@ int is_in_cmdlist(struct cmdnames *c, const char *s)
 static int autocorrect;
 static struct cmdnames aliases;
 
+#define AUTOCORRECT_PROMPT (-3)
 #define AUTOCORRECT_NEVER (-2)
 #define AUTOCORRECT_IMMEDIATELY (-1)
 
@@ -486,6 +500,8 @@ static int git_unknown_cmd_config(const char *var, const char *value, void *cb)
 			autocorrect = AUTOCORRECT_NEVER;
 		} else if (!strcmp(value, "immediate")) {
 			autocorrect = AUTOCORRECT_IMMEDIATELY;
+		} else if (!strcmp(value, "prompt")) {
+			autocorrect = AUTOCORRECT_PROMPT;
 		} else {
 			int v = git_config_int(var, value);
 			autocorrect = (v < 0)
@@ -539,6 +555,12 @@ const char *help_unknown_cmd(const char *cmd)
 
 	read_early_config(git_unknown_cmd_config, NULL);
 
+	/*
+	 * Disable autocorrection prompt in a non-interactive session
+	 */
+	if ((autocorrect == AUTOCORRECT_PROMPT) && (!isatty(0) || !isatty(2)))
+		autocorrect = AUTOCORRECT_NEVER;
+
 	if (autocorrect == AUTOCORRECT_NEVER) {
 		fprintf_ln(stderr, _("git: '%s' is not a git command. See 'git --help'."), cmd);
 		exit(1);
@@ -618,7 +640,16 @@ const char *help_unknown_cmd(const char *cmd)
 				   _("Continuing under the assumption that "
 				     "you meant '%s'."),
 				   assumed);
-		else {
+		else if (autocorrect == AUTOCORRECT_PROMPT) {
+			char *answer;
+			struct strbuf msg = STRBUF_INIT;
+			strbuf_addf(&msg, _("Run '%s' instead [y/N]? "), assumed);
+			answer = git_prompt(msg.buf, PROMPT_ECHO);
+			strbuf_release(&msg);
+			if (!(starts_with(answer, "y") ||
+			      starts_with(answer, "Y")))
+				exit(1);
+		} else {
 			fprintf_ln(stderr,
 				   _("Continuing in %0.1f seconds, "
 				     "assuming that you meant '%s'."),
diff --git a/help.h b/help.h
index 5871e93ba2..9d383f1a0b 100644
--- a/help.h
+++ b/help.h
@@ -37,7 +37,7 @@ void add_cmdname(struct cmdnames *cmds, const char *name, int len);
 /* Here we require that excludes is a sorted list. */
 void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes);
 int is_in_cmdlist(struct cmdnames *cmds, const char *name);
-void list_commands(unsigned int colopts, struct cmdnames *main_cmds, struct cmdnames *other_cmds);
+void list_commands(struct cmdnames *main_cmds, struct cmdnames *other_cmds);
 void get_version_info(struct strbuf *buf, int show_build_options);
 
 /*
diff --git a/hook.c b/hook.c
new file mode 100644
index 0000000000..69a215b2c3
--- /dev/null
+++ b/hook.c
@@ -0,0 +1,173 @@
+#include "cache.h"
+#include "hook.h"
+#include "run-command.h"
+#include "config.h"
+
+const char *find_hook(const char *name)
+{
+	static struct strbuf path = STRBUF_INIT;
+
+	strbuf_reset(&path);
+	strbuf_git_path(&path, "hooks/%s", name);
+	if (access(path.buf, X_OK) < 0) {
+		int err = errno;
+
+#ifdef STRIP_EXTENSION
+		strbuf_addstr(&path, STRIP_EXTENSION);
+		if (access(path.buf, X_OK) >= 0)
+			return path.buf;
+		if (errno == EACCES)
+			err = errno;
+#endif
+
+		if (err == EACCES && advice_enabled(ADVICE_IGNORED_HOOK)) {
+			static struct string_list advise_given = STRING_LIST_INIT_DUP;
+
+			if (!string_list_lookup(&advise_given, name)) {
+				string_list_insert(&advise_given, name);
+				advise(_("The '%s' hook was ignored because "
+					 "it's not set as executable.\n"
+					 "You can disable this warning with "
+					 "`git config advice.ignoredHook false`."),
+				       path.buf);
+			}
+		}
+		return NULL;
+	}
+	return path.buf;
+}
+
+int hook_exists(const char *name)
+{
+	return !!find_hook(name);
+}
+
+static int pick_next_hook(struct child_process *cp,
+			  struct strbuf *out,
+			  void *pp_cb,
+			  void **pp_task_cb)
+{
+	struct hook_cb_data *hook_cb = pp_cb;
+	const char *hook_path = hook_cb->hook_path;
+
+	if (!hook_path)
+		return 0;
+
+	cp->no_stdin = 1;
+	strvec_pushv(&cp->env_array, hook_cb->options->env.v);
+	cp->stdout_to_stderr = 1;
+	cp->trace2_hook_name = hook_cb->hook_name;
+	cp->dir = hook_cb->options->dir;
+
+	strvec_push(&cp->args, hook_path);
+	strvec_pushv(&cp->args, hook_cb->options->args.v);
+
+	/* Provide context for errors if necessary */
+	*pp_task_cb = (char *)hook_path;
+
+	/*
+	 * This pick_next_hook() will be called again, we're only
+	 * running one hook, so indicate that no more work will be
+	 * done.
+	 */
+	hook_cb->hook_path = NULL;
+
+	return 1;
+}
+
+static int notify_start_failure(struct strbuf *out,
+				void *pp_cb,
+				void *pp_task_cp)
+{
+	struct hook_cb_data *hook_cb = pp_cb;
+	const char *hook_path = pp_task_cp;
+
+	hook_cb->rc |= 1;
+
+	strbuf_addf(out, _("Couldn't start hook '%s'\n"),
+		    hook_path);
+
+	return 1;
+}
+
+static int notify_hook_finished(int result,
+				struct strbuf *out,
+				void *pp_cb,
+				void *pp_task_cb)
+{
+	struct hook_cb_data *hook_cb = pp_cb;
+
+	hook_cb->rc |= result;
+
+	return 0;
+}
+
+static void run_hooks_opt_clear(struct run_hooks_opt *options)
+{
+	strvec_clear(&options->env);
+	strvec_clear(&options->args);
+}
+
+int run_hooks_opt(const char *hook_name, struct run_hooks_opt *options)
+{
+	struct strbuf abs_path = STRBUF_INIT;
+	struct hook_cb_data cb_data = {
+		.rc = 0,
+		.hook_name = hook_name,
+		.options = options,
+	};
+	const char *const hook_path = find_hook(hook_name);
+	int jobs = 1;
+	int ret = 0;
+
+	if (!options)
+		BUG("a struct run_hooks_opt must be provided to run_hooks");
+
+	if (!hook_path && !options->error_if_missing)
+		goto cleanup;
+
+	if (!hook_path) {
+		ret = error("cannot find a hook named %s", hook_name);
+		goto cleanup;
+	}
+
+	cb_data.hook_path = hook_path;
+	if (options->dir) {
+		strbuf_add_absolute_path(&abs_path, hook_path);
+		cb_data.hook_path = abs_path.buf;
+	}
+
+	run_processes_parallel_tr2(jobs,
+				   pick_next_hook,
+				   notify_start_failure,
+				   notify_hook_finished,
+				   &cb_data,
+				   "hook",
+				   hook_name);
+	ret = cb_data.rc;
+cleanup:
+	strbuf_release(&abs_path);
+	run_hooks_opt_clear(options);
+	return ret;
+}
+
+int run_hooks(const char *hook_name)
+{
+	struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
+
+	return run_hooks_opt(hook_name, &opt);
+}
+
+int run_hooks_l(const char *hook_name, ...)
+{
+	struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
+	va_list ap;
+	const char *arg;
+
+	va_start(ap, hook_name);
+	while ((arg = va_arg(ap, const char *)))
+		strvec_push(&opt.args, arg);
+	va_end(ap);
+
+	return run_hooks_opt(hook_name, &opt);
+}
diff --git a/hook.h b/hook.h
new file mode 100644
index 0000000000..18d90aedf1
--- /dev/null
+++ b/hook.h
@@ -0,0 +1,73 @@
+#ifndef HOOK_H
+#define HOOK_H
+#include "strvec.h"
+
+struct run_hooks_opt
+{
+	/* Environment vars to be set for each hook */
+	struct strvec env;
+
+	/* Args to be passed to each hook */
+	struct strvec args;
+
+	/* Emit an error if the hook is missing */
+	unsigned int error_if_missing:1;
+
+	/**
+	 * An optional initial working directory for the hook,
+	 * translates to "struct child_process"'s "dir" member.
+	 */
+	const char *dir;
+};
+
+#define RUN_HOOKS_OPT_INIT { \
+	.env = STRVEC_INIT, \
+	.args = STRVEC_INIT, \
+}
+
+struct hook_cb_data {
+	/* rc reflects the cumulative failure state */
+	int rc;
+	const char *hook_name;
+	const char *hook_path;
+	struct run_hooks_opt *options;
+};
+
+/*
+ * Returns the path to the hook file, or NULL if the hook is missing
+ * or disabled. Note that this points to static storage that will be
+ * overwritten by further calls to find_hook and run_hook_*.
+ */
+const char *find_hook(const char *name);
+
+/**
+ * A boolean version of find_hook()
+ */
+int hook_exists(const char *hookname);
+
+/**
+ * Takes a `hook_name`, resolves it to a path with find_hook(), and
+ * runs the hook for you with the options specified in "struct
+ * run_hooks opt". Will free memory associated with the "struct run_hooks_opt".
+ *
+ * Returns the status code of the run hook, or a negative value on
+ * error().
+ */
+int run_hooks_opt(const char *hook_name, struct run_hooks_opt *options);
+
+/**
+ * A wrapper for run_hooks_opt() which provides a dummy "struct
+ * run_hooks_opt" initialized with "RUN_HOOKS_OPT_INIT".
+ */
+int run_hooks(const char *hook_name);
+
+/**
+ * Like run_hooks(), a wrapper for run_hooks_opt().
+ *
+ * In addition to the wrapping behavior provided by run_hooks(), this
+ * wrapper takes a list of strings terminated by a NULL
+ * argument. These things will be used as positional arguments to the
+ * hook. This function behaves like the old run_hook_le() API.
+ */
+int run_hooks_l(const char *hook_name, ...);
+#endif
diff --git a/http-backend.c b/http-backend.c
index b329bf63f0..807fb8839e 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -466,9 +466,7 @@ static void run_service(const char **argv, int buffer_input)
 	struct child_process cld = CHILD_PROCESS_INIT;
 	ssize_t req_len = get_content_length();
 
-	if (encoding && !strcmp(encoding, "gzip"))
-		gzipped_request = 1;
-	else if (encoding && !strcmp(encoding, "x-gzip"))
+	if (encoding && (!strcmp(encoding, "gzip") || !strcmp(encoding, "x-gzip")))
 		gzipped_request = 1;
 
 	if (!user || !*user)
@@ -482,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;
@@ -534,7 +532,7 @@ static void get_info_refs(struct strbuf *hdr, char *arg)
 
 	if (service_name) {
 		const char *argv[] = {NULL /* service name */,
-			"--stateless-rpc", "--advertise-refs",
+			"--http-backend-info-refs",
 			".", NULL};
 		struct rpc_service *svc = select_service(hdr, service_name);
 
@@ -661,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);
@@ -739,6 +738,7 @@ static int bad_request(struct strbuf *hdr, const struct service_cmd *c)
 int cmd_main(int argc, const char **argv)
 {
 	char *method = getenv("REQUEST_METHOD");
+	const char *proto_header;
 	char *dir;
 	struct service_cmd *cmd = NULL;
 	char *cmd_arg = NULL;
@@ -789,6 +789,9 @@ int cmd_main(int argc, const char **argv)
 	http_config();
 	max_request_buffer = git_env_ulong("GIT_HTTP_MAX_REQUEST_BUFFER",
 					   max_request_buffer);
+	proto_header = getenv("HTTP_GIT_PROTOCOL");
+	if (proto_header)
+		setenv(GIT_PROTOCOL_ENVIRONMENT, proto_header, 0);
 
 	cmd->imp(&hdr, cmd_arg);
 	return 0;
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-push.c b/http-push.c
index d7cb1675a2..3309aaf004 100644
--- a/http-push.c
+++ b/http-push.c
@@ -203,10 +203,8 @@ static void curl_setup_http(CURL *curl, const char *url,
 	curl_easy_setopt(curl, CURLOPT_INFILE, buffer);
 	curl_easy_setopt(curl, CURLOPT_INFILESIZE, buffer->buf.len);
 	curl_easy_setopt(curl, CURLOPT_READFUNCTION, fread_buffer);
-#ifndef NO_CURL_IOCTL
 	curl_easy_setopt(curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer);
 	curl_easy_setopt(curl, CURLOPT_IOCTLDATA, buffer);
-#endif
 	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_fn);
 	curl_easy_setopt(curl, CURLOPT_NOBODY, 0);
 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, custom_req);
@@ -249,8 +247,6 @@ static void process_response(void *callback_data)
 	finish_request(request);
 }
 
-#ifdef USE_CURL_MULTI
-
 static void start_fetch_loose(struct transfer_request *request)
 {
 	struct active_request_slot *slot;
@@ -299,7 +295,6 @@ static void start_mkcol(struct transfer_request *request)
 		FREE_AND_NULL(request->url);
 	}
 }
-#endif
 
 static void start_fetch_packed(struct transfer_request *request)
 {
@@ -605,7 +600,6 @@ static void finish_request(struct transfer_request *request)
 	}
 }
 
-#ifdef USE_CURL_MULTI
 static int is_running_queue;
 static int fill_active_slot(void *unused)
 {
@@ -629,7 +623,6 @@ static int fill_active_slot(void *unused)
 	}
 	return 0;
 }
-#endif
 
 static void get_remote_object_list(unsigned char parent);
 
@@ -658,10 +651,8 @@ static void add_fetch_request(struct object *obj)
 	request->next = request_queue_head;
 	request_queue_head = request;
 
-#ifdef USE_CURL_MULTI
 	fill_active_slots();
 	step_active_slots();
-#endif
 }
 
 static int add_send_request(struct object *obj, struct remote_lock *lock)
@@ -696,10 +687,8 @@ static int add_send_request(struct object *obj, struct remote_lock *lock)
 	request->next = request_queue_head;
 	request_queue_head = request;
 
-#ifdef USE_CURL_MULTI
 	fill_active_slots();
 	step_active_slots();
-#endif
 
 	return 1;
 }
@@ -894,7 +883,7 @@ static struct remote_lock *lock_remote(const char *path, long timeout)
 	slot->results = &results;
 	curl_setup_http(slot->curl, url, DAV_LOCK, &out_buffer, fwrite_buffer);
 	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
-	curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
+	curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &in_buffer);
 
 	CALLOC_ARRAY(lock, 1);
 	lock->timeout = -1;
@@ -1153,7 +1142,7 @@ static void remote_ls(const char *path, int flags,
 	curl_setup_http(slot->curl, url, DAV_PROPFIND,
 			&out_buffer, fwrite_buffer);
 	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
-	curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
+	curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &in_buffer);
 
 	if (start_active_slot(slot)) {
 		run_active_slot(slot);
@@ -1227,7 +1216,7 @@ static int locking_available(void)
 	curl_setup_http(slot->curl, repo->url, DAV_PROPFIND,
 			&out_buffer, fwrite_buffer);
 	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
-	curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
+	curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &in_buffer);
 
 	if (start_active_slot(slot)) {
 		run_active_slot(slot);
@@ -1682,21 +1671,15 @@ static int delete_remote_branch(const char *pattern, int force)
 
 static void run_request_queue(void)
 {
-#ifdef USE_CURL_MULTI
 	is_running_queue = 1;
 	fill_active_slots();
 	add_fill_function(NULL, fill_active_slot);
-#endif
 	do {
 		finish_all_active_slots();
-#ifdef USE_CURL_MULTI
 		fill_active_slots();
-#endif
 	} while (request_queue_head && !aborted);
 
-#ifdef USE_CURL_MULTI
 	is_running_queue = 0;
-#endif
 }
 
 int cmd_main(int argc, const char **argv)
@@ -1770,10 +1753,6 @@ int cmd_main(int argc, const char **argv)
 		break;
 	}
 
-#ifndef USE_CURL_MULTI
-	die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI");
-#endif
-
 	if (!repo->url)
 		usage(http_push_usage);
 
@@ -1786,9 +1765,7 @@ int cmd_main(int argc, const char **argv)
 
 	http_init(NULL, repo->url, 1);
 
-#ifdef USE_CURL_MULTI
 	is_running_queue = 0;
-#endif
 
 	/* Verify DAV compliance/lock support */
 	if (!locking_available()) {
diff --git a/http-walker.c b/http-walker.c
index 90d8ecb57e..910fae539b 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -127,7 +127,6 @@ static void release_object_request(struct object_request *obj_req)
 	free(obj_req);
 }
 
-#ifdef USE_CURL_MULTI
 static int fill_active_slot(struct walker *walker)
 {
 	struct object_request *obj_req;
@@ -146,7 +145,6 @@ static int fill_active_slot(struct walker *walker)
 	}
 	return 0;
 }
-#endif
 
 static void prefetch(struct walker *walker, unsigned char *sha1)
 {
@@ -163,10 +161,8 @@ static void prefetch(struct walker *walker, unsigned char *sha1)
 	http_is_verbose = walker->get_verbosely;
 	list_add_tail(&newreq->node, &object_queue_head);
 
-#ifdef USE_CURL_MULTI
 	fill_active_slots();
 	step_active_slots();
-#endif
 }
 
 static int is_alternate_allowed(const char *url)
@@ -357,11 +353,9 @@ static void fetch_alternates(struct walker *walker, const char *base)
 	 * wait for them to arrive and return to processing this request's
 	 * curl message
 	 */
-#ifdef USE_CURL_MULTI
 	while (cdata->got_alternates == 0) {
 		step_active_slots();
 	}
-#endif
 
 	/* Nothing to do if they've already been fetched */
 	if (cdata->got_alternates == 1)
@@ -384,7 +378,7 @@ static void fetch_alternates(struct walker *walker, const char *base)
 	alt_req.walker = walker;
 	slot->callback_data = &alt_req;
 
-	curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer);
+	curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &buffer);
 	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
 	curl_easy_setopt(slot->curl, CURLOPT_URL, url.buf);
 
@@ -505,12 +499,8 @@ static int fetch_object(struct walker *walker, unsigned char *hash)
 		return 0;
 	}
 
-#ifdef USE_CURL_MULTI
 	while (obj_req->state == WAITING)
 		step_active_slots();
-#else
-	start_object_request(walker, obj_req);
-#endif
 
 	/*
 	 * obj_req->req might change when fetching alternates in the callback
@@ -623,9 +613,7 @@ struct walker *get_http_walker(const char *url)
 	walker->cleanup = cleanup;
 	walker->data = data;
 
-#ifdef USE_CURL_MULTI
 	add_fill_function(walker, (int (*)(void *)) fill_active_slot);
-#endif
 
 	return walker;
 }
diff --git a/http.c b/http.c
index 8119247149..229da4d148 100644
--- a/http.c
+++ b/http.c
@@ -1,4 +1,5 @@
 #include "git-compat-util.h"
+#include "git-curl-compat.h"
 #include "http.h"
 #include "config.h"
 #include "pack.h"
@@ -19,28 +20,16 @@
 static struct trace_key trace_curl = TRACE_KEY_INIT(CURL);
 static int trace_curl_data = 1;
 static int trace_curl_redact = 1;
-#if LIBCURL_VERSION_NUM >= 0x070a08
 long int git_curl_ipresolve = CURL_IPRESOLVE_WHATEVER;
-#else
-long int git_curl_ipresolve;
-#endif
 int active_requests;
 int http_is_verbose;
 ssize_t http_post_buffer = 16 * LARGE_PACKET_MAX;
 
-#if LIBCURL_VERSION_NUM >= 0x070a06
-#define LIBCURL_CAN_HANDLE_AUTH_ANY
-#endif
-
 static int min_curl_sessions = 1;
 static int curl_session_count;
-#ifdef USE_CURL_MULTI
 static int max_requests = -1;
 static CURLM *curlm;
-#endif
-#ifndef NO_CURL_EASY_DUPHANDLE
 static CURL *curl_default;
-#endif
 
 #define PREV_BUF_SIZE 4096
 
@@ -59,25 +48,19 @@ static struct {
 	{ "sslv2", CURL_SSLVERSION_SSLv2 },
 	{ "sslv3", CURL_SSLVERSION_SSLv3 },
 	{ "tlsv1", CURL_SSLVERSION_TLSv1 },
-#if LIBCURL_VERSION_NUM >= 0x072200
+#ifdef GIT_CURL_HAVE_CURL_SSLVERSION_TLSv1_0
 	{ "tlsv1.0", CURL_SSLVERSION_TLSv1_0 },
 	{ "tlsv1.1", CURL_SSLVERSION_TLSv1_1 },
 	{ "tlsv1.2", CURL_SSLVERSION_TLSv1_2 },
 #endif
-#if LIBCURL_VERSION_NUM >= 0x073400
+#ifdef GIT_CURL_HAVE_CURL_SSLVERSION_TLSv1_3
 	{ "tlsv1.3", CURL_SSLVERSION_TLSv1_3 },
 #endif
 };
-#if LIBCURL_VERSION_NUM >= 0x070903
 static const char *ssl_key;
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070908
 static const char *ssl_capath;
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071304
 static const char *curl_no_proxy;
-#endif
-#if LIBCURL_VERSION_NUM >= 0x072c00
+#ifdef GIT_CURL_HAVE_CURLOPT_PINNEDPUBLICKEY
 static const char *ssl_pinnedkey;
 #endif
 static const char *ssl_cainfo;
@@ -101,9 +84,7 @@ static struct {
 	{ "digest", CURLAUTH_DIGEST },
 	{ "negotiate", CURLAUTH_GSSNEGOTIATE },
 	{ "ntlm", CURLAUTH_NTLM },
-#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
 	{ "anyauth", CURLAUTH_ANY },
-#endif
 	/*
 	 * CURLAUTH_DIGEST_IE has no corresponding command-line option in
 	 * curl(1) and is not included in CURLAUTH_ANY, so we leave it out
@@ -133,27 +114,15 @@ static int curl_empty_auth = -1;
 
 enum http_follow_config http_follow_config = HTTP_FOLLOW_INITIAL;
 
-#if LIBCURL_VERSION_NUM >= 0x071700
-/* Use CURLOPT_KEYPASSWD as is */
-#elif LIBCURL_VERSION_NUM >= 0x070903
-#define CURLOPT_KEYPASSWD CURLOPT_SSLKEYPASSWD
-#else
-#define CURLOPT_KEYPASSWD CURLOPT_SSLCERTPASSWD
-#endif
-
 static struct credential cert_auth = CREDENTIAL_INIT;
 static int ssl_cert_password_required;
-#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
 static unsigned long http_auth_methods = CURLAUTH_ANY;
 static int http_auth_methods_restricted;
 /* Modes for which empty_auth cannot actually help us. */
 static unsigned long empty_auth_useless =
 	CURLAUTH_BASIC
-#ifdef CURLAUTH_DIGEST_IE
 	| CURLAUTH_DIGEST_IE
-#endif
 	| CURLAUTH_DIGEST;
-#endif
 
 static struct curl_slist *pragma_header;
 static struct curl_slist *no_pragma_header;
@@ -186,7 +155,6 @@ size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_)
 	return size / eltsize;
 }
 
-#ifndef NO_CURL_IOCTL
 curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp)
 {
 	struct buffer *buffer = clientp;
@@ -203,7 +171,6 @@ curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp)
 		return CURLIOE_UNKNOWNCMD;
 	}
 }
-#endif
 
 size_t fwrite_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_)
 {
@@ -237,12 +204,8 @@ static void finish_active_slot(struct active_request_slot *slot)
 	if (slot->results != NULL) {
 		slot->results->curl_result = slot->curl_result;
 		slot->results->http_code = slot->http_code;
-#if LIBCURL_VERSION_NUM >= 0x070a08
 		curl_easy_getinfo(slot->curl, CURLINFO_HTTPAUTH_AVAIL,
 				  &slot->results->auth_avail);
-#else
-		slot->results->auth_avail = 0;
-#endif
 
 		curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CONNECTCODE,
 			&slot->results->http_connectcode);
@@ -255,12 +218,9 @@ static void finish_active_slot(struct active_request_slot *slot)
 
 static void xmulti_remove_handle(struct active_request_slot *slot)
 {
-#ifdef USE_CURL_MULTI
 	curl_multi_remove_handle(curlm, slot->curl);
-#endif
 }
 
-#ifdef USE_CURL_MULTI
 static void process_curl_messages(void)
 {
 	int num_messages;
@@ -288,7 +248,6 @@ static void process_curl_messages(void)
 		curl_message = curl_multi_info_read(curlm, &num_messages);
 	}
 }
-#endif
 
 static int http_options(const char *var, const char *value, void *cb)
 {
@@ -305,14 +264,10 @@ static int http_options(const char *var, const char *value, void *cb)
 		return git_config_string(&ssl_version, var, value);
 	if (!strcmp("http.sslcert", var))
 		return git_config_pathname(&ssl_cert, var, value);
-#if LIBCURL_VERSION_NUM >= 0x070903
 	if (!strcmp("http.sslkey", var))
 		return git_config_pathname(&ssl_key, var, value);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070908
 	if (!strcmp("http.sslcapath", var))
 		return git_config_pathname(&ssl_capath, var, value);
-#endif
 	if (!strcmp("http.sslcainfo", var))
 		return git_config_pathname(&ssl_cainfo, var, value);
 	if (!strcmp("http.sslcertpasswordprotected", var)) {
@@ -341,18 +296,14 @@ static int http_options(const char *var, const char *value, void *cb)
 
 	if (!strcmp("http.minsessions", var)) {
 		min_curl_sessions = git_config_int(var, value);
-#ifndef USE_CURL_MULTI
 		if (min_curl_sessions > 1)
 			min_curl_sessions = 1;
-#endif
 		return 0;
 	}
-#ifdef USE_CURL_MULTI
 	if (!strcmp("http.maxrequests", var)) {
 		max_requests = git_config_int(var, value);
 		return 0;
 	}
-#endif
 	if (!strcmp("http.lowspeedlimit", var)) {
 		curl_low_speed_limit = (long)git_config_int(var, value);
 		return 0;
@@ -423,10 +374,10 @@ static int http_options(const char *var, const char *value, void *cb)
 	}
 
 	if (!strcmp("http.pinnedpubkey", var)) {
-#if LIBCURL_VERSION_NUM >= 0x072c00
+#ifdef GIT_CURL_HAVE_CURLOPT_PINNEDPUBLICKEY
 		return git_config_pathname(&ssl_pinnedkey, var, value);
 #else
-		warning(_("Public key pinning not supported with cURL < 7.44.0"));
+		warning(_("Public key pinning not supported with cURL < 7.39.0"));
 		return 0;
 #endif
 	}
@@ -461,12 +412,6 @@ static int curl_empty_auth_enabled(void)
 	if (curl_empty_auth >= 0)
 		return curl_empty_auth;
 
-#ifndef LIBCURL_CAN_HANDLE_AUTH_ANY
-	/*
-	 * Our libcurl is too old to do AUTH_ANY in the first place;
-	 * just default to turning the feature off.
-	 */
-#else
 	/*
 	 * In the automatic case, kick in the empty-auth
 	 * hack as long as we would potentially try some
@@ -479,7 +424,6 @@ static int curl_empty_auth_enabled(void)
 	if (http_auth_methods_restricted &&
 	    (http_auth_methods & ~empty_auth_useless))
 		return 1;
-#endif
 	return 0;
 }
 
@@ -493,24 +437,8 @@ static void init_curl_http_auth(CURL *result)
 
 	credential_fill(&http_auth);
 
-#if LIBCURL_VERSION_NUM >= 0x071301
 	curl_easy_setopt(result, CURLOPT_USERNAME, http_auth.username);
 	curl_easy_setopt(result, CURLOPT_PASSWORD, http_auth.password);
-#else
-	{
-		static struct strbuf up = STRBUF_INIT;
-		/*
-		 * Note that we assume we only ever have a single set of
-		 * credentials in a given program run, so we do not have
-		 * to worry about updating this buffer, only setting its
-		 * initial value.
-		 */
-		if (!up.len)
-			strbuf_addf(&up, "%s:%s",
-				http_auth.username, http_auth.password);
-		curl_easy_setopt(result, CURLOPT_USERPWD, up.buf);
-	}
-#endif
 }
 
 /* *var must be free-able */
@@ -524,22 +452,10 @@ static void var_override(const char **var, char *value)
 
 static void set_proxyauth_name_password(CURL *result)
 {
-#if LIBCURL_VERSION_NUM >= 0x071301
 		curl_easy_setopt(result, CURLOPT_PROXYUSERNAME,
 			proxy_auth.username);
 		curl_easy_setopt(result, CURLOPT_PROXYPASSWORD,
 			proxy_auth.password);
-#else
-		struct strbuf s = STRBUF_INIT;
-
-		strbuf_addstr_urlencode(&s, proxy_auth.username,
-					is_rfc3986_unreserved);
-		strbuf_addch(&s, ':');
-		strbuf_addstr_urlencode(&s, proxy_auth.password,
-					is_rfc3986_unreserved);
-		curl_proxyuserpwd = strbuf_detach(&s, NULL);
-		curl_easy_setopt(result, CURLOPT_PROXYUSERPWD, curl_proxyuserpwd);
-#endif
 }
 
 static void init_curl_proxy_auth(CURL *result)
@@ -552,7 +468,6 @@ static void init_curl_proxy_auth(CURL *result)
 
 	var_override(&http_proxy_authmethod, getenv("GIT_HTTP_PROXY_AUTHMETHOD"));
 
-#if LIBCURL_VERSION_NUM >= 0x070a07 /* CURLOPT_PROXYAUTH and CURLAUTH_ANY */
 	if (http_proxy_authmethod) {
 		int i;
 		for (i = 0; i < ARRAY_SIZE(proxy_authmethods); i++) {
@@ -570,7 +485,6 @@ static void init_curl_proxy_auth(CURL *result)
 	}
 	else
 		curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
-#endif
 }
 
 static int has_cert_password(void)
@@ -587,7 +501,7 @@ static int has_cert_password(void)
 	return 1;
 }
 
-#if LIBCURL_VERSION_NUM >= 0x073400
+#ifdef GIT_CURL_HAVE_CURLOPT_PROXY_KEYPASSWD
 static int has_proxy_cert_password(void)
 {
 	if (http_proxy_ssl_cert == NULL || proxy_ssl_cert_password_required != 1)
@@ -603,13 +517,13 @@ static int has_proxy_cert_password(void)
 }
 #endif
 
-#if LIBCURL_VERSION_NUM >= 0x071900
+#ifdef GITCURL_HAVE_CURLOPT_TCP_KEEPALIVE
 static void set_curl_keepalive(CURL *c)
 {
 	curl_easy_setopt(c, CURLOPT_TCP_KEEPALIVE, 1);
 }
 
-#elif LIBCURL_VERSION_NUM >= 0x071000
+#else
 static int sockopt_callback(void *client, curl_socket_t fd, curlsocktype type)
 {
 	int ka = 1;
@@ -623,19 +537,13 @@ static int sockopt_callback(void *client, curl_socket_t fd, curlsocktype type)
 	if (rc < 0)
 		warning_errno("unable to set SO_KEEPALIVE on socket");
 
-	return 0; /* CURL_SOCKOPT_OK only exists since curl 7.21.5 */
+	return CURL_SOCKOPT_OK;
 }
 
 static void set_curl_keepalive(CURL *c)
 {
 	curl_easy_setopt(c, CURLOPT_SOCKOPTFUNCTION, sockopt_callback);
 }
-
-#else
-static void set_curl_keepalive(CURL *c)
-{
-	/* not supported on older curl versions */
-}
 #endif
 
 static void redact_sensitive_header(struct strbuf *header)
@@ -643,8 +551,8 @@ static void redact_sensitive_header(struct strbuf *header)
 	const char *sensitive_header;
 
 	if (trace_curl_redact &&
-	    (skip_prefix(header->buf, "Authorization:", &sensitive_header) ||
-	     skip_prefix(header->buf, "Proxy-Authorization:", &sensitive_header))) {
+	    (skip_iprefix(header->buf, "Authorization:", &sensitive_header) ||
+	     skip_iprefix(header->buf, "Proxy-Authorization:", &sensitive_header))) {
 		/* The first token is the type, which is OK to log */
 		while (isspace(*sensitive_header))
 			sensitive_header++;
@@ -654,7 +562,7 @@ static void redact_sensitive_header(struct strbuf *header)
 		strbuf_setlen(header,  sensitive_header - header->buf);
 		strbuf_addstr(header, " <redacted>");
 	} else if (trace_curl_redact &&
-		   skip_prefix(header->buf, "Cookie:", &sensitive_header)) {
+		   skip_iprefix(header->buf, "Cookie:", &sensitive_header)) {
 		struct strbuf redacted_header = STRBUF_INIT;
 		const char *cookie;
 
@@ -809,7 +717,6 @@ void setup_curl_trace(CURL *handle)
 	curl_easy_setopt(handle, CURLOPT_DEBUGDATA, NULL);
 }
 
-#ifdef CURLPROTO_HTTP
 static long get_curl_allowed_protocols(int from_user)
 {
 	long allowed_protocols = 0;
@@ -825,9 +732,8 @@ static long get_curl_allowed_protocols(int from_user)
 
 	return allowed_protocols;
 }
-#endif
 
-#if LIBCURL_VERSION_NUM >=0x072f00
+#ifdef GIT_CURL_HAVE_CURL_HTTP_VERSION_2
 static int get_curl_http_version_opt(const char *version_string, long *opt)
 {
 	int i;
@@ -869,7 +775,7 @@ static CURL *get_curl_handle(void)
 		curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 2);
 	}
 
-#if LIBCURL_VERSION_NUM >= 0x072f00 // 7.47.0
+#ifdef GIT_CURL_HAVE_CURL_HTTP_VERSION_2
     if (curl_http_version) {
 		long opt;
 		if (!get_curl_http_version_opt(curl_http_version, &opt)) {
@@ -879,12 +785,8 @@ static CURL *get_curl_handle(void)
     }
 #endif
 
-#if LIBCURL_VERSION_NUM >= 0x070907
 	curl_easy_setopt(result, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
-#endif
-#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
 	curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-#endif
 
 #ifdef CURLGSSAPI_DELEGATION_FLAG
 	if (curl_deleg) {
@@ -904,7 +806,7 @@ static CURL *get_curl_handle(void)
 
 	if (http_ssl_backend && !strcmp("schannel", http_ssl_backend) &&
 	    !http_schannel_check_revoke) {
-#if LIBCURL_VERSION_NUM >= 0x072c00
+#ifdef GIT_CURL_HAVE_CURLSSLOPT_NO_REVOKE
 		curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE);
 #else
 		warning(_("CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"));
@@ -940,28 +842,24 @@ static CURL *get_curl_handle(void)
 		curl_easy_setopt(result, CURLOPT_SSLCERT, ssl_cert);
 	if (has_cert_password())
 		curl_easy_setopt(result, CURLOPT_KEYPASSWD, cert_auth.password);
-#if LIBCURL_VERSION_NUM >= 0x070903
 	if (ssl_key != NULL)
 		curl_easy_setopt(result, CURLOPT_SSLKEY, ssl_key);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070908
 	if (ssl_capath != NULL)
 		curl_easy_setopt(result, CURLOPT_CAPATH, ssl_capath);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x072c00
+#ifdef GIT_CURL_HAVE_CURLOPT_PINNEDPUBLICKEY
 	if (ssl_pinnedkey != NULL)
 		curl_easy_setopt(result, CURLOPT_PINNEDPUBLICKEY, ssl_pinnedkey);
 #endif
 	if (http_ssl_backend && !strcmp("schannel", http_ssl_backend) &&
 	    !http_schannel_use_ssl_cainfo) {
 		curl_easy_setopt(result, CURLOPT_CAINFO, NULL);
-#if LIBCURL_VERSION_NUM >= 0x073400
+#ifdef GIT_CURL_HAVE_CURLOPT_PROXY_CAINFO
 		curl_easy_setopt(result, CURLOPT_PROXY_CAINFO, NULL);
 #endif
 	} else if (ssl_cainfo != NULL || http_proxy_ssl_ca_info != NULL) {
 		if (ssl_cainfo != NULL)
 			curl_easy_setopt(result, CURLOPT_CAINFO, ssl_cainfo);
-#if LIBCURL_VERSION_NUM >= 0x073400
+#ifdef GIT_CURL_HAVE_CURLOPT_PROXY_CAINFO
 		if (http_proxy_ssl_ca_info != NULL)
 			curl_easy_setopt(result, CURLOPT_PROXY_CAINFO, http_proxy_ssl_ca_info);
 #endif
@@ -975,19 +873,11 @@ static CURL *get_curl_handle(void)
 	}
 
 	curl_easy_setopt(result, CURLOPT_MAXREDIRS, 20);
-#if LIBCURL_VERSION_NUM >= 0x071301
 	curl_easy_setopt(result, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
-#elif LIBCURL_VERSION_NUM >= 0x071101
-	curl_easy_setopt(result, CURLOPT_POST301, 1);
-#endif
-#ifdef CURLPROTO_HTTP
 	curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS,
 			 get_curl_allowed_protocols(0));
 	curl_easy_setopt(result, CURLOPT_PROTOCOLS,
 			 get_curl_allowed_protocols(-1));
-#else
-	warning(_("Protocol restrictions not supported with cURL < 7.19.4"));
-#endif
 	if (getenv("GIT_CURL_VERBOSE"))
 		http_trace_curl_no_data();
 	setup_curl_trace(result);
@@ -1002,10 +892,8 @@ static CURL *get_curl_handle(void)
 	if (curl_ftp_no_epsv)
 		curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0);
 
-#ifdef CURLOPT_USE_SSL
 	if (curl_ssl_try)
 		curl_easy_setopt(result, CURLOPT_USE_SSL, CURLUSESSL_TRY);
-#endif
 
 	/*
 	 * CURL also examines these variables as a fallback; but we need to query
@@ -1040,7 +928,6 @@ static CURL *get_curl_handle(void)
 		 */
 		curl_easy_setopt(result, CURLOPT_PROXY, "");
 	} else if (curl_http_proxy) {
-#if LIBCURL_VERSION_NUM >= 0x071800
 		if (starts_with(curl_http_proxy, "socks5h"))
 			curl_easy_setopt(result,
 				CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5_HOSTNAME);
@@ -1053,8 +940,7 @@ static CURL *get_curl_handle(void)
 		else if (starts_with(curl_http_proxy, "socks"))
 			curl_easy_setopt(result,
 				CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x073400
+#ifdef GIT_CURL_HAVE_CURLOPT_PROXY_KEYPASSWD
 		else if (starts_with(curl_http_proxy, "https")) {
 			curl_easy_setopt(result, CURLOPT_PROXYTYPE, CURLPROXY_HTTPS);
 
@@ -1081,11 +967,9 @@ static CURL *get_curl_handle(void)
 			die("Invalid proxy URL '%s'", curl_http_proxy);
 
 		curl_easy_setopt(result, CURLOPT_PROXY, proxy_auth.host);
-#if LIBCURL_VERSION_NUM >= 0x071304
 		var_override(&curl_no_proxy, getenv("NO_PROXY"));
 		var_override(&curl_no_proxy, getenv("no_proxy"));
 		curl_easy_setopt(result, CURLOPT_NOPROXY, curl_no_proxy);
-#endif
 	}
 	init_curl_proxy_auth(result);
 
@@ -1106,7 +990,7 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
 	char *low_speed_limit;
 	char *low_speed_time;
 	char *normalized_url;
-	struct urlmatch_config config = { STRING_LIST_INIT_DUP };
+	struct urlmatch_config config = URLMATCH_CONFIG_INIT;
 
 	config.section = "http";
 	config.key = NULL;
@@ -1121,7 +1005,7 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
 	free(normalized_url);
 	string_list_clear(&config.vars, 1);
 
-#if LIBCURL_VERSION_NUM >= 0x073800
+#ifdef GIT_CURL_HAVE_CURLSSLSET_NO_BACKENDS
 	if (http_ssl_backend) {
 		const curl_ssl_backend **backends;
 		struct strbuf buf = STRBUF_INIT;
@@ -1164,7 +1048,6 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
 	no_pragma_header = curl_slist_append(http_copy_default_headers(),
 		"Pragma:");
 
-#ifdef USE_CURL_MULTI
 	{
 		char *http_max_requests = getenv("GIT_HTTP_MAX_REQUESTS");
 		if (http_max_requests != NULL)
@@ -1174,18 +1057,13 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
 	curlm = curl_multi_init();
 	if (!curlm)
 		die("curl_multi_init failed");
-#endif
 
 	if (getenv("GIT_SSL_NO_VERIFY"))
 		curl_ssl_verify = 0;
 
 	set_from_env(&ssl_cert, "GIT_SSL_CERT");
-#if LIBCURL_VERSION_NUM >= 0x070903
 	set_from_env(&ssl_key, "GIT_SSL_KEY");
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070908
 	set_from_env(&ssl_capath, "GIT_SSL_CAPATH");
-#endif
 	set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO");
 
 	set_from_env(&user_agent, "GIT_HTTP_USER_AGENT");
@@ -1201,10 +1079,8 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
 		curl_ssl_verify = 1;
 
 	curl_session_count = 0;
-#ifdef USE_CURL_MULTI
 	if (max_requests < 1)
 		max_requests = DEFAULT_MAX_REQUESTS;
-#endif
 
 	set_from_env(&http_proxy_ssl_cert, "GIT_PROXY_SSL_CERT");
 	set_from_env(&http_proxy_ssl_key, "GIT_PROXY_SSL_KEY");
@@ -1224,9 +1100,7 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
 			ssl_cert_password_required = 1;
 	}
 
-#ifndef NO_CURL_EASY_DUPHANDLE
 	curl_default = get_curl_handle();
-#endif
 }
 
 void http_cleanup(void)
@@ -1244,13 +1118,9 @@ void http_cleanup(void)
 	}
 	active_queue_head = NULL;
 
-#ifndef NO_CURL_EASY_DUPHANDLE
 	curl_easy_cleanup(curl_default);
-#endif
 
-#ifdef USE_CURL_MULTI
 	curl_multi_cleanup(curlm);
-#endif
 	curl_global_cleanup();
 
 	string_list_clear(&extra_http_headers, 0);
@@ -1297,7 +1167,6 @@ struct active_request_slot *get_active_slot(void)
 	struct active_request_slot *slot = active_queue_head;
 	struct active_request_slot *newslot;
 
-#ifdef USE_CURL_MULTI
 	int num_transfers;
 
 	/* Wait for a slot to open up if the queue is full */
@@ -1306,7 +1175,6 @@ struct active_request_slot *get_active_slot(void)
 		if (num_transfers < active_requests)
 			process_curl_messages();
 	}
-#endif
 
 	while (slot != NULL && slot->in_use)
 		slot = slot->next;
@@ -1329,11 +1197,7 @@ struct active_request_slot *get_active_slot(void)
 	}
 
 	if (slot->curl == NULL) {
-#ifdef NO_CURL_EASY_DUPHANDLE
-		slot->curl = get_curl_handle();
-#else
 		slot->curl = curl_easy_duphandle(curl_default);
-#endif
 		curl_session_count++;
 	}
 
@@ -1367,12 +1231,8 @@ struct active_request_slot *get_active_slot(void)
 	else
 		curl_easy_setopt(slot->curl, CURLOPT_FOLLOWLOCATION, 0);
 
-#if LIBCURL_VERSION_NUM >= 0x070a08
 	curl_easy_setopt(slot->curl, CURLOPT_IPRESOLVE, git_curl_ipresolve);
-#endif
-#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
 	curl_easy_setopt(slot->curl, CURLOPT_HTTPAUTH, http_auth_methods);
-#endif
 	if (http_auth.password || curl_empty_auth_enabled())
 		init_curl_http_auth(slot->curl);
 
@@ -1381,7 +1241,6 @@ struct active_request_slot *get_active_slot(void)
 
 int start_active_slot(struct active_request_slot *slot)
 {
-#ifdef USE_CURL_MULTI
 	CURLMcode curlm_result = curl_multi_add_handle(curlm, slot->curl);
 	int num_transfers;
 
@@ -1399,11 +1258,9 @@ int start_active_slot(struct active_request_slot *slot)
 	 * something.
 	 */
 	curl_multi_perform(curlm, &num_transfers);
-#endif
 	return 1;
 }
 
-#ifdef USE_CURL_MULTI
 struct fill_chain {
 	void *data;
 	int (*fill)(void *);
@@ -1462,11 +1319,9 @@ void step_active_slots(void)
 		fill_active_slots();
 	}
 }
-#endif
 
 void run_active_slot(struct active_request_slot *slot)
 {
-#ifdef USE_CURL_MULTI
 	fd_set readfds;
 	fd_set writefds;
 	fd_set excfds;
@@ -1479,7 +1334,6 @@ void run_active_slot(struct active_request_slot *slot)
 		step_active_slots();
 
 		if (slot->in_use) {
-#if LIBCURL_VERSION_NUM >= 0x070f04
 			long curl_timeout;
 			curl_multi_timeout(curlm, &curl_timeout);
 			if (curl_timeout == 0) {
@@ -1491,10 +1345,6 @@ void run_active_slot(struct active_request_slot *slot)
 				select_timeout.tv_sec  =  curl_timeout / 1000;
 				select_timeout.tv_usec = (curl_timeout % 1000) * 1000;
 			}
-#else
-			select_timeout.tv_sec  = 0;
-			select_timeout.tv_usec = 50000;
-#endif
 
 			max_fd = -1;
 			FD_ZERO(&readfds);
@@ -1517,12 +1367,6 @@ void run_active_slot(struct active_request_slot *slot)
 			select(max_fd+1, &readfds, &writefds, &excfds, &select_timeout);
 		}
 	}
-#else
-	while (slot->in_use) {
-		slot->curl_result = curl_easy_perform(slot->curl);
-		finish_active_slot(slot);
-	}
-#endif
 }
 
 static void release_active_slot(struct active_request_slot *slot)
@@ -1536,9 +1380,7 @@ static void release_active_slot(struct active_request_slot *slot)
 			curl_session_count--;
 		}
 	}
-#ifdef USE_CURL_MULTI
 	fill_active_slots();
-#endif
 }
 
 void finish_all_active_slots(void)
@@ -1647,6 +1489,10 @@ static int handle_curl_result(struct slot_results *results)
 		 */
 		credential_reject(&cert_auth);
 		return HTTP_NOAUTH;
+#ifdef GIT_CURL_HAVE_CURLE_SSL_PINNEDPUBKEYNOTMATCH
+	} else if (results->curl_result == CURLE_SSL_PINNEDPUBKEYNOTMATCH) {
+		return HTTP_NOMATCHPUBLICKEY;
+#endif
 	} else if (missing_target(results))
 		return HTTP_MISSING_TARGET;
 	else if (results->http_code == 401) {
@@ -1654,24 +1500,20 @@ static int handle_curl_result(struct slot_results *results)
 			credential_reject(&http_auth);
 			return HTTP_NOAUTH;
 		} else {
-#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
 			http_auth_methods &= ~CURLAUTH_GSSNEGOTIATE;
 			if (results->auth_avail) {
 				http_auth_methods &= results->auth_avail;
 				http_auth_methods_restricted = 1;
 			}
-#endif
 			return HTTP_REAUTH;
 		}
 	} else {
 		if (results->http_connectcode == 407)
 			credential_reject(&proxy_auth);
-#if LIBCURL_VERSION_NUM >= 0x070c00
 		if (!curl_errorstr[0])
 			strlcpy(curl_errorstr,
 				curl_easy_strerror(results->curl_result),
 				sizeof(curl_errorstr));
-#endif
 		return HTTP_ERROR;
 	}
 }
@@ -1930,7 +1772,7 @@ static int http_request(const char *url,
 		curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 1);
 	} else {
 		curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
-		curl_easy_setopt(slot->curl, CURLOPT_FILE, result);
+		curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, result);
 
 		if (target == HTTP_REQUEST_FILE) {
 			off_t posn = ftello(result);
@@ -2284,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;
@@ -2347,7 +2190,7 @@ struct http_pack_request *new_direct_http_pack_request(
 	}
 
 	preq->slot = get_active_slot();
-	curl_easy_setopt(preq->slot->curl, CURLOPT_FILE, preq->packfile);
+	curl_easy_setopt(preq->slot->curl, CURLOPT_WRITEDATA, preq->packfile);
 	curl_easy_setopt(preq->slot->curl, CURLOPT_WRITEFUNCTION, fwrite);
 	curl_easy_setopt(preq->slot->curl, CURLOPT_URL, preq->url);
 	curl_easy_setopt(preq->slot->curl, CURLOPT_HTTPHEADER,
@@ -2518,7 +2361,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
 
 	freq->slot = get_active_slot();
 
-	curl_easy_setopt(freq->slot->curl, CURLOPT_FILE, freq);
+	curl_easy_setopt(freq->slot->curl, CURLOPT_WRITEDATA, freq);
 	curl_easy_setopt(freq->slot->curl, CURLOPT_FAILONERROR, 0);
 	curl_easy_setopt(freq->slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file);
 	curl_easy_setopt(freq->slot->curl, CURLOPT_ERRORBUFFER, freq->errorstr);
diff --git a/http.h b/http.h
index bf3d1270ad..df1590e53a 100644
--- a/http.h
+++ b/http.h
@@ -10,49 +10,7 @@
 #include "remote.h"
 #include "url.h"
 
-/*
- * We detect based on the cURL version if multi-transfer is
- * usable in this implementation and define this symbol accordingly.
- * This shouldn't be set by the Makefile or by the user (e.g. via CFLAGS).
- */
-#undef USE_CURL_MULTI
-
-#if LIBCURL_VERSION_NUM >= 0x071000
-#define USE_CURL_MULTI
 #define DEFAULT_MAX_REQUESTS 5
-#endif
-
-#if LIBCURL_VERSION_NUM < 0x070704
-#define curl_global_cleanup() do { /* nothing */ } while (0)
-#endif
-
-#if LIBCURL_VERSION_NUM < 0x070800
-#define curl_global_init(a) do { /* nothing */ } while (0)
-#elif LIBCURL_VERSION_NUM >= 0x070c00
-#define curl_global_init(a) curl_global_init_mem(a, xmalloc, free, \
-						xrealloc, xstrdup, xcalloc)
-#endif
-
-#if (LIBCURL_VERSION_NUM < 0x070c04) || (LIBCURL_VERSION_NUM == 0x071000)
-#define NO_CURL_EASY_DUPHANDLE
-#endif
-
-#if LIBCURL_VERSION_NUM < 0x070a03
-#define CURLE_HTTP_RETURNED_ERROR CURLE_HTTP_NOT_FOUND
-#endif
-
-#if LIBCURL_VERSION_NUM < 0x070c03
-#define NO_CURL_IOCTL
-#endif
-
-/*
- * CURLOPT_USE_SSL was known as CURLOPT_FTP_SSL up to 7.16.4,
- * and the constants were known as CURLFTPSSL_*
-*/
-#if !defined(CURLOPT_USE_SSL) && defined(CURLOPT_FTP_SSL)
-#define CURLOPT_USE_SSL CURLOPT_FTP_SSL
-#define CURLUSESSL_TRY CURLFTPSSL_TRY
-#endif
 
 struct slot_results {
 	CURLcode curl_result;
@@ -82,9 +40,7 @@ struct buffer {
 size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
 size_t fwrite_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
 size_t fwrite_null(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
-#ifndef NO_CURL_IOCTL
 curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp);
-#endif
 
 /* Slot lifecycle functions */
 struct active_request_slot *get_active_slot(void);
@@ -101,11 +57,9 @@ void finish_all_active_slots(void);
 int run_one_slot(struct active_request_slot *slot,
 		 struct slot_results *results);
 
-#ifdef USE_CURL_MULTI
 void fill_active_slots(void);
 void add_fill_function(void *data, int (*fill)(void *));
 void step_active_slots(void);
-#endif
 
 void http_init(struct remote *remote, const char *url,
 	       int proactive_auth);
@@ -200,6 +154,7 @@ struct http_get_options {
 #define HTTP_START_FAILED	3
 #define HTTP_REAUTH	4
 #define HTTP_NOAUTH	5
+#define HTTP_NOMATCHPUBLICKEY	6
 
 /*
  * Requests a URL and stores the result in a strbuf.
diff --git a/imap-send.c b/imap-send.c
index 9d06ef7cd2..e6090a0346 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -451,6 +451,7 @@ static int buffer_gets(struct imap_buffer *b, char **s)
 	/* not reached */
 }
 
+__attribute__((format (printf, 1, 2)))
 static void imap_info(const char *msg, ...)
 {
 	va_list va;
@@ -463,6 +464,7 @@ static void imap_info(const char *msg, ...)
 	}
 }
 
+__attribute__((format (printf, 1, 2)))
 static void imap_warn(const char *msg, ...)
 {
 	va_list va;
@@ -504,6 +506,7 @@ static char *next_arg(char **s)
 	return ret;
 }
 
+__attribute__((format (printf, 3, 4)))
 static int nfsnprintf(char *buf, int blen, const char *fmt, ...)
 {
 	int ret;
@@ -1438,7 +1441,7 @@ static CURL *setup_curl(struct imap_server_conf *srvc, struct credential *cred)
 	curl_easy_setopt(curl, CURLOPT_PORT, server.port);
 
 	if (server.auth_method) {
-#if LIBCURL_VERSION_NUM < 0x072200
+#ifndef GIT_CURL_HAVE_CURLOPT_LOGIN_OPTIONS
 		warning("No LOGIN_OPTIONS support in this cURL version");
 #else
 		struct strbuf auth = STRBUF_INIT;
@@ -1514,11 +1517,7 @@ static int curl_append_msgs_to_imap(struct imap_server_conf *server,
 	if (cred.username) {
 		if (res == CURLE_OK)
 			credential_approve(&cred);
-#if LIBCURL_VERSION_NUM >= 0x070d01
 		else if (res == CURLE_LOGIN_DENIED)
-#else
-		else
-#endif
 			credential_reject(&cred);
 	}
 
diff --git a/list-objects.c b/list-objects.c
index 473a332416..2f623f8211 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -337,8 +337,8 @@ static void add_pending_tree(struct rev_info *revs, struct tree *tree)
 	add_pending_object(revs, &tree->object, "");
 }
 
-static void traverse_trees_and_blobs(struct traversal_context *ctx,
-				     struct strbuf *base)
+static void traverse_non_commits(struct traversal_context *ctx,
+				 struct strbuf *base)
 {
 	int i;
 
@@ -410,9 +410,9 @@ static void do_traverse(struct traversal_context *ctx)
 			 * needs a reallocation for each commit. Can we pass the
 			 * tree directory without allocation churn?
 			 */
-			traverse_trees_and_blobs(ctx, &csp);
+			traverse_non_commits(ctx, &csp);
 	}
-	traverse_trees_and_blobs(ctx, &csp);
+	traverse_non_commits(ctx, &csp);
 	strbuf_release(&csp);
 }
 
diff --git a/list.h b/list.h
index eb601192f4..362a4cd7f5 100644
--- a/list.h
+++ b/list.h
@@ -46,7 +46,10 @@ struct list_head {
 #define INIT_LIST_HEAD(ptr) \
 	(ptr)->next = (ptr)->prev = (ptr)
 
-#define LIST_HEAD_INIT(name) { &(name), &(name) }
+#define LIST_HEAD_INIT(name) { \
+	.next = &(name), \
+	.prev = &(name), \
+}
 
 /* Add new element at the head of the list. */
 static inline void list_add(struct list_head *newp, struct list_head *head)
diff --git a/ll-merge.c b/ll-merge.c
index 261657578c..a937cec59a 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -14,7 +14,7 @@
 
 struct ll_merge_driver;
 
-typedef int (*ll_merge_fn)(const struct ll_merge_driver *,
+typedef enum ll_merge_result (*ll_merge_fn)(const struct ll_merge_driver *,
 			   mmbuffer_t *result,
 			   const char *path,
 			   mmfile_t *orig, const char *orig_name,
@@ -49,7 +49,7 @@ void reset_merge_attributes(void)
 /*
  * Built-in low-levels
  */
-static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
+static enum ll_merge_result ll_binary_merge(const struct ll_merge_driver *drv_unused,
 			   mmbuffer_t *result,
 			   const char *path,
 			   mmfile_t *orig, const char *orig_name,
@@ -58,6 +58,7 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
 			   const struct ll_merge_options *opts,
 			   int marker_size)
 {
+	enum ll_merge_result ret;
 	mmfile_t *stolen;
 	assert(opts);
 
@@ -68,16 +69,19 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
 	 */
 	if (opts->virtual_ancestor) {
 		stolen = orig;
+		ret = LL_MERGE_OK;
 	} else {
 		switch (opts->variant) {
 		default:
-			warning("Cannot merge binary files: %s (%s vs. %s)",
-				path, name1, name2);
-			/* fallthru */
+			ret = LL_MERGE_BINARY_CONFLICT;
+			stolen = src1;
+			break;
 		case XDL_MERGE_FAVOR_OURS:
+			ret = LL_MERGE_OK;
 			stolen = src1;
 			break;
 		case XDL_MERGE_FAVOR_THEIRS:
+			ret = LL_MERGE_OK;
 			stolen = src2;
 			break;
 		}
@@ -87,16 +91,10 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
 	result->size = stolen->size;
 	stolen->ptr = NULL;
 
-	/*
-	 * With -Xtheirs or -Xours, we have cleanly merged;
-	 * otherwise we got a conflict.
-	 */
-	return opts->variant == XDL_MERGE_FAVOR_OURS ||
-	       opts->variant == XDL_MERGE_FAVOR_THEIRS ?
-	       0 : 1;
+	return ret;
 }
 
-static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
+static enum ll_merge_result ll_xdl_merge(const struct ll_merge_driver *drv_unused,
 			mmbuffer_t *result,
 			const char *path,
 			mmfile_t *orig, const char *orig_name,
@@ -105,7 +103,9 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
 			const struct ll_merge_options *opts,
 			int marker_size)
 {
+	enum ll_merge_result ret;
 	xmparam_t xmp;
+	int status;
 	assert(opts);
 
 	if (orig->size > MAX_XDIFF_SIZE ||
@@ -133,10 +133,12 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
 	xmp.ancestor = orig_name;
 	xmp.file1 = name1;
 	xmp.file2 = name2;
-	return xdl_merge(orig, src1, src2, &xmp, result);
+	status = xdl_merge(orig, src1, src2, &xmp, result);
+	ret = (status > 0) ? LL_MERGE_CONFLICT : status;
+	return ret;
 }
 
-static int ll_union_merge(const struct ll_merge_driver *drv_unused,
+static enum ll_merge_result ll_union_merge(const struct ll_merge_driver *drv_unused,
 			  mmbuffer_t *result,
 			  const char *path,
 			  mmfile_t *orig, const char *orig_name,
@@ -178,7 +180,7 @@ static void create_temp(mmfile_t *src, char *path, size_t len)
 /*
  * User defined low-level merge driver support.
  */
-static int ll_ext_merge(const struct ll_merge_driver *fn,
+static enum ll_merge_result ll_ext_merge(const struct ll_merge_driver *fn,
 			mmbuffer_t *result,
 			const char *path,
 			mmfile_t *orig, const char *orig_name,
@@ -194,6 +196,7 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
 	const char *args[] = { NULL, NULL };
 	int status, fd, i;
 	struct stat st;
+	enum ll_merge_result ret;
 	assert(opts);
 
 	sq_quote_buf(&path_sq, path);
@@ -236,7 +239,8 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
 		unlink_or_warn(temp[i]);
 	strbuf_release(&cmd);
 	strbuf_release(&path_sq);
-	return status;
+	ret = (status > 0) ? LL_MERGE_CONFLICT : status;
+	return ret;
 }
 
 /*
@@ -362,7 +366,7 @@ static void normalize_file(mmfile_t *mm, const char *path, struct index_state *i
 	}
 }
 
-int ll_merge(mmbuffer_t *result_buf,
+enum ll_merge_result ll_merge(mmbuffer_t *result_buf,
 	     const char *path,
 	     mmfile_t *ancestor, const char *ancestor_label,
 	     mmfile_t *ours, const char *our_label,
diff --git a/ll-merge.h b/ll-merge.h
index aceb1b2413..e4a20e81a3 100644
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -82,13 +82,20 @@ struct ll_merge_options {
 	long xdl_opts;
 };
 
+enum ll_merge_result {
+	LL_MERGE_ERROR = -1,
+	LL_MERGE_OK = 0,
+	LL_MERGE_CONFLICT,
+	LL_MERGE_BINARY_CONFLICT,
+};
+
 /**
  * Perform a three-way single-file merge in core.  This is a thin wrapper
  * around `xdl_merge` that takes the path and any merge backend specified in
  * `.gitattributes` or `.git/info/attributes` into account.
  * Returns 0 for a clean merge.
  */
-int ll_merge(mmbuffer_t *result_buf,
+enum ll_merge_result ll_merge(mmbuffer_t *result_buf,
 	     const char *path,
 	     mmfile_t *ancestor, const char *ancestor_label,
 	     mmfile_t *ours, const char *our_label,
diff --git a/lockfile.h b/lockfile.h
index db93e6ba73..90af4e66b2 100644
--- a/lockfile.h
+++ b/lockfile.h
@@ -121,7 +121,7 @@ struct lock_file {
 	struct tempfile *tempfile;
 };
 
-#define LOCK_INIT { NULL }
+#define LOCK_INIT { 0 }
 
 /* String appended to a filename to derive the lockfile name: */
 #define LOCK_SUFFIX ".lock"
diff --git a/log-tree.c b/log-tree.c
index 7b823786c2..25165e2a91 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -1,12 +1,15 @@
 #include "cache.h"
+#include "commit-reach.h"
 #include "config.h"
 #include "diff.h"
 #include "object-store.h"
 #include "repository.h"
+#include "tmp-objdir.h"
 #include "commit.h"
 #include "tag.h"
 #include "graph.h"
 #include "log-tree.h"
+#include "merge-ort.h"
 #include "reflog-walk.h"
 #include "refs.h"
 #include "string-list.h"
@@ -16,6 +19,7 @@
 #include "line-log.h"
 #include "help.h"
 #include "range-diff.h"
+#include "strmap.h"
 
 static struct decoration name_decoration = { "object names" };
 static int decoration_loaded;
@@ -134,7 +138,8 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid,
 			      int flags, void *cb_data)
 {
 	struct object *obj;
-	enum decoration_type type = DECORATION_NONE;
+	enum object_type objtype;
+	enum decoration_type deco_type = DECORATION_NONE;
 	struct decoration_filter *filter = (struct decoration_filter *)cb_data;
 
 	if (filter && !ref_filter_match(refname, filter))
@@ -155,28 +160,29 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid,
 		return 0;
 	}
 
-	obj = parse_object(the_repository, oid);
-	if (!obj)
+	objtype = oid_object_info(the_repository, oid, NULL);
+	if (objtype < 0)
 		return 0;
+	obj = lookup_object_by_type(the_repository, oid, objtype);
 
 	if (starts_with(refname, "refs/heads/"))
-		type = DECORATION_REF_LOCAL;
+		deco_type = DECORATION_REF_LOCAL;
 	else if (starts_with(refname, "refs/remotes/"))
-		type = DECORATION_REF_REMOTE;
+		deco_type = DECORATION_REF_REMOTE;
 	else if (starts_with(refname, "refs/tags/"))
-		type = DECORATION_REF_TAG;
+		deco_type = DECORATION_REF_TAG;
 	else if (!strcmp(refname, "refs/stash"))
-		type = DECORATION_REF_STASH;
+		deco_type = DECORATION_REF_STASH;
 	else if (!strcmp(refname, "HEAD"))
-		type = DECORATION_REF_HEAD;
+		deco_type = DECORATION_REF_HEAD;
 
-	add_name_decoration(type, refname, obj);
+	add_name_decoration(deco_type, refname, obj);
 	while (obj->type == OBJ_TAG) {
+		if (!obj->parsed)
+			parse_object(the_repository, &obj->oid);
 		obj = ((struct tag *)obj)->tagged;
 		if (!obj)
 			break;
-		if (!obj->parsed)
-			parse_object(the_repository, &obj->oid);
 		add_name_decoration(DECORATION_REF_TAG, refname, obj);
 	}
 	return 0;
@@ -511,12 +517,13 @@ 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);
-	if (status && !sigc.gpg_output)
+	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
-		show_sig_lines(opt, status, sigc.gpg_output);
+		show_sig_lines(opt, status, sigc.output);
 	signature_check_clear(&sigc);
 
  out:
@@ -581,10 +588,11 @@ 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);
-		if (sigc.gpg_output)
-			strbuf_addstr(&verify_message, sigc.gpg_output);
+		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
 			strbuf_addstr(&verify_message, "No signature\n");
 		signature_check_clear(&sigc);
@@ -845,7 +853,7 @@ int log_tree_diff_flush(struct rev_info *opt)
 	opt->shown_dashes = 0;
 	diffcore_std(&opt->diffopt);
 
-	if (diff_queue_is_empty()) {
+	if (diff_queue_is_empty(&opt->diffopt)) {
 		int saved_fmt = opt->diffopt.output_format;
 		opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
 		diff_flush(&opt->diffopt);
@@ -900,6 +908,106 @@ static int do_diff_combined(struct rev_info *opt, struct commit *commit)
 	return !opt->loginfo;
 }
 
+static void setup_additional_headers(struct diff_options *o,
+				     struct strmap *all_headers)
+{
+	struct hashmap_iter iter;
+	struct strmap_entry *entry;
+
+	/*
+	 * Make o->additional_path_headers contain the subset of all_headers
+	 * that match o->pathspec.  If there aren't any that match o->pathspec,
+	 * then make o->additional_path_headers be NULL.
+	 */
+
+	if (!o->pathspec.nr) {
+		o->additional_path_headers = all_headers;
+		return;
+	}
+
+	o->additional_path_headers = xmalloc(sizeof(struct strmap));
+	strmap_init_with_options(o->additional_path_headers, NULL, 0);
+	strmap_for_each_entry(all_headers, &iter, entry) {
+		if (match_pathspec(the_repository->index, &o->pathspec,
+				   entry->key, strlen(entry->key),
+				   0 /* prefix */, NULL /* seen */,
+				   0 /* is_dir */))
+			strmap_put(o->additional_path_headers,
+				   entry->key, entry->value);
+	}
+	if (!strmap_get_size(o->additional_path_headers)) {
+		strmap_clear(o->additional_path_headers, 0);
+		FREE_AND_NULL(o->additional_path_headers);
+	}
+}
+
+static void cleanup_additional_headers(struct diff_options *o)
+{
+	if (!o->pathspec.nr) {
+		o->additional_path_headers = NULL;
+		return;
+	}
+	if (!o->additional_path_headers)
+		return;
+
+	strmap_clear(o->additional_path_headers, 0);
+	FREE_AND_NULL(o->additional_path_headers);
+}
+
+static int do_remerge_diff(struct rev_info *opt,
+			   struct commit_list *parents,
+			   struct object_id *oid,
+			   struct commit *commit)
+{
+	struct merge_options o;
+	struct commit_list *bases;
+	struct merge_result res = {0};
+	struct pretty_print_context ctx = {0};
+	struct commit *parent1 = parents->item;
+	struct commit *parent2 = parents->next->item;
+	struct strbuf parent1_desc = STRBUF_INIT;
+	struct strbuf parent2_desc = STRBUF_INIT;
+
+	/* Setup merge options */
+	init_merge_options(&o, the_repository);
+	o.show_rename_progress = 0;
+	o.record_conflict_msgs_as_headers = 1;
+	o.msg_header_prefix = "remerge";
+
+	ctx.abbrev = DEFAULT_ABBREV;
+	format_commit_message(parent1, "%h (%s)", &parent1_desc, &ctx);
+	format_commit_message(parent2, "%h (%s)", &parent2_desc, &ctx);
+	o.branch1 = parent1_desc.buf;
+	o.branch2 = parent2_desc.buf;
+
+	/* Parse the relevant commits and get the merge bases */
+	parse_commit_or_die(parent1);
+	parse_commit_or_die(parent2);
+	bases = get_merge_bases(parent1, parent2);
+
+	/* Re-merge the parents */
+	merge_incore_recursive(&o, bases, parent1, parent2, &res);
+
+	/* Show the diff */
+	setup_additional_headers(&opt->diffopt, res.path_messages);
+	diff_tree_oid(&res.tree->object.oid, oid, "", &opt->diffopt);
+	log_tree_diff_flush(opt);
+
+	/* Cleanup */
+	cleanup_additional_headers(&opt->diffopt);
+	strbuf_release(&parent1_desc);
+	strbuf_release(&parent2_desc);
+	merge_finalize(&o, &res);
+
+	/* Clean up the contents of the temporary object directory */
+	if (opt->remerge_objdir)
+		tmp_objdir_discard_objects(opt->remerge_objdir);
+	else
+		BUG("did a remerge diff without remerge_objdir?!?");
+
+	return !opt->loginfo;
+}
+
 /*
  * Show the diff of a commit.
  *
@@ -934,6 +1042,18 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
 	}
 
 	if (is_merge) {
+		int octopus = (parents->next->next != NULL);
+
+		if (opt->remerge_diff) {
+			if (octopus) {
+				show_log(opt);
+				fprintf(opt->diffopt.file,
+					"diff: warning: Skipping remerge-diff "
+					"for octopus merges.\n");
+				return 1;
+			}
+			return do_remerge_diff(opt, parents, oid, commit);
+		}
 		if (opt->combine_merges)
 			return do_diff_combined(opt, commit);
 		if (opt->separate_merges) {
diff --git a/log-tree.h b/log-tree.h
index 1e8c91dbf2..e7e4641cf8 100644
--- a/log-tree.h
+++ b/log-tree.h
@@ -14,10 +14,8 @@ struct decoration_filter {
 };
 
 int parse_decorate_color_config(const char *var, const char *slot_name, const char *value);
-void init_log_tree_opt(struct rev_info *);
 int log_tree_diff_flush(struct rev_info *);
 int log_tree_commit(struct rev_info *, struct commit *);
-int log_tree_opt_parse(struct rev_info *, const char **, int);
 void show_log(struct rev_info *opt);
 void format_decorations_extended(struct strbuf *sb, const struct commit *commit,
 			     int use_color,
diff --git a/ls-refs.c b/ls-refs.c
index 88f6c3f60d..54078323dc 100644
--- a/ls-refs.c
+++ b/ls-refs.c
@@ -41,6 +41,12 @@ static void ensure_config_read(void)
 }
 
 /*
+ * If we see this many or more "ref-prefix" lines from the client, we consider
+ * it "too many" and will avoid using the prefix feature entirely.
+ */
+#define TOO_MANY_PREFIXES 65536
+
+/*
  * Check if one of the prefixes is a prefix of the ref.
  * If no prefixes were provided, all refs match.
  */
@@ -65,6 +71,7 @@ struct ls_refs_data {
 	unsigned peel;
 	unsigned symrefs;
 	struct strvec prefixes;
+	struct strbuf buf;
 	unsigned unborn : 1;
 };
 
@@ -73,7 +80,8 @@ static int send_ref(const char *refname, const struct object_id *oid,
 {
 	struct ls_refs_data *data = cb_data;
 	const char *refname_nons = strip_namespace(refname);
-	struct strbuf refline = STRBUF_INIT;
+
+	strbuf_reset(&data->buf);
 
 	if (ref_is_hidden(refname_nons, refname))
 		return 0;
@@ -82,9 +90,9 @@ static int send_ref(const char *refname, const struct object_id *oid,
 		return 0;
 
 	if (oid)
-		strbuf_addf(&refline, "%s %s", oid_to_hex(oid), refname_nons);
+		strbuf_addf(&data->buf, "%s %s", oid_to_hex(oid), refname_nons);
 	else
-		strbuf_addf(&refline, "unborn %s", refname_nons);
+		strbuf_addf(&data->buf, "unborn %s", refname_nons);
 	if (data->symrefs && flag & REF_ISSYMREF) {
 		struct object_id unused;
 		const char *symref_target = resolve_ref_unsafe(refname, 0,
@@ -94,20 +102,19 @@ static int send_ref(const char *refname, const struct object_id *oid,
 		if (!symref_target)
 			die("'%s' is a symref but it is not?", refname);
 
-		strbuf_addf(&refline, " symref-target:%s",
+		strbuf_addf(&data->buf, " symref-target:%s",
 			    strip_namespace(symref_target));
 	}
 
 	if (data->peel && oid) {
 		struct object_id peeled;
 		if (!peel_iterated_oid(oid, &peeled))
-			strbuf_addf(&refline, " peeled:%s", oid_to_hex(&peeled));
+			strbuf_addf(&data->buf, " peeled:%s", oid_to_hex(&peeled));
 	}
 
-	strbuf_addch(&refline, '\n');
-	packet_write(1, refline.buf, refline.len);
+	strbuf_addch(&data->buf, '\n');
+	packet_fwrite(stdout, data->buf.buf, data->buf.len);
 
-	strbuf_release(&refline);
 	return 0;
 }
 
@@ -138,13 +145,13 @@ static int ls_refs_config(const char *var, const char *value, void *data)
 	return parse_hide_refs_config(var, value, "uploadpack");
 }
 
-int ls_refs(struct repository *r, struct strvec *keys,
-	    struct packet_reader *request)
+int ls_refs(struct repository *r, struct packet_reader *request)
 {
 	struct ls_refs_data data;
 
 	memset(&data, 0, sizeof(data));
 	strvec_init(&data.prefixes);
+	strbuf_init(&data.buf, 0);
 
 	ensure_config_read();
 	git_config(ls_refs_config, NULL);
@@ -157,22 +164,35 @@ int ls_refs(struct repository *r, struct strvec *keys,
 			data.peel = 1;
 		else if (!strcmp("symrefs", arg))
 			data.symrefs = 1;
-		else if (skip_prefix(arg, "ref-prefix ", &out))
-			strvec_push(&data.prefixes, out);
+		else if (skip_prefix(arg, "ref-prefix ", &out)) {
+			if (data.prefixes.nr < TOO_MANY_PREFIXES)
+				strvec_push(&data.prefixes, out);
+		}
 		else if (!strcmp("unborn", arg))
 			data.unborn = allow_unborn;
+		else
+			die(_("unexpected line: '%s'"), arg);
 	}
 
 	if (request->status != PACKET_READ_FLUSH)
 		die(_("expected flush after ls-refs arguments"));
 
+	/*
+	 * If we saw too many prefixes, we must avoid using them at all; as
+	 * soon as we have any prefix, they are meant to form a comprehensive
+	 * list.
+	 */
+	if (data.prefixes.nr >= TOO_MANY_PREFIXES)
+		strvec_clear(&data.prefixes);
+
 	send_possibly_unborn_head(&data);
 	if (!data.prefixes.nr)
 		strvec_push(&data.prefixes, "");
 	for_each_fullref_in_prefixes(get_git_namespace(), data.prefixes.v,
-				     send_ref, &data, 0);
-	packet_flush(1);
+				     send_ref, &data);
+	packet_fflush(stdout);
 	strvec_clear(&data.prefixes);
+	strbuf_release(&data.buf);
 	return 0;
 }
 
diff --git a/ls-refs.h b/ls-refs.h
index a99e4be0bd..e2243a547b 100644
--- a/ls-refs.h
+++ b/ls-refs.h
@@ -2,10 +2,8 @@
 #define LS_REFS_H
 
 struct repository;
-struct strvec;
 struct packet_reader;
-int ls_refs(struct repository *r, struct strvec *keys,
-	    struct packet_reader *request);
+int ls_refs(struct repository *r, struct packet_reader *request);
 int ls_refs_advertise(struct repository *r, struct strbuf *value);
 
 #endif /* LS_REFS_H */
diff --git a/mailmap.c b/mailmap.c
index d1f7c0d272..40ce152024 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -8,6 +8,7 @@
 #define debug_mm(...) fprintf(stderr, __VA_ARGS__)
 #define debug_str(X) ((X) ? (X) : "(none)")
 #else
+__attribute__((format (printf, 1, 2)))
 static inline void debug_mm(const char *format, ...) {}
 static inline const char *debug_str(const char *s) { return s; }
 #endif
@@ -36,6 +37,7 @@ static void free_mailmap_info(void *p, const char *s)
 		 s, debug_str(mi->name), debug_str(mi->email));
 	free(mi->name);
 	free(mi->email);
+	free(mi);
 }
 
 static void free_mailmap_entry(void *p, const char *s)
@@ -51,6 +53,7 @@ static void free_mailmap_entry(void *p, const char *s)
 
 	me->namemap.strdup_strings = 1;
 	string_list_clear_func(&me->namemap, free_mailmap_info);
+	free(me);
 }
 
 /*
diff --git a/mem-pool.c b/mem-pool.c
index ccdcad2e3d..599d8e895f 100644
--- a/mem-pool.c
+++ b/mem-pool.c
@@ -8,6 +8,26 @@
 #define BLOCK_GROWTH_SIZE (1024 * 1024 - sizeof(struct mp_block))
 
 /*
+ * The inner union is an approximation for C11's max_align_t, and the
+ * struct + offsetof computes _Alignof. This can all just be replaced
+ * with _Alignof(max_align_t) if/when C11 is part of the baseline.
+ * Note that _Alignof(X) need not be the same as sizeof(X); it's only
+ * required to be a (possibly trivial) factor. They are the same for
+ * most architectures, but m68k for example has only 2-byte alignment
+ * for its 4-byte and 8-byte types, so using sizeof would waste space.
+ *
+ * Add more types to the union if the current set is insufficient.
+ */
+struct git_max_alignment {
+	char unalign;
+	union {
+		uintmax_t max_align_uintmax;
+		void *max_align_pointer;
+	} aligned;
+};
+#define GIT_MAX_ALIGNMENT offsetof(struct git_max_alignment, aligned)
+
+/*
  * Allocate a new mp_block and insert it after the block specified in
  * `insert_after`. If `insert_after` is NULL, then insert block at the
  * head of the linked list.
@@ -69,9 +89,9 @@ void *mem_pool_alloc(struct mem_pool *pool, size_t len)
 	struct mp_block *p = NULL;
 	void *r;
 
-	/* round up to a 'uintmax_t' alignment */
-	if (len & (sizeof(uintmax_t) - 1))
-		len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));
+	/* round up to a 'GIT_MAX_ALIGNMENT' alignment */
+	if (len & (GIT_MAX_ALIGNMENT - 1))
+		len += GIT_MAX_ALIGNMENT - (len & (GIT_MAX_ALIGNMENT - 1));
 
 	if (pool->mp_block &&
 	    pool->mp_block->end - pool->mp_block->next_free >= len)
diff --git a/merge-blobs.c b/merge-blobs.c
index ee0a0e90c9..8138090f81 100644
--- a/merge-blobs.c
+++ b/merge-blobs.c
@@ -36,7 +36,7 @@ static void *three_way_filemerge(struct index_state *istate,
 				 mmfile_t *their,
 				 unsigned long *size)
 {
-	int merge_status;
+	enum ll_merge_result merge_status;
 	mmbuffer_t res;
 
 	/*
@@ -50,6 +50,9 @@ static void *three_way_filemerge(struct index_state *istate,
 				istate, NULL);
 	if (merge_status < 0)
 		return NULL;
+	if (merge_status == LL_MERGE_BINARY_CONFLICT)
+		warning("Cannot merge binary files: %s (%s vs. %s)",
+			path, ".our", ".their");
 
 	*size = res.size;
 	return res.ptr;
diff --git a/merge-ort.c b/merge-ort.c
index 8cfa0ccd3c..d85b1cd99e 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -32,6 +32,7 @@
 #include "promisor-remote.h"
 #include "revision.h"
 #include "strmap.h"
+#include "submodule-config.h"
 #include "submodule.h"
 #include "tree.h"
 #include "unpack-trees.h"
@@ -62,6 +63,53 @@ struct traversal_callback_data {
 	struct name_entry names[3];
 };
 
+struct deferred_traversal_data {
+	/*
+	 * possible_trivial_merges: directories to be explored only when needed
+	 *
+	 * possible_trivial_merges is a map of directory names to
+	 * dir_rename_mask.  When we detect that a directory is unchanged on
+	 * one side, we can sometimes resolve the directory without recursing
+	 * into it.  Renames are the only things that can prevent such an
+	 * optimization.  However, for rename sources:
+	 *   - If no parent directory needed directory rename detection, then
+	 *     no path under such a directory can be a relevant_source.
+	 * and for rename destinations:
+	 *   - If no cached rename has a target path under the directory AND
+	 *   - If there are no unpaired relevant_sources elsewhere in the
+	 *     repository
+	 * then we don't need any path under this directory for a rename
+	 * destination.  The only way to know the last item above is to defer
+	 * handling such directories until the end of collect_merge_info(),
+	 * in handle_deferred_entries().
+	 *
+	 * For each we store dir_rename_mask, since that's the only bit of
+	 * information we need, other than the path, to resume the recursive
+	 * traversal.
+	 */
+	struct strintmap possible_trivial_merges;
+
+	/*
+	 * trivial_merges_okay: if trivial directory merges are okay
+	 *
+	 * See possible_trivial_merges above.  The "no unpaired
+	 * relevant_sources elsewhere in the repository" is a single boolean
+	 * per merge side, which we store here.  Note that while 0 means no,
+	 * 1 only means "maybe" rather than "yes"; we optimistically set it
+	 * to 1 initially and only clear when we determine it is unsafe to
+	 * do trivial directory merges.
+	 */
+	unsigned trivial_merges_okay;
+
+	/*
+	 * target_dirs: ancestor directories of rename targets
+	 *
+	 * target_dirs contains all directory names that are an ancestor of
+	 * any rename destination.
+	 */
+	struct strset target_dirs;
+};
+
 struct rename_info {
 	/*
 	 * All variables that are arrays of size 3 correspond to data tracked
@@ -119,6 +167,8 @@ struct rename_info {
 	 */
 	struct strintmap relevant_sources[3];
 
+	struct deferred_traversal_data deferred[3];
+
 	/*
 	 * dir_rename_mask:
 	 *   0: optimization removing unmodified potential rename source okay
@@ -164,6 +214,7 @@ struct rename_info {
 	 *   MERGE_SIDE2: cached data from side2 can be reused
 	 *   MERGE_SIDE1: cached data from side1 can be reused
 	 *   0:           no cached data can be reused
+	 *   -1:          See redo_after_renames; both sides can be reused.
 	 */
 	int cached_pairs_valid_side;
 
@@ -210,6 +261,28 @@ struct rename_info {
 	struct strset cached_irrelevant[3];
 
 	/*
+	 * redo_after_renames: optimization flag for "restarting" the merge
+	 *
+	 * Sometimes it pays to detect renames, cache them, and then
+	 * restart the merge operation from the beginning.  The reason for
+	 * this is that when we know where all the renames are, we know
+	 * whether a certain directory has any paths under it affected --
+	 * and if a directory is not affected then it permits us to do
+	 * trivial tree merging in more cases.  Doing trivial tree merging
+	 * prevents the need to run process_entry() on every path
+	 * underneath trees that can be trivially merged, and
+	 * process_entry() is more expensive than collect_merge_info() --
+	 * plus, the second collect_merge_info() will be much faster since
+	 * it doesn't have to recurse into the relevant trees.
+	 *
+	 * Values for this flag:
+	 *   0 = don't bother, not worth it (or conditions not yet checked)
+	 *   1 = conditions for optimization met, optimization worthwhile
+	 *   2 = we already did it (don't restart merge yet again)
+	 */
+	unsigned redo_after_renames;
+
+	/*
 	 * needed_limit: value needed for inexact rename detection to run
 	 *
 	 * If the current rename limit wasn't high enough for inexact
@@ -231,8 +304,6 @@ struct merge_options_internal {
 	 *   * these keys serve to intern all the path strings, which allows
 	 *     us to do pointer comparison on directory names instead of
 	 *     strcmp; we just have to be careful to use the interned strings.
-	 *     (Technically paths_to_free may track some strings that were
-	 *      removed from froms paths.)
 	 *
 	 * The values of paths:
 	 *   * either a pointer to a merged_info, or a conflict_info struct
@@ -268,14 +339,14 @@ struct merge_options_internal {
 	struct strmap conflicted;
 
 	/*
-	 * paths_to_free: additional list of strings to free
+	 * pool: memory pool for fast allocation/deallocation
 	 *
-	 * If keys are removed from "paths", they are added to paths_to_free
-	 * to ensure they are later freed.  We avoid free'ing immediately since
-	 * other places (e.g. conflict_info.pathnames[]) may still be
-	 * referencing these paths.
+	 * We allocate room for lots of filenames and auxiliary data
+	 * structures in merge_options_internal, and it tends to all be
+	 * freed together too.  Using a memory pool for these provides a
+	 * nice speedup.
 	 */
-	struct string_list paths_to_free;
+	struct mem_pool pool;
 
 	/*
 	 * output: special messages and conflict notices for various paths
@@ -447,60 +518,47 @@ static void clear_or_reinit_internal_opts(struct merge_options_internal *opti,
 {
 	struct rename_info *renames = &opti->renames;
 	int i;
-	void (*strmap_func)(struct strmap *, int) =
+	void (*strmap_clear_func)(struct strmap *, int) =
 		reinitialize ? strmap_partial_clear : strmap_clear;
-	void (*strintmap_func)(struct strintmap *) =
+	void (*strintmap_clear_func)(struct strintmap *) =
 		reinitialize ? strintmap_partial_clear : strintmap_clear;
-	void (*strset_func)(struct strset *) =
+	void (*strset_clear_func)(struct strset *) =
 		reinitialize ? strset_partial_clear : strset_clear;
 
-	/*
-	 * We marked opti->paths with strdup_strings = 0, so that we
-	 * wouldn't have to make another copy of the fullpath created by
-	 * make_traverse_path from setup_path_info().  But, now that we've
-	 * used it and have no other references to these strings, it is time
-	 * to deallocate them.
-	 */
-	free_strmap_strings(&opti->paths);
-	strmap_func(&opti->paths, 1);
+	strmap_clear_func(&opti->paths, 0);
 
 	/*
 	 * All keys and values in opti->conflicted are a subset of those in
 	 * opti->paths.  We don't want to deallocate anything twice, so we
 	 * don't free the keys and we pass 0 for free_values.
 	 */
-	strmap_func(&opti->conflicted, 0);
-
-	/*
-	 * opti->paths_to_free is similar to opti->paths; we created it with
-	 * strdup_strings = 0 to avoid making _another_ copy of the fullpath
-	 * but now that we've used it and have no other references to these
-	 * strings, it is time to deallocate them.  We do so by temporarily
-	 * setting strdup_strings to 1.
-	 */
-	opti->paths_to_free.strdup_strings = 1;
-	string_list_clear(&opti->paths_to_free, 0);
-	opti->paths_to_free.strdup_strings = 0;
+	strmap_clear_func(&opti->conflicted, 0);
 
 	if (opti->attr_index.cache_nr) /* true iff opt->renormalize */
 		discard_index(&opti->attr_index);
 
 	/* Free memory used by various renames maps */
 	for (i = MERGE_SIDE1; i <= MERGE_SIDE2; ++i) {
-		strintmap_func(&renames->dirs_removed[i]);
-		strmap_func(&renames->dir_renames[i], 0);
-		strintmap_func(&renames->relevant_sources[i]);
+		strintmap_clear_func(&renames->dirs_removed[i]);
+		strmap_clear_func(&renames->dir_renames[i], 0);
+		strintmap_clear_func(&renames->relevant_sources[i]);
 		if (!reinitialize)
 			assert(renames->cached_pairs_valid_side == 0);
-		if (i != renames->cached_pairs_valid_side) {
-			strset_func(&renames->cached_target_names[i]);
-			strmap_func(&renames->cached_pairs[i], 1);
-			strset_func(&renames->cached_irrelevant[i]);
+		if (i != renames->cached_pairs_valid_side &&
+		    -1 != renames->cached_pairs_valid_side) {
+			strset_clear_func(&renames->cached_target_names[i]);
+			strmap_clear_func(&renames->cached_pairs[i], 1);
+			strset_clear_func(&renames->cached_irrelevant[i]);
 			partial_clear_dir_rename_count(&renames->dir_rename_count[i]);
 			if (!reinitialize)
 				strmap_clear(&renames->dir_rename_count[i], 1);
 		}
 	}
+	for (i = MERGE_SIDE1; i <= MERGE_SIDE2; ++i) {
+		strintmap_clear_func(&renames->deferred[i].possible_trivial_merges);
+		strset_clear_func(&renames->deferred[i].target_dirs);
+		renames->deferred[i].trivial_merges_okay = 1; /* 1 == maybe */
+	}
 	renames->cached_pairs_valid_side = 0;
 	renames->dir_rename_mask = 0;
 
@@ -525,11 +583,14 @@ static void clear_or_reinit_internal_opts(struct merge_options_internal *opti,
 		strmap_clear(&opti->output, 0);
 	}
 
+	mem_pool_discard(&opti->pool, 0);
+
 	/* Clean out callback_data as well. */
 	FREE_AND_NULL(renames->callback_data);
 	renames->callback_data_nr = renames->callback_data_alloc = 0;
 }
 
+__attribute__((format (printf, 2, 3)))
 static int err(struct merge_options *opt, const char *err, ...)
 {
 	va_list params;
@@ -548,6 +609,7 @@ static int err(struct merge_options *opt, const char *err, ...)
 
 static void format_commit(struct strbuf *sb,
 			  int indent,
+			  struct repository *repo,
 			  struct commit *commit)
 {
 	struct merge_remote_desc *desc;
@@ -561,7 +623,7 @@ static void format_commit(struct strbuf *sb,
 		return;
 	}
 
-	format_commit_message(commit, "%h %s", sb, &ctx);
+	repo_format_commit_message(repo, commit, "%h %s", sb, &ctx);
 	strbuf_addch(sb, '\n');
 }
 
@@ -572,20 +634,84 @@ static void path_msg(struct merge_options *opt,
 		     const char *fmt, ...)
 {
 	va_list ap;
-	struct strbuf *sb = strmap_get(&opt->priv->output, path);
+	struct strbuf *sb, *dest;
+	struct strbuf tmp = STRBUF_INIT;
+
+	if (opt->record_conflict_msgs_as_headers && omittable_hint)
+		return; /* Do not record mere hints in headers */
+	if (opt->record_conflict_msgs_as_headers && opt->priv->call_depth)
+		return; /* Do not record inner merge issues in headers */
+	sb = strmap_get(&opt->priv->output, path);
 	if (!sb) {
 		sb = xmalloc(sizeof(*sb));
 		strbuf_init(sb, 0);
 		strmap_put(&opt->priv->output, path, sb);
 	}
 
+	dest = (opt->record_conflict_msgs_as_headers ? &tmp : sb);
+
 	va_start(ap, fmt);
-	strbuf_vaddf(sb, fmt, ap);
+	strbuf_vaddf(dest, fmt, ap);
 	va_end(ap);
 
+	if (opt->record_conflict_msgs_as_headers) {
+		int i_sb = 0, i_tmp = 0;
+
+		/* Start with the specified prefix */
+		if (opt->msg_header_prefix)
+			strbuf_addf(sb, "%s ", opt->msg_header_prefix);
+
+		/* Copy tmp to sb, adding spaces after newlines */
+		strbuf_grow(sb, sb->len + 2*tmp.len); /* more than sufficient */
+		for (; i_tmp < tmp.len; i_tmp++, i_sb++) {
+			/* Copy next character from tmp to sb */
+			sb->buf[sb->len + i_sb] = tmp.buf[i_tmp];
+
+			/* If we copied a newline, add a space */
+			if (tmp.buf[i_tmp] == '\n')
+				sb->buf[++i_sb] = ' ';
+		}
+		/* Update length and ensure it's NUL-terminated */
+		sb->len += i_sb;
+		sb->buf[sb->len] = '\0';
+
+		strbuf_release(&tmp);
+	}
+
+	/* Add final newline character to sb */
 	strbuf_addch(sb, '\n');
 }
 
+static struct diff_filespec *pool_alloc_filespec(struct mem_pool *pool,
+						 const char *path)
+{
+	/* Similar to alloc_filespec(), but allocate from pool and reuse path */
+	struct diff_filespec *spec;
+
+	spec = mem_pool_calloc(pool, 1, sizeof(*spec));
+	spec->path = (char*)path; /* spec won't modify it */
+
+	spec->count = 1;
+	spec->is_binary = -1;
+	return spec;
+}
+
+static struct diff_filepair *pool_diff_queue(struct mem_pool *pool,
+					     struct diff_queue_struct *queue,
+					     struct diff_filespec *one,
+					     struct diff_filespec *two)
+{
+	/* Same code as diff_queue(), except allocate from pool */
+	struct diff_filepair *dp;
+
+	dp = mem_pool_calloc(pool, 1, sizeof(*dp));
+	dp->one = one;
+	dp->two = two;
+	if (queue)
+		diff_q(queue, dp);
+	return dp;
+}
+
 /* add a string to a strbuf, but converting "/" to "_" */
 static void add_flattened_path(struct strbuf *out, const char *s)
 {
@@ -714,8 +840,9 @@ static void setup_path_info(struct merge_options *opt,
 	assert(!df_conflict || !resolved); /* df_conflict implies !resolved */
 	assert(resolved == (merged_version != NULL));
 
-	mi = xcalloc(1, resolved ? sizeof(struct merged_info) :
-				   sizeof(struct conflict_info));
+	mi = mem_pool_calloc(&opt->priv->pool, 1,
+			     resolved ? sizeof(struct merged_info) :
+					sizeof(struct conflict_info));
 	mi->directory_name = current_dir_name;
 	mi->basename_offset = current_dir_name_len;
 	mi->clean = !!resolved;
@@ -812,11 +939,11 @@ static void add_pair(struct merge_options *opt,
 			return;
 	}
 
-	one = alloc_filespec(pathname);
-	two = alloc_filespec(pathname);
+	one = pool_alloc_filespec(&opt->priv->pool, pathname);
+	two = pool_alloc_filespec(&opt->priv->pool, pathname);
 	fill_filespec(is_add ? two : one,
 		      &names[names_idx].oid, 1, names[names_idx].mode);
-	diff_queue(&renames->pairs[side], one, two);
+	pool_diff_queue(&opt->priv->pool, &renames->pairs[side], one, two);
 }
 
 static void collect_rename_info(struct merge_options *opt,
@@ -1007,7 +1134,7 @@ static int collect_merge_info_callback(int n,
 	len = traverse_path_len(info, p->pathlen);
 
 	/* +1 in both of the following lines to include the NUL byte */
-	fullpath = xmalloc(len + 1);
+	fullpath = mem_pool_alloc(&opt->priv->pool, len + 1);
 	make_traverse_path(fullpath, len + 1, info, p->path, p->pathlen);
 
 	/*
@@ -1018,20 +1145,67 @@ static int collect_merge_info_callback(int n,
 	if (side1_matches_mbase && side2_matches_mbase) {
 		/* mbase, side1, & side2 all match; use mbase as resolution */
 		setup_path_info(opt, &pi, dirname, info->pathlen, fullpath,
-				names, names+0, mbase_null, 0,
+				names, names+0, mbase_null, 0 /* df_conflict */,
+				filemask, dirmask, 1 /* resolved */);
+		return mask;
+	}
+
+	/*
+	 * If the sides match, and all three paths are present and are
+	 * files, then we can take either as the resolution.  We can't do
+	 * this with trees, because there may be rename sources from the
+	 * merge_base.
+	 */
+	if (sides_match && filemask == 0x07) {
+		/* use side1 (== side2) version as resolution */
+		setup_path_info(opt, &pi, dirname, info->pathlen, fullpath,
+				names, names+1, side1_null, 0,
+				filemask, dirmask, 1);
+		return mask;
+	}
+
+	/*
+	 * If side1 matches mbase and all three paths are present and are
+	 * files, then we can use side2 as the resolution.  We cannot
+	 * necessarily do so this for trees, because there may be rename
+	 * destinations within side2.
+	 */
+	if (side1_matches_mbase && filemask == 0x07) {
+		/* use side2 version as resolution */
+		setup_path_info(opt, &pi, dirname, info->pathlen, fullpath,
+				names, names+2, side2_null, 0,
+				filemask, dirmask, 1);
+		return mask;
+	}
+
+	/* Similar to above but swapping sides 1 and 2 */
+	if (side2_matches_mbase && filemask == 0x07) {
+		/* use side1 version as resolution */
+		setup_path_info(opt, &pi, dirname, info->pathlen, fullpath,
+				names, names+1, side1_null, 0,
 				filemask, dirmask, 1);
 		return mask;
 	}
 
 	/*
-	 * Gather additional information used in rename detection.
+	 * Sometimes we can tell that a source path need not be included in
+	 * rename detection -- namely, whenever either
+	 *    side1_matches_mbase && side2_null
+	 * or
+	 *    side2_matches_mbase && side1_null
+	 * However, we call collect_rename_info() even in those cases,
+	 * because exact renames are cheap and would let us remove both a
+	 * source and destination path.  We'll cull the unneeded sources
+	 * later.
 	 */
 	collect_rename_info(opt, names, dirname, fullpath,
 			    filemask, dirmask, match_mask);
 
 	/*
-	 * Record information about the path so we can resolve later in
-	 * process_entries.
+	 * None of the special cases above matched, so we have a
+	 * provisional conflict.  (Rename detection might allow us to
+	 * unconflict some more cases, but that comes later so all we can
+	 * do now is record the different non-null file hashes.)
 	 */
 	setup_path_info(opt, &pi, dirname, info->pathlen, fullpath,
 			names, NULL, 0, df_conflict, filemask, dirmask, 0);
@@ -1046,8 +1220,36 @@ static int collect_merge_info_callback(int n,
 		struct tree_desc t[3];
 		void *buf[3] = {NULL, NULL, NULL};
 		const char *original_dir_name;
-		int i, ret;
+		int i, ret, side;
+
+		/*
+		 * Check for whether we can avoid recursing due to one side
+		 * matching the merge base.  The side that does NOT match is
+		 * the one that might have a rename destination we need.
+		 */
+		assert(!side1_matches_mbase || !side2_matches_mbase);
+		side = side1_matches_mbase ? MERGE_SIDE2 :
+			side2_matches_mbase ? MERGE_SIDE1 : MERGE_BASE;
+		if (filemask == 0 && (dirmask == 2 || dirmask == 4)) {
+			/*
+			 * Also defer recursing into new directories; set up a
+			 * few variables to let us do so.
+			 */
+			ci->match_mask = (7 - dirmask);
+			side = dirmask / 2;
+		}
+		if (renames->dir_rename_mask != 0x07 &&
+		    side != MERGE_BASE &&
+		    renames->deferred[side].trivial_merges_okay &&
+		    !strset_contains(&renames->deferred[side].target_dirs,
+				     pi.string)) {
+			strintmap_set(&renames->deferred[side].possible_trivial_merges,
+				      pi.string, renames->dir_rename_mask);
+			renames->dir_rename_mask = prev_dir_rename_mask;
+			return mask;
+		}
 
+		/* We need to recurse */
 		ci->match_mask &= filemask;
 		newinfo = *info;
 		newinfo.prev = info;
@@ -1101,6 +1303,192 @@ static int collect_merge_info_callback(int n,
 	return mask;
 }
 
+static void resolve_trivial_directory_merge(struct conflict_info *ci, int side)
+{
+	VERIFY_CI(ci);
+	assert((side == 1 && ci->match_mask == 5) ||
+	       (side == 2 && ci->match_mask == 3));
+	oidcpy(&ci->merged.result.oid, &ci->stages[side].oid);
+	ci->merged.result.mode = ci->stages[side].mode;
+	ci->merged.is_null = is_null_oid(&ci->stages[side].oid);
+	ci->match_mask = 0;
+	ci->merged.clean = 1; /* (ci->filemask == 0); */
+}
+
+static int handle_deferred_entries(struct merge_options *opt,
+				   struct traverse_info *info)
+{
+	struct rename_info *renames = &opt->priv->renames;
+	struct hashmap_iter iter;
+	struct strmap_entry *entry;
+	int side, ret = 0;
+	int path_count_before, path_count_after = 0;
+
+	path_count_before = strmap_get_size(&opt->priv->paths);
+	for (side = MERGE_SIDE1; side <= MERGE_SIDE2; side++) {
+		unsigned optimization_okay = 1;
+		struct strintmap copy;
+
+		/* Loop over the set of paths we need to know rename info for */
+		strset_for_each_entry(&renames->relevant_sources[side],
+				      &iter, entry) {
+			char *rename_target, *dir, *dir_marker;
+			struct strmap_entry *e;
+
+			/*
+			 * If we don't know delete/rename info for this path,
+			 * then we need to recurse into all trees to get all
+			 * adds to make sure we have it.
+			 */
+			if (strset_contains(&renames->cached_irrelevant[side],
+					    entry->key))
+				continue;
+			e = strmap_get_entry(&renames->cached_pairs[side],
+					     entry->key);
+			if (!e) {
+				optimization_okay = 0;
+				break;
+			}
+
+			/* If this is a delete, we have enough info already */
+			rename_target = e->value;
+			if (!rename_target)
+				continue;
+
+			/* If we already walked the rename target, we're good */
+			if (strmap_contains(&opt->priv->paths, rename_target))
+				continue;
+
+			/*
+			 * Otherwise, we need to get a list of directories that
+			 * will need to be recursed into to get this
+			 * rename_target.
+			 */
+			dir = xstrdup(rename_target);
+			while ((dir_marker = strrchr(dir, '/'))) {
+				*dir_marker = '\0';
+				if (strset_contains(&renames->deferred[side].target_dirs,
+						    dir))
+					break;
+				strset_add(&renames->deferred[side].target_dirs,
+					   dir);
+			}
+			free(dir);
+		}
+		renames->deferred[side].trivial_merges_okay = optimization_okay;
+		/*
+		 * We need to recurse into any directories in
+		 * possible_trivial_merges[side] found in target_dirs[side].
+		 * But when we recurse, we may need to queue up some of the
+		 * subdirectories for possible_trivial_merges[side].  Since
+		 * we can't safely iterate through a hashmap while also adding
+		 * entries, move the entries into 'copy', iterate over 'copy',
+		 * and then we'll also iterate anything added into
+		 * possible_trivial_merges[side] once this loop is done.
+		 */
+		copy = renames->deferred[side].possible_trivial_merges;
+		strintmap_init_with_options(&renames->deferred[side].possible_trivial_merges,
+					    0,
+					    &opt->priv->pool,
+					    0);
+		strintmap_for_each_entry(&copy, &iter, entry) {
+			const char *path = entry->key;
+			unsigned dir_rename_mask = (intptr_t)entry->value;
+			struct conflict_info *ci;
+			unsigned dirmask;
+			struct tree_desc t[3];
+			void *buf[3] = {NULL,};
+			int i;
+
+			ci = strmap_get(&opt->priv->paths, path);
+			VERIFY_CI(ci);
+			dirmask = ci->dirmask;
+
+			if (optimization_okay &&
+			    !strset_contains(&renames->deferred[side].target_dirs,
+					     path)) {
+				resolve_trivial_directory_merge(ci, side);
+				continue;
+			}
+
+			info->name = path;
+			info->namelen = strlen(path);
+			info->pathlen = info->namelen + 1;
+
+			for (i = 0; i < 3; i++, dirmask >>= 1) {
+				if (i == 1 && ci->match_mask == 3)
+					t[1] = t[0];
+				else if (i == 2 && ci->match_mask == 5)
+					t[2] = t[0];
+				else if (i == 2 && ci->match_mask == 6)
+					t[2] = t[1];
+				else {
+					const struct object_id *oid = NULL;
+					if (dirmask & 1)
+						oid = &ci->stages[i].oid;
+					buf[i] = fill_tree_descriptor(opt->repo,
+								      t+i, oid);
+				}
+			}
+
+			ci->match_mask &= ci->filemask;
+			opt->priv->current_dir_name = path;
+			renames->dir_rename_mask = dir_rename_mask;
+			if (renames->dir_rename_mask == 0 ||
+			    renames->dir_rename_mask == 0x07)
+				ret = traverse_trees(NULL, 3, t, info);
+			else
+				ret = traverse_trees_wrapper(NULL, 3, t, info);
+
+			for (i = MERGE_BASE; i <= MERGE_SIDE2; i++)
+				free(buf[i]);
+
+			if (ret < 0)
+				return ret;
+		}
+		strintmap_clear(&copy);
+		strintmap_for_each_entry(&renames->deferred[side].possible_trivial_merges,
+					 &iter, entry) {
+			const char *path = entry->key;
+			struct conflict_info *ci;
+
+			ci = strmap_get(&opt->priv->paths, path);
+			VERIFY_CI(ci);
+
+			assert(renames->deferred[side].trivial_merges_okay &&
+			       !strset_contains(&renames->deferred[side].target_dirs,
+						path));
+			resolve_trivial_directory_merge(ci, side);
+		}
+		if (!optimization_okay || path_count_after)
+			path_count_after = strmap_get_size(&opt->priv->paths);
+	}
+	if (path_count_after) {
+		/*
+		 * The choice of wanted_factor here does not affect
+		 * correctness, only performance.  When the
+		 *    path_count_after / path_count_before
+		 * ratio is high, redoing after renames is a big
+		 * performance boost.  I suspect that redoing is a wash
+		 * somewhere near a value of 2, and below that redoing will
+		 * slow things down.  I applied a fudge factor and picked
+		 * 3; see the commit message when this was introduced for
+		 * back of the envelope calculations for this ratio.
+		 */
+		const int wanted_factor = 3;
+
+		/* We should only redo collect_merge_info one time */
+		assert(renames->redo_after_renames == 0);
+
+		if (path_count_after / path_count_before >= wanted_factor) {
+			renames->redo_after_renames = 1;
+			renames->cached_pairs_valid_side = -1;
+		}
+	} else if (renames->redo_after_renames == 2)
+		renames->redo_after_renames = 0;
+	return ret;
+}
+
 static int collect_merge_info(struct merge_options *opt,
 			      struct tree *merge_base,
 			      struct tree *side1,
@@ -1126,6 +1514,8 @@ static int collect_merge_info(struct merge_options *opt,
 
 	trace2_region_enter("merge", "traverse_trees", opt->repo);
 	ret = traverse_trees(NULL, 3, t, &info);
+	if (ret == 0)
+		ret = handle_deferred_entries(opt, &info);
 	trace2_region_leave("merge", "traverse_trees", opt->repo);
 
 	return ret;
@@ -1157,7 +1547,6 @@ static int find_first_merges(struct repository *repo,
 	xsnprintf(merged_revision, sizeof(merged_revision), "^%s",
 		  oid_to_hex(&a->object.oid));
 	repo_init_revisions(repo, &revs, NULL);
-	rev_opts.submodule = path;
 	/* FIXME: can't handle linked worktrees in submodules yet */
 	revs.single_worktree = path != NULL;
 	setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts);
@@ -1167,7 +1556,7 @@ static int find_first_merges(struct repository *repo,
 		die("revision walk setup failed");
 	while ((commit = get_revision(&revs)) != NULL) {
 		struct object *o = &(commit->object);
-		if (in_merge_bases(b, commit))
+		if (repo_in_merge_bases(repo, b, commit))
 			add_object_array(o, NULL, &merges);
 	}
 	reset_revision_walk();
@@ -1182,7 +1571,7 @@ static int find_first_merges(struct repository *repo,
 		contains_another = 0;
 		for (j = 0; j < merges.nr; j++) {
 			struct commit *m2 = (struct commit *) merges.objects[j].item;
-			if (i != j && in_merge_bases(m2, m1)) {
+			if (i != j && repo_in_merge_bases(repo, m2, m1)) {
 				contains_another = 1;
 				break;
 			}
@@ -1203,10 +1592,12 @@ static int merge_submodule(struct merge_options *opt,
 			   const struct object_id *b,
 			   struct object_id *result)
 {
+	struct repository subrepo;
+	struct strbuf sb = STRBUF_INIT;
+	int ret = 0;
 	struct commit *commit_o, *commit_a, *commit_b;
 	int parent_count;
 	struct object_array merges;
-	struct strbuf sb = STRBUF_INIT;
 
 	int i;
 	int search = !opt->priv->call_depth;
@@ -1222,46 +1613,48 @@ static int merge_submodule(struct merge_options *opt,
 	if (is_null_oid(b))
 		return 0;
 
-	if (add_submodule_odb(path)) {
+	if (repo_submodule_init(&subrepo, opt->repo, path, null_oid())) {
 		path_msg(opt, path, 0,
-			 _("Failed to merge submodule %s (not checked out)"),
-			 path);
+				_("Failed to merge submodule %s (not checked out)"),
+				path);
 		return 0;
 	}
 
-	if (!(commit_o = lookup_commit_reference(opt->repo, o)) ||
-	    !(commit_a = lookup_commit_reference(opt->repo, a)) ||
-	    !(commit_b = lookup_commit_reference(opt->repo, b))) {
+	if (!(commit_o = lookup_commit_reference(&subrepo, o)) ||
+	    !(commit_a = lookup_commit_reference(&subrepo, a)) ||
+	    !(commit_b = lookup_commit_reference(&subrepo, b))) {
 		path_msg(opt, path, 0,
 			 _("Failed to merge submodule %s (commits not present)"),
 			 path);
-		return 0;
+		goto cleanup;
 	}
 
 	/* check whether both changes are forward */
-	if (!in_merge_bases(commit_o, commit_a) ||
-	    !in_merge_bases(commit_o, commit_b)) {
+	if (!repo_in_merge_bases(&subrepo, commit_o, commit_a) ||
+	    !repo_in_merge_bases(&subrepo, commit_o, commit_b)) {
 		path_msg(opt, path, 0,
 			 _("Failed to merge submodule %s "
 			   "(commits don't follow merge-base)"),
 			 path);
-		return 0;
+		goto cleanup;
 	}
 
 	/* Case #1: a is contained in b or vice versa */
-	if (in_merge_bases(commit_a, commit_b)) {
+	if (repo_in_merge_bases(&subrepo, commit_a, commit_b)) {
 		oidcpy(result, b);
 		path_msg(opt, path, 1,
 			 _("Note: Fast-forwarding submodule %s to %s"),
 			 path, oid_to_hex(b));
-		return 1;
+		ret = 1;
+		goto cleanup;
 	}
-	if (in_merge_bases(commit_b, commit_a)) {
+	if (repo_in_merge_bases(&subrepo, commit_b, commit_a)) {
 		oidcpy(result, a);
 		path_msg(opt, path, 1,
 			 _("Note: Fast-forwarding submodule %s to %s"),
 			 path, oid_to_hex(a));
-		return 1;
+		ret = 1;
+		goto cleanup;
 	}
 
 	/*
@@ -1273,10 +1666,10 @@ static int merge_submodule(struct merge_options *opt,
 
 	/* Skip the search if makes no sense to the calling context.  */
 	if (!search)
-		return 0;
+		goto cleanup;
 
 	/* find commit which merges them */
-	parent_count = find_first_merges(opt->repo, path, commit_a, commit_b,
+	parent_count = find_first_merges(&subrepo, path, commit_a, commit_b,
 					 &merges);
 	switch (parent_count) {
 	case 0:
@@ -1284,7 +1677,7 @@ static int merge_submodule(struct merge_options *opt,
 		break;
 
 	case 1:
-		format_commit(&sb, 4,
+		format_commit(&sb, 4, &subrepo,
 			      (struct commit *)merges.objects[0].item);
 		path_msg(opt, path, 0,
 			 _("Failed to merge submodule %s, but a possible merge "
@@ -1301,7 +1694,7 @@ static int merge_submodule(struct merge_options *opt,
 		break;
 	default:
 		for (i = 0; i < merges.nr; i++)
-			format_commit(&sb, 4,
+			format_commit(&sb, 4, &subrepo,
 				      (struct commit *)merges.objects[i].item);
 		path_msg(opt, path, 0,
 			 _("Failed to merge submodule %s, but multiple "
@@ -1310,7 +1703,9 @@ static int merge_submodule(struct merge_options *opt,
 	}
 
 	object_array_clear(&merges);
-	return 0;
+cleanup:
+	repo_clear(&subrepo);
+	return ret;
 }
 
 static void initialize_attr_index(struct merge_options *opt)
@@ -1382,7 +1777,7 @@ static int merge_3way(struct merge_options *opt,
 	mmfile_t orig, src1, src2;
 	struct ll_merge_options ll_opts = {0};
 	char *base, *name1, *name2;
-	int merge_status;
+	enum ll_merge_result merge_status;
 
 	if (!opt->priv->attr_index.initialized)
 		initialize_attr_index(opt);
@@ -1426,6 +1821,10 @@ static int merge_3way(struct merge_options *opt,
 	merge_status = ll_merge(result_buf, path, &orig, base,
 				&src1, name1, &src2, name2,
 				&opt->priv->attr_index, &ll_opts);
+	if (merge_status == LL_MERGE_BINARY_CONFLICT)
+		path_msg(opt, path, 0,
+			 "warning: Cannot merge binary files: %s (%s vs. %s)",
+			 path, name1, name2);
 
 	free(base);
 	free(name1);
@@ -1951,12 +2350,17 @@ static void apply_directory_rename_modifications(struct merge_options *opt,
 	VERIFY_CI(ci);
 
 	/* Find parent directories missing from opt->priv->paths */
-	cur_path = new_path;
+	cur_path = mem_pool_strdup(&opt->priv->pool, new_path);
+	free((char*)new_path);
+	new_path = (char *)cur_path;
+
 	while (1) {
 		/* Find the parent directory of cur_path */
 		char *last_slash = strrchr(cur_path, '/');
 		if (last_slash) {
-			parent_name = xstrndup(cur_path, last_slash - cur_path);
+			parent_name = mem_pool_strndup(&opt->priv->pool,
+						       cur_path,
+						       last_slash - cur_path);
 		} else {
 			parent_name = opt->priv->toplevel_dir;
 			break;
@@ -1965,7 +2369,6 @@ static void apply_directory_rename_modifications(struct merge_options *opt,
 		/* Look it up in opt->priv->paths */
 		entry = strmap_get_entry(&opt->priv->paths, parent_name);
 		if (entry) {
-			free((char*)parent_name);
 			parent_name = entry->key; /* reuse known pointer */
 			break;
 		}
@@ -1992,13 +2395,6 @@ static void apply_directory_rename_modifications(struct merge_options *opt,
 		parent_name = cur_dir;
 	}
 
-	/*
-	 * We are removing old_path from opt->priv->paths.  old_path also will
-	 * eventually need to be freed, but it may still be used by e.g.
-	 * ci->pathnames.  So, store it in another string-list for now.
-	 */
-	string_list_append(&opt->priv->paths_to_free, old_path);
-
 	assert(ci->filemask == 2 || ci->filemask == 4);
 	assert(ci->dirmask == 0);
 	strmap_remove(&opt->priv->paths, old_path, 0);
@@ -2032,7 +2428,6 @@ static void apply_directory_rename_modifications(struct merge_options *opt,
 		new_ci->stages[index].mode = ci->stages[index].mode;
 		oidcpy(&new_ci->stages[index].oid, &ci->stages[index].oid);
 
-		free(ci);
 		ci = new_ci;
 	}
 
@@ -2059,7 +2454,7 @@ static void apply_directory_rename_modifications(struct merge_options *opt,
 		 */
 		ci->path_conflict = 1;
 		if (pair->status == 'A')
-			path_msg(opt, new_path, 0,
+			path_msg(opt, new_path, 1,
 				 _("CONFLICT (file location): %s added in %s "
 				   "inside a directory that was renamed in %s, "
 				   "suggesting it should perhaps be moved to "
@@ -2067,7 +2462,7 @@ static void apply_directory_rename_modifications(struct merge_options *opt,
 				 old_path, branch_with_new_path,
 				 branch_with_dir_rename, new_path);
 		else
-			path_msg(opt, new_path, 0,
+			path_msg(opt, new_path, 1,
 				 _("CONFLICT (file location): %s renamed to %s "
 				   "in %s, inside a directory that was renamed "
 				   "in %s, suggesting it should perhaps be "
@@ -2460,10 +2855,23 @@ static void use_cached_pairs(struct merge_options *opt,
 		if (!new_name)
 			new_name = old_name;
 
+		/*
+		 * cached_pairs has *copies* of old_name and new_name,
+		 * because it has to persist across merges.  Since
+		 * pool_alloc_filespec() will just re-use the existing
+		 * filenames, which will also get re-used by
+		 * opt->priv->paths if they become renames, and then
+		 * get freed at the end of the merge, that would leave
+		 * the copy in cached_pairs dangling.  Avoid this by
+		 * making a copy here.
+		 */
+		old_name = mem_pool_strdup(&opt->priv->pool, old_name);
+		new_name = mem_pool_strdup(&opt->priv->pool, new_name);
+
 		/* We don't care about oid/mode, only filenames and status */
-		one = alloc_filespec(old_name);
-		two = alloc_filespec(new_name);
-		diff_queue(pairs, one, two);
+		one = pool_alloc_filespec(&opt->priv->pool, old_name);
+		two = pool_alloc_filespec(&opt->priv->pool, new_name);
+		pool_diff_queue(&opt->priv->pool, pairs, one, two);
 		pairs->queue[pairs->nr-1]->status = entry->value ? 'R' : 'D';
 	}
 }
@@ -2538,8 +2946,8 @@ static int compare_pairs(const void *a_, const void *b_)
 }
 
 /* Call diffcore_rename() to update deleted/added pairs into rename pairs */
-static void detect_regular_renames(struct merge_options *opt,
-				   unsigned side_index)
+static int detect_regular_renames(struct merge_options *opt,
+				  unsigned side_index)
 {
 	struct diff_options diff_opts;
 	struct rename_info *renames = &opt->priv->renames;
@@ -2552,7 +2960,7 @@ static void detect_regular_renames(struct merge_options *opt,
 		 * side had directory renames.
 		 */
 		resolve_diffpair_statuses(&renames->pairs[side_index]);
-		return;
+		return 0;
 	}
 
 	partial_clear_dir_rename_count(&renames->dir_rename_count[side_index]);
@@ -2562,7 +2970,7 @@ static void detect_regular_renames(struct merge_options *opt,
 	diff_opts.detect_rename = DIFF_DETECT_RENAME;
 	diff_opts.rename_limit = opt->rename_limit;
 	if (opt->rename_limit <= 0)
-		diff_opts.rename_limit = 1000;
+		diff_opts.rename_limit = 7000;
 	diff_opts.rename_score = opt->rename_score;
 	diff_opts.show_rename_progress = opt->show_rename_progress;
 	diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
@@ -2571,6 +2979,7 @@ static void detect_regular_renames(struct merge_options *opt,
 	diff_queued_diff = renames->pairs[side_index];
 	trace2_region_enter("diff", "diffcore_rename", opt->repo);
 	diffcore_rename_extended(&diff_opts,
+				 &opt->priv->pool,
 				 &renames->relevant_sources[side_index],
 				 &renames->dirs_removed[side_index],
 				 &renames->dir_rename_count[side_index],
@@ -2578,6 +2987,8 @@ static void detect_regular_renames(struct merge_options *opt,
 	trace2_region_leave("diff", "diffcore_rename", opt->repo);
 	resolve_diffpair_statuses(&diff_queued_diff);
 
+	if (diff_opts.needed_rename_limit > 0)
+		renames->redo_after_renames = 0;
 	if (diff_opts.needed_rename_limit > renames->needed_limit)
 		renames->needed_limit = diff_opts.needed_rename_limit;
 
@@ -2587,6 +2998,8 @@ static void detect_regular_renames(struct merge_options *opt,
 	diff_queued_diff.nr = 0;
 	diff_queued_diff.queue = NULL;
 	diff_flush(&diff_opts);
+
+	return 1;
 }
 
 /*
@@ -2617,7 +3030,7 @@ static int collect_renames(struct merge_options *opt,
 
 		if (p->status != 'A' && p->status != 'R') {
 			possibly_cache_new_pair(renames, p, side_index, NULL);
-			diff_free_filepair(p);
+			pool_diff_free_filepair(&opt->priv->pool, p);
 			continue;
 		}
 
@@ -2630,7 +3043,7 @@ static int collect_renames(struct merge_options *opt,
 
 		possibly_cache_new_pair(renames, p, side_index, new_path);
 		if (p->status != 'R' && !new_path) {
-			diff_free_filepair(p);
+			pool_diff_free_filepair(&opt->priv->pool, p);
 			continue;
 		}
 
@@ -2676,14 +3089,36 @@ static int detect_and_process_renames(struct merge_options *opt,
 	struct diff_queue_struct combined;
 	struct rename_info *renames = &opt->priv->renames;
 	int need_dir_renames, s, clean = 1;
+	unsigned detection_run = 0;
 
 	memset(&combined, 0, sizeof(combined));
 	if (!possible_renames(renames))
 		goto cleanup;
 
 	trace2_region_enter("merge", "regular renames", opt->repo);
-	detect_regular_renames(opt, MERGE_SIDE1);
-	detect_regular_renames(opt, MERGE_SIDE2);
+	detection_run |= detect_regular_renames(opt, MERGE_SIDE1);
+	detection_run |= detect_regular_renames(opt, MERGE_SIDE2);
+	if (renames->needed_limit) {
+		renames->cached_pairs_valid_side = 0;
+		renames->redo_after_renames = 0;
+	}
+	if (renames->redo_after_renames && detection_run) {
+		int i, side;
+		struct diff_filepair *p;
+
+		/* Cache the renames, we found */
+		for (side = MERGE_SIDE1; side <= MERGE_SIDE2; side++) {
+			for (i = 0; i < renames->pairs[side].nr; ++i) {
+				p = renames->pairs[side].queue[i];
+				possibly_cache_new_pair(renames, p, side, NULL);
+			}
+		}
+
+		/* Restart the merge with the cached renames */
+		renames->redo_after_renames = 2;
+		trace2_region_leave("merge", "regular renames", opt->repo);
+		goto cleanup;
+	}
 	use_cached_pairs(opt, &renames->cached_pairs[1], &renames->pairs[1]);
 	use_cached_pairs(opt, &renames->cached_pairs[2], &renames->pairs[2]);
 	trace2_region_leave("merge", "regular renames", opt->repo);
@@ -2730,7 +3165,7 @@ cleanup:
 		side_pairs = &renames->pairs[s];
 		for (i = 0; i < side_pairs->nr; ++i) {
 			struct diff_filepair *p = side_pairs->queue[i];
-			diff_free_filepair(p);
+			pool_diff_free_filepair(&opt->priv->pool, p);
 		}
 	}
 
@@ -2743,7 +3178,8 @@ simple_cleanup:
 	if (combined.nr) {
 		int i;
 		for (i = 0; i < combined.nr; i++)
-			diff_free_filepair(combined.queue[i]);
+			pool_diff_free_filepair(&opt->priv->pool,
+						combined.queue[i]);
 		free(combined.queue);
 	}
 
@@ -3217,7 +3653,8 @@ static void process_entry(struct merge_options *opt,
 		 * the directory to remain here, so we need to move this
 		 * path to some new location.
 		 */
-		CALLOC_ARRAY(new_ci, 1);
+		new_ci = mem_pool_calloc(&opt->priv->pool, 1, sizeof(*new_ci));
+
 		/* We don't really want new_ci->merged.result copied, but it'll
 		 * be overwritten below so it doesn't matter.  We also don't
 		 * want any directory mode/oid values copied, but we'll zero
@@ -3309,7 +3746,8 @@ static void process_entry(struct merge_options *opt,
 			const char *a_path = NULL, *b_path = NULL;
 			int rename_a = 0, rename_b = 0;
 
-			new_ci = xmalloc(sizeof(*new_ci));
+			new_ci = mem_pool_alloc(&opt->priv->pool,
+						sizeof(*new_ci));
 
 			if (S_ISREG(a_mode))
 				rename_a = 1;
@@ -3378,17 +3816,8 @@ static void process_entry(struct merge_options *opt,
 				b_path = path;
 			strmap_put(&opt->priv->paths, b_path, new_ci);
 
-			if (rename_a && rename_b) {
+			if (rename_a && rename_b)
 				strmap_remove(&opt->priv->paths, path, 0);
-				/*
-				 * We removed path from opt->priv->paths.  path
-				 * will also eventually need to be freed, but
-				 * it may still be used by e.g.  ci->pathnames.
-				 * So, store it in another string-list for now.
-				 */
-				string_list_append(&opt->priv->paths_to_free,
-						   path);
-			}
 
 			/*
 			 * Do special handling for b_path since process_entry()
@@ -3454,9 +3883,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)) {
 			/*
@@ -3665,11 +4107,7 @@ static int checkout(struct merge_options *opt,
 	unpack_opts.quiet = 0; /* FIXME: sequencer might want quiet? */
 	unpack_opts.verbose_update = (opt->verbosity > 2);
 	unpack_opts.fn = twoway_merge;
-	if (1/* FIXME: opts->overwrite_ignore*/) {
-		CALLOC_ARRAY(unpack_opts.dir, 1);
-		unpack_opts.dir->flags |= DIR_SHOW_IGNORED;
-		setup_standard_excludes(unpack_opts.dir);
-	}
+	unpack_opts.preserve_ignored = 0; /* FIXME: !opts->overwrite_ignore */
 	parse_tree(prev);
 	init_tree_desc(&trees[0], prev->buffer, prev->size);
 	parse_tree(next);
@@ -3677,8 +4115,6 @@ static int checkout(struct merge_options *opt,
 
 	ret = unpack_trees(2, trees, &unpack_opts);
 	clear_unpack_trees_porcelain(&unpack_opts);
-	dir_clear(unpack_opts.dir);
-	FREE_AND_NULL(unpack_opts.dir);
 	return ret;
 }
 
@@ -3694,6 +4130,21 @@ static int record_conflicted_index_entries(struct merge_options *opt)
 	if (strmap_empty(&opt->priv->conflicted))
 		return 0;
 
+	/*
+	 * We are in a conflicted state. These conflicts might be inside
+	 * sparse-directory entries, so check if any entries are outside
+	 * of the sparse-checkout cone preemptively.
+	 *
+	 * We set original_cache_nr below, but that might change if
+	 * index_name_pos() calls ask for paths within sparse directories.
+	 */
+	strmap_for_each_entry(&opt->priv->conflicted, &iter, e) {
+		if (!path_in_sparse_checkout(e->key, index)) {
+			ensure_full_index(index);
+			break;
+		}
+	}
+
 	/* If any entries have skip_worktree set, we'll have to check 'em out */
 	state.force = 1;
 	state.quiet = 1;
@@ -3701,7 +4152,7 @@ static int record_conflicted_index_entries(struct merge_options *opt)
 	state.istate = index;
 	original_cache_nr = index->cache_nr;
 
-	/* Put every entry from paths into plist, then sort */
+	/* Append every entry from conflicted into index, then sort */
 	strmap_for_each_entry(&opt->priv->conflicted, &iter, e) {
 		const char *path = e->key;
 		struct conflict_info *ci = e->value;
@@ -3846,6 +4297,9 @@ void merge_switch_to_result(struct merge_options *opt,
 		struct string_list olist = STRING_LIST_INIT_NODUP;
 		int i;
 
+		if (opt->record_conflict_msgs_as_headers)
+			BUG("Either display conflict messages or record them as headers, not both");
+
 		trace2_region_enter("merge", "display messages", opt->repo);
 
 		/* Hack to pre-allocate olist to the desired size */
@@ -3929,6 +4383,7 @@ static void merge_start(struct merge_options *opt, struct merge_result *result)
 {
 	struct rename_info *renames;
 	int i;
+	struct mem_pool *pool = NULL;
 
 	/* Sanity checks on opt */
 	trace2_region_enter("merge", "sanity checks", opt->repo);
@@ -3946,6 +4401,9 @@ static void merge_start(struct merge_options *opt, struct merge_result *result)
 	assert(opt->recursive_variant >= MERGE_VARIANT_NORMAL &&
 	       opt->recursive_variant <= MERGE_VARIANT_THEIRS);
 
+	if (opt->msg_header_prefix)
+		assert(opt->record_conflict_msgs_as_headers);
+
 	/*
 	 * detect_renames, verbosity, buffer_output, and obuf are ignored
 	 * fields that were used by "recursive" rather than "ort" -- but
@@ -3994,9 +4452,11 @@ static void merge_start(struct merge_options *opt, struct merge_result *result)
 
 	/* Initialization of various renames fields */
 	renames = &opt->priv->renames;
+	mem_pool_init(&opt->priv->pool, 0);
+	pool = &opt->priv->pool;
 	for (i = MERGE_SIDE1; i <= MERGE_SIDE2; i++) {
 		strintmap_init_with_options(&renames->dirs_removed[i],
-					    NOT_RELEVANT, NULL, 0);
+					    NOT_RELEVANT, pool, 0);
 		strmap_init_with_options(&renames->dir_rename_count[i],
 					 NULL, 1);
 		strmap_init_with_options(&renames->dir_renames[i],
@@ -4010,7 +4470,7 @@ static void merge_start(struct merge_options *opt, struct merge_result *result)
 		 */
 		strintmap_init_with_options(&renames->relevant_sources[i],
 					    -1 /* explicitly invalid */,
-					    NULL, 0);
+					    pool, 0);
 		strmap_init_with_options(&renames->cached_pairs[i],
 					 NULL, 1);
 		strset_init_with_options(&renames->cached_irrelevant[i],
@@ -4018,19 +4478,25 @@ static void merge_start(struct merge_options *opt, struct merge_result *result)
 		strset_init_with_options(&renames->cached_target_names[i],
 					 NULL, 0);
 	}
+	for (i = MERGE_SIDE1; i <= MERGE_SIDE2; i++) {
+		strintmap_init_with_options(&renames->deferred[i].possible_trivial_merges,
+					    0, pool, 0);
+		strset_init_with_options(&renames->deferred[i].target_dirs,
+					 pool, 1);
+		renames->deferred[i].trivial_merges_okay = 1; /* 1 == maybe */
+	}
 
 	/*
 	 * Although we initialize opt->priv->paths with strdup_strings=0,
 	 * that's just to avoid making yet another copy of an allocated
 	 * string.  Putting the entry into paths means we are taking
-	 * ownership, so we will later free it.  paths_to_free is similar.
+	 * ownership, so we will later free it.
 	 *
 	 * In contrast, conflicted just has a subset of keys from paths, so
 	 * we don't want to free those (it'd be a duplicate free).
 	 */
-	strmap_init_with_options(&opt->priv->paths, NULL, 0);
-	strmap_init_with_options(&opt->priv->conflicted, NULL, 0);
-	string_list_init_nodup(&opt->priv->paths_to_free);
+	strmap_init_with_options(&opt->priv->paths, pool, 0);
+	strmap_init_with_options(&opt->priv->conflicted, pool, 0);
 
 	/*
 	 * keys & strbufs in output will sometimes need to outlive "paths",
@@ -4106,6 +4572,7 @@ static void merge_ort_nonrecursive_internal(struct merge_options *opt,
 					       opt->subtree_shift);
 	}
 
+redo:
 	trace2_region_enter("merge", "collect_merge_info", opt->repo);
 	if (collect_merge_info(opt, merge_base, side1, side2) != 0) {
 		/*
@@ -4125,12 +4592,19 @@ static void merge_ort_nonrecursive_internal(struct merge_options *opt,
 	result->clean = detect_and_process_renames(opt, merge_base,
 						   side1, side2);
 	trace2_region_leave("merge", "renames", opt->repo);
+	if (opt->priv->renames.redo_after_renames == 2) {
+		trace2_region_enter("merge", "reset_maps", opt->repo);
+		clear_or_reinit_internal_opts(opt->priv, 1);
+		trace2_region_leave("merge", "reset_maps", opt->repo);
+		goto redo;
+	}
 
 	trace2_region_enter("merge", "process_entries", opt->repo);
 	process_entries(opt, &working_tree_oid);
 	trace2_region_leave("merge", "process_entries", opt->repo);
 
 	/* Set return values */
+	result->path_messages = &opt->priv->output;
 	result->tree = parse_tree_indirect(&working_tree_oid);
 	/* existence of conflicted entries implies unclean */
 	result->clean &= strmap_empty(&opt->priv->conflicted);
@@ -4150,7 +4624,7 @@ static void merge_ort_internal(struct merge_options *opt,
 			       struct commit *h2,
 			       struct merge_result *result)
 {
-	struct commit_list *iter;
+	struct commit *next;
 	struct commit *merged_merge_bases;
 	const char *ancestor_name;
 	struct strbuf merge_base_abbrev = STRBUF_INIT;
@@ -4179,7 +4653,8 @@ static void merge_ort_internal(struct merge_options *opt,
 		ancestor_name = merge_base_abbrev.buf;
 	}
 
-	for (iter = merge_bases; iter; iter = iter->next) {
+	for (next = pop_commit(&merge_bases); next;
+	     next = pop_commit(&merge_bases)) {
 		const char *saved_b1, *saved_b2;
 		struct commit *prev = merged_merge_bases;
 
@@ -4196,7 +4671,7 @@ static void merge_ort_internal(struct merge_options *opt,
 		saved_b2 = opt->branch2;
 		opt->branch1 = "Temporary merge branch 1";
 		opt->branch2 = "Temporary merge branch 2";
-		merge_ort_internal(opt, NULL, prev, iter->item, result);
+		merge_ort_internal(opt, NULL, prev, next, result);
 		if (result->clean < 0)
 			return;
 		opt->branch1 = saved_b1;
@@ -4207,8 +4682,7 @@ static void merge_ort_internal(struct merge_options *opt,
 							 result->tree,
 							 "merged tree");
 		commit_list_insert(prev, &merged_merge_bases->parents);
-		commit_list_insert(iter->item,
-				   &merged_merge_bases->parents->next);
+		commit_list_insert(next, &merged_merge_bases->parents->next);
 
 		clear_or_reinit_internal_opts(opt->priv, 1);
 	}
diff --git a/merge-ort.h b/merge-ort.h
index c011864ffe..fe599b8786 100644
--- a/merge-ort.h
+++ b/merge-ort.h
@@ -5,6 +5,7 @@
 
 struct commit;
 struct tree;
+struct strmap;
 
 struct merge_result {
 	/*
@@ -24,6 +25,15 @@ struct merge_result {
 	struct tree *tree;
 
 	/*
+	 * Special messages and conflict notices for various paths
+	 *
+	 * This is a map of pathnames to strbufs.  It contains various
+	 * warning/conflict/notice messages (possibly multiple per path)
+	 * that callers may want to use.
+	 */
+	struct strmap *path_messages;
+
+	/*
 	 * Additional metadata used by merge_switch_to_result() or future calls
 	 * to merge_incore_*().  Includes data needed to update the index (if
 	 * !clean) and to print "CONFLICT" messages.  Not for external use.
diff --git a/merge-recursive.c b/merge-recursive.c
index a67bf2acfa..9ec1e6d043 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -24,6 +24,7 @@
 #include "repository.h"
 #include "revision.h"
 #include "string-list.h"
+#include "submodule-config.h"
 #include "submodule.h"
 #include "tag.h"
 #include "tree-walk.h"
@@ -55,15 +56,7 @@ static int path_hashmap_cmp(const void *cmp_data,
 	a = container_of(eptr, const struct path_hashmap_entry, e);
 	b = container_of(entry_or_key, const struct path_hashmap_entry, e);
 
-	if (ignore_case)
-		return strcasecmp(a->path, key ? key : b->path);
-	else
-		return strcmp(a->path, key ? key : b->path);
-}
-
-static unsigned int path_hash(const char *path)
-{
-	return ignore_case ? strihash(path) : strhash(path);
+	return fspathcmp(a->path, key ? key : b->path);
 }
 
 /*
@@ -167,6 +160,7 @@ static void flush_output(struct merge_options *opt)
 	}
 }
 
+__attribute__((format (printf, 2, 3)))
 static int err(struct merge_options *opt, const char *err, ...)
 {
 	va_list params;
@@ -340,7 +334,9 @@ static void output(struct merge_options *opt, int v, const char *fmt, ...)
 		flush_output(opt);
 }
 
-static void output_commit_title(struct merge_options *opt, struct commit *commit)
+static void repo_output_commit_title(struct merge_options *opt,
+				     struct repository *repo,
+				     struct commit *commit)
 {
 	struct merge_remote_desc *desc;
 
@@ -349,23 +345,29 @@ static void output_commit_title(struct merge_options *opt, struct commit *commit
 	if (desc)
 		strbuf_addf(&opt->obuf, "virtual %s\n", desc->name);
 	else {
-		strbuf_add_unique_abbrev(&opt->obuf, &commit->object.oid,
-					 DEFAULT_ABBREV);
+		strbuf_repo_add_unique_abbrev(&opt->obuf, repo,
+					      &commit->object.oid,
+					      DEFAULT_ABBREV);
 		strbuf_addch(&opt->obuf, ' ');
-		if (parse_commit(commit) != 0)
+		if (repo_parse_commit(repo, commit) != 0)
 			strbuf_addstr(&opt->obuf, _("(bad commit)\n"));
 		else {
 			const char *title;
-			const char *msg = get_commit_buffer(commit, NULL);
+			const char *msg = repo_get_commit_buffer(repo, commit, NULL);
 			int len = find_commit_subject(msg, &title);
 			if (len)
 				strbuf_addf(&opt->obuf, "%.*s\n", len, title);
-			unuse_commit_buffer(commit, msg);
+			repo_unuse_commit_buffer(repo, commit, msg);
 		}
 	}
 	flush_output(opt);
 }
 
+static void output_commit_title(struct merge_options *opt, struct commit *commit)
+{
+	repo_output_commit_title(opt, the_repository, commit);
+}
+
 static int add_cacheinfo(struct merge_options *opt,
 			 const struct diff_filespec *blob,
 			 const char *path, int stage, int refresh, int options)
@@ -415,8 +417,11 @@ static int unpack_trees_start(struct merge_options *opt,
 	memset(&opt->priv->unpack_opts, 0, sizeof(opt->priv->unpack_opts));
 	if (opt->priv->call_depth)
 		opt->priv->unpack_opts.index_only = 1;
-	else
+	else {
 		opt->priv->unpack_opts.update = 1;
+		/* FIXME: should only do this if !overwrite_ignore */
+		opt->priv->unpack_opts.preserve_ignored = 0;
+	}
 	opt->priv->unpack_opts.merge = 1;
 	opt->priv->unpack_opts.head_idx = 2;
 	opt->priv->unpack_opts.fn = threeway_merge;
@@ -462,7 +467,7 @@ static int save_files_dirs(const struct object_id *oid,
 	strbuf_addstr(base, path);
 
 	FLEX_ALLOC_MEM(entry, path, base->buf, base->len);
-	hashmap_entry_init(&entry->e, path_hash(entry->path));
+	hashmap_entry_init(&entry->e, fspathhash(entry->path));
 	hashmap_add(&opt->priv->current_file_dir_set, &entry->e);
 
 	strbuf_setlen(base, baselen);
@@ -736,14 +741,14 @@ static char *unique_path(struct merge_options *opt,
 
 	base_len = newpath.len;
 	while (hashmap_get_from_hash(&opt->priv->current_file_dir_set,
-				     path_hash(newpath.buf), newpath.buf) ||
+				     fspathhash(newpath.buf), newpath.buf) ||
 	       (!opt->priv->call_depth && file_exists(newpath.buf))) {
 		strbuf_setlen(&newpath, base_len);
 		strbuf_addf(&newpath, "_%d", suffix++);
 	}
 
 	FLEX_ALLOC_MEM(entry, path, newpath.buf, newpath.len);
-	hashmap_entry_init(&entry->e, path_hash(entry->path));
+	hashmap_entry_init(&entry->e, fspathhash(entry->path));
 	hashmap_add(&opt->priv->current_file_dir_set, &entry->e);
 	return strbuf_detach(&newpath, NULL);
 }
@@ -1039,7 +1044,7 @@ static int merge_3way(struct merge_options *opt,
 	mmfile_t orig, src1, src2;
 	struct ll_merge_options ll_opts = {0};
 	char *base, *name1, *name2;
-	int merge_status;
+	enum ll_merge_result merge_status;
 
 	ll_opts.renormalize = opt->renormalize;
 	ll_opts.extra_marker_size = extra_marker_size;
@@ -1085,6 +1090,9 @@ static int merge_3way(struct merge_options *opt,
 	merge_status = ll_merge(result_buf, a->path, &orig, base,
 				&src1, name1, &src2, name2,
 				opt->repo->index, &ll_opts);
+	if (merge_status == LL_MERGE_BINARY_CONFLICT)
+		warning("Cannot merge binary files: %s (%s vs. %s)",
+			a->path, name1, name2);
 
 	free(base);
 	free(name1);
@@ -1117,7 +1125,6 @@ static int find_first_merges(struct repository *repo,
 	xsnprintf(merged_revision, sizeof(merged_revision), "^%s",
 		  oid_to_hex(&a->object.oid));
 	repo_init_revisions(repo, &revs, NULL);
-	rev_opts.submodule = path;
 	/* FIXME: can't handle linked worktrees in submodules yet */
 	revs.single_worktree = path != NULL;
 	setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts);
@@ -1127,7 +1134,7 @@ static int find_first_merges(struct repository *repo,
 		die("revision walk setup failed");
 	while ((commit = get_revision(&revs)) != NULL) {
 		struct object *o = &(commit->object);
-		if (in_merge_bases(b, commit))
+		if (repo_in_merge_bases(repo, b, commit))
 			add_object_array(o, NULL, &merges);
 	}
 	reset_revision_walk();
@@ -1142,7 +1149,7 @@ static int find_first_merges(struct repository *repo,
 		contains_another = 0;
 		for (j = 0; j < merges.nr; j++) {
 			struct commit *m2 = (struct commit *) merges.objects[j].item;
-			if (i != j && in_merge_bases(m2, m1)) {
+			if (i != j && repo_in_merge_bases(repo, m2, m1)) {
 				contains_another = 1;
 				break;
 			}
@@ -1156,14 +1163,14 @@ static int find_first_merges(struct repository *repo,
 	return result->nr;
 }
 
-static void print_commit(struct commit *commit)
+static void print_commit(struct repository *repo, struct commit *commit)
 {
 	struct strbuf sb = STRBUF_INIT;
 	struct pretty_print_context ctx = {0};
 	ctx.date_mode.type = DATE_NORMAL;
 	/* FIXME: Merge this with output_commit_title() */
 	assert(!merge_remote_util(commit));
-	format_commit_message(commit, " %h: %m %s", &sb, &ctx);
+	repo_format_commit_message(repo, commit, " %h: %m %s", &sb, &ctx);
 	fprintf(stderr, "%s\n", sb.buf);
 	strbuf_release(&sb);
 }
@@ -1178,6 +1185,8 @@ static int merge_submodule(struct merge_options *opt,
 			   const struct object_id *base, const struct object_id *a,
 			   const struct object_id *b)
 {
+	struct repository subrepo;
+	int ret = 0;
 	struct commit *commit_base, *commit_a, *commit_b;
 	int parent_count;
 	struct object_array merges;
@@ -1201,49 +1210,51 @@ static int merge_submodule(struct merge_options *opt,
 	if (is_null_oid(b))
 		return 0;
 
-	if (add_submodule_odb(path)) {
+	if (repo_submodule_init(&subrepo, opt->repo, path, null_oid())) {
 		output(opt, 1, _("Failed to merge submodule %s (not checked out)"), path);
 		return 0;
 	}
 
-	if (!(commit_base = lookup_commit_reference(opt->repo, base)) ||
-	    !(commit_a = lookup_commit_reference(opt->repo, a)) ||
-	    !(commit_b = lookup_commit_reference(opt->repo, b))) {
+	if (!(commit_base = lookup_commit_reference(&subrepo, base)) ||
+	    !(commit_a = lookup_commit_reference(&subrepo, a)) ||
+	    !(commit_b = lookup_commit_reference(&subrepo, b))) {
 		output(opt, 1, _("Failed to merge submodule %s (commits not present)"), path);
-		return 0;
+		goto cleanup;
 	}
 
 	/* check whether both changes are forward */
-	if (!in_merge_bases(commit_base, commit_a) ||
-	    !in_merge_bases(commit_base, commit_b)) {
+	if (!repo_in_merge_bases(&subrepo, commit_base, commit_a) ||
+	    !repo_in_merge_bases(&subrepo, commit_base, commit_b)) {
 		output(opt, 1, _("Failed to merge submodule %s (commits don't follow merge-base)"), path);
-		return 0;
+		goto cleanup;
 	}
 
 	/* Case #1: a is contained in b or vice versa */
-	if (in_merge_bases(commit_a, commit_b)) {
+	if (repo_in_merge_bases(&subrepo, commit_a, commit_b)) {
 		oidcpy(result, b);
 		if (show(opt, 3)) {
 			output(opt, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
-			output_commit_title(opt, commit_b);
+			repo_output_commit_title(opt, &subrepo, commit_b);
 		} else if (show(opt, 2))
 			output(opt, 2, _("Fast-forwarding submodule %s"), path);
 		else
 			; /* no output */
 
-		return 1;
+		ret = 1;
+		goto cleanup;
 	}
-	if (in_merge_bases(commit_b, commit_a)) {
+	if (repo_in_merge_bases(&subrepo, commit_b, commit_a)) {
 		oidcpy(result, a);
 		if (show(opt, 3)) {
 			output(opt, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
-			output_commit_title(opt, commit_a);
+			repo_output_commit_title(opt, &subrepo, commit_a);
 		} else if (show(opt, 2))
 			output(opt, 2, _("Fast-forwarding submodule %s"), path);
 		else
 			; /* no output */
 
-		return 1;
+		ret = 1;
+		goto cleanup;
 	}
 
 	/*
@@ -1255,10 +1266,10 @@ static int merge_submodule(struct merge_options *opt,
 
 	/* Skip the search if makes no sense to the calling context.  */
 	if (!search)
-		return 0;
+		goto cleanup;
 
 	/* find commit which merges them */
-	parent_count = find_first_merges(opt->repo, &merges, path,
+	parent_count = find_first_merges(&subrepo, &merges, path,
 					 commit_a, commit_b);
 	switch (parent_count) {
 	case 0:
@@ -1268,7 +1279,7 @@ static int merge_submodule(struct merge_options *opt,
 	case 1:
 		output(opt, 1, _("Failed to merge submodule %s (not fast-forward)"), path);
 		output(opt, 2, _("Found a possible merge resolution for the submodule:\n"));
-		print_commit((struct commit *) merges.objects[0].item);
+		print_commit(&subrepo, (struct commit *) merges.objects[0].item);
 		output(opt, 2, _(
 		       "If this is correct simply add it to the index "
 		       "for example\n"
@@ -1281,11 +1292,13 @@ static int merge_submodule(struct merge_options *opt,
 	default:
 		output(opt, 1, _("Failed to merge submodule %s (multiple merges found)"), path);
 		for (i = 0; i < merges.nr; i++)
-			print_commit((struct commit *) merges.objects[i].item);
+			print_commit(&subrepo, (struct commit *) merges.objects[i].item);
 	}
 
 	object_array_clear(&merges);
-	return 0;
+cleanup:
+	repo_clear(&subrepo);
+	return ret;
 }
 
 static int merge_mode_and_contents(struct merge_options *opt,
@@ -1879,7 +1892,7 @@ static struct diff_queue_struct *get_diffpairs(struct merge_options *opt,
 	 */
 	if (opts.detect_rename > DIFF_DETECT_RENAME)
 		opts.detect_rename = DIFF_DETECT_RENAME;
-	opts.rename_limit = (opt->rename_limit >= 0) ? opt->rename_limit : 1000;
+	opts.rename_limit = (opt->rename_limit >= 0) ? opt->rename_limit : 7000;
 	opts.rename_score = opt->rename_score;
 	opts.show_rename_progress = opt->show_rename_progress;
 	opts.output_format = DIFF_FORMAT_NO_OUTPUT;
@@ -3701,6 +3714,10 @@ static int merge_start(struct merge_options *opt, struct tree *head)
 
 	assert(opt->priv == NULL);
 
+	/* Not supported; option specific to merge-ort */
+	assert(!opt->record_conflict_msgs_as_headers);
+	assert(!opt->msg_header_prefix);
+
 	/* Sanity check on repo state; index must match head */
 	if (repo_index_has_changes(opt->repo, head, &sb)) {
 		err(opt, _("Your local changes to the following files would be overwritten by merge:\n  %s"),
@@ -3754,6 +3771,9 @@ int merge_recursive(struct merge_options *opt,
 	assert(opt->ancestor == NULL ||
 	       !strcmp(opt->ancestor, "constructed merge base"));
 
+	prepare_repo_settings(opt->repo);
+	opt->repo->settings.command_requires_full_index = 1;
+
 	if (merge_start(opt, repo_get_commit_tree(opt->repo, h1)))
 		return -1;
 	clean = merge_recursive_internal(opt, h1, h2, merge_bases, result);
diff --git a/merge-recursive.h b/merge-recursive.h
index 0795a1d3ec..b88000e3c2 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -46,6 +46,8 @@ struct merge_options {
 	/* miscellaneous control options */
 	const char *subtree_shift;
 	unsigned renormalize : 1;
+	unsigned record_conflict_msgs_as_headers : 1;
+	const char *msg_header_prefix;
 
 	/* internal fields used by the implementation */
 	struct merge_options_internal *priv;
diff --git a/merge.c b/merge.c
index 6e736881d9..2382ff66d3 100644
--- a/merge.c
+++ b/merge.c
@@ -53,7 +53,6 @@ int checkout_fast_forward(struct repository *r,
 	struct unpack_trees_options opts;
 	struct tree_desc t[MAX_UNPACK_TREES];
 	int i, nr_trees = 0;
-	struct dir_struct dir = DIR_INIT;
 	struct lock_file lock_file = LOCK_INIT;
 
 	refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
@@ -80,11 +79,7 @@ int checkout_fast_forward(struct repository *r,
 	}
 
 	memset(&opts, 0, sizeof(opts));
-	if (overwrite_ignore) {
-		dir.flags |= DIR_SHOW_IGNORED;
-		setup_standard_excludes(&dir);
-		opts.dir = &dir;
-	}
+	opts.preserve_ignored = !overwrite_ignore;
 
 	opts.head_idx = 1;
 	opts.src_index = r->index;
@@ -101,7 +96,6 @@ int checkout_fast_forward(struct repository *r,
 		clear_unpack_trees_porcelain(&opts);
 		return -1;
 	}
-	dir_clear(&dir);
 	clear_unpack_trees_porcelain(&opts);
 
 	if (write_locked_index(r->index, &lock_file, COMMIT_LOCK))
diff --git a/mergesort.c b/mergesort.c
index e5fdf2ee4a..bd9c6ef8ee 100644
--- a/mergesort.c
+++ b/mergesort.c
@@ -1,73 +1,84 @@
 #include "cache.h"
 #include "mergesort.h"
 
-struct mergesort_sublist {
-	void *ptr;
-	unsigned long len;
-};
-
-static void *get_nth_next(void *list, unsigned long n,
-			  void *(*get_next_fn)(const void *))
+/* Combine two sorted lists.  Take from `list` on equality. */
+static void *llist_merge(void *list, void *other,
+			 void *(*get_next_fn)(const void *),
+			 void (*set_next_fn)(void *, void *),
+			 int (*compare_fn)(const void *, const void *))
 {
-	while (n-- && list)
-		list = get_next_fn(list);
-	return list;
-}
+	void *result = list, *tail;
 
-static void *pop_item(struct mergesort_sublist *l,
-		      void *(*get_next_fn)(const void *))
-{
-	void *p = l->ptr;
-	l->ptr = get_next_fn(l->ptr);
-	l->len = l->ptr ? (l->len - 1) : 0;
-	return p;
+	if (compare_fn(list, other) > 0) {
+		result = other;
+		goto other;
+	}
+	for (;;) {
+		do {
+			tail = list;
+			list = get_next_fn(list);
+			if (!list) {
+				set_next_fn(tail, other);
+				return result;
+			}
+		} while (compare_fn(list, other) <= 0);
+		set_next_fn(tail, other);
+	other:
+		do {
+			tail = other;
+			other = get_next_fn(other);
+			if (!other) {
+				set_next_fn(tail, list);
+				return result;
+			}
+		} while (compare_fn(list, other) > 0);
+		set_next_fn(tail, list);
+	}
 }
 
+/*
+ * Perform an iterative mergesort using an array of sublists.
+ *
+ * n is the number of items.
+ * ranks[i] is undefined if n & 2^i == 0, and assumed empty.
+ * ranks[i] contains a sublist of length 2^i otherwise.
+ *
+ * The number of bits in a void pointer limits the number of objects
+ * that can be created, and thus the number of array elements necessary
+ * to be able to sort any valid list.
+ *
+ * Adding an item to this array is like incrementing a binary number;
+ * positional values for set bits correspond to sublist lengths.
+ */
 void *llist_mergesort(void *list,
 		      void *(*get_next_fn)(const void *),
 		      void (*set_next_fn)(void *, void *),
 		      int (*compare_fn)(const void *, const void *))
 {
-	unsigned long l;
-
-	if (!list)
-		return NULL;
-	for (l = 1; ; l *= 2) {
-		void *curr;
-		struct mergesort_sublist p, q;
+	void *ranks[bitsizeof(void *)];
+	size_t n = 0;
+	int i;
 
-		p.ptr = list;
-		q.ptr = get_nth_next(p.ptr, l, get_next_fn);
-		if (!q.ptr)
-			break;
-		p.len = q.len = l;
+	while (list) {
+		void *next = get_next_fn(list);
+		if (next)
+			set_next_fn(list, NULL);
+		for (i = 0; n & ((size_t)1 << i); i++)
+			list = llist_merge(ranks[i], list, get_next_fn,
+					   set_next_fn, compare_fn);
+		n++;
+		ranks[i] = list;
+		list = next;
+	}
 
-		if (compare_fn(p.ptr, q.ptr) > 0)
-			list = curr = pop_item(&q, get_next_fn);
+	for (i = 0; n; i++, n >>= 1) {
+		if (!(n & 1))
+			continue;
+		if (list)
+			list = llist_merge(ranks[i], list, get_next_fn,
+					   set_next_fn, compare_fn);
 		else
-			list = curr = pop_item(&p, get_next_fn);
-
-		while (p.ptr) {
-			while (p.len || q.len) {
-				void *prev = curr;
-
-				if (!p.len)
-					curr = pop_item(&q, get_next_fn);
-				else if (!q.len)
-					curr = pop_item(&p, get_next_fn);
-				else if (compare_fn(p.ptr, q.ptr) > 0)
-					curr = pop_item(&q, get_next_fn);
-				else
-					curr = pop_item(&p, get_next_fn);
-				set_next_fn(prev, curr);
-			}
-			p.ptr = q.ptr;
-			p.len = l;
-			q.ptr = get_nth_next(p.ptr, l, get_next_fn);
-			q.len = q.ptr ? l : 0;
-
-		}
-		set_next_fn(curr, NULL);
+			list = ranks[i];
 	}
 	return list;
 }
diff --git a/mergetools/xxdiff b/mergetools/xxdiff
index ce5b8e9f29..d5ce467995 100644
--- a/mergetools/xxdiff
+++ b/mergetools/xxdiff
@@ -3,6 +3,13 @@ diff_cmd () {
 		-R 'Accel.Search: "Ctrl+F"' \
 		-R 'Accel.SearchForward: "Ctrl+G"' \
 		"$LOCAL" "$REMOTE"
+
+	# xxdiff can segfault on binary files which are often uninteresting.
+	# Do not allow segfaults to stop us from continuing on to the next file.
+	if test $? = 128
+	then
+		return 1
+	fi
 }
 
 merge_cmd () {
diff --git a/midx.c b/midx.c
index 9a35b0255d..865170bad0 100644
--- a/midx.c
+++ b/midx.c
@@ -13,6 +13,10 @@
 #include "repository.h"
 #include "chunk-format.h"
 #include "pack.h"
+#include "pack-bitmap.h"
+#include "refs.h"
+#include "revision.h"
+#include "list-objects.h"
 
 #define MIDX_SIGNATURE 0x4d494458 /* "MIDX" */
 #define MIDX_VERSION 1
@@ -29,6 +33,7 @@
 #define MIDX_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */
 #define MIDX_CHUNKID_OBJECTOFFSETS 0x4f4f4646 /* "OOFF" */
 #define MIDX_CHUNKID_LARGEOFFSETS 0x4c4f4646 /* "LOFF" */
+#define MIDX_CHUNKID_REVINDEX 0x52494458 /* "RIDX" */
 #define MIDX_CHUNK_FANOUT_SIZE (sizeof(uint32_t) * 256)
 #define MIDX_CHUNK_OFFSET_WIDTH (2 * sizeof(uint32_t))
 #define MIDX_CHUNK_LARGE_OFFSET_WIDTH (sizeof(uint64_t))
@@ -48,20 +53,20 @@ static uint8_t oid_version(void)
 	}
 }
 
-static const unsigned char *get_midx_checksum(struct multi_pack_index *m)
+const unsigned char *get_midx_checksum(struct multi_pack_index *m)
 {
 	return m->data + m->data_len - the_hash_algo->rawsz;
 }
 
-static 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,
@@ -85,28 +90,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);
@@ -155,6 +162,9 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
 
 	pair_chunk(cf, MIDX_CHUNKID_LARGEOFFSETS, &m->chunk_large_offsets);
 
+	if (git_env_bool("GIT_TEST_MIDX_READ_RIDX", 1))
+		pair_chunk(cf, MIDX_CHUNKID_REVINDEX, &m->chunk_revindex);
+
 	m->num_objects = ntohl(m->chunk_oid_fanout[255]);
 
 	CALLOC_ARRAY(m->pack_names, m->num_packs);
@@ -175,12 +185,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)
@@ -195,6 +206,8 @@ void close_midx(struct multi_pack_index *m)
 	if (!m)
 		return;
 
+	close_midx(m->next);
+
 	munmap((unsigned char *)m->data, m->data_len);
 
 	for (i = 0; i < m->num_packs; i++) {
@@ -203,6 +216,7 @@ void close_midx(struct multi_pack_index *m)
 	}
 	FREE_AND_NULL(m->packs);
 	FREE_AND_NULL(m->pack_names);
+	free(m);
 }
 
 int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t pack_int_id)
@@ -276,14 +290,18 @@ uint32_t nth_midxed_pack_int_id(struct multi_pack_index *m, uint32_t pos)
 			(off_t)pos * MIDX_CHUNK_OFFSET_WIDTH);
 }
 
-static int nth_midxed_pack_entry(struct repository *r,
-				 struct multi_pack_index *m,
-				 struct pack_entry *e,
-				 uint32_t pos)
+int fill_midx_entry(struct repository * r,
+		    const struct object_id *oid,
+		    struct pack_entry *e,
+		    struct multi_pack_index *m)
 {
+	uint32_t pos;
 	uint32_t pack_int_id;
 	struct packed_git *p;
 
+	if (!bsearch_midx(oid, m, &pos))
+		return 0;
+
 	if (pos >= m->num_objects)
 		return 0;
 
@@ -303,15 +321,9 @@ static int nth_midxed_pack_entry(struct repository *r,
 	if (!is_pack_valid(p))
 		return 0;
 
-	if (p->num_bad_objects) {
-		uint32_t i;
-		struct object_id oid;
-		nth_midxed_object_oid(&oid, m, pos);
-		for (i = 0; i < p->num_bad_objects; i++)
-			if (hasheq(oid.hash,
-				   p->bad_object_sha1 + the_hash_algo->rawsz * i))
-				return 0;
-	}
+	if (oidset_size(&p->bad_objects) &&
+	    oidset_contains(&p->bad_objects, oid))
+		return 0;
 
 	e->offset = nth_midxed_offset(m, pos);
 	e->p = p;
@@ -319,19 +331,6 @@ static int nth_midxed_pack_entry(struct repository *r,
 	return 1;
 }
 
-int fill_midx_entry(struct repository * r,
-		    const struct object_id *oid,
-		    struct pack_entry *e,
-		    struct multi_pack_index *m)
-{
-	uint32_t pos;
-
-	if (!bsearch_midx(oid, m, &pos))
-		return 0;
-
-	return nth_midxed_pack_entry(r, m, e, pos);
-}
-
 /* Match "foo.idx" against either "foo.pack" _or_ "foo.idx". */
 static int cmp_idx_or_pack_name(const char *idx_or_pack_name,
 				const char *idx_name)
@@ -468,6 +467,8 @@ struct write_midx_context {
 	uint32_t num_large_offsets;
 
 	int preferred_pack_idx;
+
+	struct string_list *to_include;
 };
 
 static void add_pack_to_midx(const char *full_path, size_t full_path_len,
@@ -477,8 +478,26 @@ static void add_pack_to_midx(const char *full_path, size_t full_path_len,
 
 	if (ends_with(file_name, ".idx")) {
 		display_progress(ctx->progress, ++ctx->pack_paths_checked);
+		/*
+		 * Note that at most one of ctx->m and ctx->to_include are set,
+		 * so we are testing midx_contains_pack() and
+		 * string_list_has_string() independently (guarded by the
+		 * appropriate NULL checks).
+		 *
+		 * We could support passing to_include while reusing an existing
+		 * MIDX, but don't currently since the reuse process drags
+		 * forward all packs from an existing MIDX (without checking
+		 * whether or not they appear in the to_include list).
+		 *
+		 * If we added support for that, these next two conditional
+		 * should be performed independently (likely checking
+		 * to_include before the existing MIDX).
+		 */
 		if (ctx->m && midx_contains_pack(ctx->m, file_name))
 			return;
+		else if (ctx->to_include &&
+			 !string_list_has_string(ctx->to_include, file_name))
+			return;
 
 		ALLOC_GROW(ctx->info, ctx->nr + 1, ctx->alloc);
 
@@ -818,6 +837,18 @@ static int write_midx_large_offsets(struct hashfile *f,
 	return 0;
 }
 
+static int write_midx_revindex(struct hashfile *f,
+			       void *data)
+{
+	struct write_midx_context *ctx = data;
+	uint32_t i;
+
+	for (i = 0; i < ctx->entries_nr; i++)
+		hashwrite_be32(f, ctx->pack_order[i]);
+
+	return 0;
+}
+
 struct midx_pack_order_data {
 	uint32_t nr;
 	uint32_t pack;
@@ -882,7 +913,7 @@ static void write_midx_reverse_index(char *midx_name, unsigned char *midx_hash,
 	strbuf_release(&buf);
 }
 
-static void clear_midx_files_ext(struct repository *r, const char *ext,
+static void clear_midx_files_ext(const char *object_dir, const char *ext,
 				 unsigned char *keep_hash);
 
 static int midx_checksum_valid(struct multi_pack_index *m)
@@ -890,12 +921,238 @@ static int midx_checksum_valid(struct multi_pack_index *m)
 	return hashfile_checksum_valid(m->data, m->data_len);
 }
 
-static int write_midx_internal(const char *object_dir, struct multi_pack_index *m,
+static void prepare_midx_packing_data(struct packing_data *pdata,
+				      struct write_midx_context *ctx)
+{
+	uint32_t i;
+
+	memset(pdata, 0, sizeof(struct packing_data));
+	prepare_packing_data(the_repository, pdata);
+
+	for (i = 0; i < ctx->entries_nr; i++) {
+		struct pack_midx_entry *from = &ctx->entries[ctx->pack_order[i]];
+		struct object_entry *to = packlist_alloc(pdata, &from->oid);
+
+		oe_set_in_pack(pdata, to,
+			       ctx->info[ctx->pack_perm[from->pack_int_id]].p);
+	}
+}
+
+static int add_ref_to_pending(const char *refname,
+			      const struct object_id *oid,
+			      int flag, void *cb_data)
+{
+	struct rev_info *revs = (struct rev_info*)cb_data;
+	struct object *object;
+
+	if ((flag & REF_ISSYMREF) && (flag & REF_ISBROKEN)) {
+		warning("symbolic ref is dangling: %s", refname);
+		return 0;
+	}
+
+	object = parse_object_or_die(oid, refname);
+	if (object->type != OBJ_COMMIT)
+		return 0;
+
+	add_pending_object(revs, object, "");
+	if (bitmap_is_preferred_refname(revs->repo, refname))
+		object->flags |= NEEDS_BITMAP;
+	return 0;
+}
+
+struct bitmap_commit_cb {
+	struct commit **commits;
+	size_t commits_nr, commits_alloc;
+
+	struct write_midx_context *ctx;
+};
+
+static const struct object_id *bitmap_oid_access(size_t index,
+						 const void *_entries)
+{
+	const struct pack_midx_entry *entries = _entries;
+	return &entries[index].oid;
+}
+
+static void bitmap_show_commit(struct commit *commit, void *_data)
+{
+	struct bitmap_commit_cb *data = _data;
+	int pos = oid_pos(&commit->object.oid, data->ctx->entries,
+			  data->ctx->entries_nr,
+			  bitmap_oid_access);
+	if (pos < 0)
+		return;
+
+	ALLOC_GROW(data->commits, data->commits_nr + 1, data->commits_alloc);
+	data->commits[data->commits_nr++] = commit;
+}
+
+static int read_refs_snapshot(const char *refs_snapshot,
+			      struct rev_info *revs)
+{
+	struct strbuf buf = STRBUF_INIT;
+	struct object_id oid;
+	FILE *f = xfopen(refs_snapshot, "r");
+
+	while (strbuf_getline(&buf, f) != EOF) {
+		struct object *object;
+		int preferred = 0;
+		char *hex = buf.buf;
+		const char *end = NULL;
+
+		if (buf.len && *buf.buf == '+') {
+			preferred = 1;
+			hex = &buf.buf[1];
+		}
+
+		if (parse_oid_hex(hex, &oid, &end) < 0)
+			die(_("could not parse line: %s"), buf.buf);
+		if (*end)
+			die(_("malformed line: %s"), buf.buf);
+
+		object = parse_object_or_die(&oid, NULL);
+		if (preferred)
+			object->flags |= NEEDS_BITMAP;
+
+		add_pending_object(revs, object, "");
+	}
+
+	fclose(f);
+	strbuf_release(&buf);
+	return 0;
+}
+
+static struct commit **find_commits_for_midx_bitmap(uint32_t *indexed_commits_nr_p,
+						    const char *refs_snapshot,
+						    struct write_midx_context *ctx)
+{
+	struct rev_info revs;
+	struct bitmap_commit_cb cb = {0};
+
+	cb.ctx = ctx;
+
+	repo_init_revisions(the_repository, &revs, NULL);
+	if (refs_snapshot) {
+		read_refs_snapshot(refs_snapshot, &revs);
+	} else {
+		setup_revisions(0, NULL, &revs, NULL);
+		for_each_ref(add_ref_to_pending, &revs);
+	}
+
+	/*
+	 * Skipping promisor objects here is intentional, since it only excludes
+	 * them from the list of reachable commits that we want to select from
+	 * when computing the selection of MIDX'd commits to receive bitmaps.
+	 *
+	 * Reachability bitmaps do require that their objects be closed under
+	 * reachability, but fetching any objects missing from promisors at this
+	 * point is too late. But, if one of those objects can be reached from
+	 * an another object that is included in the bitmap, then we will
+	 * complain later that we don't have reachability closure (and fail
+	 * appropriately).
+	 */
+	fetch_if_missing = 0;
+	revs.exclude_promisor_objects = 1;
+
+	if (prepare_revision_walk(&revs))
+		die(_("revision walk setup failed"));
+
+	traverse_commit_list(&revs, bitmap_show_commit, NULL, &cb);
+	if (indexed_commits_nr_p)
+		*indexed_commits_nr_p = cb.commits_nr;
+
+	return cb.commits;
+}
+
+static int write_midx_bitmap(char *midx_name, unsigned char *midx_hash,
+			     struct write_midx_context *ctx,
+			     const char *refs_snapshot,
+			     unsigned flags)
+{
+	struct packing_data pdata;
+	struct pack_idx_entry **index;
+	struct commit **commits = NULL;
+	uint32_t i, commits_nr;
+	uint16_t options = 0;
+	char *bitmap_name = xstrfmt("%s-%s.bitmap", midx_name, hash_to_hex(midx_hash));
+	int ret;
+
+	if (!ctx->entries_nr)
+		BUG("cannot write a bitmap without any objects");
+
+	if (flags & MIDX_WRITE_BITMAP_HASH_CACHE)
+		options |= BITMAP_OPT_HASH_CACHE;
+
+	prepare_midx_packing_data(&pdata, ctx);
+
+	commits = find_commits_for_midx_bitmap(&commits_nr, refs_snapshot, ctx);
+
+	/*
+	 * Build the MIDX-order index based on pdata.objects (which is already
+	 * in MIDX order; c.f., 'midx_pack_order_cmp()' for the definition of
+	 * this order).
+	 */
+	ALLOC_ARRAY(index, pdata.nr_objects);
+	for (i = 0; i < pdata.nr_objects; i++)
+		index[i] = &pdata.objects[i].idx;
+
+	bitmap_writer_show_progress(flags & MIDX_PROGRESS);
+	bitmap_writer_build_type_index(&pdata, index, pdata.nr_objects);
+
+	/*
+	 * bitmap_writer_finish expects objects in lex order, but pack_order
+	 * gives us exactly that. use it directly instead of re-sorting the
+	 * array.
+	 *
+	 * This changes the order of objects in 'index' between
+	 * bitmap_writer_build_type_index and bitmap_writer_finish.
+	 *
+	 * The same re-ordering takes place in the single-pack bitmap code via
+	 * write_idx_file(), which is called by finish_tmp_packfile(), which
+	 * happens between bitmap_writer_build_type_index() and
+	 * bitmap_writer_finish().
+	 */
+	for (i = 0; i < pdata.nr_objects; i++)
+		index[ctx->pack_order[i]] = &pdata.objects[i].idx;
+
+	bitmap_writer_select_commits(commits, commits_nr, -1);
+	ret = bitmap_writer_build(&pdata);
+	if (ret < 0)
+		goto cleanup;
+
+	bitmap_writer_set_checksum(midx_hash);
+	bitmap_writer_finish(index, pdata.nr_objects, bitmap_name, options);
+
+cleanup:
+	free(index);
+	free(bitmap_name);
+	return ret;
+}
+
+static struct multi_pack_index *lookup_multi_pack_index(struct repository *r,
+							const char *object_dir)
+{
+	struct multi_pack_index *cur;
+
+	/* Ensure the given object_dir is local, or a known alternate. */
+	find_odb(r, object_dir);
+
+	for (cur = get_multi_pack_index(r); cur; cur = cur->next) {
+		if (!strcmp(object_dir, cur->object_dir))
+			return cur;
+	}
+
+	return NULL;
+}
+
+static int write_midx_internal(const char *object_dir,
+			       struct string_list *packs_to_include,
 			       struct string_list *packs_to_drop,
 			       const char *preferred_pack_name,
+			       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;
@@ -906,15 +1163,19 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 	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 (m)
-		ctx.m = m;
-	else
-		ctx.m = load_multi_pack_index(object_dir, 1);
+	if (!packs_to_include) {
+		/*
+		 * Only reference an existing MIDX when not filtering which
+		 * packs to include, since all packs and objects are copied
+		 * blindly from an existing MIDX if one is present.
+		 */
+		ctx.m = lookup_multi_pack_index(the_repository, object_dir);
+	}
 
 	if (ctx.m && !midx_checksum_valid(ctx.m)) {
 		warning(_("ignoring existing multi-pack-index; checksum mismatch"));
@@ -932,8 +1193,27 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 
 			ctx.info[ctx.nr].orig_pack_int_id = i;
 			ctx.info[ctx.nr].pack_name = xstrdup(ctx.m->pack_names[i]);
-			ctx.info[ctx.nr].p = NULL;
+			ctx.info[ctx.nr].p = ctx.m->packs[i];
 			ctx.info[ctx.nr].expired = 0;
+
+			if (flags & MIDX_WRITE_REV_INDEX) {
+				/*
+				 * If generating a reverse index, need to have
+				 * packed_git's loaded to compare their
+				 * mtimes and object count.
+				 */
+				if (prepare_midx_pack(the_repository, ctx.m, i)) {
+					error(_("could not load pack"));
+					result = 1;
+					goto cleanup;
+				}
+
+				if (open_pack_index(ctx.m->packs[i]))
+					die(_("could not open index for %s"),
+					    ctx.m->packs[i]->pack_name);
+				ctx.info[ctx.nr].p = ctx.m->packs[i];
+			}
+
 			ctx.nr++;
 		}
 	}
@@ -944,21 +1224,95 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 	else
 		ctx.progress = NULL;
 
+	ctx.to_include = packs_to_include;
+
 	for_each_file_in_pack_dir(object_dir, add_pack_to_midx, &ctx);
 	stop_progress(&ctx.progress);
 
-	if (ctx.m && ctx.nr == ctx.m->num_packs && !packs_to_drop)
-		goto cleanup;
+	if ((ctx.m && ctx.nr == ctx.m->num_packs) &&
+	    !(packs_to_include || packs_to_drop)) {
+		struct bitmap_index *bitmap_git;
+		int bitmap_exists;
+		int want_bitmap = flags & MIDX_WRITE_BITMAP;
+
+		bitmap_git = prepare_midx_bitmap_git(ctx.m);
+		bitmap_exists = bitmap_git && bitmap_is_midx(bitmap_git);
+		free_bitmap_index(bitmap_git);
+
+		if (bitmap_exists || !want_bitmap) {
+			/*
+			 * The correct MIDX already exists, and so does a
+			 * corresponding bitmap (or one wasn't requested).
+			 */
+			if (!want_bitmap)
+				clear_midx_files_ext(object_dir, ".bitmap",
+						     NULL);
+			goto cleanup;
+		}
+	}
 
-	ctx.preferred_pack_idx = -1;
 	if (preferred_pack_name) {
+		int found = 0;
 		for (i = 0; i < ctx.nr; i++) {
 			if (!cmp_idx_or_pack_name(preferred_pack_name,
 						  ctx.info[i].pack_name)) {
 				ctx.preferred_pack_idx = i;
+				found = 1;
 				break;
 			}
 		}
+
+		if (!found)
+			warning(_("unknown preferred pack: '%s'"),
+				preferred_pack_name);
+	} else if (ctx.nr &&
+		   (flags & (MIDX_WRITE_REV_INDEX | MIDX_WRITE_BITMAP))) {
+		struct packed_git *oldest = ctx.info[ctx.preferred_pack_idx].p;
+		ctx.preferred_pack_idx = 0;
+
+		if (packs_to_drop && packs_to_drop->nr)
+			BUG("cannot write a MIDX bitmap during expiration");
+
+		/*
+		 * set a preferred pack when writing a bitmap to ensure that
+		 * the pack from which the first object is selected in pseudo
+		 * pack-order has all of its objects selected from that pack
+		 * (and not another pack containing a duplicate)
+		 */
+		for (i = 1; i < ctx.nr; i++) {
+			struct packed_git *p = ctx.info[i].p;
+
+			if (!oldest->num_objects || p->mtime < oldest->mtime) {
+				oldest = p;
+				ctx.preferred_pack_idx = i;
+			}
+		}
+
+		if (!oldest->num_objects) {
+			/*
+			 * If all packs are empty; unset the preferred index.
+			 * This is acceptable since there will be no duplicate
+			 * objects to resolve, so the preferred value doesn't
+			 * matter.
+			 */
+			ctx.preferred_pack_idx = -1;
+		}
+	} else {
+		/*
+		 * otherwise don't mark any pack as preferred to avoid
+		 * interfering with expiration logic below
+		 */
+		ctx.preferred_pack_idx = -1;
+	}
+
+	if (ctx.preferred_pack_idx > -1) {
+		struct packed_git *preferred = ctx.info[ctx.preferred_pack_idx].p;
+		if (!preferred->num_objects) {
+			error(_("cannot select preferred pack %s with no objects"),
+			      preferred->pack_name);
+			result = 1;
+			goto cleanup;
+		}
 	}
 
 	ctx.entries = get_sorted_entries(ctx.m, ctx.info, ctx.nr, &ctx.entries_nr,
@@ -1029,11 +1383,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 						      ctx.info, ctx.nr,
 						      sizeof(*ctx.info),
 						      idx_or_pack_name_cmp);
-
-		if (!preferred)
-			warning(_("unknown preferred pack: '%s'"),
-				preferred_pack_name);
-		else {
+		if (preferred) {
 			uint32_t perm = ctx.pack_perm[preferred->orig_pack_int_id];
 			if (perm == PACK_EXPIRED)
 				warning(_("preferred pack '%s' is expired"),
@@ -1045,18 +1395,21 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 		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.m)
-		close_midx(ctx.m);
-
 	if (ctx.nr - dropped_packs == 0) {
 		error(_("no pack files to index."));
 		result = 1;
 		goto cleanup;
 	}
 
+	if (!ctx.entries_nr) {
+		if (flags & MIDX_WRITE_BITMAP)
+			warning(_("refusing to write multi-pack .bitmap without any objects"));
+		flags &= ~(MIDX_WRITE_REV_INDEX | MIDX_WRITE_BITMAP);
+	}
+
 	cf = init_chunkfile(f);
 
 	add_chunk(cf, MIDX_CHUNKID_PACKNAMES, pack_name_concat_len,
@@ -1075,20 +1428,39 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 			(size_t)ctx.num_large_offsets * MIDX_CHUNK_LARGE_OFFSET_WIDTH,
 			write_midx_large_offsets);
 
+	if (flags & (MIDX_WRITE_REV_INDEX | MIDX_WRITE_BITMAP)) {
+		ctx.pack_order = midx_pack_order(&ctx);
+		add_chunk(cf, MIDX_CHUNKID_REVINDEX,
+			  ctx.entries_nr * sizeof(uint32_t),
+			  write_midx_revindex);
+	}
+
 	write_midx_header(f, get_num_chunks(cf), ctx.nr - dropped_packs);
 	write_chunkfile(cf, &ctx);
 
 	finalize_hashfile(f, midx_hash, CSUM_FSYNC | CSUM_HASH_IN_STREAM);
 	free_chunkfile(cf);
 
-	if (flags & MIDX_WRITE_REV_INDEX)
-		ctx.pack_order = midx_pack_order(&ctx);
+	if (flags & MIDX_WRITE_REV_INDEX &&
+	    git_env_bool("GIT_TEST_MIDX_WRITE_REV", 0))
+		write_midx_reverse_index(midx_name.buf, midx_hash, &ctx);
+	if (flags & MIDX_WRITE_BITMAP) {
+		if (write_midx_bitmap(midx_name.buf, midx_hash, &ctx,
+				      refs_snapshot, flags) < 0) {
+			error(_("could not write multi-pack bitmap"));
+			result = 1;
+			goto cleanup;
+		}
+	}
 
-	if (flags & MIDX_WRITE_REV_INDEX)
-		write_midx_reverse_index(midx_name, midx_hash, &ctx);
-	clear_midx_files_ext(the_repository, ".rev", midx_hash);
+	if (ctx.m)
+		close_object_store(the_repository->objects);
+
+	if (commit_lock_file(&lk) < 0)
+		die_errno(_("could not write multi-pack-index"));
 
-	commit_lock_file(&lk);
+	clear_midx_files_ext(object_dir, ".bitmap", midx_hash);
+	clear_midx_files_ext(object_dir, ".rev", midx_hash);
 
 cleanup:
 	for (i = 0; i < ctx.nr; i++) {
@@ -1103,16 +1475,28 @@ cleanup:
 	free(ctx.entries);
 	free(ctx.pack_perm);
 	free(ctx.pack_order);
-	free(midx_name);
+	strbuf_release(&midx_name);
+
 	return result;
 }
 
 int write_midx_file(const char *object_dir,
 		    const char *preferred_pack_name,
+		    const char *refs_snapshot,
 		    unsigned flags)
 {
 	return write_midx_internal(object_dir, NULL, NULL, preferred_pack_name,
-				   flags);
+				   refs_snapshot, flags);
+}
+
+int write_midx_file_only(const char *object_dir,
+			 struct string_list *packs_to_include,
+			 const char *preferred_pack_name,
+			 const char *refs_snapshot,
+			 unsigned flags)
+{
+	return write_midx_internal(object_dir, packs_to_include, NULL,
+				   preferred_pack_name, refs_snapshot, flags);
 }
 
 struct clear_midx_data {
@@ -1135,7 +1519,7 @@ static void clear_midx_file_ext(const char *full_path, size_t full_path_len,
 		die_errno(_("failed to remove %s"), full_path);
 }
 
-static void clear_midx_files_ext(struct repository *r, const char *ext,
+static void clear_midx_files_ext(const char *object_dir, const char *ext,
 				 unsigned char *keep_hash)
 {
 	struct clear_midx_data data;
@@ -1146,7 +1530,7 @@ static void clear_midx_files_ext(struct repository *r, const char *ext,
 				    hash_to_hex(keep_hash), ext);
 	data.ext = ext;
 
-	for_each_file_in_pack_dir(r->objects->odb->path,
+	for_each_file_in_pack_dir(object_dir,
 				  clear_midx_file_ext,
 				  &data);
 
@@ -1155,23 +1539,27 @@ static void clear_midx_files_ext(struct repository *r, 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, ".rev", NULL);
+	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;
 
+__attribute__((format (printf, 1, 2)))
 static void midx_report(const char *fmt, ...)
 {
 	va_list ap;
@@ -1219,12 +1607,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;
 	}
 
@@ -1257,7 +1648,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)
@@ -1335,7 +1726,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;
 }
@@ -1344,7 +1737,7 @@ int expire_midx_packs(struct repository *r, const char *object_dir, unsigned fla
 {
 	uint32_t i, *count, result = 0;
 	struct string_list packs_to_drop = STRING_LIST_INIT_DUP;
-	struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
+	struct multi_pack_index *m = lookup_multi_pack_index(r, object_dir);
 	struct progress *progress = NULL;
 
 	if (!m)
@@ -1390,9 +1783,10 @@ int expire_midx_packs(struct repository *r, const char *object_dir, unsigned fla
 	free(count);
 
 	if (packs_to_drop.nr)
-		result = write_midx_internal(object_dir, m, &packs_to_drop, NULL, flags);
+		result = write_midx_internal(object_dir, NULL, &packs_to_drop, NULL, NULL, flags);
 
 	string_list_clear(&packs_to_drop, 0);
+
 	return result;
 }
 
@@ -1508,7 +1902,7 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size,
 	struct child_process cmd = CHILD_PROCESS_INIT;
 	FILE *cmd_in;
 	struct strbuf base_name = STRBUF_INIT;
-	struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
+	struct multi_pack_index *m = lookup_multi_pack_index(r, object_dir);
 
 	/*
 	 * When updating the default for these configuration
@@ -1579,12 +1973,9 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size,
 		goto cleanup;
 	}
 
-	result = write_midx_internal(object_dir, m, NULL, NULL, flags);
-	m = NULL;
+	result = write_midx_internal(object_dir, NULL, NULL, NULL, NULL, flags);
 
 cleanup:
-	if (m)
-		close_midx(m);
 	free(include_pack);
 	return result;
 }
diff --git a/midx.h b/midx.h
index 8684cf0fef..22e8e53288 100644
--- a/midx.h
+++ b/midx.h
@@ -2,12 +2,15 @@
 #define MIDX_H
 
 #include "repository.h"
+#include "string-list.h"
 
 struct object_id;
 struct pack_entry;
 struct repository;
 
 #define GIT_TEST_MULTI_PACK_INDEX "GIT_TEST_MULTI_PACK_INDEX"
+#define GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP \
+	"GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP"
 
 struct multi_pack_index {
 	struct multi_pack_index *next;
@@ -33,6 +36,7 @@ struct multi_pack_index {
 	const unsigned char *chunk_oid_lookup;
 	const unsigned char *chunk_object_offsets;
 	const unsigned char *chunk_large_offsets;
+	const unsigned char *chunk_revindex;
 
 	const char **pack_names;
 	struct packed_git **packs;
@@ -41,8 +45,12 @@ struct multi_pack_index {
 
 #define MIDX_PROGRESS     (1 << 0)
 #define MIDX_WRITE_REV_INDEX (1 << 1)
+#define MIDX_WRITE_BITMAP (1 << 2)
+#define MIDX_WRITE_BITMAP_HASH_CACHE (1 << 3)
 
-char *get_midx_rev_filename(struct multi_pack_index *m);
+const unsigned char *get_midx_checksum(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);
@@ -56,7 +64,19 @@ int fill_midx_entry(struct repository *r, const struct object_id *oid, struct pa
 int midx_contains_pack(struct multi_pack_index *m, const char *idx_or_pack_name);
 int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, int local);
 
-int write_midx_file(const char *object_dir, const char *preferred_pack_name, unsigned flags);
+/*
+ * Variant of write_midx_file which writes a MIDX containing only the packs
+ * specified in packs_to_include.
+ */
+int write_midx_file(const char *object_dir,
+		    const char *preferred_pack_name,
+		    const char *refs_snapshot,
+		    unsigned flags);
+int write_midx_file_only(const char *object_dir,
+			 struct string_list *packs_to_include,
+			 const char *preferred_pack_name,
+			 const char *refs_snapshot,
+			 unsigned flags);
 void clear_midx_file(struct repository *r);
 int verify_midx_file(struct repository *r, const char *object_dir, unsigned flags);
 int expire_midx_packs(struct repository *r, const char *object_dir, unsigned flags);
diff --git a/notes-merge.c b/notes-merge.c
index 46c1f7c7f1..01d596920e 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -273,7 +273,7 @@ static void check_notes_merge_worktree(struct notes_merge_options *o)
 		 */
 		if (file_exists(git_path(NOTES_MERGE_WORKTREE)) &&
 		    !is_empty_dir(git_path(NOTES_MERGE_WORKTREE))) {
-			if (advice_resolve_conflict)
+			if (advice_enabled(ADVICE_RESOLVE_CONFLICT))
 				die(_("You have not concluded your previous "
 				    "notes merge (%s exists).\nPlease, use "
 				    "'git notes merge --commit' or 'git notes "
@@ -344,7 +344,7 @@ static int ll_merge_in_worktree(struct notes_merge_options *o,
 {
 	mmbuffer_t result_buf;
 	mmfile_t base, local, remote;
-	int status;
+	enum ll_merge_result status;
 
 	read_mmblob(&base, &p->base);
 	read_mmblob(&local, &p->local);
@@ -358,6 +358,9 @@ static int ll_merge_in_worktree(struct notes_merge_options *o,
 	free(local.ptr);
 	free(remote.ptr);
 
+	if (status == LL_MERGE_BINARY_CONFLICT)
+		warning("Cannot merge binary files: %s (%s vs. %s)",
+			oid_to_hex(&p->obj), o->local_ref, o->remote_ref);
 	if ((status < 0) || !result_buf.ptr)
 		die("Failed to execute internal merge");
 
diff --git a/object-file.c b/object-file.c
index ecca5a8da0..8be57f48de 100644
--- a/object-file.c
+++ b/object-file.c
@@ -32,6 +32,7 @@
 #include "packfile.h"
 #include "object-store.h"
 #include "promisor-remote.h"
+#include "submodule.h"
 
 /* The maximum size for an object header. */
 #define MAX_HEADER_LEN 32
@@ -164,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,
@@ -183,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,
@@ -199,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,
@@ -414,74 +412,6 @@ enum scld_error safe_create_leading_directories_const(const char *path)
 	return result;
 }
 
-int raceproof_create_file(const char *path, create_file_fn fn, void *cb)
-{
-	/*
-	 * The number of times we will try to remove empty directories
-	 * in the way of path. This is only 1 because if another
-	 * process is racily creating directories that conflict with
-	 * us, we don't want to fight against them.
-	 */
-	int remove_directories_remaining = 1;
-
-	/*
-	 * The number of times that we will try to create the
-	 * directories containing path. We are willing to attempt this
-	 * more than once, because another process could be trying to
-	 * clean up empty directories at the same time as we are
-	 * trying to create them.
-	 */
-	int create_directories_remaining = 3;
-
-	/* A scratch copy of path, filled lazily if we need it: */
-	struct strbuf path_copy = STRBUF_INIT;
-
-	int ret, save_errno;
-
-	/* Sanity check: */
-	assert(*path);
-
-retry_fn:
-	ret = fn(path, cb);
-	save_errno = errno;
-	if (!ret)
-		goto out;
-
-	if (errno == EISDIR && remove_directories_remaining-- > 0) {
-		/*
-		 * A directory is in the way. Maybe it is empty; try
-		 * to remove it:
-		 */
-		if (!path_copy.len)
-			strbuf_addstr(&path_copy, path);
-
-		if (!remove_dir_recursively(&path_copy, REMOVE_DIR_EMPTY_ONLY))
-			goto retry_fn;
-	} else if (errno == ENOENT && create_directories_remaining-- > 0) {
-		/*
-		 * Maybe the containing directory didn't exist, or
-		 * maybe it was just deleted by a process that is
-		 * racing with us to clean up empty directories. Try
-		 * to create it:
-		 */
-		enum scld_error scld_result;
-
-		if (!path_copy.len)
-			strbuf_addstr(&path_copy, path);
-
-		do {
-			scld_result = safe_create_leading_directories(path_copy.buf);
-			if (scld_result == SCLD_OK)
-				goto retry_fn;
-		} while (scld_result == SCLD_VANISHED && create_directories_remaining-- > 0);
-	}
-
-out:
-	strbuf_release(&path_copy);
-	errno = save_errno;
-	return ret;
-}
-
 static void fill_loose_path(struct strbuf *buf, const struct object_id *oid)
 {
 	int i;
@@ -517,9 +447,9 @@ const char *loose_object_path(struct repository *r, struct strbuf *buf,
  */
 static int alt_odb_usable(struct raw_object_store *o,
 			  struct strbuf *path,
-			  const char *normalized_objdir)
+			  const char *normalized_objdir, khiter_t *pos)
 {
-	struct object_directory *odb;
+	int r;
 
 	/* Detect cases where alternate disappeared */
 	if (!is_directory(path->buf)) {
@@ -533,14 +463,20 @@ static int alt_odb_usable(struct raw_object_store *o,
 	 * Prevent the common mistake of listing the same
 	 * thing twice, or object directory itself.
 	 */
-	for (odb = o->odb; odb; odb = odb->next) {
-		if (!fspathcmp(path->buf, odb->path))
-			return 0;
+	if (!o->odb_by_path) {
+		khiter_t p;
+
+		o->odb_by_path = kh_init_odb_path_map();
+		assert(!o->odb->next);
+		p = kh_put_odb_path_map(o->odb_by_path, o->odb->path, &r);
+		assert(r == 1); /* never used */
+		kh_value(o->odb_by_path, p) = o->odb;
 	}
-	if (!fspathcmp(path->buf, normalized_objdir))
+	if (fspatheq(path->buf, normalized_objdir))
 		return 0;
-
-	return 1;
+	*pos = kh_put_odb_path_map(o->odb_by_path, path->buf, &r);
+	/* r: 0 = exists, 1 = never used, 2 = deleted */
+	return r == 0 ? 0 : 1;
 }
 
 /*
@@ -561,17 +497,18 @@ static int alt_odb_usable(struct raw_object_store *o,
 static void read_info_alternates(struct repository *r,
 				 const char *relative_base,
 				 int depth);
-static int link_alt_odb_entry(struct repository *r, const char *entry,
+static int link_alt_odb_entry(struct repository *r, const struct strbuf *entry,
 	const char *relative_base, int depth, const char *normalized_objdir)
 {
 	struct object_directory *ent;
 	struct strbuf pathbuf = STRBUF_INIT;
+	khiter_t pos;
 
-	if (!is_absolute_path(entry) && relative_base) {
+	if (!is_absolute_path(entry->buf) && relative_base) {
 		strbuf_realpath(&pathbuf, relative_base, 1);
 		strbuf_addch(&pathbuf, '/');
 	}
-	strbuf_addstr(&pathbuf, entry);
+	strbuf_addbuf(&pathbuf, entry);
 
 	if (strbuf_normalize_path(&pathbuf) < 0 && relative_base) {
 		error(_("unable to normalize alternate object path: %s"),
@@ -587,23 +524,25 @@ static int link_alt_odb_entry(struct repository *r, const char *entry,
 	while (pathbuf.len && pathbuf.buf[pathbuf.len - 1] == '/')
 		strbuf_setlen(&pathbuf, pathbuf.len - 1);
 
-	if (!alt_odb_usable(r->objects, &pathbuf, normalized_objdir)) {
+	if (!alt_odb_usable(r->objects, &pathbuf, normalized_objdir, &pos)) {
 		strbuf_release(&pathbuf);
 		return -1;
 	}
 
 	CALLOC_ARRAY(ent, 1);
-	ent->path = xstrdup(pathbuf.buf);
+	/* pathbuf.buf is already in r->objects->odb_by_path */
+	ent->path = strbuf_detach(&pathbuf, NULL);
 
 	/* add the alternate entry */
 	*r->objects->odb_tail = ent;
 	r->objects->odb_tail = &(ent->next);
 	ent->next = NULL;
+	assert(r->objects->odb_by_path);
+	kh_value(r->objects->odb_by_path, pos) = ent;
 
 	/* recursively add alternates */
-	read_info_alternates(r, pathbuf.buf, depth + 1);
+	read_info_alternates(r, ent->path, depth + 1);
 
-	strbuf_release(&pathbuf);
 	return 0;
 }
 
@@ -660,7 +599,7 @@ static void link_alt_odb_entries(struct repository *r, const char *alt,
 		alt = parse_alt_odb_entry(alt, sep, &entry);
 		if (!entry.len)
 			continue;
-		link_alt_odb_entry(r, entry.buf,
+		link_alt_odb_entry(r, &entry,
 				   relative_base, depth, objdirbuf.buf);
 	}
 	strbuf_release(&entry);
@@ -741,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`
@@ -811,6 +793,27 @@ out:
 	return ref_git;
 }
 
+struct object_directory *find_odb(struct repository *r, const char *obj_dir)
+{
+	struct object_directory *odb;
+	char *obj_dir_real = real_pathdup(obj_dir, 1);
+	struct strbuf odb_path_real = STRBUF_INIT;
+
+	prepare_alt_odb(r);
+	for (odb = r->objects->odb; odb; odb = odb->next) {
+		strbuf_realpath(&odb_path_real, odb->path, 1);
+		if (!strcmp(obj_dir_real, odb_path_real.buf))
+			break;
+	}
+
+	free(obj_dir_real);
+	strbuf_release(&odb_path_real);
+
+	if (!odb)
+		die(_("could not find object directory matching %s"), obj_dir);
+	return odb;
+}
+
 static void fill_alternate_refs_command(struct child_process *cmd,
 					const char *repo_path)
 {
@@ -834,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;
 }
 
@@ -1053,9 +1056,11 @@ void *xmmap(void *start, size_t length,
  * the streaming interface and rehash it to do the same.
  */
 int check_object_signature(struct repository *r, const struct object_id *oid,
-			   void *map, unsigned long size, const char *type)
+			   void *map, unsigned long size, const char *type,
+			   struct object_id *real_oidp)
 {
-	struct object_id real_oid;
+	struct object_id tmp;
+	struct object_id *real_oid = real_oidp ? real_oidp : &tmp;
 	enum object_type obj_type;
 	struct git_istream *st;
 	git_hash_ctx c;
@@ -1063,8 +1068,8 @@ int check_object_signature(struct repository *r, const struct object_id *oid,
 	int hdrlen;
 
 	if (map) {
-		hash_object_file(r->hash_algo, map, size, type, &real_oid);
-		return !oideq(oid, &real_oid) ? -1 : 0;
+		hash_object_file(r->hash_algo, map, size, type, real_oid);
+		return !oideq(oid, real_oid) ? -1 : 0;
 	}
 
 	st = open_istream(r, oid, &obj_type, &size, NULL);
@@ -1089,9 +1094,9 @@ int check_object_signature(struct repository *r, const struct object_id *oid,
 			break;
 		r->hash_algo->update_fn(&c, buf, readlen);
 	}
-	r->hash_algo->final_oid_fn(&real_oid, &c);
+	r->hash_algo->final_oid_fn(real_oid, &c);
 	close_istream(st);
-	return !oideq(oid, &real_oid) ? -1 : 0;
+	return !oideq(oid, real_oid) ? -1 : 0;
 }
 
 int git_open_cloexec(const char *name, int flags)
@@ -1178,7 +1183,7 @@ static int quick_has_loose(struct repository *r,
 
 	prepare_alt_odb(r);
 	for (odb = r->objects->odb; odb; odb = odb->next) {
-		if (oid_array_lookup(odb_loose_cache(odb, oid), oid) >= 0)
+		if (oidtree_contains(odb_loose_cache(odb, oid), oid))
 			return 1;
 	}
 	return 0;
@@ -1224,11 +1229,14 @@ void *map_loose_object(struct repository *r,
 	return map_loose_object_1(r, NULL, oid, size);
 }
 
-static int unpack_loose_short_header(git_zstream *stream,
-				     unsigned char *map, unsigned long mapsize,
-				     void *buffer, unsigned long bufsiz)
+enum unpack_loose_header_result unpack_loose_header(git_zstream *stream,
+						    unsigned char *map,
+						    unsigned long mapsize,
+						    void *buffer,
+						    unsigned long bufsiz,
+						    struct strbuf *header)
 {
-	int ret;
+	int status;
 
 	/* Get the data stream */
 	memset(stream, 0, sizeof(*stream));
@@ -1239,43 +1247,24 @@ static int unpack_loose_short_header(git_zstream *stream,
 
 	git_inflate_init(stream);
 	obj_read_unlock();
-	ret = git_inflate(stream, 0);
+	status = git_inflate(stream, 0);
 	obj_read_lock();
-
-	return ret;
-}
-
-int unpack_loose_header(git_zstream *stream,
-			unsigned char *map, unsigned long mapsize,
-			void *buffer, unsigned long bufsiz)
-{
-	int status = unpack_loose_short_header(stream, map, mapsize,
-					       buffer, bufsiz);
-
-	if (status < Z_OK)
-		return status;
-
-	/* Make sure we have the terminating NUL */
-	if (!memchr(buffer, '\0', stream->next_out - (unsigned char *)buffer))
-		return -1;
-	return 0;
-}
-
-static int unpack_loose_header_to_strbuf(git_zstream *stream, unsigned char *map,
-					 unsigned long mapsize, void *buffer,
-					 unsigned long bufsiz, struct strbuf *header)
-{
-	int status;
-
-	status = unpack_loose_short_header(stream, map, mapsize, buffer, bufsiz);
 	if (status < Z_OK)
-		return -1;
+		return ULHR_BAD;
 
 	/*
 	 * Check if entire header is unpacked in the first iteration.
 	 */
 	if (memchr(buffer, '\0', stream->next_out - (unsigned char *)buffer))
-		return 0;
+		return ULHR_OK;
+
+	/*
+	 * We have a header longer than MAX_HEADER_LEN. The "header"
+	 * here is only non-NULL when we run "cat-file
+	 * --allow-unknown-type".
+	 */
+	if (!header)
+		return ULHR_TOO_LONG;
 
 	/*
 	 * buffer[0..bufsiz] was not large enough.  Copy the partial
@@ -1296,7 +1285,7 @@ static int unpack_loose_header_to_strbuf(git_zstream *stream, unsigned char *map
 		stream->next_out = buffer;
 		stream->avail_out = bufsiz;
 	} while (status != Z_STREAM_END);
-	return -1;
+	return ULHR_TOO_LONG;
 }
 
 static void *unpack_loose_rest(git_zstream *stream,
@@ -1354,11 +1343,10 @@ static void *unpack_loose_rest(git_zstream *stream,
  * too permissive for what we want to check. So do an anal
  * object header parse by hand.
  */
-static int parse_loose_header_extended(const char *hdr, struct object_info *oi,
-				       unsigned int flags)
+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;
 
 	/*
@@ -1377,15 +1365,6 @@ static int parse_loose_header_extended(const char *hdr, struct object_info *oi,
 	type = type_from_string_gently(type_buf, type_len, 1);
 	if (oi->type_name)
 		strbuf_add(oi->type_name, type_buf, type_len);
-	/*
-	 * Set type to 0 if its an unknown object and
-	 * we're obtaining the type using '--allow-unknown-type'
-	 * option.
-	 */
-	if ((flags & OBJECT_INFO_ALLOW_UNKNOWN_TYPE) && (type < 0))
-		type = 0;
-	else if (type < 0)
-		die(_("invalid object type"));
 	if (oi->typep)
 		*oi->typep = type;
 
@@ -1402,25 +1381,24 @@ static int parse_loose_header_extended(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
 	 */
-	return *hdr ? -1 : type;
-}
-
-int parse_loose_header(const char *hdr, unsigned long *sizep)
-{
-	struct object_info oi = OBJECT_INFO_INIT;
+	if (*hdr)
+		return -1;
 
-	oi.sizep = sizep;
-	return parse_loose_header_extended(hdr, &oi, 0);
+	/*
+	 * The format is valid, but the type may still be bogus. The
+	 * Caller needs to check its oi->typep.
+	 */
+	return 0;
 }
 
 static int loose_object_info(struct repository *r,
@@ -1434,6 +1412,8 @@ static int loose_object_info(struct repository *r,
 	char hdr[MAX_HEADER_LEN];
 	struct strbuf hdrbuf = STRBUF_INIT;
 	unsigned long size_scratch;
+	enum object_type type_scratch;
+	int allow_unknown = flags & OBJECT_INFO_ALLOW_UNKNOWN_TYPE;
 
 	if (oi->delta_base_oid)
 		oidclr(oi->delta_base_oid);
@@ -1464,43 +1444,48 @@ static int loose_object_info(struct repository *r,
 
 	if (!oi->sizep)
 		oi->sizep = &size_scratch;
+	if (!oi->typep)
+		oi->typep = &type_scratch;
 
 	if (oi->disk_sizep)
 		*oi->disk_sizep = mapsize;
-	if ((flags & OBJECT_INFO_ALLOW_UNKNOWN_TYPE)) {
-		if (unpack_loose_header_to_strbuf(&stream, map, mapsize, hdr, sizeof(hdr), &hdrbuf) < 0)
-			status = error(_("unable to unpack %s header with --allow-unknown-type"),
-				       oid_to_hex(oid));
-	} else if (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0)
+
+	switch (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr),
+				    allow_unknown ? &hdrbuf : NULL)) {
+	case ULHR_OK:
+		if (parse_loose_header(hdrbuf.len ? hdrbuf.buf : hdr, oi) < 0)
+			status = error(_("unable to parse %s header"), oid_to_hex(oid));
+		else if (!allow_unknown && *oi->typep < 0)
+			die(_("invalid object type"));
+
+		if (!oi->contentp)
+			break;
+		*oi->contentp = unpack_loose_rest(&stream, hdr, *oi->sizep, oid);
+		if (*oi->contentp)
+			goto cleanup;
+
+		status = -1;
+		break;
+	case ULHR_BAD:
 		status = error(_("unable to unpack %s header"),
 			       oid_to_hex(oid));
-	if (status < 0)
-		; /* Do nothing */
-	else if (hdrbuf.len) {
-		if ((status = parse_loose_header_extended(hdrbuf.buf, oi, flags)) < 0)
-			status = error(_("unable to parse %s header with --allow-unknown-type"),
-				       oid_to_hex(oid));
-	} else if ((status = parse_loose_header_extended(hdr, oi, flags)) < 0)
-		status = error(_("unable to parse %s header"), oid_to_hex(oid));
-
-	if (status >= 0 && oi->contentp) {
-		*oi->contentp = unpack_loose_rest(&stream, hdr,
-						  *oi->sizep, oid);
-		if (!*oi->contentp) {
-			git_inflate_end(&stream);
-			status = -1;
-		}
-	} else
-		git_inflate_end(&stream);
+		break;
+	case ULHR_TOO_LONG:
+		status = error(_("header for %s too long, exceeds %d bytes"),
+			       oid_to_hex(oid), MAX_HEADER_LEN);
+		break;
+	}
 
+	git_inflate_end(&stream);
+cleanup:
 	munmap(map, mapsize);
-	if (status && oi->typep)
-		*oi->typep = status;
 	if (oi->sizep == &size_scratch)
 		oi->sizep = NULL;
 	strbuf_release(&hdrbuf);
+	if (oi->typep == &type_scratch)
+		oi->typep = NULL;
 	oi->whence = OI_LOOSE;
-	return (status < 0) ? status : 0;
+	return status;
 }
 
 int obj_read_use_lock = 0;
@@ -1583,6 +1568,17 @@ static int do_oid_object_info_extended(struct repository *r,
 				break;
 		}
 
+		/*
+		 * If r is the_repository, this might be an attempt at
+		 * accessing a submodule object as if it were in the_repository
+		 * (having called add_submodule_odb() on that submodule's ODB).
+		 * If any such ODBs exist, register them and try again.
+		 */
+		if (r == the_repository &&
+		    register_all_submodule_odb_as_alternates())
+			/* We added some alternates; retry */
+			continue;
+
 		/* Check if it is a missing object */
 		if (fetch_if_missing && repo_has_promisor_remote(r) &&
 		    !already_retried &&
@@ -1607,7 +1603,7 @@ static int do_oid_object_info_extended(struct repository *r,
 		return 0;
 	rtype = packed_object_info(r, e.p, e.offset, oi);
 	if (rtype < 0) {
-		mark_bad_packed_object(e.p, real->hash);
+		mark_bad_packed_object(e.p, real);
 		return do_oid_object_info_extended(r, real, oi, 0);
 	} else if (oi->whence == OI_PACKED) {
 		oi->u.packed.offset = e.offset;
@@ -1716,7 +1712,7 @@ void *read_object_file_extended(struct repository *r,
 		die(_("loose object %s (stored in %s) is corrupt"),
 		    oid_to_hex(repl), path);
 
-	if ((p = has_packed_and_bad(r, repl->hash)) != NULL)
+	if ((p = has_packed_and_bad(r, repl)) != NULL)
 		die(_("packed object %s (stored in %s) is corrupt"),
 		    oid_to_hex(repl), p->pack_name);
 	obj_read_unlock();
@@ -1853,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"));
 }
@@ -1906,7 +1905,7 @@ static int create_tmpfile(struct strbuf *tmp, const char *filename)
 
 static int write_loose_object(const struct object_id *oid, char *hdr,
 			      int hdrlen, const void *buf, unsigned long len,
-			      time_t mtime)
+			      time_t mtime, unsigned flags)
 {
 	int fd, ret;
 	unsigned char compressed[4096];
@@ -1920,7 +1919,9 @@ static int write_loose_object(const struct object_id *oid, char *hdr,
 
 	fd = create_tmpfile(&tmp_file, filename.buf);
 	if (fd < 0) {
-		if (errno == EACCES)
+		if (flags & HASH_SILENT)
+			return -1;
+		else if (errno == EACCES)
 			return error(_("insufficient permission for adding an object to repository database %s"), get_object_directory());
 		else
 			return error_errno(_("unable to create temporary file"));
@@ -1970,7 +1971,8 @@ static int write_loose_object(const struct object_id *oid, char *hdr,
 		struct utimbuf utb;
 		utb.actime = mtime;
 		utb.modtime = mtime;
-		if (utime(tmp_file.buf, &utb) < 0)
+		if (utime(tmp_file.buf, &utb) < 0 &&
+		    !(flags & HASH_SILENT))
 			warning_errno(_("failed utime() on %s"), tmp_file.buf);
 	}
 
@@ -1995,8 +1997,9 @@ static int freshen_packed_object(const struct object_id *oid)
 	return 1;
 }
 
-int write_object_file(const void *buf, unsigned long len, const char *type,
-		      struct object_id *oid)
+int write_object_file_flags(const void *buf, unsigned long len,
+			    const char *type, struct object_id *oid,
+			    unsigned flags)
 {
 	char hdr[MAX_HEADER_LEN];
 	int hdrlen = sizeof(hdr);
@@ -2008,7 +2011,7 @@ int write_object_file(const void *buf, unsigned long len, const char *type,
 				  &hdrlen);
 	if (freshen_packed_object(oid) || freshen_loose_object(oid))
 		return 0;
-	return write_loose_object(oid, hdr, hdrlen, buf, len, 0);
+	return write_loose_object(oid, hdr, hdrlen, buf, len, 0, flags);
 }
 
 int hash_object_file_literally(const void *buf, unsigned long len,
@@ -2028,7 +2031,7 @@ int hash_object_file_literally(const void *buf, unsigned long len,
 		goto cleanup;
 	if (freshen_packed_object(oid) || freshen_loose_object(oid))
 		goto cleanup;
-	status = write_loose_object(oid, header, hdrlen, buf, len, 0);
+	status = write_loose_object(oid, header, hdrlen, buf, len, 0, 0);
 
 cleanup:
 	free(header);
@@ -2050,7 +2053,7 @@ int force_object_loose(const struct object_id *oid, time_t mtime)
 	if (!buf)
 		return error(_("cannot read object for %s"), oid_to_hex(oid));
 	hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %"PRIuMAX , type_name(type), (uintmax_t)len) + 1;
-	ret = write_loose_object(oid, hdr, hdrlen, buf, len, mtime);
+	ret = write_loose_object(oid, hdr, hdrlen, buf, len, mtime, 0);
 	free(buf);
 
 	return ret;
@@ -2454,39 +2457,45 @@ int for_each_loose_object(each_loose_object_fn cb, void *data,
 static int append_loose_object(const struct object_id *oid, const char *path,
 			       void *data)
 {
-	oid_array_append(data, oid);
+	oidtree_insert(data, oid);
 	return 0;
 }
 
-struct oid_array *odb_loose_cache(struct object_directory *odb,
+struct oidtree *odb_loose_cache(struct object_directory *odb,
 				  const struct object_id *oid)
 {
 	int subdir_nr = oid->hash[0];
 	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 = (size_t)1u << (subdir_nr % word_bits);
+	uint32_t *bitmap;
 
 	if (subdir_nr < 0 ||
-	    subdir_nr >= ARRAY_SIZE(odb->loose_objects_subdir_seen))
+	    subdir_nr >= bitsizeof(odb->loose_objects_subdir_seen))
 		BUG("subdir_nr out of range");
 
-	if (odb->loose_objects_subdir_seen[subdir_nr])
-		return &odb->loose_objects_cache[subdir_nr];
-
+	bitmap = &odb->loose_objects_subdir_seen[word_index];
+	if (*bitmap & mask)
+		return odb->loose_objects_cache;
+	if (!odb->loose_objects_cache) {
+		ALLOC_ARRAY(odb->loose_objects_cache, 1);
+		oidtree_init(odb->loose_objects_cache);
+	}
 	strbuf_addstr(&buf, odb->path);
 	for_each_file_in_obj_subdir(subdir_nr, &buf,
 				    append_loose_object,
 				    NULL, NULL,
-				    &odb->loose_objects_cache[subdir_nr]);
-	odb->loose_objects_subdir_seen[subdir_nr] = 1;
+				    odb->loose_objects_cache);
+	*bitmap |= mask;
 	strbuf_release(&buf);
-	return &odb->loose_objects_cache[subdir_nr];
+	return odb->loose_objects_cache;
 }
 
 void odb_clear_loose_cache(struct object_directory *odb)
 {
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(odb->loose_objects_cache); i++)
-		oid_array_clear(&odb->loose_objects_cache[i]);
+	oidtree_clear(odb->loose_objects_cache);
+	FREE_AND_NULL(odb->loose_objects_cache);
 	memset(&odb->loose_objects_subdir_seen, 0,
 	       sizeof(odb->loose_objects_subdir_seen));
 }
@@ -2551,17 +2560,16 @@ static int check_stream_oid(git_zstream *stream,
 
 int read_loose_object(const char *path,
 		      const struct object_id *expected_oid,
-		      enum object_type *type,
-		      unsigned long *size,
-		      void **contents)
+		      struct object_id *real_oid,
+		      void **contents,
+		      struct object_info *oi)
 {
 	int ret = -1;
 	void *map = NULL;
 	unsigned long mapsize;
 	git_zstream stream;
 	char hdr[MAX_HEADER_LEN];
-
-	*contents = NULL;
+	unsigned long *size = oi->sizep;
 
 	map = map_loose_object_1(the_repository, path, NULL, &mapsize);
 	if (!map) {
@@ -2569,19 +2577,19 @@ int read_loose_object(const char *path,
 		goto out;
 	}
 
-	if (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0) {
+	if (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr),
+				NULL) < 0) {
 		error(_("unable to unpack header of %s"), path);
 		goto out;
 	}
 
-	*type = parse_loose_header(hdr, size);
-	if (*type < 0) {
+	if (parse_loose_header(hdr, oi) < 0) {
 		error(_("unable to parse header of %s"), path);
 		git_inflate_end(&stream);
 		goto out;
 	}
 
-	if (*type == OBJ_BLOB && *size > big_file_threshold) {
+	if (*oi->typep == OBJ_BLOB && *size > big_file_threshold) {
 		if (check_stream_oid(&stream, hdr, *size, path, expected_oid) < 0)
 			goto out;
 	} else {
@@ -2593,12 +2601,8 @@ int read_loose_object(const char *path,
 		}
 		if (check_object_signature(the_repository, expected_oid,
 					   *contents, *size,
-					   type_name(*type))) {
-			error(_("hash mismatch for %s (expected %s)"), path,
-			      oid_to_hex(expected_oid));
-			free(*contents);
+					   oi->type_name->buf, real_oid))
 			goto out;
-		}
 	}
 
 	ret = 0; /* everything checks out */
diff --git a/object-name.c b/object-name.c
index 64202de60b..0230a87416 100644
--- a/object-name.c
+++ b/object-name.c
@@ -87,27 +87,21 @@ static void update_candidates(struct disambiguate_state *ds, const struct object
 
 static int match_hash(unsigned, const unsigned char *, const unsigned char *);
 
+static enum cb_next match_prefix(const struct object_id *oid, void *arg)
+{
+	struct disambiguate_state *ds = arg;
+	/* no need to call match_hash, oidtree_each did prefix match */
+	update_candidates(ds, oid);
+	return ds->ambiguous ? CB_BREAK : CB_CONTINUE;
+}
+
 static void find_short_object_filename(struct disambiguate_state *ds)
 {
 	struct object_directory *odb;
 
-	for (odb = ds->repo->objects->odb; odb && !ds->ambiguous; odb = odb->next) {
-		int pos;
-		struct oid_array *loose_objects;
-
-		loose_objects = odb_loose_cache(odb, &ds->bin_pfx);
-		pos = oid_array_lookup(loose_objects, &ds->bin_pfx);
-		if (pos < 0)
-			pos = -1 - pos;
-		while (!ds->ambiguous && pos < loose_objects->nr) {
-			const struct object_id *oid;
-			oid = loose_objects->oid + pos;
-			if (!match_hash(ds->len, ds->bin_pfx.hash, oid->hash))
-				break;
-			update_candidates(ds, oid);
-			pos++;
-		}
-	}
+	for (odb = ds->repo->objects->odb; odb && !ds->ambiguous; odb = odb->next)
+		oidtree_each(odb_loose_cache(odb, &ds->bin_pfx),
+				&ds->bin_pfx, ds->len, match_prefix, ds);
 }
 
 static int match_hash(unsigned len, const unsigned char *a, const unsigned char *b)
@@ -357,35 +351,118 @@ static int init_object_disambiguation(struct repository *r,
 	return 0;
 }
 
+struct ambiguous_output {
+	const struct disambiguate_state *ds;
+	struct strbuf advice;
+	struct strbuf sb;
+};
+
 static int show_ambiguous_object(const struct object_id *oid, void *data)
 {
-	const struct disambiguate_state *ds = data;
-	struct strbuf desc = STRBUF_INIT;
+	struct ambiguous_output *state = data;
+	const struct disambiguate_state *ds = state->ds;
+	struct strbuf *advice = &state->advice;
+	struct strbuf *sb = &state->sb;
 	int type;
+	const char *hash;
 
 	if (ds->fn && !ds->fn(ds->repo, oid, ds->cb_data))
 		return 0;
 
+	hash = repo_find_unique_abbrev(ds->repo, oid, DEFAULT_ABBREV);
 	type = oid_object_info(ds->repo, oid, NULL);
+
+	if (type < 0) {
+		/*
+		 * TRANSLATORS: This is a line of ambiguous object
+		 * output shown when we cannot look up or parse the
+		 * object in question. E.g. "deadbeef [bad object]".
+		 */
+		strbuf_addf(sb, _("%s [bad object]"), hash);
+		goto out;
+	}
+
+	assert(type == OBJ_TREE || type == OBJ_COMMIT ||
+	       type == OBJ_BLOB || type == OBJ_TAG);
+
 	if (type == OBJ_COMMIT) {
+		struct strbuf date = STRBUF_INIT;
+		struct strbuf msg = STRBUF_INIT;
 		struct commit *commit = lookup_commit(ds->repo, oid);
+
 		if (commit) {
 			struct pretty_print_context pp = {0};
 			pp.date_mode.type = DATE_SHORT;
-			format_commit_message(commit, " %ad - %s", &desc, &pp);
+			format_commit_message(commit, "%ad", &date, &pp);
+			format_commit_message(commit, "%s", &msg, &pp);
 		}
+
+		/*
+		 * TRANSLATORS: This is a line of ambiguous commit
+		 * object output. E.g.:
+		 *
+		 *    "deadbeef commit 2021-01-01 - Some Commit Message"
+		 */
+		strbuf_addf(sb, _("%s commit %s - %s"), hash, date.buf,
+			    msg.buf);
+
+		strbuf_release(&date);
+		strbuf_release(&msg);
 	} else if (type == OBJ_TAG) {
 		struct tag *tag = lookup_tag(ds->repo, oid);
-		if (!parse_tag(tag) && tag->tag)
-			strbuf_addf(&desc, " %s", tag->tag);
+
+		if (!parse_tag(tag) && tag->tag) {
+			/*
+			 * TRANSLATORS: This is a line of ambiguous
+			 * tag object output. E.g.:
+			 *
+			 *    "deadbeef tag 2022-01-01 - Some Tag Message"
+			 *
+			 * The second argument is the YYYY-MM-DD found
+			 * in the tag.
+			 *
+			 * The third argument is the "tag" string
+			 * from object.c.
+			 */
+			strbuf_addf(sb, _("%s tag %s - %s"), hash,
+				    show_date(tag->date, 0, DATE_MODE(SHORT)),
+				    tag->tag);
+		} else {
+			/*
+			 * TRANSLATORS: This is a line of ambiguous
+			 * tag object output where we couldn't parse
+			 * the tag itself. E.g.:
+			 *
+			 *    "deadbeef [bad tag, could not parse it]"
+			 */
+			strbuf_addf(sb, _("%s [bad tag, could not parse it]"),
+				    hash);
+		}
+	} else if (type == OBJ_TREE) {
+		/*
+		 * TRANSLATORS: This is a line of ambiguous <type>
+		 * object output. E.g. "deadbeef tree".
+		 */
+		strbuf_addf(sb, _("%s tree"), hash);
+	} else if (type == OBJ_BLOB) {
+		/*
+		 * TRANSLATORS: This is a line of ambiguous <type>
+		 * object output. E.g. "deadbeef blob".
+		 */
+		strbuf_addf(sb, _("%s blob"), hash);
 	}
 
-	advise("  %s %s%s",
-	       repo_find_unique_abbrev(ds->repo, oid, DEFAULT_ABBREV),
-	       type_name(type) ? type_name(type) : "unknown type",
-	       desc.buf);
 
-	strbuf_release(&desc);
+out:
+	/*
+	 * TRANSLATORS: This is line item of ambiguous object output
+	 * from describe_ambiguous_object() above. For RTL languages
+	 * you'll probably want to swap the "%s" and leading " " space
+	 * around.
+	 */
+	strbuf_addf(advice, _("  %s\n"), sb->buf);
+
+	strbuf_reset(sb);
 	return 0;
 }
 
@@ -482,6 +559,11 @@ static enum get_oid_result get_short_oid(struct repository *r,
 
 	if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) {
 		struct oid_array collect = OID_ARRAY_INIT;
+		struct ambiguous_output out = {
+			.ds = &ds,
+			.sb = STRBUF_INIT,
+			.advice = STRBUF_INIT,
+		};
 
 		error(_("short object ID %s is ambiguous"), ds.hex_pfx);
 
@@ -494,13 +576,22 @@ static enum get_oid_result get_short_oid(struct repository *r,
 		if (!ds.ambiguous)
 			ds.fn = NULL;
 
-		advise(_("The candidates are:"));
 		repo_for_each_abbrev(r, ds.hex_pfx, collect_ambiguous, &collect);
 		sort_ambiguous_oid_array(r, &collect);
 
-		if (oid_array_for_each(&collect, show_ambiguous_object, &ds))
+		if (oid_array_for_each(&collect, show_ambiguous_object, &out))
 			BUG("show_ambiguous_object shouldn't return non-zero");
+
+		/*
+		 * TRANSLATORS: The argument is the list of ambiguous
+		 * objects composed in show_ambiguous_object(). See
+		 * its "TRANSLATORS" comments for details.
+		 */
+		advise(_("The candidates are:\n%s"), out.advice.buf);
+
 		oid_array_clear(&collect);
+		strbuf_release(&out.advice);
+		strbuf_release(&out.sb);
 	}
 
 	return status;
@@ -812,7 +903,7 @@ static int get_oid_basic(struct repository *r, const char *str, int len,
 			refs_found = repo_dwim_ref(r, str, len, &tmp_oid, &real_ref, 0);
 			if (refs_found > 0) {
 				warning(warn_msg, len, str);
-				if (advice_object_name_warning)
+				if (advice_enabled(ADVICE_OBJECT_NAME_WARNING))
 					fprintf(stderr, "%s\n", _(object_name_msg));
 			}
 			free(real_ref);
@@ -1801,13 +1892,13 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo,
 	const char *cp;
 	int only_to_die = flags & GET_OID_ONLY_TO_DIE;
 
-	if (only_to_die)
-		flags |= GET_OID_QUIETLY;
-
 	memset(oc, 0, sizeof(*oc));
 	oc->mode = S_IFINVALID;
 	strbuf_init(&oc->symlink_path, 0);
 	ret = get_oid_1(repo, name, namelen, oid, flags);
+	if (!ret && flags & GET_OID_REQUIRE_PATH)
+		die(_("<object>:<path> required, only <object> '%s' given"),
+		    name);
 	if (!ret)
 		return ret;
 	/*
@@ -1938,7 +2029,7 @@ void maybe_die_on_misspelt_object_name(struct repository *r,
 {
 	struct object_context oc;
 	struct object_id oid;
-	get_oid_with_context_1(r, name, GET_OID_ONLY_TO_DIE,
+	get_oid_with_context_1(r, name, GET_OID_ONLY_TO_DIE | GET_OID_QUIETLY,
 			       prefix, &oid, &oc);
 }
 
diff --git a/object-store.h b/object-store.h
index ec32c23dcb..6f89482df0 100644
--- a/object-store.h
+++ b/object-store.h
@@ -7,6 +7,10 @@
 #include "oid-array.h"
 #include "strbuf.h"
 #include "thread-utils.h"
+#include "khash.h"
+#include "dir.h"
+#include "oidtree.h"
+#include "oidset.h"
 
 struct object_directory {
 	struct object_directory *next;
@@ -20,8 +24,20 @@ struct object_directory {
 	 *
 	 * Be sure to call odb_load_loose_cache() before using.
 	 */
-	char loose_objects_subdir_seen[256];
-	struct oid_array loose_objects_cache[256];
+	uint32_t loose_objects_subdir_seen[8]; /* 256 bits */
+	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,
@@ -30,8 +46,12 @@ struct object_directory {
 	char *path;
 };
 
+KHASH_INIT(odb_path_map, const char * /* key: odb_path */,
+	struct object_directory *, 1, fspathhash, fspatheq)
+
 void prepare_alt_odb(struct repository *r);
 char *compute_alternate_path(const char *path, struct strbuf *err);
+struct object_directory *find_odb(struct repository *r, const char *obj_dir);
 typedef int alt_odb_fn(struct object_directory *, void *);
 int foreach_alt_odb(alt_odb_fn, void*);
 typedef void alternate_ref_fn(const struct object_id *oid, void *);
@@ -51,15 +71,29 @@ 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.
  */
-struct oid_array *odb_loose_cache(struct object_directory *odb,
+struct oidtree *odb_loose_cache(struct object_directory *odb,
 				  const struct object_id *oid);
 
 /* 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;
@@ -69,9 +103,8 @@ struct packed_git {
 	const void *index_data;
 	size_t index_size;
 	uint32_t num_objects;
-	uint32_t num_bad_objects;
 	uint32_t crc_offset;
-	unsigned char *bad_object_sha1;
+	struct oidset bad_objects;
 	int index_version;
 	time_t mtime;
 	int pack_fd;
@@ -116,6 +149,8 @@ struct raw_object_store {
 	 */
 	struct object_directory *odb;
 	struct object_directory **odb_tail;
+	kh_odb_path_map_t *odb_by_path;
+
 	int loaded_alternates;
 
 	/*
@@ -214,8 +249,14 @@ int hash_object_file(const struct git_hash_algo *algo, const void *buf,
 		     unsigned long len, const char *type,
 		     struct object_id *oid);
 
-int write_object_file(const void *buf, unsigned long len,
-		      const char *type, struct object_id *oid);
+int write_object_file_flags(const void *buf, unsigned long len,
+			    const char *type, struct object_id *oid,
+			    unsigned flags);
+static inline int write_object_file(const void *buf, unsigned long len,
+				    const char *type, struct object_id *oid)
+{
+	return write_object_file_flags(buf, len, type, oid, 0);
+}
 
 int hash_object_file_literally(const void *buf, unsigned long len,
 			       const char *type, struct object_id *oid,
@@ -236,6 +277,7 @@ int force_object_loose(const struct object_id *oid, time_t mtime);
 
 /*
  * Open the loose object at path, check its hash, and return the contents,
+ * use the "oi" argument to assert things about the object, or e.g. populate its
  * type, and size. If the object is a blob, then "contents" may return NULL,
  * to allow streaming of large blobs.
  *
@@ -243,9 +285,9 @@ int force_object_loose(const struct object_id *oid, time_t mtime);
  */
 int read_loose_object(const char *path,
 		      const struct object_id *expected_oid,
-		      enum object_type *type,
-		      unsigned long *size,
-		      void **contents);
+		      struct object_id *real_oid,
+		      void **contents,
+		      struct object_info *oi);
 
 /* Retry packed storage after checking packed and loose storage */
 #define HAS_OBJECT_RECHECK_PACKED 1
@@ -362,7 +404,7 @@ struct object_info {
  * Initializer for a "struct object_info" that wants no items. You may
  * also memset() the memory to all-zeroes.
  */
-#define OBJECT_INFO_INIT {NULL}
+#define OBJECT_INFO_INIT { 0 }
 
 /* Invoke lookup_replace_object() on the given hash */
 #define OBJECT_INFO_LOOKUP_REPLACE 1
@@ -447,6 +489,12 @@ enum for_each_object_flags {
 	 * Visit objects within a pack in packfile order rather than .idx order
 	 */
 	FOR_EACH_OBJECT_PACK_ORDER = (1<<2),
+
+	/* Only iterate over packs that are not marked as kept in-core. */
+	FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS = (1<<3),
+
+	/* Only iterate over packs that do not have .keep files. */
+	FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS = (1<<4),
 };
 
 /*
diff --git a/object.c b/object.c
index 14188453c5..c37501fc12 100644
--- a/object.c
+++ b/object.c
@@ -185,6 +185,24 @@ struct object *lookup_unknown_object(struct repository *r, const struct object_i
 	return obj;
 }
 
+struct object *lookup_object_by_type(struct repository *r,
+			    const struct object_id *oid,
+			    enum object_type type)
+{
+	switch (type) {
+	case OBJ_COMMIT:
+		return (struct object *)lookup_commit(r, oid);
+	case OBJ_TREE:
+		return (struct object *)lookup_tree(r, oid);
+	case OBJ_TAG:
+		return (struct object *)lookup_tag(r, oid);
+	case OBJ_BLOB:
+		return (struct object *)lookup_blob(r, oid);
+	default:
+		BUG("unknown object type %d", type);
+	}
+}
+
 struct object *parse_object_buffer(struct repository *r, const struct object_id *oid, enum object_type type, unsigned long size, void *buffer, int *eaten_p)
 {
 	struct object *obj;
@@ -261,7 +279,7 @@ struct object *parse_object(struct repository *r, const struct object_id *oid)
 	if ((obj && obj->type == OBJ_BLOB && repo_has_object_file(r, oid)) ||
 	    (!obj && repo_has_object_file(r, oid) &&
 	     oid_object_info(r, oid, NULL) == OBJ_BLOB)) {
-		if (check_object_signature(r, repl, NULL, 0, NULL) < 0) {
+		if (check_object_signature(r, repl, NULL, 0, NULL, NULL) < 0) {
 			error(_("hash mismatch %s"), oid_to_hex(oid));
 			return NULL;
 		}
@@ -272,7 +290,7 @@ struct object *parse_object(struct repository *r, const struct object_id *oid)
 	buffer = repo_read_object_file(r, oid, &type, &size);
 	if (buffer) {
 		if (check_object_signature(r, repl, buffer, size,
-					   type_name(type)) < 0) {
+					   type_name(type), NULL) < 0) {
 			free(buffer);
 			error(_("hash mismatch %s"), oid_to_hex(repl));
 			return NULL;
@@ -495,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);
@@ -511,6 +529,8 @@ static void free_object_directories(struct raw_object_store *o)
 		free_object_directory(o->odb);
 		o->odb = next;
 	}
+	kh_destroy_odb_path_map(o->odb_by_path);
+	o->odb_by_path = NULL;
 }
 
 void raw_object_store_clear(struct raw_object_store *o)
diff --git a/object.h b/object.h
index 8bca310713..cb556ab775 100644
--- a/object.h
+++ b/object.h
@@ -55,7 +55,7 @@ struct object_array {
 	} *objects;
 };
 
-#define OBJECT_ARRAY_INIT { 0, 0, NULL }
+#define OBJECT_ARRAY_INIT { 0 }
 
 /*
  * object flag allocation:
@@ -75,7 +75,6 @@ struct object_array {
  * builtin/fsck.c:           0--3
  * builtin/gc.c:             0
  * builtin/index-pack.c:                                     2021
- * builtin/pack-objects.c:                                   20
  * builtin/reflog.c:                   10--12
  * builtin/show-branch.c:    0-------------------------------------------26
  * builtin/unpack-objects.c:                                 2021
@@ -144,9 +143,27 @@ struct object *parse_object_or_die(const struct object_id *oid, const char *name
  */
 struct object *parse_object_buffer(struct repository *r, const struct object_id *oid, enum object_type type, unsigned long size, void *buffer, int *eaten_p);
 
-/** Returns the object, with potentially excess memory allocated. **/
+/*
+ * Allocate and return an object struct, even if you do not know the type of
+ * the object. The returned object may have its "type" field set to a real type
+ * (if somebody previously called lookup_blob(), etc), or it may be set to
+ * OBJ_NONE. In the latter case, subsequent calls to lookup_blob(), etc, will
+ * set the type field as appropriate.
+ *
+ * Use this when you do not know the expected type of an object and want to
+ * avoid parsing it for efficiency reasons. Try to avoid it otherwise; it
+ * may allocate excess memory, since the returned object must be as large as
+ * the maximum struct of any type.
+ */
 struct object *lookup_unknown_object(struct repository *r, const struct object_id *oid);
 
+/*
+ * Dispatch to the appropriate lookup_blob(), lookup_commit(), etc, based on
+ * "type".
+ */
+struct object *lookup_object_by_type(struct repository *r, const struct object_id *oid,
+				     enum object_type type);
+
 struct object_list *object_list_insert(struct object *item,
 				       struct object_list **list_p);
 
diff --git a/oid-array.h b/oid-array.h
index 72bca78b7d..f60f9af674 100644
--- a/oid-array.h
+++ b/oid-array.h
@@ -56,7 +56,7 @@ struct oid_array {
 	int sorted;
 };
 
-#define OID_ARRAY_INIT { NULL, 0, 0, 0 }
+#define OID_ARRAY_INIT { 0 }
 
 /**
  * Add an item to the set. The object ID will be placed at the end of the array
diff --git a/oidset.c b/oidset.c
index 5aac633c1f..b36a2bae86 100644
--- a/oidset.c
+++ b/oidset.c
@@ -36,11 +36,6 @@ void oidset_clear(struct oidset *set)
 	oidset_init(set, 0);
 }
 
-int oidset_size(struct oidset *set)
-{
-	return kh_size(&set->set);
-}
-
 void oidset_parse_file(struct oidset *set, const char *path)
 {
 	oidset_parse_file_carefully(set, path, NULL, NULL);
diff --git a/oidset.h b/oidset.h
index 01f6560283..ba4a5a2cd3 100644
--- a/oidset.h
+++ b/oidset.h
@@ -57,7 +57,10 @@ int oidset_remove(struct oidset *set, const struct object_id *oid);
 /**
  * Returns the number of oids in the set.
  */
-int oidset_size(struct oidset *set);
+static inline int oidset_size(const struct oidset *set)
+{
+	return kh_size(&set->set);
+}
 
 /**
  * Remove all entries from the oidset, freeing any resources associated with
diff --git a/oidtree.c b/oidtree.c
new file mode 100644
index 0000000000..0d39389bee
--- /dev/null
+++ b/oidtree.c
@@ -0,0 +1,109 @@
+/*
+ * A wrapper around cbtree which stores oids
+ * May be used to replace oid-array for prefix (abbreviation) matches
+ */
+#include "oidtree.h"
+#include "alloc.h"
+#include "hash.h"
+
+struct oidtree_iter_data {
+	oidtree_iter fn;
+	void *arg;
+	size_t *last_nibble_at;
+	int algo;
+	uint8_t last_byte;
+};
+
+void oidtree_init(struct oidtree *ot)
+{
+	cb_init(&ot->tree);
+	mem_pool_init(&ot->mem_pool, 0);
+}
+
+void oidtree_clear(struct oidtree *ot)
+{
+	if (ot) {
+		mem_pool_discard(&ot->mem_pool, 0);
+		oidtree_init(ot);
+	}
+}
+
+void oidtree_insert(struct oidtree *ot, const struct object_id *oid)
+{
+	struct cb_node *on;
+	struct object_id k;
+
+	if (!oid->algo)
+		BUG("oidtree_insert requires oid->algo");
+
+	on = mem_pool_alloc(&ot->mem_pool, sizeof(*on) + sizeof(*oid));
+
+	/*
+	 * Clear the padding and copy the result in separate steps to
+	 * respect the 4-byte alignment needed by struct object_id.
+	 */
+	oidcpy_with_padding(&k, oid);
+	memcpy(on->k, &k, sizeof(k));
+
+	/*
+	 * n.b. Current callers won't get us duplicates, here.  If a
+	 * future caller causes duplicates, there'll be a a small leak
+	 * that won't be freed until oidtree_clear.  Currently it's not
+	 * worth maintaining a free list
+	 */
+	cb_insert(&ot->tree, on, sizeof(*oid));
+}
+
+
+int oidtree_contains(struct oidtree *ot, const struct object_id *oid)
+{
+	struct object_id k;
+	size_t klen = sizeof(k);
+
+	oidcpy_with_padding(&k, oid);
+
+	if (oid->algo == GIT_HASH_UNKNOWN)
+		klen -= sizeof(oid->algo);
+
+	/* cb_lookup relies on memcmp on the struct, so order matters: */
+	klen += BUILD_ASSERT_OR_ZERO(offsetof(struct object_id, hash) <
+				offsetof(struct object_id, algo));
+
+	return cb_lookup(&ot->tree, (const uint8_t *)&k, klen) ? 1 : 0;
+}
+
+static enum cb_next iter(struct cb_node *n, void *arg)
+{
+	struct oidtree_iter_data *x = arg;
+	struct object_id k;
+
+	/* Copy to provide 4-byte alignment needed by struct object_id. */
+	memcpy(&k, n->k, sizeof(k));
+
+	if (x->algo != GIT_HASH_UNKNOWN && x->algo != k.algo)
+		return CB_CONTINUE;
+
+	if (x->last_nibble_at) {
+		if ((k.hash[*x->last_nibble_at] ^ x->last_byte) & 0xf0)
+			return CB_CONTINUE;
+	}
+
+	return x->fn(&k, x->arg);
+}
+
+void oidtree_each(struct oidtree *ot, const struct object_id *oid,
+			size_t oidhexsz, oidtree_iter fn, void *arg)
+{
+	size_t klen = oidhexsz / 2;
+	struct oidtree_iter_data x = { 0 };
+	assert(oidhexsz <= GIT_MAX_HEXSZ);
+
+	x.fn = fn;
+	x.arg = arg;
+	x.algo = oid->algo;
+	if (oidhexsz & 1) {
+		x.last_byte = oid->hash[klen];
+		x.last_nibble_at = &klen;
+	}
+	cb_each(&ot->tree, (const uint8_t *)oid, klen, iter, &x);
+}
diff --git a/oidtree.h b/oidtree.h
new file mode 100644
index 0000000000..77898f510a
--- /dev/null
+++ b/oidtree.h
@@ -0,0 +1,22 @@
+#ifndef OIDTREE_H
+#define OIDTREE_H
+
+#include "cbtree.h"
+#include "hash.h"
+#include "mem-pool.h"
+
+struct oidtree {
+	struct cb_tree tree;
+	struct mem_pool mem_pool;
+};
+
+void oidtree_init(struct oidtree *);
+void oidtree_clear(struct oidtree *);
+void oidtree_insert(struct oidtree *, const struct object_id *);
+int oidtree_contains(struct oidtree *, const struct object_id *);
+
+typedef enum cb_next (*oidtree_iter)(const struct object_id *, void *data);
+void oidtree_each(struct oidtree *, const struct object_id *,
+			size_t oidhexsz, oidtree_iter, void *data);
+
+#endif /* OIDTREE_H */
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index f0b4044e2b..cab3eaa2ac 100644
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -48,7 +48,7 @@ void bitmap_writer_show_progress(int show)
 }
 
 /**
- * Build the initial type index for the packfile
+ * Build the initial type index for the packfile or multi-pack-index
  */
 void bitmap_writer_build_type_index(struct packing_data *to_pack,
 				    struct pack_idx_entry **index,
@@ -125,15 +125,20 @@ static inline void push_bitmapped_commit(struct commit *commit)
 	writer.selected_nr++;
 }
 
-static uint32_t find_object_pos(const struct object_id *oid)
+static uint32_t find_object_pos(const struct object_id *oid, int *found)
 {
 	struct object_entry *entry = packlist_find(writer.to_pack, oid);
 
 	if (!entry) {
-		die("Failed to write bitmap index. Packfile doesn't have full closure "
+		if (found)
+			*found = 0;
+		warning("Failed to write bitmap index. Packfile doesn't have full closure "
 			"(object %s is missing)", oid_to_hex(oid));
+		return 0;
 	}
 
+	if (found)
+		*found = 1;
 	return oe_in_pack_pos(writer.to_pack, entry);
 }
 
@@ -331,9 +336,10 @@ static void bitmap_builder_clear(struct bitmap_builder *bb)
 	bb->commits_nr = bb->commits_alloc = 0;
 }
 
-static void fill_bitmap_tree(struct bitmap *bitmap,
-			     struct tree *tree)
+static int fill_bitmap_tree(struct bitmap *bitmap,
+			    struct tree *tree)
 {
+	int found;
 	uint32_t pos;
 	struct tree_desc desc;
 	struct name_entry entry;
@@ -342,9 +348,11 @@ static void fill_bitmap_tree(struct bitmap *bitmap,
 	 * If our bit is already set, then there is nothing to do. Both this
 	 * tree and all of its children will be set.
 	 */
-	pos = find_object_pos(&tree->object.oid);
+	pos = find_object_pos(&tree->object.oid, &found);
+	if (!found)
+		return -1;
 	if (bitmap_get(bitmap, pos))
-		return;
+		return 0;
 	bitmap_set(bitmap, pos);
 
 	if (parse_tree(tree) < 0)
@@ -355,11 +363,15 @@ static void fill_bitmap_tree(struct bitmap *bitmap,
 	while (tree_entry(&desc, &entry)) {
 		switch (object_type(entry.mode)) {
 		case OBJ_TREE:
-			fill_bitmap_tree(bitmap,
-					 lookup_tree(the_repository, &entry.oid));
+			if (fill_bitmap_tree(bitmap,
+					     lookup_tree(the_repository, &entry.oid)) < 0)
+				return -1;
 			break;
 		case OBJ_BLOB:
-			bitmap_set(bitmap, find_object_pos(&entry.oid));
+			pos = find_object_pos(&entry.oid, &found);
+			if (!found)
+				return -1;
+			bitmap_set(bitmap, pos);
 			break;
 		default:
 			/* Gitlink, etc; not reachable */
@@ -368,15 +380,18 @@ static void fill_bitmap_tree(struct bitmap *bitmap,
 	}
 
 	free_tree_buffer(tree);
+	return 0;
 }
 
-static void fill_bitmap_commit(struct bb_commit *ent,
-			       struct commit *commit,
-			       struct prio_queue *queue,
-			       struct prio_queue *tree_queue,
-			       struct bitmap_index *old_bitmap,
-			       const uint32_t *mapping)
+static int fill_bitmap_commit(struct bb_commit *ent,
+			      struct commit *commit,
+			      struct prio_queue *queue,
+			      struct prio_queue *tree_queue,
+			      struct bitmap_index *old_bitmap,
+			      const uint32_t *mapping)
 {
+	int found;
+	uint32_t pos;
 	if (!ent->bitmap)
 		ent->bitmap = bitmap_new();
 
@@ -401,11 +416,16 @@ static void fill_bitmap_commit(struct bb_commit *ent,
 		 * Mark ourselves and queue our tree. The commit
 		 * walk ensures we cover all parents.
 		 */
-		bitmap_set(ent->bitmap, find_object_pos(&c->object.oid));
+		pos = find_object_pos(&c->object.oid, &found);
+		if (!found)
+			return -1;
+		bitmap_set(ent->bitmap, pos);
 		prio_queue_put(tree_queue, get_commit_tree(c));
 
 		for (p = c->parents; p; p = p->next) {
-			int pos = find_object_pos(&p->item->object.oid);
+			pos = find_object_pos(&p->item->object.oid, &found);
+			if (!found)
+				return -1;
 			if (!bitmap_get(ent->bitmap, pos)) {
 				bitmap_set(ent->bitmap, pos);
 				prio_queue_put(queue, p->item);
@@ -413,8 +433,12 @@ static void fill_bitmap_commit(struct bb_commit *ent,
 		}
 	}
 
-	while (tree_queue->nr)
-		fill_bitmap_tree(ent->bitmap, prio_queue_get(tree_queue));
+	while (tree_queue->nr) {
+		if (fill_bitmap_tree(ent->bitmap,
+				     prio_queue_get(tree_queue)) < 0)
+			return -1;
+	}
+	return 0;
 }
 
 static void store_selected(struct bb_commit *ent, struct commit *commit)
@@ -432,7 +456,7 @@ static void store_selected(struct bb_commit *ent, struct commit *commit)
 	kh_value(writer.bitmaps, hash_pos) = stored;
 }
 
-void bitmap_writer_build(struct packing_data *to_pack)
+int bitmap_writer_build(struct packing_data *to_pack)
 {
 	struct bitmap_builder bb;
 	size_t i;
@@ -441,6 +465,7 @@ void bitmap_writer_build(struct packing_data *to_pack)
 	struct prio_queue tree_queue = { NULL };
 	struct bitmap_index *old_bitmap;
 	uint32_t *mapping;
+	int closed = 1; /* until proven otherwise */
 
 	writer.bitmaps = kh_init_oid_map();
 	writer.to_pack = to_pack;
@@ -463,8 +488,11 @@ void bitmap_writer_build(struct packing_data *to_pack)
 		struct commit *child;
 		int reused = 0;
 
-		fill_bitmap_commit(ent, commit, &queue, &tree_queue,
-				   old_bitmap, mapping);
+		if (fill_bitmap_commit(ent, commit, &queue, &tree_queue,
+				       old_bitmap, mapping) < 0) {
+			closed = 0;
+			break;
+		}
 
 		if (ent->selected) {
 			store_selected(ent, commit);
@@ -492,6 +520,7 @@ void bitmap_writer_build(struct packing_data *to_pack)
 	clear_prio_queue(&queue);
 	clear_prio_queue(&tree_queue);
 	bitmap_builder_clear(&bb);
+	free_bitmap_index(old_bitmap);
 	free(mapping);
 
 	trace2_region_leave("pack-bitmap-write", "building_bitmaps_total",
@@ -499,7 +528,9 @@ void bitmap_writer_build(struct packing_data *to_pack)
 
 	stop_progress(&writer.progress);
 
-	compute_xor_offsets();
+	if (closed)
+		compute_xor_offsets();
+	return closed ? 0 : -1;
 }
 
 /**
diff --git a/pack-bitmap.c b/pack-bitmap.c
index bfc10148f5..9c666cdb8b 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -13,6 +13,7 @@
 #include "repository.h"
 #include "object-store.h"
 #include "list-objects-filter-options.h"
+#include "midx.h"
 #include "config.h"
 
 /*
@@ -35,8 +36,15 @@ struct stored_bitmap {
  * the active bitmap index is the largest one.
  */
 struct bitmap_index {
-	/* Packfile to which this bitmap index belongs to */
+	/*
+	 * The pack or multi-pack index (MIDX) that this bitmap index belongs
+	 * to.
+	 *
+	 * Exactly one of these must be non-NULL; this specifies the object
+	 * order used to interpret this bitmap.
+	 */
 	struct packed_git *pack;
+	struct multi_pack_index *midx;
 
 	/*
 	 * Mark the first `reuse_objects` in the packfile as reused:
@@ -71,6 +79,9 @@ struct bitmap_index {
 	/* If not NULL, this is a name-hash cache pointing into map. */
 	uint32_t *hashes;
 
+	/* The checksum of the packfile or MIDX; points into map. */
+	const unsigned char *checksum;
+
 	/*
 	 * Extended index.
 	 *
@@ -136,6 +147,13 @@ static struct ewah_bitmap *read_bitmap_1(struct bitmap_index *index)
 	return b;
 }
 
+static uint32_t bitmap_num_objects(struct bitmap_index *index)
+{
+	if (index->midx)
+		return index->midx->num_objects;
+	return index->pack->num_objects;
+}
+
 static int load_bitmap_header(struct bitmap_index *index)
 {
 	struct bitmap_disk_header *header = (void *)index->map;
@@ -154,7 +172,7 @@ static int load_bitmap_header(struct bitmap_index *index)
 	/* Parse known bitmap format options */
 	{
 		uint32_t flags = ntohs(header->options);
-		size_t cache_size = st_mult(index->pack->num_objects, sizeof(uint32_t));
+		size_t cache_size = st_mult(bitmap_num_objects(index), sizeof(uint32_t));
 		unsigned char *index_end = index->map + index->map_size - the_hash_algo->rawsz;
 
 		if ((flags & BITMAP_OPT_FULL_DAG) == 0)
@@ -170,6 +188,7 @@ static int load_bitmap_header(struct bitmap_index *index)
 	}
 
 	index->entry_count = ntohl(header->entry_count);
+	index->checksum = header->checksum;
 	index->map_pos += header_size;
 	return 0;
 }
@@ -218,6 +237,15 @@ static inline uint8_t read_u8(const unsigned char *buffer, size_t *pos)
 
 #define MAX_XOR_OFFSET 160
 
+static int nth_bitmap_object_oid(struct bitmap_index *index,
+				 struct object_id *oid,
+				 uint32_t n)
+{
+	if (index->midx)
+		return nth_midxed_object_oid(oid, index->midx, n) ? 0 : -1;
+	return nth_packed_object_id(oid, index->pack, n);
+}
+
 static int load_bitmap_entries_v1(struct bitmap_index *index)
 {
 	uint32_t i;
@@ -237,7 +265,7 @@ static int load_bitmap_entries_v1(struct bitmap_index *index)
 		xor_offset = read_u8(index->map, &index->map_pos);
 		flags = read_u8(index->map, &index->map_pos);
 
-		if (nth_packed_object_id(&oid, index->pack, commit_idx_pos) < 0)
+		if (nth_bitmap_object_oid(index, &oid, commit_idx_pos) < 0)
 			return error("corrupt ewah bitmap: commit index %u out of range",
 				     (unsigned)commit_idx_pos);
 
@@ -262,7 +290,17 @@ static int load_bitmap_entries_v1(struct bitmap_index *index)
 	return 0;
 }
 
-static char *pack_bitmap_filename(struct packed_git *p)
+char *midx_bitmap_filename(struct multi_pack_index *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)
 {
 	size_t len;
 
@@ -271,6 +309,61 @@ static char *pack_bitmap_filename(struct packed_git *p)
 	return xstrfmt("%.*s.bitmap", (int)len, p->pack_name);
 }
 
+static int open_midx_bitmap_1(struct bitmap_index *bitmap_git,
+			      struct multi_pack_index *midx)
+{
+	struct stat st;
+	char *idx_name = midx_bitmap_filename(midx);
+	int fd = git_open(idx_name);
+
+	free(idx_name);
+
+	if (fd < 0)
+		return -1;
+
+	if (fstat(fd, &st)) {
+		close(fd);
+		return -1;
+	}
+
+	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", buf.buf);
+		close(fd);
+		strbuf_release(&buf);
+		return -1;
+	}
+
+	bitmap_git->midx = midx;
+	bitmap_git->map_size = xsize_t(st.st_size);
+	bitmap_git->map_pos = 0;
+	bitmap_git->map = xmmap(NULL, bitmap_git->map_size, PROT_READ,
+				MAP_PRIVATE, fd, 0);
+	close(fd);
+
+	if (load_bitmap_header(bitmap_git) < 0)
+		goto cleanup;
+
+	if (!hasheq(get_midx_checksum(bitmap_git->midx), bitmap_git->checksum))
+		goto cleanup;
+
+	if (load_midx_revindex(bitmap_git->midx) < 0) {
+		warning(_("multi-pack bitmap is missing required reverse index"));
+		goto cleanup;
+	}
+	return 0;
+
+cleanup:
+	munmap(bitmap_git->map, bitmap_git->map_size);
+	bitmap_git->map_size = 0;
+	bitmap_git->map_pos = 0;
+	bitmap_git->map = NULL;
+	bitmap_git->midx = NULL;
+	return -1;
+}
+
 static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git *packfile)
 {
 	int fd;
@@ -292,12 +385,18 @@ static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git
 		return -1;
 	}
 
-	if (bitmap_git->pack) {
+	if (bitmap_git->pack || bitmap_git->midx) {
+		/* ignore extra bitmap file; we can only handle one */
 		warning("ignoring extra bitmap file: %s", packfile->pack_name);
 		close(fd);
 		return -1;
 	}
 
+	if (!is_pack_valid(packfile)) {
+		close(fd);
+		return -1;
+	}
+
 	bitmap_git->pack = packfile;
 	bitmap_git->map_size = xsize_t(st.st_size);
 	bitmap_git->map = xmmap(NULL, bitmap_git->map_size, PROT_READ, MAP_PRIVATE, fd, 0);
@@ -308,19 +407,47 @@ static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git
 		munmap(bitmap_git->map, bitmap_git->map_size);
 		bitmap_git->map = NULL;
 		bitmap_git->map_size = 0;
+		bitmap_git->map_pos = 0;
+		bitmap_git->pack = NULL;
 		return -1;
 	}
 
 	return 0;
 }
 
-static int load_pack_bitmap(struct bitmap_index *bitmap_git)
+static int load_reverse_index(struct bitmap_index *bitmap_git)
+{
+	if (bitmap_is_midx(bitmap_git)) {
+		uint32_t i;
+		int ret;
+
+		/*
+		 * The multi-pack-index's .rev file is already loaded via
+		 * open_pack_bitmap_1().
+		 *
+		 * But we still need to open the individual pack .rev files,
+		 * since we will need to make use of them in pack-objects.
+		 */
+		for (i = 0; i < bitmap_git->midx->num_packs; i++) {
+			if (prepare_midx_pack(the_repository, bitmap_git->midx, i))
+				die(_("load_reverse_index: could not open pack"));
+			ret = load_pack_revindex(bitmap_git->midx->packs[i]);
+			if (ret)
+				return ret;
+		}
+		return 0;
+	}
+	return load_pack_revindex(bitmap_git->pack);
+}
+
+static int load_bitmap(struct bitmap_index *bitmap_git)
 {
 	assert(bitmap_git->map);
 
 	bitmap_git->bitmaps = kh_init_oid_map();
 	bitmap_git->ext_index.positions = kh_init_oid_pos();
-	if (load_pack_revindex(bitmap_git->pack))
+
+	if (load_reverse_index(bitmap_git))
 		goto failed;
 
 	if (!(bitmap_git->commits = read_bitmap_1(bitmap_git)) ||
@@ -364,11 +491,46 @@ static int open_pack_bitmap(struct repository *r,
 	return ret;
 }
 
+static int open_midx_bitmap(struct repository *r,
+			    struct bitmap_index *bitmap_git)
+{
+	struct multi_pack_index *midx;
+
+	assert(!bitmap_git->map);
+
+	for (midx = get_multi_pack_index(r); midx; midx = midx->next) {
+		if (!open_midx_bitmap_1(bitmap_git, midx))
+			return 0;
+	}
+	return -1;
+}
+
+static int open_bitmap(struct repository *r,
+		       struct bitmap_index *bitmap_git)
+{
+	assert(!bitmap_git->map);
+
+	if (!open_midx_bitmap(r, bitmap_git))
+		return 0;
+	return open_pack_bitmap(r, bitmap_git);
+}
+
 struct bitmap_index *prepare_bitmap_git(struct repository *r)
 {
 	struct bitmap_index *bitmap_git = xcalloc(1, sizeof(*bitmap_git));
 
-	if (!open_pack_bitmap(r, bitmap_git) && !load_pack_bitmap(bitmap_git))
+	if (!open_bitmap(r, bitmap_git) && !load_bitmap(bitmap_git))
+		return bitmap_git;
+
+	free_bitmap_index(bitmap_git);
+	return NULL;
+}
+
+struct bitmap_index *prepare_midx_bitmap_git(struct multi_pack_index *midx)
+{
+	struct bitmap_index *bitmap_git = xcalloc(1, sizeof(*bitmap_git));
+
+	if (!open_midx_bitmap_1(bitmap_git, midx) && !load_bitmap(bitmap_git))
 		return bitmap_git;
 
 	free_bitmap_index(bitmap_git);
@@ -399,7 +561,7 @@ static inline int bitmap_position_extended(struct bitmap_index *bitmap_git,
 
 	if (pos < kh_end(positions)) {
 		int bitmap_pos = kh_value(positions, pos);
-		return bitmap_pos + bitmap_git->pack->num_objects;
+		return bitmap_pos + bitmap_num_objects(bitmap_git);
 	}
 
 	return -1;
@@ -418,10 +580,26 @@ static inline int bitmap_position_packfile(struct bitmap_index *bitmap_git,
 	return pos;
 }
 
+static int bitmap_position_midx(struct bitmap_index *bitmap_git,
+				const struct object_id *oid)
+{
+	uint32_t want, got;
+	if (!bsearch_midx(oid, bitmap_git->midx, &want))
+		return -1;
+
+	if (midx_to_pack_pos(bitmap_git->midx, want, &got) < 0)
+		return -1;
+	return got;
+}
+
 static int bitmap_position(struct bitmap_index *bitmap_git,
 			   const struct object_id *oid)
 {
-	int pos = bitmap_position_packfile(bitmap_git, oid);
+	int pos;
+	if (bitmap_is_midx(bitmap_git))
+		pos = bitmap_position_midx(bitmap_git, oid);
+	else
+		pos = bitmap_position_packfile(bitmap_git, oid);
 	return (pos >= 0) ? pos : bitmap_position_extended(bitmap_git, oid);
 }
 
@@ -451,7 +629,7 @@ static int ext_index_add_object(struct bitmap_index *bitmap_git,
 		bitmap_pos = kh_value(eindex->positions, hash_pos);
 	}
 
-	return bitmap_pos + bitmap_git->pack->num_objects;
+	return bitmap_pos + bitmap_num_objects(bitmap_git);
 }
 
 struct bitmap_show_data {
@@ -668,7 +846,7 @@ static void show_extended_objects(struct bitmap_index *bitmap_git,
 	for (i = 0; i < eindex->count; ++i) {
 		struct object *obj;
 
-		if (!bitmap_get(objects, bitmap_git->pack->num_objects + i))
+		if (!bitmap_get(objects, bitmap_num_objects(bitmap_git) + i))
 			continue;
 
 		obj = eindex->objects[i];
@@ -732,6 +910,7 @@ static void show_objects_for_type(
 			continue;
 
 		for (offset = 0; offset < BITS_IN_EWORD; ++offset) {
+			struct packed_git *pack;
 			struct object_id oid;
 			uint32_t hash = 0, index_pos;
 			off_t ofs;
@@ -741,14 +920,28 @@ static void show_objects_for_type(
 
 			offset += ewah_bit_ctz64(word >> offset);
 
-			index_pos = pack_pos_to_index(bitmap_git->pack, pos + offset);
-			ofs = pack_pos_to_offset(bitmap_git->pack, pos + offset);
-			nth_packed_object_id(&oid, bitmap_git->pack, index_pos);
+			if (bitmap_is_midx(bitmap_git)) {
+				struct multi_pack_index *m = bitmap_git->midx;
+				uint32_t pack_id;
+
+				index_pos = pack_pos_to_midx(m, pos + offset);
+				ofs = nth_midxed_offset(m, index_pos);
+				nth_midxed_object_oid(&oid, m, index_pos);
+
+				pack_id = nth_midxed_pack_int_id(m, index_pos);
+				pack = bitmap_git->midx->packs[pack_id];
+			} else {
+				index_pos = pack_pos_to_index(bitmap_git->pack, pos + offset);
+				ofs = pack_pos_to_offset(bitmap_git->pack, pos + offset);
+				nth_bitmap_object_oid(bitmap_git, &oid, index_pos);
+
+				pack = bitmap_git->pack;
+			}
 
 			if (bitmap_git->hashes)
 				hash = get_be32(bitmap_git->hashes + index_pos);
 
-			show_reach(&oid, object_type, 0, hash, bitmap_git->pack, ofs);
+			show_reach(&oid, object_type, 0, hash, pack, ofs);
 		}
 	}
 }
@@ -760,8 +953,13 @@ static int in_bitmapped_pack(struct bitmap_index *bitmap_git,
 		struct object *object = roots->item;
 		roots = roots->next;
 
-		if (find_pack_entry_one(object->oid.hash, bitmap_git->pack) > 0)
-			return 1;
+		if (bitmap_is_midx(bitmap_git)) {
+			if (bsearch_midx(&object->oid, bitmap_git->midx, NULL))
+				return 1;
+		} else {
+			if (find_pack_entry_one(object->oid.hash, bitmap_git->pack) > 0)
+				return 1;
+		}
 	}
 
 	return 0;
@@ -809,8 +1007,9 @@ static void filter_bitmap_exclude_type(struct bitmap_index *bitmap_git,
 	tips = find_tip_objects(bitmap_git, tip_objects, type);
 
 	/*
-	 * We can use the blob type-bitmap to work in whole words
-	 * for the objects that are actually in the bitmapped packfile.
+	 * We can use the type-level bitmap for 'type' to work in whole
+	 * words for the objects that are actually in the bitmapped
+	 * packfile.
 	 */
 	for (i = 0, init_type_iterator(&it, bitmap_git, type);
 	     i < to_filter->word_alloc && ewah_iterator_next(&mask, &it);
@@ -821,12 +1020,12 @@ static void filter_bitmap_exclude_type(struct bitmap_index *bitmap_git,
 	}
 
 	/*
-	 * Clear any blobs that weren't in the packfile (and so would not have
-	 * been caught by the loop above. We'll have to check them
-	 * individually.
+	 * Clear any objects that weren't in the packfile (and so would
+	 * not have been caught by the loop above. We'll have to check
+	 * them individually.
 	 */
 	for (i = 0; i < eindex->count; i++) {
-		uint32_t pos = i + bitmap_git->pack->num_objects;
+		uint32_t pos = i + bitmap_num_objects(bitmap_git);
 		if (eindex->objects[i]->type == type &&
 		    bitmap_get(to_filter, pos) &&
 		    !bitmap_get(tips, pos))
@@ -847,23 +1046,35 @@ static void filter_bitmap_blob_none(struct bitmap_index *bitmap_git,
 static unsigned long get_size_by_pos(struct bitmap_index *bitmap_git,
 				     uint32_t pos)
 {
-	struct packed_git *pack = bitmap_git->pack;
 	unsigned long size;
 	struct object_info oi = OBJECT_INFO_INIT;
 
 	oi.sizep = &size;
 
-	if (pos < pack->num_objects) {
-		off_t ofs = pack_pos_to_offset(pack, pos);
+	if (pos < bitmap_num_objects(bitmap_git)) {
+		struct packed_git *pack;
+		off_t ofs;
+
+		if (bitmap_is_midx(bitmap_git)) {
+			uint32_t midx_pos = pack_pos_to_midx(bitmap_git->midx, pos);
+			uint32_t pack_id = nth_midxed_pack_int_id(bitmap_git->midx, midx_pos);
+
+			pack = bitmap_git->midx->packs[pack_id];
+			ofs = nth_midxed_offset(bitmap_git->midx, midx_pos);
+		} else {
+			pack = bitmap_git->pack;
+			ofs = pack_pos_to_offset(pack, pos);
+		}
+
 		if (packed_object_info(the_repository, pack, ofs, &oi) < 0) {
 			struct object_id oid;
-			nth_packed_object_id(&oid, pack,
-					     pack_pos_to_index(pack, pos));
+			nth_bitmap_object_oid(bitmap_git, &oid,
+					      pack_pos_to_index(pack, pos));
 			die(_("unable to get size of %s"), oid_to_hex(&oid));
 		}
 	} else {
 		struct eindex *eindex = &bitmap_git->ext_index;
-		struct object *obj = eindex->objects[pos - pack->num_objects];
+		struct object *obj = eindex->objects[pos - bitmap_num_objects(bitmap_git)];
 		if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0)
 			die(_("unable to get size of %s"), oid_to_hex(&obj->oid));
 	}
@@ -905,7 +1116,7 @@ static void filter_bitmap_blob_limit(struct bitmap_index *bitmap_git,
 	}
 
 	for (i = 0; i < eindex->count; i++) {
-		uint32_t pos = i + bitmap_git->pack->num_objects;
+		uint32_t pos = i + bitmap_num_objects(bitmap_git);
 		if (eindex->objects[i]->type == OBJ_BLOB &&
 		    bitmap_get(to_filter, pos) &&
 		    !bitmap_get(tips, pos) &&
@@ -1035,7 +1246,7 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
 	/* try to open a bitmapped pack, but don't parse it yet
 	 * because we may not need to use it */
 	CALLOC_ARRAY(bitmap_git, 1);
-	if (open_pack_bitmap(revs->repo, bitmap_git) < 0)
+	if (open_bitmap(revs->repo, bitmap_git) < 0)
 		goto cleanup;
 
 	for (i = 0; i < revs->pending.nr; ++i) {
@@ -1079,7 +1290,7 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
 	 * from disk. this is the point of no return; after this the rev_list
 	 * becomes invalidated and we must perform the revwalk through bitmaps
 	 */
-	if (load_pack_bitmap(bitmap_git) < 0)
+	if (load_bitmap(bitmap_git) < 0)
 		goto cleanup;
 
 	object_array_clear(&revs->pending);
@@ -1122,22 +1333,49 @@ cleanup:
 	return NULL;
 }
 
-static void try_partial_reuse(struct bitmap_index *bitmap_git,
-			      size_t pos,
-			      struct bitmap *reuse,
-			      struct pack_window **w_curs)
+/*
+ * -1 means "stop trying further objects"; 0 means we may or may not have
+ * reused, but you can keep feeding bits.
+ */
+static int try_partial_reuse(struct packed_git *pack,
+			     size_t pos,
+			     struct bitmap *reuse,
+			     struct pack_window **w_curs)
 {
-	off_t offset, header;
+	off_t offset, delta_obj_offset;
 	enum object_type type;
 	unsigned long size;
 
-	if (pos >= bitmap_git->pack->num_objects)
-		return; /* not actually in the pack */
+	/*
+	 * try_partial_reuse() is called either on (a) objects in the
+	 * bitmapped pack (in the case of a single-pack bitmap) or (b)
+	 * objects in the preferred pack of a multi-pack bitmap.
+	 * Importantly, the latter can pretend as if only a single pack
+	 * exists because:
+	 *
+	 *   - The first pack->num_objects bits of a MIDX bitmap are
+	 *     reserved for the preferred pack, and
+	 *
+	 *   - Ties due to duplicate objects are always resolved in
+	 *     favor of the preferred pack.
+	 *
+	 * Therefore we do not need to ever ask the MIDX for its copy of
+	 * an object by OID, since it will always select it from the
+	 * preferred pack. Likewise, the selected copy of the base
+	 * object for any deltas will reside in the same pack.
+	 *
+	 * This means that we can reuse pos when looking up the bit in
+	 * the reuse bitmap, too, since bits corresponding to the
+	 * preferred pack precede all bits from other packs.
+	 */
+
+	if (pos >= pack->num_objects)
+		return -1; /* not actually in the pack or MIDX preferred pack */
 
-	offset = header = pack_pos_to_offset(bitmap_git->pack, pos);
-	type = unpack_object_header(bitmap_git->pack, w_curs, &offset, &size);
+	offset = delta_obj_offset = pack_pos_to_offset(pack, pos);
+	type = unpack_object_header(pack, w_curs, &offset, &size);
 	if (type < 0)
-		return; /* broken packfile, punt */
+		return -1; /* broken packfile, punt */
 
 	if (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA) {
 		off_t base_offset;
@@ -1151,12 +1389,12 @@ static void try_partial_reuse(struct bitmap_index *bitmap_git,
 		 * and the normal slow path will complain about it in
 		 * more detail.
 		 */
-		base_offset = get_delta_base(bitmap_git->pack, w_curs,
-					     &offset, type, header);
+		base_offset = get_delta_base(pack, w_curs, &offset, type,
+					     delta_obj_offset);
 		if (!base_offset)
-			return;
-		if (offset_to_pack_pos(bitmap_git->pack, base_offset, &base_pos) < 0)
-			return;
+			return 0;
+		if (offset_to_pack_pos(pack, base_offset, &base_pos) < 0)
+			return 0;
 
 		/*
 		 * We assume delta dependencies always point backwards. This
@@ -1168,7 +1406,7 @@ static void try_partial_reuse(struct bitmap_index *bitmap_git,
 		 * odd parameters.
 		 */
 		if (base_pos >= pos)
-			return;
+			return 0;
 
 		/*
 		 * And finally, if we're not sending the base as part of our
@@ -1179,13 +1417,22 @@ static void try_partial_reuse(struct bitmap_index *bitmap_git,
 		 * object_entry code path handle it.
 		 */
 		if (!bitmap_get(reuse, base_pos))
-			return;
+			return 0;
 	}
 
 	/*
 	 * If we got here, then the object is OK to reuse. Mark it.
 	 */
 	bitmap_set(reuse, pos);
+	return 0;
+}
+
+uint32_t midx_preferred_pack(struct bitmap_index *bitmap_git)
+{
+	struct multi_pack_index *m = bitmap_git->midx;
+	if (!m)
+		BUG("midx_preferred_pack: requires non-empty MIDX");
+	return nth_midxed_pack_int_id(m, pack_pos_to_midx(bitmap_git->midx, 0));
 }
 
 int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
@@ -1193,20 +1440,37 @@ int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
 				       uint32_t *entries,
 				       struct bitmap **reuse_out)
 {
+	struct packed_git *pack;
 	struct bitmap *result = bitmap_git->result;
 	struct bitmap *reuse;
 	struct pack_window *w_curs = NULL;
 	size_t i = 0;
 	uint32_t offset;
+	uint32_t objects_nr;
 
 	assert(result);
 
+	load_reverse_index(bitmap_git);
+
+	if (bitmap_is_midx(bitmap_git))
+		pack = bitmap_git->midx->packs[midx_preferred_pack(bitmap_git)];
+	else
+		pack = bitmap_git->pack;
+	objects_nr = pack->num_objects;
+
 	while (i < result->word_alloc && result->words[i] == (eword_t)~0)
 		i++;
 
-	/* Don't mark objects not in the packfile */
-	if (i > bitmap_git->pack->num_objects / BITS_IN_EWORD)
-		i = bitmap_git->pack->num_objects / BITS_IN_EWORD;
+	/*
+	 * Don't mark objects not in the packfile or preferred pack. This bitmap
+	 * marks objects eligible for reuse, but the pack-reuse code only
+	 * understands how to reuse a single pack. Since the preferred pack is
+	 * guaranteed to have all bases for its deltas (in a multi-pack bitmap),
+	 * we use it instead of another pack. In single-pack bitmaps, the choice
+	 * is made for us.
+	 */
+	if (i > objects_nr / BITS_IN_EWORD)
+		i = objects_nr / BITS_IN_EWORD;
 
 	reuse = bitmap_word_alloc(i);
 	memset(reuse->words, 0xFF, i * sizeof(eword_t));
@@ -1220,10 +1484,23 @@ int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
 				break;
 
 			offset += ewah_bit_ctz64(word >> offset);
-			try_partial_reuse(bitmap_git, pos + offset, reuse, &w_curs);
+			if (try_partial_reuse(pack, pos + offset,
+					      reuse, &w_curs) < 0) {
+				/*
+				 * try_partial_reuse indicated we couldn't reuse
+				 * any bits, so there is no point in trying more
+				 * bits in the current word, or any other words
+				 * in result.
+				 *
+				 * Jump out of both loops to avoid future
+				 * unnecessary calls to try_partial_reuse.
+				 */
+				goto done;
+			}
 		}
 	}
 
+done:
 	unuse_pack(&w_curs);
 
 	*entries = bitmap_popcount(reuse);
@@ -1237,7 +1514,7 @@ int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
 	 * need to be handled separately.
 	 */
 	bitmap_and_not(result, reuse);
-	*packfile_out = bitmap_git->pack;
+	*packfile_out = pack;
 	*reuse_out = reuse;
 	return 0;
 }
@@ -1290,7 +1567,7 @@ static uint32_t count_object_type(struct bitmap_index *bitmap_git,
 
 	for (i = 0; i < eindex->count; ++i) {
 		if (eindex->objects[i]->type == type &&
-			bitmap_get(objects, bitmap_git->pack->num_objects + i))
+			bitmap_get(objects, bitmap_num_objects(bitmap_git) + i))
 			count++;
 	}
 
@@ -1319,10 +1596,52 @@ void count_bitmap_commit_list(struct bitmap_index *bitmap_git,
 struct bitmap_test_data {
 	struct bitmap_index *bitmap_git;
 	struct bitmap *base;
+	struct bitmap *commits;
+	struct bitmap *trees;
+	struct bitmap *blobs;
+	struct bitmap *tags;
 	struct progress *prg;
 	size_t seen;
 };
 
+static void test_bitmap_type(struct bitmap_test_data *tdata,
+			     struct object *obj, int pos)
+{
+	enum object_type bitmap_type = OBJ_NONE;
+	int bitmaps_nr = 0;
+
+	if (bitmap_get(tdata->commits, pos)) {
+		bitmap_type = OBJ_COMMIT;
+		bitmaps_nr++;
+	}
+	if (bitmap_get(tdata->trees, pos)) {
+		bitmap_type = OBJ_TREE;
+		bitmaps_nr++;
+	}
+	if (bitmap_get(tdata->blobs, pos)) {
+		bitmap_type = OBJ_BLOB;
+		bitmaps_nr++;
+	}
+	if (bitmap_get(tdata->tags, pos)) {
+		bitmap_type = OBJ_TAG;
+		bitmaps_nr++;
+	}
+
+	if (bitmap_type == OBJ_NONE)
+		die("object %s not found in type bitmaps",
+		    oid_to_hex(&obj->oid));
+
+	if (bitmaps_nr > 1)
+		die("object %s does not have a unique type",
+		    oid_to_hex(&obj->oid));
+
+	if (bitmap_type != obj->type)
+		die("object %s: real type %s, expected: %s",
+		    oid_to_hex(&obj->oid),
+		    type_name(obj->type),
+		    type_name(bitmap_type));
+}
+
 static void test_show_object(struct object *object, const char *name,
 			     void *data)
 {
@@ -1332,6 +1651,7 @@ static void test_show_object(struct object *object, const char *name,
 	bitmap_pos = bitmap_position(tdata->bitmap_git, &object->oid);
 	if (bitmap_pos < 0)
 		die("Object not in bitmap: %s\n", oid_to_hex(&object->oid));
+	test_bitmap_type(tdata, object, bitmap_pos);
 
 	bitmap_set(tdata->base, bitmap_pos);
 	display_progress(tdata->prg, ++tdata->seen);
@@ -1346,6 +1666,7 @@ static void test_show_commit(struct commit *commit, void *data)
 				     &commit->object.oid);
 	if (bitmap_pos < 0)
 		die("Object not in bitmap: %s\n", oid_to_hex(&commit->object.oid));
+	test_bitmap_type(tdata, &commit->object, bitmap_pos);
 
 	bitmap_set(tdata->base, bitmap_pos);
 	display_progress(tdata->prg, ++tdata->seen);
@@ -1393,6 +1714,10 @@ void test_bitmap_walk(struct rev_info *revs)
 
 	tdata.bitmap_git = bitmap_git;
 	tdata.base = bitmap_new();
+	tdata.commits = ewah_to_bitmap(bitmap_git->commits);
+	tdata.trees = ewah_to_bitmap(bitmap_git->trees);
+	tdata.blobs = ewah_to_bitmap(bitmap_git->blobs);
+	tdata.tags = ewah_to_bitmap(bitmap_git->tags);
 	tdata.prg = start_progress("Verifying bitmap entries", result_popcnt);
 	tdata.seen = 0;
 
@@ -1405,6 +1730,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);
 }
 
@@ -1426,6 +1757,33 @@ int test_bitmap_commits(struct repository *r)
 	return 0;
 }
 
+int test_bitmap_hashes(struct repository *r)
+{
+	struct bitmap_index *bitmap_git = prepare_bitmap_git(r);
+	struct object_id oid;
+	uint32_t i, index_pos;
+
+	if (!bitmap_git || !bitmap_git->hashes)
+		goto cleanup;
+
+	for (i = 0; i < bitmap_num_objects(bitmap_git); i++) {
+		if (bitmap_is_midx(bitmap_git))
+			index_pos = pack_pos_to_midx(bitmap_git->midx, i);
+		else
+			index_pos = pack_pos_to_index(bitmap_git->pack, i);
+
+		nth_bitmap_object_oid(bitmap_git, &oid, index_pos);
+
+		printf("%s %"PRIu32"\n",
+		       oid_to_hex(&oid), get_be32(bitmap_git->hashes + index_pos));
+	}
+
+cleanup:
+	free_bitmap_index(bitmap_git);
+
+	return 0;
+}
+
 int rebuild_bitmap(const uint32_t *reposition,
 		   struct ewah_bitmap *source,
 		   struct bitmap *dest)
@@ -1463,19 +1821,32 @@ uint32_t *create_bitmap_mapping(struct bitmap_index *bitmap_git,
 	uint32_t i, num_objects;
 	uint32_t *reposition;
 
-	num_objects = bitmap_git->pack->num_objects;
+	if (!bitmap_is_midx(bitmap_git))
+		load_reverse_index(bitmap_git);
+	else if (load_midx_revindex(bitmap_git->midx) < 0)
+		BUG("rebuild_existing_bitmaps: missing required rev-cache "
+		    "extension");
+
+	num_objects = bitmap_num_objects(bitmap_git);
 	CALLOC_ARRAY(reposition, num_objects);
 
 	for (i = 0; i < num_objects; ++i) {
 		struct object_id oid;
 		struct object_entry *oe;
+		uint32_t index_pos;
 
-		nth_packed_object_id(&oid, bitmap_git->pack,
-				     pack_pos_to_index(bitmap_git->pack, i));
+		if (bitmap_is_midx(bitmap_git))
+			index_pos = pack_pos_to_midx(bitmap_git->midx, i);
+		else
+			index_pos = pack_pos_to_index(bitmap_git->pack, i);
+		nth_bitmap_object_oid(bitmap_git, &oid, index_pos);
 		oe = packlist_find(mapping, &oid);
 
-		if (oe)
+		if (oe) {
 			reposition[i] = oe_in_pack_pos(mapping, oe) + 1;
+			if (bitmap_git->hashes && !oe->hash)
+				oe->hash = get_be32(bitmap_git->hashes + index_pos);
+		}
 	}
 
 	return reposition;
@@ -1492,11 +1863,32 @@ 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)) {
+		/*
+		 * Multi-pack bitmaps need to have resources associated with
+		 * their on-disk reverse indexes unmapped so that stale .rev and
+		 * .bitmap files can be removed.
+		 *
+		 * Unlike pack-based bitmaps, multi-pack bitmaps can be read and
+		 * written in the same 'git multi-pack-index write --bitmap'
+		 * process. Close resources so they can be removed safely on
+		 * platforms like Windows.
+		 */
+		close_midx_revindex(b->midx);
+	}
 	free(b);
 }
 
@@ -1511,7 +1903,6 @@ static off_t get_disk_usage_for_type(struct bitmap_index *bitmap_git,
 				     enum object_type object_type)
 {
 	struct bitmap *result = bitmap_git->result;
-	struct packed_git *pack = bitmap_git->pack;
 	off_t total = 0;
 	struct ewah_iterator it;
 	eword_t filter;
@@ -1528,15 +1919,35 @@ static off_t get_disk_usage_for_type(struct bitmap_index *bitmap_git,
 			continue;
 
 		for (offset = 0; offset < BITS_IN_EWORD; offset++) {
-			size_t pos;
-
 			if ((word >> offset) == 0)
 				break;
 
 			offset += ewah_bit_ctz64(word >> offset);
-			pos = base + offset;
-			total += pack_pos_to_offset(pack, pos + 1) -
-				 pack_pos_to_offset(pack, pos);
+
+			if (bitmap_is_midx(bitmap_git)) {
+				uint32_t pack_pos;
+				uint32_t midx_pos = pack_pos_to_midx(bitmap_git->midx, base + offset);
+				off_t offset = nth_midxed_offset(bitmap_git->midx, midx_pos);
+
+				uint32_t pack_id = nth_midxed_pack_int_id(bitmap_git->midx, midx_pos);
+				struct packed_git *pack = bitmap_git->midx->packs[pack_id];
+
+				if (offset_to_pack_pos(pack, offset, &pack_pos) < 0) {
+					struct object_id oid;
+					nth_midxed_object_oid(&oid, bitmap_git->midx, midx_pos);
+
+					die(_("could not find %s in pack %s at offset %"PRIuMAX),
+					    oid_to_hex(&oid),
+					    pack->pack_name,
+					    (uintmax_t)offset);
+				}
+
+				total += pack_pos_to_offset(pack, pack_pos + 1) - offset;
+			} else {
+				size_t pos = base + offset;
+				total += pack_pos_to_offset(bitmap_git->pack, pos + 1) -
+					 pack_pos_to_offset(bitmap_git->pack, pos);
+			}
 		}
 	}
 
@@ -1546,7 +1957,6 @@ static off_t get_disk_usage_for_type(struct bitmap_index *bitmap_git,
 static off_t get_disk_usage_for_extended(struct bitmap_index *bitmap_git)
 {
 	struct bitmap *result = bitmap_git->result;
-	struct packed_git *pack = bitmap_git->pack;
 	struct eindex *eindex = &bitmap_git->ext_index;
 	off_t total = 0;
 	struct object_info oi = OBJECT_INFO_INIT;
@@ -1558,7 +1968,7 @@ static off_t get_disk_usage_for_extended(struct bitmap_index *bitmap_git)
 	for (i = 0; i < eindex->count; i++) {
 		struct object *obj = eindex->objects[i];
 
-		if (!bitmap_get(result, pack->num_objects + i))
+		if (!bitmap_get(result, bitmap_num_objects(bitmap_git) + i))
 			continue;
 
 		if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0)
@@ -1588,7 +1998,28 @@ off_t get_disk_usage_from_bitmap(struct bitmap_index *bitmap_git,
 	return total;
 }
 
+int bitmap_is_midx(struct bitmap_index *bitmap_git)
+{
+	return !!bitmap_git->midx;
+}
+
 const struct string_list *bitmap_preferred_tips(struct repository *r)
 {
 	return repo_config_get_value_multi(r, "pack.preferbitmaptips");
 }
+
+int bitmap_is_preferred_refname(struct repository *r, const char *refname)
+{
+	const struct string_list *preferred_tips = bitmap_preferred_tips(r);
+	struct string_list_item *item;
+
+	if (!preferred_tips)
+		return 0;
+
+	for_each_string_list_item(item, preferred_tips) {
+		if (starts_with(refname, item->string))
+			return 1;
+	}
+
+	return 0;
+}
diff --git a/pack-bitmap.h b/pack-bitmap.h
index 99d733eb26..19a63fa1ab 100644
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -44,6 +44,7 @@ typedef int (*show_reachable_fn)(
 struct bitmap_index;
 
 struct bitmap_index *prepare_bitmap_git(struct repository *r);
+struct bitmap_index *prepare_midx_bitmap_git(struct multi_pack_index *midx);
 void count_bitmap_commit_list(struct bitmap_index *, uint32_t *commits,
 			      uint32_t *trees, uint32_t *blobs, uint32_t *tags);
 void traverse_bitmap_commit_list(struct bitmap_index *,
@@ -51,9 +52,11 @@ void traverse_bitmap_commit_list(struct bitmap_index *,
 				 show_reachable_fn show_reachable);
 void test_bitmap_walk(struct rev_info *revs);
 int test_bitmap_commits(struct repository *r);
+int test_bitmap_hashes(struct repository *r);
 struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
 					 struct list_objects_filter_options *filter,
 					 int filter_provided_objects);
+uint32_t midx_preferred_pack(struct bitmap_index *bitmap_git);
 int reuse_partial_packfile_from_bitmap(struct bitmap_index *,
 				       struct packed_git **packfile,
 				       uint32_t *entries,
@@ -87,12 +90,17 @@ struct ewah_bitmap *bitmap_for_commit(struct bitmap_index *bitmap_git,
 				      struct commit *commit);
 void bitmap_writer_select_commits(struct commit **indexed_commits,
 		unsigned int indexed_commits_nr, int max_bitmaps);
-void bitmap_writer_build(struct packing_data *to_pack);
+int bitmap_writer_build(struct packing_data *to_pack);
 void bitmap_writer_finish(struct pack_idx_entry **index,
 			  uint32_t index_nr,
 			  const char *filename,
 			  uint16_t options);
+char *midx_bitmap_filename(struct multi_pack_index *midx);
+char *pack_bitmap_filename(struct packed_git *p);
+
+int bitmap_is_midx(struct bitmap_index *bitmap_git);
 
 const struct string_list *bitmap_preferred_tips(struct repository *r);
+int bitmap_is_preferred_refname(struct repository *r, const char *refname);
 
 #endif
diff --git a/pack-check.c b/pack-check.c
index c8e560d71a..3f418e3a6a 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -142,7 +142,8 @@ static int verify_packfile(struct repository *r,
 			err = error("cannot unpack %s from %s at offset %"PRIuMAX"",
 				    oid_to_hex(&oid), p->pack_name,
 				    (uintmax_t)entries[i].offset);
-		else if (check_object_signature(r, &oid, data, size, type_name(type)))
+		else if (check_object_signature(r, &oid, data, size,
+						type_name(type), NULL))
 			err = error("packed %s from %s is corrupt",
 				    oid_to_hex(&oid), p->pack_name);
 		else if (fn) {
diff --git a/pack-revindex.c b/pack-revindex.c
index 0e4a31d9db..08dc160167 100644
--- a/pack-revindex.c
+++ b/pack-revindex.c
@@ -296,14 +296,34 @@ 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);
+	if (m->chunk_revindex) {
+		/*
+		 * If the MIDX `m` has a `RIDX` chunk, then use its contents for
+		 * the reverse index instead of trying to load a separate `.rev`
+		 * file.
+		 *
+		 * Note that we do *not* set `m->revindex_map` here, since we do
+		 * not want to accidentally call munmap() in the middle of the
+		 * MIDX.
+		 */
+		trace2_data_string("load_midx_revindex", the_repository,
+				   "source", "midx");
+		m->revindex_data = (const uint32_t *)m->chunk_revindex;
+		return 0;
+	}
 
-	ret = load_revindex_from_disk(revindex_name,
+	trace2_data_string("load_midx_revindex", the_repository,
+			   "source", "rev");
+
+	get_midx_rev_filename(&revindex_name, m);
+
+	ret = load_revindex_from_disk(revindex_name.buf,
 				      m->num_objects,
 				      &m->revindex_map,
 				      &m->revindex_len);
@@ -313,7 +333,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/pack-revindex.h b/pack-revindex.h
index 479b8f2f9c..74f4eae668 100644
--- a/pack-revindex.h
+++ b/pack-revindex.h
@@ -109,7 +109,7 @@ off_t pack_pos_to_offset(struct packed_git *p, uint32_t pos);
  * If the reverse index has not yet been loaded, or the position is out of
  * bounds, this function aborts.
  *
- * This function runs in time O(log N) with the number of objects in the MIDX.
+ * This function runs in constant time.
  */
 uint32_t pack_pos_to_midx(struct multi_pack_index *m, uint32_t pos);
 
@@ -120,7 +120,7 @@ uint32_t pack_pos_to_midx(struct multi_pack_index *m, uint32_t pos);
  * If the reverse index has not yet been loaded, or the position is out of
  * bounds, this function aborts.
  *
- * This function runs in constant time.
+ * This function runs in time O(log N) with the number of objects in the MIDX.
  */
 int midx_to_pack_pos(struct multi_pack_index *midx, uint32_t at, uint32_t *pos);
 
diff --git a/pack-write.c b/pack-write.c
index f1fc3ecafa..a5846f3a34 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -75,9 +75,7 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 			index_name = strbuf_detach(&tmp_file, NULL);
 		} else {
 			unlink(index_name);
-			fd = open(index_name, O_CREAT|O_EXCL|O_WRONLY, 0600);
-			if (fd < 0)
-				die_errno("unable to create '%s'", index_name);
+			fd = xopen(index_name, O_CREAT|O_EXCL|O_WRONLY, 0600);
 		}
 		f = hashfd(fd, index_name);
 	}
@@ -224,6 +222,9 @@ const char *write_rev_file(const char *rev_name,
 	uint32_t i;
 	const char *ret;
 
+	if (!(flags & WRITE_REV) && !(flags & WRITE_REV_VERIFY))
+		return NULL;
+
 	ALLOC_ARRAY(pack_order, nr_objects);
 	for (i = 0; i < nr_objects; i++)
 		pack_order[i] = i;
@@ -256,9 +257,7 @@ const char *write_rev_file_order(const char *rev_name,
 			rev_name = strbuf_detach(&tmp_file, NULL);
 		} else {
 			unlink(rev_name);
-			fd = open(rev_name, O_CREAT|O_EXCL|O_WRONLY, 0600);
-			if (fd < 0)
-				die_errno("unable to create '%s'", rev_name);
+			fd = xopen(rev_name, O_CREAT|O_EXCL|O_WRONLY, 0600);
 		}
 		f = hashfd(fd, rev_name);
 	} else if (flags & WRITE_REV_VERIFY) {
@@ -462,49 +461,48 @@ struct hashfile *create_tmp_packfile(char **pack_tmp_name)
 	return hashfd(fd, *pack_tmp_name);
 }
 
-void finish_tmp_packfile(struct strbuf *name_buffer,
+static void rename_tmp_packfile(struct strbuf *name_prefix, const char *source,
+				const char *ext)
+{
+	size_t name_prefix_len = name_prefix->len;
+
+	strbuf_addstr(name_prefix, ext);
+	if (rename(source, name_prefix->buf))
+		die_errno("unable to rename temporary file to '%s'",
+			  name_prefix->buf);
+	strbuf_setlen(name_prefix, name_prefix_len);
+}
+
+void rename_tmp_packfile_idx(struct strbuf *name_buffer,
+			     char **idx_tmp_name)
+{
+	rename_tmp_packfile(name_buffer, *idx_tmp_name, "idx");
+}
+
+void stage_tmp_packfiles(struct strbuf *name_buffer,
 			 const char *pack_tmp_name,
 			 struct pack_idx_entry **written_list,
 			 uint32_t nr_written,
 			 struct pack_idx_option *pack_idx_opts,
-			 unsigned char hash[])
+			 unsigned char hash[],
+			 char **idx_tmp_name)
 {
-	const char *idx_tmp_name, *rev_tmp_name = NULL;
-	int basename_len = name_buffer->len;
+	const char *rev_tmp_name = NULL;
 
 	if (adjust_shared_perm(pack_tmp_name))
 		die_errno("unable to make temporary pack file readable");
 
-	idx_tmp_name = write_idx_file(NULL, written_list, nr_written,
-				      pack_idx_opts, hash);
-	if (adjust_shared_perm(idx_tmp_name))
+	*idx_tmp_name = (char *)write_idx_file(NULL, written_list, nr_written,
+					       pack_idx_opts, hash);
+	if (adjust_shared_perm(*idx_tmp_name))
 		die_errno("unable to make temporary index file readable");
 
 	rev_tmp_name = write_rev_file(NULL, written_list, nr_written, hash,
 				      pack_idx_opts->flags);
 
-	strbuf_addf(name_buffer, "%s.pack", hash_to_hex(hash));
-
-	if (rename(pack_tmp_name, name_buffer->buf))
-		die_errno("unable to rename temporary pack file");
-
-	strbuf_setlen(name_buffer, basename_len);
-
-	strbuf_addf(name_buffer, "%s.idx", hash_to_hex(hash));
-	if (rename(idx_tmp_name, name_buffer->buf))
-		die_errno("unable to rename temporary index file");
-
-	strbuf_setlen(name_buffer, basename_len);
-
-	if (rev_tmp_name) {
-		strbuf_addf(name_buffer, "%s.rev", hash_to_hex(hash));
-		if (rename(rev_tmp_name, name_buffer->buf))
-			die_errno("unable to rename temporary reverse-index file");
-	}
-
-	strbuf_setlen(name_buffer, basename_len);
-
-	free((void *)idx_tmp_name);
+	rename_tmp_packfile(name_buffer, pack_tmp_name, "pack");
+	if (rev_tmp_name)
+		rename_tmp_packfile(name_buffer, rev_tmp_name, "rev");
 }
 
 void write_promisor_file(const char *promisor_name, struct ref **sought, int nr_sought)
diff --git a/pack.h b/pack.h
index fa13954526..b22bfc4a18 100644
--- a/pack.h
+++ b/pack.h
@@ -110,6 +110,14 @@ int encode_in_pack_object_header(unsigned char *hdr, int hdr_len,
 int read_pack_header(int fd, struct pack_header *);
 
 struct hashfile *create_tmp_packfile(char **pack_tmp_name);
-void finish_tmp_packfile(struct strbuf *name_buffer, const char *pack_tmp_name, struct pack_idx_entry **written_list, uint32_t nr_written, struct pack_idx_option *pack_idx_opts, unsigned char sha1[]);
+void stage_tmp_packfiles(struct strbuf *name_buffer,
+			 const char *pack_tmp_name,
+			 struct pack_idx_entry **written_list,
+			 uint32_t nr_written,
+			 struct pack_idx_option *pack_idx_opts,
+			 unsigned char hash[],
+			 char **idx_tmp_name);
+void rename_tmp_packfile_idx(struct strbuf *basename,
+			     char **idx_tmp_name);
 
 #endif
diff --git a/packfile.c b/packfile.c
index 9ef6d98292..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;
 
@@ -339,6 +340,7 @@ void close_pack(struct packed_git *p)
 	close_pack_fd(p);
 	close_pack_index(p);
 	close_pack_revindex(p);
+	oidset_clear(&p->bad_objects);
 }
 
 void close_object_store(struct raw_object_store *o)
@@ -860,7 +862,7 @@ static void prepare_pack(const char *full_name, size_t full_name_len,
 	if (!strcmp(file_name, "multi-pack-index"))
 		return;
 	if (starts_with(file_name, "multi-pack-index") &&
-	    ends_with(file_name, ".rev"))
+	    (ends_with(file_name, ".bitmap") || ends_with(file_name, ".rev")))
 		return;
 	if (ends_with(file_name, ".idx") ||
 	    ends_with(file_name, ".rev") ||
@@ -1059,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++];
@@ -1067,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;
 }
 
@@ -1161,31 +1163,19 @@ int unpack_object_header(struct packed_git *p,
 	return type;
 }
 
-void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1)
+void mark_bad_packed_object(struct packed_git *p, const struct object_id *oid)
 {
-	unsigned i;
-	const unsigned hashsz = the_hash_algo->rawsz;
-	for (i = 0; i < p->num_bad_objects; i++)
-		if (hasheq(sha1, p->bad_object_sha1 + hashsz * i))
-			return;
-	p->bad_object_sha1 = xrealloc(p->bad_object_sha1,
-				      st_mult(GIT_MAX_RAWSZ,
-					      st_add(p->num_bad_objects, 1)));
-	hashcpy(p->bad_object_sha1 + hashsz * p->num_bad_objects, sha1);
-	p->num_bad_objects++;
+	oidset_insert(&p->bad_objects, oid);
 }
 
 const struct packed_git *has_packed_and_bad(struct repository *r,
-					    const unsigned char *sha1)
+					    const struct object_id *oid)
 {
 	struct packed_git *p;
-	unsigned i;
 
 	for (p = r->objects->packed_git; p; p = p->next)
-		for (i = 0; i < p->num_bad_objects; i++)
-			if (hasheq(sha1,
-				   p->bad_object_sha1 + the_hash_algo->rawsz * i))
-				return p;
+		if (oidset_contains(&p->bad_objects, oid))
+			return p;
 	return NULL;
 }
 
@@ -1272,7 +1262,7 @@ static int retry_bad_packed_offset(struct repository *r,
 	if (offset_to_pack_pos(p, obj_offset, &pos) < 0)
 		return OBJ_BAD;
 	nth_packed_object_id(&oid, p, pack_pos_to_index(p, pos));
-	mark_bad_packed_object(p, oid.hash);
+	mark_bad_packed_object(p, &oid);
 	type = oid_object_info(r, &oid, NULL);
 	if (type <= OBJ_NONE)
 		return OBJ_BAD;
@@ -1722,7 +1712,7 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset,
 				nth_packed_object_id(&oid, p, index_pos);
 				error("bad packed object CRC for %s",
 				      oid_to_hex(&oid));
-				mark_bad_packed_object(p, oid.hash);
+				mark_bad_packed_object(p, &oid);
 				data = NULL;
 				goto out;
 			}
@@ -1811,7 +1801,7 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset,
 				      " at offset %"PRIuMAX" from %s",
 				      oid_to_hex(&base_oid), (uintmax_t)obj_offset,
 				      p->pack_name);
-				mark_bad_packed_object(p, base_oid.hash);
+				mark_bad_packed_object(p, &base_oid);
 				base = read_object(r, &base_oid, &type, &base_size);
 				external_base = base;
 			}
@@ -2016,13 +2006,9 @@ static int fill_pack_entry(const struct object_id *oid,
 {
 	off_t offset;
 
-	if (p->num_bad_objects) {
-		unsigned i;
-		for (i = 0; i < p->num_bad_objects; i++)
-			if (hasheq(oid->hash,
-				   p->bad_object_sha1 + the_hash_algo->rawsz * i))
-				return 0;
-	}
+	if (oidset_size(&p->bad_objects) &&
+	    oidset_contains(&p->bad_objects, oid))
+		return 0;
 
 	offset = find_pack_entry_one(oid->hash, p);
 	if (!offset)
@@ -2205,6 +2191,12 @@ int for_each_packed_object(each_packed_object_fn cb, void *data,
 		if ((flags & FOR_EACH_OBJECT_PROMISOR_ONLY) &&
 		    !p->pack_promisor)
 			continue;
+		if ((flags & FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS) &&
+		    p->pack_keep_in_core)
+			continue;
+		if ((flags & FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS) &&
+		    p->pack_keep)
+			continue;
 		if (open_pack_index(p)) {
 			pack_errors = 1;
 			continue;
diff --git a/packfile.h b/packfile.h
index 3ae117a8ae..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 **);
@@ -159,8 +158,8 @@ int packed_object_info(struct repository *r,
 		       struct packed_git *pack,
 		       off_t offset, struct object_info *);
 
-void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1);
-const struct packed_git *has_packed_and_bad(struct repository *r, const unsigned char *sha1);
+void mark_bad_packed_object(struct packed_git *, const struct object_id *);
+const struct packed_git *has_packed_and_bad(struct repository *, const struct object_id *);
 
 #define ON_DISK_KEEP_PACKS 1
 #define IN_CORE_KEEP_PACKS 2
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 ddc0ff3c06..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 */
@@ -603,8 +603,7 @@ static void gather_results_from_workers(struct pc_worker *workers,
 				continue;
 
 			if (pfd->revents & POLLIN) {
-				int len = packet_read(pfd->fd, NULL, NULL,
-						      packet_buffer,
+				int len = packet_read(pfd->fd, packet_buffer,
 						      sizeof(packet_buffer), 0);
 
 				if (len < 0) {
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 e6f56768ca..2437ad3bcd 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -8,10 +8,13 @@
 
 static int disallow_abbreviated_options;
 
-#define OPT_SHORT 1
-#define OPT_UNSET 2
+enum opt_parsed {
+	OPT_LONG  = 0,
+	OPT_SHORT = 1<<0,
+	OPT_UNSET = 1<<1,
+};
 
-int optbug(const struct option *opt, const char *reason)
+static int optbug(const struct option *opt, const char *reason)
 {
 	if (opt->long_name) {
 		if (opt->short_name)
@@ -22,9 +25,26 @@ int optbug(const struct option *opt, const char *reason)
 	return error("BUG: switch '%c' %s", opt->short_name, reason);
 }
 
+static const char *optname(const struct option *opt, enum opt_parsed flags)
+{
+	static struct strbuf sb = STRBUF_INIT;
+
+	strbuf_reset(&sb);
+	if (flags & OPT_SHORT)
+		strbuf_addf(&sb, "switch `%c'", opt->short_name);
+	else if (flags & OPT_UNSET)
+		strbuf_addf(&sb, "option `no-%s'", opt->long_name);
+	else if (flags == OPT_LONG)
+		strbuf_addf(&sb, "option `%s'", opt->long_name);
+	else
+		BUG("optname() got unknown flags %d", flags);
+
+	return sb.buf;
+}
+
 static enum parse_opt_result get_arg(struct parse_opt_ctx_t *p,
 				     const struct option *opt,
-				     int flags, const char **arg)
+				     enum opt_parsed flags, const char **arg)
 {
 	if (p->opt) {
 		*arg = p->opt;
@@ -50,7 +70,7 @@ static void fix_filename(const char *prefix, const char **file)
 static enum parse_opt_result opt_command_mode_error(
 	const struct option *opt,
 	const struct option *all_opts,
-	int flags)
+	enum opt_parsed flags)
 {
 	const struct option *that;
 	struct strbuf that_name = STRBUF_INIT;
@@ -82,7 +102,7 @@ static enum parse_opt_result opt_command_mode_error(
 static enum parse_opt_result get_value(struct parse_opt_ctx_t *p,
 				       const struct option *opt,
 				       const struct option *all_opts,
-				       int flags)
+				       enum opt_parsed flags)
 {
 	const char *s, *arg;
 	const int unset = flags & OPT_UNSET;
@@ -298,11 +318,11 @@ static enum parse_opt_result parse_long_opt(
 	const struct option *all_opts = options;
 	const char *arg_end = strchrnul(arg, '=');
 	const struct option *abbrev_option = NULL, *ambiguous_option = NULL;
-	int abbrev_flags = 0, ambiguous_flags = 0;
+	enum opt_parsed abbrev_flags = OPT_LONG, ambiguous_flags = OPT_LONG;
 
 	for (; options->type != OPTION_END; options++) {
 		const char *rest, *long_name = options->long_name;
-		int flags = 0, opt_flags = 0;
+		enum opt_parsed flags = OPT_LONG, opt_flags = OPT_LONG;
 
 		if (!long_name)
 			continue;
@@ -310,19 +330,6 @@ static enum parse_opt_result parse_long_opt(
 again:
 		if (!skip_prefix(arg, long_name, &rest))
 			rest = NULL;
-		if (options->type == OPTION_ARGUMENT) {
-			if (!rest)
-				continue;
-			if (*rest == '=')
-				return error(_("%s takes no value"),
-					     optname(options, flags));
-			if (*rest)
-				continue;
-			if (options->value)
-				*(int *)options->value = options->defval;
-			p->out[p->cpidx++] = arg - 2;
-			return PARSE_OPT_DONE;
-		}
 		if (!rest) {
 			/* abbreviated? */
 			if (!(p->flags & PARSE_OPT_KEEP_UNKNOWN) &&
@@ -397,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;
 
@@ -408,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)
@@ -494,7 +502,8 @@ static void parse_options_check(const struct option *opts)
 
 static void parse_options_start_1(struct parse_opt_ctx_t *ctx,
 				  int argc, const char **argv, const char *prefix,
-				  const struct option *options, int flags)
+				  const struct option *options,
+				  enum parse_opt_flags flags)
 {
 	ctx->argc = argc;
 	ctx->argv = argv;
@@ -519,7 +528,8 @@ static void parse_options_start_1(struct parse_opt_ctx_t *ctx,
 
 void parse_options_start(struct parse_opt_ctx_t *ctx,
 			 int argc, const char **argv, const char *prefix,
-			 const struct option *options, int flags)
+			 const struct option *options,
+			 enum parse_opt_flags flags)
 {
 	memset(ctx, 0, sizeof(*ctx));
 	parse_options_start_1(ctx, argc, argv, prefix, options, flags);
@@ -585,7 +595,7 @@ static int show_gitcomp(const struct option *opts, int show_all)
 		if (!opts->long_name)
 			continue;
 		if (!show_all &&
-			(opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE)))
+			(opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE | PARSE_OPT_FROM_ALIAS)))
 			continue;
 
 		switch (opts->type) {
@@ -710,13 +720,14 @@ static void free_preprocessed_options(struct option *options)
 	free(options);
 }
 
-static int usage_with_options_internal(struct parse_opt_ctx_t *,
-				       const char * const *,
-				       const struct option *, int, int);
+static enum parse_opt_result usage_with_options_internal(struct parse_opt_ctx_t *,
+							 const char * const *,
+							 const struct option *,
+							 int, int);
 
-int parse_options_step(struct parse_opt_ctx_t *ctx,
-		       const struct option *options,
-		       const char * const usagestr[])
+enum parse_opt_result parse_options_step(struct parse_opt_ctx_t *ctx,
+					 const struct option *options,
+					 const char * const usagestr[])
 {
 	int internal_help = !(ctx->flags & PARSE_OPT_NO_INTERNAL_HELP);
 
@@ -850,9 +861,11 @@ int parse_options_end(struct parse_opt_ctx_t *ctx)
 	return ctx->cpidx + ctx->argc;
 }
 
-int parse_options(int argc, const char **argv, const char *prefix,
-		  const struct option *options, const char * const usagestr[],
-		  int flags)
+int parse_options(int argc, const char **argv,
+		  const char *prefix,
+		  const struct option *options,
+		  const char * const usagestr[],
+		  enum parse_opt_flags flags)
 {
 	struct parse_opt_ctx_t ctx;
 	struct option *real_options;
@@ -874,7 +887,7 @@ int parse_options(int argc, const char **argv, const char *prefix,
 	case PARSE_OPT_NON_OPTION:
 	case PARSE_OPT_DONE:
 		break;
-	default: /* PARSE_OPT_UNKNOWN */
+	case PARSE_OPT_UNKNOWN:
 		if (ctx.argv[0][1] == '-') {
 			error(_("unknown option `%s'"), ctx.argv[0] + 2);
 		} else if (isascii(*ctx.opt)) {
@@ -910,32 +923,85 @@ static int usage_argh(const struct option *opts, FILE *outfile)
 #define USAGE_OPTS_WIDTH 24
 #define USAGE_GAP         2
 
-static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
-				       const char * const *usagestr,
-				       const struct option *opts, int full, int err)
+static enum parse_opt_result usage_with_options_internal(struct parse_opt_ctx_t *ctx,
+							 const char * const *usagestr,
+							 const struct option *opts,
+							 int full, int err)
 {
 	FILE *outfile = err ? stderr : stdout;
 	int need_newline;
 
+	const char *usage_prefix = _("usage: %s");
+	/*
+	 * The translation could be anything, but we can count on
+	 * msgfmt(1)'s --check option to have asserted that "%s" is in
+	 * the translation. So compute the length of the "usage: "
+	 * part. We are assuming that the translator wasn't overly
+	 * clever and used e.g. "%1$s" instead of "%s", there's only
+	 * one "%s" in "usage_prefix" above, so there's no reason to
+	 * do so even with a RTL language.
+	 */
+	size_t usage_len = strlen(usage_prefix) - strlen("%s");
+	/*
+	 * TRANSLATORS: the colon here should align with the
+	 * one in "usage: %s" translation.
+	 */
+	const char *or_prefix = _("   or: %s");
+	/*
+	 * TRANSLATORS: You should only need to translate this format
+	 * string if your language is a RTL language (e.g. Arabic,
+	 * Hebrew etc.), not if it's a LTR language (e.g. German,
+	 * Russian, Chinese etc.).
+	 *
+	 * When a translated usage string has an embedded "\n" it's
+	 * because options have wrapped to the next line. The line
+	 * after the "\n" will then be padded to align with the
+	 * command name, such as N_("git cmd [opt]\n<8
+	 * spaces>[opt2]"), where the 8 spaces are the same length as
+	 * "git cmd ".
+	 *
+	 * This format string prints out that already-translated
+	 * line. The "%*s" is whitespace padding to account for the
+	 * padding at the start of the line that we add in this
+	 * function. The "%s" is a line in the (hopefully already
+	 * translated) N_() usage string, which contained embedded
+	 * newlines before we split it up.
+	 */
+	const char *usage_continued = _("%*s%s");
+	const char *prefix = usage_prefix;
+	int saw_empty_line = 0;
+
 	if (!usagestr)
 		return PARSE_OPT_HELP;
 
 	if (!err && ctx && ctx->flags & PARSE_OPT_SHELL_EVAL)
 		fprintf(outfile, "cat <<\\EOF\n");
 
-	fprintf_ln(outfile, _("usage: %s"), _(*usagestr++));
-	while (*usagestr && **usagestr)
-		/*
-		 * TRANSLATORS: the colon here should align with the
-		 * one in "usage: %s" translation.
-		 */
-		fprintf_ln(outfile, _("   or: %s"), _(*usagestr++));
 	while (*usagestr) {
-		if (**usagestr)
-			fprintf_ln(outfile, _("    %s"), _(*usagestr));
-		else
-			fputc('\n', outfile);
-		usagestr++;
+		const char *str = _(*usagestr++);
+		struct string_list list = STRING_LIST_INIT_DUP;
+		unsigned int j;
+
+		if (!saw_empty_line && !*str)
+			saw_empty_line = 1;
+
+		string_list_split(&list, str, '\n', -1);
+		for (j = 0; j < list.nr; j++) {
+			const char *line = list.items[j].string;
+
+			if (saw_empty_line && *line)
+				fprintf_ln(outfile, _("    %s"), line);
+			else if (saw_empty_line)
+				fputc('\n', outfile);
+			else if (!j)
+				fprintf_ln(outfile, prefix, line);
+			else
+				fprintf_ln(outfile, usage_continued,
+					   (int)usage_len, "", line);
+		}
+		string_list_clear(&list, 0);
+
+		prefix = or_prefix;
 	}
 
 	need_newline = 1;
@@ -1010,21 +1076,19 @@ 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);
 }
 
-const char *optname(const struct option *opt, int flags)
+void NORETURN usage_msg_optf(const char * const fmt,
+			     const char * const *usagestr,
+			     const struct option *options, ...)
 {
-	static struct strbuf sb = STRBUF_INIT;
-
-	strbuf_reset(&sb);
-	if (flags & OPT_SHORT)
-		strbuf_addf(&sb, "switch `%c'", opt->short_name);
-	else if (flags & OPT_UNSET)
-		strbuf_addf(&sb, "option `no-%s'", opt->long_name);
-	else
-		strbuf_addf(&sb, "option `%s'", opt->long_name);
+	struct strbuf msg = STRBUF_INIT;
+	va_list ap;
+	va_start(ap, options);
+	strbuf_vaddf(&msg, fmt, ap);
+	va_end(ap);
 
-	return sb.buf;
+	usage_msg_opt(msg.buf, usagestr, options);
 }
diff --git a/parse-options.h b/parse-options.h
index a845a9d952..659a4c28b2 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -8,7 +8,6 @@
 enum parse_opt_type {
 	/* special types */
 	OPTION_END,
-	OPTION_ARGUMENT,
 	OPTION_GROUP,
 	OPTION_NUMBER,
 	OPTION_ALIAS,
@@ -34,6 +33,7 @@ enum parse_opt_flags {
 	PARSE_OPT_KEEP_UNKNOWN = 1 << 3,
 	PARSE_OPT_NO_INTERNAL_HELP = 1 << 4,
 	PARSE_OPT_ONE_SHOT = 1 << 5,
+	PARSE_OPT_SHELL_EVAL = 1 << 6,
 };
 
 enum parse_opt_option_flags {
@@ -45,7 +45,6 @@ enum parse_opt_option_flags {
 	PARSE_OPT_NODASH = 1 << 5,
 	PARSE_OPT_LITERAL_ARGHELP = 1 << 6,
 	PARSE_OPT_FROM_ALIAS = 1 << 7,
-	PARSE_OPT_SHELL_EVAL = 1 << 8,
 	PARSE_OPT_NOCOMPLETE = 1 << 9,
 	PARSE_OPT_COMP_ARG = 1 << 10,
 	PARSE_OPT_CMDMODE = 1 << 11,
@@ -86,6 +85,11 @@ typedef enum parse_opt_result parse_opt_ll_cb(struct parse_opt_ctx_t *ctx,
  *   token to explain the kind of argument this option wants. Does not
  *   begin in capital letter, and does not end with a full stop.
  *   Should be wrapped by N_() for translation.
+ *   Is automatically enclosed in brackets when printed, unless it
+ *   contains any of the following characters: ()<>[]|
+ *   E.g. "name" is shown as "<name>" to indicate that a name value
+ *   needs to be supplied, not the literal string "name", but
+ *   "<start>,<end>" and "(this|that)" are printed verbatim.
  *
  * `help`::
  *   the short help associated to what the option does.
@@ -135,7 +139,7 @@ struct option {
 	const char *argh;
 	const char *help;
 
-	int flags;
+	enum parse_opt_option_flags flags;
 	parse_opt_cb *callback;
 	intptr_t defval;
 	parse_opt_ll_cb *ll_callback;
@@ -155,8 +159,6 @@ struct option {
 #define OPT_INTEGER_F(s, l, v, h, f)     { OPTION_INTEGER, (s), (l), (v), N_("n"), (h), (f) }
 
 #define OPT_END()                   { OPTION_END }
-#define OPT_ARGUMENT(l, v, h)       { OPTION_ARGUMENT, 0, (l), (v), NULL, \
-				      (h), PARSE_OPT_NOARG, NULL, 1 }
 #define OPT_GROUP(h)                { OPTION_GROUP, 0, NULL, NULL, NULL, (h) }
 #define OPT_BIT(s, l, v, h, b)      OPT_BIT_F(s, l, v, h, b, 0)
 #define OPT_BITOP(s, l, v, h, set, clear) { OPTION_BITOP, (s), (l), (v), NULL, (h), \
@@ -169,8 +171,10 @@ struct option {
 #define OPT_BOOL(s, l, v, h)        OPT_BOOL_F(s, l, v, h, 0)
 #define OPT_HIDDEN_BOOL(s, l, v, h) { OPTION_SET_INT, (s), (l), (v), NULL, \
 				      (h), PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 1}
-#define OPT_CMDMODE(s, l, v, h, i)  { OPTION_SET_INT, (s), (l), (v), NULL, \
-				      (h), PARSE_OPT_CMDMODE|PARSE_OPT_NOARG|PARSE_OPT_NONEG, NULL, (i) }
+#define OPT_CMDMODE_F(s, l, v, h, i, f)  { OPTION_SET_INT, (s), (l), (v), NULL, \
+				      (h), PARSE_OPT_CMDMODE|PARSE_OPT_NOARG|PARSE_OPT_NONEG | (f), NULL, (i) }
+#define OPT_CMDMODE(s, l, v, h, i)  OPT_CMDMODE_F(s, l, v, h, i, 0)
+
 #define OPT_INTEGER(s, l, v, h)     OPT_INTEGER_F(s, l, v, h, 0)
 #define OPT_MAGNITUDE(s, l, v, h)   { OPTION_MAGNITUDE, (s), (l), (v), \
 				      N_("n"), (h), PARSE_OPT_NONEG }
@@ -216,7 +220,8 @@ struct option {
  */
 int parse_options(int argc, const char **argv, const char *prefix,
 		  const struct option *options,
-		  const char * const usagestr[], int flags);
+		  const char * const usagestr[],
+		  enum parse_opt_flags flags);
 
 NORETURN void usage_with_options(const char * const *usagestr,
 				 const struct option *options);
@@ -225,8 +230,15 @@ NORETURN void usage_msg_opt(const char *msg,
 			    const char * const *usagestr,
 			    const struct option *options);
 
-int optbug(const struct option *opt, const char *reason);
-const char *optname(const struct option *opt, int flags);
+/**
+ * usage_msg_optf() is like usage_msg_opt() except that the first
+ * argument is a format string, and optional format arguments follow
+ * after the 3rd option.
+ */
+__attribute__((format (printf,1,4)))
+void NORETURN usage_msg_optf(const char *fmt,
+			     const char * const *usagestr,
+			     const struct option *options, ...);
 
 /*
  * Use these assertions for callbacks that expect to be called with NONEG and
@@ -265,7 +277,7 @@ struct parse_opt_ctx_t {
 	const char **out;
 	int argc, cpidx, total;
 	const char *opt;
-	int flags;
+	enum parse_opt_flags flags;
 	const char *prefix;
 	const char **alias_groups; /* must be in groups of 3 elements! */
 	struct option *updated_options;
@@ -273,11 +285,12 @@ struct parse_opt_ctx_t {
 
 void parse_options_start(struct parse_opt_ctx_t *ctx,
 			 int argc, const char **argv, const char *prefix,
-			 const struct option *options, int flags);
+			 const struct option *options,
+			 enum parse_opt_flags flags);
 
-int parse_options_step(struct parse_opt_ctx_t *ctx,
-		       const struct option *options,
-		       const char * const usagestr[]);
+enum parse_opt_result parse_options_step(struct parse_opt_ctx_t *ctx,
+					 const struct option *options,
+					 const char * const usagestr[]);
 
 int parse_options_end(struct parse_opt_ctx_t *ctx);
 
@@ -303,6 +316,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/path.c b/path.c
index 7bccd830e9..2c895471d9 100644
--- a/path.c
+++ b/path.c
@@ -12,6 +12,7 @@
 #include "packfile.h"
 #include "object-store.h"
 #include "lockfile.h"
+#include "exec-cmd.h"
 
 static int get_st_mode_bits(const char *path, int *mode)
 {
@@ -719,19 +720,25 @@ static struct passwd *getpw_str(const char *username, size_t len)
 }
 
 /*
- * Return a string with ~ and ~user expanded via getpw*.  If buf != NULL,
- * then it is a newly allocated string. Returns NULL on getpw failure or
- * if path is NULL.
+ * Return a string with ~ and ~user expanded via getpw*. Returns NULL on getpw
+ * failure or if path is NULL.
  *
- * If real_home is true, strbuf_realpath($HOME) is used in the expansion.
+ * If real_home is true, strbuf_realpath($HOME) is used in the `~/` expansion.
+ *
+ * If the path starts with `%(prefix)/`, the remainder is interpreted as
+ * relative to where Git is installed, and expanded to the absolute path.
  */
-char *expand_user_path(const char *path, int real_home)
+char *interpolate_path(const char *path, int real_home)
 {
 	struct strbuf user_path = STRBUF_INIT;
 	const char *to_copy = path;
 
 	if (path == NULL)
 		goto return_null;
+
+	if (skip_prefix(path, "%(prefix)/", &path))
+		return system_path(path);
+
 	if (path[0] == '~') {
 		const char *first_slash = strchrnul(path, '/');
 		const char *username = path + 1;
@@ -812,7 +819,7 @@ const char *enter_repo(const char *path, int strict)
 		strbuf_add(&validated_path, path, len);
 
 		if (used_path.buf[0] == '~') {
-			char *newpath = expand_user_path(used_path.buf, 0);
+			char *newpath = interpolate_path(used_path.buf, 0);
 			if (!newpath)
 				return NULL;
 			strbuf_attach(&used_path, newpath, strlen(newpath),
@@ -1503,21 +1510,28 @@ int looks_like_command_line_option(const char *str)
 	return str && str[0] == '-';
 }
 
-char *xdg_config_home(const char *filename)
+char *xdg_config_home_for(const char *subdir, const char *filename)
 {
 	const char *home, *config_home;
 
+	assert(subdir);
 	assert(filename);
 	config_home = getenv("XDG_CONFIG_HOME");
 	if (config_home && *config_home)
-		return mkpathdup("%s/git/%s", config_home, filename);
+		return mkpathdup("%s/%s/%s", config_home, subdir, filename);
 
 	home = getenv("HOME");
 	if (home)
-		return mkpathdup("%s/.config/git/%s", home, filename);
+		return mkpathdup("%s/.config/%s/%s", home, subdir, filename);
+
 	return NULL;
 }
 
+char *xdg_config_home(const char *filename)
+{
+	return xdg_config_home_for("git", filename);
+}
+
 char *xdg_cache_home(const char *filename)
 {
 	const char *home, *cache_home;
diff --git a/path.h b/path.h
index 251c78d980..b68691a86b 100644
--- a/path.h
+++ b/path.h
@@ -181,10 +181,7 @@ struct path_cache {
 	const char *shallow;
 };
 
-#define PATH_CACHE_INIT                                        \
-	{                                                      \
-		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL \
-	}
+#define PATH_CACHE_INIT { 0 }
 
 const char *git_path_squash_msg(struct repository *r);
 const char *git_path_merge_msg(struct repository *r);
diff --git a/pathspec.c b/pathspec.c
index 08f8d3eedc..ddeeba7911 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -37,11 +37,10 @@ void add_pathspec_matches_against_index(const struct pathspec *pathspec,
 			num_unmatched++;
 	if (!num_unmatched)
 		return;
-	/* TODO: audit for interaction with sparse-index. */
-	ensure_full_index(istate);
 	for (i = 0; i < istate->cache_nr; i++) {
 		const struct cache_entry *ce = istate->cache[i];
-		if (sw_action == PS_IGNORE_SKIP_WORKTREE && ce_skip_worktree(ce))
+		if (sw_action == PS_IGNORE_SKIP_WORKTREE &&
+		    (ce_skip_worktree(ce) || !path_in_sparse_checkout(ce->name, istate)))
 			continue;
 		ce_path_match(istate, ce, pathspec, seen);
 	}
@@ -72,7 +71,7 @@ char *find_pathspecs_matching_skip_worktree(const struct pathspec *pathspec)
 
 	for (i = 0; i < istate->cache_nr; i++) {
 		struct cache_entry *ce = istate->cache[i];
-		if (ce_skip_worktree(ce))
+		if (ce_skip_worktree(ce) || !path_in_sparse_checkout(ce->name, istate))
 		    ce_path_match(istate, ce, pathspec, seen);
 	}
 
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.pm b/perl/Git.pm
index 090a7df63f..080cdc2a21 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -1686,6 +1686,16 @@ sub _setup_git_cmd_env {
 # by searching for it at proper places.
 sub _execv_git_cmd { exec('git', @_); }
 
+sub _is_sig {
+	my ($v, $n) = @_;
+
+	# We are avoiding a "use POSIX qw(SIGPIPE SIGABRT)" in the hot
+	# Git.pm codepath.
+	require POSIX;
+	no strict 'refs';
+	$v == *{"POSIX::$n"}->();
+}
+
 # Close pipe to a subprocess.
 sub _cmd_close {
 	my $ctx = shift @_;
@@ -1698,9 +1708,16 @@ sub _cmd_close {
 		} elsif ($? >> 8) {
 			# The caller should pepper this.
 			throw Git::Error::Command($ctx, $? >> 8);
+		} elsif ($? & 127 && _is_sig($? & 127, "SIGPIPE")) {
+			# we might e.g. closed a live stream; the command
+			# dying of SIGPIPE would drive us here.
+		} elsif ($? & 127 && _is_sig($? & 127, "SIGABRT")) {
+			die sprintf('BUG?: got SIGABRT ($? = %d, $? & 127 = %d) when closing pipe',
+				    $?, $? & 127);
+		} elsif ($? & 127) {
+			die sprintf('got signal ($? = %d, $? & 127 = %d) when closing pipe',
+				    $?, $? & 127);
 		}
-		# else we might e.g. closed a live stream; the command
-		# dying of SIGPIPE would drive us here.
 	}
 }
 
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 98304ce374..8e43c2def4 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -103,7 +103,7 @@ void packet_response_end(int fd)
 {
 	packet_trace("0002", 4, 1);
 	if (write_in_full(fd, "0002", 4) < 0)
-		die_errno(_("unable to write stateless separator packet"));
+		die_errno(_("unable to write response end packet"));
 }
 
 int packet_flush_gently(int fd)
@@ -243,29 +243,50 @@ void packet_write(int fd_out, const char *buf, size_t size)
 		die("%s", err.buf);
 }
 
-void packet_buf_write(struct strbuf *buf, const char *fmt, ...)
+void packet_fwrite(FILE *f, const char *buf, size_t size)
 {
-	va_list args;
+	size_t packet_size;
+	char header[4];
 
-	va_start(args, fmt);
-	format_packet(buf, "", fmt, args);
-	va_end(args);
+	if (size > LARGE_PACKET_DATA_MAX)
+		die(_("packet write failed - data exceeds max packet size"));
+
+	packet_trace(buf, size, 1);
+	packet_size = size + 4;
+
+	set_packet_header(header, packet_size);
+	fwrite_or_die(f, header, 4);
+	fwrite_or_die(f, buf, size);
 }
 
-void packet_buf_write_len(struct strbuf *buf, const char *data, size_t len)
+void packet_fwrite_fmt(FILE *fh, const char *fmt, ...)
 {
-	size_t orig_len, n;
+       static struct strbuf buf = STRBUF_INIT;
+       va_list args;
 
-	orig_len = buf->len;
-	strbuf_addstr(buf, "0000");
-	strbuf_add(buf, data, len);
-	n = buf->len - orig_len;
+       strbuf_reset(&buf);
 
-	if (n > LARGE_PACKET_MAX)
-		die(_("protocol error: impossibly long line"));
+       va_start(args, fmt);
+       format_packet(&buf, "", fmt, args);
+       va_end(args);
 
-	set_packet_header(&buf->buf[orig_len], n);
-	packet_trace(data, len, 1);
+       fwrite_or_die(fh, buf.buf, buf.len);
+}
+
+void packet_fflush(FILE *f)
+{
+	packet_trace("0000", 4, 1);
+	fwrite_or_die(f, "0000", 4);
+	fflush_or_die(f);
+}
+
+void packet_buf_write(struct strbuf *buf, const char *fmt, ...)
+{
+	va_list args;
+
+	va_start(args, fmt);
+	format_packet(buf, "", fmt, args);
+	va_end(args);
 }
 
 int write_packetized_from_fd_no_flush(int fd_in, int fd_out)
@@ -349,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,
@@ -356,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;
@@ -406,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 "))
@@ -416,38 +475,28 @@ enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
 	return PACKET_READ_NORMAL;
 }
 
-int packet_read(int fd, char **src_buffer, size_t *src_len,
-		char *buffer, unsigned size, int options)
+int packet_read(int fd, char *buffer, unsigned size, int options)
 {
 	int pktlen = -1;
 
-	packet_read_with_status(fd, src_buffer, src_len, buffer, size,
-				&pktlen, options);
+	packet_read_with_status(fd, NULL, NULL, buffer, size, &pktlen,
+				options);
 
 	return pktlen;
 }
 
-static char *packet_read_line_generic(int fd,
-				      char **src, size_t *src_len,
-				      int *dst_len)
+char *packet_read_line(int fd, int *dst_len)
 {
-	int len = packet_read(fd, src, src_len,
-			      packet_buffer, sizeof(packet_buffer),
+	int len = packet_read(fd, packet_buffer, sizeof(packet_buffer),
 			      PACKET_READ_CHOMP_NEWLINE);
 	if (dst_len)
 		*dst_len = len;
 	return (len > 0) ? packet_buffer : NULL;
 }
 
-char *packet_read_line(int fd, int *len_p)
-{
-	return packet_read_line_generic(fd, NULL, NULL, len_p);
-}
-
 int packet_read_line_gently(int fd, int *dst_len, char **dst_line)
 {
-	int len = packet_read(fd, NULL, NULL,
-			      packet_buffer, sizeof(packet_buffer),
+	int len = packet_read(fd, packet_buffer, sizeof(packet_buffer),
 			      PACKET_READ_CHOMP_NEWLINE|PACKET_READ_GENTLE_ON_EOF);
 	if (dst_len)
 		*dst_len = len;
@@ -456,11 +505,6 @@ int packet_read_line_gently(int fd, int *dst_len, char **dst_line)
 	return len;
 }
 
-char *packet_read_line_buf(char **src, size_t *src_len, int *dst_len)
-{
-	return packet_read_line_generic(-1, src, src_len, dst_len);
-}
-
 ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out, int options)
 {
 	int packet_len;
@@ -470,7 +514,7 @@ ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out, int options)
 
 	for (;;) {
 		strbuf_grow(sb_out, LARGE_PACKET_DATA_MAX);
-		packet_len = packet_read(fd_in, NULL, NULL,
+		packet_len = packet_read(fd_in,
 			/* strbuf_grow() above always allocates one extra byte to
 			 * store a '\0' at the end of the string. packet_read()
 			 * writes a '\0' extra byte at the end, too. Let it know
diff --git a/pkt-line.h b/pkt-line.h
index 5af5f45687..6d2a63db23 100644
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -29,13 +29,23 @@ void packet_buf_delim(struct strbuf *buf);
 void set_packet_header(char *buf, int size);
 void packet_write(int fd_out, const char *buf, size_t size);
 void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
-void packet_buf_write_len(struct strbuf *buf, const char *data, size_t len);
 int packet_flush_gently(int fd);
 int packet_write_fmt_gently(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
 int write_packetized_from_fd_no_flush(int fd_in, int fd_out);
 int write_packetized_from_buf_no_flush(const char *src_in, size_t len, int fd_out);
 
 /*
+ * Stdio versions of packet_write functions. When mixing these with fd
+ * based functions, take care to call fflush(3) before doing fd writes or
+ * closing the fd.
+ */
+void packet_fwrite(FILE *f, const char *buf, size_t size);
+void packet_fwrite_fmt(FILE *f, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
+
+/* packet_fflush writes a flush packet and flushes the stdio buffer of f */
+void packet_fflush(FILE *f);
+
+/*
  * Read a packetized line into the buffer, which must be at least size bytes
  * long. The return value specifies the number of bytes read into the buffer.
  *
@@ -77,8 +87,8 @@ int write_packetized_from_buf_no_flush(const char *src_in, size_t len, int fd_ou
 #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)
-int packet_read(int fd, char **src_buffer, size_t *src_len, char
-		*buffer, unsigned size, int options);
+#define PACKET_READ_REDACT_URI_PATH      (1u<<4)
+int packet_read(int fd, char *buffer, unsigned size, int options);
 
 /*
  * Convert a four hex digit packet line length header into its numeric
@@ -128,12 +138,6 @@ char *packet_read_line(int fd, int *size);
 int packet_read_line_gently(int fd, int *size, char **dst_line);
 
 /*
- * Same as packet_read_line, but read from a buf rather than a descriptor;
- * see packet_read for details on how src_* is used.
- */
-char *packet_read_line_buf(char **src_buf, size_t *src_len, int *size);
-
-/*
  * Reads a stream of variable sized packets until a flush packet is detected.
  */
 ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out, int options);
diff --git a/po/README.md b/po/README.md
index 2fd92cca04..19fabb4acf 100644
--- a/po/README.md
+++ b/po/README.md
@@ -1,5 +1,4 @@
-Core GIT Translations
-=====================
+# Core GIT Translations
 
 This directory holds the translations for the core of Git. This document
 describes how you can contribute to the effort of enhancing the language
@@ -8,14 +7,14 @@ coverage and maintaining the translation.
 The localization (l10n) coordinator, Jiang Xin <worldhello.net@gmail.com>,
 coordinates our localization effort in the l10 coordinator repository:
 
-        https://github.com/git-l10n/git-po/
+    https://github.com/git-l10n/git-po/
 
-The two character language translation codes are defined by ISO_639-1, as
+The two character language translation codes are defined by ISO\_639-1, as
 stated in the gettext(1) full manual, appendix A.1, Usual Language Codes.
 
 
-Contributing to an existing translation
----------------------------------------
+## Contributing to an existing translation
+
 As a contributor for a language XX, you should first check TEAMS file in
 this directory to see whether a dedicated repository for your language XX
 exists. Fork the dedicated repository and start to work if it exists.
@@ -28,10 +27,10 @@ For this case, wrong translations should be reported and fixed through
 their workflows.
 
 
-Creating a new language translation
------------------------------------
+## Creating a new language translation
+
 If you are the first contributor for the language XX, please fork this
-repository, prepare and/or update the translated message file po/XX.po
+repository, prepare and/or update the translated message file "po/XX.po"
 (described later), and ask the l10n coordinator to pull your work.
 
 If there are multiple contributors for the same language, please first
@@ -40,8 +39,8 @@ language, so that the l10n coordinator only needs to interact with one
 person per language.
 
 
-Core translation
-----------------
+## Core translation
+
 The core translation is the smallest set of work that must be completed
 for a new language translation. Because there are more than 5000 messages
 in the template message file "po/git.pot" that need to be translated,
@@ -51,21 +50,25 @@ The core template message file which contains a small set of messages
 will be generated in "po-core/core.pot" automatically by running a helper
 program named "git-po-helper" (described later).
 
-    git-po-helper init --core XX.po
+```shell
+git-po-helper init --core XX.po
+```
 
 After translating the generated "po-core/XX.po", you can merge it to
 "po/XX.po" using the following commands:
 
-    msgcat po-core/XX.po po/XX.po -s -o /tmp/XX.po
-    mv /tmp/XX.po po/XX.po
-    git-po-helper update XX.po
+```shell
+msgcat po-core/XX.po po/XX.po -s -o /tmp/XX.po
+mv /tmp/XX.po po/XX.po
+git-po-helper update XX.po
+```
 
 Edit "po/XX.po" by hand to fix "fuzzy" messages, which may have misplaced
 translated messages and duplicate messages.
 
 
-Translation Process Flow
-------------------------
+## Translation Process Flow
+
 The overall data-flow looks like this:
 
     +-------------------+            +------------------+
@@ -79,21 +82,20 @@ The overall data-flow looks like this:
                                      | Language Team XX |
                                      +------------------+
 
- * Translatable strings are marked in the source file.
- * L10n coordinator pulls from the source (1)
- * L10n coordinator updates the message template po/git.pot
- * Language team pulls from L10n coordinator (2)
- * Language team updates the message file po/XX.po
- * L10n coordinator pulls from Language team (3)
- * L10n coordinator asks the result to be pulled (4).
+- Translatable strings are marked in the source file.
+- L10n coordinator pulls from the source (1)
+- L10n coordinator updates the message template "po/git.pot"
+- Language team pulls from L10n coordinator (2)
+- Language team updates the message file "po/XX.po"
+- L10n coordinator pulls from Language team (3)
+- L10n coordinator asks the result to be pulled (4).
 
 
-Maintaining the po/git.pot file
--------------------------------
+## Maintaining the "po/git.pot" file
 
 (This is done by the l10n coordinator).
 
-The po/git.pot file contains a message catalog extracted from Git's
+The "po/git.pot" file contains a message catalog extracted from Git's
 sources. The l10n coordinator maintains it by adding new translations with
 msginit(1), or update existing ones with msgmerge(1).  In order to update
 the Git sources to extract the messages from, the l10n coordinator is
@@ -105,62 +107,68 @@ Language contributors use this file to prepare translations for their
 language, but they are not expected to modify it.
 
 
-Initializing a XX.po file
--------------------------
+## Initializing a "XX.po" file
 
 (This is done by the language teams).
 
-If your language XX does not have translated message file po/XX.po yet,
+If your language XX does not have translated message file "po/XX.po" yet,
 you add a translation for the first time by running:
 
-    msginit --locale=XX
+```shell
+msginit --locale=XX
+```
 
-in the po/ directory, where XX is the locale, e.g. "de", "is", "pt_BR",
-"zh_CN", etc.
+in the "po/" directory, where XX is the locale, e.g. "de", "is", "pt\_BR",
+"zh\_CN", etc.
 
-Then edit the automatically generated copyright info in your new XX.po
+Then edit the automatically generated copyright info in your new "XX.po"
 to be correct, e.g. for Icelandic:
 
-    @@ -1,6 +1,6 @@
-    -# Icelandic translations for PACKAGE package.
-    -# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER
-    -# This file is distributed under the same license as the PACKAGE package.
-    +# Icelandic translations for Git.
-    +# Copyright (C) 2010 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
-    +# This file is distributed under the same license as the Git package.
-     # Ævar Arnfjörð Bjarmason <avarab@gmail.com>, 2010.
+```diff
+@@ -1,6 +1,6 @@
+-# Icelandic translations for PACKAGE package.
+-# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER
+-# This file is distributed under the same license as the PACKAGE package.
++# Icelandic translations for Git.
++# Copyright (C) 2010 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
++# This file is distributed under the same license as the Git package.
+ # Ævar Arnfjörð Bjarmason <avarab@gmail.com>, 2010.
+```
 
 And change references to PACKAGE VERSION in the PO Header Entry to
 just "Git":
 
-    perl -pi -e 's/(?<="Project-Id-Version: )PACKAGE VERSION/Git/' XX.po
+```shell
+perl -pi -e 's/(?<="Project-Id-Version: )PACKAGE VERSION/Git/' XX.po
+```
 
 Once you are done testing the translation (see below), commit the result
 and ask the l10n coordinator to pull from you.
 
 
-Updating a XX.po file
----------------------
+## Updating a "XX.po" file
 
 (This is done by the language teams).
 
-If you are replacing translation strings in an existing XX.po file to
+If you are replacing translation strings in an existing "XX.po" file to
 improve the translation, just edit the file.
 
-If there's an existing XX.po file for your language, but the repository
-of the l10n coordinator has newer po/git.pot file, you would need to first
+If there's an existing "XX.po" file for your language, but the repository
+of the l10n coordinator has newer "po/git.pot" file, you would need to first
 pull from the l10n coordinator (see the beginning of this document for its
 URL), and then update the existing translation by running:
 
-    msgmerge --add-location --backup=off -U XX.po git.pot
+```shell
+msgmerge --add-location --backup=off -U XX.po git.pot
+```
 
-in the po/ directory, where XX.po is the file you want to update.
+in the "po/" directory, where "XX.po" is the file you want to update.
 
 Once you are done testing the translation (see below), commit the result
 and ask the l10n coordinator to pull from you.
 
-Fuzzy translation
------------------
+
+## Fuzzy translation
 
 Fuzzy translation is a translation marked by comment "fuzzy" to let you
 know that the translation is out of date because the "msgid" has been
@@ -172,14 +180,15 @@ After fixing the corresponding translation, you must remove the "fuzzy"
 tag in the comment.
 
 
-Testing your changes
---------------------
+## Testing your changes
 
-(This is done by the language teams, after creating or updating XX.po file).
+(This is done by the language teams, after creating or updating "XX.po" file).
 
 Before you submit your changes go back to the top-level and do:
 
-    make
+```shell
+make
+```
 
 On systems with GNU gettext (i.e. not Solaris) this will compile your
 changed PO file with `msgfmt --check`, the --check option flags many
@@ -188,8 +197,7 @@ messages that deviate from the originals in whether they begin/end
 with a newline or not.
 
 
-Marking strings for translation
--------------------------------
+## Marking strings for translation
 
 (This is done by the core developers).
 
@@ -202,132 +210,159 @@ gettext library, so most of the advice in your gettext documentation
 
 General advice:
 
- - Don't mark everything for translation, only strings which will be
-   read by humans (the porcelain interface) should be translated.
+- Don't mark everything for translation, only strings which will be
+  read by humans (the porcelain interface) should be translated.
+
+  The output from Git's plumbing utilities will primarily be read by
+  programs and would break scripts under non-C locales if it was
+  translated. Plumbing strings should not be translated, since
+  they're part of Git's API.
 
-   The output from Git's plumbing utilities will primarily be read by
-   programs and would break scripts under non-C locales if it was
-   translated. Plumbing strings should not be translated, since
-   they're part of Git's API.
+- Adjust the strings so that they're easy to translate. Most of the
+  advice in `info '(gettext)Preparing Strings'` applies here.
 
- - 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
-   git-am.sh:
+- 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
+  git-am.sh:
 
-       # TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
-       # in your translation. The program will only accept English
-       # input at this point.
-       gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
+  ```shell
+  # TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+  # in your translation. The program will only accept English
+  # input at this point.
+  gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
+  ```
 
-   Or in C, from builtin/revert.c:
+  Or in C, from builtin/revert.c:
 
-       /* TRANSLATORS: %s will be "revert" or "cherry-pick" */
-       die(_("%s: Unable to write new index file"), action_name(opts));
+  ```c
+  /* TRANSLATORS: %s will be "revert" or "cherry-pick" */
+  die(_("%s: Unable to write new index file"), action_name(opts));
+  ```
 
 We provide wrappers for C, Shell and Perl programs. Here's how they're
 used:
 
-C:
 
- - Include builtin.h at the top, it'll pull in gettext.h, which
-   defines the gettext interface. Consult with the list if you need to
-   use gettext.h directly.
+### C
+
+Include builtin.h at the top, it'll pull in gettext.h, which
+defines the gettext interface. Consult with the list if you need to
+use gettext.h directly.
+
+The C interface is a subset of the normal GNU gettext
+interface. We currently export these functions:
 
- - The C interface is a subset of the normal GNU gettext
-   interface. We currently export these functions:
+- \_()
 
-   - _()
+  Mark and translate a string. E.g.:
 
-    Mark and translate a string. E.g.:
+  ```c
+  printf(_("HEAD is now at %s"), hex);
+  ```
 
-        printf(_("HEAD is now at %s"), hex);
+- Q\_()
 
-   - Q_()
+  Mark and translate a plural string. E.g.:
 
-    Mark and translate a plural string. E.g.:
+  ```c
+  printf(Q_("%d commit", "%d commits", number_of_commits));
+  ```
 
-        printf(Q_("%d commit", "%d commits", number_of_commits));
+  This is just a wrapper for the ngettext() function.
 
-    This is just a wrapper for the ngettext() function.
+- N\_()
 
-   - N_()
+  A no-op pass-through macro for marking strings inside static
+  initializations, e.g.:
 
-    A no-op pass-through macro for marking strings inside static
-    initializations, e.g.:
+  ```c
+  static const char *reset_type_names[] = {
+      N_("mixed"), N_("soft"), N_("hard"), N_("merge"), N_("keep"), NULL
+  };
+  ```
 
-        static const char *reset_type_names[] = {
-            N_("mixed"), N_("soft"), N_("hard"), N_("merge"), N_("keep"), NULL
-        };
+  And then, later:
 
-    And then, later:
+  ```c
+  die(_("%s reset is not allowed in a bare repository"),
+        _(reset_type_names[reset_type]));
+  ```
 
-        die(_("%s reset is not allowed in a bare repository"),
-               _(reset_type_names[reset_type]));
+  Here `_()` couldn't have statically determined what the translation
+  string will be, but since it was already marked for translation
+  with `N_()` the look-up in the message catalog will succeed.
 
-    Here _() couldn't have statically determined what the translation
-    string will be, but since it was already marked for translation
-    with N_() the look-up in the message catalog will succeed.
 
-Shell:
+### Shell
 
- - The Git gettext shell interface is just a wrapper for
-   gettext.sh. Import it right after git-sh-setup like this:
+The Git gettext shell interface is just a wrapper for
+gettext.sh. Import it right after git-sh-setup like this:
 
-       . git-sh-setup
-       . git-sh-i18n
+```shell
+. git-sh-setup
+. git-sh-i18n
+```
 
-   And then use the gettext or eval_gettext functions:
+And then use the `gettext` or `eval_gettext` functions:
 
-       # For constant interface messages:
-       gettext "A message for the user"; echo
+```shell
+# For constant interface messages:
+gettext "A message for the user"; echo
 
-       # To interpolate variables:
-       details="oh noes"
-       eval_gettext "An error occurred: \$details"; echo
+# To interpolate variables:
+details="oh noes"
+eval_gettext "An error occurred: \$details"; echo
+```
 
-   In addition we have wrappers for messages that end with a trailing
-   newline. I.e. you could write the above as:
+In addition we have wrappers for messages that end with a trailing
+newline. I.e. you could write the above as:
 
-       # For constant interface messages:
-       gettextln "A message for the user"
+```shell
+# For constant interface messages:
+gettextln "A message for the user"
 
-       # To interpolate variables:
-       details="oh noes"
-       eval_gettextln "An error occurred: \$details"
+# To interpolate variables:
+details="oh noes"
+eval_gettextln "An error occurred: \$details"
+```
 
-   More documentation about the interface is available in the GNU info
-   page: `info '(gettext)sh'`. Looking at git-am.sh (the first shell
-   command to be translated) for examples is also useful:
+More documentation about the interface is available in the GNU info
+page: `info '(gettext)sh'`. Looking at git-am.sh (the first shell
+command to be translated) for examples is also useful:
 
-       git log --reverse -p --grep=i18n git-am.sh
+```shell
+git log --reverse -p --grep=i18n git-am.sh
+```
 
-Perl:
 
- - The Git::I18N module provides a limited subset of the
-   Locale::Messages functionality, e.g.:
+### Perl
 
-       use Git::I18N;
-       print __("Welcome to Git!\n");
-       printf __("The following error occurred: %s\n"), $error;
+The Git::I18N module provides a limited subset of the
+Locale::Messages functionality, e.g.:
 
-   Run `perldoc perl/Git/I18N.pm` for more info.
+```perl
+use Git::I18N;
+print __("Welcome to Git!\n");
+printf __("The following error occurred: %s\n"), $error;
+```
 
+Run `perldoc perl/Git/I18N.pm` for more info.
 
-Testing marked strings
-----------------------
 
-Git's tests are run under LANG=C LC_ALL=C. So the tests do not need be
+## Testing marked strings
+
+Git's tests are run under `LANG=C LC_ALL=C`. So the tests do not need be
 changed to account for translations as they're added.
 
 
-PO helper
----------
+## PO helper
 
-To make the maintenance of XX.po easier, the l10n coordinator and l10n
+To make the maintenance of "XX.po" easier, the l10n coordinator and l10n
 team leaders can use a helper program named "git-po-helper". It is a
 wrapper to gettext suite, specifically written for the purpose of Git
 l10n workflow.
@@ -337,64 +372,84 @@ To build and install the helper program from source, see
 
 Usage for git-po-helper:
 
-  - To start a new language translation:
+- To start a new language translation:
 
-        git-po-helper init XX.po
+  ```shell
+  git-po-helper init XX.po
+  ```
 
-  - To update your XX.po file:
+- To update your "XX.po" file:
 
-        git-po-helper update XX.po
+  ```shell
+  git-po-helper update XX.po
+  ```
 
-  - To check commit log and syntax of XX.po:
+- To check commit log and syntax of "XX.po":
 
-        git-po-helper check-po XX.po
-        git-po-helper check-commits
+  ```shell
+  git-po-helper check-po XX.po
+  git-po-helper check-commits
+  ```
 
 Run "git-po-helper" without arguments to show usage.
 
 
-Conventions
------------
+## Conventions
 
 There are some conventions that l10n contributors must follow:
 
-1. The subject of each l10n commit should be prefixed with "l10n: ".
-2. Do not use non-ASCII characters in the subject of a commit.
-3. The length of commit subject (first line of the commit log) should
-   be less than 50 characters, and the length of other lines of the
-   commit log should be no more than 72 characters.
-4. Add "Signed-off-by" trailer to your commit log, like other commits
-   in Git. You can automatically add the trailer by committing with
-   the following command:
+- The subject of each l10n commit should be prefixed with "l10n: ".
+
+- Do not use non-ASCII characters in the subject of a commit.
+
+- The length of commit subject (first line of the commit log) should
+  be less than 50 characters, and the length of other lines of the
+  commit log should be no more than 72 characters.
+
+- Add "Signed-off-by" trailer to your commit log, like other commits
+  in Git. You can automatically add the trailer by committing with
+  the following command:
 
-        git commit -s
+  ```shell
+  git commit -s
+  ```
 
-5. Check syntax with "msgfmt" or the following command before creating
-   your commit:
+- Check syntax with "msgfmt" or the following command before creating
+  your commit:
 
-        git-po-helper check-po <XX.po>
+  ```shell
+  git-po-helper check-po <XX.po>
+  ```
+
+- Squash trivial commits to make history clear.
+
+- DO NOT edit files outside "po/" directory.
+
+- Other subsystems ("git-gui", "gitk", and Git itself) have their
+  own workflow. See [Documentation/SubmittingPatches][] for
+  instructions on how to contribute patches to these subsystems.
 
-6. Squash trivial commits to make history clear.
-7. DO NOT edit files outside "po/" directory.
-8. Other subsystems ("git-gui", "gitk", and Git itself) have their
-   own workflow. See [Documentation/SubmittingPatches][] for
-   instructions on how to contribute patches to these subsystems.
 
 To contribute for a new l10n language, contributor should follow
 additional conventions:
 
-1. Initialize proper filename of the "XX.po" file conforming to
-   iso-639 and iso-3166.
-2. Must complete a minimal translation based on the "po-core/core.pot"
-   template. Using the following command to initialize the minimal
-   "po-core/XX.po" file:
+- Initialize proper filename of the "XX.po" file conforming to
+  iso-639 and iso-3166.
+
+- Must complete a minimal translation based on the "po-core/core.pot"
+  template. Using the following command to initialize the minimal
+  "po-core/XX.po" file:
 
-        git-po-helper init --core <your-language>
+  ```shell
+  git-po-helper init --core <your-language>
+  ```
 
-3. Add a new entry in the "po/TEAMS" file with proper format, and check
-   the syntax of "po/TEAMS" by runnning the following command:
+- Add a new entry in the "po/TEAMS" file with proper format, and check
+  the syntax of "po/TEAMS" by running the following command:
 
-        git-po-helper team --check
+  ```shell
+  git-po-helper team --check
+  ```
 
 
 [git-po-helper/README]: https://github.com/git-l10n/git-po-helper#readme
diff --git a/po/TEAMS b/po/TEAMS
index bf52d3afbf..3dd51fc159 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -52,7 +52,7 @@ Leader:		Arusekk <arek_koz@o2.pl>
 
 Language:	pt_PT (Portuguese - Portugal)
 Repository:	https://github.com/git-l10n-pt-PT/git-po/
-Leader:		Daniel Santos <hello@brighterdan.com>
+Leader:		Daniel Santos <daniel@brilhante.top>
 
 Language:	ru (Russian)
 Repository:	https://github.com/DJm00n/git-po-ru/
@@ -73,11 +73,11 @@ Leader:		Trần Ng�c Quân <vnwildman AT gmail.com>
 Members:	Nguyễn Thái Ng�c Duy <pclouds AT gmail.com>
 
 Language:	zh_CN (Simplified Chinese)
-Repository:	https://github.com/jiangxin/git/
-Leader:		Jiang Xin <worldhello.net AT gmail.com>
+Repository:	https://github.com/fangyi-zhou/git/
+Leader:		Fangyi Zhou <me AT fangyi.io>
 Members:	Ray Chen <oldsharp AT gmail.com>
 		�云 <lilydjwg AT gmail.com>
-		Fangyi Zhou <me AT fangyi.io>
+		Jiang Xin <worldhello.net AT gmail.com>
 
 Language:	zh_TW (Traditional Chinese)
 Repository:	https://github.com/l10n-tw/git-po
diff --git a/po/bg.po b/po/bg.po
index 212f7ac812..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 еталонно хранилище
@@ -62,6 +63,7 @@
 # fallback резервен вариант
 # pathspec magic опци� за магиче�ки пътища
 # bitmap index индек� на база битови ма�ки
+# multi-pack bitmap многопакетната битова ма�ка
 # mark маркер
 # plumbing команди от �и�темно ниво
 # porcelain команди от потребител�ко ниво
@@ -143,9 +145,10 @@
 # blame извеждане на автор�тво
 # refname име на указател
 # cone pattern matching пътеводно напа�ване
+# sparse-checkout cone пътеводен �егмент на ча�тичното изтегл�не
 # negative pattern отрицателен шаблон
 # colored hunk/diff оцветено парче/разлика
-# up to date обновен, о�вен като �амо�тотелва дума - актуален или completely up to date - напълно актуален
+# up to date обновен, о�вен като �амо�то�телна дума - актуален или completely up to date - напълно актуален
 # stateless без запазване на �ъ�то�нието
 # end packet пакет за край
 # identity �амолично�т, информаци� за
@@ -157,8 +160,14 @@
 # expired о�тар�л
 # reroll-count номер на редакци�
 # Nth re-roll N-та поредна редакци�
-# fetch до�тавам
+# fetch до�тав�м
 # prefetch предварително до�тав�не
+# scheduler планиращ модул
+# snapshot �нимка
+# enlistment зачи�лена директори�
+# zealous merge за�илено �ливане
+# unregister отчи�л�вам
+# marked counting избро�ване
 # ------------------------
 # „$var“ - може да не �работва за shell има gettext и eval_gettext - проверка - намират �е ле�но по „$
 # ------------------------
@@ -173,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.31\n"
+"Project-Id-Version: git 2.34\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-05-17 16:02+0800\n"
-"PO-Revision-Date: 2021-05-28 17:44+0200\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"
@@ -187,233 +197,234 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: add-interactive.c:376
+#: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "�еу�пешен анализ — „%s“."
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: 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 "индек�ът не може да бъде прочетен"
 
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
 #: git-add--interactive.perl:294
 msgid "binary"
 msgstr "двоично"
 
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
 #: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "нищо"
 
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
 #: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "н�ма промени"
 
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Обнов�ване"
 
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
 #, c-format
 msgid "could not stage '%s'"
 msgstr "неу�пешно добав�не в индек�а на „%s“"
 
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "индек�ът не може да бъде запи�ан"
 
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
 #, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "%d файл обновен\n"
 msgstr[1] "%d файла обновени\n"
 
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "БЕЛЕЖК�: „%s“ вече не �е �леди.\n"
 
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: 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“"
 
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Отм�на"
 
-#: add-interactive.c:775
+#: add-interactive.c:779
 msgid "Could not parse HEAD^{tree}"
 msgstr "Указател�т „HEAD^{tree}“ не може да бъде анализиран"
 
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
 #, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "%d файл � отменени промени\n"
 msgstr[1] "%d файла � отменени промени\n"
 
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "��ма не�ледени файлове.\n"
 
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Добав�не на не�ледени"
 
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
 #, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "%d файл добавен\n"
 msgstr[1] "%d файла добавени\n"
 
-#: add-interactive.c:925
+#: add-interactive.c:929
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "пренебрегване на не�л�тото: „%s“"
 
-#: add-interactive.c:937 add-patch.c:1751 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:939 add-patch.c:1749 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:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Обнов�ване на кръпка"
 
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Преглед на разликата"
 
-#: add-interactive.c:1010
+#: add-interactive.c:1014
 msgid "show paths with changes"
 msgstr "извеждане на пътищата � промени"
 
-#: add-interactive.c:1012
+#: add-interactive.c:1016
 msgid "add working tree state to the staged set of changes"
 msgstr "добав�не на �ъ�то�нието на работното дърво към промените в индек�а"
 
-#: add-interactive.c:1014
+#: add-interactive.c:1018
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "връщане на �ъ�то�нието на индек�а към �оченото от „HEAD“"
 
-#: add-interactive.c:1016
+#: add-interactive.c:1020
 msgid "pick hunks and update selectively"
 msgstr "интерактивни избор и пром�на на парчета код"
 
-#: add-interactive.c:1018
+#: add-interactive.c:1022
 msgid "view diff between HEAD and index"
 msgstr "разлика между �оченото от „HEAD“ и индек�а"
 
-#: add-interactive.c:1020
+#: add-interactive.c:1024
 msgid "add contents of untracked files to the staged set of changes"
 msgstr "добав�не на �ъдържанието на не�ледените файлове към индек�а"
 
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
 msgid "Prompt help:"
 msgstr "Помощ:"
 
-#: add-interactive.c:1030
+#: add-interactive.c:1034
 msgid "select a single item"
 msgstr "избор на eдин елемент"
 
-#: add-interactive.c:1032
+#: add-interactive.c:1036
 msgid "select a range of items"
 msgstr "избор на поредица от елементи"
 
-#: add-interactive.c:1034
+#: add-interactive.c:1038
 msgid "select multiple ranges"
 msgstr "избор на н�колко поредици от елементи"
 
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
 msgid "select item based on unique prefix"
 msgstr "избор на базата на уникален префик�"
 
-#: add-interactive.c:1038
+#: add-interactive.c:1042
 msgid "unselect specified items"
 msgstr "изваждане на указаното от избора"
 
-#: add-interactive.c:1040
+#: add-interactive.c:1044
 msgid "choose all items"
 msgstr "избор на в�ички елементи"
 
-#: add-interactive.c:1042
+#: add-interactive.c:1046
 msgid "(empty) finish selecting"
 msgstr "(празно) приключване на избирането"
 
-#: add-interactive.c:1079
+#: add-interactive.c:1083
 msgid "select a numbered item"
 msgstr "избор на номериран елемент"
 
-#: add-interactive.c:1083
+#: add-interactive.c:1087
 msgid "(empty) select nothing"
 msgstr "(празно) без избор на нищо"
 
-#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "��� Команди ���"
 
-#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Избор на �ледващо дей�твие"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "staged"
 msgstr "в индек�а"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "извън индек�а"
 
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
-#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
-#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
-#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
+#: 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 "път"
 
-#: add-interactive.c:1151
+#: add-interactive.c:1155
 msgid "could not refresh index"
 msgstr "индек�ът не може да бъде обновен"
 
 #
-#: add-interactive.c:1165 builtin/clean.c:781 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,?]? "
@@ -440,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,?]? "
@@ -482,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,?]? "
@@ -524,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,?]? "
@@ -567,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,?]? "
@@ -618,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,?]? "
@@ -659,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,?]? "
@@ -713,34 +724,34 @@ msgstr ""
 "a — прилагане на това и в�ички �ледващи парчета от файла\n"
 "d — без прилагане на това и в�ички �ледващи парчета от файла\n"
 
-#: add-patch.c:342
+#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "заглавната ча�т на парчето „%.*s“ не може да �е анализира"
 
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "заглавната ча�т на оцветеното парче „%.*s“ не може да �е анализира"
 
-#: add-patch.c:419
+#: add-patch.c:420
 msgid "could not parse diff"
 msgstr "разликата не може да �е анализира"
 
-#: add-patch.c:438
+#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr "оцветената разлика не може да �е анализира"
 
-#: add-patch.c:452
+#: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
 msgstr "неу�пешно изпълнение на „%s“"
 
-#: add-patch.c:611
+#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
 msgstr "изходът от „interactive.diffFilter“ не напа�ва"
 
-#: add-patch.c:612
+#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -748,7 +759,7 @@ msgstr ""
 "Обработените редове на изхода на ползвани� филтър, тр�бва\n"
 "да �е отна��т едно към едно �пр�мо редовете на входа."
 
-#: add-patch.c:790
+#: add-patch.c:791
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -757,7 +768,7 @@ msgstr ""
 "очаква �е ред №%d от контек�та в\n"
 "%.*s"
 
-#: add-patch.c:805
+#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -770,11 +781,11 @@ msgstr ""
 "    не завършва �:\n"
 "%.*s"
 
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Ръчно редактиране на парчета код — отдолу има под�казка.\n"
 
-#: add-patch.c:1085
+#: add-patch.c:1086
 #, c-format
 msgid ""
 "---\n"
@@ -789,7 +800,7 @@ msgstr ""
 "Редовете, които започват � „%c“ ще бъдат пропу�нати.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -799,11 +810,11 @@ msgstr ""
 "изтриете в�ички редове от парчето код, то ще бъде о�тавено непроменено, а\n"
 "редактирането — отказано.\n"
 
-#: add-patch.c:1132
+#: add-patch.c:1133
 msgid "could not parse hunk header"
 msgstr "заглавната ча�т парчето не може да �е анализира"
 
-#: add-patch.c:1177
+#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr "неу�пешно изпълнение на „git apply --cached“"
 
@@ -819,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:1246 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 ""
@@ -827,19 +838,19 @@ msgstr ""
 "редактирането? (текущите редакции ще �е отмен�т при отказ!): „y“ (да)/ "
 "„n“ (не)? "
 
-#: add-patch.c:1289
+#: add-patch.c:1290
 msgid "The selected hunks do not apply to the index!"
 msgstr "Избраните парчета не може да �е добав�т в индек�а!"
 
-#: add-patch.c:1290 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:1297 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "�ищо не е приложено.\n"
 
-#: add-patch.c:1354
+#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -861,73 +872,73 @@ msgstr ""
 "e — ръчно редактиране на текущото парче\n"
 "? — извеждане не помощта\n"
 
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
 msgstr "��ма друго парче преди това"
 
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
 msgstr "��ма друго парче �лед това"
 
-#: add-patch.c:1537
+#: add-patch.c:1538
 msgid "No other hunks to goto"
 msgstr "��ма други парчета"
 
-#: add-patch.c:1548 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:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "към кое парче да �е придвижи? "
 
-#: add-patch.c:1560
+#: add-patch.c:1561
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "�еправилен номер: „%s“"
 
-#: add-patch.c:1565
+#: add-patch.c:1566
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Има �амо %d парче."
 msgstr[1] "Има �амо %d парчета."
 
-#: add-patch.c:1574
+#: add-patch.c:1575
 msgid "No other hunks to search"
 msgstr "��ма други парчета за тър�ене"
 
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "да �е тър�и � регул�рен израз? "
 
-#: add-patch.c:1595
+#: add-patch.c:1596
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Сгрешен регул�рен израз „%s“: %s"
 
-#: add-patch.c:1612
+#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
 msgstr "�икое парче не напа�ва на регул�рни� израз"
 
-#: add-patch.c:1619
+#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
 msgstr "Това парче не може да бъде разделено"
 
-#: add-patch.c:1623
+#: add-patch.c:1624
 #, c-format
 msgid "Split into %d hunks."
 msgstr "Раздел�не на %d парчета."
 
-#: add-patch.c:1627
+#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
 msgstr "Това парче не може да бъде редактирано"
 
-#: add-patch.c:1679
+#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr "неу�пешно изпълнение на „git apply“"
 
-#: advice.c:145
+#: advice.c:78
 #, c-format
 msgid ""
 "\n"
@@ -937,37 +948,37 @@ msgstr ""
 "За да изключите това предупреждение, изпълнете:\n"
 "    git config advice.%s false"
 
-#: advice.c:161
+#: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sпод�казка: %.*s%s\n"
 
-#: advice.c:252
+#: advice.c:178
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "Отбирането на подавани� е блокирано от не�лети файлове."
 
-#: advice.c:254
+#: advice.c:180
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Подаването е блокирано от не�лети файлове."
 
-#: advice.c:256
+#: advice.c:182
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Сливането е блокирано от не�лети файлове."
 
-#: advice.c:258
+#: advice.c:184
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Издърпването е блокирано от не�лети файлове."
 
-#: advice.c:260
+#: advice.c:186
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Отм�ната е блокирана от не�лети файлове."
 
-#: advice.c:262
+#: advice.c:188
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "Дей�твието „%s“ е блокирано от не�лети файлове."
 
-#: advice.c:270
+#: 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."
@@ -975,40 +986,47 @@ msgstr ""
 "Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm Ф�ЙЛ“,\n"
 "за да отбележите коригирането им.  След това извършете подаването."
 
-#: advice.c:278
+#: advice.c:204
 msgid "Exiting because of an unresolved conflict."
 msgstr "Изход от програмата заради некоригиран конфликт."
 
-#: advice.c:283 builtin/merge.c:1374
+#: advice.c:209 builtin/merge.c:1382
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "�е �те завършили �ливане.  (Указател�т „MERGE_HEAD“ �ъще�твува)."
 
-#: advice.c:285
+#: advice.c:211
 msgid "Please, commit your changes before merging."
 msgstr "Промените тр�бва да �е подадат преди �ливане."
 
-#: advice.c:286
+#: advice.c:212
 msgid "Exiting because of unfinished merge."
 msgstr "Изход от програмата заради незавършено �ливане."
 
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "�е може да �е извърши превъртане, преу�танов�ване на дей�твието."
+
+#: advice.c:227
 #, 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"
+"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 ""
-"Следните пътища не �ъвпадат � никой от на�троените, но �ъвпадат � обекти\n"
-"в индек�а, които �а извън текущото ча�тично изтегл�не:\n"
+"Следните пътища напа�ват � пътища извън дефиници�та за ча�тично\n"
+"изтегл�не и н�ма да �е обнов�т в индек�а:\n"
 
-#: advice.c:303
+#: advice.c:234
 msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"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 ""
-"Изключете или променете правилата за ча�тично�т, ако и�кате до обнов�вате "
-"такива обекти."
+"�ко и�кате да ги обновите, пробвайте едно от �ледните:\n"
+"  � ползвайте опци�та „--sparse“\n"
+"  � изключете или променете правилата за ча�тично�т."
 
-#: advice.c:310
+#: advice.c:242
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -1069,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
@@ -1197,37 +1227,37 @@ msgstr "изтрити�т файл „%s“ не е празен"
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "� предупреждение: файлът „%s“ вече е празен, но не е изтрит"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "грешка в двоичната кръпка на ред %d: %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "неразпозната двоичната кръпка на ред %d"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "кръпката е � изц�ло повредени данни на ред %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "�имволната връзка „%s“ не може да бъде прочетена"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "файлът „%s“ не може да бъде отворен или прочетен"
 
-#: apply.c:2935
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "неправилно начало на ред: „%c“"
 
-#: apply.c:3056
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -1236,13 +1266,13 @@ msgstr[0] ""
 msgstr[1] ""
 "%d-то парче код бе у�пешно приложено на ред %d (отме�тване от %d реда)."
 
-#: apply.c:3068
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 "Контек�тът е намален на (%ld/%ld) за прилагането на парчето код на ред %d"
 
-#: apply.c:3074
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1251,316 +1281,318 @@ msgstr ""
 "при тър�ене за:\n"
 "%.*s"
 
-#: apply.c:3096
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "лип�ват данните за двоичната кръпка за „%s“"
 
-#: apply.c:3104
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "двоичната кръпка не може да �е приложи в обратна по�ока, когато обратното "
 "парче за „%s“ лип�ва"
 
-#: apply.c:3151
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "към „%s“ не може да �е приложи двоична кръпка без пълен индек�"
 
-#: apply.c:3162
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "кръпката �ъответ�тва на „%s“ (%s), който не �ъвпада по �ъдържание."
 
-#: apply.c:3170
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "кръпката �ъответ�тва на „%s“, който тр�бва да е празен, но не е"
 
-#: apply.c:3188
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr ""
 "необходими�т резултат �лед операци�та  — „%s“ за „%s“ не може да бъде "
 "прочетен"
 
-#: apply.c:3201
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "двоичната кръпка не може да бъде приложена върху „%s“"
 
-#: apply.c:3208
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "двоичната кръпка за „%s“ води до неправилни резултати (очакваше �е: „%s“, а "
 "бе получено: „%s“)"
 
-#: apply.c:3229
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "неу�пешно прилагане на кръпка: „%s:%ld“"
 
-#: apply.c:3352
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "„%s“ не може да �е изтегли"
 
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 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“ не може да бъде прочетен"
 
-#: apply.c:3412
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "изчитане на „%s“ �лед про�лед�ване на �имволна връзка"
 
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "обектът � път „%s“ е преименуван или изтрит"
 
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "„%s“ не �ъще�твува в индек�а"
 
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr "„%s“ не �ъответ�тва на индек�а"
 
-#: apply.c:3571
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr "в хранилището лип�ват необходимите обекти-BLOB, за тройно �ливане."
 
-#: apply.c:3574
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Тройно �ливане…\n"
 
-#: apply.c:3590 apply.c:3594
+#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "текущото �ъдържание на „%s“ не може да бъде прочетено"
 
-#: apply.c:3606
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "�еу�пешно тройно �ливане…\n"
 
-#: apply.c:3620
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Конфликти при прилагането на кръпката към „%s“.\n"
 
-#: apply.c:3625
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Кръпката бе приложена чи�то към „%s“.\n"
 
-#: apply.c:3642
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Преминаване към пр�ко прилагане…\n"
 
-#: apply.c:3654
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "изтриващата кръпка о�тав� файла непразен"
 
-#: apply.c:3727
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "„%s“: неправилен вид"
 
-#: apply.c:3729
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "„%s“ е от вид „%o“, а �е очакваше „%o“"
 
-#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
-#: read-cache.c:1351
+#: 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:3952
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "„%s“: вече �ъще�твува в индек�а"
 
-#: apply.c:3956
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "„%s“: вече �ъще�твува в работното дърво"
 
-#: apply.c:3976
+#: apply.c:4000
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "новите права за до�тъп (%o) на „%s“ не �ъвпадат �ъ� �тарите (%o)"
 
-#: apply.c:3981
+#: 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:4001
+#: apply.c:4025
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "за�егнати�т файл „%s“ е �лед �имволна връзка"
 
-#: apply.c:4005
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "Кръпката „%s“ не може да бъде приложена"
 
-#: apply.c:4020
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Провер�ване на кръпката „%s“…"
 
-#: apply.c:4112
+#: apply.c:4136
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 "информаци�та за �умата по SHA1 за подмодула лип�ва или не е до�татъчна (%s)."
 
-#: apply.c:4119
+#: apply.c:4143
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "�м�на на режима на до�тъпа на „%s“, който не е в текущи� връх „HEAD“"
 
-#: apply.c:4122
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "информаци�та за �умата по SHA1 лип�ва или не е до�татъчна (%s)."
 
-#: apply.c:4131
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "„%s“ не може да �е добави към временни� индек�"
 
-#: apply.c:4141
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "временни�т индек� не може да �е запази в „%s“"
 
-#: apply.c:4279
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "„%s“ не може да �е извади от индек�а"
 
-#: apply.c:4313
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "повредена кръпка за модула „%s“"
 
-#: apply.c:4319
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr ""
 "не може да �е получи информаци� чрез „stat“ за ново�ъздадени� файл „%s“"
 
-#: apply.c:4327
+#: apply.c:4351
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "не може да �е за �ъздаде м��тото за �ъхранение на ново�ъздадени� файл „%s“"
 
-#: apply.c:4333 apply.c:4478
+#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "не може да �е добави запи� в кеша за „%s“"
 
-#: apply.c:4376 builtin/bisect--helper.c:523
+#: 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:4380
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "затвар�не на файла „%s“"
 
-#: apply.c:4450
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "файлът „%s“ не може да �е запише � режим на до�тъп „%o“"
 
-#: apply.c:4548
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Кръпката „%s“ бе приложена чи�то."
 
-#: apply.c:4556
+#: apply.c:4580
 msgid "internal error"
 msgstr "вътрешна грешка"
 
-#: apply.c:4559
+#: 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:4570
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
-msgstr "�ъкращаване на името на файла � отхвърлените парчета на „ %.*s.rej“"
+msgstr "�ъкращаване на името на файла � отхвърлените парчета на „%.*s.rej“"
 
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "„%s“ не може да бъде отворен"
 
-#: apply.c:4592
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "%d-то парче бе у�пешно приложено."
 
-#: apply.c:4596
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "%d-то парче бе отхвърлено."
 
-#: apply.c:4725
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Пропу�ната кръпка: „%s“"
 
-#: apply.c:4733
-msgid "unrecognized input"
-msgstr "непознат вход"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr ""
+"�а входа н�ма непразни кръпки (те �е приемат при опци� „--allow-empty“)"
 
-#: apply.c:4753
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "индек�ът не може да бъде запи�ан"
 
-#: apply.c:4910
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "кръпката „%s“ не може да бъде отворена: %s"
 
-#: apply.c:4937
+#: apply.c:4963
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
 msgstr[1] "пренебрегнати �а %d грешки в знаците за интервали"
 
-#: apply.c:4943 apply.c:4958
+#: 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:4951
+#: apply.c:4977
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1569,141 +1601,139 @@ msgstr[0] ""
 msgstr[1] ""
 "Добавени �а %d реда �лед корекци�та на грешките в знаците за интервали."
 
-#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
+#: 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:4995
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
 msgstr "без прилагане на промените напа�ващи на дадени� път"
 
-#: apply.c:4998
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "прилагане на промените напа�ващи на дадени� път"
 
-#: apply.c:5000 builtin/am.c:2317
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "БРОЙ"
 
-#: apply.c:5001
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
 
-#: apply.c:5004
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "игнориране на редовете добавени от тази кръпка"
 
-#: apply.c:5006
+#: apply.c:5032
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "извеждане на �тати�тика на промените без прилагане на кръпката"
 
-#: apply.c:5010
+#: apply.c:5036
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "извеждане на бро� на добавените и изтритите редове"
 
-#: apply.c:5012
+#: apply.c:5038
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "извеждане на �тати�тика на входните данни без прилагане на кръпката"
 
-#: apply.c:5014
+#: apply.c:5040
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "проверка дали кръпката може да �е приложи, без дей�твително прилагане"
 
-#: apply.c:5016
+#: apply.c:5042
 msgid "make sure the patch is applicable to the current index"
 msgstr "проверка дали кръпката може да бъде приложена към текущи� индек�"
 
-#: apply.c:5018
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "отбел�зване на новите файлове � „git add --intent-to-add“"
 
-#: apply.c:5020
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "прилагане на кръпката без пром�на на работното дърво"
 
-#: apply.c:5022
+#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
 msgstr "прилагане на кръпка, ко�то промен� и файлове извън работното дърво"
 
-#: apply.c:5025
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 "кръпката да бъде приложена.  Опци�та �е комбинира � „--check“/„--stat“/„--"
 "summary“"
 
-#: apply.c:5027
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr ""
 "пробване � тройно �ливане, ако това не �работи — �тандартно прилагане на "
 "кръпка"
 
-#: apply.c:5029
+#: apply.c:5055
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "�ъздаване на временен индек� на база на включената информаци� за индек�а"
 
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "раздел�не на пътищата � нулеви� знак „NUL“"
 
-#: apply.c:5034
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr "да �е о�игури контек�т от поне такъв БРОЙ �ъвпадащи редове"
 
-#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296
+#: 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:3831
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
 msgid "action"
 msgstr "дей�твие"
 
-#: apply.c:5036
+#: apply.c:5062
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "за�ичане на нови или променени редове � грешки в знаците за интервали"
 
-#: apply.c:5039 apply.c:5042
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 "игнориране на промените в знаците за интервали при откриване на контек�та"
 
-#: apply.c:5045
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "прилагане на кръпката в обратна по�ока"
 
-#: apply.c:5047
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "без изи�кване на дори и един ред контек�т"
 
-#: apply.c:5049
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "о�тав�не на отхвърлените парчета във файлове � разширение „.rej“"
 
-#: apply.c:5051
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "позвол�ване на за�тъпващи �е парчета"
 
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
-#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "повече подробно�ти"
-
-#: apply.c:5054
+#: apply.c:5080
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "пренебрегване на неправилно лип�ващ знак за нов ред в кра� на файл"
 
-#: apply.c:5057
+#: apply.c:5083
 msgid "do not trust the line counts in the hunk headers"
 msgstr "без довер�ване на номерата на редовете в заглавните ча�ти на парчетата"
 
-#: apply.c:5059 builtin/am.c:2305
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "��Ч�Л��_ДИРЕКТОРИЯ"
 
-#: apply.c:5060
+#: 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"
@@ -1714,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“ върна грешка"
@@ -1738,7 +1768,7 @@ msgstr "път�т не е правилно кодиран в UTF-8: %s"
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "твърде дълъг път (%d знака, SHA1: %s): %s"
 
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
 msgstr "грешка при декомпре�иране � „deflate“ (%d)"
@@ -1767,156 +1797,152 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote ХР��ИЛИЩЕ [--exec КОМ��Д�] --list"
 
-#: archive.c:188
-#, c-format
-msgid "cannot read %s"
-msgstr "обектът „%s“ не може да бъде прочетен"
-
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
-#: builtin/merge.c:1143
+#: 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 "файлът „%s“ не може да бъде прочетен"
 
-#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
+#: 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“ не �ъвпада � никой файл"
 
-#: archive.c:451
+#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "такъв указател н�ма: %.*s"
 
-#: archive.c:457
+#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "неправилно име на обект: „%s“"
 
-#: archive.c:470
+#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "не е обект-дърво: %s"
 
-#: archive.c:482
+#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "текущата работна директори� не е �ледена"
 
-#: archive.c:523
+#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Файлът „%s“ лип�ва"
 
-#: archive.c:525
+#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "„%s“ не е обикновен файл"
 
-#: archive.c:552
+#: archive.c:551
 msgid "fmt"
 msgstr "ФОРМ�Т"
 
-#: archive.c:552
+#: archive.c:551
 msgid "archive format"
 msgstr "ФОРМ�Т на архива"
 
-#: archive.c:553 builtin/log.c:1772
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "ПРЕФИКС"
 
-#: archive.c:554
+#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
 msgstr "добав�не на този ПРЕФИКС към в�еки път в архива"
 
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: 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: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 "Ф�ЙЛ"
 
-#: archive.c:556
+#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "добав�не на не�ледените файлове към архива"
 
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
 msgid "write the archive to this file"
 msgstr "запазване на архива в този Ф�ЙЛ"
 
-#: archive.c:561
+#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "изчитане на „.gitattributes“ в работната директори�"
 
-#: archive.c:562
+#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "извеждане на архивираните файлове на �тандартната грешка"
 
-#: archive.c:564
+#: archive.c:563
 msgid "set compression level"
 msgstr "задаване на нивото на компре�иране"
 
-#: archive.c:567
+#: archive.c:566
 msgid "list supported archive formats"
 msgstr "извеждане на �пи�ъка � поддържаните формати"
 
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "хранилище"
 
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "получаване на архива от отдалеченото ХР��ИЛИЩЕ"
 
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
 msgid "command"
 msgstr "команда"
 
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
 msgid "path to the remote git-upload-archive command"
 msgstr "път към отдалечената команда „git-upload-archive“"
 
-#: archive.c:579
+#: archive.c:578
 msgid "Unexpected option --remote"
 msgstr "�еочаквана опци� „--remote“"
 
-#: archive.c:581
-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:583
+#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "�еочаквана опци� „--output“"
 
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "опциите „--add-file“ и „--remote“ �а не�ъвме�тими"
-
-#: archive.c:607
+#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "�епознат формат на архив: „%s“"
 
-#: archive.c:616
+#: archive.c:615
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "�ргументът не �е поддържа за форма̀та „%s“: -%d"
 
-#: attr.c:202
+#: attr.c:203
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "„%.*s“ е неправилно име за атрибут"
 
-#: attr.c:363
+#: attr.c:364
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s: командата не е позволена: „%s:%d“"
 
-#: attr.c:403
+#: attr.c:404
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1924,22 +1950,22 @@ msgstr ""
 "Отрицателните шаблони �е игнорират в атрибутите на git.\n"
 "�ко ви тр�бва начална удивителна, ползвайте „\\!“."
 
-#: bisect.c:489
+#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "�еправилно цитирано �ъдържание във файла „%s“: %s"
 
-#: bisect.c:699
+#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Повече не може да �е тър�и двоично!\n"
 
-#: bisect.c:766
+#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "�еправилно име на подаване „%s“"
 
-#: bisect.c:791
+#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1948,7 +1974,7 @@ msgstr ""
 "�еправилна база за �ливане: %s.\n"
 "Следователно грешката е коригирана между „%s“ и [%s].\n"
 
-#: bisect.c:796
+#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1957,7 +1983,7 @@ msgstr ""
 "�ова база за �ливане: %s.\n"
 "Свой�твото е променено между „%s“ и [%s].\n"
 
-#: bisect.c:801
+#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1966,7 +1992,7 @@ msgstr ""
 "Базата за �ливане „%s“ е %s.\n"
 "Следователно първото %s подаване е между „%s“ и [%s].\n"
 
-#: bisect.c:809
+#: bisect.c:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1977,7 +2003,7 @@ msgstr ""
 "Двоичното тър�ене � git bisect н�ма да работи правилно.\n"
 "Дали не �те объркали указателите „%s“ и „%s“?\n"
 
-#: bisect.c:822
+#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1988,36 +2014,36 @@ msgstr ""
 "�е може да �ме �игурни, че първото %s подаване е между „%s“ и „%s“.\n"
 "Двоичното тър�ене продължава."
 
-#: bisect.c:861
+#: bisect.c:859
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Двоично тър�ене: тр�бва да �е провери база за �ливане\n"
 
-#: bisect.c:911
+#: bisect.c:909
 #, c-format
 msgid "a %s revision is needed"
 msgstr "необходима е вер�и� „%s“"
 
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
 #, c-format
 msgid "could not create file '%s'"
 msgstr "файлът „%s“ не може да бъде �ъздаден"
 
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: bisect.c:1027
+#: bisect.c:1025
 msgid "reading bisect refs failed"
 msgstr "неу�пешно прочитане на указателите за двоично тър�ене"
 
-#: bisect.c:1057
+#: bisect.c:1055
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "„%s“ e както „%s“, така и „%s“\n"
 
-#: bisect.c:1066
+#: bisect.c:1064
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -2026,7 +2052,7 @@ msgstr ""
 "Лип�ва подход�що за те�тване подаване.\n"
 "Проверете параметрите за пътищата.\n"
 
-#: bisect.c:1095
+#: bisect.c:1093
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -2036,7 +2062,7 @@ msgstr[1] "(приблизително %d �тъпки)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1101
+#: bisect.c:1099
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -2057,11 +2083,12 @@ msgstr ""
 "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изи�ква "
 "указването на крайно подаване"
 
-#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
-#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
-#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
-#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
+#: 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 "неу�пешно на�тройване на обхождането на вер�иите"
 
@@ -2082,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"
@@ -2195,154 +2218,155 @@ 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“ не е обновен"
 
-#: bundle.c:41
+#: bundle.c:44
 #, c-format
 msgid "unrecognized bundle hash algorithm: %s"
 msgstr "непознат алгоритъм за контролни �уми за пратки „%s“"
 
-#: bundle.c:45
+#: bundle.c:48
 #, c-format
 msgid "unknown capability '%s'"
 msgstr "непозната възможно�т „%s“"
 
-#: bundle.c:71
+#: bundle.c:74
 #, c-format
 msgid "'%s' does not look like a v2 or v3 bundle file"
 msgstr "Файлът „%s“ не изглежда да е пратка на git вер�и� 2 или 3"
 
-#: bundle.c:110
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "непозната заглавна ча�т: %s%s (%d)"
 
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: 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'"
 msgstr "„%s“ не може да �е отвори"
 
-#: bundle.c:189
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr "В хранилището лип�ват �ледните необходими подавани�:"
 
-#: bundle.c:192
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
 msgstr "за проверката на пратка е необходимо хранилище"
 
-#: bundle.c:243
+#: bundle.c:257
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "Пратката �ъдържа �ледни� указател:"
 msgstr[1] "Пратката �ъдържа �ледните %d указатели:"
 
-#: bundle.c:250
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "Пратката �ъдържа пълна и�тори�."
 
-#: bundle.c:252
+#: bundle.c:266
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Пратката изи�ква �ледни� указател:"
 msgstr[1] "Пратката изи�ква �ледните %d указатели:"
 
-#: bundle.c:319
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "неу�пешно дублиране на де�криптора на пратката � „dup“"
 
-#: bundle.c:326
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "Командата „git pack-objects“ не може да бъде �тартирана"
 
-#: bundle.c:337
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "Командата „git pack-objects“ не завърши у�пешно"
 
-#: bundle.c:386
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 "указател�т „%s“ не е бил включен поради опциите зададени на „git rev-list“"
 
-#: bundle.c:490
+#: bundle.c:504
 #, c-format
 msgid "unsupported bundle version %d"
 msgstr "неподдържана вер�и� на индек�а %d"
 
-#: bundle.c:492
+#: bundle.c:506
 #, c-format
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "пратка %d не може да �е запише � алгоритъм %s"
 
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "непознат аргумент: %s"
 
-#: bundle.c:539
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "Създаването на празна пратка е невъзможно."
 
-#: bundle.c:549
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "файлът „%s“ не може да бъде �ъздаден"
 
-#: bundle.c:574
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "командата „git index-pack“ не завърши у�пешно"
 
-#: chunk-format.c:113
+#: chunk-format.c:117
 msgid "terminating chunk id appears earlier than expected"
 msgstr "идентификаторът за краен откъ� �е �в�ва по-рано от очакваното"
 
-#: chunk-format.c:122
+#: chunk-format.c:126
 #, c-format
 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
 msgstr "неправилно отме�тване на откъ�/и %<PRIx64> и %<PRIx64>"
 
-#: chunk-format.c:129
+#: chunk-format.c:133
 #, c-format
 msgid "duplicate chunk ID %<PRIx32> found"
 msgstr "повтар�щ �е идентификатор на откъ� %<PRIx32>"
 
-#: chunk-format.c:143
+#: chunk-format.c:147
 #, c-format
 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"
 
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
 msgid "invalid hash version"
 msgstr "неправилна вер�и� на контролна �ума"
 
@@ -2388,197 +2412,197 @@ msgstr ""
 msgid "unable to find all commit-graph files"
 msgstr "н�кои файлове на гра̀фа � подавани�та не може да бъдат открити"
 
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 "неправилна позици� на подаването.  Веро�тно графът � подавани�та е повреден"
 
-#: commit-graph.c:766
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "подаването „%s“ не може да бъде открито"
 
-#: commit-graph.c:799
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr ""
 "графът � подавани�та изи�ква генериране на данни за отме�тването, но такива "
 "лип�ват"
 
-#: commit-graph.c:1075 builtin/am.c:1340
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "подаването не може да бъде анализирано: %s"
 
-#: commit-graph.c:1337 builtin/pack-objects.c:2897
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "видът на обекта „%s“ не може да бъде определен"
 
-#: commit-graph.c:1368
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "Зареждане на познатите подавани� в гра̀фа � подавани�та"
 
-#: commit-graph.c:1385
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr "Разшир�ване на до�тижимите подавани� в гра̀фа"
 
-#: commit-graph.c:1405
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr "Изчи�тване на отбел�звани�та на подавани�та в гра̀фа � подавани�та"
 
-#: commit-graph.c:1424
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "Изчи�л�ване на топологичните нива в гра̀фа � подавани�та"
 
-#: commit-graph.c:1477
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr "Изчи�л�ване на номерата на поколени�та в гра̀фа � подавани�та"
 
-#: commit-graph.c:1558
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr "Изчи�л�ване на филтрите на Блум на пътищата � пром�на при подаването"
 
-#: commit-graph.c:1635
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "Събиране на �вързаните подавани�"
 
-#: commit-graph.c:1660
+#: 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:1673
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "грешка при добав�не на пакетен файл „%s“"
 
-#: commit-graph.c:1677
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "грешка при отвар�не на индек�а на „%s“"
 
-#: commit-graph.c:1714
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr "Откриване на подавани�та в гра̀фа измежду пакетираните обекти"
 
-#: commit-graph.c:1732
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr "Откриване на още върхове в гра̀фа � подавани�та"
 
-#: commit-graph.c:1781
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr "правилни�т брой на базовите идентификатори не може да �е запише"
 
-#: commit-graph.c:1812 midx.c:906
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "родител�ките директории на „%s“ не може да бъдат �ъздадени"
 
-#: commit-graph.c:1825
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "не може да бъде �ъздаден временен �лой за гра̀фа � подавани�та"
 
-#: commit-graph.c:1830
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "правата за �поделен до�тъп до „%s“ не може да бъдат зададени"
 
-#: commit-graph.c:1887
+#: 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:1923
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr "файлът � веригата на гра̀фа � подавани�та не може да �е отвори"
 
-#: commit-graph.c:1939
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr "о�новни�т файл на гра̀фа � подавани�та не може да бъде преименуван"
 
-#: commit-graph.c:1959
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr "временни�т файл на гра̀фа � подавани�та не може да бъде преименуван"
 
-#: commit-graph.c:2092
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "Тър�ене на подавани�та �ъ� �ливани�"
 
-#: commit-graph.c:2136
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "Сливане на гра̀фа � подавани�та"
 
-#: commit-graph.c:2244
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
 "опит за запи� на гра̀фа � подавани�та, но на�тройката „core.commitGraph“ е "
 "изключена"
 
-#: commit-graph.c:2351
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr "прекалено много подавани� за запи�ване на гра̀фа"
 
-#: commit-graph.c:2450
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr "графът � подавани�та е � грешна �ума за проверка — веро�тно е повреден"
 
-#: commit-graph.c:2460
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr ""
 "неправилна подредба на обектите по идентификатор в гра̀фа � подавани�та: „%s“ "
 "е преди „%s“, а не тр�бва"
 
-#: commit-graph.c:2470 commit-graph.c:2485
+#: 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:2477
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "подаване „%s“ в гра̀фа � подавани�та не може да �е анализира"
 
-#: commit-graph.c:2495
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "Проверка на подавани�та в гра̀фа"
 
-#: commit-graph.c:2510
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "подаване „%s“ в базата от данни към гра̀фа � подавани�та не може да �е "
 "анализира"
 
-#: commit-graph.c:2517
+#: 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:2527
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "�пи�ъкът � родители на „%s“ в гра̀фа � подавани�та е прекалено дълъг"
 
-#: commit-graph.c:2536
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "родител�т на „%s“ в гра̀фа � подавани�та е „%s“, а тр�бва да е „%s“"
 
-#: commit-graph.c:2550
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "�пи�ъкът � родители на „%s“ в гра̀фа � подавани�та е прекалено къ�"
 
-#: commit-graph.c:2555
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2586,7 +2610,7 @@ msgstr ""
 "номерът на поколението на подаване „%s“ в гра̀фа � подавани�та е 0, а другаде "
 "не е"
 
-#: commit-graph.c:2559
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2594,32 +2618,32 @@ msgstr ""
 "номерът на поколението на подаване „%s“ в гра̀фа � подавани�та не е 0, а "
 "другаде е"
 
-#: commit-graph.c:2576
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr ""
 "номерът на поколението на подаване „%s“ в гра̀фа � подавани�та е %<PRIuMAX> < "
 "%<PRIuMAX>"
 
-#: commit-graph.c:2582
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 "датата на подаване на „%s“ в гра̀фа � подавани�та е %<PRIuMAX>, а тр�бва да е "
 "%<PRIuMAX>"
 
-#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
-#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 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“ не може да �е анализира"
 
-#: commit.c:54
+#: commit.c:55
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s не е подаване!"
 
-#: commit.c:194
+#: commit.c:196
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -2642,29 +2666,29 @@ msgstr ""
 "\n"
 "    git config advice.graftFileDeprecated false"
 
-#: commit.c:1237
+#: commit.c:1241
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "Подаването „%s“ е � недоверен подпи� от GPG, който твърди, че е на „%s“."
 
-#: commit.c:1241
+#: commit.c:1245
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 "Подаването „%s“ е � неправилен подпи� от GPG, който твърди, че е на „%s“."
 
-#: commit.c:1244
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Подаването „%s“ е без подпи� от GPG."
 
-#: commit.c:1247
+#: commit.c:1251
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Подаването „%s“ е � коректен подпи� от GPG на „%s“.\n"
 
-#: commit.c:1501
+#: 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"
@@ -2678,7 +2702,7 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "паметта �върши"
 
-#: config.c:126
+#: config.c:125
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -2693,35 +2717,35 @@ msgstr ""
 "    %s\n"
 "Това може да �е дължи на зацикл�не при вмъкването."
 
-#: config.c:142
+#: config.c:141
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "път�т за вмъкване „%s“не може да бъде разширен"
 
-#: config.c:153
+#: config.c:152
 msgid "relative config includes must come from files"
 msgstr "отно�ителните вмъквани� на конфигурации тр�бва да идват от файлове"
 
-#: config.c:199
+#: config.c:201
 msgid "relative config include conditionals must come from files"
 msgstr "отно�ителните у�ловни изрази за вмъкване тр�бва да идват от файлове"
 
-#: config.c:396
+#: config.c:398
 #, c-format
 msgid "invalid config format: %s"
 msgstr "неправилен формат на на�тройка: %s"
 
-#: config.c:400
+#: config.c:402
 #, c-format
 msgid "missing environment variable name for configuration '%.*s'"
 msgstr "лип�ва име на променлива на �редата за на�тройката „%.*s“"
 
-#: config.c:405
+#: config.c:407
 #, c-format
 msgid "missing environment variable '%s' for configuration '%.*s'"
 msgstr "лип�ва променлива на �редата „%s“ за на�тройката „%.*s“"
 
-#: config.c:442
+#: config.c:443
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "ключът не �ъдържа раздел: „%s“"
@@ -2731,168 +2755,168 @@ msgstr "ключът не �ъдържа раздел: „%s“"
 msgid "key does not contain variable name: %s"
 msgstr "ключът не �ъдържа име на променлива: „%s“"
 
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "неправилен ключ: „%s“"
 
-#: config.c:478
+#: config.c:475
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "неправилен ключ (нов ред): „%s“"
 
-#: config.c:511
+#: config.c:495
 msgid "empty config key"
 msgstr "празен ключ за на�тройка"
 
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "неправилен конфигурационен параметър: „%s“"
 
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
 #, c-format
 msgid "bogus format in %s"
 msgstr "неправилен формат в „%s“"
 
-#: config.c:622
+#: config.c:606
 #, c-format
 msgid "bogus count in %s"
 msgstr "неправилен брой в „%s“"
 
-#: config.c:626
+#: config.c:610
 #, c-format
 msgid "too many entries in %s"
 msgstr "прекалено много запи�и в „%s“"
 
-#: config.c:636
+#: config.c:620
 #, c-format
 msgid "missing config key %s"
 msgstr "ключът за на�тройка „%s“ лип�ва"
 
-#: config.c:644
+#: config.c:628
 #, c-format
 msgid "missing config value %s"
 msgstr "�тойно�тта за на�тройка „%s“ лип�ва"
 
-#: config.c:995
+#: config.c:979
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "неправилен ред за на�тройки %d в BLOB „%s“"
 
-#: config.c:999
+#: config.c:983
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "неправилен ред за на�тройки %d във файла „%s“"
 
-#: config.c:1003
+#: config.c:987
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "неправилен ред за на�тройки %d на �тандартни� вход"
 
-#: config.c:1007
+#: config.c:991
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "неправилен ред за на�тройки %d в BLOB за подмодул „%s“"
 
-#: config.c:1011
+#: config.c:995
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "неправилен ред за на�тройки %d на командни� ред „%s“"
 
-#: config.c:1015
+#: config.c:999
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "неправилен ред за на�тройки %d в „%s“"
 
-#: config.c:1152
+#: config.c:1136
 msgid "out of range"
 msgstr "извън диапазона"
 
-#: config.c:1152
+#: config.c:1136
 msgid "invalid unit"
 msgstr "неправилна мерна единица"
 
-#: config.c:1153
+#: config.c:1137
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“: %s"
 
-#: config.c:1163
+#: config.c:1147
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ в BLOB „%s“: %s"
 
-#: config.c:1166
+#: config.c:1150
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ във файла „%s“: %s"
 
-#: config.c:1169
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ на �тандартни� вход: %s"
 
-#: config.c:1172
+#: config.c:1156
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ в BLOB от подмодул „%s“: %s"
 
-#: config.c:1175
+#: config.c:1159
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ на командни� ред „%s“: %s"
 
-#: config.c:1178
+#: config.c:1162
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ в %s: %s"
 
-#: config.c:1257
+#: config.c:1241
 #, c-format
 msgid "bad boolean config value '%s' for '%s'"
 msgstr "неправилна булева �тойно�т „%s“ за „%s“"
 
-#: config.c:1275
+#: config.c:1259
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "домашната папка на потребител� не може да бъде открита: „%s“"
 
-#: config.c:1284
+#: config.c:1268
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "„%s“ не е правилна �тойно�т за време за „%s“"
 
-#: config.c:1377
+#: config.c:1361
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "дължината на �ъкращаване е извън интервала ([4; 40]): %d"
 
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "неправилно ниво на компре�иране: %d"
 
-#: config.c:1494
+#: config.c:1476
 msgid "core.commentChar should only be one character"
 msgstr "на�тройката „core.commentChar“ тр�бва да е �амо един знак"
 
-#: config.c:1527
+#: config.c:1509
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "неправилен режим за �ъздаването на обекти: %s"
 
-#: config.c:1599
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "неправилна �тойно�т за „%s“"
 
-#: config.c:1625
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "неправилна �тойно�т за „%s“: „%s“"
 
-#: config.c:1626
+#: config.c:1611
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 "тр�бва да е една от �ледните �тойно�ти: „nothing“ (без изтла�кване при лип�а "
@@ -2900,132 +2924,132 @@ msgstr ""
 "„simple“ (клонът �ъ� �ъщото име, от който �е издърпва), „upstream“ (клонът, "
 "от който �е издърпва) или „current“ (клонът �ъ� �ъщото име)"
 
-#: config.c:1687 builtin/pack-objects.c:3924
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "неправилно ниво на компре�иране при пакетиране: %d"
 
-#: config.c:1809
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "обектът-BLOB „%s“ � конфигурации не може да �е зареди"
 
-#: config.c:1812
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "указател�т „%s“ не �очи към обект-BLOB"
 
-#: config.c:1829
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "обектът-BLOB „%s“ � конфигурации не може да бъде открит"
 
-#: config.c:1873
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "„%s“ не може да бъде анализиран"
 
-#: config.c:1929
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr "неправилни на�тройки от командни� ред"
 
-#: config.c:2293
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
 
-#: config.c:2467
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "�еправилен %s: „%s“"
 
-#: config.c:2512
+#: config.c:2504
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "�тойно�тта на „splitIndex.maxPercentChange“ тр�бва да е между 1 и 100, а не "
 "%d"
 
-#: config.c:2558
+#: config.c:2550
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "неразпозната �тойно�т „%s“ от командни� ред"
 
-#: config.c:2560
+#: config.c:2552
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "неправилна на�тройка „%s“ във файла „%s“ на ред №%d"
 
-#: config.c:2644
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "неправилно име на раздел: „%s“"
 
-#: config.c:2676
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "зададени �а н�колко �тойно�ти за „%s“"
 
-#: config.c:2705
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "нови�т конфигурационен файл „%s“ не може да бъде запазен"
 
-#: config.c:2957 config.c:3283
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "конфигурационни�т файл „%s“ не може да бъде заключен"
 
-#: config.c:2968
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "отвар�не на „%s“"
 
-#: config.c:3005 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "неправилен шаблон: %s"
 
-#: config.c:3030
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "неправилен конфигурационен файл: „%s“"
 
-#: config.c:3043 config.c:3296
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "неу�пешно изпълнение на „fstat“ върху „%s“"
 
-#: config.c:3054
+#: config.c:3047
 #, c-format
-msgid "unable to mmap '%s'"
-msgstr "неу�пешно изпълнение на „mmap“ върху „%s“"
+msgid "unable to mmap '%s'%s"
+msgstr "неу�пешно изпълнение на „mmap“ върху „%s“%s"
 
-#: config.c:3063 config.c:3301
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "неу�пешна �м�на на права � „chmod“ върху „%s“"
 
-#: config.c:3148 config.c:3398
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "конфигурационни�т файл „%s“ не може да бъде запи�ан"
 
-#: config.c:3182
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "„%s“ не може да �е зададе да е „%s“"
 
-#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: 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:3274
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "неправилно име на раздел: %s"
 
-#: config.c:3441
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "лип�ва �тойно�т за „%s“"
@@ -3061,72 +3085,72 @@ msgid "expected flush after capabilities"
 msgstr ""
 "�лед първоначалната об�ва на възможно�тите �е очаква изчи�тване на буферите"
 
-#: connect.c:263
+#: connect.c:265
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "пропу�кане на възможно�тите �лед първи� ред „%s“"
 
-#: connect.c:284
+#: connect.c:286
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "протоколна грешка: неочаквани възможно�ти^{}"
 
-#: connect.c:306
+#: connect.c:308
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "протоколна грешка: очаква �е SHA1 на плитък обект, а бе получено: „%s“"
 
-#: connect.c:308
+#: connect.c:310
 msgid "repository on the other end cannot be shallow"
 msgstr "от�рещното хранилище не може да е плитко"
 
-#: connect.c:347
+#: connect.c:349
 msgid "invalid packet"
 msgstr "неправилен пакет"
 
-#: connect.c:367
+#: connect.c:369
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "протоколна грешка: неочаквано „%s“"
 
-#: connect.c:497
+#: connect.c:499
 #, c-format
 msgid "unknown object format '%s' specified by server"
 msgstr "�ървърът указа непознат формат на обект: „%s“"
 
-#: connect.c:526
+#: connect.c:528
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "неправилен отговор на „ls-refs“: „%s“"
 
-#: connect.c:530
+#: connect.c:532
 msgid "expected flush after ref listing"
 msgstr "�лед избро�ването на указателите �е очаква изчи�тване на буферите"
 
-#: connect.c:533
+#: connect.c:535
 msgid "expected response end packet after ref listing"
 msgstr "�лед избро�ването на указателите �е очаква пакет за край"
 
-#: connect.c:666
+#: connect.c:670
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "протокол „%s“ не �е поддържа"
 
-#: connect.c:717
+#: connect.c:721
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "неу�пешно задаване на „SO_KEEPALIVE“ на гнездо"
 
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
 #, c-format
 msgid "Looking up %s ... "
 msgstr "Тър�ене на „%s“… "
 
-#: connect.c:761
+#: connect.c:765
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "„%s“ (порт %s) не може да �е открие („%s“)"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
 #, c-format
 msgid ""
 "done.\n"
@@ -3135,7 +3159,7 @@ msgstr ""
 "готово.\n"
 "Свързване към „%s“ (порт %s)…"
 
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -3145,90 +3169,90 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
 msgid "done."
 msgstr "дей�твието завърши."
 
-#: connect.c:824
+#: connect.c:828
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "„%s“ не може да �е открие (%s)"
 
-#: connect.c:830
+#: connect.c:834
 #, c-format
 msgid "unknown port %s"
 msgstr "непознат порт „%s“"
 
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "необичайното име на хо�т „%s“ е блокирано"
 
-#: connect.c:969
+#: connect.c:973
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "необичайни�т порт „%s“ е блокиран"
 
-#: connect.c:979
+#: connect.c:983
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "по�редникът „%s“ не може да �е �тартира"
 
-#: connect.c:1050
+#: connect.c:1054
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 "не е указан път. Проверете �интак�и�а � командата:\n"
 "\n"
 "    git help pull"
 
-#: connect.c:1190
+#: connect.c:1194
 msgid "newline is forbidden in git:// hosts and repo paths"
 msgstr ""
 "знакът за нов ред не е позволен в адре�ите и в пътищата до хранилищата "
 "„git://“"
 
-#: connect.c:1247
+#: connect.c:1251
 msgid "ssh variant 'simple' does not support -4"
 msgstr "вариантът за „ssh“ — „simple“ (опро�тен), не поддържа опци�та „-4“"
 
-#: connect.c:1259
+#: connect.c:1263
 msgid "ssh variant 'simple' does not support -6"
 msgstr "вариантът за „ssh“ — „simple“ (опро�тен), не поддържа опци�та „-6“"
 
-#: connect.c:1276
+#: connect.c:1280
 msgid "ssh variant 'simple' does not support setting port"
 msgstr ""
 "вариантът за „ssh“ — „simple“ (опро�тен), не поддържа задаването на порт"
 
-#: connect.c:1388
+#: connect.c:1392
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "необичайни�т път „%s“ е блокиран"
 
-#: connect.c:1436
+#: connect.c:1440
 msgid "unable to fork"
 msgstr "неу�пешно �ъздаване на проце�"
 
-#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "Проверка на �вързано�тта"
 
-#: connected.c:120
+#: connected.c:122
 msgid "Could not run 'git rev-list'"
 msgstr "Командата „git rev-list“ не може да бъде изпълнена."
 
-#: connected.c:144
+#: connected.c:146
 msgid "failed write to rev-list"
 msgstr "неу�пешен запи� на �пи�ъка � вер�иите"
 
-#: connected.c:149
+#: connected.c:151
 msgid "failed to close rev-list's stdin"
 msgstr "�тандартни�т вход на �пи�ъка � вер�иите не може да бъде затворен"
 
 #: convert.c:183
 #, c-format
 msgid "illegal crlf_action %d"
-msgstr "неправилно дей�твие за край на ред: %d"
+msgstr "неправилно дей�твие за край на ред (crlf_action): %d"
 
 #: convert.c:196
 #, c-format
@@ -3338,7 +3362,7 @@ msgstr "неочакван вид филтър"
 msgid "path name too long for external filter"
 msgstr "път�т е прекалено дълъг за външен филтър"
 
-#: convert.c:934
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -3347,17 +3371,17 @@ msgstr ""
 "външни�т филтър „%s“ вече не е наличен, въпреки че не в�ички пътища �а "
 "филтрирани"
 
-#: convert.c:1234
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr ""
 "„true“/„false“ (и�тина/лъжа̀) не може да �а кодирани� на работното дърво"
 
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: неу�пешно изпълнение на декодиращ филтър „%s“"
 
-#: convert.c:1490
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: неу�пешно изпълнение на кодиращ филтър „%s“"
@@ -3375,17 +3399,17 @@ msgstr "адре�ът тр�бва задължително да �ъдържа
 msgid "refusing to work with credential missing protocol field"
 msgstr "адре�ът тр�бва задължително да �ъдържа протокол"
 
-#: credential.c:394
+#: credential.c:395
 #, c-format
 msgid "url contains a newline in its %s component: %s"
 msgstr "адре�ът �ъдържа нов ред в ча�тта за %s: %s"
 
-#: credential.c:438
+#: credential.c:439
 #, c-format
 msgid "url has no scheme: %s"
 msgstr "адре�ът е без �хема: %s"
 
-#: credential.c:511
+#: credential.c:512
 #, c-format
 msgid "credential url cannot be parsed: %s"
 msgstr "адре�ът за идентификаци� не може да �е анализира: „%s“"
@@ -3484,36 +3508,36 @@ msgstr ""
 msgid "Marked %d islands, done.\n"
 msgstr "Отбел�зани �а %d групи, работата приключи.\n"
 
-#: diff-merges.c:80
+#: diff-merges.c:70
 #, c-format
 msgid "unknown value for --diff-merges: %s"
 msgstr "непозната �тойно�т за опци�та „--diff-merges“: „%s“"
 
-#: diff-lib.c:538
+#: diff-lib.c:561
 msgid "--merge-base does not work with ranges"
 msgstr "опци�та „--merge-base“ не работи � диапазони"
 
-#: diff-lib.c:540
+#: diff-lib.c:563
 msgid "--merge-base only works with commits"
 msgstr "опци�та „--merge-base“ работи �амо � подавани�"
 
-#: diff-lib.c:557
+#: diff-lib.c:580
 msgid "unable to get HEAD"
 msgstr "Указател�т „HEAD“ не може да бъде получен"
 
-#: diff-lib.c:564
+#: diff-lib.c:587
 msgid "no merge base found"
 msgstr "лип�ва база за �ливане"
 
-#: diff-lib.c:566
+#: diff-lib.c:589
 msgid "multiple merge bases found"
 msgstr "много бази за �ливане"
 
-#: diff-no-index.c:238
+#: diff-no-index.c:237
 msgid "git diff --no-index [<options>] <path> <path>"
 msgstr "git diff --no-index [ОПЦИЯ…] ПЪТ ПЪТ"
 
-#: diff-no-index.c:263
+#: diff-no-index.c:262
 msgid ""
 "Not a git repository. Use --no-index to compare two paths outside a working "
 "tree"
@@ -3521,28 +3545,28 @@ msgstr ""
 "�е е хранилище на git.  Ползвайте опци�та „--no-index“, за да �равните "
 "пътища извън работно дърво"
 
-#: diff.c:156
+#: diff.c:158
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 "  �еу�пешно разпознаване на „%s“ като процент-праг за �тати�тиката по "
 "директории\n"
 
-#: diff.c:161
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  �епознат параметър „%s“ за �тати�тиката по директории'\n"
 
-#: diff.c:297
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
 msgstr ""
 "на�тройката за цв�т за преме�тване тр�бва да е една от: „no“ (без), "
-"„default“ (�тандартно), „blocks“ (парчета), „zebra“ (райе), "
-"„dimmed_zebra“ (тъмно райе), „plain“ (обикновено)"
+"„default“ (�тандартно), „blocks“ (парчета), „zebra“ (райе), „dimmed-"
+"zebra“ (тъмно райе), „plain“ (обикновено)"
 
-#: diff.c:325
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3555,7 +3579,7 @@ msgstr ""
 "„allow-indentation-change“ (позвол�ване на промените в празните знаци за "
 "форматиране)"
 
-#: diff.c:333
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3563,12 +3587,12 @@ msgstr ""
 "„color-moved-ws“: „allow-indentation-change“ е не�ъвме�тима � другите режими "
 "за празни знаци"
 
-#: diff.c:410
+#: diff.c:412
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "�епозната �тойно�т „%s“ за на�тройката „diff.submodule“"
 
-#: diff.c:470
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3577,38 +3601,49 @@ msgstr ""
 "Грешки в на�тройката „diff.dirstat“:\n"
 "%s"
 
-#: diff.c:4278
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 "външната програма за разлики завърши неу�пешно.  Спиране на работата при „%s“"
 
-#: diff.c:4630
-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: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:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "опциите „%s“ и „%s“ �а не�ъвме�тими, използвайте „%s“ � „%s“"
 
-#: diff.c:4633
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "опциите „-G“, „-S“ и „--find-object“ �а не�ъвме�тими една � друга"
+#: diff.c:4601
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr "опциите „%s“ и „%s“ �а не�ъвме�тими, използвайте „%s“ � „%s“ и „%s“"
 
-#: diff.c:4712
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "опци�та „--follow“ изи�ква точно един път"
 
-#: diff.c:4760
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "неправилна �тойно�т за „--stat“: %s"
 
-#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: 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:4797
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3617,44 +3652,44 @@ msgstr ""
 "�еразпознат параметър към опци�та „--dirstat/-X“:\n"
 "%s"
 
-#: diff.c:4882
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "непознат вид пром�на: „%c“ в „--diff-filter=%s“"
 
-#: diff.c:4906
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "непозната �тойно�т �лед „ws-error-highlight=%.*s“"
 
-#: diff.c:4920
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "„%s“ не може да �е открие"
 
-#: diff.c:4970 diff.c:4976
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr ""
 "опци�та „%s“ изи�ква �тойно�ти за МИ�ИМ�ЛЕ�_%%_ПРОМЯ��_З�_ИЗТОЧ�ИК_/"
 "М�КСИМ�ЛЕ�_%%_ПРОМЯ��_З�_З�МЯ�� от"
 
-#: diff.c:4988
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "опци�та „%s“ изи�ква знак, а не: „%s“"
 
-#: diff.c:5009
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "неправилен аргумент за „--color-moved“: „%s“"
 
-#: diff.c:5028
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "неправилен режим „%s“ за „ --color-moved-ws“"
 
-#: diff.c:5068
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -3663,158 +3698,158 @@ msgstr ""
 "Майер�), „minimal“ (минимизиране на разликите), „patience“ (па�иан�) и "
 "„histogram“ (хи�тограмен)"
 
-#: diff.c:5104 diff.c:5124
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "неправилен аргумент към „%s“"
 
-#: diff.c:5228
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "неправилен регул�рен израз подаден към „-I“: „%s“"
 
-#: diff.c:5277
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "неразпознат параметър към опци�та „--submodule“: „%s“"
 
-#: diff.c:5333
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "неправилен аргумент към „--word-diff“: „%s“"
 
-#: diff.c:5369
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "Формат на изхода за разликите"
 
-#: diff.c:5371 diff.c:5377
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "�ъздаване на кръпки"
 
-#: diff.c:5374 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "без извеждане на разликите"
 
-#: diff.c:5379 diff.c:5493 diff.c:5500
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "БРОЙ"
 
-#: diff.c:5380 diff.c:5383
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "файловете � разлики да �а � контек�т � такъв БРОЙ редове"
 
-#: diff.c:5385
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "файловете � разлики да �а в �уров формат"
 
-#: diff.c:5388
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
-msgstr "п�евдоним на „-p --stat“"
+msgstr "п�евдоним на „-p --raw“"
 
-#: diff.c:5392
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "п�евдоним на „-p --stat“"
 
-#: diff.c:5396
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "„--stat“ във формат за четене от програма"
 
-#: diff.c:5399
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "извеждане �амо на по�ледни� ред на „--stat“"
 
-#: diff.c:5401 diff.c:5409
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "П�Р�МЕТЪР_1, П�Р�МЕТЪР_2, …"
 
-#: diff.c:5402
+#: diff.c:5371
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "извеждане на разпределението на промените за в��ка поддиректори�"
 
-#: diff.c:5406
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "п�евдоним на „--dirstat=cumulative“"
 
-#: diff.c:5410
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "п�евдоним на „--dirstat=Ф�ЙЛОВЕ,П�Р�МЕТЪР_1,П�Р�МЕТЪР_2,…“"
+msgstr "п�евдоним на „--dirstat=Ф�ЙЛ…,П�Р�МЕТЪР_1,П�Р�МЕТЪР_2,…“"
 
-#: diff.c:5414
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "предупреждаване, ако промените вод�т до маркери за конфликт или грешки в "
 "празните знаци"
 
-#: diff.c:5417
+#: diff.c:5386
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "�ъкратено резюме на �ъздадените, преименуваните и файловете � пром�на на "
 "режима на до�тъп"
 
-#: diff.c:5420
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "извеждане �амо на имената на променените файлове"
 
-#: diff.c:5423
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "извеждане �амо на имената и �тати�тиката за променените файлове"
 
-#: diff.c:5425
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "ШИРОЧИ��[,ИМЕ-ШИРОЧИ��[,БРОЙ]]"
 
-#: diff.c:5426
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "извеждане на �тати�тика за промените"
 
-#: diff.c:5428 diff.c:5431 diff.c:5434
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "ШИРОЧИ��"
 
-#: diff.c:5429
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "�тати�тика � такава ШИРОЧИ�� за промените"
 
-#: diff.c:5432
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "�тати�тика за промените � такава ШИРОЧИ�� на имената"
 
-#: diff.c:5435
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "�тати�тика за промените � такава ШИРОЧИ�� на гра̀фа"
 
-#: diff.c:5437
+#: diff.c:5406
 msgid "<count>"
 msgstr "БРОЙ"
 
-#: diff.c:5438
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "ограничаване на БРО� на редовете в �тати�тиката за промените"
 
-#: diff.c:5441
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "кратко резюме в �тати�тиката за промените"
 
-#: diff.c:5444
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "извеждане на двоична разлика във вид за прилагане"
 
-#: diff.c:5447
+#: diff.c:5416
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 "показване на пълните имена на обекти в редовете за индек�а при вариантите "
 "преди и �лед пром�ната"
 
-#: diff.c:5449
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "разлики в цв�т"
 
-#: diff.c:5450
+#: diff.c:5419
 msgid "<kind>"
 msgstr "ВИД"
 
-#: diff.c:5451
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -3822,7 +3857,7 @@ msgstr ""
 "грешките в празните знаци да �е указват в редовете за контек�та, вариантите "
 "преди и �лед разликата,"
 
-#: diff.c:5454
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3830,261 +3865,261 @@ msgstr ""
 "без преименуване на пътищата.  Да �е използват нулеви байтове за разделители "
 "на полета в изхода при ползване на опци�та „--raw“ или „--numstat“"
 
-#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "ПРЕФИКС"
 
-#: diff.c:5458
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "префик� вме�то „a/“ за източник"
 
-#: diff.c:5461
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "префик� вме�то „b/“ за цел"
 
-#: diff.c:5464
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr "добав�не на допълнителен префик� за в�еки ред на изхода"
 
-#: diff.c:5467
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "без префик� за източника и целта"
 
-#: diff.c:5470
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "извеждане на контек�т между по�ледователните парчета � разлики от указани� "
 "БРОЙ редове"
 
-#: diff.c:5474 diff.c:5479 diff.c:5484
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "З��К"
 
-#: diff.c:5475
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "знак вме�то „+“ за нов вариант на ред"
 
-#: diff.c:5480
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "знак вме�то „-“ за �тар вариант на ред"
 
-#: diff.c:5485
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "знак вме�то „ “ за контек�т"
 
-#: diff.c:5488
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "�а�тройки за разлики � преименуване"
 
-#: diff.c:5489
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "МИ�ИМ�ЛЕ�_%_ПРОМЯ��_З�_ИЗТОЧ�ИК[/М�КСИМ�ЛE�_%_ПРОМЯ��_З�_З�МЯ��]"
 
-#: diff.c:5490
+#: diff.c:5459
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 "заме�тване на пълните промени � по�ледователно�т от изтриване и �ъздаване"
 
-#: diff.c:5494
+#: diff.c:5463
 msgid "detect renames"
 msgstr "за�ичане на преименувани�та"
 
-#: diff.c:5498
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "без предварителен вариант при изтриване"
 
-#: diff.c:5501
+#: diff.c:5470
 msgid "detect copies"
 msgstr "за�ичане на копирани�та"
 
-#: diff.c:5505
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
 msgstr "тър�ене на копирано и от непроменените файлове"
 
-#: diff.c:5507
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "без тър�ене на преименувани�"
 
-#: diff.c:5510
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "празни обекти като източник при преименувани�"
 
-#: diff.c:5512
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr ""
 "продължаване на извеждането на и�тори�та — без отр�зването при преименувани� "
 "на файл"
 
-#: diff.c:5515
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr ""
 "без за�ичане на преименувани�/копирани�, ако бро�т им надвишава тази �тойно�т"
 
-#: diff.c:5517
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Опции към алгоритъма за разлики"
 
-#: diff.c:5519
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "тър�ене на възможно най-малка разлика"
 
-#: diff.c:5522
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "без промени в празните знаци при �равн�ване на редове"
 
-#: diff.c:5525
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "без промени в празните знаци"
 
-#: diff.c:5528
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "без промени в празните знаци в кра� на редовете"
 
-#: diff.c:5531
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "без промени в знаците за край на ред"
 
-#: diff.c:5534
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "без промени в редовете, които �а изц�ло от празни знаци"
 
-#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "РЕГУЛЯРЕ�_ИЗР�З"
 
-#: diff.c:5537
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr "без промени в редовете, които напа�ват РЕГУЛЯР�и�_ИЗР�З"
 
-#: diff.c:5540
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 "еври�тика за преме�тване на границите на парчетата за уле�н�ване на четенето"
 
-#: diff.c:5543
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "разлика чрез алгоритъм за подредба като па�иан�"
 
-#: diff.c:5547
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "разлика по хи�тограмни� алгоритъм"
 
-#: diff.c:5549
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "�ЛГОРИТЪМ"
 
-#: diff.c:5550
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "избор на �ЛГОРИТЪМа за разлики"
 
-#: diff.c:5552
+#: diff.c:5521
 msgid "<text>"
 msgstr "ТЕКСТ"
 
-#: diff.c:5553
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "разлика чрез алгоритъма �ъ� закотв�не"
 
-#: diff.c:5555 diff.c:5564 diff.c:5567
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "РЕЖИМ"
 
-#: diff.c:5556
+#: diff.c:5525
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 "разлика по думи, като �е ползва този РЕЖИМ за отдел�нето на променените думи"
 
-#: diff.c:5559
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr "РЕГУЛЯРЕ�_ИЗР�З за раздел�не по думи"
 
-#: diff.c:5562
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "п�евдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕ�_ИЗР�З“"
 
-#: diff.c:5565
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "различен цв�т за извеждане на преме�тените редове"
 
-#: diff.c:5568
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr ""
 "режим за пре�качането на празните знаци при задаването на „--color-moved“"
 
-#: diff.c:5571
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Други опции за разлики"
 
-#: diff.c:5573
+#: diff.c:5542
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "при изпълнение от поддиректори� да �е пренебрегват разликите извън не� и да "
 "�е ползват отно�ителни пътища"
 
-#: diff.c:5577
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "обработка на в�ички файлове като тек�тови"
 
-#: diff.c:5579
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "разм�на на двата входа — обръщане на разликата"
 
-#: diff.c:5581
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr ""
 "завършване � код за �ъ�то�ние 1 при наличието на разлики, а в противен "
 "�лучай — � 0"
 
-#: diff.c:5583
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "без в��какъв изход от програмата"
 
-#: diff.c:5585
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "позвол�ване на изпълнение на външна помощна програма за разлики"
 
-#: diff.c:5587
+#: diff.c:5556
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "изпълнение на външни програми-филтри при �равнението на двоични файлове"
 
-#: diff.c:5589
+#: diff.c:5558
 msgid "<when>"
 msgstr "КОГ�"
 
-#: diff.c:5590
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr "игнориране на промените в подмодулите при извеждането на разликите"
 
-#: diff.c:5593
+#: diff.c:5562
 msgid "<format>"
 msgstr "ФОРМ�Т"
 
-#: diff.c:5594
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "начин за извеждане на промените в подмодулите"
 
-#: diff.c:5598
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "без включване в индек�а на запи�ите, добавени � „git add -N“"
 
-#: diff.c:5601
+#: diff.c:5570
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "включване в индек�а на запи�ите, добавени � „git add -N“"
 
-#: diff.c:5603
+#: diff.c:5572
 msgid "<string>"
 msgstr "�ИЗ"
 
-#: diff.c:5604
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "тър�ене на разлики, които промен�т бро� на по�ва на указаните низове"
 
-#: diff.c:5607
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -4092,69 +4127,69 @@ msgstr ""
 "тър�ене на разлики, които промен�т бро� на по�ва на низовете, които напа�ват "
 "на регул�рни� израз"
 
-#: diff.c:5610
+#: diff.c:5579
 msgid "show all changes in the changeset with -S or -G"
 msgstr "извеждане на в�ички промени � „-G“/„-S“"
 
-#: diff.c:5613
+#: diff.c:5582
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "�ИЗът към „-S“ да �е тълкува като разширен регул�рен израз по POSIX"
 
-#: diff.c:5616
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr "управление на подредбата на файловете в изхода"
 
-#: diff.c:5617 diff.c:5620
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "ПЪТ"
 
-#: diff.c:5618
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "първо извеждане на пром�ната в указани� път"
 
-#: diff.c:5621
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "пре�качане на изхода към указани� път"
 
-#: diff.c:5623
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "ИДЕ�ТИФИК�ТОР_��_ОБЕКТ"
 
-#: diff.c:5624
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "тър�ене на разлики, които промен�т бро� на по�ва на указани� обект"
 
-#: diff.c:5626
+#: 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:5627
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "избор на файловете по вид разлика"
 
-#: diff.c:5629
+#: diff.c:5598
 msgid "<file>"
 msgstr "Ф�ЙЛ"
 
-#: diff.c:5630
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "Изход към указани� файл"
 
-#: diff.c:6287
-msgid "inexact rename detection was skipped due to too many files."
+#: diff.c:6257
+msgid "exhaustive rename detection was skipped due to too many files."
 msgstr ""
-"тър�енето на преименувани� на обекти �ъчетани � промени �е пре�кача поради "
-"многото файлове."
+"пълното тър�ене на преименувани� на обекти �е пре�кача поради многото "
+"файлове."
 
-#: diff.c:6290
+#: diff.c:6260
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "у�тановени �а �амо точните копи� на променените пътища поради многото "
 "файлове."
 
-#: diff.c:6293
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -4165,7 +4200,7 @@ msgstr "задайте променливата „%s“ да е поне %d и
 msgid "failed to read orderfile '%s'"
 msgstr "файлът � подредбата на �ъответ�тви�та „%s“ не може да бъде прочетен"
 
-#: diffcore-rename.c:1418
+#: diffcore-rename.c:1564
 msgid "Performing inexact rename detection"
 msgstr "Тър�ене на преименувани� на обекти �ъчетани � промени"
 
@@ -4174,62 +4209,70 @@ msgstr "ТърÑ�ене на преименуваниÑ� на обекти Ñ�ъчÐ
 msgid "No such path '%s' in the diff"
 msgstr "��ма път на име „%s“ в разликата"
 
-#: dir.c:578
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "път�т „%s“ не �ъвпада � никой файл в git"
 
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr "непознат шаблон: „%s“"
 
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "непознат отрицателен шаблон: „%s“"
 
-#: dir.c:809
+#: dir.c:820
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr ""
 "файлът определ�щ ча�тично�тта на изтегленото хранилище може да има проблем: "
 "шаблонът „%s“ �е повтар�"
 
-#: dir.c:819
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "изключване на пътеводното напа�ване"
 
-#: dir.c:1206
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "„%s“ не може да �е ползва за игнорираните файлове (като gitignore)"
 
-#: dir.c:2314
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "директори�та „%s“ не може да бъде отворена"
 
-#: dir.c:2614
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr "името и вер�и�та на �дрото не б�ха получени"
 
-#: dir.c:2738
+#: dir.c:2844
 msgid "untracked cache is disabled on this system or location"
 msgstr ""
 "кешът за не�ледените файлове е изключен на тази �и�тема или ме�тоположение"
 
-#: dir.c:3543
+#: dir.c:3112
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Името на директори�та не може да бъде отгатнато.\n"
+"Задайте директори�та изрично на командни� ред"
+
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "файлът � индек�а е повреден в хранилището „%s“"
 
-#: dir.c:3590 dir.c:3595
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr "директориите за „%s“ не може да бъдат �ъздадени"
 
-#: dir.c:3624
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "директори�та на git не може да �е мигрира от „%s“ до „%s“"
@@ -4248,296 +4291,372 @@ msgstr "Филтриране на �ъдържанието"
 msgid "could not stat file '%s'"
 msgstr "неу�пешно изпълнение на „stat“ върху файла „%s“"
 
-#: environment.c:152
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "неправилен път към про�тран�тва от имена „%s“"
 
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "GIT_DIR не може да �е зададе да е „%s“"
-
 #: exec-cmd.c:363
 #, c-format
 msgid "too many args to run %s"
 msgstr "прекалено много аргументи за изпълнение „%s“"
 
-#: fetch-pack.c:182
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: очаква �е плитък �пи�ък"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: �лед плитък �пи�ък �е очаква изчи�тващ пакет „flush“"
 
-#: fetch-pack.c:196
+#: 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:216
+#: 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:227
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "невъзможно пи�ане към отдалечено хранилище"
 
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "опци�та „--stateless-rpc“ изи�ква  „multi_ack_detailed“"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "неправилен плитък ред: „%s“"
 
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "неправилен неплитък ред: „%s“"
 
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "обектът „%s“ лип�ва"
 
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "грешка в обекта: „%s“"
 
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "не е открит плитък обект: %s"
 
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "очаква �е плитък или не обект, а бе получено: „%s“"
 
-#: fetch-pack.c:439
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "получено бе %s %d %s"
 
-#: fetch-pack.c:456
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "неправилно подаване: „%s“"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "преу�танов�ване"
 
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "дей�твието завърши"
 
-#: fetch-pack.c:512
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "получено бе %s (%d) %s"
 
-#: fetch-pack.c:548
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Отбел�зване на „%s“ като пълно"
 
-#: fetch-pack.c:763
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "вече има „%s“ (%s)"
 
-#: fetch-pack.c:849
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: не може да �е �ъздаде проце� за демултиплек�ора"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "протоколна грешка: неправилна заглавна ча�т на пакет"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: не може да �е �ъздаде проце� за „%s“"
 
-#: fetch-pack.c:957
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack: неправилен изход от командата „index-pack“"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "неу�пешно изпълнение на „%s“"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "грешка в демултиплек�ора"
 
-#: fetch-pack.c:1019
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Вер�и�та на �ървъра е: %.*s"
 
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
+#: 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:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: 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:1029
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "Сървърът не поддържа плитки клиенти"
 
-#: fetch-pack.c:1089
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "Сървърът не поддържа опци�та „--shallow-since“"
 
-#: fetch-pack.c:1094
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "Сървърът не поддържа опци�та „--shallow-exclude“"
 
-#: fetch-pack.c:1098
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "Сървърът не поддържа опци�та „--deepen“"
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
 msgstr "Сървърът не поддържа форма̀та на обектите на това хранилище"
 
-#: fetch-pack.c:1113
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "н�ма общи подавани�"
 
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
 msgstr "клонираното хранилище е плитко, затова н�ма да �е клонира."
 
-#: fetch-pack.c:1128 fetch-pack.c:1651
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: неу�пешно до�тав�не."
 
-#: fetch-pack.c:1242
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "различни алгоритми — на клиента: „%s“, на �ървъра: „%s“"
 
-#: fetch-pack.c:1246
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "�ървърът не поддържа алгоритъм „%s“"
 
-#: fetch-pack.c:1279
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "Сървърът не поддържа плитки за�вки"
 
-#: fetch-pack.c:1286
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "Сървърът поддържа филтри"
 
-#: fetch-pack.c:1329 fetch-pack.c:2034
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
 msgstr "невъзможно пи�ане към отдалечено хранилище"
 
-#: fetch-pack.c:1347
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "грешка при прочитане на заглавната ча�т на раздел „%s“"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "очаква �е „%s“, а бе получено „%s“"
 
-#: fetch-pack.c:1387
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "неочакван ред за потвърждение: „%s“"
 
-#: fetch-pack.c:1392
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "грешка при обработка на потвърждени�та: %d"
 
-#: fetch-pack.c:1402
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr ""
 "очакваше �е пакетни�т файл да бъде изпратен �лед отговор за готовно�т (ready)"
 
-#: fetch-pack.c:1404
+#: fetch-pack.c:1420
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 "очакваше �е �лед лип�а на отговор за готовно�т (ready) да не �е �е пращат "
 "други раздели"
 
-#: fetch-pack.c:1445
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "грешка при обработка на информаци� за дълбочината/плитко�тта: %d"
 
-#: fetch-pack.c:1494
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "очаква �е и�кан указател, а бе получено: „%s“"
 
-#: fetch-pack.c:1499
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "неочакван и�кан указател: „%s“"
 
-#: fetch-pack.c:1504
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "грешка при обработката на и�каните указатели: %d"
 
-#: fetch-pack.c:1534
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack: очаква �е пакет за край на отговора"
 
-#: fetch-pack.c:1930
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "не може да бъде открит подход�щ връх от отдалеченото хранилище"
 
-#: fetch-pack.c:1953 builtin/clone.c:697
+#: fetch-pack.c:1982 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
 msgstr "отдалеченото хранилище не изпрати в�ички необходими обекти."
 
-#: fetch-pack.c:2056
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "неочаквано �ъ�то�ние за готовно�т от отдалечено хранилище"
 
-#: fetch-pack.c:2079
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "такъв отдалечен указател н�ма: %s"
 
-#: fetch-pack.c:2082
+#: fetch-pack.c:2111
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Сървърът не позвол�ва за�вка за необ�вен обект „%s“"
 
-#: gpg-interface.c:273
+#: 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:276
+#: gpg-interface.c:332 gpg-interface.c:460
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "Програмата не у�п� да запише �амо�то�телни� подпи� в „%s“"
 
-#: gpg-interface.c:470
+#: gpg-interface.c:451
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"на�тройката „gpg.ssh.allowedSignersFile“ тр�бва да е зададена за проверка на "
+"подпи�ите на ssh"
+
+#: gpg-interface.c:480
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"За проверка на подпи�ите е необходима командата (до�тъпна от openssh ≥ "
+"8.2p1+):\n"
+"\n"
+"    ssh-keygen -Y find-principals/verify"
+
+#: gpg-interface.c:536
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr ""
+"файлът за отхвърл�не на подпи�и на ssh е на�троен, но не може да �е открие: "
+"%s"
+
+#: gpg-interface.c:624
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "лош/не�ъвме�тим подпи� „%s“"
+
+#: 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:829
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"Поне една от на�тройките „user.signingkey“ или „gpg.ssh.defaultKeyCommand“ "
+"тр�бва да е зададена"
+
+#: 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:857
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "неу�пешно изпълнение на „gpg.ssh.defaultKeyCommand“: %s %s"
+
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
-msgstr "Програмата „gpg“ не подпи�а данните."
+msgstr "Програмата „gpg“ не подпи�а данните"
+
+#: gpg-interface.c:967
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr ""
+"за подпи�ване �ъ� ssh е необходимо да зададете на�тройката „user.signingkey“"
+
+#: gpg-interface.c:978
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "неу�пешно запазване на ключа за подпи�ване на ssh в „%s“"
+
+#: gpg-interface.c:996
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "неу�пешно запазване на буфера за подпи�ване на ssh в „%s“"
+
+#: gpg-interface.c:1014
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"За подпи�ване �ъ� ssh е необходима командата (до�тъпна от openssh ≥ "
+"8.2p1+):\n"
+"\n"
+"    ssh-keygen -Y"
+
+#: gpg-interface.c:1026
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "неу�пешно прочитане на буфера за подпи�ване на ssh от „%s“"
 
 #: graph.c:98
 #, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
+msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "пре�качане на неправилни� цв�т „%.*s“ в „log.graphColors“"
 
 #: grep.c:531
@@ -4548,109 +4667,109 @@ msgstr ""
 "зададени�т шаблон �ъдържа нулев знак (идва от -f „Ф�ЙЛ“).  Това �е поддържа "
 "в комбинаци� � „-P“ �амо при ползването на „PCRE v2“"
 
-#: grep.c:1893
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "„%s“: файлът �очен от „%s“ не може да бъде прочетен"
 
-#: grep.c:1910 setup.c:176 builtin/clone.c:416 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:1921
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "„%s“: изчитането върна по-малко байтове от очакваното"
 
-#: help.c:23
+#: help.c:24
 msgid "start a working area (see also: git help tutorial)"
 msgstr "�ъздаване на работно дърво (погледнете: „git help tutorial“)"
 
-#: help.c:24
+#: help.c:25
 msgid "work on the current change (see also: git help everyday)"
 msgstr "работа по текущата пром�на (погледнете: „git help everyday“)"
 
-#: help.c:25
+#: help.c:26
 msgid "examine the history and state (see also: git help revisions)"
 msgstr "преглед на и�тори�та и �ъ�то�нието (погледнете: „git help revisions“)"
 
-#: help.c:26
+#: help.c:27
 msgid "grow, mark and tweak your common history"
 msgstr "увеличаване, отбел�зване и пром�на на общата и�тори�"
 
-#: help.c:27
+#: help.c:28
 msgid "collaborate (see also: git help workflows)"
 msgstr "�ъвме�тна работа (погледнете: „git help workflows“)"
 
-#: help.c:31
+#: help.c:32
 msgid "Main Porcelain Commands"
 msgstr "О�новни команди от потребител�ко ниво"
 
-#: help.c:32
+#: help.c:33
 msgid "Ancillary Commands / Manipulators"
 msgstr "Помощни команди / Промен�щи"
 
-#: help.c:33
+#: help.c:34
 msgid "Ancillary Commands / Interrogators"
 msgstr "Помощни команди / Запитващи"
 
-#: help.c:34
+#: help.c:35
 msgid "Interacting with Others"
 msgstr "Съвме�тна работа � други хора"
 
-#: help.c:35
+#: help.c:36
 msgid "Low-level Commands / Manipulators"
 msgstr "Команди от ни�ко ниво / Промен�щи"
 
-#: help.c:36
+#: help.c:37
 msgid "Low-level Commands / Interrogators"
 msgstr "Команди от ни�ко ниво / Запитващи"
 
-#: help.c:37
+#: help.c:38
 msgid "Low-level Commands / Syncing Repositories"
 msgstr "Команди от ни�ко ниво / Синхронизаци� на хранилища"
 
-#: help.c:38
+#: help.c:39
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Команди от ни�ко ниво / Допълнителни ин�трументи"
 
-#: help.c:300
+#: help.c:313
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "налични команди на git от „%s“"
 
-#: help.c:307
+#: help.c:320
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "команди на git от други директории от „$PATH“"
 
-#: help.c:316
+#: help.c:329
 msgid "These are common Git commands used in various situations:"
 msgstr "Това �а най-че�то използваните команди на Git:"
 
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "неподдържан �пи�ък от команди „%s“"
 
-#: help.c:405
+#: help.c:418
 msgid "The Git concept guides are:"
 msgstr "Ръковод�твата за концепциите в Git �а:"
 
-#: help.c:429
+#: help.c:442
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr "За повече информаци� за КОМ��Д� изпълнете „git help КОМ��Д�“"
 
-#: help.c:434
+#: help.c:447
 msgid "External commands"
 msgstr "Външни команди"
 
-#: help.c:449
+#: help.c:462
 msgid "Command aliases"
 msgstr "П�евдоними на командите"
 
-#: help.c:527
+#: help.c:543
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -4659,36 +4778,41 @@ msgstr ""
 "Изглежда, че „%s“ е команда на git, но т� не може да\n"
 "бъде изпълнена.  Веро�тно пакетът „git-%s“ е повреден."
 
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git: „%s“ не е команда на git.  Погледнете изхода от „git --help“."
 
-#: help.c:591
+#: help.c:613
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Странно, изглежда, че на �и�темата ви н�ма нито една команда на git."
 
-#: help.c:613
+#: help.c:635
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: Пробвахте да изпълните команда на Git на име „%s“, а такава "
 "не �ъще�твува."
 
-#: help.c:618
+#: help.c:640
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr ""
 "Изпълнението автоматично продължава, като �е �чита, че имате предвид „%s“."
 
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Да �е изпълни „%s“ вме�то това [y/N]? "
+
+#: help.c:654
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr ""
 "Изпълнението автоматично ще продължи �лед %0.1f �ек., като �е �чита, че "
 "имате предвид „%s“."
 
-#: help.c:635
+#: help.c:666
 msgid ""
 "\n"
 "The most similar command is"
@@ -4702,16 +4826,16 @@ msgstr[1] ""
 "\n"
 "�ай-близките команди �а"
 
-#: help.c:675
+#: help.c:706
 msgid "git version [<options>]"
 msgstr "git version [ОПЦИЯ…]"
 
-#: help.c:730
+#: help.c:761
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s — %s"
 
-#: help.c:734
+#: help.c:765
 msgid ""
 "\n"
 "Did you mean this?"
@@ -4725,6 +4849,16 @@ msgstr[1] ""
 "\n"
 "Команди � подобно име �а:"
 
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Куката „%s“ �е пре�кача, защото лип�ват права за изпълнение.\n"
+"За да изключите това предупреждение, изпълнете:\n"
+"    git config advice.ignoredHook false"
+
 #: ident.c:353
 msgid "Author identity unknown\n"
 msgstr "Лип�ва информаци� за автора\n"
@@ -4790,7 +4924,7 @@ msgstr "не може да �е ползва празно име като иде
 msgid "name consists only of disallowed characters: %s"
 msgstr "името �ъдържа �амо непозволени знаци: „%s“"
 
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
 #, c-format
 msgid "invalid date format: %s"
 msgstr "неправилен формат на дата: %s"
@@ -4805,7 +4939,7 @@ msgstr "поддръжката на филтри Ñ�ÑŠÑ� „sparse:path“ е пÑ
 
 #: list-objects-filter-options.c:105
 #, c-format
-msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
 msgstr "„%s“ не е правилна �тойно�т за вид на обект в „object:type=ВИД“"
 
 #: list-objects-filter-options.c:124
@@ -4853,7 +4987,7 @@ msgstr "обект „%s“ в дървото „%s“ е отбелÑ�зан кÐ
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "обект „%s“ в дървото „%s“ е отбел�зан като BLOB, но не е"
 
-#: list-objects.c:395
+#: list-objects.c:398
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "кореновото дърво за подаване „%s“ не може да �е зареди"
@@ -4887,7 +5021,12 @@ msgstr "Файлът-ключалка „%s.lock“ не може да бъде
 msgid "invalid value '%s' for lsrefs.unborn"
 msgstr "неправилна �тойно�т „%s“ за „lsrefs.unborn“"
 
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "неочакван ред: „%s“"
+
+#: ls-refs.c:178
 msgid "expected flush after ls-refs arguments"
 msgstr "�лед аргументите към „ls-refs“ �е очаква изчи�тване на буферите"
 
@@ -4895,39 +5034,39 @@ msgstr "Ñ�лед аргументите към „ls-refs“ Ñ�е очаква Ð
 msgid "quoted CRLF detected"
 msgstr "цитирани знаци CRLF"
 
-#: mailinfo.c:1254 builtin/am.c:176 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“"
 
-#: merge-ort.c:1116 merge-recursive.c:1205
+#: merge-ort.c:1584 merge-recursive.c:1211
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "�еу�пешно �ливане на подмодула „%s“ (не е изтеглен)"
 
-#: merge-ort.c:1125 merge-recursive.c:1212
+#: merge-ort.c:1593 merge-recursive.c:1218
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "�еу�пешно �ливане на подмодула „%s“ (н�ма подавани�)"
 
-#: merge-ort.c:1134 merge-recursive.c:1219
+#: merge-ort.c:1602 merge-recursive.c:1225
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 "Подмодулът „%s“ не може да бъде �л�т (базата за �ливане не предше�тва "
 "подавани�та)"
 
-#: merge-ort.c:1144 merge-ort.c:1151
+#: merge-ort.c:1612 merge-ort.c:1620
 #, c-format
 msgid "Note: Fast-forwarding submodule %s to %s"
 msgstr "Бележка: Превъртане на подмодула „%s“ към „%s“"
 
-#: merge-ort.c:1172
+#: merge-ort.c:1642
 #, c-format
 msgid "Failed to merge submodule %s"
 msgstr "�еу�пешно �ливане на подмодула „%s“"
 
-#: merge-ort.c:1179
+#: merge-ort.c:1649
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4936,7 +5075,7 @@ msgstr ""
 "�еу�пешно �ливане на подмодула „%s“, но е открито възможно решение:\n"
 "%s\n"
 
-#: merge-ort.c:1183 merge-recursive.c:1273
+#: merge-ort.c:1653 merge-recursive.c:1281
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -4952,7 +5091,7 @@ msgstr ""
 "\n"
 "Това приема предложеното.\n"
 
-#: merge-ort.c:1196
+#: merge-ort.c:1666
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4961,21 +5100,21 @@ msgstr ""
 "�еу�пешно �ливане на подмодула „%s“, но �а открити множе�тво решени�:\n"
 "%s"
 
-#: merge-ort.c:1415 merge-recursive.c:1362
+#: merge-ort.c:1887 merge-recursive.c:1372
 msgid "Failed to execute internal merge"
 msgstr "�еу�пешно вътрешно �ливане"
 
-#: merge-ort.c:1420 merge-recursive.c:1367
+#: merge-ort.c:1892 merge-recursive.c:1377
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "„%s“ не може да �е добави в базата � данни"
 
-#: merge-ort.c:1427 merge-recursive.c:1400
+#: merge-ort.c:1899 merge-recursive.c:1410
 #, c-format
 msgid "Auto-merging %s"
 msgstr "�втоматично �ливане на „%s“"
 
-#: merge-ort.c:1566 merge-recursive.c:2122
+#: merge-ort.c:2038 merge-recursive.c:2132
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4984,7 +5123,7 @@ msgstr ""
 "КО�ФЛИКТ (ко�вено преименуване на директори�): �ледни�т файл или директори� "
 "„%s“ не позвол�ват ко�веното преименуване на �ледни� път/ища: %s."
 
-#: merge-ort.c:1576 merge-recursive.c:2132
+#: merge-ort.c:2048 merge-recursive.c:2142
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4994,7 +5133,7 @@ msgstr ""
 "�ъответ�тва на „%s“.  Ко�вено преименуване на директори� води до по�тав�нето "
 "на тези пътища там: %s."
 
-#: merge-ort.c:1634
+#: merge-ort.c:2106
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -5005,7 +5144,7 @@ msgstr ""
 "да �е преименува „%s“, защото е преме�тен в н�колко нови директории, без "
 "нико� от т�х да е по-че�та цел."
 
-#: merge-ort.c:1788 merge-recursive.c:2468
+#: merge-ort.c:2260 merge-recursive.c:2478
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -5014,7 +5153,7 @@ msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: пре�качане на преименуването на „%s“ на „%s“ в „%s“, защото "
 "„%s“ �ъщо е � променено име."
 
-#: merge-ort.c:1932 merge-recursive.c:3244
+#: merge-ort.c:2400 merge-recursive.c:3261
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -5023,7 +5162,7 @@ msgstr ""
 "Обновен път: „%s“ е добавен в „%s“ в директори�, ко�то е преименувана в "
 "„%s“.  Обектът �е ме�ти в „%s“."
 
-#: merge-ort.c:1939 merge-recursive.c:3251
+#: merge-ort.c:2407 merge-recursive.c:3268
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -5032,7 +5171,7 @@ msgstr ""
 "Обновен път: „%s“ е преименуван на „%s“ в „%s“ в директори�, ко�то е "
 "преименувана в „%s“.  Обектът �е ме�ти в „%s“."
 
-#: merge-ort.c:1952 merge-recursive.c:3247
+#: merge-ort.c:2420 merge-recursive.c:3264
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -5041,7 +5180,7 @@ msgstr ""
 "КО�ФЛИКТ (ме�та на файлове): „%s“ е добавен в „%s“ в директори�, ко�то е "
 "преименувана в „%s“.  Предложението е да преме�тите обекта в „%s“."
 
-#: merge-ort.c:1960 merge-recursive.c:3254
+#: merge-ort.c:2428 merge-recursive.c:3271
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -5050,14 +5189,14 @@ msgstr ""
 "КО�ФЛИКТ (ме�та на файлове): „%s“ е преименуван на „%s“ в „%s“ в директори�, "
 "ко�то е преименувана в „%s“.  Предложението е да преме�тите обекта в „%s“."
 
-#: merge-ort.c:2103
+#: merge-ort.c:2584
 #, c-format
 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
 msgstr ""
 "КО�ФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон „%s“ "
 "и на „%s“ в „%s“."
 
-#: merge-ort.c:2198
+#: merge-ort.c:2679
 #, c-format
 msgid ""
 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -5068,24 +5207,24 @@ msgstr ""
 "има и промени в �ъдържанието, а и има �ъвпадение на път�.  Може да �е "
 "получат вложени маркери за конфликт."
 
-#: merge-ort.c:2217 merge-ort.c:2241
+#: merge-ort.c:2698 merge-ort.c:2722
 #, c-format
 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr ""
 "КО�ФЛИКТ (преименуване/добав�не): „%s“ е преименуван на „%s“ в клон „%s“, а "
 "е изтрит в „%s“."
 
-#: merge-ort.c:2550 merge-recursive.c:3002
+#: merge-ort.c:3212 merge-recursive.c:3022
 #, c-format
 msgid "cannot read object %s"
 msgstr "обектът „%s“ не може да �е прочете"
 
-#: merge-ort.c:2553 merge-recursive.c:3005
+#: merge-ort.c:3215 merge-recursive.c:3025
 #, c-format
 msgid "object %s is not a blob"
 msgstr "обектът „%s“ не е BLOB"
 
-#: merge-ort.c:2981
+#: merge-ort.c:3644
 #, c-format
 msgid ""
 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -5094,7 +5233,7 @@ msgstr ""
 "КО�ФЛИКТ (файл/директори�): директори� на м��тото на „%s“ от „%s“, вме�то "
 "това �е извършва преме�тване в „%s“."
 
-#: merge-ort.c:3055
+#: merge-ort.c:3721
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -5103,7 +5242,7 @@ msgstr ""
 "КО�ФЛИКТ (различни видове): „%s“ е различен вид обект в двата варианта.  И "
 "двата �е преименуват, за да може в�ичко да е отразено."
 
-#: merge-ort.c:3062
+#: merge-ort.c:3728
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -5112,24 +5251,24 @@ msgstr ""
 "КО�ФЛИКТ (различни видове): „%s“ е различен вид обект в двата варианта.  "
 "Извършва �е преименуване в едини�, за да може в�ичко да е отразено."
 
-#: merge-ort.c:3162 merge-recursive.c:3081
+#: merge-ort.c:3819 merge-recursive.c:3101
 msgid "content"
 msgstr "�ъдържание"
 
-#: merge-ort.c:3164 merge-recursive.c:3085
+#: merge-ort.c:3821 merge-recursive.c:3105
 msgid "add/add"
 msgstr "добав�не/добав�не"
 
-#: merge-ort.c:3166 merge-recursive.c:3130
+#: merge-ort.c:3823 merge-recursive.c:3150
 msgid "submodule"
 msgstr "ПОДМОДУЛ"
 
-#: merge-ort.c:3168 merge-recursive.c:3131
+#: merge-ort.c:3825 merge-recursive.c:3151
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "КО�ФЛИКТ (%s): Конфликт при �ливане на „%s“"
 
-#: merge-ort.c:3198
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -5138,7 +5277,7 @@ msgstr ""
 "КО�ФЛИКТ (пром�на/изтриване): „%s“ е изтрит в %s, а е променен в %s.  Вер�и� "
 "%s на „%s“ е о�тавена в дървото."
 
-#: merge-ort.c:3433
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5150,12 +5289,12 @@ 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:3730
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr "неу�пешно �ъбиране на информаци�та за �ливането на „%s“, „%s“ и „%s“"
 
-#: merge-ort-wrappers.c:13 merge-recursive.c:3699
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -5164,113 +5303,113 @@ msgstr ""
 "Сливането ще презапише локалните промени на тези файлове:\n"
 "    %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "Вече е обновено."
 
-#: merge-recursive.c:356
+#: merge-recursive.c:353
 msgid "(bad commit)\n"
 msgstr "(лошо подаване)\n"
 
-#: merge-recursive.c:379
+#: merge-recursive.c:381
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr ""
 "неу�пешно изпълнение на „add_cacheinfo“ за път� „%s“.  Сливането е "
 "преу�тановено."
 
-#: merge-recursive.c:388
+#: merge-recursive.c:390
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 "неу�пешно изпълнение на „add_cacheinfo“ за обнов�ването на път� „%s“.  "
 "Сливането е преу�тановено."
 
-#: merge-recursive.c:876
+#: merge-recursive.c:881
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "грешка при �ъздаването на път� „%s“%s"
 
-#: merge-recursive.c:887
+#: merge-recursive.c:892
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Изтриване на „%s“, за да �е о�вободи м��то за поддиректори�\n"
 
-#: merge-recursive.c:901 merge-recursive.c:920
+#: merge-recursive.c:906 merge-recursive.c:925
 msgid ": perhaps a D/F conflict?"
 msgstr ": възможно е да има конфликт директори�/файл."
 
-#: merge-recursive.c:910
+#: merge-recursive.c:915
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr ""
 "преу�танов�ване на дей�твието, за да не �е изтрие не�ледени�т файл „%s“"
 
-#: merge-recursive.c:951 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "обектът „%s“ (%s) не може да бъде прочетен"
 
-#: merge-recursive.c:956
+#: merge-recursive.c:961
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "обектът „%s“ (%s) �е очакваше да е BLOB, а не е"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:986
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "„%s“ не може да �е отвори: %s"
 
-#: merge-recursive.c:992
+#: merge-recursive.c:997
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "неу�пешно �ъздаване на �имволната връзка „%s“: %s"
 
-#: merge-recursive.c:997
+#: merge-recursive.c:1002
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr ""
 "не е ��но какво да �е прави � обекта „%2$s“ (%3$s) � права за до�тъп „%1$06o“"
 
-#: merge-recursive.c:1227 merge-recursive.c:1239
+#: merge-recursive.c:1233 merge-recursive.c:1246
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Превъртане на подмодула „%s“ до �ледното подаване:"
 
-#: merge-recursive.c:1230 merge-recursive.c:1242
+#: merge-recursive.c:1236 merge-recursive.c:1249
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Превъртане на подмодула „%s“"
 
-#: merge-recursive.c:1265
+#: merge-recursive.c:1273
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "�еу�пешно �ливане на подмодула „%s“ (лип�ва �ливането, което �е предше�тва "
 "от подавани�та)"
 
-#: merge-recursive.c:1269
+#: merge-recursive.c:1277
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "�еу�пешно �ливане на подмодула „%s“ (не е превъртане)"
 
-#: merge-recursive.c:1270
+#: merge-recursive.c:1278
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr ""
 "Открито е �ливане, което може да решава проблема �ъ� �ливането на "
 "подмодула:\n"
 
-#: merge-recursive.c:1282
+#: merge-recursive.c:1290
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "�еу�пешно �ливане на подмодула „%s“ (открити �а множе�тво �ливани�)"
 
-#: merge-recursive.c:1424
+#: merge-recursive.c:1434
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr "Грешка: за да не �е изтрие не�ледени�т файл „%s“, �е запи�ва в „%s“."
 
-#: merge-recursive.c:1496
+#: merge-recursive.c:1506
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5279,7 +5418,7 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s.  Вер�и� %s на „%s“ "
 "е о�тавена в дървото."
 
-#: merge-recursive.c:1501
+#: merge-recursive.c:1511
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5288,7 +5427,7 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
 "%s.  Вер�и� %s на „%s“ е о�тавена в дървото."
 
-#: merge-recursive.c:1508
+#: merge-recursive.c:1518
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5297,7 +5436,7 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s.  Вер�и� %s на „%s“ "
 "е о�тавена в дървото: %s."
 
-#: merge-recursive.c:1513
+#: merge-recursive.c:1523
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5306,45 +5445,45 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
 "%s.  Вер�и� %s на „%s“ е о�тавена в дървото: %s."
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "rename"
 msgstr "преименуване"
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "renamed"
 msgstr "преименуван"
 
-#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Преу�танов�ване на дей�твието, за да не �е изгуби променени�т „%s“"
 
-#: merge-recursive.c:1609
+#: merge-recursive.c:1619
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 "Отказ да �е загуби не�ледени�т файл „%s“, защото е на м��то, където пречи."
 
-#: merge-recursive.c:1667
+#: merge-recursive.c:1677
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "КО�ФЛИКТ (преименуване/добав�не): „%s“ е преименуван на „%s“ в клон „%s“, а "
 "„%s“ е добавен в „%s“"
 
-#: merge-recursive.c:1698
+#: merge-recursive.c:1708
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "„%s“ е директори� в „%s“, затова �е добав� като „%s“"
 
-#: merge-recursive.c:1703
+#: merge-recursive.c:1713
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 "Преу�танов�ване на дей�твието, за да не �е изгуби не�ледени�т файл „%s“.  "
 "Вме�то него �е добав� „%s“"
 
-#: merge-recursive.c:1730
+#: merge-recursive.c:1740
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5353,18 +5492,18 @@ msgstr ""
 "КО�ФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
 "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s."
 
-#: merge-recursive.c:1735
+#: merge-recursive.c:1745
 msgid " (left unresolved)"
 msgstr " (некоригиран конфликт)"
 
-#: merge-recursive.c:1827
+#: merge-recursive.c:1837
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "КО�ФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
 "„%s“, а „%s“ е преименуван на „%s“ в „%s“"
 
-#: merge-recursive.c:2090
+#: merge-recursive.c:2100
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5375,7 +5514,7 @@ msgstr ""
 "по�тави „%s“, защото н�колко нови директории подел�т �ъдържанието на "
 "директори� „%s“, като нико� не �ъдържа мнозин�тво от файловете �."
 
-#: merge-recursive.c:2224
+#: merge-recursive.c:2234
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5384,81 +5523,81 @@ msgstr ""
 "КО�ФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
 "„%s“, а „%s“ е преименуван на „%s“ в „%s“"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modify"
 msgstr "пром�на"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modified"
 msgstr "променен"
 
-#: merge-recursive.c:3108
+#: merge-recursive.c:3128
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Пре�качане на „%s“ (�лети�т резултат е идентичен �ъ� �егашни�)"
 
-#: merge-recursive.c:3161
+#: merge-recursive.c:3181
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Добав�не като „%s“"
 
-#: merge-recursive.c:3368
+#: merge-recursive.c:3385
 #, c-format
 msgid "Removing %s"
 msgstr "Изтриване на „%s“"
 
-#: merge-recursive.c:3391
+#: merge-recursive.c:3408
 msgid "file/directory"
 msgstr "файл/директори�"
 
-#: merge-recursive.c:3396
+#: merge-recursive.c:3413
 msgid "directory/file"
 msgstr "директори�/файл"
 
-#: merge-recursive.c:3403
+#: merge-recursive.c:3420
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "КО�ФЛИКТ (%s): Съще�твува директори� на име „%s“ в „%s“.  Добав�не на „%s“ "
 "като „%s“"
 
-#: merge-recursive.c:3412
+#: merge-recursive.c:3429
 #, c-format
 msgid "Adding %s"
 msgstr "Добав�не на „%s“"
 
-#: merge-recursive.c:3421
+#: merge-recursive.c:3438
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "КО�ФЛИКТ (добав�не/добав�не): Конфликт при �ливане на „%s“"
 
-#: merge-recursive.c:3474
+#: merge-recursive.c:3491
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "неу�пешно �ливане на дърветата „%s“ и „%s“"
 
-#: merge-recursive.c:3568
+#: merge-recursive.c:3585
 msgid "Merging:"
 msgstr "Сливане:"
 
-#: merge-recursive.c:3581
+#: merge-recursive.c:3598
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "открит е %u общ предше�твеник:"
 msgstr[1] "открити �а %u общи предше�твеници:"
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3648
 msgid "merge returned no commit"
 msgstr "�ливането не върна подаване"
 
-#: merge-recursive.c:3796
+#: merge-recursive.c:3816
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "�еу�пешен анализ на обекта „%s“"
 
-#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
+#: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr "Индек�ът не може да бъде прочетен"
 
@@ -5466,134 +5605,176 @@ msgstr "Индек�ът не може да бъде прочетен"
 msgid "failed to read the cache"
 msgstr "кешът не може да бъде прочетен"
 
-#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
-#: builtin/stash.c:267
+#: 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 "неу�пешно запи�ване на нови� индек�"
 
-#: midx.c:74
+#: midx.c:78
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "неправилен размер на откъ� (OID fanout) на индек�а за множе�тво пакети"
 
-#: midx.c:105
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "файлът � индек�а за множе�тво пакети „%s“ е твърде малък"
 
-#: midx.c:121
+#: 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:126
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "непозната вер�и� на индек� за множе�тво пакети — %d"
 
-#: midx.c:131
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr ""
 "вер�и�та на контролната �ума на индек�а за множе�тво пакети %u не �ъвпада � "
 "%u"
 
-#: midx.c:148
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "лип�ва откъ� (pack-name) от индек� за множе�тво пакети"
 
-#: midx.c:150
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "лип�ва откъ� (OID fanout) от индек� за множе�тво пакети"
 
-#: midx.c:152
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "лип�ва откъ� (OID lookup) от индек� за множе�тво пакети"
 
-#: midx.c:154
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "лип�ва откъ� за отме�твани�та на обекти от индек� за множе�тво пакети"
 
-#: midx.c:170
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 "неправилна подредба на имената в индек� за множе�тво пакети: „%s“ �е по�ви "
 "преди „%s“"
 
-#: midx.c:214
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr ""
 "неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)"
 
-#: midx.c:264
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 "индек�ът за множе�тво пакети �ъдържа 64-битови отме�твани�, но размерът на "
 "„off_t“ е недо�татъчен"
 
-#: midx.c:490
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "пакетни�т файл „%s“ не може да бъде добавен"
 
-#: midx.c:496
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "индек�ът за пакети „%s“ не може да бъде отворен"
 
-#: midx.c:564
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "обект %d в пакетни� файл лип�ва"
 
-#: midx.c:880 builtin/index-pack.c:1535
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "файлът за индек�а не може да бъде �ъхранен"
 
-#: midx.c:933
-msgid "Adding packfiles to multi-pack-index"
-msgstr "Добав�не на пакетни файлове към индек� за множе�тво пакети"
+#: midx.c:993
+#, c-format
+msgid "could not parse line: %s"
+msgstr "редът не може да �е анализира: „%s“"
 
-#: midx.c:979
+#: midx.c:995
 #, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "пакетни�т файл за триене „%s“ не може да �е открие"
+msgid "malformed line: %s"
+msgstr "неправилен ред: „%s“."
 
-#: midx.c:1024
+#: midx.c:1162
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+"индек�ът за множе�тво пакети �е пре�кача, защото контролната �ума не �ъвпада"
+
+#: midx.c:1187
+msgid "could not load pack"
+msgstr "пакетът не може да �е зареди"
+
+#: midx.c:1193
+#, c-format
+msgid "could not open index for %s"
+msgstr "индек�ът за „%s“ не може да �е отвори"
+
+#: midx.c:1204
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Добав�не на пакетни файлове към индек� за множе�тво пакети"
+
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "непознат предпочитан пакет: %s"
 
-#: midx.c:1029
+#: midx.c:1292
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr ""
+"не може да изберете „%s“, който не �ъдържа обекти, за предпочитан пакет"
+
+#: midx.c:1324
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "пакетни�т файл за триене „%s“ не може да �е открие"
+
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "предпочитани�т пакет „%s“ е о�тар�л"
 
-#: midx.c:1045
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "н�ма пакетни файлове за индек�иране"
 
-#: midx.c:1125 builtin/clean.c:37
+#: midx.c:1420
+msgid "could not write multi-pack bitmap"
+msgstr "многопакетната битова ма�ка не може да бъде запазена"
+
+#: midx.c:1430
+msgid "could not write multi-pack-index"
+msgstr "индек�ът за множе�тво пакети не може да бъде запазен"
+
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "файлът „%s“ не може да бъде изтрит"
 
-#: midx.c:1156
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "индек�ът за множе�тво пакети не може да бъде изчи�тен при „%s“"
 
-#: midx.c:1214
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr "файлът � индек�а за множе�тво пакети, но не може да бъде анализиран"
 
-#: midx.c:1222
+#: midx.c:1593
+msgid "incorrect checksum"
+msgstr "неправилна контролна �ума"
+
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "Тър�ене на указаните пакетни файлове"
 
-#: midx.c:1237
+#: midx.c:1611
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -5601,75 +5782,75 @@ msgstr ""
 "неправилна подредба на откъ�и (OID fanout): fanout[%d] = %<PRIx32> > "
 "%<PRIx32> = fanout[%d]"
 
-#: midx.c:1242
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "във файла � индек�а за множе�тво пакети н�ма идентификатори на обекти"
 
-#: midx.c:1251
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr ""
 "Проверка на подредбата на идентификатори на обекти във файл � индек� към "
 "множе�тво пакетни файлове"
 
-#: midx.c:1260
+#: 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:1280
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "Подредба на обектите по пакетни файлове"
 
-#: midx.c:1287
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "Проверка на отме�тването на обекти"
 
-#: midx.c:1303
+#: midx.c:1677
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "запи�ът в пакета за обекта oid[%d] = %s не може да бъде зареден"
 
-#: midx.c:1309
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "индек�ът на пакета „%s“ не може да бъде зареден"
 
-#: midx.c:1318
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "неправилно отме�тване на обект за oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1343
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "Пребро�ване на �вързаните обекти"
 
-#: midx.c:1353
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "Тър�ене и изтриване на не�вързаните пакетни файлове"
 
-#: midx.c:1544
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "командата „pack-objects“ не може да бъде �тартирана"
 
-#: midx.c:1564
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "командата „pack-objects“ не може да бъде завършена"
 
 #: name-hash.c:542
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
-msgstr "не може да �е �ъздаде нишка за директории: %s"
+msgstr "не може да �е �ъздаде нишка за директории (lazy_dir): %s"
 
 #: name-hash.c:564
 #, c-format
 msgid "unable to create lazy_name thread: %s"
-msgstr "не може да �е �ъздаде нишка за имена: %s"
+msgstr "не може да �е �ъздаде нишка за имена (lazy_name): %s"
 
 #: name-hash.c:570
 #, c-format
 msgid "unable to join lazy_name thread: %s"
-msgstr "не може да �е изчака нишка за имена: %s"
+msgstr "не може да �е изчака нишка за имена (lazy_name): %s"
 
 #: notes-merge.c:277
 #, c-format
@@ -5719,279 +5900,277 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr "Зададена е лоша �тойно�т на променливата „%s“: „%s“"
 
-#: object-file.c:526
+#: 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:577
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "алтернативни�т път към обекти не може да бъде нормализиран: „%s“"
 
-#: object-file.c:649
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 "%s: алтернативните хранилища за обекти �е пренебрегват поради прекалено "
 "дълбоко влагане"
 
-#: object-file.c:656
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "директори�та за обекти „%s“ не може да бъде нормализирана"
 
-#: object-file.c:699
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "заключващи�т файл за алтернативите не може да �е отвори � „fdopen“"
 
-#: object-file.c:717
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "файлът � алтернативите не може да бъде прочетен"
 
-#: object-file.c:724
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr "нови�т файл � алтернативите не може да бъде преме�тен на м��тото му"
 
-#: object-file.c:759
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "път�т „%s“ не �ъще�твува."
 
-#: object-file.c:780
+#: object-file.c:762
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "в�е още не �е поддържа еталонно хранилище „%s“ като �вързано."
 
-#: object-file.c:786
+#: object-file.c:768
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "еталонното хранилище „%s“ не е локално"
 
-#: object-file.c:792
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "еталонното хранилище „%s“ е плитко"
 
-#: object-file.c:800
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "еталонното хранилище „%s“ е � при�аждане"
 
-#: object-file.c:860
+#: object-file.c:813
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "директори�та � обекти, ко�то отговар� на „%s“, не може да бъде открита"
+
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
 
-#: object-file.c:1010
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr ""
 "неу�пешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>"
 
-#: object-file.c:1031
-msgid "mmap failed"
-msgstr "неу�пешно изпълнение на „mmap“"
+#: object-file.c:1048
+#, c-format
+msgid "mmap failed%s"
+msgstr "неу�пешно изпълнение на „mmap“%s"
 
-#: object-file.c:1195
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "файлът � обектите „%s“ е празен"
 
-#: object-file.c:1330 object-file.c:2524
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "непакетирани�т обект „%s“ е повреден"
 
-#: object-file.c:1332 object-file.c:2528
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "грешни данни в кра� на непакетирани� обект „%s“"
 
-#: object-file.c:1374
+#: object-file.c:1457
+#, c-format
+msgid "unable to parse %s header"
+msgstr "заглавната ча�т на „%s“ не може да бъде анализирана"
+
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "неправилен вид обект"
 
-#: object-file.c:1458
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
-"заглавната ча�т „%s“ не може да �е разпакетира � опци�та „--allow-unknown-"
-"type“"
-
-#: object-file.c:1461
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "заглавната ча�т на „%s“ не може да бъде разпакетирана"
 
-#: object-file.c:1467
+#: object-file.c:1474
 #, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr ""
-"заглавната ча�т „%s“ не може да �е анализира � опци�та „--allow-unknown-type“"
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "заглавната ча�т на „%s“ е прекалено дълга — надхвърл� %d байта"
 
-#: object-file.c:1470
-#, c-format
-msgid "unable to parse %s header"
-msgstr "заглавната ча�т на „%s“ не може да бъде анализирана"
-
-#: object-file.c:1697
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr "обектът „%s“ не може да бъде прочетен"
 
-#: object-file.c:1701
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "заме�тител�т „%s“ на „%s“ не може да бъде открит"
 
-#: object-file.c:1705
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "непакетирани�т обект „%s“ (в „%s“) е повреден"
 
-#: object-file.c:1709
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "пакетирани�т обект „%s“ (в „%s“) е повреден"
 
-#: object-file.c:1814
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "файлът „%s“ не може да бъде запи�ан"
 
-#: object-file.c:1821
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "правата за до�тъп до „%s“ не може да бъдат зададени"
 
-#: object-file.c:1828
+#: object-file.c:1835
 msgid "file write error"
 msgstr "грешка при запи� на файл"
 
-#: object-file.c:1848
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr "грешка при затвар�нето на файла � непакетиран обект"
 
-#: object-file.c:1913
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "н�ма права за добав�не на обект към базата от данни на хранилището „%s“"
 
-#: object-file.c:1915
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "не може да бъде �ъздаден временен файл"
 
-#: object-file.c:1939
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "грешка при запи�а на файла � непакетиран обект"
 
-#: object-file.c:1945
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "нови�т обект „%s“ не може да �е компре�ира � „deflate“: %d"
 
-#: object-file.c:1949
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "неу�пешно приключване на „deflate“ върху „%s“: %d"
 
-#: object-file.c:1953
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "грешка поради не�табилни� източник данни за обектите „%s“"
 
-#: object-file.c:1963 builtin/pack-objects.c:1097
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr "неу�пешно задаване на време на до�тъп/�ъздаване чрез „utime“ на „%s“"
 
-#: object-file.c:2040
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "обектът за „%s“ не може да �е прочете"
 
-#: object-file.c:2091
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "повредено подаване"
 
-#: object-file.c:2099
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "повреден етикет"
 
-#: object-file.c:2199
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "грешка при четене по време на индек�иране на „%s“"
 
-#: object-file.c:2202
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "непълно прочитане по време на индек�иране на „%s“"
 
-#: object-file.c:2275 object-file.c:2285
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "„%s“ не може да �е вмъкне в базата от данни"
 
-#: object-file.c:2291
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "неподдържан вид файл: „%s“"
 
-#: object-file.c:2315
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr "„%s“ е неправилен обект"
 
-#: object-file.c:2317
+#: object-file.c:2331
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "„%s“ е неправилен обект от вид „%s“"
 
-#: object-file.c:2344 builtin/index-pack.c:192
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "обектът „%s“ не може да бъде отворен"
 
-#: object-file.c:2535 object-file.c:2588
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "неправилна контролна �ума за „%s“ (тр�бва да е %s)"
 
-#: object-file.c:2559
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "неу�пешно изпълнение на „mmap“ върху „%s“"
 
-#: object-file.c:2564
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "заглавната ча�т на „%s“ не може да бъде разпакетирана"
 
-#: object-file.c:2570
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "заглавната ча�т на „%s“ не може да бъде анализирана"
 
-#: object-file.c:2581
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "�ъдържанието на „%s“ не може да бъде разпакетирано"
 
-#: object-name.c:486
+#: object-name.c:480
 #, c-format
 msgid "short object ID %s is ambiguous"
 msgstr "къ�и�т идентификатор на обект „%s“ не е еднозначен"
 
-#: object-name.c:497
+#: object-name.c:491
 msgid "The candidates are:"
 msgstr "Възможно�тите �а:"
 
-#: object-name.c:796
+#: object-name.c:790
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -6007,30 +6186,30 @@ msgstr ""
 "� 40 ше�тнаде�етични знака, защото �тандартно те ще бъдат пре�качани.\n"
 "Възможно е такива указатели да �а �ъздадени �лучайно.  �апример:\n"
 "\n"
-"    git switch -c $BRANCH $(git rev-parse …)\n"
+"    git switch -c $br $(git rev-parse …)\n"
 "\n"
-"където �тойно�тта на променливата на �редата BRANCH е празна, при което\n"
+"където �тойно�тта на променливата на �редата „$br“ е празна, при което\n"
 "�е �ъздава подобен указател.  Прегледайте тези указатели и ги изтрийте.\n"
 "За да изключите това �ъобщение, изпълнете:\n"
 "\n"
 "    git config advice.objectNameWarning false"
 
-#: object-name.c:916
+#: object-name.c:910
 #, c-format
 msgid "log for '%.*s' only goes back to %s"
 msgstr "журналът за „%.*s“ �тига �амо до „%s“"
 
-#: object-name.c:924
+#: object-name.c:918
 #, c-format
 msgid "log for '%.*s' only has %d entries"
 msgstr "журналът за „%.*s“ �ъдържа �амо %d запи�а"
 
-#: object-name.c:1702
+#: object-name.c:1696
 #, c-format
 msgid "path '%s' exists on disk, but not in '%.*s'"
 msgstr "път�т „%s“ �ъще�твува на ди�ка, но не и в „%.*s“"
 
-#: object-name.c:1708
+#: object-name.c:1702
 #, c-format
 msgid ""
 "path '%s' exists, but not '%s'\n"
@@ -6039,12 +6218,12 @@ msgstr ""
 "път�т „%s“ �ъще�твува на ди�ка, но не е в „%s“\n"
 "Пробвайте � „%.*s:%s“, което е �ъщото като „%.*s:./%s“."
 
-#: object-name.c:1717
+#: object-name.c:1711
 #, c-format
 msgid "path '%s' does not exist in '%.*s'"
 msgstr "път�т „%s“ не �ъще�твува в „%.*s“"
 
-#: object-name.c:1745
+#: object-name.c:1739
 #, c-format
 msgid ""
 "path '%s' is in the index, but not at stage %d\n"
@@ -6053,7 +6232,7 @@ msgstr ""
 "път�т „%s“ е в индек�а, но не вер�и� %d\n"
 "Пробвайте � „%d:%s“."
 
-#: object-name.c:1761
+#: object-name.c:1755
 #, c-format
 msgid ""
 "path '%s' is in the index, but not '%s'\n"
@@ -6062,21 +6241,21 @@ msgstr ""
 "път�т „%s“ е в индек�а, но не в „%s“\n"
 "Пробвайте � „%d:%s“, което е �ъщото като „%d:./%s“."
 
-#: object-name.c:1769
+#: object-name.c:1763
 #, c-format
 msgid "path '%s' exists on disk, but not in the index"
 msgstr "път�т „%s“ �ъще�твува на ди�ка, но не е в индек�а"
 
-#: object-name.c:1771
+#: object-name.c:1765
 #, c-format
 msgid "path '%s' does not exist (neither on disk nor in the index)"
 msgstr "път�т „%s“ не �ъще�твува нито на ди�ка, нито в индек�а"
 
-#: object-name.c:1784
+#: object-name.c:1778
 msgid "relative path syntax can't be used outside working tree"
 msgstr "отно�ителен път не може да �е ползва извън работното дърво"
 
-#: object-name.c:1922
+#: object-name.c:1916
 #, c-format
 msgid "invalid object name '%.*s'."
 msgstr "неправилно име на обект: „%.*s“"
@@ -6091,27 +6270,42 @@ msgstr "неправилен вид обект: „%s“"
 msgid "object %s is a %s, not a %s"
 msgstr "обектът „%s“ е %s, а не %s"
 
-#: object.c:232
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "обектът „%s“ е непознат вид: %d"
 
-#: object.c:245
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "обектът „%s“ не може да бъде анализиран"
 
-#: object.c:265 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "разлика в контролната �ума: „%s“"
 
-#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "задължителни�т обратен индек� лип�ва в многопакетната битова ма�ка"
+
+#: pack-bitmap.c:429
+msgid "load_reverse_index: could not open pack"
+msgstr ""
+"load_reverse_index: пакетът не може да �е отвори (при зареждане на обратни� "
+"индек�)"
+
+#: 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:1547 builtin/rev-list.c:92
+#: pack-bitmap.c:1935
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "„%s“ лип�ва в пакет „%s“ при отме�тване %<PRIuMAX>"
+
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "използваното м��то за „%s“ не може да бъде получено"
@@ -6143,132 +6337,142 @@ msgstr ""
 "идентификатор на контролна �ума %2$<PRIu32> на файла � обратен индек� „%1$s“ "
 "не �е поддържа"
 
-#: pack-write.c:250
+#: pack-write.c:251
 msgid "cannot both write and verify reverse index"
 msgstr "обратни�т индек� не може едновременно да �е запи�ва и да �е провер�ва"
 
-#: pack-write.c:271
+#: pack-write.c:270
 #, c-format
 msgid "could not stat: %s"
 msgstr "не може да �е получи информаци� чрез „stat“ за „%s“"
 
-#: pack-write.c:283
+#: pack-write.c:282
 #, c-format
 msgid "failed to make %s readable"
 msgstr "не може да �е дадат права за четене на „%s“"
 
-#: pack-write.c:522
+#: pack-write.c:520
 #, c-format
 msgid "could not write '%s' promisor file"
 msgstr "гарантиращи�т файл „%s“ не може да �е запише"
 
-#: packfile.c:625
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 "отме�тване преди кра� на пакетни� файл (възможно е индек�ът да е повреден)"
 
-#: packfile.c:1937
+#: packfile.c:657
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "не може да �е изпълни „mmap“ върху пакетни� файл „%s“%s"
+
+#: packfile.c:1924
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 "отме�тване преди началото на индек�а на пакетни� файл „%s“ (възможно е "
 "индек�ът да е повреден)"
 
-#: packfile.c:1941
+#: 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
+#: 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.c:38
+#: 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"
 msgstr "опци�та „%s“ изи�ква аргумент"
 
-#: parse-options.c:73
+#: parse-options.c:93
 #, c-format
 msgid "%s is incompatible with %s"
 msgstr "опциите „%s“ и „%s“ �а не�ъвме�тими"
 
-#: parse-options.c:78
+#: parse-options.c:98
 #, c-format
 msgid "%s : incompatible with something else"
 msgstr "опци�та „%s“ е не�ъвме�тима � нещо"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
 #, c-format
 msgid "%s takes no value"
 msgstr "опци�та „%s“ не приема аргументи"
 
-#: parse-options.c:94
+#: parse-options.c:114
 #, c-format
 msgid "%s isn't available"
 msgstr "опци�та „%s“ не е налична"
 
-#: parse-options.c:217
+#: parse-options.c:237
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr ""
 "„%s“ очаква неотрицателно ц�ло чи�ло, евентуално �ъ� �уфик� „k“/„m“/„g“"
 
-#: parse-options.c:386
+#: parse-options.c:393
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "нееднозначна опци�: „%s“ (може да е „--%s%s“ или „--%s%s“)"
 
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr "„--%s“ (� 2 тирета) ли имахте предвид?"
 
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "п�евдоним на „--%s“"
 
-#: parse-options.c:879
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "непозната опци�: „%s“"
 
-#: parse-options.c:881
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "непознат флаг „%c“"
 
-#: parse-options.c:883
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "непозната �тойно�т извън „ascii“ в низа: „%s“"
 
-#: parse-options.c:907
+#: parse-options.c:920
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:926
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "употреба: %s"
@@ -6276,48 +6480,72 @@ msgstr "употреба: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:932
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "     или: %s"
 
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. 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:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:974
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-ЧИСЛО"
 
-#: path.c:915
+#: path.c:922
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "�е може да �е дадат права за запи� в директори�та „%s“ на групата"
 
-#: pathspec.c:151
+#: pathspec.c:150
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 "Екраниращи�т знак „\\“не може да е по�леден знак в �тойно�тта на атрибут"
 
-#: pathspec.c:169
+#: pathspec.c:168
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Позволено е �амо едно указване на „attr:“."
 
-#: pathspec.c:172
+#: pathspec.c:171
 msgid "attr spec must not be empty"
 msgstr "„attr:“ тр�бва да указва �тойно�т"
 
-#: pathspec.c:215
+#: pathspec.c:214
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "неправилно име на атрибут: „%s“"
 
-#: pathspec.c:280
+#: pathspec.c:279
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr "глобалните на�тройки за пътища „glob“ и „noglob“ �а не�ъвме�тими"
 
-#: pathspec.c:287
+#: pathspec.c:286
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -6325,51 +6553,51 @@ msgstr ""
 "глобалната на�тройка за до�ловни пътища „literal“ е не�ъвме�тима � в�ички "
 "други глобални на�тройки за пътища"
 
-#: pathspec.c:327
+#: pathspec.c:326
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "неправилен параметър за опци�та за магиче�ки пътища „prefix“"
 
-#: pathspec.c:348
+#: pathspec.c:347
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "�еправилна �тойно�т за опци�та за магиче�ки пътища „%.*s“ в „%s“"
 
-#: pathspec.c:353
+#: pathspec.c:352
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "Знакът „)“ лип�ва в опци�та за магиче�ки пътища в „%s“"
 
-#: pathspec.c:391
+#: pathspec.c:390
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Магиче�ките пътища „%c“ �а без реализаци� за „%s“"
 
-#: pathspec.c:450
+#: pathspec.c:449
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: опциите „literal“ и „glob“ �а не�ъвме�тими"
 
-#: pathspec.c:466
+#: pathspec.c:465
 #, c-format
 msgid "%s: '%s' is outside repository at '%s'"
 msgstr "%s: „%s“ е извън хранилището при „%s“"
 
-#: pathspec.c:542
+#: pathspec.c:541
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "„%s“ (клавиш: „%c“)"
 
-#: pathspec.c:552
+#: pathspec.c:551
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: магиче�ките пътища не �е поддържат от командата „%s“"
 
-#: pathspec.c:619
+#: pathspec.c:618
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "път�т „%s“ е �лед �имволна връзка"
 
-#: pathspec.c:664
+#: pathspec.c:663
 #, c-format
 msgid "line is badly quoted: %s"
 msgstr "неправилно цитиран ред: %s"
@@ -6383,14 +6611,14 @@ msgid "unable to write delim packet"
 msgstr "раздел�щи�т пакет не може да �е запише"
 
 #: pkt-line.c:106
-msgid "unable to write stateless separator packet"
-msgstr "раздел�щи�т пакет без запазване на �ъ�то�ние не може да �е запише"
+msgid "unable to write response end packet"
+msgstr "пакетът за край на отговора не може да �е запише"
 
 #: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr "неу�пешно изчи�тване на буферите при запи� на пакет"
 
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
 msgid "protocol error: impossibly long line"
 msgstr "протоколна грешка: прекалено дълъг ред"
 
@@ -6398,7 +6626,7 @@ msgstr "протоколна грешка: прекалено дълъг ред"
 msgid "packet write with format failed"
 msgstr "неу�пешен запи� на пакет � формат"
 
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
 msgid "packet write failed - data exceeds max packet size"
 msgstr ""
 "неу�пешен запи� на пакетен файл — данните надвишават мак�имални�т размер на "
@@ -6409,25 +6637,25 @@ msgstr ""
 msgid "packet write failed: %s"
 msgstr "неу�пешен запи� на пакет: %s"
 
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
 msgid "read error"
 msgstr "грешка при четене"
 
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
 msgid "the remote end hung up unexpectedly"
 msgstr "отдалеченото хранилище неочаквано прекъ�на връзката"
 
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "протоколна грешка: неправилeн знак за дължина на ред: %.4s"
 
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: 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:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "отдалечена грешка: %s"
@@ -6441,25 +6669,25 @@ msgstr "Обнов�ване на индек�а"
 msgid "unable to create threaded lstat: %s"
 msgstr "не може да �е �ъздаде нишка за изпълнението на „lstat“: %s"
 
-#: pretty.c:988
+#: pretty.c:1051
 msgid "unable to parse --pretty format"
 msgstr "аргументът към опци�та „--pretty“ не може да �е анализира"
 
-#: promisor-remote.c:30
+#: promisor-remote.c:31
 msgid "promisor-remote: unable to fork off fetch subprocess"
 msgstr "хранилище-гарант: неу�пешно �ъздаване на проце� за до�тав�не"
 
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
 msgid "promisor-remote: could not write to fetch subprocess"
 msgstr "хранилище-гарант: не може да �е пише към проце�а за до�тав�не"
 
-#: promisor-remote.c:41
+#: promisor-remote.c:44
 msgid "promisor-remote: could not close stdin to fetch subprocess"
 msgstr ""
 "хранилище-гарант: �тандартни�т вход на проце�а за до�тав�не не може да �е "
 "затвори"
 
-#: promisor-remote.c:53
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr ""
@@ -6473,21 +6701,21 @@ msgstr "object-info: Ñ�лед аргументите Ñ�е очаква изчиÑ
 msgid "Removing duplicate objects"
 msgstr "Изтриване на повтар�щите �е обекти"
 
-#: range-diff.c:78
+#: range-diff.c:67
 msgid "could not start `log`"
 msgstr "командата за журнала � подавани� „log“ не може да �е �тартира"
 
-#: range-diff.c:80
+#: range-diff.c:69
 msgid "could not read `log` output"
 msgstr ""
 "изходът от командата за журнала � подавани� „log“ не може да �е прочете"
 
-#: range-diff.c:101 sequencer.c:5551
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "подаването „%s“ не може да бъде анализирано"
 
-#: range-diff.c:115
+#: range-diff.c:111
 #, c-format
 msgid ""
 "could not parse first line of `log` output: did not start with 'commit ': "
@@ -6496,71 +6724,67 @@ msgstr ""
 "първи�т ред от изхода на командата „log“ не може да �е анализира, защото не "
 "започва � „commit “: „%s“"
 
-#: range-diff.c:140
+#: range-diff.c:137
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "заглавната ча�т на git „%.*s“ не може да �е анализира"
 
-#: range-diff.c:306
+#: range-diff.c:304
 msgid "failed to generate diff"
 msgstr "неу�пешно тър�ене на разлика"
 
-#: range-diff.c:558
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "опциите „--left-only“ и „--right-only“ �а не�ъвме�тими"
-
-#: range-diff.c:561 range-diff.c:563
+#: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "журналът � подавани�та на „%s“ не може да бъде анализиран"
 
-#: read-cache.c:708
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr ""
 "н�ма да бъде добавен п�евдоним за файл „%s“ („%s“ вече �ъще�твува в индек�а)"
 
-#: read-cache.c:724
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr "в базата от данни за обектите не може да �е �ъздаде празен обект-BLOB"
 
-#: read-cache.c:746
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 "%s: може да добав�те �амо обикновени файлове, �имволни връзки и директории "
 "на git"
 
-#: read-cache.c:751
+#: 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:803
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "файлът „%s“ не може да бъде индек�иран"
 
-#: read-cache.c:822
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "„%s“ не може да �е добави в индек�а"
 
-#: read-cache.c:833
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "„stat“ не може да �е изпълни върху „%s“"
 
-#: read-cache.c:1356
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "„%s“ �ъще�твува и като файл, и като директори�"
 
-#: read-cache.c:1571
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "Обнов�ване на индек�а"
 
-#: read-cache.c:1700
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6569,7 +6793,7 @@ msgstr ""
 "Зададена е неправилна �тойно�т на на�тройката „index.version“.\n"
 "Ще �е ползва вер�и� %i"
 
-#: read-cache.c:1710
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6579,146 +6803,152 @@ msgstr ""
 "„GIT_INDEX_VERSION“.\n"
 "Ще �е ползва вер�и� %i"
 
-#: read-cache.c:1766
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "неправилен подпи�: „0x%08x“"
 
-#: read-cache.c:1769
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "неправилна вер�и� на индек�а %d"
 
-#: read-cache.c:1778
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "неправилен подпи� за контролна �ума по SHA1 на файла на индек�а"
 
-#: read-cache.c:1812
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr ""
 "индек�ът ползва разширение „%.4s“, което не �е поддържа от тази вер�и� на git"
 
-#: read-cache.c:1814
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "игнориране на разширението „%.4s“"
 
-#: read-cache.c:1851
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "непознат формат на запи� в индек�а: „0x%08x“"
 
-#: read-cache.c:1867
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "неправилно име на поле в индек�а близо до път� „%s“"
 
-#: read-cache.c:1924
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr "неподредени запи�и в индек�а"
 
-#: read-cache.c:1927
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "множе�тво запи�и за �лети� файл „%s“"
 
-#: read-cache.c:1930
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "неподредени запи�и за „%s“"
 
-#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:332
+#: 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:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr "файлът � индек�а е повреден"
 
-#: read-cache.c:2180
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
-msgstr "не може да �е �ъздаде нишка за зареждане на обектите от кеша: %s"
+msgstr ""
+"не може да �е �ъздаде нишка за зареждане на обектите от кеша "
+"(load_cache_entries): %s"
 
-#: read-cache.c:2193
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
-msgstr "не може да �е изчака нишка за зареждане на обектите от кеша: %s"
+msgstr ""
+"не може да �е изчака нишка за зареждане на обектите от кеша "
+"(load_cache_entries): %s"
 
-#: read-cache.c:2226
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: неу�пешно отвар�не на файла на индек�а"
 
-#: read-cache.c:2230
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: не може да �е получи информаци� за отворени� индек� �ъ� „stat“"
 
-#: read-cache.c:2234
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: файлът на индек�а е по-малък от очакваното"
 
-#: read-cache.c:2238
+#: read-cache.c:2280
 #, c-format
-msgid "%s: unable to map index file"
-msgstr "%s: неу�пешно задел�не на �ъответ�тваща памет чрез „mmap“ на индек�а"
+msgid "%s: unable to map index file%s"
+msgstr "%s: неу�пешно изпълнение на „mmap“ върху индек�ни� файл%s"
 
-#: read-cache.c:2280
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr ""
-"не може да �е �ъздаде нишка за зареждане на разширени�та на индек�а: %s"
+"не може да �е �ъздаде нишка за зареждане на разширени�та на индек�а "
+"(load_index_extensions): %s"
 
-#: read-cache.c:2307
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr ""
-"не може да �е �ъздаде нишка за зареждане на разширени�та на индек�а: %s"
+"не може да �е �ъздаде нишка за зареждане на разширени�та на индек�а "
+"(load_index_extensions): %s"
 
-#: read-cache.c:2345
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "�поделени�т индек� „%s“ не може да �е обнови"
 
-#: read-cache.c:2392
+#: 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:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: 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:3138
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr "индек�ът не може да бъде превърнат в ча�тичен"
 
-#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "неу�пешно изпълнение на „stat“ върху „%s“"
 
-#: read-cache.c:3222
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "не може да �е отвори директори�та на git: %s"
 
-#: read-cache.c:3234
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "неу�пешно изтриване на „%s“"
 
-#: read-cache.c:3263
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "правата за до�тъп до „%s“ не може да бъдат поправени"
 
-#: read-cache.c:3412
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: не може да �е премине към етап №0"
@@ -6800,7 +7030,7 @@ msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Пребазиране на „%s“ върху „%s“ (%d команди)"
 msgstr[1] "Пребазиране на „%s“ върху „%s“ (%d команда)"
 
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6808,7 +7038,7 @@ msgstr ""
 "\n"
 "�е изтривайте редове.  Подавани�та може да �е пре�качат � командата „drop“.\n"
 
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6816,7 +7046,7 @@ msgstr ""
 "\n"
 "�ко изтриете ред, �ъответ�тващото му подаване ще бъде ИЗТРИТО.\n"
 
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6831,7 +7061,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -6841,14 +7071,14 @@ msgstr ""
 "�ко изтриете в�ичко, пребазирането ще бъде преу�тановено.\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816
-#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
+#: 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'"
 msgstr "„%s“ не може да �е запише"
 
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
 #, c-format
 msgid "could not write '%s'."
 msgstr "„%s“ не може да �е запише."
@@ -6879,14 +7109,12 @@ msgstr ""
 "предупреждение)\n"
 "или „error“ (�читане за грешка).\n"
 
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
 #, c-format
-msgid "could not read '%s'."
-msgstr "от „%s“ не може да �е чете."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: „merges“ замен� „preserve“"
 
-#: ref-filter.c:42 wt-status.c:1978
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "изтрит"
 
@@ -6905,257 +7133,229 @@ msgstr "назад � %d"
 msgid "ahead %d, behind %d"
 msgstr "напред � %d, назад � %d"
 
-#: ref-filter.c:175
+#: ref-filter.c:235
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "очакван формат: %%(color:ЦВЯТ)"
 
-#: ref-filter.c:177
+#: ref-filter.c:237
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "непознат цв�т: %%(color:%s)"
 
-#: ref-filter.c:199
+#: ref-filter.c:259
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "очаква �е ц�ло чи�ло за „refname:lstrip=%s“"
 
-#: ref-filter.c:203
+#: ref-filter.c:263
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "очаква �е ц�ло чи�ло за „refname:rstrip=%s“"
 
-#: ref-filter.c:205
+#: 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"
 
-#: ref-filter.c:260
+#: ref-filter.c:320
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) не приема аргументи"
 
-#: ref-filter.c:282
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "непознат аргумент за %%(objectsize): %s"
-
-#: ref-filter.c:290
+#: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) не приема аргументи"
 
-#: ref-filter.c:302
+#: ref-filter.c:364
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) не приема аргументи"
 
-#: ref-filter.c:315
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "непознат аргумент за %%(subject): %s"
-
-#: ref-filter.c:334
+#: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
-msgstr "очаква �е %%(trailers:КЛЮЧ=СТОЙ�ОСТ)"
+msgstr "очаква �е %%(trailers:key=ЕПИЛОГ)"
 
-#: ref-filter.c:336
+#: ref-filter.c:398
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "непознат аргумент „%%(trailers)“: %s"
 
-#: ref-filter.c:367
+#: ref-filter.c:429
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "очаква �е положителна �тойно�т за „contents:lines=%s“"
 
-#: ref-filter.c:369
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "непознат аргумент за %%(contents): %s"
-
-#: ref-filter.c:384
+#: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "очаква �е положителна �тойно�т за „%s“ в %%(%s)"
 
-#: ref-filter.c:388
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "непознат аргумент „%s“ в %%(%s)"
-
-#: ref-filter.c:402
+#: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
 msgstr "непозната опци� за е-поща: %s"
 
-#: ref-filter.c:432
+#: ref-filter.c:506
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "очакван формат: %%(align:ШИРОЧИ��,ПОЗИЦИЯ)"
 
-#: ref-filter.c:444
+#: ref-filter.c:518
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "непозната позици�: %s"
 
-#: ref-filter.c:451
+#: ref-filter.c:525
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "непозната широчина: %s"
 
-#: ref-filter.c:460
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "непознат аргумент за %%(align): %s"
-
-#: ref-filter.c:468
+#: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "очаква �е положителна широчина � лек�емата „%%(align)“"
 
-#: ref-filter.c:486
+#: ref-filter.c:568
 #, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "непознат аргумент за „%%(if)“: %s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) не приема аргументи"
 
-#: ref-filter.c:588
+#: ref-filter.c:680
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "неправилно име на обект: „%.*s“"
 
-#: ref-filter.c:615
+#: ref-filter.c:707
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "непознато име на обект: „%.*s“"
 
-#: ref-filter.c:619
+#: ref-filter.c:711
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr "не е хранилище на git, а полето „%.*s“ изи�ква до�тъп данни на обектни"
 
-#: ref-filter.c:743
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "формат: лек�емата %%(if) е използвана без �ъответната � %%(then)"
-
-#: ref-filter.c:807
+#: 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:809
+#: ref-filter.c:912
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "формат: лек�емата %%(then) е използвана повече от един път"
 
-#: ref-filter.c:811
+#: ref-filter.c:914
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "формат: лек�емата %%(then) е използвана �лед %%(else)"
 
-#: ref-filter.c:839
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "формат: лек�емата %%(else) е използвана без �ъответната � %%(if)"
-
-#: ref-filter.c:841
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "формат: лек�емата %%(else) е използвана без �ъответната � %%(then)"
-
-#: ref-filter.c:843
+#: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "формат: лек�емата %%(else) е използвана повече от един път"
 
-#: ref-filter.c:858
+#: ref-filter.c:965
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "формат: лек�емата %%(end) е използвана без �ъответната �"
 
-#: ref-filter.c:915
+#: ref-filter.c:1027
 #, c-format
 msgid "malformed format string %s"
 msgstr "неправилен форматиращ низ „%s“"
 
-#: ref-filter.c:1556
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "тази команда отхвърли лек�емата %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr ""
+"опци�та „--format=%.*s“ е не�ъвме�тима � „--python“, „--shell“, „--tcl“"
+
+#: ref-filter.c:1706
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(извън клон, пребазиране на „%s“)"
 
-#: ref-filter.c:1559
+#: ref-filter.c:1709
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr "(извън клон, пребазиране на не�вързан указател „HEAD“ при „%s“)"
 
-#: ref-filter.c:1562
+#: ref-filter.c:1712
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(извън клон, двоично тър�ене от „%s“)"
 
-#: ref-filter.c:1566
+#: ref-filter.c:1716
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(указател�т „HEAD“ не е �вързан и е при „%s“)"
 
-#: ref-filter.c:1569
+#: ref-filter.c:1719
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(указател�т „HEAD“ не е �вързан и е отделѐн от „%s“)"
 
-#: ref-filter.c:1572
+#: ref-filter.c:1722
 msgid "(no branch)"
 msgstr "(извън клон)"
 
-#: ref-filter.c:1604 ref-filter.c:1813
+#: ref-filter.c:1754 ref-filter.c:1972
 #, c-format
 msgid "missing object %s for %s"
 msgstr "обектът „%s“ лип�ва за „%s“"
 
-#: ref-filter.c:1614
+#: ref-filter.c:1764
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "неу�пешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
 
-#: ref-filter.c:1997
+#: ref-filter.c:2155
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "обект �ъ� �грешен формат при „%s“"
 
-#: ref-filter.c:2086
+#: ref-filter.c:2245
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "игнориране на указател� � грешно име „%s“"
 
-#: ref-filter.c:2091 refs.c:676
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "игнориране на повредени� указател „%s“"
 
-#: ref-filter.c:2431
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "грешка във форма̀та: лип�ва лек�емата %%(end)"
 
-#: ref-filter.c:2525
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "неправилно име на обект „%s“"
 
-#: ref-filter.c:2530
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "опци�та „%s“ не �очи към подаване"
 
-#: refs.c:264
+#: refs.c:261
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr "„%s“ не �очи към позволен обект!"
 
-#: refs.c:566
+#: refs.c:563
 #, c-format
 msgid ""
 "Using '%s' as the name for the initial branch. This default branch name\n"
@@ -7180,12 +7380,12 @@ msgstr ""
 "\n"
 "    git branch -m ИМЕ\n"
 
-#: refs.c:588
+#: refs.c:585
 #, c-format
 msgid "could not retrieve `%s`"
 msgstr "„%s“ не може да бъде получен"
 
-#: refs.c:598
+#: refs.c:595
 #, c-format
 msgid "invalid branch name: %s = %s"
 msgstr "неправилно име на клон: „%s = %s“"
@@ -7195,66 +7395,66 @@ msgstr "неправилно име на клон: „%s = %s“"
 msgid "ignoring dangling symref %s"
 msgstr "игнориране на указател на обект извън клон „%s“"
 
-#: refs.c:922
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "има пропу�ки в журнала � подавани�та за указател� „%s“ �лед „%s“"
 
-#: refs.c:929
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "журналът � подавани�та за указател� „%s“ �вършва неочаквано �лед „%s“"
 
-#: refs.c:994
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "журналът � подавани�та за указател� „%s“ е празен"
 
-#: refs.c:1086
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "указател не може да �е обнови � грешно име „%s“"
 
-#: refs.c:1157
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
-msgstr "неу�пешно обнов�ване на указател� „%s“: %s"
+msgstr "неу�пешно обнов�ване на указател� (update_ref) „%s“: %s"
 
-#: refs.c:2051
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "не �а позволени повече от една промени на указател� „%s“"
 
-#: refs.c:2131
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "обнов�вани�та на указатели �а забранени в �реди под карантина"
 
-#: refs.c:2142
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "обнов�вани�та на указатели �а преу�тановени от кука"
 
-#: refs.c:2242 refs.c:2272
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "„%s“ �ъще�твува, не може да �е �ъздаде „%s“"
 
-#: refs.c:2248 refs.c:2283
+#: 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:1228
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr "Указател�т „%s“ не може да бъде изтрит"
 
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: 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:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr "Указателите не може да бъдат изтрити: %s"
@@ -7264,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“ �ъвпада � повече от един обект"
@@ -7317,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"
@@ -7341,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"
@@ -7352,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"
@@ -7363,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"
@@ -7373,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"
@@ -7383,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 ""
@@ -7502,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"
@@ -7521,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“ не може да бъде анализирано"
@@ -7558,7 +7758,7 @@ msgstr "приложеното коригиране на конфликт не Ð
 msgid "there were errors while writing '%s' (%s)"
 msgstr "грешки при запи�ването на „%s“ (%s)"
 
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "грешка при изчи�тването на буферите при запи�ването на „%s“"
@@ -7606,8 +7806,8 @@ msgstr "излишниÑ�Ñ‚ обект „%s“ не може да Ñ�е изтрÐ
 msgid "Recorded preimage for '%s'"
 msgstr "Предварителни�т вариант на „%s“ е запазен"
 
-#: rerere.c:865 submodule.c:2089 builtin/log.c:2000
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
+#: 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“ не може да бъде �ъздадена"
@@ -7645,49 +7845,35 @@ msgstr "директори�та „rr-cache“ не може да �е отво
 msgid "could not determine HEAD revision"
 msgstr "не може да �е определи към какво да �очи указател�т „HEAD“"
 
-#: reset.c:70 reset.c:76 sequencer.c:3669
+#: reset.c:70 reset.c:76 sequencer.c:3700
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "дървото, �очено от „%s“, не може да бъде открито"
 
-#: revision.c:2343
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "опци�та „--unpacked=П�КЕТЕ�_Ф�ЙЛ“ вече не �е поддържа"
 
-#: revision.c:2683
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr "Текущи�т клон е повреден"
 
-#: revision.c:2686
+#: revision.c:2689
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "Текущи�т клон „%s“ е без подавани� "
 
-#: revision.c:2892
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr ""
 "опци�та „-L“ поддържа един�твено форматирането на разликите �поред опциите „-"
 "p“ и „-s“"
 
-#: run-command.c:767
-msgid "open /dev/null failed"
-msgstr "неу�пешно отвар�не на „/dev/null“"
-
-#: run-command.c:1275
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "не може да �е �ъздаде а�инхронна нишка: %s"
 
-#: run-command.c:1345
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Куката „%s“ �е пре�кача, защото лип�ват права за изпълнение.\n"
-"За да изключите това предупреждение, изпълнете:\n"
-"    git config advice.ignoredHook false"
-
 #: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
@@ -7709,24 +7895,24 @@ msgstr "неу�пешно отдалечено разпакетиране: %s"
 msgid "failed to sign the push certificate"
 msgstr "�ертификатът за изтла�кване не може да бъде подпи�ан"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "send-pack: unable to fork off fetch subprocess"
 msgstr "send-pack: неу�пешно �ъздаване на проце�"
 
-#: send-pack.c:455
+#: send-pack.c:457
 msgid "push negotiation failed; proceeding anyway with push"
 msgstr "неу�пешно договар�не на изтла�кване, но �е продължава � изтла�кването"
 
-#: send-pack.c:520
+#: send-pack.c:528
 msgid "the receiving end does not support this repository's hash algorithm"
 msgstr ""
 "от�рещната �трана не поддържа алгоритъма за контролни �уми на това хранилище"
 
-#: send-pack.c:529
+#: send-pack.c:537
 msgid "the receiving end does not support --signed push"
 msgstr "от�рещната �трана не поддържа изтла�кване � опци�та „--signed“"
 
-#: send-pack.c:531
+#: send-pack.c:539
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -7734,101 +7920,155 @@ msgstr ""
 "от�рещната �трана не поддържа изтла�кване � опци�та „--signed“, затова не �е "
 "използва �ертификат"
 
-#: send-pack.c:543
+#: send-pack.c:546
 msgid "the receiving end does not support --atomic push"
 msgstr "получаващата �трана не поддържа изтла�кване � опци�та „--atomic“"
 
-#: send-pack.c:548
+#: send-pack.c:551
 msgid "the receiving end does not support push options"
 msgstr "от�рещната �трана не поддържа опции при изтла�кване"
 
-#: sequencer.c:196
+#: sequencer.c:197
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "не�ъще�твуващ режим на изчи�тване „%s“ на �ъобщение при подаване"
 
-#: sequencer.c:324
+#: sequencer.c:325
 #, c-format
 msgid "could not delete '%s'"
 msgstr "„%s“ не може да бъде изтрит"
 
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: 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“ не може да бъде изтрит"
 
-#: sequencer.c:354
+#: sequencer.c:355
 msgid "revert"
 msgstr "отм�на"
 
-#: sequencer.c:356
+#: sequencer.c:357
 msgid "cherry-pick"
 msgstr "отбиране"
 
-#: sequencer.c:358
+#: sequencer.c:359
 msgid "rebase"
 msgstr "пребазиране"
 
-#: sequencer.c:360
+#: sequencer.c:361
 #, c-format
 msgid "unknown action: %d"
 msgstr "неизве�тно дей�твие: %d"
 
-#: sequencer.c:419
+#: sequencer.c:420
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr ""
-"�лед коригирането на конфликтите, отбележете �ъответните\n"
-"пътища � „git add ПЪТ…“ или „git rm ПЪТ…“."
+"�лед коригирането на конфликтите, отбележете �ъответните пътища �:\n"
+"\n"
+"    git add ПЪТ…\n"
+"\n"
+"или\n"
+"\n"
+"    git rm ПЪТ…"
 
-#: sequencer.c:422
+#: sequencer.c:423
 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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
+msgstr ""
+"След коригирането на конфликтите отбележете решаването им чрез:\n"
+"\n"
+"    git add/rm ПЪТ…\n"
+"\n"
+"и изпълнете:\n"
+"\n"
+"    git cherry-pick --continue\n"
+"\n"
+"�ко предпочитате да пре�кочите тази кръпка, изпълнете:\n"
+"\n"
+"    git cherry-pick --skip\n"
+"\n"
+"За да откажете пребазирането и да �е върнете към първоначалното �ъ�то�ние,\n"
+"изпълнете:\n"
+"\n"
+"    git cherry-pick --abort"
+
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
 msgstr ""
-"�лед коригирането на конфликтите, отбележете �ъответните\n"
-"пътища � „git add ПЪТ…“ или „git rm ПЪТ…“, �лед което\n"
-"подайте резултата � командата „git commit'“."
+"След коригирането на конфликтите отбележете решаването им чрез:\n"
+"\n"
+"    git add/rm ПЪТ…\n"
+"\n"
+"и изпълнете:\n"
+"\n"
+"    git revert --continue\n"
+"\n"
+"�ко предпочитате да пре�кочите тази кръпка, изпълнете:\n"
+"\n"
+"    git revert --skip\n"
+"\n"
+"За да откажете пребазирането и да �е върнете към първоначалното �ъ�то�ние,\n"
+"изпълнете:\n"
+"\n"
+"    git revert --abort"
 
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "„%s“ не може да �е заключи"
 
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#: 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“ не може да �е пише"
 
-#: sequencer.c:442
+#: sequencer.c:455
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "кра�т на ред не може да �е запише в „%s“"
 
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3554
+#: 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:486
+#: 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."
 msgstr "локалните ви промени ще бъдат презапи�ани при %s."
 
-#: sequencer.c:490
+#: sequencer.c:503
 msgid "commit your changes or stash them to proceed."
 msgstr "подайте или �катайте промените, за да продължите"
 
-#: sequencer.c:522
+#: sequencer.c:535
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: превъртане"
 
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "�е�ъще�твуващ режим на изчи�тване „%s“"
@@ -7836,65 +8076,65 @@ msgstr "�е�ъще�твуващ режим на изчи�тване „%s“
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
 #.
-#: sequencer.c:671
+#: sequencer.c:685
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: нови�т индек� не може да бъде запазен"
 
-#: sequencer.c:685
+#: sequencer.c:699
 msgid "unable to update cache tree"
 msgstr "дървото на кеша не може да бъде обновено"
 
-#: sequencer.c:699
+#: sequencer.c:713
 msgid "could not resolve HEAD commit"
 msgstr "подаването, �очено от указател� „HEAD“, не може да бъде открито"
 
-#: sequencer.c:779
+#: sequencer.c:793
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "в „%.*s“ н�ма ключове"
 
-#: sequencer.c:790
+#: sequencer.c:804
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "цитирането на �тойно�тта на „%s“ не може да бъде изчи�тено"
 
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
-#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
+#: 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“"
 
-#: sequencer.c:837
+#: sequencer.c:851
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "на�тройката за автор „GIT_AUTHOR_NAME“ вече е зададена"
 
-#: sequencer.c:842
+#: sequencer.c:856
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "на�тройката за е-поща „GIT_AUTHOR_EMAIL“ вече е зададена"
 
-#: sequencer.c:847
+#: sequencer.c:861
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "на�тройката за дата „GIT_AUTHOR_DATE“ вече е зададена"
 
-#: sequencer.c:851
+#: sequencer.c:865
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "непозната променлива „%s“"
 
-#: sequencer.c:856
+#: sequencer.c:870
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "на�тройката за автор „GIT_AUTHOR_NAME“ лип�ва"
 
-#: sequencer.c:858
+#: sequencer.c:872
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "на�тройката за е-поща „GIT_AUTHOR_EMAIL“ лип�ва"
 
-#: sequencer.c:860
+#: sequencer.c:874
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "на�тройката за дата „GIT_AUTHOR_DATE“ лип�ва"
 
-#: sequencer.c:925
+#: sequencer.c:939
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -7923,13 +8163,13 @@ msgstr ""
 "\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:1212
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 "неу�пешно изпълнение на куката при пром�на на �ъобщението при подаване "
 "(prepare-commit-msg)"
 
-#: sequencer.c:1218
+#: 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"
@@ -7957,7 +8197,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1231
+#: 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"
@@ -7982,355 +8222,362 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1273
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "току що �ъздаденото подаване не може да бъде открито"
 
-#: sequencer.c:1275
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr "току що �ъздаденото подаване не може да бъде анализирано"
 
-#: sequencer.c:1321
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr ""
 "�ъ�то�нието �очено от указател� „HEAD“ не може да бъде открито �лед "
 "подаването"
 
-#: sequencer.c:1323
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "не�вързан връх „HEAD“"
 
-#: sequencer.c:1327
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (начално подаване)"
 
-#: sequencer.c:1348
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "указател�т „HEAD“ не може да бъде анализиран"
 
-#: sequencer.c:1350
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "указател�т „HEAD“ „%s“ �очи към нещо, което не е подаване!"
 
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
 msgid "could not parse HEAD commit"
 msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
 
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "авторът на подаването не може да бъде анализиран"
 
-#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
+#: 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:1454 sequencer.c:1574
+#: sequencer.c:1473 sequencer.c:1593
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "�ъобщението за подаване не може да бъде прочетено от „%s“"
 
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "неправилна �амолично�т за автор: „%s“"
 
-#: sequencer.c:1491
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "повредена информаци� за автор: лип�ва дата"
 
-#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
-#: builtin/merge.c:934 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:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#: 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:1606
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "подаването „%s“ не може да бъде анализирано"
 
-#: sequencer.c:1611
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "родител�кото подаване „%s“ не може да бъде анализирано"
 
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "непозната команда: %d"
 
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "Това е 1-то �ъобщение при подаване:"
 
-#: sequencer.c:1737
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Това е �ъобщение при подаване №%d:"
 
-#: sequencer.c:1738
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "Съобщението при подаване №1 ще бъде пре�кочено:"
 
-#: sequencer.c:1739
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Съобщението при подаване №%d ще бъде пре�кочено:"
 
-#: sequencer.c:1740
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Това е обединение от %d подавани�"
 
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "„%s“ не може да �е запази"
 
-#: sequencer.c:1934
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "За вкарване в предходното подаване ви тр�бва указател „HEAD“"
 
-#: sequencer.c:1936 sequencer.c:3581
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "указател�т „HEAD“ не може да �е прочете"
 
-#: sequencer.c:1938
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr ""
 "�ъобщението за подаване към указател� „HEAD“ не може да бъде прочетено: %s"
 
-#: sequencer.c:1962
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "�ъобщението за подаване към „%s“ не може да бъде прочетено"
 
-#: sequencer.c:2072
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "индек�ът не е �л�т."
 
-#: sequencer.c:2079
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "началното подаване не може да �е вкара в предходното му"
 
-#: sequencer.c:2098
+#: sequencer.c:2117
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "подаването „%s“ е �ливане, но не е дадена опци�та „-m“"
 
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2125 sequencer.c:2133
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "подаването „%s“ н�ма родител %d"
 
-#: sequencer.c:2120
+#: 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:2139
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: неразпозната �тойно�т за родител�кото подаване „%s“"
 
-#: sequencer.c:2205
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "„%s“ не може да �е преименува на „%s“"
 
-#: sequencer.c:2265
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "подаването „%s“… не може да бъде отменено: „%s“"
 
-#: sequencer.c:2266
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "подаването „%s“… не може да бъде приложено: „%s“"
 
-#: sequencer.c:2287
+#: sequencer.c:2306
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr "пре�качане на %s %s — кръпката вече е приложена\n"
 
-#: sequencer.c:2345
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: неу�пешно изчитане на индек�а"
 
-#: sequencer.c:2352
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: неу�пешно обнов�ване на индек�а"
 
-#: sequencer.c:2425
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "„%s“ не приема аргументи: „%s“"
 
-#: sequencer.c:2434
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "„%s“ изи�ква аргументи"
 
-#: sequencer.c:2477
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "„%s“ не може да �е анализира"
 
-#: sequencer.c:2538
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "неправилен ред %d: %.*s"
 
-#: sequencer.c:2549
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "Без предишно подаване не може да �е изпълни „%s“"
 
-#: sequencer.c:2635
+#: sequencer.c:2624 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "от „%s“ не може да �е чете."
+
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "преу�танов�ване на извършваното в момента отбиране на подавани�"
 
-#: sequencer.c:2644
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "преу�танов�ване на извършваното в момента отм�на на подаване"
 
-#: sequencer.c:2690
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "коригирайте това чрез „git rebase --edit-todo“."
 
-#: sequencer.c:2692
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "неизползваем файл � опи�ание на пред�то�щите дей�тви�: „%s“"
 
-#: sequencer.c:2697
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "никое от подавани�та не може да �е разпознае."
 
-#: sequencer.c:2708
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr ""
 "по време на отм�на на подаване не може да �е извърши отбиране на подаване."
 
-#: sequencer.c:2710
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "по време на отбиране не може да �е извърши отм�на на подаване."
 
-#: sequencer.c:2788
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "неправилна �тойно�т за „%s“: „%s“"
 
-#: sequencer.c:2897
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "подаването, в което другите да �е вкарат, не може да �е използва"
 
-#: sequencer.c:2917
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "неправилен файл � опции: „%s“"
 
-#: sequencer.c:3012 sequencer.c:4869
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "зададено е празно множе�тво от подавани�"
 
-#: sequencer.c:3029
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "в момента вече �е извършва отм�на на подавани�"
 
-#: sequencer.c:3031
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
+msgstr "използвайте „git revert (--continue | %s--abort | --quit)“"
 
-#: sequencer.c:3034
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "в момента вече �е извършва отбиране на подавани�"
 
-#: sequencer.c:3036
+#: sequencer.c:3057
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
 
-#: sequencer.c:3050
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr ""
 "директори�та за определ�нето на по�ледователно�тта „%s“ не може да бъде "
 "�ъздадена"
 
-#: sequencer.c:3065
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "указател�т „HEAD“ не може да �е заключи"
 
-#: sequencer.c:3125 sequencer.c:4582
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 "в момента не �е извършва отбиране на подавани� или пребазиране на клона"
 
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "Подаването �очено от указател� „HEAD“ не може да бъде открито"
 
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3150 sequencer.c:3194
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 "дей�твието не може да бъде преу�тановено, когато �те на клон, който тепърва "
 "пред�тои да бъде �ъздаден"
 
-#: sequencer.c:3159 builtin/grep.c:759
+#: 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:3161
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "„%s“ не може да бъде прочетен: %s"
 
-#: sequencer.c:3162
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "неочакван край на файл"
 
-#: sequencer.c:3168
+#: sequencer.c:3189
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 "запазени�т преди започването на отбирането файл за указател� „HEAD“ — „%s“ е "
 "повреден"
 
-#: sequencer.c:3179
+#: sequencer.c:3200
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Изглежда указател�т „HEAD“ е променен.  Проверете към какво �очи.\n"
 "�е �е прав�т промени."
 
-#: sequencer.c:3220
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "в момента не тече пребазиране"
 
-#: sequencer.c:3229
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "в момента не �е извършва отбиране на подавани�"
 
-#: sequencer.c:3239
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "неу�пешно пре�качане на подаването"
 
-#: sequencer.c:3246
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "н�ма какво да �е пре�кочи"
 
-#: sequencer.c:3249
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8340,16 +8587,16 @@ msgstr ""
 "\n"
 "    git %s --continue"
 
-#: sequencer.c:3411 sequencer.c:4473
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "указател�т „HEAD“ не може да бъде прочетен"
 
-#: sequencer.c:3428
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "„%s“ не може да �е копира като „%s“"
 
-#: sequencer.c:3436
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8368,27 +8615,27 @@ msgstr ""
 "\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3446
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“"
 
-#: sequencer.c:3453
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "�евъзможно �ливане на „%.*s“"
 
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "„%s“ не може да �е копира като „%s“"
 
-#: sequencer.c:3483
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "В момента �е изпълн�ва: %s\n"
 
-#: sequencer.c:3498
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8403,11 +8650,11 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3504
+#: sequencer.c:3520
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "и промен� индек�а и/или работното дърво\n"
 
-#: sequencer.c:3510
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8424,90 +8671,90 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3571
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "неправилно име на етикет: „%.*s“"
 
-#: sequencer.c:3625
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "запазване на фалшиво начално подаване"
 
-#: sequencer.c:3630
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "запазване на подаването, в което другите да �е вкарат"
 
-#: sequencer.c:3714
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "„%s“ не може да бъде открит"
 
-#: sequencer.c:3747
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "без текущо подаване не може да �е �лива"
 
-#: sequencer.c:3769
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "„%.*s“ не може да �е анализира"
 
-#: sequencer.c:3778
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "н�ма нищо за �ливане: „%.*s“"
 
-#: sequencer.c:3790
+#: sequencer.c:3818
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "върху начално подаване не може да �е извърши множе�твено �ливане"
 
-#: sequencer.c:3806
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "�ъобщението за подаване към „%s“ не може да бъде получено"
 
-#: sequencer.c:3989
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "�ливането на „%.*s“ не може даже да започне"
 
-#: sequencer.c:4005
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "�ливане: нови�т индек� не може да бъде запазен"
 
-#: sequencer.c:4079
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr "�е може да �е �катае автоматично"
 
-#: sequencer.c:4082
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "�еочакван резултат при �катаване: „%s“"
 
-#: sequencer.c:4088
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Директори�та за „%s“ не може да бъде �ъздадена"
 
-#: sequencer.c:4091
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "�втоматично �катано: „%s“\n"
 
-#: sequencer.c:4095
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "неу�пешно изпълнение на „git reset --hard“"
 
-#: sequencer.c:4120
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "�втоматично �катаното е приложено.\n"
 
-#: sequencer.c:4132
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "„%s“ не може да бъде запазен"
 
-#: sequencer.c:4135
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8519,29 +8766,29 @@ msgstr ""
 "„git stash pop“ или да ги изхвърлите чрез „git stash drop“, когато "
 "пои�кате.\n"
 
-#: sequencer.c:4140
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "Конфликти при прилагането на автоматично �катаното."
 
-#: sequencer.c:4141
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr "Вече има запи� за автоматично �катано, затова �е �ъздава нов запи�."
 
-#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "указател�т „HEAD“ не може да �е отдели"
 
-#: sequencer.c:4249
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Бе �пр�но при „HEAD“\n"
 
-#: sequencer.c:4251
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Бе �пр�но при „%s“\n"
 
-#: sequencer.c:4259
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8564,58 +8811,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4305
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "Пребазиране (%d/%d)%s"
 
-#: sequencer.c:4351
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Спиране при „%s“…  %.*s\n"
 
-#: sequencer.c:4422
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "непозната команда %d"
 
-#: sequencer.c:4481
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "указател�т за „orig-head“ не може да �е прочете"
 
-#: sequencer.c:4486
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "указател�т за „onto“ не може да �е прочете"
 
-#: sequencer.c:4500
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "„HEAD“ не може да бъде обновен до „%s“"
 
-#: sequencer.c:4560
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "У�пешно пребазиране и обнов�ване на „%s“.\n"
 
-#: sequencer.c:4612
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
 msgstr "не може да пребазирате, защото има промени, които не �а в индек�а."
 
-#: sequencer.c:4621
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "не�ъще�твуващо подаване не може да �е поправи"
 
-#: sequencer.c:4623
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "неправилен файл: „%s“"
 
-#: sequencer.c:4625
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "неправилно �ъдържание: „%s“"
 
-#: sequencer.c:4628
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8625,59 +8872,69 @@ msgstr ""
 "В работното дърво има неподадени промени.  Първо ги подайте, а �лед това\n"
 "отново изпълнете „git rebase --continue“."
 
-#: sequencer.c:4664 sequencer.c:4703
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "файлът „%s“ не може да бъде запи�ан"
 
-#: sequencer.c:4719
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "указател�т „CHERRY_PICK_HEAD“ не може да бъде изтрит"
 
-#: sequencer.c:4726
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "промените в индек�а не може да бъдат подадени."
 
-#: sequencer.c:4846
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: не може да �е отбере „%s“"
 
-#: sequencer.c:4850
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: неправилна вер�и�"
 
-#: sequencer.c:4885
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "първоначалното подаване не може да бъде отменено"
 
-#: sequencer.c:5362
+#: sequencer.c:5189 sequencer.c:5418
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "пре�качане на вече приложеното подаване „%s“"
+
+#: sequencer.c:5259 sequencer.c:5434
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr ""
+"може да включите пропу�натите подавани� � опци�та „--reapply-cherry-picks“"
+
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
 msgstr "make_script: неподдържани опции"
 
-#: sequencer.c:5365
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script: грешка при подготовката на вер�ии"
 
-#: sequencer.c:5615 sequencer.c:5632
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "н�ма какво да �е прави"
 
-#: sequencer.c:5651
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "излишните команди за отбиране не б�ха пре�кочени"
 
-#: sequencer.c:5751
+#: 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"
@@ -8688,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"
@@ -8701,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"
@@ -8718,99 +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
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "тази команда тр�бва да �е изпълни в работно дърво"
 
-#: setup.c:661
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Очаква �е вер�и� на хранилището на git <= %d, а не %d"
 
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr "открити �а непознати разширени� в хранилището:"
+#: setup.c:730
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "открито е непознато разширение в хранилището:"
+msgstr[1] "открити �а непознати разширени� в хранилището:"
 
-#: setup.c:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "вер�и�та на хранилището е 0, но �а открити разширени� за вер�и� 1:"
+#: 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:700
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "„%s“ не може да �е отвори"
 
-#: setup.c:702
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "прекалено гол�м файл „.git“: „%s“"
 
-#: setup.c:704
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "грешка при прочитане на „%s“"
 
-#: setup.c:706
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "неправилен формат на gitfile: %s"
 
-#: setup.c:708
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "лип�ва път в gitfile: „%s“"
 
-#: setup.c:710
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "не е хранилище на Git: %s"
 
-#: setup.c:812
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "„%s“ е прекалено гол�м"
 
-#: setup.c:826
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "не е хранилище на git: „%s“"
 
-#: setup.c:855 setup.c:857 setup.c:888
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "не може да �е влезе в директори�та „%s“"
 
-#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr "проце�ът не може да �е върне към предишната работна директори�"
 
-#: setup.c:987
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "не може да бъде получена информаци� чрез „stat“ за „%*s%s%s“"
 
-#: setup.c:1225
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "Текущата работна директори� не може да бъде прочетена"
 
-#: setup.c:1234 setup.c:1240
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "не може да �е влезе в директори�та „%s“"
 
-#: setup.c:1245
+#: setup.c:1315
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 "нито тази, нито ко�то и да е от по-горните директории, не е хранилище на "
 "git: %s"
 
-#: setup.c:1251
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8821,7 +9082,7 @@ msgstr ""
 "Git работи в рамките на една файлова �и�тема, защото променливата на �редата "
 "„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена."
 
-#: setup.c:1370
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8831,27 +9092,15 @@ msgstr ""
 "(0%.3o).\n"
 "Соб�твеникът на файла тр�бва да има права за пи�ане и четене."
 
-#: setup.c:1417
-msgid "open /dev/null or dup failed"
-msgstr "неу�пешно изпълнение на „open“ или „dup“ върху „/dev/null“"
-
-#: setup.c:1432
+#: setup.c:1508
 msgid "fork failed"
 msgstr "неу�пешно �ъздаване на проце� чрез „fork“"
 
-#: setup.c:1437 t/helper/test-simple-ipc.c:285
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "неу�пешно изпълнение на „setsid“"
 
-#: sparse-index.c:151
-msgid "attempting to use sparse-index without cone mode"
-msgstr "опит за ползване на ча�тичен индек� без пътеводен режим"
-
-#: sparse-index.c:156
-msgid "unable to update cache-tree, staying full"
-msgstr "дървото на кеша не може да бъде обновено и о�тава пълно"
-
-#: sparse-index.c:239
+#: sparse-index.c:289
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr "обектът в индек�а е директори�, но не ча�тично изтеглена (%08x)"
@@ -8908,13 +9157,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] "%u байт/�ек."
 msgstr[1] "%u байта/�ек."
 
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
-#: builtin/rebase.c:866
+#: 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:1177
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "„%s“ не може да �е редактира"
@@ -8940,7 +9189,7 @@ msgstr ""
 msgid "invalid value for %s"
 msgstr "�еправилна �тойно�т за „%s“"
 
-#: submodule-config.c:766
+#: submodule-config.c:767
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Запи�ът „%s“ във файла „.gitmodules“ не може да бъде променен"
@@ -8965,22 +9214,22 @@ msgstr "ЗапиÑ�ÑŠÑ‚ „%s“ във файла „.gitmodules“ не можÐ
 msgid "staging updated .gitmodules failed"
 msgstr "неу�пешно добав�не на променени� файл „.gitmodules“ в индек�а"
 
-#: submodule.c:328
+#: submodule.c:358
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "в неподготвени� подмодул „%s“"
 
-#: submodule.c:359
+#: submodule.c:389
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Път�т „%s“ е в подмодула „%.*s“"
 
-#: submodule.c:436
+#: submodule.c:466
 #, c-format
 msgid "bad --ignore-submodules argument: %s"
 msgstr "неправилен аргумент за „--ignore-submodules“: „%s“"
 
-#: submodule.c:818
+#: submodule.c:844
 #, c-format
 msgid ""
 "Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8989,12 +9238,12 @@ msgstr ""
 "Подмодулът при подаване %s на път� „%s“ е различен от други� модул �ъ� "
 "�ъщото име, затова първи�т �е пре�кача."
 
-#: submodule.c:921
+#: submodule.c:954
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "запи�ът за подмодула „%s“ (%s) е %s, а не подаване!"
 
-#: submodule.c:1006
+#: submodule.c:1042
 #, c-format
 msgid ""
 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -9003,36 +9252,36 @@ msgstr ""
 "Командата „git rev-list ПОД�В��ИЯ --not --remotes -n 1“ не може да �е "
 "изпълни в подмодула „%s“"
 
-#: submodule.c:1129
+#: submodule.c:1165
 #, c-format
 msgid "process for submodule '%s' failed"
 msgstr "проце�ът за подмодула „%s“ завърши неу�пешно"
 
-#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "�е може да �е открие към какво �очи указател�т „HEAD“"
 
-#: submodule.c:1169
+#: submodule.c:1205
 #, c-format
 msgid "Pushing submodule '%s'\n"
 msgstr "Изтла�кване на подмодула „%s“\n"
 
-#: submodule.c:1172
+#: submodule.c:1208
 #, c-format
 msgid "Unable to push submodule '%s'\n"
 msgstr "Подмодулът „%s“ не може да бъде изтла�кан\n"
 
-#: submodule.c:1464
+#: submodule.c:1491
 #, c-format
 msgid "Fetching submodule %s%s\n"
 msgstr "До�тав�не на подмодула „%s%s“\n"
 
-#: submodule.c:1498
+#: submodule.c:1525
 #, c-format
 msgid "Could not access submodule '%s'\n"
 msgstr "Подмодулът „%s“ не може да бъде до�тъпен\n"
 
-#: submodule.c:1653
+#: submodule.c:1680
 #, c-format
 msgid ""
 "Errors during submodule fetch:\n"
@@ -9041,63 +9290,63 @@ msgstr ""
 "Грешки при до�тав�не на подмодул:\n"
 "%s"
 
-#: submodule.c:1678
+#: submodule.c:1705
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "„%s“ не е хранилище на git"
 
-#: submodule.c:1695
+#: submodule.c:1722
 #, c-format
 msgid "Could not run 'git status --porcelain=2' in submodule %s"
 msgstr ""
 "Командата „git status --porcelain=2“ не може да �е изпълни в подмодула „%s“"
 
-#: submodule.c:1736
+#: submodule.c:1763
 #, c-format
 msgid "'git status --porcelain=2' failed in submodule %s"
 msgstr ""
 "командата „git status --porcelain=2“ не може да �е изпълни в подмодула „%s“"
 
-#: submodule.c:1811
+#: submodule.c:1838
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "командата „git status“ не може да �е изпълни в подмодула „%s“"
 
-#: submodule.c:1824
+#: submodule.c:1851
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "командата „git status“ не може да �е изпълни в подмодула „%s“"
 
-#: submodule.c:1839
+#: submodule.c:1868
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "�а�тройката „core.worktree“ не може да �е изтрие в подмодула „%s“"
 
-#: submodule.c:1866 submodule.c:2176
+#: submodule.c:1895 submodule.c:2210
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "неу�пешна обработка на поддиректориите в подмодула „%s“"
 
-#: submodule.c:1887
+#: submodule.c:1917
 msgid "could not reset submodule index"
 msgstr "неу�пешно занул�ване на индек�а на подмодула"
 
-#: submodule.c:1929
+#: submodule.c:1959
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "индек�ът на подмодула „%s“ не е чи�т"
 
-#: submodule.c:1981
+#: submodule.c:2013
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Подмодулът „%s“ не може да �е обнови."
 
-#: submodule.c:2049
+#: submodule.c:2081
 #, c-format
 msgid "submodule git dir '%s' is inside git dir '%.*s'"
 msgstr "„%s“ (директори� на подмодул) е в директори�та на git: „%.*s“"
 
-#: submodule.c:2070
+#: submodule.c:2102
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -9105,17 +9354,17 @@ msgstr ""
 "не �е поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно "
 "работно дърво"
 
-#: submodule.c:2082 submodule.c:2141
+#: submodule.c:2114 submodule.c:2174
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "името на подмодула „%s“ не може да бъде намерено"
 
-#: submodule.c:2086
+#: submodule.c:2118
 #, c-format
 msgid "refusing to move '%s' into an existing git dir"
 msgstr "„%s“ не може да �е преме�ти в �ъще�твуваща директори� на git"
 
-#: submodule.c:2093
+#: submodule.c:2124
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -9126,11 +9375,11 @@ msgstr ""
 "„%s“ към\n"
 "„%s“\n"
 
-#: submodule.c:2221
+#: submodule.c:2255
 msgid "could not start ls-files in .."
 msgstr "„ls-stat“ не може да �е �тартира в „..“"
 
-#: submodule.c:2261
+#: submodule.c:2295
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "„ls-tree“ завърши � неочакван изходен код: %d"
@@ -9152,7 +9401,7 @@ msgid "unknown value '%s' for key '%s'"
 msgstr "непозната �тойно�т „%s“ за на�тройката „%s“"
 
 #: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
 #, c-format
 msgid "more than one %s"
 msgstr "�тойно�тта „%s“ �е повтар� в на�тройките"
@@ -9167,11 +9416,11 @@ msgstr "празна завършваща лек�ема в епилога „%.
 msgid "could not read input file '%s'"
 msgstr "входни�т файл „%s“ не може да бъде прочетен"
 
-#: trailer.c:766 builtin/mktag.c:88
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
 msgid "could not read from stdin"
 msgstr "от �тандартни� вход не може да �е чете"
 
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
 #, c-format
 msgid "could not stat %s"
 msgstr "�е може да �е получи информаци� чрез „stat“ за „%s“"
@@ -9243,7 +9492,7 @@ msgstr "неу�пешно изпълнение на бързо вна��не"
 msgid "error while running fast-import"
 msgstr "грешка при изпълнението на бързо вна��не"
 
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
 #, c-format
 msgid "could not read ref %s"
 msgstr "указател�т „%s“ не може да �е прочете"
@@ -9261,7 +9510,7 @@ msgstr "протоколът не поддържа задаването на пÑ
 msgid "invalid remote service path"
 msgstr "неправилен път на отдалечената у�луга"
 
-#: transport-helper.c:661 transport.c:1471
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "опци�та не �е поддържа от протокола"
 
@@ -9270,7 +9519,7 @@ msgstr "опци�та не �е поддържа от протокола"
 msgid "can't connect to subservice %s"
 msgstr "неу�пешно �вързване към поду�лугата „%s“"
 
-#: transport-helper.c:693 transport.c:397
+#: transport-helper.c:693 transport.c:404
 msgid "--negotiate-only requires protocol v2"
 msgstr "опци�та „--negotiate-only“ изи�ква вер�и� 2 на протокола"
 
@@ -9284,63 +9533,62 @@ msgid "expected ok/error, helper said '%s'"
 msgstr ""
 "очаква �е или у�пех, или грешка, но на�рещната помощна програма върна „%s“"
 
-#: transport-helper.c:855
+#: transport-helper.c:859
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "на�рещната помощна програма завърши � неочакван изходен код: „%s“"
 
-#: transport-helper.c:938
+#: transport-helper.c:942
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "на�рещната помощна програма „%s“ не поддържа проби „dry-run“"
 
-#: transport-helper.c:941
+#: transport-helper.c:945
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "на�рещната помощна програма „%s“ не поддържа опци�та „--signed“"
 
-#: transport-helper.c:944
+#: transport-helper.c:948
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr ""
 "на�рещната помощна програма „%s“ не поддържа опци�та „--signed=if-asked“"
 
-#: transport-helper.c:949
+#: transport-helper.c:953
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "на�рещната помощна програма „%s“ не поддържа опци�та „--atomic“"
 
-#: transport-helper.c:953
+#: transport-helper.c:957
 #, c-format
 msgid "helper %s does not support --%s"
 msgstr "на�рещната помощна програма „%s“ не поддържа опци�та „%s“"
 
-#: transport-helper.c:960
+#: transport-helper.c:964
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "на�рещната помощна програма „%s“ не поддържа опции за изтла�кване"
 
-#: transport-helper.c:1060
+#: transport-helper.c:1064
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 "на�рещната помощна програма не поддържа изтла�кване.  �еобходимо е "
 "избро�ване на указателите"
 
-#: transport-helper.c:1065
+#: transport-helper.c:1069
 #, c-format
 msgid "helper %s does not support 'force'"
-msgstr ""
-"на�рещната помощна програма не поддържа „%s“ поддържа опци�та „--force“"
+msgstr "на�рещната помощна програма „%s“ не поддържа опци�та „--force“"
 
-#: transport-helper.c:1112
+#: transport-helper.c:1116
 msgid "couldn't run fast-export"
 msgstr "не може да �е извърши бързо изна��не"
 
-#: transport-helper.c:1117
+#: transport-helper.c:1121
 msgid "error while running fast-export"
 msgstr "грешка при изпълнението на командата за бързо изна��не"
 
-#: transport-helper.c:1142
+#: transport-helper.c:1146
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -9349,52 +9597,52 @@ msgstr ""
 "��ма общи указатели, не �а указани никакви указатели —\n"
 "нищо н�ма да бъде направено.  Пробвайте да укажете клон.\n"
 
-#: transport-helper.c:1224
+#: transport-helper.c:1228
 #, c-format
 msgid "unsupported object format '%s'"
 msgstr "обект � неподдържан формат „%s“"
 
-#: transport-helper.c:1233
+#: transport-helper.c:1237
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "неправилен отговор в �пи�ъка � указатели: „%s“"
 
-#: transport-helper.c:1385
+#: transport-helper.c:1389
 #, c-format
 msgid "read(%s) failed"
 msgstr "неу�пешно четене на „%s“"
 
-#: transport-helper.c:1412
+#: transport-helper.c:1416
 #, c-format
 msgid "write(%s) failed"
 msgstr "неу�пешен запи� в „%s“"
 
-#: transport-helper.c:1461
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed"
 msgstr "неу�пешно изпълнение на нишката „%s“"
 
-#: transport-helper.c:1465
+#: transport-helper.c:1469
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "завършването на нишката „%s“ не може да �е изчака: „%s“"
 
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "неу�пешно �тартиране на нишка за копиране на данните: „%s“"
 
-#: transport-helper.c:1525
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed to wait"
 msgstr "проце�ът на „%s“ не у�п� да изчака чрез „waitpid“"
 
-#: transport-helper.c:1529
+#: transport-helper.c:1533
 #, c-format
 msgid "%s process failed"
 msgstr "неу�пешно изпълнение на „%s“"
 
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
 msgid "can't start thread for copying data"
 msgstr "неу�пешно �тартиране на нишка за копиране на данните"
 
@@ -9408,47 +9656,47 @@ msgstr "Клонът „%s“ ще �леди „%s“ от „%s“\n"
 msgid "could not read bundle '%s'"
 msgstr "пратката на git „%s“ не може да бъде прочетена"
 
-#: transport.c:220
+#: transport.c:227
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: неправилна опци� за дълбочина: %s"
 
-#: transport.c:272
+#: transport.c:279
 msgid "see protocol.version in 'git help config' for more details"
 msgstr ""
 "За повече информаци� вижте раздела „protocol.version“ в „git help config“"
 
-#: transport.c:273
+#: transport.c:280
 msgid "server options require protocol version 2 or later"
 msgstr "опциите на �ървъра изи�кват поне вер�и� 2 на протокола"
 
-#: transport.c:400
+#: transport.c:407
 msgid "server does not support wait-for-done"
 msgstr "�ървърът не поддържа „wait-for-done“"
 
-#: transport.c:751
+#: transport.c:759
 msgid "could not parse transport.color.* config"
 msgstr "�тойно�тта на на�тройката „transport.color.*“ не може да �е разпознае"
 
-#: transport.c:826
+#: transport.c:834
 msgid "support for protocol v2 not implemented yet"
 msgstr "протокол вер�и� 2 в�е още не �е поддържа"
 
-#: transport.c:960
+#: transport.c:967
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "непозната �тойно�т за на�тройката „%s“: „%s“"
 
-#: transport.c:1026
+#: transport.c:1033
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "прено�ът по „%s“ не е позволен"
 
-#: transport.c:1079
+#: transport.c:1082
 msgid "git-over-rsync is no longer supported"
 msgstr "командата „git-over-rsync“ вече не �е поддържа"
 
-#: transport.c:1181
+#: transport.c:1185
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -9457,7 +9705,7 @@ msgstr ""
 "Следните пътища за подмодули �ъдържат промени,\n"
 "които лип�ват от в�ички отдалечени хранилища:\n"
 
-#: transport.c:1185
+#: transport.c:1189
 #, c-format
 msgid ""
 "\n"
@@ -9482,11 +9730,11 @@ msgstr ""
 "    git push\n"
 "\n"
 
-#: transport.c:1193
+#: transport.c:1197
 msgid "Aborting."
 msgstr "Преу�танов�ване на дей�твието."
 
-#: transport.c:1340
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr "неу�пешно изтла�кване на в�ички необходими подмодули"
 
@@ -9506,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"
@@ -9515,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"
@@ -9524,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"
@@ -9533,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"
@@ -9542,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"
@@ -9551,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"
@@ -9560,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"
@@ -9569,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"
@@ -9578,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"
@@ -9587,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"
@@ -9596,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"
@@ -9605,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"
@@ -9614,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"
@@ -9623,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 "
@@ -9633,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 "
@@ -9643,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"
@@ -9652,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"
@@ -9661,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"
@@ -9670,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"
@@ -9679,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"
@@ -9693,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 "
@@ -9704,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"
@@ -9714,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 "
@@ -9725,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 "
@@ -9741,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"
@@ -9755,17 +10012,17 @@ msgstr ""
 "във файлови �и�теми, които не различават главни от малки букви)\n"
 "и �амо един от уча�тниците в конфликта е в работното дърво:\n"
 
-#: unpack-trees.c:1519
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "Обнов�ване на флаговете на индек�а"
 
-#: unpack-trees.c:2608
+#: unpack-trees.c:2803
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr ""
 "работното дърво и не�леденото подаване �ъдържат повтар�щи �е обекти: %s"
 
-#: upload-pack.c:1548
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "�лед аргументите на „fetch“ �е очаква изчи�тване на буферите"
 
@@ -9802,116 +10059,126 @@ msgstr "неправилна ча�т от път� „..“"
 msgid "Fetching objects"
 msgstr "До�тав�не на обектите"
 
-#: worktree.c:238 builtin/am.c:2151
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr "„%s“ не може да бъде прочетен"
 
-#: worktree.c:304
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "„%s“ в о�новното работно дърво не е директори�та на хранилището"
 
-#: worktree.c:315
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 "файлът „%s“ не �ъдържа аб�олютни� път към ме�тоположението на работното дърво"
 
-#: worktree.c:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "„%s“ не �ъще�твува."
 
-#: worktree.c:333
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "„%s“ не е файл на .git, код за грешка: %d"
 
-#: worktree.c:342
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "„%s“ не �очи към обратно към „%s“"
 
-#: worktree.c:608
+#: worktree.c:604
 msgid "not a directory"
 msgstr "не е директори�"
 
-#: worktree.c:617
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr "„.git“ не е файл"
 
-#: worktree.c:619
+#: worktree.c:615
 msgid ".git file broken"
 msgstr "„.git“ е повреден"
 
-#: worktree.c:621
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr "„.git“ е неправилен"
 
-#: worktree.c:727
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "неправилен път"
 
-#: worktree.c:733
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr "не може да �е открие хранилище: „.git“ не е файл"
 
-#: worktree.c:737
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr "не може да �е открие хранилище: файлът „.git“ не �очи към хранилище"
 
-#: worktree.c:741
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "не може да �е открие хранилище: „.git“ е повреден"
 
-#: worktree.c:747
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "директори�та „gitdir“ не може да �е прочете"
 
-#: worktree.c:751
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "неправилна директори� „gitdir“"
 
-#: worktree.c:776
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "не е валидна директори�"
 
-#: worktree.c:782
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "файлът „gitdir“ не �ъще�твува"
 
-#: worktree.c:787 worktree.c:796
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "файлът „gitdir“ не може да бъде прочетен (%s)"
 
-#: worktree.c:806
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr ""
 "изчитането върна по-малко байтове от очакваното (очаквани: %<PRIuMAX> байта, "
 "получени: %<PRIuMAX>)"
 
-#: worktree.c:814
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "неправилен файл „gitdir“"
 
-#: worktree.c:822
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "файлът „gitdir“ �очи не�ъще�твуващо ме�тоположение"
 
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "променливата на �редата „%s“ не може да �е зададе чрез „setenv“"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "пакетни�т файл „%s“ не може да бъде �ъздаден"
+
+#: wrapper.c:205 wrapper.c:375
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "„%s“ не може да бъде отворен и за четене, и за запи�"
 
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
 #, c-format
 msgid "unable to access '%s'"
 msgstr "н�ма до�тъп до „%s“"
 
-#: wrapper.c:607
+#: wrapper.c:615
 msgid "unable to get current working directory"
 msgstr "текущата работна директори� е недо�тъпна"
 
@@ -9952,11 +10219,11 @@ msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 "  (използвайте „git rm Ф�ЙЛ…“, за да укажете разрешаването на конфликта)"
 
-#: wt-status.c:211 wt-status.c:1075
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr "Промени, които ще бъдат подадени:"
 
-#: wt-status.c:234 wt-status.c:1084
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "Промени, които не �а в индек�а за подаване:"
 
@@ -10061,22 +10328,22 @@ msgstr "променено �ъдържание, "
 msgid "untracked content, "
 msgstr "не�ледено �ъдържание, "
 
-#: wt-status.c:908
+#: 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:939
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "Подмодулите �а променени, но не �а обновени:"
 
-#: wt-status.c:941
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "Промени в подмодулите за подаване:"
 
-#: wt-status.c:1023
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -10084,7 +10351,7 @@ msgstr ""
 "�е промен�йте и не изтривайте горни� ред.\n"
 "В�ичко отдолу ще бъде изтрито."
 
-#: wt-status.c:1115
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -10095,271 +10362,282 @@ msgstr ""
 "Изчи�л�ването на бро� различаващи �е подавани� отне %.2f �ек.\n"
 "За да избегнете това, ползвайте „--no-ahead-behind“.\n"
 
-#: wt-status.c:1145
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "��кои пътища не �а �лети."
 
-#: wt-status.c:1148
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git commit“)"
 
-#: wt-status.c:1150
+#: wt-status.c:1206
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (използвайте „git merge --abort“, за да преу�тановите �ливането)"
 
-#: wt-status.c:1154
+#: wt-status.c:1210
 msgid "All conflicts fixed but you are still merging."
 msgstr "В�ички конфликти �а решени, но продължавате �ливането."
 
-#: wt-status.c:1157
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (използвайте „git commit“, за да завършите �ливането)"
 
-#: wt-status.c:1166
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr "В момента прилагате поредица от кръпки чрез „git am“."
 
-#: wt-status.c:1169
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "Текущата кръпка е празна."
 
-#: wt-status.c:1173
+#: wt-status.c:1232
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git am --continue“)"
 
-#: wt-status.c:1175
+#: wt-status.c:1234
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (използвайте „git am --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:1177
+#: 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:1310
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "„git-rebase-todo“ лип�ва."
 
-#: wt-status.c:1312
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "�е �а изпълнени команди."
 
-#: wt-status.c:1315
+#: 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:1326
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (повече информаци� има във файла „%s“)"
 
-#: wt-status.c:1331
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "�е о�тават повече команди."
 
-#: wt-status.c:1334
+#: 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:1342
+#: wt-status.c:1404
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr ""
 "  (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)"
 
-#: wt-status.c:1354
+#: wt-status.c:1416
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "В момента пребазирате клона „%s“ върху „%s“."
 
-#: wt-status.c:1359
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "В момента пребазирате."
 
-#: wt-status.c:1372
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (коригирайте конфликтите и използвайте „git rebase --continue“)"
 
-#: wt-status.c:1374
+#: wt-status.c:1436
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (използвайте „git rebase --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:1376
+#: wt-status.c:1438
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 "  (използвайте „git rebase --abort“, за да въз�тановите първоначални� клон)"
 
-#: wt-status.c:1383
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (в�ички конфликти �а коригирани: изпълнете „git rebase --continue“)"
 
-#: wt-status.c:1387
+#: 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:1392
+#: wt-status.c:1454
 msgid "You are currently splitting a commit during a rebase."
 msgstr "В момента раздел�те подаване докато пребазирате."
 
-#: wt-status.c:1395
+#: wt-status.c:1457
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (След като работното ви дърво �тане чи�то, използвайте „git rebase --"
 "continue“)"
 
-#: wt-status.c:1399
+#: 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:1404
+#: wt-status.c:1466
 msgid "You are currently editing a commit during a rebase."
 msgstr "В момента редактирате подаване докато пребазирате."
 
-#: wt-status.c:1407
+#: wt-status.c:1469
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 "  (използвайте „git commit --amend“, за да редактирате текущото подаване)"
 
-#: wt-status.c:1409
+#: wt-status.c:1471
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (използвайте „git rebase --continue“, �лед като завършите промените �и)"
 
-#: wt-status.c:1420
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "В момента �е извършва отбиране на подавани�."
 
-#: wt-status.c:1423
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "В момента отбирате подаването „%s“."
 
-#: wt-status.c:1430
+#: wt-status.c:1492
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)"
 
-#: wt-status.c:1433
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (за да продължите, изпълнете „git cherry-pick --continue“)"
 
-#: wt-status.c:1436
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (в�ички конфликти �а коригирани, изпълнете „git cherry-pick --continue“)"
 
-#: wt-status.c:1438
+#: wt-status.c:1500
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  (използвайте „git cherry-pick --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:1440
+#: wt-status.c:1502
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (използвайте „git cherry-pick --abort“, за да отмените в�ички дей�тви� � "
 "отбиране)"
 
-#: wt-status.c:1450
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "В момента тече отм�на на подаване."
 
-#: wt-status.c:1453
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "В момента отмен�те подаване „%s“."
 
-#: wt-status.c:1459
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git revert --continue“)"
 
-#: wt-status.c:1462
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (за да продължите, изпълнете „git revert --continue“)"
 
-#: wt-status.c:1465
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (в�ички конфликти �а коригирани, изпълнете „git revert --continue“)"
 
-#: wt-status.c:1467
+#: wt-status.c:1529
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (използвайте „git revert --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:1469
+#: wt-status.c:1531
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 "  (използвайте „git revert --abort“, за да преу�тановите отм�ната на "
 "подаване)"
 
-#: wt-status.c:1479
+#: wt-status.c:1541
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "В момента тър�ите двоично, като �те �тартирали от клон „%s“."
 
-#: wt-status.c:1483
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "В момента тър�ите двоично."
 
-#: wt-status.c:1486
+#: wt-status.c:1548
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 "  (използвайте „git bisect reset“, за да �е върнете към първоначалното "
 "�ъ�то�ние и клон)"
 
-#: wt-status.c:1497
+#: wt-status.c:1559
+msgid "You are in a sparse checkout."
+msgstr "Вие �те в ча�тично изтегл�не."
+
+#: wt-status.c:1562
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr ""
 "�амирате �е в ча�тично изтеглено хранилище � %d%% налични, �ледени файла."
 
-#: wt-status.c:1736
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "�а клон "
 
-#: wt-status.c:1743
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "извършвате интерактивно пребазиране върху "
 
-#: wt-status.c:1745
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "извършвате пребазиране върху "
 
-#: wt-status.c:1750
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "Указател�т „HEAD“ не е �вързан и е при "
 
-#: wt-status.c:1752
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "Указател�т „HEAD“ не е �вързан и е отделѐн от "
 
-#: wt-status.c:1755
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "Извън в�ички клони."
 
-#: wt-status.c:1772
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Първоначално подаване"
 
-#: wt-status.c:1773
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "В�е още лип�ват подавани�"
 
-#: wt-status.c:1787
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "�е�ледени файлове"
 
-#: wt-status.c:1789
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Игнорирани файлове"
 
-#: wt-status.c:1793
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10371,32 +10649,32 @@ msgstr ""
 "изпълнението, но ще тр�бва да добав�те новите файлове ръчно.\n"
 "За повече подробно�ти погледнете „git status help“."
 
-#: wt-status.c:1799
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "�е�ледените файлове не �а изведени%s"
 
-#: wt-status.c:1801
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr " (използвайте опци�та „-u“, за да изведете не�ледените файлове)"
 
-#: wt-status.c:1807
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "��ма промени"
 
-#: wt-status.c:1812
+#: 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:1816
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "към индек�а за подаване не �а добавени промени\n"
 
-#: wt-status.c:1820
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -10405,89 +10683,89 @@ msgstr ""
 "към индек�а за подаване не �а добавени промени, но има нови файлове "
 "(използвайте „git add“, за да започне т�хното �ледене)\n"
 
-#: wt-status.c:1824
+#: wt-status.c:1894
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "към индек�а за подаване не �а добавени промени, но има нови файлове\n"
 
-#: wt-status.c:1828
+#: 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:1832 wt-status.c:1838
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "лип�ват каквито и да е промени\n"
 
-#: wt-status.c:1835
+#: wt-status.c:1905
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "лип�ват каквито и да е промени (използвайте опци�та „-u“, за да �е изведат и "
 "не�ледените файлове)\n"
 
-#: wt-status.c:1840
+#: wt-status.c:1910
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "лип�ват каквито и да е промени, работното дърво е чи�то\n"
 
-#: wt-status.c:1945
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "В�е още лип�ват подавани� в "
 
-#: wt-status.c:1949
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (извън клон)"
 
-#: wt-status.c:1980
+#: wt-status.c:2050
 msgid "different"
 msgstr "различен"
 
-#: wt-status.c:1982 wt-status.c:1990
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "назад � "
 
-#: wt-status.c:1985 wt-status.c:1988
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr "напред � "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2511
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "не може да извършите „%s“, защото има промени, които не �а в индек�а."
 
-#: wt-status.c:2517
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr "о�вен това в индек�а има неподадени промени."
 
-#: wt-status.c:2519
+#: wt-status.c:2604
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "не може да извършите „%s“, защото в индек�а има неподадени промени."
 
-#: compat/simple-ipc/ipc-unix-socket.c:178
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr "командата за комуникаци� между проце�и не може да бъде пратена"
 
-#: compat/simple-ipc/ipc-unix-socket.c:185
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr "отговорът за комуникаци�та между проце�и не може да бъде прочетен"
 
-#: compat/simple-ipc/ipc-unix-socket.c:862
+#: 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:874
+#: compat/simple-ipc/ipc-unix-socket.c:904
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr "не може да �е �тартира нишката worker[0] за „%s“"
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "неу�пешно изтриване на „%s“"
@@ -10496,136 +10774,142 @@ msgstr "неу�пешно изтриване на „%s“"
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
 
-#: builtin/add.c:61
+#: builtin/add.c:64
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "правата на „%2$s“ не може да �е зададат да �а %1$cx"
 
-#: builtin/add.c:99
+#: builtin/add.c:106
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "неочакван изходен код при генериране на разлика: %c"
 
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
 msgid "updating files failed"
 msgstr "неу�пешно обнов�ване на файловете"
 
-#: builtin/add.c:114
+#: builtin/add.c:121
 #, c-format
 msgid "remove '%s'\n"
 msgstr "изтриване на „%s“\n"
 
-#: builtin/add.c:198
+#: builtin/add.c:205
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Промени, които и �лед обнов�ването на индек�а не �а добавени към него:"
 
-#: builtin/add.c:307 builtin/rev-parse.c:991
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Индек�ът не може да бъде прочетен"
 
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Файлът „%s“ не може да бъде отворен за запи�."
-
-#: builtin/add.c:322
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "Кръпката не може да бъде запи�ана"
 
-#: builtin/add.c:325
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "неу�пешно редактиране на кръпка"
 
-#: builtin/add.c:328
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "�е може да �е получи информаци� чрез „stat“ за файла „%s“"
 
-#: builtin/add.c:330
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "Празна кръпка, преу�танов�ване на дей�твието."
 
-#: builtin/add.c:335
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Кръпката „%s“ не може да бъде приложена"
 
-#: builtin/add.c:343
+#: builtin/add.c:348
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Следните пътища ще бъдат игнорирани �поред н�кой от файловете „.gitignore“:\n"
 
-#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: 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:366
+#: 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:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "интерактивен избор на парчета код"
 
-#: builtin/add.c:368
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "редактиране на текущата разлика и прилагане"
 
-#: builtin/add.c:369
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "добав�не и на иначе игнорираните файлове"
 
-#: builtin/add.c:370
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "обнов�ване на �ледените файлове"
 
-#: builtin/add.c:371
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "уеднакв�ване на знаците за край на файл (включва опци�та „-u“)"
 
-#: builtin/add.c:372
+#: builtin/add.c:377
 msgid "record only the fact that the path will be added later"
 msgstr "отбел�зване �амо на факта, че път�т ще бъде добавен по-къ�но"
 
-#: builtin/add.c:373
+#: builtin/add.c:378
 msgid "add changes from all tracked and untracked files"
 msgstr "добав�не на в�ички промени в �ледените и не�ледените файлове"
 
-#: builtin/add.c:376
+#: builtin/add.c:381
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 "игнориране на пътищата, които �а изтрити от работното дърво (�ъщото като „--"
 "no-all“)"
 
-#: builtin/add.c:378
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "без добав�не на нови файлове, �амо обнов�ване на индек�а"
 
-#: builtin/add.c:379
+#: builtin/add.c:384
 msgid "just skip files which cannot be added because of errors"
 msgstr "пре�качане на файловете, които не може да бъдат добавени поради грешки"
 
-#: builtin/add.c:380
+#: builtin/add.c:385
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 "проверка, че при пробно изпълнение в�ички файлове, дори и изтритите, �е "
 "игнорират"
 
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: 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:388 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "изрично задаване на �тойно�тта на флага дали файлът е изпълним"
 
-#: builtin/add.c:384
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "предупреждаване при добав�не на вградено хранилище"
 
-#: builtin/add.c:386
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "реализаци� на „git stash -p“"
 
-#: builtin/add.c:404
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10656,12 +10940,12 @@ msgstr ""
 "\n"
 "За повече информаци� погледнете „git help submodule“."
 
-#: builtin/add.c:432
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "добав�не на вградено хранилище: %s"
 
-#: builtin/add.c:451
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10672,56 +10956,27 @@ msgstr ""
 "\n"
 "    git config advice.addIgnoredFile false"
 
-#: builtin/add.c:460
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "неу�пешно добав�не на файлове"
 
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr ""
-"опци�та „--dry-run“ е не�ъвме�тима � в��ка от опциите „--interactive“/„--"
-"patch“"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr ""
-"опци�та „--pathspec-from-file“ е не�ъвме�тима � в��ка от опциите „--"
-"interactive“/„--patch“"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "опциите „--pathspec-from-file“ и „--edit“ �а не�ъвме�тими"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "опциите „-A“ и „-u“ �а не�ъвме�тими"
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "опци�та „--ignore-missing“ изи�ква „--dry-run“"
-
-#: builtin/add.c:526
+#: builtin/add.c:548
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“"
 
-#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr ""
-"опци�та „--pathspec-from-file“ е не�ъвме�тима � аргументи, указващи пътища"
-
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
-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:555
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "�ищо не е зададено и нищо не е добавено.\n"
 
-#: builtin/add.c:557
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10732,110 +10987,128 @@ msgstr ""
 "\n"
 "    git config advice.addEmptyPathspec false"
 
-#: builtin/am.c:364
+#: 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:454
+#: builtin/am.c:482
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "„%s“ бе изтрит от куката „applypatch-msg“"
 
-#: builtin/am.c:496
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Дадени�т входен ред е � неправилен формат: „%s“."
 
-#: builtin/am.c:534
+#: builtin/am.c:562
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Бележката не може да �е копира от „%s“ към „%s“"
 
-#: builtin/am.c:560
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "неу�пешно изпълнение на „fseek“"
 
-#: builtin/am.c:748
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "кръпката „%s“ не може да �е анализира"
 
-#: builtin/am.c:813
+#: builtin/am.c:841
 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 "Само една поредица от кръпки от „StGIT“ може да бъде прилагана в даден момент"
 
-#: builtin/am.c:861
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "неправилна �тойно�т за време"
 
-#: builtin/am.c:866 builtin/am.c:878
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "неправилен ред за дата „Date“"
 
-#: builtin/am.c:873
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "неправилно отме�тване на ча�ови� по��"
 
-#: builtin/am.c:966
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "Форматът на кръпката не може да бъде определен."
 
-#: builtin/am.c:971 builtin/clone.c:414
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/am.c:976
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Кръпките не може да бъдат разделени."
 
-#: builtin/am.c:1125
+#: 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:1126
+#: 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: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:1127
+#: 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:1222
+#: 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:1250
-msgid "Patch is empty."
-msgstr "Кръпката е празна."
-
-#: builtin/am.c:1315
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "лип�ва ред за автор�тво в подаването „%s“"
 
-#: builtin/am.c:1318
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "грешен ред � идентично�т: %.*s"
 
-#: builtin/am.c:1537
+#: builtin/am.c:1566
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "В хранилището лип�ват необходимите обекти-BLOB, за да �е премине към тройно "
 "�ливане."
 
-#: builtin/am.c:1539
+#: builtin/am.c:1568
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Базовото дърво �е рекон�труира от информаци�та в индек�а…"
 
-#: builtin/am.c:1558
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10843,24 +11116,24 @@ msgstr ""
 "Кръпката не може да �е приложи към обектите-BLOB в индек�а.\n"
 "Да не би да �те � редактирали на ръка?"
 
-#: builtin/am.c:1564
+#: builtin/am.c:1593
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Преминаване към прилагане на кръпка към базата и тройно �ливане…"
 
-#: builtin/am.c:1590
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "�еу�пешно �ливане на промените."
 
-#: builtin/am.c:1622
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "прилагане върху празна и�тори�"
 
-#: builtin/am.c:1674 builtin/am.c:1678
+#: builtin/am.c:1703 builtin/am.c:1707
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "не може да �е продължи — „%s“ не �ъще�твува."
 
-#: builtin/am.c:1696
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "Т�лото на кръпката за прилагане е:"
 
@@ -10868,45 +11141,63 @@ msgstr "Т�лото на кръпката за прилагане е:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1706
+#: 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:1752 builtin/commit.c:408
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "индек�ът не може да бъде запи�ан"
 
-#: builtin/am.c:1756
+#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 "Индек�ът не е чи�т: кръпките не може да бъдат приложени (замър�ени �а: %s)"
 
-#: builtin/am.c:1796 builtin/am.c:1864
+#: 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:1813
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "Без промени — кръпката вече е приложена."
 
-#: builtin/am.c:1819
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "�еу�пешно прилагане на кръпка при %s %.*s“"
 
-#: builtin/am.c:1823
+#: 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:1867
+#: 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"
@@ -10916,7 +11207,7 @@ msgstr ""
 "�ко н�ма друга пром�на за включване в индек�а, най-веро�тно н�ко� друга\n"
 "кръпка е довела до �ъщите промени и в такъв �лучай про�то пропу�нете тази."
 
-#: builtin/am.c:1874
+#: 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 "
@@ -10927,17 +11218,17 @@ msgstr ""
 "След корекци� на конфликтите изпълнете „git add“ върху поправените файлове.\n"
 "За да приемете „изтрити от т�х“, изпълнете „git rm“ върху изтритите файлове."
 
-#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
-#: builtin/reset.c:355
+#: 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:2033
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "индек�ът не може да бъде изчи�тен"
 
-#: builtin/am.c:2077
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10948,166 +11239,173 @@ msgstr ""
 "�очи към\n"
 "„ORIG_HEAD“"
 
-#: builtin/am.c:2184
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "�еправилна �тойно�т за „--patch-format“: „%s“"
 
-#: builtin/am.c:2226
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr "�еправилна �тойно�т за „--show-current-patch“: „%s“"
 
-#: builtin/am.c:2230
+#: 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:2261
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [ОПЦИЯ…] [(Ф�ЙЛ_С_ПОЩ�|ДИРЕКТОРИЯ_С_ПОЩ�)…]"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)"
+msgstr "git am [ОПЦИЯ…] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2268
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "интерактивна работа"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "изо�тавена опци�, �ъще�твува по и�ториче�ки причини, нищо не прави"
 
-#: builtin/am.c:2272
+#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
 msgstr "да �е преминава към тройно �ливане при нужда."
 
-#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:948
+#: 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:2275
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "добав�не на епилог за подпи� „Signed-off-by“ в �ъобщението за подаване"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "прекодиране в UTF-8 (�тандартно)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "подаване на опци�та „-k“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2282
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "подаване на опци�та „-b“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "подаване на опци�та „-m“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2286
+#: builtin/am.c:2345
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 "подаване на опци�та „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
 
-#: builtin/am.c:2289
+#: 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:2292
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "пропу�кане на в�ичко преди реда за отр�зване"
 
-#: builtin/am.c:2294
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "прекарване през „git-mailinfo“"
 
-#: builtin/am.c:2297 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:2324
+#: 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:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
+#: 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:317
 msgid "n"
 msgstr "БРОЙ"
 
-#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: 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:2321
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "формат на кръпките"
 
-#: builtin/am.c:2327
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
 msgstr "избрано от ва� �ъобщение за грешка при прилагане на кръпки"
 
-#: builtin/am.c:2329
+#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
 msgstr "продължаване на прилагането на кръпки �лед коригирането на конфликт"
 
-#: builtin/am.c:2332
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "п�евдоними на „--continue“"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "пре�качане на текущата кръпка"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr ""
 "въз�танов�ване на първоначалното �ъ�то�ние на клона и преу�танов�ване на "
 "прилагането на кръпката"
 
-#: builtin/am.c:2341
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr ""
 "преу�танов�ване на прилагането на кръпката без пром�на към кое �очи „HEAD“"
 
-#: builtin/am.c:2345
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "показване на прилаганата кръпка"
 
-#: builtin/am.c:2350
+#: 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:2352
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr "използване на текущото време като това за автор"
 
-#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: 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:2355 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "подпи�ване на подавани�та � GPG"
 
-#: builtin/am.c:2358
+#: 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:2376
+#: 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."
@@ -11115,18 +11413,18 @@ msgstr ""
 "Опциите „-b“/„--binary“ отдавна не прав�т нищо и\n"
 "ще бъдат премахнати в бъдеще.  �е ги ползвайте."
 
-#: builtin/am.c:2383
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr "неу�пешно изчитане на индек�а"
 
-#: builtin/am.c:2398
+#: builtin/am.c:2463
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "предишната директори� за пребазиране „%s“ в�е още �ъще�твува, а е зададен "
 "файл „mbox“."
 
-#: builtin/am.c:2422
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11135,11 +11433,11 @@ msgstr ""
 "Открита е излишна директори� „%s“.\n"
 "Може да � изтриете � командата „git am --abort“."
 
-#: builtin/am.c:2428
+#: builtin/am.c:2493
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "В момента не тече операци� по коригиране и н�ма как да �е продължи."
 
-#: builtin/am.c:2438
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "интерактивни�т режим изи�ква кръпки на командни� ред"
 
@@ -11147,45 +11445,36 @@ msgstr "интерактивни�т режим изи�ква кръпки на
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [ОПЦИЯ…] [КРЪПК�…]"
 
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "архивни�т файл „%s“ не може да бъде �ъздаден"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "изходът не може да бъде прена�очен"
 
-#: builtin/archive.c:37
+#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Лип�ва адре� за отдалеченото хранилище"
 
-#: builtin/archive.c:61
+#: builtin/archive.c:59
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr ""
 "git archive: очакваше �е „ACK“/„NAK“, а бе получен изчи�тващ пакет „flush“"
 
-#: builtin/archive.c:64
+#: builtin/archive.c:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: получен е „NACK“ — %s"
 
-#: builtin/archive.c:65
+#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive: протоколна грешка"
 
-#: builtin/archive.c:69
+#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive: очакваше �е изчи�тване на буферите чрез „flush“"
 
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [ПОД�В��Е]"
 
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check ЛОШО ДОБРО УПР�ВЛЯВ�Щ�_ДУМ�"
-
 #: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -11209,60 +11498,73 @@ msgstr "git bisect--helper --bisect-next"
 
 #: builtin/bisect--helper.c:29
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
-msgstr "git bisect--helper --bisect-reset (ЛОШО) [ВЕРСИЯ]"
+msgstr "git bisect--helper --bisect-state (ЛОШО) [ВЕРСИЯ]"
 
 #: builtin/bisect--helper.c:30
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
-msgstr "git bisect--helper --bisect-reset (ДОБРО) [ВЕРСИЯ…]"
+msgstr "git bisect--helper --bisect-state (ДОБРО) [ВЕРСИЯ…]"
 
 #: builtin/bisect--helper.c:31
 msgid "git bisect--helper --bisect-replay <filename>"
-msgstr "git bisect--helper --bisect-next ИМЕ_��_Ф�ЙЛ"
+msgstr "git bisect--helper --bisect-replay ИМЕ_��_Ф�ЙЛ"
 
 #: builtin/bisect--helper.c:32
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-msgstr "git bisect--helper --bisect-reset [(ВЕРСИЯ|ДИ�П�ЗО�)…]"
+msgstr "git bisect--helper --bisect-skip [(ВЕРСИЯ|ДИ�П�ЗО�)…]"
+
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run КОМ��Д�…"
 
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:109
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr "файлът „%s“ не може да �е отвори в режим „%s“"
 
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "във файла „%s“ не може да �е пише"
 
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "файлът „%s“ не може да бъде отворен за четене"
+
+#: builtin/bisect--helper.c:170
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "„%s“ е неправилна управл�ваща дума"
 
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "„%s“ е вградена команда и не може да �е използва като управл�ваща дума"
 
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "не може да �мените значението на управл�ващата дума „%s“"
 
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
 msgid "please use two different terms"
 msgstr "използвайте две различни управл�ващи думи"
 
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "В момента не �е извършва двоично тър�ене.\n"
 
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "„%s“ не е подаване"
 
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11270,27 +11572,27 @@ msgstr ""
 "първоначално указаното „%s“ в указател� „HEAD“ не може да бъде\n"
 "изтеглено.  Пробвайте да изпълните командата „git bisect reset ПОД�В��Е“."
 
-#: builtin/bisect--helper.c:254
+#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "�еправилен аргумент на функци�та „bisect_write“: „%s“"
 
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "идентификаторът на обект на вер�и� „%s“ не може да бъде получен"
 
-#: builtin/bisect--helper.c:271
+#: builtin/bisect--helper.c:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "файлът „%s“ не може да бъде отворен"
 
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:314
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "�еправилна команда: в момента �е изпълн�ва двоично тър�ене по %s/%s."
 
-#: builtin/bisect--helper.c:324
+#: builtin/bisect--helper.c:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -11299,7 +11601,7 @@ msgstr ""
 "Тр�бва да зададете поне една „%s“ и една „%s“ вер�и�.  (Това може да �е\n"
 "направи �ъответно и чрез командите „git bisect %s“ и „git bisect %s“.)"
 
-#: builtin/bisect--helper.c:328
+#: builtin/bisect--helper.c:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -11310,7 +11612,7 @@ msgstr ""
 "Тр�бва да зададете поне една „%s“ и една „%s“ вер�и�.  (Това може да �е\n"
 "направи �ъответно и чрез командите „git bisect %s“ и „git bisect %s“.)"
 
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "двоично тър�ене �амо по „%s“ подаване."
@@ -11319,15 +11621,15 @@ msgstr "двоично тър�ене �амо по „%s“ подаване."
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "Да �е продължи ли? „Y“ —  Д�, „n“ — не"
 
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
 msgid "no terms defined"
 msgstr "не �а указани управл�ващи думи"
 
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -11336,7 +11638,7 @@ msgstr ""
 "Текущите управл�ващи думи �а: %s за �тарото �ъ�то�ние\n"
 "и %s за новото �ъ�то�ние.\n"
 
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -11345,56 +11647,56 @@ msgstr ""
 "на „git bisect terms“ е подаден неправилен аргумент „%s“\n"
 "Поддържат �е опциите „--term-good“/„--term-old“ и „--term-bad„/„--term-new“."
 
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
 msgstr "неу�пешно на�тройване на обхождането на вер�иите\n"
 
-#: builtin/bisect--helper.c:519
+#: builtin/bisect--helper.c:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "файлът „%s“ не може да �е отвори за добав�не"
 
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
 msgstr "„“ е неправилна управл�ваща дума"
 
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "непозната опци�: %s"
 
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "„%s“ не изглежда като указател към вер�и�"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "�еправилен указател „HEAD“"
 
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 "�еу�пешно преминаване към „%s“.  Изпълнете командата „git bisect start "
 "СЪЩЕСТВУВ�Щ_КЛО�“."
 
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
 msgid "won't bisect on cg-seek'ed tree"
 msgstr ""
 "не може да �е тър�и двоично, когато е изпълнена командата „cg-seek“ от "
 "„cogito“"
 
-#: builtin/bisect--helper.c:735
+#: builtin/bisect--helper.c:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "�еправилен указател „HEAD“ — необичаен �имволен указател"
 
-#: builtin/bisect--helper.c:755
+#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "неправилен указател: „%s“"
 
-#: builtin/bisect--helper.c:813
+#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "Започнете като изпълните командата „git bisect start“\n"
 
@@ -11402,108 +11704,158 @@ msgstr "Започнете като изпълните командата „git
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "Да �е извърши ли автоматично? „Y“ —  Д�, „n“ — не"
 
-#: builtin/bisect--helper.c:842
+#: builtin/bisect--helper.c:859
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr "опци�та „--bisect-state“ изи�ква поне един аргумент"
 
-#: builtin/bisect--helper.c:855
+#: builtin/bisect--helper.c:872
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "Командата „git bisect %s“ приема �амо един аргумент."
 
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "�еправилна вер�и�: „%s“"
 
-#: builtin/bisect--helper.c:887
+#: builtin/bisect--helper.c:904
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "�еправилна вер�и� (не е подаване): „%s“"
 
-#: builtin/bisect--helper.c:919
+#: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
 msgstr "В момента не �е извършва двоично тър�ене."
 
-#: builtin/bisect--helper.c:969
+#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr ""
 "�епозната команда „%s“.  Възможно�тите �а: „start“, „skip“, „good“, „bad“ (и "
 "вариантите им)"
 
-#: builtin/bisect--helper.c:981
+#: builtin/bisect--helper.c:998
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr ""
 "файлът „%s“ не може да бъде прочетен, за да �е изпълн�т командите от него "
 "наново"
 
-#: builtin/bisect--helper.c:1054
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "неу�пешно двоично тър�ене, не е зададена команда."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "изпълнение на %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+"неу�пешно двоично тър�ене: изходни�т код от командата „%2$s“ е %1$d — това е "
+"извън интервала [0, 128)"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "файлът „%s“ не може да бъде отворен за запи�"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "двоичното тър�ене не може да продължи"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "у�пешно двоично тър�ене"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "двоичното тър�ене откри първото лошо подаване"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"неу�пешно двоично тър�ене: „git bisect--helper --bisect-state %s“ завърши � "
+"код за грешка: %d"
+
+#: builtin/bisect--helper.c:1192
 msgid "reset the bisection state"
 msgstr "изчи�тване на �ъ�то�нието на двоичното тър�ене"
 
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1194
 msgid "check whether bad or good terms exist"
 msgstr "проверка дали �ъще�твуват одобр�ващи/отхвърл�щи управл�ващи думи"
 
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1196
 msgid "print out the bisect terms"
 msgstr "извеждане на управл�ващите думи"
 
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1198
 msgid "start the bisect session"
 msgstr "начало на двоично тър�ене"
 
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1200
 msgid "find the next bisection commit"
 msgstr "откриване на �ледващото подаване при двоично тър�ене"
 
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1202
 msgid "mark the state of ref (or refs)"
 msgstr "задаване на �ъ�то�нието на указател�/ите"
 
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1204
 msgid "list the bisection steps so far"
 msgstr "извеждане на �тъпките на двоичното тър�ене до�ега"
 
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1206
 msgid "replay the bisection process from the given file"
 msgstr "наново изпълнение на двоичното тър�ене чрез дадени� файл"
 
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1208
 msgid "skip some commits for checkout"
 msgstr "пре�качане на н�кои подавани� при изтегл�не"
 
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "визуализиране на двоичното тър�ене"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr ""
+"за автоматично определ�не на �ъ�то�нието при двоичното тър�ене да �е ползва "
+"тази КОМ��Д�…"
+
+#: builtin/bisect--helper.c:1214
 msgid "no log for BISECT_WRITE"
 msgstr "лип�ва запи� за „BISECT_WRITE“"
 
-#: builtin/bisect--helper.c:1087
+#: builtin/bisect--helper.c:1229
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "опци�та „--bisect-reset“ изи�ква или 0 аргументи, или 1 — подаване"
 
-#: builtin/bisect--helper.c:1092
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "опци�та „--bisect-next-check“ изи�ква 2 или 3 аргумента"
-
-#: builtin/bisect--helper.c:1098
+#: builtin/bisect--helper.c:1234
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "опци�та „--bisect-terms“ изи�ква 0 или 1 аргумента"
 
-#: builtin/bisect--helper.c:1107
+#: builtin/bisect--helper.c:1243
 msgid "--bisect-next requires 0 arguments"
 msgstr "опци�та „--bisect-next“ не приема аргументи"
 
-#: builtin/bisect--helper.c:1118
+#: builtin/bisect--helper.c:1254
 msgid "--bisect-log requires 0 arguments"
 msgstr "опци�та „--bisect-log“ не приема аргументи"
 
-#: builtin/bisect--helper.c:1123
+#: builtin/bisect--helper.c:1259
 msgid "no logfile given"
 msgstr "не е зададен журнален файл"
 
@@ -11515,167 +11867,169 @@ msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗÐ�_ВЕРСИЯТÐ�…] [ВЕРÐ
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "ОПЦИИте_З�_ВЕРСИЯТ� �а документирани в ръковод�твото git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "тр�бва да е цв�т: %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "тр�бва да завършва � цв�т"
 
-#: builtin/blame.c:728
+#: builtin/blame.c:724
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "неправилен цв�т „%s“ в „color.blame.repeatedLines“"
 
-#: builtin/blame.c:746
+#: builtin/blame.c:742
 msgid "invalid value for blame.coloring"
 msgstr "неправилна �тойно�т за „blame.coloring“"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:841
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "вер�и�та за пре�качане „%s“ не може да бъде открита"
 
-#: builtin/blame.c:867
+#: builtin/blame.c:863
 msgid "show blame entries as we find them, incrementally"
 msgstr "извеждане на автор�твото � намирането му, по�ледователно"
 
-#: builtin/blame.c:868
+#: builtin/blame.c:864
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr ""
 "без извеждане на имената на обектите за граничните подавани� (�тандартно "
 "опци�та е изключена)"
 
-#: builtin/blame.c:869
+#: builtin/blame.c:865
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr ""
 "началните подавани� да не �е �читат за гранични (�тандартно опци�та е "
 "изключена)"
 
-#: builtin/blame.c:870
+#: builtin/blame.c:866
 msgid "show work cost statistics"
 msgstr "извеждане на �тати�тика за извършените дей�тви�"
 
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: 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 "извеждане на напредъка"
 
-#: builtin/blame.c:872
+#: builtin/blame.c:868
 msgid "show output score for blame entries"
 msgstr "извеждане на допълнителна информаци� за определ�нето на автор�твото"
 
-#: builtin/blame.c:873
+#: builtin/blame.c:869
 msgid "show original filename (Default: auto)"
 msgstr ""
 "извеждане на първоначалното име на файл (�тандартно това е автоматично)"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:870
 msgid "show original linenumber (Default: off)"
 msgstr ""
 "извеждане на първоначални� номер на ред (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:871
 msgid "show in a format designed for machine consumption"
 msgstr "извеждане във формат за по-нататъшна обработка"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:872
 msgid "show porcelain format with per-line commit information"
 msgstr ""
 "извеждане във формат за команди от потребител�ко ниво � информаци� на в�еки "
 "ред"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:873
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr ""
 "използване на �ъщи� формат като „git-annotate“ (�тандартно опци�та е "
 "изключена)"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:874
 msgid "show raw timestamp (Default: off)"
 msgstr "извеждане на неформатирани времена (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:879
+#: builtin/blame.c:875
 msgid "show long commit SHA1 (Default: off)"
 msgstr "извеждане на пълните �уми по SHA1 (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:880
+#: builtin/blame.c:876
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "без име на автор и време на пром�на (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:881
+#: builtin/blame.c:877
 msgid "show author email instead of name (Default: off)"
 msgstr ""
 "извеждане на е-пощата на автора, а не името му (�тандартно опци�та е "
 "изключена)"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:878
 msgid "ignore whitespace differences"
 msgstr "без разлики в знаците за интервали"
 
-#: builtin/blame.c:883 builtin/log.c:1820
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "ВЕРС"
 
-#: builtin/blame.c:883
+#: builtin/blame.c:879
 msgid "ignore <rev> when blaming"
 msgstr "пре�качане на ВЕРСи�та при извеждане на автор�твото"
 
-#: builtin/blame.c:884
+#: builtin/blame.c:880
 msgid "ignore revisions from <file>"
 msgstr "пре�качане на вер�иите указани във Ф�ЙЛа"
 
-#: builtin/blame.c:885
+#: builtin/blame.c:881
 msgid "color redundant metadata from previous line differently"
 msgstr ""
 "оцвет�ване на повтар�щите �е метаданни от предишни� ред в различен цв�т"
 
-#: builtin/blame.c:886
+#: builtin/blame.c:882
 msgid "color lines by age"
 msgstr "оцвет�ване на редовете по възра�т"
 
-#: builtin/blame.c:887
+#: builtin/blame.c:883
 msgid "spend extra cycles to find better match"
 msgstr "допълнителни изчи�лени� за по-добри резултати"
 
-#: builtin/blame.c:888
+#: builtin/blame.c:884
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "изчитане на вер�иите от Ф�ЙЛа, а не чрез изпълнение на „git-rev-list“"
 
-#: builtin/blame.c:889
+#: builtin/blame.c:885
 msgid "use <file>'s contents as the final image"
 msgstr "използване на �ъдържанието на Ф�ЙЛа като крайно положение"
 
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
 msgid "score"
 msgstr "напа�ване на редовете"
 
-#: builtin/blame.c:890
+#: builtin/blame.c:886
 msgid "find line copies within and across files"
 msgstr ""
 "тър�ене на копирани редове както в рамките на един файл, така и от един файл "
 "към друг"
 
-#: builtin/blame.c:891
+#: builtin/blame.c:887
 msgid "find line movements within and across files"
 msgstr ""
 "тър�ене на преме�тени редове както в рамките на един файл, така и от един "
 "файл към друг"
 
-#: builtin/blame.c:892
+#: builtin/blame.c:888
 msgid "range"
 msgstr "диапазон"
 
-#: builtin/blame.c:893
+#: builtin/blame.c:889
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
 "информаци� �амо за редовете в диапазона ��Ч�ЛО,КР�Й или �амо на :ФУ�КЦИЯта"
 
-#: builtin/blame.c:945
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "опци�та „--progress“ е не�ъвме�тима � „--incremental“ и форма̀та на командите "
@@ -11689,18 +12043,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:996
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "преди 4 години и 11 ме�еца"
 
-#: builtin/blame.c:1112
+#: 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:1157
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "Редове � автор�тво"
 
@@ -11732,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"
@@ -11741,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"
@@ -11750,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"
@@ -11764,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 "�еу�пешно обнов�ване на конфигурационни� файл"
 
@@ -11776,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:440 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "форматиращи�т низ не може да бъде анализиран: %s"
 
-#: builtin/branch.c:471
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "подаването, �очено от указател� „HEAD“, не може да �е у�танови"
 
-#: builtin/branch.c:477
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "„HEAD“ (%s) �очи извън директори�та „refs/heads“"
 
-#: builtin/branch.c:492
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Клонът „%s“ �е пребазира върху „%s“"
 
-#: builtin/branch.c:496
+#: builtin/branch.c:501
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Тър�и �е двоично в клона „%s“ при „%s“"
 
-#: builtin/branch.c:513
+#: builtin/branch.c:518
 msgid "cannot copy the current branch while not on any."
 msgstr "не може да копирате текущи� клон, защото �те извън който и да е клон"
 
-#: builtin/branch.c:515
+#: builtin/branch.c:520
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 "не може да преименувате текущи� клон, защото �те извън който и да е клон"
 
-#: builtin/branch.c:526
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "�еправилно име на клон: „%s“"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "�еу�пешно преименуване на клон"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "�еу�пешно копиране на клон"
 
-#: builtin/branch.c:561
+#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Клонът � неправилно име „%s“ е копиран"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Клонът � неправилно име „%s“ е преименуван"
 
-#: builtin/branch.c:570
+#: builtin/branch.c:575
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Клонът е преименуван на „%s“, но указател�т „HEAD“ не е обновен"
 
-#: builtin/branch.c:579
+#: builtin/branch.c:584
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Клонът е преименуван, но конфигурационни�т файл не е обновен"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:586
 msgid "Branch is copied, but update of config-file failed"
 msgstr "Клонът е копиран, но конфигурационни�т файл не е обновен"
 
-#: builtin/branch.c:597
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11880,183 +12234,179 @@ msgstr ""
 "    %s\n"
 "Редовете, които започват � „%c“, ще бъдат пропу�нати.\n"
 
-#: builtin/branch.c:631
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Общи на�тройки"
 
-#: builtin/branch.c:633
+#: builtin/branch.c:639
 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 "извеждане на контролната �ума и темата.  Повтар�нето на опци�та прибав� "
 "отдалечените клони"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "без информационни �ъобщени�"
 
-#: builtin/branch.c:635
-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:637
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "да не �е ползва"
 
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "клон-източник"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "�м�на на клона-източник"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "изчи�тване на информаци�та за клон-източник"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "цветен изход"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "дей�твие върху �лед�щите клони"
 
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:652 builtin/branch.c:654
 msgid "print only branches that contain the commit"
 msgstr "извеждане �амо на клоните, които �ъдържат това ПОД�В��Е"
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:653 builtin/branch.c:655
 msgid "print only branches that don't contain the commit"
 msgstr "извеждане �амо на клоните, които не �ъдържат това ПОД�В��Е"
 
-#: builtin/branch.c:650
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "Специални дей�тви� на „git-branch“:"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "извеждане както на �лед�щите, така и на локалните клони"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "изтриване на клони, които �а напълно �лети"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "изтриване и на клони, които не �а напълно �лети"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr ""
 "преме�тване/преименуване на клон и принадлежащи�т му журнал на указателите"
 
-#: builtin/branch.c:656
+#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr "преме�тване/преименуване на клон, дори ако има вече клон � такова име"
 
-#: builtin/branch.c:657
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "копиране на клон и принадлежащи� му журнал на указателите"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "копиране на клон, дори ако има вече клон � такова име"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "извеждане на имената на клоните"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "извеждане на името на текущи� клон"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "�ъздаване на журнала на указателите на клона"
 
-#: builtin/branch.c:663
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "редактиране на опи�анието на клона"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "принудително �ъздаване, преме�тване, преименуване, изтриване"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "извеждане �амо на �летите клони"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "извеждане �амо на не�летите клони"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "извеждане по колони"
 
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: 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:670
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "извеждане �амо на клоните на ОБЕКТ�"
 
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: 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:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: 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:695 builtin/clone.c:794
+#: builtin/branch.c:703 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr "В директори�та „refs/heads“ лип�ва файл „HEAD“"
 
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr "опциите „--column“ и „--verbose“ �а не�ъвме�тими"
-
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "�еобходимо е име на клон"
 
-#: builtin/branch.c:766
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "�е може да зададете опи�ание на не�вързан „HEAD“"
 
-#: builtin/branch.c:771
+#: builtin/branch.c:779
 msgid "cannot edit description of more than one branch"
 msgstr "�е може да редактирате опи�анието на повече от един клон едновременно"
 
-#: builtin/branch.c:778
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "В клона „%s“ в�е още н�ма подавани�."
 
-#: builtin/branch.c:781
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Лип�ва клон на име „%s“."
 
-#: builtin/branch.c:796
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "прекалено много клони за копиране"
 
-#: builtin/branch.c:805
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "прекалено много аргументи към командата за преименуване"
 
-#: builtin/branch.c:810
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr "прекалено много аргументи към командата за �ледене"
 
-#: builtin/branch.c:814
+#: builtin/branch.c:822
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -12064,31 +12414,31 @@ msgstr ""
 "Следеното от „HEAD“ не може да �е зададе да е „%s“, защото то не �очи към "
 "никой клон."
 
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "��ма клон на име „%s“."
 
-#: builtin/branch.c:821
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "�е �ъще�твува клон на име „%s“."
 
-#: builtin/branch.c:834
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "прекалено много аргументи към командата за �пиране на �ледене"
 
-#: builtin/branch.c:838
+#: builtin/branch.c:846
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "Следеното от „HEAD“ не може да махне, защото то не �очи към никой клон."
 
-#: builtin/branch.c:844
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "��ма информаци� клонът „%s“ да �леди н�кой друг"
 
-#: builtin/branch.c:854
+#: 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>?"
@@ -12096,7 +12446,7 @@ msgstr ""
 "опциите „-a“ и „-r“ на „git branch“ �а не�ъвме�тими � име на клон.\n"
 "Пробвайте �: „-a|-r --list Ш�БЛО�“"
 
-#: builtin/branch.c:858
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12104,32 +12454,32 @@ msgstr ""
 "опци�та „--set-upstream“ вече не �е поддържа.  Използвайте „--track“ или „--"
 "set-upstream-to“"
 
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "вер�и� на git:\n"
 
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "грешка при изпълнението на „uname()“ — „%s“ (%d)\n"
 
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
 msgid "compiler info: "
 msgstr "компилатор: "
 
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "библиотека на C: "
 
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
 msgid "not run from a git repository - no hooks to show\n"
 msgstr "командата е �тартирана извън хранилище на Git, затова н�ма куки\n"
 
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory Ф�ЙЛ] [-s|--suffix ФОРМ�Т]"
 
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -12165,38 +12515,33 @@ msgstr ""
 "Разгледайте о�таналата ча�т от доклада за грешка по-долу.\n"
 "Може да изтриете редовете, които не и�кате да �поделите.\n"
 
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
 msgid "specify a destination for the bugreport file"
 msgstr "укажете файла, в който да �е запази докладът за грешка"
 
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
 msgid "specify a strftime format suffix for the filename"
 msgstr "укажете �уфик�а на файла във формат за „strftime“"
 
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "родител�ките директории на „%s“ не може да бъдат �ъздадени"
 
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "Информаци� за �и�темата"
 
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "Включени куки"
 
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "нови�т файл „%s“ не може да бъде �ъздаден"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "в „%s“ не може да �е пише"
 
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "�ови�т доклад е �ъздаден в „%s“.\n"
@@ -12217,28 +12562,28 @@ msgstr "git bundle list-heads Ф�ЙЛ [ИМЕ_��_УК�З�ТЕЛ…]"
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle Ф�ЙЛ [ИМЕ_��_УК�З�ТЕЛ…]"
 
-#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
 msgid "do not show progress meter"
 msgstr "без извеждане на напредъка"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
 msgid "show progress meter"
 msgstr "извеждане на напредъка"
 
-#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
 msgid "show progress meter during object writing phase"
 msgstr "извеждане на напредъка във фазата на запазване на обектите"
 
-#: builtin/bundle.c:74 builtin/pack-objects.c:3754
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
 msgid "similar to --all-progress when progress meter is shown"
 msgstr ""
 "�ъщото дей�твие като опци�та „--all-progress“ при извеждането на напредъка"
 
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
 msgid "specify bundle format version"
 msgstr "вер�и� на пратката"
 
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
 msgstr "За �ъздаването на пратка е необходимо хранилище."
 
@@ -12246,25 +12591,25 @@ msgstr "За �ъздаването на пратка е необходимо х
 msgid "do not show bundle details"
 msgstr "без подробна информаци� за пратките"
 
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
 #, c-format
 msgid "%s is okay\n"
 msgstr "Пратката „%s“ е наред\n"
 
-#: builtin/bundle.c:163
+#: builtin/bundle.c:182
 msgid "Need a repository to unbundle."
 msgstr "За приемането на пратка е необходимо хранилище."
 
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "повече подробно�ти.  По�тав� �е пред подкоманда"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Разпакетиране на пратки от обекти"
 
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "�епозната подкоманда: %s"
 
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:622
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -12272,7 +12617,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ"
 
-#: builtin/cat-file.c:599
+#: builtin/cat-file.c:623
 msgid ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
@@ -12280,79 +12625,79 @@ msgstr ""
 "git cat-file (--batch[=ФОРМ�Т] | --batch-check[=ФОРМ�Т]) [--follow-symlinks] "
 "[--textconv | --filters]"
 
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:644
 msgid "only one batch option may be specified"
 msgstr "може да укажете �амо една пакетна опци�"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 "ВИДът може да е: „blob“ (BLOB), „tree“ (дърво), „commit“ (подаване), "
 "„tag“ (етикет)"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
 msgid "show object type"
 msgstr "извеждане на вида на обект"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
 msgid "show object size"
 msgstr "извеждане на размера на обект"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
 msgid "exit with zero when there's no error"
 msgstr "изход � 0, когато н�ма грешка"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
 msgid "pretty-print object's content"
 msgstr "форматирано извеждане на �ъдържанието на обекта"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 "да �е �тартира програмата зададена в на�тройката „textconv“ за преобразуване "
 "на �ъдържанието на обекта-BLOB"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
 msgid "for blob objects, run filters on object's content"
 msgstr ""
 "да �е �тартират програмите за преобразуване на �ъдържанието на обектите-BLOB"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
 msgid "blob"
 msgstr "обект-BLOB"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
 msgid "use a specific path for --textconv/--filters"
 msgstr "опциите „--textconv“/„--filters“ изи�кват път"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "позвол�ване на опциите „-s“ и „-t“ да работ�т � повредени обекти"
 
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
 msgid "buffer --batch output"
 msgstr "буфериране на изхода от „--batch“"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "извеждане на информаци� и �ъдържание на обектите подадени на �тандартни� вход"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
 msgid "show info about objects fed from the standard input"
 msgstr "извеждане на информаци� за обектите подадени на �тандартни� вход"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "�ледване на �имволните връзки �очещи в дървото (ползва �е � „--batch“ или „--"
 "batch-check“)"
 
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
 msgid "show all objects with --batch or --batch-check"
 msgstr "извеждане на в�ички обекти � „--batch“ или „--batch-check“"
 
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:690
 msgid "do not order --batch-all-objects output"
 msgstr "без подреждане на изхода от „--batch-all-objects“"
 
@@ -12372,7 +12717,7 @@ msgstr "извеждане на в�ички атрибути, зададени
 msgid "use .gitattributes only from the index"
 msgstr "използване на файла „.gitattributes“ �амо от индек�а"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "изчитане на имената на файловете от �тандартни� вход"
 
@@ -12380,8 +12725,8 @@ msgstr "изчитане на имената на файловете от �та
 msgid "terminate input and output records by a NUL character"
 msgstr "раздел�не на входните и изходните запи�и � нулеви� знак „NUL“"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
-#: builtin/worktree.c:491
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "без показване на напредъка"
 
@@ -12439,9 +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/submodule--helper.c:1825
-#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836
-#: builtin/submodule--helper.c:2334 builtin/worktree.c:719
+#: 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 "�ИЗ"
 
@@ -12505,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:414
+#: 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:419
+#: 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:426
+#: 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:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: 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:462 builtin/checkout.c:465
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "опциите „%s“ и „%s“ �а не�ъвме�тими"
-
-#: builtin/checkout.c:469
+#: builtin/checkout.c:474
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "�евъзможно е едновременно да обнов�вате пътища и да преминете към клона „%s“."
 
-#: builtin/checkout.c:473
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "не е указано нито „%s“, нито „%s“"
 
-#: builtin/checkout.c:477
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "опци�та „%s“ е задължителна, когато „%s“ не е зададена"
 
-#: builtin/checkout.c:482 builtin/checkout.c:487
+#: 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:563 builtin/checkout.c:570
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "път�т „%s“ не е �л�т"
 
-#: builtin/checkout.c:739
+#: builtin/checkout.c:747
 msgid "you need to resolve your current index first"
 msgstr "първо тр�бва да коригирате индек�а �и"
 
-#: builtin/checkout.c:793
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12607,50 +12948,50 @@ msgstr ""
 "индек�а:\n"
 "%s"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:890
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Журналът на указателите за „%s“ не може да �е про�леди: %s\n"
 
-#: builtin/checkout.c:928
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "Указател�т „HEAD“ в момента �очи към"
 
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
+#: 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:936
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Занул�ване на клона „%s“\n"
 
-#: builtin/checkout.c:939
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Вече �те на „%s“\n"
 
-#: builtin/checkout.c:943
+#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Преминаване към клона „%s“ и занул�ване на промените\n"
 
-#: builtin/checkout.c:945 builtin/checkout.c:1376
+#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Преминахте към нови� клон „%s“\n"
 
-#: builtin/checkout.c:947
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Преминахте към клона „%s“\n"
 
-#: builtin/checkout.c:998
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr "… и още %d.\n"
 
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12672,7 +13013,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1023
+#: 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"
@@ -12699,19 +13040,19 @@ msgstr[1] ""
 "    git branch ИМЕ_��_�ОВИЯ_КЛО� %s\n"
 "\n"
 
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "вътрешна грешка при обхождането на вер�иите"
 
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "Преди това „HEAD“ �очеше към"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
 msgid "You are on a branch yet to be born"
 msgstr "В момента �те на клон, който в�е още не е �ъздаден"
 
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12720,7 +13061,7 @@ msgstr ""
 "„%s“ може да е както локален файл, така и �лед�щ клон.  За уточн�ване\n"
 "ползвайте разделител� „--“ (и евентуално опци�та „--no-guess“)"
 
-#: builtin/checkout.c:1191
+#: 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"
@@ -12742,51 +13083,51 @@ msgstr ""
 "\n"
 "    checkout.defaultRemote=origin"
 
-#: builtin/checkout.c:1201
+#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "„%s“ напа�ва � множе�тво (%d) отдалечени клони"
 
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "очаква �е �амо един указател"
 
-#: builtin/checkout.c:1284
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "очаква �е един указател, а �те подали %d."
 
-#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "неправилен указател: %s"
 
-#: builtin/checkout.c:1343 builtin/checkout.c:1709
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "указател�т не �очи към обект-дърво: %s"
 
-#: builtin/checkout.c:1390
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "очаква �е клон, а не етикет — „%s“"
 
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "очаква �е локален, а не отдалечен клон — „%s“"
 
-#: builtin/checkout.c:1393 builtin/checkout.c:1401
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "очаква �е клон, а не „%s“"
 
-#: builtin/checkout.c:1396
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "очаква �е клон, а не подаване — „%s“"
 
-#: builtin/checkout.c:1412
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12794,7 +13135,7 @@ msgstr ""
 "по време на �ливане не може да преминете към друг клон.\n"
 "Пробвайте � „git merge --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1416
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12803,7 +13144,7 @@ msgstr ""
 "клон.\n"
 "Пробвайте � „git am --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1420
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12811,7 +13152,7 @@ msgstr ""
 "по време на пребазиране не може да преминете към друг клон.\n"
 "Пробвайте � „git rebase --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1424
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12819,7 +13160,7 @@ msgstr ""
 "по време на отбиране на подавани� не може да преминете към друг клон.\n"
 "Пробвайте � „git cherry-pick --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1428
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12827,139 +13168,129 @@ msgstr ""
 "по време на отм�на на подавани� не може да преминете към друг клон.\n"
 "Пробвайте � „git revert --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr "преминаване към друг клон по време на двоично тър�ене"
 
-#: builtin/checkout.c:1439
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr "задаването на път е не�ъвме�тимо � преминаването от един клон към друг"
 
-#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: 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:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: 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:1467
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "опци�та „%s“ е не�ъвме�тима �ъ� задаването на ��Ч�ЛО"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1487
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 "За да преминете към клон, подайте указател, който �очи към подаване.  „%s“ "
 "не е такъв"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "лип�ва аргумент — клон или подаване"
 
-#: builtin/checkout.c:1525
+#: builtin/checkout.c:1537
 msgid "perform a 3-way merge with the new branch"
 msgstr "извършване на тройно �ливане � нови� клон"
 
-#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "СТИЛ"
 
-#: builtin/checkout.c:1527
-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:1539 builtin/worktree.c:488
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "отдел�не на указател� „HEAD“ към указаното подаване"
 
-#: builtin/checkout.c:1540
-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:1542
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "принудително изтегл�не (вашите промени ще бъдат занулени)"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "�ОВ_КЛО�"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "нов клон без родител"
 
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "обнов�ване на игнорираните файлове (�тандартно)"
 
-#: builtin/checkout.c:1549
+#: builtin/checkout.c:1563
 msgid "do not check if another worktree is holding the given ref"
 msgstr "без проверка дали друго работно дърво държи указател�"
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "изтегл�не на вашата вер�и� на не�летите файлове"
 
-#: builtin/checkout.c:1565
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "изтегл�не на чуждата вер�и� на не�летите файлове"
 
-#: builtin/checkout.c:1569
+#: builtin/checkout.c:1583
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "без ограничаване на изброените пътища �амо до ча�тично изтеглените"
 
-#: builtin/checkout.c:1624
+#: 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:1628
-msgid "-p and --overlay are mutually exclusive"
-msgstr "опциите „-p“ и „--overlay“ �а не�ъвме�тими"
-
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "опци�та „--track“ изи�ква име на клон"
 
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "лип�ва име на клон, използвайте опци�та „-%c“"
 
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "„%s“ не може да бъде открит"
 
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "указан е неправилен път"
 
-#: builtin/checkout.c:1725
+#: 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:1729
+#: 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:1738
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "опциите „--pathspec-from-file“ и „--detach“ �а не�ъвме�тими"
-
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "опциите „--pathspec-from-file“ и „--patch“ �а не�ъвме�тими"
-
-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -12967,74 +13298,75 @@ msgstr ""
 "git checkout: опциите „--ours“/„--theirs“, „--force“ и „--merge“\n"
 "�а не�ъвме�тими � изтегл�не от индек�а."
 
-#: builtin/checkout.c:1759
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "тр�бва да укажете поне един път за въз�танов�ване"
 
-#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484
+#: 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:1786
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "�ъздаване и преминаване към нов клон"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "�ъздаване/занул�ване на клон и преминаване към него"
 
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "�ъздаване на журнал на указателите за нов клон"
 
-#: builtin/checkout.c:1791
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr ""
 "опит за отгатване на име на клон �лед неу�пешен опит � „git checkout "
 "�ЕСЪЩЕСТВУВ�Щ_КЛО�“ (�тандартно)"
 
-#: builtin/checkout.c:1792
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "използване на припокриващ режим (�тандартно)"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "�ъздаване и преминаване към нов клон"
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "�ъздаване/занул�ване на клон и преминаване към него"
 
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr ""
 "опит за отгатване на име на клон �лед неу�пешен опит � „git switch "
 "�ЕСЪЩЕСТВУВ�Щ_КЛО�“"
 
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "занул�ване на локалните промени"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "към кой указател към дърво да �е премине"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "въз�танов�ване на индек�а"
 
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "въз�танов�ване на работното дърво (�тандартно)"
 
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "пренебрегване на не�летите елементи"
 
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "използване на припокриващ режим"
 
@@ -13068,7 +13400,15 @@ msgstr "Хранилището „%s“ ще бъде пре�кочено\n"
 msgid "could not lstat %s\n"
 msgstr "не може да �е получи информаци� чрез „lstat“ за „%s“\n"
 
-#: builtin/clean.c:302 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"
@@ -13081,7 +13421,7 @@ msgstr ""
 "ПРЕФИКС    — избор на един�твен обект по този уникален префик�\n"
 "           — (празно) нищо да не �е избира\n"
 
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13102,33 +13442,33 @@ msgstr ""
 "*          — избиране на в�ички обекти\n"
 "           — (празно) завършване на избирането\n"
 
-#: builtin/clean.c:521 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:661
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Шаблони за игнорирани елементи≫ "
 
-#: builtin/clean.c:696
+#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: �икой обект не напа�ва на „%s“"
 
-#: builtin/clean.c:717
+#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "Избиране на обекти за изтриване"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Да �е изтрие ли „%s“? „y“ —  да, „N“ — �Е"
 
-#: builtin/clean.c:789
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13146,52 +13486,52 @@ msgstr ""
 "help                — този край\n"
 "?                   — под�казка за шаблоните"
 
-#: builtin/clean.c:825
+#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Следни�т обект ще бъде изтрит:"
 msgstr[1] "Следните обекти ще бъдат изтрити:"
 
-#: builtin/clean.c:841
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Файловете за изчи�тване �вършиха.  Изход от програмата."
 
-#: builtin/clean.c:903
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "без извеждане на имената на файловете, които ще бъдат изтрити"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:928
 msgid "force"
 msgstr "принудително изтриване"
 
-#: builtin/clean.c:906
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "интерактивно изтриване"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "изтриване на цели директории"
 
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: 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:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "Ш�БЛО�"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "добав�не на Ш�БЛО� от файлове, които да не �е три�т"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "изтриване и на игнорираните файлове"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "изтриване �амо на игнорирани файлове"
 
-#: builtin/clean.c:929
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13199,7 +13539,7 @@ msgstr ""
 "�а�тройката „clean.requireForce“ е зададена като и�тина, което изи�ква н�ко� "
 "от опциите „-i“, „-n“ или „-f“.  ��ма да �е извърши изчи�тване"
 
-#: builtin/clean.c:932
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13208,7 +13548,7 @@ msgstr ""
 "което изи�ква н�ко� от опциите „-i“, „-n“ или „-f“.  ��ма да �е извърши "
 "изчи�тване"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "опциите „-x“ и „-X“ �а не�ъвме�тими"
 
@@ -13224,7 +13564,7 @@ msgstr "без клониране на плитко хранилище"
 msgid "don't create a checkout"
 msgstr "без �ъздаване на работно дърво"
 
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "�ъздаване на голо хранилище"
 
@@ -13257,27 +13597,29 @@ msgstr "инициализиране на подмодулите при това
 msgid "number of submodules cloned in parallel"
 msgstr "брой подмодули, клонирани паралелно"
 
-#: builtin/clone.c:116 builtin/init-db.c:538
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "директори� � шаблони"
 
-#: builtin/clone.c:117 builtin/init-db.c:539
+#: builtin/clone.c:117 builtin/init-db.c:540
 msgid "directory from which templates will be used"
 msgstr "директори�, ко�то �ъдържа шаблоните, които да �е ползват"
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832
-#: builtin/submodule--helper.c:2337
+#: 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:1834
-#: builtin/submodule--helper.c:2339
+#: 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:549
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: 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 "ИМЕ"
 
@@ -13293,8 +13635,8 @@ 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:863
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
+#: builtin/pull.c:212
 msgid "depth"
 msgstr "ДЪЛБОЧИ��"
 
@@ -13302,8 +13644,8 @@ msgstr "ДЪЛБОЧИ��"
 msgid "create a shallow clone of that depth"
 msgstr "плитко клониране до тази ДЪЛБОЧИ��"
 
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
 msgid "time"
 msgstr "ВРЕМЕ"
 
@@ -13311,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/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: 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:215
+#: 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:1844
-#: builtin/submodule--helper.c:2353
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 "клониране �амо на един клон — или �очени� от отдалечени� „HEAD“, или изрично "
@@ -13336,11 +13678,11 @@ msgstr ""
 msgid "any cloned submodules will be shallow"
 msgstr "в�ички клонирани подмодули ще �а плитки"
 
-#: builtin/clone.c:142 builtin/init-db.c:547
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "СЛУЖЕБ��_ДИРЕКТОРИЯ"
 
-#: builtin/clone.c:143 builtin/init-db.c:548
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "отделна СЛУЖЕБ��_ДИРЕКТОРИЯ за git извън работното дърво"
 
@@ -13352,23 +13694,23 @@ msgstr "КЛЮЧ=СТОЙ�ОСТ"
 msgid "set config inside the new repository"
 msgstr "задаване на на�тройките на новото хранилище"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: 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/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: 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:234
-#: builtin/push.c:585
+#: 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:237
-#: builtin/push.c:587
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
+#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "�амо адре�и IPv6"
 
@@ -13382,51 +13724,43 @@ msgstr ""
 "инициализиране на файла за ча�тично изтегл�не („.git/info/sparse-checkout“) "
 "да �ъдържа �амо файловете в о�новната директори�"
 
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Името на директори�та не може да бъде отгатнато.\n"
-"Задайте директори�та изрично на командни� ред"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: не може да �е добави алтернативен източник на „%s“: %s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:304
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "„%s“ �ъще�твува и не е директори�"
 
-#: builtin/clone.c:436
+#: builtin/clone.c:322
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "неу�пешно итериране по „%s“"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:353
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "връзката „%s“ не може да бъде �ъздадена"
 
-#: builtin/clone.c:471
+#: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "файлът не може да бъде копиран като „%s“"
 
-#: builtin/clone.c:476
+#: builtin/clone.c:362
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "неу�пешно итериране по „%s“"
 
-#: builtin/clone.c:503
+#: builtin/clone.c:389
 #, c-format
 msgid "done.\n"
 msgstr "дей�твието завърши.\n"
 
-#: builtin/clone.c:517
+#: builtin/clone.c:403
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -13439,108 +13773,104 @@ msgstr ""
 "\n"
 "    git restore --source=HEAD :/\n"
 
-#: builtin/clone.c:594
+#: builtin/clone.c:480
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 "Клонът „%s“ от отдалеченото хранилище, което клонирате,\n"
 "и който �ледва да бъде изтеглен, не �ъще�твува."
 
-#: builtin/clone.c:713
+#: builtin/clone.c:597
 #, c-format
 msgid "unable to update %s"
 msgstr "обектът „%s“ не може да бъде обновен"
 
-#: builtin/clone.c:761
+#: builtin/clone.c:645
 msgid "failed to initialize sparse-checkout"
 msgstr "ча�тичното изтегл�не не може да �е инициализира"
 
-#: builtin/clone.c:784
+#: builtin/clone.c:668
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "указател�т „HEAD“ от отдалеченото хранилище �очи към нещо,\n"
 "което не �ъще�твува.  �е може да �е изтегли определен клон.\n"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:701
 msgid "unable to checkout working tree"
 msgstr "работното дърво не може да бъде подготвено"
 
-#: builtin/clone.c:894
+#: builtin/clone.c:779
 msgid "unable to write parameters to config file"
 msgstr "на�тройките не може да бъдат запи�ани в конфигурационни� файл"
 
-#: builtin/clone.c:957
+#: builtin/clone.c:842
 msgid "cannot repack to clean up"
 msgstr "не може да �е извърши пакетиране за изчи�тване на файловете"
 
-#: builtin/clone.c:959
+#: builtin/clone.c:844
 msgid "cannot unlink temporary alternates file"
 msgstr "временни�т файл за алтернативни обекти не може да бъде изтрит"
 
-#: builtin/clone.c:1001 builtin/receive-pack.c:2491
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "Прекалено много аргументи."
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
 msgstr "Тр�бва да укажете кое хранилище и�кате да клонирате."
 
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "опциите „--bare“ и „--origin %s“ �а не�ъвме�тими."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "опциите „%s“ и „%s %s“ �а не�ъвме�тими"
 
-#: builtin/clone.c:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "опциите „--bare“ и „--separate-git-dir“ �а не�ъвме�тими."
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "не �ъще�твува хранилище „%s“"
 
-#: builtin/clone.c:1039 builtin/fetch.c:2011
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "дълбочината тр�бва да е положително ц�ло чи�ло, а не „%s“"
 
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "целеви�т път „%s“ �ъще�твува и не е празна директори�."
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr "път�т в хранилището „%s“ �ъще�твува и не е празна директори�."
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "в „%s“ вече �ъще�твува работно дърво."
 
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
+#: 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“ не може да бъдат �ъздадени"
 
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "работното дърво в „%s“ не може да бъде �ъздадено."
 
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Клониране и �ъздаване на голо хранилище в „%s“…\n"
 
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Клониране и �ъздаване на хранилище в „%s“…\n"
 
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -13548,49 +13878,53 @@ msgstr ""
 "опци�та „--recursive“ е не�ъвме�тима � опциите „--reference“ и „--reference-"
 "if-able“"
 
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "„%s“ е неправилно име за отдалечено хранилище"
 
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опци�та „--depth“ �е пре�кача.  Ползвайте �хемата "
 "„file://“."
 
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опци�та „--shallow-since“ �е пре�кача.  Ползвайте "
 "�хемата „file://“."
 
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опци�та „--shallow-exclude“ �е пре�кача.  Ползвайте "
 "�хемата „file://“."
 
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опци�та „--filter“ �е пре�кача.  Ползвайте �хемата "
 "„file://“."
 
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
 msgid "source repository is shallow, ignoring --local"
 msgstr "клонираното хранилище е плитко, затова опци�та „--local“ �е пре�кача"
 
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
 msgid "--local is ignored"
 msgstr "опци�та „--local“ �е пре�кача"
 
-#: builtin/clone.c:1337 builtin/clone.c:1345
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr "отдалечени�т тран�порт върна грешка"
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Отдалечени�т клон „%s“ лип�ва в клонираното хранилище „%s“"
 
-#: builtin/clone.c:1348
+#: builtin/clone.c:1242
 msgid "You appear to have cloned an empty repository."
 msgstr "Изглежда клонирахте празно хранилище."
 
@@ -13626,14 +13960,14 @@ msgstr "поле в знаци между колоните"
 msgid "--command must be the first argument"
 msgstr "опци�та „--command“ тр�бва да е първи�т аргумент"
 
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
 msgid ""
 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 "git commit-graph verify [--object-dir ДИР_ОБЕКТИ] [--shallow] [--"
 "[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13643,99 +13977,97 @@ msgstr ""
 "split[=СТР�ТЕГИЯ]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] ОПЦИИ_З�_Р�ЗДЕЛЯ�Е"
 
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "директори�та � обекти, ко�то отговар� на „%s“, не може да бъде открита"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "директори�"
 
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr "ДИРектори�та_�_ОБЕКТИ за запазване на гра̀фа"
 
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 "ако гра̀фа � подавани�та е раздробен, да �е провер�ва �амо файлът на върха"
 
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Графът � подавани�та не може да �е отвори: „%s“"
 
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "непознат аргумент към „--split“: %s"
 
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr "неочакван, неше�тнай�етичен идентификатор на обект:  %s"
 
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "неправилен обект: „%s“"
 
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
 msgid "start walk at all refs"
 msgstr "обхождането да започне от в�ички указатели"
 
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr ""
 "проверка на подавани�та за индек�ите на пакетите изброени на командни� ред"
 
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
 msgid "start walk at commits listed by stdin"
 msgstr "започване на обхождането при подавани�та подадени на �тандартни� вход"
 
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
 msgstr ""
 "включване на в�ички подавани�, които вече �а във файла � гра̀фа на подавани�та"
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
 msgid "enable computation for changed paths"
 msgstr "включване на изчи�лени�та за променените пътища"
 
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
 msgid "allow writing an incremental commit-graph file"
 msgstr "позвол�ване на запи� на нара�тващ файл � гра̀фа на подавани�та"
 
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr "мак�имален брой подавани� в небазово ниво на раздробен граф"
 
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr ""
 "мак�имално отношение на бро� подавани� в две по�ледователни нива в раздробен "
 "граф"
 
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
 msgid "only expire files older than a given date-time"
 msgstr "об�в�ване за о�тарели �амо на файловете по-�тари от това ВРЕМЕ"
 
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr "мак�имален брой промени в пътищата �ледени от филтрите на Блум"
 
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr ""
 "опциите „--reachable“, „--stdin-commits“ и „--stdin-packs“ �а не�ъвме�тими"
 
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
 msgid "Collecting commits from input"
 msgstr "Получаване на подавани�та от входа"
 
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "непозната подкоманда: %s"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13749,70 +14081,65 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "пре�качане на повтар�щ �е родител: „%s“"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
+#: 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“"
 
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: „%s“ не може да �е отвори"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree: „%s“ не може да �е прочете"
 
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree: „%s“ не може да �е затвори"
 
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr "родител"
 
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "ИДЕ�ТИФИК�ТОР на обекта за подаването-родител"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
-#: builtin/tag.c:456
+#: 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:115 builtin/commit.c:1614
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "СЪОБЩЕ�ИЕ при подаване"
 
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
 msgstr "изчитане на �ъобщението за подаване от Ф�ЙЛ"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299
-#: 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 "подпи�ване на подаването � GPG"
 
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "тр�бва да е точно едно дърво"
 
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: не може да �е прочете"
 
-#: builtin/commit.c:41
+#: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [ОПЦИЯ…] [--] ПЪТ…"
 
-#: builtin/commit.c:46
+#: builtin/commit.c:47
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [ОПЦИЯ…] [--] ПЪТ…"
 
-#: builtin/commit.c:51
+#: builtin/commit.c:52
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13824,7 +14151,7 @@ msgstr ""
 "� опци�та „--allow-empty“, или да го изтриете от и�тори�та � командата:\n"
 "„git reset HEAD^“.\n"
 
-#: builtin/commit.c:56
+#: builtin/commit.c:57
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -13839,21 +14166,21 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:63
+#: builtin/commit.c:64
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr ""
 "В противен �лучай използвайте командата:\n"
 "\n"
 "    git rebase --skip\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:67
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr ""
 "В противен �лучай използвайте командата:\n"
 "\n"
 "    git cherry-pick --skip\n"
 
-#: builtin/commit.c:69
+#: builtin/commit.c:70
 msgid ""
 "and then use:\n"
 "\n"
@@ -13875,73 +14202,69 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:324
+#: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
 msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
 
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "опциите „-a“ и „--pathspec-from-file“ �а не�ъвме�тими"
-
-#: builtin/commit.c:374
+#: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "опциите „--include“ и „--only“ изи�кват аргументи."
 
-#: builtin/commit.c:386
+#: builtin/commit.c:387
 msgid "unable to create temporary index"
 msgstr "временни�т индек� не може да бъде �ъздаден"
 
-#: builtin/commit.c:395
+#: builtin/commit.c:396
 msgid "interactive add failed"
 msgstr "неу�пешно интерактивно добав�не"
 
-#: builtin/commit.c:410
+#: builtin/commit.c:411
 msgid "unable to update temporary index"
 msgstr "временни�т индек� не може да бъде обновен"
 
-#: builtin/commit.c:412
+#: builtin/commit.c:413
 msgid "Failed to update main cache tree"
 msgstr "Дървото на о�новни� кеш не може да бъде обновено"
 
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
 msgid "unable to write new_index file"
-msgstr "нови�т индек� не може да бъде запи�ан"
+msgstr "нови�т индек� (new_index) не може да бъде запи�ан"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "cannot do a partial commit during a merge."
 msgstr "по време на �ливане не може да �е извърши ча�тично подаване."
 
-#: builtin/commit.c:491
+#: builtin/commit.c:492
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "по време на отбиране не може да �е извърши ча�тично подаване."
 
-#: builtin/commit.c:493
+#: builtin/commit.c:494
 msgid "cannot do a partial commit during a rebase."
 msgstr "по време на пребазиране не може да �е извърши ча�тично подаване."
 
-#: builtin/commit.c:501
+#: builtin/commit.c:502
 msgid "cannot read the index"
 msgstr "индек�ът не може да бъде прочетен"
 
-#: builtin/commit.c:520
+#: builtin/commit.c:521
 msgid "unable to write temporary index file"
 msgstr "временни�т индек� не може да бъде запи�ан"
 
-#: builtin/commit.c:618
+#: builtin/commit.c:619
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "заглавната ча�т за автор в подаването „%s“ лип�ва"
 
-#: builtin/commit.c:620
+#: builtin/commit.c:621
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "заглавната ча�т за автор в подаването „%s“ е неправилна"
 
-#: builtin/commit.c:639
+#: builtin/commit.c:640
 msgid "malformed --author parameter"
 msgstr "неправилен параметър към опци�та „--author“"
 
-#: builtin/commit.c:692
+#: builtin/commit.c:693
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -13949,43 +14272,81 @@ msgstr ""
 "не може да �е избере знак за коментар — в текущото �ъобщение за подаване �а "
 "използвани в�ички подобни знаци"
 
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "�ледното подаване не може да бъде открито: %s"
 
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(изчитане на �ъобщението за подаване от �тандартни� вход)\n"
 
-#: builtin/commit.c:760
+#: builtin/commit.c:761
 msgid "could not read log from standard input"
 msgstr "�ъобщението за подаване не бе прочетено �тандартни� вход"
 
-#: builtin/commit.c:764
+#: builtin/commit.c:765
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "файлът �ъ� �ъобщението за подаване „%s“ не може да бъде прочетен"
 
-#: builtin/commit.c:801
+#: 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:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
 msgstr "�ъобщението за вкарване SQUASH_MSG не може да бъде прочетено"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:821
 msgid "could not read MERGE_MSG"
 msgstr "�ъобщението за �ливане MERGE_MSG не може да бъде прочетено"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:881
 msgid "could not write commit template"
 msgstr "шаблонът за подаване не може да бъде запазен"
 
+#: builtin/commit.c:894
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr ""
+"Въведете �ъобщението за подаване на промените.  Редовете, които започват\n"
+"� „%c“, ще бъдат пропу�нати.\n"
+
+#: builtin/commit.c:896
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Въведете �ъобщението за подаване на промените.  Редовете, които започват\n"
+"� „%c“, ще бъдат пропу�нати, а празно �ъобщение преу�танов�ва подаването.\n"
+
 #: builtin/commit.c:900
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Въведете �ъобщението за подаване на промените.  Редовете, които започват\n"
+"� „%c“, �ъщо ще бъдат включени — може да ги изтриете вие.\n"
+
+#: builtin/commit.c:904
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Въведете �ъобщението за подаване на промените.  Редовете, които започват\n"
+"� „%c“, �ъщо ще бъдат включени — може да ги изтриете вие.  Празно \n"
+"�ъобщение преу�танов�ва подаването.\n"
+
+#: builtin/commit.c:916
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -14000,7 +14361,7 @@ msgstr ""
 "    git update-ref -d MERGE_HEAD\n"
 "и опитайте отново.\n"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:921
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -14015,206 +14376,177 @@ msgstr ""
 "    git update-ref -d CHERRY_PICK_HEAD\n"
 "и опитайте отново.\n"
 
-#: builtin/commit.c:915
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"Въведете �ъобщението за подаване на промените.  Редовете, които започват\n"
-"� „%c“, ще бъдат пропу�нати, а празно �ъобщение преу�танов�ва подаването.\n"
-
-#: builtin/commit.c:923
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"Въведете �ъобщението за подаване на промените.  Редовете, които започват\n"
-"� „%c“, �ъщо ще бъдат включени — може да ги изтриете вие.  Празно \n"
-"�ъобщение преу�танов�ва подаването.\n"
-
-#: builtin/commit.c:940
+#: builtin/commit.c:948
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s�втор:   %.*s <%.*s>"
 
-#: builtin/commit.c:948
+#: builtin/commit.c:956
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sДата:    %s"
 
-#: builtin/commit.c:955
+#: builtin/commit.c:963
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sПодаващ: %.*s <%.*s>"
 
-#: builtin/commit.c:973
+#: builtin/commit.c:981
 msgid "Cannot read index"
 msgstr "Индек�ът не може да бъде прочетен"
 
-#: builtin/commit.c:1018
+#: builtin/commit.c:1026
 msgid "unable to pass trailers to --trailers"
 msgstr "епилогът не може да �е подаде на „--trailers“"
 
-#: builtin/commit.c:1058
+#: builtin/commit.c:1066
 msgid "Error building trees"
 msgstr "Грешка при изграждане на дърветата"
 
-#: builtin/commit.c:1072 builtin/tag.c:319
+#: 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"
 
-#: builtin/commit.c:1116
+#: builtin/commit.c:1124
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "опци�та „--author '%s'“ не отговар� на форма̀та „Име <е-поща>“ и не �ъвпада � "
 "никой автор"
 
-#: builtin/commit.c:1130
+#: builtin/commit.c:1138
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "�еправилен режим за игнорираните файлове: „%s“"
 
-#: builtin/commit.c:1148 builtin/commit.c:1441
+#: builtin/commit.c:1156 builtin/commit.c:1451
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "�еправилен режим за не�ледените файлове: „%s“"
 
-#: builtin/commit.c:1188
-msgid "--long and -z are incompatible"
-msgstr "опциите „--long“ и „-z“ �а не�ъвме�тими."
-
-#: builtin/commit.c:1219
+#: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr ""
 "В момента �е извършва �ливане, не може да промените �ъобщение при подаване."
 
-#: builtin/commit.c:1221
+#: builtin/commit.c:1229
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr ""
 "В момента �е извършва отбиране на подаване, не може да промените �ъобщение "
 "при подаване."
 
-#: builtin/commit.c:1224
+#: 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:1226
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"опци�та за пром�на на �ъобщението на „--fixup“ и „--patch“/„--interactive“/"
-"„--all“/„--include“/„--only“ �а не�ъвме�тими"
+#: builtin/commit.c:1234
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "опциите „%s“ и „%s“ �а не�ъвме�тими"
 
-#: builtin/commit.c:1245
+#: 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:1254
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "��ма какво да бъде поправено."
 
-#: builtin/commit.c:1257
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "В момента �е извършва �ливане, не може да поправ�те."
 
-#: builtin/commit.c:1259
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "В момента �е извършва отбиране на подаване, не може да поправ�те."
 
-#: builtin/commit.c:1261
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "В момента �е извършва пребазиране, не може да поправ�те."
 
-#: builtin/commit.c:1264
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "опциите „--squash“ и „--fixup“ �а не�ъвме�тими."
 
-#: builtin/commit.c:1274
+#: builtin/commit.c:1281
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "опциите „-c“, „-C“, „-F“ и „--fixup““ �а не�ъвме�тими."
 
-#: builtin/commit.c:1276
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "опци�та „-m“ е не�ъвме�тима � „-c“, „-C“ и „-F“."
 
-#: builtin/commit.c:1285
+#: 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:1303
+#: 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:1331
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "непозната опци�: --fixup=%s:%s"
 
-#: builtin/commit.c:1345
+#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "опци�та „-a“ е не�ъвме�тима �ъ� задаването на пътища: „%s…“"
 
-#: builtin/commit.c:1476 builtin/commit.c:1642
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "кратка информаци� за �ъ�то�нието"
 
-#: builtin/commit.c:1478 builtin/commit.c:1644
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "информаци� за клоните"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "информаци� за �катаното"
 
-#: builtin/commit.c:1482 builtin/commit.c:1646
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "изчи�л�ване на точните �тойно�ти напред/назад"
 
-#: builtin/commit.c:1484
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "вер�и�"
 
-#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
-#: builtin/worktree.c:681
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "формат на изхода за четене от програма"
 
-#: builtin/commit.c:1487 builtin/commit.c:1650
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr "подробна информаци� за �ъ�то�нието (�тандартно)"
 
-#: builtin/commit.c:1490 builtin/commit.c:1653
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "раздел�не на елементите � нулеви� знак „NUL“"
 
-#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: 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:1493 builtin/commit.c:1656
+#: 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:1497
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14223,11 +14555,11 @@ msgstr ""
 "„traditional“ (традиционен), „matching“ (напа�ващи), „no“ (без игнорираните "
 "файлове).  Стандартни�т РЕЖИМ е: „traditional“."
 
-#: builtin/commit.c:1499 parse-options.h:193
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "КОГ�"
 
-#: builtin/commit.c:1500
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14236,197 +14568,197 @@ msgstr ""
 "една от „all“ (в�ички), „dirty“ (тези � неподадени промени), "
 "„untracked“ (не�ледени)"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "извеждане на не�ледените файлове в колони"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "без за�ичане на преименувани�та"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr "за�ичане на преименувани�та, може да �е зададе коефициент на прилика"
 
-#: builtin/commit.c:1525
+#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "�еподдържана комбинаци� от аргументи за игнорирани и не�ледени файлове"
 
-#: builtin/commit.c:1607
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "без информаци� �лед у�пешно подаване"
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "добав�не на разликата към шаблона за �ъобщението при подаване"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "Опции за �ъобщението при подаване"
 
-#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr "взимане на �ъобщението от Ф�ЙЛ"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "�ВТОР"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "задаване на �ВТОР за подаването"
 
-#: builtin/commit.c:1613 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "Д�Т�"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "задаване на Д�Т� за подаването"
 
-#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
-#: parse-options.h:329 ref-filter.h:90
+#: 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:1615
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr "преизползване и редактиране на �ъобщението от указаното ПОД�В��Е"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr "преизползване на �ъобщението от указаното ПОД�В��Е"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1621
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]подаване"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
 "използване на автоматичното �ъобщение за вкарване на указаното ПОД�В��Е в "
 "предходното без �леда или за пром�на на подаването или �ъобщението"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1635
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "използване на автоматичното �ъобщение за вкарване на указаното ПОД�В��Е в "
 "предното"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1636
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "�м�на на автора да �ъвпада � подаващи� (използва �е � „-C“/„-c“/„--amend“)"
 
-#: builtin/commit.c:1624 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
-msgstr "епилог"
+msgstr "ЕПИЛОГ"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
-msgstr "добов�не на друг епилог"
+msgstr "добав�не на друг ЕПИЛОГ"
 
-#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: 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:1626
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "използване на указани� шаблонен Ф�ЙЛ"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "редактиране на подаване"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr "вмъкване на �ъ�то�нието в шаблона за �ъобщението при подаване"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "Опции за избор на файлове при подаване"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "подаване на в�ички променени файлове"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "добав�не на указаните файлове към индек�а за подаване"
 
-#: builtin/commit.c:1637
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "интерактивно добав�не на файлове"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "интерактивно добав�не на промени"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "подаване �амо на указаните файлове"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 "без изпълнение на куките преди подаване и при пром�на на �ъобщението за "
 "подаване (pre-commit и commit-msg)"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "отпечатване на това, което би било подадено"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "поправ�не на предишното подаване"
 
-#: builtin/commit.c:1655
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "без изпълнение на куката �лед презапи�ване (post-rewrite)"
 
-#: builtin/commit.c:1662
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "позвол�ване на празни подавани�"
 
-#: builtin/commit.c:1664
+#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr "позвол�ване на подавани� � празни �ъобщени�"
 
-#: builtin/commit.c:1737
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Повреден файл за върха за �ливането „MERGE_HEAD“ (%s)"
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "режимът на �ливане „MERGE_MODE“ не може да бъде прочетен"
 
-#: builtin/commit.c:1765
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "�ъобщението за подаване не може да бъде прочетено: %s"
 
-#: builtin/commit.c:1772
+#: builtin/commit.c:1788
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "�еизвършване на подаване поради празно �ъобщение.\n"
 
-#: builtin/commit.c:1777
+#: builtin/commit.c:1793
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "�еизвършване на подаване поради нередактирано �ъобщение.\n"
 
-#: builtin/commit.c:1788
+#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "�еизвършване на подаване поради празно �ъобщение.\n"
 
-#: builtin/commit.c:1824
+#: 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"
@@ -14694,7 +15026,7 @@ msgstr "„--worktree“ може да Ñ�е използва Ñ�амо в храÐ
 
 #: builtin/config.c:684
 msgid "$HOME not set"
-msgstr "променливата „HOME“ не е зададена"
+msgstr "�тойно�тта „$HOME“ не е зададена"
 
 #: builtin/config.c:708
 msgid ""
@@ -14702,7 +15034,7 @@ msgid ""
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
 "section in \"git help worktree\" for details"
 msgstr ""
-"опци�та „--worktre“ не приема множе�тво работни дървета, преди\n"
+"опци�та „--worktree“ не приема множе�тво работни дървета, преди\n"
 "включването на разширението в на�тройките „worktreeConfig“.  За\n"
 "повече информаци� вижте раздела „CONFIGURATION FILE“ в\n"
 "„git help worktree“"
@@ -14803,10 +15135,10 @@ msgstr "извеждане на Ñ�ъобщениÑ�та за траÑ�иране Ð
 #: builtin/credential-cache--daemon.c:316
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr ""
-"демонът за кеша � идентификациите е недо�тъпен — лип�ва поддръжка на гнезда "
-"на unix"
+"демонът за кеша � идентификациите е недо�тъпен (credential-cache--daemon) — "
+"лип�ва поддръжка на гнезда на unix"
 
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr ""
 "кешът � идентификациите е недо�тъпен — лип�ва поддръжка на гнезда на unix"
@@ -14952,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 "извеждане на �ъкратено име на обект като резервен вариант"
 
@@ -14969,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"
@@ -15008,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:684
+#: 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“"
@@ -15036,115 +15357,107 @@ msgstr "%s...%s: много бази за �ливане, ще �е ползва
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [ОПЦИЯ…] [ПОД�В��Е [ПОД�В��Е]] [[--] ПЪТ…]"
 
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "неу�пешно дей�твие � изходен код: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "�имволната връзка „%s“ не може да бъде прочетена"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "файлът, �очен от �имволната връзка „%s“, не може да бъде прочетен"
 
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "обектът „%s“ за �имволната връзка „%s“ не може да бъде прочетен"
 
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
 msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
 msgstr ""
 "комбинираните формати на разликите („-c“ и „--cc“) не �е поддържат\n"
 "в режима за разлики върху директории („-d“ и „--dir-diff“)."
 
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "и двата файла �а променени: „%s“ и „%s“."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "работното дърво е изо�тавено."
 
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "в „%s“ има временни файлове."
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "възможно е да ги изчи�тите или въз�тановите"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "неу�пешно дей�твие � изходен код: %d"
+
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "използвайте „diff.guitool“ вме�то „diff.tool“"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "разлика по директории"
 
-#: builtin/difftool.c:704
+#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "�тартиране на ПРОГР�М�та за разлики без предупреждение"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "�ледване на �имволните връзки при разлика по директории"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "ПРОГР�М�"
 
-#: builtin/difftool.c:711
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "използване на указаната ПРОГР�М�"
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "извеждане на �пи�ък � в�ички ПРОГР�Ми, които може да �е ползват � опци�та „--"
 "tool“"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:706
 msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr ""
-"„git-difftool“ да �пре работа, когато �тартираната ПРОГР�М� завърши � "
-"ненулев код"
+"„git-difftool“ да �пре работа, когато �тартираната ПРОГР�М� за разлики "
+"завърши � ненулев код"
 
-#: builtin/difftool.c:719
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "команда за разглеждане на разлики"
 
-#: builtin/difftool.c:720
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "подава �е към „diff“"
 
-#: builtin/difftool.c:735
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "„git-difftool“ изи�ква работно дърво или опци�та „--no-index“"
 
-#: builtin/difftool.c:742
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "опциите „--dir-diff“ и „--no-index“ �а не�ъвме�тими"
-
-#: builtin/difftool.c:745
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "опциите „--gui“, „--tool“ и „--extcmd“ �а не�ъвме�тими една � друга"
-
-#: builtin/difftool.c:753
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "не е зададена програма за „--tool=ПРОГР�М�“"
 
-#: builtin/difftool.c:760
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "не е зададена команда за „--extcmd=КОМ��Д�“"
 
@@ -15152,7 +15465,7 @@ msgstr "не е зададена команда за „--extcmd=КОМÐ�Ð�ДÐ�â
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] ОПЦИИ ПРОМЕ�ЛИВИ"
 
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
 msgid "type"
 msgstr "ВИД"
 
@@ -15184,128 +15497,120 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [ОПЦИИ_З�_СПИСЪК�_С_ВЕРСИИ]"
 
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 "Грешка: непреките етикети не �е изна��т, о�вен ако не зададете „--mark-tags“."
 
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "опци�та „--anonymize-map“ изи�ква аргумент"
 
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "Съобщение за напредъка на в�еки такъв БРОЙ обекта"
 
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "Как да �е обработват подпи�аните етикети"
 
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr "Как да �е обработват етикетите на филтрираните обекти"
 
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "как да �е обработват �ъобщени�та за подаване, които �а в друго кодиране"
 
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "запазване на маркерите в този Ф�ЙЛ"
 
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "вна��не на маркерите от този Ф�ЙЛ"
 
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "вна��не на маркерите от този Ф�ЙЛ, ако �ъще�твува"
 
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr ""
 "да �е използва изку�твено име на човек при лип�а на �ъздател на етикета"
 
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "извеждане на ц�лото дърво за в��ко подаване"
 
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "използване на маркер за завършване на потока"
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "без извеждане на �ъдържанието на обектите-BLOB"
 
-#: builtin/fast-export.c:1222 builtin/log.c:1823
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "УК�З�ТЕЛ_��_ВЕРСИЯ"
 
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "прилагане на УК�З�ТЕЛ�_��_ВЕРСИЯ към изне�ените указатели"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "анонимизиране на извежданата информаци�"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "ОТ:КЪМ"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "заме�тване ОТ �ъ� КЪМ в анонимизирани� изход"
 
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
 "указване на родителите, които не �а в потока на бързо изна��не, � "
 "идентификатор на обект"
 
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr "извеждане на първоначалните идентификатори на обектите BLOB/подав�ни�"
 
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "задаване на идентификатори на маркери на етикетите"
 
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "опци�та „--anonymize-map“ изи�ква „--anonymize“"
-
-#: builtin/fast-export.c:1271
-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“"
@@ -15315,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:185
+#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "до�тав�не от в�ички отдалечени хранилища"
 
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:148 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "задаване на клон за �ледене за издърпване/до�тав�не"
 
-#: 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 "добав�не към „.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:191
+#: 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:195
+#: 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:198
+#: 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:122
+#: 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:206
+#: 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: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 "задълбочаване на и�тори�та на плитко хранилище"
 
-#: 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 "задълбочаване на и�тори�та на плитко хранилище до определено време"
 
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: 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)"
@@ -15436,121 +15741,127 @@ msgstr ""
 "�тандартно рекур�ивно изтегл�не на подмодулите (файловете � на�тройки �а � "
 "приоритет)"
 
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: 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:226
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "К�РТ�_С_УК�З�ТЕЛИ"
 
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "указване на К�РТ�та_С_УК�З�ТЕЛИ за до�тав�не"
 
-#: 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 "докладване, че в�ички обекти може �а до�тижими при започване от този"
 
-#: 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:243
+#: 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:757
+#: builtin/fetch.c:766
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "на�тройката „fetch.output“ е � неправилна �тойно�т „%s“"
 
-#: builtin/fetch.c:856
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "обектът „%s“ лип�ва"
 
-#: builtin/fetch.c:860
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[актуален]"
 
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[отхвърлен]"
 
-#: builtin/fetch.c:874
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "в текущи� клон не може да �е до�тав�"
 
-#: builtin/fetch.c:884
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr "изтеглен в друго работно дърво"
+
+#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr "[обнов�ване на етикетите]"
 
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: 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:889
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "�ъще�твуващ етикет ще бъде презапи�ан"
 
-#: builtin/fetch.c:911
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[нов етикет]"
 
-#: builtin/fetch.c:914
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[нов клон]"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[нов указател]"
 
-#: builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "принудително обнов�ване"
 
-#: builtin/fetch.c:961
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "�ъщин�ко �ливане"
 
-#: builtin/fetch.c:1065
+#: 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:1069
+#: 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“, а за да � изключите за "
@@ -15558,24 +15869,23 @@ msgstr ""
 "\n"
 "    git config fetch.showForcedUpdates false\n"
 
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1112
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "хранилището „%s“ не изпрати в�ички необходими обекти\n"
 
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1141
 #, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr ""
-"отхвърл�не на върха „%s“, защото плитките хранилища не може да бъдат "
-"обнов�вани"
+"отхвърл�не на „%s“, защото плитките върхове не може да бъдат обнов�вани"
 
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "От %.*s\n"
 
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15585,146 +15895,157 @@ msgstr ""
 "„git remote prune %s“, за да премахнете о�тарелите клони, които\n"
 "предизвикват конфликта"
 
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (обектът „%s“ ще �е окаже извън клон)"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (обектът „%s“ вече е извън клон)"
 
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[изтрит]"
 
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(нищо)"
 
-#: builtin/fetch.c:1384
+#: 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:1403
+#: 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:1406
+#: 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:1618
+#: builtin/fetch.c:1455
+#, c-format
+msgid "the object %s does not exist"
+msgstr "обектът „%s“ не �ъще�твува"
+
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr ""
 "за�ечени �а множе�тво клони, това е не�ъвме�тимо � опци�та „--set-upstream“"
 
-#: builtin/fetch.c:1633
+#: 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:1635
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr "не може да указвате клон за �ледене на отдалечен етикет"
 
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "непознат вид клон"
 
-#: builtin/fetch.c:1639
+#: 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:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "До�тав�не на „%s“\n"
 
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 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:1790
+#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "„%s“ не може да �е до�тави (изходни�т код е: %d)\n"
 
-#: builtin/fetch.c:1894
+#: 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:1930
-msgid "You need to specify a tag name."
-msgstr "Тр�бва да укажете име на етикет."
-
-#: builtin/fetch.c:1995
-msgid "Negative depth in --deepen is not supported"
-msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не �е поддържа"
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "тр�бва да укажете име на етикет"
 
-#: builtin/fetch.c:1997
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "опциите „--deepen“ и „--depth“ �а не�ъвме�тими"
+#: builtin/fetch.c:2032
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr ""
+"Опци�та „--negotiate-only“ изи�ква една или повече опции „--negotiate-tip=*“"
 
-#: builtin/fetch.c:2002
-msgid "--depth and --unshallow cannot be used together"
-msgstr "опциите „--depth“ и „--unshallow“ �а не�ъвме�тими"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
+msgstr "отрицателна дълбочина като аргумент на „--deepen“ не �е поддържа"
 
-#: builtin/fetch.c:2004
+#: builtin/fetch.c:2045
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "не може да използвате опци�та „--unshallow“ върху пълно хранилище"
 
-#: builtin/fetch.c:2021
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr "към „git fetch --all“ не може да добавите аргумент-хранилище"
 
-#: builtin/fetch.c:2023
+#: builtin/fetch.c:2064
 msgid "fetch --all does not make sense with refspecs"
 msgstr "към „git fetch --all“ не може да добавите аргумент-указател на вер�и�"
 
-#: builtin/fetch.c:2032
+#: 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:2039
-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:2055
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr "опци�та „--negotiate-only“ изи�ква хранилище"
 
-#: builtin/fetch.c:2060
-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:2079
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
 msgstr ""
 "опци�та „--filter“ може да �е ползва �амо � отдалеченото хранилище указано в "
-"на�тройката „extensions.partialClone“"
+"на�тройката „extensions.partialclone“"
 
-#: builtin/fetch.c:2083
+#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
 msgstr ""
 "опци�та „--atomic“ поддържа до�тав�не �амо от едно отдалечено хранилище"
 
-#: builtin/fetch.c:2087
+#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "опци�та „--stdin“ поддържа до�тав�не �амо от едно отдалечено хранилище"
 
@@ -15734,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 "файл, от който да �е чете"
 
@@ -15772,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:483
+#: 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 "извеждане �амо на указателите, които не �ъдържат това ПОД�В��Е"
 
@@ -15820,19 +16145,19 @@ msgstr "извеждане �амо на указателите, които не
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=��СТРОЙК� �РГУМЕ�Т…"
 
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "на�тройка"
 
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "на�тройка, ко�то �ъдържа �пи�ък � пътища към хранилища"
 
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "лип�ва --config=��СТРОЙК�"
 
-#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "непознат"
 
@@ -15848,16 +16173,16 @@ msgstr "грешка в %s „%s“: %s"
 msgid "warning in %s %s: %s"
 msgstr "предупреждение за %s „%s“: %s"
 
-#: builtin/fsck.c:123 builtin/fsck.c:126
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "�къ�ана връзка от %7s %s"
 
-#: builtin/fsck.c:135
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "неправилен вид обект във връзката"
 
-#: builtin/fsck.c:151
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -15866,212 +16191,222 @@ msgstr ""
 "�къ�ана връзка от %7s %s\n"
 "              към %7s %s"
 
-#: builtin/fsck.c:263
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "лип�ващ обект: %s „%s“"
 
-#: builtin/fsck.c:290
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "недо�тижим обект: %s „%s“"
 
-#: builtin/fsck.c:310
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "извън клон: %s „%s“"
 
-#: builtin/fsck.c:320
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "„lost-found“ не може да �е �ъздаде"
 
-#: builtin/fsck.c:331
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "„%s“ не може да �е завърши"
 
-#: builtin/fsck.c:348
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Проверка на „%s“"
 
-#: builtin/fsck.c:386
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Проверка на �вързано�тта (%d обекта)"
 
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Провер�ване на %s „%s“"
 
-#: builtin/fsck.c:410
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "�къ�ани връзки"
 
-#: builtin/fsck.c:419
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "начална директори� „%s“"
 
-#: builtin/fsck.c:427
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "приложен етикет „%s“ върху „%s“ (%s) в „%s“"
 
-#: builtin/fsck.c:456
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: лип�ващ или повреден обект"
 
-#: builtin/fsck.c:481
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: неправилен запи� в журнала за указатели „%s“"
 
-#: builtin/fsck.c:495
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Проверка на журнала на указателите: „%s“ до „%s“"
 
-#: builtin/fsck.c:529
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "„%s“: неправилен указател за SHA1: „%s“"
 
-#: builtin/fsck.c:536
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: не е подаване!"
 
-#: builtin/fsck.c:590
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "внимание: н�ма указатели по подразбиране"
 
-#: builtin/fsck.c:605
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: разлика в контролната �ума при: %s"
+
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
-msgstr "„%s“: лип�ващ обект: „%s“"
+msgstr "%s: развален или лип�ващ обект: %s"
+
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: обектът е непознат вид „%s“: %s"
 
-#: builtin/fsck.c:618
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "„%s“: не може да �е анализира: „%s“"
 
-#: builtin/fsck.c:638
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "неправилен ред � контролна �ума по SHA1: „%s“"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Проверка на директори� � обекти"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Проверка на директориите � обекти"
 
-#: builtin/fsck.c:671
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "Проверка на връзките на „%s“"
 
 #
-#: builtin/fsck.c:676 builtin/index-pack.c:866
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "неправилен указател „%s“"
 
-#: builtin/fsck.c:683
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "„%s“ �очи към нещо необичайно (%s)"
 
-#: builtin/fsck.c:689
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: не�вързани�т връх „HEAD“ не �очи към нищо"
 
-#: builtin/fsck.c:693
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "предупреждение: „%s“ �очи към в�е още не�ъще�твуващ клон (%s)"
 
-#: builtin/fsck.c:705
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "Проверка на дървото на кеша"
 
-#: builtin/fsck.c:710
+#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "„%s“: неправилен указател за SHA1 в дървото на кеша"
 
-#: builtin/fsck.c:719
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "в дървото на кеша има нещо, което не е дърво"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
 
-#: builtin/fsck.c:756
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "показване на недо�тижимите обекти"
 
-#: builtin/fsck.c:757
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "показване на обектите извън клоните"
 
-#: builtin/fsck.c:758
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "показване на етикетите"
 
-#: builtin/fsck.c:759
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "показване на кореновите възли"
 
-#: builtin/fsck.c:760
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "задаване на обекти от индек�а да �а коренови"
 
-#: builtin/fsck.c:761
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "про�лед�ване и на указателите от журнала � указателите (�тандартно)"
 
-#: builtin/fsck.c:762
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "допълнително да �е провер�ват пакетите и алтернативните обекти"
 
-#: builtin/fsck.c:763
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "проверка �амо на връзката"
 
-#: builtin/fsck.c:764 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "по-�троги проверки"
 
-#: builtin/fsck.c:766
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "запазване на обектите извън клоните в директори�та „.git/lost-found“"
 
-#: builtin/fsck.c:767 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "показване на напредъка"
 
-#: builtin/fsck.c:768
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "показване на подробни имена на до�тижимите обекти"
 
-#: builtin/fsck.c:827 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Проверка на обектите"
 
-#: builtin/fsck.c:855
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "„%s“: лип�ващ обект"
 
-#: builtin/fsck.c:866
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "неправилен параметър: очаква �е SHA1, а бе получено: „%s“"
@@ -16090,85 +16425,79 @@ 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:240 builtin/tag.c:573
-#, 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"
-"and remove %s.\n"
+"and remove %s\n"
 "Automatic cleanup will not be performed until the file is removed.\n"
 "\n"
 "%s"
 msgstr ""
-"При по�ледното изпълнение на „git gc“ бе докладвана грешка.  Коригирайте "
-"причината за\n"
-"не� и изтрийте „%s“.\n"
+"При по�ледното изпълнение на „git gc“ бе докладвано �ледното — коригирайте\n"
+"причината за него и изтрийте „%s“.\n"
 "�втоматичното изчи�тване на боклука н�ма да работи, преди да изтриете "
 "файла.\n"
 "\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)"
@@ -16177,33 +16506,33 @@ 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:869
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "графът � подавани�та не може да бъде запи�ан"
 
-#: builtin/gc.c:905
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "неу�пешно предварително до�тав�не на отдалечените клони"
 
@@ -16215,137 +16544,176 @@ msgstr "процеÑ�ÑŠÑ‚ за командата „git pack-objects“ не мÐ
 msgid "failed to finish 'git pack-objects' process"
 msgstr "проце�ът за командата „git pack-objects“ не може да завърши"
 
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "индек�ът за множе�тво пакети не може да бъде запи�ан"
 
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "неу�пешно изпълнение на „git multi-pack-index expire“"
 
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "неу�пешно изпълнение на „git multi-pack-index repack“"
 
-#: builtin/gc.c:1179
+#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 "задачата „incremental-repack“ �е пре�кача, защото на�тройката „core."
 "multiPackIndex“ е изключена"
 
-#: builtin/gc.c:1283
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "заключващи�т файл „%s“ �ъще�твува.  Дей�твието �е пре�кача"
 
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "неу�пешно изпълнение на задачата „%s“"
 
-#: builtin/gc.c:1395
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "„%s“ не е правилна задача"
 
-#: builtin/gc.c:1400
+#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "задачата „%s“ не може да �е избере повече от веднъж"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "изпълн�ване на задачи �поред �ъ�то�нието на хранилището"
 
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "че�тота"
 
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "изпълн�ване на задачи по график"
 
-#: builtin/gc.c:1420
+#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "без извеждане на напредъка и друга информаци� на �тандартни� изход"
 
-#: builtin/gc.c:1421
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "задача"
 
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "изпълнение на определена задача"
 
-#: builtin/gc.c:1439
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr ""
-"може да �е указва мак�имум една от опциите „--auto“ и „--schedule=ЧЕСТОТ�“"
+msgstr "опциите „--auto“ и „--schedule=ЧЕСТОТ�“ �а не�ъвме�тими"
 
-#: builtin/gc.c:1482
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "неу�пешно изпълнение на „git config“"
 
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "грешка при заме�тването на път� „%s“"
 
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "неу�пешно �тартиране на „launchctl“."
 
-#: builtin/gc.c:1613
+#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "директориите за „%s“ не може да бъдат �ъздадени"
 
-#: builtin/gc.c:1674
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "у�лугата „%s“ не може �е на�трои първоначално"
 
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "неу�пешно �ъздаване на временен файл за xml"
 
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "задачите за периодично изпълнение не може да �е �тартират"
 
-#: builtin/gc.c:1879
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr ""
 "неу�пешно изпълнение на „crontab -l“.  Си�темата ви може да не поддържа "
 "„cron“"
 
-#: builtin/gc.c:1896
+#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr ""
 "неу�пешно изпълнение на „crontab“.  Си�темата ви може да не поддържа „cron“"
 
-#: builtin/gc.c:1900
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "�тандартни�т вход на „crontab“ не може да �е отвори"
 
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "проце�ът на „crontab“ умр�"
 
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "неу�пешно �тартиране на „systemctl“"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "неу�пешно изпълнение на „systemctl“"
+
+#: 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:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "непознат аргумент към „--scheduler“: %s"
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "лип�ват както таймери на systemd, така и crontab"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "планиращи�т модул „%s“ лип�ва"
+
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "друг проце� задава поддръжката на заден фон"
 
-#: builtin/gc.c:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=ПЛ��ИР�Щ_МОДУЛ]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "ПЛ��ИР�Щ_МОДУЛ"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "ПЛ��ИР�Щи�т_МОДУЛ, който да изпълн�ва задачите"
+
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "неу�пешно добав�не на хранилище към файла � глобални на�тройки"
 
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance ПОДКОМ��Д� [ОПЦИЯ…]"
 
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "неправилна подкоманда: „%s“"
@@ -16354,12 +16722,12 @@ msgstr "неправилна подкоманда: „%s“"
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [ОПЦИЯ…] [-e] Ш�БЛО� [ВЕРСИЯ…] [[--] ПЪТ…]"
 
-#: builtin/grep.c:223
+#: builtin/grep.c:239
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: неу�пешно �ъздаване на нишка: %s"
 
-#: builtin/grep.c:277
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "зададен е неправилен брой нишки (%d) за %s"
@@ -16368,275 +16736,275 @@ msgstr "зададен е неправилен брой нишки (%d) за %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
-#: builtin/pack-objects.c:2969
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "лип�ва поддръжка за нишки.  „%s“ ще �е пренебрегне"
 
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "дървото не може да бъде прочетено (%s)"
 
-#: builtin/grep.c:658
+#: builtin/grep.c:672
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "не може да �е изпълни „grep“ от обект от вида %s"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:752
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "опци�та „%c“ очаква чи�ло за аргумент"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:851
 msgid "search in index instead of in the work tree"
 msgstr "тър�ене в индек�а, а не в работното дърво"
 
-#: builtin/grep.c:840
+#: builtin/grep.c:853
 msgid "find in contents not managed by git"
 msgstr "тър�ене и във файловете, които не �а под управлението на git"
 
-#: builtin/grep.c:842
+#: builtin/grep.c:855
 msgid "search in both tracked and untracked files"
 msgstr "тър�ене и в �ледените, и в не�ледените файлове"
 
-#: builtin/grep.c:844
+#: builtin/grep.c:857
 msgid "ignore files specified via '.gitignore'"
 msgstr "игнориране на файловете указани в „.gitignore“"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:859
 msgid "recursively search in each submodule"
 msgstr "рекур�ивно тър�ене във в�ички подмодули"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:862
 msgid "show non-matching lines"
 msgstr "извеждане на редовете, които не �ъвпадат"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:864
 msgid "case insensitive matching"
 msgstr "без значение на реги�търа на буквите (главни/малки)"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:866
 msgid "match patterns only at word boundaries"
 msgstr "напа�ване на шаблоните �амо по границите на думите"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:868
 msgid "process binary files as text"
 msgstr "обработване на двоичните файлове като тек�тови"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:870
 msgid "don't match patterns in binary files"
 msgstr "пре�качане на двоичните файлове"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:873
 msgid "process binary files with textconv filters"
 msgstr ""
 "обработване на двоичните файлове чрез филтри за преобразуване към тек�т"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:875
 msgid "search in subdirectories (default)"
 msgstr "тър�ене в поддиректориите (�тандартно)"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:877
 msgid "descend at most <depth> levels"
 msgstr "навлизане мак�имално на тази ДЪЛБОЧИ�� в дървото"
 
-#: builtin/grep.c:868
+#: builtin/grep.c:881
 msgid "use extended POSIX regular expressions"
 msgstr "разширени регул�рни изрази по POSIX"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:884
 msgid "use basic POSIX regular expressions (default)"
 msgstr "о�новни регул�рни изрази по POSIX (�тандартно)"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:887
 msgid "interpret patterns as fixed strings"
 msgstr "шаблоните �а до�ловни низове"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:890
 msgid "use Perl-compatible regular expressions"
 msgstr "регул�рни изрази на Perl"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:893
 msgid "show line numbers"
 msgstr "извеждане на номерата на редовете"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:894
 msgid "show column number of first match"
 msgstr "извеждане на номера на колоната на първото напа�ване"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:895
 msgid "don't show filenames"
 msgstr "без извеждане на имената на файловете"
 
-#: builtin/grep.c:883
+#: builtin/grep.c:896
 msgid "show filenames"
 msgstr "извеждане на имената на файловете"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:898
 msgid "show filenames relative to top directory"
 msgstr ""
 "извеждане на отно�ителните имена на файловете �пр�мо о�новната директори� на "
 "хранилището"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:900
 msgid "show only filenames instead of matching lines"
 msgstr "извеждане �амо на имената на файловете без напа�ващите редове"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:902
 msgid "synonym for --files-with-matches"
 msgstr "п�евдоним на „--files-with-matches“"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:905
 msgid "show only the names of files without match"
 msgstr ""
 "извеждане �амо на имената на файловете, които не �ъдържат ред, напа�ващ на "
 "шаблона"
 
-#: builtin/grep.c:894
+#: builtin/grep.c:907
 msgid "print NUL after filenames"
 msgstr "извеждане на нулеви� знак „NUL“ �лед в��ко име на файл"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:910
 msgid "show only matching parts of a line"
 msgstr "извеждане �амо на ча�тите на редовете, които �ъвпадат"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:912
 msgid "show the number of matches instead of matching lines"
 msgstr "извеждане на бро� на �ъвпадени�та вме�то напа�ващите редове"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:913
 msgid "highlight matches"
 msgstr "оцвет�ване на напа�вани�та"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:915
 msgid "print empty line between matches from different files"
 msgstr "извеждане на празен ред между напа�вани�та от различни файлове"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:917
 msgid "show filename only once above matches from same file"
 msgstr ""
 "извеждане на името на файла �амо веднъж за в�ички напа�вани� от този файл"
 
-#: builtin/grep.c:907
+#: builtin/grep.c:920
 msgid "show <n> context lines before and after matches"
 msgstr "извеждане на такъв БРОЙ редове преди и �лед напа�вани�та"
 
-#: builtin/grep.c:910
+#: builtin/grep.c:923
 msgid "show <n> context lines before matches"
 msgstr "извеждане на такъв БРОЙ редове преди напа�вани�та"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:925
 msgid "show <n> context lines after matches"
 msgstr "извеждане на такъв БРОЙ редове �лед напа�вани�та"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:927
 msgid "use <n> worker threads"
 msgstr "използване на такъв БРОЙ работещи нишки"
 
-#: builtin/grep.c:915
+#: builtin/grep.c:928
 msgid "shortcut for -C NUM"
 msgstr "п�евдоним на „-C БРОЙ“"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:931
 msgid "show a line with the function name before matches"
 msgstr "извеждане на ред � името на функци�та, в ко�то е напа�нат шаблона"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:933
 msgid "show the surrounding function"
 msgstr "извеждане на обхващащата функци�"
 
-#: builtin/grep.c:923
+#: builtin/grep.c:936
 msgid "read patterns from file"
 msgstr "изчитане на шаблоните от Ф�ЙЛ"
 
-#: builtin/grep.c:925
+#: builtin/grep.c:938
 msgid "match <pattern>"
 msgstr "напа�ване на Ш�БЛО�"
 
-#: builtin/grep.c:927
+#: builtin/grep.c:940
 msgid "combine patterns specified with -e"
 msgstr "комбиниране на шаблоните указани � опци�та „-e“"
 
-#: builtin/grep.c:939
+#: builtin/grep.c:952
 msgid "indicate hit with exit status without output"
 msgstr ""
 "без извеждане на �тандартни� изход.  Изходни�т код указва наличието на "
 "напа�ване"
 
-#: builtin/grep.c:941
+#: builtin/grep.c:954
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "извеждане на редове �амо от файловете, които напа�ват на в�ички шаблони"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "pager"
 msgstr "програма за преглед по �траници"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "show matching files in the pager"
 msgstr "извеждане на �ъвпадащите файлове в програма за преглед по �траници"
 
-#: builtin/grep.c:948
+#: builtin/grep.c:961
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 "позвол�ване на �тартирането на grep(1) (текущи�т компилат пренебрегва тази "
 "опци�)"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1027
 msgid "no pattern given"
 msgstr "не �те задали шаблон"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:1063
 msgid "--no-index or --untracked cannot be used with revs"
-msgstr "опциите „--cached“ и „--untracked“ �а не�ъвме�тими � вер�ии."
+msgstr "опциите „--no-index“ и „--untracked“ �а не�ъвме�тими � вер�ии."
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:1071
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "вер�и�та „%s“ не може бъде открита"
 
-#: builtin/grep.c:1088
+#: builtin/grep.c:1101
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "опциите „--untracked“ и „--recurse-submodules“ �а не�ъвме�тими"
 
-#: builtin/grep.c:1092
+#: builtin/grep.c:1105
 msgid "invalid option combination, ignoring --threads"
 msgstr "неправилна комбинаци� от опции, „--threads“ ще �е пренебрегне"
 
-#: builtin/grep.c:1095 builtin/pack-objects.c:3930
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
 msgid "no threads support, ignoring --threads"
 msgstr "лип�ва поддръжка за нишки.  „--threads“ ще �е пренебрегне"
 
-#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "зададен е неправилен брой нишки: %d"
 
-#: builtin/grep.c:1132
+#: builtin/grep.c:1145
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "опци�та „--open-files-in-pager“ изи�ква тър�ене в работното дърво"
 
-#: builtin/grep.c:1158
+#: builtin/grep.c:1171
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "опциите „--cached“ и „--untracked“ �а не�ъвме�тими � „--no-index“"
 
-#: builtin/grep.c:1161
+#: builtin/grep.c:1174
 msgid "--untracked cannot be used with --cached"
 msgstr "опциите „--untracked“ и „--cached“ �а не�ъвме�тими"
 
-#: builtin/grep.c:1167
+#: builtin/grep.c:1180
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
 "опциите „--(no-)exclude-standard“ �а не�ъвме�тими � тър�ене по �ледени "
 "файлове"
 
-#: builtin/grep.c:1175
+#: builtin/grep.c:1188
 msgid "both --cached and trees are given"
 msgstr "опци�та „--cached“ е не�ъвме�тима �ъ� задаване на дърво"
 
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -16644,97 +17012,109 @@ msgstr ""
 "git hash-object [-t ВИД] [-w] [--path=Ф�ЙЛ | --no-filters] [--stdin] [--] "
 "Ф�ЙЛ…"
 
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object --stdin-paths"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "ВИД на обекта"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "запи�ване на обекта в базата от данни за обектите"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "изчитане на обекта от �тандартни� вход"
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "запазване на файла както е — без филтри"
 
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "�ъздаване и изчи�л�ване на контролни �уми на произволни данни за повредени "
 "обекти за тра�иране на Git"
 
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "обработване на Ф�ЙЛа в�е едно е � този път"
 
-#: builtin/help.c:47
+#: builtin/help.c:55
 msgid "print all available commands"
 msgstr "показване на в�ички налични команди"
 
-#: builtin/help.c:48
+#: builtin/help.c:57
 msgid "exclude guides"
 msgstr "без въведени�"
 
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "показване на �пи�ък � въведени�"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "показване на имената на в�ички конфигуриращи променливи"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
 msgid "show man page"
 msgstr "показване на �траница от ръковод�твото"
 
-#: builtin/help.c:53
+#: builtin/help.c:59
 msgid "show manual in web browser"
 msgstr "показване на �траница от ръковод�твото в уеб браузър"
 
-#: builtin/help.c:55
+#: builtin/help.c:61
 msgid "show info page"
 msgstr "показване на информационна �траница"
 
-#: builtin/help.c:57
+#: builtin/help.c:63
 msgid "print command description"
 msgstr "извеждане на опи�анието на команда"
 
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [КОМ��Д�]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "показване на �пи�ък � въведени�"
 
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "показване на имената на в�ички конфигуриращи променливи"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [КОМ��Д�]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "непознат формат на помощта „%s“"
 
-#: builtin/help.c:190
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "�еу�пешно �тартиране на „emacsclient“."
 
-#: builtin/help.c:203
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "Вер�и�та на „emacsclient“ не може да �е анализира."
 
-#: builtin/help.c:211
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "Прекалено �тара вер�и� на „emacsclient“ — %d (< 22)."
 
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: 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:307
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16743,7 +17123,7 @@ msgstr ""
 "„%s“: път към неподдържана програма за преглед на\n"
 " ръковод�твото.  Вме�то не� пробвайте „man.<tool>.cmd“."
 
-#: builtin/help.c:319
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16752,342 +17132,319 @@ msgstr ""
 "„%s“: команда за поддържана програма за преглед на\n"
 " ръковод�твото.  Вме�то не� пробвайте „man.<tool>.path“."
 
-#: builtin/help.c:436
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "„%s“: непозната програма за преглед на ръковод�твото."
 
-#: builtin/help.c:453
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "нико� програма за преглед на ръковод�тво не у�п� да обработи за�вката"
 
-#: builtin/help.c:461
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr ""
 "нико� програма за преглед на информационните �траници не у�п� да обработи "
 "за�вката"
 
-#: builtin/help.c:520 builtin/help.c:531 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:534 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:563 builtin/help.c:593
+#: builtin/help.c:580
+msgid "this option doesn't take any other arguments"
+msgstr "опци�та не приема аргументи"
+
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "употреба: %s%s"
 
-#: builtin/help.c:577
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "За повече информаци� изпълнете „git help config“"
 
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "неправилен вид на обекта „%s“"
 
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "очаквани�т обект „%s“ не бе получен"
 
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "неправилен вид на обекта „%s“: очакваше �е „%s“, а бе получен „%s“"
 
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "не може да �е запълни %d байт"
 msgstr[1] "не може да �е запълн�т %d байта"
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr "неочакван край на файл"
 
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "грешка при четене на входните данни"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "използвани �а повече от наличните байтове"
 
-#: builtin/index-pack.c:325 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr "пакетни�т файл е прекалено гол�м за текущата �тойно�т на типа „off_t“"
 
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "пакетни�т файл надвишава мак�имални� възможен размер"
 
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "пакетни�т файл „%s“ не може да бъде �ъздаден"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "пакетни�т файл „%s“ не може да бъде отворен"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
 msgid "pack signature mismatch"
 msgstr "не�ъответ�твие в подпи�а към пакетни� файл"
 
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "не �е поддържа пакетиране вeр�и� „%<PRIu32>“"
 
-#: builtin/index-pack.c:383
+#: builtin/index-pack.c:376
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "повреден обект в пакетни� файл при отме�тване %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:489
+#: builtin/index-pack.c:482
 #, c-format
 msgid "inflate returned %d"
 msgstr "декомпре�ирането � „inflate“ върна %d"
 
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:531
 msgid "offset value overflow for delta base object"
 msgstr "�тойно�тта на отме�тването за обекта-разлика води до препълване"
 
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:539
 msgid "delta base offset is out of bound"
 msgstr "�тойно�тта на отме�тването за обекта-разлика е извън диапазона"
 
-#: builtin/index-pack.c:554
+#: builtin/index-pack.c:547
 #, c-format
 msgid "unknown object type %d"
 msgstr "непознат вид обект %d"
 
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:578
 msgid "cannot pread pack file"
 msgstr "пакетни�т файл не може да бъде прочетен"
 
-#: builtin/index-pack.c:587
+#: builtin/index-pack.c:580
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "неочакван край на файл, лип�ва %<PRIuMAX> байт"
 msgstr[1] "неочакван край на файл, лип�ват %<PRIuMAX> байта"
 
-#: builtin/index-pack.c:613
+#: builtin/index-pack.c:606
 msgid "serious inflate inconsistency"
 msgstr "�ериозна грешка при декомпре�иране � „inflate“"
 
-#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788
-#: builtin/index-pack.c:827 builtin/index-pack.c:836
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 "СЪВП�ДЕ�ИЕ �� СТОЙ�ОСТИТЕ З� СУМИТЕ З� SHA1: „%s“ �� ДВ� Р�ЗЛИЧ�И ОБЕКТ�!"
 
-#: builtin/index-pack.c:761 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
 #, c-format
 msgid "unable to read %s"
 msgstr "обектът „%s“ не може да бъде прочетен"
 
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:818
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "�ъще�твуващи�т обект в „%s“ не може да бъде прочетен"
 
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:826
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "�ъще�твуващи�т обект „%s“ не може да бъде прочетен"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:840
 #, c-format
 msgid "invalid blob object %s"
 msgstr "неправилен обект-BLOB „%s“"
 
-#: builtin/index-pack.c:850 builtin/index-pack.c:869
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
 msgid "fsck error in packed object"
 msgstr "грешка при проверката на пакетирани обекти"
 
-#: builtin/index-pack.c:871
+#: builtin/index-pack.c:864
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "��кои обекти, на�ледници на „%s“, не може да бъдат до�тигнати"
 
-#: builtin/index-pack.c:932 builtin/index-pack.c:979
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
 msgstr "разликата не може да бъде приложена"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Receiving objects"
 msgstr "Получаване на обекти"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Indexing objects"
 msgstr "Индек�иране на обекти"
 
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1190
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "пакетни�т файл е повреден (нееднакви �уми по SHA1)"
 
-#: builtin/index-pack.c:1201
+#: builtin/index-pack.c:1195
 msgid "cannot fstat packfile"
 msgstr "не може да �е получи информаци� за пакетни� файл � „fstat“"
 
-#: builtin/index-pack.c:1204
+#: builtin/index-pack.c:1198
 msgid "pack has junk at the end"
 msgstr "в кра� на пакетни� файл има повредени данни"
 
-#: builtin/index-pack.c:1216
+#: builtin/index-pack.c:1210
 msgid "confusion beyond insanity in parse_pack_objects()"
-msgstr ""
-"фатална грешка във функци�та „parse_pack_objects“.  Това е грешка в Git, "
-"докладвайте � на разработчиците, като пратите е-пи�мо на адре�: „git@vger."
-"kernel.org“."
+msgstr "фатална грешка във функци�та „parse_pack_objects“"
 
-#: builtin/index-pack.c:1239
+#: builtin/index-pack.c:1233
 msgid "Resolving deltas"
 msgstr "Откриване на �ъответните разлики"
 
-#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "не може да �е �ъздаде нишка: %s"
 
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1277
 msgid "confusion beyond insanity"
-msgstr ""
-"фатална грешка във функци�та „conclude_pack“.  Това е грешка в Git, "
-"докладвайте � на разработчиците, като пратите е-пи�мо на адре�: „git@vger."
-"kernel.org“."
+msgstr "фатална грешка"
 
-#: builtin/index-pack.c:1289
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "дей�твието завърши � %d локален обект"
 msgstr[1] "дей�твието завърши � %d локални обекта"
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 "�еочаквана по�ледваща �ума за грешки за „%s“ (причината може да е грешка в "
 "ди�ка)"
 
-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "в пакета има %d ненапа�ваща разлика"
 msgstr[1] "в пакета има %d ненапа�ващи разлики"
 
-#: builtin/index-pack.c:1329
+#: builtin/index-pack.c:1323
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "добавени�т обект не може да �е компре�ира � „deflate“: %d"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1419
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "локални�т обект „%s“ е повреден"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1440
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "името на пакетни� файл „%s“ не завършва � „%s“"
 
-#: builtin/index-pack.c:1470
+#: builtin/index-pack.c:1464
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "грешка при запи� на файла „%s“ „%s“"
 
-#: builtin/index-pack.c:1478
+#: builtin/index-pack.c:1472
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "грешка при затвар�нето на запи�ани� файл „%s“ „%s“"
 
-#: builtin/index-pack.c:1504
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "временни�т файл „*.%s“ не може да �е преименува на „%s“"
+
+#: builtin/index-pack.c:1514
 msgid "error while closing pack file"
 msgstr "грешка при затвар�нето на пакетни� файл"
 
-#: builtin/index-pack.c:1518
-msgid "cannot store pack file"
-msgstr "пакетни�т файл не може да бъде запазен"
-
-#: builtin/index-pack.c:1526
-msgid "cannot store index file"
-msgstr "файлът за индек�а не може да бъде �ъхранен"
-
-#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "зададена е неправилна вер�и� пакетиране: „pack.indexversion=%<PRIu32>“"
 
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1643
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Съще�твуващи�т пакетен файл „%s“ не може да бъде отворен"
 
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1645
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Съще�твуващи�т индек� за пакетни� файл „%s“ не може да бъде отворен"
 
-#: builtin/index-pack.c:1701
+#: builtin/index-pack.c:1693
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "%d обект не е разлика"
 msgstr[1] "%d обекта не �а разлика"
 
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1700
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "дължината на веригата е %d: %lu обект"
 msgstr[1] "дължината на веригата е %d: %lu обекта"
 
-#: builtin/index-pack.c:1750
+#: builtin/index-pack.c:1742
 msgid "Cannot come back to cwd"
 msgstr "Проце�ът не може да �е върне към предишната работна директори�"
 
-#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
-#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
 #, c-format
 msgid "bad %s"
 msgstr "неправилна �тойно�т „%s“"
 
-#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "непознат алгоритъм за контролни �уми „%s“"
 
-#: builtin/index-pack.c:1852
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "опци�та „--fix-thin“ изи�ква „--stdin“"
-
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "„--stdin“ изи�ква хранилище на git"
 
-#: builtin/index-pack.c:1856
-msgid "--object-format cannot be used with --stdin"
-msgstr "опци�та „--object-format“ и „--stdin“ �а не�ъвме�тими"
-
-#: builtin/index-pack.c:1871
+#: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "опци�та „--verify“ изи�ква име на пакетен файл"
 
-#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "грешка при проверка � „fsck“ на пакетните обекти"
 
@@ -17131,59 +17488,59 @@ msgstr "н�ма шаблони в „%s“"
 msgid "not copying templates from '%s': %s"
 msgstr "шаблоните н�ма да бъдат копирани от „%s“: „%s“"
 
-#: builtin/init-db.c:262
+#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "неправилно име на първоначални� клон: „%s“"
 
-#: builtin/init-db.c:353
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "файлове от вид %d не �е поддържат"
 
-#: builtin/init-db.c:356
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "„%s“ не може да �е преме�ти в „%s“"
 
-#: builtin/init-db.c:372
+#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr ""
 "опит за повторно задаване на първото подаване в хранилището � различна "
 "контролна �ума"
 
-#: builtin/init-db.c:396 builtin/init-db.c:399
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "Директори�та „%s“ вече �ъще�твува"
 
-#: builtin/init-db.c:431
+#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: „--initial-branch=%s“ �е пропу�ка"
 
-#: builtin/init-db.c:462
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr ""
 "Инициализиране наново на �ъще�твуващо, �поделено хранилище на Git в „%s%s“\n"
 
-#: builtin/init-db.c:463
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Инициализиране наново на �ъще�твуващо хранилище на Git в „%s%s“\n"
 
-#: builtin/init-db.c:467
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Инициализиране на празно, �поделено хранилище на Git в „%s%s“\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Инициализиране на празно хранилище на Git в „%s%s“\n"
 
-#: builtin/init-db.c:517
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -17191,43 +17548,39 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_Ш�БЛО�И] [--"
 "shared[=ПР�В�]] [ДИРЕКТОРИЯ]"
 
-#: builtin/init-db.c:543
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "права"
 
-#: builtin/init-db.c:544
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 "указване, че хранилището на Git ще бъде �поделено от повече от един "
 "потребител"
 
-#: builtin/init-db.c:550
+#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "задаване на името на първоначални� клон"
 
-#: builtin/init-db.c:551 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "алгоритъм"
 
-#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "указване на алгоритъм за контролна �ума"
 
-#: builtin/init-db.c:559
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "опциите „--separate-git-dir“ и „--bare“ �а не�ъвме�тими"
-
-#: builtin/init-db.c:590 builtin/init-db.c:595
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/init-db.c:599 builtin/init-db.c:654
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "не може да �е влезе в директори�та „%s“"
 
-#: builtin/init-db.c:626
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -17236,12 +17589,12 @@ msgstr ""
 "%s (или --work-tree=ДИРЕКТОРИЯ) изи�ква указването на %s (или --git-"
 "dir=ДИРЕКТОРИЯ)"
 
-#: builtin/init-db.c:678
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Работното дърво в „%s“ е недо�тъпно"
 
-#: builtin/init-db.c:683
+#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "опци�та „--separate-git-dir“ е не�ъвме�тима � голо хранилище"
 
@@ -17299,7 +17652,7 @@ msgstr "епилози за добав�не"
 
 #: builtin/interpret-trailers.c:123
 msgid "--trailer with --only-input does not make sense"
-msgstr "опци�та „--trailer“ е не�ъвме�тима � „--name-only“"
+msgstr "опци�та „--trailer“ е не�ъвме�тима � „--only-input“"
 
 #: builtin/interpret-trailers.c:133
 msgid "no input file given for in-place editing"
@@ -17352,85 +17705,85 @@ msgstr ""
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "опци�та „-LДИ�П�ЗО�:Ф�ЙЛ“ не може да �е ползва � път"
 
-#: builtin/log.c:303
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Резултат: %d %s\n"
 
-#: builtin/log.c:568
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: повреден файл"
 
-#: builtin/log.c:583 builtin/log.c:673
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr "обектът не може да бъде прочетен: %s"
 
-#: builtin/log.c:698
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "неизве�тен вид: %d"
 
-#: builtin/log.c:843
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: неправилно придружаващо пи�мо от режима на опи�ание"
 
-#: builtin/log.c:850
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "не е зададена �тойно�т на „format.headers“"
 
-#: builtin/log.c:979
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "файлът-кръпка „%s“ не може да бъде отворен"
 
-#: builtin/log.c:996
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "тр�бва да зададете точно един диапазон"
 
-#: builtin/log.c:1006
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "не е диапазон"
 
-#: builtin/log.c:1170
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "придружаващото пи�мо тр�бва да е форматирано като е-пи�мо"
 
-#: builtin/log.c:1176
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "неу�пешно �ъздаване на придружаващо пи�мо"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "неправилен формат на заглавната ча�т за отговор „in-reply-to“: %s"
 
-#: builtin/log.c:1290
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИ�П�ЗО�_��_ВЕРСИИТЕ]"
 
-#: builtin/log.c:1348
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "може да укажете мак�имум една директори� за изход"
 
-#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#: 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:1510 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:1519
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "точната база за �ливане не може да бъде открита"
 
-#: builtin/log.c:1529
+#: 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"
@@ -17441,307 +17794,289 @@ msgstr ""
 "Може ръчно да зададете базово подаване чрез „--"
 "base=<ИДЕ�ТИФИК�ТОР_��_Б�ЗОВО_ПОД�В��Е>“."
 
-#: builtin/log.c:1552
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "точната база при �ливане не може да бъде открита"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1587
 msgid "base commit should be the ancestor of revision list"
 msgstr "базовото подаване тр�бва да е предше�твеникът на �пи�ъка � вер�иите"
 
-#: builtin/log.c:1579
+#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr "базовото подаване не може да е в �пи�ъка � вер�иите"
 
-#: builtin/log.c:1637
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "идентификаторът на кръпката не може да бъде получен"
 
-#: builtin/log.c:1700
+#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
 msgstr ""
 "неу�пешно определ�не на началото на диапазонната разлика на текущата поредица"
 
-#: builtin/log.c:1702
+#: builtin/log.c:1720
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr ""
 "„%s“ �е ползва като началото на диапазонната разлика на текущата поредица"
 
-#: builtin/log.c:1746
+#: builtin/log.c:1764
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "номераци� „[PATCH n/m]“ дори и при един�твена кръпка"
 
-#: builtin/log.c:1749
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "номераци� „[PATCH]“ дори и при множе�тво кръпки"
 
-#: builtin/log.c:1753
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "извеждане на кръпките на �тандартни� изход"
 
-#: builtin/log.c:1755
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "�ъздаване на придружаващо пи�мо"
 
-#: builtin/log.c:1757
+#: builtin/log.c:1775
 msgid "use simple number sequence for output file names"
 msgstr "про�та чи�лова по�ледователно�т за имената на файловете-кръпки"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "З��ЦИ"
 
-#: builtin/log.c:1759
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "използване на тези З��ЦИ за �уфик� вме�то „.patch“"
 
-#: builtin/log.c:1761
+#: builtin/log.c:1779
 msgid "start numbering patches at <n> instead of 1"
 msgstr "номерирането на кръпките да започва от този БРОЙ, а не � 1"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "номер на редакци�"
 
-#: builtin/log.c:1763
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "отбел�зване, че това е N-тата поредна редакци� на поредицата от кръпки"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "мак�имална дължина на име на в�еки пакетен файл"
 
-#: builtin/log.c:1767
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "използване на „[RFC PATCH]“ вме�то „[PATCH]“"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "режим-придружаващо-пи�мо-по-опи�ание"
 
-#: builtin/log.c:1771
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr ""
 "генериране на ча�тите на придружаващото пи�мо на базата на опи�анието на "
 "клона"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "използване на този „[ПРЕФИКС]“ вме�то „[PATCH]“"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "без добав�не/махане на префик�а „[PATCH]“"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "без извеждане на разлики между двоични файлове"
 
-#: builtin/log.c:1784
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr "в заглавната ча�т „From:“ (от) контролната �ума да е �амо от нули"
 
-#: builtin/log.c:1786
+#: builtin/log.c:1804
 msgid "don't include a patch matching a commit upstream"
 msgstr "без кръпки, които при�ъ�тват в �ледени� клон"
 
-#: builtin/log.c:1788
+#: builtin/log.c:1806
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 "извеждане във формат за кръпки, а на в �тандартни� (кръпка и �тати�тика)"
 
-#: builtin/log.c:1790
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "Опции при изпращане"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1809
 msgid "header"
 msgstr "З�ГЛ�В��_Ч�СТ"
 
-#: builtin/log.c:1792
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "добав�не на тази З�ГЛ�В��_Ч�СТ"
 
-#: builtin/log.c:1793 builtin/log.c:1794
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "Е-ПОЩ�"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "добав�не на заглавна ча�т „To:“ (до)"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "добав�не на заглавна ча�т „Cc:“ (и до)"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "ИДЕ�ТИЧ�ОСТ"
 
-#: builtin/log.c:1796
+#: builtin/log.c:1814
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "задаване на адре�а в заглавната ча�т „From“ (от) да е тази ИДЕ�ТИЧ�ОСТ.  �ко "
 "не е зададена такава, �е взима адре�а на подаващи�"
 
-#: builtin/log.c:1798
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "ИДЕ�ТИФИК�ТОР_��_СЪОБЩЕ�ИЕ"
 
-#: builtin/log.c:1799
+#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 "първото �ъобщение да е в отговор на е-пи�мото � този "
 "ИДЕ�ТИФИК�ТОР_��_СЪОБЩЕ�ИЕ"
 
-#: builtin/log.c:1800 builtin/log.c:1803
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "граница"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "прикреп�не на кръпката"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "включване на кръпката в тек�та на пи�мата"
 
-#: builtin/log.c:1808
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "използване на нишки за �ъобщени�та.  СТИЛът е „shallow“ (плитък) или "
 "„deep“ (дълбок)"
 
-#: builtin/log.c:1810
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "подпи�"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "добав�не на поле за подпи�"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "Б�ЗОВО_ПОД�В��Е"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr "добав�не на необходимото Б�Зово дърво към поредицата от кръпки"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "добав�не на подпи� от файл"
 
-#: builtin/log.c:1817
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "без извеждане на имената на кръпките"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "извеждане на напредъка във фазата на �ъздаване на кръпките"
 
-#: builtin/log.c:1821
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "показване на промените �пр�мо ВЕРСи�та в придружаващото пи�мо или един�твена "
 "кръпка"
 
-#: builtin/log.c:1824
+#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "показване на промените �пр�мо указател� на ВЕРСи�та в придружаващото пи�мо "
 "или един�твена кръпка"
 
-#: builtin/log.c:1826 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:1913
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "грешна идентично�т: %s"
 
-#: builtin/log.c:1928
-msgid "-n and -k are mutually exclusive"
-msgstr "опциите „-n“ и „-k“ �а не�ъвме�тими"
-
-#: builtin/log.c:1930
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ �а не�ъвме�тими"
-
-#: builtin/log.c:1938
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "опци�та „--name-only“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1940
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "опци�та „--name-status“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1942
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "опци�та „--check“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1964
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr ""
-"опциите „--stdout“, „--output“ и „--output-directory“ �а не�ъвме�тими една � "
-"друга"
-
-#: builtin/log.c:2087
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr ""
 "опци�та „--interdiff“ изи�ква опци� „--cover-letter“ или един�твена кръпка"
 
-#: builtin/log.c:2091
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Разлика в разликите:"
 
-#: builtin/log.c:2092
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Разлика в разликите �пр�мо v%d:"
 
-#: builtin/log.c:2098
-msgid "--creation-factor requires --range-diff"
-msgstr "опци�та „--creation-factor“ изи�ква опци� „--range-diff“"
-
-#: builtin/log.c:2102
+#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr ""
 "опци�та „--range-diff“ изи�ква опци� „--cover-letter“ или един�твена кръпка"
 
-#: builtin/log.c:2110
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "Диапазонна разлика:"
 
-#: builtin/log.c:2111
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Диапазонна разлика �пр�мо v%d:"
 
-#: builtin/log.c:2122
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "файлът „%s“ � подпи� не може да бъде прочетен"
 
-#: builtin/log.c:2158
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "Създаване на кръпки"
 
-#: builtin/log.c:2202
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "неу�пешно �ъздаване на изходни файлове"
 
-#: builtin/log.c:2261
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [ОТД�ЛЕЧЕ�_КЛО� [ВРЪХ [ПРЕДЕЛ]]]"
 
-#: builtin/log.c:2315
+#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17749,131 +18084,140 @@ msgstr ""
 "Следени�т отдалечен клон не бе открит, затова изрично задайте "
 "ОТД�ЛЕЧЕ�_КЛО�.\n"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [ОПЦИЯ…] [Ф�ЙЛ…]"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "раздел�не на пътищата � нулеви� знак „NUL“"
+
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "извеждане на �ъ�то�нието на файловете � еднобуквени флагове"
 
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "малки букви за файловете, които да �е �четат за непроменени"
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "малки букви за файловете за командата „fsmonitor clean“"
 
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "извеждане на кешираните файлове (�тандартно)"
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "извеждане на изтритите файлове"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "извеждане на променените файлове"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "извеждане на другите файлове"
 
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "извеждане на игнорираните файлове"
 
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
 msgstr "извеждане на името на обекта за �ъдържанието на индек�а"
 
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:639
 msgid "show files on the filesystem that need to be removed"
 msgstr "извеждане на файловете, които тр�бва да бъдат изтрити"
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "извеждане �амо на името на другите (не�ледените) директории"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "извеждане на знаците за край на ред във файловете"
 
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "без извеждане на празните директории"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "извеждане на не�летите файлове"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "извеждане на информаци�та за отм�на на разрешените подавани�"
 
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "пре�качане на файловете напа�ващи Ш�БЛО�а"
 
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "шаблоните за игнориране да �е прочетат от този Ф�ЙЛ"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "изчитане на шаблоните за игнориране от Ф�ЙЛ"
 
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 "изчитане на допълнителните шаблони за игнориране по директори� от този Ф�ЙЛ"
 
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "добав�не на �тандартно игнорираните от Git файлове"
 
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr "пътищата да �а отно�ителни �пр�мо о�новната директори� на проекта"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "рекур�ивно обхождане подмодулите"
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:669
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "грешка, ако н�кой от тези Ф�ЙЛове не е в индек�а"
 
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "УК�З�ТЕЛ_КЪМ_ДЪРВО"
 
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:671
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 "�читане, че пътищата изтрити �лед УК�З�ТЕЛ�_КЪМ_ДЪРВО в�е още �ъще�твуват"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "извеждане на информаци�та за изчи�тване на грешки"
 
-#: builtin/ls-files.c:674
+#: 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"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<repository> [<refs>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repository> [<refs>...]]"
 msgstr ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=КОМ��Д�]\n"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [ХР��ИЛИЩЕ [УК�З�ТЕЛ…]]"
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [ХР��ИЛИЩЕ [УК�З�ТЕЛ…]]"
 
 #: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "без извеждане на адре�ите на отдалечените хранилища"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
 msgid "exec"
 msgstr "КОМ��Д�"
 
@@ -17946,9 +18290,7 @@ msgstr ""
 #. TRANSLATORS: keep <> in "<" mail ">" info.
 #: builtin/mailinfo.c:14
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
-msgstr ""
-"git mailinfo [ОПЦИЯ…] СЪОБЩЕ�ИЕ КРЪПК� < ПИСМО >И�ФОРМ�ЦИЯ\n"
-"git diff --no-index  ПЪТ ПЪТ"
+msgstr "git mailinfo [ОПЦИЯ…] СЪОБЩЕ�ИЕ КРЪПК� < ПИСМО >И�ФОРМ�ЦИЯ"
 
 #: builtin/mailinfo.c:58
 msgid "keep subject"
@@ -17997,7 +18339,7 @@ msgstr "ДЕЙСТВИЕ при намирането на цитиран знаÐ
 msgid "use headers in message's body"
 msgstr "заглавни ча�ти в т�лото на пи�мото"
 
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "празна пощен�ка кути� mbox: „%s“"
@@ -18060,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"
 
@@ -18114,196 +18460,192 @@ msgstr "указател�т „%s“ не може да бъде изтрит"
 msgid "Merging %s with %s\n"
 msgstr "Сливане на „%s“ � „%s“\n"
 
-#: builtin/merge.c:58
+#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [ОПЦИЯ…] [ПОД�В��Е…]"
 
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "опци�та „-m“ изи�ква �тойно�т"
 
-#: builtin/merge.c:146
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "опци�та „%s“ изи�ква �тойно�т"
 
-#: builtin/merge.c:199
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "��ма такава �тратеги� за �ливане: „%s“.\n"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "�аличните �тратегии �а:"
 
-#: builtin/merge.c:205
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Допълнителните �тратегии �а:"
 
-#: builtin/merge.c:256 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 "без извеждане на �тати�тиката �лед завършване на �ливане"
 
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:261 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "извеждане на �тати�тиката �лед завършване на �ливане"
 
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(п�евдоним на „--stat“)"
 
-#: builtin/merge.c:262 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 ""
 "добав�не (на мак�имум такъв БРОЙ) запи�и от �ъкратени� журнал в �ъобщението "
 "за подаване"
 
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr "�ъздаване на едно подаване вме�то извършване на �ливане"
 
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "извършване на подаване при у�пешно �ливане (�тандартно дей�твие)"
 
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "редактиране на �ъобщението преди подаване"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "позвол�ване на превъртане (�тандартно дей�твие)"
 
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "преу�танов�ване, ако превъртането е невъзможно"
 
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "проверка, че указаното подаване е � правилен подпи� на GPG"
 
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: 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:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "СТР�ТЕГИЯ за �ливане, ко�то да �е ползва"
 
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "ОПЦИЯ=СТОЙ�ОСТ"
 
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "ОПЦИЯ за избраната �тратеги� за �ливане"
 
-#: builtin/merge.c:283
+#: builtin/merge.c:285
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "СЪОБЩЕ�ИЕ при подаването �ъ� �ливане (при �ъщин�ки �ливани�)"
 
-#: builtin/merge.c:290
+#: 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:292
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
-msgstr "преу�танов�ване без пром�на на индек�а и работното дърво"
+msgstr "преу�танов�ване (--abort) без пром�на на индек�а и работното дърво"
 
-#: builtin/merge.c:294
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "продължаване на текущото �ливане"
 
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "позвол�ване на �ливане на незави�ими и�тории"
 
-#: builtin/merge.c:303
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr ""
 "без изпълнение на куките преди подаване и �ливане и при пром�на на "
 "�ъобщението за подаване (pre-merge-commit и commit-msg)"
 
-#: builtin/merge.c:320
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "не може да �е извърши �катаване"
 
-#: builtin/merge.c:325
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "неу�пешно �катаване"
 
-#: builtin/merge.c:330
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "неправилен обект: „%s“"
 
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "неу�пешно прочитане на обект-дърво"
 
-#: builtin/merge.c:400
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Вече е обновено (н�ма какво да �е вкара)"
 
-#: builtin/merge.c:414
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Вкарано подаване — указател�т „HEAD“ н�ма да бъде обновен\n"
 
-#: builtin/merge.c:464
+#: 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:602
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "�еправилен низ за на�тройката „branch.%s.mergeoptions“: „%s“"
 
-#: builtin/merge.c:728
+#: builtin/merge.c:732
 msgid "Not handling anything other than two heads merge."
 msgstr "Поддържа �е �амо �ливане на точно две и�тории."
 
-#: builtin/merge.c:741
+#: builtin/merge.c:745
 #, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "�епозната опци� за рекур�ивното �ливане „merge-recursive“: „-X%s“"
+msgid "unknown strategy option: -X%s"
+msgstr "непозната опци� за �тратеги�: -X%s"
 
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "„%s“ не може да бъде запи�ан"
 
-#: builtin/merge.c:812
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "От „%s“ не може да �е чете"
 
-#: builtin/merge.c:821
+#: 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:827
+#: 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"
@@ -18312,11 +18654,11 @@ msgstr ""
 "В �ъобщението при подаване добавете информаци� за причината за\n"
 "�ливането, о�обено ако �ливате обновен отдалечен клон в тематичен клон.\n"
 
-#: builtin/merge.c:832
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Празно �ъобщение предотврат�ва подаването.\n"
 
-#: builtin/merge.c:835
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18325,76 +18667,76 @@ msgstr ""
 "Редовете, които започват � „%c“, ще бъдат пропу�нати, а празно\n"
 "�ъобщение преу�танов�ва подаването.\n"
 
-#: builtin/merge.c:888
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "Празно �ъобщение при подаване."
 
-#: builtin/merge.c:903
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Първи�т етап на �ливането завърши.\n"
 
-#: builtin/merge.c:964
+#: builtin/merge.c:970
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "�еу�пешно автоматично �ливане — коригирайте конфликтите и подайте "
 "резултата.\n"
 
-#: builtin/merge.c:1003
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "��ма текущ клон."
 
-#: builtin/merge.c:1005
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "Текущи�т клон не �леди никой."
 
-#: builtin/merge.c:1007
+#: builtin/merge.c:1013
 msgid "No default upstream defined for the current branch."
 msgstr "Текущи�т клон не �леди никой клон."
 
-#: builtin/merge.c:1012
+#: builtin/merge.c:1018
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "�икой клон не �леди клона „%s“ от хранилището „%s“"
 
-#: builtin/merge.c:1069
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "�еправилна �тойно�т „%s“ в �редата „%s“"
 
-#: builtin/merge.c:1172
+#: builtin/merge.c:1177
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "не може да �е �лее в „%s“: %s"
 
-#: builtin/merge.c:1206
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "не може да �е �лее"
 
-#: builtin/merge.c:1316
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "опци�та „--abort“ не приема аргументи"
 
-#: builtin/merge.c:1320
+#: builtin/merge.c:1328
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 "�е може да преу�тановите �ливане, защото в момента не �е извършва такова "
 "(лип�ва указател „MERGE_HEAD“)."
 
-#: builtin/merge.c:1338
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "опци�та „--quit“ не приема аргументи"
 
-#: builtin/merge.c:1351
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "опци�та „--continue“ не приема аргументи"
 
-#: builtin/merge.c:1355
+#: builtin/merge.c:1363
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "В момента не �е извършва �ливане (лип�ва указател „MERGE_HEAD“)."
 
-#: builtin/merge.c:1371
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18402,7 +18744,7 @@ msgstr ""
 "�е �те завършили �ливане.  (Указател�т „MERGE_HEAD“ �ъще�твува).\n"
 "Подайте промените �и, преди да започнете ново �ливане."
 
-#: builtin/merge.c:1378
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18410,100 +18752,86 @@ msgstr ""
 "�е �те завършили отбиране на подаване (указател�т „CHERRY_PICK_HEAD“\n"
 "�ъще�твува).  Подайте промените �и, преди да започнете ново �ливане."
 
-#: builtin/merge.c:1381
+#: builtin/merge.c:1389
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 "�е �те завършили отбиране на подаване (указател�т „CHERRY_PICK_HEAD“\n"
 "�ъще�твува)."
 
-#: builtin/merge.c:1395
-msgid "You cannot combine --squash with --no-ff."
-msgstr "опциите „--squash“ и „--no-ff“ �а не�ъвме�тими."
-
-#: builtin/merge.c:1397
-msgid "You cannot combine --squash with --commit."
-msgstr "опциите „--squash“ и „--commit“ �а не�ъвме�тими."
-
-#: builtin/merge.c:1413
+#: builtin/merge.c:1421
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "�е е указано подаване и на�тройката „merge.defaultToUpstream“ не е зададена."
 
-#: builtin/merge.c:1430
+#: builtin/merge.c:1438
 msgid "Squash commit into empty head not supported yet"
 msgstr "Вкарване на подаване във връх без и�тори� в�е още не �е поддържа"
 
-#: builtin/merge.c:1432
+#: builtin/merge.c:1440
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
-"Понеже върхът е без и�тори�, в�ички �ливани� �а превъртани�, не може да �е "
-"извърши �ъщин�ко �ливане изи�квано от опци�та „--no-ff“"
+"Понеже върхът е без и�тори�, �ливани�, които не �а превъртани�, �а невъзможни"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "„%s“ — не е нещо, което може да �е �лее"
 
-#: builtin/merge.c:1439
+#: builtin/merge.c:1447
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Може да �леете точно едно подаване във връх без и�тори�"
 
-#: builtin/merge.c:1520
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "незави�ими и�тории не може да �е �ле�т"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Обнов�ване „%s..%s“\n"
 
-#: builtin/merge.c:1585
+#: builtin/merge.c:1601
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Проба �ъ� �ливане в рамките на индек�а…\n"
 
-#: builtin/merge.c:1592
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "�еу�пешно �ливане.\n"
 
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr "�е може да �е извърши превъртане, преу�танов�ване на дей�твието."
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: builtin/merge.c:1667 builtin/merge.c:1733
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Привеждане на дървото към първоначалното…\n"
 
-#: builtin/merge.c:1655
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Пробване �ъ� �тратеги�та за �ливане „%s“…\n"
 
-#: builtin/merge.c:1707
+#: builtin/merge.c:1723
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "�ико� �тратеги� за �ливане не може да извърши �ливането.\n"
 
-#: builtin/merge.c:1709
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "�еу�пешно �ливане �ъ� �тратеги� „%s“.\n"
 
-#: builtin/merge.c:1718
+#: builtin/merge.c:1735
 #, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr ""
 "Ползва �е �тратеги�та „%s“, ко�то ще подготви дървото за коригиране на "
 "ръка.\n"
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
-"�втоматичното �ливане завърши у�пешно.  Самото подаване не е извършено, "
-"защото бе зададена опци�та „--no-commit“.\n"
+"�втоматичното �ливане завърши у�пешно.  Самото подаване не е извършено\n"
 
 #: builtin/mktag.c:10
 msgid "git mktag"
@@ -18534,15 +18862,15 @@ msgstr "обектът Ñ� етикет не може да бъде прочетÐ
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr "обектът „%s“ е � етикет за %s, но е %s"
 
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr "етикетът на �тандартни� вход не преминава �трогата проверка � „fsck“"
 
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
 msgid "tag on stdin did not refer to a valid object"
 msgstr "етикетът на �тандартни� вход не �очи към правилен обект"
 
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "файлът за етикета не може да бъде запазен"
 
@@ -18563,37 +18891,55 @@ msgid "allow creation of more than one tree"
 msgstr "разрешаване на �ъздаването на повече от едно дърво"
 
 #: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [ОПЦИЯ…] write [--preferred-pack=П�КЕТ]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [ОПЦИЯ…] write [--preferred-pack=П�КЕТ] [--refs-"
+"snapshot=ПЪТ]"
 
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
 msgid "git multi-pack-index [<options>] verify"
 msgstr "git multi-pack-index [ОПЦИЯ…] verify"
 
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [ОПЦИЯ…] expire"
 
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [ОПЦИЯ…] repack [--batch-size=Р�ЗМЕР]"
 
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 "ДИРектори�та_�_ОБЕКТи �ъдържа множе�тво двойки пакетни файлове �ъ� "
 "�ъответни� им индек�"
 
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
 msgid "preferred-pack"
 msgstr "предпочитан_пакет"
 
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr ""
 "пакет, който да �е преизползва при изчи�л�ване на многопакетна битовата ма�ка"
 
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "запазване на многопакетната битова ма�ка"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr ""
+"запазване на битовата ма�ка за множе�тво пакети, �ъдържаща �амо дадените "
+"индек�и"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "�нимка на указателите за избор на подавани� по битова ма�ка"
+
+#: builtin/multi-pack-index.c:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18601,11 +18947,6 @@ msgstr ""
 "при препакетиране пакетните файлове, които �а � по-малък от този размер, да "
 "�е обедин�ват в пакети � по-гол�м от този размер"
 
-#: builtin/multi-pack-index.c:180
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "непозната подкоманда: %s"
-
 #: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [ОПЦИЯ…] ОБЕКТ… ЦЕЛ"
@@ -18634,119 +18975,119 @@ msgstr "принудително преме�тване/преименуване
 msgid "skip move/rename errors"
 msgstr "пре�качане на грешките при преме�тване/преименуване"
 
-#: builtin/mv.c:170
+#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "целта „%s“ �ъще�твува и не е директори�"
 
-#: builtin/mv.c:181
+#: builtin/mv.c:184
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:190
 msgid "bad source"
 msgstr "неправилен обект"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "директори� не може да �е преме�ти в �ебе �и"
 
-#: builtin/mv.c:191
+#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "директори� не може да �е преме�ти върху файл"
 
-#: builtin/mv.c:200
+#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "първоначалната директори� е празна"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "не е под контрола на Git"
 
-#: builtin/mv.c:227
+#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "конфликт"
 
-#: builtin/mv.c:230
+#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "целта �ъще�твува"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "презапи�ване на „%s“"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "Презапи�ването е невъзможно"
 
-#: builtin/mv.c:244
+#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "множе�тво източници за една цел"
 
-#: builtin/mv.c:246
+#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "целевата директори� не �ъще�твува"
 
-#: builtin/mv.c:253
+#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, обект: „%s“, цел: „%s“"
 
-#: builtin/mv.c:274
+#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Преименуване на „%s“ на „%s“\n"
 
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: 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 "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)"
 
@@ -18866,62 +19207,62 @@ 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:197
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr "задайте �ъдържанието на бележката � н�ко� от опциите „-m“ или „-F“"
 
-#: builtin/notes.c:206
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "обектът-бележка не може да бъде запи�ан"
 
-#: builtin/notes.c:208
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "�ъдържанието на бележката е във файла „%s“"
 
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "файлът „%s“ не може да бъде отворен или прочетен"
 
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "не може да �е открие към какво �очи „%s“."
 
-#: builtin/notes.c:265
+#: builtin/notes.c:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "обектът „%s“ не може да бъде прочетен."
 
-#: builtin/notes.c:268
+#: builtin/notes.c:266
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr ""
 "�ъдържанието на бележка не може да �е вземе от обект, който не е BLOB: „%s“."
 
-#: builtin/notes.c:309
+#: builtin/notes.c:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "входен ред � неправилен формат: „%s“."
 
-#: builtin/notes.c:324
+#: builtin/notes.c:322
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "бележката не може да �е копира от „%s“ към „%s“"
@@ -18929,50 +19270,50 @@ msgstr "бележката не може да �е копира от „%s“ к
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr ""
 "н�ма да �е извърши „%s“ върху бележките в „%s“, защото �а извън „refs/"
 "notes/“."
 
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: 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:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr "прекалено много аргументи"
 
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
 #, c-format
 msgid "no note found for object %s."
 msgstr "н�ма бележки за обекта „%s“."
 
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "низ, който е �ъдържанието на бележката"
 
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "Ф�ЙЛ �ъ� �ъдържанието на бележката"
 
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
 msgid "reuse and edit specified note object"
 msgstr "преизползване и редактиране на указани� ОБЕКТ-бележка"
 
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "преизползване на указани� ОБЕКТ-бележка"
 
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "приемане и на празни бележки"
 
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "зам�на на �ъще�твуващите бележки"
 
-#: builtin/notes.c:448
+#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18981,31 +19322,31 @@ msgstr ""
 "�е може да �е добави бележка, защото такава вече �ъще�твува за обекта „%s“.  "
 "Използвайте опци�та „-f“, за да презапишете �ъще�твуващи бележки."
 
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Презапи�ване на �ъще�твуващите бележки за обекта „%s“\n"
 
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Изтриване на бележката за обекта „%s“\n"
 
-#: builtin/notes.c:497
+#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "изчитане на обектите от �тандартни� вход"
 
-#: builtin/notes.c:499
+#: builtin/notes.c:497
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 "зареждане на на�тройките за КОМ��Д�та, ко�то презапи�ва подавани� (включва "
 "опци�та „--stdin“)"
 
-#: builtin/notes.c:517
+#: builtin/notes.c:515
 msgid "too few arguments"
 msgstr "прекалено малко аргументи"
 
-#: builtin/notes.c:538
+#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -19014,12 +19355,12 @@ msgstr ""
 "�е може да �е копира бележка, защото такава вече �ъще�твува за обекта „%s“.  "
 "Използвайте опци�та „-f“, за да презапишете �ъще�твуващи бележки."
 
-#: builtin/notes.c:550
+#: builtin/notes.c:548
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "н�ма бележки за обекта-източник „%s“.  �е може да �е копира."
 
-#: builtin/notes.c:603
+#: builtin/notes.c:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -19030,52 +19371,52 @@ msgstr ""
 "Вме�то това ги използвайте � подкомандата „add“: „git notes add -f -m/-F/-c/-"
 "C“.\n"
 
-#: builtin/notes.c:698
+#: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "указател�т „NOTES_MERGE_PARTIAL“ не може да бъде изтрит"
 
-#: builtin/notes.c:700
+#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "указател�т „NOTES_MERGE_REF“ не може да бъде изтрит"
 
-#: builtin/notes.c:702
+#: builtin/notes.c:700
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "работната директори� на „git notes merge“ не може да бъде изтрита"
 
-#: builtin/notes.c:722
+#: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "указател�т „NOTES_MERGE_PARTIAL“ не може да бъде прочетен"
 
-#: builtin/notes.c:724
+#: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да �е открие."
 
-#: builtin/notes.c:726
+#: builtin/notes.c:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да �е анализира."
 
-#: builtin/notes.c:739
+#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "не може да �е открие към какво �очи „NOTES_MERGE_REF“"
 
-#: builtin/notes.c:742
+#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "неу�пешно �ливане на бележките"
 
-#: builtin/notes.c:768
+#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "непозната �тратеги� за �ливане на бележки „%s“"
 
-#: builtin/notes.c:784
+#: builtin/notes.c:782
 msgid "General options"
 msgstr "Общи опции"
 
-#: builtin/notes.c:786
+#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Опции при �ливане"
 
-#: builtin/notes.c:788
+#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -19085,46 +19426,46 @@ msgstr ""
 "„union“ (обедин�ване), „cat_sort_uniq“ (обедин�ване, подреждане, уникални "
 "резултати)"
 
-#: builtin/notes.c:790
+#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "Подаване на не�лети бележки"
 
-#: builtin/notes.c:792
+#: builtin/notes.c:790
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "завършване на �ливането чрез подаване на не�лети бележки"
 
-#: builtin/notes.c:794
+#: builtin/notes.c:792
 msgid "Aborting notes merge resolution"
 msgstr "Преу�танов�ване на корекци�та при �ливането на бележки"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "преу�танов�ване на �ливането на бележки"
 
-#: builtin/notes.c:807
+#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "опциите „--commit“, „--abort“ и „-s“/„--strategy“ �а не�ъвме�тими"
 
-#: builtin/notes.c:812
+#: builtin/notes.c:810
 msgid "must specify a notes ref to merge"
 msgstr "тр�бва да укажете указател към бележка за �ливане."
 
-#: builtin/notes.c:836
+#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "неизве�тна �тратеги� към опци�та „-s“/„--strategy“: „%s“"
 
-#: builtin/notes.c:873
+#: builtin/notes.c:874
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "в момента �е извършва �ливане на бележките в „%s“ при „%s“"
 
-#: builtin/notes.c:876
+#: builtin/notes.c:878
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "не може да �е запази връзка към указател� на текущата бележка („%s“)."
 
-#: builtin/notes.c:878
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -19135,59 +19476,59 @@ msgstr ""
 "резултата � „git notes merge --commit“ или преу�тановете �ливането � "
 "командата „git notes merge --abort“.\n"
 
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "�е може да �е открие към какво �очи „%s“."
 
-#: builtin/notes.c:900
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "��ма бележки за обекта „%s“\n"
 
-#: builtin/notes.c:912
+#: builtin/notes.c:914
 msgid "attempt to remove non-existent note is not an error"
 msgstr "опитът за изтриването на не�ъще�твуваща бележка не �е �чита за грешка"
 
-#: builtin/notes.c:915
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr "изчитане на имената на обектите от �тандартни� вход"
 
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr "�амо извеждане без дей�твително ока�тр�не"
 
-#: builtin/notes.c:955
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "докладване на ока�трените обекти"
 
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "УК�З�ТЕЛ_З�_БЕЛЕЖК�"
 
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "да �е използва бележката �очена от този УК�З�ТЕЛ_З�_БЕЛЕЖК�"
 
-#: builtin/notes.c:1034 builtin/stash.c:1739
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "непозната подкоманда: %s"
 
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [ОПЦИЯ…] [< СПИСЪК_С_УК�З�ТЕЛИ | < СПИСЪК_С_ОБЕКТИ]"
 
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [ОПЦИЯ…] ПРЕФИКС_��_ИМЕТО [< СПИСЪК_С_УК�З�ТЕЛИ | < "
 "СПИСЪК_С_ОБЕКТИ]"
 
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -19196,112 +19537,116 @@ msgstr ""
 "write_reuse_object: „%s“ не може да �е открие, а �е очакваше при отме�тване "
 "%<PRIuMAX> в пакетни� файл „%s“"
 
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "лоша контролна �ума за пакетирани� обект „%s“"
 
-#: builtin/pack-objects.c:459
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "пакетиран обект � грешки за „%s“"
 
-#: builtin/pack-objects.c:590
+#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "рекур�ивна разлика за обект „%s“"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "подредени б�ха %u обекта, а �е очакваха %<PRIu32>"
 
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "очаква �е обект при отме�тване %<PRIuMAX> в пакетни� файл „%s“"
 
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1160
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "изключване на запи�ването на битовата ма�ка, пакетите �а разделени поради "
 "�тойно�тта на „pack.packSizeLimit“"
 
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
 msgid "Writing objects"
 msgstr "Запи�ване на обектите"
 
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "не може да бъде получена информаци� чрез „stat“ за „%s“"
 
-#: builtin/pack-objects.c:1141
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "неу�пешно запи�ване на индек�и на база битови ма�ки"
+
+#: builtin/pack-objects.c:1294
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "б�ха запи�ани %<PRIu32> обекти, а �е очакваха %<PRIu32>"
 
-#: builtin/pack-objects.c:1383
+#: builtin/pack-objects.c:1536
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "изключване на запи�ването на битовата ма�ка, защото н�кои обекти н�ма да �е "
 "пакетират"
 
-#: builtin/pack-objects.c:1831
+#: builtin/pack-objects.c:1984
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "прекалено далечно начало на отме�тването за обектите-разлика за „%s“"
 
-#: builtin/pack-objects.c:1840
+#: builtin/pack-objects.c:1993
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "недо�тижимо начало на отме�тването за обектите-разлика за „%s“"
 
-#: builtin/pack-objects.c:2121
+#: builtin/pack-objects.c:2274
 msgid "Counting objects"
 msgstr "Пребро�ване на обектите"
 
-#: builtin/pack-objects.c:2266
+#: builtin/pack-objects.c:2439
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "заглавната ча�т на „%s“ не може да бъде анализирана"
 
-#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
-#: builtin/pack-objects.c:2362
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
 #, c-format
 msgid "object %s cannot be read"
 msgstr "обектът „%s“ не може да �е прочете"
 
-#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "обектът „%s“ е � неправилна дължина (%<PRIuMAX>, а не %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2376
+#: builtin/pack-objects.c:2549
 msgid "suboptimal pack - out of memory"
 msgstr "неоптимизиран пакет — паметта �върши"
 
-#: builtin/pack-objects.c:2691
+#: builtin/pack-objects.c:2864
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Делта компре�и�та ще използва до %d нишки"
 
-#: builtin/pack-objects.c:2830
+#: builtin/pack-objects.c:3003
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr ""
 "обектите, които може да бъдат до�тигнати от етикета „%s“, не може да бъдат "
 "пакетирани"
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:3089
 msgid "Compressing objects"
 msgstr "Компре�иране на обектите"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:3095
 msgid "inconsistency with delta count"
 msgstr "неправилен брой разлики"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3174
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19310,7 +19655,7 @@ msgstr ""
 "�тойно�тта на „uploadpack.blobpackfileuri“ тр�бва да е във формат "
 "„СУМ�_��_ОБЕКТ СУМ�_��_П�КЕТ �ДРЕС“ (получена е „%s“)"
 
-#: builtin/pack-objects.c:3004
+#: builtin/pack-objects.c:3177
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19318,17 +19663,18 @@ msgstr ""
 "вече има на�тройка за обекта в друг ред „uploadpack."
 "blobpackfileuri“ (получена е „%s“)"
 
-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3212
 #, c-format
 msgid "could not get type of object %s in pack %s"
 msgstr "видът на обекта „%s“ в пакет „%s“ не може да бъде определен"
 
-#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "пакетът „%s“ не може да �е открие"
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3408
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -19337,7 +19683,7 @@ msgstr ""
 "очаква �е идентификатор на краен обект, а не:\n"
 " %s"
 
-#: builtin/pack-objects.c:3224
+#: builtin/pack-objects.c:3414
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -19346,264 +19692,260 @@ msgstr ""
 "очаква �е идентификатор на обект, а не:\n"
 " %s"
 
-#: builtin/pack-objects.c:3322
+#: builtin/pack-objects.c:3507
 msgid "invalid value for --missing"
 msgstr "неправилна �тойно�т за „--missing“"
 
-#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
 msgid "cannot open pack index"
 msgstr "индек�ът на пакетни� файл не може да бъде отворен"
 
-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3541
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "непакетирани�т обект в „%s“ не може да бъде анализиран"
 
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3627
 msgid "unable to force loose object"
 msgstr "о�таването на обекта непакетиран не може да бъде наложено"
 
-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3757
 #, c-format
 msgid "not a rev '%s'"
 msgstr "„%s“ не е вер�и�"
 
-#: builtin/pack-objects.c:3631
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "неправилна вер�и� „%s“"
 
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3788
 msgid "unable to add recent objects"
 msgstr "�корошните обекти не може да бъдат добавени"
 
-#: builtin/pack-objects.c:3712
+#: builtin/pack-objects.c:3841
 #, c-format
 msgid "unsupported index version %s"
 msgstr "неподдържана вер�и� на индек�а „%s“"
 
-#: builtin/pack-objects.c:3716
+#: builtin/pack-objects.c:3845
 #, c-format
 msgid "bad index version '%s'"
 msgstr "неправилна вер�и� на индек�а „%s“"
 
-#: builtin/pack-objects.c:3755
+#: builtin/pack-objects.c:3884
 msgid "<version>[,<offset>]"
 msgstr "ВЕРСИЯ[,ОТМЕСТВ��Е]"
 
-#: builtin/pack-objects.c:3756
+#: builtin/pack-objects.c:3885
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "запазване на индек�а на пакетните файлове във форма̀та � указаната вер�и�"
 
-#: builtin/pack-objects.c:3759
+#: builtin/pack-objects.c:3888
 msgid "maximum size of each output pack file"
 msgstr "мак�имален размер на в�еки пакетен файл"
 
-#: builtin/pack-objects.c:3761
+#: builtin/pack-objects.c:3890
 msgid "ignore borrowed objects from alternate object store"
 msgstr "игнориране на обектите заети от други хранилища на обекти"
 
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c:3892
 msgid "ignore packed objects"
 msgstr "игнориране на пакетираните обекти"
 
-#: builtin/pack-objects.c:3765
+#: builtin/pack-objects.c:3894
 msgid "limit pack window by objects"
 msgstr "ограничаване на прозореца за пакетиране по брой обекти"
 
-#: builtin/pack-objects.c:3767
+#: builtin/pack-objects.c:3896
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "ограничаване на прозореца за пакетиране и по памет о�вен по брой обекти"
 
-#: builtin/pack-objects.c:3769
+#: builtin/pack-objects.c:3898
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "мак�имална дължина на веригата от разлики, ко�то е позволена в пакетни� файл"
 
-#: builtin/pack-objects.c:3771
+#: builtin/pack-objects.c:3900
 msgid "reuse existing deltas"
 msgstr "преизползване на �ъще�твуващите разлики"
 
-#: builtin/pack-objects.c:3773
+#: builtin/pack-objects.c:3902
 msgid "reuse existing objects"
 msgstr "преизползване на �ъще�твуващите обекти"
 
-#: builtin/pack-objects.c:3775
+#: builtin/pack-objects.c:3904
 msgid "use OFS_DELTA objects"
 msgstr "използване на обекти „OFS_DELTA“"
 
-#: builtin/pack-objects.c:3777
+#: builtin/pack-objects.c:3906
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "�тартиране на нишки за претър�ване на най-добрите �ъвпадени� на разликите"
 
-#: builtin/pack-objects.c:3779
+#: builtin/pack-objects.c:3908
 msgid "do not create an empty pack output"
 msgstr "без �ъздаване на празен пакетен файл"
 
-#: builtin/pack-objects.c:3781
+#: builtin/pack-objects.c:3910
 msgid "read revision arguments from standard input"
 msgstr "изчитане на вер�иите от �тандартни� вход"
 
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:3912
 msgid "limit the objects to those that are not yet packed"
 msgstr "ограничаване до в�е още непакетираните обекти"
 
-#: builtin/pack-objects.c:3786
+#: builtin/pack-objects.c:3915
 msgid "include objects reachable from any reference"
 msgstr ""
 "включване на в�ички обекти, които може да �е до�тигнат от произволен указател"
 
-#: builtin/pack-objects.c:3789
+#: builtin/pack-objects.c:3918
 msgid "include objects referred by reflog entries"
 msgstr "включване и на обектите �очени от запи�ите в журнала на указателите"
 
-#: builtin/pack-objects.c:3792
+#: builtin/pack-objects.c:3921
 msgid "include objects referred to by the index"
 msgstr "включване и на обектите �очени от индек�а"
 
-#: builtin/pack-objects.c:3795
+#: builtin/pack-objects.c:3924
 msgid "read packs from stdin"
 msgstr "изчитане на пакетите от �тандартни� вход"
 
-#: builtin/pack-objects.c:3797
+#: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
 msgstr "извеждане на пакета на �тандартни� изход"
 
-#: builtin/pack-objects.c:3799
+#: builtin/pack-objects.c:3928
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 "включване и на обектите-етикети, които �очат към обектите, които ще бъдат "
 "пакетирани"
 
-#: builtin/pack-objects.c:3801
+#: builtin/pack-objects.c:3930
 msgid "keep unreachable objects"
 msgstr "запазване на недо�тижимите обекти"
 
-#: builtin/pack-objects.c:3803
+#: builtin/pack-objects.c:3932
 msgid "pack loose unreachable objects"
 msgstr "пакетиране и на недо�тижимите обекти"
 
-#: builtin/pack-objects.c:3805
+#: builtin/pack-objects.c:3934
 msgid "unpack unreachable objects newer than <time>"
 msgstr "разпакетиране на недо�тижимите обекти, които �а по-нови от това ВРЕМЕ"
 
-#: builtin/pack-objects.c:3808
+#: builtin/pack-objects.c:3937
 msgid "use the sparse reachability algorithm"
 msgstr "използване на алгоритъм за ча�тична до�тижимо�т"
 
-#: builtin/pack-objects.c:3810
+#: builtin/pack-objects.c:3939
 msgid "create thin packs"
 msgstr "�ъздаване на �ъкратени пакети"
 
-#: builtin/pack-objects.c:3812
+#: builtin/pack-objects.c:3941
 msgid "create packs suitable for shallow fetches"
 msgstr "пакетиране подход�що за плитко до�тав�не"
 
-#: builtin/pack-objects.c:3814
+#: builtin/pack-objects.c:3943
 msgid "ignore packs that have companion .keep file"
 msgstr "игнориране на пакетите, които �а придружени от файл „.keep“"
 
-#: builtin/pack-objects.c:3816
+#: builtin/pack-objects.c:3945
 msgid "ignore this pack"
 msgstr "пропу�кане на този пакет"
 
-#: builtin/pack-objects.c:3818
+#: builtin/pack-objects.c:3947
 msgid "pack compression level"
 msgstr "ниво на компре�иране при пакетиране"
 
-#: builtin/pack-objects.c:3820
+#: builtin/pack-objects.c:3949
 msgid "do not hide commits by grafts"
 msgstr ""
 "извеждане на в�ички родители — дори и тези, които нормално �а �крити при "
 "при�аждани�та"
 
-#: builtin/pack-objects.c:3822
+#: builtin/pack-objects.c:3951
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "използване на �ъще�твуващи индек�и на база битови ма�ки за у�кор�ване на "
 "пребро�ването на обектите"
 
-#: builtin/pack-objects.c:3824
+#: builtin/pack-objects.c:3953
 msgid "write a bitmap index together with the pack index"
 msgstr "запазване и на индек� на база битова ма�ка, заедно � индек�а за пакета"
 
-#: builtin/pack-objects.c:3828
+#: builtin/pack-objects.c:3957
 msgid "write a bitmap index if possible"
 msgstr "запи�ване на индек�и на база битови ма�ки при възможно�т"
 
-#: builtin/pack-objects.c:3832
+#: builtin/pack-objects.c:3961
 msgid "handling for missing objects"
 msgstr "как да �е обработват лип�ващите обекти"
 
-#: builtin/pack-objects.c:3835
+#: builtin/pack-objects.c:3964
 msgid "do not pack objects in promisor packfiles"
 msgstr "без пакетиране на обекти в гарантиращи пакети"
 
-#: builtin/pack-objects.c:3837
+#: builtin/pack-objects.c:3966
 msgid "respect islands during delta compression"
 msgstr "без пром�на на групите при делта компре�и�"
 
-#: builtin/pack-objects.c:3839
+#: builtin/pack-objects.c:3968
 msgid "protocol"
 msgstr "протокол"
 
-#: builtin/pack-objects.c:3840
+#: builtin/pack-objects.c:3969
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr "без ползване на на�тройки „uploadpack.blobpackfileuri“ � този протокол"
 
-#: builtin/pack-objects.c:3873
+#: builtin/pack-objects.c:4002
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "веригата � разлики е прекалено дълбока — %d, ще �е ползва %d"
 
-#: builtin/pack-objects.c:3878
+#: builtin/pack-objects.c:4007
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr ""
 "Стойно�тта на на�тройката „pack.deltaCacheLimit“ е прекалено гол�ма.  Ще �е "
 "ползва %d"
 
-#: builtin/pack-objects.c:3934
+#: builtin/pack-objects.c:4063
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "опци�та „--max-pack-size“ не може да �е използва за �ъздаване на пакетни "
 "файлове за прено�"
 
-#: builtin/pack-objects.c:3936
+#: builtin/pack-objects.c:4065
 msgid "minimum pack size limit is 1 MiB"
 msgstr "минимални�т размер на пакетите е 1 MiB"
 
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:4070
 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 "опци�та „--thin“не може да �е използва за �ъздаване на пакетни файлове � "
 "индек�"
 
-#: builtin/pack-objects.c:3944
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "опциите „--keep-unreachable“ и „--unpack-unreachable“ �а не�ъвме�тими"
-
-#: builtin/pack-objects.c:3950
+#: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
-msgstr "опци�та „-filter“ изи�ква „-stdout“"
+msgstr "опци�та „--filter“ изи�ква „--stdout“"
 
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:4081
 msgid "cannot use --filter with --stdin-packs"
-msgstr "опциите „-filter“ и „--stdin-packs“ �а не�ъвме�тими"
+msgstr "опциите „--filter“ и „--stdin-packs“ �а не�ъвме�тими"
 
-#: builtin/pack-objects.c:3956
+#: builtin/pack-objects.c:4085
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr ""
 "вътрешни�т �пи�ък на указатели и опци�та „--stdin-packs“ �а не�ъвме�тими"
 
-#: builtin/pack-objects.c:4015
+#: builtin/pack-objects.c:4144
 msgid "Enumerating objects"
 msgstr "Избро�ване на обектите"
 
-#: builtin/pack-objects.c:4052
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19646,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:152
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "хранилище � важни обекти не може да �е ока�тр�"
 
@@ -19671,44 +20013,50 @@ msgstr "�еправилна �тойно�т за „%s“: „%s“"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [ОПЦИЯ…] [ХР��ИЛИЩЕ [УК�З�ТЕЛ_��_ВЕРСИЯ…]]"
 
-#: builtin/pull.c:123
+#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
 msgstr "управление на рекур�ивното до�тав�не на подмодулите"
 
-#: builtin/pull.c:127
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Опции при �ливане"
 
-#: builtin/pull.c:130
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "вна��не на промените чрез пребазиране, а не чрез �ливане"
 
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "позвол�ване на превъртани�"
 
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr ""
+"дали куките преди подаване и �ливане и при пром�на на �ъобщението за "
+"подаване (pre-merge-commit и commit-msg) да �е изпълн�т"
+
+#: builtin/pull.c:171 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr "автоматично �катаване/прилагане на �катаното преди и �лед пребазиране"
 
-#: builtin/pull.c:183
+#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "Опции при до�тав�не"
 
-#: builtin/pull.c:193
+#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "принудително презапи�ване на локални� клон"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr "брой подмодули издърпани паралелно"
 
-#: builtin/pull.c:317
+#: builtin/pull.c:321
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "�еправилна �тойно�т за „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."
@@ -19716,14 +20064,14 @@ msgstr ""
 "Между указателите, които току що до�тавихте, н�ма подход�щ кандидат, върху "
 "който да пребазирате."
 
-#: builtin/pull.c:447
+#: builtin/pull.c:451
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Между указателите, които току що до�тавихте, н�ма подход�щ кандидат, който "
 "да �леете."
 
-#: 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."
@@ -19731,7 +20079,7 @@ msgstr ""
 "�ай веро�тно �те подали шаблон за указатели, който не е напа�нал � нищо в "
 "отдалеченото хранилище."
 
-#: builtin/pull.c:451
+#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -19742,43 +20090,44 @@ msgstr ""
 "Понеже това не е хранилището по подразбиране на текущи� клон, тр�бва\n"
 "да укажете отдалечени� клон на командни� ред."
 
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
 msgid "You are not currently on a branch."
 msgstr "Извън в�ички клони."
 
-#: 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 "Укажете върху кой клон и�кате да пребазирате."
 
-#: 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 "Укажете кой клон и�кате да �леете."
 
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "За повече информаци� погледнете ръковод�твото „git-pull(1)“"
 
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
 msgid "<remote>"
 msgstr "ОТД�ЛЕЧЕ�О_ХР��ИЛИЩЕ"
 
-#: 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 "КЛО�"
 
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
 msgid "There is no tracking information for the current branch."
 msgstr "Текущи�т клон не �леди никой."
 
-#: 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 ""
 "�ко и�кате да зададете информаци� за �леден клон, може да направите това � "
 "командата:"
 
-#: builtin/pull.c:485
+#: builtin/pull.c:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -19787,22 +20136,22 @@ msgstr ""
 "За �ливане е указан отдалечени�т указател „%s“,\n"
 "но такъв не е до�тавен."
 
-#: builtin/pull.c:596
+#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "недо�тъпно подаване: %s"
 
-#: builtin/pull.c:902
+#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "без „--verify-signatures“ при пребазиране"
 
-#: builtin/pull.c:930
+#: builtin/pull.c:969
 msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"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"
@@ -19812,32 +20161,32 @@ msgid ""
 "or --ff-only on the command line to override the configured default per\n"
 "invocation.\n"
 msgstr ""
-"�е �е на�ърчава издърпване без указване на �тратеги�та за �ъгла�уване на\n"
-"клоните.  За да заглушите това �ъобщение, изпълнете н�ко� от �ледните\n"
+"��кои от клоните �а �е раздалечили и тр�бва да укажете как да �е решава\n"
+"това.  За да заглушите това �ъобщение, изпълнете н�ко� от �ледните\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:991
+#: builtin/pull.c:1046
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Обнов�ване на в�е още не�ъздаден клон � промените от индек�а"
 
-#: builtin/pull.c:995
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "издърпване � пребазиране"
 
-#: builtin/pull.c:996
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "тр�бва да подадете или �катаете промените."
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19847,7 +20196,7 @@ msgstr ""
 "до�тав�нето обнови върха на текущи� клон.  Работното\n"
 "ви копие бе превърт�но от подаване „%s“."
 
-#: builtin/pull.c:1027
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19864,15 +20213,24 @@ msgstr ""
 "    git reset --hard\n"
 "за връщане към нормално �ъ�то�ние."
 
-#: builtin/pull.c:1042
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr "�е може да �ливате множе�тво клони в празен върхов указател."
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "�е може да пребазирате върху повече от един клон."
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1104
+msgid "Cannot fast-forward to multiple branches."
+msgstr "�е може да превъртите към повече от един клон."
+
+#: builtin/pull.c:1119
+msgid "Need to specify how to reconcile divergent branches."
+msgstr ""
+"Тр�бва да укажете как да �е решават разликите при разминаване на клоните."
+
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "пребазирането е невъзможно заради локално запи�аните промени по подмодулите"
@@ -19937,7 +20295,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:ИМЕ_��_ОТД�ЛЕЧЕ�ИЯ_КЛО�\n"
 
-#: builtin/push.c:194
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -19951,14 +20309,21 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:202
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "Текущи�т клон „%s“ �леди н�колко отдалечени клона, не може про�то да "
 "изтла�кате."
 
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"�е �те указали вер�и� за подаване, а на�тройката „push.default“ е "
+"„nothing“ (нищо без изрично указана вер�и� да не �е изтла�ква)"
+
+#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -19970,14 +20335,7 @@ msgstr ""
 "Тр�бва да укажете ко� вер�и� да �е изтла�ка, за обнов�ване на отдалечени� "
 "клон."
 
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"�е �те указали вер�и� за подаване, а на�тройката „push.default“ е "
-"„nothing“ (нищо без изрично указана вер�и� да не �е изтла�ква)"
-
-#: builtin/push.c:267
+#: builtin/push.c:258
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19991,7 +20349,7 @@ msgstr ""
 "преди отново да изтла�кате промените.  За повече информаци� вижте раздела\n"
 "„Note about fast-forwards“ в �траницата от ръковод�твото „git push --help“."
 
-#: builtin/push.c:273
+#: builtin/push.c:264
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -20005,7 +20363,7 @@ msgstr ""
 "информаци� погледнете раздела „Note about fast-forwards“ в �траницата от\n"
 "ръковод�твото „git push --help“."
 
-#: builtin/push.c:279
+#: builtin/push.c:270
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -20024,14 +20382,14 @@ msgstr ""
 "�траницата\n"
 "от ръковод�твото „git push --help“."
 
-#: builtin/push.c:286
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Изтла�кването е отхвърлено, защото в отдалеченото хранилище �ъще�твува "
 "етикет,\n"
 "който ще припокриете � етикет от вашето хранилище."
 
-#: builtin/push.c:289
+#: builtin/push.c:280
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -20041,7 +20399,7 @@ msgstr ""
 "указател, който вече �очи към обект, който не е подаване, както и тепърва\n"
 "да го промените да �очи към подобен обект.\n"
 
-#: builtin/push.c:294
+#: builtin/push.c:285
 msgid ""
 "Updates were rejected because the tip of the remote-tracking\n"
 "branch has been updated since the last checkout. You may want\n"
@@ -20052,107 +20410,102 @@ msgstr ""
 "по�ледното изтегл�не.  Вне�ете отдалечените промени (напр. � командата\n"
 "„git pull…“), преди отново принудително да изтла�кате промените.\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Изтла�кване към „%s“\n"
 
-#: builtin/push.c:371
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "ча�т от указателите не б�ха изтла�кани към „%s“"
 
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "хранилище"
 
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
 msgstr "изтла�кване на в�ички указатели"
 
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr "огледално копие на в�ички указатели"
 
-#: builtin/push.c:557
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "изтриване на указателите"
 
-#: builtin/push.c:558
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "изтла�кване на етикетите (не�ъвме�тимо � опциите „--all“ и „--mirror“)"
 
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "принудително обнов�ване"
 
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "ИМЕ_��_УК�З�ТЕЛ:ОЧ�КВ���_СТОЙ�ОСТ"
 
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
 msgid "require old value of ref to be at this value"
 msgstr "УК�З�ТЕЛ�т тр�бва първоначално да е � тази ОЧ�КВ���_СТОЙ�ОСТ"
 
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
 msgid "require remote updates to be integrated locally"
 msgstr ""
 "изи�кване обнов�вани�та в отдалечените хранилища да �е вна��т и в локалното"
 
-#: builtin/push.c:569
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "управление на рекур�ивното изтла�кване на подмодулите"
 
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
 msgid "use thin pack"
 msgstr "използване на �ъкратени пакети"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "програма за получаването на пакети"
 
-#: builtin/push.c:573
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "задаване на отдалеченото хранилище за командите „git pull/status“"
 
-#: builtin/push.c:576
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "ока�тр�не на указателите, които �а премахнати от локалното хранилище"
 
-#: builtin/push.c:578
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "без изпълнение на куката преди изтла�кване (pre-push)"
 
-#: builtin/push.c:579
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr ""
 "изтла�кване на лип�ващите в отдалеченото хранилище, но �вързани � текущото "
 "изтла�кване, етикети"
 
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
 msgstr "подпи�ване на изтла�кването � GPG"
 
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
 msgid "request atomic transaction on remote side"
 msgstr "изи�кване на атомарни операции от от�рещната �трана"
 
-#: builtin/push.c:601
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr ""
-"опци�та „--delete“ е не�ъвме�тима � опциите  „--all“, „--mirror“ и „--tags“"
-
-#: builtin/push.c:603
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "опци�та „--delete“ изи�ква поне един указател на вер�и�"
 
-#: builtin/push.c:623
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "неправилно указано хранилище „%s“"
 
-#: builtin/push.c:624
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -20174,27 +20527,15 @@ msgstr ""
 "\n"
 "    git push ИМЕ\n"
 
-#: builtin/push.c:639
-msgid "--all and --tags are incompatible"
-msgstr "опциите „--all“ и „--tags“ �а не�ъвме�тими"
-
-#: builtin/push.c:641
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "опци�та „--all“ е не�ъвме�тима � указването на вер�и�"
 
-#: builtin/push.c:645
-msgid "--mirror and --tags are incompatible"
-msgstr "опциите „--mirror“ и „--tags“ �а не�ъвме�тими"
-
-#: builtin/push.c:647
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "опци�та „--mirror“ е не�ъвме�тима � указването на вер�и�"
 
-#: builtin/push.c:650
-msgid "--all and --mirror are incompatible"
-msgstr "опциите „--all“ и „--mirror“ �а не�ъвме�тими"
-
-#: builtin/push.c:657
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "опциите за изтла�кване не тр�бва да �ъдържат знак за нов ред"
 
@@ -20246,83 +20587,82 @@ msgstr "необходими Ñ�а два диапазона Ñ� подаваниÑ
 #: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=ПРЕФИКС) "
-"[-u [--exclude-per-directory=Ф�ЙЛ_С_ИЗКЛЮЧЕ�ИЯ] | -i]] [--no-sparse-"
-"checkout] [--index-output=Ф�ЙЛ] (--empty | УК�З�ТЕЛ_КЪМ_ДЪРВО_1 "
-"[УК�З�ТЕЛ_КЪМ_ДЪРВО_2 [УК�З�ТЕЛ_КЪМ_ДЪРВО_3]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=Ф�ЙЛ] (--empty | "
+"УК�З�ТЕЛ_КЪМ_ДЪРВО_1 [УК�З�ТЕЛ_КЪМ_ДЪРВО_2 [УК�З�ТЕЛ_КЪМ_ДЪРВО_3]])"
 
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "запазване на индек�а в този Ф�ЙЛ"
 
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "�амо занул�ване на индек�а"
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "Сливане"
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
 msgid "perform a merge in addition to a read"
 msgstr "да �е извърши и �ливане �лед о�вен изчитането"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
 msgid "3-way merge if no file level merging required"
 msgstr "тройно �ливане, ако не �е налага пофайлово �ливане"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
 msgid "3-way merge in presence of adds and removes"
 msgstr "тройно �ливане при добав�не на добав�не и изтриване на файлове"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "�ъщото като опци�та „-m“, но не�летите обекти �е пренебрегват"
 
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "ПОДДИРЕКТОРИЯ/"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "изчитане на дървото към индек�а като да е в тази ПОДДИРЕКТОРИЯ/"
 
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
 msgid "update working tree with merge result"
 msgstr "обнов�ване на работното дърво � резултата от �ливането"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "Ф�ЙЛ_С_ИЗКЛЮЧЕ�ИЯ"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "позвол�ване на презапи�ването на изрично пренебрегваните файлове"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
 msgid "don't check the working tree after merging"
 msgstr "без проверка на работното дърво �лед �ливането"
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
 msgid "don't update the index or the work tree"
 msgstr "без обнов�ване и на индек�а, и на работното дърво"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
 msgid "skip applying sparse checkout filter"
 msgstr "без прилагане на филтъра за ча�тично изтегл�не"
 
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "изчи�тване на грешки в командата „unpack-trees“"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "без информационни �ъобщени�"
 
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
 msgid "You need to resolve your current index first"
 msgstr "Първо тр�бва да коригирате индек�а �и"
 
@@ -20344,197 +20684,44 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "неу�пешно изтриване на �пи�ъка за изпълнение: „%s“"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
 #, c-format
 msgid "could not create temporary %s"
 msgstr "не може да �е �ъздаде временна директори� „%s“"
 
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
 msgid "could not mark as interactive"
 msgstr "невъзможно задаване на интерактивна работа"
 
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
 msgid "could not generate todo list"
 msgstr "файлът � командите не може да �е генерира"
 
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "опциите „--upstream“ и „--onto“ изи�кват базово подаване"
 
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [ОПЦИЯ…]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "запазванe на първоначално празните подавани�"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "позвол�ване на празни �ъобщени� при подаване"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "пребазиране на подавани�та �ъ� �ливани�"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr ""
-"запазване на първоначалните точки на разклон�ване на �е�трин�ките клони"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "преме�тване на подавани�та, които започват �ъ� „squash!“/“fixup!“"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "подпи�ване на подавани�та"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "извеждане на �тати�тика � промените в �ледени� клон"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "продължаване на пребазирането"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "пре�качане на подаване"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "редактиране на �пи�ъка � команди за изпълнение"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "извеждане на текущата кръпка"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "�ъкратени идентификатори в �пи�ъка за изпълнение"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "пълни идентификатори в �пи�ъка за изпълнение"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "проверка на �пи�ъка за изпълнение"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr ""
-"преподреждане на редовете за вкарване на подавани�та подавани�та в "
-"предходните им �ъ� и без �мени на �ъобщението"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "вмъкване на командите за изпълнение в �пи�ъка за изпълнение"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "върху"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "ограничена вер�и�"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "ограничена вер�и�"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "подаване, в което другите да �е вкарат"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "подаване, в което другите да �е вкарат"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "подаване на източника"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "име на върха"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "име на върха"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "�тратеги� на пребазиране"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "опции на �тратеги�та"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "опции на �тратеги�та"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "преминаване към"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "клонът, към който да �е премине"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "име на база"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "име на база"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "команда"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "команда за изпълнение"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr ""
-"автоматично подаване за повторно изпълнение на командите завършили � неу�пех"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "опциите „--[no-]rebase-cousins“ изи�кват опци�та „--rebase-merges“"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "„%s“ изи�ква пребазиране"
 
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "не може да �е премине към новата база, зададена � „onto“: „%s“"
 
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "неправилен указател към първоначален връх „orig-head“: „%s“"
 
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "неправилната �тойно�т на „allow_rerere_autoupdate“ �е пре�кача: „%s“"
 
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20548,7 +20735,7 @@ msgstr ""
 "За да откажете пребазирането и да �е върнете към първоначалното �ъ�то�ние,\n"
 "изпълнете „git rebase --abort“."
 
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
 #, c-format
 msgid ""
 "\n"
@@ -20566,7 +20753,7 @@ msgstr ""
 "\n"
 "В резултат те не може да �е пребазират."
 
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20575,7 +20762,7 @@ msgstr ""
 "неправилна �тойно�т „%s“: вариантите �а „drop“ (пре�качане), "
 "„keep“ (запазване) и „ask“ (питане)"
 
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -20592,7 +20779,7 @@ msgstr ""
 "    git rebase КЛО�\n"
 "\n"
 
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -20605,192 +20792,190 @@ msgstr ""
 "\n"
 "    git branch --set-upstream-to=%s/КЛО� %s\n"
 
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
 msgid "exec commands cannot contain newlines"
 msgstr "командите за изпълнение не може да �ъдържат нови редове"
 
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
 msgid "empty exec command"
 msgstr "празна команда за изпълнение"
 
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
 msgid "rebase onto given branch instead of upstream"
 msgstr "пребазиране върху зададени�, а не �ледени� клон"
 
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "за текуща база да �е ползва базата за �ливане на клона и �леденото"
 
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
 msgid "allow pre-rebase hook to run"
 msgstr "позвол�ване на куката преди пребазиране да �е изпълни"
 
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
 msgid "be quiet. implies --no-stat"
 msgstr "без извеждане на информаци�.  Включва опци�та „--no-stat“"
 
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "извеждане на �тати�тика � промените в �ледени� клон"
+
+#: builtin/rebase.c:1035
 msgid "do not show diffstat of what changed upstream"
 msgstr "без извеждане на �тати�тика � промените в �ледени� клон"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "добав�не на епилог за подпи� „Signed-off-by“ към в��ко подаване"
 
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
 msgid "make committer date match author date"
 msgstr "датата на подаващи� да отговар� на датата на автора"
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
 msgid "ignore author date and use current date"
 msgstr "да �е ползва днешна дата, а не тази на автора"
 
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
 msgid "synonym of --reset-author-date"
 msgstr "п�евдоним на „--reset-author-date“"
 
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
 msgid "passed to 'git apply'"
 msgstr "подава �е на командата „git apply“"
 
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
 msgid "ignore changes in whitespace"
 msgstr "без промени в празните знаци"
 
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "отбиране на в�ички подавани� дори да н�ма промени"
 
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
 msgid "continue"
 msgstr "продължаване"
 
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
 msgid "skip current patch and continue"
 msgstr "пре�качане на текущата кръпка и продължаване"
 
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
 msgid "abort and check out the original branch"
 msgstr "преу�танов�ване и въз�танов�ване на първоначални� клон"
 
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
 msgid "abort but keep HEAD where it is"
 msgstr "преу�танов�ване без пром�на към какво �очи „HEAD“"
 
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
 msgid "edit the todo list during an interactive rebase"
 msgstr "редактиране на файла � команди при интерактивно пребазиране"
 
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
 msgid "show the patch file being applied or merged"
 msgstr "показване на кръпката, ко�то �е прилага или �лива"
 
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
 msgid "use apply strategies to rebase"
 msgstr "при пребазиране да �е ползва �тратеги� � прилагане"
 
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
 msgid "use merging strategies to rebase"
 msgstr "при пребазиране да �е ползва �тратеги� �ъ� �ливане"
 
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 "позвол�ване на потребител� да редактира �пи�ъка � подавани� за пребазиране"
 
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "(ОСТ�РЯЛО) пре�ъздаване на �ливани�та вме�то да �е пре�качат"
 
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
 msgid "how to handle commits that become empty"
 msgstr "как да �е обработват оказалите �е празни подавани�"
 
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "запазванe на първоначално празните подавани�"
+
+#: builtin/rebase.c:1097
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr ""
 "преме�тване на подавани�та, които започват �ъ� „squash!“/“fixup!“ при „-i“"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
 msgid "add exec lines after each commit of the editable list"
 msgstr ""
 "добав�не на редове � команди за изпълнение �лед в��ко подаване в "
 "редактирани� �пи�ък"
 
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
 msgid "allow rebasing commits with empty messages"
 msgstr "позвол�ване на пребазиране на подавани� � празни �ъобщени�"
 
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
 msgid "try to rebase merges instead of skipping them"
 msgstr "опит за пребазиране на �ливани�та вме�то те да �е пре�качат"
 
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr ""
 "за доуточн�ването на �ледени� клон, използвайте:\n"
 "\n"
 "    git merge-base --fork-point"
 
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
 msgid "use the given merge strategy"
 msgstr "използване на зададената �тратеги�та на �ливане"
 
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
 msgid "option"
 msgstr "опци�"
 
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
 msgid "pass the argument through to the merge strategy"
 msgstr "аргументът да �е подаде на �тратеги�та за �ливане"
 
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "пребазиране на в�ички до�тижими подавани� до началното им подаване"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+"автоматично подаване за повторно изпълнение на командите завършили � неу�пех"
+
+#: builtin/rebase.c:1128
 msgid "apply all changes, even those already present upstream"
 msgstr "прилагане на в�ички промени, дори и наличните вече в �леденото"
 
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
-"Изглежда, че �ега �е прилагат кръпки чрез командата „git-am“.  �е може да "
+"Изглежда, че �ега �е прилагат кръпки чрез командата „git am“.  �е може да "
 "пребазирате в момента."
 
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"Опци�та „--preserve-merges“ е о�тар�ла.  Ползвайте „--rebase-merges“ вме�то "
-"не�."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "Опци�та „--preserve-merges“ е заменена � „--rebase-merges“."
 
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "опциите „--keep-base“ и „--onto“ �а не�ъвме�тими"
-
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "опциите „--keep-base“ и „--root“ �а не�ъвме�тими"
-
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "опциите „--root“ и „--fork-point“ �а не�ъвме�тими"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Изглежда в момента не тече пребазиране"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "Опци�та „--edit-todo“ е до�тъпна �амо по време на интерактивно пребазиране."
 
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Указател�т „HEAD“ не може да бъде прочетен"
 
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -20798,16 +20983,16 @@ msgstr ""
 "Тр�бва да редактирате в�ички конфликти при �ливането.  След това\n"
 "отбележете коригирането им чрез командата „git add“"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
 msgid "could not discard worktree changes"
 msgstr "промените в работното дърво не може да бъдат занулени"
 
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
 #, c-format
 msgid "could not move back to %s"
 msgstr "връщането към „%s“ е невъзможно"
 
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -20828,147 +21013,136 @@ msgstr ""
 "за\n"
 "да не загубите �лучайно промени.\n"
 
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
 msgstr "опци�та „C“ очаква чи�ло за аргумент"
 
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "�еизве�тна �тратеги�: „%s“"
 
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
 msgid "--strategy requires --merge or --interactive"
 msgstr ""
 "опци�та „--strategy“ изи�ква н�ко� от опциите „--merge“ или „--interactive“"
 
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr "опциите за „apply“ �а не�ъвме�тими � опциите за �ливане"
+#: builtin/rebase.c:1463
+msgid "apply options and merge options cannot be used together"
+msgstr "опциите за прилагане и �ливане �а не�ъвме�тими"
 
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "�епозната реализаци� на пребазиране: %s"
 
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr ""
 "опци�та „--reschedule-failed-exec“ изи�ква н�ко� от опциите „--exec“ или „--"
 "interactive“"
 
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "опциите „--preserve-merges“ и „--rebase-merges“ �а не�ъвме�тими"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"ГРЕШК�: опциите „--preserve-merges“ и „--reschedule-failed-exec“ �а "
-"не�ъвме�тими"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "неправилен �леден клон: „%s“"
 
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
 msgid "Could not create new root commit"
 msgstr "�е може да �е �ъздаде ново начално подаване"
 
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "„%s“: изи�ква �е точно една база за �ливане � клона"
 
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "„%s“: изи�ква �е точно една база за пребазиране"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "Указател�т „%s“ не �очи към подаване"
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
 #, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "Ф�Т�Л�� ГРЕШК�: не �ъще�твува клон „%s“"
+msgid "no such branch/commit '%s'"
+msgstr "не �ъще�твува клон/подаване „%s“"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2415
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "Такъв указател н�ма: %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
 msgid "Could not resolve HEAD to a revision"
 msgstr "Подаването, �очено от указател� „HEAD“, не може да бъде открито"
 
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
 msgid "Please commit or stash them."
 msgstr "Промените тр�бва или да �е подадат, или да �е �ката�т."
 
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
 #, c-format
 msgid "could not switch to %s"
 msgstr "не може да �е премине към „%s“"
 
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
 msgid "HEAD is up to date."
 msgstr "Указател�т „HEAD“ е напълно актуален."
 
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Текущи�т клон „%s“ е напълно актуален.\n"
 
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
 msgid "HEAD is up to date, rebase forced."
 msgstr "Указател�т „HEAD“ е напълно актуален — принудително пребазиране"
 
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Текущи�т клон „%s“ е напълно актуален — принудително пребазиране\n"
 
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането."
 
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Промените в „%s“:\n"
 
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Промените от „%s“ към „%s“:\n"
 
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "Първо, указател�т „HEAD“ започва да �очи към базата, върху ко�то "
 "пребазирате…\n"
 
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
 msgid "Could not detach HEAD"
 msgstr "Указател�т „HEAD“ не може да �е отдел�"
 
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Превъртане на „%s“ към „%s“.\n"
 
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack ДИРЕКТОРИЯ_��_GIT"
 
-#: builtin/receive-pack.c:1276
+#: 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"
@@ -21001,7 +21175,7 @@ msgstr ""
 "За да заглушите това �ъобщение, като запазите �тандартното поведение,\n"
 "задайте на�тройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)."
 
-#: builtin/receive-pack.c:1296
+#: 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"
@@ -21022,13 +21196,13 @@ msgstr ""
 "За да заглушите това �ъобщение, задайте на�тройката\n"
 "„receive.denyDeleteCurrent“ да е „refuse“ (отказ)."
 
-#: builtin/receive-pack.c:2479
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "без извеждане на информаци�"
 
-#: builtin/receive-pack.c:2493
-msgid "You must specify a directory."
-msgstr "Тр�бва да укажете директори�."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "тр�бва да укажете директори�"
 
 #: builtin/reflog.c:17
 msgid ""
@@ -21051,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:699
+#: 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 ]"
 
@@ -21177,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"
@@ -21226,7 +21405,7 @@ msgstr ""
 "указването на �ледени клони е �ми�лено �амо за отдалечени хранилища, от "
 "които �е до�тав�"
 
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
 #, c-format
 msgid "remote %s already exists."
 msgstr "вече �ъще�твува отдалечено хранилище � име „%s“."
@@ -21236,25 +21415,30 @@ msgstr "вече �ъще�твува отдалечено хранилище �
 msgid "Could not setup master '%s'"
 msgstr "О�новни�т клон „%s“ не може да бъде на�троен"
 
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "„branch.%s.rebase=%s“ не �е поддържа.  Приема �е „true“ (и�тина)"
+
+#: builtin/remote.c:366
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Обектите за до�тав�не за указател� „%s“ не може да бъдат получени"
 
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
 msgid "(matching)"
 msgstr "(�ъвпадащи)"
 
-#: builtin/remote.c:466
+#: builtin/remote.c:472
 msgid "(delete)"
 msgstr "(за изтриване)"
 
-#: builtin/remote.c:655
+#: builtin/remote.c:660
 #, c-format
 msgid "could not set '%s'"
 msgstr "„%s“ не може да �е зададе"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:665
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -21265,17 +21449,17 @@ msgstr ""
 "    %s:%d\n"
 "използва отдалечено хранилище, което вече не �ъще�твува: „%s“"
 
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "��ма отдалечено хранилище на име „%s“"
 
-#: builtin/remote.c:710
+#: builtin/remote.c:715
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Разделът „%s“ в на�тройките не може да бъде преименуван на „%s“"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:735
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -21286,17 +21470,17 @@ msgstr ""
 "    %s\n"
 "  Променете на�тройките ръчно, ако е необходимо."
 
-#: builtin/remote.c:770
+#: builtin/remote.c:775
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "неу�пешно изтриване на „%s“"
 
-#: builtin/remote.c:804
+#: builtin/remote.c:809
 #, c-format
 msgid "creating '%s' failed"
 msgstr "неу�пешно �ъздаване на „%s“"
 
-#: builtin/remote.c:882
+#: builtin/remote.c:887
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -21310,121 +21494,121 @@ msgstr[1] ""
 "Бележка: ��колко клона извън йерархи�та „refs/remotes/“ не б�ха изтрити.\n"
 "Изтрийте ги чрез командата:"
 
-#: builtin/remote.c:896
+#: builtin/remote.c:901
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Разделът „%s“ в на�тройките не може да бъде изтрит"
 
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " нов (�ледващото до�тав�не ще го разположи в „remotes/%s“)"
 
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
 msgid " tracked"
 msgstr " �леден"
 
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " �тар (изтрийте чрез „git remote prune“)"
 
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
 msgid " ???"
 msgstr " не��но �ъ�то�ние"
 
 # CHECK
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
-"неправилен клон за �ливане „%s“.  �евъзможно е да пребазирате върху повече "
-"от 1 клон"
+"неправилен клон за �ливане „branch.%s.merge“.  �евъзможно е да пребазирате "
+"върху повече от 1 клон"
 
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "интерактивно пребазиране върху отдалечени� клон „%s“"
 
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "интерактивно пребазиране (�ъ� �ливани�) върху отдалечени� клон „%s“"
 
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "пребазиране върху отдалечени� клон „%s“"
 
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
 #, c-format
 msgid " merges with remote %s"
 msgstr " �ливане � отдалечени� клон „%s“"
 
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
 #, c-format
 msgid "merges with remote %s"
 msgstr "�ливане � отдалечени� клон „%s“"
 
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    и � отдалечени� клон „%s“\n"
 
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
 msgid "create"
 msgstr "�ъздаден"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
 msgid "delete"
 msgstr "изтрит"
 
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
 msgid "up to date"
 msgstr "актуален"
 
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
 msgid "fast-forwardable"
 msgstr "може да �е превърти"
 
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
 msgid "local out of date"
 msgstr "локални�т е изо�танал"
 
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s принудително изтла�ква към %-*s (%s)"
 
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s изтла�ква към %-*s (%s)"
 
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s принудително изтла�ква към %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s изтла�ква към %s"
 
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
 msgid "do not query remotes"
 msgstr "без за�вки към отдалечените хранилища"
 
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
 msgstr "� отдалечено хранилище „%s“"
 
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  �дре� за до�тав�не: %s"
 
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
 msgid "(no URL)"
 msgstr "(без адре�)"
 
@@ -21432,25 +21616,25 @@ msgstr "(без адре�)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  �дре� за изтла�кване: %s"
 
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  клон �очен от HEAD: %s"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
 msgid "(not queried)"
 msgstr "(без проверка)"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
 msgid "(unknown)"
 msgstr "(непознат)"
 
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -21459,161 +21643,165 @@ msgstr ""
 "хранилище\n"
 "  не е еднозначен и е н�кой от �ледните):\n"
 
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Отдалечен клон:%s"
 msgstr[1] "  Отдалечени клони:%s"
 
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
 msgid " (status not queried)"
 msgstr " (�ъ�то�нието не бе проверено)"
 
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Локален клон на�троен за издърпване чрез „git pull“:"
 msgstr[1] "  Локални клони на�троени за издърпване чрез „git pull“:"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Локалните указатели ще бъдат прене�ени чрез „ push“"
 
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Локални�т указател, на�троен за „git push“%s:"
 msgstr[1] "  Локалните указатели, на�троени за „git push“%s:"
 
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "задаване на refs/remotes/ИМЕ/HEAD �поред отдалеченото хранилище"
 
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "изтриване на refs/remotes/ИМЕ/HEAD"
 
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
 msgid "Cannot determine remote HEAD"
 msgstr "�е може да �е у�танови отдалечени�т връх"
 
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Множе�тво клони � върхове.  Изберете изрично н�кой от т�х чрез командата:"
 
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
 #, c-format
 msgid "Could not delete %s"
 msgstr "„%s“ не може да бъде изтрит"
 
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "�еправилен указател: %s"
 
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
 #, c-format
 msgid "Could not setup %s"
 msgstr "„%s“ не може да �е на�трои"
 
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
 #, c-format
 msgid " %s will become dangling!"
 msgstr "„%s“ ще �е превърне в обект извън клоните!"
 
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
 #, c-format
 msgid " %s has become dangling!"
 msgstr "„%s“ �е превърна в обект извън клоните!"
 
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
 #, c-format
 msgid "Pruning %s"
 msgstr "Ока�тр�не на „%s“"
 
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
 #, c-format
 msgid "URL: %s"
 msgstr "адре�: %s"
 
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
 #, c-format
 msgid " * [would prune] %s"
 msgstr " � [ще бъде ока�трено] %s"
 
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
 #, c-format
 msgid " * [pruned] %s"
 msgstr " � [ока�трено] %s"
 
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
 msgid "prune remotes after fetching"
 msgstr "ока�тр�не на огледалата на отдалечените хранилища �лед до�тав�не"
 
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
 #, c-format
 msgid "No such remote '%s'"
 msgstr "��ма отдалечено хранилище на име „%s“"
 
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
 msgid "add branch"
 msgstr "добав�не на клон"
 
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
 msgid "no remote specified"
 msgstr "не е указано отдалечено хранилище"
 
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
 msgid "query push URLs rather than fetch URLs"
 msgstr "запитване към адре�ите за изтла�кване, а не за до�тав�не"
 
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
 msgid "return all URLs"
 msgstr "извеждане на в�ички адре�и"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "не е зададен адре� за отдалеченото хранилище „%s“"
 
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
 msgid "manipulate push URLs"
 msgstr "пром�на на адре�ите за изтла�кване"
 
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
 msgid "add URL"
 msgstr "добав�не на адре�и"
 
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
 msgid "delete URLs"
 msgstr "изтриване на адре�и"
 
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
 msgid "--add --delete doesn't make sense"
 msgstr "опциите „--add“ и „--delete“ �а не�ъвме�тими"
 
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "�еправилен (�тар) формат за адре�: %s"
 
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Такъв адре� не е открит: %s"
 
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
 msgid "Will not delete all non-push URLs"
 msgstr "�икой от адре�ите, които не �а за изтла�кване, н�ма да �е изтрие"
 
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "повече подробно�ти.  По�тав� �е пред подкоманда"
+
+#: builtin/repack.c:28
 msgid "git repack [<options>]"
 msgstr "git repack [ОПЦИЯ…]"
 
-#: builtin/repack.c:31
+#: builtin/repack.c:33
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -21622,154 +21810,159 @@ msgstr ""
 "Ползвайте опци�та --no-write-bitmap-index или изключете на�тройката\n"
 "„pack.writebitmaps“."
 
-#: builtin/repack.c:198
+#: builtin/repack.c:201
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 "командата „pack-objects“ не може да �е �тартира за препакетирането на "
 "гарантиращите обекти"
 
-#: builtin/repack.c:270 builtin/repack.c:630
+#: 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:294
+#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "командата „pack-objects“ не може да завърши за препакетирането на "
 "гарантиращите обекти"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "грешка при отвар�не на индек�а за „%s“"
 
-#: builtin/repack.c:368
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr "пакет „%s“ е твърде гол�м, за да е ча�т от геометрична прогре�и�"
 
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: 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:460
+#: builtin/repack.c:498
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "временни�т файл „%s“ не може да бъде отворен за запи�"
+
+#: builtin/repack.c:516
+msgid "could not close refs snapshot tempfile"
+msgstr "временни�т файл �ъ� �нимка на указателите не може да �е затвори"
+
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "пакетиране на в�ичко в пакет"
 
-#: builtin/repack.c:462
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 "�ъщото като опци�та „-a“.  Допълнително — недо�тижимите обекти да �танат "
 "непакетирани"
 
-#: builtin/repack.c:465
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 "премахване на ненужните пакетирани файлове и изпълнение на командата „git-"
 "prune-packed“"
 
-#: builtin/repack.c:467
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "подаване на опци�та „--no-reuse-delta“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:469
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 "подаване на опци�та „--no-reuse-object“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:471
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "без изпълнение на командата „git-update-server-info“"
 
-#: builtin/repack.c:474
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "подаване на опци�та „--local“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:476
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "�ъздаване и запи�ване на индек�и на база битови ма�ки"
 
-#: builtin/repack.c:478
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "подаване на опци�та „--delta-islands“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:479
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "еври�тична дата"
 
-#: builtin/repack.c:480
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 "при комбинирането � опци�та „-A“ — без разпакетиране на обектите по �тари от "
 "това"
 
-#: builtin/repack.c:482
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "� „-a“ — препакетиране на недо�тижимите обекти"
 
-#: builtin/repack.c:484
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr "размер на прозореца за делта компре�и�та"
 
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "байтове"
 
-#: builtin/repack.c:486
+#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "�ъщото като горната опци�, но ограничението да е по размер на паметта, а не "
 "по бро� на обектите"
 
-#: builtin/repack.c:488
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "ограничаване на мак�ималната дълбочина на делтата"
 
-#: builtin/repack.c:490
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "ограничаване на мак�имални� брой нишки"
 
-#: builtin/repack.c:492
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "мак�имален размер на в�еки пакет"
 
-#: builtin/repack.c:494
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr "препакетиране на обектите в пакети бел�зани � „.keep“"
 
-#: builtin/repack.c:496
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "без препакетиране на този пакет"
 
-#: builtin/repack.c:498
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "откриване на геометрична прогре�и� � ча�тно <N>"
 
-#: builtin/repack.c:508
+#: builtin/repack.c:670
+msgid "write a multi-pack index of the resulting packs"
+msgstr "запазване на многопакетен индек� за �ъздадените пакети"
+
+#: builtin/repack.c:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "пакетите в хранилище � важни обекти не може да �е три�т"
 
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "опциите „--keep-unreachable“ и „-A“ �а не�ъвме�тими"
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr "опциите „--geometric“ и „-A“/„-a“ �а не�ъвме�тими"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "�ищо ново за пакетиране"
 
-#: builtin/repack.c:669
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "лип�ва задължителни� файл „%s“"
 
-#: builtin/repack.c:671
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "неу�пешно изтриване на „%s“"
@@ -21852,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 "
@@ -21921,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"
@@ -21954,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“ приема точно един шаблон"
 
@@ -22026,150 +22213,140 @@ msgstr "опци�та „-l“ приема точно един шаблон"
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget ПЪТ… | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "реги�триране на чи�ти корекции на конфликти в индек�а"
 
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "командата „git rerere forget“ изи�ква указването на път"
 
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
 #, c-format
 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:83
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Указател�т „HEAD“ е повреден."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Дървото, �очено от указател� „HEAD“, не може да бъде открито."
 
-#: builtin/reset.c:91
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Дървото, �очено от „%s“, не може да бъде открито."
 
-#: builtin/reset.c:116
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "Указател�т „HEAD“ �очи към „%s“"
 
-#: builtin/reset.c:195
+#: builtin/reset.c:299
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "�е може да �е извърши %s занул�ване по време на �ливане."
 
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: 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:297
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "индек�а и указател� „HEAD“, без работното дърво"
 
-#: builtin/reset.c:298
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "�амо указател� „HEAD“, без индек�а и работното дърво"
 
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr "указател� „HEAD“, индек�а и работното дърво"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "занул�ване на указател� „HEAD“, но запазване на локалните промени"
 
-#: builtin/reset.c:310
+#: builtin/reset.c:411
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "отбел�зване �амо на факта, че изтритите пътища ще бъдат добавени по-къ�но"
 
-#: builtin/reset.c:344
+#: builtin/reset.c:445
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Стойно�тта „%s“ не е разпозната като �ъще�твуваща вер�и�."
 
-#: builtin/reset.c:352
+#: builtin/reset.c:453
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "„%s“ не е разпознат като дърво."
 
-#: builtin/reset.c:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr ""
-"опци�та „--patch“ е не�ъвме�тима � в��ка от опциите „--hard“/„--mixed“/„--"
-"soft“"
-
-#: builtin/reset.c:371
+#: builtin/reset.c:472
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "опци�та „--mixed“ не бива да �е използва заедно � пътища.  Вме�то това "
 "изпълнете „git reset -- ПЪТ…“."
 
-#: builtin/reset.c:373
+#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "�е може да извършите %s занул�ване, когато �те задали ПЪТ."
 
-#: builtin/reset.c:388
+#: builtin/reset.c:489
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "В голо хранилище не може да извършите %s занул�ване"
 
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr "опци�та „-N“ изи�ква опци�та „--mixed“"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "Промени извън индек�а �лед занул�ването:"
 
-#: builtin/reset.c:416
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -22182,30 +22359,27 @@ msgstr ""
 "Опци�та „--quiet“ заглушава това �ъобщение еднократно.  За по�то�нно\n"
 "заглушаване задайте на�тройката „reset.quiet“ да е „true“ (и�тина).\n"
 
-#: builtin/reset.c:434
+#: builtin/reset.c:541
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Индек�ът не може да бъде занулен към вер�и� „%s“."
 
-#: builtin/reset.c:439
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "�ови�т индек� не може да бъде запи�ан."
 
-#: builtin/rev-list.c:538
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "опциите „--exclude-promisor-objects“ и „--missing“ и �а не�ъвме�тими"
-
-#: builtin/rev-list.c:599
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "филтрирането на обекти изи�ква опци�та „--objects“"
 
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr "командата „rev-list“ не поддържа извеждането на бележки"
 
-#: builtin/rev-list.c:664
-msgid "marked counting is incompatible with --objects"
-msgstr "опци�та „--objects“ е не�ъвме�тима � избро�ването"
+#: builtin/rev-list.c:679
+#, 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>...]"
@@ -22223,6 +22397,18 @@ msgstr "Ñ�пиране на анализа Ñ�лед първиÑ� аргуменÑ
 msgid "output in stuck long form"
 msgstr "изход в дълги� формат"
 
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "неочакван край на входа"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr "лип�ва низ преди разделител� „--“"
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "Изи�ква точно една вер�и�"
+
 #: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -22238,6 +22424,50 @@ msgstr ""
 "За повече информаци� за първи� вариант изпълнете „git rev-parse --parseopt -"
 "h“"
 
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "опци�та „--resolve-git-dir“ изи�ква аргумент"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "„%s“ не е директори� „gitdir“"
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "опци�та „--git-path“ изи�ква аргумент"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "опци�та „-n“ изи�ква аргумент"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "опци�та „--path-format“ изи�ква аргумент"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "неправилен аргумент за „--path-format“: „%s“"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "опци�та „--default“ изи�ква аргумент"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "опци�та „--prefix“ изи�ква аргумент"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "непознат режим за „--abbrev-ref“: „%s“"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "непознат режим за „--show-object-format“: „%s“"
+
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [ОПЦИЯ…] УК�З�ТЕЛ_КЪМ_ПОД�В��Е…"
@@ -22312,15 +22542,19 @@ msgstr "добав�не на името на подаването"
 msgid "preserve initially empty commits"
 msgstr "запазване на първоначално празните подавани�"
 
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "позвол�ване на празни �ъобщени� при подаване"
+
 #: builtin/revert.c:129
 msgid "keep redundant, empty commits"
 msgstr "запазване на излишните, празни подавани�"
 
-#: builtin/revert.c:237
+#: builtin/revert.c:241
 msgid "revert failed"
 msgstr "неу�пешна отм�на"
 
-#: builtin/revert.c:250
+#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "неу�пешно отбиране"
 
@@ -22373,72 +22607,73 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "�ледни�т файл е � променено �ъдържание"
 msgstr[1] "�ледните файлове �а � променено �ъдържание"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "да не �е извеждат изтритите файлове"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "изтриване �амо от индек�а"
 
-#: builtin/rm.c:246
+#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "въпреки проверката за актуално�тта на �ъдържанието"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "рекур�ивно изтриване"
 
-#: builtin/rm.c:249
+#: builtin/rm.c:250
 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 "изходни�т код да е 0, дори ако никой файл нe e напа�нал � шаблона за "
 "изтриване"
 
-#: builtin/rm.c:283
+#: builtin/rm.c:285
 msgid "No pathspec was given. Which files should I remove?"
 msgstr "�е �а зададени пътища.  Кои файлове да �е изтри�т?"
 
-#: builtin/rm.c:310
+#: builtin/rm.c:315
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "за да продължите, или вкарайте промените по файла „.gitmodules“ в индек�а,\n"
 "или ги �катайте"
 
-#: builtin/rm.c:331
+#: builtin/rm.c:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "без използването на опци�та „-r“ „%s“ н�ма да �е изтрие рекур�ивно"
 
-#: builtin/rm.c:379
+#: builtin/rm.c:385
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: „%s“ не може да �е изтрие"
 
 #: builtin/send-pack.c:20
 msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-"  --all and explicit <ref> specification are mutually exclusive."
+"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=П�КЕТ] [--verbose] [--thin] [--atomic] [ХОСТ:]ДИРЕКТОРИЯ [УК�З�ТЕЛ…]\n"
-"  опци�та „--all“ и изричното по�очване на УК�З�ТЕЛ �а взаимно не�ъвме�тими."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=П�КЕТ]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [ХОСТ:]ДИРЕКТОРИЯ (--all | УК�З�ТЕЛ…])"
 
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "име на отдалечено хранилище"
 
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "използване на протокол без запазване на �ъ�то�нието за RPC"
 
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "четене на указателите от �тандартни� вход"
 
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "извеждане на �ъ�то�нието от отдалечената помощна функци�"
 
@@ -22495,21 +22730,21 @@ msgstr "поле"
 msgid "group by field"
 msgstr "групиране по поле"
 
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
 msgid "too many arguments given outside repository"
 msgstr "прекалено много аргументи извън хранилище"
 
 #: builtin/show-branch.c:13
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"    [--current] [--color[=КОГ�] | --no-color] [--sparse]\n"
-"    [--more=БРОЙ | --list | --independent | --merge-base]\n"
-"    [--no-name | --sha1-name] [--topics] [(РЕВИЗИЯ | УК�З�ТЕЛ)…]"
+"                [--current] [--color[=КОГ�] | --no-color] [--sparse]\n"
+"                [--more=БРОЙ | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(РЕВИЗИЯ | УК�З�ТЕЛ)…]"
 
 #: builtin/show-branch.c:17
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -22522,117 +22757,110 @@ msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "„%s“ �е пре�кача — не може да �е обработ�т повече от %d указател"
 msgstr[1] "„%s“ �е пре�кача — не може да �е обработ�т повече от %d указатели"
 
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
 #, c-format
 msgid "no matching refs with %s"
 msgstr "никой указател не �ъвпада � „%s“"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
 msgid "show remote-tracking and local branches"
 msgstr "извеждане на �лед�щите и локалните клони"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
 msgid "show remote-tracking branches"
 msgstr "извеждане на �лед�щите клони"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
 msgid "color '*!+-' corresponding to the branch"
 msgstr "оцвет�ване на „*!+-“ �поред клоните"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
 msgid "show <n> more commits after the common ancestor"
 msgstr "извеждане на такъв БРОЙ подавани� от общи� предше�твеник"
 
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
 msgid "synonym to more=-1"
 msgstr "п�евдоним на „more=-1“"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
 msgid "suppress naming strings"
 msgstr "без низове за имената на клоните"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
 msgid "include the current branch"
 msgstr "включване и на текущи� клон"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
 msgid "name commits with their object names"
 msgstr "именуване на подавани�та � имената им на обекти"
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
 msgid "show possible merge bases"
 msgstr "извеждане на възможните бази за �ливани�"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
 msgid "show refs unreachable from any other ref"
 msgstr "извеждане на недо�тижимите указатели"
 
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
 msgid "show commits in topological order"
 msgstr "извеждане на подавани�та в топологиче�ка подредба"
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
 msgid "show only commits not on the first branch"
 msgstr "извеждане �амо на подавани�та, които не �а от първи� клон"
 
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
 msgid "show merges reachable from only one tip"
 msgstr "извеждане на �ливани�та, които може да �е до�тигнат �амо от един връх"
 
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
 msgid "topologically sort, maintaining date order where possible"
 msgstr ""
 "топологиче�ка подредба, при запазване на подредбата по дата, доколкото е\n"
 "възможно"
 
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
 msgid "<n>[,<base>]"
 msgstr "БРОЙ[,Б�З�]"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "показване на най-много БРОЙ журнални запи�а � начало �ъответната Б�З�"
 
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"опци�та „--reflog“ е не�ъвме�тима � опциите  „--all“, „--remotes“, „--"
-"independent“ и „--merge-base“"
-
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "не е зададен клон, а указател�т „HEAD“ е неправилен"
 
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
 msgid "--reflog option needs one branch name"
-msgstr "опци�та „--track“ изи�ква точно едно име на клон"
+msgstr "опци�та „--reflog“ изи�ква точно едно име на клон"
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "�амо %d запи� може да бъде показан наведнъж."
 msgstr[1] "�амо %d запи�а може да бъде показани наведнъж."
 
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
 #, c-format
 msgid "no such ref %s"
 msgstr "такъв указател н�ма: %s"
 
-#: builtin/show-branch.c:831
+#: 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:835
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "„%s“ е неправилен указател."
 
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "подаването „%s“ (%s) лип�ва"
@@ -22701,77 +22929,120 @@ 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:227
+#: builtin/sparse-checkout.c:176
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"директори�та „%s“ �ъдържа не�ледени файлове, но не е в пътищата на "
+"пътеводното напа�ване на ча�тичното изтегл�не"
+
+#: builtin/sparse-checkout.c:184
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "директори�та „%s“ не може да бъде изтрита"
+
+#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
 msgstr "директори�та за ча�тично изтегл�не „%s“ не може да бъде �ъздадена"
 
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr ""
 "на�тройката „worktreeConfig“ не може да �е включи, защото форматът на "
 "хранилището не може да �е обнови"
 
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "неу�пешно задаване на на�тройката „extensions.worktreeConfig“"
 
-#: builtin/sparse-checkout.c:290
+#: 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:310
+#: 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:312
+#: 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:340
-msgid "failed to modify sparse-index config"
-msgstr "на�тройките на ча�тични� индек� не може да �е промен�т"
-
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "„%s“ не може да �е отвори"
 
-#: builtin/sparse-checkout.c:419
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr "път�т „%s“  не може да �е нормализира"
 
-#: builtin/sparse-checkout.c:431
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | Ш�БЛО�…)"
-
-#: builtin/sparse-checkout.c:456
+#: builtin/sparse-checkout.c:557
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "цитирането на низ, форматиран за C — „%s“ не може да бъде изчи�тено"
 
-#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "шаблоните за ча�тично изтегл�не не може да �е заред�т"
 
-#: builtin/sparse-checkout.c:579
+#: 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:594
-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 | "
+"Ш�БЛО�…)"
+
+#: 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:613
+#: 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:644
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "грешка при обнов�ване на работната директори�"
 
@@ -22795,28 +23066,28 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [СК�Т��О]"
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch КЛО� [СК�Т��О]"
 
-#: builtin/stash.c:29 builtin/stash.c:70
-msgid "git stash clear"
-msgstr "git stash clear"
-
 #: 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 builtin/stash.c:87
+#: 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
@@ -22841,6 +23112,14 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message СЪОБЩЕ�ИЕ]\n"
 "          [--] [ПЪТ…]]"
 
+#: builtin/stash.c:87
+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] [СЪОБЩЕ�ИЕ]]"
+
 #: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
@@ -22864,7 +23143,7 @@ msgstr "„%s“ е неправилно име за указател"
 msgid "git stash clear with arguments is unimplemented"
 msgstr "командата „git stash clear“ не поддържа аргументи"
 
-#: builtin/stash.c:431
+#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -22875,168 +23154,186 @@ msgstr ""
 "            „%s“ на „%s“\n"
 "         за да �е направи м��то.\n"
 
-#: builtin/stash.c:492
+#: builtin/stash.c:508
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "по време на �ливане не може да приложите нещо �катано"
 
-#: builtin/stash.c:503
+#: builtin/stash.c:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "файлът � разликите „%s^!“ не може да �е генерира"
 
-#: builtin/stash.c:510
+#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr ""
 "в индек�а има конфликти.  Пробвайте да изпълните командата без опци�та „--"
 "index“."
 
-#: builtin/stash.c:516
+#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "дървото �очено от индек�а не може да бъде запазено"
 
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "не�ледени файлове не може да �е въз�танов�т от �катаното"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Сливане на „%s“ � „%s“"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "Индек�ът не е изваден от �катаното."
 
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "не�ледени файлове не може да �е въз�танов�т от �катаното"
+
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "опит за повторно �ъздаване на индек�а"
 
-#: builtin/stash.c:635
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Изтрито: „%s“ (%s)"
 
-#: builtin/stash.c:638
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "Скатаното „%s“ не може да бъде изтрито"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "„%s“ не е указател към нещо �катано"
 
-#: builtin/stash.c:701
+#: builtin/stash.c:718
 msgid "The stash entry is kept in case you need it again."
 msgstr "Скатаното е запазено в �лучай, че ви потр�бва отново."
 
-#: builtin/stash.c:724
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "�е е указано име на клон"
 
-#: builtin/stash.c:808
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "дървото не може да бъде анализирано"
 
-#: builtin/stash.c:819
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "дървото не може да бъде разпакетирано"
 
-#: builtin/stash.c:839
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "�катаване и на не�ледените файлове"
 
-#: builtin/stash.c:842
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "извеждане �амо на не�ледените файлове в �катаното"
 
-#: builtin/stash.c:932 builtin/stash.c:969
+#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Указател�т „%s“ не може да бъде обновен да �очи към „%s“"
 
-#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "�ъобщение при �катаване"
 
-#: builtin/stash.c:960
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "командата „git stash store“ изи�ква точно един аргумент-ПОД�В��Е"
 
-#: builtin/stash.c:1175
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "��ма промени в индек�а"
+
+#: builtin/stash.c:1220
 msgid "No changes selected"
 msgstr "�е �а избрани никакви промени"
 
-#: builtin/stash.c:1275
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "В�е още лип�ва първоначално подаване"
 
-#: builtin/stash.c:1302
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "Съ�то�нието на текущи� индек� не може да бъде запазено"
 
-#: builtin/stash.c:1311
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "�е�ледените файлове не може да �е запаз�т"
 
-#: builtin/stash.c:1322 builtin/stash.c:1331
+#: builtin/stash.c:1367 builtin/stash.c:1386
 msgid "Cannot save the current worktree state"
 msgstr "Съ�то�нието на работното дърво не може да бъде запазено"
 
-#: builtin/stash.c:1359
+#: 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:1408
+#: 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:1426
+#: 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:1441
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "��ма никакви локални промени за �катаване"
 
-#: builtin/stash.c:1448
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "Скатаването не може да �тартира"
 
-#: builtin/stash.c:1463
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "Текущото �ъ�то�ние не може да бъде запазено"
 
-#: builtin/stash.c:1468
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Съ�то�нието на работната директори� и индек�а e запазено: „%s“"
 
-#: builtin/stash.c:1558
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "Промените в работното дърво не може да бъдат занулени"
 
-#: builtin/stash.c:1597 builtin/stash.c:1662
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "запазване на индек�а"
 
-#: builtin/stash.c:1599 builtin/stash.c:1664
+#: 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:1600 builtin/stash.c:1665
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "без извеждане на информаци�"
 
-#: builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "�катаване и на не�ледените файлове"
 
-#: builtin/stash.c:1604 builtin/stash.c:1669
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "�катаване и на игнорираните файлове"
 
-#: builtin/stash.c:1704
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -23060,131 +23357,131 @@ msgstr "пропу�кане на в�ички редове, които запо
 msgid "prepend comment character and space to each line"
 msgstr "добав�не на „# “ в началото на в�еки ред"
 
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Очаква �е пълно име на указател, а не „%s“"
 
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr ""
 "командата „print-default-remote“ на „submodule--helper“ не приема аргументи"
 
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "не може да �е махне компонент от адре�а „%s“"
 
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"на�тройката „%s“ лип�ва.  Приема �е, че това хранилище е правилни�т източник "
+"за �ебе �и."
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr "директори� за определ�нето на отно�ителните пътища"
 
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:410
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Във файла „.gitmodules“ не е открит адре� за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:520
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Влизане в „%s“\n"
 
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
 "."
 msgstr ""
-"изпълнената команда завърши � ненулев изход за „%s“\n"
+"изпълнената команда (run_command) завърши � ненулев изход за „%s“\n"
 "."
 
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:545
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
 "submodules of %s\n"
 "."
 msgstr ""
-"изпълнената команда завърши � ненулев изход при обхождане на подмодулите, "
-"вложени в „%s“\n"
+"изпълнената команда (run_command) завърши � ненулев изход при обхождане на "
+"подмодулите, вложени в „%s“\n"
 "."
 
-#: builtin/submodule--helper.c:566
+#: builtin/submodule--helper.c:561
 msgid "suppress output of entering each submodule command"
 msgstr "без извеждане на изход при въвеждането на в��ка команда за подмодули"
 
-#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
-#: builtin/submodule--helper.c:1488
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
 msgid "recurse into nested submodules"
 msgstr "рекур�ивно обхождане на подмодулите"
 
-#: builtin/submodule--helper.c:573
+#: builtin/submodule--helper.c:568
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] КОМ��Д�"
 
-#: builtin/submodule--helper.c:600
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"на�тройката „%s“ лип�ва.  Приема �е, че това хранилище е правилни�т източник "
-"за �ебе �и."
-
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:642
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "�еу�пешно реги�триране на адре� за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:646
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Реги�триран е подмодул „%s“ (%s) за път� към подмодул „%s“\n"
 
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:656
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: препоръчва �е режим на обнов�ване за подмодула „%s“\n"
 
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:663
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "�еу�пешно реги�триране на режима на обнов�ване за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:710
+#: builtin/submodule--helper.c:685
 msgid "suppress output for initializing a submodule"
 msgstr "без извеждане на информаци� при инициализирането на подмодул"
 
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [ОПЦИЯ…] [ПЪТ]"
 
-#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "Във файла „.gitmodules“ лип�ва информаци� за път� „%s“"
 
-#: builtin/submodule--helper.c:836
+#: builtin/submodule--helper.c:811
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "указател�т �очен от „HEAD“ в подмодула „%s“ не може да бъде открит"
 
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "неу�пешно рекур�ивно обхождане на подмодула „%s“"
 
-#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "без изход за �ъ�то�нието на подмодула"
 
-#: builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:863
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -23192,109 +23489,106 @@ msgstr ""
 "използване на подаването указано в индек�а, а не това от указател� „HEAD“ на "
 "подмодула"
 
-#: builtin/submodule--helper.c:894
+#: builtin/submodule--helper.c:869
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:918
+#: builtin/submodule--helper.c:893
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name ПЪТ"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:965
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "� %s %s(обект-BLOB)→%s(подмодул)"
 
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:968
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "� %s %s(подмодул)→%s(обект-BLOB)"
 
-#: builtin/submodule--helper.c:1006
+#: builtin/submodule--helper.c:981
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1056
+#: builtin/submodule--helper.c:1031
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "неу�пешно изчи�л�ване на контролната �ума на обект от „%s“"
 
-#: builtin/submodule--helper.c:1060
+#: builtin/submodule--helper.c:1035
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "неочакван режим „%o“\n"
 
-#: builtin/submodule--helper.c:1301
+#: builtin/submodule--helper.c:1276
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr ""
 "използване на подаването указано в индек�а, а не това от указател� „HEAD“ на "
 "подмодула"
 
-#: builtin/submodule--helper.c:1303
-msgid "to compare the commit in the index with that in the submodule HEAD"
+#: builtin/submodule--helper.c:1278
+msgid "compare the commit in the index with that in the submodule HEAD"
 msgstr ""
-"за �равнение на подаването указано в индек�а � това от указател� „HEAD“ на "
+"�равнение на подаването указано в индек�а � това от указател� „HEAD“ на "
 "подмодула"
 
-#: builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1280
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr "пре�качане на подмодули, чи�то на�тройка „ignore_config“ е „all“"
 
-#: builtin/submodule--helper.c:1307
+#: builtin/submodule--helper.c:1282
 msgid "limit the summary size"
 msgstr "ограничаване на размера на обобщението"
 
-#: builtin/submodule--helper.c:1312
+#: builtin/submodule--helper.c:1287
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
-msgstr "git submodule--helper summary [ОПЦИЯ…] [ПОД�В��Е] -- [ПЪТ]"
+msgstr "git submodule--helper summary [ОПЦИЯ…] [ПОД�В��Е] [--] [ПЪТ]"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1311
 msgid "could not fetch a revision for HEAD"
 msgstr "не може да �е до�тави вер�и� за „HEAD“"
 
-#: builtin/submodule--helper.c:1341
-msgid "--cached and --files are mutually exclusive"
-msgstr "опциите „--cached“ и „--files“ �а не�ъвме�тими"
-
-#: builtin/submodule--helper.c:1408
+#: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Синхронизиране на адре�а на подмодул за „%s“\n"
 
-#: builtin/submodule--helper.c:1414
+#: builtin/submodule--helper.c:1379
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "неу�пешно реги�триране на адре� за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c:1393
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "отдалечени�т адре� на подмодула „%s“ не може да бъде получен"
 
-#: builtin/submodule--helper.c:1439
+#: builtin/submodule--helper.c:1404
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "отдалечени�т адре� на подмодула „%s“ не може да бъде променен"
 
-#: builtin/submodule--helper.c:1486
+#: builtin/submodule--helper.c:1451
 msgid "suppress output of synchronizing submodule url"
 msgstr "без извеждане на информаци� при �инхронизирането на подмодул"
 
-#: builtin/submodule--helper.c:1493
+#: builtin/submodule--helper.c:1458
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [ПЪТ]"
 
-#: builtin/submodule--helper.c:1547
+#: 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:1559
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23303,47 +23597,47 @@ msgstr ""
 "Работното дърво на подмодул „%s“ �ъдържа локални промени.  Може да ги "
 "отхвърлите � опци�та „-f“"
 
-#: builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Директори�та „%s“ е изчи�тена\n"
 
-#: builtin/submodule--helper.c:1569
+#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr ""
 "Директори�та към работното дърво на подмодула „%s“ не може да бъде изтрита\n"
 
-#: builtin/submodule--helper.c:1580
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "празната директори� за подмодула „%s“ не може да бъде �ъздадена"
 
-#: builtin/submodule--helper.c:1596
+#: 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:1625
+#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr ""
 "изтриване на работните дървета на подмодулите, дори когато те �ъдържат "
 "локални промени"
 
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "премахване на реги�трациите на в�ички подмодули"
 
-#: builtin/submodule--helper.c:1631
+#: 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:1645
+#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Използвайте „--all“, за да премахнете в�ички подмодули"
 
-#: builtin/submodule--helper.c:1714
+#: 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"
@@ -23355,47 +23649,70 @@ msgstr ""
 "задайте на�тройката „submodule.alternateErrorStrategy“ да е „info“ или\n"
 "при клониране ползвайте опци�та „--reference-if-able“ вме�то „--reference“."
 
-#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756
+#: 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:1792
+#: builtin/submodule--helper.c:1740
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 "�епозната �тойно�т „%s“ за на�тройката „submodule.alternateErrorStrategy“"
 
-#: builtin/submodule--helper.c:1799
+#: builtin/submodule--helper.c:1747
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "�епозната �тойно�т „%s“ за на�тройката „submodule.alternateLocation“"
 
-#: builtin/submodule--helper.c:1823
+#: 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:1813
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "�еу�пешно клониране на адре�а „%s“ в път� „%s“ като подмодул"
+
+#: builtin/submodule--helper.c:1818
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "директори�та не е празна: „%s“"
+
+#: builtin/submodule--helper.c:1830
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "директори�та на подмодула „%s“ не може да бъде получена"
+
+#: builtin/submodule--helper.c:1862
 msgid "where the new submodule will be cloned to"
 msgstr "къде да �е клонира нови�т подмодул"
 
-#: builtin/submodule--helper.c:1826
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "име на нови� подмодул"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr "адре�, от който да �е клонира нови�т подмодул"
 
-#: builtin/submodule--helper.c:1837
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "дълбочина на плитките хранилища"
 
-#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr "извеждане на напредъка на клонирането"
 
-#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr "предотврат�ване на клониране в непразна и�тори�"
 
-#: builtin/submodule--helper.c:1849
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -23404,108 +23721,185 @@ msgstr ""
 "git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХР��ИЛИЩЕ] "
 "[--name ИМЕ] [--depth ДЪЛБОЧИ��] [--single-branch] --url �ДРЕС --path ПЪТ"
 
-#: builtin/submodule--helper.c:1874
-#, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr ""
-"„%s“ не може нито да �е �ъздаде, нито да �е ползва в директори�та на git на "
-"друг подмодул"
-
-#: builtin/submodule--helper.c:1885
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "�еу�пешно клониране на адре�а „%s“ в път� „%s“ като подмодул"
-
-#: builtin/submodule--helper.c:1889
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "директори�та не е празна: „%s“"
-
-#: builtin/submodule--helper.c:1901
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "директори�та на подмодула „%s“ не може да бъде получена"
-
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:1925
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "�еправилен режим на обнов�ване „%s“ за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:1941
+#: builtin/submodule--helper.c:1929
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "�а�троен е неправилен режим на обнов�ване „%s“ за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:2042
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Път�т на подмодула „%s“ не е инициализиран"
 
-#: builtin/submodule--helper.c:2046
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Веро�тно и�кахте да използвате „update --init“?"
 
-#: builtin/submodule--helper.c:2076
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Пре�качане на не�лети� подмодул „%s“"
 
-#: builtin/submodule--helper.c:2105
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Пре�качане на подмодула „%s“"
 
-#: builtin/submodule--helper.c:2255
+#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "�еу�пешен опит за клониране на „%s“.  �а�рочен е втори опит"
 
-#: builtin/submodule--helper.c:2266
+#: builtin/submodule--helper.c:2268
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 "Втори неу�пешен опит за клониране на „%s“.  Дей�твието �е преу�танов�ва"
 
-#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2373
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "�еу�пешно изтегл�не на вер�и� „%s“ в път� към подмодул „%s“'"
+
+#: builtin/submodule--helper.c:2377
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "�еу�пешно пребазиране на вер�и� „%s“ в път� към подмодул „%s“"
+
+#: builtin/submodule--helper.c:2381
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "�еу�пешно �ливане на вер�и� „%s“ в път� към подмодул „%s“"
+
+#: 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:2409
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Път към подмодул „%s“: изтеглена е вер�и� „%s“\n"
+
+#: builtin/submodule--helper.c:2413
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Път към подмодул „%s“: пребазиран към „%s“\n"
+
+#: builtin/submodule--helper.c:2417
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Път към подмодул „%s“: �л�т в „%s“\n"
+
+#: builtin/submodule--helper.c:2421
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Път�т на подмодула „%s“: „%s %s“\n"
+
+#: 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:2454
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Подмодулът в път� „%s“ е до�тавен, но не �ъдържа обекта �ъ� �ума\n"
+"„%s“.  Директното до�тав�не на това подаване е неу�пешно."
+
+#: 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:2331
+#: 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:2335
+#: 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:2341
+#: builtin/submodule--helper.c:2518
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr "извършване на плитко клониране, отр�зано до указани� брой вер�ии"
 
-#: builtin/submodule--helper.c:2344
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "брой паралелни проце�и"
 
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2523
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "дали първоначалното клониране да е плитко, както �е препоръчва"
 
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "без извеждане на напредъка на клонирането"
 
-#: builtin/submodule--helper.c:2358
+#: 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:2371
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "неправилен параметър към опци�та „--update“"
 
-#: builtin/submodule--helper.c:2419
+#: builtin/submodule--helper.c:2566
+msgid "suppress output for update by rebase or merge"
+msgstr ""
+"без извеждане на информаци� при обнов�ване чрез пребазиране или �ливане"
+
+#: builtin/submodule--helper.c:2567
+msgid "force checkout updates"
+msgstr "принудително изтегл�не на обновлени�та"
+
+#: builtin/submodule--helper.c:2569
+msgid "don't fetch new objects from the remote site"
+msgstr "без до�тав�не на новите обекти от отдалеченото хранилище"
+
+#: builtin/submodule--helper.c:2571
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr ""
+"различен режим на обнов�ване, когато хранилището е чи�то ново изтеглено"
+
+#: builtin/submodule--helper.c:2572
+msgid "depth for shallow fetch"
+msgstr "дълбочина на плиткото до�тав�не"
+
+#: builtin/submodule--helper.c:2582
+msgid "sha1"
+msgstr "�ума по SHA1"
+
+#: builtin/submodule--helper.c:2583
+msgid "SHA1 expected by superproject"
+msgstr "�умата по SHA1, очаквана от обхващащи� модул"
+
+#: builtin/submodule--helper.c:2585
+msgid "subsha1"
+msgstr "�умата по SHA1 на подмодула"
+
+#: builtin/submodule--helper.c:2586
+msgid "SHA1 of submodule's HEAD"
+msgstr "�умата по SHA1 за указател� HEAD на подмодула"
+
+#: 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:2663
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23514,83 +23908,188 @@ msgstr ""
 "Клонът на подмодула „%s“ е на�троен да на�лед�ва клона от обхващащи� проект, "
 "но той не е на никой клон"
 
-#: builtin/submodule--helper.c:2542
+#: builtin/submodule--helper.c:2781
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "не може да �е получи връзка към хранилище за подмодула „%s“"
 
-#: builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "рекур�ивно обхождане подмодулите"
 
-#: builtin/submodule--helper.c:2581
+#: 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:2637
+#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "проверка дали пи�ането във файла „.gitmodules“ е безопа�но"
 
-#: builtin/submodule--helper.c:2640
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr "изтриване на на�тройка във файла „.gitmodules“"
 
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config ИМЕ [СТОЙ�ОСТ]"
 
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset ИМЕ"
 
-#: builtin/submodule--helper.c:2647
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2666 git-submodule.sh:150
-#, sh-format
+#: 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:2682
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr "без извеждане на информаци� при задаването на адре�а на подмодул"
 
-#: builtin/submodule--helper.c:2686
+#: 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:2719
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr "задаване на �тандартни� �лед�щ клон да е „master“"
 
-#: builtin/submodule--helper.c:2721
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "задаване на �тандартни� �лед�щ клон"
 
-#: builtin/submodule--helper.c:2725
+#: 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:2726
+#: 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:2733
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "необходимо е една от опциите „--branch“ и „--default“"
 
-#: builtin/submodule--helper.c:2736
-msgid "--branch and --default are mutually exclusive"
-msgstr "опциите „--branch“ и „--default“ �а не�ъвме�тими"
+#: builtin/submodule--helper.c:3038
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "Добав�не на �ъще�твуващото хранилище в „%s“ към индек�а\n"
+
+#: 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:3054
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr ""
+"Открита е локална директори� на Git — „%s“, ко�то �очи към отдалечените "
+"хранилища:\n"
+
+#: 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 ""
+"�ко и�кате да преизползвате тази локална директори� на git, вме�то да\n"
+"клонирате отново:\n"
+"    %s\n"
+"използвайте опци�та „--force“.  �ко локалната директори� на git не е\n"
+"правилното хранилище или ако не знаете какво означава това, използвайте\n"
+"друго име като аргумент към опци�та „--name“."
+
+#: builtin/submodule--helper.c:3073
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "�ктивиране на локалното хранилище за подмодула „%s“ наново.\n"
+
+#: builtin/submodule--helper.c:3110
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "Подмодулът „%s“ не може да бъде изтеглен"
+
+#: builtin/submodule--helper.c:3149
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "�еу�пешно добав�не на подмодула „%s“"
+
+#: 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:3222
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "„%s“ вече �ъще�твува в индек�а"
+
+#: 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:3254
+msgid "branch of repository to add as submodule"
+msgstr "клон на хранилище, който да �е добави като подмодул"
 
-#: builtin/submodule--helper.c:2793 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3255
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "позвол�ване на добав�не и на иначе игнорираните файлове"
+
+#: builtin/submodule--helper.c:3257
+msgid "print only error messages"
+msgstr "извеждане �амо на �ъобщени�та за грешка"
+
+#: builtin/submodule--helper.c:3261
+msgid "borrow the objects from reference repositories"
+msgstr "заемане на обектите от еталонните хранилища"
+
+#: 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:3270
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [ОПЦИЯ…] [--] ХР��ИЛИЩЕ [ПЪТ]"
+
+#: builtin/submodule--helper.c:3298
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"Отно�ителен път може да �е ползва �амо от о�новната директори� на работното "
+"дърво"
+
+#: builtin/submodule--helper.c:3306
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr ""
+"адре� на хранилище: „%s“ тр�бва или да е аб�олютен, или да започва � „./“ "
+"или „../“"
+
+#: builtin/submodule--helper.c:3341
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "„%s“ е неправилно име за подмодул"
+
+#: 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:2799
+#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "„%s“ не е подкоманда на „submodule--helper“"
@@ -23615,18 +24114,18 @@ msgstr "изтриване на �имволен указател"
 msgid "shorten ref output"
 msgstr "кратка информаци� за указател�"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "причина"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr "причина за обнов�ването"
 
 #: builtin/tag.c:25
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+"        <tagname> [<head>]"
 msgstr ""
 "git tag [-a | -s | -u ИДЕ�ТИФИК�ТОР_��_КЛЮЧ] [-f] [-m СЪОБЩЕ�ИЕ | -F Ф�ЙЛ]\n"
 "        ЕТИКЕТ [ВРЪХ]"
@@ -23639,7 +24138,7 @@ msgstr "git tag -d ЕТИКЕТ…"
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
 "[<pattern>...]"
 msgstr ""
 "git tag -l [-n[БРОЙ]] [--contains ПОД�В��Е] [--no-contains ПОД�В��Е]\n"
@@ -23688,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"
@@ -23706,134 +24205,111 @@ msgstr ""
 "\n"
 "    git tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c:274
 msgid "bad object type."
 msgstr "неправилен вид обект."
 
-#: builtin/tag.c:328
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "лип�ва �ъобщение за етикета"
 
-#: builtin/tag.c:335
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Съобщението за етикета е запазено във файла „%s“\n"
 
-#: builtin/tag.c:446
+#: builtin/tag.c:444
 msgid "list tag names"
 msgstr "извеждане на имената на етикетите"
 
-#: builtin/tag.c:448
+#: builtin/tag.c:446
 msgid "print <n> lines of each tag message"
 msgstr "извеждане на този БРОЙ редове от в��ко �ъобщение за етикет"
 
-#: builtin/tag.c:450
+#: builtin/tag.c:448
 msgid "delete tags"
 msgstr "изтриване на етикети"
 
-#: builtin/tag.c:451
+#: builtin/tag.c:449
 msgid "verify tags"
 msgstr "проверка на етикети"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:451
 msgid "Tag creation options"
 msgstr "Опции при �ъздаването на етикети"
 
-#: builtin/tag.c:455
+#: builtin/tag.c:453
 msgid "annotated tag, needs a message"
 msgstr "анотирането на етикети изи�ква �ъобщение"
 
-#: builtin/tag.c:457
+#: builtin/tag.c:455
 msgid "tag message"
 msgstr "СЪОБЩЕ�ИЕ за етикет"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:457
 msgid "force edit of tag message"
 msgstr "принудително редактиране на �ъобщение за етикет"
 
-#: builtin/tag.c:460
+#: builtin/tag.c:458
 msgid "annotated and GPG-signed tag"
 msgstr "анотиран етикет � подпи� по GPG"
 
-#: builtin/tag.c:463
+#: builtin/tag.c:461
 msgid "use another key to sign the tag"
 msgstr "използване на друг ключ за подпи�ването на етикет"
 
-#: builtin/tag.c:464
+#: builtin/tag.c:462
 msgid "replace the tag if exists"
 msgstr "зам�на на етикета, ако �ъще�твува"
 
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "�ъздаване на журнал на указателите"
 
-#: builtin/tag.c:467
+#: builtin/tag.c:465
 msgid "Tag listing options"
 msgstr "Опции за извеждането на етикети"
 
-#: builtin/tag.c:468
+#: builtin/tag.c:466
 msgid "show tag list in columns"
 msgstr "извеждане на �пи�ъка на етикетите по колони"
 
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
 msgid "print only tags that contain the commit"
 msgstr "извеждане �амо на етикетите, които �ъдържат подаването"
 
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that don't contain the commit"
 msgstr "извеждане �амо на етикетите, които не �ъдържат подаването"
 
-#: builtin/tag.c:473
+#: builtin/tag.c:471
 msgid "print only tags that are merged"
 msgstr "извеждане �амо на �летите етикети"
 
-#: builtin/tag.c:474
+#: builtin/tag.c:472
 msgid "print only tags that are not merged"
 msgstr "извеждане �амо на не�летите етикети"
 
-#: builtin/tag.c:478
+#: builtin/tag.c:476
 msgid "print only tags of the object"
 msgstr "извеждане �амо на етикетите на ОБЕКТ�"
 
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "опциите „--column“ и „-n“ �а не�ъвме�тими"
-
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "опци�та „-n“ изи�ква режим на �пи�ък."
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "опци�та „-contains“ изи�ква режим на �пи�ък."
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "опци�та „-contains“ изи�ква  режим на �пи�ък."
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "опци�та „-points-at“ изи�ква режим на �пи�ък."
-
-#: builtin/tag.c:556
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "опциите „--merged“ и „--no-merged“ изи�кват режим на �пи�ък."
-
-#: builtin/tag.c:567
-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:592
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "„%s“ е неправилно име за етикет."
 
-#: builtin/tag.c:597
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "етикетът „%s“ вече �ъще�твува"
 
-#: builtin/tag.c:628
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Обновен етикет „%s“ (бе „%s“)\n"
@@ -23847,217 +24323,212 @@ msgstr "Разпакетиране на обектите"
 msgid "failed to create directory %s"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "файлът „%s“ не може да бъде �ъздаден"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "файлът „%s“ не може да бъде изтрит"
 
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "директори�та „%s“ не може да бъде изтрита"
 
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Проверка на времето на пром�на (mtime) на файла „%s“"
 
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та не �е промен� �лед "
 "добав�нето на нов файл"
 
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та не �е промен� �лед "
 "добав�нето на нова директори�"
 
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та �е промен� �лед "
 "обнов�ването на нов файл"
 
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та �е промен� �лед добав�нето "
 "на файл в поддиректори�"
 
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та не �е промен� �лед "
 "изтриването на файл"
 
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та не �е промен� �лед "
 "изтриването на директори�"
 
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
 msgid " OK"
 msgstr " Добре"
 
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [ОПЦИЯ…] [--] [Ф�ЙЛ…]"
 
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr ""
 "продължаване � обнов�ването, дори когато индек�ът тр�бва да бъде обновен"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "подмодулите да �е игнорират при обнов�ването"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "новите файлове да не �е игнорират"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "файлове да може да замен�т директории и обратно"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "предупреждаване при лип�ващи в работното дърво файлове"
 
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "обнов�ване дори и индек�ът да �ъдържа не�лети обекти"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "обнов�ване на информаци�та от функци�та „stat“"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 "като опци�та „--refresh“, но да �е провер�т и обектите, които �а били приети "
 "за непроменени"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "РЕЖИМ,ОБЕКТ,ПЪТ"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "добав�не на изброените обекти към индек�а"
 
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "задаване на флаг, че файлът не �е промен�"
 
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "изчи�тване на флага, че файлът не �е промен�"
 
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "задаване на флаг, че файловете �а �амо за индек�а"
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "изчи�тване на флага, че файловете �а �амо за индек�а"
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
 msgid "do not touch index-only entries"
 msgstr "без пром�на на файловете �амо за индек�а"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr "добав�не �амо към индек�а без добав�не към базата от данни за обектите"
 
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr "изтриване на указаните пътища, дори и да �ъще�твуват в работното дърво"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr ""
 "при комбиниране � опци�та „--stdin“ — входните редове �а разделени � нулеви� "
 "байт"
 
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "изчитане на �пи�ъка � пътища за обнов�ване от �тандартни� вход"
 
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "добав�не на елементите от �тандартни� вход към индек�а"
 
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 "въз�танов�ване на �ъ�то�нието преди �ливане или нужда от обнов�ване за "
 "изброените пътища"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "добав�не �амо на �ъдържанието, което �е различава от това в „HEAD“"
 
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "игнориране на файловете, които лип�ват в работното дърво"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "извеждане на дей�тви�та на �тандартни� изход"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 "забрав�не на запи�аната информаци� за неразрешени конфликти — за командите "
 "от потребител�ко ниво"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "запи�ване на индек�а в този формат"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "включване или изключване на раздел�нето на индек�а"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "включване/изключване на кеша за не�ледените файлове"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "проверка дали файловата �и�тема поддържа кеш за не�ледени файлове"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 "включване на кеша за не�ледените файлове без проверка на файловата �и�тема"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "запи� на индек�а, дори да не е отбел�зан като променен"
 
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "включване или изключване на наблюдението на файловата �и�тема"
 
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "отбел�зване на файловете, че може да �е �лед�т чрез файловата �и�тема"
 
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "изчи�тване на флага за �леденето чрез файловата �и�тема"
 
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -24065,7 +24536,7 @@ msgstr ""
 "�а�тройката „core.splitIndex“ е зададена на „false“ (лъжа̀).  Сменете � или � "
 "изтрийте, за да включите раздел�нето на индек�а"
 
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -24073,7 +24544,7 @@ msgstr ""
 "�а�тройката „core.splitIndex“ е зададена на „true“ (и�тина).  Сменете � или "
 "� изтрийте, за да изключите раздел�нето на индек�а."
 
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -24081,11 +24552,11 @@ msgstr ""
 "�а�тройката „core.untrackedCache“ е зададена на „true“ (и�тина).  Сменете � "
 "или � изтрийте, за да изключите кеша за не�ледените файлове"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Кешът за не�ледените файлове е изключен"
 
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -24093,29 +24564,29 @@ msgstr ""
 "�а�тройката „core.untrackedCache“ е зададена на „false“ (лъжа̀).  Сменете � "
 "или � изтрийте, за да включите кеша за не�ледените файлове"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Кешът за не�ледените файлове е включен за „%s“"
 
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 "�а�тройката „core.fsmonitor“ не е зададена.  Задайте �, за да включите "
 "�леденето чрез файловата �и�тема."
 
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "�леденето чрез файловата �и�тема е включено"
 
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 "�а�тройката „core.fsmonitor“ е зададена.  Изтрийте �, за да изключите "
 "�леденето чрез файловата �и�тема."
 
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "�леденето чрез файловата �и�тема е изключено"
 
@@ -24131,21 +24602,21 @@ msgstr "git update-ref [ОПЦИЯ…] ИМЕ_Ð�Ð�_УКÐ�ЗÐ�ТЕЛ Ð�ОВÐ�_СÐ
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [ОПЦИЯ…] --stdin [-z]"
 
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "изтриване на указател�"
 
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
 msgstr "обнов�ване на ИМЕто_��_УК�З�ТЕЛ�, а не това, към което �очи"
 
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
 msgstr ""
 "н�кои от елементите подадени на �тандартни� вход завършват � нулеви� знак "
 "„NUL“"
 
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "изчитане на указателите от �тандартни� вход"
 
@@ -24159,28 +24630,28 @@ msgstr "обнов�ване на информационните файлове
 
 #: builtin/upload-pack.c:11
 msgid "git upload-pack [<options>] <dir>"
-msgstr "git upload-repack [ОПЦИЯ…] ДИРЕКТОРИЯ"
+msgstr "git upload-pack [ОПЦИЯ…] ДИРЕКТОРИЯ"
 
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
 msgid "quit after a single request/response exchange"
 msgstr "изход �лед първоначалната разм�на на за�вка и отговор"
 
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "изход �лед първоначалната об�ва на указатели"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "до�тав�не на информаци�та/указателите за „git-http-backend“"
 
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 "да не �е тър�и „ДИРЕКТОРИЯ/.git/“, ако ДИРЕКТОРИЯта не е под контрола на Git"
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "тран�ферът да �е преу�танови �лед този БРОЙ �екунди"
 
 #: builtin/verify-commit.c:19
 msgid "git verify-commit [-v | --verbose] <commit>..."
-msgstr "git verify-tag [-v | --verbose] ПОД�В��Е…"
+msgstr "git verify-commit [-v | --verbose] ПОД�В��Е…"
 
 #: builtin/verify-commit.c:68
 msgid "print commit contents"
@@ -24210,63 +24681,58 @@ msgstr "git verify-tag [-v | --verbose] [--format=ФОРМ�Т] ЕТИКЕТ…"
 msgid "print tag contents"
 msgstr "извеждане на �ъдържанието на ЕТИКЕТи"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [ОПЦИЯ…] ПЪТ [УК�З�ТЕЛ_КЪМ_ПОД�В��Е]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [ОПЦИЯ…]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [ОПЦИЯ…] [ПЪТ]"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move [ДЪРВО] [�ОВ_ПЪТ]"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [ОПЦИЯ…]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [ОПЦИЯ…] [ДЪРВО]"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock [ПЪТ]"
 
-#: builtin/worktree.c:61 builtin/worktree.c:935
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "неу�пешно изтриване на „%s“"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "Изтриване на „%s/%s“: %s"
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
 msgid "report pruned working trees"
 msgstr "докладване на ока�трените работни дървета"
 
-#: builtin/worktree.c:151
+#: builtin/worktree.c:150
 msgid "expire working trees older than <time>"
 msgstr "об�в�ване на работните копи� по-�тари от това ВРЕМЕ за о�тарели"
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c:220
 #, c-format
 msgid "'%s' already exists"
 msgstr "„%s“ вече �ъще�твува"
 
-#: builtin/worktree.c:230
+#: builtin/worktree.c:229
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "целта не може да �е ползва за работно дърво: „%s“"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -24276,7 +24742,7 @@ msgstr ""
 "За изрично задаване ползвайте „%s -f -f“, а за изчи�тване —\n"
 "„unlock“, „prune“ или „remove“"
 
-#: builtin/worktree.c:237
+#: builtin/worktree.c:236
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -24286,29 +24752,33 @@ msgstr ""
 "За изрично задаване ползвайте „%s -f“, а за изчи�тване —\n"
 "„prune“ или „remove“"
 
-#: builtin/worktree.c:288
+#: builtin/worktree.c:287
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+msgid "initializing"
+msgstr "инициализаци�"
+
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Приготв�не на работното дърво (нов клон „%s“)"
 
-#: builtin/worktree.c:424
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 "Приготв�не на работното дърво (занул�ване на клона „%s“, който �очеше към "
 "„%s“)"
 
-#: builtin/worktree.c:433
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Приготв�не на работното дърво (изтегл�не на „%s“)"
 
-#: builtin/worktree.c:439
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Подготв�не на работно дърво (указател�т „HEAD“ не �вързан: %s)"
@@ -24333,86 +24803,82 @@ msgstr "подготв�не на новото работно дърво"
 msgid "keep the new working tree locked"
 msgstr "новото работно дърво да о�тане заключено"
 
-#: builtin/worktree.c:493
+#: builtin/worktree.c:492 builtin/worktree.c:729
+msgid "reason for locking"
+msgstr "причина за заключване"
+
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "задаване на режима на �ледене (виж git-branch(1))"
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "опит за напа�ване на името на нови� клон � това на �лед�щ клон"
 
-#: builtin/worktree.c:504
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "опциите „-b“, „-B“ и „--detach“ �а не�ъвме�тими една � друга"
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "добавена � „--lock“"
 
-#: builtin/worktree.c:565
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "„--[no-]track“ може да �е използва �амо при �ъздаването на нов клон"
 
-#: builtin/worktree.c:682
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr "извеждане на подробни анотации и об��нени�, ако такива �а налични"
 
-#: builtin/worktree.c:684
+#: builtin/worktree.c:693
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 "добав�не на анотаци� за ока�тр�не на работните копи� по-�тари от това ВРЕМЕ"
 
-#: builtin/worktree.c:693
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "опциите „--verbose“ и „--porcelain“ �а не�ъвме�тими"
-
-#: builtin/worktree.c:720
-msgid "reason for locking"
-msgstr "причина за заключване"
-
-#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
-#: builtin/worktree.c:963
+#: 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:734 builtin/worktree.c:767
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "О�новното дърво не може да �е отключи или заключи"
 
-#: builtin/worktree.c:739
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "„%s“ вече е заключено, защото „%s“"
 
-#: builtin/worktree.c:741
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "„%s“ вече е заключено"
 
-#: builtin/worktree.c:769
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "„%s“ не е заключено"
 
-#: builtin/worktree.c:810
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "не може да ме�тите или изтривате работни дървета, в които има подмодули"
 
-#: builtin/worktree.c:818
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 "принудително преме�тване, дори работното дърво да не е чи�то или да е "
 "заключено"
 
-#: builtin/worktree.c:841 builtin/worktree.c:965
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "„%s“ е о�новно работно дърво"
 
-#: builtin/worktree.c:846
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "името на целта не може да �е определи от „%s“"
 
-#: builtin/worktree.c:859
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -24421,7 +24887,7 @@ msgstr ""
 "не може да преме�тите заключено работно дърво, причина за заключването: %s\n"
 "или го отключете, или го преме�тете принудително � „move -f -f“"
 
-#: builtin/worktree.c:861
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -24429,41 +24895,41 @@ msgstr ""
 "не може да преме�тите заключено работно дърво:\n"
 "или го отключете, или го преме�тете принудително � „move -f -f“"
 
-#: builtin/worktree.c:864
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 "проверките �а неу�пешни, работното дърво не може да бъде преме�тено: %s"
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "„%s“ не може да �е преме�ти в „%s“"
 
-#: builtin/worktree.c:915
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "неу�пешно изпълнение на „git status“ върху „%s“"
 
-#: builtin/worktree.c:919
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 "„%s“ �ъдържа променени или нови файлове, за принудително изтриване е "
 "необходима опци�та „--force“"
 
-#: builtin/worktree.c:924
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 "командата „git status“ не може да �е изпълни за „%s“, код за грешка: %d"
 
-#: builtin/worktree.c:947
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 "принудително изтриване, дори работното дърво да не е чи�то или да е заключено"
 
-#: builtin/worktree.c:970
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -24472,7 +24938,7 @@ msgstr ""
 "не може да изтриете заключено работно дърво, причина за заключването: %s\n"
 "или го отключете, или го изтрийте принудително � „remove -f -f“"
 
-#: builtin/worktree.c:972
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -24480,17 +24946,17 @@ msgstr ""
 "не може да изтриете заключено работно дърво:\n"
 "или го отключете, или го изтрийте принудително � „remove -f -f“"
 
-#: builtin/worktree.c:975
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "проверките �а неу�пешни, работното дърво не може да бъде изтрито: %s"
 
-#: builtin/worktree.c:999
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "поправ�не: %s: „%s“"
 
-#: builtin/worktree.c:1002
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "грешка: %s: „%s“"
@@ -24543,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"
@@ -24573,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"
@@ -24607,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:833
+#: git.c:835
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "зацикл�не в п�евдонимите: заме�твани�та на „%s“ не приключват:%s"
 
-#: git.c:883
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "„%s“ не може да �е обработи като вградена команда"
 
-#: git.c:896
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -24638,35 +25094,27 @@ msgstr ""
 "употреба: %s\n"
 "\n"
 
-#: git.c:916
+#: 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:928
+#: 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 "неподдържани опции"
@@ -24692,65 +25140,31 @@ msgstr "test-tool serve-v2 [ОПЦИЯ…]"
 msgid "exit immediately after advertising capabilities"
 msgstr "изход �лед първоначалната об�ва на възможно�тите"
 
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "гнездото/каналът вече �е ползват: „%s“"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "�ървърът не �тартира на гнездо/канал „%s“"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "демонът не може да �е �тартира във фонов режим"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "неу�пешно изпълнение на „waitpid“"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "демонът още не отговар� на за�вки"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "демонът не е �тартирал"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "„waitpid“ върна неочаквана �тойно�т"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "демонът не е �пр�л"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
 msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
 msgstr "test-helper simple-ipc is-active    [ИМЕ] [ОПЦИЯ…]"
 
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
 msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
 msgstr "test-helper simple-ipc run-daemon   [ИМЕ] [�ИШКИ]"
 
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
 msgstr "test-helper simple-ipc start-daemon [ИМЕ] [�ИШКИ] [ИЗЧ�КВ��Е]"
 
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
 msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
 msgstr "test-helper simple-ipc stop-daemon  [ИМЕ] [ИЗЧ�КВ��Е]"
 
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
 msgid "test-helper simple-ipc send         [<name>] [<token>]"
 msgstr "test-helper simple-ipc send         [ИМЕ] [ЛЕКСЕМ�]"
 
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
 msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
 msgstr "test-helper simple-ipc sendbytes    [ИМЕ] [БРОЙ_Б�ЙТОВЕ] [Р�ЗМЕР]"
 
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
 msgid ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
@@ -24758,88 +25172,84 @@ msgstr ""
 "test-helper simple-ipc multiple     [ИМЕ] [�ИШКИ] [БРОЙ_Б�ЙТОВЕ] "
 "[Р�ЗМЕР_��_П�КЕТ�]"
 
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
 msgid "name or pathname of unix domain socket"
 msgstr "име или път за гнездото на Unix"
 
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
 msgid "named-pipe name"
 msgstr "име на именован канал"
 
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
 msgid "number of threads in server thread pool"
 msgstr "брой нишки в запа�а нишки"
 
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
 msgid "seconds to wait for daemon to start or stop"
 msgstr "�екунди изчакване на демона да �тартира или �пре"
 
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
 msgid "number of bytes"
 msgstr "брой байтове"
 
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
 msgid "number of requests per thread"
 msgstr "брой за�вки на нишка"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "byte"
 msgstr "байта"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "ballast character"
 msgstr "знаци за пращане"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "token"
 msgstr "лек�ема"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "command token to send to the server"
 msgstr "командна лек�ема за пращане"
 
-#: http.c:399
+#: http.c:350
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 "отрицателна �тойно�т за „http.postbuffer“.  Ще �е ползва �тандартната: %d"
 
-#: http.c:420
+#: http.c:371
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Управлението на делегирането не �е поддържа от cURL < 7.22.0"
 
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Задаването на по�то�нен публичен ключ не �е поддържа от cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Задаването на по�то�нен публичен ключ не �е поддържа от cURL < 7.39.0"
 
-#: http.c:910
+#: http.c:812
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "„CURLSSLOPT_NO_REVOKE“ не �е поддържа от cURL < 7.44.0"
 
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Ограничаването на протоколите не �е поддържа от cURL < 7.44.0"
-
-#: http.c:1132
+#: http.c:1016
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "�еподдържана реализаци� на SSL „%s“. Поддържат �е:"
 
-#: http.c:1139
+#: http.c:1023
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 "Реализаци�та на SSL не може да �е зададе да е „%s“: cURL е компилиран без "
 "поддръжка на SSL"
 
-#: http.c:1143
+#: http.c:1027
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr ""
 "Реализаци�та на SSL не може да �е зададе да е „%s“, защото вече е зададена "
 "друга"
 
-#: http.c:2035
+#: http.c:1876
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -24857,140 +25267,316 @@ msgstr ""
 "неправилно екраниране или цитиране в �тойно�тта към опци� за изтла�кване: "
 "„%s“"
 
-#: remote-curl.c:307
+#: remote-curl.c:304
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "„%sinfo/refs“ е неизползваемо, проверете дали е хранилище на git"
 
-#: remote-curl.c:408
+#: remote-curl.c:405
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 "неправилен отговор от �ървъра: очакваше �е у�луга, а бе получен изчи�тващ "
 "пакет „flush“"
 
-#: remote-curl.c:439
+#: remote-curl.c:436
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "неправилен отговор от �ървъра, бе получено: „%s“"
 
-#: remote-curl.c:499
+#: remote-curl.c:496
 #, c-format
 msgid "repository '%s' not found"
 msgstr "хранилището „%s“ лип�ва"
 
-#: remote-curl.c:503
+#: remote-curl.c:500
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "�еу�пешна идентификаци� към „%s“"
 
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "н�ма до�тъп до „%s“ �ъ� �ледната на�тройка на „http.pinnedPubkey“: %s"
+
+#: remote-curl.c:508
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "н�ма до�тъп до „%s“: %s"
 
-#: remote-curl.c:513
+#: remote-curl.c:514
 #, c-format
 msgid "redirecting to %s"
 msgstr "прена�очване към „%s“"
 
-#: remote-curl.c:642
+#: remote-curl.c:645
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "получен е EOF, в режим без поддръжка за това"
 
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr "отдалечени�т �ървър изпрати разделител без запазване на �ъ�то�нието"
+#: remote-curl.c:657
+msgid "remote server sent unexpected response end packet"
+msgstr "отдалечени�т �ървър прати неочакван пакет за край на отговор"
 
-#: remote-curl.c:724
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 "данните за POST не може да �е прочетат наново, пробвайте да увеличите "
 "на�тройката „http.postBuffer“"
 
-#: remote-curl.c:754
+#: remote-curl.c:755
 #, c-format
 msgid "remote-curl: bad line length character: %.4s"
 msgstr "remote-curl: неправилeн знак за дължина на ред: %.4s"
 
-#: remote-curl.c:756
+#: remote-curl.c:757
 msgid "remote-curl: unexpected response end packet"
 msgstr "remote-curl: неочакван пакет за край на отговор"
 
-#: remote-curl.c:832
+#: remote-curl.c:833
 #, c-format
 msgid "RPC failed; %s"
 msgstr "�еу�пешно отдалечено извикване.  %s"
 
-#: remote-curl.c:872
+#: remote-curl.c:873
 msgid "cannot handle pushes this big"
 msgstr "толкова големи изтла�квани� не може да �е изпълн�т"
 
-#: remote-curl.c:987
+#: remote-curl.c:986
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr ""
 "за�вката не може да бъде декомпре�ирана, грешка от „zlib“ при "
 "декомпре�иране: %d"
 
-#: remote-curl.c:991
+#: remote-curl.c:990
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr ""
 "за�вката не може да бъде декомпре�ирана; грешка от „zlib“ при завършване: %d<"
 
-#: remote-curl.c:1041
+#: remote-curl.c:1040
 #, c-format
 msgid "%d bytes of length header were received"
 msgstr "получени �а %d байта от заглавна ча�т"
 
-#: remote-curl.c:1043
+#: remote-curl.c:1042
 #, c-format
 msgid "%d bytes of body are still expected"
 msgstr "очакват �е още %d байта от т�лото на отговора"
 
-#: remote-curl.c:1132
+#: remote-curl.c:1131
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "опро�тени�т тран�порт по http не поддържа плитки клиенти"
 
-#: remote-curl.c:1147
+#: remote-curl.c:1146
 msgid "fetch failed."
 msgstr "неу�пешно до�тав�не."
 
-#: remote-curl.c:1193
+#: remote-curl.c:1192
 msgid "cannot fetch by sha1 over smart http"
 msgstr "умни�т вариант на http не може да до�тав� по SHA1"
 
-#: remote-curl.c:1237 remote-curl.c:1243
+#: remote-curl.c:1236 remote-curl.c:1242
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "протоколна грешка: очаква �е SHA1 или указател, а бе получено: „%s“"
 
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1254 remote-curl.c:1372
 #, c-format
 msgid "http transport does not support %s"
 msgstr "тран�портът по http не поддържа „%s“"
 
-#: remote-curl.c:1291
+#: remote-curl.c:1290
 msgid "git-http-push failed"
 msgstr "неу�пешно изпълнение на „git-http-push“"
 
-#: remote-curl.c:1479
+#: remote-curl.c:1478
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: употреба: git remote-curl ХР��ИЛИЩЕ [�ДРЕС]"
 
-#: remote-curl.c:1511
+#: remote-curl.c:1510
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl: грешка при изчитането на потока команди от git"
 
-#: remote-curl.c:1518
+#: remote-curl.c:1517
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: опит за до�тав�не без локално хранилище"
 
-#: remote-curl.c:1559
+#: remote-curl.c:1558
 #, c-format
 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"
@@ -25007,11 +25593,11 @@ msgstr "�РГУМЕ�ТИ"
 msgid "object filtering"
 msgstr "филтриране по вид на обекта"
 
-#: parse-options.h:184
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "период на валидно�т/запазване"
 
-#: parse-options.h:198
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "нулева операци� (за �ъвме�тимо�т � предишни вер�ии)"
 
@@ -25042,11 +25628,11 @@ msgstr ""
 "при ползването на „--pathspec-from-file“, пътищата �а разделени � нулеви� "
 "знак „NUL“"
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "key"
 msgstr "КЛЮЧ"
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "име на полето, по което да е подредбата"
 
@@ -25120,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 ""
@@ -25337,454 +25923,418 @@ 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"
 msgstr "Общ преглед на препоръчваните начини за работа � Git"
 
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "неу�пешно двоично тър�ене, не е зададена команда."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "изпълнение на командата „${command}“"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"неу�пешно двоично тър�ене:\n"
-"изходни�т код от командата „${command}“ е ${res} — това е извън интервала "
-"[0, 128)"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "двоичното тър�ене не може да продължи"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"неу�пешно двоично тър�ене:\n"
-"функци�та „bisect-state ${state}“ завърши � код за грешка ${res}"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "у�пешно двоично тър�ене"
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -25823,99 +26373,17 @@ msgstr "Опит за про�то �ливане � „$pretty_name“"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Про�тото �ливане не �работи, пробва �е автоматично �ливане."
 
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-"Отно�ителен път може да �е ползва �амо от о�новната директори� на работното "
-"дърво"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr ""
-"адре� на хранилище: „${repo}“ тр�бва или да е аб�олютен, или да започва � "
-"„./“ или „../“"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "„${sm_path}“ вече �ъще�твува в индек�а"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "„${sm_path}“ вече �ъще�твува в индек�а и не е подмодул"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "в „${sm_path}“ не е изтеглено подаване"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "Добав�не на �ъще�твуващото хранилище в „${sm_path}“ към индек�а"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "„${sm_path}“ �ъще�твува, а не е хранилище на Git"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-"Открита е локална директори� на Git — „${sm_name}“, ко�то �очи към "
-"отдалечените хранилища:"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-"  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"�ко и�кате да преизползвате тази директори� на git, вме�то да клонирате "
-"отново\n"
-"    $realrepo\n"
-"използвайте опци�та „--force“.  �ко локалната директори� на git не е за\n"
-"правилното хранилище или ако не знаете какво означава това, използвайте\n"
-"друго име като аргумент към опци�та „--name“."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "�ктивиране на локалното хранилище за подмодула „${sm_name}“ наново."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "�еу�пешно добав�не на подмодула „${sm_path}“"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "�еу�пешно реги�триране на подмодула „${sm_path}“"
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Текущата вер�и� за подмодула в „${displaypath}“ лип�ва"
 
-#: git-submodule.sh:578
+#: git-submodule.sh:411
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "�еу�пешно до�тав�не в път� към подмодул „${sm_path}“"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:416
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25924,473 +26392,56 @@ msgstr ""
 "Текущата вер�и� „${remote_name}/${branch}“ в път� към подмодул „${sm_path}“ "
 "лип�ва"
 
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"�еу�пешно до�тав�не в път� към подмодул „${displaypath}“, опит за директно "
-"до�тав�не на „${sha1}“"
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Подмодулът в път� „$displaypath“ е до�тавен, но не �ъдържа обекта �ъ� �ума\n"
-"„${sha1}“.  Директното до�тав�не на това подаване е неу�пешно."
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"�еу�пешно изтегл�не на вер�и� „${sha1}“ в път� към подмодул „${displaypath}“'"
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Път към подмодул „${displaypath}“: изтеглена е вер�и� „${sha1}“"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"�еу�пешно пребазиране на вер�и� „${sha1}“ в път� към подмодул "
-"„${displaypath}“"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Път към подмодул „${displaypath}“: пребазиране върху вер�и� „${sha1}“"
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"�еу�пешно �ливане на вер�и� „${sha1}“ в път� към подмодул „${displaypath}“"
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Път към подмодул „${displaypath}“: �ливане � вер�и� „${sha1}“"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"�еу�пешно изпълнение на командата „${command} ${sha1}“ в път� към подмодул "
-"„${displaypath}“"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“"
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 "�еу�пешна обработка на поддиректориите в път� към подмодул „${displaypath}“"
 
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "�втоматично �катаното е приложено."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "„$stash_sha1“ не може да бъде запазен"
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"Прилагането на автоматично �катаното доведе до конфликти.  Промените ви �а\n"
-"надеждно �катани.  Може да пробвате да ги приложите чрез „git stash pop“\n"
-"или да ги изхвърлите чрез „git stash drop“, когато пои�кате.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Пребазиране ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-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 ПОД�В��Е  — вкарване на подаването в предходното му, без �м�на на\n"
-"                      �ъобщението\n"
-" x, exec ПОД�В��Е   — изпълнение на команда към обвивката: о�таналата ча�т "
-"на\n"
-"                      реда\n"
-" d, drop ПОД�В��Е   — пре�качане на подаването\n"
-" l, label ЕТИКЕТ    — задаване на етикет на указаното от HEAD\n"
-" t, reset ЕТИКЕТ    — занул�ване на HEAD към ЕТИКЕТа\n"
-" m, merge [-C ПОД�В��Е | -c ПОД�В��Е] ЕТИКЕТ [# ЕДИ�_РЕД]\n"
-"                    — �ъздаване на подаване �ъ� �ливане �ъ� �ъобщението от\n"
-"                      първоначалното подаване (или �ъобщението от ЕДИ�_РЕД,\n"
-"                      ако не е зададено подаване �ъ� �ливане.  С опци�та\n"
-"                      „-c ПОД�В��Е“, може да �мените �ъобщението.\n"
-"\n"
-"Може да промен�те по�ледователно�тта на редовете — те �е изпълн�ват\n"
-"по�ледователно отгоре-надолу.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, 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"
-"    git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"След като привършите, продължете � командата:\n"
-"\n"
-"    git rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: това не е подаване, което може да бъде отбрано"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "�еправилно име на подаване: „$sha1“"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr ""
-"Заме�тващата �ума по SHA1 за текущото подаване не може да бъде запазена"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Превъртане до „$sha1“"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "�е може да �е превърти до „$sha1“"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Указател�т „HEAD“ не може да �е на�очи към „$first_parent“"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Подаването не може да �е �мачка: „$sha1“"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Грешка при повтар�нето на �ливането на „$sha1“"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "„$sha1“ не може да �е отбере."
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Това е �ъобщение при подаване №${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Съобщение при подаване №${n} ще бъде пре�кочено."
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Това е обединение от $count подаване."
-msgstr[1] "Това е обединение от $count подавани�."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "�овото �ъобщение при подаване „$fixup_msg“ не може да бъде запазено"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Това е обединение от 2 подавани�"
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "�е може да �е подаде $sha1… $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, 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"
-"�ай-веро�тните причини �а празно �ъобщение при подаване или неу�пешно "
-"изпълнение\n"
-"на куката преди подаване.  �ко имате проблем � куката, ще тр�бва да го "
-"коригирате,\n"
-"преди да може да промените �ъобщението на подаването."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Спиране при „$sha1_abbrev…“ $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Без предходно подаване не може да �е изпълни „$squash_style“"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "В момента �е изпълн�ва: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "�еу�пешно изпълнение: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "и промени индек�а и/или работното дърво"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Може да коригирате проблема, �лед което изпълнете:\n"
-"\n"
-"    git rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, 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"
-"\n"
-"    git rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "�епозната команда: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Коригирайте това чрез „git rebase --edit-todo“."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "У�пешно пребазиране и обнов�ване на „$head_name“."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Указател�т „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-
-#: git-rebase--preserve-merges.sh:807
-#, 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"
-"\n"
-"    git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"�ко и�кате да �ъздадете ново подаване, изпълнете:\n"
-"\n"
-"    git commit $gpg_sign_opt_quoted\n"
-"\n"
-"И в двата �луча� �лед като привършите, продължете � командата:\n"
-"\n"
-"    git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "�е може да бъде открит автор за поправ�нето на подаването"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"В работното дърво има неподадени промени.  Първо ги подайте, а �лед това\n"
-"отново изпълнете „git rebase --continue“."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Промените в индек�а не може да бъдат подадени."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Тек�тови�т редактор не може да бъде �тартиран"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "„$switch_to“ не може да �е изтегли"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Лип�ва указател „HEAD“"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Временната директори� „$state_dir“ не може да бъде �ъздадена"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Пребазирането не е интерактивно"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-"Пребазиране на $shortrevisions върху $shortonto ($todocount команда)"
-msgstr[1] ""
-"Пребазиране на $shortrevisions върху $shortonto ($todocount команди)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Празните подавани� �а коментирани"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Спи�ъкът � презапи�аните подавани� не може да бъде �ъздаден"
-
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 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
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "�е може да пребазирате, защото има промени, които не �а в индек�а."
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr ""
 "�е може да презапишете клоните, защото има промени, които не �а в индек�а."
 
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"�е може да издърпвате при това пребазиране, защото има промени, които не �а "
-"в индек�а."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr ""
 "�е може да изпълните „$action“, защото има промени, които не �а в индек�а."
 
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "�е може да пребазирате, защото в индек�а има неподадени промени."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"�е може да издърпвате при това пребазиране, защото в индек�а има неподадени "
-"промени."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr ""
 "�е може да изпълните „$action“, защото в индек�а има неподадени промени."
 
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "О�вен това в индек�а има неподадени промени."
 
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr ""
 "Тази команда тр�бва да �е изпълни от о�новната директори� на работното дърво"
 
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr "�б�олютни�т път на работното дърво не може да �е определи"
 
@@ -26479,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"
@@ -26493,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"
@@ -26507,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"
@@ -26521,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"
@@ -26535,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"
@@ -26552,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"
@@ -26569,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"
@@ -26586,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"
@@ -26600,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"
@@ -26622,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"
@@ -26728,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 "неизве�тна �тратеги� за прилагане на кръпка: „%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:138
+#: 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:145 git-send-email.perl:151
+#: 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:222
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "Ф�Т�Л�� ГРЕШК�: „%s“ не завърши у�пешно, а � код %d"
 
-#: git-send-email.perl:235
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr ""
 "тек�тови�т редактор приключи работата � грешка, в�ичко �е преу�танов�ва"
 
-#: git-send-email.perl:321
+#: 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:326
+#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "„%s.final“ �ъдържа подготвеното е-пи�мо.\n"
 
-#: git-send-email.perl:419
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "опци�та „--dump-aliases“ е не�ъвме�тима � другите опции\n"
 
-#: git-send-email.perl:493
+#: 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"
@@ -26791,11 +26842,11 @@ msgstr ""
 "забележете знака „e“.  За да изключите тази проверка, задайте\n"
 "на�тройката „sendemail.forbidSendmailVariables“ да е „false“ (лъжа̀).\n"
 
-#: git-send-email.perl:498 git-send-email.perl:700
+#: 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:501
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -26803,40 +26854,40 @@ msgstr ""
 "„batch-size“ и „relogin“ тр�бва да �е указват заедно (или чрез командни� "
 "ред, или чрез на�тройките)\n"
 
-#: git-send-email.perl:514
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "�епознато поле за опци�та „--suppress-cc“: „%s“\n"
 
-#: git-send-email.perl:545
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "�епозната �тойно�т за „--confirm“: %s\n"
 
-#: git-send-email.perl:573
+#: 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:575
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: „:include:“ не �е поддържа: %s\n"
 
-#: git-send-email.perl:577
+#: 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:582
+#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: редът за „sendmail“ не е разпознат: %s\n"
 
-#: git-send-email.perl:666
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26851,12 +26902,12 @@ msgstr ""
 "    � укажете „./%s“ за файл;\n"
 "    � използвате опци�та „--format-patch“ за диапазон.\n"
 
-#: git-send-email.perl:687
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Директори�та „%s“ не може да �е отвори: %s"
 
-#: git-send-email.perl:720
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26866,17 +26917,17 @@ msgstr ""
 "�е �а указани кръпки!\n"
 "\n"
 
-#: git-send-email.perl:733
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "В „%s“ лип�ва тема"
 
-#: git-send-email.perl:743
+#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "„%s“ не може да �е отвори за запи�: %s"
 
-#: git-send-email.perl:754
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26891,27 +26942,27 @@ msgstr ""
 "\n"
 "Изтрийте в�ичко, ако не и�кате да изпратите обобщаващо пи�мо.\n"
 
-#: git-send-email.perl:778
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "„%s“ не може да �е отвори: %s"
 
-#: git-send-email.perl:795
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "„%s.final“ не може да �е отвори: %s"
 
-#: git-send-email.perl:838
+#: 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:873
+#: 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:928
+#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -26919,11 +26970,11 @@ msgstr ""
 "Следните файлове �а 8 битови, но не �а � об�вена заглавна ча�т „Content-"
 "Transfer-Encoding“.\n"
 
-#: git-send-email.perl:933
+#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Кое 8 битово кодиране �е ползва [�тандартно: UTF-8]? "
 
-#: git-send-email.perl:941
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26936,22 +26987,22 @@ msgstr ""
 "в�е още е � шаблонното заглавие „*** SUBJECT HERE ***“.  Ползвайте опци�та\n"
 "„--force“, ако �те �игурни, че точно това и�кате да изпратите.\n"
 
-#: git-send-email.perl:960
+#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "�а кой да �е прат�т е-пи�мата (незадължително поле)"
 
-#: git-send-email.perl:978
+#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "Ф�Т�Л�� ГРЕШК�: „%s“ е п�евдоним на �ебе �и\n"
 
-#: git-send-email.perl:990
+#: 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:1048 git-send-email.perl:1056
+#: 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"
@@ -26959,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:1060
+#: 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:1377
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "Път�т към �ертификат „%s“ не �ъще�твува."
 
-#: git-send-email.perl:1460
+#: 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"
@@ -26998,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:1475
+#: 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:1478
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Изи�кване на отговор към това е-пи�мо"
 
-#: git-send-email.perl:1506
+#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "Сървърът за SMTP не е на�троен правилно."
 
-#: git-send-email.perl:1553
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Сървърът не поддържа „STARTTLS“! %s"
 
-#: git-send-email.perl:1558 git-send-email.perl:1562
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "�еу�пешно изпълнение на STARTTLS! %s"
 
-#: git-send-email.perl:1571
+#: 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:1589
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "„%s“ не може да бъде изпратен\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Проба за изпращане на „%s“\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Изпращане на „%s“\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "У�пех при пробата.  От журнала:\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "У�пех.  От журнала:\n"
 
-#: git-send-email.perl:1606
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Резултат: "
 
-#: git-send-email.perl:1609
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Резултат: у�пех\n"
 
-#: git-send-email.perl:1627
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "файлът „%s“ не може да бъде отворен"
 
-#: git-send-email.perl:1674 git-send-email.perl:1694
+#: 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:1680
+#: 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:1737
+#: 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:1772
+#: git-send-email.perl:1890
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(т�ло) Добав�не на „�к: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1883
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) �е може да бъде �е изпълни „%s“"
 
-#: git-send-email.perl:1890
+#: 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:1894
+#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) програмни�т канал не може да �е затвори за изпълнението на „%s“"
 
-#: git-send-email.perl:1924
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "�ъобщението не може да �е изпрати чрез 7 битови знаци"
 
-#: git-send-email.perl:1932
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "неправилно кодиране за прено�"
 
-#: git-send-email.perl:1966
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -27118,12 +27169,12 @@ msgstr ""
 "%s\n"
 "ПРЕДУПРЕЖДЕ�ИЕ: не �а пратени никакви кръпки\n"
 
-#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039
+#: 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:1979
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -27132,13 +27183,13 @@ msgstr ""
 "Ф�Т�Л�� ГРЕШК�: %s: %d е повече от 998 знака\n"
 "ПРЕДУПРЕЖДЕ�ИЕ: не �а пратени никакви кръпки\n"
 
-#: git-send-email.perl:1997
+#: 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:2001
+#: 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 4c451706a9..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,22 +9,29 @@
 #   -----------------+---------------------------------
 #   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
 #   hunk             |  tros
 #   not supported    |  no està admès
-#   repository       |  dipòsit
+#   push             |  pujar
+#   repository       |  repositori
 #   setting          |  paràmetre
+#   shallow          |  superficial
 #   skip             |  ometre
+#   sparse           |  dispers
 #   squelch          |  silenciar
+#   supported        |  admetre
 #   token            |  testimoni
 #   unset            |  desassignar
 #   upstream         |  font
@@ -40,8 +47,9 @@
 #   Anglès           |  Català
 #   -----------------+---------------------------------
 #   blame            |  «blame»
-#   HEAD             |  HEAD (f, la branca)
+#   HEAD             |  HEAD (f, la branca actual) - (no s'apostrofa)
 #   cherry pick      |  «cherry pick»
+#   promisor         |  «promisor»
 #   rebase           |  «rebase»
 #   stage            |  «stage»
 #   stash            |  «stash»
@@ -52,9 +60,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-05-17 16:02+0800\n"
-"PO-Revision-Date: 2021-05-14 10:22-0600\n"
-"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\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"
 "MIME-Version: 1.0\n"
@@ -63,243 +71,244 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.3.1\n"
 
-#: add-interactive.c:376
+#: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Perdó (%s)?"
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: 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"
 
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
 #: git-add--interactive.perl:294
 msgid "binary"
 msgstr "binari"
 
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
 #: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "res"
 
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
 #: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "sense canvis"
 
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Actualitza"
 
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
 #, c-format
 msgid "could not stage '%s'"
 msgstr "no s'ha pogut fer «stage» «%s»"
 
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
+#: 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"
 
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
 #, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "actualitzat %d camí\n"
 msgstr[1] "actualitzats %d camins\n"
 
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "nota: %s està ara sense seguiment.\n"
 
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: 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»"
 
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Reverteix"
 
-#: add-interactive.c:775
+#: add-interactive.c:779
 msgid "Could not parse HEAD^{tree}"
 msgstr "No s'ha pogut analitzar HEAD^{tree}"
 
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
 #, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "revertit %d camí\n"
 msgstr[1] "revertits %d camins\n"
 
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "Sense fitxers no seguits.\n"
 
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Afegeix sense seguiment"
 
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
 #, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "afegit %d camí\n"
 msgstr[1] "afegits %d camins\n"
 
-#: add-interactive.c:925
+#: add-interactive.c:929
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "s'està ignorant allò no fusionat: %s"
 
-#: add-interactive.c:937 add-patch.c:1751 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:939 add-patch.c:1749 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:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Actualització del pedaç"
 
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Reviseu les diferències"
 
-#: add-interactive.c:1010
+#: add-interactive.c:1014
 msgid "show paths with changes"
 msgstr "mostra els camins amb canvis"
 
-#: add-interactive.c:1012
+#: add-interactive.c:1016
 msgid "add working tree state to the staged set of changes"
 msgstr "afegeix l'estat de l'arbre de treball al conjunt de canvis «staged»"
 
-#: add-interactive.c:1014
+#: add-interactive.c:1018
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "reverteix el conjunt de canvis «staged» a la versió HEAD"
 
-#: add-interactive.c:1016
+#: add-interactive.c:1020
 msgid "pick hunks and update selectively"
 msgstr "selecciona els trossos i actualitza selectivament"
 
-#: add-interactive.c:1018
+#: add-interactive.c:1022
 msgid "view diff between HEAD and index"
 msgstr "visualitza les diferències entre HEAD i l'índex"
 
-#: add-interactive.c:1020
+#: add-interactive.c:1024
 msgid "add contents of untracked files to the staged set of changes"
 msgstr "afegeix contingut de fitxers no seguits al conjunt de canvis «staged»"
 
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
 msgid "Prompt help:"
 msgstr "Mostra ajuda:"
 
-#: add-interactive.c:1030
+#: add-interactive.c:1034
 msgid "select a single item"
 msgstr "seleccioneu un únic ítem"
 
-#: add-interactive.c:1032
+#: add-interactive.c:1036
 msgid "select a range of items"
 msgstr "seleccioneu un rang d'ítems"
 
-#: add-interactive.c:1034
+#: add-interactive.c:1038
 msgid "select multiple ranges"
 msgstr "seleccioneu rangs múltiples"
 
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
 msgid "select item based on unique prefix"
 msgstr "seleccioneu un ítem basant-se en un prefix únic"
 
-#: add-interactive.c:1038
+#: add-interactive.c:1042
 msgid "unselect specified items"
 msgstr "desselecciona els ítems especificats"
 
-#: add-interactive.c:1040
+#: add-interactive.c:1044
 msgid "choose all items"
 msgstr "trieu tots els ítems"
 
-#: add-interactive.c:1042
+#: add-interactive.c:1046
 msgid "(empty) finish selecting"
 msgstr "(buit) finalitza la selecció"
 
-#: add-interactive.c:1079
+#: add-interactive.c:1083
 msgid "select a numbered item"
 msgstr "seleccioneu un ítem numerat"
 
-#: add-interactive.c:1083
+#: add-interactive.c:1087
 msgid "(empty) select nothing"
 msgstr "(buit) no seleccionis res"
 
-#: add-interactive.c:1091 builtin/clean.c:816 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:1092 builtin/clean.c:817 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è"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "staged"
 msgstr "staged"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "unstaged"
 
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
-#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
-#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
-#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
+#: 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í"
 
-#: add-interactive.c:1151
+#: add-interactive.c:1155
 msgid "could not refresh index"
 msgstr "no s'ha pogut actualitzar l'índex"
 
-#: add-interactive.c:1165 builtin/clean.c:781 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,?]? "
 
 #: add-patch.c:39
 msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"staging."
+"If the patch applies cleanly, the edited hunk will immediately be marked for"
+" staging."
 msgstr ""
-"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a "
-"«staging»."
+"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a"
+" «staging»."
 
 #: add-patch.c:42
 msgid ""
@@ -315,30 +324,30 @@ 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,?]? "
 
 #: add-patch.c:61
 msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"stashing."
+"If the patch applies cleanly, the edited hunk will immediately be marked for"
+" stashing."
 msgstr ""
 "Si el pedaç s'aplica de forma neta, el tros editat es marcarà immediatament "
 "per a «stashing»."
@@ -357,33 +366,33 @@ 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,?]? "
 
 #: add-patch.c:85
 msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"unstaging."
+"If the patch applies cleanly, the edited hunk will immediately be marked for"
+" unstaging."
 msgstr ""
-"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a "
-"«unstaging»."
+"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a"
+" «unstaging»."
 
 #: add-patch.c:88
 msgid ""
@@ -399,32 +408,32 @@ 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,?]? "
 
 #: add-patch.c:108 add-patch.c:176 add-patch.c:221
 msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"applying."
+"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
@@ -441,37 +450,37 @@ 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,?]? "
 
 #: add-patch.c:131 add-patch.c:154 add-patch.c:199
 msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be marked for "
-"discarding."
+"If the patch applies cleanly, the edited hunk will immediately be marked for"
+" discarding."
 msgstr ""
-"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a "
-"ser descartat."
+"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a"
+" ser descartat."
 
 #: add-patch.c:134 add-patch.c:202
 msgid ""
@@ -487,25 +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,?]? "
+"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,?]? "
+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 ""
@@ -525,23 +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,?]? "
+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,?]? "
@@ -574,34 +585,34 @@ 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:342
+#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "no s'ha pogut analitzar la capçalera del tros «%.*s»"
 
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "no s'ha pogut analitzar la capçalera del tros acolorida «%.*s»"
 
-#: add-patch.c:419
+#: add-patch.c:420
 msgid "could not parse diff"
 msgstr "no s'ha pogut analitzar el diff"
 
-#: add-patch.c:438
+#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr "no s'ha pogut analitzar el diff acolorit"
 
-#: add-patch.c:452
+#: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
 msgstr "no s'ha pogut executar «%s»"
 
-#: add-patch.c:611
+#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
 msgstr "sortida no coincident des d'interactive.diffFilter"
 
-#: add-patch.c:612
+#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -609,7 +620,7 @@ msgstr ""
 "El filtre ha de mantenir una correspondència d'un a un\n"
 "entre les línies d'entrada i sortida."
 
-#: add-patch.c:790
+#: add-patch.c:791
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -618,7 +629,7 @@ msgstr ""
 "s'esperava la línia amb contingut #%d a\n"
 "%.*s"
 
-#: add-patch.c:805
+#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -631,12 +642,12 @@ msgstr ""
 "\tno acaben amb:\n"
 "%.*s"
 
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr ""
 "Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n"
 
-#: add-patch.c:1085
+#: add-patch.c:1086
 #, c-format
 msgid ""
 "---\n"
@@ -650,21 +661,21 @@ msgstr ""
 "Les línies que comencin per %c s'eliminaran.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
 "aborted and the hunk is left unchanged.\n"
 msgstr ""
-"Si no s'aplica correctament, tindreu una oportunitat per editar-lo\n"
+"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"
 
-#: add-patch.c:1132
+#: add-patch.c:1133
 msgid "could not parse hunk header"
 msgstr "no s'ha pogut analitzar la capçalera del tros"
 
-#: add-patch.c:1177
+#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr "«git apply --cached» ha fallat"
 
@@ -673,33 +684,33 @@ 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.
-#.
 #. TRANSLATORS: do not translate [y/n]
 #. The program will only accept that input
 #. at this point.
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: add-patch.c:1246 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]? "
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?"
+" "
 msgstr ""
 "El tros editat no s'aplica. Editeu-lo de nou (si responeu «no» es "
 "descartarà) [y/n]? "
 
-#: add-patch.c:1289
+#: add-patch.c:1290
 msgid "The selected hunks do not apply to the index!"
 msgstr "Els trossos seleccionats no s'apliquen a l'índex!"
 
-#: add-patch.c:1290 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:1297 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"
 
-#: add-patch.c:1354
+#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -721,73 +732,73 @@ msgstr ""
 "e - edita manualment el tros actual\n"
 "? - mostra l'ajuda\n"
 
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
 msgstr "Sense tros previ"
 
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
 msgstr "No hi ha tros següent"
 
-#: add-patch.c:1537
+#: add-patch.c:1538
 msgid "No other hunks to goto"
 msgstr "No hi ha altres trossos on anar-hi"
 
-#: add-patch.c:1548 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:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "ves a quin tros? "
 
-#: add-patch.c:1560
+#: add-patch.c:1561
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Número no vàlid: «%s»"
 
-#: add-patch.c:1565
+#: add-patch.c:1566
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Només %d tros disponible."
 msgstr[1] "Només %d trossos disponibles."
 
-#: add-patch.c:1574
+#: add-patch.c:1575
 msgid "No other hunks to search"
 msgstr "No hi ha cap altre tros a cercar"
 
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "cerca per expressió regular? "
 
-#: add-patch.c:1595
+#: add-patch.c:1596
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Expressió regular de cerca mal formada %s: %s"
 
-#: add-patch.c:1612
+#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
 msgstr "No hi ha trossos que coincideixin amb el patró donat"
 
-#: add-patch.c:1619
+#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
 msgstr "No es pot dividir aquest tros"
 
-#: add-patch.c:1623
+#: add-patch.c:1624
 #, c-format
 msgid "Split into %d hunks."
 msgstr "Divideix en %d trossos."
 
-#: add-patch.c:1627
+#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
 msgstr "No es pot editar aquest tros"
 
-#: add-patch.c:1679
+#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr "«git apply» ha fallat"
 
-#: advice.c:145
+#: advice.c:78
 #, c-format
 msgid ""
 "\n"
@@ -796,37 +807,37 @@ msgstr ""
 "\n"
 "Desactiva aquest missatge amb «git config advice.%s false»"
 
-#: advice.c:161
+#: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
-msgstr "%spista: %.*s%s\n"
+msgstr "%sconsell: %.*s%s\n"
 
-#: advice.c:252
+#: advice.c:178
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "Fer «cherry pick» no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:254
+#: advice.c:180
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Cometre no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:256
+#: advice.c:182
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:258
+#: advice.c:184
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Baixar no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:260
+#: advice.c:186
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Revertir no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:262
+#: advice.c:188
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "No és possible %s perquè teniu fitxers sense fusionar."
 
-#: advice.c:270
+#: 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."
@@ -835,36 +846,48 @@ msgstr ""
 "«git add/rm <fitxer>» segons sigui apropiat per a marcar la\n"
 "resolució i feu una comissió."
 
-#: advice.c:278
+#: advice.c:204
 msgid "Exiting because of an unresolved conflict."
 msgstr "S'està sortint a causa d'un conflicte no resolt."
 
-#: advice.c:283 builtin/merge.c:1374
+#: 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)."
 
-#: advice.c:285
+#: advice.c:211
 msgid "Please, commit your changes before merging."
 msgstr "Cometeu els vostres canvis abans de fusionar."
 
-#: advice.c:286
+#: advice.c:212
 msgid "Exiting because of unfinished merge."
 msgstr "S'està sortint a causa d'una fusió no terminada."
 
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "No és possible avançar ràpidament, s'està avortant."
+
+#: advice.c:227
 #, 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"
+"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 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:303
+#: advice.c:234
 msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"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 voleu actualitzar aquestes entrades, proveu les següents solucions:\n"
+"* Utilitzeu l'opció --sparse.\n"
+"* Inhabiliteu o modifiqueu les regles de dispersió."
 
-#: advice.c:310
+#: advice.c:242
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -882,15 +905,14 @@ msgid ""
 "\n"
 "  git switch -\n"
 "\n"
-"Turn off this advice by setting config variable advice.detachedHead to "
-"false\n"
+"Turn off this advice by setting config variable advice.detachedHead to false\n"
 "\n"
 msgstr ""
 "Avís: s'està canviant a «%s».\n"
 "\n"
 "Esteu en un estat de «HEAD separat». Podeu donar un cop d'ull, fer canvis\n"
-"experimentals i cometre'ls, i podeu descartar qualsevol comissió que feu\n"
-"en aquest estat sense impactar a cap branca tornant a una branca.\n"
+"experimentals i cometre'ls. Podeu descartar qualsevol comissió que feu\n"
+"en aquest estat, sense impactar a cap branca, tornant a una branca.\n"
 "\n"
 "Si voleu crear una branca nova per a conservar les comissions que creeu,\n"
 "poder fer-ho (ara o més tard) usant -c amb l'ordre switch. Exemple:\n"
@@ -901,8 +923,7 @@ msgstr ""
 "\n"
 "  git switch -\n"
 "\n"
-"Desactiveu aquest consell configurant la variable advice.detachedHead a "
-"«false»\n"
+"Desactiveu aquest consell configurant la variable advice.detachedHead a «false»\n"
 "\n"
 
 #: alias.c:50
@@ -923,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 dipòsit"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index fora d'un dipòsit"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached fora d'un dipòsit"
+#: 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
@@ -993,11 +1026,11 @@ msgstr "línies de capçalera %d i %d inconsistents"
 #: apply.c:1371
 #, c-format
 msgid ""
-"git diff header lacks filename information when removing %d leading pathname "
-"component (line %d)"
+"git diff header lacks filename information when removing %d leading pathname"
+" component (line %d)"
 msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname "
-"components (line %d)"
+"git diff header lacks filename information when removing %d leading pathname"
+" components (line %d)"
 msgstr[0] ""
 "a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
 "%d component de nom de camí inicial (línia %d)"
@@ -1049,49 +1082,49 @@ msgstr "el fitxer suprimit %s encara té continguts"
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** advertència: el fitxer %s queda buit però no se suprimeix"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "pedaç binari malmès a la línia %d: %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "pedaç binari no reconegut a la línia %d"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "pedaç amb només escombraries a la línia %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "no s'ha pogut obrir o llegir %s"
 
-#: apply.c:2935
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "inici de línia no vàlid: «%c»"
 
-#: apply.c:3056
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament d'%d línia)."
 msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament de %d línies)."
 
-#: apply.c:3068
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d"
 
-#: apply.c:3074
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1100,23 +1133,23 @@ msgstr ""
 "tot cercant:\n"
 "%.*s"
 
-#: apply.c:3096
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "manquen les dades de pedaç binari de «%s»"
 
-#: apply.c:3104
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a «%s»"
 
-#: apply.c:3151
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "no es pot aplicar un pedaç binari a «%s» sense la línia d'índex completa"
 
-#: apply.c:3162
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -1124,291 +1157,290 @@ msgstr ""
 "el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts "
 "actuals."
 
-#: apply.c:3170
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "el pedaç s'aplica a un «%s» buit però no és buit"
 
-#: apply.c:3188
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "no es pot llegir la postimatge %s necessària per a «%s»"
 
-#: apply.c:3201
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "el pedaç binari no s'aplica a «%s»"
 
-#: apply.c:3208
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha "
 "rebut %s)"
 
-#: apply.c:3229
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "el pedaç ha fallat: %s:%ld"
 
-#: apply.c:3352
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "no es pot agafar %s"
 
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 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"
 
-#: apply.c:3412
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "s'està llegint de «%s» més enllà d'un enllaç simbòlic"
 
-#: apply.c:3441 apply.c:3687
+#: 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:3527 apply.c:3702
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: no existeix en l'índex"
 
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: 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:3571
-#, fuzzy
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr ""
-"al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies."
+"al repositori li manca el blob necessari per a fer a una fusió de 3 vies."
 
-#: apply.c:3574
-#, fuzzy, c-format
+#: apply.c:3598
+#, c-format
 msgid "Performing three-way merge...\n"
-msgstr "S'està retrocedint a una fusió de 3 vies...\n"
+msgstr "S'està fent una fusió de 3 vies...\n"
 
-#: apply.c:3590 apply.c:3594
+#: 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:3606
-#, fuzzy, c-format
+#: apply.c:3630
+#, c-format
 msgid "Failed to perform three-way merge...\n"
-msgstr "S'ha produït un error en retrocedir a una fusió de 3 vies...\n"
+msgstr "S'ha produït un error en fer una fusió de tres vies...\n"
 
-#: apply.c:3620
+#: 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:3625
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "S'ha aplicat el pedaç a «%s» netament.\n"
 
-#: apply.c:3642
-#, fuzzy, c-format
+#: apply.c:3666
+#, c-format
 msgid "Falling back to direct application...\n"
-msgstr "S'està retrocedint a una fusió de 3 vies...\n"
+msgstr "S'està usant alternativament l'aplicació directa...\n"
 
-#: apply.c:3654
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
 
-#: apply.c:3727
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipus erroni"
 
-#: apply.c:3729
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s és del tipus %o, s'esperava %o"
 
-#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
-#: read-cache.c:1351
+#: 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:3952
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: ja existeix en l'índex"
 
-#: apply.c:3956
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: ja existeix en el directori de treball"
 
-#: apply.c:3976
+#: 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:3981
+#: 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:4001
+#: 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:4005
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: el pedaç no s'aplica"
 
-#: apply.c:4020
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "S'està comprovant el pedaç %s..."
 
-#: apply.c:4112
+#: 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:4119
+#: 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:4122
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta informació sha1 o és inútil (%s)."
 
-#: apply.c:4131
+#: 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:4141
+#: 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:4279
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "no s'ha pogut eliminar %s de l'índex"
 
-#: apply.c:4313
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "pedaç malmès per al submòdul %s"
 
-#: apply.c:4319
+#: 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:4327
+#: 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"
+"no s'ha pogut crear un magatzem de suport per al fitxer novament creat %s"
 
-#: apply.c:4333 apply.c:4478
+#: 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:4376 builtin/bisect--helper.c:523
+#: 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:4380
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "s'està tancant el fitxer «%s»"
 
-#: apply.c:4450
+#: 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:4548
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "El pedaç %s s'ha aplicat netament."
 
-#: apply.c:4556
+#: apply.c:4580
 msgid "internal error"
 msgstr "error intern"
 
-#: apply.c:4559
+#: 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:4570
+#: 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:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "no es pot obrir %s"
 
-#: apply.c:4592
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "El tros #%d s'ha aplicat netament."
 
-#: apply.c:4596
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "S'ha rebutjat el tros #%d."
 
-#: apply.c:4725
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "S'ha omès el pedaç «%s»."
 
-#: apply.c:4733
-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:4753
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "no es pot llegir el fitxer d'índex"
 
-#: apply.c:4910
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "no es pot obrir el pedaç «%s»: %s"
 
-#: apply.c:4937
+#: 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:4943 apply.c:4958
+#: 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:4951
+#: apply.c:4977
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1417,140 +1449,140 @@ msgstr[0] ""
 msgstr[1] ""
 "S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
 
-#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
+#: 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:4995
+#: 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:4998
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "aplica els canvis que coincideixin amb el camí donat"
 
-#: apply.c:5000 builtin/am.c:2317
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
-msgstr "número"
+msgstr "nombre"
 
-#: apply.c:5001
+#: 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:5004
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "ignora afegiments fets pel pedaç"
 
-#: apply.c:5006
+#: 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"
+"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de "
+"l'entrada"
 
-#: apply.c:5010
+#: 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:5012
+#: 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:5014
+#: 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:5016
+#: 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:5018
+#: 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:5020
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "aplica un pedaç sense tocar l'arbre de treball"
 
-#: apply.c:5022
+#: 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:5025
+#: 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:5027
-#, fuzzy
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
-msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"
+msgstr ""
+"intenta una fusió de tres vies, si falla intenta llavors un pedaç normal"
 
-#: apply.c:5029
+#: 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"
+msgstr ""
+"construeix un índex temporal basat en la informació d'índex incrustada"
 
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: 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:5034
+#: 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:5035 builtin/am.c:2293 builtin/am.c:2296
+#: 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:3831
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
 msgid "action"
 msgstr "acció"
 
-#: apply.c:5036
+#: 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:5039 apply.c:5042
+#: 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:5045
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "aplica el pedaç al revés"
 
-#: apply.c:5047
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "no esperis almenys una línia de context"
 
-#: apply.c:5049
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
 
-#: apply.c:5051
+#: apply.c:5077
 msgid "allow overlapping hunks"
-msgstr "permet trossos encavalcants"
+msgstr "permet trossos superposats"
 
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
-#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "sigues detallat"
-
-#: apply.c:5054
+#: 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:5057
+#: 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:5059 builtin/am.c:2305
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "arrel"
 
-#: apply.c:5060
+#: 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"
@@ -1561,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"
@@ -1585,7 +1617,7 @@ msgstr "el camí no és vàlid en UTF-8: %s"
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "el camí és massa llarg (%d caràcters, SHA1: %s): %s"
 
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
 msgstr "error de deflació (%d)"
@@ -1605,165 +1637,162 @@ msgstr "git archive --list"
 
 #: archive.c:16
 msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> "
+"[<path>...]"
 msgstr ""
-"git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> "
+"git archive --remote <repositori> [--exec <ordre>] [<opcions>] <arbre> "
 "[<camí>...]"
 
 #: archive.c:17
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr "git archive --remote <dipòsit> [--exec <ordre>] --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:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
-#: builtin/merge.c:1143
-#, c-format
-msgid "could not read '%s'"
-msgstr "no s'ha pogut llegir «%s»"
-
-#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
+#: 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"
 
-#: archive.c:451
+#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "no existeix la referència: %.*s"
 
-#: archive.c:457
+#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "no és un nom d'objecte vàlid: %s"
 
-#: archive.c:470
+#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "no és un objecte d'arbre: %s"
 
-#: archive.c:482
+#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "no se segueix el directori de treball actual"
 
-#: archive.c:523
+#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Fitxer no trobat: %s"
 
-#: archive.c:525
+#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "No és un fitxer normal: %s"
 
-#: archive.c:552
+#: archive.c:551
 msgid "fmt"
 msgstr "format"
 
-#: archive.c:552
+#: archive.c:551
 msgid "archive format"
 msgstr "format d'arxiu"
 
-#: archive.c:553 builtin/log.c:1772
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "prefix"
 
-#: archive.c:554
+#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
 msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
 
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: 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: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"
 
-#: archive.c:556
+#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "inclou els fitxers no seguits a l'arxiu"
 
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
 msgid "write the archive to this file"
 msgstr "escriu l'arxiu a aquest fitxer"
 
-#: archive.c:561
+#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "llegeix .gitattributes en el directori de treball"
 
-#: archive.c:562
+#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "informa de fitxers arxivats en stderr"
 
-#: archive.c:564
+#: archive.c:563
 msgid "set compression level"
 msgstr "estableix el nivell de compressió"
 
-#: archive.c:567
+#: archive.c:566
 msgid "list supported archive formats"
 msgstr "llista els formats d'arxiu admesos"
 
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
-msgstr "dipòsit"
+msgstr "repositori"
 
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
 msgid "retrieve the archive from remote repository <repo>"
-msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
+msgstr "recupera l'arxiu del repositori remot <repositori>"
 
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
 msgid "command"
 msgstr "ordre"
 
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
 msgid "path to the remote git-upload-archive command"
 msgstr "camí a l'ordre git-upload-archive remota"
 
-#: archive.c:579
+#: archive.c:578
 msgid "Unexpected option --remote"
 msgstr "Opció inesperada --remote"
 
-#: archive.c:581
-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:583
+#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Opció inesperada --output"
 
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "Les opcions --add-file i --remote no es poden usar juntes"
-
-#: archive.c:607
+#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Format d'arxiu desconegut «%s»"
 
-#: archive.c:616
+#: archive.c:615
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argument no admès per al format «%s»: -%d"
 
-#: attr.c:202
+#: attr.c:203
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s no és un nom d'atribut vàlid"
 
-#: attr.c:363
+#: attr.c:364
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s no està permès: %s:%d"
 
-#: attr.c:403
+#: attr.c:404
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1771,22 +1800,22 @@ msgstr ""
 "Els patrons negatius s'ignoren en els atributs de git\n"
 "Useu «\\!» per exclamació capdavantera literal."
 
-#: bisect.c:489
+#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s"
 
-#: bisect.c:699
+#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "No podem bisecar més!\n"
 
-#: bisect.c:766
+#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "No és un nom de comissió vàlid %s"
 
-#: bisect.c:791
+#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1795,7 +1824,7 @@ msgstr ""
 "La base de fusió %s és errònia.\n"
 "Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n"
 
-#: bisect.c:796
+#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1804,7 +1833,7 @@ msgstr ""
 "La base de fusió %s és nova.\n"
 "La propietat s'ha canviat entre %s i [%s].\n"
 
-#: bisect.c:801
+#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1813,7 +1842,7 @@ msgstr ""
 "La base de fusió %s és %s.\n"
 "Això vol dir que la primera comissió «%s» és entre %s i [%s].\n"
 
-#: bisect.c:809
+#: bisect.c:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1824,7 +1853,7 @@ msgstr ""
 "git bisect no pot funcionar correctament en aquest cas.\n"
 "Potser heu confós les revisions %s i %s?\n"
 
-#: bisect.c:822
+#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1832,41 +1861,40 @@ msgid ""
 "We continue anyway."
 msgstr ""
 "s'ha d'ometre la base de fusió entre %s i [%s].\n"
-"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i "
-"%s.\n"
+"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i %s.\n"
 "Continuem de totes maneres."
 
-#: bisect.c:861
+#: bisect.c:859
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisecant: s'ha de provar una base de fusió\n"
 
-#: bisect.c:911
+#: bisect.c:909
 #, c-format
 msgid "a %s revision is needed"
 msgstr "es necessita una revisió %s"
 
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
 #, c-format
 msgid "could not create file '%s'"
 msgstr "no s'ha pogut crear el fitxer «%s»"
 
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "no s'ha pogut llegir el fitxer «%s»"
 
-#: bisect.c:1027
+#: bisect.c:1025
 msgid "reading bisect refs failed"
 msgstr "la lectura de les referències de bisecció ha fallat"
 
-#: bisect.c:1057
+#: bisect.c:1055
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s era ambdós %s i %s\n"
 
-#: bisect.c:1066
-#, fuzzy, c-format
+#: bisect.c:1064
+#, c-format
 msgid ""
 "No testable commit found.\n"
 "Maybe you started with bad path arguments?\n"
@@ -1874,7 +1902,7 @@ msgstr ""
 "No s'ha trobat cap comissió comprovable.\n"
 "Potser heu començat amb paràmetres de camí incorrectes?\n"
 
-#: bisect.c:1095
+#: bisect.c:1093
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1883,8 +1911,7 @@ msgstr[1] "(aproximadament %d passos)"
 
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
-#.
-#: bisect.c:1101
+#: bisect.c:1099
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1902,23 +1929,24 @@ msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final"
 #: blame.c:2811
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
-"--reverse i --first-parent-together requereixen una última comissió "
+"--reverse i --first-parent junts requereixen una última comissió "
 "especificada"
 
-#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
-#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
-#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
-#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
+#: 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
@@ -1930,110 +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."
+msgid ""
+"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"
@@ -2054,157 +2071,155 @@ 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"
 
-#: bundle.c:41
+#: 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:45
+#: bundle.c:48
 #, c-format
 msgid "unknown capability '%s'"
 msgstr "funcionalitat «%s» desconeguda"
 
-#: bundle.c:71
+#: bundle.c:74
 #, c-format
 msgid "'%s' does not look like a v2 or v3 bundle file"
 msgstr "«%s» no sembla un fitxer de farcell v2 o v3"
 
-#: bundle.c:110
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "capçalera no reconeguda: %s%s (%d)"
 
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: 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'"
 msgstr "no s'ha pogut obrir «%s»"
 
-#: bundle.c:189
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
-msgstr "Al dipòsit li manquen aquestes comissions prerequerides:"
+msgstr "Al repositori li manquen aquestes comissions prerequerides:"
 
-#: bundle.c:192
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
-msgstr "cal un dipòsit per verificar un farcell"
+msgstr "cal un repositori per a verificar un farcell"
 
-#: bundle.c:243
+#: bundle.c:257
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "El farcell conté aquesta referència:"
 msgstr[1] "El farcell conté aquestes %d referències:"
 
-#: bundle.c:250
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "El farcell registra una història completa."
 
-#: bundle.c:252
+#: bundle.c:266
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "El farcell requereix aquesta referència:"
 msgstr[1] "El farcell requereix aquestes %d referències:"
 
-#: bundle.c:319
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "no s'ha pogut duplicar el descriptor del farcell"
 
-#: bundle.c:326
+#: 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:337
+#: bundle.c:351
 msgid "pack-objects died"
-msgstr "El pack-objects s'ha mort"
+msgstr "el pack-objects s'ha mort"
 
-#: bundle.c:386
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "les opcions de la llista de revisions exclouen la referència «%s»"
 
-#: bundle.c:490
+#: bundle.c:504
 #, c-format
 msgid "unsupported bundle version %d"
 msgstr "versió del farcell no compatible %d"
 
-#: bundle.c:492
+#: bundle.c:506
 #, c-format
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "no es pot escriure la versió %d amb l'algorisme %s"
 
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
+#: 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"
 
-#: bundle.c:539
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "S'està refusant crear un farcell buit."
 
-#: bundle.c:549
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "no es pot crear «%s»"
 
-#: bundle.c:574
+#: bundle.c:588
 msgid "index-pack died"
-msgstr "L'index-pack s'ha mort"
+msgstr "l'index-pack s'ha mort"
 
-#: chunk-format.c:113
-#, fuzzy
+#: chunk-format.c:117
 msgid "terminating chunk id appears earlier than expected"
 msgstr ""
-"s'ha acabat l'identificador de fragment multi-index apareix abans del que "
-"s'esperava"
+"l'identificador de fragment de finalització apareix abans del que s'esperava"
 
-#: chunk-format.c:122
-#, fuzzy, c-format
+#: chunk-format.c:126
+#, c-format
 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr ""
-"desplaçament incorrecte de l'objecte per a oid[%d] =%s%<PRIx64> !=%<PRIx64>"
+msgstr "desplaçament incorrecte del fragment %<PRIx64> i %<PRIx64>"
 
-#: chunk-format.c:129
+#: chunk-format.c:133
 #, c-format
 msgid "duplicate chunk ID %<PRIx32> found"
-msgstr ""
+msgstr "s'ha trobat un ID del fragment %<PRIx32> duplicat"
 
-#: chunk-format.c:143
+#: chunk-format.c:147
 #, c-format
 msgid "final chunk has non-zero id %<PRIx32>"
-msgstr ""
+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"
 
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
 msgid "invalid hash version"
 msgstr "especificació de hash no vàlida"
 
@@ -2233,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"
@@ -2253,243 +2268,250 @@ msgstr ""
 msgid "unable to find all commit-graph files"
 msgstr "no es poden trobar tots els fitxers del graf de comissions"
 
-#: commit-graph.c:745 commit-graph.c:782
+#: 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:766
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "no s'ha pogut trobar la comissió %s"
 
-#: commit-graph.c:799
+#: 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é cap"
 
-#: commit-graph.c:1075 builtin/am.c:1340
+#: 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:1337 builtin/pack-objects.c:2897
+#: 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:1368
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "S'estan carregant comissions conegudes al graf de comissions"
 
-#: commit-graph.c:1385
+#: 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:1405
+#: 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:1424
-#, fuzzy
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
-msgstr "S'estan calculant els nombres de generació del graf de comissions"
+msgstr "S'estan calculant els nivells topològics del graf de comissions"
 
-#: commit-graph.c:1477
+#: 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:1558
+#: 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:1635
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "S'estan recollint els objectes referenciats"
 
-#: commit-graph.c:1660
+#: 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'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"
+msgstr[1] ""
+"S'estan cercant les comissions pel graf de comissions en %d paquets"
 
-#: commit-graph.c:1673
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "error en afegir paquet %s"
 
-#: commit-graph.c:1677
+#: 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:1714
+#: 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:1732
+#: 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:1781
+#: 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:1812 midx.c:906
+#: 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:1825
+#: 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:1830
+#: 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:1887
+#: 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:1923
+#: 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:1939
+#: 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:1959
+#: 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:2092
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "S'estan escanejant les comissions fusionades"
 
-#: commit-graph.c:2136
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "S'està fusionant el graf de comissions"
 
-#: commit-graph.c:2244
+#: 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:2351
+#: 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:2450
+#: 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:2460
+#: 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:2470 commit-graph.c:2485
+#: 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"
+"el graf de comissions té un valor de «fanout» incorrecte: fanout[%d] = %u !="
+" %u"
 
-#: commit-graph.c:2477
+#: 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:2495
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "S'estan verificant les comissions al graf de comissions"
 
-#: commit-graph.c:2510
+#: 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:2517
+#: 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"
+"OID de l'arbre arrel per a comissions %s en el graf de comissions és %s != "
+"%s"
 
-#: commit-graph.c:2527
+#: 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:2536
+#: 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:2550
+#: 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:2555
+#: commit-graph.c:2587
 #, c-format
 msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+"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ò "
-"té no zero en altres llocs"
+"el graf de comissions té nombre de generació zero per a la comissió %s, però"
+" té no zero en altres llocs"
 
-#: commit-graph.c:2559
+#: commit-graph.c:2591
 #, c-format
 msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+"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:2576
-#, fuzzy, c-format
+#: commit-graph.c:2608
+#, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
-msgstr "La generació del graf de comissions per la comissió %s és %u != %u"
+msgstr ""
+"generació del graf de comissions per a la comissió %s és %<PRIuMAX> < "
+"%<PRIuMAX>"
 
-#: commit-graph.c:2582
+#: 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:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
-#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 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"
 
-#: commit.c:54
+#: commit.c:55
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s no és una comissió!"
 
-#: commit.c:194
+#: commit.c:196
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -2503,32 +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:1237
+#: 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:1241
+#: 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:1244
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "La comissió %s no té signatura GPG."
 
-#: commit.c:1247
+#: 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:1501
+#: 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"
@@ -2543,7 +2566,7 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "memòria esgotada"
 
-#: config.c:126
+#: config.c:125
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -2558,36 +2581,36 @@ msgstr ""
 "\t%s\n"
 "Això pot ser degut a inclusions circulars."
 
-#: config.c:142
+#: config.c:141
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "no s'ha pogut expandir el camí d'inclusió «%s»"
 
-#: config.c:153
+#: config.c:152
 msgid "relative config includes must come from files"
 msgstr "les inclusions de configuració relatives han de venir de fitxers"
 
-#: config.c:199
+#: config.c:201
 msgid "relative config include conditionals must come from files"
 msgstr ""
 "els condicionals d'inclusió de configuració relatius han de venir de fitxers"
 
-#: config.c:396
+#: config.c:398
 #, c-format
 msgid "invalid config format: %s"
 msgstr "format de configuració no vàlid: %s"
 
-#: config.c:400
+#: config.c:402
 #, c-format
 msgid "missing environment variable name for configuration '%.*s'"
-msgstr ""
+msgstr "falta el nom de la variable d'entorn per a la configuració «%.*s»"
 
-#: config.c:405
+#: config.c:407
 #, c-format
 msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr ""
+msgstr "falta la variable d'entorn «%s» per a la configuració «%.*s»"
 
-#: config.c:442
+#: config.c:443
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "la clau no conté una secció: «%s»"
@@ -2597,302 +2620,306 @@ 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:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "clau no vàlida: %s"
 
-#: config.c:478
+#: config.c:475
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "clau no vàlida (línia nova): %s"
 
-#: config.c:511
+#: config.c:495
 msgid "empty config key"
 msgstr "clau de configuració buida"
 
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "paràmetre de configuració erroni: %s"
 
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
 #, c-format
 msgid "bogus format in %s"
 msgstr "format erroni a %s"
 
-#: config.c:622
-#, fuzzy, c-format
+#: config.c:606
+#, c-format
 msgid "bogus count in %s"
-msgstr "format erroni a %s"
+msgstr "comptatge erroni a %s"
 
-#: config.c:626
+#: config.c:610
 #, c-format
 msgid "too many entries in %s"
 msgstr "hi ha massa arguments a %s"
 
-#: config.c:636
-#, fuzzy, c-format
+#: config.c:620
+#, c-format
 msgid "missing config key %s"
-msgstr "fitxer de configuració no vàlid %s"
+msgstr "falta la clau de configuració %s"
 
-#: config.c:644
-#, fuzzy, c-format
+#: config.c:628
+#, c-format
 msgid "missing config value %s"
-msgstr "falta el valor per «%s»"
+msgstr "falta el valor de configuració %s"
 
-#: config.c:995
+#: config.c:979
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "línia de configuració %d errònia en el blob %s"
 
-#: config.c:999
+#: config.c:983
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "línia de configuració %d errònia en el fitxer %s"
 
-#: config.c:1003
+#: config.c:987
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "línia de configuració %d errònia en l'entrada estàndard"
 
-#: config.c:1007
+#: config.c:991
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "línia de configuració %d errònia en el blob de submòdul %s"
 
-#: config.c:1011
+#: config.c:995
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "línia de configuració %d errònia en la línia d'ordres %s"
 
-#: config.c:1015
+#: config.c:999
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "línia de configuració %d errònia en %s"
 
-#: config.c:1152
+#: config.c:1136
 msgid "out of range"
 msgstr "fora de rang"
 
-#: config.c:1152
+#: config.c:1136
 msgid "invalid unit"
 msgstr "unitat no vàlida"
 
-#: config.c:1153
+#: config.c:1137
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "valor de configuració numèric erroni «%s» per «%s»: %s"
 
-#: config.c:1163
+#: config.c:1147
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "valor de configuració numèric erroni «%s» per «%s» en el blob %s: %s"
 
-#: config.c:1166
+#: config.c:1150
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
-msgstr "valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s"
+msgstr ""
+"valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s"
 
-#: config.c:1169
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
-"valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: %s"
+"valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: "
+"%s"
 
-#: config.c:1172
+#: config.c:1156
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "valor de configuració numèric «%s» erroni per «%s» en el blob de submòdul "
 "%s: %s"
 
-#: config.c:1175
+#: config.c:1159
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "valor de configuració numèric «%s» erroni per «%s» en la línia d'ordres %s: "
 "%s"
 
-#: config.c:1178
+#: config.c:1162
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "valor de configuració numèric incorrecte «%s» per «%s» en %s: %s"
 
-#: config.c:1257
-#, fuzzy, c-format
+#: config.c:1241
+#, c-format
 msgid "bad boolean config value '%s' for '%s'"
-msgstr "valor de configuració numèric erroni «%s» per «%s»: %s"
+msgstr "valor de configuració booleà erroni «%s» per a «%s»"
 
-#: config.c:1275
+#: config.c:1259
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "s'ha produït un error en expandir el directori d'usuari en: «%s»"
 
-#: config.c:1284
+#: config.c:1268
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "«%s» per a «%s» no és una marca de temps vàlida"
 
-#: config.c:1377
+#: config.c:1361
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "la longitud d'«abbrev» està fora de rang: %d"
 
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "nivell de compressió de zlib incorrecte %d"
 
-#: config.c:1494
+#: config.c:1476
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar només hauria de ser un caràcter"
 
-#: config.c:1527
+#: config.c:1509
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "mode de creació d'objecte no vàlid: %s"
 
-#: config.c:1599
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "valor no vàlid per a %s"
 
-#: config.c:1625
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "valor no vàlid per a %s: %s"
 
-#: config.c:1626
+#: 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:1687 builtin/pack-objects.c:3924
+#: 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:1809
+#: 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:1812
+#: 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:1829
+#: 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:1873
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "s'ha produït un error en analitzar %s"
 
-#: config.c:1929
+#: 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:2293
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
-msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
+msgstr ""
+"un error desconegut ha ocorregut en llegir els fitxers de configuració"
 
-#: config.c:2467
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s no vàlid: «%s»"
 
-#: config.c:2512
+#: 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:2558
+#: 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:2560
+#: 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:2644
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nom de secció no vàlid «%s»"
 
-#: config.c:2676
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s té múltiples valors"
 
-#: config.c:2705
+#: 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:2957 config.c:3283
+#: 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:2968
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "s'està obrint %s"
 
-#: config.c:3005 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:3030
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "fitxer de configuració no vàlid %s"
 
-#: config.c:3043 config.c:3296
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "ha fallat «fstat» a %s"
 
-#: config.c:3054
+#: config.c:3047
 #, c-format
-msgid "unable to mmap '%s'"
-msgstr "no s'ha pogut fer «mmap» «%s»"
+msgid "unable to mmap '%s'%s"
+msgstr "no s'ha pogut fer «mmap» «%s»%s"
 
-#: config.c:3063 config.c:3301
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "ha fallat chmod a %s"
 
-#: config.c:3148 config.c:3398
+#: 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:3182
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "no s'ha pogut establir «%s» a «%s»"
 
-#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: 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:3274
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "nom de secció no vàlida: %s"
 
-#: config.c:3441
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "falta el valor per «%s»"
@@ -2908,10 +2935,10 @@ msgid ""
 "Please make sure you have the correct access rights\n"
 "and the repository exists."
 msgstr ""
-"No s'ha pogut llegir del dipòsit remot.\n"
+"No s'ha pogut llegir del repositori remot.\n"
 "\n"
 "Assegureu-vos que tingueu els permisos\n"
-"d'accés correctes i que el dipòsit existeixi."
+"d'accés correctes i que el repositori existeixi."
 
 #: connect.c:81
 #, c-format
@@ -2927,73 +2954,74 @@ msgstr "el servidor no és compatible amb la característica «%s»"
 msgid "expected flush after capabilities"
 msgstr "s'esperava un buidatge després de les capacitats"
 
-#: connect.c:263
+#: connect.c:265
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "ignora les capacitats després de la primera línia «%s»"
 
-#: connect.c:284
+#: connect.c:286
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "error de protocol: unexpected capabilities^{}"
 
-#: connect.c:306
+#: connect.c:308
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr ""
 "s'ha produït un error de protocol: s'esperava shallow sha-1, s'ha rebut «%s»"
 
-#: connect.c:308
+#: connect.c:310
 msgid "repository on the other end cannot be shallow"
-msgstr "el dipòsit de l'altre extrem no pot ser shallow"
+msgstr "el repositori de l'altre extrem no pot ser shallow"
 
-#: connect.c:347
+#: connect.c:349
 msgid "invalid packet"
 msgstr "paquet no vàlid"
 
-#: connect.c:367
+#: connect.c:369
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "s'ha produït un error de protocol: no s'esperava «%s»"
 
-#: connect.c:497
+#: connect.c:499
 #, c-format
 msgid "unknown object format '%s' specified by server"
 msgstr "format d'objecte «%s» especificat pel servidor desconegut"
 
-#: connect.c:526
+#: connect.c:528
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "resposta de ls-refs no vàlida: %s"
 
-#: connect.c:530
+#: connect.c:532
 msgid "expected flush after ref listing"
 msgstr "s'esperava una neteja després del llistat de referències"
 
-#: connect.c:533
+#: connect.c:535
 msgid "expected response end packet after ref listing"
-msgstr "s'esperava un final de resposta després del llistat de referències"
+msgstr ""
+"s'esperava un paquet de final de resposta després del llistat de referències"
 
-#: connect.c:666
+#: connect.c:670
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "el protocol «%s» no és compatible"
 
-#: connect.c:717
+#: connect.c:721
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "no s'ha pogut establir SO_KEEPALIVE al sòcol"
 
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
 #, c-format
 msgid "Looking up %s ... "
 msgstr "S'està cercant %s..."
 
-#: connect.c:761
+#: connect.c:765
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "no s'ha pogut trobar %s (port %s) (%s)"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
 #, c-format
 msgid ""
 "done.\n"
@@ -3002,7 +3030,7 @@ msgstr ""
 "fet.\n"
 "S'està connectant a %s (port %s) ... "
 
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -3012,79 +3040,81 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
 msgid "done."
 msgstr "fet."
 
-#: connect.c:824
+#: connect.c:828
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "no s'ha pogut trobar %s (%s)"
 
-#: connect.c:830
+#: connect.c:834
 #, c-format
 msgid "unknown port %s"
 msgstr "port desconegut %s"
 
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "s'ha bloquejat el nom estrany d'amfitrió «%s»"
 
-#: connect.c:969
+#: connect.c:973
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "s'ha bloquejat el port estrany «%s»"
 
-#: connect.c:979
+#: connect.c:983
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "no s'ha pogut iniciar servidor intermediari «%s»"
 
-#: connect.c:1050
+#: connect.c:1054
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
-"no s'ha especificat un camí; vegeu «git help pull» per la sintaxi vàlida per "
-"URL"
+"no s'ha especificat un camí; vegeu «git help pull» per la sintaxi vàlida per"
+" URL"
 
-#: connect.c:1190
+#: connect.c:1194
 msgid "newline is forbidden in git:// hosts and repo paths"
 msgstr ""
+"la línia nova està prohibida en els servidors git:// i els camins de "
+"repositori"
 
-#: connect.c:1247
+#: connect.c:1251
 msgid "ssh variant 'simple' does not support -4"
 msgstr "la variant «simple» de ssh no és compatible amb -4"
 
-#: connect.c:1259
+#: connect.c:1263
 msgid "ssh variant 'simple' does not support -6"
 msgstr "la variant «simple» de ssh no és compatible amb -6"
 
-#: connect.c:1276
+#: connect.c:1280
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "la variant «simple» de ssh no permet definir el port"
 
-#: connect.c:1388
+#: connect.c:1392
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "s'ha bloquejat el nom de fitxer estrany «%s»"
 
-#: connect.c:1436
+#: connect.c:1440
 msgid "unable to fork"
 msgstr "no s'ha pogut bifurcar"
 
-#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "S'està comprovant la connectivitat"
 
-#: connected.c:120
+#: connected.c:122
 msgid "Could not run 'git rev-list'"
 msgstr "No s'ha pogut executar «git rev-list»"
 
-#: connected.c:144
+#: connected.c:146
 msgid "failed write to rev-list"
 msgstr "escriptura fallada al rev-list"
 
-#: connected.c:149
+#: connected.c:151
 msgid "failed to close rev-list's stdin"
 msgstr "s'ha produït un error en tancar l'stdin del rev-list"
 
@@ -3105,8 +3135,7 @@ msgid ""
 "The file will have its original line endings in your working directory"
 msgstr ""
 "CRLF serà reemplaçat per LF en %s.\n"
-"El fitxer tindrà els seus terminadors de línia originals en el vostre "
-"directori de treball"
+"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de treball"
 
 #: convert.c:206
 #, c-format
@@ -3120,8 +3149,7 @@ msgid ""
 "The file will have its original line endings in your working directory"
 msgstr ""
 "LF serà reemplaçat per CRLF en %s.\n"
-"El fitxer tindrà els seus terminadors de línia originals en el vostre "
-"directori de treball"
+"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de treball"
 
 #: convert.c:273
 #, c-format
@@ -3134,8 +3162,8 @@ msgid ""
 "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
 "working-tree-encoding."
 msgstr ""
-"El fitxer «%s» conté una marca d'ordre de byte (BOM). Utilitzeu UTF-%.*s com "
-"a codificacions d'arbre de treball."
+"El fitxer «%s» conté una marca d'ordre de byte (BOM). Utilitzeu UTF-%.*s com"
+" a codificacions d'arbre de treball."
 
 #: convert.c:293
 #, c-format
@@ -3145,11 +3173,12 @@ msgstr "La BOM és necessària en «%s» si està codificada com a %s"
 #: convert.c:295
 #, c-format
 msgid ""
-"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
-"%sLE (depending on the byte order) as working-tree-encoding."
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or "
+"UTF-%sLE (depending on the byte order) as working-tree-encoding."
 msgstr ""
-"Falta una marca d'ordre de byte (BOM) al fitxer «%s». Useu UTF-%sBE o UTF-"
-"%sLE (depenent de l'ordre de byte) com a codificacions d'arbre de treball."
+"Falta una marca d'ordre de byte (BOM) al fitxer «%s». Useu UTF-%sBE o "
+"UTF-%sLE (depenent de l'ordre de byte) com a codificacions d'arbre de "
+"treball."
 
 #: convert.c:408 convert.c:479
 #, c-format
@@ -3194,25 +3223,25 @@ msgstr "tipus de filtre inesperat"
 msgid "path name too long for external filter"
 msgstr "el nom del camí és massa gran per al filtre extern"
 
-#: convert.c:934
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
 "been filtered"
 msgstr ""
-"el filtre extern «%s» ja no està disponible encara que no s'han filtrat tots "
-"els camins"
+"el filtre extern «%s» ja no està disponible encara que no s'han filtrat tots"
+" els camins"
 
-#: convert.c:1234
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr "cert/fals no són codificacions d'arbre de treball vàlides"
 
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: el filtre de netejat «%s» ha fallat"
 
-#: convert.c:1490
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: ha fallat el filtre smudge %s"
@@ -3232,17 +3261,17 @@ msgid "refusing to work with credential missing protocol field"
 msgstr ""
 "s'ha rebutjat treballar amb credencials que no tenen el camp de protocol"
 
-#: credential.c:394
+#: credential.c:395
 #, c-format
 msgid "url contains a newline in its %s component: %s"
 msgstr "url conté una línia nova en %s component: %s"
 
-#: credential.c:438
+#: credential.c:439
 #, c-format
 msgid "url has no scheme: %s"
 msgstr "l'url no té esquema: %s"
 
-#: credential.c:511
+#: credential.c:512
 #, c-format
 msgid "credential url cannot be parsed: %s"
 msgstr "no s'ha pogut analitzar l'URL de credencials: %s"
@@ -3342,56 +3371,56 @@ msgstr ""
 msgid "Marked %d islands, done.\n"
 msgstr "Marcades %d illes, fet.\n"
 
-#: diff-merges.c:80
+#: diff-merges.c:70
 #, c-format
 msgid "unknown value for --diff-merges: %s"
 msgstr "valor desconegut per a --diff-merges: %s"
 
-#: diff-lib.c:538
+#: diff-lib.c:561
 msgid "--merge-base does not work with ranges"
 msgstr "--merge-base no funciona amb intervals"
 
-#: diff-lib.c:540
+#: diff-lib.c:563
 msgid "--merge-base only works with commits"
 msgstr "--merge-base només funciona amb comissions"
 
-#: diff-lib.c:557
+#: diff-lib.c:580
 msgid "unable to get HEAD"
 msgstr "no s'ha pogut obtenir HEAD"
 
-#: diff-lib.c:564
+#: diff-lib.c:587
 msgid "no merge base found"
 msgstr "no s'ha trobat una base de fusió"
 
-#: diff-lib.c:566
+#: diff-lib.c:589
 msgid "multiple merge bases found"
 msgstr "s'han trobat múltiples bases de fusió"
 
-#: diff-no-index.c:238
+#: diff-no-index.c:237
 msgid "git diff --no-index [<options>] <path> <path>"
 msgstr "git diff --no-index [<opcions>] <camí> <camí>"
 
-#: diff-no-index.c:263
+#: diff-no-index.c:262
 msgid ""
 "Not a git repository. Use --no-index to compare two paths outside a working "
 "tree"
 msgstr ""
-"No és un dipòsit Git. Useu --no-index per a comparar dos camins fora del "
+"No és un repositori Git. Useu --no-index per a comparar dos camins fora del "
 "directori de treball"
 
-#: diff.c:156
+#: 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:161
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Paràmetre de dirstat desconegut «%s»\n"
 
-#: diff.c:297
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -3399,31 +3428,31 @@ msgstr ""
 "el paràmetre de color en moviment ha de ser «no», «default», «blocks», "
 "«zebra», «dimmed-zebra» o «plain»"
 
-#: diff.c:325
+#: 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'"
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change',"
+" 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
 msgstr ""
 "el mode «%s» de «color-moved-ws» és desconegut, els valor possibles són "
 "«ignore-space-change», «ignore-space-at-eol», «ignore-all-space», «allow-"
-"indentation-change»."
+"indentation-change»"
 
-#: diff.c:333
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
 msgstr ""
-"color-moved-ws: allow-indentation-change no es pot combinar amb altres modes "
-"d'espai en blanc"
+"color-moved-ws: allow-indentation-change no es pot combinar amb altres modes"
+" d'espai en blanc"
 
-#: diff.c:410
+#: 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:470
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3432,35 +3461,49 @@ msgstr ""
 "S'han trobat errors en la variable de configuració «diff.dirstat»:\n"
 "%s"
 
-#: diff.c:4278
+#: 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:4630
-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:4633
-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: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:4712
+#: diff.c:4601
+#, c-format
+msgid ""
+"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:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow requereix exactament una especificació de camí"
 
-#: diff.c:4760
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "valor --stat no vàlid: %s"
 
-#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: 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:4797
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3469,200 +3512,199 @@ msgstr ""
 "S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4882
+#: 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:4906
+#: 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:4920
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "no s'ha pogut resoldre «%s»"
 
-#: diff.c:4970 diff.c:4976
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s espera una forma <n>/<m>"
 
-#: diff.c:4988
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s esperava un caràcter, s'ha rebut «%s»"
 
-#: diff.c:5009
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "argument --color-moved incorrecte: %s"
 
-#: diff.c:5028
+#: 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:5068
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
+#: 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:5104 diff.c:5124
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "argument no vàlid a %s"
 
-#: diff.c:5228
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "expressió regular donada a -I: no vàlida: «%s»"
 
-#: diff.c:5277
+#: 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:5333
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "argument --word-diff incorrecte: %s"
 
-#: diff.c:5369
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "Opcions del format de sortida del diff"
 
-#: diff.c:5371 diff.c:5377
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
-msgstr "generant pedaç"
+msgstr "genera el pedaç"
 
-#: diff.c:5374 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "omet la sortida de diferències"
 
-#: diff.c:5379 diff.c:5493 diff.c:5500
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5380 diff.c:5383
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "genera diffs amb <n> línies de context"
 
-#: diff.c:5385
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "genera el diff en format cru"
 
-#: diff.c:5388
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "sinònim de «-p --raw»"
 
-#: diff.c:5392
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "sinònim de «-p --stat»"
 
-#: diff.c:5396
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "llegible per màquina --stat"
 
-#: diff.c:5399
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "mostra només l'última línia de --stat"
 
-#: diff.c:5401 diff.c:5409
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5402
+#: 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:5406
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "sinònim de --dirstat=cumulative"
 
-#: diff.c:5410
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "sinònim de --dirstat=files,param1,param2..."
 
-#: diff.c:5414
+#: 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:5417
+#: 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:5420
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "mostra només els noms de fitxers canviats"
 
-#: diff.c:5423
+#: 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:5425
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<amplada>[<amplada-nom>[,<recompte>]]"
 
-#: diff.c:5426
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "genera diffstat"
 
-#: diff.c:5428 diff.c:5431 diff.c:5434
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<amplada>"
 
-#: diff.c:5429
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "genera diffstat amb una amplada donada"
 
-#: diff.c:5432
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "genera diffstat amb un nom d'amplada donat"
 
-#: diff.c:5435
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "genera diffstat amb una amplada de graf donada"
 
-#: diff.c:5437
+#: diff.c:5406
 msgid "<count>"
 msgstr "<comptador>"
 
-#: diff.c:5438
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "genera diffstat amb línies limitades"
 
-#: diff.c:5441
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "genera un resum compacte a diffstat"
 
-#: diff.c:5444
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "diff amb sortida binària que pot ser aplicada"
 
-#: diff.c:5447
+#: 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»"
+"mostra els noms complets dels objectes pre i post-imatge a les línies "
+"«index»"
 
-#: diff.c:5449
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "mostra un diff amb colors"
 
-#: diff.c:5450
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<kind>"
 
-#: diff.c:5451
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -3670,7 +3712,7 @@ msgstr ""
 "ressalta els errors d'espai en blanc a les línies «context», «old» o «new» "
 "al diff"
 
-#: diff.c:5454
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3678,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:5457 diff.c:5460 diff.c:5463 diff.c:5572
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<prefix>"
 
-#: diff.c:5458
+#: 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:5461
+#: 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:5464
+#: 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:5467
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "no mostris cap prefix d'origen o destí"
 
-#: diff.c:5470
+#: 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:5474 diff.c:5479 diff.c:5484
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<char>"
 
-#: diff.c:5475
+#: 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:5480
+#: 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:5485
+#: 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:5488
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "Opcions de canvi de nom del diff"
 
-#: diff.c:5489
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5490
+#: 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:5494
+#: diff.c:5463
 msgid "detect renames"
 msgstr "detecta els canvis de noms"
 
-#: diff.c:5498
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "omet les preimatges per les supressions"
 
-#: diff.c:5501
+#: diff.c:5470
 msgid "detect copies"
 msgstr "detecta còpies"
 
-#: diff.c:5505
+#: 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:5507
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "inhabilita la detecció de canvis de nom"
 
-#: diff.c:5510
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "usa els blobs buits com a font de canvi de nom"
 
-#: diff.c:5512
+#: 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:5515
+#: 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 "
-"nom/còpia supera el límit indicat"
+"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:5517
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Opcions de l'algorisme Diff"
 
-#: diff.c:5519
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "produeix el diff més petit possible"
 
-#: diff.c:5522
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "ignora els espais en blanc en comparar línies"
 
-#: diff.c:5525
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "ignora els canvis en la quantitat d'espai en blanc"
 
-#: diff.c:5528
+#: 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:5531
+#: 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:5534
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "ignora els canvis en línies que estan en blanc"
 
-#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<regex>"
 
-#: diff.c:5537
+#: 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:5540
+#: 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:5543
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "genera diff usant l'algorisme «patience diff»"
 
-#: diff.c:5547
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "genera diff usant l'algorisme «histogram diff»"
 
-#: diff.c:5549
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<algorisme>"
 
-#: diff.c:5550
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "trieu un algorisme per al diff"
 
-#: diff.c:5552
+#: diff.c:5521
 msgid "<text>"
 msgstr "<text>"
 
-#: diff.c:5553
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "genera diff usant l'algorisme «anchored diff»"
 
-#: diff.c:5555 diff.c:5564 diff.c:5567
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<mode>"
 
-#: diff.c:5556
+#: 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:5559
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr "utilitza <regex> per a decidir què és una paraula"
 
-#: diff.c:5562
+#: 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:5565
+#: 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:5568
+#: 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:5571
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Altres opcions diff"
 
-#: diff.c:5573
+#: 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"
+"quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els"
+" camins relatius"
 
-#: diff.c:5577
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "tracta tots els fitxers com a text"
 
-#: diff.c:5579
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "intercanvia les dues entrades, inverteix el diff"
 
-#: diff.c:5581
+#: 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:5583
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "inhabilita totes les sortides del programa"
 
-#: diff.c:5585
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "permet executar un ajudant de diff extern"
 
-#: diff.c:5587
+#: 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:5589
+#: diff.c:5558
 msgid "<when>"
 msgstr "<quan>"
 
-#: diff.c:5590
+#: 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:5593
+#: diff.c:5562
 msgid "<format>"
 msgstr "<format>"
 
-#: diff.c:5594
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "especifiqueu com es mostren els canvis als submòduls"
 
-#: diff.c:5598
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "amaga les entrades «git add -N» de l'índex"
 
-#: diff.c:5601
+#: 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:5603
+#: diff.c:5572
 msgid "<string>"
 msgstr "<cadena>"
 
-#: diff.c:5604
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
@@ -3934,7 +3976,7 @@ msgstr ""
 "cerca les diferències que canvien el nombre d'ocurrències de la cadena "
 "especificada"
 
-#: diff.c:5607
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3942,40 +3984,35 @@ msgstr ""
 "cerca les diferències que canvien el nombre d'ocurrències de l'expressió "
 "regular especificada"
 
-#: diff.c:5610
+#: 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:5613
+#: 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:5616
+#: 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:5617 diff.c:5620
-#, fuzzy
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
-msgstr "camí"
+msgstr "<camí>"
 
-#: diff.c:5618
-#, fuzzy
+#: diff.c:5587
 msgid "show the change in the specified path first"
-msgstr ""
-"escriu el fitxer d'índex de paquet en la versió de format d'índex "
-"especificada"
+msgstr "mostra el canvi primer al camí especificat"
 
-#: diff.c:5621
-#, fuzzy
+#: diff.c:5590
 msgid "skip the output to the specified path"
-msgstr "Restableix la HEAD actual a l'estat especificat"
+msgstr "omet la sortida al camí especificat"
 
-#: diff.c:5623
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<id de l'objecte>"
 
-#: diff.c:5624
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
@@ -3983,111 +4020,119 @@ msgstr ""
 "cerca les diferències que canvien el nombre d'ocurrències de l'objecte "
 "especificat"
 
-#: diff.c:5626
+#: 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:5627
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "seleccioneu els fitxers per tipus de diff"
 
-#: diff.c:5629
+#: diff.c:5598
 msgid "<file>"
 msgstr "<fitxer>"
 
-#: diff.c:5630
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "Sortida a un fitxer específic"
 
-#: diff.c:6287
-msgid "inexact rename detection was skipped due to too many files."
+#: 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 inexacta a causa de massa fitxers."
+"s'ha omès la detecció de canvi de nom exhaustiva perquè hi ha massa fitxers."
 
-#: diff.c:6290
+#: 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 a causa de massa fitxers."
+"només s'han trobat còpies des de camins modificats perquè de massa fitxers."
 
-#: diff.c:6293
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr ""
-"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar "
-"l'ordre."
+"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar"
+" l'ordre."
 
 #: diffcore-order.c:24
 #, c-format
 msgid "failed to read orderfile '%s'"
 msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
 
-#: diffcore-rename.c:1418
+#: diffcore-rename.c:1564
 msgid "Performing inexact rename detection"
 msgstr "S'està realitzant una detecció inexacta de canvis de nom"
 
 #: diffcore-rotate.c:29
-#, fuzzy, c-format
+#, c-format
 msgid "No such path '%s' in the diff"
-msgstr "no hi ha tal camí %s en %s"
+msgstr "No existeix el camí «%s» al diff"
 
-#: dir.c:578
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 "l'especificació de camí «%s» no ha coincidit amb cap fitxer que git conegui"
 
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr "patró no reconegut: «%s»"
 
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "patró negatiu no reconegut: «%s»"
 
-#: dir.c:809
+#: dir.c:820
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr ""
 "el vostre fitxer «sparse-checkout» pot tenir problemes el patró «%s» es "
 "repeteix"
 
-#: dir.c:819
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "inhabilita la coincidència de patrons «cone»"
 
-#: dir.c:1206
+#: 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:2314
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "no s'ha pogut obrir el directori «%s»"
 
-#: dir.c:2614
+#: 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:2738
+#: 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:3543
+#: dir.c:3112
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"No s'ha pogut endevinar cap nom de directori.\n"
+"Especifiqueu un directori en la línia d'ordres"
+
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
-msgstr "el fitxer d'índex al dipòsit %s és malmès"
+msgstr "el fitxer d'índex al repositori %s és malmès"
 
-#: dir.c:3590 dir.c:3595
+#: 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:3624
+#: 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»"
@@ -4095,7 +4140,7 @@ msgstr "no s'ha pogut migrar el directori de «%s» a «%s»"
 #: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
-msgstr "pista: s'està esperant que el vostre editor tanqui el fitxer...%c"
+msgstr "consell: s'està esperant que el vostre editor tanqui el fitxer...%c"
 
 #: entry.c:179
 msgid "Filtering content"
@@ -4106,409 +4151,477 @@ msgstr "S'està filtrant el contingut"
 msgid "could not stat file '%s'"
 msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
 
-#: environment.c:152
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "camí d'espai de noms git incorrecte «%s»"
 
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "no s'ha pogut establir GIT_DIR a «%s»"
-
 #: exec-cmd.c:363
 #, c-format
 msgid "too many args to run %s"
 msgstr "hi ha massa arguments per a executar %s"
 
-#: fetch-pack.c:182
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: llista shallow esperada"
 
-#: fetch-pack.c:185
+#: 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"
+"git fetch-pack: s'esperava un paquet de buidatge després d'una llista "
+"shallow"
 
-#: fetch-pack.c:196
+#: 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:216
+#: 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:227
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "no s'ha pogut escriure al remot"
 
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc requereix multi_ack_detailed"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: 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:389 fetch-pack.c:1429
+#: 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:391 fetch-pack.c:1431
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "objecte no trobat: %s"
 
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "error en objecte: %s"
 
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: 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:399 fetch-pack.c:1440
+#: 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:439
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "s'ha rebut %s %d %s"
 
-#: fetch-pack.c:456
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "comissió no vàlida %s"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "s'abandona"
 
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "fet"
 
-#: fetch-pack.c:512
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "s'ha rebut %s (%d) %s"
 
-#: fetch-pack.c:548
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "S'està marcant %s com a complet"
 
-#: fetch-pack.c:763
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ja es té %s (%s)"
 
-#: fetch-pack.c:849
+#: 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"
+msgstr ""
+"fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "error de protocol: capçalera de paquet errònia"
 
-#: fetch-pack.c:951
+#: 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:957
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
-msgstr ""
+msgstr "fetch-pack: sortida d'index-pack no vàlida"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "%s ha fallat"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "error en desmultiplexor de banda lateral"
 
-#: fetch-pack.c:1019
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La versió del servidor és %.*s"
 
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
+#: 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:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: 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:1029
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "El servidor no permet clients superficials"
 
-#: fetch-pack.c:1089
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "El servidor no admet --shallow-since"
 
-#: fetch-pack.c:1094
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "El servidor no admet --shallow-exclude"
 
-#: fetch-pack.c:1098
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "El servidor no admet --deepen"
 
-#: fetch-pack.c:1100
+#: 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 dipòsit"
+msgstr ""
+"El servidor no és compatible amb el format d'objecte d'aquest repositori"
 
-#: fetch-pack.c:1113
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "cap comissió en comú"
 
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
-#, fuzzy
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
-msgstr "el dipòsit font és superficial, s'està ignorant --local"
+msgstr "el repositori font és superficial, es rebutja clonar-ho."
 
-#: fetch-pack.c:1128 fetch-pack.c:1651
+#: 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:1242
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "algoritmes no coincidents: client %s; servidor %s"
 
-#: fetch-pack.c:1246
+#: 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:1279
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "El servidor no permet sol·licituds superficials"
 
-#: fetch-pack.c:1286
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "El servidor accepta filtratge"
 
-#: fetch-pack.c:1329 fetch-pack.c:2034
+#: 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:1347
+#: 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:1353
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "s'esperava «%s», s'ha rebut «%s»"
 
-#: fetch-pack.c:1387
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "línia de confirmació inesperada: «%s»"
 
-#: fetch-pack.c:1392
+#: 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:1402
+#: 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:1404
+#: 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:1445
+#: 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:1494
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "s'esperava wanted-ref, s'ha rebut «%s»"
 
-#: fetch-pack.c:1499
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref inesperat: «%s»"
 
-#: fetch-pack.c:1504
+#: 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:1534
+#: 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:1930
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "no hi ha cap HEAD remot coincident"
 
-#: fetch-pack.c:1953 builtin/clone.c:697
+#: 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:2056
-#, fuzzy
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
-msgstr "final de fitxer inesperat"
+msgstr "«ready» no esperat des del remot"
 
-#: fetch-pack.c:2079
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "no existeix la referència remota %s"
 
-#: fetch-pack.c:2082
+#: 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:273
+#: 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:276
+#: 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:470
+#: gpg-interface.c:451
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile s'ha de configurar i existeix per a la "
+"verificació de la signatura ssh"
+
+#: gpg-interface.c:480
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+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:536
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "fitxer de revocació de la signatura ssh configurat però no trobat: %s"
+
+#: gpg-interface.c:624
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "la signatura «%s» és incompatible o està malmesa"
+
+#: gpg-interface.c:801 gpg-interface.c:806
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "no s'ha pogut obtenir l'empremta ssh de la clau  «%s»"
+
+#: gpg-interface.c:829
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+"o bé user.signingkey o gpg.ssh.defaultKeyCommand han de ser configurats"
+
+#: 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: %s %s"
+
+#: gpg-interface.c:857
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand ha fallat: %s %s"
+
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr "gpg ha fallat en signar les dades"
 
+#: gpg-interface.c:967
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey s'ha d'establir per a signar amb ssh"
+
+#: gpg-interface.c:978
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "s'ha produït un error en escriure la clau de signatura ssh a «%s»"
+
+#: 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 clau de signatura ssh a «%s»"
+
+#: gpg-interface.c:1014
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y sign és necessari per a signar amb ssh (disponible a openssh versió "
+"8.2p1+)"
+
+#: gpg-interface.c:1026
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "s'ha produït un error en llegir la signatura ssh des de «%s»"
+
 #: graph.c:98
 #, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr "ignora el color no vàlid «%.*s» en log.graphColors"
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "ignora el color no vàlid «%.*s» a log.graphColors"
 
 #: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
 msgstr ""
-"el patró indicat conté byte NULL (via -f <fitxer>). Això només és compatible "
-"amb -P sota PCRE v2"
+"el patró indicat conté byte NULL (via -f <fitxer>). Això només és compatible"
+" amb -P sota PCRE v2"
 
-#: grep.c:1893
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "«%s»: no s'ha pogut llegir %s"
 
-#: grep.c:1910 setup.c:176 builtin/clone.c:416 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:1921
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "«%s»: lectura curta"
 
-#: help.c:23
+#: help.c:24
 msgid "start a working area (see also: git help tutorial)"
 msgstr "començar una àrea de treball (vegeu també: git help tutorial)"
 
-#: help.c:24
+#: help.c:25
 msgid "work on the current change (see also: git help everyday)"
 msgstr "treballar en el canvi actual (vegeu també: git help everyday)"
 
-#: help.c:25
+#: help.c:26
 msgid "examine the history and state (see also: git help revisions)"
 msgstr "examinar la història i l'estat (vegeu també: git help revisions)"
 
-#: help.c:26
+#: help.c:27
 msgid "grow, mark and tweak your common history"
 msgstr "fer créixer, marcar i ajustar la vostra història comuna"
 
-#: help.c:27
+#: help.c:28
 msgid "collaborate (see also: git help workflows)"
 msgstr "col·laborar (vegeu també: git help workflow)"
 
-#: help.c:31
+#: help.c:32
 msgid "Main Porcelain Commands"
 msgstr "Ordres principals de porcellana"
 
-#: help.c:32
+#: help.c:33
 msgid "Ancillary Commands / Manipulators"
 msgstr "Ordres auxiliars / manipuladors"
 
-#: help.c:33
+#: help.c:34
 msgid "Ancillary Commands / Interrogators"
 msgstr "Ordres auxiliars / interrogadors"
 
-#: help.c:34
+#: help.c:35
 msgid "Interacting with Others"
 msgstr "Interaccionar amb altres"
 
-#: help.c:35
+#: help.c:36
 msgid "Low-level Commands / Manipulators"
 msgstr "Ordres de baix nivell / Manipuladors"
 
-#: help.c:36
+#: help.c:37
 msgid "Low-level Commands / Interrogators"
 msgstr "Ordres de baix nivell / Interrogadors"
 
-#: help.c:37
+#: help.c:38
 msgid "Low-level Commands / Syncing Repositories"
-msgstr "Ordres de baix nivell / Sincronització de dipòsits"
+msgstr "Ordres de baix nivell / Sincronització de repositoris"
 
-#: help.c:38
+#: help.c:39
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Ordres de baix nivell / Ajudants interns"
 
-#: help.c:300
+#: help.c:313
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "ordres de git disponibles en «%s»"
 
-#: help.c:307
+#: help.c:320
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
 
-#: help.c:316
+#: help.c:329
 msgid "These are common Git commands used in various situations:"
-msgstr ""
-"Aquestes són ordres del Git habitualment usades en diverses situacions:"
+msgstr "Aquestes són ordres habituals del Git usades en diverses situacions:"
 
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "tipus de llistat de l'ordre no compatible «%s»"
 
-#: help.c:405
+#: help.c:418
 msgid "The Git concept guides are:"
 msgstr "Les guies de Git de conceptes són:"
 
-#: help.c:429
+#: 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:434
+#: help.c:447
 msgid "External commands"
 msgstr "Ordres externes"
 
-#: help.c:449
+#: help.c:462
 msgid "Command aliases"
 msgstr "Àlies d'ordres"
 
-#: help.c:527
+#: help.c:543
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -4517,33 +4630,38 @@ msgstr ""
 "«%s» sembla una ordre de git, però no hem pogut\n"
 "executar-la. Pot ser que git-%s estigui malmès?"
 
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git: «%s» no és una ordre de git. Vegeu «git --help»."
 
-#: help.c:591
+#: help.c:613
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Ai. El vostre sistema no informa de cap ordre de Git."
 
-#: help.c:613
+#: help.c:635
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr ""
 "ADVERTÈNCIA: Heu invocat una ordre de Git amb nom «%s», la qual no existeix."
 
-#: help.c:618
+#: help.c:640
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "El procés continuarà, pressuposant que volíeu dir «%s»."
 
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Voleu executar «%s» en el seu lloc? [y/N]? "
+
+#: help.c:654
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr ""
 "El procés continuarà en %0.1f segons, pressuposant que volíeu dir «%s»."
 
-#: help.c:635
+#: help.c:666
 msgid ""
 "\n"
 "The most similar command is"
@@ -4557,16 +4675,16 @@ msgstr[1] ""
 "\n"
 "Les ordres més similars són"
 
-#: help.c:675
+#: help.c:706
 msgid "git version [<options>]"
 msgstr "git version [<opcions>]"
 
-#: help.c:730
+#: help.c:761
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:734
+#: help.c:765
 msgid ""
 "\n"
 "Did you mean this?"
@@ -4580,6 +4698,15 @@ msgstr[1] ""
 "\n"
 "Volíeu dir un d'aquests?"
 
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"El lligam «%s» s'ha ignorat perquè no s'ha establert com a executable.\n"
+"Podeu desactivar aquest avís amb «git config advice.ignoredHook false»."
+
 #: ident.c:353
 msgid "Author identity unknown\n"
 msgstr "Identitat de l'autor desconeguda\n"
@@ -4607,11 +4734,11 @@ msgstr ""
 "\n"
 "Executeu\n"
 "\n"
-"  git config --global user.email \"usuari@domini.com\"\n"
-"  git config --global user.name \"El vostre nom\"\n"
+"  git config --global user.email «usuari@domini.com»\n"
+"  git config --global user.name «El vostre nom»\n"
 "\n"
 "per a establir la identitat predeterminada del vostre compte.\n"
-"Ometeu --global per a establir la identitat només en aquest dipòsit.\n"
+"Ometeu --global per a establir la identitat només en aquest repositori.\n"
 
 #: ident.c:397
 msgid "no email was given and auto-detection is disabled"
@@ -4646,7 +4773,7 @@ msgstr "nom d'identitat buit (per <%s>) no és permès"
 msgid "name consists only of disallowed characters: %s"
 msgstr "el nom conté només caràcters no permesos: %s"
 
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
 #, c-format
 msgid "invalid date format: %s"
 msgstr "format de data no vàlid: %s"
@@ -4660,9 +4787,9 @@ msgid "sparse:path filters support has been dropped"
 msgstr "sparse: s'ha eliminat la implementació de filtres de camí sparse"
 
 #: list-objects-filter-options.c:105
-#, fuzzy, c-format
-msgid "'%s' for 'object:type=<type>' isnot a valid object type"
-msgstr "«%s» per a «%s» no és una marca de temps vàlida"
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "«%s» per a «object:type=<type>» no és un tipus d'objecte vàlid"
 
 #: list-objects-filter-options.c:124
 #, c-format
@@ -4685,8 +4812,8 @@ msgstr "no es poden combinar múltiples especificacions de filtratge"
 #: list-objects-filter-options.c:376
 msgid "unable to upgrade repository format to support partial clone"
 msgstr ""
-"no s'ha pogut actualitzar el format del dipòsit perquè sigui compatible amb "
-"un clonatge parcial"
+"no s'ha pogut actualitzar el format del repositori perquè sigui compatible "
+"amb un clonatge parcial"
 
 #: list-objects-filter.c:532
 #, c-format
@@ -4708,7 +4835,7 @@ msgstr "l'entrada «%s» a l'arbre %s té mode d'arbre, però no és un arbre"
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "l'entrada «%s» a l'arbre %s té mode blob, però no és un blob"
 
-#: list-objects.c:395
+#: list-objects.c:398
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "no s'ha pogut carregar l'arrel de l'arbre per la comissió %s"
@@ -4727,10 +4854,10 @@ msgstr ""
 "No s'ha pogut crear «%s.lock»: %s.\n"
 "\n"
 "Sembla que un altre procés de git s'està executant en aquest\n"
-"dipòsit, per exemple, un editor obert per «git commit». \n"
+"repositori, per exemple, un editor obert per «git commit». \n"
 "Assegureu-vos que tots els processos s'hagin acabat i\n"
-"llavors proveu de nou. Si encara falla, pot ser que un procés de\n"
-"git ha tingut un error:\n"
+"llavors proveu de nou. Si encara falla, pot ser un procés git\n"
+"ha fallat en aquest repositori abans:\n"
 "elimineu el fitxer manualment per a continuar."
 
 #: lockfile.c:160
@@ -4739,60 +4866,66 @@ msgid "Unable to create '%s.lock': %s"
 msgstr "No s'ha pogut crear «%s.lock»: %s"
 
 #: ls-refs.c:37
-#, fuzzy, c-format
+#, c-format
 msgid "invalid value '%s' for lsrefs.unborn"
-msgstr "valor no vàlid per a «blame.coloring»"
+msgstr "valor «%s» no vàlid per a «lsrefs.unborn»"
 
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "línia inesperada: «%s»"
+
+#: ls-refs.c:178
 msgid "expected flush after ls-refs arguments"
 msgstr "s'esperava una neteja després dels arguments ls-refs"
 
 #: mailinfo.c:1050
 msgid "quoted CRLF detected"
-msgstr ""
+msgstr "CRLF citat detectat"
 
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
-#, fuzzy, c-format
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
+#, c-format
 msgid "bad action '%s' for '%s'"
-msgstr "no es pot copiar «%s» a «%s»"
+msgstr "acció «%s» incorrecta per a «%s»"
 
-#: merge-ort.c:1116 merge-recursive.c:1205
+#: merge-ort.c:1584 merge-recursive.c:1211
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "S'ha produït un error en fusionar el submòdul %s (no està agafat)"
 
-#: merge-ort.c:1125 merge-recursive.c:1212
+#: merge-ort.c:1593 merge-recursive.c:1218
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
-msgstr "S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)"
+msgstr ""
+"S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)"
 
-#: merge-ort.c:1134 merge-recursive.c:1219
+#: merge-ort.c:1602 merge-recursive.c:1225
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 "S'ha produït un error en fusionar el submòdul %s (les comissions no "
 "segueixen merge-base)"
 
-#: merge-ort.c:1144 merge-ort.c:1151
-#, fuzzy, c-format
+#: merge-ort.c:1612 merge-ort.c:1620
+#, c-format
 msgid "Note: Fast-forwarding submodule %s to %s"
-msgstr "Avançament ràpid al submòdul %s"
+msgstr "Nota: avançament ràpid del submòdul %s a %s"
 
-#: merge-ort.c:1172
-#, fuzzy, c-format
+#: merge-ort.c:1642
+#, c-format
 msgid "Failed to merge submodule %s"
-msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»"
+msgstr "S'ha produït un error en fusionar el submòdul «%s»"
 
-#: merge-ort.c:1179
-#, fuzzy, c-format
+#: merge-ort.c:1649
+#, c-format
 msgid ""
 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
 "%s\n"
 msgstr ""
-"S'ha produït un error en fusionar el submòdul %s (s'han trobat múltiples "
-"fusions)"
+"S'ha produït un error en fusionar el submòdul %s, però existeix una solució possible:\n"
+"%s\n"
 
-#: merge-ort.c:1183 merge-recursive.c:1273
+#: merge-ort.c:1653 merge-recursive.c:1281
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -4809,30 +4942,30 @@ msgstr ""
 "\n"
 "que acceptarà aquest suggeriment.\n"
 
-#: merge-ort.c:1196
-#, fuzzy, c-format
+#: merge-ort.c:1666
+#, c-format
 msgid ""
 "Failed to merge submodule %s, but multiple possible merges exist:\n"
 "%s"
 msgstr ""
-"S'ha produït un error en fusionar el submòdul %s (s'han trobat múltiples "
-"fusions)"
+"S'ha produït un error en fusionar el submòdul %s, però existeixen múltiples solucions possibles:\n"
+"%s"
 
-#: merge-ort.c:1415 merge-recursive.c:1362
+#: merge-ort.c:1887 merge-recursive.c:1372
 msgid "Failed to execute internal merge"
 msgstr "S'ha produït un error en executar la fusió interna"
 
-#: merge-ort.c:1420 merge-recursive.c:1367
+#: merge-ort.c:1892 merge-recursive.c:1377
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "No s'ha pogut afegir %s a la base de dades"
 
-#: merge-ort.c:1427 merge-recursive.c:1400
+#: merge-ort.c:1899 merge-recursive.c:1410
 #, c-format
 msgid "Auto-merging %s"
 msgstr "S'està autofusionant %s"
 
-#: merge-ort.c:1566 merge-recursive.c:2122
+#: merge-ort.c:2038 merge-recursive.c:2132
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4842,7 +4975,7 @@ msgstr ""
 "existent a %s en forma de canvi del nom del directori implícit, posant-hi "
 "els camins següents a: %s."
 
-#: merge-ort.c:1576 merge-recursive.c:2132
+#: merge-ort.c:2048 merge-recursive.c:2142
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4852,18 +4985,18 @@ msgstr ""
 "camí a %s; els canvis del nom del directori implícits han intentat posar "
 "aquests camins a: %s segons"
 
-#: merge-ort.c:1634
-#, fuzzy, c-format
+#: merge-ort.c:2106
+#, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
 "renamed to multiple other directories, with no destination getting a "
 "majority of the files."
 msgstr ""
 "CONFLICTE (divisió de canvi de nom de directori): no està clar on col·locar "
-"%s perquè el directori %s s'han canviat de nom a múltiples altres "
-"directoris, sense una destinació per a la majoria dels fitxers."
+"%s; s'han canviat de nom a múltiples altres directoris, sense una destinació"
+" per a la majoria dels fitxers."
 
-#: merge-ort.c:1788 merge-recursive.c:2468
+#: merge-ort.c:2260 merge-recursive.c:2478
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4872,138 +5005,149 @@ msgstr ""
 "AV�S: S'està evitant aplicar el canvi de nom %s -> %s a %s, perquè %s ell "
 "mateix ja havia canviat de nom."
 
-#: merge-ort.c:1932 merge-recursive.c:3244
-#, fuzzy, c-format
+#: merge-ort.c:2400 merge-recursive.c:3261
+#, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
 "moving it to %s."
 msgstr ""
-"La ruta va actualitzar els percentatges afegits dins d'un directori que va "
-"ser rebatejat en percentatges; es va traslladar a percentatges."
+"Pedaç actualitzat: %s afegit a %s dins d'un directori que va canviar de nom "
+"a %s; movent-lo a %s."
 
-#: merge-ort.c:1939 merge-recursive.c:3251
-#, fuzzy, c-format
+#: merge-ort.c:2407 merge-recursive.c:3268
+#, c-format
 msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in"
+" %s; moving it to %s."
 msgstr ""
-"El camí va actualitzar els percentatges de canvi de nom a percentatges "
-"d'incens dins d'un directori que es va canviar de nom en percentatges, "
-"passant-lo a percentatges."
+"Pedaç actualitzat: %s canviat al nom %s a %s, dins d'un directori que va "
+"canviar de nom a %s; movent-lo a %s."
 
-#: merge-ort.c:1952 merge-recursive.c:3247
-#, fuzzy, c-format
+#: merge-ort.c:2420 merge-recursive.c:3264
+#, c-format
 msgid ""
-"CONFLICT (file location): %s added in %s inside a directory that was renamed "
-"in %s, suggesting it should perhaps be moved to %s."
+"CONFLICT (file location): %s added in %s inside a directory that was renamed"
+" in %s, suggesting it should perhaps be moved to %s."
 msgstr ""
-"CONFLICT (ubicació de l'arxiu) els percentatges afegits dins d'un directori "
-"que va ser rebatejat en percentatges suggerint que potser hauria de ser "
-"traslladat als percentatges."
+"CONFLICTE (ubicació del fitxer): %s afegit a %s dins d'un directori que va "
+"canviar de nom a %s suggerint que potser hauria de moure's a %s."
 
-#: merge-ort.c:1960 merge-recursive.c:3254
-#, fuzzy, c-format
+#: merge-ort.c:2428 merge-recursive.c:3271
+#, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
 "was renamed in %s, suggesting it should perhaps be moved to %s."
 msgstr ""
-"CONFLICT (ubicació de l'arxiu) per cents redenominats a un 1% dins d'un "
-"directori que va ser rebatejat en percentatges, suggerint que potser hauria "
-"de canviar-se a percentatges."
+"CONFLICTE (ubicació del fitxer): %s canviat al nom %s a %s, dins d'un "
+"directori que va canviar de nom a %s, suggerint que potser hauria de moure's"
+" a %s."
 
-#: merge-ort.c:2103
+#: merge-ort.c:2584
 #, c-format
 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
-msgstr "CONFLICTE (canvi de nom/canvi de nom): %s ara té el nom %s a %s i %s a %s."
+msgstr ""
+"CONFLICTE (canvi de nom/canvi de nom): %s ara té el nom %s a %s i %s a %s."
 
-#: merge-ort.c:2198
+#: merge-ort.c:2679
 #, c-format
 msgid ""
 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
-"conflicts AND collides with another path; this may result in nested conflict "
-"markers."
+"conflicts AND collides with another path; this may result in nested conflict"
+" markers."
 msgstr ""
+"CONFLICTE (canvi de nom implicat en la col·lisió): el canvi de nom de %s -> "
+"%s té conflictes de contingut i col·lisiona amb un altre camí; això pot "
+"donar lloc a marcadors de conflicte imbricats."
 
-#: merge-ort.c:2217 merge-ort.c:2241
+#: merge-ort.c:2698 merge-ort.c:2722
 #, c-format
 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr ""
-"CONFLICTE (canvi de nom/supressió): %s ara té el nom %s a %s, però s'ha suprimit "
-"a %s"
+"CONFLICTE (canvi de nom/supressió): %s ara té el nom %s a %s, però s'ha "
+"suprimit a %s."
 
-#: merge-ort.c:2550 merge-recursive.c:3002
+#: merge-ort.c:3212 merge-recursive.c:3022
 #, c-format
 msgid "cannot read object %s"
 msgstr "no es pot llegir l'objecte %s"
 
-#: merge-ort.c:2553 merge-recursive.c:3005
+#: merge-ort.c:3215 merge-recursive.c:3025
 #, c-format
 msgid "object %s is not a blob"
 msgstr "l'objecte %s no és un blob"
 
-#: merge-ort.c:2981
+#: merge-ort.c:3644
 #, c-format
 msgid ""
 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
 "%s instead."
 msgstr ""
+"CONFLICTE (fitxer/directori): directori en el camí de %s des de %s; en "
+"comptes es mou a %s."
 
-#: merge-ort.c:3055
+#: merge-ort.c:3721
 #, c-format
 msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed both "
-"of them so each can be recorded somewhere."
+"CONFLICT (distinct types): %s had different types on each side; renamed both"
+" of them so each can be recorded somewhere."
 msgstr ""
+"CONFLICTE (tipus diferents): %s tenia diferents tipus a cada costat; se'ls "
+"ha canviat el nom per tal que cadascun pugui ser registrat en algun lloc."
 
-#: merge-ort.c:3062
+#: merge-ort.c:3728
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed one "
 "of them so each can be recorded somewhere."
 msgstr ""
+"CONFLICTE (tipus diferents): %s té diferents tipus a cada costat; s'ha "
+"canviat el nom d'un d'ells per tal que cadascun pugui ser registrat en algun"
+" lloc."
 
-#: merge-ort.c:3162 merge-recursive.c:3081
+#: merge-ort.c:3819 merge-recursive.c:3101
 msgid "content"
 msgstr "contingut"
 
-#: merge-ort.c:3164 merge-recursive.c:3085
+#: merge-ort.c:3821 merge-recursive.c:3105
 msgid "add/add"
 msgstr "afegiment/afegiment"
 
-#: merge-ort.c:3166 merge-recursive.c:3130
+#: merge-ort.c:3823 merge-recursive.c:3150
 msgid "submodule"
 msgstr "submòdul"
 
-#: merge-ort.c:3168 merge-recursive.c:3131
+#: merge-ort.c:3825 merge-recursive.c:3151
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
 
-#: merge-ort.c:3198
+#: 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 ""
-"CONFLICTE: (modificació/supressió): %s suprimit a %s i modificat a %s. La versió %s de %s "
-"s'ha deixat en l'arbre."
+"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:3433
+#: 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"
 msgstr ""
+"Nota: %s no està actualitzat i en forma de comprovar la versió en conflicte;"
+" còpia antiga reanomenada a %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:3730
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
-msgstr "ha fallat la recollida de la informació de fusió per als arbres %s, %s, %s"
+msgstr ""
+"ha fallat la recollida de la informació de fusió per als arbres %s, %s, %s"
 
-#: merge-ort-wrappers.c:13 merge-recursive.c:3699
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -5012,110 +5156,111 @@ msgstr ""
 "Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "Ja està al dia."
 
-#: merge-recursive.c:356
+#: merge-recursive.c:353
 msgid "(bad commit)\n"
 msgstr "(comissió errònia)\n"
 
-#: merge-recursive.c:379
+#: merge-recursive.c:381
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "addinfo_cache ha fallat per al camí «%s»; interrompent la fusió."
+msgstr "add_cacheinfo ha fallat per al camí «%s»; interrompent la fusió."
 
-#: merge-recursive.c:388
+#: merge-recursive.c:390
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
-"addinfo_cache ha fallat al refrescar el camí «%s»; interrompent la fusió."
+"add_cacheinfo ha fallat al refrescar el camí «%s»; interrompent la fusió."
 
-#: merge-recursive.c:876
+#: merge-recursive.c:881
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "s'ha produït un error en crear el camí «%s»%s"
 
-#: merge-recursive.c:887
+#: merge-recursive.c:892
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "S'està eliminant %s per a fer espai per al subdirectori\n"
 
-#: merge-recursive.c:901 merge-recursive.c:920
+#: merge-recursive.c:906 merge-recursive.c:925
 msgid ": perhaps a D/F conflict?"
 msgstr ": potser un conflicte D/F?"
 
-#: merge-recursive.c:910
+#: merge-recursive.c:915
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
 
-#: merge-recursive.c:951 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "no es pot llegir l'objecte %s «%s»"
 
-#: merge-recursive.c:956
+#: merge-recursive.c:961
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob esperat per a %s «%s»"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:986
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "s'ha produït un error en obrir «%s»: %s"
 
-#: merge-recursive.c:992
+#: merge-recursive.c:997
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s"
 
-#: merge-recursive.c:997
+#: merge-recursive.c:1002
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "no se sap què fer amb %06o %s «%s»"
 
-#: merge-recursive.c:1227 merge-recursive.c:1239
+#: merge-recursive.c:1233 merge-recursive.c:1246
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Avançament ràpid del submòdul %s a la següent comissió:"
 
-#: merge-recursive.c:1230 merge-recursive.c:1242
+#: merge-recursive.c:1236 merge-recursive.c:1249
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Avançament ràpid al submòdul %s"
 
-#: merge-recursive.c:1265
+#: merge-recursive.c:1273
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
-"Ha fallat en fusionar el submòdul %s (no s'ha trobat les comissions següents)"
+"Ha fallat en fusionar el submòdul %s (no s'ha trobat les comissions "
+"següents)"
 
-#: merge-recursive.c:1269
+#: merge-recursive.c:1277
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr ""
 "S'ha produït un error en fusionar el submòdul %s (sense avançament ràpid)"
 
-#: merge-recursive.c:1270
+#: merge-recursive.c:1278
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "S'ha trobat una possible resolució de fusió pel submòdul:\n"
 
-#: merge-recursive.c:1282
+#: merge-recursive.c:1290
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr ""
 "S'ha produït un error en fusionar el submòdul %s (s'han trobat múltiples "
 "fusions)"
 
-#: merge-recursive.c:1424
+#: merge-recursive.c:1434
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 "Error: s'està refusant perdre el fitxer no seguit a %s; en comptes s'ha "
 "escrit a %s."
 
-#: merge-recursive.c:1496
+#: merge-recursive.c:1506
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5124,7 +5269,7 @@ msgstr ""
 "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
 "s'ha deixat en l'arbre."
 
-#: merge-recursive.c:1501
+#: merge-recursive.c:1511
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5133,7 +5278,7 @@ msgstr ""
 "CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
 "de %s s'ha deixat en l'arbre."
 
-#: merge-recursive.c:1508
+#: merge-recursive.c:1518
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5142,7 +5287,7 @@ msgstr ""
 "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
 "s'ha deixat en l'arbre a %s."
 
-#: merge-recursive.c:1513
+#: merge-recursive.c:1523
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5151,66 +5296,66 @@ msgstr ""
 "CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
 "de %s s'ha deixat en l'arbre a %s."
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "rename"
 msgstr "canvi de nom"
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "renamed"
 msgstr "canviat de nom"
 
-#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "S'està refusant a perdre el fitxer brut a %s"
 
-#: merge-recursive.c:1609
+#: merge-recursive.c:1619
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 "S'està refusant perdre el fitxer no seguit a «%s», malgrat que està en mig "
 "de l'operació."
 
-#: merge-recursive.c:1667
+#: merge-recursive.c:1677
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s a %s.  S'ha afegit "
 "%s a %s"
 
-#: merge-recursive.c:1698
+#: merge-recursive.c:1708
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això"
 
-#: merge-recursive.c:1703
+#: merge-recursive.c:1713
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 "S'està refusant perdre el fitxer no seguit a %s; en comptes, s'està afegint "
 "com a %s"
 
-#: merge-recursive.c:1730
+#: merge-recursive.c:1740
 #, c-format
 msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
+"\"%s\"->\"%s\" in \"%s\"%s"
 msgstr ""
 "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom «%s»->«%s» en la branca "
 "«%s» canvi de nom «%s»->«%s» en «%s»%s"
 
-#: merge-recursive.c:1735
+#: merge-recursive.c:1745
 msgid " (left unresolved)"
 msgstr " (deixat sense resolució)"
 
-#: merge-recursive.c:1827
+#: merge-recursive.c:1837
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de "
 "nom %s->%s en %s"
 
-#: merge-recursive.c:2090
+#: merge-recursive.c:2100
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5221,90 +5366,91 @@ msgstr ""
 "%s perquè el directori %s s'han canviat de nom a múltiples altres "
 "directoris, sense una destinació per a la majoria dels fitxers."
 
-#: merge-recursive.c:2224
+#: merge-recursive.c:2234
 #, c-format
 msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory "
+"%s->%s in %s"
 msgstr ""
 "CONFLICTE (canvi de nom/canvi de nom): canvi de nom %s->%s en %s. Canvi de "
 "nom de directori %s->%s en %s"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modify"
 msgstr "modificació"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modified"
 msgstr "modificat"
 
-#: merge-recursive.c:3108
+#: merge-recursive.c:3128
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "S'ha omès %s (el fusionat és igual a l'existent)"
 
-#: merge-recursive.c:3161
+#: merge-recursive.c:3181
 #, c-format
 msgid "Adding as %s instead"
 msgstr "S'està afegint com a %s en lloc d'això"
 
-#: merge-recursive.c:3368
+#: merge-recursive.c:3385
 #, c-format
 msgid "Removing %s"
 msgstr "S'està eliminant %s"
 
-#: merge-recursive.c:3391
+#: merge-recursive.c:3408
 msgid "file/directory"
 msgstr "fitxer/directori"
 
-#: merge-recursive.c:3396
+#: merge-recursive.c:3413
 msgid "directory/file"
 msgstr "directori/fitxer"
 
-#: merge-recursive.c:3403
+#: merge-recursive.c:3420
 #, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgid ""
+"CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
-"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a "
-"%s"
+"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a"
+" %s"
 
-#: merge-recursive.c:3412
+#: merge-recursive.c:3429
 #, c-format
 msgid "Adding %s"
 msgstr "S'està afegint %s"
 
-#: merge-recursive.c:3421
+#: merge-recursive.c:3438
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusió en %s"
 
-#: merge-recursive.c:3474
+#: merge-recursive.c:3491
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "la fusió dels arbres %s i %s ha fallat"
 
-#: merge-recursive.c:3568
+#: merge-recursive.c:3585
 msgid "Merging:"
 msgstr "S'està fusionant:"
 
-#: merge-recursive.c:3581
+#: merge-recursive.c:3598
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "s'ha trobat %u avantpassat en comú:"
 msgstr[1] "s'han trobat %u avantpassats en comú:"
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3648
 msgid "merge returned no commit"
 msgstr "la fusió no ha retornat cap comissió"
 
-#: merge-recursive.c:3796
+#: merge-recursive.c:3816
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "No s'ha pogut analitzar l'objecte «%s»"
 
-#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
-#: builtin/stash.c:473
+#: 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."
 
@@ -5312,221 +5458,260 @@ 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:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
-#: builtin/stash.c:267
+#: 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"
 
-#: midx.c:74
-#, fuzzy
+#: midx.c:78
 msgid "multi-pack-index OID fanout is of the wrong size"
-msgstr "multi-index no reconegut"
+msgstr "l'OID de l'índex multipaquet és d'una mida incorrecta"
 
-#: midx.c:105
-#, fuzzy, c-format
+#: midx.c:111
+#, c-format
 msgid "multi-pack-index file %s is too small"
-msgstr "l'índex múltiple és massa petit"
+msgstr "el fitxer de l'índex multipaquet %s és massa petit"
 
-#: midx.c:121
-#, fuzzy, c-format
+#: midx.c:127
+#, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
-"signatura d'índex múltiple 0x%08x no coincideix amb la signatura 0x%08x"
+"la signatura de l'índex multipaquet 0x%08x no coincideix amb la signatura "
+"0x%08x"
 
-#: midx.c:126
-#, fuzzy, c-format
+#: midx.c:132
+#, c-format
 msgid "multi-pack-index version %d not recognized"
-msgstr "multi-index no reconegut"
+msgstr "no es reconeix la versió %d de l'índex multipaquet"
 
-#: midx.c:131
-#, fuzzy, c-format
+#: midx.c:137
+#, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr ""
-"la versió del hash del graf de comissions %X no coincideix amb la versió %X"
+"la versió del hash índex multipaquet %u no coincideix amb la versió %u"
 
-#: midx.c:148
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
-msgstr "Falta un fragment de nom de paquet necessari al multi-index"
+msgstr "falta un fragment de nom de paquet necessari al multi-index"
 
-#: midx.c:150
+#: 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:152
+#: 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:154
+#: 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:170
-#, fuzzy, c-format
+#: midx.c:176
+#, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr "noms de paquet d'índex múltiple fora de l'ordre «%s» abans de «%s»"
+msgstr ""
+"els noms de paquet de l'índex multipaquet estan desordenats «%s» abans de "
+"«%s»"
 
-#: midx.c:214
+#: 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:264
-#, fuzzy
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
-"multi-index emmagatzema un desplaçament de 64 bits però deft és massa petit"
+"l'índex multipaquet emmagatzema un desplaçament de 64 bits, però off_t és "
+"massa petit"
 
-#: midx.c:490
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "no s'ha pogut afegir el fitxer de paquet «%s»"
 
-#: midx.c:496
+#: 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:564
+#: 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:880 builtin/index-pack.c:1535
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "no es pot emmagatzemar el fitxer d'índex invers"
 
-#: midx.c:933
-#, fuzzy
-msgid "Adding packfiles to multi-pack-index"
-msgstr "Afegint fitxers de paquets a multi-index"
+#: midx.c:993
+#, c-format
+msgid "could not parse line: %s"
+msgstr "no s'ha pogut analitzar la línia: %s"
 
-#: midx.c:979
-#, fuzzy, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "no s'han vist caure els paquets del fitxer"
+#: midx.c:995
+#, c-format
+msgid "malformed line: %s"
+msgstr "línia mal formada: %s"
 
-#: midx.c:1024
-#, fuzzy, c-format
+#: 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:1187
+msgid "could not load pack"
+msgstr "no s'ha pogut carregar el paquet"
+
+#: 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:1204
+msgid "Adding packfiles to multi-pack-index"
+msgstr "S'estan afegint fitxers empaquetats a l'índex multipaquet"
+
+#: midx.c:1247
+#, c-format
 msgid "unknown preferred pack: '%s'"
-msgstr "Rebase de system%s desconegut"
+msgstr "paquet preferit desconegut: «%s»"
+
+#: midx.c:1292
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "no es pot selecionar un paquet preferit %s sense objectes"
 
-#: midx.c:1029
-#, fuzzy, c-format
+#: 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:1370
+#, c-format
 msgid "preferred pack '%s' is expired"
-msgstr "el dipòsit de referència «%s» és empeltat"
+msgstr "el paquet preferit «%s» ha caducat"
 
-#: midx.c:1045
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "no hi ha fitxers empaquetats a indexar."
 
-#: midx.c:1125 builtin/clean.c:37
+#: midx.c:1420
+msgid "could not write multi-pack bitmap"
+msgstr "no s'han pogut escriure els mapes de bits dels multipaquets"
+
+#: midx.c:1430
+msgid "could not write multi-pack-index"
+msgstr "no s'ha pogut escriure l'índex multipaquet"
+
+#: 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:1156
-#, fuzzy, c-format
+#: midx.c:1522
+#, c-format
 msgid "failed to clear multi-pack-index at %s"
-msgstr "no s'han pogut netejar els percentatges multi-paquet"
+msgstr "no s'ha pogut netejar l'índex multipaquet a %s"
 
-#: midx.c:1214
-#, fuzzy
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
-msgstr "l'índex múltiple és massa petit"
+msgstr ""
+"el fitxer de l'índex multipaquet existeix, però no s'ha pogut analitzar"
+
+#: midx.c:1593
+msgid "incorrect checksum"
+msgstr "suma de verificació incorrecta"
 
-#: midx.c:1222
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "S'estan cercant fitxers empaquetats referenciats"
 
-#: midx.c:1237
-#, fuzzy, c-format
+#: midx.c:1611
+#, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
-"od fanout fora de l'ordre fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+"oid fanout desordenat: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1242
-#, fuzzy
+#: midx.c:1616
 msgid "the midx contains no oid"
-msgstr "el midx no conté cap oide"
+msgstr "el midx no conté cap oid"
 
-#: midx.c:1251
-#, fuzzy
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
-msgstr "Verificant l'ordre OID en multi-index"
+msgstr "S'està verificant l'ordre OID a l'índex multipaquet"
 
-#: midx.c:1260
-#, fuzzy, c-format
+#: midx.c:1634
+#, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
-msgstr "oid lookup fora d'ordre oid[%d] = per cents >= %s = oid[%d]"
+msgstr "oid lookup desordenat: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1280
+#: midx.c:1654
 msgid "Sorting objects by packfile"
-msgstr "S'estan ordenant els objectes per fitxer de paquet"
+msgstr "S'estan ordenant els objectes per fitxer empaquetats"
 
-#: midx.c:1287
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "S'estan verificant els desplaçaments dels objectes"
 
-#: midx.c:1303
-#, fuzzy, c-format
+#: 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] = percentatges"
+msgstr "no s'ha pogut carregar l'entrada del paquet per a oid[%d] = %s"
 
-#: midx.c:1309
-#, fuzzy, c-format
+#: 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 de paquet %s"
+msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer empaquetat %s"
 
-#: midx.c:1318
-#, fuzzy, c-format
+#: 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>"
+"desplaçament incorrecte de l'objecte per a oid[%d] = %s: %<PRIx64> != "
+"%<PRIx64>"
 
-#: midx.c:1343
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "S'estan comptant els objectes referenciats"
 
-#: midx.c:1353
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "S'estan cercant i suprimint els fitxers de paquets no referenciats"
 
-#: midx.c:1544
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "no s'ha pogut iniciar el pack-objects"
 
-#: midx.c:1564
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "no s'ha pogut finalitzar el pack-objects"
 
 #: name-hash.c:542
-#, fuzzy, c-format
+#, c-format
 msgid "unable to create lazy_dir thread: %s"
-msgstr "no s'ha pogut crear el fil per cent mandrós"
+msgstr "no s'ha pogut crear el fil «lazy_dir» :%s"
 
 #: name-hash.c:564
-#, fuzzy, c-format
+#, c-format
 msgid "unable to create lazy_name thread: %s"
-msgstr "no s'ha pogut crear un fil percent"
+msgstr "no s'ha pogut crear un fil «lazy_name»: %s"
 
 #: name-hash.c:570
-#, fuzzy, c-format
+#, c-format
 msgid "unable to join lazy_name thread: %s"
-msgstr "no s'ha pogut unir als fil per cents de nom mandrós"
+msgstr "no s'ha pogut unir el fil «lazy_name»: %s"
 
 #: notes-merge.c:277
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
-"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
-"commit/abort the previous merge before you start a new notes merge."
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you start a new notes merge."
 msgstr ""
 "No heu acabat la vostra fusió de notes prèvia (%s existeix).\n"
-"Useu «git notes merge --commit» o «git notes merge --abort» per a cometre/"
-"avortar la fusió prèvia abans de començar una fusió de notes nova."
+"Useu «git notes merge --commit» o «git notes merge --abort» per a cometre/avortar la fusió prèvia abans de començar una fusió de notes nova."
 
 #: notes-merge.c:284
 #, c-format
@@ -5550,284 +5735,284 @@ msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)"
 #. TRANSLATORS: The first %s is the name of
 #. the environment variable, the second %s is
 #. its value.
-#.
 #: notes-utils.c:145
 #, c-format
 msgid "Bad %s value: '%s'"
 msgstr "Valor erroni de %s: «%s»"
 
-#: object-file.c:526
+#: 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"
+"no existeix el directori d'objecte %s; comproveu "
+".git/objects/info/alternates"
 
-#: object-file.c:577
+#: 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:649
-#, fuzzy, c-format
+#: object-file.c:588
+#, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
-"percentatges ignorant botigues alternatives d'objectes imbricació massa "
-"profunda"
+"%s: s'estan ignorant els emmagatzematges alternatius d'objectes, imbricació "
+"massa profunda"
 
-#: object-file.c:656
+#: 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:699
-#, fuzzy
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
-msgstr "no s'ha pogut obrir el fitxer de bloqueig alternatiu «fdopen»"
+msgstr "no s'ha pogut fer «fdopen» al fitxer de bloqueig alternatiu"
 
-#: object-file.c:717
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "no es pot llegir el fitxer «alternates»"
 
-#: object-file.c:724
+#: 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:759
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "el camí «%s» no existeix"
 
-#: object-file.c:780
+#: object-file.c:762
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
-"encara no s'admet el dipòsit de referència «%s» com a agafament enllaçat."
+"encara no s'admet el repositori de referència «%s» com a agafament enllaçat."
 
-#: object-file.c:786
+#: object-file.c:768
 #, c-format
 msgid "reference repository '%s' is not a local repository."
-msgstr "el dipòsit de referència «%s» no és un dipòsit local."
+msgstr "el repositori de referència «%s» no és un repositori local."
 
-#: object-file.c:792
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
-msgstr "el dipòsit de referència «%s» és superficial"
+msgstr "el repositori de referència «%s» és superficial"
 
-#: object-file.c:800
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
-msgstr "el dipòsit de referència «%s» és empeltat"
+msgstr "el repositori de referència «%s» és empeltat"
 
-#: object-file.c:860
+#: 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: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:1010
+#: 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:1031
-msgid "mmap failed"
-msgstr "mmap ha fallat"
+#: object-file.c:1048
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap ha fallat%s"
 
-#: object-file.c:1195
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "el tipus d'objecte %s és buit"
 
-#: object-file.c:1330 object-file.c:2524
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "objecte solt corrupte «%s»"
 
-#: object-file.c:1332 object-file.c:2528
+#: 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:1374
+#: 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:1459
 msgid "invalid object type"
 msgstr "tipus d'objecte és incorrecte"
 
-#: object-file.c:1458
-#, 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"
-
-#: object-file.c:1461
+#: 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:1467
+#: object-file.c:1474
 #, 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"
-
-#: object-file.c:1470
-#, c-format
-msgid "unable to parse %s header"
-msgstr "no s'ha pogut analitzar la capçalera %s"
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "la capçalera per a %s és massa llarga, supera els %d bytes"
 
-#: object-file.c:1697
+#: 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:1701
+#: 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:1705
+#: 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:1709
+#: 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:1814
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "no s'ha pogut escriure al fitxer %s"
 
-#: object-file.c:1821
+#: 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:1828
+#: object-file.c:1835
 msgid "file write error"
 msgstr "s'ha produït un error en escriure al fitxer"
 
-#: object-file.c:1848
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr "error en tancar el fitxer d'objecte solt"
 
-#: object-file.c:1913
+#: 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 dipòsit "
-"%s"
+"permisos insuficients per a afegir un objecte a la base de dades del "
+"repositori %s"
 
-#: object-file.c:1915
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "no s'ha pogut crear un fitxer temporal"
 
-#: object-file.c:1939
+#: 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:1945
+#: 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:1949
+#: 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:1953
+#: 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:1963 builtin/pack-objects.c:1097
+#: 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:2040
+#: 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:2091
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "comissió corrupta"
 
-#: object-file.c:2099
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "etiqueta corrupta"
 
-#: object-file.c:2199
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "error de lectura mentre s'indexava %s"
 
-#: object-file.c:2202
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "lectura curta mentre s'indexa %s"
 
-#: object-file.c:2275 object-file.c:2285
+#: 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:2291
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: tipus de fitxer no suportat"
 
-#: object-file.c:2315
+#: 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:2317
+#: 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:2344 builtin/index-pack.c:192
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "no s'ha pogut obrir %s"
 
-#: object-file.c:2535 object-file.c:2588
+#: 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:2559
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "no s'ha pogut fer «mmap» %s"
 
-#: object-file.c:2564
+#: 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:2570
+#: 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:2581
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "no s'han pogut desempaquetar els continguts de %s"
 
-#: object-name.c:486
-#, fuzzy, c-format
+#: object-name.c:480
+#, c-format
 msgid "short object ID %s is ambiguous"
-msgstr "l'SHA1 %s curt és ambigu"
+msgstr "l'id d'objecte curt %s és ambigu"
 
-#: object-name.c:497
+#: object-name.c:491
 msgid "The candidates are:"
 msgstr "Els candidats són:"
 
-#: object-name.c:796
+#: object-name.c:790
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5851,68 +6036,69 @@ msgstr ""
 "suprimiu-les. Desactiveu aquest missatge executant\n"
 "«git config advice.objectNameWarning false»"
 
-#: object-name.c:916
+#: object-name.c:910
 #, c-format
 msgid "log for '%.*s' only goes back to %s"
 msgstr "registre per a «%.*s» només retorna a %s"
 
-#: object-name.c:924
+#: object-name.c:918
 #, c-format
 msgid "log for '%.*s' only has %d entries"
 msgstr "registre per a «%.*s» només té %d entrades"
 
-#: object-name.c:1702
+#: object-name.c:1696
 #, c-format
 msgid "path '%s' exists on disk, but not in '%.*s'"
 msgstr "el camí «%s» existeix al disc, però no a «%.*s»"
 
-#: object-name.c:1708
-#, fuzzy, c-format
+#: object-name.c:1702
+#, c-format
 msgid ""
 "path '%s' exists, but not '%s'\n"
 "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
 msgstr ""
-"path '%s' existeix però no insinuacions '%s' vol dir '%.*s%s' aka '%.*s./%s'?"
+"el camí «%s» existeix, però no «%s»\n"
+"consell: volíeu dir «%.*s:%s» conegut com a «%.*s:./%s»?"
 
-#: object-name.c:1717
+#: object-name.c:1711
 #, c-format
 msgid "path '%s' does not exist in '%.*s'"
 msgstr "el camí «%s» no existeix en «%.*s»"
 
-#: object-name.c:1745
-#, fuzzy, c-format
+#: object-name.c:1739
+#, c-format
 msgid ""
 "path '%s' is in the index, but not at stage %d\n"
 "hint: Did you mean ':%d:%s'?"
 msgstr ""
-"La ruta \"%s\" està en l'índex però no en la indicació de l'etapa per cent."
+"el camí «%s» està a l'índex, però no a «stage» %d\n"
+".consell: volíeu dir «:%d:%s»?"
 
-#: object-name.c:1761
-#, fuzzy, c-format
+#: object-name.c:1755
+#, c-format
 msgid ""
 "path '%s' is in the index, but not '%s'\n"
 "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
 msgstr ""
-"el camí '%s' està en l'índex però no en la indicació '%s' vol dir '%ds' aka "
-"'%d./%s'?"
+"el camí «%s» està a l'índex, però no a «%s»\n"
+".consell: volíeu dir «:%d:%s» conegut com a «:%d:./%s»?"
 
-#: object-name.c:1769
-#, fuzzy, c-format
+#: object-name.c:1763
+#, c-format
 msgid "path '%s' exists on disk, but not in the index"
-msgstr "el camí «%» existeix al disc però no a l'índex"
+msgstr "el camí «%s» existeix al disc, però no a l'índex"
 
-#: object-name.c:1771
-#, fuzzy, c-format
+#: object-name.c:1765
+#, c-format
 msgid "path '%s' does not exist (neither on disk nor in the index)"
 msgstr "el camí «%s» no existeix (ni al disc ni a l'índex)"
 
-#: object-name.c:1784
-#, fuzzy
+#: object-name.c:1778
 msgid "relative path syntax can't be used outside working tree"
 msgstr ""
-"la sintaxi relativa del camí no es pot utilitzar fora de l'arbre de treball"
+"la sintaxi de camí relatiu no es pot utilitzar fora de l'arbre de treball"
 
-#: object-name.c:1922
+#: object-name.c:1916
 #, c-format
 msgid "invalid object name '%.*s'."
 msgstr "nom d'objecte no vàlid «%.*s»."
@@ -5927,27 +6113,40 @@ msgstr "tipus d'objecte «%s» no vàlid"
 msgid "object %s is a %s, not a %s"
 msgstr "l'objecte %s és %s, no pas %s"
 
-#: object.c:232
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "l'objecte %s té un identificador de tipus %d desconegut"
 
-#: object.c:245
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "no s'ha pogut analitzar l'objecte: %s"
 
-#: object.c:265 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "el resum no coincideix %s"
 
-#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "falta l'índex invers necessari al mapa de bits multipaquet"
+
+#: pack-bitmap.c:429
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: no s'ha pogut obrir el paquet"
+
+#: 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:1547 builtin/rev-list.c:92
+#: pack-bitmap.c:1935
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "no s'ha pogut trobar %s al paquet %s al desplaçament %<PRIuMAX>"
+
+#: 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"
@@ -5970,185 +6169,217 @@ msgstr "el fitxer d'índex invers %s té una signatura desconeguda"
 #: pack-revindex.c:238
 #, c-format
 msgid "reverse-index file %s has unsupported version %<PRIu32>"
-msgstr ""
+msgstr "el fitxer d'índex invers %s té la versió %<PRIu32> no admesa"
 
 #: pack-revindex.c:243
 #, c-format
 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
-msgstr ""
+msgstr "el fitxer d'índex invers %s té un ID de resum %<PRIu32> no admès"
 
-#: pack-write.c:250
+#: pack-write.c:251
 msgid "cannot both write and verify reverse index"
 msgstr "no es pot escriure i verificar l'índex invers"
 
-#: pack-write.c:271
+#: pack-write.c:270
 #, c-format
 msgid "could not stat: %s"
 msgstr "no s'ha pogut fer stat a: %s"
 
-#: pack-write.c:283
-#, fuzzy, c-format
+#: pack-write.c:282
+#, c-format
 msgid "failed to make %s readable"
-msgstr "s'ha produït un error en analitzar %s"
+msgstr "s'ha produït un error en fer %s llegible"
 
-#: pack-write.c:522
-#, fuzzy, c-format
+#: pack-write.c:520
+#, c-format
 msgid "could not write '%s' promisor file"
-msgstr "no s'ha pogut escriure «%s»"
+msgstr "no s'ha pogut escriure «%s» al fitxer «promisor»"
 
-#: packfile.c:625
+#: 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:1937
+#: 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: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:1941
+#: 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
+#: 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.c:38
+#: 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"
 msgstr "%s requereix un valor"
 
-#: parse-options.c:73
+#: parse-options.c:93
 #, c-format
 msgid "%s is incompatible with %s"
 msgstr "%s és incompatible amb %s"
 
-#: parse-options.c:78
+#: parse-options.c:98
 #, c-format
 msgid "%s : incompatible with something else"
 msgstr "%s: és incompatible amb alguna altra cosa"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
 #, c-format
 msgid "%s takes no value"
 msgstr "%s no accepta cap valor"
 
-#: parse-options.c:94
+#: parse-options.c:114
 #, c-format
 msgid "%s isn't available"
 msgstr "%s no és disponible"
 
-#: parse-options.c:217
+#: parse-options.c:237
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr "%s espera un valor enter no negatiu amb un sufix opcional k/m/g"
 
-#: parse-options.c:386
+#: parse-options.c:393
 #, c-format
 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:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
-msgstr "voleu dir «--%s» (amb dos traços)?"
+msgstr "voleu dir «--%s» (amb dos guionets)?"
 
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "àlies de --%s"
 
-#: parse-options.c:879
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opció desconeguda «%s»"
 
-#: parse-options.c:881
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
-msgstr "«switch» «%c» desconegut"
+msgstr "opció «%c» desconeguda"
 
-#: parse-options.c:883
+#: 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:907
+#: parse-options.c:920
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:926
+#: 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:932
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "   o: %s"
 
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. 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:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:974
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-NUM"
 
-#: path.c:915
+#: path.c:922
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "No s'ha pogut fer %s escrivible pel grup"
 
-#: pathspec.c:151
+#: pathspec.c:150
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 "El caràcter d'escapament «\\» no està permès com a últim caràcter en un "
 "valor d'un atribut"
 
-#: pathspec.c:169
+#: pathspec.c:168
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Només es permet una especificació «attr:»."
 
-#: pathspec.c:172
+#: pathspec.c:171
 msgid "attr spec must not be empty"
 msgstr "una especificació d'atribut no pot estar buida"
 
-#: pathspec.c:215
+#: pathspec.c:214
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nom d'atribut no vàlid %s"
 
-#: pathspec.c:280
+#: pathspec.c:279
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "els paràmetres d'especificació de camí «glob» i «noglob» globals són "
 "incompatibles"
 
-#: pathspec.c:287
+#: pathspec.c:286
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -6156,52 +6387,52 @@ msgstr ""
 "el paràmetre d'especificació de camí «literal» global és incompatible amb "
 "tots els altres paràmetres d'especificació de camí globals"
 
-#: pathspec.c:327
+#: pathspec.c:326
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "paràmetre no vàlid per a la màgia d'especificació de camí «prefix»"
 
-#: pathspec.c:348
+#: pathspec.c:347
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Màgia d'especificació de camí no vàlida «%.*s» en «%s»"
 
-#: pathspec.c:353
+#: pathspec.c:352
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "«)» mancant al final de la màgia d'especificació de camí en «%s»"
 
-#: pathspec.c:391
+#: pathspec.c:390
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Màgia d'especificació de camí no implementada «%c» en «%s»"
 
-#: pathspec.c:450
+#: pathspec.c:449
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: «literal» i «glob» són incompatibles"
 
-#: pathspec.c:466
+#: pathspec.c:465
 #, c-format
 msgid "%s: '%s' is outside repository at '%s'"
-msgstr "%s: «%s» està fora del dipòsit en «%s»"
+msgstr "%s: «%s» està fora del repositori en «%s»"
 
-#: pathspec.c:542
+#: pathspec.c:541
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "«%s» (mnemònic: «%c»)"
 
-#: pathspec.c:552
+#: pathspec.c:551
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 "%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s"
 
-#: pathspec.c:619
+#: pathspec.c:618
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "l'especificació de camí «%s» és més enllà d'un enllaç simbòlic"
 
-#: pathspec.c:664
+#: pathspec.c:663
 #, c-format
 msgid "line is badly quoted: %s"
 msgstr "la línia està mal citada: %s"
@@ -6215,15 +6446,14 @@ msgid "unable to write delim packet"
 msgstr "no s'ha pogut escriure el paquet delim"
 
 #: pkt-line.c:106
-#, fuzzy
-msgid "unable to write stateless separator packet"
-msgstr "no s'ha pogut escriure el paquet de buidatge"
+msgid "unable to write response end packet"
+msgstr "no s'ha pogut escriure el paquet de final de resposta"
 
 #: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr "s'ha produït un error en escriure el paquet de buidatge"
 
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
 msgid "protocol error: impossibly long line"
 msgstr "error de protocol: longitud de línia impossible"
 
@@ -6231,7 +6461,7 @@ msgstr "error de protocol: longitud de línia impossible"
 msgid "packet write with format failed"
 msgstr "ha fallat l'escriptura del paquet amb format"
 
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
 msgid "packet write failed - data exceeds max packet size"
 msgstr ""
 "no s'ha pogut escriure el paquet - les dades excedeixen la mida màxima del "
@@ -6242,25 +6472,25 @@ msgstr ""
 msgid "packet write failed: %s"
 msgstr "no s'ha pogut escriure el paquet: %s"
 
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
 msgid "read error"
 msgstr "error de lectura"
 
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
 msgid "the remote end hung up unexpectedly"
 msgstr "el remot ha penjat inesperadament"
 
-#: pkt-line.c:369 pkt-line.c:371
+#: 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:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: 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:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "error remot: %s"
@@ -6274,122 +6504,116 @@ 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:30
+#: 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:35 promisor-remote.c:37
+#: 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:41
+#: 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:53
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "el nom remot «promisor» no pot començar amb «/»: %s"
 
 #: protocol-caps.c:103
-#, fuzzy
 msgid "object-info: expected flush after arguments"
-msgstr "s'esperava una neteja després de les capacitats"
+msgstr "object-info: s'esperava una neteja després dels arguments"
 
 #: prune-packed.c:35
 msgid "Removing duplicate objects"
-msgstr "S'estan eliminant objectes duplicats"
+msgstr "S'estan eliminant els objectes duplicats"
 
-#: range-diff.c:78
+#: range-diff.c:67
 msgid "could not start `log`"
 msgstr "no s'ha pogut iniciar «log»"
 
-#: range-diff.c:80
+#: range-diff.c:69
 msgid "could not read `log` output"
 msgstr "no s'ha pogut llegir la sortida de «log»"
 
-#: range-diff.c:101 sequencer.c:5551
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "no s'ha pogut analitzar la comissió «%s»"
 
-#: range-diff.c:115
-#, fuzzy, c-format
+#: range-diff.c:111
+#, c-format
 msgid ""
 "could not parse first line of `log` output: did not start with 'commit ': "
 "'%s'"
 msgstr ""
-"no s'ha pogut analitzar la primera línia de la sortida `log` no s'ha iniciat "
-"amb 'commit '%s'"
+"no s'ha pogut analitzar la primera línia de la sortida «log»: no començava "
+"amb «commit»: «%s»"
 
-#: range-diff.c:140
+#: range-diff.c:137
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "no s'ha pogut llegir la capçalera de la gif «%.*s»"
 
-#: range-diff.c:306
+#: range-diff.c:304
 msgid "failed to generate diff"
 msgstr "s'ha produït un error en generar el diff"
 
-#: range-diff.c:558
-#, fuzzy
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "-p i --overlay són mútuament excloents"
-
-#: range-diff.c:561 range-diff.c:563
+#: 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:708
+#: 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:724
+#: 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:746
+#: 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:751
-#, fuzzy, c-format
+#: 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"
+msgstr "«%s» no té una comissió comprovada"
 
-#: read-cache.c:803
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "no es pot llegir indexar el fitxer «%s»"
 
-#: read-cache.c:822
+#: 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:833
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "no s'ha pogut fer «stat» a «%s»"
 
-#: read-cache.c:1356
+#: 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:1571
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "Actualitza l'índex"
 
-#: read-cache.c:1700
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6398,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:1710
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6407,157 +6631,153 @@ msgstr ""
 "GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
 "S'està usant la versió %i"
 
-#: read-cache.c:1766
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "signatura malmesa 0x%08x"
 
-#: read-cache.c:1769
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "versió d'índex incorrecta %d"
 
-#: read-cache.c:1778
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "signatura sha1 malmesa al fitxer d'índex"
 
-#: read-cache.c:1812
+#: 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:1814
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "s'està ignorant l'extensió %.4s"
 
-#: read-cache.c:1851
+#: 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:1867
+#: 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:1924
-#, fuzzy
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
-msgstr "entrades d'escenari no ordenades en l'índex"
+msgstr "entrades «stage» no ordenades en l'índex"
 
-#: read-cache.c:1927
-#, fuzzy, c-format
+#: read-cache.c:1960
+#, c-format
 msgid "multiple stage entries for merged file '%s'"
-msgstr "múltiples entrades d'etapa per al fitxer fusionat «%s»"
+msgstr "múltiples entrades «stage» per al fitxer fusionat «%s»"
 
-#: read-cache.c:1930
-#, fuzzy, c-format
+#: read-cache.c:1963
+#, c-format
 msgid "unordered stage entries for '%s'"
-msgstr "entrades d'etapa no ordenades per «%s»"
-
-#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:332
+msgstr "entrades «stage» no ordenades per a «%s»"
+
+#: 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: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:2180
+#: 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:2193
+#: 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:2226
+#: 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:2230
+#: 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:2234
+#: 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:2238
+#: read-cache.c:2280
 #, c-format
-msgid "%s: unable to map index file"
-msgstr "%s: no es pot mapar el fitxer d'índex"
+msgid "%s: unable to map index file%s"
+msgstr "%s: no es pot mapar el fitxer d'índex%s"
 
-#: read-cache.c:2280
-#,c-format
+#: 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:2307
+#: 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:2345
+#: 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:2392
+#: 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:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: 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:3138
-#, fuzzy
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
-msgstr "s'ha produït un error en netejar l'índex"
+msgstr "s'ha produït un error en convertir a un índex dispers"
 
-#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "no s'ha pogut fer stat a «%s»"
 
-#: read-cache.c:3222
+#: 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:3234
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "no s'ha pogut desenllaçar: %s"
 
-#: read-cache.c:3263
+#: 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:3412
-#, fuzzy, c-format
+#: read-cache.c:3411
+#, c-format
 msgid "%s: cannot drop to stage #0"
-msgstr "els percentatges no poden descendir a l'escenari #0"
+msgstr "%s: no es pot baixar fins al «stage» #0"
 
 #: rebase-interactive.c:11
 msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n"
 "Or you can abort the rebase with 'git rebase --abort'.\n"
 msgstr ""
-"Podeu arreglar-ho amb «git rebase --edit-todo» i després «git rebase --"
-"continue».\n"
+"Podeu arreglar-ho amb «git rebase --edit-todo» i després «git rebase --continue».\n"
 "O bé, podeu avortar el «rebase» amb «git rebase --abort».\n"
 
 #: rebase-interactive.c:33
@@ -6597,45 +6817,39 @@ msgstr ""
 "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-la\n"
-"s, squash <comissió> = usa la comissió, però fusiona-la a la comissió "
-"prèvia\n"
+"s, squash <comissió> = usa la comissió, però fusiona-la a la comissió prèvia\n"
 "f, fixup [-C | -c] <commit> = com a «squash», però manté només el missatge\n"
 "                   de comissió previ, a menys que s'usi -C, en aquest cas\n"
 "                   manté només el missatge d'aquesta comissió; -c és el mateix\n"
 "                   que -C, però obre l'editor\n"
-"x, exec <ordre> = executa l'ordre (la resta de la línia) usant "
-"l'intèrpret d'ordres\n"
-"b, break = atura't aquí (continua fent «rebase» després amb «git rebase --"
-"continue»)\n"
+"x, exec <ordre> = executa l'ordre (la resta de la línia) usant l'intèrpret d'ordres\n"
+"b, break = atura't aquí (continua fent «rebase» després amb «git rebase --continue»)\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 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 la comissió.\n"
 "\n"
 "Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
 
 #: rebase-interactive.c:66
-#, fuzzy, c-format
+#, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Rebase %s en un 1% (ordre<unk>d)"
-msgstr[1] "Rebase de percentatges sobre els percentatges (ordres<unk>d)"
+msgstr[0] "Fes «rebase» de %s a %s (%d ordre)"
+msgstr[1] "Fes «rebase» de %s a %s (%d ordres)"
 
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
 msgstr ""
 "\n"
-"No elimineu cap línia. Useu «drop» explícitament per a eliminar una "
-"comissió.\n"
+"No elimineu cap línia. Useu «drop» explícitament per a eliminar una comissió.\n"
 
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6643,7 +6857,7 @@ msgstr ""
 "\n"
 "Si elimineu una línia aquí, ES PERDRÀ AQUELLA COMISSIÓ.\n"
 
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6657,7 +6871,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -6667,14 +6881,14 @@ msgstr ""
 "No obstant, si elimineu tot, s'avortarà el «rebase».\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816
-#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
+#: 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'"
 msgstr "no s'ha pogut escriure «%s»"
 
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
 #, c-format
 msgid "could not write '%s'."
 msgstr "no s'ha pogut escriure a «%s»."
@@ -6685,8 +6899,7 @@ msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):\n"
 msgstr ""
-"Advertència: pot ser que algunes comissions s'hagin descartat "
-"accidentalment.\n"
+"Advertència: pot ser que algunes comissions s'hagin descartat accidentalment.\n"
 "Les comissions descartades (més nova a més vella):\n"
 
 #: rebase-interactive.c:203
@@ -6694,26 +6907,21 @@ msgstr ""
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
 "\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"
 "The possible behaviours are: ignore, warn, error.\n"
 "\n"
 msgstr ""
-"Per a evitar aquest missatge, useu «drop» per a eliminar explícitament una "
-"comissió.\n"
+"Per a evitar aquest missatge, useu «drop» per a eliminar explícitament una comissió.\n"
 "\n"
-"Useu «git config rebase.missingCommitsCheck» per a canviar el nivell "
-"d'advertències.\n"
+"Useu «git config rebase.missingCommitsCheck» per a canviar el nivell d'advertències.\n"
 "Els comportaments possibles són: ignore, warn, error.\n"
 
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
 #, c-format
-msgid "could not read '%s'."
-msgstr "no s'ha pogut llegir «%s»."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: «conserva» substituït per «fusiona»"
 
-#: ref-filter.c:42 wt-status.c:1978
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "no hi és"
 
@@ -6732,259 +6940,230 @@ msgstr "darrere per %d"
 msgid "ahead %d, behind %d"
 msgstr "davant per %d, darrere per %d"
 
-#: ref-filter.c:175
+#: ref-filter.c:235
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "format esperat: %%(color:<color>)"
 
-#: ref-filter.c:177
+#: ref-filter.c:237
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "color no reconegut: %%(color:%s)"
 
-#: ref-filter.c:199
+#: ref-filter.c:259
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Valor enter esperat pel nom de referència:lstrip=%s"
 
-#: ref-filter.c:203
+#: ref-filter.c:263
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Valor enter esperat pel nom de referència:rstrip=%s"
 
-#: ref-filter.c:205
+#: 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"
 
-#: ref-filter.c:260
+#: ref-filter.c:320
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) no accepta arguments"
 
-#: ref-filter.c:282
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "argument %%(objectsize) no reconegut: %s"
-
-#: ref-filter.c:290
+#: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) no accepta arguments"
 
-#: ref-filter.c:302
+#: ref-filter.c:364
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) no accepta arguments"
 
-#: ref-filter.c:315
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "argument %%(subject) no reconegut: %s"
-
-#: ref-filter.c:334
+#: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
-msgstr ""
+msgstr "s'esperava %%(trailers:key=<value>)"
 
-#: ref-filter.c:336
+#: ref-filter.c:398
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "argument %%(trailers) desconegut: %s"
 
-#: ref-filter.c:367
+#: ref-filter.c:429
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valor positiu esperat conté:lines=%s"
 
-#: ref-filter.c:369
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "argument %%(contents) no reconegut: %s"
-
-#: ref-filter.c:384
+#: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "valor positiu esperat «%s» a %%(%s)"
 
-#: ref-filter.c:388
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "argument no reconegut «%s» a %%(%s)"
-
-#: ref-filter.c:402
+#: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
 msgstr "opció del correu electrònic no reconeguda: «%s»"
 
-#: ref-filter.c:432
+#: ref-filter.c:506
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "format esperat: %%(align:<amplada>,<posició>)"
 
-#: ref-filter.c:444
+#: ref-filter.c:518
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "posició no reconeguda:%s"
 
-#: ref-filter.c:451
+#: ref-filter.c:525
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "amplada no reconeguda:%s"
 
-#: ref-filter.c:460
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "argument %%(align) no reconegut: %s"
-
-#: ref-filter.c:468
+#: 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:486
+#: ref-filter.c:568
 #, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "argument %%(if) no reconegut: %s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) no accepta arguments"
 
-#: ref-filter.c:588
+#: ref-filter.c:680
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nom de camp mal format: %.*s"
 
-#: ref-filter.c:615
+#: ref-filter.c:707
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nom de camp desconegut: %.*s"
 
-#: ref-filter.c:619
+#: ref-filter.c:711
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
-"no és un dipòsit, 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:743
+#: 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: s'ha usat l'àtom %%(if) sense un àtom %%(then)"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format: l'àtom %%(%s) usat sense un àtom %%(%s)"
 
-#: ref-filter.c:807
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "format: s'ha usat l'àtom %%(then) sense un àtom %%(if)"
-
-#: ref-filter.c:809
+#: ref-filter.c:912
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format: s'ha usat l'àtom %%(then) més d'un cop"
 
-#: ref-filter.c:811
+#: ref-filter.c:914
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)"
 
-#: ref-filter.c:839
-#, 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:841
-#, 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:843
+#: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "format: s'ha usat l'àtom %%(else) més d'un cop"
 
-#: ref-filter.c:858
+#: ref-filter.c:965
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent"
 
-#: ref-filter.c:915
+#: ref-filter.c:1027
 #, c-format
 msgid "malformed format string %s"
 msgstr "cadena de format mal format %s"
 
-#: ref-filter.c:1556
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "aquesta ordre rebutja l'àtom %%(%.*s)"
+
+#: ref-filter.c:1040
+#, 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
 msgid "(no branch, rebasing %s)"
 msgstr "(sense branca, s'està fent «rebase» %s)"
 
-#: ref-filter.c:1559
-#,  c-format
+#: ref-filter.c:1709
+#, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr "(sense branca, s'està fent «rebase» d'un «HEAD» separat %s)"
 
-#: ref-filter.c:1562
+#: ref-filter.c:1712
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(sense branca, bisecció començada en %s)"
 
-#: ref-filter.c:1566
+#: ref-filter.c:1716
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD separat a %s)"
 
-#: ref-filter.c:1569
+#: ref-filter.c:1719
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD separat des de %s)"
 
-#: ref-filter.c:1572
+#: ref-filter.c:1722
 msgid "(no branch)"
 msgstr "(sense branca)"
 
-#: ref-filter.c:1604 ref-filter.c:1813
+#: ref-filter.c:1754 ref-filter.c:1972
 #, c-format
 msgid "missing object %s for %s"
 msgstr "manca l'objecte %s per a %s"
 
-#: ref-filter.c:1614
+#: ref-filter.c:1764
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer ha fallat en %s per a %s"
 
-#: ref-filter.c:1997
+#: ref-filter.c:2155
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objecte mal format a «%s»"
 
-#: ref-filter.c:2086
+#: ref-filter.c:2245
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "s'està ignorant la referència amb nom malmès %s"
 
-#: ref-filter.c:2091 refs.c:676
+#: 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:2431
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: manca l'àtom %%(end)"
 
-#: ref-filter.c:2525
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "nom d'objecte %s mal format"
 
-#: ref-filter.c:2530
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "l'opció «%s» ha d'apuntar a una comissió"
 
-#: refs.c:264
+#: refs.c:261
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr "%s no apunta a un objecte vàlid"
 
-#: refs.c:566
+#: refs.c:563
 #, c-format
 msgid ""
 "Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6998,83 +7177,92 @@ msgid ""
 "\n"
 "\tgit branch -m <name>\n"
 msgstr ""
+"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 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>\n"
 
-#: refs.c:588
+#: refs.c:585
 #, c-format
 msgid "could not retrieve `%s`"
 msgstr "no s'ha pogut recuperar «%s»"
 
-#: refs.c:598
+#: refs.c:595
 #, c-format
 msgid "invalid branch name: %s = %s"
 msgstr "nom de branca no vàlida: %s = %s"
 
 #: refs.c:674
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring dangling symref %s"
-msgstr "ignorant symref per sota"
+msgstr "s'està ignorant symref penjant %s"
 
-#: refs.c:922
-#, fuzzy, c-format
+#: refs.c:925
+#, c-format
 msgid "log for ref %s has gap after %s"
-msgstr "registre per a ref %s have gap després de percentatges"
+msgstr "registre per a ref %s té un buit després de %s"
 
-#: refs.c:929
-#, fuzzy, c-format
+#: refs.c:932
+#, c-format
 msgid "log for ref %s unexpectedly ended on %s"
-msgstr "registre per als ref%s inesperadament ha acabat en percentatges"
+msgstr "registre per als ref %s ha acabat inesperadament a %s"
 
-#: refs.c:994
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "el registre per a %s és buit"
 
-#: refs.c:1086
+#: 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:1157
-#, fuzzy, c-format
+#: refs.c:1168
+#, c-format
 msgid "update_ref failed for ref '%s': %s"
-msgstr "ha fallat updateref per al ref '%s'%s"
+msgstr "ha fallat update_ref per a la ref «%s»: %s"
 
-#: refs.c:2051
+#: 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:2131
+#: 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:2142
-#, fuzzy
+#: refs.c:2161
 msgid "ref updates aborted by hook"
-msgstr "les actualitzacions de referències s'han avortat per ganxo"
+msgstr "les actualitzacions de referències s'han avortat per un lligam"
 
-#: refs.c:2242 refs.c:2272
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "«%s» existeix; no es pot crear «%s»"
 
-#: refs.c:2248 refs.c:2283
+#: 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:1228
+#: 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:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: 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:1245 refs/packed-backend.c:1555
+#: 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"
@@ -7084,60 +7272,61 @@ msgstr "no s'han pogut suprimir les referències: %s"
 msgid "invalid refspec '%s'"
 msgstr "refspec no vàlida: «%s»"
 
-#: remote.c:351
-#, fuzzy, c-format
+#: remote.c:402
+#, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
-msgstr "config remote abreviation no pot començar amb «/» per cents"
+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"
+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 "l'especificació de referència de src %s coincideix amb més d'un"
+msgstr ""
+"l'especificació de referència de src %s coincideix amb més d'una referència"
 
 #. 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"
@@ -7149,161 +7338,170 @@ 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
-#, fuzzy, c-format
+#: remote.c:1232
+#, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
 "Did you mean to create a new branch by pushing to\n"
 "'%s:refs/heads/%s'?"
 msgstr ""
-"La part <src> de l'especificació de referència és un objecte de comissió. "
-"Voleu crear una branca nova empenyent a '%srefs/heads/%s'?"
+"La part <src> de l'especificació de la referència és un objecte de comissió.\n"
+"Voleu crear una branca nova empenyent a\n"
+"«%s:refs/heads/%s»?"
 
-#: remote.c:1128
-#, fuzzy, c-format
+#: remote.c:1237
+#, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
 "Did you mean to create a new tag by pushing to\n"
 "'%s:refs/tags/%s'?"
 msgstr ""
-"La part <src> de l'especificació de referència és un objecte d'etiqueta. "
-"Voleu crear una etiqueta nova empenyent a '%srefs/tags/%s'?"
+"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
-#, fuzzy, c-format
+#: remote.c:1242
+#, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
 "Did you mean to tag a new tree by pushing to\n"
 "'%s:refs/tags/%s'?"
 msgstr ""
-"La part <src> de l'especificació de referència és un objecte d'arbre. Voleu "
-"marcar un nou arbre empenyent a '%srefs/tags/%s'?"
+"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
-#, fuzzy, c-format
+#: remote.c:1247
+#, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
 "Did you mean to tag a new blob by pushing to\n"
 "'%s:refs/tags/%s'?"
 msgstr ""
-"La part <src> de l'especificació de referència és un objecte blob. Voleu "
-"marcar un nou blob empenyent a '%srefs/tags/%s'?"
+"La part <src> de l'especificació de la referència és un objecte blob.\n"
+"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
-#, fuzzy, c-format
+#: remote.c:1306
+#, c-format
 msgid "dst refspec %s matches more than one"
-msgstr "dst les especificacions de rendiment coincideixen més d'un"
+msgstr ""
+"l'especificació de la referència dst %s coincideixen amb més d'una "
+"referència"
 
-#: remote.c:1204
-#, fuzzy, c-format
+#: remote.c:1313
+#, c-format
 msgid "dst ref %s receives from more than one src"
-msgstr "dst ref%s rep de més d'un 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"
+"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 ""
@@ -7315,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"
@@ -7334,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»"
@@ -7371,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
+#: 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»"
@@ -7392,9 +7590,9 @@ msgid "writing '%s' failed"
 msgstr "s'ha produït un error en escriure «%s»"
 
 #: rerere.c:698
-#, fuzzy, c-format
+#, c-format
 msgid "Staged '%s' using previous resolution."
-msgstr "Fased '%s' utilitzant resolució anterior."
+msgstr "«Staged» «%s» utilitzant una resolució anterior."
 
 #: rerere.c:737
 #, c-format
@@ -7407,17 +7605,17 @@ msgid "Resolved '%s' using previous resolution."
 msgstr "S'ha resolt «%s» usant una resolució anterior."
 
 #: rerere.c:787
-#, fuzzy, c-format
+#, c-format
 msgid "cannot unlink stray '%s'"
-msgstr "no es pot desenllaçar «%s» extraviats"
+msgstr "no es pot desenllaçar «%s» (extraviat)"
 
 #: rerere.c:791
 #, c-format
 msgid "Recorded preimage for '%s'"
 msgstr "Imatge prèvia registrada per a «%s»"
 
-#: rerere.c:865 submodule.c:2089 builtin/log.c:2000
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
+#: 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»"
@@ -7455,46 +7653,33 @@ 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:3669
+#: 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:2343
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
-msgstr "--unpacked=<packfile> ja no s'ha admet"
+msgstr "--unpacked=<packfile> ja no s'admet"
 
-#: revision.c:2683
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr "la vostra branca actual sembla malmesa"
 
-#: revision.c:2686
+#: 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:2892
+#: 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:767
-msgid "open /dev/null failed"
-msgstr "s'ha produït un error en obrir /dev/null"
-
-#: run-command.c:1275
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "no s'ha pogut crear fil «async»: %s"
 
-#: run-command.c:1345
-#, fuzzy, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"El ganxo «%s» s'ha ignorat perquè no s'ha establert com a executable. Podeu "
-"desactivar aquest avís amb `git config aconsell.ignoredHook false`."
-
 #: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
@@ -7515,73 +7700,74 @@ msgstr "s'ha produït un error en el desempaquetament remot: %s"
 msgid "failed to sign the push certificate"
 msgstr "s'ha produït un error en signar el certificat de pujada"
 
-#: send-pack.c:433
-#, fuzzy
+#: send-pack.c:435
 msgid "send-pack: unable to fork off fetch subprocess"
-msgstr "promisor-remote no es pot bifurcar obtenint el subprocés"
+msgstr "send-pack: no es pot bifurcar obtenint un subprocés"
 
-#: send-pack.c:455
+#: send-pack.c:457
 msgid "push negotiation failed; proceeding anyway with push"
 msgstr ""
+"ha fallat la negociació de l'empenta; s'està procedint igualment amb "
+"l'empenta"
 
-#: send-pack.c:520
-#, fuzzy
+#: send-pack.c:528
 msgid "the receiving end does not support this repository's hash algorithm"
-msgstr "el destí receptor no admet opcions de pujada"
+msgstr "el receptor de destí no admet l'algorisme de hash del repositori"
 
-#: send-pack.c:529
+#: send-pack.c:537
 msgid "the receiving end does not support --signed push"
 msgstr "el destí receptor no admet pujar --signed"
 
-#: send-pack.c:531
+#: send-pack.c:539
 msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+"not sending a push certificate since the receiving end does not support "
+"--signed push"
 msgstr ""
 "no s'està enviant una certificació de pujada perquè el destí receptor no "
 "admet pujar --signed"
 
-#: send-pack.c:543
+#: send-pack.c:546
 msgid "the receiving end does not support --atomic push"
 msgstr "el destí receptor no admet pujar --atomic"
 
-#: send-pack.c:548
+#: send-pack.c:551
 msgid "the receiving end does not support push options"
 msgstr "el destí receptor no admet opcions de pujada"
 
-#: sequencer.c:196
+#: sequencer.c:197
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "mode de neteja «%s» no vàlid en la comissió del missatge"
 
-#: sequencer.c:324
+#: sequencer.c:325
 #, c-format
 msgid "could not delete '%s'"
 msgstr "no s'ha pogut suprimir «%s»"
 
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: 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»"
 
-#: sequencer.c:354
+#: sequencer.c:355
 msgid "revert"
 msgstr "revertir"
 
-#: sequencer.c:356
+#: sequencer.c:357
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:358
+#: sequencer.c:359
 msgid "rebase"
 msgstr "rebase"
 
-#: sequencer.c:360
+#: sequencer.c:361
 #, c-format
 msgid "unknown action: %d"
 msgstr "acció desconeguda: %d"
 
-#: sequencer.c:419
+#: sequencer.c:420
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -7589,119 +7775,146 @@ msgstr ""
 "després de resoldre els conflictes, marqueu els camins\n"
 "corregits amb «git add <camins>» o «git rm <camins>»"
 
-#: sequencer.c:422
+#: sequencer.c:423
 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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
 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»"
+"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:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"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:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "no s'ha pogut bloquejar «%s»"
 
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#: 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»"
 
-#: sequencer.c:442
+#: sequencer.c:455
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "no s'ha pogut escriure el terminador de línia a «%s»"
 
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3554
+#: 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:486
+#: 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."
 msgstr "els vostres canvis locals se sobreescriurien per %s."
 
-#: sequencer.c:490
+#: sequencer.c:503
 msgid "commit your changes or stash them to proceed."
 msgstr "cometeu els vostres canvis o feu un «stash» per a procedir."
 
-#: sequencer.c:522
+#: sequencer.c:535
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avanç ràpid"
 
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Mode de neteja no vàlid %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
-#.
-#: sequencer.c:671
+#: sequencer.c:685
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
 
-#: sequencer.c:685
+#: sequencer.c:699
 msgid "unable to update cache tree"
 msgstr "no s'ha pogut actualitzar l'arbre cau"
 
-#: sequencer.c:699
+#: sequencer.c:713
 msgid "could not resolve HEAD commit"
 msgstr "no s'ha pogut resoldre la comissió HEAD"
 
-#: sequencer.c:779
+#: sequencer.c:793
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "no hi ha una clau a «%.*s»"
 
-#: sequencer.c:790
-#, fuzzy, c-format
+#: sequencer.c:804
+#, c-format
 msgid "unable to dequote value of '%s'"
-msgstr "no s'ha pogut delinear el valor de cometes de «%s»"
+msgstr "no s'han pogut treure les cometes del valor de «%s»"
 
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
-#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
+#: 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"
 
-#: sequencer.c:837
+#: sequencer.c:851
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "Ja s'ha donat «GIT_AUTHOR_NAME»"
 
-#: sequencer.c:842
+#: sequencer.c:856
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "Ja s'ha donat «GIT_AUTHOR_EMAIL»"
 
-#: sequencer.c:847
+#: sequencer.c:861
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "Ja s'ha donat «GIT_AUTHOR_DATE»"
 
-#: sequencer.c:851
+#: sequencer.c:865
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "variable «%s» desconeguda"
 
-#: sequencer.c:856
+#: sequencer.c:870
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "falta «GIT_AUTHOR_NAME»"
 
-#: sequencer.c:858
+#: sequencer.c:872
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "falta «GIT_AUTHOR_EMAIL»"
 
-#: sequencer.c:860
+#: sequencer.c:874
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "falta «GIT_AUTHOR_DATE»"
 
-#: sequencer.c:925
+#: sequencer.c:939
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -7718,8 +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"
@@ -7731,11 +7943,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1212
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "el lligam «prepare-commit-msg» ha fallat"
 
-#: sequencer.c:1218
+#: 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"
@@ -7753,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"
@@ -7762,7 +7974,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1231
+#: 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"
@@ -7788,344 +8000,349 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1273
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "no s'ha pogut trobar la comissió novament creada"
 
-#: sequencer.c:1275
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr "no s'ha pogut analitzar la comissió novament creada"
 
-#: sequencer.c:1321
+#: 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:1323
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "HEAD separat"
 
-#: sequencer.c:1327
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (comissió arrel)"
 
-#: sequencer.c:1348
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "no s'ha pogut analitzar HEAD"
 
-#: sequencer.c:1350
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s no és una comissió!"
 
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
+#: 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:1410 sequencer.c:2295
+#: 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:1421 builtin/am.c:1614 builtin/merge.c:706
+#: 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:1454 sequencer.c:1574
+#: 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:1485 sequencer.c:1517
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "identitat d'autor no vàlida: «%s»"
 
-#: sequencer.c:1491
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "autor malmès: falta la informació de la data"
 
-#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
-#: builtin/merge.c:934 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:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#: 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:1606
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "no s'ha pogut analitzar la comissió %s"
 
-#: sequencer.c:1611
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "no s'ha pogut analitzar la comissió pare %s"
 
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "ordre desconeguda: %d"
 
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "Aquest és el 1r missatge de comissió:"
 
-#: sequencer.c:1737
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Aquest és el missatge de comissió #%d:"
 
-#: sequencer.c:1738
-#, fuzzy
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
-msgstr "El missatge de comissió núm. #%d s'ometrà:"
+msgstr "El primer missatge de comissió s'ometrà:"
 
-#: sequencer.c:1739
+#: 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:1740
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Això és una combinació de %d comissions."
 
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "no es pot escriure «%s»"
 
-#: sequencer.c:1934
+#: 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:1936 sequencer.c:3581
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "no s'ha pogut llegir HEAD"
 
-#: sequencer.c:1938
+#: 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:1962
+#: 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:2072
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "el vostre fitxer d'índex està sense fusionar."
 
-#: sequencer.c:2079
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "no es pot arreglar la comissió arrel"
 
-#: sequencer.c:2098
+#: 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:2106 sequencer.c:2114
+#: 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:2120
+#: 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:2139
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: no es pot analitzar la comissió pare %s"
 
-#: sequencer.c:2205
+#: 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:2265
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "no s'ha pogut revertir %s... %s"
 
-#: sequencer.c:2266
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "no s'ha pogut aplicar %s... %s"
 
-#: sequencer.c:2287
-#, fuzzy, c-format
+#: sequencer.c:2306
+#, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
-msgstr ""
-"deixant anar per cents per cents -- el contingut del pedaç ja s'ha avançat"
+msgstr "descartant %s %s -- el contingut del pedaç ja està a la font\n"
 
-#: sequencer.c:2345
+#: 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:2352
+#: 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:2425
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s no accepta arguments: «%s»"
 
-#: sequencer.c:2434
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "falten els arguments per a %s"
 
-#: sequencer.c:2477
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "no s'ha pogut analitzar «%s»"
 
-#: sequencer.c:2538
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "línia no vàlida %d: %.*s"
 
-#: sequencer.c:2549
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "no es pot «%s» sense una comissió prèvia"
 
-#: sequencer.c:2635
+#: sequencer.c:2624 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "no s'ha pogut llegir «%s»."
+
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "s'està cancel·lant un «cherry pick» en curs"
 
-#: sequencer.c:2644
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "s'està cancel·lant la reversió en curs"
 
-#: sequencer.c:2690
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "corregiu-ho usant «git rebase --edit-todo»."
 
-#: sequencer.c:2692
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "full d'instruccions inusable: «%s»"
 
-#: sequencer.c:2697
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "no s'ha analitzat cap comissió."
 
-#: sequencer.c:2708
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "no es pot fer «cherry pick» durant una reversió."
 
-#: sequencer.c:2710
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "no es pot revertir durant un «cherry pick»."
 
-#: sequencer.c:2788
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valor no vàlid per a %s: %s"
 
-#: sequencer.c:2897
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "«squash-onto» no usable"
 
-#: sequencer.c:2917
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "full d'opcions mal format: «%s»"
 
-#: sequencer.c:3012 sequencer.c:4869
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "conjunt de comissions buit passat"
 
-#: sequencer.c:3029
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "una reversió ja està en curs"
 
-#: sequencer.c:3031
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "intenteu «git revert (--continue | %s--abort | --quit)»"
 
-#: sequencer.c:3034
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "un «cherry pick» ja està en curs"
 
-#: sequencer.c:3036
+#: 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:3050
+#: 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:3065
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "no s'ha pogut bloquejar HEAD"
 
-#: sequencer.c:3125 sequencer.c:4582
+#: 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:3127 sequencer.c:3138
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "no es pot resoldre HEAD"
 
-#: sequencer.c:3129 sequencer.c:3173
+#: 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:3159 builtin/grep.c:759
+#: 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:3161
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "no es pot llegir «%s»: %s"
 
-#: sequencer.c:3162
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "final de fitxer inesperat"
 
-#: sequencer.c:3168
+#: 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:3179
+#: 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:3220
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "no hi ha cap reversió en curs"
 
-#: sequencer.c:3229
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "ni hi ha cap «cherry pick» en curs"
 
-#: sequencer.c:3239
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "s'ha produït un error en ometre la comissió"
 
-#: sequencer.c:3246
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "no hi ha res a ometre"
 
-#: sequencer.c:3249
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8134,16 +8351,16 @@ msgstr ""
 "heu fet ja una comissió?\n"
 "proveu «git %s --continue»"
 
-#: sequencer.c:3411 sequencer.c:4473
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "no es pot llegir HEAD"
 
-#: sequencer.c:3428
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "no s'ha pogut copiar «%s» a «%s»"
 
-#: sequencer.c:3436
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8162,27 +8379,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3446
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "No s'ha pogut aplicar %s... %.*s"
 
-#: sequencer.c:3453
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "No s'ha pogut fusionar %.*s"
 
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: 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:3483
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "S'està executant: %s\n"
 
-#: sequencer.c:3498
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8197,11 +8414,11 @@ msgstr ""
 " git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3504
+#: 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:3510
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8217,92 +8434,91 @@ msgstr ""
 "\n"
 " git rebase --continue\n"
 
-#: sequencer.c:3571
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nom d'etiqueta no permès: «%.*s»"
 
-#: sequencer.c:3625
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "s'està escrivint una comissió arrel falsa"
 
-#: sequencer.c:3630
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "s'està escrivint «squash-onto»"
 
-#: sequencer.c:3714
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "no s'ha pogut resoldre «%s»"
 
-#: sequencer.c:3747
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "no es pot fusionar sense una revisió actual"
 
-#: sequencer.c:3769
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "no s'ha pogut analitzar «%.*s»"
 
-#: sequencer.c:3778
+#: 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:3790
-#, 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:3806
+#: 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:3989
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "no s'ha pogut fusionar «%.*s»"
 
-#: sequencer.c:4005
+#: 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:4079
+#: 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:4082
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Resposta de «stash» inesperada: «%s»"
 
-#: sequencer.c:4088
+#: 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:4091
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "S'ha creat un «stash» automàticament: %s\n"
 
-#: sequencer.c:4095
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "no s'ha pogut fer reset --hard"
 
-#: sequencer.c:4120
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "S'ha aplicat el «stash» automàticament.\n"
 
-#: sequencer.c:4132
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "no es pot emmagatzemar %s"
 
-#: sequencer.c:4135
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8313,31 +8529,31 @@ 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:4140
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "L'aplicació del «stash» automàticament ha donat conflictes."
 
-#: sequencer.c:4141
+#: 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:4234 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "no s'ha pogut separar HEAD"
 
-#: sequencer.c:4249
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Aturat a HEAD\n"
 
-#: sequencer.c:4251
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Aturat a %s\n"
 
-#: sequencer.c:4259
-#, fuzzy, c-format
+#: sequencer.c:4301
+#, c-format
 msgid ""
 "Could not execute the todo command\n"
 "\n"
@@ -8348,62 +8564,67 @@ msgid ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 msgstr ""
-"No s'ha pogut executar l'ordre de tasques pendents.*s S'ha reprogramat; Per "
-"editar l'ordre abans de continuar editeu primer la llista de tasques "
-"pendents git rebase --edit-todo git rebase --continue"
+"No s'ha pogut executar l'ordre «todo»\n"
+"\n"
+"    %.*s\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:4305
-#, fuzzy, c-format
+#: sequencer.c:4347
+#, c-format
 msgid "Rebasing (%d/%d)%s"
-msgstr "S'estan reubicant (%d/%d)%s"
+msgstr "S'està fent «rebase» (%d/%d)%s"
 
-#: sequencer.c:4351
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Aturat a %s...  %.*s\n"
 
-#: sequencer.c:4422
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "ordre %d desconeguda"
 
-#: sequencer.c:4481
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "no s'ha pogut llegir orig-head"
 
-#: sequencer.c:4486
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "no s'ha pogut llegir «onto»"
 
-#: sequencer.c:4500
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "no s'ha pogut actualitzar HEAD a %s"
 
-#: sequencer.c:4560
+#: 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:4612
+#: 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:4621
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "no es pot esmenar una comissió no existent"
 
-#: sequencer.c:4623
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "fitxer no vàlid: «%s»"
 
-#: sequencer.c:4625
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contingut no vàlid: «%s»"
 
-#: sequencer.c:4628
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8413,86 +8634,93 @@ 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:4664 sequencer.c:4703
+#: 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:4719
+#: 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:4726
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "no s'han pogut cometre els canvis «staged»."
 
-#: sequencer.c:4846
+#: 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:4850
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisió incorrecta"
 
-#: sequencer.c:4885
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "no es pot revertir com a comissió inicial"
 
-#: sequencer.c:5362
+#: sequencer.c:5189 sequencer.c:5418
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "omet les comissions aplicades anteriorment %s"
+
+#: sequencer.c:5259 sequencer.c:5434
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "useu --reapply-cherry-picks per a incloure les comissions omeses"
+
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
 msgstr "make_script: opcions no gestionades"
 
-#: sequencer.c:5365
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script: s'ha produït un error en preparar les revisions"
 
-#: sequencer.c:5615 sequencer.c:5632
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "res a fer"
 
-#: sequencer.c:5651
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "no s'han pogut ometre les ordres «picks» no necessàries"
 
-#: sequencer.c:5751
+#: sequencer.c:5802
 msgid "the script was already rearranged."
 msgstr "l'script ja estava endreçat."
 
-#: setup.c:133
-#, fuzzy, c-format
+#: setup.c:134
+#, c-format
 msgid "'%s' is outside repository at '%s'"
-msgstr "'%s' està fora del dipòsit a '%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"
 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
 msgstr ""
 "%s: no hi ha tal camí en l'arbre de treball.\n"
-"Useu «git <ordre> -- <camí>...» per a especificar camins que no existeixin "
-"localment."
+"Useu «git <ordre> -- <camí>...» per a especificar camins que no existeixin localment."
 
-#: setup.c:198
+#: setup.c:199
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
 "Use '--' to separate paths from revisions, like this:\n"
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
-"argument ambigu «%s»: revisió no coneguda o el camí no és en l'arbre de "
-"treball.\n"
+"argument ambigu «%s»: revisió no coneguda o el camí no és en l'arbre de treball.\n"
 "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"
@@ -8503,144 +8731,132 @@ 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
+#: 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:661
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
-msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d"
+msgstr "S'esperava una versió de repositori de git <= %d, s'ha trobat %d"
 
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr "s'han trobat extensions de dipòsit desconegudes:"
+#: 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:681
-#, fuzzy
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "s'han trobat extensions de dipòsit desconegudes:"
+#: 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:700
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "s'ha produït un error en obrir «%s»"
 
-#: setup.c:702
+#: 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:704
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "error en llegir %s"
 
-#: setup.c:706
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "format gitfile no vàlid: %s"
 
-#: setup.c:708
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "sense camí al gitfile: %s"
 
-#: setup.c:710
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
-msgstr "no és un dipòsit de git: %s"
+msgstr "no és un repositori de git: %s"
 
-#: setup.c:812
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "«$%s» massa gran"
 
-#: setup.c:826
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
-msgstr "no és un dipòsit de git: «%s»"
+msgstr "no és un repositori de git: «%s»"
 
-#: setup.c:855 setup.c:857 setup.c:888
+#: 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:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: 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:987
+#: 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:1225
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "No s'ha pogut llegir el directori de treball actual"
 
-#: setup.c:1234 setup.c:1240
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "no es pot canviar a «%s»"
 
-#: setup.c:1245
+#: setup.c:1315
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
-msgstr "no és un dipòsit de git (ni cap dels directoris pares): %s"
+msgstr "no és un repositori de git (ni cap dels directoris pares): %s"
 
-#: setup.c:1251
+#: 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 ""
-"no és un dipòsit de git (ni cap pare fins al punt de muntatge %s)\n"
-"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
-"no està establert)."
+"no é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:1370
+#: 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 ""
-"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:1417
-msgid "open /dev/null or dup failed"
-msgstr "s'ha produït un error en obrir /dev/null o dup"
+"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:1432
+#: setup.c:1508
 msgid "fork failed"
 msgstr "el «fork» ha fallat"
 
-#: setup.c:1437 t/helper/test-simple-ipc.c:285
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "«setsid» ha fallat"
 
-#: sparse-index.c:151
-msgid "attempting to use sparse-index without cone mode"
-msgstr ""
-
-#: sparse-index.c:156
-#, fuzzy
-msgid "unable to update cache-tree, staying full"
-msgstr "no s'ha pogut actualitzar l'arbre cau"
-
-#: sparse-index.c:239
+#: sparse-index.c:289
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
-msgstr ""
+msgstr "l'entrada d'índex és un directori, però no dispers (%08x)"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
 #: strbuf.c:850
@@ -8694,13 +8910,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] "%u byte/s"
 msgstr[1] "%u bytes/s"
 
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
-#: builtin/rebase.c:866
+#: 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:1177
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "no s'ha pogut editar «%s»"
@@ -8715,18 +8931,18 @@ msgid "negative values not allowed for submodule.fetchjobs"
 msgstr "no es permeten els valors negatius a submodule.fetchjobs"
 
 #: submodule-config.c:402
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr ""
-"ignorant \"%s\" que poden interpretar-se com una opció de línia d'ordres per "
-"cent"
+"s'està ignorant «%s» que pot interpretar-se com a una opció de línia "
+"d'ordres: %s"
 
 #: submodule-config.c:499
 #, c-format
 msgid "invalid value for %s"
 msgstr "valor no vàlid per a %s"
 
-#: submodule-config.c:766
+#: submodule-config.c:767
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
@@ -8751,74 +8967,74 @@ msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s"
 msgid "staging updated .gitmodules failed"
 msgstr "l'allistament del .gitmodules actualitzat ha fallat"
 
-#: submodule.c:328
+#: submodule.c:358
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "al submòdul sense popular «%s»"
 
-#: submodule.c:359
+#: submodule.c:389
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "L'especificació «%s» és en el submòdul «%.*s»"
 
-#: submodule.c:436
+#: submodule.c:466
 #, c-format
 msgid "bad --ignore-submodules argument: %s"
 msgstr "argument incorrecte --ignore-submodules: %s"
 
-#: submodule.c:818
-#, fuzzy, c-format
+#: submodule.c:844
+#, c-format
 msgid ""
 "Submodule in commit %s at path: '%s' collides with a submodule named the "
 "same. Skipping it."
 msgstr ""
-"El submòdul en «commit%s» al camí «%s» col·lideix amb un submòdul anomenat "
-"el mateix. Ometent-lo."
+"El submòdul en la comissió %s al camí: «%s» col·lideix amb un submòdul amb "
+"el mateix nom. Ometent-lo."
 
-#: submodule.c:921
+#: submodule.c:954
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "l'entrada del submòdul «%s» (%s) és a %s, no és una comissió"
 
-#: submodule.c:1006
+#: submodule.c:1042
 #, c-format
 msgid ""
 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
 "submodule %s"
 msgstr ""
-"No s'ha pogut executar l'ordre «git rev-list <commits> --not --remotes -n 1» "
-"en el submòdul %s"
+"No s'ha pogut executar l'ordre «git rev-list <commits> --not --remotes -n 1»"
+" en el submòdul %s"
 
-#: submodule.c:1129
+#: submodule.c:1165
 #, c-format
 msgid "process for submodule '%s' failed"
 msgstr "ha fallat el procés per al submòdul «%s»"
 
-#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
+#: 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."
 
-#: submodule.c:1169
-#, fuzzy, c-format
+#: submodule.c:1205
+#, c-format
 msgid "Pushing submodule '%s'\n"
-msgstr "Subjecting submodule '%s'"
+msgstr "S'està pujant el submòdul «%s»\n"
 
-#: submodule.c:1172
-#, fuzzy, c-format
+#: submodule.c:1208
+#, c-format
 msgid "Unable to push submodule '%s'\n"
-msgstr "No s'ha pogut prémer el submòdul «%s»"
+msgstr "No s'ha pogut pujar el submòdul «%s»\n"
 
-#: submodule.c:1464
+#: submodule.c:1491
 #, c-format
 msgid "Fetching submodule %s%s\n"
 msgstr "S'està obtenint el submòdul %s%s\n"
 
-#: submodule.c:1498
+#: submodule.c:1525
 #, c-format
 msgid "Could not access submodule '%s'\n"
 msgstr "No s'ha pogut accedir al submòdul «%s»\n"
 
-#: submodule.c:1653
+#: submodule.c:1680
 #, c-format
 msgid ""
 "Errors during submodule fetch:\n"
@@ -8827,61 +9043,63 @@ msgstr ""
 "Errors durant l'obtenció de submòduls:\n"
 "%s"
 
-#: submodule.c:1678
+#: submodule.c:1705
 #, c-format
 msgid "'%s' not recognized as a git repository"
-msgstr "«%s» no reconegut com un dipòsit git"
+msgstr "«%s» no reconegut com un repositori git"
 
-#: submodule.c:1695
+#: submodule.c:1722
 #, c-format
 msgid "Could not run 'git status --porcelain=2' in submodule %s"
 msgstr "No s'ha pogut executar «git status --porcelain=2» en el submòdul %s"
 
-#: submodule.c:1736
+#: submodule.c:1763
 #, c-format
 msgid "'git status --porcelain=2' failed in submodule %s"
 msgstr "«git status --porcelain=2» ha fallat en el submòdul %s"
 
-#: submodule.c:1811
+#: submodule.c:1838
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "no s'ha pogut iniciar «git status» al submòdul «%s»"
 
-#: submodule.c:1824
+#: submodule.c:1851
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "no s'ha pogut executar «git status» al submòdul «%s»"
 
-#: submodule.c:1839
-#, fuzzy, c-format
+#: submodule.c:1868
+#, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr "No s'ha pogut desassignar el paràmetre core.worktree al submòdul «%s»"
+msgstr ""
+"No s'ha pogut desassignar el paràmetre «core.worktree» al submòdul «%s»"
 
-#: submodule.c:1866 submodule.c:2176
+#: submodule.c:1895 submodule.c:2210
 #, c-format
 msgid "could not recurse into submodule '%s'"
-msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»"
+msgstr ""
+"s'ha produït un error en cercar recursivament al camí del submòdul «%s»"
 
-#: submodule.c:1887
+#: submodule.c:1917
 msgid "could not reset submodule index"
 msgstr "no s'ha pogut restablir l'índex del submòdul"
 
-#: submodule.c:1929
+#: submodule.c:1959
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "el submòdul «%s» té l'índex brut"
 
-#: submodule.c:1981
+#: submodule.c:2013
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "No s'ha pogut actualitzar el submòdul «%s»."
 
-#: submodule.c:2049
+#: submodule.c:2081
 #, c-format
 msgid "submodule git dir '%s' is inside git dir '%.*s'"
 msgstr "submodule git dir «%s» està dins git dir «%.*s»"
 
-#: submodule.c:2070
+#: submodule.c:2102
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8889,17 +9107,17 @@ msgstr ""
 "no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de "
 "treball"
 
-#: submodule.c:2082 submodule.c:2141
+#: submodule.c:2114 submodule.c:2174
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "no s'ha trobat el nom pel submòdul «%s»"
 
-#: submodule.c:2086
+#: submodule.c:2118
 #, c-format
 msgid "refusing to move '%s' into an existing git dir"
 msgstr "s'ha refusat moure «%s» a un directori git existent"
 
-#: submodule.c:2093
+#: submodule.c:2124
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -8910,24 +9128,24 @@ msgstr ""
 "«%s» a\n"
 "«%s»\n"
 
-#: submodule.c:2221
+#: submodule.c:2255
 msgid "could not start ls-files in .."
 msgstr "no s'ha pogut iniciar ls-files a .."
 
-#: submodule.c:2261
+#: submodule.c:2295
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
 
 #: symlinks.c:244
-#, fuzzy, c-format
+#, c-format
 msgid "failed to lstat '%s'"
-msgstr "s'ha produït un error en fer stat a «%s»"
+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
@@ -8936,7 +9154,7 @@ msgid "unknown value '%s' for key '%s'"
 msgstr "valor desconegut «%s» per a la clau «%s»"
 
 #: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
 #, c-format
 msgid "more than one %s"
 msgstr "més d'un %s"
@@ -8944,18 +9162,18 @@ 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
 msgid "could not read input file '%s'"
 msgstr "no s'ha pogut llegir el fitxer d'entrada «%s»"
 
-#: trailer.c:766 builtin/mktag.c:88
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
 msgid "could not read from stdin"
 msgstr "no s'ha pogut llegir des de stdin"
 
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
 #, c-format
 msgid "could not stat %s"
 msgstr "no s'ha pogut fer stat a %s"
@@ -8989,28 +9207,26 @@ msgid "unable to find remote helper for '%s'"
 msgstr "no s'ha pogut trobar l'ajudant remot per a «%s»"
 
 #: transport-helper.c:161 transport-helper.c:575
-#, fuzzy
 msgid "can't dup helper output fd"
 msgstr "no es pot duplicar la sortida de l'ajudant «fd»"
 
 #: transport-helper.c:214
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
 "version of Git"
 msgstr ""
-"capacitat obligatòria desconeguda; aquest ajudant remot probablement "
+"funcionalitat obligatòria %s desconeguda; aquest ajudant remot probablement "
 "necessita una versió més nova del Git"
 
 #: transport-helper.c:220
-#, fuzzy
 msgid "this remote helper should implement refspec capability"
-msgstr "aquest ajudant remot ha d'implementar la capacitat de refspec"
+msgstr "aquest ajudant remot ha d'implementar la funcionalitat de refspec"
 
 #: transport-helper.c:287 transport-helper.c:429
-#, fuzzy, c-format
+#, c-format
 msgid "%s unexpectedly said: '%s'"
-msgstr "deien inesperadament \"%s\""
+msgstr "%s ha dit inesperadament «%s»"
 
 #: transport-helper.c:417
 #, c-format
@@ -9022,31 +9238,28 @@ msgid "couldn't run fast-import"
 msgstr "no s'ha pogut executar «fast-import»"
 
 #: transport-helper.c:520
-#, fuzzy
 msgid "error while running fast-import"
 msgstr "error en executar la importació ràpida"
 
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
 #, c-format
 msgid "could not read ref %s"
 msgstr "no s'ha pogut llegir la referència %s"
 
 #: transport-helper.c:594
-#, fuzzy, c-format
+#, c-format
 msgid "unknown response to connect: %s"
-msgstr "resposta desconeguda per connectar els percentatges"
+msgstr "resposta desconeguda en connectar: %s"
 
 #: transport-helper.c:616
-#, fuzzy
 msgid "setting remote service path not supported by protocol"
 msgstr "el protocol no permet establir el camí del servei remot"
 
 #: transport-helper.c:618
-#, fuzzy
 msgid "invalid remote service path"
 msgstr "el camí del servei remot no és vàlid"
 
-#: transport-helper.c:661 transport.c:1471
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "opció no admesa pel protocol"
 
@@ -9055,133 +9268,129 @@ msgstr "opció no admesa pel protocol"
 msgid "can't connect to subservice %s"
 msgstr "no es pot connectar al subservei %s"
 
-#: transport-helper.c:693 transport.c:397
+#: transport-helper.c:693 transport.c:404
 msgid "--negotiate-only requires protocol v2"
-msgstr ""
+msgstr "--negotiate-only requereix el protocol v2"
 
 #: transport-helper.c:755
-#, fuzzy
 msgid "'option' without a matching 'ok/error' directive"
-msgstr "'option' sense una directiva 'ok/error' coincident"
+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:855
-#, fuzzy, c-format
+#: transport-helper.c:859
+#, 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:938
-#, fuzzy, c-format
+#: transport-helper.c:942
+#, 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:941
-#, fuzzy, c-format
+#: transport-helper.c:945
+#, 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:944
-#, fuzzy, c-format
+#: transport-helper.c:948
+#, 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:949
-#, fuzzy, c-format
+#: transport-helper.c:953
+#, 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:953
-#, fuzzy, c-format
+#: transport-helper.c:957
+#, 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:960
-#, fuzzy, c-format
+#: transport-helper.c:964
+#, 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:1060
-#, fuzzy
+#: transport-helper.c:1064
 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:1065
-#, fuzzy, c-format
+#: transport-helper.c:1069
+#, 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:1112
-#, fuzzy
+#: transport-helper.c:1116
 msgid "couldn't run fast-export"
-msgstr "no s'ha pogut executar «fast-export»"
+msgstr "no s'ha pogut executar l'exportació ràpida"
 
-#: transport-helper.c:1117
-#, fuzzy
+#: transport-helper.c:1121
 msgid "error while running fast-export"
 msgstr "error en executar l'exportació ràpida"
 
-#: transport-helper.c:1142
-#, fuzzy, c-format
+#: transport-helper.c:1146
+#, 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:1224
-#, fuzzy, c-format
+#: transport-helper.c:1228
+#, c-format
 msgid "unsupported object format '%s'"
-msgstr "objecte mal format a «%s»"
+msgstr "format d'objecte no suportat «%s»"
 
-#: transport-helper.c:1233
-#, fuzzy, c-format
+#: transport-helper.c:1237
+#, 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:1385
-#, fuzzy, c-format
+#: transport-helper.c:1389
+#, c-format
 msgid "read(%s) failed"
-msgstr "ha fallat read(%)"
+msgstr "ha fallat la lectura(%s)"
 
-#: transport-helper.c:1412
-#, fuzzy, c-format
+#: transport-helper.c:1416
+#, c-format
 msgid "write(%s) failed"
-msgstr "ha fallat write(%)"
+msgstr "ha fallat l'escriptura(%s)"
 
-#: transport-helper.c:1461
-#, fuzzy, c-format
+#: transport-helper.c:1465
+#, c-format
 msgid "%s thread failed"
-msgstr "ha fallat el fil per cents"
+msgstr "%s ha fallat el fil"
 
-#: transport-helper.c:1465
-#, fuzzy, c-format
+#: transport-helper.c:1469
+#, 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:1484 transport-helper.c:1488
+#: 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:1525
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed to wait"
 msgstr "el procés %s no ha pogut esperar"
 
-#: transport-helper.c:1529
+#: transport-helper.c:1533
 #, c-format
 msgid "%s process failed"
 msgstr "el procés %s ha fallat"
 
-#: transport-helper.c:1547 transport-helper.c:1556
+#: 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
@@ -9193,52 +9402,47 @@ msgstr "Canviaria la font de «%s» a «%s» de «%s»\n"
 msgid "could not read bundle '%s'"
 msgstr "no s'ha pogut llegir el paquet «%s»"
 
-#: transport.c:220
+#: transport.c:227
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: opció de profunditat no vàlida «%s»"
 
-#: transport.c:272
-#, fuzzy
+#: transport.c:279
 msgid "see protocol.version in 'git help config' for more details"
-msgstr "vegeu protocol.version a «git help config» per a més detalls"
+msgstr "vegeu «protocol.version» a «git help config» per a més detalls"
 
-#: transport.c:273
-#, fuzzy
+#: transport.c:280
 msgid "server options require protocol version 2 or later"
 msgstr "les opcions del servidor requereixen el protocol versió 2 o posterior"
 
-#: transport.c:400
-#, fuzzy
+#: transport.c:407
 msgid "server does not support wait-for-done"
-msgstr "El servidor no admet --deepen"
+msgstr "el servidor no admet «wait-for-done»"
 
-#: transport.c:751
-#, fuzzy
+#: transport.c:759
 msgid "could not parse transport.color.* config"
 msgstr "no s'ha pogut analitzar la configuració de transport.color.*"
 
-#: transport.c:826
-#, fuzzy
+#: transport.c:834
 msgid "support for protocol v2 not implemented yet"
-msgstr "encara no s'ha implementat la implementació del protocol v2"
+msgstr ""
+"encara no s'ha implementat la compatibilitat amb la versió v2 del protocol"
 
-#: transport.c:960
-#, fuzzy, c-format
+#: transport.c:967
+#, c-format
 msgid "unknown value for config '%s': %s"
-msgstr "valor desconegut per config «%s»%s"
+msgstr "valor desconegut per al config «%s»': %s"
 
-#: transport.c:1026
+#: transport.c:1033
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "no es permet el transport «%s»"
 
-#: transport.c:1079
-#, fuzzy
+#: transport.c:1082
 msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync ja no és compatible"
+msgstr "git-over-rsync ja no s'admet"
 
-#: transport.c:1181
+#: transport.c:1185
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -9247,7 +9451,7 @@ msgstr ""
 "Els camins de submòdul següents contenen canvis que no\n"
 "es poden trobar en cap remot:\n"
 
-#: transport.c:1185
+#: transport.c:1189
 #, c-format
 msgid ""
 "\n"
@@ -9273,14 +9477,13 @@ msgstr ""
 "\n"
 "per a pujar-los a un remot.\n"
 
-#: transport.c:1193
+#: transport.c:1197
 msgid "Aborting."
 msgstr "S'està avortant."
 
-#: transport.c:1340
-#, 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"
@@ -9298,47 +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"
@@ -9347,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"
@@ -9356,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"
@@ -9365,47 +9564,51 @@ 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"
 "%%s"
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien 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"
 "%%sPlease move or remove them before you merge."
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien 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"
 "%%s"
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien 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"
@@ -9414,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"
@@ -9423,74 +9626,66 @@ 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"
+"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"
+"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"
 "%%sPlease move or remove them before you %s."
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"%s:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n"
 "%%sMoveu-los o elimineu-los abans de %s."
 
-#: unpack-trees.c:166
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"%s:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n"
 "%%s"
 
-#: unpack-trees.c: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"
@@ -9499,78 +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"
+"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"
+"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"
+"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:1519
-#, fuzzy
+#: unpack-trees.c:1636
 msgid "Updating index flags"
-msgstr "Actualitzant els indicadors d’índex"
+msgstr "Actualitzant els indicadors d'índex"
 
-#: unpack-trees.c:2608
+#: 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:1548
-#, 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"
@@ -9605,124 +9797,126 @@ msgstr "segment de camí «..» no vàlid"
 msgid "Fetching objects"
 msgstr "S'estan obtenint objectes"
 
-#: worktree.c:238 builtin/am.c:2151
+#: 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:304
-#, fuzzy, c-format
+#: 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 el directori del repositori"
+msgstr "«%s» a l'arbre de treball principal no és al directori del repositori"
 
-#: worktree.c:315
-#, fuzzy, c-format
+#: 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:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "«%s» no existeix"
 
-#: worktree.c:333
+#: 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:342
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "«%s» no assenyala de tornada a «%s»"
 
-#: worktree.c:608
+#: worktree.c:604
 msgid "not a directory"
 msgstr "no és en un directori"
 
-#: worktree.c:617
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git no és un fitxer"
 
-#: worktree.c:619
+#: worktree.c:615
 msgid ".git file broken"
 msgstr "fitxer .git malmès"
 
-#: worktree.c:621
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr "fitxer .git malmès"
 
-#: worktree.c:727
-#, fuzzy
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "no és un camí vàlid"
 
-#: worktree.c:733
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
-msgstr "no s'ha pogut trobar el dipòsit; .git no és un fitxer"
+msgstr "no s'ha pogut trobar el repositori; .git no és un fitxer"
 
-#: worktree.c:737
-#, fuzzy
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
-msgstr "no s'ha pogut trobar el dipòsit; .git no és un fitxer"
+msgstr ""
+"no s'ha pogut trobar el repositori; el fitxer .git no fa referència a un "
+"repositori"
 
-#: worktree.c:741
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
-msgstr "no s'ha pogut trobar el dipòsit; el fitxer .git està malmès"
+msgstr "no s'ha pogut trobar el repositori; el fitxer .git està malmès"
 
-#: worktree.c:747
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "gitdir illegible"
 
-#: worktree.c:751
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "gitdir incorrecte"
 
-#: worktree.c:776
-#, fuzzy
+#: worktree.c:772
 msgid "not a valid directory"
-msgstr "no és en un directori git"
+msgstr "no és en un directori vàlid"
 
-#: worktree.c:782
-#, fuzzy
+#: worktree.c:778
 msgid "gitdir file does not exist"
-msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
+msgstr "el fitxer gitdir no existeix"
 
-#: worktree.c:787 worktree.c:796
-#, fuzzy, c-format
+#: worktree.c:783 worktree.c:792
+#, c-format
 msgid "unable to read gitdir file (%s)"
-msgstr "no s'ha pogut llegir l'arbre (%s)"
+msgstr "no s'ha pogut llegir el fitxer gitdir (%s)"
 
-#: worktree.c:806
-#, fuzzy, c-format
+#: worktree.c:802
+#, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr ""
-"S'estan eliminant els arbres de treball/%s: lectura curta (s'esperaven "
-"%<PRIuMAX> bytes, se n'han llegit %<PRIuMAX>)"
+msgstr "lectura curta (s'esperaven %<PRIuMAX> bytes, llegits %<PRIuMAX>)"
 
-#: worktree.c:814
-#, fuzzy
+#: worktree.c:810
 msgid "invalid gitdir file"
-msgstr "fitxer de configuració no vàlid %s"
+msgstr "fitxer gitdir no vàlid"
 
-#: worktree.c:822
-#, fuzzy
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
-msgstr ""
-"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no "
-"existent"
+msgstr "el fitxer gitdir indica una ubicació no existent"
 
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "no s'ha pogut fer setenv «%s»"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no s'ha pogut crear «%s»"
+
+#: wrapper.c:205 wrapper.c:375
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "no s'ha pogut obrir «%s» per a lectura i escriptura"
 
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
 #, c-format
 msgid "unable to access '%s'"
 msgstr "no s'ha pogut accedir a «%s»"
 
-#: wrapper.c:607
+#: wrapper.c:615
 msgid "unable to get current working directory"
 msgstr "no s'ha pogut obtenir el directori de treball actual"
 
@@ -9731,14 +9925,14 @@ msgid "Unmerged paths:"
 msgstr "Camins sense fusionar:"
 
 #: wt-status.c:187 wt-status.c:219
-#, fuzzy
 msgid "  (use \"git restore --staged <file>...\" to unstage)"
-msgstr "(useu \"git restitution --staged <file>\" per a unstage)"
+msgstr "  (useu «git restore --staged <fitxer>...» per a fer «unstage»)"
 
 #: wt-status.c:190 wt-status.c:222
-#, fuzzy, c-format
+#, c-format
 msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr "(useu \"git restitution --source=%s --staged <file>\" per a unstage)"
+msgstr ""
+"  (useu «git restore --source=%s --staged <fitxer>...» per a fer «unstage»)"
 
 #: wt-status.c:193 wt-status.c:225
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
@@ -9758,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:1075
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr "Canvis a cometre:"
 
-#: wt-status.c:234 wt-status.c:1084
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "Canvis no «staged» per a cometre:"
 
@@ -9775,11 +9969,9 @@ msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  (useu «git add/rm <fitxer>...» per a actualitzar què es cometrà)"
 
 #: wt-status.c:241
-#, fuzzy
-msgid ""
-"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgid "  (use \"git restore <file>...\" to discard changes in working directory)"
 msgstr ""
-"(useu \"git restore <file>\" per descartar els canvis en el directori de "
+"  (useu «git restore <file>...» per a descartar canvis en el directori de "
 "treball)"
 
 #: wt-status.c:243
@@ -9864,22 +10056,22 @@ msgstr "contingut modificat, "
 msgid "untracked content, "
 msgstr "contingut no seguit, "
 
-#: wt-status.c:908
+#: 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:939
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "Submòduls canviats però no actualitzats:"
 
-#: wt-status.c:941
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "Canvis de submòdul a cometre:"
 
-#: wt-status.c:1023
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -9887,118 +10079,124 @@ msgstr ""
 "No modifiqueu ni elimineu la línia de dalt.\n"
 "Tot el que hi ha a sota s'ignorarà."
 
-#: wt-status.c:1115
-#, fuzzy, c-format
+#: wt-status.c:1171
+#, c-format
 msgid ""
 "\n"
 "It took %.2f seconds to compute the branch ahead/behind values.\n"
 "You can use '--no-ahead-behind' to avoid this.\n"
 msgstr ""
-"S'ha trigat un 2%f segons a calcular la branca endavant/darrere dels valors. "
-"Podeu utilitzar «--no-perhead-behind» per evitar-ho."
+"\n"
+"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:1145
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "Teniu camins sense fusionar."
 
-#: wt-status.c:1148
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (arregleu els conflictes i executeu «git commit»)"
 
-#: wt-status.c:1150
+#: 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:1154
+#: 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:1157
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (useu «git commit» per a concloure la fusió)"
 
-#: wt-status.c:1166
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr "Esteu enmig d'una sessió am."
 
-#: wt-status.c:1169
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "El pedaç actual està buit."
 
-#: wt-status.c:1173
+#: 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:1175
+#: 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:1177
+#: 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:1310
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "Manca git-rebase-todo."
 
-#: wt-status.c:1312
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "No s'ha fet cap ordre."
 
-#: wt-status.c:1315
+#: 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:1326
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (vegeu més en el fitxer %s)"
 
-#: wt-status.c:1331
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "No manca cap ordre."
 
-#: wt-status.c:1334
+#: 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:1342
+#: 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:1354
+#: 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:1359
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "Actualment esteu fent «rebase»."
 
-#: wt-status.c:1372
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr "  (arregleu els conflictes i després executeu «git rebase --continue»)"
+msgstr ""
+"  (arregleu els conflictes i després executeu «git rebase --continue»)"
 
-#: wt-status.c:1374
+#: 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:1376
+#: 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:1383
+#: 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:1387
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -10006,160 +10204,164 @@ msgstr ""
 "Actualment esteu dividint una comissió mentre es fa «rebase» de la branca "
 "«%s» en «%s»."
 
-#: wt-status.c:1392
+#: 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:1395
+#: 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:1399
+#: 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:1404
+#: 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:1407
+#: 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:1409
-msgid ""
-"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+#: 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:1420
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "Hi ha «cherry pick» actualment en curs."
 
-#: wt-status.c:1423
+#: 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:1430
+#: 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:1433
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (executeu «git cherry-pick --continue» per a continuar)"
 
-#: wt-status.c:1436
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
-"  (tots els conflictes estan arreglats: executeu «git cherry-pick --"
-"continue»)"
+"  (tots els conflictes estan arreglats: executeu «git cherry-pick "
+"--continue»)"
 
-#: wt-status.c:1438
+#: 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:1440
+#: 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:1450
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "Una reversió està actualment en curs."
 
-#: wt-status.c:1453
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Actualment esteu revertint la comissió %s."
 
-#: wt-status.c:1459
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (arregleu els conflictes i executeu «git revert --continue»)"
 
-#: wt-status.c:1462
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (executeu «git revert --continue» per a continuar)"
 
-#: wt-status.c:1465
+#: 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:1467
+#: 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:1469
+#: 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:1479
+#: 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:1483
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "Actualment esteu bisecant."
 
-#: wt-status.c:1486
+#: 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:1497
-#, fuzzy, c-format
+#: wt-status.c:1559
+msgid "You are in a sparse checkout."
+msgstr "Esteu en un «sparse-checkout»."
+
+#: 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."
+msgstr ""
+"Esteu en un «sparse-checkout» amb un %d%% de fitxers seguits presents."
 
-#: wt-status.c:1736
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "En la branca "
 
-#: wt-status.c:1743
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "«rebase» interactiu en curs; sobre "
 
-#: wt-status.c:1745
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "«rebase» en curs; sobre "
 
-#: wt-status.c:1750
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "HEAD separat a "
 
-#: wt-status.c:1752
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "HEAD separat des de "
 
-#: wt-status.c:1755
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "Actualment no s'és en cap branca."
 
-#: wt-status.c:1772
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Comissió inicial"
 
-#: wt-status.c:1773
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "No s'ha fet cap comissió encara"
 
-#: wt-status.c:1787
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "Fitxers no seguits"
 
-#: wt-status.c:1789
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Fitxers ignorats"
 
-#: wt-status.c:1793
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10171,30 +10373,30 @@ msgstr ""
 "oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n"
 "«git help status»)."
 
-#: wt-status.c:1799
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Els fitxers no seguits no estan llistats%s"
 
-#: wt-status.c:1801
+#: 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:1807
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "Sense canvis"
 
-#: wt-status.c:1812
+#: 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:1816
+#: 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:1820
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -10203,88 +10405,87 @@ 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:1824
+#: 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:1828
+#: 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:1832 wt-status.c:1838
+#: 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:1835
+#: 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"
+msgstr "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
 
-#: wt-status.c:1840
+#: 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:1945
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "No s'ha fet cap comissió encara a "
 
-#: wt-status.c:1949
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (sense branca)"
 
-#: wt-status.c:1980
+#: wt-status.c:2050
 msgid "different"
 msgstr "diferent"
 
-#: wt-status.c:1982 wt-status.c:1990
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "darrere "
 
-#: wt-status.c:1985 wt-status.c:1988
+#: 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:2511
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "no es pot %s: Teniu canvis «unstaged»."
 
-#: wt-status.c:2517
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr "addicionalment, el vostre índex conté canvis sense cometre."
 
-#: wt-status.c:2519
+#: 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:178
+#: 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:185
+#: 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:862
+#: 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:874
-#, 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:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "s'ha produït un error en desenllaçar «%s»"
@@ -10293,137 +10494,138 @@ msgstr "s'ha produït un error en desenllaçar «%s»"
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
 
-#: builtin/add.c:61
-#, fuzzy, c-format
+#: builtin/add.c:64
+#, c-format
 msgid "cannot chmod %cx '%s'"
-msgstr "no es pot canviar de directori a «%s»"
+msgstr "no es pot fer chmod %cx «%s»"
 
-#: builtin/add.c:99
+#: builtin/add.c:106
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "estat de diff inesperat %c"
 
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
 msgid "updating files failed"
 msgstr "s'ha produït un error en actualitzar els fitxers"
 
-#: builtin/add.c:114
+#: builtin/add.c:121
 #, c-format
 msgid "remove '%s'\n"
 msgstr "elimina «%s»\n"
 
-#: builtin/add.c:198
+#: builtin/add.c:205
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
 
-#: builtin/add.c:307 builtin/rev-parse.c:991
+#: 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:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "No s'ha pogut obrir «%s» per a escriptura."
-
-#: builtin/add.c:322
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "No s'ha pogut escriure el pedaç"
 
-#: builtin/add.c:325
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "l'edició del pedaç ha fallat"
 
-#: builtin/add.c:328
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "No s'ha pogut fer stat a «%s»"
 
-#: builtin/add.c:330
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "El pedaç és buit. S'ha avortat."
 
-#: builtin/add.c:335
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "No s'ha pogut aplicar «%s»"
 
-#: builtin/add.c:343
+#: 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"
+msgstr "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
 
-#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: 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: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:366
+#: builtin/add.c:371
 msgid "interactive picking"
-msgstr "recull interactiu"
+msgstr "selecció interactiva"
 
-#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "selecciona els trossos interactivament"
 
-#: builtin/add.c:368
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "edita la diferència actual i aplica-la"
 
-#: builtin/add.c:369
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "permet afegir fitxers que d'altra manera s'ignoren"
 
-#: builtin/add.c:370
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "actualitza els fitxers seguits"
 
-#: builtin/add.c:371
-#, fuzzy
+#: 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:372
+#: 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:373
+#: 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:376
+#: 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:378
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "no afegeixis, només actualitza l'índex"
 
-#: builtin/add.c:379
+#: 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:380
+#: 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:382 builtin/update-index.c:1006
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "permet actualitzar entrada fora del con del «sparse-checkout»"
+
+#: 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:384
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
-msgstr "avisa'm quan s'afegeixi un dipòsit incrustat"
+msgstr "avisa'm quan s'afegeixi un repositori incrustat"
 
-#: builtin/add.c:386
-#, fuzzy
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
-msgstr "backend per a «git stash -p»"
+msgstr "rerefons per a «git stash -p»"
 
-#: builtin/add.c:404
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10440,9 +10642,9 @@ msgid ""
 "\n"
 "See \"git help submodule\" for more information."
 msgstr ""
-"Heu afegit un altre dipòsit git dins del dipòsit actual.\n"
-"Els clons de dipòsits externs no contindran els continguts\n"
-"del dipòsit incrustat i no sabran com obtenir-ho.\n"
+"Heu afegit un altre repositori git dins del repositori actual.\n"
+"Els clons de repositoris externs no contindran els continguts\n"
+"del repositori incrustat i no sabran com obtenir-ho.\n"
 "Si volíeu afegir un submòdul, useu:\n"
 "\n"
 "\tgit submodule add <url> %s\n"
@@ -10454,12 +10656,12 @@ msgstr ""
 "\n"
 "Vegeu «git help submodule» per a més informació."
 
-#: builtin/add.c:432
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
-msgstr "s'està afegint un dipòsit incrustat: %s"
+msgstr "s'està afegint un repositori incrustat: %s"
 
-#: builtin/add.c:451
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10469,51 +10671,27 @@ msgstr ""
 "Desactiveu aquest missatge executant\n"
 "«git config advice.addIgnoredFile false»"
 
-#: builtin/add.c:460
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "l'afegiment de fitxers ha fallat"
 
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run és incompatible amb --interactive/--patch"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file és incompatible amb --interactive/--patch"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file és incompatible amb --edit"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A i -u són mútuament incompatibles"
-
-#: builtin/add.c:522
-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:526
+#: 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:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file és incompatible amb els arguments de «pathspec»"
-
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
-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:555
+#: 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:557
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10523,111 +10701,119 @@ msgstr ""
 "Desactiveu aquest missatge executant\n"
 "«git config advice.addEmptyPathspec false»"
 
-#: builtin/am.c:364
+#: 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:454
+#: 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:496
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Línia d'entrada mal formada: «%s»."
 
-#: builtin/am.c:534
+#: 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:560
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "fseek ha fallat"
 
-#: builtin/am.c:748
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "no s'ha pogut analitzar el pedaç «%s»"
 
-#: builtin/am.c:813
+#: 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:861
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "marca de temps no vàlida"
 
-#: builtin/am.c:866 builtin/am.c:878
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "línia Date no vàlida"
 
-#: builtin/am.c:873
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "desplaçament del fus horari no vàlid"
 
-#: builtin/am.c:966
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "La detecció de format de pedaç ha fallat."
 
-#: builtin/am.c:971 builtin/clone.c:414
+#: 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:976
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "S'ha produït un error en dividir els pedaços."
 
-#: builtin/am.c:1125
+#: 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:1126
+#: 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:1127
+#: 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 ""
-"Per a restaurar la branca original i deixar d'apedaçar, executeu «%s --"
-"abort»."
+"Per a enregistrar un pedaç buit com a comissió buida, executeu «%s --allow-empty»."
 
-#: builtin/am.c:1222
-#, fuzzy
-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 ""
-"Pedaç enviat amb format=flux; es pot perdre espai al final de les línies."
+"Per a restaurar la branca original i deixar d'apedaçar, executeu «%s "
+"--abort»."
 
-#: builtin/am.c:1250
-msgid "Patch is empty."
-msgstr "El pedaç està buit."
+#: 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:1315
+#: 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:1318
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "línia d'identitat no vàlida: %.*s"
 
-#: builtin/am.c:1537
+#: builtin/am.c:1566
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
-"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 "
-"vies."
+"Al repositori li manquen els blobs necessaris per a retrocedir a una fusió "
+"de 3 vies."
 
-#: builtin/am.c:1539
+#: 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:1558
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10635,100 +10821,114 @@ msgstr ""
 "Heu editat el vostre pedaç a mà?\n"
 "No s'aplica als blobs recordats en el seu índex."
 
-#: builtin/am.c:1564
+#: 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:1590
+#: 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:1622
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "s'està aplicant a una història buida"
 
-#: builtin/am.c:1674 builtin/am.c:1678
+#: 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:1696
+#: 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:1706
+#: 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:1752 builtin/commit.c:408
+#: 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:1756
+#: 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:1796 builtin/am.c:1864
+#: 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:1813
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
 
-#: builtin/am.c:1819
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "El pedaç ha fallat a %s %.*s"
 
-#: builtin/am.c:1823
-#, fuzzy
+#: builtin/am.c:1874
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
-msgstr "Utilitzeu 'git am --show-current-patch=diff' per veure el pedaç fallit"
+msgstr ""
+"Useu «git am --show-current-patch=diff» per a veure el pedaç que ha fallat"
 
-#: builtin/am.c:1867
+#: 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: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:1874
+#: 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"
+"You should 'git add' each file with resolved conflicts to mark them as such.\n"
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 "Encara teniu camins sense fusionar a l'índex.\n"
-"Heu de fer «git add» a cada fitxer amb conflictes resolts per a marcar-los "
-"com a tal.\n"
-"Podeu executar «git rm» en un fitxer per a acceptar «suprimit per ells» pel "
-"fitxer."
+"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:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
-#: builtin/reset.c:355
+#: 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:2033
+#: 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:2077
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10736,184 +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:2184
+#: 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:2226
-#, fuzzy, c-format
+#: builtin/am.c:2285
+#, c-format
 msgid "Invalid value for --show-current-patch: %s"
-msgstr "Valor no vàlid per --show-current-patch%s"
+msgstr "Valor no vàlid per --show-current-patch: %s"
 
-#: builtin/am.c:2230
-#, fuzzy, 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"
+#: builtin/am.c:2289
+#, c-format
+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:2261
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opcions>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2268
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "executa interactivament"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "opció històrica -- no-op"
 
-#: builtin/am.c:2272
+#: 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:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:948
+#: 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:2275
-#, fuzzy
+#: 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:2278
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "recodifica en utf8 (per defecte)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "passa l'indicador -k a git-mailinfo"
 
-#: builtin/am.c:2282
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "passa l'indicador -b a git-mailinfo"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "passa l'indicador -m a git-mailinfo"
 
-#: builtin/am.c:2286
+#: 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:2289
+#: 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:2292
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "elimina tot abans d'una línia de tisores"
 
-#: builtin/am.c:2294
-#, fuzzy
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
-msgstr "passa-ho a través de git-apply"
+msgstr "passa-ho a través del git-mailinfo"
 
-#: builtin/am.c:2297 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:2324
+#: 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:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
+#: 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:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: 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:2321
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "el format en el qual estan els pedaços"
 
-#: builtin/am.c:2327
+#: 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:2329
+#: 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:2332
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "sinònims de --continue"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "omet el pedaç actual"
 
-#: builtin/am.c:2338
-#, fuzzy
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
-msgstr "restaura la branca original i avorta l'operació d'apedaçament."
+msgstr "restaura la branca original i interromp l'operació d'apedaçament"
 
-#: builtin/am.c:2341
-#, fuzzy
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
-msgstr "avorta l'operació de pedaç però manté HEAD on és."
+msgstr "interromp l'operació d'apedaçament però manté HEAD on és"
 
-#: builtin/am.c:2345
-#, fuzzy
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "mostra el pedaç que s'està aplicant"
 
-#: builtin/am.c:2350
+#: 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:2352
+#: 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:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: 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:2355 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "signa les comissions amb GPG"
 
-#: builtin/am.c:2358
+#: 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:2376
+#: 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:2383
+#: 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:2398
+#: 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:2422
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -10922,12 +11125,11 @@ msgstr ""
 "S'ha trobat un directori %s extraviat.\n"
 "Useu «git am --abort» per a eliminar-lo."
 
-#: builtin/am.c:2428
+#: 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:2438
-#, fuzzy
+#: 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"
 
@@ -10935,177 +11137,174 @@ msgstr "el mode interactiu requereix pedaços a la línia d'ordres"
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<opcions>] [<pedaç>...]"
 
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "no s'ha pogut crear el fitxer d'arxiu «%s»"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "no s'ha pogut redirigir la sortida"
 
-#: builtin/archive.c:37
+#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Remot sense URL"
 
-#: builtin/archive.c:61
+#: builtin/archive.c:59
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de buidatge"
 
-#: builtin/archive.c:64
+#: builtin/archive.c:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: %s NACK"
 
-#: builtin/archive.c:65
+#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive: error de protocol"
 
-#: builtin/archive.c:69
+#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive: s'esperava una neteja"
 
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<comissió>]"
 
-#: builtin/bisect--helper.c:24
-#, fuzzy
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check <goodterm> <badterm> [<term>]"
-
 #: builtin/bisect--helper.c:25
-#, fuzzy
 msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | "
+"--term-new]"
 msgstr ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-bad | --term-new]"
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | "
+"--term-new]"
 
 #: builtin/bisect--helper.c:26
-#, fuzzy
 msgid ""
-"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
-"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<paths>...]"
+"git bisect--helper --bisect-start [--term-{new,bad}=<term> "
+"--term-{old,good}=<term>] [--no-checkout] [--first-parent] [<bad> "
+"[<good>...]] [--] [<paths>...]"
 msgstr ""
-"git bisect--helper --bisect-start [---term-{oldgood}=<term> --term-{newbad}"
-"=<term>][--no-checkout] [<bad> [<good>]] [-] [<paths>]"
+"git bisect--helper --bisect-start [--term-{new,bad}=<term> "
+"--term-{old,good}=<term>] [--no-checkout] [--first-parent] [<bad> "
+"[<good>...]] [--] [<paths>...]"
 
 #: builtin/bisect--helper.c:28
-#, fuzzy
 msgid "git bisect--helper --bisect-next"
-msgstr "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-next"
 
 #: builtin/bisect--helper.c:29
-#, fuzzy
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
-msgstr "git bisect--helper --bisect-reset [<comissió>]"
+msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"
 
 #: builtin/bisect--helper.c:30
-#, fuzzy
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
-msgstr "git bisect--helper --bisect-reset [<comissió>]"
+msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]"
 
 #: builtin/bisect--helper.c:31
-#, fuzzy
 msgid "git bisect--helper --bisect-replay <filename>"
-msgstr "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-replay <filename>"
 
 #: builtin/bisect--helper.c:32
-#, fuzzy
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-msgstr "git bisect--helper --bisect-reset [<comissió>]"
+msgstr "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <ordre>..."
 
-#: builtin/bisect--helper.c:107
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:109
+#, c-format
 msgid "cannot open file '%s' in mode '%s'"
-msgstr "no es pot copiar «%s» a «%s»"
+msgstr "no es pot obrir el fitxer «%s» en mode «%s»"
 
-#: builtin/bisect--helper.c:114
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:116
+#, c-format
 msgid "could not write to file '%s'"
-msgstr "no s'ha pogut escriure el fitxer: «%s»"
+msgstr "no s'ha pogut escriure el fitxer «%s»"
+
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "no es pot obrir «%s» per a lectura"
 
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:170
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "«%s» no és un terme vàlid"
 
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "no es pot usar l'ordre interna «%s» com a terme"
 
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "no es pot canviar el significat del terme «%s»"
 
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
 msgid "please use two different terms"
-msgstr "useu dos termes distintes"
+msgstr "useu dos termes diferents"
 
-#: builtin/bisect--helper.c:193
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:210
+#, c-format
 msgid "We are not bisecting.\n"
-msgstr "No estem bisecant."
+msgstr "No estem bisecant.\n"
 
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "«%s» no és una comissió vàlida"
 
-#: builtin/bisect--helper.c:210
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:227
+#, 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:254
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:271
+#, c-format
 msgid "Bad bisect_write argument: %s"
-msgstr "Arguments de bisectriu incorrectes"
+msgstr "Argument «bisect_write» incorrecte: %s"
 
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "no s'ha pogut obtenir l'oid de la revisió «%s»"
 
-#: builtin/bisect--helper.c:271
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:288
+#, c-format
 msgid "couldn't open the file '%s'"
 msgstr "no s'ha pogut obrir el fitxer «%s»"
 
-#: builtin/bisect--helper.c:297
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:314
+#, 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:324
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:341
+#, 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:328
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:345
+#, 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:348
+#: builtin/bisect--helper.c:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "bisecant amb només una comissió %s"
@@ -11113,25 +11312,24 @@ msgstr "bisecant amb només una comissió %s"
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
 #. at this point.
-#.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "N'esteu segur [Y/n]? "
 
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
 msgid "no terms defined"
 msgstr "cap terme definit"
 
-#: builtin/bisect--helper.c:420
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:437
+#, 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:430
+#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -11140,177 +11338,207 @@ msgstr ""
 "argument no vàlid %s per a «git bisect terms».\n"
 "Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
 
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
-#, fuzzy
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
 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:519
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:536
+#, c-format
 msgid "could not open '%s' for appending"
-msgstr "no s'ha pogut obrir «%s» per a lectura"
+msgstr "no s'ha pogut obrir «%s» per a afegir-hi"
 
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
-#, fuzzy
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
 msgstr "«%s» no és un terme vàlid"
 
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "opció no reconeguda: «%s»"
 
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "«%s» no sembla ser una revisió vàlida"
 
-#: builtin/bisect--helper.c:696
+#: 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:711
+#: builtin/bisect--helper.c:728
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 "l'agafament de «%s» ha fallat. Proveu «git bisect start <branca-vàlida>»."
 
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek"
 
-#: builtin/bisect--helper.c:735
-#, fuzzy
+#: builtin/bisect--helper.c:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "HEAD incorrecte - referència simbòlica estranya"
 
-#: builtin/bisect--helper.c:755
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:772
+#, c-format
 msgid "invalid ref: '%s'"
-msgstr "ref '%s' no és vàlid"
+msgstr "referència no és vàlida: «%s»"
 
-#: builtin/bisect--helper.c:813
-#, fuzzy
+#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
-msgstr "Cal començar per «git bisect start»"
+msgstr "Cal començar per «git bisect start»\n"
 
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
 #. at this point.
-#.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "Voleu que ho faci per vostè [Y/n]? "
 
-#: builtin/bisect--helper.c:842
-#, fuzzy
+#: builtin/bisect--helper.c:859
 msgid "Please call `--bisect-state` with at least one argument"
-msgstr "Si us plau crideu `--bisect-state` amb almenys un argument"
+msgstr "Executeu «--bisect-state» amb almenys un argument"
 
-#: builtin/bisect--helper.c:855
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:872
+#, c-format
 msgid "'git bisect %s' can take only one argument."
-msgstr "«git bisect $TERM_BAD» pot acceptar només un argument."
+msgstr "«git bisect %s» només pot acceptar un argument."
 
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
+#, c-format
 msgid "Bad rev input: %s"
-msgstr "Introducció de revisió errònia: $arg"
+msgstr "Entrada amb revisió errònia: %s"
 
-#: builtin/bisect--helper.c:887
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:904
+#, 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:919
+#: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
 msgstr "No estem bisecant."
 
-#: builtin/bisect--helper.c:969
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:986
+#, c-format
 msgid "'%s'?? what are you talking about?"
-msgstr "?? de què parleu?"
+msgstr "«%s»? Què voleu dir?"
 
-#: builtin/bisect--helper.c:981
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:998
+#, c-format
 msgid "cannot read file '%s' for replaying"
-msgstr "no es pot llegir $file per a reproducció"
+msgstr "no es pot llegir «%s» per a reproducció"
+
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "ha fallat l'execució de bisect: no s'ha proporcionat cap ordre."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "s'està executant %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+"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
+msgid "cannot open file '%s' for writing"
+msgstr "no es pot obrir «%s» per a escriptura"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "l'execució de la bisecció no pot continuar més"
 
-#: builtin/bisect--helper.c:1054
-#, fuzzy
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "execució de bisecció amb èxit"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "la bisecció ha trobat una primera comissió errònia"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"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
 msgid "reset the bisection state"
 msgstr "restableix l'estat de la bisecció"
 
-#: builtin/bisect--helper.c:1056
-#, fuzzy
+#: builtin/bisect--helper.c:1194
 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:1058
-#, fuzzy
+#: builtin/bisect--helper.c:1196
 msgid "print out the bisect terms"
-msgstr "imprimeix els termes de la bisectriu"
+msgstr "imprimeix els termes de la bisecció"
 
-#: builtin/bisect--helper.c:1060
-#, fuzzy
+#: builtin/bisect--helper.c:1198
 msgid "start the bisect session"
-msgstr "inicia la sessió bisect"
+msgstr "inicia la sessió bisecció"
 
-#: builtin/bisect--helper.c:1062
-#, fuzzy
+#: builtin/bisect--helper.c:1200
 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:1064
-#, fuzzy
+#: builtin/bisect--helper.c:1202
 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:1066
-#, fuzzy
+#: builtin/bisect--helper.c:1204
 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:1068
+#: builtin/bisect--helper.c:1206
 msgid "replay the bisection process from the given file"
-msgstr ""
+msgstr "torna a reproduir el procés de bisecció des del fitxer donat"
 
-#: builtin/bisect--helper.c:1070
-#, fuzzy
+#: builtin/bisect--helper.c:1208
 msgid "skip some commits for checkout"
-msgstr "la branca o entrega a agafar"
+msgstr "omet algunes comissions en agafar"
+
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "visualitza la bisecció"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "useu <cmd>... per a fer una bisecció automàticament."
 
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1214
 msgid "no log for BISECT_WRITE"
 msgstr "no hi ha registre per a BISECT_WRITE"
 
-#: builtin/bisect--helper.c:1087
-#, fuzzy
+#: builtin/bisect--helper.c:1229
 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:1092
-#, fuzzy
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check requereix 2 o 3 arguments"
-
-#: builtin/bisect--helper.c:1098
+#: builtin/bisect--helper.c:1234
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms requereix 0 o 1 argument"
 
-#: builtin/bisect--helper.c:1107
+#: builtin/bisect--helper.c:1243
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next no requereix cap argument"
 
-#: builtin/bisect--helper.c:1118
-#, fuzzy
+#: builtin/bisect--helper.c:1254
 msgid "--bisect-log requires 0 arguments"
-msgstr "--bisect-next no requereix cap argument"
+msgstr "--bisect-log no requereix cap argument"
 
-#: builtin/bisect--helper.c:1123
-#, fuzzy
+#: builtin/bisect--helper.c:1259
 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>"
@@ -11320,180 +11548,158 @@ msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "s'esperava un color: %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "ha d'acabar amb un color"
 
-#: builtin/blame.c:728
+#: builtin/blame.c:724
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "color «%s» no vàlid en «color.blame.repeatedLines»"
 
-#: builtin/blame.c:746
+#: builtin/blame.c:742
 msgid "invalid value for blame.coloring"
 msgstr "valor no vàlid per a «blame.coloring»"
 
-#: builtin/blame.c:845
+#: 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:867
-#, fuzzy
+#: builtin/blame.c:863
 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:868
-#, fuzzy
+#: builtin/blame.c:864
 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:869
-#, fuzzy
+#: builtin/blame.c:865
 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:870
-#, fuzzy
+#: builtin/blame.c:866
 msgid "show work cost statistics"
-msgstr "Mostra les estadístiques de preu de treball"
+msgstr "mostra les estadístiques de preu de treball"
 
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: 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:872
-#, fuzzy
+#: builtin/blame.c:868
 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:873
-#, fuzzy
+#: builtin/blame.c:869
 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:874
-#, fuzzy
+#: builtin/blame.c:870
 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:875
-#, fuzzy
+#: builtin/blame.c:871
 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:876
-#, fuzzy
+#: builtin/blame.c:872
 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:877
-#, fuzzy
+#: builtin/blame.c:873
 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:878
-#, fuzzy
+#: builtin/blame.c:874
 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:879
-#, fuzzy
+#: builtin/blame.c:875
 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:880
-#, fuzzy
+#: builtin/blame.c:876
 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:881
-#, fuzzy
+#: builtin/blame.c:877
 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:882
-#, fuzzy
+#: 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:883 builtin/log.c:1820
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "rev"
 
-#: builtin/blame.c:883
-#, fuzzy
+#: builtin/blame.c:879
 msgid "ignore <rev> when blaming"
-msgstr "Ignora <rev> en culpar"
+msgstr "ignora <rev> en fer «blame»"
 
-#: builtin/blame.c:884
-#, fuzzy
+#: builtin/blame.c:880
 msgid "ignore revisions from <file>"
-msgstr "Ignora les revisions de <file>"
+msgstr "ignora les revisions de <fitxer>"
 
-#: builtin/blame.c:885
-#, fuzzy
+#: builtin/blame.c:881
 msgid "color redundant metadata from previous line differently"
-msgstr "color les metadades redundants de la línia anterior de manera diferent"
+msgstr ""
+"acoloreix les metadades redundants de la línia anterior de manera diferent"
 
-#: builtin/blame.c:886
-#, fuzzy
+#: builtin/blame.c:882
 msgid "color lines by age"
-msgstr "coloreja les línies per edat"
+msgstr "acoloreix les línies per antiguitat"
 
-#: builtin/blame.c:887
-#, fuzzy
+#: builtin/blame.c:883
 msgid "spend extra cycles to find better match"
-msgstr "Gasta cicles extres per a trobar una coincidència millor"
+msgstr "gasta cicles extres per a trobar una coincidència millor"
 
-#: builtin/blame.c:888
-#, fuzzy
+#: builtin/blame.c:884
 msgid "use revisions from <file> instead of calling git-rev-list"
-msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
+msgstr "usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
 
-#: builtin/blame.c:889
-#, fuzzy
+#: builtin/blame.c:885
 msgid "use <file>'s contents as the final image"
-msgstr "Usa els continguts de <fitxer> com a la imatge final"
+msgstr "usa els continguts de <fitxer> com a la imatge final"
 
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
 msgid "score"
 msgstr "puntuació"
 
-#: builtin/blame.c:890
-#, fuzzy
+#: builtin/blame.c:886
 msgid "find line copies within and across files"
-msgstr "Troba còpies de lí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:891
-#, fuzzy
+#: builtin/blame.c:887
 msgid "find line movements within and across files"
-msgstr "Troba moviments de línia dins i a través dels fitxers"
+msgstr "troba moviments de línia dins i a través dels fitxers"
 
-#: builtin/blame.c:892
+#: builtin/blame.c:888
 msgid "range"
 msgstr "rang"
 
-#: builtin/blame.c:893
-#, fuzzy
+#: builtin/blame.c:889
 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:945
+#: 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"
@@ -11505,19 +11711,18 @@ msgstr ""
 #. among various forms of relative timestamps, but
 #. your language may need more or fewer display
 #. columns.
-#.
-#: builtin/blame.c:996
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "fa 4 anys i 11 mesos"
 
-#: builtin/blame.c:1112
+#: 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:1157
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "S'està fent un «blame»"
 
@@ -11549,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"
@@ -11559,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"
@@ -11569,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"
@@ -11583,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"
 
@@ -11595,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:440 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:471
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "no s'ha pogut resoldre HEAD"
 
-#: builtin/branch.c:477
+#: 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:492
+#: 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:496
+#: 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:513
+#: 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:515
+#: 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:526
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nom de branca no vàlid: «%s»"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "El canvi de nom de branca ha fallat"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "La còpia de la branca ha fallat"
 
-#: builtin/branch.c:561
+#: 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:564
+#: 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:570
+#: 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:579
+#: 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:581
+#: 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:597
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11702,256 +11907,250 @@ msgstr ""
 "  %s\n"
 "S'eliminaran les línies que comencin amb «%c».\n"
 
-#: builtin/branch.c:631
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Opcions genèriques"
 
-#: builtin/branch.c:633
+#: 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 la branca font"
+msgstr "mostra el hash i l'assumpte, doneu dues vegades per a la branca font"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "omet els missatges informatius"
 
-#: builtin/branch.c:635
-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:637
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "no usar"
 
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "font"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "canvia la informació de font"
 
-#: builtin/branch.c:640
-#, fuzzy
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "treu la informació de la font"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:649
 msgid "use colored output"
-msgstr "usa sortida colorada"
+msgstr "usa sortida amb colors"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "actua en branques amb seguiment remot"
 
-#: builtin/branch.c:644 builtin/branch.c:646
+#: 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:645 builtin/branch.c:647
+#: 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:650
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "Accions de git-branch específiques:"
 
-#: builtin/branch.c:651
+#: 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:653
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "suprimeix la branca si està completament fusionada"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "suprimeix la branca (encara que no estigui fusionada)"
 
-#: builtin/branch.c:655
+#: 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:656
+#: 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:657
+#: 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:658
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "copia una branca, encara que el destí existeixi"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "llista els noms de branca"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "mostra el nom de la branca actual"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "crea el registre de referència de la branca"
 
-#: builtin/branch.c:663
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "edita la descripció de la branca"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "força creació, moviment/canvi de nom, supressió"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "imprimeix només les branques que s'han fusionat"
 
-#: builtin/branch.c:666
+#: 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:667
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "llista les branques en columnes"
 
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: 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:670
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "imprimeix només les branques de l'objecte"
 
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: 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:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: 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:695 builtin/clone.c:794
+#: 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:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column i --verbose són incompatibles"
-
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: 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:766
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "No es pot donar descripció a un HEAD separat"
 
-#: builtin/branch.c:771
+#: 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:778
+#: 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:781
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "No hi ha cap branca amb nom «%s»."
 
-#: builtin/branch.c:796
+#: 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:805
+#: 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:810
+#: 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:814
+#: builtin/branch.c:822
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
-"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca."
+"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap "
+"branca."
 
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "no existeix la branca «%s»"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la branca «%s» no existeix"
 
-#: builtin/branch.c:834
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "hi ha massa arguments per a desassignar la font"
 
-#: builtin/branch.c:838
+#: 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:844
+#: 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:854
-#, 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:858
+#: 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:15
+#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "versió de git:\n"
 
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "uname() ha fallat amb l'error «%s» (%d)\n"
 
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
 msgid "compiler info: "
 msgstr "informació del compilador: "
 
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
 msgid "libc info: "
-msgstr "Informació de la libc: "
+msgstr "informació de la libc: "
 
-#: builtin/bugreport.c:80
-#, fuzzy
+#: builtin/bugreport.c:49
 msgid "not run from a git repository - no hooks to show\n"
-msgstr "no és un dipòsit de git: %s"
+msgstr ""
+"no s'està executant en un repositori de git - no hi ha lligams a mostrar\n"
 
-#: builtin/bugreport.c:90
+#: 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:97
-#, fuzzy
+#: builtin/bugreport.c:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -11969,209 +12168,203 @@ 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:136
+#: 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:138
-#, fuzzy
+#: builtin/bugreport.c:110
 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:160
-#, fuzzy, c-format
+#: builtin/bugreport.c:132
+#, 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:167
+#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "Informació del sistema"
 
-#: builtin/bugreport.c:170
-#, fuzzy
+#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
-msgstr "no s'ha pogut bifurcar"
-
-#: builtin/bugreport.c:177
-#, fuzzy, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "no s'ha pogut crear el fitxer «%s»"
+msgstr "Habilita els lligams"
 
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "no s'ha pogut escriure a %s"
 
-#: builtin/bugreport.c:190
-#, fuzzy, c-format
+#: builtin/bugreport.c:159
+#, c-format
 msgid "Created new report at '%s'.\n"
-msgstr "S'ha netejat el directori «%s»\n"
+msgstr "S'ha creat un nou informe a «%s».\n"
 
 #: builtin/bundle.c:15 builtin/bundle.c:23
-#, fuzzy
 msgid "git bundle create [<options>] <file> <git-rev-list args>"
-msgstr "git pack create [<opcions>] <file> <git-rev-list args>"
+msgstr "git bundle create [<opcions>] <fitxer> <git-rev-list args>"
 
 #: builtin/bundle.c:16 builtin/bundle.c:28
-#, fuzzy
 msgid "git bundle verify [<options>] <file>"
-msgstr "git pack verify [<opcions>] <file>"
+msgstr "git bundle verify [<opcions>] <fitxer>"
 
 #: builtin/bundle.c:17 builtin/bundle.c:33
-#, fuzzy
 msgid "git bundle list-heads <file> [<refname>...]"
-msgstr "git pack list-heads <file> [<refname>]"
+msgstr "git bundle list-heads <fitxer> [<refname>...]"
 
 #: builtin/bundle.c:18 builtin/bundle.c:38
-#, fuzzy
 msgid "git bundle unbundle <file> [<refname>...]"
-msgstr "git bundle <file> [<refname>]"
+msgstr "git bundle unbundle <fitxer> [<refname>...]"
 
-#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
 msgid "do not show progress meter"
 msgstr "no mostris l'indicador de progrés"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
 msgid "show progress meter"
 msgstr "mostra l'indicador de progrés"
 
-#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
 msgid "show progress meter during object writing phase"
 msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes"
 
-#: builtin/bundle.c:74 builtin/pack-objects.c:3754
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "similar a --all-progress quan l'indicador de progrés es mostra"
 
-#: builtin/bundle.c:76
-#, fuzzy
+#: builtin/bundle.c:74
 msgid "specify bundle format version"
-msgstr "especifica la versió del format del paquet"
+msgstr "especifica la versió del format del farcell"
 
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
-msgstr "Cal un dipòsit per a fer un farcell."
+msgstr "Cal un repositori per a crear un farcell."
 
 #: builtin/bundle.c:107
-#, fuzzy
 msgid "do not show bundle details"
-msgstr "no mostris els detalls del paquet"
+msgstr "no mostris els detalls del farcell"
 
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s està bé\n"
 
-#: builtin/bundle.c:163
+#: builtin/bundle.c:182
 msgid "Need a repository to unbundle."
-msgstr "Cal un dipòsit per a desfer un farcell."
+msgstr "Cal un repositori per a desfer un farcell."
 
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "S'estan desagrupant objectes"
 
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Subordre desconeguda: %s"
 
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:622
 msgid ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | "
+"-p | <type> | --textconv | --filters) [--path=<path>] <object>"
 msgstr ""
-"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
-"p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | "
+"-p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
 
-#: builtin/cat-file.c:599
-#, fuzzy
+#: builtin/cat-file.c:623
 msgid ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
 msgstr ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:620
-#, fuzzy
+#: builtin/cat-file.c:644
 msgid "only one batch option may be specified"
 msgstr "només es pot especificar una opció per lots"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
 msgid "show object type"
 msgstr "mostra el tipus de l'objecte"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
 msgid "show object size"
 msgstr "mostra la mida de l'objecte"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
 msgid "exit with zero when there's no error"
 msgstr "surt amb zero quan no hi ha error"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
 msgid "pretty-print object's content"
 msgstr "imprimeix bellament el contingut de l'objecte"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
 msgid "for blob objects, run textconv on object's content"
-msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte"
+msgstr ""
+"en els objectes de blob, executa textconv en el contingut de l'objecte"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
 msgid "for blob objects, run filters on object's content"
 msgstr ""
 "en els objectes de blob, executa els filtres en el contingut de l'objecte"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
 msgid "use a specific path for --textconv/--filters"
 msgstr "usa un camí específic per a --textconv/--filters"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos"
 
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
 msgid "buffer --batch output"
 msgstr "posa la sortida de --batch en memòria intermèdia"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "mostra la informació i contingut dels objectes rebuts de l'entrada estàndard"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
 msgid "show info about objects fed from the standard input"
 msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
-"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)"
+"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-"
+"check)"
 
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
 msgid "show all objects with --batch or --batch-check"
 msgstr "mostra tots els objectes amb --batch o --batch-check"
 
-#: builtin/cat-file.c:666
-#, fuzzy
+#: builtin/cat-file.c:690
 msgid "do not order --batch-all-objects output"
-msgstr "no ordenar la sortida --batch-all-objects"
+msgstr "no ordenar la sortida de --batch-all-objects"
 
 #: builtin/check-attr.c:13
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -12189,7 +12382,7 @@ msgstr "informa de tots els atributs establerts en el fitxer"
 msgid "use .gitattributes only from the index"
 msgstr "usa .gitattributes només des de l'índex"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "llegeix els noms de fitxer de stdin"
 
@@ -12197,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:1520 builtin/gc.c:549
-#: builtin/worktree.c:491
+#: 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"
 
@@ -12252,14 +12445,14 @@ msgid "no contacts specified"
 msgstr "no hi ha contactes especificats"
 
 #: builtin/checkout--worker.c:110
-#, fuzzy
 msgid "git checkout--worker [<options>]"
-msgstr "git checkout [<opcions>] <branca>"
+msgstr "git checkout--worker [<opcions>]"
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1825
-#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836
-#: builtin/submodule--helper.c:2334 builtin/worktree.c:719
+#: 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"
 
@@ -12324,151 +12517,146 @@ 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:414
-#, fuzzy, c-format
+#: builtin/checkout.c:419
+#, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
-msgstr[0] "Conflicte de fusió recreat en un 1%"
-msgstr[1] "Conflictes de fusió recreats en un 1%"
+msgstr[0] "Recreat un conflicte de fusió"
+msgstr[1] "Recreats %d conflictes de fusió"
 
-#: builtin/checkout.c:419
-#, fuzzy, c-format
+#: builtin/checkout.c:424
+#, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
-msgstr[0] "Camí actualitzat d'un 1% des d'un 1%"
-msgstr[1] "Camins actualitzats a un 1% des d'un 1%"
+msgstr[0] "S'ha actualitzat %d camí des de %s"
+msgstr[1] "S'han actualitzat %d camins des de %s"
 
-#: builtin/checkout.c:426
+#: 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:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: 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:462 builtin/checkout.c:465
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "«%s» no es pot usar amb %s"
-
-#: builtin/checkout.c:469
+#: 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:473
+#: 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:477
-#, fuzzy, c-format
+#: 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:482 builtin/checkout.c:487
+#: 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:563 builtin/checkout.c:570
+#: 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:739
+#: 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:793
-#, fuzzy, c-format
+#: builtin/checkout.c:797
+#, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
 "%s"
 msgstr ""
-"no es poden continuar amb els canvis «staged» als fitxers següents "
-"percentatges"
+"no es pot continuar amb els canvis «staged» als fitxers següents:\n"
+"%s"
 
-#: builtin/checkout.c:886
+#: 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:928
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD ara és a"
 
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
+#: 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:936
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Restableix la branca «%s»\n"
 
-#: builtin/checkout.c:939
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Ja esteu en «%s»\n"
 
-#: builtin/checkout.c:943
+#: 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:945 builtin/checkout.c:1376
+#: 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:947
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "S'ha canviat a la branca «%s»\n"
 
-#: builtin/checkout.c:998
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... i %d més.\n"
 
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12491,7 +12679,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1023
+#: 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"
@@ -12518,29 +12706,28 @@ msgstr[1] ""
 " git branch <nom-de-branca-nova> %s\n"
 "\n"
 
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "error intern en el passeig per revisions"
 
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "La posició de HEAD anterior era"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: 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:1184
-#, 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:1191
-#, 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"
@@ -12551,93 +12738,92 @@ 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:1201
+#: 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:1267
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "només s'esperava una referència"
 
-#: builtin/checkout.c:1284
+#: 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:1330 builtin/worktree.c:270 builtin/worktree.c:438
+#: 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:1343 builtin/checkout.c:1709
+#: 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:1390
+#: 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:1392
+#: 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:1393 builtin/checkout.c:1401
+#: 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:1396
+#: 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:1412
-#, fuzzy
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
 msgstr ""
-"no es pot canviar de branca mentre es fusiona «git merge --quit» o «git "
-"worktree add»."
+"no es pot canviar de branca mentre es fusiona\n"
+"Considereu usar «git merge --quit» o «git worktree add»."
 
-#: builtin/checkout.c:1416
-#, 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:1420
-#, 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:1424
-#, 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:1428
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12645,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:1432
-#, 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:1439
+#: 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:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: 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:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: 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:1467
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "«%s» no pot prendre <start-point>"
 
-#: builtin/checkout.c:1475
+#: 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:1482
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "manca branca o argument de comissió"
 
-#: builtin/checkout.c:1525
+#: 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:1526 builtin/log.c:1807 parse-options.h:323
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "estil"
 
-#: builtin/checkout.c:1527
-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:1539 builtin/worktree.c:488
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "separa HEAD a la comissió anomenada"
 
-#: builtin/checkout.c:1540
-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:1542
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "agafa a la força (descarta qualsevol modificació local)"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "branca-nova"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "branca òrfena nova"
 
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "actualitza els fitxers ignorats (per defecte)"
 
-#: builtin/checkout.c:1549
+#: 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:1562
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "agafa la versió nostra dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1565
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "agafa la versió seva dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1569
+#: 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:1624
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c i --orphan 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:1628
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p i --overlay són mútuament excloents"
-
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track necessita un nom de branca"
 
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "falta el nom de la branca; proveu -%c"
 
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "no es pot resoldre %s"
 
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "especificació de camí no vàlida"
 
-#: builtin/checkout.c:1725
+#: 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:1729
+#: 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:1738
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file és incompatible amb --detach"
-
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file és incompatible amb --patch"
-
-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -12786,73 +12959,71 @@ msgstr ""
 "git checkout: --ours/--theirs, --force i --merge són incompatibles en\n"
 "agafar de l'índex."
 
-#: builtin/checkout.c:1759
+#: 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:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484
+#: 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:1786
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "crea i agafa una branca nova"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "crea/restableix i agafa una branca"
 
-#: builtin/checkout.c:1789
+#: 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:1791
-#, 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:1792
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "utilitza el mode de superposició (per defecte)"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "crea i canvia a una branca nova"
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "crea/restableix i canvia a una branca"
 
-#: builtin/checkout.c:1841
-#, 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:1843
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "descarta les modificacions locals"
 
-#: builtin/checkout.c:1877
-#, 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:1879
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "restaura l'índex"
 
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "restaura l'arbre de treball (per defecte)"
 
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "ignora les entrades sense fusionar"
 
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "utilitza el mode de superposició"
 
@@ -12875,19 +13046,27 @@ msgstr "Eliminaria %s\n"
 #: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
-msgstr "S'està ometent el dipòsit %s\n"
+msgstr "S'està ometent el repositori %s\n"
 
 #: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
-msgstr "Ometria el dipòsit %s\n"
+msgstr "Ometria el repositori %s\n"
 
 #: builtin/clean.c:38
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "no s'ha pogut fer lstat %s\n"
 
-#: builtin/clean.c:302 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"
@@ -12900,7 +13079,7 @@ msgstr ""
 "foo        - selecciona un ítem basat en un prefix únic\n"
 "           - (buit) no seleccionis res\n"
 
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12921,33 +13100,33 @@ msgstr ""
 "*          - tria tots els ítems\n"
 "           - (buit) finalitza la selecció\n"
 
-#: builtin/clean.c:521 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:661
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Introduïu els patrons a ignorar>> "
 
-#: builtin/clean.c:696
+#: 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:717
+#: 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:758
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Voleu eliminar %s [y/N]? "
 
-#: builtin/clean.c:789
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12965,60 +13144,60 @@ msgstr ""
 "help                - aquesta pantalla\n"
 "?                   - ajuda de selecció de l'avís"
 
-#: builtin/clean.c:825
+#: 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:841
+#: 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:903
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "no imprimeixis els noms dels fitxers eliminats"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:928
 msgid "force"
 msgstr "força"
 
-#: builtin/clean.c:906
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "neteja interactiva"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "elimina directoris sencers"
 
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: 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:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "patró"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "afegiu <patró> per a ignorar les regles"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "elimina els fitxers ignorats, també"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "elimina només els fitxers ignorats"
 
-#: builtin/clean.c:929
+#: builtin/clean.c:951
 msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to"
+" clean"
 msgstr ""
 "clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; "
 "refusant netejar"
 
-#: builtin/clean.c:932
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13026,34 +13205,33 @@ msgstr ""
 "clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; "
 "refusant netejar"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x i -X no es poden usar junts"
 
 #: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
-msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"
+msgstr "git clone [<opcions>] [--] <repositori> [<directori>]"
 
 #: builtin/clone.c:96
-#, fuzzy
 msgid "don't clone shallow repository"
-msgstr "per a clonar des d'un dipòsit local"
+msgstr "no clonis un repositori superficial"
 
 #: builtin/clone.c:98
 msgid "don't create a checkout"
 msgstr "no facis cap agafament"
 
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
-msgstr "crea un dipòsit nu"
+msgstr "crea un repositori nu"
 
 #: builtin/clone.c:103
 msgid "create a mirror repository (implies bare)"
-msgstr "crea un dipòsit mirall (implica bare)"
+msgstr "crea un repositori mirall (implica bare)"
 
 #: builtin/clone.c:105
 msgid "to clone from a local repository"
-msgstr "per a clonar des d'un dipòsit local"
+msgstr "per a clonar des d'un repositori local"
 
 #: builtin/clone.c:107
 msgid "don't use local hardlinks, always copy"
@@ -13061,7 +13239,7 @@ msgstr "no usis enllaços durs locals, sempre copia"
 
 #: builtin/clone.c:109
 msgid "setup as shared repository"
-msgstr "configura com a dipòsit compartit"
+msgstr "configura com a repositori compartit"
 
 #: builtin/clone.c:111
 msgid "pathspec"
@@ -13075,27 +13253,29 @@ msgstr "inicialitza els submòduls en el clon"
 msgid "number of submodules cloned in parallel"
 msgstr "nombre de submòduls clonats en paral·lel"
 
-#: builtin/clone.c:116 builtin/init-db.c:538
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "directori-de-plantilla"
 
-#: builtin/clone.c:117 builtin/init-db.c:539
+#: builtin/clone.c:117 builtin/init-db.c:540
 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:1832
-#: builtin/submodule--helper.c:2337
+#: 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 "dipòsit de referència"
+msgstr "repositori de referència"
 
-#: builtin/clone.c:123 builtin/submodule--helper.c:1834
-#: builtin/submodule--helper.c:2339
+#: 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:549
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: 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"
 
@@ -13111,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:863
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
+#: builtin/pull.c:212
 msgid "depth"
 msgstr "profunditat"
 
@@ -13120,26 +13300,26 @@ 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:3804
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
 msgid "time"
-msgstr "hora"
+msgstr "data"
 
 #: builtin/clone.c:133
 msgid "create a shallow clone since a specific time"
-msgstr "crea un clon superficial des d'una hora específica"
+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:1318
+#: 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:1844
-#: builtin/submodule--helper.c:2353
+#: 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"
 
@@ -13152,11 +13332,11 @@ msgstr ""
 msgid "any cloned submodules will be shallow"
 msgstr "qualsevol submòdul clonat serà superficial"
 
-#: builtin/clone.c:142 builtin/init-db.c:547
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "directori de git"
 
-#: builtin/clone.c:143 builtin/init-db.c:548
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "separa el directori de git de l'arbre de treball"
 
@@ -13166,31 +13346,32 @@ msgstr "clau=valor"
 
 #: builtin/clone.c:145
 msgid "set config inside the new repository"
-msgstr "estableix la configuració dins del dipòsit nou"
+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:584 builtin/send-pack.c:196
+#: 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:584 builtin/send-pack.c:197
+#: 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/push.c:585
+#: 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/push.c:587
+#: 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"
 
 #: builtin/clone.c:154
 msgid "any cloned submodules will use their remote-tracking branch"
-msgstr "qualsevol submòdul clonat utilitzarà la seva branca de seguiment remot"
+msgstr ""
+"qualsevol submòdul clonat utilitzarà la seva branca de seguiment remot"
 
 #: builtin/clone.c:156
 msgid "initialize sparse-checkout file to include only files at root"
@@ -13198,206 +13379,197 @@ msgstr ""
 "inicialitza el fitxer «sparse-checkout» per a incloure només els fitxers a "
 "l'arrel"
 
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"No s'ha pogut endevinar cap nom de directori.\n"
-"Especifiqueu un directori en la línia d'ordres"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: No s'ha pogut afegir un alternatiu per a «%s»: %s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:304
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existeix i no és directori"
 
-#: builtin/clone.c:436
-#, fuzzy, c-format
+#: builtin/clone.c:322
+#, 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:467
+#: builtin/clone.c:353
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "s'ha produït un error en crear l'enllaç «%s»"
 
-#: builtin/clone.c:471
+#: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "s'ha produït un error en copiar el fitxer a «%s»"
 
-#: builtin/clone.c:476
+#: builtin/clone.c:362
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "no s'ha pogut iterar sobre «%s»"
 
-#: builtin/clone.c:503
+#: builtin/clone.c:389
 #, c-format
 msgid "done.\n"
 msgstr "fet.\n"
 
-#: builtin/clone.c:517
-#, fuzzy
+#: builtin/clone.c:403
 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:594
+#: builtin/clone.c:480
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "No s'ha pogut trobar la branca remota %s per a clonar."
 
-#: builtin/clone.c:713
+#: builtin/clone.c:597
 #, c-format
 msgid "unable to update %s"
 msgstr "no s'ha pogut actualitzar %s"
 
-#: builtin/clone.c:761
+#: builtin/clone.c:645
 msgid "failed to initialize sparse-checkout"
 msgstr "no s'ha pogut inicialitzar «sparse-checkout»"
 
-#: builtin/clone.c:784
+#: builtin/clone.c:668
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "la HEAD remot es refereix a una referència que no existeix; no s'ha pogut "
 "agafar.\n"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:701
 msgid "unable to checkout working tree"
 msgstr "no s'ha pogut agafar l'arbre de treball"
 
-#: builtin/clone.c:894
+#: builtin/clone.c:779
 msgid "unable to write parameters to config file"
 msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració"
 
-#: builtin/clone.c:957
+#: builtin/clone.c:842
 msgid "cannot repack to clean up"
 msgstr "no es pot reempaquetar per a netejar"
 
-#: builtin/clone.c:959
+#: builtin/clone.c:844
 msgid "cannot unlink temporary alternates file"
 msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
 
-#: builtin/clone.c:1001 builtin/receive-pack.c:2491
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "Hi ha massa arguments."
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
-msgstr "Heu d'especificar un dipòsit per a clonar."
+msgstr "Heu d'especificar un repositori per a clonar."
 
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "les opcions --bare i --origin %s 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:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare i --separate-git-dir són incompatibles."
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
-msgstr "el dipòsit «%s» no existeix"
+msgstr "el repositori «%s» no existeix"
 
-#: builtin/clone.c:1039 builtin/fetch.c:2011
+#: 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"
 
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "el camí destí «%s» ja existeix i no és un directori buit."
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr "el camí destí «%s» ja existeix i no és un directori buit."
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "l'arbre de treball «%s» ja existeix."
 
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
+#: 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»"
 
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "no s'ha pogut crear el directori d'arbre de treball «%s»"
 
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
-msgstr "S'està clonant al dipòsit nu «%s»...\n"
+msgstr "S'està clonant al repositori nu «%s»...\n"
 
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "S'està clonant a «%s»...\n"
 
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
 msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
+"clone --recursive is not compatible with both --reference and --reference-"
+"if-able"
 msgstr ""
 "clone --recursive no és compatible amb ambdós --reference i --reference-if-"
 "able"
 
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "«%s» no és un nom de remot vàlid"
 
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això."
 
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això."
 
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això."
 
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter s'ignora en els clons locals; useu file:// en lloc d'això."
 
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
 msgid "source repository is shallow, ignoring --local"
-msgstr "el dipòsit font és superficial, s'està ignorant --local"
+msgstr "el repositori font és superficial, s'està ignorant --local"
 
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
 msgid "--local is ignored"
 msgstr "--local s'ignora"
 
-#: builtin/clone.c:1337 builtin/clone.c:1345
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr "el transport remot ha informat d'un error"
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "La branca remota %s no es troba en la font %s"
 
-#: builtin/clone.c:1348
+#: builtin/clone.c:1242
 msgid "You appear to have cloned an empty repository."
-msgstr "Sembla que heu clonat un dipòsit buit."
+msgstr "Sembla que heu clonat un repositori buit."
 
 #: builtin/column.c:10
 msgid "git column [<options>]"
@@ -13412,141 +13584,132 @@ msgid "layout to use"
 msgstr "disposició a usar"
 
 #: builtin/column.c:30
-#, fuzzy
 msgid "maximum width"
-msgstr "Amplada màxima"
+msgstr "amplada màxima"
 
 #: builtin/column.c:31
-#, fuzzy
 msgid "padding space on left border"
-msgstr "Espai d'encoixinada en el marge esquerre"
+msgstr "espai de farciment al marge esquerre"
 
 #: builtin/column.c:32
-#, fuzzy
 msgid "padding space on right border"
-msgstr "Espai d'encoixinada en el marge dret"
+msgstr "espai de farciment al marge dret"
 
 #: builtin/column.c:33
-#, fuzzy
 msgid "padding space between columns"
-msgstr "Espai d'encoixinada entre columnes"
+msgstr "espai de farciment entre columnes"
 
 #: builtin/column.c:51
 msgid "--command must be the first argument"
 msgstr "--command ha de ser el primer argument"
 
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
 msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+"git commit-graph verify [--object-dir <objdir>] [--shallow] "
+"[--[no-]progress]"
 msgstr ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+"git commit-graph verify [--object-dir <objdir>] [--shallow] "
+"[--[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
 msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--"
-"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
-"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
+"git commit-graph write [--object-dir <objdir>] [--append] "
+"[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
+"[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split "
+"options>"
 msgstr ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--"
-"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
-"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
-
-#: builtin/commit-graph.c:64
-#, 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"
+"git commit-graph write [--object-dir <objdir>] [--append] "
+"[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
+"[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split "
+"options>"
 
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "directori"
 
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
-#, fuzzy
+#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
-msgstr "El directori d'objectes per a emmagatzemar el gràfic"
+msgstr "el directori d'objectes a emmagatzemar al graf"
 
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 "si el graf de comissions està dividit només, verifica el fitxer de consell"
 
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "No s'ha pogut obrir el graf de comissions «%s»"
 
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "argument --split no reconegut, %s"
 
-#: builtin/commit-graph.c:155
-#, fuzzy, c-format
+#: builtin/commit-graph.c:150
+#, 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:160
+#: builtin/commit-graph.c:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "no és un objecte vàlid: %s"
 
-#: builtin/commit-graph.c:213
+#: 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:215
+#: 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:217
-#, fuzzy
+#: builtin/commit-graph.c:209
 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:219
+#: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
 msgstr "inclou ja totes les comissions al fitxer del graf de comissions"
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
 msgid "enable computation for changed paths"
 msgstr "habilita la computació per als camins canviats"
 
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
 msgid "allow writing an incremental commit-graph file"
 msgstr "permet escriure un fitxer de graf de comissions incrementals"
 
-#: builtin/commit-graph.c:228
-#, fuzzy
+#: builtin/commit-graph.c:219
 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:230
+#: builtin/commit-graph.c:221
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "ràtio màxima entre dos nivells d'un graf de comissions dividit"
 
-#: builtin/commit-graph.c:232
+#: 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:234
-#, fuzzy
+#: builtin/commit-graph.c:225
 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:255
-#, fuzzy
+#: builtin/commit-graph.c:251
 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:287
+#: 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:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "subordre no reconeguda: %s"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13560,70 +13723,65 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "s'han ignorat el pare %s duplicat"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
+#: 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"
 
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: ha fallat en obrir «%s»"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree: ha fallat en llegir «%s»"
 
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree: ha fallat en tancar «%s»"
 
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr "pare"
 
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "id d'un objecte de comissió pare"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
-#: builtin/tag.c:456
+#: 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:115 builtin/commit.c:1614
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "missatge de comissió"
 
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
 msgstr "llegeix el missatge de registre de comissió des d'un fitxer"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299
-#: 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"
 
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "ha de donar exactament un arbre"
 
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: ha fallat en llegir"
 
-#: builtin/commit.c:41
+#: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<opcions>] [--] <especificació-de-camí>..."
 
-#: builtin/commit.c:46
+#: builtin/commit.c:47
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<opcions>] [--] <especificació-de-camí>..."
 
-#: builtin/commit.c:51
+#: builtin/commit.c:52
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13633,7 +13791,7 @@ msgstr ""
 "deixaria buida. Podeu repetir la vostra ordre amb --allow-empty, o\n"
 "podeu eliminar la comissió per complet amb «git reset HEAD^».\n"
 
-#: builtin/commit.c:56
+#: builtin/commit.c:57
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -13641,23 +13799,21 @@ msgid ""
 "    git commit --allow-empty\n"
 "\n"
 msgstr ""
-"El «cherry pick» previ està ara buit, possiblement a causa de resolució de "
-"conflictes.\n"
+"El «cherry pick» previ està ara buit, possiblement a causa de resolució de conflictes.\n"
 "Si el voleu cometre de totes maneres, useu:\n"
 "\n"
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:63
+#: builtin/commit.c:64
 msgid "Otherwise, please use 'git rebase --skip'\n"
-msgstr "Altrament si us plau useu «git rebase --skip»\n"
+msgstr "Altrament, si us plau useu «git rebase --skip»\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:67
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
-msgstr "Altrament si us plau useu «git cherry-pick --skip»\n"
+msgstr "Altrament, si us plau useu «git cherry-pick --skip»\n"
 
-#: builtin/commit.c:69
-#, fuzzy
+#: builtin/commit.c:70
 msgid ""
 "and then use:\n"
 "\n"
@@ -13669,77 +13825,79 @@ msgid ""
 "    git cherry-pick --skip\n"
 "\n"
 msgstr ""
-"i després utilitzeu git cherry-pick --continue per tornar a seleccionar les "
-"comissions restants. Si voleu ometre aquesta publicació utilitzeu git cherry-"
-"pick --skip"
+"i després utilitzeu:\n"
+"\n"
+"    git cherry-pick --continue\n"
+"\n"
+"per a continuar seleccionant les comissions restants.\n"
+"Si voleu ometre aquesta comissió, useu:\n"
+"\n"
+"    git cherry-pick --skip\n"
+"\n"
 
-#: builtin/commit.c:324
+#: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
 msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
 
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file amb -a no té sentit"
-
-#: builtin/commit.c:374
+#: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "--include/--only no té sentit sense camí."
 
-#: builtin/commit.c:386
+#: builtin/commit.c:387
 msgid "unable to create temporary index"
 msgstr "no s'ha pogut crear un índex temporal"
 
-#: builtin/commit.c:395
+#: builtin/commit.c:396
 msgid "interactive add failed"
 msgstr "l'afegiment interactiu ha fallat"
 
-#: builtin/commit.c:410
+#: builtin/commit.c:411
 msgid "unable to update temporary index"
 msgstr "no s'ha pogut actualitzar l'índex temporal"
 
-#: builtin/commit.c:412
+#: builtin/commit.c:413
 msgid "Failed to update main cache tree"
 msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau"
 
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
 msgid "unable to write new_index file"
 msgstr "no s'ha pogut escriure el fitxer new_index"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "cannot do a partial commit during a merge."
 msgstr "no es pot fer una comissió parcial durant una fusió."
 
-#: builtin/commit.c:491
+#: builtin/commit.c:492
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "no es pot fer una comissió parcial durant un «cherry pick»."
 
-#: builtin/commit.c:493
+#: builtin/commit.c:494
 msgid "cannot do a partial commit during a rebase."
 msgstr "no es pot fer una comissió parcial durant un «rebase»."
 
-#: builtin/commit.c:501
+#: builtin/commit.c:502
 msgid "cannot read the index"
 msgstr "no es pot llegir l'índex"
 
-#: builtin/commit.c:520
+#: builtin/commit.c:521
 msgid "unable to write temporary index file"
 msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
 
-#: builtin/commit.c:618
+#: builtin/commit.c:619
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "a la comissió «%s» li manca la capçalera d'autor"
 
-#: builtin/commit.c:620
+#: builtin/commit.c:621
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "la comissió «%s» té una línia d'autor mal formada"
 
-#: builtin/commit.c:639
+#: builtin/commit.c:640
 msgid "malformed --author parameter"
 msgstr "paràmetre --author mal format"
 
-#: builtin/commit.c:692
+#: builtin/commit.c:693
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -13747,43 +13905,82 @@ msgstr ""
 "no es pot seleccionar un caràcter de comentari que\n"
 "no sigui usat en el missatge de comissió actual"
 
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "no s'ha pogut cercar la comissió %s"
 
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(s'està llegint el missatge de registre des de l'entrada estàndard)\n"
 
-#: builtin/commit.c:760
+#: builtin/commit.c:761
 msgid "could not read log from standard input"
 msgstr "no s'ha pogut llegir el registre des de l'entrada estàndard"
 
-#: builtin/commit.c:764
+#: builtin/commit.c:765
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
 
-#: builtin/commit.c:801
-#, fuzzy, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "no es pot combinar «--keep-base» amb «--root»"
+#: builtin/commit.c:802
+#, c-format
+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:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
 msgstr "no s'ha pogut llegir SQUASH_MSG"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:821
 msgid "could not read MERGE_MSG"
 msgstr "no s'ha pogut llegir MERGE_MSG"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:881
 msgid "could not write commit template"
 msgstr "no s'ha pogut escriure la plantilla de comissió"
 
+#: builtin/commit.c:894
+#, 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ó per als vostres canvis.\n"
+"S'ignoraran les línies que comencin amb «%c».\n"
+
+#: builtin/commit.c:896
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"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"
+
 #: builtin/commit.c:900
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Introduïu el missatge de comissió pels vostres canvis. Es mantindran\n"
+"les línies que comencin amb «%c»; podeu eliminar-les si voleu.\n"
+
+#: builtin/commit.c:904
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Introduïu el missatge de comissió dels vostres canvis.\n"
+"Es mantindran les línies que comencin amb «%c»; podeu eliminar-les vosaltres\n"
+"mateixos si voleu. Un missatge buit avorta la comissió.\n"
+
+#: builtin/commit.c:916
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -13797,7 +13994,7 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "i intenteu-ho de nou.\n"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:921
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -13811,200 +14008,169 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "i intenteu-ho de nou.\n"
 
-#: builtin/commit.c:915
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"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"
-
-#: builtin/commit.c:923
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"Introduïu el missatge de comissió dels vostres canvis.\n"
-"Es mantindran les línies que comencin amb «%c»; podeu eliminar-les "
-"vosaltres\n"
-"mateixos si voleu. Un missatge buit avorta la comissió.\n"
-
-#: builtin/commit.c:940
+#: builtin/commit.c:948
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:    %.*s <%.*s>"
 
-#: builtin/commit.c:948
+#: builtin/commit.c:956
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sData:      %s"
 
-#: builtin/commit.c:955
+#: builtin/commit.c:963
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sComitent: %.*s <%.*s>"
 
-#: builtin/commit.c:973
+#: builtin/commit.c:981
 msgid "Cannot read index"
 msgstr "No es pot llegir l'índex"
 
-#: builtin/commit.c:1018
-#, fuzzy
+#: builtin/commit.c:1026
 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:1058
+#: builtin/commit.c:1066
 msgid "Error building trees"
-msgstr "Error en construir arbres"
+msgstr "Error en construir els arbres"
 
-#: builtin/commit.c:1072 builtin/tag.c:319
+#: 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"
 
-#: builtin/commit.c:1116
+#: builtin/commit.c:1124
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author «%s» no és «Nom <adreça-electrònica>» i no coincideix amb\n"
 "cap autor existent"
 
-#: builtin/commit.c:1130
+#: builtin/commit.c:1138
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Mode d'ignorància no vàlid «%s»"
 
-#: builtin/commit.c:1148 builtin/commit.c:1441
+#: 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:1188
-msgid "--long and -z are incompatible"
-msgstr "--long i -z són incompatibles"
-
-#: builtin/commit.c:1219
-#, fuzzy
+#: builtin/commit.c:1227
 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:1221
-#, fuzzy
+#: builtin/commit.c:1229
 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:1224
-#, 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ó"
+#: builtin/commit.c:1232
+#, 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:1226
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
+#: builtin/commit.c:1234
+#, 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:1245
+#: 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:1254
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "No teniu res a esmenar."
 
-#: builtin/commit.c:1257
+#: 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:1259
+#: 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:1261
+#: 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:1264
+#: 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:1274
+#: 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:1276
+#: 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:1285
+#: 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:1303
+#: 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:1331
-#, fuzzy, c-format
+#: builtin/commit.c:1338
+#, c-format
 msgid "unknown option: --fixup=%s:%s"
-msgstr "opció desconeguda: %s\n"
+msgstr "opció desconeguda: --fixup=%s:%s"
 
-#: builtin/commit.c:1345
+#: 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:1476 builtin/commit.c:1642
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "mostra l'estat concisament"
 
-#: builtin/commit.c:1478 builtin/commit.c:1644
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "mostra la informació de branca"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "mostra la informació de «stash»"
 
-#: builtin/commit.c:1482 builtin/commit.c:1646
-#, 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:1484
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "versió"
 
-#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
-#: builtin/worktree.c:681
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
-msgstr "sortida llegible per màquina"
+msgstr "sortida llegible per una màquina"
 
-#: builtin/commit.c:1487 builtin/commit.c:1650
+#: 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:1490 builtin/commit.c:1653
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "acaba les entrades amb NUL"
 
-#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: 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:1493 builtin/commit.c:1656
+#: 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:1497
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14012,11 +14178,11 @@ msgstr ""
 "mostra els fitxers ignorats, modes opcionals: traditional, matching, no. "
 "(Per defecte: traditional, matching, no.)"
 
-#: builtin/commit.c:1499 parse-options.h:193
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "quan"
 
-#: builtin/commit.c:1500
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14024,207 +14190,205 @@ msgstr ""
 "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
 "defecte: all)"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "mostra els fitxers no seguits en columnes"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "no detectis canvis de noms"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
-msgstr "detecta canvis de noms, i opcionalment estableix un índex de semblança"
+msgstr ""
+"detecta canvis de noms, i opcionalment estableix un índex de semblança"
 
-#: builtin/commit.c:1525
+#: 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:1607
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "omet el resum després d'una comissió reeixida"
 
-#: builtin/commit.c:1608
+#: 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:1610
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "Opcions de missatge de comissió"
 
-#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
+#: 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:1612
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1612
+#: 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:1613 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "data"
 
-#: builtin/commit.c:1613
+#: 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:1615 builtin/commit.c:1616 builtin/commit.c:1622
-#: parse-options.h:329 ref-filter.h:90
+#: 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:1615
+#: 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:1616
+#: 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:1621
-#, fuzzy
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
-msgstr "esmena la comissió anterior"
+msgstr "[(amend|reword):]commit"
 
-#: builtin/commit.c:1621
-#, 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:1622
+#: 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:1623
+#: 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:1624 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "remolc"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
-msgstr ""
+msgstr "afegeix un «trailer» personalitzat"
 
-#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
-#: 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:1626
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "usa el fitxer de plantilla especificat"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "força l'edició de la comissió"
 
-#: builtin/commit.c:1629
+#: 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:1634
+#: 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:1635
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "comet tots els fitxers canviats"
 
-#: builtin/commit.c:1636
+#: 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:1637
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "afegeix els fitxers interactivament"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "afegeix els canvis interactivament"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "comet només els fitxers especificats"
 
-#: builtin/commit.c:1640
+#: 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:1641
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "mostra què es cometria"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "esmena la comissió anterior"
 
-#: builtin/commit.c:1655
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "evita el lligam de post escriptura"
 
-#: builtin/commit.c:1662
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "està bé registrar un canvi buit"
 
-#: builtin/commit.c:1664
+#: 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:1737
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fitxer MERGE_HEAD malmès (%s)"
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "no s'ha pogut llegir MERGE_MODE"
 
-#: builtin/commit.c:1765
+#: 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:1772
+#: 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:1777
+#: 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:1788
-#, 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:1824
-#, 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>]"
@@ -14253,11 +14417,11 @@ msgstr "usa el fitxer de configuració del sistema"
 
 #: builtin/config.c:133
 msgid "use repository config file"
-msgstr "usa el fitxer de configuració del dipòsit"
+msgstr "usa el fitxer de configuració del repositori"
 
 #: builtin/config.c:134
 msgid "use per-worktree config file"
-msgstr "usa un fitxer de configuració per dipòsit"
+msgstr "usa un fitxer de configuració per repositori"
 
 #: builtin/config.c:135
 msgid "use given config file"
@@ -14393,30 +14557,28 @@ 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"
 msgstr "valor"
 
 #: builtin/config.c:167
-#, fuzzy
 msgid "with --get, use default value when missing entry"
-msgstr "amb --get utilitza el valor per defecte quan falta una entrada"
+msgstr "amb --get utilitza el valor per defecte quan falti una entrada"
 
 #: builtin/config.c:181
-#, fuzzy, c-format
+#, c-format
 msgid "wrong number of arguments, should be %d"
-msgstr "el nombre d'arguments és erroni"
+msgstr "nombre d'arguments erroni, ha de ser %d"
 
 #: builtin/config.c:183
-#, fuzzy, c-format
+#, c-format
 msgid "wrong number of arguments, should be from %d to %d"
-msgstr "el nombre d'arguments hauria de passar d'un percentatge a un altre."
+msgstr "nombre d'arguments erroni, ha de ser %d a %d"
 
 #: builtin/config.c:339
 #, c-format
@@ -14427,7 +14589,8 @@ msgstr "patró de la clau no vàlid: %s"
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr ""
-"s'ha produït un error en formatar el valor per defecte de la configuració: %s"
+"s'ha produït un error en formatar el valor per defecte de la configuració: "
+"%s"
 
 #: builtin/config.c:441
 #, c-format
@@ -14447,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
@@ -14472,31 +14634,28 @@ msgstr "només un fitxer de configuració cada cop"
 
 #: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
-msgstr "--local només es pot usar dins d'un dipòsit git"
+msgstr "--local només es pot usar dins d'un repositori git"
 
 #: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
-msgstr "--blob només es pot usar dins d'un dipòsit git"
+msgstr "--blob només es pot usar dins d'un repositori git"
 
 #: builtin/config.c:662
-#, fuzzy
 msgid "--worktree can only be used inside a git repository"
-msgstr "--blob només es pot usar dins d'un dipòsit git"
+msgstr "--worktree només es pot usar dins d'un repositori git"
 
 #: builtin/config.c:684
 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"
@@ -14512,8 +14671,8 @@ msgstr "--name-only només és aplicable a --list o --get-regexp"
 
 #: builtin/config.c:767
 msgid ""
-"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
-"list"
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and "
+"--list"
 msgstr ""
 "--show-origin només és aplicable a --get, --get-all, --get-regexp, i --list"
 
@@ -14522,9 +14681,8 @@ msgid "--default is only applicable to --get"
 msgstr "--default només és aplicable a --get"
 
 #: builtin/config.c:806
-#, fuzzy
 msgid "--fixed-value only applies with 'value-pattern'"
-msgstr "--fixed-value només s'aplica amb 'value-pattern'"
+msgstr "--fixed-value només s'aplica amb «value-pattern»"
 
 #: builtin/config.c:822
 #, c-format
@@ -14589,21 +14747,23 @@ msgid "print debugging messages to stderr"
 msgstr "imprimeix els missatges de depuració a stderr"
 
 #: builtin/credential-cache--daemon.c:316
-#, fuzzy
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr ""
-"credencial-cache-daemon no disponible; no hi ha compatibilitat amb sòcols "
-"unix"
+"credential-cache--daemon no disponible; no hi ha compatibilitat amb sòcols "
+"d'unix"
 
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr ""
-"credencial-cache no disponible; no hi ha compatibilitat amb els sòcols d'unix"
+"credencial-cache no disponible; no hi ha compatibilitat amb els sòcols "
+"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>...]"
@@ -14721,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"
@@ -14739,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"
 
@@ -14755,29 +14915,16 @@ 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
-#, fuzzy
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "-p i --overlay 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
-#, fuzzy
 msgid "--merge-base only works with two commits"
 msgstr "--merge-base només funciona amb dues comissions"
 
@@ -14796,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 dipòsit de git"
+msgstr "No és un repositori de git"
 
-#: builtin/diff.c:532 builtin/grep.c:684
+#: 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"
@@ -14824,114 +14971,106 @@ 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:261
-#, c-format
-msgid "failed: %d"
-msgstr "ha fallat: %d"
-
-#: builtin/difftool.c:303
+#: 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:305
+#: 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:313
+#: 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:413
+#: builtin/difftool.c:421
 msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"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:637
+#: 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:639
+#: 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:650
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "existeix un fitxer temporal a «%s»."
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "podeu netejar o recuperar-los."
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "ha fallat: %d"
+
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "usa «diff.guitool» en lloc de «diff.tool»"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "fes un diff de tot el directori"
 
-#: builtin/difftool.c:704
+#: 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:709
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "utilitza enllaços simbòlics en mode dir-diff"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "eina"
 
-#: builtin/difftool.c:711
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "utilitza l'eina de diff especificada"
 
-#: builtin/difftool.c:713
+#: 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:716
+#: builtin/difftool.c:706
 msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr ""
 "fes que «git-difftool» surti quan l'eina de diff invocada torna un codi de "
 "sortida diferent de zero"
 
-#: builtin/difftool.c:719
+#: 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:720
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "passa-ho a «diff»"
 
-#: builtin/difftool.c:735
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool requereix worktree o --no-index"
 
-#: builtin/difftool.c:742
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff és incompatible amb --no-index"
-
-#: builtin/difftool.c:745
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool and --extcmd són mútuament excloents"
-
-#: builtin/difftool.c:753
+#: 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:760
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "no s'ha proporcionat l'<ordre> per a --extcmd=<ordre>"
 
@@ -14939,454 +15078,427 @@ msgstr "no s'ha proporcionat l'<ordre> per a --extcmd=<ordre>"
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <opcions> <env-var>"
 
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
 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
-msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
-msgstr "`--default' espera un valor booleà amb `-type=bool` no `%s`"
+#, c-format
+msgid ""
+"option `--default' expects a boolean value with `--type=bool`, not `%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`"
+"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:868
-#, fuzzy
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
-"Error no es poden exportar les etiquetes niades a menys que s'especifiqui --"
-"mark-tags."
+"Error: no es poden exportar les etiquetes imbricades a menys que "
+"s'especifiqui --mark-tags."
 
-#: builtin/fast-export.c:1177
-#, fuzzy
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
-msgstr "--anonymize-map token no pot estar buit"
+msgstr "el testimoni de --anonymize-map no pot estar buit"
 
-#: builtin/fast-export.c:1197
+#: 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:1199
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "selecciona la gestió de les etiquetes signades"
 
-#: builtin/fast-export.c:1202
+#: 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:1205
-#, fuzzy
+#: 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:1208
-#, fuzzy
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
-msgstr "Bolca les marques a aquest fitxer"
+msgstr "bolca les marques a aquest fitxer"
 
-#: builtin/fast-export.c:1210
-#, fuzzy
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
-msgstr "Importa les marques d'aquest fitxer"
+msgstr "importa les marques d'aquest fitxer"
 
-#: builtin/fast-export.c:1214
-#, fuzzy
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
-msgstr "Importa marques d'aquest fitxer si existeix"
+msgstr "importa marques d'aquest fitxer si existeix"
 
-#: builtin/fast-export.c:1216
-#, 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:1218
-#, fuzzy
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
-msgstr "Imprimeix l'arbre complet de cada comissió"
+msgstr "imprimeix l'arbre complet de per a cada comissió"
 
-#: builtin/fast-export.c:1220
-#, 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:1221
-#, 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:1222 builtin/log.c:1823
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "especificació de referència"
 
-#: builtin/fast-export.c:1223
-#, fuzzy
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
-msgstr "Aplica l'especificació de referència a les referències exportades"
+msgstr "aplica l'especificació de referència a les referències exportades"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "anonimitza la sortida"
 
-#: builtin/fast-export.c:1225
-#, fuzzy
+#: builtin/fast-export.c:1199
 msgid "from:to"
-msgstr "des de"
+msgstr "des de:a"
 
-#: builtin/fast-export.c:1226
+#: 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:1229
-#, 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:1231
-#, 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:1233
-#, fuzzy
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
-msgstr "Etiquetes amb els identificadors de marca"
-
-#: builtin/fast-export.c:1256
-#, fuzzy
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--trailer amb --only-input no té sentit"
+msgstr "marca les etiquetes amb els identificadors de marca"
 
-#: builtin/fast-export.c:1271
-#, fuzzy
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "No es poden passar tant --import-marks com --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
-#, fuzzy, c-format
+#: builtin/fast-import.c:3090
+#, c-format
 msgid "Missing from marks for submodule '%s'"
-msgstr "Subjecting submodule '%s'"
+msgstr "Falten les marques «from» per al submòdul «%s»"
 
-#: builtin/fast-import.c:3090
-#, fuzzy, c-format
+#: builtin/fast-import.c:3092
+#, c-format
 msgid "Missing to marks for submodule '%s'"
-msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%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>] [<dipòsit> [<especificació-de-referència>...]]"
+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>] [(<dipòsit> | <grup>)...]"
+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.paral·lelisme no pot ser negatiu"
+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
-#, fuzzy
+#: 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
+#: builtin/fetch.c:165
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
+"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 temps"
+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 dipòsit complet"
+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)"
 msgstr ""
-"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que "
-"els fitxers de configuració)"
+"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que"
+" els fitxers de configuració)"
 
-#: builtin/fetch.c: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
-#, fuzzy
+#: 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
+#: 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, mostra els avantpassats dels "
+"consells de negociació"
 
-#: builtin/fetch.c:213 builtin/fetch.c:215
-#, fuzzy
+#: builtin/fetch.c:214 builtin/fetch.c:216
 msgid "run 'maintenance --auto' after fetching"
-msgstr "executa «gc --auto» després d'obtenir"
+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"
+"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:757
+#: 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:856
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "objecte %s no trobat"
 
-#: builtin/fetch.c:860
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[al dia]"
 
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[rebutjat]"
 
-#: builtin/fetch.c:874
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "no es pot obtenir en la branca actual"
 
-#: builtin/fetch.c:884
+#: 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:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: 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:889
-#, 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:911
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[etiqueta nova]"
 
-#: builtin/fetch.c:914
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[branca nova]"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[referència nova]"
 
-#: builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "actualització forçada"
 
-#: builtin/fetch.c:961
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "sense avanç ràpid"
 
-#: builtin/fetch.c:1065
-#, fuzzy
+#: 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 però aquesta comprovació s'ha desactivat. Per tornar a habilitar "
-"utilitzeu l'indicador «--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:1069
-#, fuzzy, c-format
+#: builtin/fetch.c:1080
+#, c-format
 msgid ""
-"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"
+"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"
 msgstr ""
-"S'ha trigat segons de 9% a comprovar les actualitzacions forçoses. Podeu "
-"utilitzar «--no-show-forced-updates» o executar «git config fetch."
-"showForcedUpdates false» per evitar aquesta comprovació."
+"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 a evitar aquesta comprovació.\n"
 
-#: builtin/fetch.c:1101
+#: 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:1129
+#: builtin/fetch.c:1141
 #, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+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:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "De %.*s\n"
 
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15396,149 +15508,157 @@ msgstr ""
 " intenteu executar «git remote prune %s» per a eliminar\n"
 " qualsevol branca antiga o conflictiva"
 
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s es tornarà penjant)"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s s'ha tornat penjant)"
 
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[suprimit]"
 
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(cap)"
 
-#: builtin/fetch.c:1384
+#: 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 dipòsit 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:1403
+#: 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:1406
+#: 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:1618
+#: builtin/fetch.c:1455
+#, c-format
+msgid "the object %s does not exist"
+msgstr "l'objecte %s no existeix"
+
+#: 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:1633
+#: 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:1635
+#: 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:1637
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "tipus de branca desconegut"
 
-#: builtin/fetch.c:1639
+#: 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:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "S'està obtenint %s\n"
 
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 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:1790
+#: 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:1894
+#: 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 dipòsit remot especificat. Especifiqueu un URL o\n"
-"un nom remot del qual es deuen obtenir les revisions noves."
-
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "Necessiteu especificar un nom d'etiqueta."
+"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:1995
-msgid "Negative depth in --deepen is not supported"
-msgstr "No s'admet una profunditat negativa en --deepen"
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "necessiteu especificar un nom d'etiqueta"
 
-#: builtin/fetch.c:1997
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen i --depth són mútuament excloents"
+#: 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:2002
-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:2004
+#: builtin/fetch.c:2045
 msgid "--unshallow on a complete repository does not make sense"
-msgstr "--unshallow en un dipòsit complet no té sentit"
+msgstr "--unshallow en un repositori complet no té sentit"
 
-#: builtin/fetch.c:2021
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
-msgstr "fetch --all no accepta un argument de dipòsit"
+msgstr "fetch --all no accepta un argument de repositori"
 
-#: builtin/fetch.c:2023
+#: 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:2032
+#: 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:2039
-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:2055
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
-msgstr ""
+msgstr "s'ha de subministrar el remot en usar --negotiate-only"
 
-#: builtin/fetch.c:2060
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr ""
+#: builtin/fetch.c:2102
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "el protocol no admet --negotiate-only, se surt"
 
-#: builtin/fetch.c:2079
+#: builtin/fetch.c:2121
 msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialclone"
+"--filter can only be used with the remote configured in "
+"extensions.partialclone"
 msgstr ""
-"--filter només es pot utilitzar amb el remot configurat en extensions."
-"partialclone"
+"--filter només es pot utilitzar amb el remot configurat en "
+"extensions.partialclone"
 
-#: builtin/fetch.c:2083
-#, 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:2087
-#, 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 ""
@@ -15546,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"
 
@@ -15575,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:483
+#: 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ó"
 
@@ -15633,20 +15756,19 @@ msgstr "imprimeix només les referències que no continguin la comissió"
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<config> <command-args>"
 
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "config"
 
-#: builtin/for-each-repo.c:38
-#, fuzzy
+#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "clau de configuració emmagatzemant una llista de camins de repositori"
 
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "falta --config=<config>"
 
-#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "desconegut"
 
@@ -15662,229 +15784,240 @@ msgstr "error en %s %s: %s"
 msgid "warning in %s %s: %s"
 msgstr "avís en %s %s: %s"
 
-#: builtin/fsck.c:123 builtin/fsck.c:126
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "enllaç trencat de %7s %s"
 
-#: builtin/fsck.c:135
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "tipus d'objecte incorrecte en l'enllaç"
 
-#: builtin/fsck.c:151
-#, fuzzy, c-format
+#: builtin/fsck.c:152
+#, 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:263
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "manca %s %s"
 
-#: builtin/fsck.c:290
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "inabastable %s %s"
 
-#: builtin/fsck.c:310
-#, fuzzy, c-format
+#: builtin/fsck.c:311
+#, c-format
 msgid "dangling %s %s"
-msgstr "per cent"
+msgstr "sense assignació %s %s"
 
-#: builtin/fsck.c:320
-#, fuzzy
+#: builtin/fsck.c:321
 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:331
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "no s'ha pogut finalitzar «%s»"
 
-#: builtin/fsck.c:348
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "S'està comprovant %s"
 
-#: builtin/fsck.c:386
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "S'està comprovant la connectivitat (%d objectes)"
 
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "S'està comprovant %s %s"
 
-#: builtin/fsck.c:410
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "enllaços trencats"
 
-#: builtin/fsck.c:419
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "arrel %s"
 
-#: builtin/fsck.c:427
-#, fuzzy, c-format
+#: builtin/fsck.c:428
+#, c-format
 msgid "tagged %s %s (%s) in %s"
-msgstr "percentatges marcats"
+msgstr "marcat %s %s (%s) a %s"
 
-#: builtin/fsck.c:456
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: objecte corrupte o no trobat"
 
-#: builtin/fsck.c:481
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: entrada de referència no vàlida %s"
 
-#: builtin/fsck.c:495
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "S'està comprovant reflog %s->%s"
 
-#: builtin/fsck.c:529
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: punter %s sha1 no vàlid"
 
-#: builtin/fsck.c:536
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: no és una comissió"
 
-#: builtin/fsck.c:590
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "avís: no hi ha referències per defecte"
 
-#: builtin/fsck.c:605
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: el resum del camí no coincideix, trobat a: %s"
+
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: objecte corrupte o no trobat: %s"
 
-#: builtin/fsck.c:618
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: l'objecte és de tipus desconegut «%s»: %s"
+
+#: 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:638
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "fitxer sha1 malmès: %s"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "S'està comprovant el directori d'objecte"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "S'estan comprovant els directoris d'objecte"
 
-#: builtin/fsck.c:671
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "S'està comprovant l'enllaç %s"
 
-#: builtin/fsck.c:676 builtin/index-pack.c:866
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "%s no vàlid"
 
-#: builtin/fsck.c:683
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s apunta a una cosa estranya (%s)"
 
-#: builtin/fsck.c:689
+#: 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:693
+#: 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:705
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "S'està comprovant l'arbre de la memòria cau"
 
-#: builtin/fsck.c:710
-#, 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:719
-#, 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:750
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opcions>] [<objecte>...]"
 
-#: builtin/fsck.c:756
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "mostra els objectes inabastables"
 
-#: builtin/fsck.c:757
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "mostra els objectes penjants"
 
-#: builtin/fsck.c:758
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "informa de les etiquetes"
 
-#: builtin/fsck.c:759
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "informa dels nodes d'arrel"
 
-#: builtin/fsck.c:760
+#: 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:761
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
-msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"
+msgstr ""
+"fes que els registres de referències siguin nodes cap (per defecte)"
 
-#: builtin/fsck.c:762
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "també considera els paquets i els objectes alternatius"
 
-#: builtin/fsck.c:763
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "comprova només la connectivitat"
 
-#: builtin/fsck.c:764 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "habilita la comprovació més estricta"
 
-#: builtin/fsck.c:766
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "escriu objectes penjants a .git/lost-found"
 
-#: builtin/fsck.c:767 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "mostra el progrés"
 
-#: builtin/fsck.c:768
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "mostra els noms detallats dels objectes abastables"
 
-#: builtin/fsck.c:827 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "S'estan comprovant els objectes"
 
-#: builtin/fsck.c:855
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: falta l'objecte"
 
-#: builtin/fsck.c:866
+#: 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»"
@@ -15903,289 +16036,306 @@ 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:240 builtin/tag.c:573
-#, c-format
-msgid "cannot read '%s'"
-msgstr "no es pot llegir «%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"
-"and remove %s.\n"
+"and remove %s\n"
 "Automatic cleanup will not be performed until the file is removed.\n"
 "\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"
+msgstr ""
+"força l'execució de gc encara que hi pugui haver un altre gc executant-se"
 
-#: builtin/gc.c:560
-#, fuzzy
+#: 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
-#, fuzzy, c-format
+#: builtin/gc.c:577
+#, c-format
 msgid "failed to parse gc.logexpiry value %s"
-msgstr "no s'ha pogut analitzar el valor de gc.logexpiry dels percentatges"
+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 dipòsit automàticament en el rerefons per a un "
+"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 dipòsit per a un rendiment òptim.\n"
+"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)"
 msgstr ""
-"gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si no)"
+"gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si "
+"no)"
 
-#: builtin/gc.c:705
+#: builtin/gc.c:707
 msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+"There are too many unreachable loose objects; run 'git prune' to remove "
+"them."
 msgstr ""
-"Hi ha massa objectes solts inabastables; executeu «git prune» per a eliminar-"
-"los."
+"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:869
-#, fuzzy
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
-msgstr "s'ha produït un error en escriure l'objecte de comissió"
+msgstr "s'ha produït un error en escriure el graf de comissions"
 
-#: builtin/gc.c:905
-#, 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:1022
-#, fuzzy
 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:1039
-#, fuzzy
 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:1091
-#, 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:1109
-#, 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:1170
-#, 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:1179
-#, 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:1283
-#, 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:1313
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "la tasca «%s» ha fallat"
 
-#: builtin/gc.c:1395
-#, 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:1400
-#, 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:1415
-#, fuzzy
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
-msgstr "executa les tasques basades en l'estat del dipòsit"
+msgstr "executa les tasques basades en l'estat del repositori"
 
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "freqüència"
 
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "executa les tasques basant-se en freqüència"
 
-#: builtin/gc.c:1420
-#, 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:1421
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "tasca"
 
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "executa una tasca específica"
 
-#: builtin/gc.c:1439
-#, 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:1482
-#, 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:1547
-#, 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:1576
-#, 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:1613
-#, 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:1674
-#, 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:1745
-#, 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:1835
-#, 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:1879
-#, 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:1896
-#, 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:1900
-#, 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:1942
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "«crontab» ha mort"
 
-#: builtin/gc.c:1976
-#, fuzzy
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "s'ha produït un error en iniciar systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "s'ha produït un error en executar systemctl"
+
+#: 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:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "l'argument --scheduler no reconegut «%s»"
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "ni els temporitzadors de systemd ni de crontab estan disponibles"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "el planificador %s no està disponible"
+
+#: 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:2000
-#, fuzzy
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<scheduler>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "planificador"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "planificador per a activar l'execució de manteniment del git"
+
+#: 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:2010
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <subcommand> [<options>]"
 
-#: builtin/gc.c:2029
-#, 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>...]"
 msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]"
 
-#: builtin/grep.c:223
+#: builtin/grep.c:239
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: s'ha produït un error en crear fil: %s"
 
-#: builtin/grep.c:277
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s"
@@ -16193,368 +16343,377 @@ msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s"
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
-#.
-#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
-#: builtin/pack-objects.c:2969
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "no s'admeten fils, s'ignorarà %s"
 
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "no s'ha pogut llegir l'arbre (%s)"
 
-#: builtin/grep.c:658
+#: builtin/grep.c:672
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "no es pot fer grep des d'un objecte de tipus %s"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:752
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "l'opció «%c» espera un valor numèric"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:851
 msgid "search in index instead of in the work tree"
 msgstr "cerca en l'índex en lloc de l'arbre de treball"
 
-#: builtin/grep.c:840
+#: builtin/grep.c:853
 msgid "find in contents not managed by git"
 msgstr "cerca en continguts no gestionats per git"
 
-#: builtin/grep.c:842
+#: builtin/grep.c:855
 msgid "search in both tracked and untracked files"
 msgstr "cerca tant en fitxers seguits com en no seguits"
 
-#: builtin/grep.c:844
+#: builtin/grep.c:857
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignora els fitxers especificats mitjançant «.gitignore»"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:859
 msgid "recursively search in each submodule"
 msgstr "cerca recursivament a cada submòdul"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:862
 msgid "show non-matching lines"
 msgstr "mostra les línies no coincidents"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:864
 msgid "case insensitive matching"
-msgstr "coincidència insensible a majúscula i minúscula"
+msgstr "coincidència no distingeix entre majúscules i minúscules"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:866
 msgid "match patterns only at word boundaries"
 msgstr "coincideix amb els patrons només als límits de paraula"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:868
 msgid "process binary files as text"
 msgstr "processa els fitxers binaris com a text"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:870
 msgid "don't match patterns in binary files"
 msgstr "no coincideixis amb els patrons en els fitxers binaris"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:873
 msgid "process binary files with textconv filters"
 msgstr "processa els fitxers binaris amb filtres de textconv"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:875
 msgid "search in subdirectories (default)"
 msgstr "cerca als subdirectoris (per defecte)"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:877
 msgid "descend at most <depth> levels"
 msgstr "descendeix com a màxim <profunditat> nivells"
 
-#: builtin/grep.c:868
+#: builtin/grep.c:881
 msgid "use extended POSIX regular expressions"
 msgstr "usa les expressions regulars POSIX ampliades"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:884
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:887
 msgid "interpret patterns as fixed strings"
 msgstr "interpreta els patrons com a cadenes fixes"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:890
 msgid "use Perl-compatible regular expressions"
 msgstr "usa les expressions regulars compatibles amb Perl"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:893
 msgid "show line numbers"
 msgstr "mostra els números de línia"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:894
 msgid "show column number of first match"
 msgstr "mostra el nombre de columna de la primera coincidència"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:895
 msgid "don't show filenames"
 msgstr "no mostris els noms de fitxer"
 
-#: builtin/grep.c:883
+#: builtin/grep.c:896
 msgid "show filenames"
 msgstr "mostra els noms de fitxer"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:898
 msgid "show filenames relative to top directory"
 msgstr "mostra els noms de fitxer relatius al directori superior"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:900
 msgid "show only filenames instead of matching lines"
 msgstr "mostra només els noms de fitxer en lloc de les línies coincidents"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:902
 msgid "synonym for --files-with-matches"
 msgstr "sinònim de --files-with-matches"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:905
 msgid "show only the names of files without match"
 msgstr "mostra només els noms dels fitxers sense coincidència"
 
-#: builtin/grep.c:894
+#: builtin/grep.c:907
 msgid "print NUL after filenames"
 msgstr "imprimeix NUL després dels noms de fitxer"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:910
 msgid "show only matching parts of a line"
 msgstr "mostra només les parts de coincidents de la línia"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:912
 msgid "show the number of matches instead of matching lines"
 msgstr "mostra el nombre de coincidències en lloc de les línies coincidents"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:913
 msgid "highlight matches"
 msgstr "ressalta les coincidències"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:915
 msgid "print empty line between matches from different files"
 msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:917
 msgid "show filename only once above matches from same file"
 msgstr ""
 "mostra el nom de fitxer només una vegada a dalt de les coincidències del "
 "mateix fitxer"
 
-#: builtin/grep.c:907
+#: builtin/grep.c:920
 msgid "show <n> context lines before and after matches"
 msgstr "mostra <n> línies de context abans i després d'una coincidència"
 
-#: builtin/grep.c:910
+#: builtin/grep.c:923
 msgid "show <n> context lines before matches"
 msgstr "mostra <n> línies de context abans d'una coincidència"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:925
 msgid "show <n> context lines after matches"
 msgstr "mostra <n> línies de context després d'una coincidència"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:927
 msgid "use <n> worker threads"
 msgstr "usa <n> fils de treball"
 
-#: builtin/grep.c:915
+#: builtin/grep.c:928
 msgid "shortcut for -C NUM"
-msgstr "drecera per -C NUM"
+msgstr "drecera per a -C NUM"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:931
 msgid "show a line with the function name before matches"
 msgstr "mostra una línia amb el nom de funció abans de les coincidències"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:933
 msgid "show the surrounding function"
 msgstr "mostra la funció circumdant"
 
-#: builtin/grep.c:923
+#: builtin/grep.c:936
 msgid "read patterns from file"
 msgstr "llegeix els patrons des d'un fitxer"
 
-#: builtin/grep.c:925
+#: builtin/grep.c:938
 msgid "match <pattern>"
 msgstr "coincideix amb <patró>"
 
-#: builtin/grep.c:927
+#: builtin/grep.c:940
 msgid "combine patterns specified with -e"
 msgstr "combina els patrons especificats amb -e"
 
-#: builtin/grep.c:939
+#: builtin/grep.c:952
 msgid "indicate hit with exit status without output"
 msgstr "indica coincidència amb estat de sortida sense sortida textual"
 
-#: builtin/grep.c:941
+#: builtin/grep.c:954
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "mostra només les coincidències dels fitxers que coincideixin amb tots els "
 "patrons"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "pager"
 msgstr "paginador"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "show matching files in the pager"
 msgstr "mostra els fitxers coincidents en el paginador"
 
-#: builtin/grep.c:948
+#: builtin/grep.c:961
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1027
 msgid "no pattern given"
 msgstr "no s'ha donat cap patró"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:1063
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index o --untracked no es pot usar amb revisions"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:1071
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "no s'ha pogut resoldre la revisió: %s"
 
-#: builtin/grep.c:1088
+#: builtin/grep.c:1101
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked no s'admet amb --recurse-submodules"
 
-#: builtin/grep.c:1092
+#: builtin/grep.c:1105
 msgid "invalid option combination, ignoring --threads"
 msgstr "combinació d'opcions no vàlida, s'està ignorant --threads"
 
-#: builtin/grep.c:1095 builtin/pack-objects.c:3930
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
 msgid "no threads support, ignoring --threads"
 msgstr "no s'admeten fils, s'ignorarà --threads"
 
-#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
 
-#: builtin/grep.c:1132
+#: builtin/grep.c:1145
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager només funciona en l'arbre de treball"
 
-#: builtin/grep.c:1158
+#: builtin/grep.c:1171
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached o --untracked no es pot usar amb --no-index"
 
-#: builtin/grep.c:1161
-#, fuzzy
+#: builtin/grep.c:1174
 msgid "--untracked cannot be used with --cached"
-msgstr "--cached o --untracked no es pot usar amb --no-index"
+msgstr "--untracked no es pot usar amb --cached"
 
-#: builtin/grep.c:1167
-#, fuzzy
+#: builtin/grep.c:1180
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
-msgstr "--[no-]exclude-standard no es pot utilitzar per als continguts seguits"
+msgstr ""
+"--[no-]exclude-standard no es pot utilitzar per als continguts seguits"
 
-#: builtin/grep.c:1175
-#, fuzzy
+#: builtin/grep.c:1188
 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:85
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
 msgstr ""
-"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] "
-"[--] <fitxer>..."
+"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin]"
+" [--] <fitxer>..."
 
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "tipus d'objecte"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "escriu l'objecte a la base de dades d'objectes"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "llegeix l'objecte des de stdin"
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "emmagatzema el fitxer tal com és sense filtres"
 
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "només suma qualsevol brossa aleatòria per a crear objectes malmesos per a "
 "depurar al Git"
 
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "processa el fitxer com si fos d'aquest camí"
 
-#: builtin/help.c:47
+#: builtin/help.c:55
 msgid "print all available commands"
 msgstr "imprimeix totes les ordres disponibles"
 
-#: builtin/help.c:48
+#: builtin/help.c:57
 msgid "exclude guides"
 msgstr "exclou guies"
 
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "imprimeix la llista de guies útils"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "imprimeix tots els noms de les variables de configuració"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
 msgid "show man page"
 msgstr "mostra la pàgina de manual"
 
-#: builtin/help.c:53
+#: builtin/help.c:59
 msgid "show manual in web browser"
 msgstr "mostra la pàgina de manual en el navegador web"
 
-#: builtin/help.c:55
+#: builtin/help.c:61
 msgid "show info page"
 msgstr "mostra la pàgina d'informació"
 
-#: builtin/help.c:57
+#: builtin/help.c:63
 msgid "print command description"
 msgstr "imprimeix la descripció de l'ordre"
 
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "imprimeix la llista de guies útils"
 
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "imprimeix tots els noms de les variables de configuració"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "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:190
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
-msgstr "S'ha produït un error'ha produït un error en iniciar emacsclient."
+msgstr "S'ha produït un error en iniciar emacsclient."
 
-#: builtin/help.c:203
+#: 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:211
+#: 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:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: 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:307
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16563,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:319
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16572,129 +16731,122 @@ msgstr ""
 "«%s»: ordre per a un visualitzador de manuals compatible.\n"
 "Considereu usar «man.<eina>.path» en lloc d'això."
 
-#: builtin/help.c:436
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "«%s»: visualitzador de manuals desconegut."
 
-#: builtin/help.c:453
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
 
-#: builtin/help.c:461
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
 
-#: builtin/help.c:520 builtin/help.c:531 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:534 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:580
+msgid "this option doesn't take any other arguments"
+msgstr "aquesta opció no accepta cap altre argument"
 
-#: builtin/help.c:563 builtin/help.c:593
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "ús: %s%s"
 
-#: builtin/help.c:577
-#, 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:222
+#: builtin/index-pack.c:221
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "hi ha una discordança de tipus d'objecte a %s"
 
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "no s'ha rebut l'objecte esperat %s"
 
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objecte %s: s'esperava el tipus %s, s'ha trobat %s"
 
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "no es pot omplir %d octet"
-msgstr[1] "no es pot omplir %d octets"
+msgstr[1] "no es poden omplir %d octets"
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr "EOF prematur"
 
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "error de lectura d'entrada"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "s'han usat més octets que hi havia disponibles"
 
-#: builtin/index-pack.c:325 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr "paquet massa gran per a la definició actual d'off_t"
 
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "el paquet supera la mida màxima permesa"
 
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "no s'ha pogut crear «%s»"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "no es pot obrir el fitxer de paquet «%s»"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
 msgid "pack signature mismatch"
 msgstr "hi ha una discordança de signatura de paquet"
 
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "la versió de paquet %<PRIu32> no és compatible"
 
-#: builtin/index-pack.c:383
+#: builtin/index-pack.c:376
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "el paquet té un objecte incorrecte a la posició %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:489
+#: builtin/index-pack.c:482
 #, c-format
 msgid "inflate returned %d"
 msgstr "la inflació ha retornat %d"
 
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:531
 msgid "offset value overflow for delta base object"
 msgstr ""
 "desbordament de valor de desplaçament per a l'objecte base de diferències"
 
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:539
 msgid "delta base offset is out of bound"
 msgstr "el desplaçament de base de diferències està fora de límits"
 
-#: builtin/index-pack.c:554
+#: builtin/index-pack.c:547
 #, c-format
 msgid "unknown object type %d"
 msgstr "tipus d'objecte desconegut %d"
 
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:578
 msgid "cannot pread pack file"
 msgstr "no es pot fer pread en el fitxer empaquetat"
 
-#: builtin/index-pack.c:587
+#: builtin/index-pack.c:580
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -16702,204 +16854,193 @@ msgstr[0] "el final del fitxer empaquetat és prematur, manca %<PRIuMAX> octet"
 msgstr[1] ""
 "el final del fitxer empaquetat és prematur, manquen %<PRIuMAX> octets"
 
-#: builtin/index-pack.c:613
+#: builtin/index-pack.c:606
 msgid "serious inflate inconsistency"
 msgstr "hi ha una inconsistència seriosa d'inflació"
 
-#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788
-#: builtin/index-pack.c:827 builtin/index-pack.c:836
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
 
-#: builtin/index-pack.c:761 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
 #, c-format
 msgid "unable to read %s"
 msgstr "no s'ha pogut llegir %s"
 
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:818
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "no es pot llegir la informació d'objecte existent %s"
 
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:826
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "no es pot llegir l'objecte existent %s"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:840
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objecte de blob no vàlid %s"
 
-#: builtin/index-pack.c:850 builtin/index-pack.c:869
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
 msgid "fsck error in packed object"
 msgstr "fsck error en un objecte empaquetat"
 
-#: builtin/index-pack.c:871
+#: builtin/index-pack.c:864
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "No tots els objectes fills de %s són abastables"
 
-#: builtin/index-pack.c:932 builtin/index-pack.c:979
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
 msgstr "s'ha produït un error en aplicar la diferència"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Receiving objects"
 msgstr "S'estan rebent objectes"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Indexing objects"
 msgstr "S'estan indexant objectes"
 
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1190
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "el paquet és malmès (discordança SHA1)"
 
-#: builtin/index-pack.c:1201
+#: builtin/index-pack.c:1195
 msgid "cannot fstat packfile"
 msgstr "no es pot fer fstat en el fitxer de paquet"
 
-#: builtin/index-pack.c:1204
+#: builtin/index-pack.c:1198
 msgid "pack has junk at the end"
 msgstr "el paquet té brossa al seu final"
 
-#: builtin/index-pack.c:1216
+#: builtin/index-pack.c:1210
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
 
-#: builtin/index-pack.c:1239
+#: builtin/index-pack.c:1233
 msgid "Resolving deltas"
 msgstr "S'estan resolent les diferències"
 
-#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "no s'ha pogut crear fil: %s"
 
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1277
 msgid "confusion beyond insanity"
 msgstr "confusió més enllà de la bogeria"
 
-#: builtin/index-pack.c:1289
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "s'ha completat amb %d objecte local"
 msgstr[1] "s'ha completat amb %d objectes locals"
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)"
 
-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "El paquet té %d diferència no resolta"
 msgstr[1] "El paquet té %d diferències no resoltes"
 
-#: builtin/index-pack.c:1329
+#: builtin/index-pack.c:1323
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1419
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "l'objecte local %s és malmès"
 
-#: builtin/index-pack.c:1446
-#, fuzzy, c-format
+#: builtin/index-pack.c:1440
+#, 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:1470
+#: builtin/index-pack.c:1464
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "no es pot escriure «%s» al fitxer «%s»"
 
-#: builtin/index-pack.c:1478
-#, fuzzy, c-format
+#: builtin/index-pack.c:1472
+#, 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
+#, 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:1504
+#: builtin/index-pack.c:1514
 msgid "error while closing pack file"
 msgstr "error en tancar el fitxer empaquetat"
 
-#: builtin/index-pack.c:1518
-msgid "cannot store pack file"
-msgstr "no es pot emmagatzemar el fitxer empaquetat"
-
-#: builtin/index-pack.c:1526
-msgid "cannot store index file"
-msgstr "no es pot emmagatzemar el fitxer d'índex"
-
-#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "pack.indexversion=%<PRIu32> incorrecte"
 
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1643
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "No es pot obrir el fitxer empaquetat existent «%s»"
 
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1645
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "No es pot obrir el fitxer d'índex de paquets existent de «%s»"
 
-#: builtin/index-pack.c:1701
+#: builtin/index-pack.c:1693
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "sense diferències: %d objecte"
 msgstr[1] "sense diferències: %d objectes"
 
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1700
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "longitud de cadena = %d: %lu objecte"
 msgstr[1] "longitud de cadena = %d: %lu objectes"
 
-#: builtin/index-pack.c:1750
+#: builtin/index-pack.c:1742
 msgid "Cannot come back to cwd"
 msgstr "No es pot tornar al directori de treball actual"
 
-#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
-#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
 #, c-format
 msgid "bad %s"
 msgstr "%s incorrecte"
 
-#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "algorisme hash desconegut «%s»"
 
-#: builtin/index-pack.c:1852
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin no es pot usar sense --stdin"
-
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
-msgstr "--stdin requereix un dipòsit git"
-
-#: builtin/index-pack.c:1856
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format no es pot usar sense --stdin"
+msgstr "--stdin requereix un repositori git"
 
-#: builtin/index-pack.c:1871
+#: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "s'ha donat --verify sense nom de fitxer de paquet"
 
-#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "error fsck als objectes del paquet"
 
@@ -16943,100 +17084,95 @@ msgstr "plantilles no trobades a %s"
 msgid "not copying templates from '%s': %s"
 msgstr "no s'estan copiant plantilles de «%s»: %s"
 
-#: builtin/init-db.c:262
+#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "nom de branca inicial no vàlid: «%s»"
 
-#: builtin/init-db.c:353
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "no s'ha pogut gestionar el tipus de fitxer %d"
 
-#: builtin/init-db.c:356
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "no s'ha pogut moure %s a %s"
 
-#: builtin/init-db.c:372
-#, fuzzy
+#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
-msgstr "s'ha intentat reinicialitzar el dipòsit amb un hash diferent"
+msgstr "s'ha intentat reinicialitzar el repositori amb un hash diferent"
 
-#: builtin/init-db.c:396 builtin/init-db.c:399
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s ja existeix"
 
-#: builtin/init-db.c:431
-#, fuzzy, c-format
+#: builtin/init-db.c:432
+#, c-format
 msgid "re-init: ignored --initial-branch=%s"
-msgstr "reinicialització ignorada --initial-branch=%"
+msgstr "reinicialització: s'ha ignorat --initial-branch=%s"
 
-#: builtin/init-db.c:462
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
-msgstr "S'ha reinicialitzat el dipòsit compartit existent del Git en %s%s\n"
+msgstr "S'ha reinicialitzat el repositori compartit existent del Git en %s%s\n"
 
-#: builtin/init-db.c:463
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
-msgstr "S'ha reinicialitzat el dipòsit existent del Git en %s%s\n"
+msgstr "S'ha reinicialitzat el repositori existent del Git en %s%s\n"
 
-#: builtin/init-db.c:467
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
-msgstr "S'ha inicialitzat un dipòsit compartit buit del Git en %s%s\n"
+msgstr "S'ha inicialitzat un repositori compartit buit del Git en %s%s\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
-msgstr "S'ha inicialitzat un dipòsit buit del Git en %s%s\n"
+msgstr "S'ha inicialitzat un repositori buit del Git en %s%s\n"
 
-#: builtin/init-db.c:517
+#: builtin/init-db.c:518
 msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
-"shared[=<permissions>]] [<directory>]"
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] "
+"[--shared[=<permissions>]] [<directory>]"
 msgstr ""
-"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--"
-"shared[=<permisos>]] [<directori>]"
+"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] "
+"[--shared[=<permisos>]] [<directori>]"
 
-#: builtin/init-db.c:543
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "permisos"
 
-#: builtin/init-db.c:544
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
-msgstr "especifica que el dipòsit de git es compartirà entre diversos usuaris"
+msgstr ""
+"especifica que el repositori de git es compartirà entre diversos usuaris"
 
-#: builtin/init-db.c:550
-#, fuzzy
+#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
-msgstr "passa per alt el bit executable dels fitxers llistats"
+msgstr "sobreescriu el nom de la branca inicial"
 
-#: builtin/init-db.c:551 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "hash"
 
-#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "especifiqueu l'algorisme de resum a usar"
 
-#: builtin/init-db.c:559
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir i --bare són mútuament excloents"
-
-#: builtin/init-db.c:590 builtin/init-db.c:595
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "no es pot mkdir %s"
 
-#: builtin/init-db.c:599 builtin/init-db.c:654
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "no es pot canviar de directori a %s"
 
-#: builtin/init-db.c:626
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -17045,15 +17181,14 @@ msgstr ""
 "no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-"
 "dir=<directori>)"
 
-#: builtin/init-db.c:678
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "No es pot accedir a l'arbre de treball «%s»"
 
-#: builtin/init-db.c:683
-#, fuzzy
+#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
-msgstr "--separate-git-dir és incompatible amb --bisect"
+msgstr "--separate-git-dir és incompatible amb un repositori nu"
 
 #: builtin/interpret-trailers.c:16
 msgid ""
@@ -17073,7 +17208,7 @@ msgstr "escurça els remolcs buits"
 
 #: builtin/interpret-trailers.c:99
 msgid "where to place the new trailer"
-msgstr "on ubica"
+msgstr "on ubicar el «trailer» nou"
 
 #: builtin/interpret-trailers.c:101
 msgid "action if trailer already exists"
@@ -17133,9 +17268,8 @@ msgid "show source"
 msgstr "mostra la font"
 
 #: builtin/log.c:181
-#, fuzzy
 msgid "use mail map file"
-msgstr "Usa el fitxer de mapa de correu"
+msgstr "usa el fitxer de mapa de correu"
 
 #: builtin/log.c:184
 msgid "only decorate refs that match <pattern>"
@@ -17150,544 +17284,522 @@ 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:303
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortida final: %d %s\n"
 
-#: builtin/log.c:568
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: fitxer incorrecte"
 
-#: builtin/log.c:583 builtin/log.c:673
+#: 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:698
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "tipus desconegut: %d"
 
-#: builtin/log.c:843
+#: 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:850
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers sense valor"
 
-#: builtin/log.c:979
+#: 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:996
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "necessita exactament un interval"
 
-#: builtin/log.c:1006
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "no és un interval"
 
-#: builtin/log.c:1170
-#, 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:1176
-#, 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:1263
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to boig: %s"
 
-#: builtin/log.c:1290
+#: 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:1348
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "dos directoris de sortida?"
 
-#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#: 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:1510 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:1519
+#: 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:1529
-#, 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 --"
-"base=<base-commit-id> manualment"
+"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:1552
+#: 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:1569
+#: 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:1579
+#: 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:1637
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "no es pot obtenir l'id del pedaç"
 
-#: builtin/log.c:1700
-#, 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:1702
-#, 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:1746
+#: 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:1749
+#: 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:1753
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "imprimeix els pedaços a la sortida estàndard"
 
-#: builtin/log.c:1755
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "genera una carta de presentació"
 
-#: builtin/log.c:1757
+#: 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:1758
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "sufix"
 
-#: builtin/log.c:1759
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "usa <sufix> en lloc de «.patch»"
 
-#: builtin/log.c:1761
+#: 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:1762
+#: builtin/log.c:1780
 msgid "reroll-count"
-msgstr ""
+msgstr "reroll-count"
 
-#: builtin/log.c:1763
+#: 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:1765
-#, fuzzy
+#: builtin/log.c:1783
 msgid "max length of output filename"
-msgstr "mida màxima de cada fitxer empaquetat de sortida"
+msgstr "mida màxima del nom del fitxer de sortida"
 
-#: builtin/log.c:1767
-#, fuzzy
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
-msgstr "Usa [RFC PATCH] en lloc de [PATCH]"
+msgstr "useu [RFC PATCH] en comptes de [PATCH]"
 
-#: builtin/log.c:1770
-#, fuzzy
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
-msgstr "preferences-from-description-mode"
+msgstr "cover-from-description-mode"
 
-#: builtin/log.c:1771
-#, fuzzy
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr ""
-"genera parts d'una lletra de portada basant-se en la descripció d'una branca"
+"genera parts d'una carta de presentació basant-se en la descripció d'una "
+"branca"
 
-#: builtin/log.c:1773
-#, fuzzy
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
-msgstr "Usa [<prefix>] en lloc de [PATCH]"
+msgstr "useu [<prefix>] en comptes de [PATCH]"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "emmagatzema els fitxers resultants a <directori>"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "no despullis/afegeixis [PATCH]"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "no emetis diferències binàries"
 
-#: builtin/log.c:1784
+#: 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:1786
+#: 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:1788
+#: 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:1790
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "Missatgeria"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1809
 msgid "header"
 msgstr "capçalera"
 
-#: builtin/log.c:1792
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "afegeix una capçalera de correu electrònic"
 
-#: builtin/log.c:1793 builtin/log.c:1794
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "correu electrònic"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "afegeix la capçalera To:"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "afegeix la capçalera Cc:"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "identitat"
 
-#: builtin/log.c:1796
+#: 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:1798
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "ID de missatge"
 
-#: builtin/log.c:1799
+#: 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:1800 builtin/log.c:1803
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "límit"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "adjunta el pedaç"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "posa el pedaç en el cos"
 
-#: builtin/log.c:1808
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
 
-#: builtin/log.c:1810
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "signatura"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "afegeix una signatura"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "comissió base"
 
-#: builtin/log.c:1813
+#: 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:1816
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "afegeix una signatura des d'un fitxer"
 
-#: builtin/log.c:1817
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "no imprimeixis els noms de fitxer del pedaç"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "mostra el progrés durant la generació de pedaços"
 
-#: builtin/log.c:1821
-#, fuzzy
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
-"mostra els canvis contra <rev> a la lletra de la portada o a un sol pedaç"
+"mostra els canvis contra <rev> a la carta de presentació o a un sol pedaç"
 
-#: builtin/log.c:1824
-#, 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 pedaç"
+"mostra els canvis contra <refspec> a la carta de presentació o a un sol "
+"pedaç"
 
-#: builtin/log.c:1826 builtin/range-diff.c:28
-#, fuzzy
+#: 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:1913
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "línia d'identitat no vàlida: %s"
 
-#: builtin/log.c:1928
-msgid "-n and -k are mutually exclusive"
-msgstr "-n i -k són mútuament excloents"
-
-#: builtin/log.c:1930
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc i -k són mútuament excloents"
-
-#: builtin/log.c:1938
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only no té sentit"
 
-#: builtin/log.c:1940
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status no té sentit"
 
-#: builtin/log.c:1942
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check no té sentit"
 
-#: builtin/log.c:1964
-#, fuzzy
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "-b, -B i --detach són mútuament excloents"
-
-#: builtin/log.c:2087
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff requereix --cover-letter o un sol pedaç"
 
-#: builtin/log.c:2091
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2092
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff contra v%d:"
 
-#: builtin/log.c:2098
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor requereix --range-diff"
-
-#: builtin/log.c:2102
+#: 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:2110
-#, fuzzy
+#: builtin/log.c:2127
 msgid "Range-diff:"
-msgstr "Diferència-interval"
+msgstr "Diferència de l'interval:"
 
-#: builtin/log.c:2111
-#, 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:2122
+#: 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:2158
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "S'estan generant els pedaços"
 
-#: builtin/log.c:2202
-#, fuzzy
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "no s'han pogut crear els fitxers de sortida"
 
-#: builtin/log.c:2261
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
 
-#: builtin/log.c:2315
+#: builtin/log.c:2333
 #, c-format
 msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+"Could not find a tracked remote branch, please specify <upstream> "
+"manually.\n"
 msgstr ""
 "No s'ha pogut trobar una branca remota seguida. Especifiqueu <font> "
 "manualment.\n"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opcions>] [<fitxer>...]"
 
-#: builtin/ls-files.c:619
+#: 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:620
 msgid "identify the file status with tags"
 msgstr "identifica l'estat de fitxer amb etiquetes"
 
-#: builtin/ls-files.c:621
+#: 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:623
+#: 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:625
+#: 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:627
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "mostra en la sortida els fitxers suprimits"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "mostra en la sortida els fitxers modificats"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "mostra en la sortida els altres fitxers"
 
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "mostra en la sortida els fitxers ignorats"
 
-#: builtin/ls-files.c:636
+#: 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:638
+#: 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:640
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "mostra només els noms dels directoris «other»"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "mostra els terminadors de línia dels fitxers"
 
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "no mostris els directoris buits"
 
-#: builtin/ls-files.c:647
+#: 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:649
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "mostra la informació de resolució de desfet"
 
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "omet els fitxers coincidents amb el patró"
 
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "els patrons d'exclusió es llegeixen de <fitxer>"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "llegeix els patrons des de <file>"
 
-#: builtin/ls-files.c:657
+#: 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:659
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "afegeix les exclusions estàndards de git"
 
-#: builtin/ls-files.c:663
+#: 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:666
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "inclou recursivament als submòduls"
 
-#: builtin/ls-files.c:668
+#: 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:669
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "arbre"
 
-#: builtin/ls-files.c:670
+#: 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:672
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "mostra les dades de depuració"
 
-#: builtin/ls-files.c:674
-#, fuzzy
+#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
-msgstr "omet anomenar cadenes"
+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
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<repository> [<refs>...]]"
+"              [-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"
-"                     [<dipòsit> [<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"
 msgstr "no imprimeixis l'URL remot"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
 msgid "exec"
 msgstr "executable"
 
@@ -17758,58 +17870,54 @@ 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
 msgid "keep non patch brackets in subject"
-msgstr ""
+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
 msgid "re-code metadata to i18n.commitEncoding"
-msgstr ""
+msgstr "torna a codificar les metadades a i18n.commitEncoding"
 
 #: builtin/mailinfo.c:67
 msgid "disable charset re-coding of metadata"
-msgstr ""
+msgstr "inhabilita la recodificació del joc de caràcters de les metadades"
 
 #: builtin/mailinfo.c:69
 msgid "encoding"
-msgstr ""
+msgstr "codificació"
 
 #: builtin/mailinfo.c:70
 msgid "re-code metadata to this encoding"
-msgstr ""
+msgstr "recodifica les metadades en aquesta codificació"
 
 #: builtin/mailinfo.c:72
 msgid "use scissors"
-msgstr ""
+msgstr "usa les tisores"
 
 #: builtin/mailinfo.c:73
-#, fuzzy
 msgid "<action>"
-msgstr "acció"
+msgstr "<acció>"
 
 #: builtin/mailinfo.c:74
 msgid "action when quoted CR is found"
-msgstr ""
+msgstr "acció quan es troba un CR en una cita"
 
 #: builtin/mailinfo.c:77
 msgid "use headers in message's body"
-msgstr ""
+msgstr "utilitza les capçaleres en el cos del missatge"
 
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "mbox buit: «%s»"
@@ -17853,15 +17961,16 @@ msgstr "és la primera un avantpassat de l'altre?"
 #: builtin/merge-base.c:151
 msgid "find where <commit> forked from reflog of <ref>"
 msgstr ""
-"troba on <comissió> s'ha bifurcat del registre de referències de <referència>"
+"troba on <comissió> s'ha bifurcat del registre de referències de "
+"<referència>"
 
 #: builtin/merge-file.c:9
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
 msgstr ""
-"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1> "
-"<fitxer-original> <fitxer2>"
+"git merge-file [<opcions>] [-L <nom1> [-L <original> [-L <nom2>]]] <fitxer1>"
+" <fitxer-original> <fitxer2>"
 
 #: builtin/merge-file.c:35
 msgid "send results to standard output"
@@ -17872,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"
 
@@ -17926,209 +18039,202 @@ msgstr "no s'ha pogut resoldre la referència «%s»"
 msgid "Merging %s with %s\n"
 msgstr "S'està fusionant %s amb %s\n"
 
-#: builtin/merge.c:58
+#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opcions>] [<comissió>...]"
 
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "l'opció «m» requereix un valor"
 
-#: builtin/merge.c:146
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "l'opció «%s» requereix un valor"
 
-#: builtin/merge.c:199
+#: 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:200
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les estratègies disponibles són:"
 
-#: builtin/merge.c:205
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les estratègies personalitzades disponibles són:"
 
-#: builtin/merge.c:256 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:259 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:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(sinònim de --stat)"
 
-#: builtin/merge.c:262 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ó"
+"afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió"
+" de fusió"
 
-#: builtin/merge.c:265 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:267 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:269 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:271
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "permet l'avanç ràpid (per defecte)"
 
-#: builtin/merge.c:273 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:277 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:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: 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:279 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:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "opció=valor"
 
-#: builtin/merge.c:281 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:283
+#: 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:290
+#: 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:292
+#: 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:294
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "continua la fusió en curs actual"
 
-#: builtin/merge.c:296 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:303
-#, 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:320
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "no s'ha pogut executar «stash»."
 
-#: builtin/merge.c:325
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "l'«stash» ha fallat"
 
-#: builtin/merge.c:330
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "no és un objecte vàlid: %s"
 
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree ha fallat"
 
-#: builtin/merge.c:400
-#, fuzzy
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
-msgstr " (res a fer «squash»)"
+msgstr "Ja està actualitzat. (res a fer «squash»)"
 
-#: builtin/merge.c:414
+#: 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:464
+#: 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:602
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
 
-#: builtin/merge.c:728
+#: 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:741
+#: builtin/merge.c:745
 #, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Opció desconeguda de merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "opció d'estratègia desconeguda: -X%s"
 
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
+#: 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:812
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "No s'ha pogut llegir de «%s»"
 
-#: builtin/merge.c:821
+#: 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:827
-#, fuzzy
+#: 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 "
-"necessària especialment si fusiona una font actualitzada en una branca de "
-"tema."
+"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:832
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Un missatge buit interromp la comissió.\n"
 
-#: builtin/merge.c:835
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18137,74 +18243,74 @@ msgstr ""
 "Les línies que comencen amb «%c» seran ignorades i un missatge buit "
 "interromp la comissió.\n"
 
-#: builtin/merge.c:888
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "El missatge de comissió és buit."
 
-#: builtin/merge.c:903
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Meravellós.\n"
 
-#: builtin/merge.c:964
+#: 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:1003
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "No hi ha cap branca actual."
 
-#: builtin/merge.c:1005
+#: 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:1007
+#: 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:1012
+#: 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:1069
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valor incorrecte «%s» en l'entorn «%s»"
 
-#: builtin/merge.c:1172
+#: 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:1206
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "no és quelcom que puguem fusionar"
 
-#: builtin/merge.c:1316
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort no espera cap argument"
 
-#: builtin/merge.c:1320
+#: 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:1338
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit no espera cap argument"
 
-#: builtin/merge.c:1351
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue no espera cap argument"
 
-#: builtin/merge.c:1355
+#: 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:1371
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18212,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:1378
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18220,90 +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:1381
+#: 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:1395
-msgid "You cannot combine --squash with --no-ff."
-msgstr "No podeu combinar --squash amb --no-ff."
-
-#: builtin/merge.c:1397
-msgid "You cannot combine --squash with --commit."
-msgstr "No podeu combinar --squash amb --commit."
-
-#: builtin/merge.c:1413
+#: 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:1430
+#: 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:1432
+#: 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:1437
+#: 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:1439
+#: 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:1520
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "s'està refusant fusionar històries no relacionades"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "S'estan actualitzant %s..%s\n"
 
-#: builtin/merge.c:1585
+#: 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:1592
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "No.\n"
 
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr "No és possible avançar ràpidament, s'està avortant."
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: 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:1655
+#: 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:1707
+#: 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:1709
+#: 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:1718
+#: builtin/merge.c:1735
 #, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "S'està usant el %s per a preparar la resolució a mà.\n"
+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:1732
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -18312,43 +18406,42 @@ msgstr ""
 
 #: builtin/mktag.c:10
 msgid "git mktag"
-msgstr ""
+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
 #, c-format
 msgid "error: tag input does not pass fsck: %s"
-msgstr ""
+msgstr "error: l'entrada d'etiqueta no passa fsck: %s"
 
 #: builtin/mktag.c:41
 #, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr ""
+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:97
+#: builtin/mktag.c:98
 msgid "tag on stdin did not pass our strict fsck check"
-msgstr ""
+msgstr "l'etiqueta a stdin no ha passat la comprovació estricta del fsck"
 
-#: builtin/mktag.c:100
-#, fuzzy
+#: builtin/mktag.c:101
 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:103 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"
 
@@ -18369,57 +18462,61 @@ 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>]"
+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:13
-#, fuzzy
+#: builtin/multi-pack-index.c:14
 msgid "git multi-pack-index [<options>] verify"
-msgstr "git upload-pack [<opcions>] <directori>"
+msgstr "git multi-pack-index [<opcions>] verify"
 
-#: builtin/multi-pack-index.c:16
-#, fuzzy
+#: builtin/multi-pack-index.c:17
 msgid "git multi-pack-index [<options>] expire"
-msgstr "git upload-pack [<opcions>] <directori>"
+msgstr "git multi-pack-index [<opcions>] expire"
 
-#: builtin/multi-pack-index.c:19
-#, fuzzy
+#: builtin/multi-pack-index.c:20
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
-msgstr ""
-"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
-"size=<size>)"
+msgstr "git multi-pack-index [<opcions>] repack [--batch-size=<mida>]"
 
-#: builtin/multi-pack-index.c:54
-#, fuzzy
+#: builtin/multi-pack-index.c:57
 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:69
+#: builtin/multi-pack-index.c:98
 msgid "preferred-pack"
-msgstr ""
+msgstr "paquet preferit"
 
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr ""
+"empaqueta per a reutilitzar quan es calcula un mapa de bits multipaquet"
+
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "escriu un map de bits multipaquet"
 
-#: builtin/multi-pack-index.c:128
-#, fuzzy
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr ""
+"escriu un índex multipaquet que contingui només els índexs donats"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "instantània de referències per a seleccionar les comissions de mapa de bits"
+
+#: 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/multi-pack-index.c:180
-#, fuzzy, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "subcomandes no reconeguts"
-
 #: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<opcions>] <origen>... <destí>"
@@ -18448,118 +18545,118 @@ msgstr "força el moviment / canvi de nom encara que el destí existeixi"
 msgid "skip move/rename errors"
 msgstr "omet els errors de moviment / canvi de nom"
 
-#: builtin/mv.c:170
+#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "el destí «%s» no és un directori"
 
-#: builtin/mv.c:181
+#: builtin/mv.c:184
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:190
 msgid "bad source"
 msgstr "origen incorrecte"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "no es pot moure un directori a dins d'ell mateix"
 
-#: builtin/mv.c:191
+#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "no es pot moure un directori sobre un fitxer"
 
-#: builtin/mv.c:200
+#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "el directori d'origen està buit"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "no està sota control de versions"
 
-#: builtin/mv.c:227
+#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "en conflicte"
 
-#: builtin/mv.c:230
+#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "el destí existeix"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "s'està sobreescrivint «%s»"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "No es pot sobreescriure"
 
-#: builtin/mv.c:244
+#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "múltiples orígens per al mateix destí"
 
-#: builtin/mv.c:246
+#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "el directori destí no existeix"
 
-#: builtin/mv.c:253
+#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, origen=%s, destí=%s"
 
-#: builtin/mv.c:274
+#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "S'està canviant el nom de %s a %s\n"
 
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: 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)"
 
@@ -18569,8 +18666,8 @@ msgstr "git notes [--ref <referència-de-notes>] [llista [<objecte>]]"
 
 #: builtin/notes.c:29
 msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file>"
+" | (-c | -C) <object>] [<object>]"
 msgstr ""
 "git notes [--ref <referència-de-notes>] add [-f] [--allow-empty] [-m "
 "<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]"
@@ -18582,8 +18679,8 @@ msgstr ""
 
 #: builtin/notes.c:31
 msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> |"
+" (-c | -C) <object>] [<object>]"
 msgstr ""
 "git notes [--ref <referència-de-notes>] append [--allow-empty] [-m "
 "<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]"
@@ -18680,111 +18777,110 @@ 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:197
+#: 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:206
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "no s'ha pogut escriure l'objecte de nota"
 
-#: builtin/notes.c:208
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "s'han deixat els continguts de la nota en %s"
 
-#: builtin/notes.c:242 builtin/tag.c:576
+#: 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»"
 
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
 #, 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:265
+#: builtin/notes.c:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "s'ha produït un error en llegir l'objecte «%s»."
 
-#: builtin/notes.c:268
+#: builtin/notes.c:266
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "no es poden llegir les dades de node de l'objecte no de blob «%s»."
 
-#: builtin/notes.c:309
+#: builtin/notes.c:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "línia d'entrada mal formada: «%s»."
 
-#: builtin/notes.c:324
+#: builtin/notes.c:322
 #, 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»"
 
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
-#.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "s'està refusant %s les notes en %s (fora de refs/notes/)"
 
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: 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: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"
 
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
 #, c-format
 msgid "no note found for object %s."
 msgstr "no s'ha trobat cap nota per a l'objecte %s."
 
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "anota els continguts com a cadena"
 
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "anota els continguts en un fitxer"
 
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
 msgid "reuse and edit specified note object"
 msgstr "reusa i edita l'objecte de nota especificat"
 
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "reusa l'objecte de nota especificat"
 
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "permet l'emmagatzematge d'una nota buida"
 
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "reemplaça les notes existents"
 
-#: builtin/notes.c:448
+#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18793,45 +18889,44 @@ msgstr ""
 "No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. "
 "Useu «-f» per a sobreescriure les notes existents"
 
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "S'estan sobreescrivint les notes existents de l'objecte %s\n"
 
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: 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"
 
-#: builtin/notes.c:497
+#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "llegeix els objectes des de stdin"
 
-#: builtin/notes.c:499
+#: builtin/notes.c:497
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 "carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
 
-#: builtin/notes.c:517
-#, fuzzy
+#: builtin/notes.c:515
 msgid "too few arguments"
-msgstr "hi ha massa arguments"
+msgstr "massa pocs arguments"
 
-#: builtin/notes.c:538
+#: builtin/notes.c:536
 #, c-format
 msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite"
+" existing notes"
 msgstr ""
 "No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. "
 "Useu «-f» per a sobreescriure les notes existents"
 
-#: builtin/notes.c:550
+#: builtin/notes.c:548
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "manquen notes a l'objecte font %s. No es pot copiar."
 
-#: builtin/notes.c:603
+#: builtin/notes.c:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18840,600 +18935,587 @@ msgstr ""
 "Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre «edit».\n"
 "Useu «git notes add -f -m/-F/-c/-C» en lloc d'això.\n"
 
-#: builtin/notes.c:698
+#: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:700
+#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_REF"
 
-#: builtin/notes.c:702
+#: builtin/notes.c:700
 msgid "failed to remove 'git notes merge' worktree"
 msgstr ""
 "s'ha produït un error en eliminar l'arbre de treball de «git notes merge»"
 
-#: builtin/notes.c:722
+#: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "s'ha produït un error en llegir la referència NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:724
+#: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:726
+#: builtin/notes.c:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:739
+#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF"
 
-#: builtin/notes.c:742
+#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "s'ha produït un error en finalitzar la fusió de notes"
 
-#: builtin/notes.c:768
+#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "estratègia de fusió de notes desconeguda %s"
 
-#: builtin/notes.c:784
+#: builtin/notes.c:782
 msgid "General options"
 msgstr "Opcions generals"
 
-#: builtin/notes.c:786
+#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Opcions de fusió"
 
-#: builtin/notes.c:788
+#: builtin/notes.c:786
 msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+"resolve notes conflicts using the given strategy "
+"(manual/ours/theirs/union/cat_sort_uniq)"
 msgstr ""
-"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/"
-"union/cat_sort_uniq)"
+"resol els conflictes de nota usant l'estratègia donada "
+"(manual/ours/theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:790
+#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "S'estan cometent les notes sense fusionar"
 
-#: builtin/notes.c:792
+#: builtin/notes.c:790
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "finalitza la fusió de notes cometent les notes sense fusionar"
 
-#: builtin/notes.c:794
+#: builtin/notes.c:792
 msgid "Aborting notes merge resolution"
 msgstr "S'està avortant la resolució de fusió de notes"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "avorta la fusió de notes"
 
-#: builtin/notes.c:807
+#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "no es pot combinar --commit, --abort i -s/--strategy"
 
-#: builtin/notes.c:812
+#: builtin/notes.c:810
 msgid "must specify a notes ref to merge"
 msgstr "cal especificar una referència de notes a fusionar"
 
-#: builtin/notes.c:836
+#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "-s/--strategy desconeguda: %s"
 
-#: builtin/notes.c:873
+#: 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:876
+#: 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:878
+#: builtin/notes.c:880
 #, c-format
 msgid ""
-"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
-"'git notes merge --commit', or abort the merge with 'git notes merge --"
-"abort'.\n"
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with"
+" 'git notes merge --commit', or abort the merge with 'git notes merge "
+"--abort'.\n"
 msgstr ""
 "La fusió de notes automàtica ha fallat. Arregleu els conflictes en %s i "
 "cometeu el resultat amb «git notes merge --commit», o avorteu la fusió amb "
 "«git notes merge --abort».\n"
 
-#: builtin/notes.c:897 builtin/tag.c:589
+#: 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:900
+#: 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:912
+#: 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:915
+#: 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:954 builtin/prune.c:132 builtin/worktree.c:148
+#: 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:955
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "informa de notes podades"
 
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "referència de notes"
 
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "usa les notes de <referència-de-notes>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1739
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subordre desconeguda: %s"
 
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < "
 "<llista-de-objectes>]"
 
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < "
 "<llista-de-objectes>]"
 
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
 "pack %s"
 msgstr ""
+"write_reuse_object: no s'ha pogut localitzar %s, s'esperava a la posició "
+"%<PRIuMAX> al paquet %s"
 
-#: builtin/pack-objects.c:448
-#, fuzzy, c-format
+#: builtin/pack-objects.c:580
+#, 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:459
-#, fuzzy, c-format
+#: builtin/pack-objects.c:591
+#, c-format
 msgid "corrupt packed object for %s"
-msgstr "objecte empaquetat corrupte durant els percentatges"
+msgstr "objecte empaquetat corrupte per a %s"
 
-#: builtin/pack-objects.c:590
-#, fuzzy, c-format
+#: builtin/pack-objects.c:722
+#, c-format
 msgid "recursive delta detected for object %s"
-msgstr "delta recursiu detectat per a objectes percentuals"
+msgstr "diferència recursiva detectada per a l'objecte  %s"
 
-#: builtin/pack-objects.c:801
-#, fuzzy, c-format
+#: builtin/pack-objects.c:941
+#, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
-msgstr "s'esperava un objecte d'un 1% <PRIu32>"
+msgstr "ordenats %u objectes, s'esperaven %<PRIu32>"
 
-#: builtin/pack-objects.c:896
-#, fuzzy, c-format
+#: builtin/pack-objects.c:1036
+#, 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:1015
+#: builtin/pack-objects.c:1160
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
-"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets "
-"a causa de pack.packSizeLimit"
+"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets"
+" a causa de pack.packSizeLimit"
 
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
 msgid "Writing objects"
 msgstr "S'estan escrivint els objectes"
 
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "s'ha produït un error en fer stat a %s"
 
-#: builtin/pack-objects.c:1141
-#, fuzzy, c-format
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "s'ha produït un error en escriure l'índex de mapa de bits"
+
+#: builtin/pack-objects.c:1294
+#, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
-msgstr "va escriure%<PRIu32> objectes mentre s'esperava un percentatge<PRIu32>"
+msgstr "escrits %<PRIu32> objectes mentre s'esperaven %<PRIu32>"
 
-#: builtin/pack-objects.c:1383
+#: builtin/pack-objects.c:1536
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
-"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no "
-"s'empaqueten"
+"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no"
+" s'empaqueten"
 
-#: builtin/pack-objects.c:1831
-#, fuzzy, c-format
+#: builtin/pack-objects.c:1984
+#, 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:1840
-#, fuzzy, c-format
+#: builtin/pack-objects.c:1993
+#, 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:2121
+#: builtin/pack-objects.c:2274
 msgid "Counting objects"
 msgstr "S'estan comptant els objectes"
 
-#: builtin/pack-objects.c:2266
-#, fuzzy, c-format
+#: builtin/pack-objects.c:2439
+#, 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:2336 builtin/pack-objects.c:2352
-#: builtin/pack-objects.c:2362
-#, fuzzy, c-format
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
+#, 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:2339 builtin/pack-objects.c:2366
-#, fuzzy, c-format
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
+#, 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:2376
-#, fuzzy
+#: builtin/pack-objects.c:2549
 msgid "suboptimal pack - out of memory"
 msgstr "paquet subòptim - sense memòria"
 
-#: builtin/pack-objects.c:2691
-#, fuzzy, c-format
+#: builtin/pack-objects.c:2864
+#, c-format
 msgid "Delta compression using up to %d threads"
-msgstr "Compressió delta usant fils de fins a un 1%"
+msgstr "Compressió de diferències usant fins a %d fils"
 
-#: builtin/pack-objects.c:2830
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3003
+#, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr ""
-"no s'han pogut empaquetar els objectes abastables des de les etiquetes per "
-"cent"
+"no s'han pogut empaquetar els objectes abastables des de l'etiqueta %s"
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:3089
 msgid "Compressing objects"
 msgstr "S'estan comprimint els objectes"
 
-#: builtin/pack-objects.c:2922
-#, fuzzy
+#: builtin/pack-objects.c:3095
 msgid "inconsistency with delta count"
 msgstr "inconsistència amb el comptador de diferències"
 
-#: builtin/pack-objects.c:3001
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3174
+#, c-format
 msgid ""
-"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
-"hash> <uri>' (got '%s')"
+"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:3004
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3177
+#, 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:3039
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3212
+#, 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:3161 builtin/pack-objects.c:3175
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
+#, 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:3218
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3408
+#, 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:3224
+#: builtin/pack-objects.c:3414
 #, c-format
 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:3322
+#: builtin/pack-objects.c:3507
 msgid "invalid value for --missing"
 msgstr "valor no vàlid per a --missing"
 
-#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
-#, fuzzy
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
 msgid "cannot open pack index"
 msgstr "no s'ha pogut obrir l'índex del paquet"
 
-#: builtin/pack-objects.c:3412
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3541
+#, 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:3498
-#, fuzzy
+#: builtin/pack-objects.c:3627
 msgid "unable to force loose object"
 msgstr "no s'ha pogut forçar l'objecte solt"
 
-#: builtin/pack-objects.c:3628
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3757
+#, c-format
 msgid "not a rev '%s'"
-msgstr "no és una revisió \"%s\""
+msgstr "«%s» no és una revisió"
 
-#: builtin/pack-objects.c:3631
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "revisió incorrecte «%s»"
 
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3788
 msgid "unable to add recent objects"
 msgstr "no s'han pogut afegir els objectes recents"
 
-#: builtin/pack-objects.c:3712
+#: builtin/pack-objects.c:3841
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versió d'índex no compatible %s"
 
-#: builtin/pack-objects.c:3716
+#: builtin/pack-objects.c:3845
 #, c-format
 msgid "bad index version '%s'"
 msgstr "versió d'índex incorrecta «%s»"
 
-#: builtin/pack-objects.c:3755
+#: builtin/pack-objects.c:3884
 msgid "<version>[,<offset>]"
 msgstr "<versió>[,<desplaçament>]"
 
-#: builtin/pack-objects.c:3756
+#: builtin/pack-objects.c:3885
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "escriu el fitxer d'índex de paquet en la versió de format d'índex "
 "especificada"
 
-#: builtin/pack-objects.c:3759
+#: builtin/pack-objects.c:3888
 msgid "maximum size of each output pack file"
 msgstr "mida màxima de cada fitxer empaquetat de sortida"
 
-#: builtin/pack-objects.c:3761
+#: builtin/pack-objects.c:3890
 msgid "ignore borrowed objects from alternate object store"
-msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
+msgstr ""
+"ignora els objectes manllevats d'un emmagatzematge d'objectes alternatiu"
 
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c:3892
 msgid "ignore packed objects"
 msgstr "ignora els objectes empaquetats"
 
-#: builtin/pack-objects.c:3765
+#: builtin/pack-objects.c:3894
 msgid "limit pack window by objects"
 msgstr "limita la finestra d'empaquetament per objectes"
 
-#: builtin/pack-objects.c:3767
+#: builtin/pack-objects.c:3896
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "limita la finestra d'empaquetament per memòria a més del límit d'objectes"
 
-#: builtin/pack-objects.c:3769
+#: builtin/pack-objects.c:3898
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "longitud màxima de la cadena de diferències permesa en el paquet resultant"
 
-#: builtin/pack-objects.c:3771
+#: builtin/pack-objects.c:3900
 msgid "reuse existing deltas"
 msgstr "reusa les diferències existents"
 
-#: builtin/pack-objects.c:3773
+#: builtin/pack-objects.c:3902
 msgid "reuse existing objects"
 msgstr "reusa els objectes existents"
 
-#: builtin/pack-objects.c:3775
+#: builtin/pack-objects.c:3904
 msgid "use OFS_DELTA objects"
 msgstr "usa objectes OFS_DELTA"
 
-#: builtin/pack-objects.c:3777
+#: builtin/pack-objects.c:3906
 msgid "use threads when searching for best delta matches"
 msgstr "usa fils en cercar les millores coincidències de diferències"
 
-#: builtin/pack-objects.c:3779
+#: builtin/pack-objects.c:3908
 msgid "do not create an empty pack output"
 msgstr "no creïs una emissió de paquet buida"
 
-#: builtin/pack-objects.c:3781
+#: builtin/pack-objects.c:3910
 msgid "read revision arguments from standard input"
 msgstr "llegeix els arguments de revisió des de l'entrada estàndard"
 
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:3912
 msgid "limit the objects to those that are not yet packed"
 msgstr "limita els objectes als quals encara no s'hagin empaquetat"
 
-#: builtin/pack-objects.c:3786
+#: builtin/pack-objects.c:3915
 msgid "include objects reachable from any reference"
 msgstr "inclou els objectes abastables de qualsevol referència"
 
-#: builtin/pack-objects.c:3789
+#: builtin/pack-objects.c:3918
 msgid "include objects referred by reflog entries"
 msgstr ""
 "inclou els objectes als quals facin referència les entrades del registre de "
 "referències"
 
-#: builtin/pack-objects.c:3792
+#: builtin/pack-objects.c:3921
 msgid "include objects referred to by the index"
 msgstr "inclou els objectes als quals faci referència l'índex"
 
-#: builtin/pack-objects.c:3795
-#, fuzzy
+#: builtin/pack-objects.c:3924
 msgid "read packs from stdin"
-msgstr "llegeix les actualitzacions des de stdin"
+msgstr "llegeix els paquets des de stdin"
 
-#: builtin/pack-objects.c:3797
+#: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
 msgstr "emet el paquet a stdout"
 
-#: builtin/pack-objects.c:3799
+#: builtin/pack-objects.c:3928
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
-"inclou els objectes d'etiqueta que facin referència als objectes a empaquetar"
+"inclou els objectes d'etiqueta que facin referència als objectes a "
+"empaquetar"
 
-#: builtin/pack-objects.c:3801
+#: builtin/pack-objects.c:3930
 msgid "keep unreachable objects"
 msgstr "retén els objectes inabastables"
 
-#: builtin/pack-objects.c:3803
+#: builtin/pack-objects.c:3932
 msgid "pack loose unreachable objects"
 msgstr "empaqueta els objectes inabastables solts"
 
-#: builtin/pack-objects.c:3805
+#: 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:3808
-#, fuzzy
+#: builtin/pack-objects.c:3937
 msgid "use the sparse reachability algorithm"
 msgstr "utilitza l'algorisme d'accessibilitat dispers"
 
-#: builtin/pack-objects.c:3810
+#: builtin/pack-objects.c:3939
 msgid "create thin packs"
 msgstr "crea paquets prims"
 
-#: builtin/pack-objects.c:3812
+#: builtin/pack-objects.c:3941
 msgid "create packs suitable for shallow fetches"
 msgstr "crea paquets adequats per a les obtencions superficials"
 
-#: builtin/pack-objects.c:3814
+#: builtin/pack-objects.c:3943
 msgid "ignore packs that have companion .keep file"
 msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
 
-#: builtin/pack-objects.c:3816
-#, fuzzy
+#: builtin/pack-objects.c:3945
 msgid "ignore this pack"
 msgstr "ignora aquest paquet"
 
-#: builtin/pack-objects.c:3818
+#: builtin/pack-objects.c:3947
 msgid "pack compression level"
 msgstr "nivell de compressió de paquet"
 
-#: builtin/pack-objects.c:3820
+#: builtin/pack-objects.c:3949
 msgid "do not hide commits by grafts"
 msgstr "no amaguis les comissions per empelt"
 
-#: builtin/pack-objects.c:3822
+#: builtin/pack-objects.c:3951
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "usa un índex de mapa de bits, si està disponible, per a accelerar el "
 "recompte d'objectes"
 
-#: builtin/pack-objects.c:3824
+#: builtin/pack-objects.c:3953
 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:3828
-#, fuzzy
+#: builtin/pack-objects.c:3957
 msgid "write a bitmap index if possible"
 msgstr "escriu un índex de mapa de bits si és possible"
 
-#: builtin/pack-objects.c:3832
+#: builtin/pack-objects.c:3961
 msgid "handling for missing objects"
 msgstr "gestió dels objectes absents"
 
-#: builtin/pack-objects.c:3835
-#, fuzzy
+#: builtin/pack-objects.c:3964
 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:3837
-#, fuzzy
+#: builtin/pack-objects.c:3966
 msgid "respect islands during delta compression"
 msgstr "respecta les illes durant la compressió delta"
 
-#: builtin/pack-objects.c:3839
-#, fuzzy
+#: builtin/pack-objects.c:3968
 msgid "protocol"
 msgstr "protocol"
 
-#: builtin/pack-objects.c:3840
-#, fuzzy
+#: builtin/pack-objects.c:3969
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
-msgstr "exclou qualsevol uppack.blobpackfileuri configurat amb aquest protocol"
+msgstr ""
+"exclou qualsevol uploadpack.blobpackfileuri configurat amb aquest protocol"
 
-#: builtin/pack-objects.c:3873
-#, fuzzy, c-format
+#: builtin/pack-objects.c:4002
+#, 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:3878
-#, fuzzy, c-format
+#: builtin/pack-objects.c:4007
+#, 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:3934
-#, fuzzy
+#: builtin/pack-objects.c:4063
 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:3936
-#, fuzzy
+#: builtin/pack-objects.c:4065
 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:3941
-#, fuzzy
+#: builtin/pack-objects.c:4070
 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:3944
-#, 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:3950
-#, fuzzy
+#: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "no es pot utilitzar --filter sense --stdout"
 
-#: builtin/pack-objects.c:3952
-#, fuzzy
+#: builtin/pack-objects.c:4081
 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:3956
-#, fuzzy
+#: builtin/pack-objects.c:4085
 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:4015
+#: builtin/pack-objects.c:4144
 msgid "Enumerating objects"
 msgstr "S'estan enumerant els objectes"
 
-#: builtin/pack-objects.c:4052
-#, fuzzy, c-format
+#: builtin/pack-objects.c:4180
+#, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
 "reused %<PRIu32>"
 msgstr ""
-"Total%<PRIu32> (delta %<PRIu32>) reutilitzat%<PRIu32> (delta %<PRIu32>) pack-"
-"reutilitzat%<PRIu32>"
+"Total %<PRIu32> (%<PRIu32> diferències), reusats %<PRIu32> (%<PRIu32> "
+"diferències), paquets reusats %<PRIu32>"
 
 #: builtin/pack-redundant.c:601
 msgid ""
@@ -19443,6 +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» 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>]"
@@ -19462,24 +19549,23 @@ 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:152
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
-msgstr "no es pot podar en un dipòsit d'objectes preciosos"
+msgstr "no es pot podar en un repositori d'objectes preciosos"
 
 #: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
@@ -19488,47 +19574,51 @@ msgstr "Valor no vàlid per a %s: %s"
 
 #: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr "git pull [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
+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/rebase.c:491 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:340
-#, fuzzy
+#: 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 "«stash»/«stash» automàticament abans i després"
+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."
@@ -19536,13 +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."
+"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."
@@ -19550,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"
@@ -19561,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:1248
+#: 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/rebase.c:1254
+#: 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:1246
+#: 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 "
-"amb:"
+"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"
@@ -19606,58 +19698,57 @@ 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:930
+#: builtin/pull.c:969
 msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"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"
-"You can replace \"git config\" with \"git config --global\" to set a "
-"default\n"
+"You can replace \"git config\" with \"git config --global\" to set a default\n"
 "preference for all repositories. You can also pass --rebase, --no-rebase,\n"
 "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 dipòsits. Podeu també usar --rebase,\n"
-"--no-rebase o --ff-only en la línia d'ordres per sobreescriure el valor\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 a sobreescriure el valor\n"
 "per defecte configuració en aquesta execució.\n"
 
-#: builtin/pull.c:991
+#: 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:995
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "baixar fent «rebase»"
 
-#: builtin/pull.c:996
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "cometeu-los o emmagatzemeu-los."
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19668,7 +19759,7 @@ msgstr ""
 "s'està avançant ràpidament el vostre arbre de treball des de\n"
 "la comissió %s."
 
-#: builtin/pull.c:1027
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19679,22 +19770,29 @@ msgid ""
 "to recover."
 msgstr ""
 "No es pot avançar ràpidament el vostre arbre de treball.\n"
-"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida "
-"de\n"
+"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida de\n"
 "$ git diff %s\n"
 "executeu\n"
 "$ git reset --hard\n"
 "per a recuperar."
 
-#: builtin/pull.c:1042
+#: 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:1046
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "No es pot fer «rebase» sobre múltiples branques."
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1104
+msgid "Cannot fast-forward to multiple branches."
+msgstr "No es pot fer un avançament ràpid a branques múltiples."
+
+#: builtin/pull.c:1119
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Cal especificar com reconciliar les branques divergents."
+
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "no es pot fer «rebase» amb modificacions als submòduls enregistrades "
@@ -19702,7 +19800,8 @@ msgstr ""
 
 #: builtin/push.c:19
 msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
+msgstr ""
+"git push [<opcions>] [<repositori> [<especificació-de-referència>...]]"
 
 #: builtin/push.c:111
 msgid "tag shorthand without <tag>"
@@ -19718,8 +19817,7 @@ msgid ""
 "To choose either option permanently, see push.default in 'git help config'."
 msgstr ""
 "\n"
-"Per a triar qualsevol opció permanentment, vegeu push.default a «git help "
-"config»."
+"Per a triar qualsevol opció permanentment, vegeu push.default a «git help config»."
 
 #: builtin/push.c:167
 #, c-format
@@ -19761,7 +19859,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nom-de-branca-remota>\n"
 
-#: builtin/push.c:194
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -19774,13 +19872,20 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:202
+#: builtin/push.c:199
 #, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgid ""
+"The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "La branca actual %s té múltiples branques fonts, s'està refusant pujar."
 
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"No heu especificat cap especificació de referència a pujar, i push.default "
+"és «nothing»."
+
+#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -19791,14 +19896,7 @@ msgstr ""
 "branca actual «%s», sense dir-me què pujar per a actualitzar\n"
 "quina branca remota."
 
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"No heu especificat cap especificació de referència a pujar, i push.default "
-"és «nothing»."
-
-#: builtin/push.c:267
+#: builtin/push.c:258
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19808,10 +19906,9 @@ 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ó."
+"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més informació."
 
-#: builtin/push.c:273
+#: builtin/push.c:264
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -19822,10 +19919,9 @@ msgstr ""
 "està darrere de la seva branca remota corresponent. Agafeu aquesta\n"
 "branca i integreu els canvis remots (per exemple, «git pull ...»)\n"
 "abans de pujar de nou.\n"
-"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més "
-"informació."
+"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més informació."
 
-#: builtin/push.c:279
+#: builtin/push.c:270
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -19834,19 +19930,19 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 "S'han rebutjat les actualitzacions perquè el remot conté canvis\n"
-"que no teniu localment. Això acostuma a ser causat per un altre dipòsit\n"
+"que no teniu localment. Això acostuma a ser causat per un altre repositori\n"
 "que ha pujat a la mateixa referència. Pot ser que primer vulgueu\n"
 "integrar els canvis remots (per exemple, «git pull ...») abans de\n"
 "pujar de nou.\n"
-"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més "
-"informació."
+"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més informació."
 
-#: builtin/push.c:286
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
-"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot."
+"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el "
+"remot."
 
-#: builtin/push.c:289
+#: builtin/push.c:280
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -19854,125 +19950,117 @@ 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:294
-#, fuzzy
+#: builtin/push.c:285
 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:364
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "S'està pujant a %s\n"
 
-#: builtin/push.c:371
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "s'ha produït un error en pujar algunes referències a «%s»"
 
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
-msgstr "dipòsit"
+msgstr "repositori"
 
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
 msgstr "puja totes les referències"
 
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr "reflecteix totes les referències"
 
-#: builtin/push.c:557
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "suprimeix les referències"
 
-#: builtin/push.c:558
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)"
 
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "força les actualitzacions"
 
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "<nom-de-referència>:<esperat>"
 
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
 msgid "require old value of ref to be at this value"
 msgstr "requereix que el valor antic de la referència sigui d'aquest valor"
 
-#: builtin/push.c:566 builtin/send-pack.c:208
-#, fuzzy
+#: builtin/push.c:557 builtin/send-pack.c:212
 msgid "require remote updates to be integrated locally"
 msgstr "requereix que les actualitzacions remotes s'integrin localment"
 
-#: builtin/push.c:569
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "controla la pujada recursiva dels submòduls"
 
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
 msgid "use thin pack"
 msgstr "usa el paquet prim"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "programa que rep els paquets"
 
-#: builtin/push.c:573
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "estableix la font per a git pull/status"
 
-#: builtin/push.c:576
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "poda les referències eliminades localment"
 
-#: builtin/push.c:578
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "evita el lligam de prepujada"
 
-#: builtin/push.c:579
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "puja les etiquetes absents però rellevants"
 
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
 msgstr "signa la pujada amb GPG"
 
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
 msgid "request atomic transaction on remote side"
 msgstr "demana una transacció atòmica al costat remot"
 
-#: builtin/push.c:601
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete és incompatible amb --all, --mirror i --tags"
-
-#: builtin/push.c:603
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete no té sentit sense referències"
 
-#: builtin/push.c:623
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
-msgstr "dipòsit incorrecte «%s»"
+msgstr "repositori incorrecte «%s»"
 
-#: builtin/push.c:624
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
+"Either specify the URL from the command-line or configure a remote repository using\n"
 "\n"
 "    git remote add <name> <url>\n"
 "\n"
@@ -19981,8 +20069,7 @@ msgid ""
 "    git push <name>\n"
 msgstr ""
 "No hi ha cap destí de pujada configurat.\n"
-"Especifiqueu l'URL des de la línia d'ordres o bé configureu un dipòsit remot "
-"fent servir\n"
+"Especifiqueu l'URL des de la línia d'ordres o bé configureu un repositori remot fent servir\n"
 "\n"
 "    git remote add <nom> <url>\n"
 "\n"
@@ -19990,44 +20077,28 @@ msgstr ""
 "\n"
 "    git push <nom>\n"
 
-#: builtin/push.c:639
-msgid "--all and --tags are incompatible"
-msgstr "--all i --tags són incompatibles"
-
-#: builtin/push.c:641
+#: 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:645
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror i --tags són incompatibles"
-
-#: builtin/push.c:647
+#: 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:650
-msgid "--all and --mirror are incompatible"
-msgstr "--all i --mirror són incompatibles"
-
-#: builtin/push.c:657
+#: 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"
 
 #: builtin/range-diff.c:9
-#, fuzzy
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr ""
-"git range-diff [<opcions>] <old-base>..<old-tip> <new-base>.<new-tip>..<new-"
-"tip>."
+"git range-diff [<opcions>] <old-base>..<old-tip> <new-base>..<new-tip>"
 
 #: builtin/range-diff.c:10
-#, fuzzy
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
-msgstr "git range-diff [<opcions>] <old-tip><new-tip>"
+msgstr "git range-diff [<opcions>] <old-tip>...<new-tip>"
 
 #: builtin/range-diff.c:11
-#, fuzzy
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<opcions>] <base> <old-tip> <new-tip>"
 
@@ -20036,29 +20107,25 @@ msgid "use simple diff colors"
 msgstr "utilitza colors simples de diff"
 
 #: builtin/range-diff.c:32
-#, fuzzy
 msgid "notes"
 msgstr "notes"
 
 #: builtin/range-diff.c:32
-#, fuzzy
 msgid "passed to 'git log'"
-msgstr "passa a '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"
@@ -20070,334 +20137,157 @@ msgstr "calen dos rangs de comissió"
 
 #: builtin/read-tree.c:41
 msgid ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)"
+" [-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)"
+" [-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
 
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "escriu l'índex resultant al <fitxer>"
 
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "només buida l'índex"
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "S'està fusionant"
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
 msgid "perform a merge in addition to a read"
 msgstr "realitza una fusió a més d'una lectura"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
 msgid "3-way merge if no file level merging required"
 msgstr "fusió de 3 vies si no cal fusió a nivell de fitxers"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
 msgid "3-way merge in presence of adds and removes"
 msgstr "fusió de 3 vies en presència d'afegiments i eliminacions"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "el mateix que -m, però descarta les entrades no fusionades"
 
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<subdirectori>/"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "llegiu l'arbre a l'índex sota <subdirectori>/"
 
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
 msgid "update working tree with merge result"
 msgstr "actualitza l'arbre de treball amb el resultat de fusió"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "permet que els fitxers explícitament ignorats se sobreescriguin"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
 msgid "don't check the working tree after merging"
 msgstr "no comprovis l'arbre de treball després de fusionar"
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
 msgid "don't update the index or the work tree"
 msgstr "no actualitzis l'índex ni l'arbre de treball"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
 msgid "skip applying sparse checkout filter"
 msgstr "omet l'aplicació del filtre d'agafament parcial"
 
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "depura unpack-trees"
 
-#: builtin/read-tree.c:157
-#, fuzzy
+#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "suprimeix els missatges de retroacció"
 
-#: builtin/read-tree.c:188
-#, fuzzy
+#: 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>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root "
+"[<branch>]"
 msgstr ""
-"git rebase [-i] [opcions] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root "
+"[<branch>]"
 
 #: builtin/rebase.c:39
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "llista per a fer inestable: «%s»"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
 #, c-format
 msgid "could not create temporary %s"
 msgstr "no s'ha pogut crear el fitxer temporal %s"
 
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
 msgid "could not mark as interactive"
 msgstr "no s'ha pogut marcar com a interactiu"
 
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
 msgid "could not generate todo list"
 msgstr "no s'ha pogut generar la llista per a fer"
 
-#: builtin/rebase.c:412
-#, fuzzy
+#: builtin/rebase.c:331
 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:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<opcions>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-#, fuzzy
-msgid "keep commits which start empty"
-msgstr "manté les comissions que comencen en blanc"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "permet les comissions amb missatges buits"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "fes «rebase» de les comissions de fusió"
-
-#: builtin/rebase.c:502
-#, fuzzy
-msgid "keep original branch points of cousins"
-msgstr "mantén els punts de branca originals dels cosins"
-
-#: builtin/rebase.c:504
-#, fuzzy
-msgid "move commits that begin with squash!/fixup!"
-msgstr "mou les comissions que comencen amb squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "signa les comissions"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-#, fuzzy
-msgid "display a diffstat of what changed upstream"
-msgstr "mostra un «diffstat» de la font que ha canviat"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "continua el «rebase»"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "omet la comissió"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "edita la llista a fer"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "mostra el pedaç actual"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "escurça els ids de les comissions en la llista per a fer"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "expandeix els ids de les comissions en la llista per a fer"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "comprova la llista a fer"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "reorganitza les línies «fixup/pick»"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "expandeix les ordres exec en la llista per a fer"
-
-#: builtin/rebase.c:526
-#, fuzzy
-msgid "onto"
-msgstr "sobre"
-
-#: builtin/rebase.c:529
-#, fuzzy
-msgid "restrict-revision"
-msgstr "revisió restringida"
-
-#: builtin/rebase.c:529
-#, fuzzy
-msgid "restrict revision"
-msgstr "restringeix la revisió"
-
-#: builtin/rebase.c:531
-#, fuzzy
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-#, fuzzy
-msgid "squash onto"
-msgstr "carabassa a"
-
-#: builtin/rebase.c:534
-#, fuzzy
-msgid "the upstream commit"
-msgstr "la comissió principal"
-
-#: builtin/rebase.c:536
-#, fuzzy
-msgid "head-name"
-msgstr "nom-cap"
-
-#: builtin/rebase.c:536
-#, fuzzy
-msgid "head name"
-msgstr "nom del cap"
-
-#: builtin/rebase.c:541
-#, fuzzy
-msgid "rebase strategy"
-msgstr "estratègia de rebase"
-
-#: builtin/rebase.c:542
-#, fuzzy
-msgid "strategy-opts"
-msgstr "opcions estratègiques"
-
-#: builtin/rebase.c:543
-#, fuzzy
-msgid "strategy options"
-msgstr "opcions d'estratègia"
-
-#: builtin/rebase.c:544
-#, fuzzy
-msgid "switch-to"
-msgstr "canvia a"
-
-#: builtin/rebase.c:545
-#, fuzzy
-msgid "the branch or commit to checkout"
-msgstr "la branca o entrega a agafar"
-
-#: builtin/rebase.c:546
-#, fuzzy
-msgid "onto-name"
-msgstr "ont-name"
-
-#: builtin/rebase.c:546
-#, fuzzy
-msgid "onto name"
-msgstr "al nom"
-
-#: builtin/rebase.c:547
-#, fuzzy
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "l'ordre a executar"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-#, fuzzy
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "torna a planificar automàticament qualsevol `exec` que falli"
-
-#: builtin/rebase.c:566
-#, fuzzy
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cosins no té cap efecte sense --rebase-merges"
-
-#: builtin/rebase.c:582
-#, fuzzy, c-format
+#: builtin/rebase.c:390
+#, c-format
 msgid "%s requires the merge backend"
-msgstr "%s requereix un «rebase» interactiu"
+msgstr "%s requereix un rerefons de fusió"
 
-#: builtin/rebase.c:625
-#, fuzzy, c-format
+#: builtin/rebase.c:432
+#, 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:642
-#, fuzzy, c-format
+#: builtin/rebase.c:449
+#, 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:667
-#, fuzzy, c-format
+#: builtin/rebase.c:474
+#, 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:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
 "You can instead skip this commit: run \"git rebase --skip\".\n"
-"To abort and get back to the state before \"git rebase\", run \"git rebase --"
-"abort\"."
+"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"."
 msgstr ""
 "Resoleu tots els conflictes manualment, marqueu-los com a resolts amb\n"
-"«git add/rm <fitxers_amb_conflicte>», llavors executeu «git rebase --"
-"continue».\n"
-"Podeu en comptes ometre aquesta comissió: executeu «git rebase --skip».\n"
-"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», "
-"executeu «git rebase --abort»."
+"«git 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»."
 
-#: builtin/rebase.c:896
-#, fuzzy, c-format
+#: builtin/rebase.c:680
+#, c-format
 msgid ""
 "\n"
 "git encountered an error while preparing the patches to replay\n"
@@ -20407,19 +20297,21 @@ 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:1222
-#, fuzzy, c-format
-msgid ""
-"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
-"\"."
+#: builtin/rebase.c:925
+#, 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:1240
+#: builtin/rebase.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -20436,7 +20328,7 @@ msgstr ""
 "    git rebase '<branca>'\n"
 "\n"
 
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -20444,202 +20336,184 @@ msgid ""
 "    git branch --set-upstream-to=%s/<branch> %s\n"
 "\n"
 msgstr ""
-"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
-"amb:\n"
+"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho amb:\n"
 "\n"
 "    git branch --set-upstream-to=%s/<branca> %s\n"
 "\n"
 
-#: builtin/rebase.c:1286
-#, fuzzy
+#: builtin/rebase.c:989
 msgid "exec commands cannot contain newlines"
 msgstr "les ordres exec no poden contenir línies noves"
 
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
 msgid "empty exec command"
 msgstr "ordre exec buida"
 
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
 msgid "rebase onto given branch instead of upstream"
 msgstr "fes un «rebase» en la branca donada en comptes de la font"
 
-#: builtin/rebase.c:1321
-#, fuzzy
+#: builtin/rebase.c:1025
 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"
 
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
 msgid "allow pre-rebase hook to run"
 msgstr "permet al lligam pre-rebase executar-se"
 
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
 msgid "be quiet. implies --no-stat"
 msgstr "silenciós. Implica --no-stat"
 
-#: builtin/rebase.c:1331
-#, fuzzy
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "mostra un «diffstat» del que ha canviat a la font"
+
+#: builtin/rebase.c:1035
 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:1334
-#, fuzzy
+#: builtin/rebase.c:1038
 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:1337
-#, fuzzy
+#: builtin/rebase.c:1041
 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:1339
+#: builtin/rebase.c:1043
 msgid "ignore author date and use current date"
 msgstr "ignora la data de l'autor i utilitza la data actual"
 
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
 msgid "synonym of --reset-author-date"
 msgstr "sinònim de --reset-author-date"
 
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
 msgid "passed to 'git apply'"
-msgstr "passa-ho a «git-apply»"
+msgstr "passa-ho a «git apply»"
 
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
 msgid "ignore changes in whitespace"
 msgstr "ignora els canvis d'espais en blanc"
 
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "«cherry pick» totes les comissions, inclús les no canviades"
 
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
 msgid "continue"
 msgstr "continua"
 
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
 msgid "skip current patch and continue"
 msgstr "omet el pedaç actual i continua"
 
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
 msgid "abort and check out the original branch"
 msgstr "interromp i agafa la branca original"
 
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
 msgid "abort but keep HEAD where it is"
 msgstr "interromp però manté HEAD on és"
 
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
 msgid "edit the todo list during an interactive rebase"
 msgstr "edita la llista de coses a fer durant un «rebase» interactiu"
 
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
 msgid "show the patch file being applied or merged"
 msgstr "mostra el pedaç que s'està aplicant o fusionant"
 
-#: builtin/rebase.c:1369
+#: 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:1373
+#: 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:1377
+#: builtin/rebase.c:1081
 msgid "let the user edit the list of commits to rebase"
 msgstr "permet a l'usuari editar la llista de comissions a fer «rebase»"
 
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "(EN DESÚS) intenta recrear fusions en lloc d'ignorar-les"
 
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
 msgid "how to handle commits that become empty"
 msgstr "com gestionar les comissions que queden buides"
 
-#: builtin/rebase.c:1393
-#, fuzzy
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "manté les comissions que comencen en blanc"
+
+#: builtin/rebase.c:1097
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "mou les comissions que comencen amb squash!/fixup! sota -i"
 
-#: builtin/rebase.c:1400
-#, fuzzy
+#: builtin/rebase.c:1104
 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:1404
-#, fuzzy
+#: builtin/rebase.c:1108
 msgid "allow rebasing commits with empty messages"
-msgstr "permet tornar a basar les comissions amb missatges buits"
+msgstr "permet fer «rebase» de les comissions amb missatges buits"
 
-#: builtin/rebase.c:1408
-#, fuzzy
+#: builtin/rebase.c:1112
 msgid "try to rebase merges instead of skipping them"
-msgstr "intenta fer «rebase» de les fusions en lloc d'omissió"
+msgstr "intenta fer «rebase» de les fusions en comptes d'ometre-les"
 
-#: builtin/rebase.c:1411
-#, fuzzy
+#: 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:1413
+#: builtin/rebase.c:1117
 msgid "use the given merge strategy"
 msgstr "utilitza l'estratègia de fusió donada"
 
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
 msgid "option"
 msgstr "opció"
 
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
 msgid "pass the argument through to the merge strategy"
 msgstr "passa l'argument a l'estratègia de fusió"
 
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
 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:1424
-#, fuzzy
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "torna a planificar automàticament qualsevol «exec» que falli"
+
+#: builtin/rebase.c:1128
 msgid "apply all changes, even those already present upstream"
-msgstr "aplica tots els canvis fins i tot els que ja estan a la font principal"
+msgstr "aplica tots els canvis, fins i tot els que ja estan a la font"
 
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
 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:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges està en desús. Utilitzeu --rebase-merges en "
-"lloc seu."
-
-#: builtin/rebase.c:1488
-#, fuzzy
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "no es pot combinar «--keep-base» amb «--onto»"
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges ha estat substituït per --rebase-merges"
 
-#: builtin/rebase.c:1490
-#, fuzzy
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "no es pot combinar «--keep-base» amb «--root»"
-
-#: builtin/rebase.c:1494
-#, fuzzy
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "no es pot combinar «--keep-base» amb «--root»"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "No hi ha un «rebase» en curs?"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu."
 
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "No es pot llegir HEAD"
 
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -20647,17 +20521,17 @@ msgstr ""
 "Heu d'editar tots els conflictes de fusió i després\n"
 "marcar-los com a resolts fent servir git add"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
 msgid "could not discard worktree changes"
 msgstr "no s'han pogut descartar els canvis de l'arbre de treball"
 
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
 #, c-format
 msgid "could not move back to %s"
 msgstr "no s'ha pogut tornar a %s"
 
-#: builtin/rebase.c:1620
-#, fuzzy, c-format
+#: builtin/rebase.c:1325
+#, 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"
@@ -20668,152 +20542,141 @@ 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:1648
+#: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
 msgstr "«switch» «c» espera un valor numèric"
 
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Mode desconegut: %s"
 
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requereix --merge o --interactive"
 
-#: builtin/rebase.c:1759
-#, fuzzy
-msgid "cannot combine apply options with merge options"
-msgstr "no es poden combinar les opcions d'aplicació amb les opcions de fusió"
+#: builtin/rebase.c:1463
+msgid "apply options and merge options cannot be used together"
+msgstr "les opcions apply i merge no es poden usar juntes"
 
-#: builtin/rebase.c:1772
-#, fuzzy, c-format
+#: builtin/rebase.c:1476
+#, c-format
 msgid "Unknown rebase backend: %s"
-msgstr "Rebase de system%s desconegut"
+msgstr "Rerefons de «rebase» desconegut: %s"
 
-#: builtin/rebase.c:1802
-#, fuzzy
+#: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
-msgstr "--reschedulo-failed-exec requereix --exec o --interactive"
+msgstr "--reschedule-failed-exec requereix --exec o --interactive"
 
-#: builtin/rebase.c:1822
-#, fuzzy
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "no es poden combinar «--preserve-merges» amb «--rebase-merges»"
-
-#: builtin/rebase.c:1826
-#, fuzzy
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"error no es pot combinar «--preserve-merges» amb «--reschedule-failed-exec»"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "font no vàlida: «%s»"
 
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
 msgid "Could not create new root commit"
 msgstr "No s'ha pogut crear una comissió arrel nova"
 
-#: builtin/rebase.c:1882
-#, fuzzy, c-format
+#: builtin/rebase.c:1568
+#, 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:1885
-#, fuzzy, c-format
+#: builtin/rebase.c:1571
+#, 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:1893
-#, fuzzy, c-format
+#: builtin/rebase.c:1580
+#, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "No apunta a una comissió vàlida «%s»"
 
-#: builtin/rebase.c:1921
-#, fuzzy, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "fatal no existeix aquesta branca/commit «%s»"
+#: builtin/rebase.c:1607
+#, c-format
+msgid "no such branch/commit '%s'"
+msgstr "no existeix aquesta branca o comissió «%s»"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2415
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "No hi ha tal referència: %s"
 
-#: builtin/rebase.c:1940
-#, fuzzy
+#: builtin/rebase.c:1629
 msgid "Could not resolve HEAD to a revision"
 msgstr "No s'ha pogut resoldre HEAD a una revisió"
 
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
 msgid "Please commit or stash them."
 msgstr "Cometeu-los o emmagatzemeu-los."
 
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
 #, c-format
 msgid "could not switch to %s"
 msgstr "no s'ha pogut commutar a %s"
 
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
 msgid "HEAD is up to date."
 msgstr "HEAD està al dia."
 
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "La branca actual %s està al dia.\n"
 
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
 msgid "HEAD is up to date, rebase forced."
 msgstr "La branca actual està al dia, «rebase» forçat."
 
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "La branca actual %s està al dia; «rebase» forçat.\n"
 
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
 msgid "The pre-rebase hook refused to rebase."
 msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»."
 
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Canvis a %s:\n"
 
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Canvis de %s a %s:\n"
 
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "Primer, s'està rebobinant HEAD per a reproduir el vostre treball al "
 "damunt...\n"
 
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
 msgid "Could not detach HEAD"
 msgstr "No s'ha pogut separar HEAD"
 
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Avanç ràpid %s a %s.\n"
 
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:1276
+#: 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"
@@ -20829,13 +20692,13 @@ msgid ""
 "To squelch this message and still keep the default behaviour, set\n"
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
-"Per defecte, es denega actualitzar la branca actual en un dipòsit no\n"
+"Per defecte, es denega actualitzar la branca actual en un repositori no\n"
 "nu, perquè faria l'índex i l'arbre de treball inconsistents amb allò\n"
 "que hàgiu pujat, i requeriria «git reset --hard» per a fer que\n"
 "l'arbre de treball coincidís amb HEAD.\n"
 "\n"
 "Podeu establir la variable de configuració\n"
-"«receive.denyCurrentBranch» a «ignore» o «warn» en el dipòsit remot\n"
+"«receive.denyCurrentBranch» a «ignore» o «warn» en el repositori remot\n"
 "per a permetre pujar a la seva branca actual; això no obstant, no es\n"
 "recomana a menys que hàgiu decidit actualitzar el seu arbre de treball\n"
 "per a coincidir amb allò que hàgiu pujat d'alguna altra manera.\n"
@@ -20844,7 +20707,7 @@ msgstr ""
 "per defecte, establiu la variable de configuració\n"
 "«receive.denyCurrentBranch» a «refuse»."
 
-#: builtin/receive-pack.c:1296
+#: 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"
@@ -20860,29 +20723,29 @@ msgstr ""
 "confusió.\n"
 "\n"
 "Podeu establir la variable de configuració\n"
-"«receive.denyDeleteCurrent» a «warn» o «ignore» en el dipòsit remot\n"
+"«receive.denyDeleteCurrent» a «warn» o «ignore» en el repositori remot\n"
 "per a permetre suprimir la branca actual, amb un missatge\n"
 "d'advertència o sense.\n"
 "\n"
 "Per a silenciar aquest missatge, podeu establir-la a «refuse»."
 
-#: builtin/receive-pack.c:2479
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "silenciós"
 
-#: builtin/receive-pack.c:2493
-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 ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<refs>..."
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] "
+"[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all]"
+" <refs>..."
 msgstr ""
-"git reflog expire [--expire=<hora>] [--expire-unreachable=<hora>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<referències>..."
+"git reflog expire [--expire=<data>] [--expire-unreachable=<data>] "
+"[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all]"
+" <referències>..."
 
 #: builtin/reflog.c:22
 msgid ""
@@ -20896,42 +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
-#, fuzzy, c-format
+#: builtin/reflog.c:675
+#, c-format
 msgid "%s points nowhere!"
-msgstr "els percentatges no apunten enlloc!"
+msgstr "%s no apunta a enlloc"
 
-#: builtin/reflog.c:699
-#, fuzzy
+#: builtin/reflog.c:731
 msgid "no reflog specified to delete"
-msgstr "no s'ha especificat cap registre de referència per suprimir"
+msgstr "no s'ha especificat cap registre de referència per a suprimir"
 
-#: builtin/reflog.c:708
-#, fuzzy, c-format
+#: builtin/reflog.c:742
+#, c-format
 msgid "not a reflog: %s"
-msgstr "no és un registre de referència"
+msgstr "no és un registre de referència: %s"
 
-#: builtin/reflog.c:713
-#, fuzzy, c-format
+#: 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 ]"
 
@@ -20941,11 +20803,11 @@ msgstr "git remote [-v | --verbose]"
 
 #: builtin/remote.c:18
 msgid ""
-"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <name> <url>"
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] "
+"[--mirror=<fetch|push>] <name> <url>"
 msgstr ""
-"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <nom> <url>"
+"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] "
+"[--mirror=<fetch|push>] <nom> <url>"
 
 #: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
@@ -21022,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"
@@ -21069,7 +20936,7 @@ msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "especificar les branques a seguir té sentit només amb miralls d'obtenció"
 
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
 #, c-format
 msgid "remote %s already exists."
 msgstr "el remot %s ja existeix."
@@ -21079,68 +20946,73 @@ msgstr "el remot %s ja existeix."
 msgid "Could not setup master '%s'"
 msgstr "No s'ha pogut configurar la mestra «%s»"
 
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "no s'ha gestionat branch.%s.rebase=%s; assumint «true»"
+
+#: builtin/remote.c:366
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr ""
 "No s'ha pogut obtenir el mapa d'obtenció de l'especificació de referència %s"
 
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
 msgid "(matching)"
 msgstr "(coincident)"
 
-#: builtin/remote.c:466
+#: builtin/remote.c:472
 msgid "(delete)"
 msgstr "(suprimir)"
 
-#: builtin/remote.c:655
-#, fuzzy, c-format
+#: builtin/remote.c:660
+#, c-format
 msgid "could not set '%s'"
 msgstr "no s'ha pogut establir «%s»"
 
-#: builtin/remote.c:660
-#, fuzzy, c-format
+#: builtin/remote.c:665
+#, 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:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "No existeix el remot «%s»"
 
-#: builtin/remote.c:710
+#: builtin/remote.c:715
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "No s'ha pogut canviar el nom de la secció de configuració «%s» a «%s»"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:735
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
 "\t%s\n"
 "\tPlease update the configuration manually if necessary."
 msgstr ""
-"No s'està actualitzant l'especificació de referències d'obtenció no per "
-"defecte\n"
+"No s'està actualitzant l'especificació de referències d'obtenció no per defecte\n"
 "\t%s\n"
 "\tActualitzeu la configuració manualment si és necessari."
 
-#: builtin/remote.c:770
+#: builtin/remote.c:775
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "la supressió de «%s» ha fallat"
 
-#: builtin/remote.c:804
+#: builtin/remote.c:809
 #, c-format
 msgid "creating '%s' failed"
 msgstr "la creació de «%s» ha fallat"
 
-#: builtin/remote.c:882
+#: builtin/remote.c:887
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -21151,468 +21023,465 @@ msgstr[0] ""
 "Nota: Una branca fora de la jerarquia refs/remotes/ no s'ha eliminat;\n"
 "per a suprimir-la, useu:"
 msgstr[1] ""
-"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han "
-"eliminat;\n"
+"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han eliminat;\n"
 "per a suprimir-les, useu:"
 
-#: builtin/remote.c:896
+#: builtin/remote.c:901
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "No s'ha pogut eliminar la secció de configuració «%s»"
 
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)"
 
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
 msgid " tracked"
 msgstr " seguit"
 
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " estancat (useu «git remote prune» per a eliminar)"
 
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "branch.%s.merge no vàlid; no es pot fer «rebase» sobre > 1 branca"
 
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "es fa «rebase» interactivament sobre el remot %s"
 
-#: builtin/remote.c:1058
-#, fuzzy, c-format
+#: builtin/remote.c:1068
+#, 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:1061
+#: builtin/remote.c:1071
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "es fa «rebase» sobre el remot %s"
 
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
 #, c-format
 msgid " merges with remote %s"
 msgstr " es fusiona amb el remot %s"
 
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
 #, c-format
 msgid "merges with remote %s"
 msgstr "es fusiona amb el remot %s"
 
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    i amb el remot %s\n"
 
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
 msgid "create"
 msgstr "crea"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
 msgid "delete"
 msgstr "suprimeix"
 
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
 msgid "up to date"
 msgstr "al dia"
 
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
 msgid "fast-forwardable"
 msgstr "avanç ràpid possible"
 
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
 msgid "local out of date"
 msgstr "local no actualitzat"
 
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s força a %-*s (%s)"
 
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s puja a %-*s (%s)"
 
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s força a %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s puja a %s"
 
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
 msgid "do not query remotes"
 msgstr "no consultis els remots"
 
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
 msgstr "* remot %s"
 
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL d'obtenció: %s"
 
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
 msgid "(no URL)"
 msgstr "(sense URL)"
 
 #. TRANSLATORS: the colon ':' should align
 #. with the one in " Fetch URL: %s"
 #. translation.
-#.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL de pujada: %s"
 
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Branca de HEAD: %s"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
 msgid "(not queried)"
 msgstr "(no consultat)"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
 msgid "(unknown)"
 msgstr "(desconegut)"
 
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
 #, c-format
-msgid ""
-"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgid "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 "  Branca de HEAD (la HEAD remot és ambigua, pot ser un dels següents):\n"
 
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Branca remota:%s"
 msgstr[1] "  Branques remotes:%s"
 
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
 msgid " (status not queried)"
 msgstr " (estat no consultat)"
 
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Branca local configurada per a «git pull»:"
 msgstr[1] "  Branques locals configurades per a «git pull»:"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  «git push» reflectirà les referències locals"
 
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Referència local configurada per a «git push»%s:"
 msgstr[1] "  Referències locals configurades per a «git push»%s:"
 
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "estableix refs/remotes/<nom>/HEAD segons el remot"
 
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "suprimeix refs/remotes/<nom>/HEAD"
 
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
 msgid "Cannot determine remote HEAD"
 msgstr "No es pot determinar la HEAD remota"
 
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Múltiples branques de HEAD remotes. Trieu-ne una explícitament amb:"
 
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
 #, c-format
 msgid "Could not delete %s"
 msgstr "No s'ha pogut suprimir %s"
 
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "No és una referència vàlida: %s"
 
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
 #, c-format
 msgid "Could not setup %s"
 msgstr "No s'ha pogut configurar %s"
 
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s es tornarà penjant!"
 
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s s'ha tornat penjant!"
 
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
 #, c-format
 msgid "Pruning %s"
 msgstr "S'està podant %s"
 
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [podaria] %s"
 
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [podat] %s"
 
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
 msgid "prune remotes after fetching"
 msgstr "poda els remots després d'obtenir-los"
 
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
 #, c-format
 msgid "No such remote '%s'"
 msgstr "No hi ha tal remot «%s»"
 
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
 msgid "add branch"
 msgstr "afegeix branca"
 
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
 msgid "no remote specified"
 msgstr "cap remot especificat"
 
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
 msgid "query push URLs rather than fetch URLs"
 msgstr "consulta els URL de pujada en lloc dels URL d'obtenció"
 
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
 msgid "return all URLs"
 msgstr "retorna tots els URL"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "cap URL configurat per al remot «%s»"
 
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
 msgid "manipulate push URLs"
 msgstr "manipula els URL de pujada"
 
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
 msgid "add URL"
 msgstr "afegeix URL"
 
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
 msgid "delete URLs"
 msgstr "suprimeix els URL"
 
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete no té sentit"
 
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Patró d'URL antic no vàlid: %s"
 
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
 #, c-format
 msgid "No such URL found: %s"
 msgstr "No s'ha trobat tal URL: %s"
 
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
 msgid "Will not delete all non-push URLs"
 msgstr "No se suprimiran tots els URL no de pujada"
 
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
+
+#: builtin/repack.c:28
 msgid "git repack [<options>]"
 msgstr "git repack [<opcions>]"
 
-#: builtin/repack.c:31
+#: builtin/repack.c:33
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
-"Els reempaquetaments incrementals són incompatibles amb els índexs de mapes "
-"de bits.  Useu\n"
-"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack."
-"writebitmaps."
+"Els reempaquetaments incrementals són incompatibles amb els índexs de mapes de bits.  Useu\n"
+"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack.writebitmaps."
 
-#: builtin/repack.c:198
-#, fuzzy
+#: builtin/repack.c:201
 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:270 builtin/repack.c:630
-#, 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:294
-#, 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:309
-#, 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:368
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
-msgstr ""
+msgstr "el paquet %s és massa gran per a considerar-ho en progressió geomètrica"
 
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
 #, c-format
 msgid "pack %s too large to roll up"
-msgstr ""
+msgstr "el paquet %s és massa gran per a enrotllar-lo"
 
-#: builtin/repack.c:460
+#: builtin/repack.c:498
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "no s'ha pogut obrir el fitxer temporal «%s» per a escriptura"
+
+#: builtin/repack.c:516
+msgid "could not close refs snapshot tempfile"
+msgstr "no s'ha pogut tancar el fitxer temporal amb la instantània de referències"
+
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "empaqueta-ho tot en un únic paquet"
 
-#: builtin/repack.c:462
+#: 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:465
+#: 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:467
+#: 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:469
+#: 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:471
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "no executis git-update-server-info"
 
-#: builtin/repack.c:474
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "passa --local a git-pack-objects"
 
-#: builtin/repack.c:476
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "escriu índex de mapa de bits"
 
-#: builtin/repack.c:478
-#, 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:479
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "data aproximada"
 
-#: builtin/repack.c:480
+#: 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:482
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "amb -a, reempaqueta els objectes inabastables"
 
-#: builtin/repack.c:484
+#: 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:485 builtin/repack.c:491
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "octets"
 
-#: builtin/repack.c:486
+#: 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:488
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "limita la profunditat màxima de les diferències"
 
-#: builtin/repack.c:490
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "limita el nombre màxim de fils"
 
-#: builtin/repack.c:492
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "mida màxima de cada fitxer de paquet"
 
-#: builtin/repack.c:494
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr "reempaqueta els objectes en paquets marcats amb .keep"
 
-#: builtin/repack.c:496
-#, fuzzy
+#: builtin/repack.c:666
 msgid "do not repack this pack"
-msgstr "no reempaqueta aquest paquet"
+msgstr "no reempaquetis aquest paquet"
 
-#: builtin/repack.c:498
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
-msgstr ""
+msgstr "troba una progressió geomètrica amb el factor <N>"
 
-#: builtin/repack.c:508
-msgid "cannot delete packs in a precious-objects repo"
-msgstr "no es poden suprimir paquets en un dipòsit d'objectes preciosos"
+#: builtin/repack.c:670
+msgid "write a multi-pack index of the resulting packs"
+msgstr "escriu un índex multipaquet dels paquets resultants"
 
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable i -A són incompatibles"
-
-#: builtin/repack.c:527
-#, fuzzy
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--long és incompatible amb --abbrev=0"
+#: 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:639
-#, fuzzy
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
-msgstr "Res nou per empaquetar."
+msgstr "Res nou a empaquetar."
 
-#: builtin/repack.c:669
-#, 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:671
-#, 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>"
@@ -21624,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"
@@ -21639,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 "
@@ -21768,293 +21624,276 @@ 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"
 
 #: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
-msgstr "git rerere [clear | forget <camí>... | status | remaining | diff | gc]"
+msgstr ""
+"git rerere [clear | forget <camí>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "registra les resolucions netes en l'índex"
 
-#: builtin/rerere.c:79
-#, fuzzy
+#: builtin/rerere.c:77
 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:113
+#: 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:83
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "No teniu un HEAD vàlid."
 
-#: builtin/reset.c:85
+#: 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:91
+#: 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:116
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ara és a %s"
 
-#: builtin/reset.c:195
+#: 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:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: 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:297
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "restableix HEAD i l'índex"
 
-#: builtin/reset.c:298
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "restableix només HEAD"
 
-#: builtin/reset.c:300 builtin/reset.c:302
+#: 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:304
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "restableix HEAD però retén els canvis locals"
 
-#: builtin/reset.c:310
+#: 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:344
+#: 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:352
+#: 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:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch és incompatible amb --{hard,mixed,soft}"
-
-#: builtin/reset.c:371
+#: 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:373
+#: 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:388
+#: 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 dipòsit nu"
-
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr "-N només es pot usar amb --mixed"
+msgstr "el restabliment de %s no es permet en un repositori nu"
 
-#: builtin/reset.c:413
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "Canvis «unstaged» després del restabliment:"
 
-#: builtin/reset.c:416
-#, 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:434
+#: 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:439
+#: 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:538
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "no es pot combinar --exclude-promisor-objects i --missing"
-
-#: builtin/rev-list.c:599
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "el filtratge d'objectes requereix --objects"
 
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr "el rev-list no permet mostrar notes"
 
-#: builtin/rev-list.c:664
-#, fuzzy
-msgid "marked counting is incompatible with --objects"
-msgstr "el recompte marcat és incompatible amb --objects"
+#: builtin/rev-list.c:679
+#, 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>...]"
@@ -22072,6 +21911,18 @@ msgstr "deixa d'analitzar després del primer argument que no sigui d'opció"
 msgid "output in stuck long form"
 msgstr "emet en forma llarga enganxada"
 
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "final prematur de l'entrada"
+
+#: builtin/rev-parse.c:442
+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
+msgid "Needed a single revision"
+msgstr "Cal una sola revisió"
+
 #: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -22080,12 +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."
+"Executeu «git rev-parse --parseopt -h» per a més informació sobre el primer ús."
+
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir requereix un argument"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "no és un directori git «%s»"
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "--git-path requereix un argument"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "-n requereix un argument"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "--path-format requereix un argument"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "argument no vàlid per a --path-format: %s"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "--default requereix un argument"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "--prefix requereix un argument"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "mode desconegut per a --abbrev-ref: %s"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "mode desconegut per a --show-object-format: %s"
 
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
@@ -22159,17 +22053,21 @@ msgstr "nom de la comissió a annexar"
 
 #: builtin/revert.c:127
 msgid "preserve initially empty commits"
-msgstr "preserva les comissions inicialment buides"
+msgstr "conserva les comissions inicialment buides"
+
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "permet les comissions amb missatges buits"
 
 #: builtin/revert.c:129
 msgid "keep redundant, empty commits"
 msgstr "retén les comissions redundants i buides"
 
-#: builtin/revert.c:237
+#: builtin/revert.c:241
 msgid "revert failed"
 msgstr "la reversió ha fallat"
 
-#: builtin/revert.c:250
+#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "el «cherry pick» ha fallat"
 
@@ -22185,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 ""
@@ -22219,73 +22117,71 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "el fitxer següent té modificacions locals:"
 msgstr[1] "els fitxers següents tenen modificacions locals:"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "no llistis els fitxers eliminats"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "només elimina de l'índex"
 
-#: builtin/rm.c:246
+#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "passa per alt la comprovació d'actualitat"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "permet l'eliminació recursiva"
 
-#: builtin/rm.c:249
+#: builtin/rm.c:250
 msgid "exit with a zero status even if nothing matched"
 msgstr "surt amb estat zero encara que res hagi coincidit"
 
-#: builtin/rm.c:283
-#, fuzzy
+#: builtin/rm.c:285
 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:310
-#, fuzzy
+#: builtin/rm.c:315
 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:331
+#: builtin/rm.c:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "no s'eliminarà «%s» recursivament sense -r"
 
-#: builtin/rm.c:379
+#: builtin/rm.c:385
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: no s'ha pogut eliminar %s"
 
 #: builtin/send-pack.c:20
 msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-"  --all and explicit <ref> specification are mutually exclusive."
+"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:188
+#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "nom del remot"
 
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "usa el protocol RPC sense estat"
 
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "llegeix les referències des de stdin"
 
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "imprimeix l'estat des de l'ajudant remot"
 
@@ -22298,78 +22194,71 @@ 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:391
+#: builtin/shortlog.c:394
 msgid "too many arguments given outside repository"
-msgstr "hi ha massa arguments donats fora del dipòsit"
+msgstr "hi ha massa arguments donats fora del repositori"
 
 #: builtin/show-branch.c:13
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--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>]"
-msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]"
+msgstr ""
+"git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]"
 
 #: builtin/show-branch.c:395
 #, c-format
@@ -22378,135 +22267,127 @@ msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "s'està ignorant %s; no es pot gestionar més de %d referència"
 msgstr[1] "s'està ignorant %s; no es poden gestionar més de %d referències"
 
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
 #, c-format
 msgid "no matching refs with %s"
 msgstr "no hi ha referències coincidents amb %s"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
 msgid "show remote-tracking and local branches"
 msgstr "mostra les branques amb seguiment remot i les locals"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
 msgid "show remote-tracking branches"
 msgstr "mostra les branques amb seguiment remot"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
 msgid "color '*!+-' corresponding to the branch"
 msgstr "colora «*!+-» corresponent a la branca"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
 msgid "show <n> more commits after the common ancestor"
 msgstr "mostra <n> comissions després de l'avantpassat comú"
 
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
 msgid "synonym to more=-1"
 msgstr "sinònim de more=-1"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
 msgid "suppress naming strings"
 msgstr "omet anomenar cadenes"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
 msgid "include the current branch"
 msgstr "inclou la branca actual"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
 msgid "name commits with their object names"
 msgstr "anomena les comissions amb els seus noms d'objecte"
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
 msgid "show possible merge bases"
 msgstr "mostra les bases de fusió possibles"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
 msgid "show refs unreachable from any other ref"
 msgstr "mostra les referències inabastables de qualsevol altra referència"
 
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
 msgid "show commits in topological order"
 msgstr "mostra les comissions en ordre topològic"
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
 msgid "show only commits not on the first branch"
 msgstr "mostra només les comissions que no siguin en la primera branca"
 
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
 msgid "show merges reachable from only one tip"
 msgstr "mostra les fusions abastables de només una punta"
 
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
 msgid "topologically sort, maintaining date order where possible"
 msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible"
 
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
 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:711
-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:735
+#: 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"
 
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
 msgid "--reflog option needs one branch name"
 msgstr "l'opció --reflog necessita un nom de branca"
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "es pot mostrar només %d entrada a la vegada."
 msgstr[1] "es poden mostrar només %d entrades a la vegada."
 
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
 #, c-format
 msgid "no such ref %s"
 msgstr "no hi ha tal referència %s"
 
-#: builtin/show-branch.c:831
+#: 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:835
+#: 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:838
+#: 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 ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | "
+"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
 msgstr ""
-"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]"
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | "
+"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]"
 
 #: builtin/show-ref.c:13
 msgid "git show-ref --exclude-existing[=<pattern>]"
@@ -22544,100 +22425,130 @@ msgstr "no imprimeixis els resultats a stdout (útil amb --verify)"
 
 #: builtin/show-ref.c:179
 msgid "show refs from stdin that aren't in local repository"
-msgstr "mostra les referències de stdin que no siguin en el dipòsit local"
+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:60
+msgid "this worktree is not sparse"
+msgstr "aquest arbre de treball no és dispers"
 
-#: builtin/sparse-checkout.c:72
-#, fuzzy
+#: 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)"
+"aquest arbre de treball no és dispers (pot ser que el fitxer sparse-checkout"
+" no existeixi)"
 
-#: builtin/sparse-checkout.c:227
-#, 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 "
+"sparse-checkout"
+
+#: builtin/sparse-checkout.c:184
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "s'ha produït un error en suprimir el directori «%s»"
+
+#: 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:268
-#, fuzzy
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr ""
-"no s'ha pogut actualitzar el format del dipòsit per habilitar worktreeConfig"
+"no s'ha pogut actualitzar el format del repositori per a habilitar "
+"worktreeConfig"
 
-#: builtin/sparse-checkout.c:270
-#, 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:290
-#, 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:310
-#, 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:312
+#: 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:340
-#, fuzzy
-msgid "failed to modify sparse-index config"
-msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer de paquet %s"
+msgstr "commuta l'ús d'un índex dispers"
 
-#: builtin/sparse-checkout.c:361
+#: 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:419
-#, 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:431
-#, 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:456
-#, 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:510 builtin/sparse-checkout.c:534
-#, 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:579
+#: 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:594
-#, 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: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:613
-#, fuzzy
+#: 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:644
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "s'ha produït un error en actualitzar el directori de treball"
 
@@ -22650,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>]"
 
@@ -22663,28 +22572,24 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <nom-de-branca> [<stash>]"
 
-#: builtin/stash.c:29 builtin/stash.c:70
-msgid "git stash clear"
-msgstr "git stash clear"
-
 #: 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 builtin/stash.c:87
+#: 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
@@ -22709,6 +22614,14 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <missatge>]\n"
 "          [--] [<pathspec>...]]"
 
+#: builtin/stash.c:87
+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>]"
+
 #: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
@@ -22729,191 +22642,202 @@ 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:431
+#: builtin/stash.c:447
 #, 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 a fer-ne espai.\n"
 
-#: builtin/stash.c:492
+#: builtin/stash.c:508
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "no es pot aplicar un «stash» enmig d'una fusió"
 
-#: builtin/stash.c:503
+#: builtin/stash.c:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "no s'ha pogut generar diff %s^!."
 
-#: builtin/stash.c:510
-#, fuzzy
+#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr "hi ha conflictes en l'índex. Proveu-ho sense --index."
 
-#: builtin/stash.c:516
+#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "no s'ha pogut desar l'arbre d'índex"
 
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "no s'han pogut restaurar els fitxers no seguits des del «stash»"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "S'està fusionant %s amb %s"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "L'índex no estava «unstashed»."
 
-#: builtin/stash.c:591 builtin/stash.c:689
+#: 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:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "intenta tornar a crear l'índex"
 
-#: builtin/stash.c:635
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
-msgstr "Descartat %s (%s)"
+msgstr "Descartada %s (%s)"
 
-#: builtin/stash.c:638
+#: 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:651
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "«%s» no és una referència «stash»"
 
-#: builtin/stash.c:701
+#: 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:724
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "Cap nom de branca especificat"
 
-#: builtin/stash.c:808
-#, 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:819
-#, 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:839
-#, fuzzy
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "inclou els fitxers no seguits a «stash»"
 
-#: builtin/stash.c:842
-#, 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:932 builtin/stash.c:969
+#: 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:950 builtin/stash.c:1606 builtin/stash.c:1671
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "missatge «stash»"
 
-#: builtin/stash.c:960
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "«git stash store» requereix un argument <comissió>"
 
-#: builtin/stash.c:1175
+#: 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:1275
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "Encara no teniu la comissió inicial"
 
-#: builtin/stash.c:1302
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "No es pot desar l'estat d'índex actual"
 
-#: builtin/stash.c:1311
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "No es poden desar els fitxers no seguits"
 
-#: builtin/stash.c:1322 builtin/stash.c:1331
+#: 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:1359
+#: 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:1408
+#: 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:1426
+#: 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:1441
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "No hi ha canvis locals a desar"
 
-#: builtin/stash.c:1448
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "No es pot inicialitzar el magatzem"
 
-#: builtin/stash.c:1463
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "No es pot desar l'estat actual"
 
-#: builtin/stash.c:1468
+#: 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:1558
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "No es poden eliminar els canvis de l'arbre de treball"
 
-#: builtin/stash.c:1597 builtin/stash.c:1662
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "mantén l'índex"
 
-#: builtin/stash.c:1599 builtin/stash.c:1664
-#, 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:1600 builtin/stash.c:1665
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "mode silenciós"
 
-#: builtin/stash.c:1602 builtin/stash.c:1667
+#: 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:1604 builtin/stash.c:1669
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "inclou els fitxers ignorats"
 
-#: builtin/stash.c:1704
-#, 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]"
@@ -22932,254 +22856,240 @@ 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:47 builtin/submodule--helper.c:2424
+#: 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"
 
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper print-default-remote no pren cap argument"
 
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "no es pot despullar un component de l'url «%s»"
 
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+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:1859
 msgid "alternative anchor for relative paths"
 msgstr "àncora alternativa per als camins relatius"
 
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:410
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
 
-#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:520
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "S'està entrant a «%s»\n"
 
-#: builtin/submodule--helper.c:528
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:523
+#, 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:550
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:545
+#, c-format
 msgid ""
-"run_command returned non-zero status while recursing in the nested "
-"submodules of %s\n"
+"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:566
-#, fuzzy
+#: builtin/submodule--helper.c:561
 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:568 builtin/submodule--helper.c:889
-#: builtin/submodule--helper.c:1488
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
 msgid "recurse into nested submodules"
 msgstr "inclou recursivament els submòduls imbricats"
 
-#: builtin/submodule--helper.c:573
+#: builtin/submodule--helper.c:568
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <ordre>"
 
-#: builtin/submodule--helper.c:600
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"no s'ha pogut trobar la configuració «%s». S'assumeix que aquest dipòsit és "
-"el seu dipòsit font autoritzat."
-
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:642
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "S'ha produït un error en registrar l'url per al camí de submòdul «%s»"
 
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:646
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "S'ha registrat el submòdul «%s» (%s) per al camí «%s»\n"
 
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:656
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 "advertència: se suggereix el mode d'actualització per ordre per al submòdul "
 "«%s»\n"
 
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:663
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "S'ha produït un error en registrar el mode d'actualització per al camí de "
 "submòdul «%s»"
 
-#: builtin/submodule--helper.c:710
-#, fuzzy
+#: builtin/submodule--helper.c:685
 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:715
+#: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<opcions>] [<camí>]"
 
-#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
+#: 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:836
+#: builtin/submodule--helper.c:811
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "no s'ha pogut resoldre la referència a HEAD dins del submòdul «%s»"
 
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»"
 
-#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
-#, 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:888
-#, fuzzy
+#: builtin/submodule--helper.c:863
 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:894
+#: builtin/submodule--helper.c:869
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<camí>...]"
 
-#: builtin/submodule--helper.c:918
+#: builtin/submodule--helper.c:893
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <camí>"
 
-#: builtin/submodule--helper.c:990
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:965
+#, 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:993
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:968
+#, 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:1006
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:981
+#, c-format
 msgid "%s"
-msgstr "percentatges"
+msgstr "%s"
 
-#: builtin/submodule--helper.c:1056
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1031
+#, 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:1060
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1035
+#, c-format
 msgid "unexpected mode %o\n"
-msgstr "mode inesperat $mod_dst"
+msgstr "mode inesperat %o\n"
 
-#: builtin/submodule--helper.c:1301
-#, fuzzy
+#: builtin/submodule--helper.c:1276
 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:1303
-#, fuzzy
-msgid "to compare the commit in the index with that in the submodule HEAD"
+#: builtin/submodule--helper.c:1278
+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:1305
-#, fuzzy
+#: builtin/submodule--helper.c:1280
 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:1307
-#, fuzzy
+#: builtin/submodule--helper.c:1282
 msgid "limit the summary size"
-msgstr "limita a caps"
+msgstr "limita la mida del resum"
 
-#: builtin/submodule--helper.c:1312
-#, fuzzy
+#: builtin/submodule--helper.c:1287
 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:1336
-#, fuzzy
+#: builtin/submodule--helper.c:1311
 msgid "could not fetch a revision for HEAD"
-msgstr "no s'ha pogut separar HEAD"
+msgstr "no s'ha pogut obtenir una revisió per a HEAD"
 
-#: builtin/submodule--helper.c:1341
-#, fuzzy
-msgid "--cached and --files are mutually exclusive"
-msgstr "-n i -k són mútuament excloents"
-
-#: builtin/submodule--helper.c:1408
+#: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "S'està sincronitzant l'url del submòdul per a «%s»\n"
 
-#: builtin/submodule--helper.c:1414
+#: builtin/submodule--helper.c:1379
 #, c-format
 msgid "failed to register url for submodule path '%s'"
-msgstr "s'ha produït un error en registrar l'url per al camí del submòdul «%s»"
+msgstr ""
+"s'ha produït un error en registrar l'url per al camí del submòdul «%s»"
 
-#: builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c:1393
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr ""
 "s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»"
 
-#: builtin/submodule--helper.c:1439
+#: builtin/submodule--helper.c:1404
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»"
 
-#: builtin/submodule--helper.c:1486
-#, fuzzy
+#: builtin/submodule--helper.c:1451
 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:1493
+#: 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:1547
+#: 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:1559
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23188,209 +23098,304 @@ msgstr ""
 "L'arbre de treball del submòdul «%s» conté modificacions locals; useu «-f» "
 "per a descartar-les"
 
-#: builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "S'ha esborrat el directori «%s»\n"
 
-#: builtin/submodule--helper.c:1569
+#: 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:1580
+#: 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:1596
+#: 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:1625
-#, 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:1626
-#, 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:1631
+#: 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:1645
+#: 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:1714
-#, 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:1753 builtin/submodule--helper.c:1756
+#: 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:1792
+#: 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:1799
+#: 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:1823
+#: builtin/submodule--helper.c:1772
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "s'ha rebutjat crear/usar «%s» en el directori git d'un altre submòdul"
+
+#: 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:1818
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "directori no buit: «%s»"
+
+#: 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:1862
 msgid "where the new submodule will be cloned to"
 msgstr "a on es clonarà el submòdul nou"
 
-#: builtin/submodule--helper.c:1826
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "nom del submòdul nou"
 
-#: builtin/submodule--helper.c:1829
+#: 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:1837
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "profunditat dels clons superficials"
 
-#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349
+#: 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:1842 builtin/submodule--helper.c:2351
+#: 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:1849
-#, 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>"
-
-#: builtin/submodule--helper.c:1874
-#, fuzzy, 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"
-
-#: builtin/submodule--helper.c:1885
-#, 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:1889
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "directori no buit: «%s»"
-
-#: builtin/submodule--helper.c:1901
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "no s'ha pogut obtenir el directori de submòdul per a «%s»"
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 
-#: builtin/submodule--helper.c:1937
+#: 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:1941
+#: 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:2042
+#: 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:2046
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Potser voleu usar «update --init»?"
 
-#: builtin/submodule--helper.c:2076
+#: 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:2105
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "S'està ometent el submòdul «%s»"
 
-#: builtin/submodule--helper.c:2255
+#: 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:2266
+#: 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:2328 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2373
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "No s'ha pogut agafar «%s» en el camí de submòdul «%s»"
+
+#: builtin/submodule--helper.c:2377
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "No s'ha pogut fer «rebase» «%s» en el camí de submòdul «%s»"
+
+#: builtin/submodule--helper.c:2381
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "No s'ha pogut fusionar «%s» en el camí de submòdul «%s»"
+
+#: builtin/submodule--helper.c:2385
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "L'execució de «%s %s» ha fallat en el camí de submòdul «%s»"
+
+#: builtin/submodule--helper.c:2409
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Camí de submòdul «%s»: s'ha agafat «%s»\n"
+
+#: builtin/submodule--helper.c:2413
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Camí de submòdul «%s»: s'ha fet «rebase» en «%s»\n"
+
+#: builtin/submodule--helper.c:2417
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Camí de submòdul «%s»: s'ha fusionat en «%s»\n"
+
+#: builtin/submodule--helper.c:2421
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "El camí de submòdul «%s»: '%s %s'\n"
+
+#: 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 «$%s»; s'està intentant obtenir"
+" directament %s:"
+
+#: 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 un camí de submòdul «%s», però no contenia %s. "
+"L'obtenció directa d'aquesta comissió ha fallat."
+
+#: 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:2331
+#: 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:2335
+#: 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:2341
-#, 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:2344
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "tasques paral·leles"
 
-#: builtin/submodule--helper.c:2346
+#: 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:2347
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "no imprimeixis el progrés del clonatge"
 
-#: builtin/submodule--helper.c:2358
+#: 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:2371
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "valor incorrecte per al paràmetre update"
 
-#: builtin/submodule--helper.c:2419
+#: builtin/submodule--helper.c:2566
+msgid "suppress output for update by rebase or merge"
+msgstr "omet la sortida per les actualitzacions per «rebase» o fusió"
+
+#: builtin/submodule--helper.c:2567
+msgid "force checkout updates"
+msgstr "força les actualitzacions"
+
+#: builtin/submodule--helper.c:2569
+msgid "don't fetch new objects from the remote site"
+msgstr "no obtinguis els objectes nous del lloc remot"
+
+#: builtin/submodule--helper.c:2571
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr ""
+"sobreescriu el mode d'actualització en cas que el repositori sigui un clon "
+"nou"
+
+#: builtin/submodule--helper.c:2572
+msgid "depth for shallow fetch"
+msgstr "profunditat dels clons superficials"
+
+#: builtin/submodule--helper.c:2582
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2583
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 esperat per superproject"
+
+#: builtin/submodule--helper.c:2585
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2586
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 del HEAD del submòdul"
+
+#: builtin/submodule--helper.c:2592
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [<options>] <path>"
+
+#: builtin/submodule--helper.c:2663
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23399,94 +23404,185 @@ 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:2542
+#: 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 dipòsit pel submòdul «%s»"
+msgstr "no s'ha pogut obtenir el gestor del repositori pel submòdul «%s»"
 
-#: builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "inclou recursivament als submòduls"
 
-#: builtin/submodule--helper.c:2581
+#: 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:2637
+#: 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:2640
-#, 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:2645
-#, 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:2646
-#, 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:2647
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2666 git-submodule.sh:150
-#, fuzzy, sh-format
+#: 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:2682
-#, 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:2686
-#, 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:2719
-#, 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:2721
-#, 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:2725
-#, 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:2726
-#, 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:2733
-#, fuzzy
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
-msgstr "cal el nom de branca"
+msgstr "cal --branch o --default"
+
+#: 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 «%s» a l'índex\n"
+
+#: builtin/submodule--helper.c:3041
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr "«%s» ja existeix i no és un repositori de git vàlid"
+
+#: 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 «%s» localment amb els remots:\n"
+
+#: 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 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: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 «%s»\n"
+
+#: builtin/submodule--helper.c:3110
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "no s'ha pogut agafar el submòdul «%s»"
+
+#: 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 «%s»"
+
+#: 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 «%s»"
+
+#: builtin/submodule--helper.c:3222
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "«%s» ja existeix en l'índex"
+
+#: builtin/submodule--helper.c:3225
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "«%s» ja existeix en l'índex i no és submòdul"
+
+#: builtin/submodule--helper.c:3254
+msgid "branch of repository to add as submodule"
+msgstr "la branca del repositori a afegir com a submòdul"
+
+#: builtin/submodule--helper.c:3255
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "permet afegir un camí de submòdul que si no s'hagués ignorat"
+
+#: builtin/submodule--helper.c:3257
+msgid "print only error messages"
+msgstr "mostra només els missatges d'error"
+
+#: builtin/submodule--helper.c:3261
+msgid "borrow the objects from reference repositories"
+msgstr ""
+"manlleva els objectes dels repositoris de referències"
+
+#: builtin/submodule--helper.c:3263
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"estableix el nom del submòdul a la cadena donada en lloc de per defecte al "
+"seu camí"
+
+#: builtin/submodule--helper.c:3270
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<opcions>] [--] <repositori> [<camí>]"
+
+#: 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:2736
-#, fuzzy
-msgid "--branch and --default are mutually exclusive"
-msgstr "--deepen i --depth són mútuament excloents"
+#: builtin/submodule--helper.c:3306
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "URL de repositori: «%s» ha de ser absolut o començar amb ./|../"
 
-#: builtin/submodule--helper.c:2793 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3341
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "«%s» no és un nom de submòdul vàlid"
+
+#: 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:2799
+#: 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"
@@ -23511,38 +23607,33 @@ msgstr "suprimeix la referència simbòlica"
 msgid "shorten ref output"
 msgstr "escurça la sortida de referències"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "raó"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 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"
-"\t\t<tagname> [<head>]"
+"        <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"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
-"[<pattern>...]"
+"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>..."
@@ -23577,159 +23668,135 @@ msgid ""
 "\n"
 "Write a message for tag:\n"
 "  %s\n"
-"Lines starting with '%c' will be kept; you may remove them yourself if you "
-"want to.\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
 msgstr ""
 "\n"
 "Escriviu el missatge de l'etiqueta:\n"
 "  %s\n"
-"Les línies que comencin amb «%c» es retindran; podeu eliminar-les per vós "
-"mateix si voleu.\n"
+"Les línies que comencin amb «%c» es retindran; podeu eliminar-les per vós mateix si voleu.\n"
 
-#: builtin/tag.c: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:328
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "no hi ha cap missatge d'etiqueta?"
 
-#: builtin/tag.c:335
+#: 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"
 
-#: builtin/tag.c:446
+#: builtin/tag.c:444
 msgid "list tag names"
 msgstr "llista els noms d'etiqueta"
 
-#: builtin/tag.c:448
+#: builtin/tag.c:446
 msgid "print <n> lines of each tag message"
 msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
 
-#: builtin/tag.c:450
+#: builtin/tag.c:448
 msgid "delete tags"
 msgstr "suprimeix les etiquetes"
 
-#: builtin/tag.c:451
+#: builtin/tag.c:449
 msgid "verify tags"
 msgstr "verifica les etiquetes"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:451
 msgid "Tag creation options"
 msgstr "Opcions de creació d'etiquetes"
 
-#: builtin/tag.c:455
+#: builtin/tag.c:453
 msgid "annotated tag, needs a message"
 msgstr "etiqueta anotada, necessita un missatge"
 
-#: builtin/tag.c:457
+#: builtin/tag.c:455
 msgid "tag message"
 msgstr "missatge d'etiqueta"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:457
 msgid "force edit of tag message"
 msgstr "força l'edició del missatge de l'etiqueta"
 
-#: builtin/tag.c:460
+#: builtin/tag.c:458
 msgid "annotated and GPG-signed tag"
 msgstr "etiqueta anotada i signada per GPG"
 
-#: builtin/tag.c:463
+#: builtin/tag.c:461
 msgid "use another key to sign the tag"
 msgstr "usa una altra clau per a signar l'etiqueta"
 
-#: builtin/tag.c:464
+#: builtin/tag.c:462
 msgid "replace the tag if exists"
 msgstr "reemplaça l'etiqueta si existeix"
 
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "crea un registre de referències"
 
-#: builtin/tag.c:467
+#: builtin/tag.c:465
 msgid "Tag listing options"
 msgstr "Opcions de llistat d'etiquetes"
 
-#: builtin/tag.c:468
+#: builtin/tag.c:466
 msgid "show tag list in columns"
 msgstr "mostra la llista d'etiquetes en columnes"
 
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
 msgid "print only tags that contain the commit"
 msgstr "imprimeix només les etiquetes que continguin la comissió"
 
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that don't contain the commit"
 msgstr "imprimeix només les etiquetes que no continguin la comissió"
 
-#: builtin/tag.c:473
+#: builtin/tag.c:471
 msgid "print only tags that are merged"
 msgstr "imprimeix només les etiquetes que s'han fusionat"
 
-#: builtin/tag.c:474
+#: builtin/tag.c:472
 msgid "print only tags that are not merged"
 msgstr "imprimeix només les etiquetes que no s'han fusionat"
 
-#: builtin/tag.c:478
+#: builtin/tag.c:476
 msgid "print only tags of the object"
 msgstr "imprimeix només les etiquetes de l'objecte"
 
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column i -n són incompatibles"
-
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "es permet l'opció -n només amb mode llista"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "es permet l'opció --contains només amb mode llista"
-
-#: builtin/tag.c:552
-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:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "es permet --points-at option només amb mode llista"
-
-#: builtin/tag.c:556
-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:567
-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:592
+#: 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:597
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "l'etiqueta «%s» ja existeix"
 
-#: builtin/tag.c:628
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Etiqueta «%s» actualitzada (era %s)\n"
@@ -23743,226 +23810,220 @@ msgstr "S'estan desempaquetant els objectes"
 msgid "failed to create directory %s"
 msgstr "s'ha produït un error en crear el directori %s"
 
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "s'ha produït un error en crear el fitxer %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "s'ha produït un error en suprimir el fitxer %s"
 
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "s'ha produït un error en suprimir el directori %s"
 
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "S'està provant mtime en «%s» "
 
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 "la informació de stat de directori no canvia després d'afegir un fitxer nou"
 
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "la informació de stat de directori no canvia després d'afegir un directori "
 "nou"
 
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "la informació de stat de directori canvia després d'actualitzar un fitxer"
 
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "la informació de stat de directori canvia després d'afegir un fitxer dins "
 "d'un subdirectori"
 
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 "la informació de stat de directori no canvia després de suprimir un fitxer"
 
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
-"la informació de stat de directori no canvia després de suprimir un directori"
+"la informació de stat de directori no canvia després de suprimir un "
+"directori"
 
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
 msgid " OK"
 msgstr " D'acord"
 
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
 
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr ""
 "continua l'actualització encara que l'índex necessiti una actualització"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "actualitza: ignora els submòduls"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "no ignoris els fitxers nous"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "tingues en compte els fitxers absents de l'arbre de treball"
 
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "actualitza encara que l'índex contingui entrades no fusionades"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "actualitza la informació d'estadístiques"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "com --refresh, però ignora el paràmetre assume-unchanged"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<mode>,<objecte>,<camí>"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "afegeix l'entrada especificada a l'índex"
 
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "marca els fitxers com a «no canviant»"
 
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "esborra el bit assumed-unchanged"
 
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "marca els fitxers com a «només índex»"
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "esborra el bit skip-worktree"
 
-#: builtin/update-index.c:1022
-#, fuzzy
+#: builtin/update-index.c:1020
 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:1024
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "només afegeix a l'índex; no afegeixis el contingut a la base de dades "
 "d'objectes"
 
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "elimina els camins anomenats encara que estiguin presents en l'arbre de "
 "treball"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "amb --stdin: les línies d'entrada acaben amb octets nuls"
 
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "llegeix la llista de camins a actualitzar des de l'entrada estàndard"
 
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "afegeix les entrades de l'entrada estàndard a l'índex"
 
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "reemplena les «stage» #2 i #3 per als camins llistats"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "només actualitza les entrades que difereixin de HEAD"
 
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "ignora els fitxers absents de l'arbre de treball"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "informa de les accions en la sortida estàndard"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "escriu l'índex en aquest format"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "habilita o inhabilita l'índex dividit"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "habilita/inhabilita la memòria cau no seguida"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "prova si el sistema de fitxers admet la memòria cau no seguida"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
 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:1065
-#, fuzzy
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "escriu l'índex encara que no estigui marcat com a canviat"
 
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "habilita o inhabilita el monitor del sistema de fitxers"
 
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "marca els fitxers com a vàlids pel fsmonitor"
 
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "esborra el bit de validesa del fsmonitor"
 
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
-"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment "
-"voleu habilitar l'índex dividit"
+"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment"
+" voleu habilitar l'índex dividit"
 
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr ""
-"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment "
-"voleu inhabilitar l'índex dividit"
+"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment"
+" voleu inhabilitar l'índex dividit"
 
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -23970,41 +24031,41 @@ msgstr ""
 "core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si "
 "realment voleu inhabilitar el cau no seguit"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "La memòria cau no seguida està inhabilitada"
 
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
 msgid ""
-"core.untrackedCache is set to false; remove or change it, if you really want "
-"to enable the untracked cache"
+"core.untrackedCache is set to false; remove or change it, if you really want"
+" to enable the untracked cache"
 msgstr ""
 "core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si "
 "realment voleu habilitar el cau no seguit"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "La memòria cau no seguida està habilitada per a «%s»"
 
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 "core.fsmonitor està establert a fals; establiu-lo a cert si realment voleu "
 "habilitar fsmonitor"
 
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "fsmonitor habilitat"
 
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 "core.fsmonitor està establert a cert; elimineu-lo si realment voleu "
 "inhabilitar fsmonitor"
 
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "fsmonitor inhabilitat"
 
@@ -24015,25 +24076,26 @@ msgstr "git update-ref [<opcions>] -d <nom-de-referència> [<valor-antic>]"
 #: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr ""
-"git update-ref [<opcions>]    <nom-de-referència> <valor-nou> [<valor-antic>]"
+"git update-ref [<opcions>]    <nom-de-referència> <valor-nou> [<valor-"
+"antic>]"
 
 #: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<opcions>] --stdin [-z]"
 
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "suprimeix la referència"
 
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
 msgstr "actualitza <nom de referència>, no la que apunti"
 
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin té arguments acabats amb NUL"
 
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "llegeix les actualitzacions des de stdin"
 
@@ -24049,20 +24111,20 @@ msgstr "actualitza els fitxers d'informació des de zero"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<opcions>] <directori>"
 
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
 msgid "quit after a single request/response exchange"
 msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
 
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "surt immediatament després de l'anunci inicial de referència"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "serveix les info/refs per a git-http-backend"
 
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 "no intentis <directori>/.git/ si <directori> no és cap directori del Git"
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interromp la transferència després de <n> segons d'inactivitat"
 
@@ -24098,103 +24160,100 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format>] <etiqueta>..."
 msgid "print tag contents"
 msgstr "imprimeix els continguts de l'etiqueta"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<opcions>] <camí> [<commit-ish>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opcions>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opcions>] <camí>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <arbre de treball> <camí-nou>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opcions>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<opcions>] <arbre de treball>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <camí>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:935
+#: builtin/worktree.c:75
 #, c-format
-msgid "failed to delete '%s'"
-msgstr "s'ha produït un error en suprimir «%s»"
-
-#: builtin/worktree.c:74
-#, fuzzy, c-format
 msgid "Removing %s/%s: %s"
-msgstr "S'està eliminant %s"
+msgstr "S'està eliminant %s/%s: %s"
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
 msgid "report pruned working trees"
 msgstr "informa dels arbres de treball podats"
 
-#: builtin/worktree.c:151
+#: 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:221
+#: builtin/worktree.c:220
 #, c-format
 msgid "'%s' already exists"
 msgstr "«%s» ja existeix"
 
-#: builtin/worktree.c:230
-#, fuzzy, c-format
+#: builtin/worktree.c:229
+#, 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:235
-#, fuzzy, c-format
+#: builtin/worktree.c:234
+#, 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:237
-#, fuzzy, c-format
+#: builtin/worktree.c:236
+#, 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:288
+#: builtin/worktree.c:287
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "no s'ha pogut crear directori de «%s»"
 
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+msgid "initializing"
+msgstr "s'està inicialitzant"
+
+#: 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:424
-#, 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:433
+#: 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:439
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "S'està preparant l'arbre de treball (HEAD %s separat)"
@@ -24219,170 +24278,160 @@ msgstr "emplena l'arbre de treball nou"
 msgid "keep the new working tree locked"
 msgstr "mantén l'arbre de treball nou bloquejat"
 
-#: builtin/worktree.c:493
+#: builtin/worktree.c:492 builtin/worktree.c:729
+msgid "reason for locking"
+msgstr "raó per a bloquejar"
+
+#: 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:496
+#: 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"
+"prova de fer coincidir el nom de la branca nova amb una branca amb seguiment"
+" remot"
 
-#: builtin/worktree.c:504
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B i --detach són mútuament excloents"
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "afegit amb --lock"
 
-#: builtin/worktree.c:565
+#: 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:682
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
-msgstr ""
-
-#: builtin/worktree.c:684
-#, fuzzy
-msgid "add 'prunable' annotation to worktrees older than <time>"
-msgstr "fes caducar els arbres de treball més vells que <hora>"
+msgstr "mostra les anotacions esteses i les raons, si estan disponibles"
 
 #: builtin/worktree.c:693
-#, fuzzy
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "-p i --overlay són mútuament excloents"
-
-#: builtin/worktree.c:720
-msgid "reason for locking"
-msgstr "raó per bloquejar"
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr "afegeix l'anotació «prunable» als arbres de treball més antics que <data>"
 
-#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
-#: builtin/worktree.c:963
+#: 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:734 builtin/worktree.c:767
+#: 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:739
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "«%s» ja està bloquejat, raó: «%s»"
 
-#: builtin/worktree.c:741
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "«%s» ja està bloquejat"
 
-#: builtin/worktree.c:769
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "«%s» no està bloquejat"
 
-#: builtin/worktree.c:810
+#: 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:818
+#: 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:841 builtin/worktree.c:965
+#: 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:846
+#: 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:859
-#, 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:861
-#, 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:864
+#: 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:869
+#: 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:915
+#: 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:919
-#, 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:924
+#: 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:947
+#: 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:970
-#, 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:972
-#, 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:975
-#, 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:999
-#, 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:1002
-#, 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>/]"
@@ -24401,19 +24450,20 @@ 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"
-"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\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>]"
 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 ""
@@ -24422,26 +24472,21 @@ msgid ""
 "to read about a specific subcommand or concept.\n"
 "See 'git help git' for an overview of the system."
 msgstr ""
-"«git help -a» i «git help -g» llisten subordres disponibles i\n"
+"«git help -a» i «git help -g» llisten les subordres disponibles i\n"
 "algunes guies de concepte. Vegeu «git help <ordre>» o\n"
-"«git help <concepte>» per a llegir sobre una subordre o concepte específic.\n"
-"Vegeu «git help git» per a una visió general del sistema."
+"«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"
@@ -24453,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
@@ -24468,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
@@ -24478,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:833
-#, 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:883
-#, 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:896
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -24522,45 +24562,32 @@ msgstr ""
 "ús: %s\n"
 "\n"
 
-#: git.c:916
-#, 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:928
+#: 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 dipòsit 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
@@ -24579,156 +24606,113 @@ msgstr "test-tool serve-v2 [<opcions>]"
 msgid "exit immediately after advertising capabilities"
 msgstr "surt immediatament després d'anunciar les funcionalitats"
 
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:264
-#, fuzzy, c-format
-msgid "could not start server on: '%s'"
-msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:356
-#, fuzzy
-msgid "waitpid failed"
-msgstr "«setsid» ha fallat"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:406
-#, fuzzy
-msgid "daemon failed to start"
-msgstr "s'ha produït un error en fer stat a %s"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
 msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
-msgstr ""
+msgstr "test-helper simple-ipc is-active    [<nom>] [<opcions>]"
 
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
 msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
-msgstr ""
+msgstr "test-helper simple-ipc run-daemon   [<nom>] [<fils>]"
 
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
-msgstr ""
+msgstr "test-helper simple-ipc start-daemon [<nom>] [<fils>] [<max-wait>]"
 
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
 msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
-msgstr ""
+msgstr "test-helper simple-ipc stop-daemon  [<nom>] [<max-wait>]"
 
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
 msgid "test-helper simple-ipc send         [<name>] [<token>]"
-msgstr ""
+msgstr "test-helper simple-ipc send         [<nom>] [<testimoni>]"
 
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
 msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
-msgstr ""
+msgstr "test-helper simple-ipc sendbytes    [<nom>] [<bytecount>] [<byte>]"
 
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
 msgid ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
 msgstr ""
+"test-helper simple-ipc multiple     [<nom>] [<fils>] [<bytecount>] "
+"[<batchsize>]"
 
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
 msgid "name or pathname of unix domain socket"
-msgstr ""
+msgstr "nom o nom de camí del sòcol de domini unix"
 
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
 msgid "named-pipe name"
-msgstr ""
+msgstr "nom del conducte amb nom"
 
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
 msgid "number of threads in server thread pool"
-msgstr ""
+msgstr "nombre de fils en el conjunt de fils del servidor"
 
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
 msgid "seconds to wait for daemon to start or stop"
-msgstr ""
+msgstr "segons a esperar que el dimoni comenci o s'aturi"
 
-#: t/helper/test-simple-ipc.c:703
-#, fuzzy
+#: t/helper/test-simple-ipc.c:602
 msgid "number of bytes"
-msgstr "nombre incorrecte d'arguments"
+msgstr "nombre d'octets"
 
-#: t/helper/test-simple-ipc.c:704
-#, fuzzy
+#: t/helper/test-simple-ipc.c:603
 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:706
-#, fuzzy
+#: t/helper/test-simple-ipc.c:605
 msgid "byte"
-msgstr "octets"
+msgstr "octet"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "ballast character"
-msgstr ""
+msgstr "caràcter de llast"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "token"
-msgstr ""
+msgstr "testimoni"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "command token to send to the server"
-msgstr ""
+msgstr "testimoni d'ordre a enviar al servidor"
 
-#: http.c:399
+#: http.c:350
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "valor negatiu per http.postbuffer; utilitzant el valor %d"
 
-#: http.c:420
+#: http.c:371
 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:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "No s'admet la fixació de clau pública amb cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "No s'admet la fixació de clau pública amb cURL < 7.39.0"
 
-#: http.c:910
-#, fuzzy
+#: http.c:812
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
-msgstr "CURLSSLOPTNOREVOKE no està suportat amb cURL < 7.44.0"
-
-#: http.c:989
-#, fuzzy
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Restriccions de protocol no compatibles amb cURL < 7.19.4"
+msgstr "CURLSSLOPT_NO_REVOKE no està admès amb cURL < 7.44.0"
 
-#: http.c:1132
-#, fuzzy, c-format
+#: http.c:1016
+#, 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:1139
-#, fuzzy, c-format
+#: http.c:1023
+#, 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:1143
-#, fuzzy, c-format
+#: http.c:1027
+#, 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:2035
+#: http.c:1876
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -24740,162 +24724,326 @@ 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:307
-#, fuzzy, c-format
+#: remote-curl.c:304
+#, 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:408
-#, fuzzy
+#: remote-curl.c:405
 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:439
-#, fuzzy, c-format
+#: remote-curl.c:436
+#, c-format
 msgid "invalid server response; got '%s'"
 msgstr "resposta del servidor no vàlida; s'ha obtingut «%s»"
 
-#: remote-curl.c:499
+#: remote-curl.c:496
 #, c-format
 msgid "repository '%s' not found"
-msgstr "no s'ha trobat el dipòsit «%s»"
+msgstr "no s'ha trobat el repositori «%s»"
 
-#: remote-curl.c:503
+#: remote-curl.c:500
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "S'ha produït un error en autenticar per «%s»"
 
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "no es pot accedir a «%s» la configuració de http.pinnedPubkey :%s"
+
+#: remote-curl.c:508
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "no s'ha pogut accedir a «%s»: %s"
 
-#: remote-curl.c:513
+#: remote-curl.c:514
 #, c-format
 msgid "redirecting to %s"
 msgstr "s'està redirigint a %s"
 
-#: remote-curl.c:642
-#, fuzzy
+#: remote-curl.c:645
 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:654
-msgid "remote server sent stateless separator"
-msgstr "el servidor remot ha enviat un separador sense estat"
+#: 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:724
-#, fuzzy
+#: remote-curl.c:726
 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:754
-#, fuzzy, c-format
+#: remote-curl.c:755
+#, 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:756
-#, fuzzy
+#: remote-curl.c:757
 msgid "remote-curl: unexpected response end packet"
-msgstr "paquet final de resposta inesperat del remot"
+msgstr "remote-curl: paquet final de resposta inesperat"
 
-#: remote-curl.c:832
+#: remote-curl.c:833
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC ha fallat; %s"
 
-#: remote-curl.c:872
-#, fuzzy
+#: remote-curl.c:873
 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:987
-#, fuzzy, c-format
+#: remote-curl.c:986
+#, 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:991
-#, fuzzy, c-format
+#: remote-curl.c:990
+#, 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:1041
-#, fuzzy, c-format
+#: remote-curl.c:1040
+#, 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:1043
-#, fuzzy, c-format
+#: remote-curl.c:1042
+#, 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:1132
-#, fuzzy
+#: remote-curl.c:1131
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "el transport ximple http no admet capacitats superficials"
 
-#: remote-curl.c:1147
-#, fuzzy
+#: remote-curl.c:1146
 msgid "fetch failed."
-msgstr "el fetch ha fallat."
+msgstr "l'obtenció ha fallat."
 
-#: remote-curl.c:1193
-#, fuzzy
+#: remote-curl.c:1192
 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:1237 remote-curl.c:1243
-#, fuzzy, c-format
+#: remote-curl.c:1236 remote-curl.c:1242
+#, 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:1255 remote-curl.c:1373
-#, fuzzy, c-format
+#: remote-curl.c:1254 remote-curl.c:1372
+#, 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:1291
-#, fuzzy
+#: remote-curl.c:1290
 msgid "git-http-push failed"
 msgstr "git-http-push ha fallat"
 
-#: remote-curl.c:1479
-#, fuzzy
+#: remote-curl.c:1478
 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:1511
-#, fuzzy
+#: remote-curl.c:1510
 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:1518
-#, fuzzy
+#: remote-curl.c:1517
 msgid "remote-curl: fetch attempted without a local repo"
-msgstr "s'ha intentat recuperar el valor remot sense un dipòsit local"
+msgstr "remote-curl: s'ha intentat l'obtenció sense un dipòsit local"
 
-#: remote-curl.c:1559
-#, fuzzy, c-format
+#: remote-curl.c:1558
+#, 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"
@@ -24905,11 +25053,11 @@ msgstr "arguments"
 msgid "object filtering"
 msgstr "filtratge d'objecte"
 
-#: parse-options.h:184
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "data-de-caducitat"
 
-#: parse-options.h:198
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "operació nul·la (per a compatibilitat amb versions anteriors)"
 
@@ -24922,32 +25070,30 @@ msgid "be more quiet"
 msgstr "sigues més discret"
 
 #: parse-options.h:318
-#, fuzzy
 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:337
 msgid "how to strip spaces and #comments from message"
 msgstr "com suprimir els espais i #comentaris del missatge"
 
 #: parse-options.h:338
-#, fuzzy
 msgid "read pathspec from file"
 msgstr "llegeix l'especificació del camí del fitxer"
 
 #: parse-options.h:339
-#, fuzzy
 msgid ""
-"with --pathspec-from-file, pathspec elements are separated with NUL character"
+"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:99
+#: ref-filter.h:98
 msgid "key"
 msgstr "clau"
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "nom del camp en el qual ordenar"
 
@@ -24974,7 +25120,7 @@ msgstr "Aplica un pedaç a fitxer i/o a l'índex"
 
 #: command-list.h:54
 msgid "Import a GNU Arch repository into Git"
-msgstr "Importa un dipòsit GNU Arch a Git"
+msgstr "Importa un repositori GNU Arch a Git"
 
 #: command-list.h:55
 msgid "Create an archive of files from a named tree"
@@ -24995,19 +25141,18 @@ 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"
 
 #: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr ""
-"Proveeix contingut o informació del tipus i mida per als objectes del dipòsit"
+"Proveeix contingut o informació del tipus i mida per als objectes del "
+"repositori"
 
 #: command-list.h:62
 msgid "Display gitattributes information"
@@ -25018,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"
@@ -25052,7 +25196,7 @@ msgstr "Elimina els fitxers no seguits de l'arbre de treball"
 
 #: command-list.h:72
 msgid "Clone a repository into a new directory"
-msgstr "Clona un dipòsit a un directori nou"
+msgstr "Clona un repositori a un directori nou"
 
 #: command-list.h:73
 msgid "Display data in columns"
@@ -25060,7 +25204,7 @@ msgstr "Mostra les dades en columnes"
 
 #: command-list.h:74
 msgid "Record changes to the repository"
-msgstr "Registra els canvis al dipòsit"
+msgstr "Registra els canvis al repositori"
 
 #: command-list.h:75
 msgid "Write and verify Git commit-graph files"
@@ -25072,36 +25216,32 @@ msgstr "Crea un objecte de comissió nou"
 
 #: command-list.h:77
 msgid "Get and set repository or global options"
-msgstr "Obté o estableix opcions de dipòsit o globals"
+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"
@@ -25109,12 +25249,12 @@ msgstr "Un emulador de servidor CVS per al Git"
 
 #: command-list.h:85
 msgid "A really simple server for Git repositories"
-msgstr "Un servidor realment senzill per a dipòsits Git"
+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"
@@ -25130,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 "
@@ -25142,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"
@@ -25150,11 +25289,11 @@ msgstr "Rerefons per a importadors ràpids de dades de Git"
 
 #: command-list.h:94
 msgid "Download objects and refs from another repository"
-msgstr "Baixa objectes i referències d'un altre dipòsit"
+msgstr "Baixa objectes i referències d'un altre repositori"
 
 #: command-list.h:95
 msgid "Receive missing objects from another repository"
-msgstr "Rep els objectes que manquen des d'un altre dipòsit"
+msgstr "Rep els objectes que manquen des d'un altre repositori"
 
 #: command-list.h:96
 msgid "Rewrite branches"
@@ -25169,13 +25308,12 @@ 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 dipòsit"
+msgstr "Executa una ordre Git en una llista de repositoris"
 
 #: command-list.h:100
 msgid "Prepare patches for e-mail submission"
-msgstr "Prepara pedaços per enviar-los per correu electrònic"
+msgstr "Prepara pedaços per a enviar-los per correu electrònic"
 
 #: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
@@ -25183,10 +25321,9 @@ msgstr "Verifica la connectivitat i validesa dels objectes a la base de dades"
 
 #: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
-msgstr "Neteja els fitxers innecessaris i optimitza el dipòsit local"
+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"
 
@@ -25196,7 +25333,7 @@ msgstr "Imprimeix les línies coincidents amb un patró"
 
 #: command-list.h:105
 msgid "A portable graphical interface to Git"
-msgstr "Una interfície gràfic portable per al Git"
+msgstr "Una interfície gràfica portable per al Git"
 
 #: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
@@ -25212,520 +25349,464 @@ msgstr "Implementació al servidor del Git sobre HTTP"
 
 #: command-list.h:109
 msgid "Download from a remote Git repository via HTTP"
-msgstr "Baixa des d'un dipòsit Git remot 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 dipòsit"
+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"
+"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"
 
 #: command-list.h:113
 msgid "Create an empty Git repository or reinitialize an existing one"
-msgstr "Crea un dipòsit de Git buit o reinicialitza un existent"
+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 dipòsit de treball a 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 dipòsits 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 dipòsit remot"
+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 dipòsit 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 dipòsits Perforce"
+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 dipòsit o una branca local"
+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
-#, fuzzy
+#: command-list.h:146
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
-msgstr ""
-"Compara dos intervals de comissions (p. ex. dues versions d'una branca)"
+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
-#, fuzzy
+#: 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 dipòsits seguits"
+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 dipòsit"
+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 dipòsit"
+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
-msgid "List references in a local repository"
-msgstr "Llista les referències en un dipòsit 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"
+msgid "List references in a local repository"
+msgstr "Llista les referències en un repositori local"
 
 #: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "Codi de scripts de configuració comuns pel Git shell"
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Inicialitza i modifica el «sparse-checkout»"
 
 #: command-list.h:173
-#, fuzzy
-msgid "Initialize and modify the sparse-checkout"
-msgstr "Inicialitza i modifica la comprovació «sparse»"
+msgid "Add file contents to the staging area"
+msgstr "Afegeix el contingut del fitxer a l'àrea de «staging»"
 
 #: command-list.h:174
-#, fuzzy
 msgid "Stash the changes in a dirty working directory away"
-msgstr "Desa els canvis en un directori de treball brut"
+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 dipòsit a Subversion i Git"
+msgstr "Operació bidireccional entre un repositori a Subversion i Git"
 
-#: command-list.h:180
+#: command-list.h:179
 msgid "Switch branches"
-msgstr "Commuta branques"
+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"
+"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"
+"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 dipòsits 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
+#: 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 ""
+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 dipòsits remots"
+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 dipòsit del Git"
+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 dipòsit dins un altre"
+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"
 msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
 
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "ha fallat l'execució de bisect: no s'ha proporcionat cap ordre."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "s'està executant $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"el pas de bisecció ha fallat:\n"
-"el codi de sortida $res de «$command» és < 0 o bé >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "el pas de bisecció no pot continuar més"
-
-#: git-bisect.sh:111
-#, fuzzy, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"el pas de bisecció ha fallat:\n"
-"«bisect_state $state» ha sortit amb el codi d'error $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "pas de bisecció reeixit"
-
 #: git-merge-octopus.sh:46
 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"
+"a fusionar"
 
 #: git-merge-octopus.sh:61
 msgid "Automated merge did not work."
@@ -25733,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
@@ -25760,98 +25841,18 @@ msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 "La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
 
-#: git-submodule.sh:179
-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"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "URL de dipòsit: «$repo» ha de ser absolut o començar amb ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "«$sm_path» ja existeix en l'índex"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "«$sm_path» ja existeix en l'índex i no és submòdul"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "«$sm_path» no té una comissió agafada"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "S'està afegint el dipòsit existent a «$sm_path» a l'índex"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "«$sm_path» ja existeix i no és un dipòsit de git vàlid"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-"S'ha trobat un directori de git per a «$sm_name» localment amb els remots:"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-"  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"Si voleu reusar aquest directori de git local en lloc de clonar de nou de\n"
-"  $realrepo\n"
-"useu l'opció «--force». Si el directori de git local no és el dipòsit "
-"correcte\n"
-"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció «--"
-"name»."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr ""
-"S'està reactivant el directori de git local per al submòdul «$sm_name»."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "No s'ha pogut agafar el submòdul «$sm_path»"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "S'ha produït un error en afegir el submòdul «$sm_path»"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "S'ha produït un error en registrar el submòdul «$sm_path»"
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "No s'ha pogut trobar la revisió actual en el camí de submòdul «$displaypath»"
 
-#: git-submodule.sh:578
+#: git-submodule.sh:411
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "No s'ha pogut obtenir en el camí de submòdul «$sm_path»"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:416
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25860,464 +25861,54 @@ msgstr ""
 "No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
 "camí de submòdul «$sm_path»"
 
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"No s'ha pogut obtenir en el camí de submòdul «$displaypath»; s'està "
-"intentant obtenir directament $sha1:"
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"S'ha obtingut en el camí de submòdul «$displaypath», però no contenia $sha1. "
-"L'obtenció directa d'aquella comissió ha fallat."
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "No s'ha pogut agafar «$sha1» en el camí de submòdul «$displaypath»"
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Camí de submòdul «$displaypath»: s'ha agafat «$sha1»"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"No s'ha pogut fer «rebase» «$sha1» en el camí de submòdul «$displaypath»"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Camí de submòdul «$displaypath»: s'ha fet «rebase» en «$sha1»"
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "No s'ha pogut fusionar «$sha1» en el camí de submòdul «$displaypath»"
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Camí de submòdul «$displaypath»: s'ha fusionat en «$sha1»"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"L'execució de «$command $sha1» ha fallat en el camí de submòdul "
-"«$displaypath»"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Camí de submòdul «$displaypath»: «$command $sha1»"
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 "S'ha produït un error en recórrer recursivament dins del camí de submòdul "
 "«$displaypath»"
 
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "S'ha aplicat l'«autostash»."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "No es pot emmagatzemar $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "S'està fent «rebase» ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-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"
-
-#: git-rebase--preserve-merges.sh:260
-#, 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"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: no és una comissió que es pugui triar"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Nom de comissió no vàlid: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "No es pot escriure el sha1 reemplaçant de la comissió actual"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Avanç ràpid a $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "No es pot avançar ràpidament a $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "No es pot moure HEAD a $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "S'està refusant fer «squash» a una fusió: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Error en refer la fusió $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "No s'ha pogut triar $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Aquest és el missatge de comissió núm. ${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "El missatge de comissió núm. ${n} s'ometrà:"
-
-#: git-rebase--preserve-merges.sh:473
-#, 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."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "No es pot escriure $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Això és una combinació de 2 comissions."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "No s'ha pogut aplicar $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, 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ó."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "S'ha aturat a $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "No es pot fer «$squash_style» sense una comissió prèvia"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "S'està executant: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "L'execució ha fallat: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "i ha fet canvis a l'índex o l'arbre de treball"
-
-#: git-rebase--preserve-merges.sh:685
-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"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, 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"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Ordre desconeguda: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Corregiu-ho usant «git rebase --edit-todo»."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, 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"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-"Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar "
-"la comissió"
-
-#: git-rebase--preserve-merges.sh:829
-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."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "No s'han pogut cometre els canvis «staged»."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "No s'ha pogut executar l'editor"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "No s'ha pogut agafar $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "No hi ha cap HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "No s'ha pogut crear el $state_dir temporal"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "No s'ha pogut marcar com a interactiu"
-
-#: git-rebase--preserve-merges.sh:933
-#, 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)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Tingueu en compte que les comissions buides estan comentades"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "No s'han pogut iniciar les comissions reescrites"
-
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 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
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
-
-#: git-sh-setup.sh:224
+#: 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:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "No es pot baixar fent «rebase»: Teniu canvis «unstaged»."
-
-#: git-sh-setup.sh:230
+#: 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:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "No es pot fer «rebase»: El vostre índex conté canvis sense cometre."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"No es pot baixar fent «rebase»: El vostre índex conté canvis sense cometre."
-
-#: git-sh-setup.sh:249
+#: 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:253
+#: 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:373
+#: 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:378
+#: 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"
 
@@ -26365,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
@@ -26374,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
@@ -26399,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"
@@ -26413,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"
@@ -26427,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"
@@ -26441,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"
@@ -26455,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"
@@ -26469,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"
@@ -26483,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"
@@ -26497,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"
@@ -26511,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"
@@ -26533,212 +26124,207 @@ 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"
 "revert        - revert staged set of changes back to the HEAD version\n"
 "patch         - pick hunks and update selectively\n"
 "diff          - view diff between HEAD and index\n"
-"add untracked - add contents of untracked files to the staged set of "
-"changes\n"
+"add untracked - add contents of untracked files to the staged set of changes\n"
 msgstr ""
 "status        - mostra els camins amb canvis\n"
-"update        - afegeix l'estat de l'arbre de treball al conjunt de canvis "
-"«staged»\n"
+"update        - afegeix l'estat de l'arbre de treball al conjunt de canvis «staged»\n"
 "revert        - reverteix el conjunt de canvis de «staged» a la versió HEAD\n"
 "patch         - selecciona trossos i actualitza'ls selectivament\n"
 "diff          - mostra la diferència entre HEAD i l'índex\n"
-"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de "
-"canvis «staged»\n"
+"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de canvis «staged»\n"
 
-#: git-add--interactive.perl: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:138
+#: 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:145 git-send-email.perl:151
+#: 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:222
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
-msgstr ""
+msgstr "fatal: l'ordre «%s» ha mort amb el codi de sortida %d"
 
-#: git-send-email.perl:235
+#: 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:321
+#: git-send-email.perl:346
 #, perl-format
-msgid ""
-"'%s' contains an intermediate version of the email you were composing.\n"
+msgid "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "«%s» conté una versió intermèdia del correu que estàveu redactant.\n"
 
-#: git-send-email.perl:326
+#: 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:419
+#: 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:493
-#, 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:498 git-send-email.perl:700
+#: 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 dipòsit\n"
+msgstr "No es pot executar git format-patch des de fora del repositori\n"
 
-#: git-send-email.perl:501
-#, 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:514
+#: 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:545
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Paràmetre --confirm desconegut: «%s»\n"
 
-#: git-send-email.perl:573
+#: 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:575
+#: 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:577
+#: 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:582
+#: 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:666
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26748,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:687
+#: 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:720
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26768,17 +26354,17 @@ msgstr ""
 "No s'han especificat fitxers de pedaç\n"
 "\n"
 
-#: git-send-email.perl:733
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Sense assumpte a %s?"
 
-#: git-send-email.perl:743
+#: 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:754
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26792,27 +26378,27 @@ msgstr ""
 "\n"
 "Esborreu el contingut del cos si no voleu enviar cap resum.\n"
 
-#: git-send-email.perl:778
+#: 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:795
+#: 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:838
+#: 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:873
+#: 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:928
+#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -26820,40 +26406,38 @@ msgstr ""
 "Els fitxers següents són 8bit, però no declaren un Content-Transfer-"
 "Encoding.\n"
 
-#: git-send-email.perl:933
+#: 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:941
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
 "\t%s\n"
-"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
-"want to send.\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n"
 msgstr ""
 "S'ha refusat a enviar perquè el pedaç\n"
 "\t%s\n"
-"perquè la plantilla té l'assumpte «*** SUBJECT HERE ***». Passeu --force si "
-"realment voleu enviar-ho.\n"
+"perquè la plantilla té l'assumpte «*** SUBJECT HERE ***». Passeu --force si realment voleu enviar-ho.\n"
 
-#: git-send-email.perl:960
+#: 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:978
+#: 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:990
+#: 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:1048 git-send-email.perl:1056
+#: 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"
@@ -26861,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:1060
+#: 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:1377
+#: 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:1460
+#: 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"
@@ -26890,154 +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:1475
+#: 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:1478
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Requereix resposta en enviar el correu"
 
-#: git-send-email.perl:1506
+#: 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:1553
+#: 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:1558 git-send-email.perl:1562
+#: 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:1571
+#: 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."
+"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i"
+" useu --smtp-debug."
 
-#: git-send-email.perl:1589
+#: 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:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Simulació d'enviament %s\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviat %s\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulació de correcte. El registre diu:\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "Correcte. El registre diu: \n"
 
-#: git-send-email.perl:1606
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Resultat: "
 
-#: git-send-email.perl:1609
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Resultat: correcte\n"
 
-#: git-send-email.perl:1627
+#: 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:1674 git-send-email.perl:1694
+#: 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:1680
+#: 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:1737
+#: 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:1772
+#: 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:1883
+#: 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:1890
+#: 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:1894
+#: 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:1924
+#: 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:1932
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "codificació de transferència no vàlida"
 
-#: git-send-email.perl:1966
-#, 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:1976 git-send-email.perl:2029 git-send-email.perl:2039
+#: 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:1979
-#, 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:1997
+#: 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:2001
+#: 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]: "
-
-
diff --git a/po/de.po b/po/de.po
index 20d720b1d0..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-05-17 16:02+0800\n"
-"PO-Revision-Date: 2021-05-23 18:32+0200\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,234 +17,235 @@ 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:376
+#: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Wie bitte (%s)?"
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: 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"
 
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
 #: git-add--interactive.perl:294
 msgid "binary"
 msgstr "Binär"
 
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
 #: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "Nichts"
 
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
 #: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "unverändert"
 
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
 #, c-format
 msgid "could not stage '%s'"
 msgstr "Konnte '%s' nicht zum Commit vormerken."
 
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "konnte Index nicht schreiben"
 
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
 #, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "%d Pfad aktualisiert\n"
 msgstr[1] "%d Pfade aktualisiert\n"
 
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "Hinweis: %s ist nun unversioniert.\n"
 
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: 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"
 
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Revert"
 
-#: add-interactive.c:775
+#: add-interactive.c:779
 msgid "Could not parse HEAD^{tree}"
 msgstr "Konnte HEAD^{tree} nicht parsen."
 
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
 #, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "%d Pfad wiederhergestellt\n"
 msgstr[1] "%d Pfade wiederhergestellt\n"
 
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "Keine unversionierten Dateien.\n"
 
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Unversionierte Dateien hinzufügen"
 
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
 #, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "%d Pfad hinzugefügt\n"
 msgstr[1] "%d Pfade hinzugefügt\n"
 
-#: add-interactive.c:925
+#: add-interactive.c:929
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "Ignoriere nicht zusammengeführte Datei: %s"
 
-#: add-interactive.c:937 add-patch.c:1751 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:939 add-patch.c:1749 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:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Patch Aktualisierung"
 
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Diff überprüfen"
 
-#: add-interactive.c:1010
+#: add-interactive.c:1014
 msgid "show paths with changes"
 msgstr "Zeige Pfade mit Änderungen"
 
-#: add-interactive.c:1012
+#: add-interactive.c:1016
 msgid "add working tree state to the staged set of changes"
 msgstr "Zustand des Arbeitsverzeichnisses zum Commit vormerken"
 
-#: add-interactive.c:1014
+#: add-interactive.c:1018
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "Zum Commit vorgemerkte Änderungen auf HEAD-Version zurücksetzen"
 
-#: add-interactive.c:1016
+#: add-interactive.c:1020
 msgid "pick hunks and update selectively"
 msgstr "Blöcke und Änderung gezielt auswählen"
 
-#: add-interactive.c:1018
+#: add-interactive.c:1022
 msgid "view diff between HEAD and index"
 msgstr "Differenz zwischen HEAD und Index ansehen"
 
-#: add-interactive.c:1020
+#: add-interactive.c:1024
 msgid "add contents of untracked files to the staged set of changes"
 msgstr "Inhalte von unversionierten Dateien zum Commit vormerken"
 
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
 msgid "Prompt help:"
 msgstr "Hilfe für Eingaben:"
 
-#: add-interactive.c:1030
+#: add-interactive.c:1034
 msgid "select a single item"
 msgstr "Ein einzelnes Element auswählen"
 
-#: add-interactive.c:1032
+#: add-interactive.c:1036
 msgid "select a range of items"
 msgstr "Eine Reihe von Elementen auswählen"
 
-#: add-interactive.c:1034
+#: add-interactive.c:1038
 msgid "select multiple ranges"
 msgstr "Mehrere Reihen auswählen"
 
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
 msgid "select item based on unique prefix"
 msgstr "Element basierend auf eindeutigen Präfix auswählen"
 
-#: add-interactive.c:1038
+#: add-interactive.c:1042
 msgid "unselect specified items"
 msgstr "Angegebene Elemente abwählen"
 
-#: add-interactive.c:1040
+#: add-interactive.c:1044
 msgid "choose all items"
 msgstr "Alle Elemente auswählen"
 
-#: add-interactive.c:1042
+#: add-interactive.c:1046
 msgid "(empty) finish selecting"
 msgstr "(leer) Auswählen beenden"
 
-#: add-interactive.c:1079
+#: add-interactive.c:1083
 msgid "select a numbered item"
 msgstr "Ein nummeriertes Element auswählen"
 
-#: add-interactive.c:1083
+#: add-interactive.c:1087
 msgid "(empty) select nothing"
 msgstr "(leer) nichts auswählen"
 
-#: add-interactive.c:1091 builtin/clean.c:816 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:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Was nun"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "staged"
 msgstr "zur Staging-Area hinzugefügt"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "aus Staging-Area entfernt"
 
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
-#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
-#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
-#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
+#: 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"
 
-#: add-interactive.c:1151
+#: add-interactive.c:1155
 msgid "could not refresh index"
 msgstr "Index konnte nicht aktualisiert werden"
 
-#: add-interactive.c:1165 builtin/clean.c:781 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,?]? "
@@ -273,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,?]? "
@@ -315,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,?]? "
@@ -360,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,?]? "
@@ -405,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,?]? "
@@ -454,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 ""
@@ -491,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 ""
@@ -543,34 +544,34 @@ 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\n"
 
-#: add-patch.c:342
+#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "Konnte Block-Header '%.*s' nicht parsen."
 
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "Konnte farbigen Block-Header '%.*s' nicht parsen."
 
-#: add-patch.c:419
+#: add-patch.c:420
 msgid "could not parse diff"
 msgstr "Konnte Differenz nicht parsen."
 
-#: add-patch.c:438
+#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr "Konnte farbige Differenz nicht parsen."
 
-#: add-patch.c:452
+#: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
 msgstr "'%s' konnte nicht ausgeführt werden"
 
-#: add-patch.c:611
+#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
 msgstr "nicht übereinstimmende Ausgabe von interactive.diffFilter"
 
-#: add-patch.c:612
+#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -578,7 +579,7 @@ msgstr ""
 "Der Filter muss eine Eins-zu-Eins-Beziehung\n"
 "zwischen den Ein- und Ausgabe-Zeilen einhalten."
 
-#: add-patch.c:790
+#: add-patch.c:791
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -587,7 +588,7 @@ msgstr ""
 "Erwartete Kontextzeile #%d in\n"
 "%.*s"
 
-#: add-patch.c:805
+#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -600,13 +601,13 @@ msgstr ""
 "\tendet nicht mit:\n"
 "%.*s"
 
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr ""
 "Manueller Editiermodus für Patch-Blöcke -- siehe nach unten für eine\n"
 "Kurzanleitung.\n"
 
-#: add-patch.c:1085
+#: add-patch.c:1086
 #, c-format
 msgid ""
 "---\n"
@@ -620,7 +621,7 @@ msgstr ""
 "Zeilen, die mit %c beginnen, werden entfernt.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -631,11 +632,11 @@ msgstr ""
 "werden,\n"
 "wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n"
 
-#: add-patch.c:1132
+#: add-patch.c:1133
 msgid "could not parse hunk header"
 msgstr "Konnte Block-Header nicht parsen."
 
-#: add-patch.c:1177
+#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr "'git apply --cached' schlug fehl."
 
@@ -651,27 +652,27 @@ 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:1246 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 ""
 "Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n"
 "Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?"
 
-#: add-patch.c:1289
+#: add-patch.c:1290
 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:1290 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:1297 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "Nichts angewendet.\n"
 
-#: add-patch.c:1354
+#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -695,73 +696,73 @@ msgstr ""
 "e - aktuellen Patch-Block manuell editieren\n"
 "? - Hilfe anzeigen\n"
 
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
 msgstr "Kein vorheriger Patch-Block"
 
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
 msgstr "Kein folgender Patch-Block"
 
-#: add-patch.c:1537
+#: add-patch.c:1538
 msgid "No other hunks to goto"
 msgstr "Keine anderen Patch-Blöcke verbleibend"
 
-#: add-patch.c:1548 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:1549 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? "
 
-#: add-patch.c:1560
+#: add-patch.c:1561
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Ungültige Nummer: '%s'"
 
-#: add-patch.c:1565
+#: add-patch.c:1566
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar."
 msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar."
 
-#: add-patch.c:1574
+#: add-patch.c:1575
 msgid "No other hunks to search"
 msgstr "Keine anderen Patch-Blöcke zum Durchsuchen"
 
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "Suche nach regulärem Ausdruck? "
 
-#: add-patch.c:1595
+#: add-patch.c:1596
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s"
 
-#: add-patch.c:1612
+#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
 msgstr "Kein Patch-Block entspricht dem angegebenen Muster"
 
-#: add-patch.c:1619
+#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
 msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen"
 
-#: add-patch.c:1623
+#: add-patch.c:1624
 #, c-format
 msgid "Split into %d hunks."
 msgstr "In %d Patch-Block aufgeteilt."
 
-#: add-patch.c:1627
+#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
 msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten"
 
-#: add-patch.c:1679
+#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr "'git apply' schlug fehl"
 
-#: advice.c:145
+#: advice.c:78
 #, c-format
 msgid ""
 "\n"
@@ -770,43 +771,43 @@ msgstr ""
 "\n"
 "Deaktivieren Sie diese Nachricht mit \"git config advice.%s false\""
 
-#: advice.c:161
+#: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sHinweis: %.*s%s\n"
 
-#: advice.c:252
+#: advice.c:178
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 "Cherry-Picken ist nicht möglich, weil Sie nicht zusammengeführte Dateien "
 "haben."
 
-#: advice.c:254
+#: advice.c:180
 msgid "Committing is not possible because you have unmerged files."
 msgstr ""
 "Committen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
 
-#: advice.c:256
+#: advice.c:182
 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
 "Mergen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
 
-#: advice.c:258
+#: advice.c:184
 msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
 "Pullen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
 
-#: advice.c:260
+#: advice.c:186
 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
 "Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
 
-#: advice.c:262
+#: advice.c:188
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "%s ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
 
-#: advice.c:270
+#: 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."
@@ -815,40 +816,49 @@ msgstr ""
 "dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n"
 "und zu committen."
 
-#: advice.c:278
+#: advice.c:204
 msgid "Exiting because of an unresolved conflict."
 msgstr "Beende wegen unaufgelöstem Konflikt."
 
-#: advice.c:283 builtin/merge.c:1374
+#: 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)."
 
-#: advice.c:285
+#: advice.c:211
 msgid "Please, commit your changes before merging."
 msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen."
 
-#: advice.c:286
+#: advice.c:212
 msgid "Exiting because of unfinished merge."
 msgstr "Beende wegen nicht abgeschlossenem Merge."
 
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "Vorspulen nicht möglich, breche ab."
+
+#: advice.c:227
 #, 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"
+"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 ""
-"Die folgenden Pfadspezifikationen entsprachen keinem geeigneten Pfad, aber\n"
-"entsprechen Index-Einträgen außerhalb des aktuellen partiellen Checkouts:\n"
+"Die folgenden Pfade und/oder Pfadspezifikationen entsprachen keinem Pfad,\n"
+"der außerhalb Ihrer partiellen Checkout-Definition existierte, weshalb\n"
+"diese nicht im Index aktualisiert werden:\n"
 
-#: advice.c:303
+#: advice.c:234
 msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"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 ""
-"Deaktivieren oder verändern Sie die Regeln für partielle Checkouts, wenn Sie "
-"solche Einträge aktualisieren möchten."
+"Wenn Sie beabsichtigen, solche Einträge zu aktualisieren, versuchen Sie es\n"
+"mit einem der folgenden Schritte:\n"
+"* Verwenden Sie die Option --sparse.\n"
+"* Deaktivieren oder ändern Sie die Regeln für partielle Checkouts."
 
-#: advice.c:310
+#: advice.c:242
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -909,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
@@ -1034,37 +1056,37 @@ msgstr "entfernte Datei %s hat noch Inhalte"
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "nicht erkannter Binär-Patch bei Zeile %d"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "konnte symbolische Verknüpfung %s nicht lesen"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "konnte %s nicht öffnen oder lesen"
 
-#: apply.c:2935
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "Ungültiger Zeilenanfang: '%c'"
 
-#: apply.c:3056
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -1072,12 +1094,12 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)"
 msgstr[1] ""
 "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
 
-#: apply.c:3068
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden"
 
-#: apply.c:3074
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1086,25 +1108,25 @@ msgstr ""
 "bei der Suche nach:\n"
 "%.*s"
 
-#: apply.c:3096
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "keine Daten in Binär-Patch für '%s'"
 
-#: apply.c:3104
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "kann binären Patch nicht in umgekehrter Reihenfolge anwenden ohne einen\n"
 "umgekehrten Patch-Block auf '%s'"
 
-#: apply.c:3151
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "kann binären Patch auf '%s' nicht ohne eine vollständige Index-Zeile anwenden"
 
-#: apply.c:3162
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -1112,436 +1134,435 @@ msgstr ""
 "der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n"
 "entspricht"
 
-#: apply.c:3170
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "der Patch wird auf ein leeres '%s' angewendet, was aber nicht leer ist"
 
-#: apply.c:3188
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "das erforderliche Postimage %s für '%s' kann nicht gelesen werden"
 
-#: apply.c:3201
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
 
-#: apply.c:3208
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)"
 
-#: apply.c:3229
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
 
-#: apply.c:3352
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "kann %s nicht auschecken"
 
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 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"
 
-#: apply.c:3412
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
 
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "Pfad %s wurde umbenannt/gelöscht"
 
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s ist nicht im Index"
 
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: 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:3571
+#: 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:3574
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Führe 3-Wege-Merge durch...\n"
 
-#: apply.c:3590 apply.c:3594
+#: 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:3606
+#: 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:3620
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch auf '%s' mit Konflikten angewendet.\n"
 
-#: apply.c:3625
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch auf '%s' sauber angewendet.\n"
 
-#: apply.c:3642
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Ausweichen auf direkte Anwendung...\n"
 
-#: apply.c:3654
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "Lösch-Patch hinterlässt Dateiinhalte"
 
-#: apply.c:3727
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: falscher Typ"
 
-#: apply.c:3729
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s ist vom Typ %o, erwartete %o"
 
-#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
-#: read-cache.c:1351
+#: 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:3952
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s ist bereits bereitgestellt"
 
-#: apply.c:3956
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s existiert bereits im Arbeitsverzeichnis"
 
-#: apply.c:3976
+#: 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:3981
+#: 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:4001
+#: 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:4005
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: Patch konnte nicht angewendet werden"
 
-#: apply.c:4020
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
-msgstr "Prüfe Patch %s ..."
+msgstr "Prüfe Patch %s..."
 
-#: apply.c:4112
+#: 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:4119
+#: 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:4122
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
 
-#: apply.c:4131
+#: 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:4141
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "konnte temporären Index nicht nach %s schreiben"
 
-#: apply.c:4279
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "konnte %s nicht aus dem Index entfernen"
 
-#: apply.c:4313
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "fehlerhafter Patch für Submodul %s"
 
-#: apply.c:4319
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "konnte neu erstellte Datei '%s' nicht lesen"
 
-#: apply.c:4327
+#: 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:4333 apply.c:4478
+#: 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:4376 builtin/bisect--helper.c:523
+#: 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:4380
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "schließe Datei '%s'"
 
-#: apply.c:4450
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
 
-#: apply.c:4548
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s sauber angewendet"
 
-#: apply.c:4556
+#: apply.c:4580
 msgid "internal error"
 msgstr "interner Fehler"
 
-#: apply.c:4559
+#: 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:4570
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
 
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "kann '%s' nicht öffnen"
 
-#: apply.c:4592
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Patch-Bereich #%d sauber angewendet."
 
-#: apply.c:4596
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Patch-Block #%d zurückgewiesen."
 
-#: apply.c:4725
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Patch '%s' ausgelassen."
 
-#: apply.c:4733
-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:4753
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "Konnte Index-Datei nicht lesen"
 
-#: apply.c:4910
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "kann Patch '%s' nicht öffnen: %s"
 
-#: apply.c:4937
+#: 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:4943 apply.c:4958
+#: 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:4951
+#: 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:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
+#: 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:4995
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
 msgstr "keine Änderungen im angegebenen Pfad anwenden"
 
-#: apply.c:4998
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "Änderungen nur im angegebenen Pfad anwenden"
 
-#: apply.c:5000 builtin/am.c:2317
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "Anzahl"
 
-#: apply.c:5001
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
 "entfernen"
 
-#: apply.c:5004
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "hinzugefügte Zeilen des Patches ignorieren"
 
-#: apply.c:5006
+#: 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:5010
+#: 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:5012
+#: 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:5014
+#: 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:5016
+#: 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:5018
+#: 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:5020
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
 
-#: apply.c:5022
+#: 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:5025
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
 
-#: apply.c:5027
+#: 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:5029
+#: 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:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "Pfade sind getrennt durch NUL Zeichen"
 
-#: apply.c:5034
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
 
-#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296
+#: 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:3831
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
 msgid "action"
 msgstr "Aktion"
 
-#: apply.c:5036
+#: 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:5039 apply.c:5042
+#: 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:5045
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "den Patch in umgekehrter Reihenfolge anwenden"
 
-#: apply.c:5047
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "keinen Kontext erwarten"
 
-#: apply.c:5049
+#: 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:5051
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "sich überlappende Patch-Blöcke erlauben"
 
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
-#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "erweiterte Ausgaben"
-
-#: apply.c:5054
+#: 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:5057
+#: 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:5059 builtin/am.c:2305
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "Wurzelverzeichnis"
 
-#: apply.c:5060
+#: 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"
@@ -1552,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."
@@ -1576,7 +1597,7 @@ msgstr "Pfad ist kein gültiges UTF-8: %s"
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "Pfad zu lang (%d Zeichen, SHA1: %s): %s"
 
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
 msgstr "Fehler beim Komprimieren (%d)"
@@ -1605,157 +1626,152 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <Repository> [--exec <Programm>] --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 "Kann %s nicht lesen."
-
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
-#: builtin/merge.c:1143
-#, c-format
-msgid "could not read '%s'"
-msgstr "Konnte '%s' nicht lesen"
+msgid "cannot read '%s'"
+msgstr "kann '%s' nicht lesen"
 
-#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
+#: 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"
 
-#: archive.c:451
+#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "Referenz nicht gefunden: %.*s"
 
-#: archive.c:457
+#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "Kein gültiger Objektname: %s"
 
-#: archive.c:470
+#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "Kein Tree-Objekt: %s"
 
-#: archive.c:482
+#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "Aktuelles Arbeitsverzeichnis ist unversioniert."
 
-#: archive.c:523
+#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Datei nicht gefunden: %s"
 
-#: archive.c:525
+#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "Keine reguläre Datei: %s"
 
-#: archive.c:552
+#: archive.c:551
 msgid "fmt"
 msgstr "Format"
 
-#: archive.c:552
+#: archive.c:551
 msgid "archive format"
 msgstr "Archivformat"
 
-#: archive.c:553 builtin/log.c:1772
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "Präfix"
 
-#: archive.c:554
+#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
 msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
 
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: 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: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"
 
-#: archive.c:556
+#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "unversionierte Datei zum Archiv hinzufügen"
 
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
 msgid "write the archive to this file"
 msgstr "das Archiv in diese Datei schreiben"
 
-#: archive.c:561
+#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
 
-#: archive.c:562
+#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
 
-#: archive.c:564
+#: archive.c:563
 msgid "set compression level"
 msgstr "Komprimierungsgrad setzen"
 
-#: archive.c:567
+#: archive.c:566
 msgid "list supported archive formats"
 msgstr "unterstützte Archivformate auflisten"
 
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "Repository"
 
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "Archiv vom Remote-Repository <Repository> abrufen"
 
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
 msgid "command"
 msgstr "Programm"
 
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
 msgid "path to the remote git-upload-archive command"
 msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
 
-#: archive.c:579
+#: archive.c:578
 msgid "Unexpected option --remote"
 msgstr "Unerwartete Option --remote"
 
-#: archive.c:581
-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:583
+#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Unerwartete Option --output"
 
-#: archive.c:585
-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:607
+#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Unbekanntes Archivformat '%s'"
 
-#: archive.c:616
+#: archive.c:615
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argument für Format '%s' nicht unterstützt: -%d"
 
-#: attr.c:202
+#: attr.c:203
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s ist kein gültiger Attributname"
 
-#: attr.c:363
+#: attr.c:364
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s nicht erlaubt: %s:%d"
 
-#: attr.c:403
+#: attr.c:404
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1763,22 +1779,22 @@ msgstr ""
 "Verneinende Muster werden in Git-Attributen ignoriert.\n"
 "Benutzen Sie '\\!' für führende Ausrufezeichen."
 
-#: bisect.c:489
+#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Ungültiger Inhalt bzgl. Anführungszeichen in Datei '%s': %s"
 
-#: bisect.c:699
+#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Keine binäre Suche mehr möglich!\n"
 
-#: bisect.c:766
+#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "%s ist kein gültiger Commit-Name"
 
-#: bisect.c:791
+#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1787,7 +1803,7 @@ msgstr ""
 "Die Merge-Basis %s ist fehlerhaft.\n"
 "Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
 
-#: bisect.c:796
+#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1796,7 +1812,7 @@ msgstr ""
 "Die Merge-Basis %s ist neu.\n"
 "Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n"
 
-#: bisect.c:801
+#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1805,7 +1821,7 @@ msgstr ""
 "Die Merge-Basis %s ist %s.\n"
 "Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n"
 
-#: bisect.c:809
+#: bisect.c:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1816,7 +1832,7 @@ msgstr ""
 "git bisect kann in diesem Fall nicht richtig arbeiten.\n"
 "Vielleicht verwechselten Sie %s und %s Commits?\n"
 
-#: bisect.c:822
+#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1828,36 +1844,36 @@ msgstr ""
 "erste %s Commit zwischen %s und %s befindet.\n"
 "Es wird dennoch fortgesetzt."
 
-#: bisect.c:861
+#: bisect.c:859
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n"
 
-#: bisect.c:911
+#: bisect.c:909
 #, c-format
 msgid "a %s revision is needed"
 msgstr "ein %s Commit wird benötigt"
 
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
 #, c-format
 msgid "could not create file '%s'"
 msgstr "konnte Datei '%s' nicht erstellen"
 
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "Konnte Datei '%s' nicht lesen"
 
-#: bisect.c:1027
+#: bisect.c:1025
 msgid "reading bisect refs failed"
 msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen"
 
-#: bisect.c:1057
+#: bisect.c:1055
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s war sowohl %s als auch %s\n"
 
-#: bisect.c:1066
+#: bisect.c:1064
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1866,7 +1882,7 @@ msgstr ""
 "Kein testbarer Commit gefunden.\n"
 "Vielleicht starteten Sie mit schlechten Pfad-Argumenten?\n"
 
-#: bisect.c:1095
+#: bisect.c:1093
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1876,7 +1892,7 @@ msgstr[1] "(ungefähr %d Schritte)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1101
+#: bisect.c:1099
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1899,11 +1915,12 @@ msgstr ""
 "endgültigen\n"
 "Commits"
 
-#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
-#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
-#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
-#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
+#: 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 "Einrichtung des Revisionsgangs fehlgeschlagen"
 
@@ -1924,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'."
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "kein Tracking: mehrdeutige Informationen für Referenz %s"
 
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Konnte Konfiguration zu Upstream-Branch nicht schreiben."
-
-#: 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"
@@ -2041,153 +2050,154 @@ 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."
 
-#: bundle.c:41
+#: bundle.c:44
 #, c-format
 msgid "unrecognized bundle hash algorithm: %s"
 msgstr "unbekannter Paket-Hash-Algorithmus: %s"
 
-#: bundle.c:45
+#: bundle.c:48
 #, c-format
 msgid "unknown capability '%s'"
 msgstr "unbekannte Fähigkeit '%s'"
 
-#: bundle.c:71
+#: bundle.c:74
 #, c-format
 msgid "'%s' does not look like a v2 or v3 bundle file"
 msgstr "'%s' sieht nicht wie eine v2 oder v3 Paketdatei aus"
 
-#: bundle.c:110
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
 
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: 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'"
 msgstr "Konnte '%s' nicht öffnen"
 
-#: bundle.c:189
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
 
-#: bundle.c:192
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
 msgstr "Um ein Paket zu überprüfen wird ein Repository benötigt."
 
-#: bundle.c:243
+#: bundle.c:257
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "Das Paket enthält diese Referenz:"
 msgstr[1] "Das Paket enthält diese %d Referenzen:"
 
-#: bundle.c:250
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "Das Paket speichert eine komplette Historie."
 
-#: bundle.c:252
+#: bundle.c:266
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Das Paket benötigt diese Referenz:"
 msgstr[1] "Das Paket benötigt diese %d Referenzen:"
 
-#: bundle.c:319
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "Konnte dup für Descriptor des Pakets nicht ausführen."
 
-#: bundle.c:326
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "Konnte Paketobjekte nicht erstellen"
 
-#: bundle.c:337
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "Erstellung der Paketobjekte abgebrochen"
 
-#: bundle.c:386
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
 
-#: bundle.c:490
+#: bundle.c:504
 #, c-format
 msgid "unsupported bundle version %d"
 msgstr "nicht unterstützte Paket-Version %d"
 
-#: bundle.c:492
+#: bundle.c:506
 #, c-format
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "kann Paket-Version %d nicht mit Algorithmus %s schreiben"
 
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
+#: 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"
 
-#: bundle.c:539
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "Erstellung eines leeren Pakets zurückgewiesen."
 
-#: bundle.c:549
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "kann '%s' nicht erstellen"
 
-#: bundle.c:574
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "Erstellung der Paketindexdatei abgebrochen"
 
-#: chunk-format.c:113
+#: chunk-format.c:117
 msgid "terminating chunk id appears earlier than expected"
 msgstr "abschließende Chunk-ID erscheint eher als erwartet"
 
-#: chunk-format.c:122
+#: chunk-format.c:126
 #, c-format
 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
 msgstr "unzulässige(r) Chunk-Offset(s) %<PRIx64> und %<PRIx64>"
 
-#: chunk-format.c:129
+#: chunk-format.c:133
 #, c-format
 msgid "duplicate chunk ID %<PRIx32> found"
 msgstr "doppelte Chunk-ID %<PRIx32> gefunden"
 
-#: chunk-format.c:143
+#: chunk-format.c:147
 #, c-format
 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"
 
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
 msgid "invalid hash version"
 msgstr "ungültige Hash-Version"
 
@@ -2232,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:745 commit-graph.c:782
+#: 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:766
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "Konnte Commit %s nicht finden."
 
-#: commit-graph.c:799
+#: 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:1075 builtin/am.c:1340
+#: 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:1337 builtin/pack-objects.c:2897
+#: 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:1368
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "Lade bekannte Commits in Commit-Graph"
 
-#: commit-graph.c:1385
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr "Erweitere erreichbare Commits in Commit-Graph"
 
-#: commit-graph.c:1405
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr "Lösche Commit-Markierungen in Commit-Graph"
 
-#: commit-graph.c:1424
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "Topologische Ebenen des Commit-Graph werden berechnet"
 
-#: commit-graph.c:1477
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr "Commit-Graph Generationsnummern berechnen"
 
-#: commit-graph.c:1558
+#: 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:1635
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "Sammle referenzierte Commits"
 
-#: commit-graph.c:1660
+#: 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:1673
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "Fehler beim Hinzufügen von Paket %s."
 
-#: commit-graph.c:1677
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "Fehler beim Öffnen des Index für %s."
 
-#: commit-graph.c:1714
+#: 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:1732
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr "Suche zusätzliche Ränder in Commit-Graph"
 
-#: commit-graph.c:1781
+#: 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:1812 midx.c:906
+#: 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:1825
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "konnte temporäre Graphen-Schicht nicht erstellen"
 
-#: commit-graph.c:1830
+#: 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:1887
+#: 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:1923
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr "konnte Commit-Graph Chain-Datei nicht öffnen"
 
-#: commit-graph.c:1939
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr "konnte Basis-Commit-Graph-Datei nicht umbenennen"
 
-#: commit-graph.c:1959
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr "konnte temporäre Commit-Graph-Datei nicht umbenennen"
 
-#: commit-graph.c:2092
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "Durchsuche zusammengeführte Commits"
 
-#: commit-graph.c:2136
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "Zusammenführen von Commit-Graph"
 
-#: commit-graph.c:2244
+#: 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:2351
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr "zu viele Commits zum Schreiben des Graphen"
 
-#: commit-graph.c:2450
+#: 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:2460
+#: 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:2470 commit-graph.c:2485
+#: 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:2477
+#: 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:2495
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "Commit in Commit-Graph überprüfen"
 
-#: commit-graph.c:2510
+#: 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:2517
+#: 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:2527
+#: 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:2536
+#: 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:2550
+#: 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:2555
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2423,7 +2433,7 @@ msgstr ""
 "Commit-Graph hat Generationsnummer null für Commit %s, aber sonst ungleich "
 "null"
 
-#: commit-graph.c:2559
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2431,29 +2441,29 @@ msgstr ""
 "Commit-Graph hat Generationsnummer ungleich null für Commit %s, aber sonst "
 "null"
 
-#: commit-graph.c:2576
+#: 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:2582
+#: 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:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
-#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 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"
 
-#: commit.c:54
+#: commit.c:55
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s ist kein Commit!"
 
-#: commit.c:194
+#: commit.c:196
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -2474,28 +2484,28 @@ msgstr ""
 "Sie können diese Meldung unterdrücken, indem Sie\n"
 "\"git config advice.graftFileDeprecated false\" ausführen."
 
-#: commit.c:1237
+#: 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:1241
+#: 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:1244
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Commit %s hat keine GPG-Signatur."
 
-#: commit.c:1247
+#: 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:1501
+#: 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"
@@ -2511,7 +2521,7 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "Speicher verbraucht"
 
-#: config.c:126
+#: config.c:125
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -2527,38 +2537,38 @@ msgstr ""
 "überschritten.\n"
 "Das könnte durch zirkulare Includes entstanden sein."
 
-#: config.c:142
+#: config.c:141
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "Konnte Include-Pfad '%s' nicht erweitern."
 
-#: config.c:153
+#: config.c:152
 msgid "relative config includes must come from files"
 msgstr "Relative Includes von Konfigurationen müssen aus Dateien kommen."
 
-#: config.c:199
+#: config.c:201
 msgid "relative config include conditionals must come from files"
 msgstr ""
 "Bedingungen für das Einbinden von Konfigurationen aus relativen Pfaden "
 "müssen\n"
 "aus Dateien kommen."
 
-#: config.c:396
+#: config.c:398
 #, c-format
 msgid "invalid config format: %s"
 msgstr "ungültiges Konfigurationsformat: %s"
 
-#: config.c:400
+#: config.c:402
 #, c-format
 msgid "missing environment variable name for configuration '%.*s'"
 msgstr "fehlender Name der Umgebungsvariable für Konfiguration '%.*s'"
 
-#: config.c:405
+#: config.c:407
 #, c-format
 msgid "missing environment variable '%s' for configuration '%.*s'"
 msgstr "fehlende Umgebungsvariable '%s' für Konfiguration '%.*s'"
 
-#: config.c:442
+#: config.c:443
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "Schlüssel enthält keine Sektion: %s"
@@ -2568,309 +2578,309 @@ 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:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "Ungültiger Schlüssel: %s"
 
-#: config.c:478
+#: config.c:475
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "Ungültiger Schlüssel (neue Zeile): %s"
 
-#: config.c:511
+#: config.c:495
 msgid "empty config key"
 msgstr "leerer Konfigurationsschlüssel"
 
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "Fehlerhafter Konfigurationsparameter: %s"
 
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
 #, c-format
 msgid "bogus format in %s"
 msgstr "Fehlerhaftes Format in %s"
 
-#: config.c:622
+#: config.c:606
 #, c-format
 msgid "bogus count in %s"
 msgstr "falsche Zählung in %s"
 
-#: config.c:626
+#: config.c:610
 #, c-format
 msgid "too many entries in %s"
 msgstr "zu viele Einträge in %s"
 
-#: config.c:636
+#: config.c:620
 #, c-format
 msgid "missing config key %s"
 msgstr "fehlender Konfigurationsschlüssel %s"
 
-#: config.c:644
+#: config.c:628
 #, c-format
 msgid "missing config value %s"
 msgstr "fehlender Konfigurationswert %s"
 
-#: config.c:995
+#: config.c:979
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "Ungültige Konfigurationszeile %d in Blob %s"
 
-#: config.c:999
+#: config.c:983
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "Ungültige Konfigurationszeile %d in Datei %s"
 
-#: config.c:1003
+#: config.c:987
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
 
-#: config.c:1007
+#: config.c:991
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s"
 
-#: config.c:1011
+#: config.c:995
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
 
-#: config.c:1015
+#: config.c:999
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "Ungültige Konfigurationszeile %d in %s"
 
-#: config.c:1152
+#: config.c:1136
 msgid "out of range"
 msgstr "Außerhalb des Bereichs"
 
-#: config.c:1152
+#: config.c:1136
 msgid "invalid unit"
 msgstr "Ungültige Einheit"
 
-#: config.c:1153
+#: config.c:1137
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
 
-#: config.c:1163
+#: config.c:1147
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Blob %s: %s"
 
-#: config.c:1166
+#: config.c:1150
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Datei %s: %s"
 
-#: config.c:1169
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Standard-Eingabe: "
 "%s"
 
-#: config.c:1172
+#: config.c:1156
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Submodul-Blob %s: "
 "%s"
 
-#: config.c:1175
+#: config.c:1159
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Befehlszeile %s: "
 "%s"
 
-#: config.c:1178
+#: config.c:1162
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s"
 
-#: config.c:1257
+#: config.c:1241
 #, c-format
 msgid "bad boolean config value '%s' for '%s'"
 msgstr "ungültiger boolescher Konfigurationswert '%s' für '%s'"
 
-#: config.c:1275
+#: config.c:1259
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
 
-#: config.c:1284
+#: config.c:1268
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%s' ist kein gültiger Zeitstempel für '%s'"
 
-#: config.c:1377
+#: config.c:1361
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "Länge für Abkürzung von Commit-IDs außerhalb des Bereichs: %d"
 
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "ungültiger zlib Komprimierungsgrad %d"
 
-#: config.c:1494
+#: config.c:1476
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar sollte nur ein Zeichen sein"
 
-#: config.c:1527
+#: config.c:1509
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "Ungültiger Modus für Objekterstellung: %s"
 
-#: config.c:1599
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "Ungültiger Wert für %s."
 
-#: config.c:1625
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "Ungültiger Wert für %s: %s"
 
-#: config.c:1626
+#: 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:1687 builtin/pack-objects.c:3924
+#: 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:1809
+#: 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:1812
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "Referenz '%s' zeigt auf keinen Blob."
 
-#: config.c:1829
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "Konnte Blob '%s' für Konfiguration nicht auflösen."
 
-#: config.c:1873
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "Fehler beim Parsen von %s."
 
-#: config.c:1929
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr ""
 "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
 
-#: config.c:2293
+#: 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:2467
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Ungültiger %s: '%s'"
 
-#: config.c:2512
+#: 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:2558
+#: 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:2560
+#: 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:2644
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "Ungültiger Sektionsname '%s'"
 
-#: config.c:2676
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s hat mehrere Werte"
 
-#: config.c:2705
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben."
 
-#: config.c:2957 config.c:3283
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "Konnte Konfigurationsdatei '%s' nicht sperren."
 
-#: config.c:2968
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "Öffne %s"
 
-#: config.c:3005 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "Ungültiges Muster: %s"
 
-#: config.c:3030
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "Ungültige Konfigurationsdatei %s"
 
-#: config.c:3043 config.c:3296
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat auf %s fehlgeschlagen"
 
-#: config.c:3054
+#: config.c:3047
 #, c-format
-msgid "unable to mmap '%s'"
-msgstr "mmap für '%s' fehlgeschlagen"
+msgid "unable to mmap '%s'%s"
+msgstr "mmap für '%s'(%s) fehlgeschlagen"
 
-#: config.c:3063 config.c:3301
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod auf %s fehlgeschlagen"
 
-#: config.c:3148 config.c:3398
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "Konnte Konfigurationsdatei %s nicht schreiben."
 
-#: config.c:3182
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "Konnte '%s' nicht zu '%s' setzen."
 
-#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: 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:3274
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "Ungültiger Sektionsname: %s"
 
-#: config.c:3441
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "Fehlender Wert für '%s'"
@@ -2906,74 +2916,74 @@ msgstr "Der Server unterstützt das Feature '%s' nicht."
 msgid "expected flush after capabilities"
 msgstr "Erwartete Flush nach Fähigkeiten."
 
-#: connect.c:263
+#: connect.c:265
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "Ignoriere Fähigkeiten nach der ersten Zeile '%s'."
 
-#: connect.c:284
+#: connect.c:286
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "Protokollfehler: unerwartetes capabilities^{}"
 
-#: connect.c:306
+#: connect.c:308
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "Protokollfehler: shallow SHA-1 erwartet, '%s' bekommen"
 
-#: connect.c:308
+#: connect.c:310
 msgid "repository on the other end cannot be shallow"
 msgstr ""
 "Repository auf der Gegenseite kann keine unvollständige Historie (shallow) "
 "enthalten"
 
-#: connect.c:347
+#: connect.c:349
 msgid "invalid packet"
 msgstr "ungültiges Paket"
 
-#: connect.c:367
+#: connect.c:369
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "Protokollfehler: unerwartetes '%s'"
 
-#: connect.c:497
+#: connect.c:499
 #, c-format
 msgid "unknown object format '%s' specified by server"
 msgstr "unbekanntes Objekt-Format '%s' vom Server angegeben"
 
-#: connect.c:526
+#: connect.c:528
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "ungültige ls-refs Antwort: %s"
 
-#: connect.c:530
+#: connect.c:532
 msgid "expected flush after ref listing"
 msgstr "Flush nach Auflistung der Referenzen erwartet"
 
-#: connect.c:533
+#: connect.c:535
 msgid "expected response end packet after ref listing"
 msgstr "Antwort-Endpaket nach Auflistung der Referenzen erwartet"
 
-#: connect.c:666
+#: connect.c:670
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "Protokoll '%s' wird nicht unterstützt"
 
-#: connect.c:717
+#: connect.c:721
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "kann SO_KEEPALIVE bei Socket nicht setzen"
 
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
 #, c-format
 msgid "Looking up %s ... "
 msgstr "Suche nach %s ..."
 
-#: connect.c:761
+#: connect.c:765
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "Fehler bei Suche nach %s (Port %s) (%s)."
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
 #, c-format
 msgid ""
 "done.\n"
@@ -2982,7 +2992,7 @@ msgstr ""
 "Fertig.\n"
 "Verbinde nach %s (Port %s) ... "
 
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2992,77 +3002,77 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
 msgid "done."
 msgstr "Fertig."
 
-#: connect.c:824
+#: connect.c:828
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "Fehler bei der Suche nach %s (%s)"
 
-#: connect.c:830
+#: connect.c:834
 #, c-format
 msgid "unknown port %s"
 msgstr "Unbekannter Port %s"
 
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "Merkwürdigen Hostnamen '%s' blockiert."
 
-#: connect.c:969
+#: connect.c:973
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "Merkwürdigen Port '%s' blockiert."
 
-#: connect.c:979
+#: connect.c:983
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "Kann Proxy %s nicht starten."
 
-#: connect.c:1050
+#: connect.c:1054
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr "kein Pfad angegeben; siehe 'git help pull' für eine gültige URL-Syntax"
 
-#: connect.c:1190
+#: connect.c:1194
 msgid "newline is forbidden in git:// hosts and repo paths"
 msgstr "Zeilenumbruch ist in git:// Hosts und Repository-Pfaden verboten"
 
-#: connect.c:1247
+#: connect.c:1251
 msgid "ssh variant 'simple' does not support -4"
 msgstr "SSH-Variante 'simple' unterstützt kein -4"
 
-#: connect.c:1259
+#: connect.c:1263
 msgid "ssh variant 'simple' does not support -6"
 msgstr "SSH-Variante 'simple' unterstützt kein -6"
 
-#: connect.c:1276
+#: connect.c:1280
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "SSH-Variante 'simple' unterstützt nicht das Setzen eines Ports"
 
-#: connect.c:1388
+#: connect.c:1392
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "Merkwürdigen Pfadnamen '%s' blockiert"
 
-#: connect.c:1436
+#: connect.c:1440
 msgid "unable to fork"
 msgstr "kann Prozess nicht starten"
 
-#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "Prüfe Konnektivität"
 
-#: connected.c:120
+#: connected.c:122
 msgid "Could not run 'git rev-list'"
 msgstr "Konnte 'git rev-list' nicht ausführen"
 
-#: connected.c:144
+#: connected.c:146
 msgid "failed write to rev-list"
 msgstr "Fehler beim Schreiben nach rev-list"
 
-#: connected.c:149
+#: connected.c:151
 msgid "failed to close rev-list's stdin"
 msgstr "Fehler beim Schließen von rev-lists Standard-Eingabe"
 
@@ -3173,7 +3183,7 @@ msgstr "unerwartete Filterart"
 msgid "path name too long for external filter"
 msgstr "Pfadname zu lang für externen Filter"
 
-#: convert.c:934
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -3182,16 +3192,16 @@ msgstr ""
 "externer Filter '%s' nicht mehr verfügbar, obwohl nicht alle Pfade gefiltert "
 "wurden"
 
-#: convert.c:1234
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false sind keine gültigen Codierungen im Arbeitsverzeichnis"
 
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: clean-Filter '%s' fehlgeschlagen"
 
-#: convert.c:1490
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: smudge-Filter '%s' fehlgeschlagen"
@@ -3209,17 +3219,17 @@ msgstr "Weigerung, mit fehlendem Hostnamen in Zugangsdaten zu arbeiten"
 msgid "refusing to work with credential missing protocol field"
 msgstr "Weigerung, mit fehlendem Protokoll in Zugangsdaten zu arbeiten"
 
-#: credential.c:394
+#: credential.c:395
 #, c-format
 msgid "url contains a newline in its %s component: %s"
 msgstr "URL enthält Zeilenumbruch in der %s Komponente: %s"
 
-#: credential.c:438
+#: credential.c:439
 #, c-format
 msgid "url has no scheme: %s"
 msgstr "URL hat kein Schema: %s"
 
-#: credential.c:511
+#: credential.c:512
 #, c-format
 msgid "credential url cannot be parsed: %s"
 msgstr "URL mit Zugangsdaten konnte nicht geparst werden: %s"
@@ -3319,36 +3329,36 @@ msgstr ""
 msgid "Marked %d islands, done.\n"
 msgstr "%d Delta-Islands markiert, fertig.\n"
 
-#: diff-merges.c:80
+#: diff-merges.c:70
 #, c-format
 msgid "unknown value for --diff-merges: %s"
 msgstr "unbekannter Wert für --diff-merges: %s"
 
-#: diff-lib.c:538
+#: diff-lib.c:561
 msgid "--merge-base does not work with ranges"
 msgstr "--merge-base funktioniert nicht mit Bereichen"
 
-#: diff-lib.c:540
+#: diff-lib.c:563
 msgid "--merge-base only works with commits"
 msgstr "--merge-base funktioniert nur mit Commits"
 
-#: diff-lib.c:557
+#: diff-lib.c:580
 msgid "unable to get HEAD"
 msgstr "konnte HEAD nicht bekommen"
 
-#: diff-lib.c:564
+#: diff-lib.c:587
 msgid "no merge base found"
 msgstr "keine Merge-Basis gefunden"
 
-#: diff-lib.c:566
+#: diff-lib.c:589
 msgid "multiple merge bases found"
 msgstr "mehrere Merge-Basen gefunden"
 
-#: diff-no-index.c:238
+#: diff-no-index.c:237
 msgid "git diff --no-index [<options>] <path> <path>"
 msgstr "git diff --no-index [<Optionen>] <Pfad> <Pfad>"
 
-#: diff-no-index.c:263
+#: diff-no-index.c:262
 msgid ""
 "Not a git repository. Use --no-index to compare two paths outside a working "
 "tree"
@@ -3356,26 +3366,26 @@ msgstr ""
 "Kein Git-Repository. Nutzen Sie --no-index, um zwei Pfade außerhalb des "
 "Arbeitsverzeichnisses zu vergleichen."
 
-#: diff.c:156
+#: 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:161
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Unbekannter \"dirstat\" Parameter '%s'\n"
 
-#: diff.c:297
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
 msgstr ""
 "\"color moved\"-Einstellung muss eines von diesen sein: 'no', 'default', "
-"'blocks', 'zebra', 'dimmed_zebra', 'plain'"
+"'blocks', 'zebra', 'dimmed-zebra', 'plain'"
 
-#: diff.c:325
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3384,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:333
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3392,12 +3402,12 @@ msgstr ""
 "color-moved-ws: allow-indentation-change kann nicht mit anderen\n"
 "Whitespace-Modi kombiniert werden."
 
-#: diff.c:410
+#: diff.c:412
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
-msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'"
+msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.submodule': '%s'"
 
-#: diff.c:470
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3406,36 +3416,55 @@ msgstr ""
 "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
 "%s"
 
-#: diff.c:4278
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
 
-#: diff.c:4630
-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 ""
+"die Optionen '%s', '%s', '%s' und '%s' können nicht gemeinsam verwendet "
+"werden"
+
+#: 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 ""
-"--name-only, --name-status, --check und -s schließen sich gegenseitig aus"
+"die Optionen '%s', '%s' und '%s' können nicht gemeinsam verwendet werden"
 
-#: diff.c:4633
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S und --find-object schließen sich gegenseitig aus"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr ""
+"die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden, nutzen "
+"Sie '%s' mit '%s'"
 
-#: diff.c:4712
+#: diff.c:4601
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden, nutzen "
+"Sie '%s' mit '%s' und '%s'"
+
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow erfordert genau eine Pfadspezifikation"
 
-#: diff.c:4760
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "Ungültiger --stat Wert: %s"
 
-#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: 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:4797
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3444,42 +3473,42 @@ msgstr ""
 "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
 "%s"
 
-#: diff.c:4882
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "unbekannte Änderungsklasse '%c' in --diff-filter=%s"
 
-#: diff.c:4906
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "unbekannter Wert nach ws-error-highlight=%.*s"
 
-#: diff.c:4920
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "konnte '%s' nicht auflösen"
 
-#: diff.c:4970 diff.c:4976
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s erwartet die Form <n>/<m>"
 
-#: diff.c:4988
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s erwartet ein Zeichen, '%s' bekommen"
 
-#: diff.c:5009
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "ungültiges --color-moved Argument: %s"
 
-#: diff.c:5028
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "ungültiger Modus '%s' in --color-moved-ws"
 
-#: diff.c:5068
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -3487,157 +3516,157 @@ msgstr ""
 "Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 
-#: diff.c:5104 diff.c:5124
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "ungültiges Argument für %s"
 
-#: diff.c:5228
+#: 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:5277
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
 
-#: diff.c:5333
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "ungültiges --word-diff Argument: %s"
 
-#: diff.c:5369
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "Diff-Optionen zu Ausgabeformaten"
 
-#: diff.c:5371 diff.c:5377
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "Patch erzeugen"
 
-#: diff.c:5374 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "Ausgabe der Unterschiede unterdrücken"
 
-#: diff.c:5379 diff.c:5493 diff.c:5500
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5380 diff.c:5383
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "Unterschiede mit <n> Zeilen des Kontextes erstellen"
 
-#: diff.c:5385
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "Unterschiede im Rohformat erstellen"
 
-#: diff.c:5388
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "Synonym für '-p --raw'"
 
-#: diff.c:5392
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "Synonym für '-p --stat'"
 
-#: diff.c:5396
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "maschinenlesbare Ausgabe von --stat"
 
-#: diff.c:5399
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "nur die letzte Zeile von --stat ausgeben"
 
-#: diff.c:5401 diff.c:5409
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<Parameter1,Parameter2>..."
 
-#: diff.c:5402
+#: 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:5406
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "Synonym für --dirstat=cumulative"
 
-#: diff.c:5410
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..."
 
-#: diff.c:5414
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen"
 
-#: diff.c:5417
+#: 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:5420
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "nur Dateinamen der geänderten Dateien anzeigen"
 
-#: diff.c:5423
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "nur Dateinamen und Status der geänderten Dateien anzeigen"
 
-#: diff.c:5425
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]"
 
-#: diff.c:5426
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "Zusammenfassung der Unterschiede erzeugen"
 
-#: diff.c:5428 diff.c:5431 diff.c:5434
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<Breite>"
 
-#: diff.c:5429
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "Zusammenfassung der Unterschiede mit gegebener Breite erzeugen"
 
-#: diff.c:5432
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "Zusammenfassung der Unterschiede mit gegebener Namens-Breite erzeugen"
 
-#: diff.c:5435
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "Zusammenfassung der Unterschiede mit gegebener Graph-Breite erzeugen"
 
-#: diff.c:5437
+#: diff.c:5406
 msgid "<count>"
 msgstr "<Anzahl>"
 
-#: diff.c:5438
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "Zusammenfassung der Unterschiede mit begrenzten Zeilen erzeugen"
 
-#: diff.c:5441
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "kompakte Zusammenstellung in Zusammenfassung der Unterschiede erzeugen"
 
-#: diff.c:5444
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "eine binäre Differenz ausgeben, dass angewendet werden kann"
 
-#: diff.c:5447
+#: 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:5449
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "farbige Unterschiede anzeigen"
 
-#: diff.c:5450
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<Art>"
 
-#: diff.c:5451
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -3645,7 +3674,7 @@ msgstr ""
 "Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den "
 "Unterschieden hervorheben"
 
-#: diff.c:5454
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3653,91 +3682,91 @@ msgstr ""
 "die Pfadnamen nicht verschleiern und NUL-Zeichen als Schlusszeichen in "
 "Ausgabefeldern bei --raw oder --numstat nutzen"
 
-#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<Präfix>"
 
-#: diff.c:5458
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "den gegebenen Quell-Präfix statt \"a/\" anzeigen"
 
-#: diff.c:5461
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "den gegebenen Ziel-Präfix statt \"b/\" anzeigen"
 
-#: diff.c:5464
+#: 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:5467
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "keine Quell- oder Ziel-Präfixe anzeigen"
 
-#: diff.c:5470
+#: 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:5474 diff.c:5479 diff.c:5484
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<Zeichen>"
 
-#: diff.c:5475
+#: 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:5480
+#: 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:5485
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')"
 
-#: diff.c:5488
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "Diff-Optionen zur Umbenennung"
 
-#: diff.c:5489
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5490
+#: 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:5494
+#: diff.c:5463
 msgid "detect renames"
 msgstr "Umbenennungen erkennen"
 
-#: diff.c:5498
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "Preimage für Löschungen weglassen"
 
-#: diff.c:5501
+#: diff.c:5470
 msgid "detect copies"
 msgstr "Kopien erkennen"
 
-#: diff.c:5505
+#: 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:5507
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "Erkennung von Umbenennungen deaktivieren"
 
-#: diff.c:5510
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "leere Blobs als Quelle von Umbenennungen nutzen"
 
-#: diff.c:5512
+#: 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:5515
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -3745,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:5517
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Diff Algorithmus-Optionen"
 
-#: diff.c:5519
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "die kleinstmöglichen Änderungen erzeugen"
 
-#: diff.c:5522
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "Whitespace-Änderungen beim Vergleich von Zeilen ignorieren"
 
-#: diff.c:5525
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "Änderungen bei der Anzahl von Whitespace ignorieren"
 
-#: diff.c:5528
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "Whitespace-Änderungen am Zeilenende ignorieren"
 
-#: diff.c:5531
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "den Zeilenumbruch am Ende der Zeile ignorieren"
 
-#: diff.c:5534
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "Änderungen in leeren Zeilen ignorieren"
 
-#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<Regex>"
 
-#: diff.c:5537
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr ""
 "Änderungen ignorieren, bei denen alle Zeilen mit <Regex> übereinstimmen"
 
-#: diff.c:5540
+#: 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:5543
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "Änderungen durch Nutzung des Algorithmus \"Patience Diff\" erzeugen"
 
-#: diff.c:5547
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "Änderungen durch Nutzung des Algorithmus \"Histogram Diff\" erzeugen"
 
-#: diff.c:5549
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<Algorithmus>"
 
-#: diff.c:5550
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "einen Algorithmus für Änderungen wählen"
 
-#: diff.c:5552
+#: diff.c:5521
 msgid "<text>"
 msgstr "<Text>"
 
-#: diff.c:5553
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "Änderungen durch Nutzung des Algorithmus \"Anchored Diff\" erzeugen"
 
-#: diff.c:5555 diff.c:5564 diff.c:5567
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<Modus>"
 
-#: diff.c:5556
+#: 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:5559
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr "<Regex> nutzen, um zu entscheiden, was ein Wort ist"
 
-#: diff.c:5562
+#: 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:5565
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "verschobene Codezeilen sind andersfarbig"
 
-#: diff.c:5568
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr "wie Whitespaces in --color-moved ignoriert werden"
 
-#: diff.c:5571
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Andere Diff-Optionen"
 
-#: diff.c:5573
+#: 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:5577
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "alle Dateien als Text behandeln"
 
-#: diff.c:5579
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "die beiden Eingaben vertauschen und die Änderungen umkehren"
 
-#: diff.c:5581
+#: 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:5583
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "alle Ausgaben vom Programm deaktivieren"
 
-#: diff.c:5585
+#: 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:5587
+#: 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:5589
+#: diff.c:5558
 msgid "<when>"
 msgstr "<wann>"
 
-#: diff.c:5590
+#: 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:5593
+#: diff.c:5562
 msgid "<format>"
 msgstr "<Format>"
 
-#: diff.c:5594
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "angeben, wie Unterschiede in Submodulen gezeigt werden"
 
-#: diff.c:5598
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "'git add -N' Einträge vom Index verstecken"
 
-#: diff.c:5601
+#: 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:5603
+#: diff.c:5572
 msgid "<string>"
 msgstr "<Zeichenkette>"
 
-#: diff.c:5604
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
@@ -3910,7 +3939,7 @@ msgstr ""
 "nach Unterschieden suchen, welche die Anzahl des Vorkommens der angegebenen "
 "Zeichenkette verändern"
 
-#: diff.c:5607
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3918,37 +3947,37 @@ msgstr ""
 "nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
 "regulären Ausdrucks verändern"
 
-#: diff.c:5610
+#: 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:5613
+#: 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:5616
+#: 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:5617 diff.c:5620
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<Pfad>"
 
-#: diff.c:5618
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "die Änderung des angegebenen Pfades zuerst anzeigen"
 
-#: diff.c:5621
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "überspringe die Ausgabe bis zum angegebenen Pfad"
 
-#: diff.c:5623
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<Objekt-ID>"
 
-#: diff.c:5624
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
@@ -3956,33 +3985,33 @@ msgstr ""
 "nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
 "Objektes verändern"
 
-#: diff.c:5626
+#: 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:5627
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "Dateien anhand der Art der Änderung wählen"
 
-#: diff.c:5629
+#: diff.c:5598
 msgid "<file>"
 msgstr "<Datei>"
 
-#: diff.c:5630
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "Ausgabe zu einer bestimmten Datei"
 
-#: diff.c:6287
-msgid "inexact rename detection was skipped due to too many files."
+#: diff.c:6257
+msgid "exhaustive rename detection was skipped due to too many files."
 msgstr ""
-"ungenaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n"
+"genaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n"
 "übersprungen."
 
-#: diff.c:6290
+#: 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:6293
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3995,7 +4024,7 @@ msgstr ""
 msgid "failed to read orderfile '%s'"
 msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'"
 
-#: diffcore-rename.c:1418
+#: diffcore-rename.c:1564
 msgid "Performing inexact rename detection"
 msgstr "Führe Erkennung für ungenaue Umbenennung aus"
 
@@ -4004,63 +4033,71 @@ msgstr "Führe Erkennung für ungenaue Umbenennung aus"
 msgid "No such path '%s' in the diff"
 msgstr "Pfad '%s' nicht im Diff gefunden"
 
-#: dir.c:578
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr "Pfadspezifikation '%s' stimmt mit keinen git-bekannten Dateien überein"
+msgstr "Pfadspezifikation '%s' stimmt mit keinen Git bekannten Dateien überein"
 
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr "unbekanntes Muster: '%s'"
 
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "unbekanntes verneinendes Muster: '%s'"
 
-#: dir.c:809
+#: dir.c:820
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr ""
 "Ihre Datei für den partiellen Checkout hat eventuell Probleme:\n"
 "Muster '%s' wiederholt sich."
 
-#: dir.c:819
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "deaktiviere Cone-Muster-Ãœbereinstimmung"
 
-#: dir.c:1206
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "kann %s nicht als exclude-Filter benutzen"
 
-#: dir.c:2314
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "konnte Verzeichnis '%s' nicht öffnen"
 
-#: dir.c:2614
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
 
-#: dir.c:2738
+#: 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:3543
+#: dir.c:3112
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Konnte keinen Verzeichnisnamen erraten.\n"
+"Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
+
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "Index-Datei in Repository %s beschädigt"
 
-#: dir.c:3590 dir.c:3595
+#: 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:3624
+#: 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"
@@ -4079,295 +4116,364 @@ msgstr "Filtere Inhalt"
 msgid "could not stat file '%s'"
 msgstr "konnte Datei '%s' nicht lesen"
 
-#: environment.c:152
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "ungültiger Git-Namespace-Pfad \"%s\""
 
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "konnte GIT_DIR nicht zu '%s' setzen"
-
 #: exec-cmd.c:363
 #, c-format
 msgid "too many args to run %s"
 msgstr "zu viele Argumente angegeben, um %s auszuführen"
 
-#: fetch-pack.c:182
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: erwartete shallow-Liste"
 
-#: fetch-pack.c:185
+#: 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:196
+#: 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:216
+#: 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:227
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "konnte nicht zum Remote schreiben"
 
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc benötigt multi_ack_detailed"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ungültige shallow-Zeile: %s"
 
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ungültige unshallow-Zeile: %s"
 
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "Objekt nicht gefunden: %s"
 
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "Fehler in Objekt: %s"
 
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "kein shallow-Objekt gefunden: %s"
 
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: 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:439
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "%s %d %s bekommen"
 
-#: fetch-pack.c:456
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "ungültiger Commit %s"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "gebe auf"
 
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "fertig"
 
-#: fetch-pack.c:512
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s (%d) %s bekommen"
 
-#: fetch-pack.c:548
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Markiere %s als vollständig"
 
-#: fetch-pack.c:763
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "habe %s (%s) bereits"
 
-#: fetch-pack.c:849
+#: 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:857
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "Protokollfehler: ungültiger Pack-Header"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: konnte %s nicht starten"
 
-#: fetch-pack.c:957
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack: ungültige index-pack Ausgabe"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "%s fehlgeschlagen"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "Fehler in sideband demultiplexer"
 
-#: fetch-pack.c:1019
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Server-Version ist %.*s"
 
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
+#: 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:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: 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:1029
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "Server unterstützt keine shallow-Clients"
 
-#: fetch-pack.c:1089
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "Server unterstützt kein --shallow-since"
 
-#: fetch-pack.c:1094
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "Server unterstützt kein --shallow-exclude"
 
-#: fetch-pack.c:1098
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "Server unterstützt kein --deepen"
 
-#: fetch-pack.c:1100
+#: 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:1113
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "keine gemeinsamen Commits"
 
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: 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:1128 fetch-pack.c:1651
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: Abholen fehlgeschlagen."
 
-#: fetch-pack.c:1242
+#: 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:1246
+#: 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:1279
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "Server unterstützt keine shallow-Anfragen"
 
-#: fetch-pack.c:1286
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "Server unterstützt Filter"
 
-#: fetch-pack.c:1329 fetch-pack.c:2034
+#: 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:1347
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "Fehler beim Lesen von Sektionskopf '%s'."
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "'%s' erwartet, '%s' empfangen"
 
-#: fetch-pack.c:1387
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "Unerwartete Acknowledgment-Zeile: '%s'"
 
-#: fetch-pack.c:1392
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "Fehler beim Verarbeiten von ACKS: %d"
 
-#: fetch-pack.c:1402
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr "Erwartete Versand einer Packdatei nach 'ready'."
 
-#: fetch-pack.c:1404
+#: 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:1445
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d"
 
-#: fetch-pack.c:1494
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "wanted-ref erwartet, '%s' bekommen"
 
-#: fetch-pack.c:1499
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "unerwartetes wanted-ref: '%s'"
 
-#: fetch-pack.c:1504
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "Fehler beim Verarbeiten von wanted-refs: %d"
 
-#: fetch-pack.c:1534
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack: Antwort-Endpaket erwartet"
 
-#: fetch-pack.c:1930
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "kein übereinstimmender Remote-Branch"
 
-#: fetch-pack.c:1953 builtin/clone.c:697
+#: 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:2056
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "unerwartetes 'ready' von Remote-Repository"
 
-#: fetch-pack.c:2079
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "Remote-Referenz %s nicht gefunden"
 
-#: fetch-pack.c:2082
+#: 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:273
+#: 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:276
+#: 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:470
+#: gpg-interface.c:451
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile muss konfiguriert sein und für die Überprüfung "
+"der SSH-Signatur vorhanden sein"
+
+#: gpg-interface.c:480
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+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:536
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "SSH-Signatursperrdatei konfiguriert, aber nicht gefunden: %s"
+
+#: gpg-interface.c:624
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "fehlerhafte/inkompatible Signatur '%s'"
+
+#: 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: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: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:857
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand fehlgeschlagen: %s %s"
+
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr "gpg beim Signieren der Daten fehlgeschlagen"
 
+#: 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:978
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "Fehler beim Schreiben des SSH-Signaturschlüssels nach '%s'"
+
+#: 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:1014
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"\"ssh-keygen -Y sign\" wird für die SSH-Signatur benötigt (verfügbar in "
+"openssh Version 8.2p1+)"
+
+#: gpg-interface.c:1026
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "Fehler beim Lesen des SSH-Signaturdatenpuffers von '%s'"
+
 #: graph.c:98
 #, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr "Ignoriere ungültige Farbe '%.*s' in log.graphColors"
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "ungültige Farbe '%.*s' in log.graphColors ignoriert"
 
 #: grep.c:531
 msgid ""
@@ -4377,111 +4483,111 @@ msgstr ""
 "Angegebenes Muster enthält NULL Byte (über -f <Datei>). Das wird nur mit -"
 "Punter PCRE v2 unterstützt."
 
-#: grep.c:1893
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': konnte %s nicht lesen"
 
-#: grep.c:1910 setup.c:176 builtin/clone.c:416 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:1921
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': read() zu kurz"
 
-#: help.c:23
+#: help.c:24
 msgid "start a working area (see also: git help tutorial)"
 msgstr "Arbeitsverzeichnis anlegen (siehe auch: git help tutorial)"
 
-#: help.c:24
+#: help.c:25
 msgid "work on the current change (see also: git help everyday)"
 msgstr "an aktuellen Änderungen arbeiten (siehe auch: git help everyday)"
 
-#: help.c:25
+#: help.c:26
 msgid "examine the history and state (see also: git help revisions)"
 msgstr "Historie und Status untersuchen (siehe auch: git help revisions)"
 
-#: help.c:26
+#: help.c:27
 msgid "grow, mark and tweak your common history"
 msgstr "Historie erweitern und bearbeiten"
 
-#: help.c:27
+#: help.c:28
 msgid "collaborate (see also: git help workflows)"
 msgstr "mit anderen zusammenarbeiten (siehe auch: git help workflows)"
 
-#: help.c:31
+#: help.c:32
 msgid "Main Porcelain Commands"
 msgstr "Hauptbefehle"
 
-#: help.c:32
+#: help.c:33
 msgid "Ancillary Commands / Manipulators"
 msgstr "Nebenbefehle / Manipulationen"
 
-#: help.c:33
+#: help.c:34
 msgid "Ancillary Commands / Interrogators"
 msgstr "Nebenbefehle / Abfragen"
 
-#: help.c:34
+#: help.c:35
 msgid "Interacting with Others"
 msgstr "mit anderen interagieren"
 
-#: help.c:35
+#: help.c:36
 msgid "Low-level Commands / Manipulators"
 msgstr "Systembefehle / Manipulationen"
 
-#: help.c:36
+#: help.c:37
 msgid "Low-level Commands / Interrogators"
 msgstr "Systembefehle / Abfragen"
 
-#: help.c:37
+#: help.c:38
 msgid "Low-level Commands / Syncing Repositories"
 msgstr "Systembefehle / Repositories synchronisieren"
 
-#: help.c:38
+#: help.c:39
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Systembefehle / Interne Hilfsbefehle"
 
-#: help.c:300
+#: help.c:313
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "Vorhandene Git-Befehle in '%s'"
 
-#: help.c:307
+#: help.c:320
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "Vorhandene Git-Befehle anderswo in Ihrem $PATH"
 
-#: help.c:316
+#: help.c:329
 msgid "These are common Git commands used in various situations:"
 msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:"
 
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "Nicht unterstützte Art zur Befehlsauflistung '%s'."
 
-#: help.c:405
+#: help.c:418
 msgid "The Git concept guides are:"
 msgstr "Die Git-Konzeptanleitungen sind:"
 
-#: help.c:429
+#: help.c:442
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr ""
 "Siehe 'git help <Befehl>', um mehr über einen spezifischen Unterbefehl zu "
 "lesen."
 
-#: help.c:434
+#: help.c:447
 msgid "External commands"
 msgstr "Externe Befehle"
 
-#: help.c:449
+#: help.c:462
 msgid "Command aliases"
 msgstr "Alias-Befehle"
 
-#: help.c:527
+#: help.c:543
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -4490,32 +4596,37 @@ msgstr ""
 "'%s' scheint ein git-Befehl zu sein, konnte aber\n"
 "nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?"
 
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git: '%s' ist kein Git-Befehl. Siehe 'git --help'."
 
-#: help.c:591
+#: help.c:613
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden."
 
-#: help.c:613
+#: help.c:635
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr ""
 "WARNUNG: Sie haben Git-Befehl '%s' ausgeführt, welcher nicht existiert."
 
-#: help.c:618
+#: help.c:640
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "Setze fort unter der Annahme, dass Sie '%s' meinten."
 
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Stattdessen '%s' ausführen (y/N)? "
+
+#: help.c:654
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr "Setze in %0.1f Sekunden fort unter der Annahme, dass Sie '%s' meinten."
 
-#: help.c:635
+#: help.c:666
 msgid ""
 "\n"
 "The most similar command is"
@@ -4529,16 +4640,16 @@ msgstr[1] ""
 "\n"
 "Die ähnlichsten Befehle sind"
 
-#: help.c:675
+#: help.c:706
 msgid "git version [<options>]"
 msgstr "git version [<Optionen>]"
 
-#: help.c:730
+#: help.c:761
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:734
+#: help.c:765
 msgid ""
 "\n"
 "Did you mean this?"
@@ -4552,6 +4663,16 @@ msgstr[1] ""
 "\n"
 "Haben Sie eines von diesen gemeint?"
 
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Der '%s' Hook wurde ignoriert, weil er nicht als ausführbar markiert ist.\n"
+"Sie können diese Warnung mit `git config advice.ignoredHook false` "
+"deaktivieren."
+
 #: ident.c:353
 msgid "Author identity unknown\n"
 msgstr "Identität des Autors unbekannt\n"
@@ -4614,7 +4735,7 @@ msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt."
 msgid "name consists only of disallowed characters: %s"
 msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s"
 
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
 #, c-format
 msgid "invalid date format: %s"
 msgstr "Ungültiges Datumsformat: %s"
@@ -4629,7 +4750,7 @@ msgstr "Keine Unterstützung für sparse:path Filter mehr"
 
 #: list-objects-filter-options.c:105
 #, c-format
-msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
 msgstr "'%s' für 'object:type=<Typ>' ist kein gültiger Objekttyp"
 
 #: list-objects-filter-options.c:124
@@ -4677,7 +4798,7 @@ msgstr ""
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "Eintrag '%s' im Tree-Objekt %s hat Blob-Modus, aber ist kein Blob"
 
-#: list-objects.c:395
+#: list-objects.c:398
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "Konnte Root-Tree-Objekt für Commit %s nicht laden."
@@ -4712,7 +4833,12 @@ msgstr "Konnte '%s.lock' nicht erstellen: %s"
 msgid "invalid value '%s' for lsrefs.unborn"
 msgstr "ungültiger Wert '%s' für lsrefs.unborn"
 
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "unerwartete Zeile: '%s'"
+
+#: ls-refs.c:178
 msgid "expected flush after ls-refs arguments"
 msgstr "erwartete Flush nach Argumenten für die Auflistung der Referenzen"
 
@@ -4720,37 +4846,37 @@ 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:176 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'"
 
-#: merge-ort.c:1116 merge-recursive.c:1205
+#: merge-ort.c:1584 merge-recursive.c:1211
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)."
 
-#: merge-ort.c:1125 merge-recursive.c:1212
+#: merge-ort.c:1593 merge-recursive.c:1218
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)."
 
-#: merge-ort.c:1134 merge-recursive.c:1219
+#: merge-ort.c:1602 merge-recursive.c:1225
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr "Fehler beim Merge von Submodul %s (Commits folgen keiner Merge-Basis)"
 
-#: merge-ort.c:1144 merge-ort.c:1151
+#: merge-ort.c:1612 merge-ort.c:1620
 #, c-format
 msgid "Note: Fast-forwarding submodule %s to %s"
 msgstr "Hinweis: Spule Submodul %s vor zu %s"
 
-#: merge-ort.c:1172
+#: merge-ort.c:1642
 #, c-format
 msgid "Failed to merge submodule %s"
 msgstr "Fehler beim Zusammenführen von Submodul %s"
 
-#: merge-ort.c:1179
+#: merge-ort.c:1649
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4760,7 +4886,7 @@ msgstr ""
 "Auflösung des Merges vorhanden:\n"
 "%s\n"
 
-#: merge-ort.c:1183 merge-recursive.c:1273
+#: merge-ort.c:1653 merge-recursive.c:1281
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -4777,7 +4903,7 @@ msgstr ""
 "\n"
 "hinzu, um diesen Vorschlag zu akzeptieren.\n"
 
-#: merge-ort.c:1196
+#: merge-ort.c:1666
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4787,21 +4913,21 @@ msgstr ""
 "sind vorhanden:\n"
 "%s"
 
-#: merge-ort.c:1415 merge-recursive.c:1362
+#: merge-ort.c:1887 merge-recursive.c:1372
 msgid "Failed to execute internal merge"
 msgstr "Fehler bei Ausführung des internen Merges"
 
-#: merge-ort.c:1420 merge-recursive.c:1367
+#: merge-ort.c:1892 merge-recursive.c:1377
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Konnte %s nicht zur Datenbank hinzufügen"
 
-#: merge-ort.c:1427 merge-recursive.c:1400
+#: merge-ort.c:1899 merge-recursive.c:1410
 #, c-format
 msgid "Auto-merging %s"
 msgstr "automatischer Merge von %s"
 
-#: merge-ort.c:1566 merge-recursive.c:2122
+#: merge-ort.c:2038 merge-recursive.c:2132
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4812,7 +4938,7 @@ msgstr ""
 "Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n"
 "Pfade dahin zu setzen: %s."
 
-#: merge-ort.c:1576 merge-recursive.c:2132
+#: merge-ort.c:2048 merge-recursive.c:2142
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4823,7 +4949,7 @@ msgstr ""
 "%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n"
 "zu setzen: %s"
 
-#: merge-ort.c:1634
+#: merge-ort.c:2106
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4834,7 +4960,7 @@ msgstr ""
 "ist; es wurde zu mehreren anderen Verzeichnissen umbenannt, ohne dass ein "
 "Ziel die Mehrheit der Dateien erhält."
 
-#: merge-ort.c:1788 merge-recursive.c:2468
+#: merge-ort.c:2260 merge-recursive.c:2478
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4843,25 +4969,25 @@ msgstr ""
 "WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt "
 "wurde."
 
-#: merge-ort.c:1932 merge-recursive.c:3244
+#: merge-ort.c:2400 merge-recursive.c:3261
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
 "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:1939 merge-recursive.c:3251
+#: merge-ort.c:2407 merge-recursive.c:3268
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
 "%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:1952 merge-recursive.c:3247
+#: merge-ort.c:2420 merge-recursive.c:3264
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4870,7 +4996,7 @@ msgstr ""
 "KONFLIKT (Speicherort): %s hinzugefügt in %s innerhalb eines Verzeichnisses, "
 "das umbenannt wurde in %s, es sollte vielleicht nach %s verschoben werden."
 
-#: merge-ort.c:1960 merge-recursive.c:3254
+#: merge-ort.c:2428 merge-recursive.c:3271
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4880,13 +5006,13 @@ msgstr ""
 "Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s "
 "verschoben werden."
 
-#: merge-ort.c:2103
+#: merge-ort.c:2584
 #, c-format
 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
 msgstr ""
 "KONFLIKT (umbenennen/umbenennen): %s zu %s in %s umbenannt und zu %s in %s."
 
-#: merge-ort.c:2198
+#: merge-ort.c:2679
 #, c-format
 msgid ""
 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4897,23 +5023,23 @@ msgstr ""
 "Inhaltskonflikte UND kollidiert mit einem anderen Pfad; dies kann zu "
 "verschachtelten Konfliktmarkierungen führen."
 
-#: merge-ort.c:2217 merge-ort.c:2241
+#: merge-ort.c:2698 merge-ort.c:2722
 #, c-format
 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr ""
 "KONFLIKT (umbenennen/löschen): %s zu %s in %s umbenannt, aber in %s gelöscht."
 
-#: merge-ort.c:2550 merge-recursive.c:3002
+#: merge-ort.c:3212 merge-recursive.c:3022
 #, c-format
 msgid "cannot read object %s"
 msgstr "kann Objekt %s nicht lesen"
 
-#: merge-ort.c:2553 merge-recursive.c:3005
+#: merge-ort.c:3215 merge-recursive.c:3025
 #, c-format
 msgid "object %s is not a blob"
 msgstr "Objekt %s ist kein Blob"
 
-#: merge-ort.c:2981
+#: merge-ort.c:3644
 #, c-format
 msgid ""
 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4922,7 +5048,7 @@ msgstr ""
 "KONFLIKT (Datei/Verzeichnis): Verzeichnis im Weg von %s aus %s; stattdessen "
 "nach %s verschieben."
 
-#: merge-ort.c:3055
+#: merge-ort.c:3721
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4932,7 +5058,7 @@ msgstr ""
 "Seite; beide wurden umbenannt, damit jeder irgendwo aufgezeichnet werden "
 "kann."
 
-#: merge-ort.c:3062
+#: merge-ort.c:3728
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4942,24 +5068,24 @@ msgstr ""
 "Seite; eines der beiden wurde umbenannt, damit jeder irgendwo aufgezeichnet "
 "werden kann."
 
-#: merge-ort.c:3162 merge-recursive.c:3081
+#: merge-ort.c:3819 merge-recursive.c:3101
 msgid "content"
 msgstr "Inhalt"
 
-#: merge-ort.c:3164 merge-recursive.c:3085
+#: merge-ort.c:3821 merge-recursive.c:3105
 msgid "add/add"
 msgstr "hinzufügen/hinzufügen"
 
-#: merge-ort.c:3166 merge-recursive.c:3130
+#: merge-ort.c:3823 merge-recursive.c:3150
 msgid "submodule"
 msgstr "Submodul"
 
-#: merge-ort.c:3168 merge-recursive.c:3131
+#: merge-ort.c:3825 merge-recursive.c:3151
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
 
-#: merge-ort.c:3198
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -4968,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:3433
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4980,13 +5106,13 @@ 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:3730
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr ""
 "Sammeln von Merge-Informationen für die Referenzen %s, %s, %s fehlgeschlagen"
 
-#: merge-ort-wrappers.c:13 merge-recursive.c:3699
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4996,109 +5122,109 @@ msgstr ""
 "überschrieben werden:\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "Bereits aktuell."
 
-#: merge-recursive.c:356
+#: merge-recursive.c:353
 msgid "(bad commit)\n"
 msgstr "(ungültiger Commit)\n"
 
-#: merge-recursive.c:379
+#: merge-recursive.c:381
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "add_cacheinfo für Pfad '%s' fehlgeschlagen; Merge wird abgebrochen."
 
-#: merge-recursive.c:388
+#: merge-recursive.c:390
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 "add_cacheinfo zur Aktualisierung für Pfad '%s' fehlgeschlagen;\n"
 "Merge wird abgebrochen."
 
-#: merge-recursive.c:876
+#: merge-recursive.c:881
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "Fehler beim Erstellen des Pfades '%s'%s"
 
-#: merge-recursive.c:887
+#: merge-recursive.c:892
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n"
 
-#: merge-recursive.c:901 merge-recursive.c:920
+#: merge-recursive.c:906 merge-recursive.c:925
 msgid ": perhaps a D/F conflict?"
 msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
 
-#: merge-recursive.c:910
+#: merge-recursive.c:915
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
 
-#: merge-recursive.c:951 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "kann Objekt %s '%s' nicht lesen"
 
-#: merge-recursive.c:956
+#: merge-recursive.c:961
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "Blob erwartet für %s '%s'"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:986
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "Fehler beim Öffnen von '%s': %s"
 
-#: merge-recursive.c:992
+#: merge-recursive.c:997
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s"
 
-#: merge-recursive.c:997
+#: merge-recursive.c:1002
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "weiß nicht was mit %06o %s '%s' zu machen ist"
 
-#: merge-recursive.c:1227 merge-recursive.c:1239
+#: merge-recursive.c:1233 merge-recursive.c:1246
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Spule Submodul %s zu dem folgenden Commit vor:"
 
-#: merge-recursive.c:1230 merge-recursive.c:1242
+#: merge-recursive.c:1236 merge-recursive.c:1249
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Spule Submodul %s vor"
 
-#: merge-recursive.c:1265
+#: merge-recursive.c:1273
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "Fehler beim Merge von Submodule %s (dem Merge nachfolgende Commits nicht "
 "gefunden)"
 
-#: merge-recursive.c:1269
+#: merge-recursive.c:1277
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)"
 
-#: merge-recursive.c:1270
+#: merge-recursive.c:1278
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "Mögliche Auflösung des Merges für Submodul gefunden:\n"
 
-#: merge-recursive.c:1282
+#: merge-recursive.c:1290
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)"
 
-#: merge-recursive.c:1424
+#: merge-recursive.c:1434
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 "Fehler: Verweigere unversionierte Datei bei %s zu verlieren;\n"
 "schreibe stattdessen nach %s."
 
-#: merge-recursive.c:1496
+#: merge-recursive.c:1506
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5107,7 +5233,7 @@ msgstr ""
 "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
 "im Arbeitsbereich gelassen."
 
-#: merge-recursive.c:1501
+#: merge-recursive.c:1511
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5116,7 +5242,7 @@ msgstr ""
 "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von "
 "%s wurde im Arbeitsbereich gelassen."
 
-#: merge-recursive.c:1508
+#: merge-recursive.c:1518
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5125,7 +5251,7 @@ msgstr ""
 "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde "
 "im Arbeitsbereich bei %s gelassen."
 
-#: merge-recursive.c:1513
+#: merge-recursive.c:1523
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5134,46 +5260,46 @@ msgstr ""
 "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von "
 "%s wurde im Arbeitsbereich bei %s gelassen."
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "rename"
 msgstr "umbenennen"
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "renamed"
 msgstr "umbenannt"
 
-#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Verweigere geänderte Datei bei %s zu verlieren."
 
-#: merge-recursive.c:1609
+#: merge-recursive.c:1619
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 "Verweigere unversionierte Datei bei %s zu verlieren, auch wenn diese im Weg "
 "ist."
 
-#: merge-recursive.c:1667
+#: merge-recursive.c:1677
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in "
 "%s"
 
-#: merge-recursive.c:1698
+#: merge-recursive.c:1708
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu"
 
-#: merge-recursive.c:1703
+#: merge-recursive.c:1713
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 "Verweigere unversionierte Datei bei %s zu verlieren; füge stattdessen %s "
 "hinzu"
 
-#: merge-recursive.c:1730
+#: merge-recursive.c:1740
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5182,18 +5308,18 @@ msgstr ""
 "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
 "und \"%s\"->\"%s\" in Branch \"%s\"%s"
 
-#: merge-recursive.c:1735
+#: merge-recursive.c:1745
 msgid " (left unresolved)"
 msgstr " (bleibt unaufgelöst)"
 
-#: merge-recursive.c:1827
+#: merge-recursive.c:1837
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s "
 "in %s"
 
-#: merge-recursive.c:2090
+#: merge-recursive.c:2100
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5206,7 +5332,7 @@ msgstr ""
 "wobei\n"
 "keines dieser Ziele die Mehrheit der Dateien erhielt."
 
-#: merge-recursive.c:2224
+#: merge-recursive.c:2234
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5215,81 +5341,81 @@ msgstr ""
 "KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n"
 "Benenne Verzeichnis um %s->%s in %s"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modify"
 msgstr "ändern"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modified"
 msgstr "geändert"
 
-#: merge-recursive.c:3108
+#: merge-recursive.c:3128
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
 
-#: merge-recursive.c:3161
+#: merge-recursive.c:3181
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Füge stattdessen als %s hinzu"
 
-#: merge-recursive.c:3368
+#: merge-recursive.c:3385
 #, c-format
 msgid "Removing %s"
 msgstr "Entferne %s"
 
-#: merge-recursive.c:3391
+#: merge-recursive.c:3408
 msgid "file/directory"
 msgstr "Datei/Verzeichnis"
 
-#: merge-recursive.c:3396
+#: merge-recursive.c:3413
 msgid "directory/file"
 msgstr "Verzeichnis/Datei"
 
-#: merge-recursive.c:3403
+#: merge-recursive.c:3420
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s "
 "hinzu."
 
-#: merge-recursive.c:3412
+#: merge-recursive.c:3429
 #, c-format
 msgid "Adding %s"
 msgstr "Füge %s hinzu"
 
-#: merge-recursive.c:3421
+#: merge-recursive.c:3438
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "KONFLIKT (hinzufügen/hinzufügen): Merge-Konflikt in %s"
 
-#: merge-recursive.c:3474
+#: merge-recursive.c:3491
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
 
-#: merge-recursive.c:3568
+#: merge-recursive.c:3585
 msgid "Merging:"
 msgstr "Merge:"
 
-#: merge-recursive.c:3581
+#: merge-recursive.c:3598
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden"
 msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden"
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3648
 msgid "merge returned no commit"
 msgstr "Merge hat keinen Commit zurückgegeben"
 
-#: merge-recursive.c:3796
+#: merge-recursive.c:3816
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
-#: builtin/stash.c:473
+#: 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."
 
@@ -5297,129 +5423,170 @@ msgstr "Konnte Index nicht schreiben."
 msgid "failed to read the cache"
 msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
 
-#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
-#: builtin/stash.c:267
+#: 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."
 
-#: midx.c:74
+#: midx.c:78
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "multi-pack-index OID fanout hat die falsche Größe"
 
-#: midx.c:105
+#: 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:121
+#: 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:126
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-index-Version %d nicht erkannt."
 
-#: midx.c:131
+#: 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:148
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "multi-pack-index fehlt erforderlicher Pack-Namen Chunk"
 
-#: midx.c:150
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk"
 
-#: midx.c:152
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk"
 
-#: midx.c:154
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "multi-pack-index fehlt erforderlicher Objekt offset Chunk"
 
-#: midx.c:170
+#: 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:214
+#: 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:264
+#: 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:490
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "Fehler beim Hinzufügen von Packdatei '%s'"
 
-#: midx.c:496
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "Fehler beim Öffnen von pack-index '%s'"
 
-#: midx.c:564
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei"
 
-#: midx.c:880 builtin/index-pack.c:1535
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "kann Reverse-Index-Datei nicht speichern"
 
-#: midx.c:933
-msgid "Adding packfiles to multi-pack-index"
-msgstr "Packdateien zum multi-pack-index hinzufügen"
+#: midx.c:993
+#, c-format
+msgid "could not parse line: %s"
+msgstr "Zeile konnte nicht geparst werden: %s"
 
-#: midx.c:979
+#: midx.c:995
 #, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "Pack-Datei %s zum Weglassen nicht gefunden"
+msgid "malformed line: %s"
+msgstr "fehlerhafte Zeile: %s"
 
-#: midx.c:1024
+#: midx.c:1162
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+"ignoriere existierenden multi-pack-index; Prüfsumme stimmt nicht überein"
+
+#: midx.c:1187
+msgid "could not load pack"
+msgstr "Paket konnte nicht geladen werden"
+
+#: midx.c:1193
+#, c-format
+msgid "could not open index for %s"
+msgstr "konnte Index für %s nicht öffnen"
+
+#: midx.c:1204
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Packdateien zum multi-pack-index hinzufügen"
+
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "unbekanntes bevorzugtes Paket: '%s'"
 
-#: midx.c:1029
+#: 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:1324
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "Pack-Datei %s zum Weglassen nicht gefunden"
+
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "bevorzugtes Paket '%s' ist abgelaufen"
 
-#: midx.c:1045
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "keine Packdateien zum Indizieren."
 
-#: midx.c:1125 builtin/clean.c:37
+#: midx.c:1420
+msgid "could not write multi-pack bitmap"
+msgstr "Multipack-Bitmap konnte nicht geschrieben werden"
+
+#: midx.c:1430
+msgid "could not write multi-pack-index"
+msgstr "Multi-Pack-Index konnte nicht geschrieben werden"
+
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "Fehler beim Löschen von %s"
 
-#: midx.c:1156
+#: 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:1214
+#: 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:1222
+#: midx.c:1593
+msgid "incorrect checksum"
+msgstr "Prüfsumme nicht korrekt"
+
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "Suche nach referenzierten Pack-Dateien"
 
-#: midx.c:1237
+#: midx.c:1611
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -5427,55 +5594,55 @@ msgstr ""
 "Ungültige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = "
 "fanout[%d]"
 
-#: midx.c:1242
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "das midx enthält keine oid"
 
-#: midx.c:1251
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr "Verifiziere OID-Reihenfolge im multi-pack-index"
 
-#: midx.c:1260
+#: 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:1280
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "Sortiere Objekte nach Pack-Datei"
 
-#: midx.c:1287
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "Überprüfe Objekt-Offsets"
 
-#: midx.c:1303
+#: 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:1309
+#: 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:1318
+#: 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:1343
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "Referenzierte Objekte zählen"
 
-#: midx.c:1353
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "Suchen und Löschen von unreferenzierten Pack-Dateien"
 
-#: midx.c:1544
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "Konnte 'pack-objects' nicht ausführen"
 
-#: midx.c:1564
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "Konnte 'pack-objects' nicht beenden"
 
@@ -5539,278 +5706,279 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr "Ungültiger %s Wert: '%s'"
 
-#: object-file.c:526
+#: 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:577
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren."
 
-#: object-file.c:649
+#: 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:656
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren."
 
-#: object-file.c:699
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen."
 
-#: object-file.c:717
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "Konnte \"alternates\"-Datei nicht lesen."
 
-#: object-file.c:724
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen."
 
-#: object-file.c:759
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "Pfad '%s' existiert nicht"
 
-#: object-file.c:780
+#: 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:786
+#: 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:792
+#: 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:800
+#: 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:860
+#: 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:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s"
 
-#: object-file.c:1010
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>."
 
-#: object-file.c:1031
-msgid "mmap failed"
-msgstr "mmap fehlgeschlagen"
+#: object-file.c:1048
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap fehlgeschlagen%s"
 
-#: object-file.c:1195
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "Objektdatei %s ist leer."
 
-#: object-file.c:1330 object-file.c:2524
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "Fehlerhaftes loses Objekt '%s'."
 
-#: object-file.c:1332 object-file.c:2528
+#: 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:1374
+#: object-file.c:1457
+#, c-format
+msgid "unable to parse %s header"
+msgstr "Konnte %s Kopfbereich nicht parsen."
+
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "ungültiger Objekt-Typ"
 
-#: object-file.c:1458
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "Konnte %s Kopfbereich nicht mit --allow-unknown-type entpacken."
-
-#: object-file.c:1461
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "Konnte %s Kopfbereich nicht entpacken."
 
-#: object-file.c:1467
+#: object-file.c:1474
 #, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "Konnte %s Kopfbereich mit --allow-unknown-type nicht parsen."
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "Header für %s zu lang, überschreitet %d Bytes"
 
-#: object-file.c:1470
-#, c-format
-msgid "unable to parse %s header"
-msgstr "Konnte %s Kopfbereich nicht parsen."
-
-#: object-file.c:1697
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr "Konnte Objekt %s nicht lesen."
 
-#: object-file.c:1701
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "Ersetzung %s für %s nicht gefunden."
 
-#: object-file.c:1705
+#: 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:1709
+#: 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:1814
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "Konnte Datei %s nicht schreiben."
 
-#: object-file.c:1821
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
 
-#: object-file.c:1828
+#: object-file.c:1835
 msgid "file write error"
 msgstr "Fehler beim Schreiben einer Datei."
 
-#: object-file.c:1848
+#: 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:1913
+#: 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:1915
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "Konnte temporäre Datei nicht erstellen."
 
-#: object-file.c:1939
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "Fehler beim Schreiben der Datei für lose Objekte."
 
-#: object-file.c:1945
+#: 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:1949
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)"
 
-#: object-file.c:1953
+#: 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:1963 builtin/pack-objects.c:1097
+#: 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:2040
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "Kann Objekt für %s nicht lesen."
 
-#: object-file.c:2091
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "fehlerhafter Commit"
 
-#: object-file.c:2099
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "fehlerhaftes Tag"
 
-#: object-file.c:2199
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "Lesefehler beim Indizieren von '%s'."
 
-#: object-file.c:2202
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "read() zu kurz beim Indizieren von '%s'."
 
-#: object-file.c:2275 object-file.c:2285
+#: 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:2291
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: nicht unterstützte Dateiart"
 
-#: object-file.c:2315
+#: 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:2317
+#: 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:2344 builtin/index-pack.c:192
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "kann %s nicht öffnen"
 
-#: object-file.c:2535 object-file.c:2588
+#: 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:2559
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "Konnte mmap nicht auf %s ausführen."
 
-#: object-file.c:2564
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "Konnte Kopfbereich von %s nicht entpacken."
 
-#: object-file.c:2570
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "Konnte Kopfbereich von %s nicht parsen."
 
-#: object-file.c:2581
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "Konnte Inhalt von %s nicht entpacken."
 
-#: object-name.c:486
+#: object-name.c:480
 #, c-format
 msgid "short object ID %s is ambiguous"
 msgstr "kurze Objekt-ID %s ist mehrdeutig"
 
-#: object-name.c:497
+#: object-name.c:491
 msgid "The candidates are:"
 msgstr "Die Kandidaten sind:"
 
-#: object-name.c:796
+#: object-name.c:790
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5835,22 +6003,22 @@ msgstr ""
 "indem Sie \"git config advice.objectNameWarning false\"\n"
 "ausführen."
 
-#: object-name.c:916
+#: object-name.c:910
 #, c-format
 msgid "log for '%.*s' only goes back to %s"
 msgstr "Log für '%.*s' geht nur bis %s zurück"
 
-#: object-name.c:924
+#: object-name.c:918
 #, c-format
 msgid "log for '%.*s' only has %d entries"
 msgstr "Log für '%.*s' hat nur %d Einträge"
 
-#: object-name.c:1702
+#: object-name.c:1696
 #, c-format
 msgid "path '%s' exists on disk, but not in '%.*s'"
 msgstr "Pfad '%s' befindet sich im Dateisystem, aber nicht in '%.*s'"
 
-#: object-name.c:1708
+#: object-name.c:1702
 #, c-format
 msgid ""
 "path '%s' exists, but not '%s'\n"
@@ -5859,12 +6027,12 @@ msgstr ""
 "Pfad '%s' existiert, aber nicht '%s'\n"
 "Hinweis: Meinten Sie '%.*s:%s' auch bekannt als '%.*s:./%s'?"
 
-#: object-name.c:1717
+#: object-name.c:1711
 #, c-format
 msgid "path '%s' does not exist in '%.*s'"
 msgstr "Pfad '%s' existiert nicht in '%.*s'"
 
-#: object-name.c:1745
+#: object-name.c:1739
 #, c-format
 msgid ""
 "path '%s' is in the index, but not at stage %d\n"
@@ -5873,7 +6041,7 @@ msgstr ""
 "Pfad '%s' ist im Index, aber nicht in Stufe %d\n"
 "Hinweis: Meinten Sie ':%d:%s'?"
 
-#: object-name.c:1761
+#: object-name.c:1755
 #, c-format
 msgid ""
 "path '%s' is in the index, but not '%s'\n"
@@ -5882,23 +6050,23 @@ msgstr ""
 "Pfad '%s' ist im Index, aber nicht '%s'\n"
 "Hinweis: Meinten Sie ':%d:%s' auch bekannt als ':%d:./%s'?"
 
-#: object-name.c:1769
+#: object-name.c:1763
 #, c-format
 msgid "path '%s' exists on disk, but not in the index"
 msgstr "Pfad '%s' existiert im Dateisystem, aber nicht im Index"
 
-#: object-name.c:1771
+#: object-name.c:1765
 #, c-format
 msgid "path '%s' does not exist (neither on disk nor in the index)"
 msgstr "Pfad '%s' existiert nicht (weder im Dateisystem noch im Index)"
 
-#: object-name.c:1784
+#: object-name.c:1778
 msgid "relative path syntax can't be used outside working tree"
 msgstr ""
 "Die Syntax für relative Pfade kann nicht außerhalb des Arbeitsverzeichnisses "
 "benutzt werden."
 
-#: object-name.c:1922
+#: object-name.c:1916
 #, c-format
 msgid "invalid object name '%.*s'."
 msgstr "ungültiger Objektname '%.*s'."
@@ -5913,27 +6081,40 @@ msgstr "Ungültiger Objekttyp \"%s\""
 msgid "object %s is a %s, not a %s"
 msgstr "Objekt %s ist ein %s, kein %s"
 
-#: object.c:232
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "Objekt %s hat eine unbekannte Typ-Identifikation %d"
 
-#: object.c:245
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: object.c:265 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "Hash stimmt nicht mit %s überein."
 
-#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "Multipack-Bitmap fehlt erforderlicher Reverse-Index"
+
+#: 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: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:1547 builtin/rev-list.c:92
+#: 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:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "konnte Festplattennutzung von %s nicht bekommen"
@@ -5963,127 +6144,137 @@ msgstr "Reverse-Index-Datei %s hat nicht unterstützte Version %<PRIu32>"
 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
 msgstr "Reverse-Index-Datei %s hat nicht unterstützte Hash-ID %<PRIu32>"
 
-#: pack-write.c:250
+#: pack-write.c:251
 msgid "cannot both write and verify reverse index"
 msgstr ""
 "Reverse-Index kann nicht gleichzeitig geschrieben und verifiziert werden"
 
-#: pack-write.c:271
+#: pack-write.c:270
 #, c-format
 msgid "could not stat: %s"
 msgstr "konnte nicht lesen: %s"
 
-#: pack-write.c:283
+#: pack-write.c:282
 #, c-format
 msgid "failed to make %s readable"
 msgstr "Fehler beim lesbar machen von %s"
 
-#: pack-write.c:522
+#: pack-write.c:520
 #, c-format
 msgid "could not write '%s' promisor file"
 msgstr "konnte Promisor-Datei '%s' nicht schreiben"
 
-#: packfile.c:625
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
 
-#: packfile.c:1937
+#: packfile.c:657
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "Packdatei %s kann nicht gemappt werden%s"
+
+#: 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:1941
+#: 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
+#: 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.c:38
+#: 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"
 msgstr "%s erfordert einen Wert."
 
-#: parse-options.c:73
+#: parse-options.c:93
 #, c-format
 msgid "%s is incompatible with %s"
 msgstr "%s ist inkompatibel mit %s."
 
-#: parse-options.c:78
+#: parse-options.c:98
 #, c-format
 msgid "%s : incompatible with something else"
 msgstr "%s: inkompatibel mit etwas anderem"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
 #, c-format
 msgid "%s takes no value"
 msgstr "%s erwartet keinen Wert"
 
-#: parse-options.c:94
+#: parse-options.c:114
 #, c-format
 msgid "%s isn't available"
 msgstr "%s ist nicht verfügbar."
 
-#: parse-options.c:217
+#: parse-options.c:237
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr ""
 "%s erwartet einen nicht-negativen Integer-Wert mit einem optionalen k/m/g "
 "Suffix"
 
-#: parse-options.c:386
+#: parse-options.c:393
 #, c-format
 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:420 parse-options.c:428
+#: 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:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "Alias für --%s"
 
-#: parse-options.c:879
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "Unbekannte Option: `%s'"
 
-#: parse-options.c:881
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "Unbekannter Schalter `%c'"
 
-#: parse-options.c:883
+#: 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:907
+#: parse-options.c:920
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:926
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "Verwendung: %s"
@@ -6091,49 +6282,73 @@ msgstr "Verwendung: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:932
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "      oder: %s"
 
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. 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:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:974
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-NUM"
 
-#: path.c:915
+#: path.c:922
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
 
-#: pathspec.c:151
+#: pathspec.c:150
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "Escape-Zeichen '\\' als letztes Zeichen in Attributwert nicht erlaubt"
 
-#: pathspec.c:169
+#: pathspec.c:168
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Es ist nur eine Angabe von 'attr:' erlaubt."
 
-#: pathspec.c:172
+#: pathspec.c:171
 msgid "attr spec must not be empty"
 msgstr "Angabe von 'attr:' darf nicht leer sein"
 
-#: pathspec.c:215
+#: pathspec.c:214
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "Ungültiger Attributname %s"
 
-#: pathspec.c:280
+#: pathspec.c:279
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind "
 "inkompatibel."
 
-#: pathspec.c:287
+#: pathspec.c:286
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -6141,52 +6356,52 @@ msgstr ""
 "Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n"
 "mit allen anderen Optionen."
 
-#: pathspec.c:327
+#: pathspec.c:326
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'"
 
-#: pathspec.c:348
+#: pathspec.c:347
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'"
 
-#: pathspec.c:353
+#: pathspec.c:352
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'"
 
-#: pathspec.c:391
+#: pathspec.c:390
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'"
 
-#: pathspec.c:450
+#: pathspec.c:449
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: 'literal' und 'glob' sind inkompatibel"
 
-#: pathspec.c:466
+#: pathspec.c:465
 #, c-format
 msgid "%s: '%s' is outside repository at '%s'"
 msgstr "%s: '%s' liegt außerhalb des Repositories von '%s'"
 
-#: pathspec.c:542
+#: pathspec.c:541
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (Kürzel: '%c')"
 
-#: pathspec.c:552
+#: pathspec.c:551
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 "%s: Pfadspezifikationsangabe wird von diesem Befehl nicht unterstützt: %s"
 
-#: pathspec.c:619
+#: pathspec.c:618
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
 
-#: pathspec.c:664
+#: pathspec.c:663
 #, c-format
 msgid "line is badly quoted: %s"
 msgstr "Zeile enthält falsche Anführungszeichen: %s"
@@ -6200,14 +6415,14 @@ msgid "unable to write delim packet"
 msgstr "konnte Delim-Paket nicht schreiben"
 
 #: pkt-line.c:106
-msgid "unable to write stateless separator packet"
-msgstr "konnte zustandsloses Separator-Paket nicht schreiben"
+msgid "unable to write response end packet"
+msgstr "konnte Antwort-Endpaket nicht schreiben"
 
 #: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr "Flush beim Schreiben des Pakets fehlgeschlagen."
 
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
 msgid "protocol error: impossibly long line"
 msgstr "Protokollfehler: unmöglich lange Zeile"
 
@@ -6215,7 +6430,7 @@ msgstr "Protokollfehler: unmöglich lange Zeile"
 msgid "packet write with format failed"
 msgstr "Schreiben des Pakets mit Format fehlgeschlagen."
 
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
 msgid "packet write failed - data exceeds max packet size"
 msgstr ""
 "Schreiben des Pakets fehlgeschlagen - Daten überschreiten maximale Paketgröße"
@@ -6225,25 +6440,25 @@ msgstr ""
 msgid "packet write failed: %s"
 msgstr "Schreiben des Pakets fehlgeschlagen: %s"
 
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
 msgid "read error"
 msgstr "Lesefehler"
 
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
 msgid "the remote end hung up unexpectedly"
 msgstr "Die Gegenseite hat unerwartet abgebrochen."
 
-#: pkt-line.c:369 pkt-line.c:371
+#: 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:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: 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:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "Fehler am anderen Ende: %s"
@@ -6257,25 +6472,25 @@ msgstr "Aktualisiere Index"
 msgid "unable to create threaded lstat: %s"
 msgstr "Kann Thread für lstat nicht erzeugen: %s"
 
-#: pretty.c:988
+#: pretty.c:1051
 msgid "unable to parse --pretty format"
 msgstr "Konnte --pretty Format nicht parsen."
 
-#: promisor-remote.c:30
+#: promisor-remote.c:31
 msgid "promisor-remote: unable to fork off fetch subprocess"
 msgstr "Promisor-Remote: konnte Fetch-Subprozess nicht abspalten"
 
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
 msgid "promisor-remote: could not write to fetch subprocess"
 msgstr "Promisor-Remote: konnte nicht zum Fetch-Subprozess schreiben"
 
-#: promisor-remote.c:41
+#: promisor-remote.c:44
 msgid "promisor-remote: could not close stdin to fetch subprocess"
 msgstr ""
 "Promisor-Remote: konnte Standard-Eingabe des Fetch-Subprozesses nicht "
 "schließen"
 
-#: promisor-remote.c:53
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "Promisor-Remote-Name kann nicht mit '/' beginnen: %s"
@@ -6288,20 +6503,20 @@ msgstr "object-info: erwartete Flush nach Argumenten"
 msgid "Removing duplicate objects"
 msgstr "Lösche doppelte Objekte"
 
-#: range-diff.c:78
+#: range-diff.c:67
 msgid "could not start `log`"
 msgstr "Konnte `log` nicht starten."
 
-#: range-diff.c:80
+#: range-diff.c:69
 msgid "could not read `log` output"
 msgstr "Konnte Ausgabe von `log` nicht lesen."
 
-#: range-diff.c:101 sequencer.c:5551
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "Konnte Commit '%s' nicht parsen."
 
-#: range-diff.c:115
+#: range-diff.c:111
 #, c-format
 msgid ""
 "could not parse first line of `log` output: did not start with 'commit ': "
@@ -6310,71 +6525,67 @@ msgstr ""
 "konnte erste Zeile der Ausgabe von `log` nicht parsen: fängt nicht mit "
 "'commit ' an: '%s'"
 
-#: range-diff.c:140
+#: range-diff.c:137
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "Konnte Git-Header '%.*s' nicht parsen."
 
-#: range-diff.c:306
+#: range-diff.c:304
 msgid "failed to generate diff"
 msgstr "Fehler beim Generieren des Diffs."
 
-#: range-diff.c:558
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only und --right-only schließen sich gegenseitig aus"
-
-#: range-diff.c:561 range-diff.c:563
+#: 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:708
+#: 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:724
+#: 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:746
+#: 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:751
+#: 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:803
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "Konnte Datei '%s' nicht indizieren."
 
-#: read-cache.c:822
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "Konnte '%s' nicht dem Index hinzufügen."
 
-#: read-cache.c:833
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "konnte '%s' nicht lesen"
 
-#: read-cache.c:1356
+#: 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:1571
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "Aktualisiere Index"
 
-#: read-cache.c:1700
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6383,7 +6594,7 @@ msgstr ""
 "index.version gesetzt, aber Wert ungültig.\n"
 "Verwende Version %i"
 
-#: read-cache.c:1710
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6392,143 +6603,143 @@ msgstr ""
 "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
 "Verwende Version %i"
 
-#: read-cache.c:1766
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "Ungültige Signatur 0x%08x"
 
-#: read-cache.c:1769
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "Ungültige Index-Version %d"
 
-#: read-cache.c:1778
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "Ungültige SHA1-Signatur der Index-Datei."
 
-#: read-cache.c:1812
+#: 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:1814
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "Ignoriere Erweiterung %.4s"
 
-#: read-cache.c:1851
+#: 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:1867
+#: 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:1924
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr "Ungeordnete Stage-Einträge im Index."
 
-#: read-cache.c:1927
+#: 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:1930
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "Ungeordnete Stage-Einträge für '%s'."
 
-#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:332
+#: 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: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:2180
+#: 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:2193
+#: 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:2226
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: Öffnen der Index-Datei fehlgeschlagen."
 
-#: read-cache.c:2230
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: Kann geöffneten Index nicht lesen."
 
-#: read-cache.c:2234
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: Index-Datei ist kleiner als erwartet."
 
-#: read-cache.c:2238
+#: read-cache.c:2280
 #, c-format
-msgid "%s: unable to map index file"
-msgstr "%s: Konnte Index-Datei nicht einlesen."
+msgid "%s: unable to map index file%s"
+msgstr "%s: Konnte Index-Datei nicht mappen%s"
 
-#: read-cache.c:2280
+#: 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:2307
+#: 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:2345
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "Konnte geteilten Index '%s' nicht aktualisieren."
 
-#: read-cache.c:2392
+#: 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:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: 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:3138
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr "Konvertierung zu einem Sparse-Index fehlgeschlagen"
 
-#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "Konnte '%s' nicht lesen."
 
-#: read-cache.c:3222
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "konnte Git-Verzeichnis nicht öffnen: %s"
 
-#: read-cache.c:3234
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "Konnte '%s' nicht entfernen."
 
-#: read-cache.c:3263
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
 
-#: read-cache.c:3412
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: Kann nicht auf Stufe #0 wechseln."
@@ -6599,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
@@ -6609,7 +6820,7 @@ msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Rebase von %s auf %s (%d Kommando)"
 msgstr[1] "Rebase von %s auf %s (%d Kommandos)"
 
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6618,7 +6829,7 @@ msgstr ""
 "Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n"
 "entfernen.\n"
 
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6626,7 +6837,7 @@ msgstr ""
 "\n"
 "Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n"
 
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6640,7 +6851,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -6650,14 +6861,14 @@ 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:3816
-#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
+#: 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'"
 msgstr "Konnte '%s' nicht schreiben."
 
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
 #, c-format
 msgid "could not write '%s'."
 msgstr "Konnte '%s' nicht schreiben."
@@ -6688,14 +6899,12 @@ msgstr ""
 "Warnungen zu ändern.\n"
 "Die möglichen Verhaltensweisen sind: ignore, warn, error.\n"
 
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
 #, c-format
-msgid "could not read '%s'."
-msgstr "Konnte '%s' nicht lesen."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve' wurde durch 'merges' ersetzt"
 
-#: ref-filter.c:42 wt-status.c:1978
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "entfernt"
 
@@ -6714,258 +6923,229 @@ msgstr "%d hinterher"
 msgid "ahead %d, behind %d"
 msgstr "%d voraus, %d hinterher"
 
-#: ref-filter.c:175
+#: ref-filter.c:235
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "Erwartetes Format: %%(color:<Farbe>)"
 
-#: ref-filter.c:177
+#: ref-filter.c:237
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "nicht erkannte Farbe: %%(color:%s)"
 
-#: ref-filter.c:199
+#: ref-filter.c:259
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Positiver Wert erwartet refname:lstrip=%s"
 
-#: ref-filter.c:203
+#: ref-filter.c:263
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Positiver Wert erwartet refname:rstrip=%s"
 
-#: ref-filter.c:205
+#: 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"
 
-#: ref-filter.c:260
+#: ref-filter.c:320
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) akzeptiert keine Argumente"
 
-#: ref-filter.c:282
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "nicht erkanntes %%(objectsize) Argument: %s"
-
-#: ref-filter.c:290
+#: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) akzeptiert keine Argumente"
 
-#: ref-filter.c:302
+#: ref-filter.c:364
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) akzeptiert keine Argumente"
 
-#: ref-filter.c:315
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "nicht erkanntes %%(subject) Argument: %s"
-
-#: ref-filter.c:334
+#: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
 msgstr "%%(trailers:key=<Wert>) erwartet"
 
-#: ref-filter.c:336
+#: ref-filter.c:398
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "unbekanntes %%(trailers) Argument: %s"
 
-#: ref-filter.c:367
+#: ref-filter.c:429
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "Positiver Wert erwartet contents:lines=%s"
 
-#: ref-filter.c:369
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "nicht erkanntes %%(contents) Argument: %s"
-
-#: ref-filter.c:384
+#: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "positiver Wert erwartet '%s' in %%(%s)"
 
-#: ref-filter.c:388
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "nicht erkanntes Argument '%s' in %%(%s)"
-
-#: ref-filter.c:402
+#: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
 msgstr "nicht erkannte E-Mail Option: %s"
 
-#: ref-filter.c:432
+#: ref-filter.c:506
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "erwartetes Format: %%(align:<Breite>,<Position>)"
 
-#: ref-filter.c:444
+#: ref-filter.c:518
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "nicht erkannte Position:%s"
 
-#: ref-filter.c:451
+#: ref-filter.c:525
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "nicht erkannte Breite:%s"
 
-#: ref-filter.c:460
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "nicht erkanntes %%(align) Argument: %s"
-
-#: ref-filter.c:468
+#: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "Positive Breitenangabe für %%(align) erwartet"
 
-#: ref-filter.c:486
+#: ref-filter.c:568
 #, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "nicht erkanntes %%(if) Argument: %s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) akzeptiert keine Argumente"
 
-#: ref-filter.c:588
+#: ref-filter.c:680
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "Fehlerhafter Feldname: %.*s"
 
-#: ref-filter.c:615
+#: ref-filter.c:707
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "Unbekannter Feldname: %.*s"
 
-#: ref-filter.c:619
+#: ref-filter.c:711
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 "Kein Git-Repository, aber das Feld '%.*s' erfordert Zugriff auf Objektdaten."
 
-#: ref-filter.c:743
+#: 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"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format: %%(%s) Atom ohne ein %%(%s) Atom verwendet"
 
-#: ref-filter.c:807
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet"
-
-#: ref-filter.c:809
+#: ref-filter.c:912
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format: %%(then) Atom mehr als einmal verwendet"
 
-#: ref-filter.c:811
+#: ref-filter.c:914
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: %%(then) Atom nach %%(else) verwendet"
 
-#: ref-filter.c:839
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet"
-
-#: ref-filter.c:841
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet"
-
-#: ref-filter.c:843
+#: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
-msgstr "Format: %%(end) Atom mehr als einmal verwendet"
+msgstr "Format: %%(else) Atom mehr als einmal verwendet"
 
-#: ref-filter.c:858
+#: ref-filter.c:965
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
 
-#: ref-filter.c:915
+#: ref-filter.c:1027
 #, c-format
 msgid "malformed format string %s"
 msgstr "Fehlerhafter Formatierungsstring %s"
 
-#: ref-filter.c:1556
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "dieser Befehl lehnt Atom ab %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s kann nicht mit --python, --shell, --tcl verwendet werden"
+
+#: ref-filter.c:1706
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(kein Branch, Rebase von %s)"
 
-#: ref-filter.c:1559
+#: ref-filter.c:1709
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr "(kein Branch, Rebase von losgelöstem HEAD %s)"
 
-#: ref-filter.c:1562
+#: ref-filter.c:1712
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(kein Branch, binäre Suche begonnen bei %s)"
 
-#: ref-filter.c:1566
+#: ref-filter.c:1716
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD losgelöst bei %s)"
 
-#: ref-filter.c:1569
+#: ref-filter.c:1719
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD losgelöst von %s)"
 
-#: ref-filter.c:1572
+#: ref-filter.c:1722
 msgid "(no branch)"
 msgstr "(kein Branch)"
 
-#: ref-filter.c:1604 ref-filter.c:1813
+#: ref-filter.c:1754 ref-filter.c:1972
 #, c-format
 msgid "missing object %s for %s"
 msgstr "Objekt %s fehlt für %s"
 
-#: ref-filter.c:1614
+#: ref-filter.c:1764
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
 
-#: ref-filter.c:1997
+#: ref-filter.c:2155
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "fehlerhaftes Objekt bei '%s'"
 
-#: ref-filter.c:2086
+#: ref-filter.c:2245
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
 
-#: ref-filter.c:2091 refs.c:676
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "Ignoriere fehlerhafte Referenz %s"
 
-#: ref-filter.c:2431
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "Format: %%(end) Atom fehlt"
 
-#: ref-filter.c:2525
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "missgebildeter Objektname %s"
 
-#: ref-filter.c:2530
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "die Option `%s' muss auf einen Commit zeigen"
 
-#: refs.c:264
+#: refs.c:261
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr "%s zeigt auf kein gültiges Objekt!"
 
-#: refs.c:566
+#: refs.c:563
 #, c-format
 msgid ""
 "Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6992,12 +7172,12 @@ msgstr ""
 "\n"
 "\tgit branch -m <Name>\n"
 
-#: refs.c:588
+#: refs.c:585
 #, c-format
 msgid "could not retrieve `%s`"
 msgstr "konnte `%s` nicht abrufen"
 
-#: refs.c:598
+#: refs.c:595
 #, c-format
 msgid "invalid branch name: %s = %s"
 msgstr "ungültiger Branchname: %s = %s"
@@ -7007,68 +7187,68 @@ msgstr "ungültiger Branchname: %s = %s"
 msgid "ignoring dangling symref %s"
 msgstr "Ignoriere unreferenzierte symbolische Referenz %s"
 
-#: refs.c:922
+#: 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:929
+#: 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:994
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "Log für %s ist leer."
 
-#: refs.c:1086
+#: 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:1157
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s"
 
-#: refs.c:2051
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "mehrere Aktualisierungen für Referenz '%s' nicht erlaubt"
 
-#: refs.c:2131
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 "Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
 "verboten"
 
-#: refs.c:2142
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "Aktualisierungen von Referenzen durch Hook abgebrochen"
 
-#: refs.c:2242 refs.c:2272
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' existiert; kann '%s' nicht erstellen"
 
-#: refs.c:2248 refs.c:2283
+#: 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:1228
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr "konnte Referenz %s nicht löschen"
 
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: 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:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr "konnte Referenzen nicht entfernen: %s"
@@ -7078,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."
@@ -7132,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"
@@ -7159,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"
@@ -7170,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"
@@ -7181,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"
@@ -7192,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"
@@ -7203,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 ""
@@ -7323,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"
@@ -7343,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."
@@ -7382,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
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "Flush bei '%s' fehlgeschlagen."
@@ -7427,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:2089 builtin/log.c:2000
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
+#: 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."
@@ -7466,47 +7646,33 @@ 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:3669
+#: 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:2343
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "--unpacked=<Pack-Datei> wird nicht länger unterstützt"
 
-#: revision.c:2683
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
 
-#: revision.c:2686
+#: 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:2892
+#: 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:767
-msgid "open /dev/null failed"
-msgstr "Öffnen von /dev/null fehlgeschlagen"
-
-#: run-command.c:1275
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "Konnte Thread für async nicht erzeugen: %s"
 
-#: run-command.c:1345
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Der '%s' Hook wurde ignoriert, weil er nicht als ausführbar markiert ist.\n"
-"Sie können diese Warnung mit `git config advice.ignoredHook false` "
-"deaktivieren."
-
 #: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr "Unerwartetes Flush-Paket beim Lesen des Remote-Unpack-Status."
@@ -7525,25 +7691,25 @@ msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s"
 msgid "failed to sign the push certificate"
 msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "send-pack: unable to fork off fetch subprocess"
 msgstr "send-pack: konnte Fetch-Subprozess nicht abspalten"
 
-#: send-pack.c:455
+#: send-pack.c:457
 msgid "push negotiation failed; proceeding anyway with push"
 msgstr "Push-Verhandlung fehlgeschlagen; fahre trotzdem mit dem Push fort"
 
-#: send-pack.c:520
+#: send-pack.c:528
 msgid "the receiving end does not support this repository's hash algorithm"
 msgstr ""
 "die Gegenseite unterstützt nicht den Hash-Algorithmus dieses Repositories"
 
-#: send-pack.c:529
+#: send-pack.c:537
 msgid "the receiving end does not support --signed push"
 msgstr ""
 "die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
 
-#: send-pack.c:531
+#: send-pack.c:539
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -7551,47 +7717,48 @@ msgstr ""
 "kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n"
 "Versand (\"--signed push\") unterstützt"
 
-#: send-pack.c:543
+#: send-pack.c:546
 msgid "the receiving end does not support --atomic push"
 msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
 
-#: send-pack.c:548
+#: send-pack.c:551
 msgid "the receiving end does not support push options"
 msgstr "die Gegenseite unterstützt keine Push-Optionen"
 
-#: sequencer.c:196
+#: sequencer.c:197
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen."
 
-#: sequencer.c:324
+#: sequencer.c:325
 #, c-format
 msgid "could not delete '%s'"
 msgstr "Konnte '%s' nicht löschen."
 
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: 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"
 
-#: sequencer.c:354
+#: sequencer.c:355
 msgid "revert"
 msgstr "Revert"
 
-#: sequencer.c:356
+#: sequencer.c:357
 msgid "cherry-pick"
 msgstr "Cherry-Pick"
 
-#: sequencer.c:358
+#: sequencer.c:359
 msgid "rebase"
 msgstr "Rebase"
 
-#: sequencer.c:360
+#: sequencer.c:361
 #, c-format
 msgid "unknown action: %d"
 msgstr "Unbekannte Aktion: %d"
 
-#: sequencer.c:419
+#: sequencer.c:420
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -7599,54 +7766,84 @@ msgstr ""
 "nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
 "mit 'git add <Pfade>' oder 'git rm <Pfade>'"
 
-#: sequencer.c:422
+#: sequencer.c:423
 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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
 msgstr ""
-"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
-"mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n"
-"'git commit' ein"
+"Lösen Sie alle Konflikte manuell auf, markieren Sie diese mit\n"
+"\"git add/rm <Pfadspezifikation>\" und führen Sie dann\n"
+"\"git cherry-pick --continue\" aus.\n"
+"Sie können stattdessen auch diesen Commit auslassen, indem\n"
+"Sie \"git cherry-pick --skip\" ausführen.\n"
+"Um abzubrechen und zurück zum Zustand vor \"git cherry-pick\" zu\n"
+"gelangen, führen Sie \"git cherry-pick --abort\" aus."
+
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Lösen Sie alle Konflikte manuell auf, markieren Sie diese mit\n"
+"\"git add/rm <Pfadspezifikation>\" und führen Sie dann\n"
+"\"git revert --continue\" aus.\n"
+"Sie können stattdessen auch diesen Commit auslassen, indem\n"
+"Sie \"git revert --skip\" ausführen.\n"
+"Um abzubrechen und zurück zum Zustand vor \"git revert\" zu gelangen,\n"
+"führen Sie \"git revert --abort\" aus."
 
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "Konnte '%s' nicht sperren"
 
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#: 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."
 
-#: sequencer.c:442
+#: sequencer.c:455
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "Konnte EOL nicht nach '%s' schreiben."
 
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3554
+#: 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:486
+#: 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."
 msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden."
 
-#: sequencer.c:490
+#: sequencer.c:503
 msgid "commit your changes or stash them to proceed."
 msgstr ""
 "Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
 
-#: sequencer.c:522
+#: sequencer.c:535
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: Vorspulen"
 
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Ungültiger \"cleanup\" Modus %s"
@@ -7654,65 +7851,65 @@ msgstr "Ungültiger \"cleanup\" Modus %s"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
 #.
-#: sequencer.c:671
+#: sequencer.c:685
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Konnte neue Index-Datei nicht schreiben"
 
-#: sequencer.c:685
+#: sequencer.c:699
 msgid "unable to update cache tree"
 msgstr "Konnte Cache-Verzeichnis nicht aktualisieren."
 
-#: sequencer.c:699
+#: sequencer.c:713
 msgid "could not resolve HEAD commit"
 msgstr "Konnte HEAD-Commit nicht auflösen."
 
-#: sequencer.c:779
+#: sequencer.c:793
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "Kein Schlüssel in '%.*s' vorhanden."
 
-#: sequencer.c:790
+#: sequencer.c:804
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "Konnte Anführungszeichen von '%s' nicht entfernen."
 
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
-#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
+#: 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."
 
-#: sequencer.c:837
+#: sequencer.c:851
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "'GIT_AUTHOR_NAME' bereits angegeben."
 
-#: sequencer.c:842
+#: sequencer.c:856
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "'GIT_AUTHOR_EMAIL' bereits angegeben."
 
-#: sequencer.c:847
+#: sequencer.c:861
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "'GIT_AUTHOR_DATE' bereits angegeben."
 
-#: sequencer.c:851
+#: sequencer.c:865
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "Unbekannte Variable '%s'"
 
-#: sequencer.c:856
+#: sequencer.c:870
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "'GIT_AUTHOR_NAME' fehlt."
 
-#: sequencer.c:858
+#: sequencer.c:872
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "'GIT_AUTHOR_EMAIL' fehlt."
 
-#: sequencer.c:860
+#: sequencer.c:874
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "'GIT_AUTHOR_DATE' fehlt."
 
-#: sequencer.c:925
+#: sequencer.c:939
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -7743,11 +7940,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1212
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "'prepare-commit-msg' Hook fehlgeschlagen."
 
-#: sequencer.c:1218
+#: 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"
@@ -7775,7 +7972,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1231
+#: 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"
@@ -7801,344 +7998,351 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1273
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "Konnte neu erstellten Commit nicht nachschlagen."
 
-#: sequencer.c:1275
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr "Konnte neu erstellten Commit nicht analysieren."
 
-#: sequencer.c:1321
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde."
 
-#: sequencer.c:1323
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "losgelöster HEAD"
 
-#: sequencer.c:1327
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (Root-Commit)"
 
-#: sequencer.c:1348
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "Konnte HEAD nicht parsen."
 
-#: sequencer.c:1350
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s ist kein Commit!"
 
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
+#: 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:1410 sequencer.c:2295
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "Konnte Commit-Autor nicht parsen."
 
-#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
+#: 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:1454 sequencer.c:1574
+#: 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:1485 sequencer.c:1517
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "ungültige Autor-Identität '%s'"
 
-#: sequencer.c:1491
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "unbrauchbarer Autor: Datumsinformationen fehlen"
 
-#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
-#: builtin/merge.c:934 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:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#: 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:1606
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "Konnte Commit %s nicht parsen."
 
-#: sequencer.c:1611
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "Konnte Eltern-Commit %s nicht parsen."
 
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "Unbekannter Befehl: %d"
 
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "Das ist die erste Commit-Beschreibung:"
 
-#: sequencer.c:1737
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Das ist Commit-Beschreibung #%d:"
 
-#: sequencer.c:1738
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "Die erste Commit-Beschreibung wird übersprungen:"
 
-#: sequencer.c:1739
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
 
-#: sequencer.c:1740
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Das ist eine Kombination aus %d Commits."
 
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "kann '%s' nicht schreiben"
 
-#: sequencer.c:1934
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "benötige HEAD für fixup"
 
-#: sequencer.c:1936 sequencer.c:3581
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "Konnte HEAD nicht lesen"
 
-#: sequencer.c:1938
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
 
-#: sequencer.c:1962
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
 
-#: sequencer.c:2072
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "Ihre Index-Datei ist nicht zusammengeführt."
 
-#: sequencer.c:2079
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "kann fixup nicht auf Root-Commit anwenden"
 
-#: sequencer.c:2098
+#: 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:2106 sequencer.c:2114
+#: 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:2120
+#: 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:2139
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: kann Eltern-Commit %s nicht parsen"
 
-#: sequencer.c:2205
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "Konnte '%s' nicht zu '%s' umbenennen."
 
-#: sequencer.c:2265
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
 
-#: sequencer.c:2266
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "Konnte %s... (%s) nicht anwenden"
 
-#: sequencer.c:2287
+#: 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:2345
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: Fehler beim Lesen des Index"
 
-#: sequencer.c:2352
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: Fehler beim Aktualisieren des Index"
 
-#: sequencer.c:2425
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s akzeptiert keine Argumente: '%s'"
 
-#: sequencer.c:2434
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "Fehlende Argumente für %s."
 
-#: sequencer.c:2477
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "Konnte '%s' nicht parsen."
 
-#: sequencer.c:2538
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "Ungültige Zeile %d: %.*s"
 
-#: sequencer.c:2549
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
 
-#: sequencer.c:2635
+#: sequencer.c:2624 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "Konnte '%s' nicht lesen."
+
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "Abbrechen eines laufenden \"cherry-pick\""
 
-#: sequencer.c:2644
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "Abbrechen eines laufenden \"revert\""
 
-#: sequencer.c:2690
+#: 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:2692
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "Unbenutzbares Instruktionsblatt: '%s'"
 
-#: sequencer.c:2697
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "Keine Commits geparst."
 
-#: sequencer.c:2708
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
 
-#: sequencer.c:2710
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
 
-#: sequencer.c:2788
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "ungültiger Wert für %s: %s"
 
-#: sequencer.c:2897
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "unbenutzbares squash-onto"
 
-#: sequencer.c:2917
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "fehlerhaftes Optionsblatt: '%s'"
 
-#: sequencer.c:3012 sequencer.c:4869
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "leere Menge von Commits übergeben"
 
-#: sequencer.c:3029
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "\"revert\" ist bereits im Gange"
 
-#: sequencer.c:3031
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "versuchen Sie \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3034
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "\"cherry-pick\" wird bereits durchgeführt"
 
-#: sequencer.c:3036
+#: 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:3050
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen"
 
-#: sequencer.c:3065
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "konnte HEAD nicht sperren"
 
-#: sequencer.c:3125 sequencer.c:4582
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
 msgstr "kein \"cherry-pick\" oder \"revert\" im Gange"
 
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "kann HEAD nicht auflösen"
 
-#: sequencer.c:3129 sequencer.c:3173
+#: 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:3159 builtin/grep.c:759
+#: 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:3161
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "kann '%s' nicht lesen: %s"
 
-#: sequencer.c:3162
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "unerwartetes Dateiende"
 
-#: sequencer.c:3168
+#: 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:3179
+#: 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:3220
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "kein Revert im Gange"
 
-#: sequencer.c:3229
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "kein \"cherry-pick\" im Gange"
 
-#: sequencer.c:3239
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "Ãœberspringen des Commits fehlgeschlagen"
 
-#: sequencer.c:3246
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "nichts zum Ãœberspringen vorhanden"
 
-#: sequencer.c:3249
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8147,16 +8351,16 @@ msgstr ""
 "Haben Sie bereits committet?\n"
 "Versuchen Sie \"git %s --continue\""
 
-#: sequencer.c:3411 sequencer.c:4473
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "kann HEAD nicht lesen"
 
-#: sequencer.c:3428
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "konnte '%s' nicht nach '%s' kopieren"
 
-#: sequencer.c:3436
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8175,27 +8379,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3446
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Konnte %s... (%.*s) nicht anwenden"
 
-#: sequencer.c:3453
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Konnte \"%.*s\" nicht zusammenführen"
 
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: 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:3483
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "Führe aus: %s\n"
 
-#: sequencer.c:3498
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8211,11 +8415,11 @@ msgstr ""
 "\n"
 "ausführen.\n"
 
-#: sequencer.c:3504
+#: 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:3510
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8233,91 +8437,91 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3571
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "unerlaubter Beschriftungsname: '%.*s'"
 
-#: sequencer.c:3625
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "unechten Root-Commit schreiben"
 
-#: sequencer.c:3630
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "squash-onto schreiben"
 
-#: sequencer.c:3714
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "konnte '%s' nicht auflösen"
 
-#: sequencer.c:3747
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "kann nicht ohne einen aktuellen Commit mergen"
 
-#: sequencer.c:3769
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "konnte '%.*s' nicht parsen"
 
-#: sequencer.c:3778
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "nichts zum Zusammenführen: '%.*s'"
 
-#: sequencer.c:3790
+#: 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:3806
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "konnte keine Commit-Beschreibung von '%s' bekommen"
 
-#: sequencer.c:3989
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "konnte nicht einmal versuchen '%.*s' zu mergen"
 
-#: sequencer.c:4005
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "merge: Konnte neue Index-Datei nicht schreiben."
 
-#: sequencer.c:4079
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr "Kann automatischen Stash nicht erzeugen"
 
-#: sequencer.c:4082
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Unerwartete 'stash'-Antwort: '%s'"
 
-#: sequencer.c:4088
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Konnte Verzeichnis für '%s' nicht erstellen"
 
-#: sequencer.c:4091
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Automatischen Stash erzeugt: %s\n"
 
-#: sequencer.c:4095
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "konnte 'reset --hard' nicht ausführen"
 
-#: sequencer.c:4120
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Automatischen Stash angewendet.\n"
 
-#: sequencer.c:4132
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "kann %s nicht speichern"
 
-#: sequencer.c:4135
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8328,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:4140
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "Beim Anwenden des automatischen Stash traten Konflikte auf."
 
-#: sequencer.c:4141
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr "Automatischer Stash existiert; ein neuer Stash-Eintrag wird erstellt."
 
-#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "konnte HEAD nicht loslösen"
 
-#: sequencer.c:4249
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Angehalten bei HEAD\n"
 
-#: sequencer.c:4251
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Angehalten bei %s\n"
 
-#: sequencer.c:4259
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8372,60 +8576,60 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4305
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "Rebase (%d/%d)%s"
 
-#: sequencer.c:4351
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Angehalten bei %s... %.*s\n"
 
-#: sequencer.c:4422
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "Unbekannter Befehl %d"
 
-#: sequencer.c:4481
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "Konnte orig-head nicht lesen."
 
-#: sequencer.c:4486
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "Konnte 'onto' nicht lesen."
 
-#: sequencer.c:4500
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "Konnte HEAD nicht auf %s aktualisieren."
 
-#: sequencer.c:4560
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "Erfolgreich Rebase ausgeführt und %s aktualisiert.\n"
 
-#: sequencer.c:4612
+#: 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:4621
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "Kann nicht existierenden Commit nicht nachbessern."
 
-#: sequencer.c:4623
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "Ungültige Datei: '%s'"
 
-#: sequencer.c:4625
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "Ungültige Inhalte: '%s'"
 
-#: sequencer.c:4628
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8436,59 +8640,69 @@ msgstr ""
 "committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
 "erneut aus."
 
-#: sequencer.c:4664 sequencer.c:4703
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "Konnte Datei nicht schreiben: '%s'"
 
-#: sequencer.c:4719
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
 
-#: sequencer.c:4726
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
 
-#: sequencer.c:4846
+#: 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:4850
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: ungültiger Commit"
 
-#: sequencer.c:4885
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
 
-#: sequencer.c:5362
+#: sequencer.c:5189 sequencer.c:5418
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "zuvor angewendeten Commit %s übersprungen"
+
+#: 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:5405
 msgid "make_script: unhandled options"
 msgstr "make_script: unbehandelte Optionen"
 
-#: sequencer.c:5365
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script: Fehler beim Vorbereiten der Commits"
 
-#: sequencer.c:5615 sequencer.c:5632
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "Nichts zu tun."
 
-#: sequencer.c:5651
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "Konnte unnötige \"pick\"-Befehle nicht auslassen."
 
-#: sequencer.c:5751
+#: 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"
@@ -8498,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"
@@ -8510,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"
@@ -8527,97 +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
+#: 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:661
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
 
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr "Unbekannte Repository-Erweiterungen gefunden:"
+#: 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:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "Repository-Version ist 0, aber Erweiterungen nur für v1 gefunden:"
+#: 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:700
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "Fehler beim Öffnen von '%s'."
 
-#: setup.c:702
+#: 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:704
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "Fehler beim Lesen von '%s'."
 
-#: setup.c:706
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "Ungültiges gitfile-Format: %s"
 
-#: setup.c:708
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "Kein Pfad in gitfile: %s"
 
-#: setup.c:710
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "Kein Git-Repository: %s"
 
-#: setup.c:812
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' zu groß"
 
-#: setup.c:826
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "Kein Git-Repository: '%s'"
 
-#: setup.c:855 setup.c:857 setup.c:888
+#: 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:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: 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:987
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "Konnte '%*s%s%s' nicht lesen."
 
-#: setup.c:1225
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
 
-#: setup.c:1234 setup.c:1240
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "Kann nicht nach '%s' wechseln."
 
-#: setup.c:1245
+#: 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:1251
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8627,7 +8845,7 @@ msgstr ""
 "%s)\n"
 "Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
 
-#: setup.c:1370
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8636,27 +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:1417
-msgid "open /dev/null or dup failed"
-msgstr "Öffnen von /dev/null oder dup fehlgeschlagen."
-
-#: setup.c:1432
+#: setup.c:1508
 msgid "fork failed"
 msgstr "fork fehlgeschlagen"
 
-#: setup.c:1437 t/helper/test-simple-ipc.c:285
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "setsid fehlgeschlagen"
 
-#: sparse-index.c:151
-msgid "attempting to use sparse-index without cone mode"
-msgstr "versuche partiellen Index ohne Cone-Modus zu benutzen"
-
-#: sparse-index.c:156
-msgid "unable to update cache-tree, staying full"
-msgstr "konnte Cache-Verzeichnis nicht aktualisieren, bleibt voll"
-
-#: sparse-index.c:239
+#: 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)"
@@ -8713,13 +8919,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] "%u Byte/s"
 msgstr[1] "%u Bytes/s"
 
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
-#: builtin/rebase.c:866
+#: 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:1177
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "Konnte '%s' nicht editieren."
@@ -8745,7 +8951,7 @@ msgstr ""
 msgid "invalid value for %s"
 msgstr "Ungültiger Wert für %s"
 
-#: submodule-config.c:766
+#: submodule-config.c:767
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
@@ -8770,22 +8976,22 @@ msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
 msgid "staging updated .gitmodules failed"
 msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
 
-#: submodule.c:328
+#: submodule.c:358
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "In nicht ausgechecktem Submodul '%s'."
 
-#: submodule.c:359
+#: submodule.c:389
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
 
-#: submodule.c:436
+#: submodule.c:466
 #, c-format
 msgid "bad --ignore-submodules argument: %s"
 msgstr "ungültiges --ignore-submodules Argument: %s"
 
-#: submodule.c:818
+#: submodule.c:844
 #, c-format
 msgid ""
 "Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8794,12 +9000,12 @@ msgstr ""
 "Submodul in Commit %s beim Pfad: '%s' hat den gleichen Namen wie ein "
 "Submodul. Wird übersprungen."
 
-#: submodule.c:921
+#: submodule.c:954
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "Submodul-Eintrag '%s' (%s) ist ein %s, kein Commit."
 
-#: submodule.c:1006
+#: submodule.c:1042
 #, c-format
 msgid ""
 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8808,36 +9014,36 @@ msgstr ""
 "Konnte 'git rev-list <Commits> --not --remotes -n 1' nicht in Submodul '%s' "
 "ausführen."
 
-#: submodule.c:1129
+#: submodule.c:1165
 #, c-format
 msgid "process for submodule '%s' failed"
 msgstr "Prozess für Submodul '%s' fehlgeschlagen"
 
-#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
+#: 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."
 
-#: submodule.c:1169
+#: submodule.c:1205
 #, c-format
 msgid "Pushing submodule '%s'\n"
 msgstr "Pushe Submodul '%s'\n"
 
-#: submodule.c:1172
+#: submodule.c:1208
 #, c-format
 msgid "Unable to push submodule '%s'\n"
 msgstr "Kann Push für Submodul '%s' nicht ausführen\n"
 
-#: submodule.c:1464
+#: submodule.c:1491
 #, c-format
 msgid "Fetching submodule %s%s\n"
 msgstr "Anfordern des Submoduls %s%s\n"
 
-#: submodule.c:1498
+#: submodule.c:1525
 #, c-format
 msgid "Could not access submodule '%s'\n"
 msgstr "Konnte nicht auf Submodul '%s' zugreifen\n"
 
-#: submodule.c:1653
+#: submodule.c:1680
 #, c-format
 msgid ""
 "Errors during submodule fetch:\n"
@@ -8846,62 +9052,62 @@ msgstr ""
 "Fehler während des Anforderns der Submodule:\n"
 "%s"
 
-#: submodule.c:1678
+#: submodule.c:1705
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' nicht als Git-Repository erkannt"
 
-#: submodule.c:1695
+#: submodule.c:1722
 #, c-format
 msgid "Could not run 'git status --porcelain=2' in submodule %s"
 msgstr "Konnte 'git status --porcelain=2' nicht in Submodul %s ausführen"
 
-#: submodule.c:1736
+#: submodule.c:1763
 #, c-format
 msgid "'git status --porcelain=2' failed in submodule %s"
 msgstr "'git status --porcelain=2' ist in Submodul %s fehlgeschlagen"
 
-#: submodule.c:1811
+#: submodule.c:1838
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "Konnte 'git status' in Submodul '%s' nicht starten."
 
-#: submodule.c:1824
+#: submodule.c:1851
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen."
 
-#: submodule.c:1839
+#: submodule.c:1868
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben."
 
-#: submodule.c:1866 submodule.c:2176
+#: submodule.c:1895 submodule.c:2210
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
 
-#: submodule.c:1887
+#: submodule.c:1917
 msgid "could not reset submodule index"
 msgstr "konnte Index des Submoduls nicht zurücksetzen"
 
-#: submodule.c:1929
+#: submodule.c:1959
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "Submodul '%s' hat einen geänderten Index."
 
-#: submodule.c:1981
+#: submodule.c:2013
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Submodule '%s' konnte nicht aktualisiert werden."
 
-#: submodule.c:2049
+#: submodule.c:2081
 #, c-format
 msgid "submodule git dir '%s' is inside git dir '%.*s'"
 msgstr ""
 "Git-Verzeichnis des Submoduls '%s' ist im Git-Verzeichnis '%.*s' enthalten."
 
-#: submodule.c:2070
+#: submodule.c:2102
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8909,17 +9115,17 @@ msgstr ""
 "relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
 "wird nicht unterstützt"
 
-#: submodule.c:2082 submodule.c:2141
+#: submodule.c:2114 submodule.c:2174
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "Konnte Name für Submodul '%s' nicht nachschlagen."
 
-#: submodule.c:2086
+#: submodule.c:2118
 #, c-format
 msgid "refusing to move '%s' into an existing git dir"
 msgstr "Verschieben von '%s' in ein existierendes Git-Verzeichnis verweigert."
 
-#: submodule.c:2093
+#: submodule.c:2124
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -8930,11 +9136,11 @@ msgstr ""
 "'%s' nach\n"
 "'%s'\n"
 
-#: submodule.c:2221
+#: submodule.c:2255
 msgid "could not start ls-files in .."
 msgstr "Konnte 'ls-files' nicht in .. starten"
 
-#: submodule.c:2261
+#: submodule.c:2295
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet"
@@ -8956,7 +9162,7 @@ msgid "unknown value '%s' for key '%s'"
 msgstr "unbekannter Wert '%s' für Schlüssel %s"
 
 #: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
 #, c-format
 msgid "more than one %s"
 msgstr "mehr als ein %s"
@@ -8971,11 +9177,11 @@ msgstr "leerer Anhang-Token in Anhang '%.*s'"
 msgid "could not read input file '%s'"
 msgstr "Konnte Eingabe-Datei '%s' nicht lesen"
 
-#: trailer.c:766 builtin/mktag.c:88
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
 msgid "could not read from stdin"
 msgstr "konnte nicht von der Standard-Eingabe lesen"
 
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
 #, c-format
 msgid "could not stat %s"
 msgstr "Konnte '%s' nicht lesen"
@@ -9020,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
@@ -9043,9 +9249,9 @@ 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:1247
+#: transport-helper.c:549 transport-helper.c:1251
 #, c-format
 msgid "could not read ref %s"
 msgstr "konnte Referenz %s nicht lesen"
@@ -9064,7 +9270,7 @@ msgstr ""
 msgid "invalid remote service path"
 msgstr "ungültiger Remote-Service Pfad."
 
-#: transport-helper.c:661 transport.c:1471
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "die Operation wird von dem Protokoll nicht unterstützt"
 
@@ -9073,7 +9279,7 @@ msgstr "die Operation wird von dem Protokoll nicht unterstützt"
 msgid "can't connect to subservice %s"
 msgstr "kann keine Verbindung zu Subservice %s herstellen"
 
-#: transport-helper.c:693 transport.c:397
+#: transport-helper.c:693 transport.c:404
 msgid "--negotiate-only requires protocol v2"
 msgstr "--negotiate-only benötigt Protokoll v2"
 
@@ -9086,59 +9292,59 @@ msgstr "'option' ohne passende 'ok/error' Direktive"
 msgid "expected ok/error, helper said '%s'"
 msgstr "erwartete ok/error, Remote-Helper gab '%s' aus"
 
-#: transport-helper.c:855
+#: transport-helper.c:859
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "Remote-Helper meldete unerwarteten Status von %s"
 
-#: transport-helper.c:938
+#: transport-helper.c:942
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "Remote-Helper %s unterstützt kein Trockenlauf"
 
-#: transport-helper.c:941
+#: transport-helper.c:945
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "Remote-Helper %s unterstützt kein --signed"
 
-#: transport-helper.c:944
+#: transport-helper.c:948
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "Remote-Helper %s unterstützt kein --signed=if-asked"
 
-#: transport-helper.c:949
+#: transport-helper.c:953
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "Remote-Helper %s unterstützt kein --atomic"
 
-#: transport-helper.c:953
+#: transport-helper.c:957
 #, c-format
 msgid "helper %s does not support --%s"
 msgstr "Remote-Helper %s unterstützt kein --%s"
 
-#: transport-helper.c:960
+#: transport-helper.c:964
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "Remote-Helper %s unterstützt nicht 'push-option'"
 
-#: transport-helper.c:1060
+#: transport-helper.c:1064
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "Remote-Helper unterstützt kein Push; Refspec benötigt"
 
-#: transport-helper.c:1065
+#: transport-helper.c:1069
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "Remote-Helper %s unterstützt kein 'force'."
 
-#: transport-helper.c:1112
+#: transport-helper.c:1116
 msgid "couldn't run fast-export"
 msgstr "Konnte \"fast-export\" nicht ausführen."
 
-#: transport-helper.c:1117
+#: transport-helper.c:1121
 msgid "error while running fast-export"
 msgstr "Fehler beim Ausführen von \"fast-export\"."
 
-#: transport-helper.c:1142
+#: transport-helper.c:1146
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -9147,52 +9353,52 @@ msgstr ""
 "Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausführung.\n"
 "Vielleicht sollten Sie einen Branch angeben.\n"
 
-#: transport-helper.c:1224
+#: transport-helper.c:1228
 #, c-format
 msgid "unsupported object format '%s'"
 msgstr "nicht unterstütztes Objekt-Format '%s'"
 
-#: transport-helper.c:1233
+#: transport-helper.c:1237
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "Ungültige Antwort in Referenzliste: %s"
 
-#: transport-helper.c:1385
+#: transport-helper.c:1389
 #, c-format
 msgid "read(%s) failed"
 msgstr "Lesen von %s fehlgeschlagen."
 
-#: transport-helper.c:1412
+#: transport-helper.c:1416
 #, c-format
 msgid "write(%s) failed"
 msgstr "Schreiben von %s fehlgeschlagen."
 
-#: transport-helper.c:1461
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed"
 msgstr "Thread %s fehlgeschlagen."
 
-#: transport-helper.c:1465
+#: transport-helper.c:1469
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "Fehler beim Beitreten zu Thread %s: %s"
 
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s"
 
-#: transport-helper.c:1525
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed to wait"
 msgstr "Fehler beim Warten von Prozess %s."
 
-#: transport-helper.c:1529
+#: transport-helper.c:1533
 #, c-format
 msgid "%s process failed"
 msgstr "Prozess %s fehlgeschlagen"
 
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
 msgid "can't start thread for copying data"
 msgstr "Kann Thread zum Kopieren von Daten nicht starten."
 
@@ -9206,46 +9412,46 @@ msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n"
 msgid "could not read bundle '%s'"
 msgstr "Konnte Paket '%s' nicht lesen."
 
-#: transport.c:220
+#: transport.c:227
 #, c-format
 msgid "transport: invalid depth option '%s'"
-msgstr "transport: ungültige --depth Option '%s'"
+msgstr "transport: ungültige depth Option '%s'"
 
-#: transport.c:272
+#: transport.c:279
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "Siehe protocol.version in 'git help config' für weitere Informationen"
 
-#: transport.c:273
+#: transport.c:280
 msgid "server options require protocol version 2 or later"
 msgstr "Server-Optionen benötigen Protokoll-Version 2 oder höher"
 
-#: transport.c:400
+#: transport.c:407
 msgid "server does not support wait-for-done"
 msgstr "Server unterstützt nicht 'wait-for-done'"
 
-#: transport.c:751
+#: transport.c:759
 msgid "could not parse transport.color.* config"
 msgstr "Konnte transport.color.* Konfiguration nicht parsen."
 
-#: transport.c:826
+#: transport.c:834
 msgid "support for protocol v2 not implemented yet"
 msgstr "Unterstützung für Protokoll v2 noch nicht implementiert."
 
-#: transport.c:960
+#: transport.c:967
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "Unbekannter Wert für Konfiguration '%s': %s"
 
-#: transport.c:1026
+#: transport.c:1033
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "Ãœbertragungsart '%s' nicht erlaubt."
 
-#: transport.c:1079
+#: transport.c:1082
 msgid "git-over-rsync is no longer supported"
 msgstr "git-over-rsync wird nicht länger unterstützt."
 
-#: transport.c:1181
+#: transport.c:1185
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -9254,7 +9460,7 @@ msgstr ""
 "Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
 "Remote-Repository gefunden wurden:\n"
 
-#: transport.c:1185
+#: transport.c:1189
 #, c-format
 msgid ""
 "\n"
@@ -9281,11 +9487,11 @@ msgstr ""
 "zum Versenden zu einem Remote-Repository.\n"
 "\n"
 
-#: transport.c:1193
+#: transport.c:1197
 msgid "Aborting."
 msgstr "Abbruch."
 
-#: transport.c:1340
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr "Fehler beim Versand aller erforderlichen Submodule."
 
@@ -9305,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"
@@ -9316,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"
@@ -9326,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"
@@ -9336,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"
@@ -9346,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"
@@ -9356,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"
@@ -9365,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"
@@ -9375,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"
@@ -9385,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"
@@ -9396,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"
@@ -9406,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"
@@ -9417,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"
@@ -9427,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"
@@ -9437,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 "
@@ -9448,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 "
@@ -9460,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"
@@ -9470,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"
@@ -9480,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"
@@ -9490,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"
@@ -9501,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"
@@ -9515,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 "
@@ -9526,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"
@@ -9536,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 "
@@ -9547,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 "
@@ -9561,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"
@@ -9575,17 +9790,17 @@ msgstr ""
 "auf einem case-insensitiven Dateisystem) und nur einer von der\n"
 "selben Kollissionsgruppe ist im Arbeitsverzeichnis:\n"
 
-#: unpack-trees.c:1519
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "Aktualisiere Index-Markierungen"
 
-#: unpack-trees.c:2608
+#: 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:1548
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "erwartete Flush nach Abrufen der Argumente"
 
@@ -9622,114 +9837,124 @@ msgstr "ungültiges '..' Pfadsegment"
 msgid "Fetching objects"
 msgstr "Anfordern der Objekte"
 
-#: worktree.c:238 builtin/am.c:2151
+#: 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:304
+#: 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:315
+#: 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:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' existiert nicht."
 
-#: worktree.c:333
+#: 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:342
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' zeigt nicht zurück auf '%s'"
 
-#: worktree.c:608
+#: worktree.c:604
 msgid "not a directory"
 msgstr "kein Verzeichnis"
 
-#: worktree.c:617
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git ist keine Datei"
 
-#: worktree.c:619
+#: worktree.c:615
 msgid ".git file broken"
 msgstr ".git-Datei kaputt"
 
-#: worktree.c:621
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr ".git-Datei fehlerhaft"
 
-#: worktree.c:727
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "kein gültiger Pfad"
 
-#: worktree.c:733
+#: 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:737
+#: 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:741
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "Konnte Repository nicht finden; .git-Datei ist kaputt"
 
-#: worktree.c:747
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "gitdir nicht lesbar"
 
-#: worktree.c:751
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "gitdir fehlerhaft"
 
-#: worktree.c:776
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "kein gültiges Verzeichnis"
 
-#: worktree.c:782
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "gitdir-Datei existiert nicht"
 
-#: worktree.c:787 worktree.c:796
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "konnte gitdir-Datei nicht lesen (%s)"
 
-#: worktree.c:806
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> gelesen)"
 
-#: worktree.c:814
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "ungültige gitdir-Datei"
 
-#: worktree.c:822
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "gitdir-Datei verweist auf nicht existierenden Ort"
 
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "konnte '%s' nicht setzen"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "konnte '%s' nicht erstellen"
+
+#: wrapper.c:205 wrapper.c:375
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "konnte '%s' nicht zum Lesen und Schreiben öffnen"
 
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
 #, c-format
 msgid "unable to access '%s'"
 msgstr "konnte nicht auf '%s' zugreifen"
 
-#: wrapper.c:607
+#: wrapper.c:615
 msgid "unable to get current working directory"
 msgstr "konnte aktuelles Arbeitsverzeichnis nicht bekommen"
 
@@ -9772,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:1075
+#: 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:1084
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
 
@@ -9884,22 +10109,22 @@ msgstr "geänderter Inhalt, "
 msgid "untracked content, "
 msgstr "unversionierter Inhalt, "
 
-#: wt-status.c:908
+#: 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:939
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "Submodule geändert, aber nicht aktualisiert:"
 
-#: wt-status.c:941
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "Änderungen in Submodul zum Committen:"
 
-#: wt-status.c:1023
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -9907,7 +10132,7 @@ msgstr ""
 "Ändern oder entfernen Sie nicht die obige Zeile.\n"
 "Alles unterhalb von ihr wird ignoriert."
 
-#: wt-status.c:1115
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -9919,114 +10144,121 @@ msgstr ""
 "berechnen.\n"
 "Sie können '--no-ahead-behind' benutzen, um das zu verhindern.\n"
 
-#: wt-status.c:1145
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "Sie haben nicht zusammengeführte Pfade."
 
-#: wt-status.c:1148
+#: 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:1150
+#: 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:1154
+#: 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:1157
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (benutzen Sie \"git commit\", um den Merge abzuschließen)"
 
-#: wt-status.c:1166
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr "Eine \"am\"-Sitzung ist im Gange."
 
-#: wt-status.c:1169
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "Der aktuelle Patch ist leer."
 
-#: wt-status.c:1173
+#: 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:1175
+#: 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:1177
+#: 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:1310
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo fehlt."
 
-#: wt-status.c:1312
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "Keine Befehle ausgeführt."
 
-#: wt-status.c:1315
+#: 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:1326
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (mehr Informationen in Datei %s)"
 
-#: wt-status.c:1331
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "Keine Befehle verbleibend."
 
-#: wt-status.c:1334
+#: 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:1342
+#: 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:1354
+#: 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:1359
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "Sie sind gerade beim Rebase."
 
-#: wt-status.c:1372
+#: 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:1374
+#: 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:1376
+#: 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:1383
+#: 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:1387
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -10034,170 +10266,174 @@ msgstr ""
 "Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf "
 "'%s' im Gange ist."
 
-#: wt-status.c:1392
+#: 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:1395
+#: 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:1399
+#: 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:1404
+#: 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:1407
+#: 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:1409
+#: 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:1420
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "Cherry-pick zurzeit im Gange."
 
-#: wt-status.c:1423
+#: 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:1430
+#: 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:1433
+#: 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:1436
+#: 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:1438
+#: 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:1440
+#: 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:1450
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "Revert zurzeit im Gange."
 
-#: wt-status.c:1453
+#: 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:1459
+#: 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:1462
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (Führen Sie \"git revert --continue\", um weiterzumachen)"
 
-#: wt-status.c:1465
+#: 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:1467
+#: 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:1469
+#: 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:1479
+#: 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:1483
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "Sie sind gerade bei einer binären Suche."
 
-#: wt-status.c:1486
+#: 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:1497
+#: wt-status.c:1559
+msgid "You are in a sparse checkout."
+msgstr "Sie befinden sich in einem partiellen Checkout."
+
+#: 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:1736
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "Auf Branch "
 
-#: wt-status.c:1743
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "interaktives Rebase im Gange; auf "
 
-#: wt-status.c:1745
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "Rebase im Gange; auf "
 
-#: wt-status.c:1750
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "HEAD losgelöst bei "
 
-#: wt-status.c:1752
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "HEAD losgelöst von "
 
-#: wt-status.c:1755
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "Im Moment auf keinem Branch."
 
-#: wt-status.c:1772
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Initialer Commit"
 
-#: wt-status.c:1773
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "Noch keine Commits"
 
-#: wt-status.c:1787
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "Unversionierte Dateien"
 
-#: wt-status.c:1789
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Ignorierte Dateien"
 
-#: wt-status.c:1793
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10208,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:1799
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Unversionierte Dateien nicht aufgelistet%s"
 
-#: wt-status.c:1801
+#: 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:1807
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "Keine Änderungen"
 
-#: wt-status.c:1812
+#: 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:1816
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "keine Änderungen zum Commit vorgemerkt\n"
 
-#: wt-status.c:1820
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -10242,91 +10478,91 @@ msgstr ""
 "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
 "(benutzen Sie \"git add\" zum Versionieren)\n"
 
-#: wt-status.c:1824
+#: 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:1828
+#: 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:1832 wt-status.c:1838
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "nichts zu committen\n"
 
-#: wt-status.c:1835
+#: 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:1840
+#: 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:1945
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "Noch keine Commits in "
 
-#: wt-status.c:1949
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (kein Branch)"
 
-#: wt-status.c:1980
+#: wt-status.c:2050
 msgid "different"
 msgstr "unterschiedlich"
 
-#: wt-status.c:1982 wt-status.c:1990
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "hinterher "
 
-#: wt-status.c:1985 wt-status.c:1988
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr "voraus "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2511
+#: 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:2517
+#: 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:2519
+#: 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:178
+#: 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:185
+#: 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:862
+#: 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:874
+#: 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"
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "Konnte '%s' nicht entfernen."
@@ -10335,139 +10571,146 @@ msgstr "Konnte '%s' nicht entfernen."
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
 
-#: builtin/add.c:61
+#: builtin/add.c:64
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "kann chmod %cx '%s' nicht ausführen"
 
-#: builtin/add.c:99
+#: builtin/add.c:106
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "unerwarteter Differenz-Status %c"
 
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
 msgid "updating files failed"
 msgstr "Aktualisierung der Dateien fehlgeschlagen"
 
-#: builtin/add.c:114
+#: builtin/add.c:121
 #, c-format
 msgid "remove '%s'\n"
 msgstr "lösche '%s'\n"
 
-#: builtin/add.c:198
+#: builtin/add.c:205
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
 
-#: builtin/add.c:307 builtin/rev-parse.c:991
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Konnte den Index nicht lesen"
 
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-
-#: builtin/add.c:322
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "Konnte Patch nicht schreiben"
 
-#: builtin/add.c:325
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "Bearbeitung des Patches fehlgeschlagen"
 
-#: builtin/add.c:328
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht lesen"
 
-#: builtin/add.c:330
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "Leerer Patch. Abgebrochen."
 
-#: builtin/add.c:335
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Konnte '%s' nicht anwenden."
 
-#: builtin/add.c:343
+#: 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:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: 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:366
+#: 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:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: 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:368
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "aktuelle Unterschiede editieren und anwenden"
 
-#: builtin/add.c:369
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben"
 
-#: builtin/add.c:370
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "versionierte Dateien aktualisieren"
 
-#: builtin/add.c:371
+#: 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:372
+#: 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:373
+#: 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:376
+#: 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:378
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "nichts hinzufügen, nur den Index aktualisieren"
 
-#: builtin/add.c:379
+#: 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:380
+#: 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:382 builtin/update-index.c:1006
+#: 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: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:384
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "warnen wenn eingebettetes Repository hinzugefügt wird"
 
-#: builtin/add.c:386
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "Backend für `git stash -p`"
 
-#: builtin/add.c:404
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10501,12 +10744,12 @@ msgstr ""
 "\n"
 "Siehe \"git help submodule\" für weitere Informationen."
 
-#: builtin/add.c:432
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "Füge eingebettetes Repository hinzu: %s"
 
-#: builtin/add.c:451
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10516,52 +10759,28 @@ msgstr ""
 "Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:460
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "Hinzufügen von Dateien fehlgeschlagen"
 
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run und --interactive/--patch sind inkompatibel"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file und --interactive/--patch sind inkompatibel"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file und --edit sind inkompatibel"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A und -u sind zueinander inkompatibel"
-
-#: builtin/add.c:522
-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:526
+#: 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:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file ist inkompatibel mit Pfadspezifikation-Argumenten"
-
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
-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:555
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
 
-#: builtin/add.c:557
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10571,116 +10790,124 @@ msgstr ""
 "Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:364
+#: 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:454
+#: 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:496
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Fehlerhafte Eingabezeile: '%s'."
 
-#: builtin/am.c:534
+#: 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:560
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "\"fseek\" fehlgeschlagen"
 
-#: builtin/am.c:748
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "konnte Patch '%s' nicht parsen"
 
-#: builtin/am.c:813
+#: 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:861
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "ungültiger Zeitstempel"
 
-#: builtin/am.c:866 builtin/am.c:878
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "Ungültige \"Date\"-Zeile"
 
-#: builtin/am.c:873
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "Ungültiger Offset in der Zeitzone"
 
-#: builtin/am.c:966
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "Patch-Formaterkennung fehlgeschlagen."
 
-#: builtin/am.c:971 builtin/clone.c:414
+#: 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:976
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Fehler beim Aufteilen der Patches."
 
-#: builtin/am.c:1125
+#: 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:1126
+#: 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:1127
+#: 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:1222
+#: 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:1250
-msgid "Patch is empty."
-msgstr "Patch ist leer."
-
-#: builtin/am.c:1315
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "Autor-Zeile fehlt in Commit %s"
 
-#: builtin/am.c:1318
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "Ungültige Identifikationszeile: %.*s"
 
-#: builtin/am.c:1537
+#: 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:1539
+#: builtin/am.c:1568
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
-"nachzustellen ..."
+"nachzustellen..."
 
-#: builtin/am.c:1558
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10688,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:1564
+#: 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 ..."
+msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge..."
 
-#: builtin/am.c:1590
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "Merge der Änderungen fehlgeschlagen."
 
-#: builtin/am.c:1622
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "auf leere Historie anwenden"
 
-#: builtin/am.c:1674 builtin/am.c:1678
+#: 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:1696
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "Commit-Beschreibung ist:"
 
@@ -10713,41 +10940,59 @@ msgstr "Commit-Beschreibung ist:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1706
+#: 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:1752 builtin/commit.c:408
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "Konnte Index-Datei nicht schreiben."
 
-#: builtin/am.c:1756
+#: 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:1796 builtin/am.c:1864
+#: 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:1813
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "Keine Änderungen -- Patches bereits angewendet."
 
-#: builtin/am.c:1819
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
 
-#: builtin/am.c:1823
+#: 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:1867
+#: 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"
@@ -10758,7 +11003,7 @@ msgstr ""
 "diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
 "auslassen."
 
-#: builtin/am.c:1874
+#: 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 "
@@ -10768,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:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
-#: builtin/reset.c:355
+#: 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:2033
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "Fehler beim Bereinigen des Index"
 
-#: builtin/am.c:2077
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10789,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:2184
+#: 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:2226
+#: 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:2230
+#: 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:2261
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2268
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "interaktiv ausführen"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "historische Option -- kein Effekt"
 
-#: builtin/am.c:2272
+#: 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:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:948
+#: 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:2275
+#: 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:2278
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "nach UTF-8 umkodieren (Standard)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "-k an git-mailinfo übergeben"
 
-#: builtin/am.c:2282
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "-b an git-mailinfo übergeben"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "-m an git-mailinfo übergeben"
 
-#: builtin/am.c:2286
+#: 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:2289
+#: 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:2292
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "alles vor einer Scheren-Zeile entfernen"
 
-#: builtin/am.c:2294
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "an git-mailinfo weitergeben"
 
-#: builtin/am.c:2297 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:2324
+#: 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:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
+#: 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:317
 msgid "n"
 msgstr "Anzahl"
 
-#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: 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:2321
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "Patch-Format"
 
-#: builtin/am.c:2327
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
 msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
 
-#: builtin/am.c:2329
+#: 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:2332
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "Synonyme für --continue"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "den aktuellen Patch auslassen"
 
-#: builtin/am.c:2338
+#: 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:2341
+#: 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:2345
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "den Patch, der gerade angewendet wird, anzeigen"
 
-#: builtin/am.c:2350
+#: 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:2352
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
 
-#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: 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:2355 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "Commits mit GPG signieren"
 
-#: builtin/am.c:2358
+#: 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:2376
+#: 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."
@@ -10950,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:2383
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr "Fehler beim Lesen des Index"
 
-#: builtin/am.c:2398
+#: 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:2422
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -10968,11 +11222,11 @@ msgstr ""
 "Stray %s Verzeichnis gefunden.\n"
 "Benutzen Sie \"git am --abort\", um es zu entfernen."
 
-#: builtin/am.c:2428
+#: 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:2438
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "Interaktiver Modus benötigt Patches über die Kommandozeile"
 
@@ -10980,46 +11234,35 @@ msgstr "Interaktiver Modus benötigt Patches über die Kommandozeile"
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<Optionen>] [<Patch>...]"
 
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "Konnte Archiv-Datei '%s' nicht erstellen."
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "Konnte Ausgabe nicht umleiten."
 
-#: builtin/archive.c:37
+#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Externes Archiv ohne URL"
 
-#: builtin/archive.c:61
+#: builtin/archive.c:59
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive: ACK/NAK erwartet, Flush-Paket bekommen"
 
-#: builtin/archive.c:64
+#: builtin/archive.c:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: NACK %s"
 
-#: builtin/archive.c:65
+#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive: Protokollfehler"
 
-#: builtin/archive.c:69
+#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive: erwartete eine Spülung (flush)"
 
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<Commit>]"
 
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <Begriff_gut> <Begriff_schlecht> "
-"[<Begriff>]"
-
 #: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -11058,46 +11301,59 @@ msgstr "git bisect--helper --bisect-replay <Dateiname>"
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<Commit>|<Bereich>)...]"
 
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <Programm>..."
+
+#: builtin/bisect--helper.c:109
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr "kann Datei '%s' nicht im Modus '%s' öffnen"
 
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "konnte nicht in Datei '%s' schreiben"
 
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "Datei '%s' kann nicht zum Lesen geöffnet werden"
+
+#: builtin/bisect--helper.c:170
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' ist kein gültiger Begriff"
 
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "kann den eingebauten Befehl '%s' nicht als Begriff verwenden"
 
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "kann die Bedeutung von dem Begriff '%s' nicht ändern"
 
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
 msgid "please use two different terms"
 msgstr "bitte verwenden Sie zwei verschiedene Begriffe"
 
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "Keine binäre Suche im Gange.\n"
 
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "'%s' ist kein gültiger Commit"
 
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -11105,27 +11361,27 @@ msgstr ""
 "Konnte den ursprünglichen HEAD '%s' nicht auschecken.\n"
 "Versuchen Sie 'git bisect reset <Commit>'."
 
-#: builtin/bisect--helper.c:254
+#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Ungültiges \"bisect_write\" Argument: %s"
 
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "konnte die OID der Revision '%s' nicht erhalten"
 
-#: builtin/bisect--helper.c:271
+#: builtin/bisect--helper.c:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "konnte die Datei '%s' nicht öffnen"
 
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:314
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "Ungültiger Befehl: Sie sind gerade innerhalb einer binären %s/%s Suche"
 
-#: builtin/bisect--helper.c:324
+#: builtin/bisect--helper.c:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -11134,7 +11390,7 @@ msgstr ""
 "Sie müssen mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n"
 "Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen."
 
-#: builtin/bisect--helper.c:328
+#: builtin/bisect--helper.c:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -11145,7 +11401,7 @@ msgstr ""
 "Danach müssen Sie mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n"
 "Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen."
 
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "binäre Suche nur mit einem %s Commit"
@@ -11154,15 +11410,15 @@ msgstr "binäre Suche nur mit einem %s Commit"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "Sind Sie sicher [Y/n]? "
 
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
 msgid "no terms defined"
 msgstr "keine Begriffe definiert"
 
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -11171,7 +11427,7 @@ msgstr ""
 "Ihre aktuellen Begriffe sind %s für den alten Zustand\n"
 "und %s für den neuen Zustand.\n"
 
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -11180,55 +11436,55 @@ msgstr ""
 "Ungültiges Argument %s für 'git bisect terms'.\n"
 "Unterstützte Optionen sind: --term-good|--term-old und --term-bad|--term-new."
 
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
 msgstr "Einrichtung des Revisionsgangs fehlgeschlagen\n"
 
-#: builtin/bisect--helper.c:519
+#: builtin/bisect--helper.c:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "konnte '%s' nicht zum Anhängen öffnen"
 
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
 msgstr "'' ist kein gültiger Begriff"
 
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "nicht erkannte Option: '%s'"
 
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' scheint kein gültiger Commit zu sein"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "ungültiger HEAD - HEAD wird benötigt"
 
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 "Auschecken von '%s' fehlgeschlagen. Versuchen Sie 'git bisect start "
 "<gültiger-Branch>'."
 
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
 msgid "won't bisect on cg-seek'ed tree"
 msgstr ""
 "binäre Suche auf einem durch 'cg-seek' geändertem Verzeichnis nicht möglich"
 
-#: builtin/bisect--helper.c:735
+#: builtin/bisect--helper.c:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "ungültiger HEAD - merkwürdige symbolische Referenz"
 
-#: builtin/bisect--helper.c:755
+#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "ungültige Referenz: '%s'"
 
-#: builtin/bisect--helper.c:813
+#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "Sie müssen mit \"git bisect start\" beginnen\n"
 
@@ -11236,104 +11492,150 @@ msgstr "Sie müssen mit \"git bisect start\" beginnen\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "Wollen Sie, dass ich es für Sie mache [Y/n]? "
 
-#: builtin/bisect--helper.c:842
+#: builtin/bisect--helper.c:859
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr "Bitte führen Sie `--bisect-state` mit mindestens einem Argument aus"
 
-#: builtin/bisect--helper.c:855
+#: builtin/bisect--helper.c:872
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "'git bisect %s' kann nur ein Argument entgegennehmen."
 
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "Ungültige Referenz-Eingabe: %s"
 
-#: builtin/bisect--helper.c:887
+#: builtin/bisect--helper.c:904
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "Ungültige Referenz-Eingabe (kein Commit): %s"
 
-#: builtin/bisect--helper.c:919
+#: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
 msgstr "Keine binäre Suche im Gange."
 
-#: builtin/bisect--helper.c:969
+#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "'%s'?? Was reden Sie da?"
 
-#: builtin/bisect--helper.c:981
+#: builtin/bisect--helper.c:998
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr "kann Datei '%s' nicht für die Wiederholung lesen"
 
-#: builtin/bisect--helper.c:1054
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "'bisect run' fehlgeschlagen: kein Befehl angegeben."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "Ausführen von %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "'bisect run' fehlgeschlagen: Exit-Code %d von '%s' ist < 0 oder >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "Datei '%s' kann nicht zum Schreiben geöffnet werden"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "'bisect run' kann nicht mehr fortgesetzt werden"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "'bisect run' erfolgreich ausgeführt"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "binäre Suche fand ersten schlechten Commit"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"'bisect run' fehlgeschlagen: 'git bisect--helper --bisect-state %s' mit "
+"Fehlercode %d beendet"
+
+#: builtin/bisect--helper.c:1192
 msgid "reset the bisection state"
 msgstr "den Zustand der binären Suche zurücksetzen"
 
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1194
 msgid "check whether bad or good terms exist"
 msgstr "prüfen, ob Begriffe für gute und schlechte Commits existieren"
 
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1196
 msgid "print out the bisect terms"
 msgstr "die Begriffe für die binäre Suche ausgeben"
 
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1198
 msgid "start the bisect session"
 msgstr "Sitzung für binäre Suche starten"
 
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1200
 msgid "find the next bisection commit"
 msgstr "nächsten Commit für die binäre Suche finden"
 
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1202
 msgid "mark the state of ref (or refs)"
 msgstr "den Status der Referenz(en) markieren"
 
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1204
 msgid "list the bisection steps so far"
 msgstr "die bisherigen Schritte der binären Suche auflisten"
 
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1206
 msgid "replay the bisection process from the given file"
 msgstr "binäre Suche aus der angegebenen Datei wiederholen"
 
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1208
 msgid "skip some commits for checkout"
 msgstr "einige Commits für das Auschecken überspringen"
 
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "binäre Suche visualisieren"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "verwende <Programm>... für die automatische binäre Suche."
+
+#: builtin/bisect--helper.c:1214
 msgid "no log for BISECT_WRITE"
 msgstr "kein Log für BISECT_WRITE"
 
-#: builtin/bisect--helper.c:1087
+#: builtin/bisect--helper.c:1229
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset benötigt entweder kein Argument oder ein Commit"
 
-#: builtin/bisect--helper.c:1092
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check benötigt 2 oder 3 Argumente"
-
-#: builtin/bisect--helper.c:1098
+#: builtin/bisect--helper.c:1234
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms benötigt 0 oder 1 Argument"
 
-#: builtin/bisect--helper.c:1107
+#: builtin/bisect--helper.c:1243
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next benötigt 0 Argumente"
 
-#: builtin/bisect--helper.c:1118
+#: builtin/bisect--helper.c:1254
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log benötigt 0 Argumente"
 
-#: builtin/bisect--helper.c:1123
+#: builtin/bisect--helper.c:1259
 msgid "no logfile given"
 msgstr "keine Log-Datei angegeben"
 
@@ -11345,155 +11647,157 @@ msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "erwarte eine Farbe: %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "muss mit einer Farbe enden"
 
-#: builtin/blame.c:728
+#: builtin/blame.c:724
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "ungültige Farbe '%s' in color.blame.repeatedLines"
 
-#: builtin/blame.c:746
+#: builtin/blame.c:742
 msgid "invalid value for blame.coloring"
 msgstr "ungültiger Wert für blame.coloring"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:841
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "konnte Commit %s zum Ignorieren nicht finden"
 
-#: builtin/blame.c:867
+#: builtin/blame.c:863
 msgid "show blame entries as we find them, incrementally"
 msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie finden"
 
-#: builtin/blame.c:868
+#: builtin/blame.c:864
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr "keine Objektnamen für Grenz-Commits anzeigen (Standard: aus)"
 
-#: builtin/blame.c:869
+#: builtin/blame.c:865
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)"
 
-#: builtin/blame.c:870
+#: builtin/blame.c:866
 msgid "show work cost statistics"
 msgstr "Statistiken zum Arbeitsaufwand anzeigen"
 
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: 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"
 
-#: builtin/blame.c:872
+#: builtin/blame.c:868
 msgid "show output score for blame entries"
 msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
 
-#: builtin/blame.c:873
+#: builtin/blame.c:869
 msgid "show original filename (Default: auto)"
 msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:870
 msgid "show original linenumber (Default: off)"
 msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:871
 msgid "show in a format designed for machine consumption"
 msgstr "Anzeige in einem Format für maschinelle Auswertung"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:872
 msgid "show porcelain format with per-line commit information"
 msgstr ""
 "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:873
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr ""
 "den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:874
 msgid "show raw timestamp (Default: off)"
 msgstr "unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
 
-#: builtin/blame.c:879
+#: builtin/blame.c:875
 msgid "show long commit SHA1 (Default: off)"
 msgstr "langen Commit-SHA1 anzeigen (Standard: aus)"
 
-#: builtin/blame.c:880
+#: builtin/blame.c:876
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
 
-#: builtin/blame.c:881
+#: builtin/blame.c:877
 msgid "show author email instead of name (Default: off)"
 msgstr ""
 "statt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:878
 msgid "ignore whitespace differences"
 msgstr "Whitespace-Unterschiede ignorieren"
 
-#: builtin/blame.c:883 builtin/log.c:1820
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "Commit"
 
-#: builtin/blame.c:883
+#: builtin/blame.c:879
 msgid "ignore <rev> when blaming"
 msgstr "ignoriere <Commit> beim Ausführen von 'blame'"
 
-#: builtin/blame.c:884
+#: builtin/blame.c:880
 msgid "ignore revisions from <file>"
 msgstr "ignoriere Commits aus <Datei>"
 
-#: builtin/blame.c:885
+#: builtin/blame.c:881
 msgid "color redundant metadata from previous line differently"
 msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfärben"
 
-#: builtin/blame.c:886
+#: builtin/blame.c:882
 msgid "color lines by age"
 msgstr "Zeilen nach Alter einfärben"
 
-#: builtin/blame.c:887
+#: builtin/blame.c:883
 msgid "spend extra cycles to find better match"
 msgstr ""
 "mehr Arbeitsschritte ausführen, um eine bessere Übereinstimmung zu finden"
 
-#: builtin/blame.c:888
+#: builtin/blame.c:884
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "Commits von <Datei> benutzen, statt \"git-rev-list\" aufzurufen"
 
-#: builtin/blame.c:889
+#: builtin/blame.c:885
 msgid "use <file>'s contents as the final image"
 msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
 
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
 msgid "score"
 msgstr "Bewertung"
 
-#: builtin/blame.c:890
+#: builtin/blame.c:886
 msgid "find line copies within and across files"
 msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
 
-#: builtin/blame.c:891
+#: builtin/blame.c:887
 msgid "find line movements within and across files"
 msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
 
-#: builtin/blame.c:892
+#: builtin/blame.c:888
 msgid "range"
 msgstr "Bereich"
 
-#: builtin/blame.c:893
+#: builtin/blame.c:889
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
 "nur Zeilen im Bereich <Start>,<Ende> oder Funktion :<Funktionsname> "
 "verarbeiten"
 
-#: builtin/blame.c:945
+#: 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"
@@ -11507,18 +11811,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:996
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "vor 4 Jahren und 11 Monaten"
 
-#: builtin/blame.c:1112
+#: 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:1157
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "Verarbeite Zeilen"
 
@@ -11550,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"
@@ -11559,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"
@@ -11568,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"
@@ -11583,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."
 
@@ -11595,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:440 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:471
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "Konnte HEAD-Commit nicht auflösen."
 
-#: builtin/branch.c:477
+#: 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:492
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Branch %s wird auf %s umgesetzt"
 
-#: builtin/branch.c:496
+#: 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:513
+#: 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:515
+#: 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:526
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Ungültiger Branchname: '%s'"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "Umbenennung des Branches fehlgeschlagen"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "Kopie des Branches fehlgeschlagen"
 
-#: builtin/branch.c:561
+#: 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:564
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "falsch benannten Branch '%s' umbenannt"
 
-#: builtin/branch.c:570
+#: 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:579
+#: 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:581
+#: 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:597
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11705,181 +12009,177 @@ msgstr ""
 "  %s\n"
 "Zeilen, die mit '%c' beginnen, werden entfernt.\n"
 
-#: builtin/branch.c:631
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Allgemeine Optionen"
 
-#: builtin/branch.c:633
+#: 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:634
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "Informationsmeldungen unterdrücken"
 
-#: builtin/branch.c:635
-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:637
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "nicht verwenden"
 
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "Upstream"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "Informationen zum Upstream-Branch ändern"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "Informationen zum Upstream-Branch entfernen"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "farbige Ausgaben verwenden"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "auf Remote-Tracking-Branches wirken"
 
-#: builtin/branch.c:644 builtin/branch.c:646
+#: 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:645 builtin/branch.c:647
+#: 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:650
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "spezifische Aktionen für \"git-branch\":"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "Remote-Tracking und lokale Branches auflisten"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "vollständig zusammengeführten Branch entfernen"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
 
-#: builtin/branch.c:656
+#: 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:657
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "einen Branch und dessen Reflog kopieren"
 
-#: builtin/branch.c:658
+#: 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:659
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "Branchnamen auflisten"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:668
 msgid "show current branch name"
-msgstr "Zeige aktuellen Branch-Namen."
+msgstr "Zeige aktuellen Branchnamen."
 
-#: builtin/branch.c:661
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "das Reflog des Branches erzeugen"
 
-#: builtin/branch.c:663
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "die Beschreibung für den Branch bearbeiten"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "nur zusammengeführte Branches ausgeben"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "nur nicht zusammengeführte Branches ausgeben"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "Branches in Spalten auflisten"
 
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: 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:670
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "nur Branches von diesem Objekt ausgeben"
 
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: 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:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: 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:695 builtin/clone.c:794
+#: 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:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column und --verbose sind inkompatibel"
-
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "Branchname erforderlich"
 
-#: builtin/branch.c:766
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
 
-#: builtin/branch.c:771
+#: 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:778
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Noch kein Commit in Branch '%s'."
 
-#: builtin/branch.c:781
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Branch '%s' nicht vorhanden."
 
-#: builtin/branch.c:796
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "zu viele Branches für eine Kopieroperation angegeben"
 
-#: builtin/branch.c:805
+#: 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:810
+#: 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:814
+#: builtin/branch.c:822
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11887,34 +12187,34 @@ msgstr ""
 "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
 "keinen Branch zeigt."
 
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "Branch '%s' nicht gefunden"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "Branch '%s' existiert nicht"
 
-#: builtin/branch.c:834
+#: 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:838
+#: 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:844
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
 
-#: builtin/branch.c:854
+#: 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>?"
@@ -11923,7 +12223,7 @@ msgstr ""
 "verwendet werden.\n"
 "Wollten Sie -a|-r --list <Muster> benutzen?"
 
-#: builtin/branch.c:858
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -11931,32 +12231,32 @@ msgstr ""
 "Die '--set-upstream' Option wird nicht länger unterstützt.\n"
 "Bitte benutzen Sie stattdessen '--track' oder '--set-upstream-to'."
 
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "git Version:\n"
 
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "uname() ist fehlgeschlagen mit Fehler '%s' (%d)\n"
 
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
 msgid "compiler info: "
 msgstr "Compiler Info: "
 
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "libc Info: "
 
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
 msgid "not run from a git repository - no hooks to show\n"
 msgstr "nicht in einem Git-Repository ausgeführt - keine Hooks zum Anzeigen\n"
 
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory <Datei>] [-s|--suffix <Format>]"
 
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -11993,38 +12293,33 @@ msgstr ""
 "Bitte überprüfen Sie den restlichen Teil des Fehlerberichts unten.\n"
 "Sie können jede Zeile löschen, die Sie nicht mitteilen möchten.\n"
 
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
 msgid "specify a destination for the bugreport file"
 msgstr "Speicherort für die Datei des Fehlerberichts angeben"
 
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
 msgid "specify a strftime format suffix for the filename"
 msgstr "Dateiendung im strftime-Format für den Dateinamen angeben"
 
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "konnte vorangehende Verzeichnisse für '%s' nicht erstellen"
 
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "System Info"
 
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "Aktivierte Hooks"
 
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "konnte keine neue Datei unter '%s' erstellen"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "konnte nicht nach %s schreiben"
 
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "Neuer Bericht unter '%s' erstellt.\n"
@@ -12045,27 +12340,27 @@ msgstr "git bundle list-heads <Datei> [<Referenzname>...]"
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <Datei> [<Referenzname>...]"
 
-#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
 msgid "do not show progress meter"
 msgstr "keine Fortschrittsanzeige anzeigen"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
 msgid "show progress meter"
 msgstr "Fortschrittsanzeige anzeigen"
 
-#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
 msgid "show progress meter during object writing phase"
 msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen"
 
-#: builtin/bundle.c:74 builtin/pack-objects.c:3754
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
 
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
 msgid "specify bundle format version"
 msgstr "Version des Paket-Formats angeben"
 
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
 msgstr "Um ein Paket zu erstellen wird ein Repository benötigt."
 
@@ -12073,25 +12368,25 @@ msgstr "Um ein Paket zu erstellen wird ein Repository benötigt."
 msgid "do not show bundle details"
 msgstr "Keine Bundle-Details anzeigen"
 
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s ist in Ordnung\n"
 
-#: builtin/bundle.c:163
+#: builtin/bundle.c:182
 msgid "Need a repository to unbundle."
 msgstr "Zum Entpacken wird ein Repository benötigt."
 
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Entpacken von Objekten"
 
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Unbekannter Unterbefehl: %s"
 
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:622
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -12099,7 +12394,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>"
 
-#: builtin/cat-file.c:599
+#: builtin/cat-file.c:623
 msgid ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
@@ -12107,76 +12402,76 @@ msgstr ""
 "git cat-file (--batch[=<Format>] | --batch-check[=<Format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:644
 msgid "only one batch option may be specified"
 msgstr "Nur eine Batch-Option erlaubt."
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<Art> kann sein: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
 msgid "show object type"
 msgstr "Objektart anzeigen"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
 msgid "show object size"
 msgstr "Objektgröße anzeigen"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
 msgid "exit with zero when there's no error"
 msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
 msgid "pretty-print object's content"
 msgstr "ansprechende Anzeige des Objektinhaltes"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
 msgid "for blob objects, run textconv on object's content"
 msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
 msgid "for blob objects, run filters on object's content"
 msgstr "für Blob-Objekte, Filter auf Objekt-Inhalte ausführen"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
 msgid "blob"
 msgstr "Blob"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
 msgid "use a specific path for --textconv/--filters"
 msgstr "einen bestimmten Pfad für --textconv/--filters verwenden"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "-s und -t mit beschädigten Objekten erlauben"
 
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
 msgid "buffer --batch output"
 msgstr "Ausgabe von --batch puffern"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-"
 "Eingabe"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
 msgid "show info about objects fed from the standard input"
 msgstr ""
 "Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "symbolischen Verknüpfungen innerhalb des Repositories folgen (verwendet mit "
 "--batch oder --batch-check)"
 
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
 msgid "show all objects with --batch or --batch-check"
 msgstr "alle Objekte mit --batch oder --batch-check anzeigen"
 
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:690
 msgid "do not order --batch-all-objects output"
 msgstr "Ausgabe von --batch-all-objects nicht ordnen"
 
@@ -12196,7 +12491,7 @@ msgstr "alle Attribute einer Datei ausgeben"
 msgid "use .gitattributes only from the index"
 msgstr "nur .gitattributes vom Index verwenden"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "Dateinamen von der Standard-Eingabe lesen"
 
@@ -12204,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:1520 builtin/gc.c:549
-#: builtin/worktree.c:491
+#: 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"
 
@@ -12263,9 +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/submodule--helper.c:1825
-#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836
-#: builtin/submodule--helper.c:2334 builtin/worktree.c:719
+#: 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"
 
@@ -12280,7 +12576,7 @@ msgstr "git checkout-index [<Optionen>] [--] [<Datei>...]"
 
 #: builtin/checkout-index.c:169
 msgid "stage should be between 1 and 3 or all"
-msgstr "--stage sollte zwischen 1 und 3 oder 'all' sein"
+msgstr "stage sollte zwischen 1 und 3 oder 'all' sein"
 
 #: builtin/checkout-index.c:187
 msgid "check out all files in the index"
@@ -12332,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:414
+#: 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:419
+#: 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:426
+#: 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:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: 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:462 builtin/checkout.c:465
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' kann nicht mit '%s' verwendet werden"
-
-#: builtin/checkout.c:469
+#: 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:473
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "Weder '%s' noch '%s' ist angegeben"
 
-#: builtin/checkout.c:477
+#: 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:482 builtin/checkout.c:487
+#: 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:563 builtin/checkout.c:570
+#: 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:739
+#: 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:793
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12433,50 +12724,50 @@ msgstr ""
 "Kann nicht mit vorgemerkten Änderungen in folgenden Dateien fortsetzen:\n"
 "%s"
 
-#: builtin/checkout.c:886
+#: 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:928
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD ist jetzt bei"
 
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
+#: 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:936
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Setze Branch '%s' neu\n"
 
-#: builtin/checkout.c:939
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Bereits auf '%s'\n"
 
-#: builtin/checkout.c:943
+#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:945 builtin/checkout.c:1376
+#: 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:947
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Zu Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:998
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... und %d weitere.\n"
 
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12499,7 +12790,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1023
+#: 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"
@@ -12526,19 +12817,19 @@ msgstr[1] ""
 " git branch <neuer-Branchname> %s\n"
 "\n"
 
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "interner Fehler im Revisionsgang"
 
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "Vorherige Position von HEAD war"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: 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:1184
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12548,7 +12839,7 @@ msgstr ""
 "Bitte benutzen Sie -- (und optional --no-guess), um diese\n"
 "eindeutig voneinander zu unterscheiden."
 
-#: builtin/checkout.c:1191
+#: 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"
@@ -12571,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:1201
+#: 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:1267
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "nur eine Referenz erwartet"
 
-#: builtin/checkout.c:1284
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "nur eine Referenz erwartet, %d gegeben."
 
-#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438
+#: 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:1343 builtin/checkout.c:1709
+#: 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:1390
+#: 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:1392
+#: 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:1393 builtin/checkout.c:1401
+#: 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:1396
+#: 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:1412
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12623,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:1416
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12632,7 +12923,7 @@ msgstr ""
 "werden.\n"
 "Ziehen Sie \"git am --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1420
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12641,7 +12932,7 @@ msgstr ""
 "werden.\n"
 "Ziehen Sie \"git rebase --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1424
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12650,7 +12941,7 @@ msgstr ""
 "gewechselt werden.\n"
 "Ziehen Sie \"git cherry-pick --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1428
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12659,140 +12950,129 @@ msgstr ""
 "werden.\n"
 "Ziehen Sie \"git revert --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1432
+#: 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:1439
+#: 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:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: 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:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: 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:1467
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' kann nicht <Startpunkt> bekommen"
 
-#: builtin/checkout.c:1475
+#: 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:1482
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "Branch- oder Commit-Argument fehlt"
 
-#: builtin/checkout.c:1525
+#: 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:1526 builtin/log.c:1807 parse-options.h:323
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "Stil"
 
-#: builtin/checkout.c:1527
-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:1539 builtin/worktree.c:488
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "HEAD bei benanntem Commit loslösen"
 
-#: builtin/checkout.c:1540
-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:1542
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "neuer Branch"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "neuer Branch ohne Eltern-Commit"
 
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "ignorierte Dateien aktualisieren (Standard)"
 
-#: builtin/checkout.c:1549
+#: 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:1562
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1565
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1569
+#: 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:1624
+#: 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:1628
-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:1665
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track benötigt ein Branchname"
 
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "kein Branchname; versuchen Sie -%c"
 
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "konnte %s nicht auflösen"
 
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "ungültige Pfadspezifikation"
 
-#: builtin/checkout.c:1725
+#: 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:1729
+#: 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:1738
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file und --detach sind inkompatibel"
-
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file und --patch sind inkompatibel"
-
-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -12800,70 +13080,71 @@ msgstr ""
 "git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n"
 "Sie aus dem Index auschecken."
 
-#: builtin/checkout.c:1759
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "Sie müssen Pfad(e) zur Wiederherstellung angeben."
 
-#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484
+#: 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:1786
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "einen neuen Branch erzeugen und auschecken"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "einen Branch erstellen/umsetzen und auschecken"
 
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "das Reflog für den neuen Branch erzeugen"
 
-#: builtin/checkout.c:1791
+#: 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:1792
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "benutze Overlay-Modus (Standard)"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "einen neuen Branch erzeugen und dahin wechseln"
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "einen Branch erstellen/umsetzen und dahin wechseln"
 
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "Zweite Vermutung 'git switch <kein-solcher-Branch>'"
 
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "lokale Änderungen verwerfen"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "Von welcher Commit-Referenz ausgecheckt werden soll"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "Index wiederherstellen"
 
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "das Arbeitsverzeichnis wiederherstellen (Standard)"
 
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "ignoriere nicht zusammengeführte Einträge"
 
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "benutze Overlay-Modus"
 
@@ -12898,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:302 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"
@@ -12911,7 +13200,7 @@ msgstr ""
 "foo        - Element anhand eines eindeutigen Präfix auswählen\n"
 "           - (leer) nichts auswählen\n"
 
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12932,33 +13221,33 @@ msgstr ""
 "*          - alle Elemente auswählen\n"
 "           - (leer) Auswahl beenden\n"
 
-#: builtin/clean.c:521 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:661
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Ignorier-Muster eingeben>> "
 
-#: builtin/clean.c:696
+#: 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:717
+#: 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:758
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "'%s' löschen [y/N]? "
 
-#: builtin/clean.c:789
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12976,52 +13265,52 @@ msgstr ""
 "help                - diese Meldung anzeigen\n"
 "?                   - Hilfe zur Auswahl mittels Eingabe anzeigen"
 
-#: builtin/clean.c:825
+#: 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:841
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Keine Dateien mehr zum Löschen, beende."
 
-#: builtin/clean.c:903
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "keine Namen von gelöschten Dateien ausgeben"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:928
 msgid "force"
 msgstr "Aktion erzwingen"
 
-#: builtin/clean.c:906
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "interaktives Clean"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "ganze Verzeichnisse löschen"
 
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: 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:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "Muster"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "auch ignorierte Dateien löschen"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "nur ignorierte Dateien löschen"
 
-#: builtin/clean.c:929
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13029,7 +13318,7 @@ msgstr ""
 "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; "
 "\"clean\" verweigert"
 
-#: builtin/clean.c:932
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13037,7 +13326,7 @@ msgstr ""
 "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -"
 "f gegeben; \"clean\" verweigert"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x und -X können nicht gemeinsam verwendet werden"
 
@@ -13053,13 +13342,13 @@ msgstr "Repository mit unvollständiger Historie nicht klonen"
 msgid "don't create a checkout"
 msgstr "kein Auschecken"
 
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "ein Bare-Repository erstellen"
 
 #: builtin/clone.c:103
 msgid "create a mirror repository (implies bare)"
-msgstr "ein Spiegelarchiv erstellen (impliziert --bare)"
+msgstr "ein Spiegelarchiv erstellen (impliziert bare)"
 
 #: builtin/clone.c:105
 msgid "to clone from a local repository"
@@ -13085,27 +13374,29 @@ msgstr "Submodule im Klon initialisieren"
 msgid "number of submodules cloned in parallel"
 msgstr "Anzahl der parallel zu klonenden Submodule"
 
-#: builtin/clone.c:116 builtin/init-db.c:538
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "Vorlagenverzeichnis"
 
-#: builtin/clone.c:117 builtin/init-db.c:539
+#: builtin/clone.c:117 builtin/init-db.c:540
 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:1832
-#: builtin/submodule--helper.c:2337
+#: 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:1834
-#: builtin/submodule--helper.c:2339
+#: 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:549
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: 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"
 
@@ -13121,8 +13412,8 @@ 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:863
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
+#: builtin/pull.c:212
 msgid "depth"
 msgstr "Tiefe"
 
@@ -13131,8 +13422,8 @@ 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:3804
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
 msgid "time"
 msgstr "Zeit"
 
@@ -13143,19 +13434,19 @@ msgstr ""
 "Zeit\n"
 "erstellen"
 
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: 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:215
+#: 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:1844
-#: builtin/submodule--helper.c:2353
+#: 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"
 
@@ -13167,11 +13458,11 @@ msgstr "keine Tags klonen, und auch bei späteren Abrufen nicht beachten"
 msgid "any cloned submodules will be shallow"
 msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
 
-#: builtin/clone.c:142 builtin/init-db.c:547
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr ".git-Verzeichnis"
 
-#: builtin/clone.c:143 builtin/init-db.c:548
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
 
@@ -13183,23 +13474,23 @@ 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/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: 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/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: 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:234
-#: builtin/push.c:585
+#: 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:237
-#: builtin/push.c:587
+#: 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"
 
@@ -13213,50 +13504,42 @@ msgstr ""
 "Initialisiere Datei für partiellen Checkout, um nur Dateien im\n"
 "Root-Verzeichnis einzubeziehen"
 
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Konnte keinen Verzeichnisnamen erraten.\n"
-"Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:304
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existiert und ist kein Verzeichnis"
 
-#: builtin/clone.c:436
+#: builtin/clone.c:322
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "Fehler beim Starten der Iteration über '%s'"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:353
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "Konnte Verweis '%s' nicht erstellen"
 
-#: builtin/clone.c:471
+#: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "Konnte Datei nicht nach '%s' kopieren"
 
-#: builtin/clone.c:476
+#: builtin/clone.c:362
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "Fehler beim Iterieren über '%s'"
 
-#: builtin/clone.c:503
+#: builtin/clone.c:389
 #, c-format
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: builtin/clone.c:517
+#: builtin/clone.c:403
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -13266,107 +13549,103 @@ msgstr ""
 "Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
 "und das Auschecken mit 'git restore --source=HEAD :/' erneut versuchen.\n"
 
-#: builtin/clone.c:594
+#: builtin/clone.c:480
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
 
-#: builtin/clone.c:713
+#: builtin/clone.c:597
 #, c-format
 msgid "unable to update %s"
 msgstr "kann %s nicht aktualisieren"
 
-#: builtin/clone.c:761
+#: builtin/clone.c:645
 msgid "failed to initialize sparse-checkout"
 msgstr "Fehler beim Initialisieren vom partiellen Checkout."
 
-#: builtin/clone.c:784
+#: builtin/clone.c:668
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann "
 "nicht ausgecheckt werden.\n"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:701
 msgid "unable to checkout working tree"
 msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
 
-#: builtin/clone.c:894
+#: builtin/clone.c:779
 msgid "unable to write parameters to config file"
 msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
 
-#: builtin/clone.c:957
+#: builtin/clone.c:842
 msgid "cannot repack to clean up"
 msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
 
-#: builtin/clone.c:959
+#: builtin/clone.c:844
 msgid "cannot unlink temporary alternates file"
 msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
 
-#: builtin/clone.c:1001 builtin/receive-pack.c:2491
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "Zu viele Argumente."
 
-#: builtin/clone.c:1005
+#: 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:1018
+#: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare und --origin %s 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:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare und --separate-git-dir sind inkompatibel."
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "Repository '%s' existiert nicht"
 
-#: builtin/clone.c:1039 builtin/fetch.c:2011
+#: 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"
 
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis."
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr ""
 "Pfad des Repositories '%s' existiert bereits und ist kein leeres Verzeichnis."
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "Arbeitsverzeichnis '%s' existiert bereits."
 
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
+#: 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."
 
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
 
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klone in Bare-Repository '%s' ...\n"
 
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
 #, c-format
 msgid "Cloning into '%s'...\n"
-msgstr "Klone nach '%s' ...\n"
+msgstr "Klone nach '%s'...\n"
 
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -13374,51 +13653,55 @@ msgstr ""
 "'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-"
 "able"
 
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' ist kein gültiger Name für ein Remote-Repository"
 
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "--depth wird in lokalen Klonen ignoriert; benutzen Sie stattdessen \"file://"
 "\"."
 
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
 "\"file://\"."
 
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
 "\"file://\"."
 
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 "--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen \"file://"
 "\"."
 
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 "Quelle ist ein Repository mit unvollständiger Historie (shallow),\n"
 "ignoriere --local"
 
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
 msgid "--local is ignored"
 msgstr "--local wird ignoriert"
 
-#: builtin/clone.c:1337 builtin/clone.c:1345
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr "Remoteübertragung meldete Fehler"
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
 
-#: builtin/clone.c:1348
+#: builtin/clone.c:1242
 msgid "You appear to have cloned an empty repository."
 msgstr "Sie scheinen ein leeres Repository geklont zu haben."
 
@@ -13454,14 +13737,14 @@ msgstr "Abstand zwischen Spalten auffüllen"
 msgid "--command must be the first argument"
 msgstr "--command muss an erster Stelle stehen"
 
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
 msgid ""
 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 "git commit-graph verify [--object-dir <Objektverzeichnis>] [--shallow] [--"
 "[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13471,100 +13754,98 @@ msgstr ""
 "split[=<Strategie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <Anzahl>] [--[no-]progress] <Split-Optionen>"
 
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "konnte Objekt-Verzeichnis nicht finden, dass '%s' entsprechen soll"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "Verzeichnis"
 
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr "das Objektverzeichnis zum Speichern des Graphen"
 
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 "Wenn der Commit-Graph aufgeteilt ist, nur die Datei an der Spitze überprüfen"
 
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Konnte Commit-Graph '%s' nicht öffnen."
 
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "nicht erkanntes --split Argument, %s"
 
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr "unerwartete nicht-hexadezimale Objekt-ID: %s"
 
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "ungültiges Objekt: %s"
 
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
 msgid "start walk at all refs"
 msgstr "Durchlauf auf allen Referenzen beginnen"
 
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "durch Standard-Eingabe gelistete Pack-Indexe nach Commits scannen"
 
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
 msgid "start walk at commits listed by stdin"
 msgstr "Lauf bei Commits beginnen, die über die Standard-Eingabe gelistet sind"
 
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
 msgstr ""
 "alle Commits einschließen, die sich bereits in der Commit-Graph-Datei "
 "befinden"
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
 msgid "enable computation for changed paths"
 msgstr "Berechnung für veränderte Pfade aktivieren"
 
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
 msgid "allow writing an incremental commit-graph file"
 msgstr "erlaube das Schreiben einer inkrementellen Commit-Graph-Datei"
 
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr ""
 "maximale Anzahl von Commits in einem aufgeteilten Commit-Graph ohne Basis"
 
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr ""
 "maximales Verhältnis zwischen zwei Ebenen eines aufgeteilten Commit-Graph"
 
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
 msgid "only expire files older than a given date-time"
 msgstr "nur Objekte älter als angegebene Zeit verfallen lassen"
 
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr "maximale Anzahl der zu berechnenden Bloom-Filter für veränderte Pfade"
 
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr ""
 "benutzen Sie mindestens eine der folgenden Optionen: --reachable, --stdin-"
 "commits, oder --stdin-packs"
 
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
 msgid "Collecting commits from input"
 msgstr "Sammle Commits von der Standard-Eingabe"
 
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "Nicht erkannter Unterbefehl: %s"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13578,70 +13859,65 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "doppelter Vorgänger %s ignoriert"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
+#: 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"
 
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: Fehler beim Öffnen von '%s'"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree: Fehler beim Lesen von '%s'"
 
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree: Fehler beim Schließen von '%s'"
 
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr "Eltern-Commit"
 
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "ID eines Eltern-Commit-Objektes."
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
-#: builtin/tag.c:456
+#: 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:115 builtin/commit.c:1614
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "Commit-Beschreibung"
 
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
 msgstr "Commit-Beschreibung von Datei lesen"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299
-#: 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 "Commit mit GPG signieren"
 
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "Brauche genau ein Tree-Objekt."
 
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: Fehler beim Lesen"
 
-#: builtin/commit.c:41
+#: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<Optionen>] [--] <Pfadspezifikation>..."
 
-#: builtin/commit.c:46
+#: builtin/commit.c:47
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<Optionen>] [--] <Pfadspezifikation>..."
 
-#: builtin/commit.c:51
+#: builtin/commit.c:52
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13651,7 +13927,7 @@ msgstr ""
 "machen. Sie können Ihren Befehl mit --allow-empty wiederholen, oder diesen\n"
 "Commit mit \"git reset HEAD^\" vollständig entfernen.\n"
 
-#: builtin/commit.c:56
+#: builtin/commit.c:57
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -13666,15 +13942,15 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:63
+#: builtin/commit.c:64
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "Andernfalls benutzen Sie bitte 'git rebase --skip'\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:67
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Andernfalls benutzen Sie bitte 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:69
+#: builtin/commit.c:70
 msgid ""
 "and then use:\n"
 "\n"
@@ -13696,74 +13972,70 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:324
+#: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
 msgstr "Fehler beim Entpacken des Tree-Objektes von HEAD."
 
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "Option --pathspec-from-file mit -a ist nicht sinnvoll."
-
-#: builtin/commit.c:374
+#: 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."
 
-#: builtin/commit.c:386
+#: builtin/commit.c:387
 msgid "unable to create temporary index"
 msgstr "Konnte temporären Index nicht erstellen."
 
-#: builtin/commit.c:395
+#: builtin/commit.c:396
 msgid "interactive add failed"
 msgstr "interaktives Hinzufügen fehlgeschlagen"
 
-#: builtin/commit.c:410
+#: builtin/commit.c:411
 msgid "unable to update temporary index"
 msgstr "Konnte temporären Index nicht aktualisieren."
 
-#: builtin/commit.c:412
+#: builtin/commit.c:413
 msgid "Failed to update main cache tree"
 msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
 
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
 msgid "unable to write new_index file"
 msgstr "Konnte new_index Datei nicht schreiben"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "cannot do a partial commit during a merge."
 msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist."
 
-#: builtin/commit.c:491
+#: builtin/commit.c:492
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 "Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist."
 
-#: builtin/commit.c:493
+#: builtin/commit.c:494
 msgid "cannot do a partial commit during a rebase."
 msgstr "kann keinen Teil-Commit durchführen, während ein Rebase im Gange ist."
 
-#: builtin/commit.c:501
+#: builtin/commit.c:502
 msgid "cannot read the index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:520
+#: builtin/commit.c:521
 msgid "unable to write temporary index file"
 msgstr "Konnte temporäre Index-Datei nicht schreiben."
 
-#: builtin/commit.c:618
+#: builtin/commit.c:619
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "Commit '%s' fehlt Autor-Kopfbereich"
 
-#: builtin/commit.c:620
+#: builtin/commit.c:621
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
 
-#: builtin/commit.c:639
+#: builtin/commit.c:640
 msgid "malformed --author parameter"
 msgstr "Fehlerhafter --author Parameter"
 
-#: builtin/commit.c:692
+#: builtin/commit.c:693
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -13771,43 +14043,85 @@ msgstr ""
 "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
 "der aktuellen Commit-Beschreibung verwendet wird."
 
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "Konnte Commit %s nicht nachschlagen"
 
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
 
-#: builtin/commit.c:760
+#: builtin/commit.c:761
 msgid "could not read log from standard input"
 msgstr "Konnte Log nicht von Standard-Eingabe lesen."
 
-#: builtin/commit.c:764
+#: builtin/commit.c:765
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "Konnte Log-Datei '%s' nicht lesen"
 
-#: builtin/commit.c:801
+#: 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:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
 msgstr "Konnte SQUASH_MSG nicht lesen"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:821
 msgid "could not read MERGE_MSG"
 msgstr "Konnte MERGE_MSG nicht lesen"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:881
 msgid "could not write commit template"
 msgstr "Konnte Commit-Vorlage nicht schreiben"
 
+#: builtin/commit.c:894
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr ""
+"Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,\n"
+"die mit '%c' beginnen, werden ignoriert.\n"
+
+#: builtin/commit.c:896
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,\n"
+"die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
+"bricht den Commit ab.\n"
+
 #: builtin/commit.c:900
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,\n"
+"die mit '%c' beginnen, werden beibehalten; wenn Sie möchten, können Sie\n"
+"diese entfernen.\n"
+
+#: builtin/commit.c:904
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen, "
+"die\n"
+"mit '%c' beginnen, werden beibehalten; wenn Sie möchten, können Sie diese "
+"entfernen.\n"
+"Eine leere Beschreibung bricht den Commit ab.\n"
+
+#: builtin/commit.c:916
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -13821,7 +14135,7 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "aus und versuchen Sie es erneut.\n"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:921
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -13835,205 +14149,177 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "aus und versuchen Sie es erneut.\n"
 
-#: builtin/commit.c:915
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,\n"
-"die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
-"bricht den Commit ab.\n"
-
-#: builtin/commit.c:923
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen, "
-"die\n"
-"mit '%c' beginnen, werden beibehalten; wenn Sie möchten, können Sie diese "
-"entfernen.\n"
-"Eine leere Beschreibung bricht den Commit ab.\n"
-
-#: builtin/commit.c:940
+#: builtin/commit.c:948
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:           %.*s <%.*s>"
 
-#: builtin/commit.c:948
+#: builtin/commit.c:956
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDatum:            %s"
 
-#: builtin/commit.c:955
+#: builtin/commit.c:963
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommit-Ersteller: %.*s <%.*s>"
 
-#: builtin/commit.c:973
+#: builtin/commit.c:981
 msgid "Cannot read index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:1018
+#: builtin/commit.c:1026
 msgid "unable to pass trailers to --trailers"
 msgstr "konnte Anhänge nicht an --trailers weitergeben"
 
-#: builtin/commit.c:1058
+#: builtin/commit.c:1066
 msgid "Error building trees"
 msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
 
-#: builtin/commit.c:1072 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:316
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
 "Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n"
 
-#: builtin/commit.c:1116
+#: builtin/commit.c:1124
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem "
 "vorhandenen Autor überein"
 
-#: builtin/commit.c:1130
+#: builtin/commit.c:1138
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Ungültiger ignored-Modus '%s'."
 
-#: builtin/commit.c:1148 builtin/commit.c:1441
+#: 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:1188
-msgid "--long and -z are incompatible"
-msgstr "--long und -z sind inkompatibel"
-
-#: builtin/commit.c:1219
+#: 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."
 
-#: builtin/commit.c:1221
+#: builtin/commit.c:1229
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr "\"cherry-pick\" ist im Gange -- kann Umformulierung nicht durchführen."
 
-#: builtin/commit.c:1224
+#: 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:1226
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
+#: builtin/commit.c:1234
+#, 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:1245
+#: 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:1254
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
-msgstr "Sie haben nichts für \"--amend\"."
+msgstr "Sie haben nichts zum Nachbessern."
 
-#: builtin/commit.c:1257
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
-msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen."
+msgstr "Ein Merge ist im Gange -- Nachbesserung nicht möglich."
 
-#: builtin/commit.c:1259
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen."
+msgstr "\"cherry-pick\" ist im Gange -- Nachbesserung nicht möglich."
 
-#: builtin/commit.c:1261
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
-msgstr "Ein Rebase ist im Gange -- kann \"--amend\" nicht ausführen."
+msgstr "Ein Rebase ist im Gange -- Nachbesserung nicht möglich."
 
-#: builtin/commit.c:1264
+#: 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:1274
+#: 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:1276
+#: 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:1285
+#: 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:1303
+#: 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:1331
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "unbekannte Option: --fixup=%s:%s"
 
-#: builtin/commit.c:1345
+#: 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:1476 builtin/commit.c:1642
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "Status im Kurzformat anzeigen"
 
-#: builtin/commit.c:1478 builtin/commit.c:1644
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "Branchinformationen anzeigen"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "Stashinformationen anzeigen"
 
-#: builtin/commit.c:1482 builtin/commit.c:1646
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "voraus/hinterher-Werte berechnen"
 
-#: builtin/commit.c:1484
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "Version"
 
-#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
-#: builtin/worktree.c:681
+#: 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:1487 builtin/commit.c:1650
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr "Status im Langformat anzeigen (Standard)"
 
-#: builtin/commit.c:1490 builtin/commit.c:1653
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "Einträge mit NUL-Zeichen abschließen"
 
-#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: 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:1493 builtin/commit.c:1656
+#: 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:1497
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14041,11 +14327,11 @@ msgstr ""
 "ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. "
 "(Standard: traditional)"
 
-#: builtin/commit.c:1499 parse-options.h:193
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "wann"
 
-#: builtin/commit.c:1500
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14053,195 +14339,195 @@ msgstr ""
 "Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
 "(Standard: all)"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "unversionierte Dateien in Spalten auflisten"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "keine Umbenennungen ermitteln"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr "Umbenennungen erkennen, optional Index für Gleichheit setzen"
 
-#: builtin/commit.c:1525
+#: 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:1607
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "Optionen für Commit-Beschreibung"
 
-#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
+#: 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:1612
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "Autor"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "Autor eines Commits überschreiben"
 
-#: builtin/commit.c:1613 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "Datum"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "Datum eines Commits überschreiben"
 
-#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
-#: parse-options.h:329 ref-filter.h:90
+#: 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:1615
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
 
-#: builtin/commit.c:1616
+#: 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:1621
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]Commit"
 
-#: builtin/commit.c:1621
+#: 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:1622
+#: 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:1623
+#: 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:1624 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "Anhang"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "benutzerdefinierte Anhänge hinzufügen"
 
-#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: 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:1626
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "angegebene Vorlagendatei verwenden"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "Bearbeitung des Commits erzwingen"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "Optionen für Commit-Inhalt"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "alle geänderten Dateien committen"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
 
-#: builtin/commit.c:1637
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "interaktives Hinzufügen von Dateien"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "interaktives Hinzufügen von Änderungen"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "nur die angegebenen Dateien committen"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "Hooks pre-commit und commit-msg umgehen"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "anzeigen, was committet werden würde"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "vorherigen Commit ändern"
 
-#: builtin/commit.c:1655
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "\"post-rewrite hook\" umgehen"
 
-#: builtin/commit.c:1662
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "Aufzeichnung einer leeren Änderung erlauben"
 
-#: builtin/commit.c:1664
+#: 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:1737
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "Konnte MERGE_MODE nicht lesen"
 
-#: builtin/commit.c:1765
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
 
-#: builtin/commit.c:1772
+#: 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:1777
+#: 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:1788
+#: 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:1824
+#: 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"
@@ -14515,7 +14801,7 @@ msgid ""
 msgstr ""
 "--worktree kann nicht mit mehreren Arbeitsverzeichnissen verwendet werden,\n"
 "außer die Konfigurationserweiterung worktreeConfig ist aktiviert. Bitte\n"
-"lesen Sie die Sektion \"CONFIGURATION_FILE\" in \"git help worktree\" für "
+"lesen Sie die Sektion \"CONFIGURATION FILE\" in \"git help worktree\" für "
 "Details"
 
 #: builtin/config.c:743
@@ -14574,8 +14860,8 @@ msgid ""
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr ""
 "kann nicht mehrere Werte mit einem einzigen Wert überschreiben\n"
-"       Benutzen Sie einen regulären Ausdruck, --add oder --replace, um %s\n"
-"       zu ändern."
+"       Benutzen Sie einen regulären Ausdruck, --add oder --replace-all, um\n"
+"       %s zu ändern."
 
 #: builtin/config.c:943 builtin/config.c:954
 #, c-format
@@ -14615,7 +14901,7 @@ msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr ""
 "credential-cache--daemon nicht verfügbar; Unix-Socket wird nicht unterstützt"
 
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "credential-cache nicht verfügbar; Unix-Socket wird nicht unterstützt"
 
@@ -14758,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"
 
@@ -14777,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"
@@ -14816,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:684
+#: 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"
@@ -14844,115 +15119,106 @@ 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:261
-#, c-format
-msgid "failed: %d"
-msgstr "fehlgeschlagen: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "konnte symbolische Verknüpfung %s nicht lesen"
 
-#: builtin/difftool.c:305
+#: 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:313
+#: 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:413
+#: builtin/difftool.c:421
 msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
 msgstr ""
-"Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n"
-"Diff-Modus('-d' und '--dir-diff') nicht unterstützt."
+"kombinierte Diff-Formate ('-c' und '--cc') werden im Verzeichnis-\n"
+"Diff-Modus ('-d' und '--dir-diff') nicht unterstützt."
 
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "beide Dateien geändert: '%s' und '%s'."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "Datei im Arbeitsverzeichnis belassen."
 
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "Es existieren temporäre Dateien in '%s'."
 
-#: builtin/difftool.c:651
+#: 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:700
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "fehlgeschlagen: %d"
+
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "`diff.guitool` statt `diff.tool` benutzen"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "Diff über ganzes Verzeichnis ausführen"
 
-#: builtin/difftool.c:704
+#: 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:709
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "Tool"
 
-#: builtin/difftool.c:711
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "das angegebene Diff-Tool benutzen"
 
-#: builtin/difftool.c:713
+#: 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:716
+#: builtin/difftool.c:706
 msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr ""
-"'git-difftool' beenden, wenn das aufgerufene Diff-Tool mit einem "
-"Rückkehrwert\n"
-"verschieden 0 ausgeführt wurde"
+"'git-difftool' beenden, wenn das aufgerufene Diff-Tool mit einem Exit-Code "
+"ungleich 0 ausgeführt wurde"
 
-#: builtin/difftool.c:719
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben"
 
-#: builtin/difftool.c:720
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
-msgstr "an 'diff' übergeben"
+msgstr "an `diff` übergeben"
 
-#: builtin/difftool.c:735
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool benötigt Arbeitsverzeichnis oder --no-index"
 
-#: builtin/difftool.c:742
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff kann nicht mit --no-index verwendet werden"
-
-#: builtin/difftool.c:745
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool und --extcmd schließen sich gegenseitig aus"
-
-#: builtin/difftool.c:753
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "kein <Tool> für --tool=<Tool> angegeben"
 
-#: builtin/difftool.c:760
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
 
@@ -14960,7 +15226,7 @@ msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <Optionen> <Umgebungsvariable>"
 
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
 msgid "type"
 msgstr "Art"
 
@@ -14976,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
@@ -14992,130 +15258,120 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:868
+#: 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:1177
+#: 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:1197
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "Fortschritt nach <n> Objekten anzeigen"
 
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "Behandlung von signierten Tags wählen"
 
-#: builtin/fast-export.c:1202
+#: 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:1205
+#: 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:1208
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "Markierungen in diese Datei schreiben"
 
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "Markierungen von dieser Datei importieren"
 
-#: builtin/fast-export.c:1214
+#: 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:1216
+#: 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:1218
+#: 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:1220
+#: 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:1221
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "Ausgabe von Blob-Daten überspringen"
 
-#: builtin/fast-export.c:1222 builtin/log.c:1823
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "Refspec"
 
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "Refspec auf exportierte Referenzen anwenden"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "Ausgabe anonymisieren"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "von:nach"
 
-#: builtin/fast-export.c:1226
+#: 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:1229
+#: 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:1231
+#: 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:1233
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "Tags mit Markierungs-IDs beschriften"
 
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map ohne --anonymize ist nicht sinnvoll"
-
-#: builtin/fast-export.c:1271
-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"
@@ -15125,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:185
+#: 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:245
+#: 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:188
+#: 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:191
+#: 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:195
+#: 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:198
+#: 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:122
+#: 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:206
+#: 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: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 ""
 "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
 
-#: 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 ""
 "die Historie eines Klons mit unvollständiger Historie (shallow) auf "
 "Zeitbasis\n"
 "vertiefen"
 
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: 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)"
@@ -15252,148 +15508,151 @@ msgstr ""
 "Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n"
 "als Konfigurationsdateien)"
 
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: 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:226
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "Refmap"
 
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: 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:240
+#: 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:243
+#: 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:757
+#: 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:856
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "Objekt %s nicht gefunden"
 
-#: builtin/fetch.c:860
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[aktuell]"
 
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[zurückgewiesen]"
 
-#: builtin/fetch.c:874
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
 
-#: builtin/fetch.c:884
+#: 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:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: 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:889
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "würde bestehende Tags verändern"
 
-#: builtin/fetch.c:911
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[neues Tag]"
 
-#: builtin/fetch.c:914
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[neuer Branch]"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[neue Referenz]"
 
-#: builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "Aktualisierung erzwungen"
 
-#: builtin/fetch.c:961
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "kein Vorspulen"
 
-#: builtin/fetch.c:1065
+#: 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-updated' oder führen\n"
+"aktivieren, nutzen Sie die Option '--show-forced-updates' oder führen\n"
 "Sie 'git config fetch.showForcedUpdates true' aus."
 
-#: builtin/fetch.c:1069
+#: 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:1101
+#: 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:1129
+#: builtin/fetch.c:1141
 #, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr ""
-"%s wurde zurückgewiesen, da Root-Commits von Repositories mit "
-"unvollständiger\n"
+"%s zurückgewiesen, da Root-Commits von Repositories mit unvollständiger\n"
 "Historie (shallow) nicht aktualisiert werden dürfen."
 
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "Von %.*s\n"
 
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15402,139 +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:1327
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s wird unreferenziert)"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s wurde unreferenziert)"
 
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[gelöscht]"
 
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(nichts)"
 
-#: builtin/fetch.c:1384
+#: 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:1403
+#: 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:1406
+#: 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:1618
+#: builtin/fetch.c:1455
+#, c-format
+msgid "the object %s does not exist"
+msgstr "das Objekt %s ist nicht vorhanden"
+
+#: 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: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:1633
+#: 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:1635
+#: 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:1637
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
-msgstr "Unbekannter Branch-Typ"
+msgstr "unbekannter Branch-Typ"
 
-#: builtin/fetch.c:1639
+#: 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:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Fordere an von %s\n"
 
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 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:1790
+#: 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:1894
+#: 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."
-
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "Sie müssen den Namen des Tags angeben."
+"Commits angefordert werden sollen"
 
-#: builtin/fetch.c:1995
-msgid "Negative depth in --deepen is not supported"
-msgstr "Negative Tiefe wird von --deepen nicht unterstützt."
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "Sie müssen den Namen des Tags angeben"
 
-#: builtin/fetch.c:1997
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen und --depth schließen sich gegenseitig aus"
+#: 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:2002
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth und --unshallow können nicht gemeinsam verwendet werden"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
+msgstr "negative Tiefe wird von --deepen nicht unterstützt"
 
-#: builtin/fetch.c:2004
+#: 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:2021
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all akzeptiert kein Repository als Argument"
 
-#: builtin/fetch.c:2023
+#: 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:2032
+#: 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:2039
-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:2055
+#: 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:2060
-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:2079
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15542,13 +15809,13 @@ msgstr ""
 "--filter kann nur mit den Remote-Repositories verwendet werden,\n"
 "die in extensions.partialclone konfiguriert sind"
 
-#: builtin/fetch.c:2083
+#: 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:2087
+#: 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 "
@@ -15561,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"
 
@@ -15597,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:483
+#: 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"
 
@@ -15645,19 +15916,19 @@ msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten"
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<Konfiguration> <Befehlsargumente>"
 
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "Konfiguration"
 
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "Konfigurationsschlüssel für eine Liste von Repository-Pfaden"
 
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "Option --config=<Konfiguration> fehlt"
 
-#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -15673,16 +15944,16 @@ msgstr "Fehler in %s %s: %s"
 msgid "warning in %s %s: %s"
 msgstr "Warnung in %s %s: %s"
 
-#: builtin/fsck.c:123 builtin/fsck.c:126
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "fehlerhafte Verknüpfung von %7s %s"
 
-#: builtin/fsck.c:135
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "falscher Objekttyp in Verknüpfung"
 
-#: builtin/fsck.c:151
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -15691,211 +15962,221 @@ msgstr ""
 "fehlerhafte Verknüpfung von %7s %s\n"
 "                       nach %7s %s"
 
-#: builtin/fsck.c:263
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "%s %s fehlt"
 
-#: builtin/fsck.c:290
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "%s %s nicht erreichbar"
 
-#: builtin/fsck.c:310
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "%s %s unreferenziert"
 
-#: builtin/fsck.c:320
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "Konnte lost-found nicht erstellen."
 
-#: builtin/fsck.c:331
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "Konnte '%s' nicht abschließen."
 
-#: builtin/fsck.c:348
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Prüfe %s"
 
-#: builtin/fsck.c:386
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Prüfe Konnektivität (%d Objekte)"
 
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Prüfe %s %s"
 
-#: builtin/fsck.c:410
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "Fehlerhafte Verknüpfungen"
 
-#: builtin/fsck.c:419
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "Wurzel %s"
 
-#: builtin/fsck.c:427
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "%s %s (%s) in %s getaggt"
 
-#: builtin/fsck.c:456
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: Objekt fehlerhaft oder nicht vorhanden"
 
-#: builtin/fsck.c:481
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: Ungültiger Reflog-Eintrag %s"
 
-#: builtin/fsck.c:495
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Prüfe Reflog %s->%s"
 
-#: builtin/fsck.c:529
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: Ungültiger SHA1-Zeiger %s"
 
-#: builtin/fsck.c:536
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: kein Commit"
 
-#: builtin/fsck.c:590
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "Notiz: Keine Standardreferenzen"
 
-#: builtin/fsck.c:605
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: Hash-Pfad stimmt nicht überein, gefunden bei: %s"
+
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: Objekt fehlerhaft oder nicht vorhanden: %s"
 
-#: builtin/fsck.c:618
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: Objekt hat einen unbekannten Typ '%s': %s"
+
+#: 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:638
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "Ungültige SHA1-Datei: %s"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Prüfe Objekt-Verzeichnis"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Prüfe Objekt-Verzeichnisse"
 
-#: builtin/fsck.c:671
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "Prüfe %s Verknüpfung"
 
-#: builtin/fsck.c:676 builtin/index-pack.c:866
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "Ungültiger Objekt-Typ %s"
 
-#: builtin/fsck.c:683
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s zeigt auf etwas seltsames (%s)"
 
-#: builtin/fsck.c:689
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: losgelöster HEAD zeigt auf nichts"
 
-#: builtin/fsck.c:693
+#: 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:705
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "Prüfe Cache-Verzeichnis"
 
-#: builtin/fsck.c:710
+#: 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:719
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "non-tree in Cache-Verzeichnis"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<Optionen>] [<Objekt>...]"
 
-#: builtin/fsck.c:756
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "unerreichbare Objekte anzeigen"
 
-#: builtin/fsck.c:757
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "unreferenzierte Objekte anzeigen"
 
-#: builtin/fsck.c:758
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "Tags melden"
 
-#: builtin/fsck.c:759
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "Hauptwurzeln melden"
 
-#: builtin/fsck.c:760
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
 
-#: builtin/fsck.c:761
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
 
-#: builtin/fsck.c:762
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "ebenso Pakete und alternative Objekte betrachten"
 
-#: builtin/fsck.c:763
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "nur Konnektivität prüfen"
 
-#: builtin/fsck.c:764 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "genauere Prüfung aktivieren"
 
-#: builtin/fsck.c:766
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
 
-#: builtin/fsck.c:767 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "Fortschrittsanzeige anzeigen"
 
-#: builtin/fsck.c:768
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
 
-#: builtin/fsck.c:827 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Prüfe Objekte"
 
-#: builtin/fsck.c:855
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: Objekt nicht vorhanden"
 
-#: builtin/fsck.c:866
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "Ungültiger Parameter: SHA-1 erwartet, '%s' bekommen"
@@ -15914,21 +16195,16 @@ 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:240 builtin/tag.c:573
-#, 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"
-"and remove %s.\n"
+"and remove %s\n"
 "Automatic cleanup will not be performed until the file is removed.\n"
 "\n"
 "%s"
@@ -15940,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)"
@@ -15999,33 +16275,33 @@ 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:869
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "Fehler beim Schreiben des Commit-Graph"
 
-#: builtin/gc.c:905
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "Vorabruf der Remote-Repositories fehlgeschlagen"
 
@@ -16037,138 +16313,178 @@ msgstr "konnte 'git pack-objects' Prozess nicht starten"
 msgid "failed to finish 'git pack-objects' process"
 msgstr "konnte 'git pack-objects' Prozess nicht beenden"
 
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "Fehler beim Schreiben des multi-pack-index"
 
-#: builtin/gc.c:1109
+#: 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:1170
+#: 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:1179
+#: 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:1283
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "Sperrdatei '%s' existiert, Wartung wird übersprungen"
 
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "Aufgabe '%s' fehlgeschlagen"
 
-#: builtin/gc.c:1395
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' ist keine gültige Aufgabe"
 
-#: builtin/gc.c:1400
+#: 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:1415
+#: 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:1416
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "Häufigkeit"
 
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "Aufgaben abhängig von der Häufigkeit ausführen"
 
-#: builtin/gc.c:1420
+#: 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:1421
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "Aufgabe"
 
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "eine bestimmte Aufgabe ausführen"
 
-#: builtin/gc.c:1439
+#: 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:1482
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "Fehler beim Ausführen von 'git config'"
 
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "Fehler beim Erweitern des Pfades '%s'"
 
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "konnte launchctl nicht starten"
 
-#: builtin/gc.c:1613
+#: 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:1674
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "Fehler beim Laden des Services %s"
 
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "Fehler beim Erstellen der temporären XML-Datei"
 
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "Fehler beim Starten von schtasks"
 
-#: builtin/gc.c:1879
+#: 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:1896
+#: 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:1900
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "Fehler beim Öffnen der Standard-Eingabe von 'crontab'"
 
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "'crontab' abgebrochen"
 
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "Fehler beim Starten von systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "Fehler beim Ausführen von systemctl"
+
+#: 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:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "nicht erkanntes --scheduler Argument '%s'"
+
+#: 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:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s Scheduler ist nicht verfügbar"
+
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "ein anderer Prozess plant die Hintergrundwartung"
 
-#: builtin/gc.c:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<Scheduler>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "Scheduler"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "Scheduler, um \"git maintenance run\" auzuführen"
+
+#: 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:2010
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <Unterbefehl> [<Optionen>]"
 
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "ungültiger Unterbefehl: %s"
@@ -16177,12 +16493,12 @@ msgstr "ungültiger Unterbefehl: %s"
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]"
 
-#: builtin/grep.c:223
+#: builtin/grep.c:239
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: Fehler beim Erzeugen eines Thread: %s"
 
-#: builtin/grep.c:277
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
@@ -16191,270 +16507,270 @@ msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
-#: builtin/pack-objects.c:2969
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
 
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
 
-#: builtin/grep.c:658
+#: builtin/grep.c:672
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen"
 
-#: builtin/grep.c:739
+#: 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:838
+#: builtin/grep.c:851
 msgid "search in index instead of in the work tree"
 msgstr "im Index statt im Arbeitsverzeichnis suchen"
 
-#: builtin/grep.c:840
+#: builtin/grep.c:853
 msgid "find in contents not managed by git"
 msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
 
-#: builtin/grep.c:842
+#: builtin/grep.c:855
 msgid "search in both tracked and untracked files"
 msgstr "in versionierten und unversionierten Dateien suchen"
 
-#: builtin/grep.c:844
+#: builtin/grep.c:857
 msgid "ignore files specified via '.gitignore'"
 msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:859
 msgid "recursively search in each submodule"
 msgstr "rekursive Suche in jedem Submodul"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:862
 msgid "show non-matching lines"
 msgstr "Zeilen ohne Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:864
 msgid "case insensitive matching"
 msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:866
 msgid "match patterns only at word boundaries"
 msgstr "nur ganze Wörter suchen"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:868
 msgid "process binary files as text"
 msgstr "binäre Dateien als Text verarbeiten"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:870
 msgid "don't match patterns in binary files"
 msgstr "keine Muster in Binärdateien finden"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:873
 msgid "process binary files with textconv filters"
 msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:875
 msgid "search in subdirectories (default)"
 msgstr "in Unterverzeichnissen suchen (Standard)"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:877
 msgid "descend at most <depth> levels"
 msgstr "höchstens <Tiefe> Ebenen durchlaufen"
 
-#: builtin/grep.c:868
+#: builtin/grep.c:881
 msgid "use extended POSIX regular expressions"
 msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:884
 msgid "use basic POSIX regular expressions (default)"
 msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:887
 msgid "interpret patterns as fixed strings"
 msgstr "Muster als feste Zeichenketten interpretieren"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:890
 msgid "use Perl-compatible regular expressions"
 msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:893
 msgid "show line numbers"
 msgstr "Zeilennummern anzeigen"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:894
 msgid "show column number of first match"
 msgstr "Nummer der Spalte des ersten Treffers anzeigen"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:895
 msgid "don't show filenames"
 msgstr "keine Dateinamen anzeigen"
 
-#: builtin/grep.c:883
+#: builtin/grep.c:896
 msgid "show filenames"
 msgstr "Dateinamen anzeigen"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:898
 msgid "show filenames relative to top directory"
 msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:900
 msgid "show only filenames instead of matching lines"
 msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:902
 msgid "synonym for --files-with-matches"
 msgstr "Synonym für --files-with-matches"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:905
 msgid "show only the names of files without match"
 msgstr "nur die Dateinamen ohne Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:894
+#: builtin/grep.c:907
 msgid "print NUL after filenames"
 msgstr "NUL-Zeichen nach Dateinamen ausgeben"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:910
 msgid "show only matching parts of a line"
 msgstr "nur übereinstimmende Teile der Zeile anzeigen"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:912
 msgid "show the number of matches instead of matching lines"
 msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:913
 msgid "highlight matches"
 msgstr "Ãœbereinstimmungen hervorheben"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:915
 msgid "print empty line between matches from different files"
 msgstr ""
 "eine Leerzeile zwischen Ãœbereinstimmungen in verschiedenen Dateien ausgeben"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:917
 msgid "show filename only once above matches from same file"
 msgstr ""
 "den Dateinamen nur einmal oberhalb der Ãœbereinstimmungen aus dieser Datei "
 "anzeigen"
 
-#: builtin/grep.c:907
+#: builtin/grep.c:920
 msgid "show <n> context lines before and after matches"
 msgstr "<n> Zeilen vor und nach den Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:910
+#: builtin/grep.c:923
 msgid "show <n> context lines before matches"
 msgstr "<n> Zeilen vor den Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:925
 msgid "show <n> context lines after matches"
 msgstr "<n> Zeilen nach den Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:927
 msgid "use <n> worker threads"
 msgstr "<n> Threads benutzen"
 
-#: builtin/grep.c:915
+#: builtin/grep.c:928
 msgid "shortcut for -C NUM"
 msgstr "Kurzform für -C NUM"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:931
 msgid "show a line with the function name before matches"
 msgstr "eine Zeile mit dem Funktionsnamen vor Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:933
 msgid "show the surrounding function"
 msgstr "die umgebende Funktion anzeigen"
 
-#: builtin/grep.c:923
+#: builtin/grep.c:936
 msgid "read patterns from file"
 msgstr "Muster von einer Datei lesen"
 
-#: builtin/grep.c:925
+#: builtin/grep.c:938
 msgid "match <pattern>"
 msgstr "<Muster> finden"
 
-#: builtin/grep.c:927
+#: builtin/grep.c:940
 msgid "combine patterns specified with -e"
 msgstr "Muster kombinieren, die mit -e angegeben wurden"
 
-#: builtin/grep.c:939
+#: builtin/grep.c:952
 msgid "indicate hit with exit status without output"
 msgstr "Ãœbereinstimmungen nur durch Beendigungsstatus anzeigen"
 
-#: builtin/grep.c:941
+#: builtin/grep.c:954
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "nur Ãœbereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "pager"
 msgstr "Anzeigeprogramm"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "show matching files in the pager"
 msgstr "Dateien mit Ãœbereinstimmungen im Anzeigeprogramm anzeigen"
 
-#: builtin/grep.c:948
+#: builtin/grep.c:961
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1027
 msgid "no pattern given"
 msgstr "Kein Muster angegeben."
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:1063
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index oder --untracked können nicht mit Commits verwendet werden"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:1071
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "Konnte Commit nicht auflösen: %s"
 
-#: builtin/grep.c:1088
+#: builtin/grep.c:1101
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked zusammen mit --recurse-submodules wird nicht unterstützt"
 
-#: builtin/grep.c:1092
+#: builtin/grep.c:1105
 msgid "invalid option combination, ignoring --threads"
 msgstr "Ungültige Kombination von Optionen, --threads wird ignoriert."
 
-#: builtin/grep.c:1095 builtin/pack-objects.c:3930
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
 msgid "no threads support, ignoring --threads"
 msgstr "Keine Unterstützung für Threads, --threads wird ignoriert."
 
-#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "ungültige Anzahl von Threads angegeben (%d)"
 
-#: builtin/grep.c:1132
+#: builtin/grep.c:1145
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 "--open-files-in-pager kann nur innerhalb des Arbeitsverzeichnisses verwendet "
 "werden"
 
-#: builtin/grep.c:1158
+#: builtin/grep.c:1171
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached und --untracked können nicht mit --no-index verwendet werden"
 
-#: builtin/grep.c:1161
+#: builtin/grep.c:1174
 msgid "--untracked cannot be used with --cached"
 msgstr "--untracked kann nicht mit --cached verwendet werden"
 
-#: builtin/grep.c:1167
+#: builtin/grep.c:1180
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
 "--[no-]exclude-standard kann nicht mit versionierten Inhalten verwendet "
 "werden"
 
-#: builtin/grep.c:1175
+#: builtin/grep.c:1188
 msgid "both --cached and trees are given"
 msgstr "--cached und \"Tree\"-Objekte angegeben"
 
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -16462,97 +16778,109 @@ msgstr ""
 "git hash-object [-t <Art>] [-w] [--path=<Datei> | --no-filters] [--stdin] "
 "[--] <Datei>..."
 
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "Art des Objektes"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "das Objekt in die Objektdatenbank schreiben"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "das Objekt von der Standard-Eingabe lesen"
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "Datei wie sie ist speichern, ohne Filter"
 
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "Hash über zufällige Daten, zur Erzeugung von beschädigten Objekten zur\n"
 "Fehlersuche in Git, erzeugen"
 
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "Datei verarbeiten, als ob sie von diesem Pfad wäre"
 
-#: builtin/help.c:47
+#: builtin/help.c:55
 msgid "print all available commands"
 msgstr "alle vorhandenen Befehle anzeigen"
 
-#: builtin/help.c:48
+#: builtin/help.c:57
 msgid "exclude guides"
 msgstr "Anleitungen ausschließen"
 
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "Liste von allgemein verwendeten Anleitungen anzeigen"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "alle Namen der Konfigurationsvariablen ausgeben"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
 msgid "show man page"
 msgstr "Handbuch anzeigen"
 
-#: builtin/help.c:53
+#: builtin/help.c:59
 msgid "show manual in web browser"
 msgstr "Handbuch in einem Webbrowser anzeigen"
 
-#: builtin/help.c:55
+#: builtin/help.c:61
 msgid "show info page"
 msgstr "Info-Seite anzeigen"
 
-#: builtin/help.c:57
+#: builtin/help.c:63
 msgid "print command description"
 msgstr "Beschreibung des Befehls ausgeben"
 
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<Befehl>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "Liste von allgemein verwendeten Anleitungen anzeigen"
 
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "alle Namen der Konfigurationsvariablen ausgeben"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<Befehl>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "nicht erkanntes Hilfeformat: %s"
 
-#: builtin/help.c:190
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "Konnte emacsclient nicht starten."
 
-#: builtin/help.c:203
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "Konnte Version des emacsclient nicht parsen."
 
-#: builtin/help.c:211
+#: 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:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: 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:307
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16561,7 +16889,7 @@ msgstr ""
 "'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n"
 "Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen."
 
-#: builtin/help.c:319
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16570,332 +16898,315 @@ msgstr ""
 "'%s': Programm für unterstützten Handbuchbetrachter.\n"
 "Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen."
 
-#: builtin/help.c:436
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': unbekannter Handbuch-Betrachter."
 
-#: builtin/help.c:453
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen"
 
-#: builtin/help.c:461
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
 
-#: builtin/help.c:520 builtin/help.c:531 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:534 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:563 builtin/help.c:593
+#: builtin/help.c:580
+msgid "this option doesn't take any other arguments"
+msgstr "diese Option akzeptiert keine anderen Argumente"
+
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "Verwendung: %s%s"
 
-#: builtin/help.c:577
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "'git help config' für weitere Informationen"
 
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "Objekt-Typen passen bei %s nicht zusammen"
 
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "konnte erwartetes Objekt %s nicht empfangen"
 
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "Objekt %s: erwarteter Typ %s, %s gefunden"
 
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "kann %d Byte nicht lesen"
 msgstr[1] "kann %d Bytes nicht lesen"
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr "zu frühes Dateiende"
 
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "Fehler beim Lesen der Eingabe"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "verwendete mehr Bytes als verfügbar waren"
 
-#: builtin/index-pack.c:325 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr "Paket ist zu groß für die aktuelle Definition von off_t"
 
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "Paket überschreitet die maximal erlaubte Größe"
 
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "konnte '%s' nicht erstellen"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "Kann Paketdatei '%s' nicht öffnen"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
 msgid "pack signature mismatch"
 msgstr "Paketsignatur stimmt nicht überein"
 
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "Paketversion %<PRIu32> nicht unterstützt"
 
-#: builtin/index-pack.c:383
+#: builtin/index-pack.c:376
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "Paket hat ein ungültiges Objekt bei Versatz %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:489
+#: builtin/index-pack.c:482
 #, c-format
 msgid "inflate returned %d"
 msgstr "Dekomprimierung gab %d zurück"
 
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:531
 msgid "offset value overflow for delta base object"
 msgstr "Wert für Versatz bei Differenzobjekt übergelaufen"
 
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:539
 msgid "delta base offset is out of bound"
 msgstr ""
 "Wert für Versatz bei Differenzobjekt liegt außerhalb des gültigen Bereichs"
 
-#: builtin/index-pack.c:554
+#: builtin/index-pack.c:547
 #, c-format
 msgid "unknown object type %d"
 msgstr "Unbekannter Objekt-Typ %d"
 
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:578
 msgid "cannot pread pack file"
 msgstr "Kann Paketdatei %s nicht lesen"
 
-#: builtin/index-pack.c:587
+#: builtin/index-pack.c:580
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Byte"
 msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes"
 
-#: builtin/index-pack.c:613
+#: builtin/index-pack.c:606
 msgid "serious inflate inconsistency"
 msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
 
-#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788
-#: builtin/index-pack.c:827 builtin/index-pack.c:836
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
 
-#: builtin/index-pack.c:761 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
 #, c-format
 msgid "unable to read %s"
 msgstr "kann %s nicht lesen"
 
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:818
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "Kann existierende Informationen zu Objekt %s nicht lesen."
 
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:826
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "Kann existierendes Objekt %s nicht lesen."
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:840
 #, c-format
 msgid "invalid blob object %s"
 msgstr "ungültiges Blob-Objekt %s"
 
-#: builtin/index-pack.c:850 builtin/index-pack.c:869
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
 msgid "fsck error in packed object"
 msgstr "fsck Fehler in gepacktem Objekt"
 
-#: builtin/index-pack.c:871
+#: builtin/index-pack.c:864
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
 
-#: builtin/index-pack.c:932 builtin/index-pack.c:979
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
 msgstr "Konnte Dateiunterschied nicht anwenden"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Receiving objects"
 msgstr "Empfange Objekte"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Indexing objects"
 msgstr "Indiziere Objekte"
 
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1190
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
 
-#: builtin/index-pack.c:1201
+#: builtin/index-pack.c:1195
 msgid "cannot fstat packfile"
 msgstr "kann Paketdatei nicht lesen"
 
-#: builtin/index-pack.c:1204
+#: builtin/index-pack.c:1198
 msgid "pack has junk at the end"
 msgstr "Paketende enthält nicht verwendbaren Inhalt"
 
-#: builtin/index-pack.c:1216
+#: builtin/index-pack.c:1210
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
 
-#: builtin/index-pack.c:1239
+#: builtin/index-pack.c:1233
 msgid "Resolving deltas"
 msgstr "Löse Unterschiede auf"
 
-#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "kann Thread nicht erzeugen: %s"
 
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1277
 msgid "confusion beyond insanity"
 msgstr "Fehler beim Auflösen der Unterschiede"
 
-#: builtin/index-pack.c:1289
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "abgeschlossen mit %d lokalem Objekt"
 msgstr[1] "abgeschlossen mit %d lokalen Objekten"
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "unerwartete Prüfsumme für %s (Festplattenfehler?)"
 
-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "Paket hat %d unaufgelösten Unterschied"
 msgstr[1] "Paket hat %d unaufgelöste Unterschiede"
 
-#: builtin/index-pack.c:1329
+#: builtin/index-pack.c:1323
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1419
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "lokales Objekt %s ist beschädigt"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1440
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "Name der Paketdatei '%s' endet nicht mit '.%s'"
 
-#: builtin/index-pack.c:1470
+#: builtin/index-pack.c:1464
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "Kann %s Datei '%s' nicht schreiben."
 
-#: builtin/index-pack.c:1478
+#: builtin/index-pack.c:1472
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "Kann eben geschriebene %s Datei '%s' nicht schließen."
 
-#: builtin/index-pack.c:1504
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "konnte temporäre Datei '*.%s' nicht zu '%s' umbenennen"
+
+#: builtin/index-pack.c:1514
 msgid "error while closing pack file"
 msgstr "Fehler beim Schließen der Paketdatei"
 
-#: builtin/index-pack.c:1518
-msgid "cannot store pack file"
-msgstr "Kann Paketdatei nicht speichern"
-
-#: builtin/index-pack.c:1526
-msgid "cannot store index file"
-msgstr "Kann Indexdatei nicht speichern"
-
-#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
 
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1643
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
 
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1645
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen"
 
-#: builtin/index-pack.c:1701
+#: builtin/index-pack.c:1693
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "kein Unterschied: %d Objekt"
 msgstr[1] "kein Unterschied: %d Objekte"
 
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1700
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt"
 msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte"
 
-#: builtin/index-pack.c:1750
+#: builtin/index-pack.c:1742
 msgid "Cannot come back to cwd"
 msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln"
 
-#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
-#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
 #, c-format
 msgid "bad %s"
 msgstr "%s ist ungültig"
 
-#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "unbekannter Hash-Algorithmus '%s'"
 
-#: builtin/index-pack.c:1852
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin kann nicht ohne --stdin verwendet werden"
-
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin erfordert ein Git-Repository"
 
-#: builtin/index-pack.c:1856
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format kann nicht mit --stdin verwendet werden"
-
-#: builtin/index-pack.c:1871
+#: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify wurde ohne Namen der Paketdatei angegeben"
 
-#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "fsck Fehler beim Packen von Objekten"
 
@@ -16939,56 +17250,56 @@ msgstr "Keine Vorlagen in %s gefunden."
 msgid "not copying templates from '%s': %s"
 msgstr "kopiere keine Vorlagen von '%s': %s"
 
-#: builtin/init-db.c:262
+#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "ungültiger initialer Branchname: '%s'"
 
-#: builtin/init-db.c:353
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "kann nicht mit Dateityp %d umgehen"
 
-#: builtin/init-db.c:356
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "Konnte %s nicht nach %s verschieben"
 
-#: builtin/init-db.c:372
+#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr "Versuch, das Repository mit einem anderen Hash zu reinitialisieren"
 
-#: builtin/init-db.c:396 builtin/init-db.c:399
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s existiert bereits"
 
-#: builtin/init-db.c:431
+#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "Neu-Initialisierung: --initial-branch=%s ignoriert"
 
-#: builtin/init-db.c:462
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Bestehendes verteiltes Git-Repository in %s%s neuinitialisiert\n"
 
-#: builtin/init-db.c:463
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Bestehendes Git-Repository in %s%s neuinitialisiert\n"
 
-#: builtin/init-db.c:467
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Leeres verteiltes Git-Repository in %s%s initialisiert\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Leeres Git-Repository in %s%s initialisiert\n"
 
-#: builtin/init-db.c:517
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -16996,41 +17307,37 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--"
 "shared[=<Berechtigungen>]] [<Verzeichnis>]"
 
-#: builtin/init-db.c:543
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "Berechtigungen"
 
-#: builtin/init-db.c:544
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird"
 
-#: builtin/init-db.c:550
+#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "den Namen des initialen Branches überschreiben"
 
-#: builtin/init-db.c:551 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "Hash"
 
-#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "den zu verwendenen Hash-Algorithmus angeben"
 
-#: builtin/init-db.c:559
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir und --bare schließen sich gegenseitig aus"
-
-#: builtin/init-db.c:590 builtin/init-db.c:595
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "kann Verzeichnis %s nicht erstellen"
 
-#: builtin/init-db.c:599 builtin/init-db.c:654
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "kann nicht in Verzeichnis %s wechseln"
 
-#: builtin/init-db.c:626
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -17039,12 +17346,12 @@ msgstr ""
 "%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s "
 "(oder --git-dir=<Verzeichnis>)"
 
-#: builtin/init-db.c:678
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen."
 
-#: builtin/init-db.c:683
+#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir nicht kompatibel mit Bare-Repository"
 
@@ -17153,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:303
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "letzte Ausgabe: %d %s\n"
 
-#: builtin/log.c:568
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ungültige Datei"
 
-#: builtin/log.c:583 builtin/log.c:673
+#: 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:698
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "Unbekannter Typ: %d"
 
-#: builtin/log.c:843
+#: 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:850
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers ohne Wert"
 
-#: builtin/log.c:979
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "Kann Patch-Datei %s nicht öffnen"
 
-#: builtin/log.c:996
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "Brauche genau einen Commit-Bereich."
 
-#: builtin/log.c:1006
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "Kein Commit-Bereich."
 
-#: builtin/log.c:1170
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "Anschreiben benötigt E-Mail-Format"
 
-#: builtin/log.c:1176
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "Fehler beim Erstellen der Datei für das Anschreiben."
 
-#: builtin/log.c:1263
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ungültiges in-reply-to: %s"
 
-#: builtin/log.c:1290
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
 
-#: builtin/log.c:1348
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "Zwei Ausgabeverzeichnisse?"
 
-#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#: 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:1510 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:1519
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "Konnte keine exakte Merge-Basis finden."
 
-#: builtin/log.c:1529
+#: 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"
@@ -17243,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:1552
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "Fehler beim Finden einer exakten Merge-Basis."
 
-#: builtin/log.c:1569
+#: 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:1579
+#: 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:1637
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "kann Patch-Id nicht lesen"
 
-#: builtin/log.c:1700
+#: 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:1702
+#: 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:1746
+#: 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:1749
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "[PATCH] auch mit mehreren Patches verwenden"
 
-#: builtin/log.c:1753
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "Ausgabe der Patches in Standard-Ausgabe"
 
-#: builtin/log.c:1755
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "ein Deckblatt erzeugen"
 
-#: builtin/log.c:1757
+#: 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:1758
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "Dateiendung"
 
-#: builtin/log.c:1759
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "<Dateiendung> statt '.patch' verwenden"
 
-#: builtin/log.c:1761
+#: 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:1762
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "Reroll-Anzahl"
 
-#: builtin/log.c:1763
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "die Serie als n-te Fassung kennzeichnen"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "maximale Länge des Dateinamens für die Ausgabe"
 
-#: builtin/log.c:1767
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "[RFC PATCH] statt [PATCH] verwenden"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "Modus für Erstellung des Deckblattes aus der Beschreibung"
 
-#: builtin/log.c:1771
+#: 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:1773
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "nutze [<Präfix>] statt [PATCH]"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "erzeugte Dateien in <Verzeichnis> speichern"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "[PATCH] nicht entfernen/hinzufügen"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "keine binären Unterschiede ausgeben"
 
-#: builtin/log.c:1784
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
 
-#: builtin/log.c:1786
+#: 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:1788
+#: builtin/log.c:1806
 msgid "show patch format instead of default (patch + stat)"
 msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
 
-#: builtin/log.c:1790
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "E-Mail-Einstellungen"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1809
 msgid "header"
 msgstr "Header"
 
-#: builtin/log.c:1792
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "E-Mail-Header hinzufügen"
 
-#: builtin/log.c:1793 builtin/log.c:1794
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "E-Mail"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "\"To:\"-Header hinzufügen"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "\"Cc:\"-Header hinzufügen"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "Ident"
 
-#: builtin/log.c:1796
+#: 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:1798
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1799
+#: 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:1800 builtin/log.c:1803
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "Grenze"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "den Patch anhängen"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "den Patch direkt in die Nachricht einfügen"
 
-#: builtin/log.c:1808
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
 
-#: builtin/log.c:1810
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "Signatur"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "eine Signatur hinzufügen"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "Basis-Commit"
 
-#: builtin/log.c:1813
+#: 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:1816
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "eine Signatur aus einer Datei hinzufügen"
 
-#: builtin/log.c:1817
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "keine Dateinamen der Patches anzeigen"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "Forschrittsanzeige während der Erzeugung der Patches"
 
-#: builtin/log.c:1821
+#: 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:1824
+#: 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:1826 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:1913
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "Ungültige Identifikationszeile: %s"
 
-#: builtin/log.c:1928
-msgid "-n and -k are mutually exclusive"
-msgstr "-n und -k schließen sich gegenseitig aus"
-
-#: builtin/log.c:1930
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus"
-
-#: builtin/log.c:1938
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only kann nicht verwendet werden"
 
-#: builtin/log.c:1940
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status kann nicht verwendet werden"
 
-#: builtin/log.c:1942
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check kann nicht verwendet werden"
 
-#: builtin/log.c:1964
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr ""
-"--stdout, --output und --output-directory schließen sich gegenseitig aus"
-
-#: builtin/log.c:2087
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch"
 
-#: builtin/log.c:2091
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2092
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff gegen v%d:"
 
-#: builtin/log.c:2098
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor erfordert --range-diff"
-
-#: builtin/log.c:2102
+#: 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:2110
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "Range-Diff:"
 
-#: builtin/log.c:2111
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-Diff gegen v%d:"
 
-#: builtin/log.c:2122
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "Konnte Signatur-Datei '%s' nicht lesen"
 
-#: builtin/log.c:2158
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "Erzeuge Patches"
 
-#: builtin/log.c:2202
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "Fehler beim Erstellen der Ausgabedateien."
 
-#: builtin/log.c:2261
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
 
-#: builtin/log.c:2315
+#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17539,134 +17829,142 @@ msgstr ""
 "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
 "manuell an.\n"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<Optionen>] [<Datei>...]"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "Pfade durch NUL-Zeichen trennen"
+
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "den Dateistatus mit Tags anzeigen"
 
-#: builtin/ls-files.c:621
+#: 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:623
+#: 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:625
+#: 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:627
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "entfernte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "geänderte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "sonstige Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "ignorierte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:636
+#: 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:638
+#: 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:640
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "Zeilenenden von Dateien anzeigen"
 
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "keine leeren Verzeichnisse anzeigen"
 
-#: builtin/ls-files.c:647
+#: 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:649
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "'resolve-undo' Informationen anzeigen"
 
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "Dateien auslassen, die einem Muster entsprechen"
 
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "Muster, gelesen von <Datei>, ausschließen"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "Ausschlussmuster aus <Datei> lesen"
 
-#: builtin/ls-files.c:657
+#: 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:659
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen"
 
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr "Ausgabe relativ zum Projektverzeichnis"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "Rekursion in Submodulen durchführen"
 
-#: builtin/ls-files.c:668
+#: 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:669
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "Commit-Referenz"
 
-#: builtin/ls-files.c:670
+#: 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:672
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "Ausgaben zur Fehlersuche anzeigen"
 
-#: builtin/ls-files.c:674
+#: 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"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<repository> [<refs>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repository> [<refs>...]]"
 msgstr ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<Programm>]\n"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<Repository> [<Referenzen>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<Repository> [<Referenzen>...]]"
 
 #: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "URL des Remote-Repositories nicht ausgeben"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
 msgid "exec"
 msgstr "Programm"
 
@@ -17787,7 +18085,7 @@ msgstr "Aktion, wenn ein angeführtes CR gefunden wird"
 msgid "use headers in message's body"
 msgstr "nutze Header im Inhalt der Nachricht"
 
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "Leere mbox: '%s'"
@@ -17849,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"
 
@@ -17903,194 +18205,190 @@ msgstr "Konnte Referenz '%s' nicht auflösen"
 msgid "Merging %s with %s\n"
 msgstr "Führe %s mit %s zusammen\n"
 
-#: builtin/merge.c:58
+#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<Optionen>] [<Commit>...]"
 
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: 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:146
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "Option `%s' erfordert einen Wert."
 
-#: builtin/merge.c:199
+#: 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:200
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Verfügbare Strategien sind:"
 
-#: builtin/merge.c:205
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Verfügbare benutzerdefinierte Strategien sind:"
 
-#: builtin/merge.c:256 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 "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
 
-#: builtin/merge.c:259 builtin/pull.c:136
+#: 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:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(Synonym für --stat)"
 
-#: builtin/merge.c:262 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 ""
 "(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits "
 "hinzufügen"
 
-#: builtin/merge.c:265 builtin/pull.c:148
+#: 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:267 builtin/pull.c:151
+#: 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:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "Bearbeitung der Beschreibung vor dem Commit"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "Vorspulen erlauben (Standard)"
 
-#: builtin/merge.c:273 builtin/pull.c:161
+#: 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:277 builtin/pull.c:164
+#: 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:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: 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:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "zu verwendende Merge-Strategie"
 
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "Option=Wert"
 
-#: builtin/merge.c:281 builtin/pull.c:173
+#: 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:283
+#: 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:290
+#: 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:292
+#: 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:294
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge fortsetzen"
 
-#: builtin/merge.c:296 builtin/pull.c:180
+#: 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:303
+#: 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:320
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "Konnte \"stash\" nicht ausführen."
 
-#: builtin/merge.c:325
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "\"stash\" fehlgeschlagen"
 
-#: builtin/merge.c:330
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "kein gültiges Objekt: %s"
 
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree fehlgeschlagen"
 
-#: builtin/merge.c:400
+#: 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:414
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Squash Commit -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:464
+#: 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:602
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Ungültiger branch.%s.mergeoptions String: %s"
 
-#: builtin/merge.c:728
+#: 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:741
+#: builtin/merge.c:745
 #, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Unbekannte Option für merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "unbekannte Strategie-Option: -X%s"
 
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
+#: 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:812
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "konnte nicht von '%s' lesen"
 
-#: builtin/merge.c:821
+#: 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:827
+#: 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"
@@ -18101,11 +18399,11 @@ msgstr ""
 "Upstream-Branch mit einem Thema-Branch zusammenführt.\n"
 "\n"
 
-#: builtin/merge.c:832
+#: 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:835
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18114,75 +18412,75 @@ msgstr ""
 "Zeilen, die mit '%c' beginnen, werden ignoriert,\n"
 "und eine leere Beschreibung bricht den Commit ab.\n"
 
-#: builtin/merge.c:888
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "Leere Commit-Beschreibung"
 
-#: builtin/merge.c:903
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Wunderbar.\n"
 
-#: builtin/merge.c:964
+#: 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:1003
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "Sie befinden sich auf keinem Branch."
 
-#: builtin/merge.c:1005
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "Kein Remote-Repository für den aktuellen Branch."
 
-#: builtin/merge.c:1007
+#: 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:1012
+#: 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:1069
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
 
-#: builtin/merge.c:1172
+#: 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:1206
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "nichts was wir zusammenführen können"
 
-#: builtin/merge.c:1316
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort akzeptiert keine Argumente"
 
-#: builtin/merge.c:1320
+#: 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:1338
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit erwartet keine Argumente"
 
-#: builtin/merge.c:1351
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue erwartet keine Argumente"
 
-#: builtin/merge.c:1355
+#: 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:1371
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18190,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:1378
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18198,92 +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:1381
+#: 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:1395
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Sie können --squash nicht mit --no-ff kombinieren."
-
-#: builtin/merge.c:1397
-msgid "You cannot combine --squash with --commit."
-msgstr "Sie können --squash nicht mit --commit kombinieren."
-
-#: builtin/merge.c:1413
+#: 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:1430
+#: 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"
+msgstr "Squash-Merge auf einen leeren Branch wird noch nicht unterstützt"
 
-#: builtin/merge.c:1432
+#: 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:1437
+#: 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:1439
+#: 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:1520
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "verweigere den Merge von nicht zusammenhängenden Historien"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Aktualisiere %s..%s\n"
 
-#: builtin/merge.c:1585
+#: 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:1592
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "Nein.\n"
 
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr "Vorspulen nicht möglich, breche ab."
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: 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"
+msgstr "Rücklauf des Verzeichnisses bis zum Ursprung...\n"
 
-#: builtin/merge.c:1655
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
-msgstr "Probiere Merge-Strategie %s ...\n"
+msgstr "Probiere Merge-Strategie %s...\n"
 
-#: builtin/merge.c:1707
+#: 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:1709
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
 
-#: builtin/merge.c:1718
+#: builtin/merge.c:1735
 #, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n"
+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:1732
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -18318,16 +18603,16 @@ msgstr "konnte getaggtes Objekt '%s' nicht lesen"
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr "Objekt '%s' als '%s' getaggt, aber ist ein '%s' Typ"
 
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr ""
 "Tag von der Standardeingabe für unsere strenge Überprüfung bei fsck ungültig"
 
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
 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:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "konnte Tag-Datei nicht schreiben"
 
@@ -18348,36 +18633,52 @@ msgid "allow creation of more than one tree"
 msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben"
 
 #: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<Optionen>] write [--preferred-pack=<Paket>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<Optionen>] write [--preferred-pack=<Paket>][--refs-"
+"snapshot=<Pfad>]"
 
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
 msgid "git multi-pack-index [<options>] verify"
 msgstr "git multi-pack-index [<Optionen>] verify"
 
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<Optionen>] expire"
 
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<Optionen>] repack [--batch-size=<Größe>]"
 
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 "Objekt-Verzeichnis, welches Paare von Packdateien und pack-index enthält"
 
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
 msgid "preferred-pack"
 msgstr "bevorzugtes Paket"
 
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr ""
 "Paket für die Wiederbenutzung, wenn eine Multi-Pack Bitmap berechnet wird"
 
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "schreibe Multipack-Bitmap"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "Multipack-Index schreiben, der nur die gegebenen Indexe enthält"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "Referenzen-Snapshot, um Bitmap-Commits auszuwählen"
+
+#: builtin/multi-pack-index.c:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18385,11 +18686,6 @@ msgstr ""
 "Während des Umpackens, sammle Paket-Dateien von geringerer Größe in "
 "einenStapel, welcher größer ist als diese Größe"
 
-#: builtin/multi-pack-index.c:180
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "Nicht erkannter Unterbefehl: %s"
-
 #: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<Optionen>] <Quelle>... <Ziel>"
@@ -18419,117 +18715,117 @@ msgstr "Verschieben/Umbenennen erzwingen, auch wenn das Ziel existiert"
 msgid "skip move/rename errors"
 msgstr "Fehler beim Verschieben oder Umbenennen überspringen"
 
-#: builtin/mv.c:170
+#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "Ziel '%s' ist kein Verzeichnis"
 
-#: builtin/mv.c:181
+#: builtin/mv.c:184
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Prüfe Umbenennung von '%s' nach '%s'\n"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:190
 msgid "bad source"
 msgstr "ungültige Quelle"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "kann Verzeichnis nicht in sich selbst verschieben"
 
-#: builtin/mv.c:191
+#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "kann Verzeichnis nicht über Datei verschieben"
 
-#: builtin/mv.c:200
+#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "Quellverzeichnis ist leer"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "nicht unter Versionskontrolle"
 
-#: builtin/mv.c:227
+#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "in Konflikt"
 
-#: builtin/mv.c:230
+#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "Ziel existiert bereits"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "überschreibe '%s'"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "Kann nicht überschreiben"
 
-#: builtin/mv.c:244
+#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "mehrere Quellen für dasselbe Ziel"
 
-#: builtin/mv.c:246
+#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "Zielverzeichnis existiert nicht"
 
-#: builtin/mv.c:253
+#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, Quelle=%s, Ziel=%s"
 
-#: builtin/mv.c:274
+#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Benenne %s nach %s um\n"
 
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: 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)"
 
@@ -18649,62 +18945,62 @@ 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:197
+#: 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:206
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "Konnte Notiz-Objekt nicht schreiben"
 
-#: builtin/notes.c:208
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "Die Notiz-Inhalte wurden in %s belassen."
 
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "konnte '%s' nicht öffnen oder lesen"
 
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
 
-#: builtin/notes.c:265
+#: builtin/notes.c:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "Fehler beim Lesen des Objektes '%s'."
 
-#: builtin/notes.c:268
+#: builtin/notes.c:266
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "Kann Notiz-Daten nicht von Nicht-Blob Objekt '%s' lesen."
 
-#: builtin/notes.c:309
+#: builtin/notes.c:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "Fehlerhafte Eingabezeile: '%s'."
 
-#: builtin/notes.c:324
+#: builtin/notes.c:322
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
@@ -18712,50 +19008,50 @@ msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr ""
 "Ausführung von %s auf Notizen in %s (außerhalb von refs/notes/) "
 "zurückgewiesen"
 
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: 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: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."
 
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
 #, c-format
 msgid "no note found for object %s."
 msgstr "Keine Notiz für Objekt %s gefunden."
 
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "Notizinhalte als Zeichenkette"
 
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "Notizinhalte in einer Datei"
 
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
 msgid "reuse and edit specified note object"
 msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes"
 
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "Wiederverwendung des angegebenen Notiz-Objektes"
 
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "Speichern leerer Notiz erlauben"
 
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "existierende Notizen ersetzen"
 
-#: builtin/notes.c:448
+#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18764,31 +19060,31 @@ msgstr ""
 "Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s "
 "gefunden. Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
 
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Überschreibe existierende Notizen für Objekt %s\n"
 
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: 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"
 
-#: builtin/notes.c:497
+#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "Objekte von der Standard-Eingabe lesen"
 
-#: builtin/notes.c:499
+#: builtin/notes.c:497
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 "Konfiguration für <Befehl> zum Umschreiben von Commits laden (impliziert --"
 "stdin)"
 
-#: builtin/notes.c:517
+#: builtin/notes.c:515
 msgid "too few arguments"
 msgstr "zu wenige Argumente"
 
-#: builtin/notes.c:538
+#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18797,12 +19093,12 @@ msgstr ""
 "Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. "
 "Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
 
-#: builtin/notes.c:550
+#: builtin/notes.c:548
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich."
 
-#: builtin/notes.c:603
+#: builtin/notes.c:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18811,52 +19107,52 @@ msgstr ""
 "Die Optionen -m/-F/-c/-C sind für den Unterbefehl 'edit' veraltet.\n"
 "Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n"
 
-#: builtin/notes.c:698
+#: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:700
+#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_REF"
 
-#: builtin/notes.c:702
+#: builtin/notes.c:700
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "Fehler beim Löschen des Arbeitsverzeichnisses von 'git notes merge'."
 
-#: builtin/notes.c:722
+#: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "Fehler beim Lesen der Referenz NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:724
+#: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht finden."
 
-#: builtin/notes.c:726
+#: builtin/notes.c:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht parsen."
 
-#: builtin/notes.c:739
+#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "Fehler beim Auflösen von NOTES_MERGE_REF"
 
-#: builtin/notes.c:742
+#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "Fehler beim Abschließen der Zusammenführung der Notizen."
 
-#: builtin/notes.c:768
+#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "unbekannte Merge-Strategie '%s' für Notizen"
 
-#: builtin/notes.c:784
+#: builtin/notes.c:782
 msgid "General options"
 msgstr "Allgemeine Optionen"
 
-#: builtin/notes.c:786
+#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Merge-Optionen"
 
-#: builtin/notes.c:788
+#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -18864,49 +19160,49 @@ msgstr ""
 "löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:790
+#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "nicht zusammengeführte Notizen eintragen"
 
-#: builtin/notes.c:792
+#: builtin/notes.c:790
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 "Merge von Notizen abschließen, in dem nicht zusammengeführte Notizen "
 "committet werden"
 
-#: builtin/notes.c:794
+#: builtin/notes.c:792
 msgid "Aborting notes merge resolution"
 msgstr "Konfliktauflösung beim Merge von Notizen abbrechen"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "Merge von Notizen abbrechen"
 
-#: builtin/notes.c:807
+#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "Kann --commit, --abort oder -s/--strategy nicht kombinieren."
 
-#: builtin/notes.c:812
+#: builtin/notes.c:810
 msgid "must specify a notes ref to merge"
 msgstr "Sie müssen eine Notiz-Referenz zum Mergen angeben."
 
-#: builtin/notes.c:836
+#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "Unbekannter Wert für -s/--strategy: %s"
 
-#: builtin/notes.c:873
+#: 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:876
+#: 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:878
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18918,60 +19214,60 @@ msgstr ""
 "commit',\n"
 "oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n"
 
-#: builtin/notes.c:897 builtin/tag.c:589
+#: 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:900
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "Objekt %s hat keine Notiz\n"
 
-#: builtin/notes.c:912
+#: 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:915
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr "Objektnamen von der Standard-Eingabe lesen"
 
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
+#: 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:955
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "gelöschte Notizen melden"
 
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "Notiz-Referenz"
 
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "Notizen von <Notiz-Referenz> verwenden"
 
-#: builtin/notes.c:1034 builtin/stash.c:1739
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "Unbekannter Unterbefehl: %s"
 
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<Optionen>...] [< <Referenzliste> | < "
 "<Objektliste>]"
 
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < "
 "<Objektliste>]"
 
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18980,111 +19276,115 @@ msgstr ""
 "write_reuse_object: konnte %s nicht finden, erwartet bei Offset %<PRIuMAX> "
 "in Paket %s"
 
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "Ungültiges CRC für gepacktes Objekt %s."
 
-#: builtin/pack-objects.c:459
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "Fehlerhaftes gepacktes Objekt für %s."
 
-#: builtin/pack-objects.c:590
+#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "Rekursiver Unterschied für Objekt %s festgestellt."
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u Objekte geordnet, %<PRIu32> erwartet."
 
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "Objekt beim Offset %<PRIuMAX> in Paket %s erwartet"
 
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1160
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n"
 "aufgetrennt."
 
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
 msgid "Writing objects"
 msgstr "Schreibe Objekte"
 
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "Konnte '%s' nicht lesen"
 
-#: builtin/pack-objects.c:1141
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "Fehler beim Schreiben des Bitmap-Index"
+
+#: builtin/pack-objects.c:1294
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "Schrieb %<PRIu32> Objekte während %<PRIu32> erwartet waren."
 
-#: builtin/pack-objects.c:1383
+#: builtin/pack-objects.c:1536
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-"
 "Datei\n"
 "geschrieben wurden."
 
-#: builtin/pack-objects.c:1831
+#: builtin/pack-objects.c:1984
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "\"delta base offset\" Überlauf in Paket für %s"
 
-#: builtin/pack-objects.c:1840
+#: builtin/pack-objects.c:1993
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "\"delta base offset\" liegt außerhalb des gültigen Bereichs für %s"
 
-#: builtin/pack-objects.c:2121
+#: builtin/pack-objects.c:2274
 msgid "Counting objects"
 msgstr "Zähle Objekte"
 
-#: builtin/pack-objects.c:2266
+#: builtin/pack-objects.c:2439
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen."
 
-#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
-#: builtin/pack-objects.c:2362
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
 #, c-format
 msgid "object %s cannot be read"
 msgstr "Objekt %s kann nicht gelesen werden."
 
-#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "Inkonsistente Objektlänge bei Objekt %s (%<PRIuMAX> vs %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2376
+#: builtin/pack-objects.c:2549
 msgid "suboptimal pack - out of memory"
 msgstr "ungünstiges Packet - Speicher voll"
 
-#: builtin/pack-objects.c:2691
+#: builtin/pack-objects.c:2864
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Delta-Kompression verwendet bis zu %d Threads."
 
-#: builtin/pack-objects.c:2830
+#: builtin/pack-objects.c:3003
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "Konnte keine Objekte packen, die von Tag %s erreichbar sind."
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:3089
 msgid "Compressing objects"
 msgstr "Komprimiere Objekte"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:3095
 msgid "inconsistency with delta count"
 msgstr "Inkonsistenz mit der Anzahl von Deltas"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3174
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -19093,7 +19393,7 @@ msgstr ""
 "Wert für uploadpack.blobpackfileuri muss in der Form '<Objekt-Hash> <Pack-"
 "Hash> <URI>' vorliegen ('%s' erhalten)"
 
-#: builtin/pack-objects.c:3004
+#: builtin/pack-objects.c:3177
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -19101,17 +19401,18 @@ msgstr ""
 "Objekt bereits in einem anderen uploadpack.blobpackfileuri konfiguriert "
 "('%s' erhalten)"
 
-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3212
 #, c-format
 msgid "could not get type of object %s in pack %s"
 msgstr "konnte Typ von Objekt %s in Paket %s nicht bestimmen"
 
-#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "Konnte Paket '%s' nicht finden"
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3408
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -19120,7 +19421,7 @@ msgstr ""
 "erwartete Randobjekt-ID, erhielt nutzlose Daten:\n"
 " %s"
 
-#: builtin/pack-objects.c:3224
+#: builtin/pack-objects.c:3414
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -19129,263 +19430,259 @@ msgstr ""
 "erwartete Objekt-ID, erhielt nutzlose Daten:\n"
 " %s"
 
-#: builtin/pack-objects.c:3322
+#: builtin/pack-objects.c:3507
 msgid "invalid value for --missing"
 msgstr "ungültiger Wert für --missing"
 
-#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
 msgid "cannot open pack index"
 msgstr "kann Paketindex nicht öffnen"
 
-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3541
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "loses Objekt bei %s konnte nicht untersucht werden"
 
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3627
 msgid "unable to force loose object"
 msgstr "konnte loses Objekt nicht erzwingen"
 
-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3757
 #, c-format
 msgid "not a rev '%s'"
 msgstr "'%s' ist kein Commit"
 
-#: builtin/pack-objects.c:3631
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "ungültiger Commit '%s'"
 
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3788
 msgid "unable to add recent objects"
 msgstr "konnte neuere Objekte nicht hinzufügen"
 
-#: builtin/pack-objects.c:3712
+#: builtin/pack-objects.c:3841
 #, c-format
 msgid "unsupported index version %s"
 msgstr "nicht unterstützte Index-Version %s"
 
-#: builtin/pack-objects.c:3716
+#: builtin/pack-objects.c:3845
 #, c-format
 msgid "bad index version '%s'"
 msgstr "ungültige Index-Version '%s'"
 
-#: builtin/pack-objects.c:3755
+#: builtin/pack-objects.c:3884
 msgid "<version>[,<offset>]"
 msgstr "<Version>[,<Offset>]"
 
-#: builtin/pack-objects.c:3756
+#: builtin/pack-objects.c:3885
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben"
 
-#: builtin/pack-objects.c:3759
+#: builtin/pack-objects.c:3888
 msgid "maximum size of each output pack file"
 msgstr "maximale Größe für jede ausgegebene Paketdatei"
 
-#: builtin/pack-objects.c:3761
+#: builtin/pack-objects.c:3890
 msgid "ignore borrowed objects from alternate object store"
 msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
 
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c:3892
 msgid "ignore packed objects"
 msgstr "gepackte Objekte ignorieren"
 
-#: builtin/pack-objects.c:3765
+#: builtin/pack-objects.c:3894
 msgid "limit pack window by objects"
 msgstr "Paketfenster durch Objekte begrenzen"
 
-#: builtin/pack-objects.c:3767
+#: builtin/pack-objects.c:3896
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
 
-#: builtin/pack-objects.c:3769
+#: builtin/pack-objects.c:3898
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "maximale Länge der erlaubten Differenzverkettung im resultierenden Paket"
 
-#: builtin/pack-objects.c:3771
+#: builtin/pack-objects.c:3900
 msgid "reuse existing deltas"
 msgstr "existierende Unterschiede wiederverwenden"
 
-#: builtin/pack-objects.c:3773
+#: builtin/pack-objects.c:3902
 msgid "reuse existing objects"
 msgstr "existierende Objekte wiederverwenden"
 
-#: builtin/pack-objects.c:3775
+#: builtin/pack-objects.c:3904
 msgid "use OFS_DELTA objects"
 msgstr "OFS_DELTA Objekte verwenden"
 
-#: builtin/pack-objects.c:3777
+#: builtin/pack-objects.c:3906
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "Threads bei der Suche nach den besten Ãœbereinstimmungen bei Unterschieden "
 "verwenden"
 
-#: builtin/pack-objects.c:3779
+#: builtin/pack-objects.c:3908
 msgid "do not create an empty pack output"
 msgstr "keine leeren Pakete erzeugen"
 
-#: builtin/pack-objects.c:3781
+#: builtin/pack-objects.c:3910
 msgid "read revision arguments from standard input"
 msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
 
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:3912
 msgid "limit the objects to those that are not yet packed"
 msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen"
 
-#: builtin/pack-objects.c:3786
+#: builtin/pack-objects.c:3915
 msgid "include objects reachable from any reference"
 msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
 
-#: builtin/pack-objects.c:3789
+#: builtin/pack-objects.c:3918
 msgid "include objects referred by reflog entries"
 msgstr ""
 "Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
 
-#: builtin/pack-objects.c:3792
+#: builtin/pack-objects.c:3921
 msgid "include objects referred to by the index"
 msgstr "Objekte einschließen, die vom Index referenziert werden"
 
-#: builtin/pack-objects.c:3795
+#: builtin/pack-objects.c:3924
 msgid "read packs from stdin"
 msgstr "Pakete von der Standard-Eingabe lesen"
 
-#: builtin/pack-objects.c:3797
+#: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
 msgstr "Paket in die Standard-Ausgabe schreiben"
 
-#: builtin/pack-objects.c:3799
+#: builtin/pack-objects.c:3928
 msgid "include tag objects that refer to objects to be packed"
 msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren"
 
-#: builtin/pack-objects.c:3801
+#: builtin/pack-objects.c:3930
 msgid "keep unreachable objects"
 msgstr "nicht erreichbare Objekte behalten"
 
-#: builtin/pack-objects.c:3803
+#: builtin/pack-objects.c:3932
 msgid "pack loose unreachable objects"
 msgstr "nicht erreichbare lose Objekte packen"
 
-#: builtin/pack-objects.c:3805
+#: builtin/pack-objects.c:3934
 msgid "unpack unreachable objects newer than <time>"
 msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
 
-#: builtin/pack-objects.c:3808
+#: builtin/pack-objects.c:3937
 msgid "use the sparse reachability algorithm"
 msgstr "den \"sparse\" Algorithmus zur Bestimmung der Erreichbarkeit benutzen"
 
-#: builtin/pack-objects.c:3810
+#: builtin/pack-objects.c:3939
 msgid "create thin packs"
 msgstr "dünnere Pakete erzeugen"
 
-#: builtin/pack-objects.c:3812
+#: builtin/pack-objects.c:3941
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
 
-#: builtin/pack-objects.c:3814
+#: builtin/pack-objects.c:3943
 msgid "ignore packs that have companion .keep file"
 msgstr "Pakete ignorieren, die .keep Dateien haben"
 
-#: builtin/pack-objects.c:3816
+#: builtin/pack-objects.c:3945
 msgid "ignore this pack"
 msgstr "dieses Paket ignorieren"
 
-#: builtin/pack-objects.c:3818
+#: builtin/pack-objects.c:3947
 msgid "pack compression level"
 msgstr "Komprimierungsgrad für Paketierung"
 
-#: builtin/pack-objects.c:3820
+#: builtin/pack-objects.c:3949
 msgid "do not hide commits by grafts"
 msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
 
-#: builtin/pack-objects.c:3822
+#: builtin/pack-objects.c:3951
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen"
 
-#: builtin/pack-objects.c:3824
+#: builtin/pack-objects.c:3953
 msgid "write a bitmap index together with the pack index"
 msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
 
-#: builtin/pack-objects.c:3828
+#: builtin/pack-objects.c:3957
 msgid "write a bitmap index if possible"
 msgstr "Bitmap-Index schreiben, wenn möglich"
 
-#: builtin/pack-objects.c:3832
+#: builtin/pack-objects.c:3961
 msgid "handling for missing objects"
 msgstr "Behandlung für fehlende Objekte"
 
-#: builtin/pack-objects.c:3835
+#: builtin/pack-objects.c:3964
 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 "keine Objekte aus Packdateien von partiell geklonten Remote-Repositories "
 "packen"
 
-#: builtin/pack-objects.c:3837
+#: builtin/pack-objects.c:3966
 msgid "respect islands during delta compression"
 msgstr "Delta-Islands bei Delta-Kompression beachten"
 
-#: builtin/pack-objects.c:3839
+#: builtin/pack-objects.c:3968
 msgid "protocol"
 msgstr "Protokoll"
 
-#: builtin/pack-objects.c:3840
+#: builtin/pack-objects.c:3969
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr ""
 "jegliche konfigurierte uploadpack.blobpackfileuri für dieses Protkoll "
 "ausschließen"
 
-#: builtin/pack-objects.c:3873
+#: builtin/pack-objects.c:4002
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "Tiefe für Verkettung von Unterschieden %d ist zu tief, erzwinge %d"
 
-#: builtin/pack-objects.c:3878
+#: builtin/pack-objects.c:4007
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d"
 
-#: builtin/pack-objects.c:3934
+#: builtin/pack-objects.c:4063
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "--max-pack-size kann nicht für die Erstellung eines Pakets für eine "
 "Ãœbertragung\n"
 "benutzt werden."
 
-#: builtin/pack-objects.c:3936
+#: builtin/pack-objects.c:4065
 msgid "minimum pack size limit is 1 MiB"
 msgstr "Minimales Limit für die Paketgröße ist 1 MiB."
 
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:4070
 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:3944
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable und --unpack-unreachable sind inkompatibel"
-
-#: builtin/pack-objects.c:3950
+#: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "Kann --filter nicht ohne --stdout benutzen."
 
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:4081
 msgid "cannot use --filter with --stdin-packs"
 msgstr "kann --filter nicht mit --stdin-packs benutzen"
 
-#: builtin/pack-objects.c:3956
+#: builtin/pack-objects.c:4085
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr ""
 "interne Commit-Liste kann nicht gemeinsam mit --stdin-packs verwendet werden"
 
-#: builtin/pack-objects.c:4015
+#: builtin/pack-objects.c:4144
 msgid "Enumerating objects"
 msgstr "Objekte aufzählen"
 
-#: builtin/pack-objects.c:4052
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19429,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:152
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "kann \"prune\" in precious-objects Repository nicht ausführen"
 
@@ -19456,44 +19753,48 @@ msgstr "Ungültiger Wert für %s: %s"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/pull.c:123
+#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
 msgstr "rekursive Anforderungen von Submodulen kontrollieren"
 
-#: builtin/pull.c:127
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Optionen bezogen auf Merge"
 
-#: builtin/pull.c:130
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "Integration von Änderungen durch Rebase statt Merge"
 
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "Vorspulen erlauben"
 
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+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:340
 msgid "automatically stash/stash pop before and after"
 msgstr "automatischer Stash/Stash-Pop davor und danach"
 
-#: builtin/pull.c:183
+#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "Optionen bezogen auf Fetch"
 
-#: builtin/pull.c:193
+#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "das Ãœberschreiben von lokalen Branches erzwingen"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
 
-#: builtin/pull.c:317
+#: builtin/pull.c:321
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Ungültiger Wert für 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."
@@ -19501,14 +19802,14 @@ msgstr ""
 "Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben "
 "angefordert wurden."
 
-#: builtin/pull.c:447
+#: builtin/pull.c:451
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Es gibt keine Kandidaten für Merge innerhalb der Referenzen, die eben "
 "angefordert wurden."
 
-#: builtin/pull.c:448
+#: builtin/pull.c:452
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -19516,7 +19817,7 @@ msgstr ""
 "Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n"
 "haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt."
 
-#: builtin/pull.c:451
+#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -19528,38 +19829,39 @@ msgstr ""
 "Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n"
 "der Befehlszeile angeben."
 
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
 msgid "You are not currently on a branch."
 msgstr "Im Moment auf keinem Branch."
 
-#: 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 ""
 "Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen "
 "möchten."
 
-#: 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 "Bitte geben Sie den Branch an, welchen Sie zusammenführen möchten."
 
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "Siehe git-pull(1) für weitere Details."
 
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
 msgid "<remote>"
 msgstr "<Remote-Repository>"
 
-#: 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 "<Branch>"
 
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
 msgid "There is no tracking information for the current branch."
 msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch."
 
-#: 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 ""
@@ -19567,7 +19869,7 @@ msgstr ""
 "Sie\n"
 "dies tun mit:"
 
-#: builtin/pull.c:485
+#: builtin/pull.c:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -19577,22 +19879,22 @@ msgstr ""
 "des Remote-Repositories durchzuführen, aber diese Referenz\n"
 "wurde nicht angefordert."
 
-#: builtin/pull.c:596
+#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "Konnte nicht auf Commit '%s' zugreifen."
 
-#: builtin/pull.c:902
+#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "Ignoriere --verify-signatures für Rebase"
 
-#: builtin/pull.c:930
+#: builtin/pull.c:969
 msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"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"
@@ -19602,12 +19904,12 @@ msgid ""
 "or --ff-only on the command line to override the configured default per\n"
 "invocation.\n"
 msgstr ""
-"Es wird davon abgeraten zu Pullen, ohne anzugeben, wie mit abweichenden\n"
-"Branches umgegangen werden soll. Sie können diese Nachricht unterdrücken,\n"
-"indem Sie einen der folgenden Befehle ausführen, bevor der nächste Pull\n"
-"ausgeführt wird:\n"
+"Sie haben abweichende Branches und müssen angeben, wie mit diesen\n"
+"umgegangen werden soll.\n"
+"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"
@@ -19616,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:991
+#: 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:995
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "Pull mit Rebase"
 
-#: builtin/pull.c:996
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19640,7 +19942,7 @@ msgstr ""
 "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
 "Spule Ihr Arbeitsverzeichnis von Commit %s vor."
 
-#: builtin/pull.c:1027
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19657,15 +19959,25 @@ msgstr ""
 "$ git reset --hard\n"
 "zur Wiederherstellung aus."
 
-#: builtin/pull.c:1042
+#: 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:1046
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1104
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Kann nicht zu mehreren Branches vorspulen."
+
+#: 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:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen "
@@ -19733,7 +20045,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<Name-des-Remote-Branches>\n"
 
-#: builtin/push.c:194
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -19747,13 +20059,20 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:202
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "Der aktuelle Branch %s hat mehrere Upstream-Branches, \"push\" verweigert."
 
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Sie haben keine Refspec für \"push\" angegeben, und push.default ist "
+"\"nothing\"."
+
+#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -19764,14 +20083,7 @@ msgstr ""
 "Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n"
 "Remote-Branch zu aktualisieren."
 
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"Sie haben keine Refspec für \"push\" angegeben, und push.default ist "
-"\"nothing\"."
-
-#: builtin/push.c:267
+#: builtin/push.c:258
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19785,7 +20097,7 @@ msgstr ""
 "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
 "für weitere Details."
 
-#: builtin/push.c:273
+#: builtin/push.c:264
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -19799,7 +20111,7 @@ msgstr ""
 "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
 "für weitere Details."
 
-#: builtin/push.c:279
+#: builtin/push.c:270
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -19818,13 +20130,13 @@ msgstr ""
 "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
 "für weitere Details."
 
-#: builtin/push.c:286
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Aktualisierungen wurden zurückgewiesen, weil das Tag bereits\n"
 "im Remote-Repository existiert."
 
-#: builtin/push.c:289
+#: builtin/push.c:280
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -19834,7 +20146,7 @@ msgstr ""
 "das kein Commit ist, oder es auf ein solches Objekt zeigen lassen, ohne\n"
 "die Option '--force' zu verwenden.\n"
 
-#: builtin/push.c:294
+#: builtin/push.c:285
 msgid ""
 "Updates were rejected because the tip of the remote-tracking\n"
 "branch has been updated since the last checkout. You may want\n"
@@ -19846,103 +20158,99 @@ msgstr ""
 "diese Änderungen vielleicht lokal integrieren (z. B. 'git pull ...') bevor\n"
 "Sie die Änderungen erzwingen.\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Push nach %s\n"
 
-#: builtin/push.c:371
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
 
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "Repository"
 
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
 msgstr "alle Referenzen versenden"
 
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr "alle Referenzen spiegeln"
 
-#: builtin/push.c:557
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "Referenzen löschen"
 
-#: builtin/push.c:558
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)"
 
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "Aktualisierung erzwingen"
 
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "<Referenzname>:<Erwartungswert>"
 
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
 msgid "require old value of ref to be at this value"
 msgstr "Referenz muss sich auf dem angegebenen Wert befinden"
 
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
 msgid "require remote updates to be integrated locally"
 msgstr "Aktualisierungen des Remote müssen lokal integriert werden"
 
-#: builtin/push.c:569
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "rekursiven \"push\" von Submodulen steuern"
 
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
 msgid "use thin pack"
 msgstr "kleinere Pakete verwenden"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "'receive pack' Programm"
 
-#: builtin/push.c:573
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "Upstream für \"git pull/status\" setzen"
 
-#: builtin/push.c:576
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "lokal gelöschte Referenzen entfernen"
 
-#: builtin/push.c:578
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "\"pre-push hook\" umgehen"
 
-#: builtin/push.c:579
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "fehlende, aber relevante Tags versenden"
 
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
 msgstr "signiert \"push\" mit GPG"
 
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
 msgid "request atomic transaction on remote side"
 msgstr "Referenzen atomar versenden"
 
-#: builtin/push.c:601
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete ist inkompatibel mit --all, --mirror und --tags"
-
-#: builtin/push.c:603
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete kann nur mit Referenzen verwendet werden"
 
-#: builtin/push.c:623
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "ungültiges Repository '%s'"
 
-#: builtin/push.c:624
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -19964,27 +20272,15 @@ msgstr ""
 "\n"
 "    git push <Name>\n"
 
-#: builtin/push.c:639
-msgid "--all and --tags are incompatible"
-msgstr "--all und --tags sind inkompatibel"
-
-#: builtin/push.c:641
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all kann nicht mit Refspecs kombiniert werden"
 
-#: builtin/push.c:645
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror und --tags sind inkompatibel"
-
-#: builtin/push.c:647
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror kann nicht mit Refspecs kombiniert werden"
 
-#: builtin/push.c:650
-msgid "--all and --mirror are incompatible"
-msgstr "--all und --mirror sind inkompatibel"
-
-#: builtin/push.c:657
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben"
 
@@ -20038,83 +20334,82 @@ msgstr "Benötige zwei Commit-Bereiche."
 #: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<Präfix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<Datei>] (--empty | <Commit-Referenz1> [<Commit-Referenz2> "
-"[<Commit-Referenz3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<Datei>] (--empty | "
+"<Commit-Referenz1> [<Commit-Referenz2> [<Commit-Referenz3>]])"
 
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "resultierenden Index nach <Datei> schreiben"
 
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "nur den Index leeren"
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "Merge"
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
 msgid "perform a merge in addition to a read"
 msgstr "einen Merge, zusätzlich zum Lesen, ausführen"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
 msgid "3-way merge if no file level merging required"
 msgstr "3-Wege-Merge, wenn kein Merge auf Dateiebene erforderlich ist"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
 msgid "3-way merge in presence of adds and removes"
 msgstr "3-Wege-Merge bei Vorhandensein von hinzugefügten/entfernten Zeilen"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "genau wie -m, aber nicht zusammengeführte Einträge verwerfen"
 
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<Unterverzeichnis>/"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "das Verzeichnis in den Index unter <Unterverzeichnis>/ lesen"
 
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
 msgid "update working tree with merge result"
 msgstr "Arbeitsverzeichnis mit dem Ergebnis des Merges aktualisieren"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "explizit ignorierte Dateien zu überschreiben erlauben"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
 msgid "don't check the working tree after merging"
 msgstr "das Arbeitsverzeichnis nach dem Merge nicht prüfen"
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
 msgid "don't update the index or the work tree"
 msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
 msgid "skip applying sparse checkout filter"
 msgstr "Anwendung des Filters für partielles Auschecken überspringen"
 
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "unpack-trees protokollieren"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "Rückmeldungen unterdrücken"
 
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
 msgid "You need to resolve your current index first"
 msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
 
@@ -20137,194 +20432,44 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "Unbenutzbare TODO-Liste: '%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
 #, c-format
 msgid "could not create temporary %s"
 msgstr "Konnte temporäres Verzeichnis '%s' nicht erstellen."
 
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
 msgid "could not mark as interactive"
 msgstr "Markierung auf interaktiven Rebase fehlgeschlagen."
 
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
 msgid "could not generate todo list"
 msgstr "Konnte TODO-Liste nicht erzeugen."
 
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "Ein Basis-Commit muss mit --upstream oder --onto angegeben werden."
 
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<Optionen>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "behalte Commits, die leer beginnen"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "Commits mit leerer Beschreibung erlauben"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "Rebase auf Merge-Commits ausführen"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "originale Branch-Punkte der Cousins behalten"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "Commits verschieben, die mit squash!/fixup! beginnen"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "Commits signieren"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr ""
-"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "Rebase fortsetzen"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "Commit auslassen"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "die TODO-Liste bearbeiten"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "den aktuellen Patch anzeigen"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "Commit-IDs in der TODO-Liste verkürzen"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "Commit-IDs in der TODO-Liste erweitern"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "die TODO-Liste prüfen"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "fixup/squash-Zeilen umordnen"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "\"exec\"-Befehle in TODO-Liste einfügen"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "auf"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "Begrenzungscommit"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "Begrenzungscommit"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "squash onto"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "der Upstream-Commit"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-Name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "head-Name"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "Rebase-Strategie"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "Strategie-Optionen"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "Strategie-Optionen"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "wechseln zu"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "der Branch oder Commit zum Auschecken"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-Name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "onto-Name"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "Befehl"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "auszuführender Befehl"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s erfordert das Merge-Backend"
 
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "Konnte 'onto' nicht bestimmen: '%s'"
 
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "Ungültiges orig-head: '%s'"
 
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "Ignoriere ungültiges allow_rerere_autoupdate: '%s'"
 
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20340,7 +20485,7 @@ msgstr ""
 "Um abzubrechen und zurück zum Zustand vor \"git rebase\" zu gelangen,\n"
 "führen Sie \"git rebase --abort\" aus."
 
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
 #, c-format
 msgid ""
 "\n"
@@ -20360,16 +20505,16 @@ msgstr ""
 "Infolge dessen kann Git auf diesen Revisionen Rebase nicht\n"
 "ausführen."
 
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
 #, c-format
 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:1240
+#: builtin/rebase.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -20387,7 +20532,7 @@ msgstr ""
 "    git rebase '<Branch>'\n"
 "\n"
 
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -20401,189 +20546,186 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<Branch> %s\n"
 "\n"
 
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
 msgid "exec commands cannot contain newlines"
 msgstr "\"exec\"-Befehle können keine neuen Zeilen enthalten"
 
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
 msgid "empty exec command"
 msgstr "Leerer \"exec\"-Befehl."
 
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
 msgid "rebase onto given branch instead of upstream"
 msgstr "Rebase auf angegebenen Branch anstelle des Upstream-Branches ausführen"
 
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "Nutze die Merge-Basis von Upstream und Branch als die aktuelle Basis"
 
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
 msgid "allow pre-rebase hook to run"
 msgstr "Ausführung des pre-rebase-Hooks erlauben"
 
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
 msgid "be quiet. implies --no-stat"
 msgstr "weniger Ausgaben (impliziert --no-stat)"
 
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen"
+
+#: builtin/rebase.c:1035
 msgid "do not show diffstat of what changed upstream"
 msgstr ""
 "Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch verbergen"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "eine Signed-off-by Zeile zu jedem Commit hinzufügen"
 
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
 msgid "make committer date match author date"
 msgstr "Datum des Commit-Erstellers soll mit Datum des Autors übereinstimmen"
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
 msgid "ignore author date and use current date"
 msgstr "ignoriere Autor-Datum und nutze aktuelles Datum"
 
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
 msgid "synonym of --reset-author-date"
 msgstr "Synonym für --reset-author-date"
 
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
 msgid "passed to 'git apply'"
 msgstr "an 'git apply' übergeben"
 
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
 msgid "ignore changes in whitespace"
 msgstr "Whitespace-Änderungen ignorieren"
 
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
 msgid "cherry-pick all commits, even if unchanged"
 msgstr ""
 "Cherry-Pick auf alle Commits ausführen, auch wenn diese unverändert sind"
 
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
 msgid "continue"
 msgstr "fortsetzen"
 
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
 msgid "skip current patch and continue"
 msgstr "den aktuellen Patch auslassen und fortfahren"
 
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
 msgid "abort and check out the original branch"
 msgstr "abbrechen und den ursprünglichen Branch auschecken"
 
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
 msgid "abort but keep HEAD where it is"
 msgstr "abbrechen, aber HEAD an aktueller Stelle belassen"
 
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
 msgid "edit the todo list during an interactive rebase"
 msgstr "TODO-Liste während eines interaktiven Rebase bearbeiten"
 
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
 msgid "show the patch file being applied or merged"
 msgstr "den Patch, der gerade angewendet oder zusammengeführt wird, anzeigen"
 
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
 msgid "use apply strategies to rebase"
 msgstr "Strategien von 'git am' bei Rebase verwenden"
 
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
 msgid "use merging strategies to rebase"
 msgstr "Merge-Strategien beim Rebase verwenden"
 
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
 msgid "let the user edit the list of commits to rebase"
 msgstr "den Benutzer die Liste der Commits für den Rebase bearbeiten lassen"
 
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "(VERALTET) Versuche, Merges wiederherzustellen statt sie zu ignorieren"
 
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
 msgid "how to handle commits that become empty"
 msgstr "wie sollen Commits behandelt werden, die leer werden"
 
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "behalte Commits, die leer beginnen"
+
+#: builtin/rebase.c:1097
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "bei -i Commits verschieben, die mit squash!/fixup! beginnen"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
 msgid "add exec lines after each commit of the editable list"
 msgstr "exec-Zeilen nach jedem Commit der editierbaren Liste hinzufügen"
 
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
 msgid "allow rebasing commits with empty messages"
 msgstr "Rebase von Commits mit leerer Beschreibung erlauben"
 
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
 msgid "try to rebase merges instead of skipping them"
 msgstr "versuchen, Rebase mit Merges auszuführen, statt diese zu überspringen"
 
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
 msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr ""
-"'git merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen"
+msgstr "'merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen"
 
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
 msgid "use the given merge strategy"
 msgstr "angegebene Merge-Strategie verwenden"
 
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
 msgid "option"
 msgstr "Option"
 
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
 msgid "pass the argument through to the merge strategy"
 msgstr "Argument zur Merge-Strategie durchreichen"
 
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "Rebase auf alle erreichbaren Commits bis zum Root-Commit ausführen"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen"
+
+#: builtin/rebase.c:1128
 msgid "apply all changes, even those already present upstream"
 msgstr ""
 "alle Änderungen anwenden, auch jene, die bereits im Upstream-Branch "
 "vorhanden sind"
 
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
 msgid "It looks like 'git am' is in progress. Cannot rebase."
-msgstr "'git-am' scheint im Gange zu sein. Kann Rebase nicht durchführen."
-
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"'git rebase --preserve-merges' ist veraltet. Benutzen Sie stattdessen '--"
-"rebase-merges'."
+msgstr "'git am' scheint im Gange zu sein. Kann Rebase nicht durchführen."
 
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "'--keep-base' kann nicht mit '--onto' kombiniert werden"
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges wurde durch --rebase-merges ersetzt"
 
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "'--keep-base' kann nicht mit '--root' kombiniert werden"
-
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "'--root' kann nicht mit '--fork-point' kombiniert werden"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Kein Rebase im Gange?"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet "
 "werden."
 
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Kann HEAD nicht lesen"
 
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -20591,16 +20733,16 @@ msgstr ""
 "Sie müssen alle Merge-Konflikte editieren und diese dann\n"
 "mittels \"git add\" als aufgelöst markieren"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
 msgid "could not discard worktree changes"
 msgstr "Konnte Änderungen im Arbeitsverzeichnis nicht verwerfen."
 
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
 #, c-format
 msgid "could not move back to %s"
 msgstr "Konnte nicht zu %s zurückgehen."
 
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -20621,147 +20763,135 @@ msgstr ""
 "und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
 "etwas Schützenswertes vorhanden ist.\n"
 
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
 msgstr "Schalter `C' erwartet einen numerischen Wert."
 
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Unbekannter Modus: %s"
 
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy erfordert --merge oder --interactive"
 
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
+#: builtin/rebase.c:1463
+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:1772
+#: builtin/rebase.c:1476
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Unbekanntes Rebase-Backend: %s"
 
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec erfordert --exec oder --interactive"
 
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr ""
-"'--preserve-merges' kann nicht mit '--rebase-merges' kombiniert werden."
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"Fehler: '--preserve-merges' kann nicht mit '--reschedule-failed-exec' "
-"kombiniert werden."
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "Ungültiger Upstream '%s'"
 
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
 msgid "Could not create new root commit"
 msgstr "Konnte neuen Root-Commit nicht erstellen."
 
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "'%s': benötige genau eine Merge-Basis mit dem Branch"
 
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': benötige genau eine Merge-Basis"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "'%s' zeigt auf keinen gültigen Commit."
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
 #, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "fatal: Branch/Commit '%s' nicht gefunden"
+msgid "no such branch/commit '%s'"
+msgstr "Branch/Commit '%s' nicht gefunden"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2415
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "Referenz nicht gefunden: %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
 msgid "Could not resolve HEAD to a revision"
 msgstr "Konnte HEAD zu keinem Commit auflösen."
 
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
 msgid "Please commit or stash them."
 msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
 
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
 #, c-format
 msgid "could not switch to %s"
 msgstr "Konnte nicht zu %s wechseln."
 
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
 msgid "HEAD is up to date."
 msgstr "HEAD ist aktuell."
 
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Aktueller Branch %s ist auf dem neuesten Stand.\n"
 
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD ist aktuell, Rebase erzwungen."
 
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Aktueller Branch %s ist auf dem neuesten Stand, Rebase erzwungen.\n"
 
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
 
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Änderungen zu %s:\n"
 
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Änderungen von %s zu %s:\n"
 
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "Zunächst wird der Branch zurückgespult, um Ihre Änderungen darauf neu "
 "anzuwenden...\n"
 
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
 msgid "Could not detach HEAD"
 msgstr "Konnte HEAD nicht loslösen."
 
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Spule %s vor zu %s.\n"
 
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <Git-Verzeichnis>"
 
-#: builtin/receive-pack.c:1276
+#: 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"
@@ -20793,7 +20923,7 @@ msgstr ""
 "setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
 "'refuse'."
 
-#: builtin/receive-pack.c:1296
+#: 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"
@@ -20814,13 +20944,13 @@ msgstr ""
 "\n"
 "Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'."
 
-#: builtin/receive-pack.c:2479
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "weniger Ausgaben"
 
-#: builtin/receive-pack.c:2493
-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 ""
@@ -20844,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:699
+#: 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 ]"
 
@@ -20969,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"
@@ -20980,7 +21115,7 @@ msgstr ""
 #: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
-msgstr "unbekanntes Argument für Option --mirror: %s"
+msgstr "unbekanntes Argument für Option mirror: %s"
 
 #: builtin/remote.c:164
 msgid "fetch the remote branches"
@@ -21019,7 +21154,7 @@ msgstr ""
 "die Angabe von zu folgenden Branches kann nur mit dem Anfordern von "
 "Spiegelarchiven verwendet werden"
 
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
 #, c-format
 msgid "remote %s already exists."
 msgstr "externes Repository %s existiert bereits."
@@ -21029,25 +21164,30 @@ msgstr "externes Repository %s existiert bereits."
 msgid "Could not setup master '%s'"
 msgstr "Konnte symbolische Referenz für Hauptbranch von '%s' nicht einrichten"
 
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "unbehandeltes branch.%s.rebase=%s; 'true' wird angenommen"
+
+#: builtin/remote.c:366
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Konnte Fetch-Map für Refspec %s nicht bekommen"
 
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
 msgid "(matching)"
 msgstr "(übereinstimmend)"
 
-#: builtin/remote.c:466
+#: builtin/remote.c:472
 msgid "(delete)"
 msgstr "(lösche)"
 
-#: builtin/remote.c:655
+#: builtin/remote.c:660
 #, c-format
 msgid "could not set '%s'"
 msgstr "konnte '%s' nicht setzen"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:665
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -21058,17 +21198,17 @@ msgstr ""
 "\t%s:%d\n"
 "benennt jetzt das nicht existierende Remote-Repository '%s'"
 
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Remote-Repository nicht gefunden: '%s'"
 
-#: builtin/remote.c:710
+#: builtin/remote.c:715
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:735
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -21079,17 +21219,17 @@ msgstr ""
 "\t%s\n"
 "\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell."
 
-#: builtin/remote.c:770
+#: builtin/remote.c:775
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "Konnte '%s' nicht löschen"
 
-#: builtin/remote.c:804
+#: builtin/remote.c:809
 #, c-format
 msgid "creating '%s' failed"
 msgstr "Konnte '%s' nicht erstellen"
 
-#: builtin/remote.c:882
+#: builtin/remote.c:887
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -21105,118 +21245,118 @@ msgstr[1] ""
 "entfernt;\n"
 "um diese zu entfernen, benutzen Sie:"
 
-#: builtin/remote.c:896
+#: builtin/remote.c:901
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen"
 
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)"
 
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
 msgid " tracked"
 msgstr " gefolgt"
 
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)"
 
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "ungültiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausführen"
 
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "interaktiver Rebase auf Remote-Branch %s"
 
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "interaktiver Rebase (mit Merges) auf Remote-Branch %s"
 
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "Rebase auf Remote-Branch %s"
 
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
 #, c-format
 msgid " merges with remote %s"
 msgstr " führt mit Remote-Branch %s zusammen"
 
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
 #, c-format
 msgid "merges with remote %s"
 msgstr "führt mit Remote-Branch %s zusammen"
 
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    und mit Remote-Branch %s\n"
 
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
 msgid "create"
 msgstr "erstellt"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
 msgid "delete"
 msgstr "gelöscht"
 
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
 msgid "up to date"
 msgstr "aktuell"
 
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
 msgid "fast-forwardable"
 msgstr "vorspulbar"
 
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
 msgid "local out of date"
 msgstr "lokal nicht aktuell"
 
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s erzwingt Versandt nach %-*s (%s)"
 
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s versendet nach %-*s (%s)"
 
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s erzwingt Versand nach %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s versendet nach %s"
 
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
 msgid "do not query remotes"
 msgstr "keine Abfrage von Remote-Repositories"
 
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
 msgstr "* Remote-Repository %s"
 
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL zum Abholen: %s"
 
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
 msgid "(no URL)"
 msgstr "(keine URL)"
 
@@ -21224,25 +21364,25 @@ msgstr "(keine URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL zum Versenden: %s"
 
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Hauptbranch: %s"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
 msgid "(not queried)"
 msgstr "(nicht abgefragt)"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
 msgid "(unknown)"
 msgstr "(unbekannt)"
 
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -21250,162 +21390,166 @@ msgstr ""
 "  Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden "
 "sein):\n"
 
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Remote-Branch:%s"
 msgstr[1] "  Remote-Branches:%s"
 
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
 msgid " (status not queried)"
 msgstr " (Zustand nicht abgefragt)"
 
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Lokaler Branch konfiguriert für 'git pull':"
 msgstr[1] "  Lokale Branches konfiguriert für 'git pull':"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Lokale Referenzen werden von 'git push' gespiegelt"
 
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Lokale Referenz konfiguriert für 'git push'%s:"
 msgstr[1] "  Lokale Referenzen konfiguriert für 'git push'%s:"
 
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
 
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "entfernt refs/remotes/<Name>/HEAD"
 
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
 msgid "Cannot determine remote HEAD"
 msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
 
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen "
 "aus mit:"
 
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
 #, c-format
 msgid "Could not delete %s"
 msgstr "Konnte %s nicht entfernen"
 
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "keine gültige Referenz: %s"
 
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
 #, c-format
 msgid "Could not setup %s"
 msgstr "Konnte %s nicht einrichten"
 
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s wird unreferenziert!"
 
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s wurde unreferenziert!"
 
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
 #, c-format
 msgid "Pruning %s"
 msgstr "entferne veraltete Branches von %s"
 
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [würde veralteten Branch entfernen] %s"
 
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
 #, c-format
 msgid " * [pruned] %s"
 msgstr "* [veralteten Branch entfernt] %s"
 
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
 msgid "prune remotes after fetching"
 msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
 
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Remote-Repository '%s' nicht gefunden"
 
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
 msgid "add branch"
 msgstr "Branch hinzufügen"
 
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
 msgid "no remote specified"
 msgstr "kein Remote-Repository angegeben"
 
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
 msgid "query push URLs rather than fetch URLs"
 msgstr "nur URLs für Push ausgeben"
 
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
 msgid "return all URLs"
 msgstr "alle URLs ausgeben"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
 
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
 msgid "manipulate push URLs"
 msgstr "URLs für \"push\" manipulieren"
 
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
 msgid "add URL"
 msgstr "URL hinzufügen"
 
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
 msgid "delete URLs"
 msgstr "URLs löschen"
 
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
 msgid "--add --delete doesn't make sense"
 msgstr "--add und --delete können nicht gemeinsam verwendet werden"
 
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "ungültiges altes URL Format: %s"
 
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
 #, c-format
 msgid "No such URL found: %s"
 msgstr "URL nicht gefunden: %s"
 
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
 msgid "Will not delete all non-push URLs"
 msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
 
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
+
+#: builtin/repack.c:28
 msgid "git repack [<options>]"
 msgstr "git repack [<Optionen>]"
 
-#: builtin/repack.c:31
+#: builtin/repack.c:33
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -21414,148 +21558,153 @@ msgstr ""
 "--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n"
 "Konfiguration."
 
-#: builtin/repack.c:198
+#: builtin/repack.c:201
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 "Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n"
 "Remote-Repositories nicht starten."
 
-#: builtin/repack.c:270 builtin/repack.c:630
+#: 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:294
+#: 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:309
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "konnte Index für %s nicht öffnen"
 
-#: builtin/repack.c:368
+#: 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:401 builtin/repack.c:408 builtin/repack.c:413
+#: 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:460
+#: 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:516
+msgid "could not close refs snapshot tempfile"
+msgstr "konnte temporäre Referenzen-Snapshot-Datei nicht schließen"
+
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "alles in eine einzige Pack-Datei packen"
 
-#: builtin/repack.c:462
+#: 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:465
+#: 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:467
+#: 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:469
+#: 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:471
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "git-update-server-info nicht ausführen"
 
-#: builtin/repack.c:474
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "--local an git-pack-objects übergeben"
 
-#: builtin/repack.c:476
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "Bitmap-Index schreiben"
 
-#: builtin/repack.c:478
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "--delta-islands an git-pack-objects übergeben"
 
-#: builtin/repack.c:479
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "Datumsangabe"
 
-#: builtin/repack.c:480
+#: 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:482
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "mit -a, nicht erreichbare Objekte neu packen"
 
-#: builtin/repack.c:484
+#: 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:485 builtin/repack.c:491
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "Bytes"
 
-#: builtin/repack.c:486
+#: 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:488
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "die maximale Delta-Tiefe limitieren"
 
-#: builtin/repack.c:490
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "maximale Anzahl von Threads limitieren"
 
-#: builtin/repack.c:492
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "maximale Größe für jede Paketdatei"
 
-#: builtin/repack.c:494
+#: 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:496
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "dieses Paket nicht neu packen"
 
-#: builtin/repack.c:498
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "eine geometrische Progression mit Faktor <N> finden"
 
-#: builtin/repack.c:508
+#: 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:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen"
 
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable und -A sind inkompatibel"
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric ist inkompatibel mit -A, -a"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "Nichts Neues zum Packen."
 
-#: builtin/repack.c:669
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "benötigte Datei fehlt: %s"
 
-#: builtin/repack.c:671
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "konnte nicht löschen: %s"
@@ -21639,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 "
@@ -21708,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"
@@ -21741,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"
 
@@ -21813,147 +21956,139 @@ msgstr "Mit -l kann nur ein Muster angegeben werden"
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clean | forget <Pfad>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "saubere Auflösungen im Index registrieren"
 
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "'git rerere forget' ohne Pfade ist veraltet"
 
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
 #, c-format
 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:83
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Sie haben keinen gültigen HEAD."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD."
 
-#: builtin/reset.c:91
+#: 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:116
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ist jetzt bei %s"
 
-#: builtin/reset.c:195
+#: 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:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: 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:297
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "HEAD und Index umsetzen"
 
-#: builtin/reset.c:298
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "nur HEAD umsetzen"
 
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "HEAD umsetzen, aber lokale Änderungen behalten"
 
-#: builtin/reset.c:310
+#: 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:344
+#: 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:352
+#: 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:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}"
-
-#: builtin/reset.c:371
+#: 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:373
+#: 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:388
+#: 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:392
-msgid "-N can only be used with --mixed"
-msgstr "-N kann nur mit -mixed benutzt werden"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:"
 
-#: builtin/reset.c:416
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -21967,31 +22102,27 @@ msgstr ""
 "das zu verhindern. Setzen Sie die Konfigurationseinstellung reset.quiet\n"
 "auf \"true\", um das zum Standard zu machen.\n"
 
-#: builtin/reset.c:434
+#: 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:439
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: builtin/rev-list.c:538
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr ""
-"--exclude-promisor-objects und --missing können nicht kombiniert werden."
-
-#: builtin/rev-list.c:599
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "Das Filtern von Objekten erfordert --objects."
 
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr "rev-list unterstützt keine Anzeige von Notizen"
 
-#: builtin/rev-list.c:664
-msgid "marked counting is incompatible with --objects"
-msgstr "markiertes Zählen ist inkompatibel mit der Option --objects"
+#: builtin/rev-list.c:679
+#, 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>...]"
@@ -22010,6 +22141,18 @@ msgid "output in stuck long form"
 msgstr ""
 "Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')"
 
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "frühzeitiges Ende der Eingabe"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr "kein Verwendungstext vor dem `--' Separator angegeben"
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "Benötigte einen einzelnen Commit"
+
 #: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -22025,6 +22168,50 @@ msgstr ""
 "Führen Sie \"git rev-parse --parseopt -h\" für weitere Informationen bei "
 "erster Verwendung aus."
 
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir benötigt ein Argument"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "kein Git-Verzeichnis '%s'"
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "--git-path benötigt ein Argument"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "-n benötigt ein Argument"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "--path-format benötigt ein Argument"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "unbekanntes Argument für --path-format: %s"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "--default benötigt ein Argument"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "--prefix benötigt ein Argument"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "unbekannter Modus für --abbrev-ref: %s"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "unbekannter Modus für --show-object-format: %s"
+
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<Optionen>] <Commit-Angabe>..."
@@ -22099,15 +22286,19 @@ msgstr "Commit-Namen anhängen"
 msgid "preserve initially empty commits"
 msgstr "ursprüngliche, leere Commits erhalten"
 
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "Commits mit leerer Beschreibung erlauben"
+
 #: builtin/revert.c:129
 msgid "keep redundant, empty commits"
 msgstr "redundante, leere Commits behalten"
 
-#: builtin/revert.c:237
+#: builtin/revert.c:241
 msgid "revert failed"
 msgstr "\"revert\" fehlgeschlagen"
 
-#: builtin/revert.c:250
+#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "\"cherry-pick\" fehlgeschlagen"
 
@@ -22159,74 +22350,73 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "die folgende Datei hat lokale Änderungen:"
 msgstr[1] "die folgenden Dateien haben lokale Änderungen:"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "keine gelöschten Dateien auflisten"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "nur aus dem Index entfernen"
 
-#: builtin/rm.c:246
+#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "die \"up-to-date\" Prüfung überschreiben"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "rekursives Entfernen erlauben"
 
-#: builtin/rm.c:249
+#: builtin/rm.c:250
 msgid "exit with a zero status even if nothing matched"
 msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde"
 
-#: builtin/rm.c:283
+#: builtin/rm.c:285
 msgid "No pathspec was given. Which files should I remove?"
 msgstr ""
 "Es wurde keine Pfadspezifikation angegeben. Welche Dateien sollen entfernt "
 "werden?"
 
-#: builtin/rm.c:310
+#: builtin/rm.c:315
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder\n"
 "benutzen Sie \"stash\", um fortzufahren."
 
-#: builtin/rm.c:331
+#: builtin/rm.c:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "'%s' wird nicht ohne -r rekursiv entfernt"
 
-#: builtin/rm.c:379
+#: builtin/rm.c:385
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: konnte %s nicht löschen"
 
 #: builtin/send-pack.c:20
 msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-"  --all and explicit <ref> specification are mutually exclusive."
+"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=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<Host>:]<Verzeichnis> "
-"[<Referenz>...]\n"
-"  --all und die explizite Angabe einer <Referenz> schließen sich gegenseitig "
-"aus."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [<Host>:]<Verzeichnis> (--all | <Referenz>...)"
 
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "Name des Remote-Repositories"
 
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "zustandsloses RPC-Protokoll verwenden"
 
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "Referenzen von der Standard-Eingabe lesen"
 
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "Status des Remote-Helpers ausgeben"
 
@@ -22284,21 +22474,21 @@ msgstr "Feld"
 msgid "group by field"
 msgstr "Gruppieren nach Feld"
 
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
 msgid "too many arguments given outside repository"
 msgstr "zu viele Argumente außerhalb des Repositories angegeben"
 
 #: builtin/show-branch.c:13
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<Wann>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]"
+"                [--current] [--color[=<Wann>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]"
 
 #: builtin/show-branch.c:17
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -22311,116 +22501,109 @@ msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "ignoriere %s; kann nicht mehr als %d Referenz behandeln"
 msgstr[1] "ignoriere %s; kann nicht mehr als %d Referenzen behandeln"
 
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
 #, c-format
 msgid "no matching refs with %s"
 msgstr "keine übereinstimmenden Referenzen mit %s"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
 msgid "show remote-tracking and local branches"
 msgstr "Remote-Tracking und lokale Branches anzeigen"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
 msgid "show remote-tracking branches"
 msgstr "Remote-Tracking-Branches anzeigen"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
 msgid "color '*!+-' corresponding to the branch"
 msgstr "'*!+-' entsprechend des Branches einfärben"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
 msgid "show <n> more commits after the common ancestor"
 msgstr "<n> weitere Commits nach dem gemeinsamen Vorgänger-Commit anzeigen"
 
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
 msgid "synonym to more=-1"
 msgstr "Synonym für more=-1"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
 msgid "suppress naming strings"
 msgstr "Namen unterdrücken"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
 msgid "include the current branch"
 msgstr "den aktuellen Branch einbeziehen"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
 msgid "name commits with their object names"
 msgstr "Commits nach ihren Objektnamen benennen"
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
 msgid "show possible merge bases"
 msgstr "mögliche Merge-Basen anzeigen"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
 msgid "show refs unreachable from any other ref"
 msgstr ""
 "Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen"
 
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
 msgid "show commits in topological order"
 msgstr "Commits in topologischer Ordnung anzeigen"
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
 msgid "show only commits not on the first branch"
 msgstr "nur Commits anzeigen, die sich nicht im ersten Branch befinden"
 
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
 msgid "show merges reachable from only one tip"
 msgstr "Merges anzeigen, die nur von einem Branch aus erreichbar sind"
 
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
 msgid "topologically sort, maintaining date order where possible"
 msgstr "topologische Sortierung, Beibehaltung Datumsordnung wo möglich"
 
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
 msgid "<n>[,<base>]"
 msgstr "<n>[,<Basis>]"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
 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:711
-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:735
+#: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "keine Branches angegeben, und HEAD ist ungültig"
 
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
 msgid "--reflog option needs one branch name"
 msgstr "die Option --reflog benötigt einen Branchnamen"
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "nur %d Eintrag kann zur selben Zeit angezeigt werden."
 msgstr[1] "nur %d Einträge können zur selben Zeit angezeigt werden."
 
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
 #, c-format
 msgid "no such ref %s"
 msgstr "Referenz nicht gefunden: %s"
 
-#: builtin/show-branch.c:831
+#: 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:835
+#: 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:838
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "kann Commit %s (%s) nicht finden"
@@ -22489,80 +22672,123 @@ 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:227
+#: builtin/sparse-checkout.c:176
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"Verzeichnis '%s' enthält unversionierte Dateien, aber ist nicht innerhalb "
+"des partiellen Checkouts im Cone-Modus"
+
+#: 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: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:268
+#: 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:270
+#: 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:290
+#: 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:310
+#: 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:312
+#: 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:340
-msgid "failed to modify sparse-index config"
-msgstr "Verändern der Konfiguration für Sparse-Index fehlgeschlagen"
-
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "Fehler beim Öffnen von '%s'"
 
-#: builtin/sparse-checkout.c:419
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr "konnte Pfad '%s' nicht normalisieren"
 
-#: builtin/sparse-checkout.c:431
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <Muster>)"
-
-#: builtin/sparse-checkout.c:456
+#: 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:510 builtin/sparse-checkout.c:534
+#: 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:579
+#: 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:594
-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: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:613
+#: 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:644
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "Fehler während der Aktualisierung des Arbeitsverzeichnisses."
 
@@ -22586,28 +22812,28 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<Stash>]"
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <Branch> [<Stash>]"
 
-#: builtin/stash.c:29 builtin/stash.c:70
-msgid "git stash clear"
-msgstr "git stash clear"
-
 #: 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 builtin/stash.c:87
+#: 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
@@ -22632,6 +22858,14 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <Nachricht>]\n"
 "          [--] [<Pfadspezifikation>...]]"
 
+#: builtin/stash.c:87
+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] [<Nachricht>]"
+
 #: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
@@ -22655,7 +22889,7 @@ msgstr "'%s' ist kein gültiger Referenzname."
 msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear mit Parametern ist nicht implementiert"
 
-#: builtin/stash.c:431
+#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -22667,169 +22901,186 @@ msgstr ""
 "            %s -> %s\n"
 "         um Platz zu schaffen.\n"
 
-#: builtin/stash.c:492
+#: builtin/stash.c:508
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "Kann Stash nicht anwenden, solange ein Merge im Gange ist"
 
-#: builtin/stash.c:503
+#: builtin/stash.c:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "Konnte keinen Diff erzeugen %s^!."
 
-#: builtin/stash.c:510
+#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
 
-#: builtin/stash.c:516
+#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "Konnte Index-Verzeichnis nicht speichern"
 
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen."
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Führe %s mit %s zusammen"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "Index wurde nicht aus dem Stash zurückgeladen."
 
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen."
+
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "Versuche Index wiederherzustellen."
 
-#: builtin/stash.c:635
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s (%s) gelöscht"
 
-#: builtin/stash.c:638
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Konnte Stash-Eintrag nicht löschen"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' ist keine Stash-Referenz"
 
-#: builtin/stash.c:701
+#: 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:724
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "Kein Branchname spezifiziert"
 
-#: builtin/stash.c:808
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "Parsen der Tree-Objekte fehlgeschlagen"
 
-#: builtin/stash.c:819
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "Entpacken der Tree-Objekte fehlgeschlagen"
 
-#: builtin/stash.c:839
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "unversionierte Dateien in Stash einbeziehen"
 
-#: builtin/stash.c:842
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "nur unversionierte Dateien im Stash anzeigen"
 
-#: builtin/stash.c:932 builtin/stash.c:969
+#: 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:950 builtin/stash.c:1606 builtin/stash.c:1671
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "Stash-Beschreibung"
 
-#: builtin/stash.c:960
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" erwartet ein Argument <Commit>"
 
-#: builtin/stash.c:1175
+#: 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:1275
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "Sie haben bisher noch keinen initialen Commit"
 
-#: builtin/stash.c:1302
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "Kann den aktuellen Zustand des Index nicht speichern"
 
-#: builtin/stash.c:1311
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "Kann die unversionierten Dateien nicht speichern"
 
-#: builtin/stash.c:1322 builtin/stash.c:1331
+#: 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:1359
+#: 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:1408
+#: 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:1426
+#: 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:1441
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "Keine lokalen Änderungen zum Speichern"
 
-#: builtin/stash.c:1448
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "Kann \"stash\" nicht initialisieren"
 
-#: builtin/stash.c:1463
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "Kann den aktuellen Status nicht speichern"
 
-#: builtin/stash.c:1468
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Arbeitsverzeichnis und Index-Status %s gespeichert."
 
-#: builtin/stash.c:1558
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
 
-#: builtin/stash.c:1597 builtin/stash.c:1662
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "behalte Index"
 
-#: builtin/stash.c:1599 builtin/stash.c:1664
+#: 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:1600 builtin/stash.c:1665
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "weniger Ausgaben"
 
-#: builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "unversionierte Dateien in Stash einbeziehen"
 
-#: builtin/stash.c:1604 builtin/stash.c:1669
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "ignorierte Dateien einbeziehen"
 
-#: builtin/stash.c:1704
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -22855,40 +23106,49 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
 
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424
+#: 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"
 
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "'submodule--helper print-default-remote' erwartet keine Argumente."
 
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
 
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+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:1859
 msgid "alternative anchor for relative paths"
 msgstr "Alternativer Anker für relative Pfade"
 
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:410
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:520
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Betrete '%s'\n"
 
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -22897,7 +23157,7 @@ msgstr ""
 "run_command gab nicht-Null Status für '%s' zurück.\n"
 "."
 
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:545
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -22909,187 +23169,173 @@ msgstr ""
 "nicht-Null Status zurück.\n"
 "."
 
-#: builtin/submodule--helper.c:566
+#: builtin/submodule--helper.c:561
 msgid "suppress output of entering each submodule command"
 msgstr "Ausgaben beim Betreten eines Submodul-Befehls unterdrücken"
 
-#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
-#: builtin/submodule--helper.c:1488
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
 msgid "recurse into nested submodules"
 msgstr "Rekursion in verschachtelte Submodule durchführen"
 
-#: builtin/submodule--helper.c:573
+#: builtin/submodule--helper.c:568
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <Befehl>"
 
-#: builtin/submodule--helper.c:600
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n"
-"Repository sein eigenes verbindliches Upstream-Repository ist."
-
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:642
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr ""
 "Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration."
 
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:646
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n"
 
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:656
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n"
 
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:663
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n"
 "Konfiguration."
 
-#: builtin/submodule--helper.c:710
+#: builtin/submodule--helper.c:685
 msgid "suppress output for initializing a submodule"
 msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
 
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<Optionen>] [<Pfad>]"
 
-#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden"
 
-#: builtin/submodule--helper.c:836
+#: builtin/submodule--helper.c:811
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "Konnte HEAD-Referenz nicht innerhalb des Submodul-Pfads '%s' auflösen."
 
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "Fehler bei Rekursion in Submodul '%s'."
 
-#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "Ausgabe des Submodul-Status unterdrücken"
 
-#: builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:863
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr ""
 "den Commit benutzen, der im Index gespeichert ist, statt den im Submodul HEAD"
 
-#: builtin/submodule--helper.c:894
+#: builtin/submodule--helper.c:869
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:918
+#: builtin/submodule--helper.c:893
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <Pfad>"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:965
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s(blob)->%s(submodule)"
 
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:968
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(submodule)->%s(blob)"
 
-#: builtin/submodule--helper.c:1006
+#: builtin/submodule--helper.c:981
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1056
+#: builtin/submodule--helper.c:1031
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "Hash eines Objektes von '%s' konnte nicht erzeugt werden"
 
-#: builtin/submodule--helper.c:1060
+#: builtin/submodule--helper.c:1035
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "unerwarteter Modus %o\n"
 
-#: builtin/submodule--helper.c:1301
+#: builtin/submodule--helper.c:1276
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr ""
 "benutze den Commit, der im Index gespeichert ist, statt vom Submodul HEAD"
 
-#: builtin/submodule--helper.c:1303
-msgid "to compare the commit in the index with that in the submodule HEAD"
-msgstr "um den Commit aus dem Index mit dem im Submodul HEAD zu vergleichen"
+#: builtin/submodule--helper.c:1278
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "den Commit aus dem Index mit dem im Submodul HEAD vergleichen"
 
-#: builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1280
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr ""
 "überspringe Submodule, wo der 'ignore_config' Wert auf 'all' gesetzt ist"
 
-#: builtin/submodule--helper.c:1307
+#: builtin/submodule--helper.c:1282
 msgid "limit the summary size"
 msgstr "Größe der Zusammenfassung begrenzen"
 
-#: builtin/submodule--helper.c:1312
+#: builtin/submodule--helper.c:1287
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [<Optionen>] [<Commit>] [--] [<Pfad>]"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1311
 msgid "could not fetch a revision for HEAD"
 msgstr "konnte keinen Commit für HEAD holen"
 
-#: builtin/submodule--helper.c:1341
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached und --files schließen sich gegenseitig aus"
-
-#: builtin/submodule--helper.c:1408
+#: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Synchronisiere Submodul-URL für '%s'\n"
 
-#: builtin/submodule--helper.c:1414
+#: builtin/submodule--helper.c:1379
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "Fehler beim Registrieren der URL für Submodul-Pfad '%s'"
 
-#: builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c:1393
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "Fehler beim Lesen des Standard-Remote-Repositories für Submodul '%s'"
 
-#: builtin/submodule--helper.c:1439
+#: builtin/submodule--helper.c:1404
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "Fehler beim Aktualisieren des Remote-Repositories für Submodul '%s'"
 
-#: builtin/submodule--helper.c:1486
+#: builtin/submodule--helper.c:1451
 msgid "suppress output of synchronizing submodule url"
 msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken"
 
-#: builtin/submodule--helper.c:1493
+#: builtin/submodule--helper.c:1458
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]"
 
-#: builtin/submodule--helper.c:1547
+#: 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:1559
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23098,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:1567
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Verzeichnis '%s' bereinigt.\n"
 
-#: builtin/submodule--helper.c:1569
+#: 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:1580
+#: 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:1596
+#: 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:1625
+#: 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:1626
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "alle Submodule austragen"
 
-#: builtin/submodule--helper.c:1631
+#: 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:1645
+#: 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:1714
+#: 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"
@@ -23153,46 +23399,69 @@ msgstr ""
 "submodule.alternateErrorStrategy auf 'info' oder klone mit der Option\n"
 "'--reference-if-able' statt '--reference'."
 
-#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756
+#: 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:1792
+#: 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:1799
+#: 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:1823
+#: 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: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:1818
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "Verzeichnis ist nicht leer: '%s'"
+
+#: 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:1862
 msgid "where the new submodule will be cloned to"
 msgstr "Pfad für neues Submodul"
 
-#: builtin/submodule--helper.c:1826
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "Name des neuen Submoduls"
 
-#: builtin/submodule--helper.c:1829
+#: 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:1837
+#: 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:1840 builtin/submodule--helper.c:2349
+#: 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:1842 builtin/submodule--helper.c:2351
+#: 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:1849
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -23202,110 +23471,187 @@ msgstr ""
 "<Repository>] [--name <Name>] [--depth <Tiefe>] [--single-branch] --url "
 "<URL> --path <Pfad>"
 
-#: builtin/submodule--helper.c:1874
-#, 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:1885
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen."
-
-#: builtin/submodule--helper.c:1889
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "Verzeichnis ist nicht leer: '%s'"
-
-#: builtin/submodule--helper.c:1901
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
-
-#: builtin/submodule--helper.c:1937
+#: 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:1941
+#: 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:2042
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Submodul-Pfad '%s' nicht initialisiert"
 
-#: builtin/submodule--helper.c:2046
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Meinten Sie vielleicht 'update --init'?"
 
-#: builtin/submodule--helper.c:2076
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Überspringe nicht zusammengeführtes Submodul %s"
 
-#: builtin/submodule--helper.c:2105
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Ãœberspringe Submodul '%s'"
 
-#: builtin/submodule--helper.c:2255
+#: 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:2266
+#: 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:2328 builtin/submodule--helper.c:2574
+#: 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: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: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: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:2409
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Submodul-Pfad '%s': '%s' ausgecheckt\n"
+
+#: 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:2417
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Submodul-Pfad '%s': zusammengeführt in '%s'\n"
+
+#: 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: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 "
+"anzufordern:"
+
+#: 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 ""
+"\"fetch\" in Submodul-Pfad '%s' ausgeführt, aber enthielt nicht %s. Direktes "
+"Anfordern dieses Commits ist fehlgeschlagen."
+
+#: 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:2331
+#: 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:2335
+#: 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:2341
+#: 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:2344
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "Parallele Ausführungen"
 
-#: builtin/submodule--helper.c:2346
+#: 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:2347
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "keine Fortschrittsanzeige beim Klonen"
 
-#: builtin/submodule--helper.c:2358
+#: 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:2371
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
-msgstr "Fehlerhafter Wert für --update Parameter"
+msgstr "Fehlerhafter Wert für update Parameter"
+
+#: 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:2567
+msgid "force checkout updates"
+msgstr "Checkout-Aktualisierungen erzwingen"
 
-#: builtin/submodule--helper.c:2419
+#: 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: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:2572
+msgid "depth for shallow fetch"
+msgstr "Tiefe des Abrufens mit unvollständiger Historie (shallow)"
+
+#: builtin/submodule--helper.c:2582
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2583
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 vom übergeordneten Projekt erwartet"
+
+#: builtin/submodule--helper.c:2585
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2586
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 vom HEAD des Submoduls"
+
+#: 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:2663
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23314,86 +23660,192 @@ 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:2542
+#: 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:2575
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "Rekursion in Submodule durchführen"
 
-#: builtin/submodule--helper.c:2581
+#: 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:2637
+#: 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:2640
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr "Konfiguration in der .gitmodules-Datei entfernen"
 
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <name> [<Wert>]"
 
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <Name>"
 
-#: builtin/submodule--helper.c:2647
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2666 git-submodule.sh:150
-#, sh-format
+#: 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:2682
+#: 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:2686
+#: 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:2719
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr "Standard-Tracking-Branch auf master setzen"
 
-#: builtin/submodule--helper.c:2721
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "Standard-Tracking-Branch setzen"
 
-#: builtin/submodule--helper.c:2725
+#: 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:2726
+#: 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:2733
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "Option --branch oder --default erforderlich"
 
-#: builtin/submodule--helper.c:2736
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch und --default schließen sich gegenseitig aus"
+#: 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: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: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: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 ""
+"Wenn Sie das lokale Git-Verzeichnis wiederverwenden wollen, anstatt erneut "
+"von\n"
+"  %s\n"
+"zu klonen, benutzen Sie die Option '--force'. Wenn das lokale Git-"
+"Verzeichnis\n"
+"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: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:2793 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3110
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "kann Submodul '%s' nicht auschecken"
+
+#: builtin/submodule--helper.c:3149
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Hinzufügen von Submodul '%s' fehlgeschlagen"
+
+#: 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:3222
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' existiert bereits im Index"
+
+#: 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:3254
+msgid "branch of repository to add as submodule"
+msgstr "Branch des Repositories zum Hinzufügen als Submodul"
+
+#: 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:3257
+msgid "print only error messages"
+msgstr "nur Fehlermeldungen ausgeben"
+
+#: builtin/submodule--helper.c:3261
+msgid "borrow the objects from reference repositories"
+msgstr "die Objekte von Referenz-Repositories ausleihen"
+
+#: builtin/submodule--helper.c:3263
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"legt den Namen des Submoduls auf die angegebene Zeichenkette fest, statt "
+"standardmäßig dessen Pfad zu nehmen"
+
+#: 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: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: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:3341
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' ist kein gültiger Submodul-Name"
+
+#: 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:2799
+#: 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"
@@ -23419,21 +23871,21 @@ msgstr "symbolische Referenzen löschen"
 msgid "shorten ref output"
 msgstr "verkürzte Ausgabe der Referenzen"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "Grund"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr "Grund für die Aktualisierung"
 
 #: builtin/tag.c:25
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+"        <tagname> [<head>]"
 msgstr ""
-"git tag [-a | -s | -u <Schlüssel-id>] [-f] [-m <Beschreibung> | -F <Datei>]\n"
-"\t\t<Tagname> [<Commit>]"
+"git tag [-a | -s | -u <Schlüssel-ID>] [-f] [-m <Beschreibung> | -F <Datei>]\n"
+"        <Tagname> [<Commit>]"
 
 #: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
@@ -23443,12 +23895,12 @@ msgstr "git tag -d <Tagname>..."
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
 "[<pattern>...]"
 msgstr ""
 "git tag -l [-n[<Nummer>]] [--contains <Commit>] [--no-contains <Commit>] [--"
 "points-at <Objekt>]\n"
-"\t\t[--format=<format>] [--merged <Commit>] [--no-merged <Commit>] "
+"        [--format=<format>] [--merged <Commit>] [--no-merged <Commit>] "
 "[<Muster>...]"
 
 #: builtin/tag.c:30
@@ -23493,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"
@@ -23511,134 +23963,111 @@ 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:328
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "keine Tag-Beschreibung?"
 
-#: builtin/tag.c:335
+#: 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"
 
-#: builtin/tag.c:446
+#: builtin/tag.c:444
 msgid "list tag names"
 msgstr "Tagnamen auflisten"
 
-#: builtin/tag.c:448
+#: builtin/tag.c:446
 msgid "print <n> lines of each tag message"
 msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen"
 
-#: builtin/tag.c:450
+#: builtin/tag.c:448
 msgid "delete tags"
 msgstr "Tags löschen"
 
-#: builtin/tag.c:451
+#: builtin/tag.c:449
 msgid "verify tags"
 msgstr "Tags überprüfen"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:451
 msgid "Tag creation options"
 msgstr "Optionen für Erstellung von Tags"
 
-#: builtin/tag.c:455
+#: builtin/tag.c:453
 msgid "annotated tag, needs a message"
 msgstr "annotiertes Tag, benötigt eine Beschreibung"
 
-#: builtin/tag.c:457
+#: builtin/tag.c:455
 msgid "tag message"
 msgstr "Tag-Beschreibung"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:457
 msgid "force edit of tag message"
 msgstr "Bearbeitung der Tag-Beschreibung erzwingen"
 
-#: builtin/tag.c:460
+#: builtin/tag.c:458
 msgid "annotated and GPG-signed tag"
 msgstr "annotiertes und GPG-signiertes Tag"
 
-#: builtin/tag.c:463
+#: builtin/tag.c:461
 msgid "use another key to sign the tag"
 msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren"
 
-#: builtin/tag.c:464
+#: builtin/tag.c:462
 msgid "replace the tag if exists"
 msgstr "das Tag ersetzen, wenn es existiert"
 
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "Reflog erstellen"
 
-#: builtin/tag.c:467
+#: builtin/tag.c:465
 msgid "Tag listing options"
 msgstr "Optionen für Auflistung der Tags"
 
-#: builtin/tag.c:468
+#: builtin/tag.c:466
 msgid "show tag list in columns"
 msgstr "Liste der Tags in Spalten anzeigen"
 
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
 msgid "print only tags that contain the commit"
 msgstr "nur Tags ausgeben, die diesen Commit beinhalten"
 
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that don't contain the commit"
 msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/tag.c:473
+#: builtin/tag.c:471
 msgid "print only tags that are merged"
 msgstr "nur Tags ausgeben, die gemerged wurden"
 
-#: builtin/tag.c:474
+#: builtin/tag.c:472
 msgid "print only tags that are not merged"
 msgstr "nur Tags ausgeben, die nicht gemerged wurden"
 
-#: builtin/tag.c:478
+#: builtin/tag.c:476
 msgid "print only tags of the object"
 msgstr "nur Tags von dem Objekt ausgeben"
 
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column und -n sind inkompatibel"
-
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "die Option -n ist nur im Listenmodus erlaubt"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "--contains ist nur im Listenmodus erlaubt"
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "--no-contains ist nur im Listenmodus erlaubt"
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "--points-at ist nur im Listenmodus erlaubt"
-
-#: builtin/tag.c:556
-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:567
-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:592
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' ist kein gültiger Tagname."
 
-#: builtin/tag.c:597
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "Tag '%s' existiert bereits"
 
-#: builtin/tag.c:628
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Tag '%s' aktualisiert (war %s)\n"
@@ -23652,214 +24081,209 @@ msgstr "Entpacke Objekte"
 msgid "failed to create directory %s"
 msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
 
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "Konnte Datei '%s' nicht erstellen"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "Konnte Datei '%s' nicht löschen"
 
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "Konnte Verzeichnis '%s' nicht löschen"
 
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Prüfe mtime in '%s' "
 
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 "Verzeichnisinformationen haben sich nach Hinzufügen einer neuen Datei nicht "
 "geändert"
 
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "Verzeichnisinformationen haben sich nach Hinzufügen eines neuen "
 "Verzeichnisses nicht geändert"
 
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geändert"
 
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "Verzeichnisinformationen haben sich nach Hinzufügen einer Datei in ein "
 "Unterverzeichnis geändert"
 
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 "Verzeichnisinformationen haben sich nach dem Löschen einer Datei nicht "
 "geändert"
 
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 "Verzeichnisinformationen haben sich nach dem Löschen eines Verzeichnisses "
 "nicht geändert"
 
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<Optionen>] [--] [<Datei>...]"
 
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr ""
 "Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "Aktualisierung: ignoriert Submodule"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "keine neuen Dateien ignorieren"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "fehlende Dateien im Arbeitsverzeichnis beachten"
 
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 "aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "Dateiinformationen aktualisieren"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<Modus>,<Objekt>,<Pfad>"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "den angegebenen Eintrag zum Commit vormerken"
 
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "diese Datei immer als unverändert betrachten"
 
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "\"assumed-unchanged\"-Bit löschen"
 
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "Dateien als \"index-only\" markieren"
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "\"skip-worktree\"-Bit löschen"
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
 msgid "do not touch index-only entries"
 msgstr "\"index-only\" Einträge überspringen"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "die Änderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-"
 "Datenbank hinzugefügt"
 
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "benannte Pfade löschen, auch wenn sie sich im Arbeitsverzeichnis befinden"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen"
 
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen"
 
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "Einträge von der Standard-Eingabe zum Commit vormerken"
 
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 "wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind"
 
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "die Aktionen in der Standard-Ausgabe ausgeben"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "Index-Datei in diesem Format schreiben"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "Splitting des Index aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr ""
 "prüfen, ob das Dateisystem einen Cache für unversionierte Dateien unterstützt"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 "Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "Index rausschreiben, auch wenn dieser nicht als geändert markiert ist"
 
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "Dateisystem-Monitor aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "Dateien als \"fsmonitor valid\" markieren"
 
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "\"fsmonitor valid\"-Bit löschen"
 
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -23867,7 +24291,7 @@ msgstr ""
 "core.splitIndex ist auf 'false' gesetzt; entfernen oder ändern Sie dies,\n"
 "wenn sie wirklich das Splitting des Index aktivieren möchten"
 
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -23875,7 +24299,7 @@ msgstr ""
 "core.splitIndex ist auf 'true' gesetzt; entfernen oder ändern Sie dies,\n"
 "wenn Sie wirklich das Splitting des Index deaktivieren möchten"
 
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -23883,11 +24307,11 @@ msgstr ""
 "core.untrackedCache ist auf 'true' gesetzt; entfernen oder ändern Sie dies,\n"
 "wenn Sie wirklich den Cache für unversionierte Dateien deaktivieren möchten"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Cache für unversionierte Dateien deaktiviert"
 
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -23896,23 +24320,23 @@ msgstr ""
 "dies,\n"
 "wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Cache für unversionierte Dateien für '%s' aktiviert"
 
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 "core.fsmonitor nicht gesetzt; setzen Sie es, wenn Sie den Dateisystem-"
 "Monitor\n"
 "wirklich aktivieren möchten"
 
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "Dateisystem-Monitor aktiviert"
 
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
@@ -23920,7 +24344,7 @@ msgstr ""
 "Monitor\n"
 "wirklich deaktivieren möchten."
 
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "Dateisystem-Monitor deaktiviert"
 
@@ -23937,19 +24361,19 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<Optionen>] --stdin [-z]"
 
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "diese Referenz löschen"
 
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
 msgstr "<Referenzname> aktualisieren, nicht den Verweis"
 
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "Standard-Eingabe hat durch NUL-Zeichen abgeschlossene Argumente"
 
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "Aktualisierungen von der Standard-Eingabe lesen"
 
@@ -23965,21 +24389,21 @@ msgstr "die Informationsdateien von Grund auf aktualisieren"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<Optionen>] <Verzeichnis>"
 
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
 msgid "quit after a single request/response exchange"
 msgstr "nach einem einzigen Request/Response-Austausch beenden"
 
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "direkt nach der initialen Angabe der Commits beenden"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "info/refs für git-http-backend übergeben"
 
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 "kein Versuch in <Verzeichnis>/.git/ wenn <Verzeichnis> kein Git-Verzeichnis "
 "ist"
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen"
 
@@ -24015,103 +24439,102 @@ msgstr "git verify-tag [-v | --verbose] [--format=<Format>] <Tag>..."
 msgid "print tag contents"
 msgstr "Tag-Inhalte ausgeben"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<Optionen>] <Pfad> [<Commit-Angabe>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<Optionen>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<Optionen>] <Pfad>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <Arbeitsverzeichnis> <neuer-Pfad>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<Optionen>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <Pfad>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:935
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "Fehler beim Löschen von '%s'"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "Entferne %s/%s: %s"
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
 msgid "report pruned working trees"
 msgstr "entfernte Arbeitsverzeichnisse ausgeben"
 
-#: builtin/worktree.c:151
+#: builtin/worktree.c:150
 msgid "expire working trees older than <time>"
 msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen"
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c:220
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existiert bereits"
 
-#: builtin/worktree.c:230
+#: builtin/worktree.c:229
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "nicht nutzbares Ziel des Arbeitsverzeichnisses '%s'"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, 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' 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:237
+#: builtin/worktree.c:236
 #, 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' 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:288
+#: builtin/worktree.c:287
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+msgid "initializing"
+msgstr "initialisiere"
+
+#: 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:424
+#: 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:433
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)"
 
-#: builtin/worktree.c:439
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)"
@@ -24138,142 +24561,138 @@ msgstr "das neue Arbeitsverzeichnis auschecken"
 msgid "keep the new working tree locked"
 msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
 
-#: builtin/worktree.c:493
+#: builtin/worktree.c:492 builtin/worktree.c:729
+msgid "reason for locking"
+msgstr "Sperrgrund"
+
+#: 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:496
+#: 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:504
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B und --detach schließen sich gegenseitig aus"
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "mit --lock hinzugefügt"
 
-#: builtin/worktree.c:565
+#: 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:682
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr "erweiterte Anmerkungen und Gründe anzeigen, falls vorhanden"
 
-#: builtin/worktree.c:684
+#: 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:693
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose und --porcelain schließen sich gegenseitig aus"
-
-#: builtin/worktree.c:720
-msgid "reason for locking"
-msgstr "Sperrgrund"
-
-#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
-#: builtin/worktree.c:963
+#: 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:734 builtin/worktree.c:767
+#: 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:739
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ist bereits gesperrt, Grund: %s"
 
-#: builtin/worktree.c:741
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ist bereits gesperrt"
 
-#: builtin/worktree.c:769
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' ist nicht gesperrt"
 
-#: builtin/worktree.c:810
+#: 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:818
+#: 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:841 builtin/worktree.c:965
+#: 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:846
+#: 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:859
+#: 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:861
+#: 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:864
+#: 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:869
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "Fehler beim Verschieben von '%s' nach '%s'"
 
-#: builtin/worktree.c:915
+#: 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:919
+#: 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:924
+#: 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:947
+#: 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:970
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -24283,26 +24702,26 @@ msgstr ""
 "Benutzen Sie 'remove -f -f' zum Ãœberschreiben oder entsperren Sie zuerst\n"
 "das Arbeitsverzeichnis."
 
-#: builtin/worktree.c:972
+#: 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:975
+#: 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:999
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "repariere: %s: %s"
 
-#: builtin/worktree.c:1002
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "Fehler: %s: %s"
@@ -24354,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"
@@ -24384,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"
@@ -24418,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:833
+#: 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:883
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "Kann %s nicht als eingebauten Befehl behandeln."
 
-#: git.c:896
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -24449,33 +24858,25 @@ msgstr ""
 "Verwendung: %s\n"
 "\n"
 
-#: git.c:916
+#: 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:928
+#: 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"
@@ -24501,65 +24902,31 @@ msgstr "test-tool serve-v2 [<Optionen>]"
 msgid "exit immediately after advertising capabilities"
 msgstr "direkt nach Anzeige der angebotenen Fähigkeiten beenden"
 
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "Socket/Pipe bereits in Benutzung: '%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "konnte Server nicht starten auf: '%s'"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "Daemon konnte nicht im Hintergrund erzeugt werden"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "waitpid fehlgeschlagen"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "Daemon ist noch nicht online"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "Fehler beim Starten des Daemons"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid ist verwirrt"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "Daemon ist noch nicht heruntergefahren"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
 msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
 msgstr "test-helper simple-ipc is-active    [<Name>] [<Optionen>]"
 
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
 msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
 msgstr "test-helper simple-ipc run-daemon   [<Name>] [<Threads>]"
 
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
 msgstr "test-helper simple-ipc start-daemon [<Name>] [<Threads>] [<max-wait>]"
 
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
 msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
 msgstr "test-helper simple-ipc stop-daemon  [<Name>] [<max-wait>]"
 
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
 msgid "test-helper simple-ipc send         [<name>] [<token>]"
 msgstr "test-helper simple-ipc send         [<Name>] [<Token>]"
 
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
 msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
 msgstr "test-helper simple-ipc sendbytes    [<Name>] [<bytecount>] [<Byte>]"
 
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
 msgid ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
@@ -24567,86 +24934,82 @@ msgstr ""
 "test-helper simple-ipc multiple     [<Name>] [<Threads>] [<bytecount>] "
 "[<batchsize>]"
 
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
 msgid "name or pathname of unix domain socket"
 msgstr "Name oder Pfadname des UNIX-Domain-Sockets"
 
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
 msgid "named-pipe name"
 msgstr "Name der benannten Pipe"
 
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
 msgid "number of threads in server thread pool"
 msgstr "Anzahl der Threads im Thread-Pool des Servers"
 
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
 msgid "seconds to wait for daemon to start or stop"
 msgstr "Sekunden, um auf Starten oder Stoppen des Daemons zu warten"
 
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
 msgid "number of bytes"
 msgstr "Anzahl von Bytes"
 
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
 msgid "number of requests per thread"
 msgstr "Anzahl der Anfragen pro Thread"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "byte"
 msgstr "Byte"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "ballast character"
 msgstr "Ballast-Zeichen"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "token"
 msgstr "Token"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "command token to send to the server"
 msgstr "Befehlstoken, der an den Server gesendet werden soll"
 
-#: http.c:399
+#: http.c:350
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "negativer Wert für http.postbuffer; benutze Standardwert %d"
 
-#: http.c:420
+#: http.c:371
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Kontrolle über Delegation wird mit cURL < 7.22.0 nicht unterstützt"
 
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
 msgstr ""
-"Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n"
-"nicht unterstützt."
+"Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.39.0 nicht "
+"unterstützt"
 
-#: http.c:910
+#: http.c:812
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "CURLSSLOPT_NO_REVOKE wird mit cURL < 7.44.0 nicht unterstützt."
 
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Protokollbeschränkungen werden mit cURL < 7.19.4 nicht unterstützt."
-
-#: http.c:1132
+#: http.c:1016
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "Nicht unterstütztes SSL-Backend '%s'. Unterstützte SSL-Backends:"
 
-#: http.c:1139
+#: http.c:1023
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 "Konnte SSL-Backend nicht zu '%s' setzen: cURL wurde ohne SSL-Backends gebaut."
 
-#: http.c:1143
+#: http.c:1027
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "Konnte SSL-Backend nicht zu '%s' setzen: bereits gesetzt"
 
-#: http.c:2035
+#: http.c:1876
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -24662,135 +25025,313 @@ msgstr ""
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "Ungültiges Quoting beim \"push-option\"-Wert: '%s'"
 
-#: remote-curl.c:307
+#: remote-curl.c:304
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs nicht gültig: Ist das ein Git-Repository?"
 
-#: remote-curl.c:408
+#: remote-curl.c:405
 msgid "invalid server response; expected service, got flush packet"
 msgstr "ungültige Antwort des Servers; Service erwartet, Flush-Paket bekommen"
 
-#: remote-curl.c:439
+#: remote-curl.c:436
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "ungültige Serverantwort; '%s' bekommen"
 
-#: remote-curl.c:499
+#: remote-curl.c:496
 #, c-format
 msgid "repository '%s' not found"
 msgstr "Repository '%s' nicht gefunden"
 
-#: remote-curl.c:503
+#: remote-curl.c:500
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Authentifizierung fehlgeschlagen für '%s'"
 
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+"auf '%s' kann nicht mit Konfiguration http.pinnedPubkey zugegriffen werden: "
+"%s"
+
+#: remote-curl.c:508
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "konnte nicht auf '%s' zugreifen: %s"
 
-#: remote-curl.c:513
+#: remote-curl.c:514
 #, c-format
 msgid "redirecting to %s"
 msgstr "Umleitung nach %s"
 
-#: remote-curl.c:642
+#: remote-curl.c:645
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "sollte kein EOF haben, wenn nicht behutsam mit EOF"
 
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr "Server sendete zustandslosen Separator"
+#: remote-curl.c:657
+msgid "remote server sent unexpected response end packet"
+msgstr "Remote Server sendete unerwartetes Antwort-Endpaket"
 
-#: remote-curl.c:724
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 "konnte nicht RPC-POST-Daten zurückspulen - Versuchen Sie http.postBuffer zu "
 "erhöhen"
 
-#: remote-curl.c:754
+#: remote-curl.c:755
 #, c-format
 msgid "remote-curl: bad line length character: %.4s"
 msgstr "remote-curl: ungültiges Zeichen für Zeilenlänge: %.4s"
 
-#: remote-curl.c:756
+#: remote-curl.c:757
 msgid "remote-curl: unexpected response end packet"
 msgstr "remote-curl: unerwartetes Antwort-Endpaket"
 
-#: remote-curl.c:832
+#: remote-curl.c:833
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC fehlgeschlagen; %s"
 
-#: remote-curl.c:872
+#: 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:987
+#: 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:991
+#: 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:1041
+#: remote-curl.c:1040
 #, c-format
 msgid "%d bytes of length header were received"
 msgstr "%d Bytes des Längen-Headers wurden empfangen"
 
-#: remote-curl.c:1043
+#: remote-curl.c:1042
 #, c-format
 msgid "%d bytes of body are still expected"
 msgstr "%d Bytes des Bodys werden noch erwartet"
 
-#: remote-curl.c:1132
+#: remote-curl.c:1131
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "Dumb HTTP-Transport unterstützt keine shallow-Funktionen"
 
-#: remote-curl.c:1147
+#: remote-curl.c:1146
 msgid "fetch failed."
 msgstr "\"fetch\" fehlgeschlagen."
 
-#: remote-curl.c:1193
+#: 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:1237 remote-curl.c:1243
+#: remote-curl.c:1236 remote-curl.c:1242
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "Protokollfehler: SHA-1/Referenz erwartet, '%s' bekommen"
 
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1254 remote-curl.c:1372
 #, c-format
 msgid "http transport does not support %s"
 msgstr "HTTP-Transport unterstützt nicht %s"
 
-#: remote-curl.c:1291
+#: remote-curl.c:1290
 msgid "git-http-push failed"
 msgstr "\"git-http-push\" fehlgeschlagen"
 
-#: remote-curl.c:1479
+#: remote-curl.c:1478
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: Verwendung: git remote-curl <Remote-Repository> [<URL>]"
 
-#: remote-curl.c:1511
+#: remote-curl.c:1510
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl: Fehler beim Lesen des Kommando-Streams von Git"
 
-#: remote-curl.c:1518
+#: remote-curl.c:1517
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: \"fetch\" ohne lokales Repository versucht"
 
-#: remote-curl.c:1559
+#: remote-curl.c:1558
 #, c-format
 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"
@@ -24807,11 +25348,11 @@ msgstr "Argumente"
 msgid "object filtering"
 msgstr "Filtern nach Objekten"
 
-#: parse-options.h:184
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "Verfallsdatum"
 
-#: parse-options.h:198
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "Kein Effekt (Rückwärtskompatibilität)"
 
@@ -24842,11 +25383,11 @@ msgid ""
 msgstr ""
 "Mit der Option --pathspec-from-file sind Pfade durch NUL-Zeichen getrennt"
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "key"
 msgstr "Schüssel"
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "sortiere nach diesem Feld"
 
@@ -24923,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 ""
@@ -25140,465 +25681,430 @@ 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"
 msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git"
 
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "'bisect run' fehlgeschlagen: kein Befehl angegeben."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "führe $command aus"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"'bisect run' fehlgeschlagen:\n"
-"Exit-Code $res von '$command' ist < 0 oder >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "'bisect run' kann nicht mehr fortgesetzt werden"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"'bisect run' fehlgeschlagen:\n"
-"'bisect-state $state' wurde mit Fehlerwert $res beendet"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "'bisect run' erfolgreich ausgeführt"
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -25640,98 +26146,17 @@ msgstr "Versuche einfachen Merge mit $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Einfacher Merge hat nicht funktioniert, versuche automatischen Merge."
 
-#: git-submodule.sh:179
-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."
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' ist bereits zum Commit vorgemerkt"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' ist bereits zum Commit vorgemerkt und ist kein Submodul"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' hat keinen Commit ausgecheckt"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "Füge existierendes Repository in '$sm_path' dem Index hinzu."
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Repository"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-"Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Remote-"
-"Repositories:"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-"  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"Wenn Sie das lokale Git-Verzeichnis wiederverwenden wollen, anstatt erneut "
-"von\n"
-"  $realrepo\n"
-"zu klonen, benutzen Sie die Option '--force'. Wenn das lokale Git-"
-"Verzeichnis\n"
-"nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n"
-"wählen Sie einen anderen Namen mit der Option '--name'."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Kann Submodul '$sm_path' nicht auschecken"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration."
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden."
 
-#: git-submodule.sh:578
+#: git-submodule.sh:411
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:416
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25740,483 +26165,61 @@ msgstr ""
 "Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n"
 "'$sm_path' nicht finden."
 
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen. Versuche "
-"$sha1 direkt anzufordern:"
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n"
-"enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen."
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' "
-"fehlgeschlagen"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
 
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Automatischen Stash angewendet."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Kann $stash_sha1 nicht speichern."
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"Anwendung des automatischen Stash resultierte in Konflikten.\n"
-"Ihre Änderungen sind im Stash sicher.\n"
-"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Führe Rebase aus ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-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"
-"Befehle:\n"
-"p, pick <Commit> = Commit verwenden\n"
-"r, reword <Commit> = Commit verwenden, aber Commit-Beschreibung bearbeiten\n"
-"e, edit <Commit> = Commit verwenden, aber zum Nachbessern anhalten\n"
-"s, squash <Commit> = Commit verwenden, aber mit vorherigem Commit vereinen\n"
-"f, fixup <Commit> = wie \"squash\", aber diese Commit-Beschreibung "
-"verwerfen\n"
-"x, exec <Commit> = Befehl (Rest der Zeile) mittels Shell ausführen\n"
-"d, drop <Commit> = Commit entfernen\n"
-"l, label <Label> = aktuellen HEAD mit Label versehen\n"
-"t, reset <Label> = HEAD zu einem Label umsetzen\n"
-"m, merge [-C <Commit> | -c <Commit>] <Label> [# <eineZeile>]\n"
-".       Merge-Commit mit der originalen Merge-Commit-Beschreibung erstellen\n"
-".       (oder die eine Zeile, wenn keine originale Merge-Commit-"
-"Beschreibung\n"
-".       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"
-"ausgeführt.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, 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 ""
-"Sie können den Commit nun nachbessern mit:\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Sobald Sie mit Ihren Änderungen zufrieden sind, führen Sie aus:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: kein Commit der gepickt werden kann"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Ungültiger Commit-Name: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Kann ersetzenden SHA-1 des aktuellen Commits nicht schreiben"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Spule vor zu $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Kann nicht zu $sha1 vorspulen"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Kann HEAD nicht auf $first_parent setzen"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "\"squash\" eines Merges ($sha1) zurückgewiesen."
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Fehler beim Wiederholen des Merges von $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Konnte $sha1 nicht picken"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Das ist Commit-Beschreibung #${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Commit-Beschreibung #${n} wird ausgelassen:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Das ist eine Kombination aus $count Commit."
-msgstr[1] "Das ist eine Kombination aus $count Commits."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Kann $fixup_msg nicht schreiben"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Das ist eine Kombination aus 2 Commits."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Konnte $sha1... ($rest) nicht anwenden"
-
-#: git-rebase--preserve-merges.sh:601
-#, 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 ""
-"Konnte Commit nicht nachbessern, nachdem dieser verwendet wurde: $sha1... "
-"$rest\n"
-"Das passierte sehr wahrscheinlich wegen einer leeren Commit-Beschreibung, "
-"oder\n"
-"weil der pre-commit Hook fehlschlug. Falls der pre-commit Hook fehlschlug,\n"
-"sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung ändern "
-"können."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Angehalten bei $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Kann nicht '$squash_style' ohne vorherigen Commit"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Führe aus: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Ausführung fehlgeschlagen: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert."
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Sie können das Problem beheben, und dann\n"
-"\n"
-"\tgit rebase --continue\n"
-"\n"
-"ausführen."
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, 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 ""
-"Ausführung erfolgreich: $rest\n"
-"Aber Änderungen in Index oder Arbeitsverzeichnis verblieben.\n"
-"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\".\n"
-"Führen Sie dann aus:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Unbekannter Befehl: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Bitte beheben Sie das, indem Sie 'git rebase --edit-todo' ausführen."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Erfolgreich Rebase ausgeführt und $head_name aktualisiert."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Konnte CHERRY_PICK_HEAD nicht löschen"
-
-#: git-rebase--preserve-merges.sh:807
-#, 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 ""
-"Es befinden sich zum Commit vorgemerkte Änderungen in Ihrem "
-"Arbeitsverzeichnis.\n"
-"Wenn diese Änderungen in den vorherigen Commit aufgenommen werden sollen,\n"
-"führen Sie aus:\n"
-"\n"
-"  git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Wenn daraus ein neuer Commit erzeugt werden soll, führen Sie aus:\n"
-"\n"
-"  git commit $gpg_sign_opt_quoted\n"
-"\n"
-"Im Anschluss führen Sie zum Fortfahren aus:\n"
-"\n"
-"  git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-"Fehler beim Versuch die Identität des Authors zum Verbessern des Commits zu\n"
-"finden"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Sie haben nicht committete Änderungen in Ihrem Arbeitsverzeichnis. Bitte\n"
-"committen Sie diese zuerst und führen Sie dann 'git rebase --continue' "
-"erneut\n"
-"aus."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Konnte Editor nicht ausführen."
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Konnte $switch_to nicht auschecken."
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Kein HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen."
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Konnte nicht als interaktiven Rebase markieren."
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)"
-msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Leere Commits sind auskommentiert."
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Konnte neu geschriebene Commits nicht initialisieren."
-
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 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
-msgid "Cannot rebase: You have unstaged changes."
-msgstr ""
-"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt "
-"sind."
-
-#: git-sh-setup.sh:224
+#: 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:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"Kann \"pull\" mit \"rebase\" nicht ausführen: Sie haben Änderungen, die "
-"nicht zum Commit vorgemerkt sind."
-
-#: git-sh-setup.sh:230
+#: 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:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"Rebase nicht möglich: Die Staging-Area beinhaltet nicht committete "
-"Änderungen."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Kann \"pull\" mit \"rebase\" nicht ausführen: Die Staging-Area beinhaltet "
-"nicht committete Änderungen."
-
-#: git-sh-setup.sh:249
+#: 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:253
+#: 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:373
+#: 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:378
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen."
 
@@ -26299,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"
@@ -26315,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"
@@ -26329,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"
@@ -26343,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"
@@ -26360,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"
@@ -26377,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"
@@ -26392,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"
@@ -26406,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"
@@ -26420,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"
@@ -26444,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"
@@ -26548,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:138
+#: 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:145 git-send-email.perl:151
+#: 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:222
+#: 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:235
+#: 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:321
+#: 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:326
+#: 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:419
+#: 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:493
+#: 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"
@@ -26611,52 +26614,52 @@ msgstr ""
 "Setzen Sie sendemail.forbidSendmailVariables auf 'false', um diese Prüfung "
 "zu deaktivieren.\n"
 
-#: git-send-email.perl:498 git-send-email.perl:700
+#: 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:501
+#: 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:514
+#: 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:545
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Unbekannte --confirm Einstellung: '%s'\n"
 
-#: git-send-email.perl:573
+#: 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:575
+#: 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:577
+#: 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:582
+#: 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:666
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26667,18 +26670,18 @@ msgid ""
 msgstr ""
 "Datei '%s' existiert, aber es könnte auch der Bereich von Commits sein,\n"
 "für den Patches erzeugt werden sollen. Bitte machen Sie dies eindeutig\n"
-"indem Sie ...\n"
+"indem Sie...\n"
 "\n"
 "    * \"./%s\" angeben, wenn Sie eine Datei meinen, oder\n"
 "    * die Option --format-patch angeben, wenn Sie einen Commit-Bereich "
 "meinen.\n"
 
-#: git-send-email.perl:687
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Fehler beim Öffnen von %s: %s"
 
-#: git-send-email.perl:720
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26688,17 +26691,17 @@ msgstr ""
 "Keine Patch-Dateien angegeben!\n"
 "\n"
 
-#: git-send-email.perl:733
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Keine Betreffzeile in %s?"
 
-#: git-send-email.perl:743
+#: 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:754
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26713,27 +26716,27 @@ msgstr ""
 "Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden "
 "möchten.\n"
 
-#: git-send-email.perl:778
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Fehler beim Öffnen von %s: %s"
 
-#: git-send-email.perl:795
+#: 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:838
+#: 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:873
+#: 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:928
+#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -26741,11 +26744,11 @@ msgstr ""
 "Die folgenden Dateien sind 8-Bit, aber deklarieren kein\n"
 "Content-Transfer-Encoding.\n"
 
-#: git-send-email.perl:933
+#: 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:941
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26759,22 +26762,22 @@ msgstr ""
 "an,\n"
 "wenn Sie den Patch wirklich versenden wollen.\n"
 
-#: git-send-email.perl:960
+#: 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:978
+#: 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:990
+#: 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:1048 git-send-email.perl:1056
+#: 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"
@@ -26782,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:1060
+#: 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:1377
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA Pfad \"%s\" existiert nicht"
 
-#: git-send-email.perl:1460
+#: 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"
@@ -26822,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:1475
+#: 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:1478
+#: 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:1506
+#: 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:1553
+#: 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:1558 git-send-email.perl:1562
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS fehlgeschlagen! %s"
 
-#: git-send-email.perl:1571
+#: 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:1589
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Fehler beim Senden %s\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Probeversand %s\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s gesendet\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Probeversand OK. Log enthält:\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK. Log enthält:\n"
 
-#: git-send-email.perl:1606
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Ergebnis: "
 
-#: git-send-email.perl:1609
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Ergebnis: OK\n"
 
-#: git-send-email.perl:1627
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "Kann Datei %s nicht öffnen"
 
-#: git-send-email.perl:1674 git-send-email.perl:1694
+#: 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:1680
+#: 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:1737
+#: 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:1772
+#: 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:1883
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Konnte '%s' nicht ausführen"
 
-#: git-send-email.perl:1890
+#: 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:1894
+#: 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:1924
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "Kann Nachricht nicht als 7bit versenden."
 
-#: git-send-email.perl:1932
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "Ungültiges Transfer-Encoding"
 
-#: git-send-email.perl:1966
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -26943,12 +26946,12 @@ msgstr ""
 "%s\n"
 "Warnung: Es wurden keine Patches gesendet\n"
 
-#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039
+#: 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:1979
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26957,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:1997
+#: 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:2001
+#: 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/es.po b/po/es.po
index c1c26138f0..ced2eb6d3d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,224 +7,225 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-05-17 16:02+0800\n"
-"PO-Revision-Date: 2021-06-05 19:31-0500\n"
-"Last-Translator: christopher.diaz.riv@gmail.com\n"
+"POT-Creation-Date: 2021-11-04 08:34+0800\n"
+"PO-Revision-Date: 2021-11-07 18:53-0500\n"
+"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
 "Language-Team: CodeLabora <codelabora@gmail.com>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.3\n"
+"X-Generator: Poedit 3.0\n"
 
-#: add-interactive.c:376
+#: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "¿Ahh (%s)?"
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
 msgid "could not read index"
 msgstr "no se pudo leer índice"
 
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
 #: git-add--interactive.perl:294
 msgid "binary"
 msgstr "binario"
 
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
 #: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "nada"
 
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
 #: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "sin cambios"
 
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Actualizar"
 
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
 #, c-format
 msgid "could not stage '%s'"
 msgstr "no se pudo poner en stage '%s'"
 
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
 msgid "could not write index"
 msgstr "no se pudo escribir índice"
 
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
 #, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "actualizada %d ruta\n"
 msgstr[1] "actualizadas %d rutas\n"
 
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "nota: %s no es rastreado ahora.\n"
 
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry falló para la ruta '%s'"
 
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Revertir"
 
-#: add-interactive.c:775
+#: add-interactive.c:779
 msgid "Could not parse HEAD^{tree}"
 msgstr "No se pudo analizar HEAD^{tree}"
 
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
 #, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "revertida %d ruta\n"
 msgstr[1] "revertidas %d rutas\n"
 
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "No hay archivos sin rastrear.\n"
 
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Agregar no rastreados"
 
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
 #, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "agregada %d ruta\n"
 msgstr[1] "agregadas %d rutas\n"
 
-#: add-interactive.c:925
+#: add-interactive.c:929
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "ignorando lo no fusionado: %s"
 
-#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Solo cambiaron archivos binarios.\n"
 
-#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
 #, c-format
 msgid "No changes.\n"
 msgstr "Sin cambios.\n"
 
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
 msgid "Patch update"
 msgstr "Actualización del parche"
 
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
 msgid "Review diff"
 msgstr "Revisión de diff"
 
-#: add-interactive.c:1010
+#: add-interactive.c:1014
 msgid "show paths with changes"
 msgstr "mostrar rutas con cambios"
 
-#: add-interactive.c:1012
+#: add-interactive.c:1016
 msgid "add working tree state to the staged set of changes"
 msgstr "agregar estado del árbol de trabajo al conjunto de cambios en stage"
 
-#: add-interactive.c:1014
+#: add-interactive.c:1018
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "revertir conjunto de cambios en stage a la versión de HEAD"
 
-#: add-interactive.c:1016
+#: add-interactive.c:1020
 msgid "pick hunks and update selectively"
-msgstr "elegir hunks y actualizar de forma selectiva"
+msgstr "elegir fragmentos y actualizar de forma selectiva"
 
-#: add-interactive.c:1018
+#: add-interactive.c:1022
 msgid "view diff between HEAD and index"
 msgstr "ver diff entre HEAD e index"
 
-#: add-interactive.c:1020
+#: add-interactive.c:1024
 msgid "add contents of untracked files to the staged set of changes"
 msgstr ""
 "agregar contenidos de archivos sin rastrear al conjunto de cambios de stage"
 
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
 msgid "Prompt help:"
 msgstr "Mostrar ayuda:"
 
-#: add-interactive.c:1030
+#: add-interactive.c:1034
 msgid "select a single item"
-msgstr "selecciona un único objeto"
+msgstr "seleccionar un único objeto"
 
-#: add-interactive.c:1032
+#: add-interactive.c:1036
 msgid "select a range of items"
-msgstr "selecciona un rango de objetos"
+msgstr "seleccionar un rango de objetos"
 
-#: add-interactive.c:1034
+#: add-interactive.c:1038
 msgid "select multiple ranges"
-msgstr "selecciona multiples rangos"
+msgstr "seleccionar múltiples rangos"
 
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
 msgid "select item based on unique prefix"
 msgstr "seleccionar objeto basado en prefijo único"
 
-#: add-interactive.c:1038
+#: add-interactive.c:1042
 msgid "unselect specified items"
 msgstr "quitar objetos especificados"
 
-#: add-interactive.c:1040
+#: add-interactive.c:1044
 msgid "choose all items"
 msgstr "escoger todos los objetos"
 
-#: add-interactive.c:1042
+#: add-interactive.c:1046
 msgid "(empty) finish selecting"
 msgstr "(vacío) finalizar selección"
 
-#: add-interactive.c:1079
+#: add-interactive.c:1083
 msgid "select a numbered item"
-msgstr "selecciona un objeto numerado"
+msgstr "seleccionar un objeto numerado"
 
-#: add-interactive.c:1083
+#: add-interactive.c:1087
 msgid "(empty) select nothing"
-msgstr "(vacío) selecciona nada"
+msgstr "(vacío) no seleccionar nada"
 
-#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
 msgid "*** Commands ***"
 msgstr "*** Comandos ***"
 
-#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
 msgid "What now"
-msgstr "Ahora que"
+msgstr "Ahora qué"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "staged"
 msgstr "rastreado"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "no rastreado"
 
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
-#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
-#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
-#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
+#: 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
 #: git-add--interactive.perl:213
 msgid "path"
 msgstr "ruta"
 
-#: add-interactive.c:1151
+#: add-interactive.c:1155
 msgid "could not refresh index"
-msgstr "no se pudo refrescar el index"
+msgstr "no se pudo refrescar el índice"
 
-#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
 #, c-format
 msgid "Bye.\n"
 msgstr "Adiós.\n"
@@ -247,15 +248,15 @@ msgstr "¿Agregar al stage [y,n,q,a,d%s,?]? "
 #: add-patch.c:37 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar stage a este hunk [y,n,q,a,d%s,?]? "
+msgstr "¿Aplicar stage a este fragmento [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:39
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "staging."
 msgstr ""
-"Si el parche aplica limpiamente, el hunk editado será marcado inmediatamente "
-"para el área de stage."
+"Si el parche aplica limpiamente, el fragmento editado será marcado "
+"inmediatamente para el área de stage."
 
 #: add-patch.c:42
 msgid ""
@@ -265,22 +266,22 @@ msgid ""
 "a - stage this hunk and all later hunks in the file\n"
 "d - do not stage this hunk or any of the later hunks in the file\n"
 msgstr ""
-"y - aplicar stage a este hunk\n"
-"n - no aplicar stage a este hunk\n"
-"q - quit; no aplicar stage a este hunk ni ninguno de los restantes\n"
-"a - aplicar stage a este hunk y a todos los posteriores en el archivo\n"
-"d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
+"y - aplicar stage a este fragmento\n"
+"n - no aplicar stage a este fragmento\n"
+"q - quit; no aplicar stage a este fragmento ni ninguno de los restantes\n"
+"a - aplicar stage a este fragmento y a todos los posteriores en el archivo\n"
+"d - no aplicar stage a este fragmento o a ninguno de los posteriores en este "
 "archivo\n"
 
 #: add-patch.c:56 git-add--interactive.perl:1437
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? "
+msgstr "¿Hacer stash al cambio de modo [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:57 git-add--interactive.perl:1438
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar stash al borrado [y,n,q,a,d%s,?]? "
+msgstr "¿Hacer stash a la eliminación [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:58 git-add--interactive.perl:1439
 #, c-format, perl-format
@@ -290,15 +291,15 @@ msgstr "¿Agregar al stash [y,n,q,a,d%s,?]? "
 #: add-patch.c:59 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar stash a este hunk [y,n,q,a,d%s,?]? "
+msgstr "¿Hacer stash a este fragmento [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:61
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "stashing."
 msgstr ""
-"Si el parche aplica limpiamente, el hunk editado será marcado inmediatamente "
-"para aplicar stash."
+"Si el parche aplica limpiamente, el fragmento editado será marcado "
+"inmediatamente para hacer stash."
 
 #: add-patch.c:64
 msgid ""
@@ -308,11 +309,12 @@ msgid ""
 "a - stash this hunk and all later hunks in the file\n"
 "d - do not stash this hunk or any of the later hunks in the file\n"
 msgstr ""
-"y - aplicar stash a este hunk\n"
-"n - no aplicar stash a este hunk\n"
-"q - quit; no aplicar stash a este hunk o a ninguno de los restantes\n"
-"a - aplicar stash a este hunk y a todos los posteriores en el archivo\n"
-"d - no aplicar stash a este hunk ni ninguno de los posteriores en el archivo\n"
+"y - hacer stash a este fragmento\n"
+"n - no hacer stash a este fragmento\n"
+"q - quit; no hacer stash a este fragmento o a ninguno de los restantes\n"
+"a - hacer stash a este fragmento y a todos los posteriores en el archivo\n"
+"d - no hacer stash a este fragmento ni ninguno de los posteriores en el "
+"archivo\n"
 
 #: add-patch.c:80 git-add--interactive.perl:1443
 #, c-format, perl-format
@@ -332,15 +334,15 @@ msgstr "¿Quitar adición al stage [y,n,q,a,d%s,?]? "
 #: add-patch.c:83 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "¿Sacar este hunk del stage [y,n,q,a,d%s,?]? "
+msgstr "¿Sacar este fragmento del stage [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:85
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "unstaging."
 msgstr ""
-"Si el parche aplica limpiamente, el hunk editado será marcado inmediatamente "
-"para sacar del área de stage."
+"Si el parche aplica limpiamente, el fragmento editado será marcado "
+"inmediatamente para sacar del área de stage."
 
 #: add-patch.c:88
 msgid ""
@@ -351,11 +353,13 @@ msgid ""
 "d - do not unstage this hunk or any of the later hunks in the file\n"
 msgstr ""
 "y - sacar desde hunk del área de stage\n"
-"n - no sacar este hunk del area de stage\n"
-"q - quit; no sacar del area de stage este hunk ni ninguno de los restantes\n"
-"a - sacar del area de stage este hunk y todos los posteriores en el archivo\n"
-"d - no sacar del area de stage este hunk ni ninguno de los posteriores en el "
+"n - no sacar este fragmento del area de stage\n"
+"q - quit; no sacar del area de stage este fragmento ni ninguno de los "
+"restantes\n"
+"a - sacar del area de stage este fragmento y todos los posteriores en el "
 "archivo\n"
+"d - no sacar del area de stage este fragmento ni ninguno de los posteriores "
+"en el archivo\n"
 
 #: add-patch.c:103 git-add--interactive.perl:1449
 #, c-format, perl-format
@@ -375,14 +379,14 @@ msgstr "¿Aplicar adición al índice [y,n,q,a,d%s,?]? "
 #: add-patch.c:106 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar este hunk al índice [y,n,q,a,d%s,?]? "
+msgstr "¿Aplicar este fragmento al índice [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:108 add-patch.c:176 add-patch.c:221
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "applying."
 msgstr ""
-"Si el parche aplica de forma limpia, el hunk editado será marcado "
+"Si el parche aplica de forma limpia, el fragmento editado será marcado "
 "inmediatamente para aplicar."
 
 #: add-patch.c:111
@@ -393,11 +397,11 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file\n"
 msgstr ""
-"y - aplicar este hunk al índice\n"
-"n - no aplicar este hunk al índice\n"
-"q - quit; no aplicar este hunk ni ninguno de los restantes\n"
-"a - aplicar este hunk y todos los posteriores en el archivo\n"
-"d - no aplicar este hunko ninguno de los posteriores en el archivo\n"
+"y - aplicar este fragmento al índice\n"
+"n - no aplicar este fragmento al índice\n"
+"q - quit; no aplicar este fragmento ni ninguno de los restantes\n"
+"a - aplicar este fragmento y todos los posteriores en el archivo\n"
+"d - no aplicar este fragmento ni ninguno de los posteriores en el archivo\n"
 
 #: add-patch.c:126 git-add--interactive.perl:1455
 #: git-add--interactive.perl:1473
@@ -421,14 +425,14 @@ msgstr "¿Descartar adición del árbol de trabajo [y,n,q,a,d%s,?]? "
 #: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "¿Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? "
+msgstr "¿Descartar este fragmento del árbol de trabajo [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:131 add-patch.c:154 add-patch.c:199
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "discarding."
 msgstr ""
-"Si el parche aplica de forma limpia, el hunk editado será marcado "
+"Si el parche aplica de forma limpia, el fragmento editado será marcado "
 "inmediatamente para descarte."
 
 #: add-patch.c:134 add-patch.c:202
@@ -439,11 +443,11 @@ msgid ""
 "a - discard this hunk and all later hunks in the file\n"
 "d - do not discard this hunk or any of the later hunks in the file\n"
 msgstr ""
-"y - descartar este hunk del árbol de trabajo\n"
-"n - no descartar este hunk del árbol de trabajo\n"
-"q - quit; no descartar este hunk ni ninguno de los que restantes\n"
-"a - descartar este hunk y todos los posteriores en este archivo\n"
-"d - no descartar este hunk ni ninguno de los posteriores en el archivo\n"
+"y - descartar este fragmento del árbol de trabajo\n"
+"n - no descartar este fragmento del árbol de trabajo\n"
+"q - quit; no descartar este fragmento ni ninguno de los restantes\n"
+"a - descartar este fragmento y todos los posteriores en este archivo\n"
+"d - no descartar este fragmento ni ninguno de los posteriores en el archivo\n"
 
 #: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
 #, c-format, perl-format
@@ -465,7 +469,7 @@ msgstr "¿Descartar adición del índice y el árbol de trabajo [y,n,q,a,d%s,?]?
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
-"¿Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
+"¿Descartar este fragmento del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:157
 msgid ""
@@ -475,11 +479,11 @@ msgid ""
 "a - discard this hunk and all later hunks in the file\n"
 "d - do not discard this hunk or any of the later hunks in the file\n"
 msgstr ""
-"y - descartar este hunk del índice y el árbol de trabajo\n"
-"n - no descartar este hunk del índice ni el árbol de trabajo\n"
-"q - quit; no descartar este hunk ni ninguno de los que queden\n"
-"a - descartar este hunk y todos los posteriores en este archivo\n"
-"d - no descartar este hunk ni ninguno posterior en el archivo\n"
+"y - descartar este fragmento del índice y el árbol de trabajo\n"
+"n - no descartar este fragmento del índice ni el árbol de trabajo\n"
+"q - quit; no descartar este fragmento ni ninguno de los que queden\n"
+"a - descartar este fragmento y todos los posteriores en este archivo\n"
+"d - no descartar este fragmento ni ninguno posterior en el archivo\n"
 
 #: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
 #, c-format, perl-format
@@ -501,7 +505,8 @@ msgstr "¿Aplicar adición al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "
 #: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"¿Aplicar este fragmento al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "
 
 #: add-patch.c:179
 msgid ""
@@ -511,11 +516,11 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file\n"
 msgstr ""
-"y - aplicar este hunk al índice y al árbol de trabajo\n"
-"n - no aplicar este hunk al índice y al árbol de trabajo\n"
-"q - quit;  no aplicar este hunk ni ninguno de los restantes\n"
-"a - aplicar este hunk y todos los posteriores en el archivo\n"
-"d - no aplicar este hunk ni ninguno de los siguientes en este archivo\n"
+"y - aplicar este fragmento al índice y al árbol de trabajo\n"
+"n - no aplicar este fragmento al índice y al árbol de trabajo\n"
+"q - quit;  no aplicar este fragmento ni ninguno de los restantes\n"
+"a - aplicar este fragmento y todos los posteriores en el archivo\n"
+"d - no aplicar este fragmento ni ninguno de los siguientes en este archivo\n"
 
 #: add-patch.c:224
 msgid ""
@@ -525,40 +530,40 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file\n"
 msgstr ""
-"y - aplicar este hunk al índice y al árbol de trabajo\n"
-"n - no aplicar este hunk al índice y al árbol de trabajo\n"
-"q - quit;  no aplicar este hunk ni ninguno de los restantes\n"
-"a - aplicar este hunk y todos los posteriores en el archivo\n"
-"d - no aplicar este hunk ni ninguno de los siguientes en este archivo\n"
+"y - aplicar este fragmento al índice y al árbol de trabajo\n"
+"n - no aplicar este fragmento al índice y al árbol de trabajo\n"
+"q - quit;  no aplicar este fragmento ni ninguno de los restantes\n"
+"a - aplicar este fragmento y todos los posteriores en el archivo\n"
+"d - no aplicar este fragmento ni ninguno de los siguientes en este archivo\n"
 
-#: add-patch.c:342
+#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "no se puede analizar hunk header '%.*s'"
 
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "no se puede analizar hunk header '%.*s'"
 
-#: add-patch.c:419
+#: add-patch.c:420
 msgid "could not parse diff"
 msgstr "no se puede analizar diff"
 
-#: add-patch.c:438
+#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr "no se pudo analizar diff a colores"
 
-#: add-patch.c:452
+#: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
 msgstr "falló al ejecutar '%s'"
 
-#: add-patch.c:611
+#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
-msgstr "output de interactive.diffFilter no concuerda"
+msgstr "salida de interactive.diffFilter no concuerda"
 
-#: add-patch.c:612
+#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -566,7 +571,7 @@ msgstr ""
 "Tu filtro tiene que mantener correspondencia de uno a uno\n"
 "entre las líneas de entrada y salida."
 
-#: add-patch.c:790
+#: add-patch.c:791
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -575,7 +580,7 @@ msgstr ""
 "se esperaba línea de contexto #%d en\n"
 "%.*s"
 
-#: add-patch.c:805
+#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -583,16 +588,16 @@ msgid ""
 "\tdoes not end with:\n"
 "%.*s"
 msgstr ""
-"hunks no hacen overlap:\n"
+"hunks no se superponen:\n"
 "%.*s\n"
 "\tno acaba con:\n"
 "%.*s"
 
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n"
+msgstr "Modo de edición manual de hunk -- mira abajo para una guía rápida.\n"
 
-#: add-patch.c:1085
+#: add-patch.c:1086
 #, c-format
 msgid ""
 "---\n"
@@ -603,24 +608,25 @@ msgstr ""
 "---\n"
 "Para eliminar '%c' líneas, haga de ellas líneas  ' '  (contexto).\n"
 "Para eliminar '%c' líneas, bórrelas.\n"
-"Lineas comenzando con %c serán eliminadas.\n"
+"Líneas comenzando con %c serán eliminadas.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
 "aborted and the hunk is left unchanged.\n"
 msgstr ""
 "Si esto no aplica de manera limpia, se te da la oportunidad de\n"
-"editar nuevamente. Si todas las líneas del hunk son eliminadas, entonces\n"
-"la edición es abortada y el hunk queda sin cambios.\n"
+"editar nuevamente. Si todas las líneas del fragmento son eliminadas, "
+"entonces\n"
+"la edición es abortada y el fragmento queda sin cambios.\n"
 
-#: add-patch.c:1132
+#: add-patch.c:1133
 msgid "could not parse hunk header"
 msgstr "no se puede analizar hunk header"
 
-#: add-patch.c:1177
+#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr "falló 'git apply --cached'"
 
@@ -636,26 +642,26 @@ msgstr "falló '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:1246 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1242
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \"no\" descarta!) [y/"
 "n]? "
 
-#: add-patch.c:1289
+#: add-patch.c:1290
 msgid "The selected hunks do not apply to the index!"
 msgstr "¡Los hunks seleccionados no aplican al índice!"
 
-#: add-patch.c:1290 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1346
 msgid "Apply them to the worktree anyway? "
 msgstr "¿Aplicarlos al árbol de trabajo de todas maneras? "
 
-#: add-patch.c:1297 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1349
 msgid "Nothing was applied.\n"
 msgstr "Nada fue aplicado.\n"
 
-#: add-patch.c:1354
+#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -667,83 +673,84 @@ msgid ""
 "e - manually edit the current hunk\n"
 "? - print help\n"
 msgstr ""
-"j - deja este hunk sin decidir, ver el siguiente hunk sin decisión\n"
-"J - deja este hunk sin decidir, ver siguiente hunk\n"
-"k - deja este hunk sin decidir, ver hunk previo sin decidir\n"
-"K - deja este hunk sin decidir, ver hunk anterior\n"
-"g - selecciona un hunk a dónde ir\n"
-"/ - buscar un hunk que cumpla con el regex dado\n"
-"s - separar el hunk actual en más pequeños\n"
-"e - editar manualmente el hunk actual\n"
+"j - dejar este fragmento sin decidir, ver el siguiente fragmento sin "
+"decisión\n"
+"J - dejar este fragmento sin decidir, ver siguiente fragmento \n"
+"k - dejar este fragmento sin decidir, ver fragmento previo sin decidir\n"
+"K - dejar este fragmento sin decidir, ver fragmento anterior\n"
+"g - seleccionar un fragmento a dónde ir\n"
+"/ - buscar un fragmento que cumpla con el regex dado\n"
+"s - separar el fragmento actual en más pequeños\n"
+"e - editar manualmente el fragmento actual\n"
 "? - imprimir ayuda\n"
 
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
-msgstr "No hay hunk anterior"
+msgstr "No hay fragmento anterior"
 
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
-msgstr "No hay hunk siguiente"
+msgstr "No hay fragmento siguiente"
 
-#: add-patch.c:1537
+#: add-patch.c:1538
 msgid "No other hunks to goto"
-msgstr "No hay más pedazos a que ir"
+msgstr "No hay más fragmentos a que ir"
 
-#: add-patch.c:1548 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1606
 msgid "go to which hunk (<ret> to see more)? "
-msgstr "¿a que hunk ir (<enter> para ver más)? "
+msgstr "¿a qué fragmento ir (<enter> para ver más)? "
 
-#: add-patch.c:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1608
 msgid "go to which hunk? "
-msgstr "¿a que hunk ir? "
+msgstr "¿a qué fragmento ir? "
 
-#: add-patch.c:1560
+#: add-patch.c:1561
 #, c-format
 msgid "Invalid number: '%s'"
-msgstr "Numero inválido: '%s'"
+msgstr "Número inválido: '%s'"
 
-#: add-patch.c:1565
+#: add-patch.c:1566
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
-msgstr[0] "Lo siento, solo %d hunk disponible."
-msgstr[1] "Lo siento, solo %d hunks disponibles."
+msgstr[0] "Lo siento, solo %d fragmento disponible."
+msgstr[1] "Lo siento, solo %d fragmentos disponibles."
 
-#: add-patch.c:1574
+#: add-patch.c:1575
 msgid "No other hunks to search"
-msgstr "No hay más pedazos para buscar"
+msgstr "No hay más fragmentos para buscar"
 
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1661
 msgid "search for regex? "
 msgstr "¿buscar para regexp? "
 
-#: add-patch.c:1595
+#: add-patch.c:1596
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Regexp para la búsqueda mal formado %s: %s"
 
-#: add-patch.c:1612
+#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
-msgstr "No hay hunks que concuerden con el patrón entregado"
+msgstr "No hay fragmentos que concuerden con el patrón entregado"
 
-#: add-patch.c:1619
+#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
 msgstr "Perdón, no se puede dividir este pedazo"
 
-#: add-patch.c:1623
+#: add-patch.c:1624
 #, c-format
 msgid "Split into %d hunks."
-msgstr "Cortar en %d hunk."
+msgstr "Cortar en %d fragmentos."
 
-#: add-patch.c:1627
+#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
 msgstr "Perdón, no se puede editar este pedazo"
 
-#: add-patch.c:1679
+#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr "falló 'git apply'"
 
-#: advice.c:145
+#: advice.c:78
 #, c-format
 msgid ""
 "\n"
@@ -752,38 +759,38 @@ msgstr ""
 "\n"
 "Desactivar este mensaje con \"git config advice.%s false\""
 
-#: advice.c:161
+#: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sayuda: %.*s%s\n"
 
-#: advice.c:252
+#: advice.c:178
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 "No es posible ejecutar cherry-picking porque tienes archivos sin fusionar."
 
-#: advice.c:254
+#: advice.c:180
 msgid "Committing is not possible because you have unmerged files."
 msgstr "No es posible realizar un commit porque tienes archivos sin fusionar."
 
-#: advice.c:256
+#: advice.c:182
 msgid "Merging is not possible because you have unmerged files."
 msgstr "No es posible hacer merge porque tienes archivos sin fusionar."
 
-#: advice.c:258
+#: advice.c:184
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "No es posible hacer pull porque tienes archivos sin fusionar."
 
-#: advice.c:260
+#: advice.c:186
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "No es posible revertir porque tienes archivos sin fusionar."
 
-#: advice.c:262
+#: advice.c:188
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "No es posible %s porque tienes archivos sin fusionar."
 
-#: advice.c:270
+#: 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."
@@ -791,41 +798,48 @@ msgstr ""
 "Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n"
 "como sea apropiado, para marcar la resolución y realizar un commit."
 
-#: advice.c:278
+#: advice.c:204
 msgid "Exiting because of an unresolved conflict."
 msgstr "Saliendo porque existe un conflicto sin resolver."
 
-#: advice.c:283 builtin/merge.c:1374
+#: advice.c:209 builtin/merge.c:1379
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
 
-#: advice.c:285
+#: advice.c:211
 msgid "Please, commit your changes before merging."
 msgstr "Por favor, realiza un commit antes de fusionar."
 
-#: advice.c:286
+#: advice.c:212
 msgid "Exiting because of unfinished merge."
 msgstr "Saliendo por una fusión inconclusa."
 
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "No es posible hacer fast-forward, abortando."
+
+#: advice.c:227
 #, 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"
+"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 ""
-"El siguiente pathspecs no concuerda con ninguna ruta elegible, pero "
-"concuerda con\n"
-"entradas del índice fuera del checkout sparse actual:\n"
+"La siguiente ruta y/o pathspecs coinciden con rutas existentes\n"
+"fuera de su definición para sparse-checkout, por lo que no\n"
+"se actualizarán en el índice:\n"
 
-#: advice.c:303
+#: advice.c:234
 msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"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 ""
-"Deshabilitar  o modificar las reglas de escasez si intenta actualizar dichas "
-"entradas."
+"Si desea actualizar esa entrada, intente lo siguiente:\n"
+"* Use la opción --sparse.\n"
+"* Deshabilite o modifique las reglas de escasez."
 
-#: advice.c:310
+#: advice.c:242
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -922,21 +936,21 @@ msgstr ""
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
-"git apply: git-diff erróneo - se esperaba /dev/null, se encontró %s en la"
+"git apply: git-diff erróneo - se esperaba /dev/null, se encontró %s en la "
 "línea %d"
 
 #: apply.c:927
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
-"git apply: git-diff erróneo - nuevo nombre de archivo inconsistente en la"
+"git apply: git-diff erróneo - nuevo nombre de archivo inconsistente en la "
 "línea %d"
 
 #: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
-"git apply: git-diff erróneo - viejo nombre de archivo inconsistente en la"
+"git apply: git-diff erróneo - viejo nombre de archivo inconsistente en la "
 "línea %d"
 
 #: apply.c:933
@@ -963,11 +977,11 @@ msgid_plural ""
 "git diff header lacks filename information when removing %d leading pathname "
 "components (line %d)"
 msgstr[0] ""
-"el header de git diff carece de información del nombre del archivo cuando"
-"se elimina %d componente principal de la ruta (línea %d)"
+"el header de git diff carece de información del nombre del archivo cuando se "
+"elimina %d componente principal de la ruta (línea %d)"
 msgstr[1] ""
-"los headers de git diff carecen de información del  nombre del archivo cuando"
-"se eliminan %d componentes principales (línea %d)"
+"los headers de git diff carecen de información del nombre del archivo cuando "
+"se eliminan %d componentes principales de la ruta (línea %d)"
 
 #: apply.c:1384
 #, c-format
@@ -1014,49 +1028,49 @@ msgstr "el archivo borrado %s todavía tiene contenido"
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** peligro: el archivo %s está vacío pero no es borrado"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "parche binario corrupto en la línea %d: %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "parche binario no reconocido en la línea %d"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "parche que solo contiene basura en la línea %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "no es posible leer el enlace simbólico %s"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "no es posible abrir o leer %s"
 
-#: apply.c:2935
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "comienzo inválido de línea: '%c'"
 
-#: apply.c:3056
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Hunk #%d tuvo éxito en %d (%d línea compensada)."
 msgstr[1] "Hunk #%d tuvo éxito en %d (%d líneas compensadas)."
 
-#: apply.c:3068
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d"
 
-#: apply.c:3074
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1065,23 +1079,24 @@ msgstr ""
 "mientras se buscaba:\n"
 "%.*s"
 
-#: apply.c:3096
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "data perdida en parche binario para '%s'"
 
-#: apply.c:3104
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
-"no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'"
+"no se puede revertir-aplicar un parche binario sin el fragmento revertido a "
+"'%s'"
 
-#: apply.c:3151
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "no se puede aplicar el parche binario a '%s' sin un índice completo"
 
-#: apply.c:3162
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -1089,289 +1104,290 @@ msgstr ""
 "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos "
 "actuales."
 
-#: apply.c:3170
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "el parche aplica a un '%s' vacío, pero este no lo esta"
 
-#: apply.c:3188
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "la postimagen necesaria %s para '%s' no se puede leer"
 
-#: apply.c:3201
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "el parche binario no aplica para '%s'"
 
-#: apply.c:3208
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "el parche binario para '%s' crea un resultado incorrecto (esperando %s, se "
 "obtuvo %s)"
 
-#: apply.c:3229
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "el parche falló: %s:%ld"
 
-#: apply.c:3352
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "no se puede hacer checkout a %s"
 
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
 #: setup.c:308
 #, c-format
 msgid "failed to read %s"
 msgstr "no se pudo leer %s"
 
-#: apply.c:3412
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "leyendo de '%s' tras un enlace simbólico"
 
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3709
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "la ruta %s ha sido renombrada/suprimida"
 
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3724
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: no existe en el índice"
 
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3732 apply.c:3976
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: no concuerda con el índice"
 
-#: apply.c:3571
+#: apply.c:3593
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr ""
 "el repositorio carece del blob necesario para realizar un merge de tres vías."
 
-#: apply.c:3574
+#: apply.c:3596
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Realizando un merge de tres vías...\n"
 
-#: apply.c:3590 apply.c:3594
+#: apply.c:3612 apply.c:3616
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "no se pueden leer los contenidos actuales de '%s'"
 
-#: apply.c:3606
+#: apply.c:3628
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "Falló en realizar fusión de tres vías...\n"
 
-#: apply.c:3620
+#: apply.c:3642
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Parche aplicado a '%s' con conflictos.\n"
 
-#: apply.c:3625
+#: apply.c:3647
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Parche aplicado a '%s' limpiamente\n"
 
-#: apply.c:3642
+#: apply.c:3664
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Retrocediendo a la aplicación...\n"
 
-#: apply.c:3654
+#: apply.c:3676
 msgid "removal patch leaves file contents"
 msgstr "parche de eliminación deja contenidos en el archivo"
 
-#: apply.c:3727
+#: apply.c:3749
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipo incorrecto"
 
-#: apply.c:3729
+#: apply.c:3751
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s tiene tipo %o, se esperaba %o"
 
-#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
-#: read-cache.c:1351
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
 #, c-format
 msgid "invalid path '%s'"
 msgstr "ruta inválida '%s'"
 
-#: apply.c:3952
+#: apply.c:3974
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: ya existe en el índice"
 
-#: apply.c:3956
+#: apply.c:3978
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: ya existe en el directorio de trabajo"
 
-#: apply.c:3976
+#: apply.c:3998
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)"
 
-#: apply.c:3981
+#: apply.c:4003
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s"
 
-#: apply.c:4001
+#: apply.c:4023
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "archivo afectado '%s' está tras un enlace simbólico"
 
-#: apply.c:4005
+#: apply.c:4027
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: el parche no aplica"
 
-#: apply.c:4020
+#: apply.c:4042
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Revisando el parche %s..."
 
-#: apply.c:4112
+#: apply.c:4134
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "falta información del sha1 o es inútil para el submódulo %s"
 
-#: apply.c:4119
+#: apply.c:4141
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"
 
-#: apply.c:4122
+#: apply.c:4144
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta información sha1 o es inútil (%s)."
 
-#: apply.c:4131
+#: apply.c:4153
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "no se pudo añadir %s al índice temporal"
 
-#: apply.c:4141
+#: apply.c:4163
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "no se pudo escribir un índice temporal para %s"
 
-#: apply.c:4279
+#: apply.c:4301
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "no se puede eliminar %s del índice"
 
-#: apply.c:4313
+#: apply.c:4335
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "parche corrupto para el submódulo %s"
 
-#: apply.c:4319
+#: apply.c:4341
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "no es posible hacer stat en el archivo recién creado '%s'"
 
-#: apply.c:4327
+#: apply.c:4349
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "no es posible crear una copia de seguridad para el archivo recién creado %s"
 
-#: apply.c:4333 apply.c:4478
+#: apply.c:4355 apply.c:4500
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "no es posible agregar una entrada en el cache para %s"
 
-#: apply.c:4376 builtin/bisect--helper.c:523
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "falló escribir a '%s'"
 
-#: apply.c:4380
+#: apply.c:4402
 #, c-format
 msgid "closing file '%s'"
 msgstr "cerrando archivo '%s'"
 
-#: apply.c:4450
+#: apply.c:4472
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "no es posible escribir el archivo '%s' modo %o"
 
-#: apply.c:4548
+#: apply.c:4570
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Parche %s aplicado limpiamente."
 
-#: apply.c:4556
+#: apply.c:4578
 msgid "internal error"
 msgstr "error interno"
 
-#: apply.c:4559
+#: apply.c:4581
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Aplicando parche %%s con %d rechazo..."
 msgstr[1] "Aplicando parche %%s con %d rechazos..."
 
-#: apply.c:4570
+#: apply.c:4592
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "truncando el nombre de archivo .rej a %.*s.rej"
 
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
 #, c-format
 msgid "cannot open %s"
 msgstr "no se puede abrir %s"
 
-#: apply.c:4592
+#: apply.c:4614
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Hunk #%d aplicado limpiamente."
 
-#: apply.c:4596
+#: apply.c:4618
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Hunk #%d rechazado."
 
-#: apply.c:4725
+#: apply.c:4747
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Parche '%s' saltado."
 
-#: apply.c:4733
+#: apply.c:4755
 msgid "unrecognized input"
 msgstr "input no reconocido"
 
-#: apply.c:4753
+#: apply.c:4775
 msgid "unable to read index file"
 msgstr "no es posible leer el archivo índice"
 
-#: apply.c:4910
+#: apply.c:4932
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "no se puede abrir el parche '%s': %s"
 
-#: apply.c:4937
+#: apply.c:4959
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "%d error de espacios en blanco silenciado"
 msgstr[1] "%d errores de espacios en blanco silenciados"
 
-#: apply.c:4943 apply.c:4958
+#: apply.c:4965 apply.c:4980
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d línea agrega errores de espacios en blanco."
 msgstr[1] "%d líneas agregan errores de espacios en blanco."
 
-#: apply.c:4951
+#: apply.c:4973
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1380,139 +1396,139 @@ msgstr[0] ""
 msgstr[1] ""
 "%d líneas aplicadas después de arreglar los errores de espacios en blanco."
 
-#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
 msgid "Unable to write new index file"
 msgstr "No es posible escribir el archivo índice"
 
-#: apply.c:4995
+#: apply.c:5017
 msgid "don't apply changes matching the given path"
 msgstr "no aplicar cambios que concuerden con la ruta suministrada"
 
-#: apply.c:4998
+#: apply.c:5020
 msgid "apply changes matching the given path"
 msgstr "aplicar cambios que concuerden con la ruta suministrada"
 
-#: apply.c:5000 builtin/am.c:2317
+#: apply.c:5022 builtin/am.c:2320
 msgid "num"
 msgstr "num"
 
-#: apply.c:5001
+#: apply.c:5023
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales"
 
-#: apply.c:5004
+#: apply.c:5026
 msgid "ignore additions made by the patch"
 msgstr "ignorar adiciones hechas por el parche"
 
-#: apply.c:5006
+#: apply.c:5028
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada"
 
-#: apply.c:5010
+#: apply.c:5032
 msgid "show number of added and deleted lines in decimal notation"
-msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal"
+msgstr "mostrar el número de líneas agregadas y eliminadas en notación decimal"
 
-#: apply.c:5012
+#: apply.c:5034
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada"
 
-#: apply.c:5014
+#: apply.c:5036
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "en lugar de aplicar el parche, ver si el parche es aplicable"
 
-#: apply.c:5016
+#: apply.c:5038
 msgid "make sure the patch is applicable to the current index"
-msgstr "asegurar que el parche es aplicable al índice actual"
+msgstr "asegurar que el parche sea aplicable al índice actual"
 
-#: apply.c:5018
+#: apply.c:5040
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "marca los nuevos archivos con `git add --intent-to-add`"
 
-#: apply.c:5020
+#: apply.c:5042
 msgid "apply a patch without touching the working tree"
 msgstr "aplicar un parche sin tocar el árbol de trabajo"
 
-#: apply.c:5022
+#: apply.c:5044
 msgid "accept a patch that touches outside the working area"
 msgstr "aceptar un parche que toque fuera del área de trabajo"
 
-#: apply.c:5025
+#: apply.c:5047
 msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "también aplicar el parche (usar con --stat/--summary/--check"
+msgstr "también aplicar el parche (usar con --stat/--summary/--check)"
 
-#: apply.c:5027
+#: apply.c:5049
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr ""
 "intentar merge de tres vías, regresar al parche normal si el parche no aplica"
 
-#: apply.c:5029
+#: apply.c:5051
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "construir un índice temporal basado en la información de índice incrustada"
 
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5054 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "rutas están separadas con un carácter NULL"
 
-#: apply.c:5034
+#: apply.c:5056
 msgid "ensure at least <n> lines of context match"
-msgstr "asegurar que al menos concuerden <n> líneas del contexto concuerden"
+msgstr "asegurar que al menos <n> líneas del contexto concuerden"
 
-#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
-#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
 msgid "action"
 msgstr "acción"
 
-#: apply.c:5036
+#: apply.c:5058
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 "detectar líneas nuevas o modificadas que contienen errores de espacios en "
 "blanco"
 
-#: apply.c:5039 apply.c:5042
+#: apply.c:5061 apply.c:5064
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 "ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
 
-#: apply.c:5045
+#: apply.c:5067
 msgid "apply the patch in reverse"
 msgstr "aplicar el parche en reversa"
 
-#: apply.c:5047
+#: apply.c:5069
 msgid "don't expect at least one line of context"
 msgstr "no espera al menos una línea del contexto"
 
-#: apply.c:5049
+#: apply.c:5071
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
 
-#: apply.c:5051
+#: apply.c:5073
 msgid "allow overlapping hunks"
 msgstr "permitir solapamiento de hunks"
 
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
-#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
+#: 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 "ser verboso"
 
-#: apply.c:5054
+#: apply.c:5076
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "tolerar nuevas líneas faltantes detectadas incorrectamente al final del "
 "archivo"
 
-#: apply.c:5057
+#: apply.c:5079
 msgid "do not trust the line counts in the hunk headers"
-msgstr "no confiar en el conteo de líneas en los headers del hunk"
+msgstr "no confiar en el conteo de líneas en los headers del fragmento"
 
-#: apply.c:5059 builtin/am.c:2305
+#: apply.c:5081 builtin/am.c:2308
 msgid "root"
 msgstr "raíz"
 
-#: apply.c:5060
+#: apply.c:5082
 msgid "prepend <root> to all filenames"
 msgstr "anteponer <root> a todos los nombres de archivos"
 
@@ -1548,9 +1564,9 @@ msgstr "ruta no válida UTF-8: %s"
 #: archive-zip.c:322
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "ruta demasiado larga (%d chars, SHA1: %s): %s"
+msgstr "ruta demasiada larga (%d chars, SHA1: %s): %s"
 
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
 msgstr "error al desinflar (%d)"
@@ -1558,7 +1574,7 @@ msgstr "error al desinflar (%d)"
 #: archive-zip.c:603
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "timestamp demasiado largo para este sistema: %<PRIuMAX>"
+msgstr "timestamp demasiado grande para este sistema: %<PRIuMAX>"
 
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
@@ -1584,151 +1600,151 @@ msgstr "git archive --remote <repo> [--exec <comando>] --list"
 msgid "cannot read %s"
 msgstr "no se puede leer %s"
 
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
-#: builtin/merge.c:1143
+#: 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 "no se pudo leer '%s'"
 
-#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
 #, c-format
 msgid "pathspec '%s' did not match any files"
-msgstr "ruta especificada '%s' no concordó con ningun archivo"
+msgstr "ruta especificada '%s' no concordó con ningún archivo"
 
-#: archive.c:451
+#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "no existe el ref: %.*s"
 
-#: archive.c:457
+#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "nombre de objeto no válido: %s"
 
-#: archive.c:470
+#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "no es un objeto tree: %s"
 
-#: archive.c:482
+#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "directorio de trabajo actual no rastreado"
 
-#: archive.c:523
+#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Archivo no encontrado: %s"
 
-#: archive.c:525
+#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "No es un archivo regular: %s"
 
-#: archive.c:552
+#: archive.c:551
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:552
+#: archive.c:551
 msgid "archive format"
 msgstr "formato de crónica"
 
-#: archive.c:553 builtin/log.c:1772
+#: archive.c:552 builtin/log.c:1775
 msgid "prefix"
 msgstr "prefijo"
 
-#: archive.c:554
+#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
-msgstr "anteponer prefijo a cada ruta en el crónica"
-
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+msgstr "anteponer prefijo a cada ruta en la crónica"
+
+#: 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/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
 msgid "file"
 msgstr "archivo"
 
-#: archive.c:556
+#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "incluir archivos sin seguimiento a la crónica"
 
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
 msgid "write the archive to this file"
 msgstr "escribe la crónica en este archivo"
 
-#: archive.c:561
+#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "leer .gitattributes en el directorio de trabajo"
 
-#: archive.c:562
+#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "reportar archivos en la crónica por stderr"
 
-#: archive.c:564
+#: archive.c:563
 msgid "set compression level"
 msgstr "configurar nivel de compresión"
 
-#: archive.c:567
+#: archive.c:566
 msgid "list supported archive formats"
 msgstr "listar los formatos de crónica soportados"
 
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
+#: 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
 msgid "repo"
 msgstr "repo"
 
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "obtener la crónica del repositorio remoto <repo>"
 
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
 msgid "command"
 msgstr "comando"
 
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
 msgid "path to the remote git-upload-archive command"
 msgstr "ruta para el comando git-upload-archive remoto"
 
-#: archive.c:579
+#: archive.c:578
 msgid "Unexpected option --remote"
 msgstr "Opción inesperada --remote"
 
-#: archive.c:581
+#: archive.c:580
 msgid "Option --exec can only be used together with --remote"
 msgstr "Opción --exec solo puede ser utilizada con --remote"
 
-#: archive.c:583
+#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Opción inesperada --output"
 
-#: archive.c:585
+#: archive.c:584
 msgid "Options --add-file and --remote cannot be used together"
 msgstr "Opciones --add-file y --remote no pueden ser usadas juntas"
 
-#: archive.c:607
+#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Formato de crónica desconocido '%s'"
 
-#: archive.c:616
+#: archive.c:615
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argumento no soportado para formato '%s': -%d"
 
-#: attr.c:202
+#: attr.c:203
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s no es un nombre de atributo válido"
 
-#: attr.c:363
+#: attr.c:364
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s no permitido: %s:%d"
 
-#: attr.c:403
+#: attr.c:404
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1736,31 +1752,31 @@ msgstr ""
 "Los patrones negativos son ignorados en los atributos de git\n"
 "Usa '\\!' para comenzar literalmente con exclamación."
 
-#: bisect.c:489
+#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Revisa las comillas en el archivo '%s': %s"
 
-#: bisect.c:699
+#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "¡No podemos biseccionar más!\n"
 
-#: bisect.c:766
+#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "No es un nombre de commit válido %s"
 
-#: bisect.c:791
+#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
 "This means the bug has been fixed between %s and [%s].\n"
 msgstr ""
 "La base de fusión %s está mal.\n"
-"Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n"
+"Esto quiere decir que el bug ha sido corregido entre %s y [%s].\n"
 
-#: bisect.c:796
+#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1769,16 +1785,16 @@ msgstr ""
 "La base de fusión %s es nueva.\n"
 "Esta propiedad ha cambiado entre %s y [%s].\n"
 
-#: bisect.c:801
+#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
 "This means the first '%s' commit is between %s and [%s].\n"
 msgstr ""
-"La base de fisión %s es %s.\n"
+"La base de fusión %s es %s.\n"
 "Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n"
 
-#: bisect.c:809
+#: bisect.c:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1789,7 +1805,7 @@ msgstr ""
 "git bisect no puede trabajar bien en este caso.\n"
 "¿Tal vez confundiste las revisiones %s y %s?\n"
 
-#: bisect.c:822
+#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1797,39 +1813,40 @@ msgid ""
 "We continue anyway."
 msgstr ""
 "la base de fusión entre %s y [%s] tiene que ser saltada.\n"
-"Así que no podemos estar seguros que el primer %s commit está entre%s y %s.\n"
+"Así que no podemos estar seguros que el primer %s commit esté entre %s y "
+"%s.\n"
 "Vamos a continuar de todas maneras."
 
-#: bisect.c:861
+#: bisect.c:859
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
-msgstr "Biseccionando: una base de fisión debe ser probada\n"
+msgstr "Biseccionando: una base de fusión debe ser probada\n"
 
-#: bisect.c:911
+#: bisect.c:909
 #, c-format
 msgid "a %s revision is needed"
-msgstr "una %s revisión es necesaria"
+msgstr "una revisión %s es necesaria"
 
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
 #, c-format
 msgid "could not create file '%s'"
 msgstr "no se pudo crear el archivo '%s'"
 
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
 #, c-format
 msgid "could not read file '%s'"
 msgstr "no se pudo leer el archivo '%s'"
 
-#: bisect.c:1027
+#: bisect.c:1025
 msgid "reading bisect refs failed"
 msgstr "falló leer las refs de bisect"
 
-#: bisect.c:1057
+#: bisect.c:1055
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s fue tanto %s como %s\n"
 
-#: bisect.c:1066
+#: bisect.c:1064
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1838,7 +1855,7 @@ msgstr ""
 "No se encontró commit que se pueda probar.\n"
 "¿Quizás iniciaste con parámetros de rutas incorrectos?\n"
 
-#: bisect.c:1095
+#: bisect.c:1093
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1848,12 +1865,12 @@ msgstr[1] "(aproximadamente %d pasos)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1101
+#: bisect.c:1099
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
-msgstr[0] "Biseccionando: falta %d revisión por probar después de esto %s\n"
-msgstr[1] "Biseccionando: faltan %d revisiones por probar después de esto %s\n"
+msgstr[0] "Biseccionando: falta %d revisión por probar después de esta %s\n"
+msgstr[1] "Biseccionando: faltan %d revisiones por probar después de esta %s\n"
 
 #: blame.c:2776
 msgid "--contents and --reverse do not blend well."
@@ -1868,13 +1885,14 @@ msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse y --first-parent juntos requieren especificar el último commit"
 
-#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
-#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
-#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
-#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
+#: 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
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
+#: builtin/shortlog.c:255
 msgid "revision walk setup failed"
-msgstr "falló la configuración del camino de revisión"
+msgstr "falló la configuración del recorrido de revisiones"
 
 #: blame.c:2838
 msgid ""
@@ -1903,7 +1921,7 @@ msgid ""
 msgstr ""
 "\n"
 "Tras arreglar la causa del error puedes intentar arreglar\n"
-"la infamación del rastreo remoto invocando\n"
+"la información del rastreo remoto invocando\n"
 "\"git branch --set-upstream-to=%s%s%s\"."
 
 #: branch.c:67
@@ -2014,7 +2032,7 @@ msgstr ""
 "\n"
 "Si estás planeando hacer push a una nueva rama local que\n"
 "va a rastrear a su contraparte remota, tal vez quieras usar\n"
-"\"git push -u\" para configurar tu upstream predeterminado cuando realizas "
+"\"git push -u\" para configurar tu upstream predeterminado cuando realices "
 "el push."
 
 #: branch.c:281
@@ -2042,118 +2060,118 @@ msgstr "'%s' ya ha sido marcado en '%s'"
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD del árbol de trabajo %s no está actualizada"
 
-#: bundle.c:41
+#: bundle.c:44
 #, c-format
 msgid "unrecognized bundle hash algorithm: %s"
 msgstr "algoritmo bundle hash desconocido %s"
 
-#: bundle.c:45
+#: bundle.c:48
 #, c-format
 msgid "unknown capability '%s'"
 msgstr "capacidad desconocida '%s'"
 
-#: bundle.c:71
+#: bundle.c:74
 #, c-format
 msgid "'%s' does not look like a v2 or v3 bundle file"
 msgstr "'%s' no se ve como un archivo bundle v2 o v3"
 
-#: bundle.c:110
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "header no reconocido %s%s (%d)"
 
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
 #, c-format
 msgid "could not open '%s'"
 msgstr "no se pudo abrir '%s'"
 
-#: bundle.c:189
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
-msgstr "Al repositorio le falta estos commits prerrequisito:"
+msgstr "Al repositorio le faltan estos commits prerrequisitos:"
 
-#: bundle.c:192
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
 msgstr "se necesita un repositorio para verificar un bundle"
 
-#: bundle.c:243
+#: bundle.c:257
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "El bundle contiene esta referencia:"
 msgstr[1] "El bundle contiene estas %d referencias:"
 
-#: bundle.c:250
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "El bundle registra una historia completa."
 
-#: bundle.c:252
+#: bundle.c:266
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "El bundle requiere esta referencia:"
 msgstr[1] "El bundle requiere estas %d referencias:"
 
-#: bundle.c:319
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "incapaz de duplicar bundle descriptor"
 
-#: bundle.c:326
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
-msgstr "No se pudo crear los pack-objetcts"
+msgstr "No se pudo ejecutar pack-objects"
 
-#: bundle.c:337
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "pack-objects murió"
 
-#: bundle.c:386
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "referencia '%s' es excluida por las opciones de rev-list"
 
-#: bundle.c:490
+#: bundle.c:504
 #, c-format
 msgid "unsupported bundle version %d"
 msgstr "versión de bundle no soportada %d"
 
-#: bundle.c:492
+#: bundle.c:506
 #, c-format
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "no se puede escribir la versión de paquete %d con el algoritmo %s"
 
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argumento no reconocido: %s"
 
-#: bundle.c:539
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "Rechazando crear un bundle vacío."
 
-#: bundle.c:549
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "no se puede crear '%s'"
 
-#: bundle.c:574
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "index-pack murió"
 
-#: chunk-format.c:113
+#: chunk-format.c:117
 msgid "terminating chunk id appears earlier than expected"
 msgstr "terminando porque el id del chunk aparece antes de lo esperado"
 
-#: chunk-format.c:122
+#: chunk-format.c:126
 #, c-format
 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
 msgstr "offset para chunk incorrecto %<PRIx64> y %<PRIx64>"
 
-#: chunk-format.c:129
+#: chunk-format.c:133
 #, c-format
 msgid "duplicate chunk ID %<PRIx32> found"
 msgstr "se encontró ID de chuck %<PRIx32> duplicado"
 
-#: chunk-format.c:143
+#: chunk-format.c:147
 #, c-format
 msgid "final chunk has non-zero id %<PRIx32>"
 msgstr "chunk final tiene un id distinto de cero %<PRIx32>"
@@ -2163,13 +2181,13 @@ msgstr "chunk final tiene un id distinto de cero %<PRIx32>"
 msgid "invalid color value: %.*s"
 msgstr "color inválido: %.*s"
 
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
 msgid "invalid hash version"
 msgstr "versión de hash inválida"
 
 #: commit-graph.c:262
 msgid "commit-graph file is too small"
-msgstr "archivo commit-graph es muy pequeño"
+msgstr "archivo commit-graph es demasiado pequeño"
 
 #: commit-graph.c:355
 #, c-format
@@ -2193,7 +2211,7 @@ msgstr "commit-graph file es demasiado pequeño para almacenar %u chunks"
 
 #: commit-graph.c:482
 msgid "commit-graph has no base graphs chunk"
-msgstr "commit-graph no tiene una chunk base de graphs"
+msgstr "commit-graph no tiene un fragmento base de graphs"
 
 #: commit-graph.c:492
 msgid "commit-graph chain does not match"
@@ -2208,228 +2226,230 @@ msgstr "cadena de commit-graph inválida: línea '%s' no es un hash"
 msgid "unable to find all commit-graph files"
 msgstr "no es posible encontrar los archivos commit-graph"
 
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:746 commit-graph.c:783
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "posición de commit inválida. commit-graph está probablemente corrupto"
 
-#: commit-graph.c:766
+#: commit-graph.c:767
 #, c-format
 msgid "could not find commit %s"
 msgstr "no se pudo encontrar commit %s"
 
-#: commit-graph.c:799
+#: commit-graph.c:800
 msgid "commit-graph requires overflow generation data but has none"
 msgstr ""
 "commit-graph requiere datos de generación de desbordamiento pero no tiene "
 "ninguno"
 
-#: commit-graph.c:1075 builtin/am.c:1340
+#: commit-graph.c:1105 builtin/am.c:1342
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "no es posible analizar el commit %s"
 
-#: commit-graph.c:1337 builtin/pack-objects.c:2897
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "incapaz de obtener el tipo de objeto: %s"
 
-#: commit-graph.c:1368
+#: commit-graph.c:1398
 msgid "Loading known commits in commit graph"
 msgstr "Cargando commits conocidos en commit graph"
 
-#: commit-graph.c:1385
+#: commit-graph.c:1415
 msgid "Expanding reachable commits in commit graph"
 msgstr "Expandiendo commits alcanzables en commit graph"
 
-#: commit-graph.c:1405
+#: commit-graph.c:1435
 msgid "Clearing commit marks in commit graph"
 msgstr "Limpiando marcas de commits en commit graph"
 
-#: commit-graph.c:1424
+#: commit-graph.c:1454
 msgid "Computing commit graph topological levels"
 msgstr "Calculando niveles topológicos de commit graph"
 
-#: commit-graph.c:1477
+#: commit-graph.c:1507
 msgid "Computing commit graph generation numbers"
 msgstr "Calculando números de generación de commit graph"
 
-#: commit-graph.c:1558
+#: commit-graph.c:1588
 msgid "Computing commit changed paths Bloom filters"
 msgstr "Calculando números de generación de commit graph"
 
-#: commit-graph.c:1635
+#: commit-graph.c:1665
 msgid "Collecting referenced commits"
 msgstr "Recolectando commits referenciados"
 
-#: commit-graph.c:1660
+#: commit-graph.c:1690
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "Encontrando commits para commit graph en %d pack"
 msgstr[1] "Encontrando commits para commit graph en %d packs"
 
-#: commit-graph.c:1673
+#: commit-graph.c:1703
 #, c-format
 msgid "error adding pack %s"
-msgstr "error agregando pack %s"
+msgstr "error al agregar pack %s"
 
-#: commit-graph.c:1677
+#: commit-graph.c:1707
 #, c-format
 msgid "error opening index for %s"
-msgstr "error abriendo index para %s"
+msgstr "error al abrir index para %s"
 
-#: commit-graph.c:1714
+#: commit-graph.c:1744
 msgid "Finding commits for commit graph among packed objects"
 msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
 
-#: commit-graph.c:1732
+#: commit-graph.c:1762
 msgid "Finding extra edges in commit graph"
 msgstr "Encontrando esquinas extra en commit graph"
 
-#: commit-graph.c:1781
+#: commit-graph.c:1811
 msgid "failed to write correct number of base graph ids"
 msgstr "falló al escribir el número correcto de ids de base graph"
 
-#: commit-graph.c:1812 midx.c:906
+#: commit-graph.c:1842 midx.c:1146
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "no se pudo crear directorios principales para %s"
 
-#: commit-graph.c:1825
+#: commit-graph.c:1855
 msgid "unable to create temporary graph layer"
-msgstr "no es posible crear un una capa de gráfico temporal"
+msgstr "no es posible crear una capa de gráfico temporal"
 
-#: commit-graph.c:1830
+#: commit-graph.c:1860
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
-msgstr "no se pudo poner permisos a '%s'"
+msgstr "no se pudo poner permisos compartidos a '%s'"
 
-#: commit-graph.c:1887
+#: commit-graph.c:1917
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "Escribiendo commit graph en %d paso"
 msgstr[1] "Escribiendo commit graph en %d pasos"
 
-#: commit-graph.c:1923
+#: commit-graph.c:1953
 msgid "unable to open commit-graph chain file"
 msgstr "no se pudo abrir la cadena de archivos commit-graph"
 
-#: commit-graph.c:1939
+#: commit-graph.c:1969
 msgid "failed to rename base commit-graph file"
 msgstr "no se pudo renombrar el archivo base commit-graph"
 
-#: commit-graph.c:1959
+#: commit-graph.c:1989
 msgid "failed to rename temporary commit-graph file"
 msgstr "falló al renombrar el archivo temporal commit-graph"
 
-#: commit-graph.c:2092
+#: commit-graph.c:2122
 msgid "Scanning merged commits"
 msgstr "Escaneando commits fusionados"
 
-#: commit-graph.c:2136
+#: commit-graph.c:2166
 msgid "Merging commit-graph"
 msgstr "Fusionando commit-graph"
 
-#: commit-graph.c:2244
+#: commit-graph.c:2274
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
 "intentando escribir un commit-graph, pero 'core.commitGraph' está "
 "deshabilitado"
 
-#: commit-graph.c:2351
+#: commit-graph.c:2381
 msgid "too many commits to write graph"
 msgstr "demasiados commits para escribir el gráfico"
 
-#: commit-graph.c:2450
+#: commit-graph.c:2479
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "el archivo de commit-graph tiene checksums incorrectos y probablemente está "
 "corrupto"
 
-#: commit-graph.c:2460
+#: commit-graph.c:2489
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s"
 
-#: commit-graph.c:2470 commit-graph.c:2485
+#: commit-graph.c:2499 commit-graph.c:2514
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u"
 
-#: commit-graph.c:2477
+#: commit-graph.c:2506
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "falló al analizar commit %s para commit-graph"
 
-#: commit-graph.c:2495
+#: commit-graph.c:2524
 msgid "Verifying commits in commit graph"
 msgstr "Verificando commits en commit graph"
 
-#: commit-graph.c:2510
+#: commit-graph.c:2539
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "falló al analizar el commit %s de la base de datos de objetos para commit-"
 "graph"
 
-#: commit-graph.c:2517
+#: commit-graph.c:2546
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr "árbol raíz OID para commit %s en commit-graph es %s != %s"
+msgstr "OID del árbol raíz para commit %s en commit-graph es %s != %s"
 
-#: commit-graph.c:2527
+#: commit-graph.c:2556
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
-msgstr "lista padre de commit-graph para commit %s es muy larga"
+msgstr "lista padre de commit-graph para commit %s es demasiada larga"
 
-#: commit-graph.c:2536
+#: commit-graph.c:2565
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "padre de commit-graph para %s es %s != %s"
 
-#: commit-graph.c:2550
+#: commit-graph.c:2579
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
-msgstr "lista padre de commit-graph para commit %s termina antes"
+msgstr "lista de padres de commit-graph para commit %s termina prematuramente"
 
-#: commit-graph.c:2555
+#: commit-graph.c:2584
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr ""
-"commit-graph ha generado número cero para %s, pero no-cero para los demás"
+"commit-graph tiene número de generación cero para %s, pero no cero en otro "
+"lugar"
 
-#: commit-graph.c:2559
+#: commit-graph.c:2588
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr ""
-"commit-graph tiene generación no-cero para %s, pero cero para los demás"
+"commit-graph tiene número de generación no cero para %s, pero cero en otro "
+"lugar"
 
-#: commit-graph.c:2576
+#: commit-graph.c:2605
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr "generación commit-graph para commit %s es %<PRIuMAX> < %<PRIuMAX>"
 
-#: commit-graph.c:2582
+#: commit-graph.c:2611
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 "fecha de commit para commit %s en commit-graph es %<PRIuMAX> != %<PRIuMAX>"
 
-#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
-#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457
+#: 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
 #, c-format
 msgid "could not parse %s"
 msgstr "no se puede analizar %s"
 
-#: commit.c:54
+#: commit.c:55
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "¡%s %s no es un commit!"
 
-#: commit.c:194
+#: commit.c:196
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -2443,33 +2463,33 @@ msgstr ""
 "El soporte para <GIT_DIR>/info/grafts ha sido deprecado\n"
 "y será eliminado en una versión futura de Git.\n"
 "\n"
-"Por favor use \"git replace --convert-graft-file\"\n"
+"Por favor usa \"git replace --convert-graft-file\"\n"
 "para convertir los grafts en refs.\n"
 "\n"
-"Apapa este mensaje ejecutando\n"
+"Apaga este mensaje ejecutando\n"
 "\"git config advice.graftFileDeprecated false\""
 
-#: commit.c:1237
+#: commit.c:1239
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s."
 
-#: commit.c:1241
+#: commit.c:1243
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."
 
-#: commit.c:1244
+#: commit.c:1246
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Commit %s no tiene una firma GPG."
 
-#: commit.c:1247
+#: commit.c:1249
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "El Commit %s tiene una buena firma GPG por %s\n"
+msgstr "El commit %s tiene una buena firma GPG por %s\n"
 
-#: commit.c:1501
+#: commit.c:1503
 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"
@@ -2477,14 +2497,14 @@ msgid ""
 msgstr ""
 "Peligro: el mensaje del commit no se ajusta a UTF-8.\n"
 "Tal vez quieras enmendarlo después de arreglar el mensaje, o arreglar la\n"
-"variable de configuración i18n.commitencoding para la codificación que usa "
+"variable de configuración i18n.commitencoding para la codificación que use "
 "tu proyecto.\n"
 
 #: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"
 msgstr "memoria agotada"
 
-#: config.c:126
+#: config.c:125
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -2499,36 +2519,36 @@ msgstr ""
 "\t%s\n"
 "Esto puede ser causado por inclusiones circulares."
 
-#: config.c:142
+#: config.c:141
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "no se pudo expandir rutas de inclusión '%s'"
 
-#: config.c:153
+#: config.c:152
 msgid "relative config includes must come from files"
 msgstr "inclusiones de configuración relativas tienen que venir de archivos"
 
-#: config.c:199
+#: config.c:201
 msgid "relative config include conditionals must come from files"
 msgstr ""
 "la configuración relativa incluye condicionales que deben venir de archivos"
 
-#: config.c:396
+#: config.c:398
 #, c-format
 msgid "invalid config format: %s"
 msgstr "formato config inválido: %s"
 
-#: config.c:400
+#: config.c:402
 #, c-format
 msgid "missing environment variable name for configuration '%.*s'"
 msgstr "falta el nombre de la variable de entorno para la configuración '%.*s'"
 
-#: config.c:405
+#: config.c:407
 #, c-format
 msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr "Falta la variable de entorno '%s' para la configuración '%.*s'"
+msgstr "falta la variable de entorno '%s' para la configuración '%.*s'"
 
-#: config.c:442
+#: config.c:443
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "llave no contiene una sección: %s"
@@ -2538,298 +2558,298 @@ msgstr "llave no contiene una sección: %s"
 msgid "key does not contain variable name: %s"
 msgstr "llave no contiene el nombre de variable: %s"
 
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2804
 #, c-format
 msgid "invalid key: %s"
 msgstr "llave inválida: %s"
 
-#: config.c:478
+#: config.c:475
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "llave inválida (nueva línea): %s"
 
-#: config.c:511
+#: config.c:495
 msgid "empty config key"
 msgstr "clave de config vacía"
 
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "parámetro de configuración malogrado: %s"
 
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
 #, c-format
 msgid "bogus format in %s"
 msgstr "formato malogrado en %s"
 
-#: config.c:622
+#: config.c:606
 #, c-format
 msgid "bogus count in %s"
 msgstr "conteo malogrado en %s"
 
-#: config.c:626
+#: config.c:610
 #, c-format
 msgid "too many entries in %s"
 msgstr "demasiadas entradas en %s"
 
-#: config.c:636
+#: config.c:620
 #, c-format
 msgid "missing config key %s"
 msgstr "llave de configuración faltante %s"
 
-#: config.c:644
+#: config.c:628
 #, c-format
 msgid "missing config value %s"
 msgstr "valor de config faltante para %s"
 
-#: config.c:995
+#: config.c:979
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "mala línea de config %d en el blob %s"
 
-#: config.c:999
+#: config.c:983
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "mala línea de config %d en el archivo %s"
 
-#: config.c:1003
+#: config.c:987
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "mala línea de config %d en la entrada standard"
 
-#: config.c:1007
+#: config.c:991
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "mala línea de config %d en el submódulo-blob %s"
 
-#: config.c:1011
+#: config.c:995
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "mala línea de config %d en la línea de comando %s"
 
-#: config.c:1015
+#: config.c:999
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "mala línea de config %d en %s"
 
-#: config.c:1152
+#: config.c:1136
 msgid "out of range"
 msgstr "fuera de rango"
 
-#: config.c:1152
+#: config.c:1136
 msgid "invalid unit"
 msgstr "unidad inválida"
 
-#: config.c:1153
+#: config.c:1137
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "mal valor de config numérica '%s' para '%s': %s"
+msgstr "mal valor de config numérico '%s' para '%s': %s"
 
-#: config.c:1163
+#: config.c:1147
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
-msgstr "mal valor de config numérica '%s' para '%s' en el blob %s: %s"
+msgstr "mal valor de config numérico '%s' para '%s' en el blob %s: %s"
 
-#: config.c:1166
+#: config.c:1150
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
-msgstr "mal valor de config numérica '%s' para '%s' en el archivo %s: %s"
+msgstr "mal valor de config numérico '%s' para '%s' en el archivo %s: %s"
 
-#: config.c:1169
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
-msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s"
+msgstr "mal valor de config numérico '%s' para '%s' en la entrada standard: %s"
 
-#: config.c:1172
+#: config.c:1156
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
-"mal valor de config numérica '%s' para '%s' en el submódulo-blob %s: %s"
+"mal valor de config numérico '%s' para '%s' en el submódulo-blob %s: %s"
 
-#: config.c:1175
+#: config.c:1159
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
-"mal valor de config numérica '%s' para '%s' en la línea de comando %s: %s"
+"mal valor de config numérico '%s' para '%s' en la línea de comando %s: %s"
 
-#: config.c:1178
+#: config.c:1162
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr "mal valor de config numérica '%s' para '%s' en %s: %s"
+msgstr "mal valor de config numérico '%s' para '%s' en %s: %s"
 
-#: config.c:1257
+#: config.c:1241
 #, c-format
 msgid "bad boolean config value '%s' for '%s'"
-msgstr "mal valor de config booleana '%s' para '%s'"
+msgstr "mal valor de config booleano '%s' para '%s'"
 
-#: config.c:1275
+#: config.c:1259
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "falló al expandir el directorio de usuario en: '%s'"
 
-#: config.c:1284
+#: config.c:1268
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%s' para '%s' no es una marca de tiempo válida"
 
-#: config.c:1377
+#: config.c:1361
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "largo de abreviatura fuera de rango: %d"
 
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "nivel de compresión de zlib erróneo %d"
 
-#: config.c:1494
+#: config.c:1476
 msgid "core.commentChar should only be one character"
-msgstr "core.commentChar debería tener solo un caracter"
+msgstr "core.commentChar debería tener solo un carácter"
 
-#: config.c:1527
+#: config.c:1509
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "modo inválido de creación de objetos: %s"
 
-#: config.c:1599
+#: config.c:1581
 #, c-format
 msgid "malformed value for %s"
 msgstr "valor malformado para %s"
 
-#: config.c:1625
+#: config.c:1607
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "valor malformado para %s: %s"
 
-#: config.c:1626
+#: config.c:1608
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "debe ser uno de nothing, matching, simple, upstream o current"
 
-#: config.c:1687 builtin/pack-objects.c:3924
+#: config.c:1669 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "nivel de compresión de pack erróneo %d"
 
-#: config.c:1809
+#: config.c:1792
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "incapaz de cargar configuración de objeto blob '%s'"
 
-#: config.c:1812
+#: config.c:1795
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "referencia '%s' no apunta a un blob"
 
-#: config.c:1829
+#: config.c:1813
 #, c-format
 msgid "unable to resolve config blob '%s'"
-msgstr "no se posible resolver configuración de blob '%s'"
+msgstr "no es posible resolver configuración de blob '%s'"
 
-#: config.c:1873
+#: config.c:1858
 #, c-format
 msgid "failed to parse %s"
 msgstr "no se pudo analizar %s"
 
-#: config.c:1929
+#: config.c:1914
 msgid "unable to parse command-line config"
 msgstr "no es posible analizar la configuración de la línea de comando"
 
-#: config.c:2293
+#: config.c:2282
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "error desconocido ocurrió mientras se leían los archivos de configuración"
 
-#: config.c:2467
+#: config.c:2456
 #, c-format
 msgid "Invalid %s: '%s'"
-msgstr "Inválido %s: '%s'"
+msgstr "%s inválido: '%s'"
 
-#: config.c:2512
+#: config.c:2501
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100"
 
-#: config.c:2558
+#: config.c:2547
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "no es posible analizar '%s' de la configuración de la línea de comando"
 
-#: config.c:2560
+#: config.c:2549
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d"
 
-#: config.c:2644
+#: config.c:2633
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nombre de sección inválido '%s'"
 
-#: config.c:2676
+#: config.c:2665
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s tiene múltiples valores"
 
-#: config.c:2705
+#: config.c:2694
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "falló al escribir nuevo archivo de configuración %s"
 
-#: config.c:2957 config.c:3283
+#: config.c:2946 config.c:3273
 #, c-format
 msgid "could not lock config file %s"
 msgstr "no se pudo bloquear archivo de configuración %s"
 
-#: config.c:2968
+#: config.c:2957
 #, c-format
 msgid "opening %s"
 msgstr "abriendo %s"
 
-#: config.c:3005 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "patrón inválido: %s"
 
-#: config.c:3030
+#: config.c:3019
 #, c-format
 msgid "invalid config file %s"
 msgstr "archivo de configuración inválido: %s"
 
-#: config.c:3043 config.c:3296
+#: config.c:3032 config.c:3286
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat en %s falló"
 
-#: config.c:3054
+#: config.c:3043
 #, c-format
-msgid "unable to mmap '%s'"
-msgstr "no es posible hacer mmap '%s'"
+msgid "unable to mmap '%s'%s"
+msgstr "no es posible hacer mmap '%s'%s"
 
-#: config.c:3063 config.c:3301
+#: config.c:3053 config.c:3291
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod en %s falló"
 
-#: config.c:3148 config.c:3398
+#: config.c:3138 config.c:3388
 #, c-format
 msgid "could not write config file %s"
 msgstr "no se pudo escribir el archivo de configuración %s"
 
-#: config.c:3182
+#: config.c:3172
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "no se pudo configurar '%s' a '%s'"
 
-#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
 #, c-format
 msgid "could not unset '%s'"
 msgstr "no se pudo desactivar '%s'"
 
-#: config.c:3274
+#: config.c:3264
 #, c-format
 msgid "invalid section name: %s"
-msgstr "sección de nombre inválida: %s"
+msgstr "nombre de sección inválido: %s"
 
-#: config.c:3441
+#: config.c:3431
 #, c-format
 msgid "missing value for '%s'"
 msgstr "valor faltante para '%s'"
@@ -2847,8 +2867,8 @@ msgid ""
 msgstr ""
 "No se pudo leer del repositorio remoto.\n"
 "\n"
-"Por favor asegúrate que tienes los permisos de acceso correctos\n"
-"y que el repositorio existe."
+"Por favor asegúrate de que tengas los permisos de acceso correctos\n"
+"y que el repositorio exista."
 
 #: connect.c:81
 #, c-format
@@ -2864,72 +2884,72 @@ msgstr "servidor no soporta feature '%s'"
 msgid "expected flush after capabilities"
 msgstr "se espera flush tras capacidades"
 
-#: connect.c:263
+#: connect.c:265
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "ignorando capacidades tras primera línea '%s'"
 
-#: connect.c:284
+#: connect.c:286
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "error de protocolo: capacidades imprevistas^{}"
 
-#: connect.c:306
+#: connect.c:308
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "error de protocolo: sha-1 superficial esperado, se obtuvo '%s'"
 
-#: connect.c:308
+#: connect.c:310
 msgid "repository on the other end cannot be shallow"
-msgstr "el repositorio en el otro final no puede ser superficial"
+msgstr "el repositorio en el otro lado no puede ser superficial"
 
-#: connect.c:347
+#: connect.c:349
 msgid "invalid packet"
 msgstr "paquete inválido"
 
-#: connect.c:367
+#: connect.c:369
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "error de protocolo: '%s' inesperado"
 
-#: connect.c:497
+#: connect.c:499
 #, c-format
 msgid "unknown object format '%s' specified by server"
 msgstr "formato de objeto desconocido '%s' ha sido provisto por el servidor"
 
-#: connect.c:526
+#: connect.c:528
 #, c-format
 msgid "invalid ls-refs response: %s"
-msgstr "respuesta de referencias ls-refs inválida: %s"
+msgstr "respuesta de ls-refs inválida: %s"
 
-#: connect.c:530
+#: connect.c:532
 msgid "expected flush after ref listing"
 msgstr "flush esperado tras listado de refs"
 
-#: connect.c:533
+#: connect.c:535
 msgid "expected response end packet after ref listing"
 msgstr "se esperaba un paquete final luego del ref listing"
 
-#: connect.c:666
+#: connect.c:670
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "protocolo '%s' no es soportado"
 
-#: connect.c:717
+#: connect.c:721
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "no es posible configurar SO_KEEPALIVE en el socket"
 
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
 #, c-format
 msgid "Looking up %s ... "
 msgstr "Revisando %s... "
 
-#: connect.c:761
+#: connect.c:765
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "no se puede revisar %s (puerto %s) (%s)"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
 #, c-format
 msgid ""
 "done.\n"
@@ -2938,7 +2958,7 @@ msgstr ""
 "hecho.\n"
 "Conectando a %s (puerto %s) ... "
 
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2948,78 +2968,78 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
 msgid "done."
 msgstr "hecho."
 
-#: connect.c:824
+#: connect.c:828
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "no es posible revisar %s (%s)"
 
-#: connect.c:830
+#: connect.c:834
 #, c-format
 msgid "unknown port %s"
 msgstr "puerto desconocido %s"
 
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "hostname extraño '%s' bloqueado"
 
-#: connect.c:969
+#: connect.c:973
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "puerto extraño '%s' bloqueado"
 
-#: connect.c:979
+#: connect.c:983
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "no se puede comenzar proxy %s"
 
-#: connect.c:1050
+#: connect.c:1054
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
-"no hay ruta especificada; vea 'git help pull' para sintaxis de url válidas"
+"no hay ruta especificada; mira 'git help pull' para sintaxis válida de url"
 
-#: connect.c:1190
+#: connect.c:1194
 msgid "newline is forbidden in git:// hosts and repo paths"
 msgstr "la nueva línea está prohibida en git://hosts y rutas de repositorio"
 
-#: connect.c:1247
+#: connect.c:1251
 msgid "ssh variant 'simple' does not support -4"
 msgstr "variante 'simple' de ssh no soporta -4"
 
-#: connect.c:1259
+#: connect.c:1263
 msgid "ssh variant 'simple' does not support -6"
 msgstr "variante 'simple' de ssh no soporta -6"
 
-#: connect.c:1276
+#: connect.c:1280
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "variante ssh 'simple' no soporta configurar puerto"
 
-#: connect.c:1388
+#: connect.c:1392
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "ruta extraña '%s' bloqueada"
 
-#: connect.c:1436
+#: connect.c:1440
 msgid "unable to fork"
 msgstr "no es posible hacer fork"
 
-#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr "Verificando conectividad"
 
-#: connected.c:120
+#: connected.c:122
 msgid "Could not run 'git rev-list'"
-msgstr "No se pudo correr 'git rev-list'"
+msgstr "No se pudo ejecutar 'git rev-list'"
 
-#: connected.c:144
+#: connected.c:146
 msgid "failed write to rev-list"
 msgstr "falló escribir a rev-list"
 
-#: connected.c:149
+#: connected.c:151
 msgid "failed to close rev-list's stdin"
 msgstr "falló al cerrar la entrada standard de rev-list"
 
@@ -3067,8 +3087,8 @@ msgid ""
 "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
 "working-tree-encoding."
 msgstr ""
-"El archivo '%s' contiene una marca de byte (BOM). Por favor usa UTF-%.*s "
-"como working-tree-encoding."
+"El archivo '%s' contiene una marca de orden de bytes (BOM). Por favor usa "
+"UTF-%.*s como working-tree-encoding."
 
 #: convert.c:293
 #, c-format
@@ -3081,8 +3101,9 @@ msgid ""
 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
 "%sLE (depending on the byte order) as working-tree-encoding."
 msgstr ""
-"Al archivo '%s' le falta una marca de byte (BOM). Por favor usa UTF-%sBE o "
-"UTF-%sLE (dependiendo en el orden de byte) como working-tree-encoding."
+"Al archivo '%s' le falta una marca de orden de bytes (BOM). Por favor usa "
+"UTF-%sBE o UTF-%sLE (dependiendo del orden de bytes) como working-tree-"
+"encoding."
 
 #: convert.c:408 convert.c:479
 #, c-format
@@ -3125,9 +3146,9 @@ msgstr "tipo de filtro inesperado"
 
 #: convert.c:837
 msgid "path name too long for external filter"
-msgstr "nombre de ruta muy largo para filtro externo"
+msgstr "nombre de ruta demasiado largo para filtro externo"
 
-#: convert.c:934
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -3136,16 +3157,16 @@ msgstr ""
 "filtro externo '%s' ya no está disponible aunque no todas las rutas han sido "
 "filtradas"
 
-#: convert.c:1234
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false no son working-tree-encodings válidos"
 
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: falló al limpiar filtro '%s'"
 
-#: convert.c:1490
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: filtro smudge %s falló"
@@ -3153,30 +3174,30 @@ msgstr "%s: filtro smudge %s falló"
 #: credential.c:96
 #, c-format
 msgid "skipping credential lookup for key: credential.%s"
-msgstr "saltando revisión de credenciales para llave: credencial. %s"
+msgstr "saltando revisión de credenciales para llave: credential.%s"
 
 #: credential.c:112
 msgid "refusing to work with credential missing host field"
-msgstr "rehusando trabajar con credenciales faltantes en el campo host"
+msgstr "rehusando trabajar con campo host faltante en la credencial"
 
 #: credential.c:114
 msgid "refusing to work with credential missing protocol field"
-msgstr "rehusando trabajar con credenciales faltantes en el campo protocolo"
+msgstr "rehusando trabajar con campo protocolo faltante en la credencial"
 
-#: credential.c:394
+#: credential.c:395
 #, c-format
 msgid "url contains a newline in its %s component: %s"
-msgstr "url contiene un espace de línea en su componente %s: %s"
+msgstr "url contiene una nueva línea en su componente %s: %s"
 
-#: credential.c:438
+#: credential.c:439
 #, c-format
 msgid "url has no scheme: %s"
 msgstr "url no tiene scheme: %s"
 
-#: credential.c:511
+#: credential.c:512
 #, c-format
 msgid "credential url cannot be parsed: %s"
-msgstr "url credencial no puede ser analizada: %s"
+msgstr "url de credencial no puede ser analizada: %s"
 
 #: date.c:138
 msgid "in the future"
@@ -3258,74 +3279,74 @@ msgstr "mal objeto árbol %s"
 #: delta-islands.c:334
 #, c-format
 msgid "failed to load island regex for '%s': %s"
-msgstr "falló al cargar isla de regex para '%s': %s"
+msgstr "falló al cargar regex isla para '%s': %s"
 
 #: delta-islands.c:390
 #, c-format
 msgid "island regex from config has too many capture groups (max=%d)"
-msgstr "regex isla de config tiene muchos grupos de captura (max=%d)"
+msgstr "regex isla de config tiene demasiados grupos de captura (max=%d)"
 
 #: delta-islands.c:467
 #, c-format
 msgid "Marked %d islands, done.\n"
 msgstr "%d islas marcadas, listo.\n"
 
-#: diff-merges.c:80
+#: diff-merges.c:70
 #, c-format
 msgid "unknown value for --diff-merges: %s"
 msgstr "valor desconocido para --diff-merges: %s"
 
-#: diff-lib.c:538
+#: diff-lib.c:561
 msgid "--merge-base does not work with ranges"
 msgstr "--merge-base no funciona con rangos"
 
-#: diff-lib.c:540
+#: diff-lib.c:563
 msgid "--merge-base only works with commits"
 msgstr "--merge-base solo funciona con confirmaciones"
 
-#: diff-lib.c:557
+#: diff-lib.c:580
 msgid "unable to get HEAD"
 msgstr "no es posible obtener HEAD"
 
-#: diff-lib.c:564
+#: diff-lib.c:587
 msgid "no merge base found"
 msgstr "no se encontró base de fusión"
 
-#: diff-lib.c:566
+#: diff-lib.c:589
 msgid "multiple merge bases found"
 msgstr "múltiples bases de fusión encontradas"
 
-#: diff-no-index.c:238
+#: diff-no-index.c:237
 msgid "git diff --no-index [<options>] <path> <path>"
 msgstr "git diff --no-index [<opciones>] <path> <path>"
 
-#: diff-no-index.c:263
+#: diff-no-index.c:262
 msgid ""
 "Not a git repository. Use --no-index to compare two paths outside a working "
 "tree"
 msgstr ""
-"No es un repositorio git. Use --no-index para comparar dos paths fuera del "
+"No es un repositorio git. Usa --no-index para comparar dos paths fuera del "
 "árbol de trabajo"
 
-#: diff.c:156
+#: diff.c:157
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
-msgstr "  Falló al analizar dirstat porcentaje de corte '%s'\n"
+msgstr "  Falló al analizar porcentaje de corte de dirstat '%s'\n"
 
-#: diff.c:161
+#: diff.c:162
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
-msgstr "  parámetro '%s' de dirstat desconocido\n"
+msgstr "  Parámetro '%s' de dirstat desconocido\n"
 
-#: diff.c:297
+#: diff.c:298
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
 msgstr ""
 "opción de color tiene que ser una de 'no', 'default', 'blocks', 'zebra', "
-"'dimmed_zebra', 'plain'"
+"'dimmed-zebra', 'plain'"
 
-#: diff.c:325
+#: diff.c:326
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3335,7 +3356,7 @@ msgstr ""
 "change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
 "change'"
 
-#: diff.c:333
+#: diff.c:334
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3343,13 +3364,13 @@ msgstr ""
 "color-moved-ws: allow-indentation-change no puede ser combinado con otros "
 "modos de espacios en blanco"
 
-#: diff.c:410
+#: diff.c:411
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 "Valor para la variable de configuración 'diff.submodule' desconocido: '%s'"
 
-#: diff.c:470
+#: diff.c:471
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3358,35 +3379,49 @@ msgstr ""
 "Errores en la variable de config 'diff.dirstat' encontrados:\n"
 "%s"
 
-#: diff.c:4278
+#: diff.c:4290
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "diff externo murió, deteniendo en %s"
 
-#: diff.c:4630
+#: diff.c:4642
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
 
-#: diff.c:4633
+#: diff.c:4645
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G, -S y --find-object son mutuamente exclusivas"
 
-#: diff.c:4712
+#: diff.c:4648
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr ""
+"-G y --pickaxe-regex son mutuamente exclusivos, usa --pickaxe-regex con -S"
+
+#: diff.c:4651
+msgid ""
+"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+"with -G and -S"
+msgstr ""
+"--pickaxe-all y --find-object son mutuamente exclusivas, usa --pickaxe-all "
+"con -G y -S"
+
+#: diff.c:4730
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow requiere exactamente un pathspec"
 
-#: diff.c:4760
+#: diff.c:4778
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "valor --stat inválido: %s"
 
-#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s espera un valor numérico"
 
-#: diff.c:4797
+#: diff.c:4815
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3395,42 +3430,42 @@ msgstr ""
 "Falló al analizar parámetro de opción --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4882
+#: diff.c:4900
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "cambio de clase desconocido '%c' en --diff-filter=%s"
 
-#: diff.c:4906
+#: diff.c:4924
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "valor desconocido luego de ws-error-highlight=%.*s"
 
-#: diff.c:4920
+#: diff.c:4938
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "no se puede resolver '%s'"
 
-#: diff.c:4970 diff.c:4976
+#: diff.c:4988 diff.c:4994
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s espera forma <n>/<m>"
 
-#: diff.c:4988
+#: diff.c:5006
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s esperaba un char, se obtuvo '%s'"
 
-#: diff.c:5009
+#: diff.c:5027
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "mal argumento --color-moved: %s"
 
-#: diff.c:5028
+#: diff.c:5046
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "modo inválido '%s' en --color-moved-ws"
 
-#: diff.c:5068
+#: diff.c:5086
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -3438,159 +3473,159 @@ msgstr ""
 "opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e "
 "\"histogram\""
 
-#: diff.c:5104 diff.c:5124
+#: diff.c:5122 diff.c:5142
 #, c-format
 msgid "invalid argument to %s"
 msgstr "argumento inválido para %s"
 
-#: diff.c:5228
+#: diff.c:5246
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "regex inválido para -I: '%s'"
 
-#: diff.c:5277
+#: diff.c:5295
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "falló al analizar parámetro de opción --submodule: '%s'"
 
-#: diff.c:5333
+#: diff.c:5351
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "mal argumento --word-diff: %s"
 
-#: diff.c:5369
+#: diff.c:5387
 msgid "Diff output format options"
 msgstr "Opciones de formato de salida para diff"
 
-#: diff.c:5371 diff.c:5377
+#: diff.c:5389 diff.c:5395
 msgid "generate patch"
 msgstr "generar parche"
 
-#: diff.c:5374 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "suprimir salida de diff"
 
-#: diff.c:5379 diff.c:5493 diff.c:5500
+#: diff.c:5397 diff.c:5511 diff.c:5518
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5380 diff.c:5383
+#: diff.c:5398 diff.c:5401
 msgid "generate diffs with <n> lines context"
-msgstr "genera diffs con <n> líneas de contexto"
+msgstr "generar diffs con <n> líneas de contexto"
 
-#: diff.c:5385
+#: diff.c:5403
 msgid "generate the diff in raw format"
-msgstr "genera el diff en formato raw"
+msgstr "generar el diff en formato raw"
 
-#: diff.c:5388
+#: diff.c:5406
 msgid "synonym for '-p --raw'"
-msgstr "sinónimo para '-p --stat'"
+msgstr "sinónimo para '-p --raw'"
 
-#: diff.c:5392
+#: diff.c:5410
 msgid "synonym for '-p --stat'"
 msgstr "sinónimo para '-p --stat'"
 
-#: diff.c:5396
+#: diff.c:5414
 msgid "machine friendly --stat"
 msgstr "--stat amigable para máquina"
 
-#: diff.c:5399
+#: diff.c:5417
 msgid "output only the last line of --stat"
 msgstr "mostrar solo la última línea para --stat"
 
-#: diff.c:5401 diff.c:5409
+#: diff.c:5419 diff.c:5427
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5402
+#: diff.c:5420
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
-"muestra la distribución de cantidades de cambios relativa para cada "
+"mostrar la distribución de cantidades de cambios relativas para cada "
 "subdirectorio"
 
-#: diff.c:5406
+#: diff.c:5424
 msgid "synonym for --dirstat=cumulative"
 msgstr "sinónimo para --dirstat=cumulative"
 
-#: diff.c:5410
+#: diff.c:5428
 msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "sinonimo para --dirstat=archivos,param1,param2..."
+msgstr "sinónimo para --dirstat=archivos,param1,param2..."
 
-#: diff.c:5414
+#: diff.c:5432
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
-"advierte si cambios introducen conflictos de markers o errores de espacios "
+"advertir si cambios introducen conflictos de markers o errores de espacios "
 "en blanco"
 
-#: diff.c:5417
+#: diff.c:5435
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "resumen condensado de creaciones, cambios de nombres y cambios de modos"
 
-#: diff.c:5420
+#: diff.c:5438
 msgid "show only names of changed files"
 msgstr "mostrar solo nombres de archivos cambiados"
 
-#: diff.c:5423
+#: diff.c:5441
 msgid "show only names and status of changed files"
 msgstr "mostrar solo nombres y estados de archivos cambiados"
 
-#: diff.c:5425
+#: diff.c:5443
 msgid "<width>[,<name-width>[,<count>]]"
-msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"
+msgstr "<ancho>[,<ancho-de-nombre>[,<cantidad>]]"
 
-#: diff.c:5426
+#: diff.c:5444
 msgid "generate diffstat"
 msgstr "generar diffstat"
 
-#: diff.c:5428 diff.c:5431 diff.c:5434
+#: diff.c:5446 diff.c:5449 diff.c:5452
 msgid "<width>"
 msgstr "<ancho>"
 
-#: diff.c:5429
+#: diff.c:5447
 msgid "generate diffstat with a given width"
-msgstr "genera diffstat con un ancho dado"
+msgstr "generar diffstat con un ancho dado"
 
-#: diff.c:5432
+#: diff.c:5450
 msgid "generate diffstat with a given name width"
-msgstr "genera diffstat con un nombre de ancho dado"
+msgstr "generar diffstat con un ancho de nombre dado"
 
-#: diff.c:5435
+#: diff.c:5453
 msgid "generate diffstat with a given graph width"
-msgstr "genera diffstat con un ancho de graph dado"
+msgstr "generar diffstat con un ancho de graph dado"
 
-#: diff.c:5437
+#: diff.c:5455
 msgid "<count>"
 msgstr "<cantidad>"
 
-#: diff.c:5438
+#: diff.c:5456
 msgid "generate diffstat with limited lines"
-msgstr "genera diffstat con líneas limitadas"
+msgstr "generar diffstat con líneas limitadas"
 
-#: diff.c:5441
+#: diff.c:5459
 msgid "generate compact summary in diffstat"
-msgstr "genera un resumen compacto de diffstat"
+msgstr "generar un resumen compacto de diffstat"
 
-#: diff.c:5444
+#: diff.c:5462
 msgid "output a binary diff that can be applied"
-msgstr "muestra un diff binario que puede ser aplicado"
+msgstr "mostrar un diff binario que puede ser aplicado"
 
-#: diff.c:5447
+#: diff.c:5465
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 "mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index"
 "\""
 
-#: diff.c:5449
+#: diff.c:5467
 msgid "show colored diff"
 msgstr "mostrar diff colorido"
 
-#: diff.c:5450
+#: diff.c:5468
 msgid "<kind>"
 msgstr "<tipo>"
 
-#: diff.c:5451
+#: diff.c:5469
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -3598,7 +3633,7 @@ msgstr ""
 "resaltar errores de espacios en blanco en las líneas 'context', 'old' o "
 "'new' del diff"
 
-#: diff.c:5454
+#: diff.c:5472
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3606,327 +3641,330 @@ msgstr ""
 "no consolidar los pathnames y usar NULs como terminadores de campos en --raw "
 "o --numstat"
 
-#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
 msgid "<prefix>"
 msgstr "<prefijo>"
 
-#: diff.c:5458
+#: diff.c:5476
 msgid "show the given source prefix instead of \"a/\""
 msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
 
-#: diff.c:5461
+#: diff.c:5479
 msgid "show the given destination prefix instead of \"b/\""
-msgstr "mostrar el prefijo de destino en lugar de \"b/\""
+msgstr "mostrar el prefijo de destino dado en lugar de \"b/\""
 
-#: diff.c:5464
+#: diff.c:5482
 msgid "prepend an additional prefix to every line of output"
 msgstr "anteponer un prefijo adicional a cada línea mostrada"
 
-#: diff.c:5467
+#: diff.c:5485
 msgid "do not show any source or destination prefix"
 msgstr "no mostrar ningún prefijo de fuente o destino"
 
-#: diff.c:5470
+#: diff.c:5488
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
-"muestra el contexto entre hunks de diff hasta el número especificado de "
+"mostrar el contexto entre hunks de diff hasta el número especificado de "
 "líneas"
 
-#: diff.c:5474 diff.c:5479 diff.c:5484
+#: diff.c:5492 diff.c:5497 diff.c:5502
 msgid "<char>"
 msgstr "<char>"
 
-#: diff.c:5475
+#: diff.c:5493
 msgid "specify the character to indicate a new line instead of '+'"
-msgstr "especifica el char para indicar una nueva línea en lugar de '+'"
+msgstr "especificar el char para indicar una nueva línea en lugar de '+'"
 
-#: diff.c:5480
+#: diff.c:5498
 msgid "specify the character to indicate an old line instead of '-'"
-msgstr "especifica el char para indicar una línea vieja en lugar de '-'"
+msgstr "especificar el char para indicar una línea vieja en lugar de '-'"
 
-#: diff.c:5485
+#: diff.c:5503
 msgid "specify the character to indicate a context instead of ' '"
-msgstr "especifica el char para indicar un contexto en lugar de ' '"
+msgstr "especificar el char para indicar un contexto en lugar de ' '"
 
-#: diff.c:5488
+#: diff.c:5506
 msgid "Diff rename options"
 msgstr "Opciones de diff rename"
 
-#: diff.c:5489
+#: diff.c:5507
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5490
+#: diff.c:5508
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "descomponer los cambios de reescritura en pares de borrar y crear"
 
-#: diff.c:5494
+#: diff.c:5512
 msgid "detect renames"
 msgstr "detectar renombrados"
 
-#: diff.c:5498
+#: diff.c:5516
 msgid "omit the preimage for deletes"
-msgstr "omite la preimage para borrados"
+msgstr "omitir la preimage para borrados"
 
-#: diff.c:5501
+#: diff.c:5519
 msgid "detect copies"
 msgstr "detectar copias"
 
-#: diff.c:5505
+#: diff.c:5523
 msgid "use unmodified files as source to find copies"
-msgstr "usa archivos no modificados como fuente para encontrar copias"
+msgstr "usar archivos no modificados como fuente para encontrar copias"
 
-#: diff.c:5507
+#: diff.c:5525
 msgid "disable rename detection"
-msgstr "deshabilita detección de renombres"
+msgstr "deshabilitar detección de renombrados"
 
-#: diff.c:5510
+#: diff.c:5528
 msgid "use empty blobs as rename source"
-msgstr "usa blobs vacíos como fuente de renombre"
+msgstr "usar blobs vacíos como fuente de renombramiento"
 
-#: diff.c:5512
+#: diff.c:5530
 msgid "continue listing the history of a file beyond renames"
-msgstr "continua listando el historial de un archivo más allá de renombres"
+msgstr ""
+"continuar listando el historial de un archivo más allá de renombramientos"
 
-#: diff.c:5515
+#: diff.c:5533
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr ""
-"previene detección de renombre/copias si el número de objetivos para "
-"renombres/copias excede el límite dado"
+"prevenir detección de renombramientos/copias si el número de destinos para "
+"renombramientos/copias excede el límite dado"
 
-#: diff.c:5517
+#: diff.c:5535
 msgid "Diff algorithm options"
 msgstr "Opciones de algoritmos de diff"
 
-#: diff.c:5519
+#: diff.c:5537
 msgid "produce the smallest possible diff"
-msgstr "produce el diff más pequeño posible"
+msgstr "producir el diff más pequeño posible"
 
-#: diff.c:5522
+#: diff.c:5540
 msgid "ignore whitespace when comparing lines"
 msgstr "ignorar espacios en blanco cuando comparando líneas"
 
-#: diff.c:5525
+#: diff.c:5543
 msgid "ignore changes in amount of whitespace"
 msgstr "ignorar cambios en la cantidad de líneas en blanco"
 
-#: diff.c:5528
+#: diff.c:5546
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignorar cambios en espacios en blanco en EOL"
 
-#: diff.c:5531
+#: diff.c:5549
 msgid "ignore carrier-return at the end of line"
-msgstr "ignora carrier-return al final de la línea"
+msgstr "ignorar carrier-return al final de la línea"
 
-#: diff.c:5534
+#: diff.c:5552
 msgid "ignore changes whose lines are all blank"
-msgstr "ignora cambios cuyas líneas son todas en blanco"
+msgstr "ignorar cambios cuyas líneas son todas en blanco"
 
-#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
 msgid "<regex>"
 msgstr "<regex>"
 
-#: diff.c:5537
+#: diff.c:5555
 msgid "ignore changes whose all lines match <regex>"
-msgstr "ignora cambios cuyas líneas concuerdan con <regex>"
+msgstr "ignorar cambios cuyas líneas concuerdan con <regex>"
 
-#: diff.c:5540
+#: diff.c:5558
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "heurística para cambiar los límites de hunk para una fácil lectura"
 
-#: diff.c:5543
+#: diff.c:5561
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "genera un diff usando algoritmo \"patience diff\""
 
-#: diff.c:5547
+#: diff.c:5565
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "genera un diff usando algoritmo \"histogram diff\""
 
-#: diff.c:5549
+#: diff.c:5567
 msgid "<algorithm>"
 msgstr "<algoritmo>"
 
-#: diff.c:5550
+#: diff.c:5568
 msgid "choose a diff algorithm"
-msgstr "escoge un algoritmo para diff"
+msgstr "escoger un algoritmo para diff"
 
-#: diff.c:5552
+#: diff.c:5570
 msgid "<text>"
 msgstr "<texto>"
 
-#: diff.c:5553
+#: diff.c:5571
 msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "genera un diff usando algoritmo \"anchored diff\""
+msgstr "generar un diff usando algoritmo \"anchored diff\""
 
-#: diff.c:5555 diff.c:5564 diff.c:5567
+#: diff.c:5573 diff.c:5582 diff.c:5585
 msgid "<mode>"
 msgstr "<modo>"
 
-#: diff.c:5556
+#: diff.c:5574
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
-"muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"
+"mostrar diff por palabras usando <modo> para delimitar las palabras cambiadas"
 
-#: diff.c:5559
+#: diff.c:5577
 msgid "use <regex> to decide what a word is"
-msgstr "usa <regex> para decidir que palabra es"
+msgstr "usar <regex> para decidir qué es una palabra"
 
-#: diff.c:5562
+#: diff.c:5580
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"
 
-#: diff.c:5565
+#: diff.c:5583
 msgid "moved lines of code are colored differently"
 msgstr "líneas movidas de código están coloreadas diferente"
 
-#: diff.c:5568
+#: diff.c:5586
 msgid "how white spaces are ignored in --color-moved"
 msgstr "como espacios en blanco son ignorados en --color-moved"
 
-#: diff.c:5571
+#: diff.c:5589
 msgid "Other diff options"
 msgstr "Otras opciones de diff"
 
-#: diff.c:5573
+#: diff.c:5591
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
-"cuando ejecutado desde un subdir, excluye cambios del exterior y muestra "
+"cuando ejecutado desde un subdir, excluir cambios del exterior y muestra "
 "paths relativos"
 
-#: diff.c:5577
+#: diff.c:5595
 msgid "treat all files as text"
 msgstr "tratar todos los archivos como texto"
 
-#: diff.c:5579
+#: diff.c:5597
 msgid "swap two inputs, reverse the diff"
-msgstr "cambia dos inputs, invierte el diff"
+msgstr "cambiar dos inputs, invierte el diff"
 
-#: diff.c:5581
+#: diff.c:5599
 msgid "exit with 1 if there were differences, 0 otherwise"
-msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"
+msgstr "terminar con 1 si hubieron diferencias, de lo contrario con 0"
 
-#: diff.c:5583
+#: diff.c:5601
 msgid "disable all output of the program"
-msgstr "deshabilita todo el output del programa"
+msgstr "deshabilitar toda la salida del programa"
 
-#: diff.c:5585
+#: diff.c:5603
 msgid "allow an external diff helper to be executed"
-msgstr "permite la ejecución de un diff helper externo"
+msgstr "permitir la ejecución de un diff helper externo"
 
-#: diff.c:5587
+#: diff.c:5605
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
-"ejecuta filtros de conversión de texto externos cuando comparando binarios"
+"ejecutar filtros de conversión de texto externos cuando comparando binarios"
 
-#: diff.c:5589
+#: diff.c:5607
 msgid "<when>"
 msgstr "<cuando>"
 
-#: diff.c:5590
+#: diff.c:5608
 msgid "ignore changes to submodules in the diff generation"
 msgstr "ignorar cambios a submódulos en la generación de diff"
 
-#: diff.c:5593
+#: diff.c:5611
 msgid "<format>"
 msgstr "<formato>"
 
-#: diff.c:5594
+#: diff.c:5612
 msgid "specify how differences in submodules are shown"
-msgstr "especifica como son mostradas las diferencias en submódulos"
+msgstr "especificar como son mostradas las diferencias en submódulos"
 
-#: diff.c:5598
+#: diff.c:5616
 msgid "hide 'git add -N' entries from the index"
-msgstr "ocultar entradas 'git add -N' del index"
+msgstr "ocultar entradas 'git add -N' del índice"
 
-#: diff.c:5601
+#: diff.c:5619
 msgid "treat 'git add -N' entries as real in the index"
-msgstr "trata entradas 'git add -N' como reales en el index"
+msgstr "tratar entradas 'git add -N' como reales en el índice"
 
-#: diff.c:5603
+#: diff.c:5621
 msgid "<string>"
 msgstr "<string>"
 
-#: diff.c:5604
+#: diff.c:5622
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr ""
-"busca por diferencias que cambien el número de ocurrencias para el string "
+"buscar diferencias que cambien el número de ocurrencias del string "
 "especificado"
 
-#: diff.c:5607
+#: diff.c:5625
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr ""
-"busca por diferencias que cambien el número de ocurrencias para el regex "
+"buscar diferencias que cambien el número de ocurrencias del regex "
 "especificado"
 
-#: diff.c:5610
+#: diff.c:5628
 msgid "show all changes in the changeset with -S or -G"
 msgstr "mostrar todos los cambios en el changeset con -S o -G"
 
-#: diff.c:5613
+#: diff.c:5631
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "tratar <string> en -S como una expresión regular extendida de POSIX"
 
-#: diff.c:5616
+#: diff.c:5634
 msgid "control the order in which files appear in the output"
 msgstr "controlar el orden en el que los archivos aparecen en la salida"
 
-#: diff.c:5617 diff.c:5620
+#: diff.c:5635 diff.c:5638
 msgid "<path>"
 msgstr "<ruta>"
 
-#: diff.c:5618
+#: diff.c:5636
 msgid "show the change in the specified path first"
 msgstr "mostrar el cambio en la ruta especificada primero"
 
-#: diff.c:5621
+#: diff.c:5639
 msgid "skip the output to the specified path"
-msgstr "saltar el output de la ruta especificada"
+msgstr "saltar la salida de la ruta especificada"
 
-#: diff.c:5623
+#: diff.c:5641
 msgid "<object-id>"
-msgstr "<id-objeto>"
+msgstr "<id-de-objeto>"
 
-#: diff.c:5624
+#: diff.c:5642
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr ""
-"busca por diferencias que cambien el número de ocurrencias para el objeto "
+"buscar diferencias que cambien el número de ocurrencias para el objeto "
 "especificado"
 
-#: diff.c:5626
+#: diff.c:5644
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5627
+#: diff.c:5645
 msgid "select files by diff type"
-msgstr "selecciona archivos por tipo de diff"
+msgstr "seleccionar archivos por tipo de diff"
 
-#: diff.c:5629
+#: diff.c:5647
 msgid "<file>"
 msgstr "<archivo>"
 
-#: diff.c:5630
+#: diff.c:5648
 msgid "Output to a specific file"
 msgstr "Output a un archivo específico"
 
-#: diff.c:6287
-msgid "inexact rename detection was skipped due to too many files."
+#: diff.c:6306
+msgid "exhaustive rename detection was skipped due to too many files."
 msgstr ""
-"detección de cambio de nombre inexacta fue saltada por haber muchos archivos."
+"detección exhaustiva de cambio de nombre fue saltada por haber demasiados "
+"archivos."
 
-#: diff.c:6290
+#: diff.c:6309
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
-"solo se encontraron copias de rutas modificadas por haber muchos archivos."
+"solo se encontraron copias de rutas modificadas por haber demasiados "
+"archivos."
 
-#: diff.c:6293
+#: diff.c:6312
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3937,9 +3975,9 @@ msgstr ""
 #: diffcore-order.c:24
 #, c-format
 msgid "failed to read orderfile '%s'"
-msgstr "falló al leer orden de archivos '%s'"
+msgstr "falló al leer archivo de orden '%s'"
 
-#: diffcore-rename.c:1418
+#: diffcore-rename.c:1564
 msgid "Performing inexact rename detection"
 msgstr "Realizando una detección de cambios de nombre inexacta"
 
@@ -3948,479 +3986,556 @@ msgstr "Realizando una detección de cambios de nombre inexacta"
 msgid "No such path '%s' in the diff"
 msgstr "No hay ruta '%s' en el diff"
 
-#: dir.c:578
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr ""
-"ruta especificada '%s' no concordó con ningún archivo(s) conocido por git"
+msgstr "ruta especificada '%s' no concordó con ningún archivo conocido por git"
 
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr "patrón desconocido: '%s'"
 
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "patrón negativo no reconocido: '%s'"
 
-#: dir.c:809
+#: dir.c:820
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr ""
 "tu archivo sparse-checkout tal vez tenga errores: patrón '%s' está repetido"
 
-#: dir.c:819
+#: dir.c:830
 msgid "disabling cone pattern matching"
-msgstr "deshabilitar coincidencia de patrónes cono"
+msgstr "deshabilitar coincidencia de patrónes cónica"
 
-#: dir.c:1206
+#: dir.c:1214
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "no se puede usar %s como archivo de exclusión"
 
-#: dir.c:2314
+#: dir.c:2464
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "no se pudo abrir el directorio '%s'"
 
-#: dir.c:2614
+#: dir.c:2766
 msgid "failed to get kernel name and information"
-msgstr "falló al conseguir la información y nombre del kernel"
+msgstr "falló al conseguir el nombre y la información del kernel"
 
-#: dir.c:2738
+#: dir.c:2890
 msgid "untracked cache is disabled on this system or location"
 msgstr "untracked cache está desactivado en este sistema o ubicación"
 
-#: dir.c:3543
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"No se pudo adivinar ningún nombre de directorio.\n"
+"Por favor especifica un directorio en la línea de comando"
+
+#: dir.c:3837
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "archivo índice corrompido en repositorio %s"
 
-#: dir.c:3590 dir.c:3595
+#: dir.c:3884 dir.c:3889
 #, c-format
 msgid "could not create directories for %s"
 msgstr "no se pudo crear directorios para %s"
 
-#: dir.c:3624
+#: dir.c:3918
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "no se pudo migrar el directorio git de '%s' a '%s'"
 
-#: editor.c:74
+#: editor.c:77
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "ayuda: Esperando que tu editor cierre el archivo ...%c"
 
-#: entry.c:179
+#: entry.c:177
 msgid "Filtering content"
 msgstr "Filtrando contenido"
 
-#: entry.c:500
+#: entry.c:498
 #, c-format
 msgid "could not stat file '%s'"
-msgstr "no se pudo establecer el archivo '%s'"
+msgstr "no se pudo hacer stat en el archivo '%s'"
 
-#: environment.c:152
+#: environment.c:143
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "ruta de namespace de git mala \"%s\""
 
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "no se pudo configurar GIT_DIR a '%s'"
-
 #: exec-cmd.c:363
 #, c-format
 msgid "too many args to run %s"
-msgstr "demasiados argumentos para correr %s"
+msgstr "demasiados argumentos para ejecutar %s"
 
-#: fetch-pack.c:182
+#: fetch-pack.c:193
 msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: lista poco profunda esperada"
+msgstr "git fetch-pack: lista de superficiales esperada"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:196
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr ""
-"git fetch-pack: se esperaba un flush packet luego de la lista superficial"
+"git fetch-pack: se esperaba un flush packet luego de la lista de "
+"superficiales"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:207
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet"
 
-#: fetch-pack.c:216
+#: fetch-pack.c:227
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'"
 
-#: fetch-pack.c:227
+#: fetch-pack.c:238
 msgid "unable to write to remote"
 msgstr "no se puede escribir al remoto"
 
-#: fetch-pack.c:288
+#: fetch-pack.c:299
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc requiere multi_ack_detailed"
 
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:394 fetch-pack.c:1434
 #, c-format
 msgid "invalid shallow line: %s"
-msgstr "línea poco profunda inválida: %s"
+msgstr "línea shallow inválida: %s"
 
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:400 fetch-pack.c:1440
 #, c-format
 msgid "invalid unshallow line: %s"
-msgstr "línea superficial inválida: %s"
+msgstr "línea unshallow inválida: %s"
 
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:402 fetch-pack.c:1442
 #, c-format
 msgid "object not found: %s"
 msgstr "objeto no encontrado: %s"
 
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:405 fetch-pack.c:1445
 #, c-format
 msgid "error in object: %s"
 msgstr "error en objeto: %s"
 
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:407 fetch-pack.c:1447
 #, c-format
 msgid "no shallow found: %s"
-msgstr "superficie no encontrada: %s"
+msgstr "shallow no encontrado: %s"
 
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:410 fetch-pack.c:1451
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "se esperaba shallow/unshallow, se obtuvo %s"
 
-#: fetch-pack.c:439
+#: fetch-pack.c:450
 #, c-format
 msgid "got %s %d %s"
 msgstr "se obtuvo %s %d %s"
 
-#: fetch-pack.c:456
+#: fetch-pack.c:467
 #, c-format
 msgid "invalid commit %s"
 msgstr "commit inválido %s"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:498
 msgid "giving up"
 msgstr "rindiéndose"
 
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:511 progress.c:339
 msgid "done"
 msgstr "listo"
 
-#: fetch-pack.c:512
+#: fetch-pack.c:523
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "se obtuvo %s (%d) %s"
 
-#: fetch-pack.c:548
+#: fetch-pack.c:559
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Marcando %s como completa"
 
-#: fetch-pack.c:763
+#: fetch-pack.c:774
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ya se tiene %s (%s)"
 
-#: fetch-pack.c:849
+#: fetch-pack.c:860
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral"
+msgstr "fetch-pack: no se puede ejecutar un demultiplexor de banda lateral"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:868
 msgid "protocol error: bad pack header"
-msgstr "error de protocolo: paquete de header erróneo"
+msgstr "error de protocolo: header de paquete erróneo"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:962
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack: no se puede quitar %s"
+msgstr "fetch-pack: no se puede ejecutar %s"
 
-#: fetch-pack.c:957
+#: fetch-pack.c:968
 msgid "fetch-pack: invalid index-pack output"
-msgstr "fetch-pack: salida de paquete de índice no válida"
+msgstr "fetch-pack: salida de index-pack no válida"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:985
 #, c-format
 msgid "%s failed"
 msgstr "%s falló"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:987
 msgid "error in sideband demultiplexer"
 msgstr "error en demultiplexor de banda lateral"
 
-#: fetch-pack.c:1019
+#: fetch-pack.c:1030
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Versión de servidor es %.*s"
 
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
-#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: 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
 #, c-format
 msgid "Server supports %s"
 msgstr "El servidor soporta %s"
 
-#: fetch-pack.c:1029
+#: fetch-pack.c:1040
 msgid "Server does not support shallow clients"
 msgstr "El servidor no soporta clientes superficiales"
 
-#: fetch-pack.c:1089
+#: fetch-pack.c:1100
 msgid "Server does not support --shallow-since"
-msgstr "El servidor no soporta --shalow-since"
+msgstr "El servidor no soporta --shallow-since"
 
-#: fetch-pack.c:1094
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-exclude"
-msgstr "El servidor no soporta --shalow-exclude"
+msgstr "El servidor no soporta --shallow-exclude"
 
-#: fetch-pack.c:1098
+#: fetch-pack.c:1109
 msgid "Server does not support --deepen"
 msgstr "El servidor no soporta --deepen"
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1111
 msgid "Server does not support this repository's object format"
 msgstr "El servidor no soporta el formato de objetos de este repositorio"
 
-#: fetch-pack.c:1113
+#: fetch-pack.c:1124
 msgid "no common commits"
 msgstr "no hay commits comunes"
 
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
 msgstr "el repositorio fuente es superficial, rechazando clonado."
 
-#: fetch-pack.c:1128 fetch-pack.c:1651
+#: fetch-pack.c:1139 fetch-pack.c:1671
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: fetch falló."
 
-#: fetch-pack.c:1242
+#: fetch-pack.c:1253
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "algoritmos no compatibles: cliente %s; servidor %s"
 
-#: fetch-pack.c:1246
+#: fetch-pack.c:1257
 #, c-format
 msgid "the server does not support algorithm '%s'"
-msgstr "servidor no soporta el algoritmo '%s'"
+msgstr "el servidor no soporta el algoritmo '%s'"
 
-#: fetch-pack.c:1279
+#: fetch-pack.c:1290
 msgid "Server does not support shallow requests"
 msgstr "El servidor no soporta peticiones superficiales"
 
-#: fetch-pack.c:1286
+#: fetch-pack.c:1297
 msgid "Server supports filter"
-msgstr "El servidor soporta filtro"
+msgstr "El servidor soporta filtración"
 
-#: fetch-pack.c:1329 fetch-pack.c:2034
+#: fetch-pack.c:1340 fetch-pack.c:2053
 msgid "unable to write request to remote"
 msgstr "no se puede escribir request al remoto"
 
-#: fetch-pack.c:1347
+#: fetch-pack.c:1358
 #, c-format
 msgid "error reading section header '%s'"
-msgstr "error leyendo sección header '%s'"
+msgstr "error al leer header de sección '%s'"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1364
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "se esperaba '%s', se recibió '%s'"
 
-#: fetch-pack.c:1387
+#: fetch-pack.c:1398
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "línea de confirmación inesperada: '%s'"
 
-#: fetch-pack.c:1392
+#: fetch-pack.c:1403
 #, c-format
 msgid "error processing acks: %d"
-msgstr "error procesando acks: %d"
+msgstr "error al procesar acks: %d"
 
-#: fetch-pack.c:1402
+#: fetch-pack.c:1413
 msgid "expected packfile to be sent after 'ready'"
-msgstr "espere que el packfile sea mandado luego del 'listo'"
+msgstr "se esperaba que el packfile fuera enviado luego del 'listo'"
 
-#: fetch-pack.c:1404
+#: fetch-pack.c:1415
 msgid "expected no other sections to be sent after no 'ready'"
-msgstr "espere que ninguna otra sección sea enviada luego del 'listo'"
+msgstr "se esperaba que ninguna otra sección fuera enviada luego del 'listo'"
 
-#: fetch-pack.c:1445
+#: fetch-pack.c:1456
 #, c-format
 msgid "error processing shallow info: %d"
-msgstr "error procesando información superficial: %d"
+msgstr "error al procesar información de superficiales: %d"
 
-#: fetch-pack.c:1494
+#: fetch-pack.c:1505
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "se esperaba wanted-ref, se obtuvo '%s'"
 
-#: fetch-pack.c:1499
+#: fetch-pack.c:1510
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref inesperado: '%s'"
 
-#: fetch-pack.c:1504
+#: fetch-pack.c:1515
 #, c-format
 msgid "error processing wanted refs: %d"
-msgstr "error procesando refs deseadas: %d"
+msgstr "error al procesar refs deseadas: %d"
 
-#: fetch-pack.c:1534
+#: fetch-pack.c:1545
 msgid "git fetch-pack: expected response end packet"
-msgstr "git fetch-pack: se espera un paquete final de respuesta"
+msgstr "git fetch-pack: se esperaba un paquete final de respuesta"
 
-#: fetch-pack.c:1930
+#: fetch-pack.c:1949
 msgid "no matching remote head"
 msgstr "no concuerda el head remoto"
 
-#: fetch-pack.c:1953 builtin/clone.c:697
+#: fetch-pack.c:1972 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
-msgstr "remoto no mando todos los objetos necesarios"
+msgstr "remoto no mandó todos los objetos necesarios"
 
-#: fetch-pack.c:2056
+#: fetch-pack.c:2075
 msgid "unexpected 'ready' from remote"
 msgstr "'listo' inesperado del remoto"
 
-#: fetch-pack.c:2079
+#: fetch-pack.c:2098
 #, c-format
 msgid "no such remote ref %s"
 msgstr "no existe ref remota %s"
 
-#: fetch-pack.c:2082
+#: fetch-pack.c:2101
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"
 
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
 msgid "could not create temporary file"
 msgstr "no se pudo crear archivo temporal"
 
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "falló al escribir la firma separada para '%s'"
 
-#: gpg-interface.c:470
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile necesita ser configurado y existe para "
+"verificación de firmas ssh"
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify se necesita para la verficación de ssh "
+"(disponible en openssh versión 8.2p1+)"
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "archivo de revocación de firmas ssh configurado pero no encontrado: %s"
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "firma mala/incompatible '%s'"
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "error al conseguir la huella de ssh para la llave '%s'"
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "user.signingkey o gpg.ssh.defaultKeyCommand necesitan ser configurados"
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand exitoso pero no retornó ninguna llave: %s %s"
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand falló: %s %s"
+
+#: gpg-interface.c:874
 msgid "gpg failed to sign the data"
-msgstr "gpg falló al firmar la data"
+msgstr "gpg falló al firmar los datos"
+
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey necesita ser configurado para firmar con ssh"
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "falló al escribir la llave de firma para '%s'"
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "falló al escribir el buffer para lla llave de firma para '%s'"
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y signs se necesita para el firmado con ssh (disponible en "
+"openssh versión 8.2p1+)"
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "falló al leer la firma ssh desde '%s'"
 
 #: graph.c:98
 #, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr "ignora color inválido '%.*s' en log.graphColors"
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "ignorado color inválido '%.*s' en log.graphColors"
 
-#: grep.c:531
+#: grep.c:533
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
 msgstr ""
-"el patrón provisto contiene bytes NULL (via -f <archivo>). Esto solo es "
+"el patrón provisto contiene bytes NULL (vía -f <archivo>). Esto solo es "
 "soportado con -P bajo PCRE v2"
 
-#: grep.c:1893
+#: grep.c:1928
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': no es posible leer %s"
 
-#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
 #: builtin/rm.c:136
 #, c-format
 msgid "failed to stat '%s'"
-msgstr "falló al marcar '%s'"
+msgstr "falló al hacer stat en '%s'"
 
-#: grep.c:1921
+#: grep.c:1956
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': lectura corta"
 
-#: help.c:23
+#: help.c:24
 msgid "start a working area (see also: git help tutorial)"
-msgstr "comienza un área de trabajo (ver también: git help tutorial)"
+msgstr "comenzar un área de trabajo (mira también: git help tutorial)"
 
-#: help.c:24
+#: help.c:25
 msgid "work on the current change (see also: git help everyday)"
-msgstr "trabaja en los cambios actuales (ver también: git help everyday)"
+msgstr "trabajar en los cambios actuales (mira también: git help everyday)"
 
-#: help.c:25
+#: help.c:26
 msgid "examine the history and state (see also: git help revisions)"
-msgstr "examina el historial y el estado (ver también: git help revisions)"
+msgstr "examinar el historial y el estado (mira también: git help revisions)"
 
-#: help.c:26
+#: help.c:27
 msgid "grow, mark and tweak your common history"
-msgstr "crece, marca y ajusta tu historial común"
+msgstr "crecer, marcar y ajustar tu historial común"
 
-#: help.c:27
+#: help.c:28
 msgid "collaborate (see also: git help workflows)"
-msgstr "colabora (mira también: git help workflows)"
+msgstr "colaborar (mira también: git help workflows)"
 
-#: help.c:31
+#: help.c:32
 msgid "Main Porcelain Commands"
 msgstr "Comandos de Porcelana principales"
 
-#: help.c:32
+#: help.c:33
 msgid "Ancillary Commands / Manipulators"
 msgstr "Comandos auxiliares / Manipuladores"
 
-#: help.c:33
+#: help.c:34
 msgid "Ancillary Commands / Interrogators"
 msgstr "Comandos auxiliares / Interrogadores"
 
-#: help.c:34
+#: help.c:35
 msgid "Interacting with Others"
-msgstr "Interactuando con Otros"
+msgstr "Interactuar con Otros"
 
-#: help.c:35
+#: help.c:36
 msgid "Low-level Commands / Manipulators"
 msgstr "Comandos de bajo nivel / Manipuladores"
 
-#: help.c:36
+#: help.c:37
 msgid "Low-level Commands / Interrogators"
 msgstr "Comandos de bajo nivel / Interrogadores"
 
-#: help.c:37
+#: help.c:38
 msgid "Low-level Commands / Syncing Repositories"
 msgstr "Comandos de bajo nivel / Sincronización de repositorios"
 
-#: help.c:38
+#: help.c:39
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Comandos de bajo nivel / Auxiliares internos"
 
-#: help.c:300
+#: help.c:313
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "comandos disponibles de git en '%s'"
 
-#: help.c:307
+#: help.c:320
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "comandos disponibles de git desde otro lugar en tu $PATH"
 
-#: help.c:316
+#: help.c:329
 msgid "These are common Git commands used in various situations:"
 msgstr "Estos son comandos comunes de Git usados en varias situaciones:"
 
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
-msgstr "comando de listado de tipos no soportado '%s'"
+msgstr "tipo de listado de comandos no soportado '%s'"
 
-#: help.c:405
+#: help.c:418
 msgid "The Git concept guides are:"
 msgstr "Las guías de conceptos de Git son:"
 
-#: help.c:429
+#: help.c:442
 msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Vea 'git help <comando>' para leer sobre los subcomandos específicos"
+msgstr "Mira 'git help <comando>' para leer sobre los subcomandos específicos"
 
-#: help.c:434
+#: help.c:447
 msgid "External commands"
 msgstr "Comandos externos"
 
-#: help.c:449
+#: help.c:462
 msgid "Command aliases"
 msgstr "Aliases de comando"
 
-#: help.c:527
+#: help.c:543
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -4429,31 +4544,36 @@ msgstr ""
 "'%s' parece ser un comando de git, pero no hemos\n"
 "podido ejecutarlo. ¿Tal vez git-%s se ha roto?"
 
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git: '%s'no es un comando de git. Mira 'git --help'."
+msgstr "git: '%s' no es un comando de git. Mira 'git --help'."
 
-#: help.c:591
+#: help.c:613
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Oh oh. Tu sistema no reporta ningún comando de Git."
 
-#: help.c:613
+#: help.c:635
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe."
 
-#: help.c:618
+#: help.c:640
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "Continuando asumiendo que quisiste decir '%s'."
 
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr "Ejecutar '%s' en su lugar? (y/N)"
+
+#: help.c:654
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'."
+msgstr "Continuando en %0.1f segundos, asumiendo que quisiste decir '%s'."
 
-#: help.c:635
+#: help.c:666
 msgid ""
 "\n"
 "The most similar command is"
@@ -4467,16 +4587,16 @@ msgstr[1] ""
 "\n"
 "Los comandos más similares son"
 
-#: help.c:675
+#: help.c:706
 msgid "git version [<options>]"
-msgstr "git versión [<opciones>]"
+msgstr "git version [<opciones>]"
 
-#: help.c:730
+#: help.c:761
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:734
+#: help.c:765
 msgid ""
 "\n"
 "Did you mean this?"
@@ -4490,6 +4610,15 @@ msgstr[1] ""
 "\n"
 "¿Quisiste decir alguno de estos?"
 
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"El hook '%s' fue ignorado porque no ha sido configurado como ejecutable.\n"
+"Puedes desactivar esta advertencia con `git config advice.ignoredHook false`."
+
 #: ident.c:353
 msgid "Author identity unknown\n"
 msgstr "Identidad del autor desconocido\n"
@@ -4515,7 +4644,7 @@ msgstr ""
 "\n"
 "*** Por favor cuéntame quién eres.\n"
 "\n"
-"Corre\n"
+"Ejecuta\n"
 "\n"
 "  git config --global user.email \"you@example.com\"\n"
 "  git config --global user.name \"Tu Nombre\"\n"
@@ -4526,7 +4655,7 @@ msgstr ""
 
 #: ident.c:397
 msgid "no email was given and auto-detection is disabled"
-msgstr "no se entrego ningún email y la detección automática está desactivada"
+msgstr "no se entregó ningún email y la detección automática está desactivada"
 
 #: ident.c:402
 #, c-format
@@ -4535,7 +4664,7 @@ msgstr "no es posible auto-detectar la dirección de correo (se obtuvo '%s')"
 
 #: ident.c:419
 msgid "no name was given and auto-detection is disabled"
-msgstr "no se entrego ningún nombre y la detección automática está desactivada"
+msgstr "no se entregó ningún nombre y la detección automática está desactivada"
 
 #: ident.c:425
 #, c-format
@@ -4545,14 +4674,14 @@ msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')"
 #: ident.c:433
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
-msgstr "no se puede tener un nombre vacío (para <%s>)"
+msgstr "no se puede tener un nombre de identidad vacío (para <%s>)"
 
 #: ident.c:439
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr "el nombre consiste solo de caracteres no permitidos: %s"
 
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
 #, c-format
 msgid "invalid date format: %s"
 msgstr "formato de fecha inválido: %s"
@@ -4567,13 +4696,13 @@ msgstr "soporte para filtros sparse:path ha sido discontinuado"
 
 #: list-objects-filter-options.c:105
 #, c-format
-msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
 msgstr "'%s' para 'object:type=<type>' no es un objeto válido"
 
 #: list-objects-filter-options.c:124
 #, c-format
 msgid "invalid filter-spec '%s'"
-msgstr "filtro -spec inválido '%s'"
+msgstr "especificación de filtro inválida '%s'"
 
 #: list-objects-filter-options.c:140
 #, c-format
@@ -4591,7 +4720,7 @@ msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro"
 #: list-objects-filter-options.c:376
 msgid "unable to upgrade repository format to support partial clone"
 msgstr ""
-"no es posible actualizar el formato del repositorio para soportar clonado "
+"no es posible actualizar el formato del repositorio para soportar clonación "
 "parcial"
 
 #: list-objects-filter.c:532
@@ -4607,14 +4736,14 @@ msgstr "incapaz de analizar filtro de data en %s"
 #: list-objects.c:127
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "entrada '%s' en árbol %s tiene modo árbol, pero no es uno"
+msgstr "entrada '%s' en árbol %s tiene modo árbol, pero no lo es"
 
 #: list-objects.c:140
 #, c-format
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "entrada '%s' en árbol %s tiene modo blob, pero no es uno"
+msgstr "entrada '%s' en árbol %s tiene modo blob, pero no lo es"
 
-#: list-objects.c:395
+#: list-objects.c:398
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "no se puede cargar árbol raíz para commit %s"
@@ -4632,10 +4761,10 @@ msgid ""
 msgstr ""
 "No se puede crear '%s.lock': %s.\n"
 "\n"
-"Otro proceso git parece estar corriendo en el repositorio, es decir\n"
-"un editor abierto con 'git commit'. Por favor asegúrese de que todos los "
+"Otro proceso git parece estar ejecutando en el repositorio, es decir\n"
+"un editor abierto con 'git commit'. Por favor asegúrate de que todos los "
 "procesos\n"
-"están terminados y vuelve a intentar. Si el fallo permanece, un proceso git\n"
+"estén terminados y vuelve a intentar. Si el fallo permanece, un proceso git\n"
 "puede haber roto el repositorio antes:\n"
 "borra el archivo manualmente para continuar."
 
@@ -4649,7 +4778,12 @@ msgstr "No se pudo crear '%s.lock': %s"
 msgid "invalid value '%s' for lsrefs.unborn"
 msgstr "valor inválido '%s' para lsrefs.unborn"
 
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "línea inesperada: '%s'"
+
+#: ls-refs.c:178
 msgid "expected flush after ls-refs arguments"
 msgstr "se esperaba un flush luego de argumentos ls-refs"
 
@@ -4657,37 +4791,37 @@ msgstr "se esperaba un flush luego de argumentos ls-refs"
 msgid "quoted CRLF detected"
 msgstr "CRLF con comillas detectado"
 
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
 #, c-format
 msgid "bad action '%s' for '%s'"
 msgstr "mala acción '%s' para '%s'"
 
-#: merge-ort.c:1116 merge-recursive.c:1205
+#: merge-ort.c:1584 merge-recursive.c:1211
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Falló al fusionar el submódulo %s (no revisado)"
 
-#: merge-ort.c:1125 merge-recursive.c:1212
+#: merge-ort.c:1593 merge-recursive.c:1218
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "Falló al fusionar el submódulo %s (commits no presentes)"
 
-#: merge-ort.c:1134 merge-recursive.c:1219
+#: merge-ort.c:1602 merge-recursive.c:1225
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)"
+msgstr "Falló el fusionar submódulo %s (commits no siguen la base de fusión)"
 
-#: merge-ort.c:1144 merge-ort.c:1151
+#: merge-ort.c:1612 merge-ort.c:1620
 #, c-format
 msgid "Note: Fast-forwarding submodule %s to %s"
 msgstr "Nota: Fast-forward de submódulo %s a %s"
 
-#: merge-ort.c:1172
+#: merge-ort.c:1642
 #, c-format
 msgid "Failed to merge submodule %s"
-msgstr "falló al fusionar el submódulo %s"
+msgstr "Falló al fusionar el submódulo %s"
 
-#: merge-ort.c:1179
+#: merge-ort.c:1649
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4697,7 +4831,7 @@ msgstr ""
 "fusión:\n"
 "%s\n"
 
-#: merge-ort.c:1183 merge-recursive.c:1273
+#: merge-ort.c:1653 merge-recursive.c:1281
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -4714,30 +4848,31 @@ msgstr ""
 "\n"
 "el cual aceptará esta sugerencia.\n"
 
-#: merge-ort.c:1196
+#: merge-ort.c:1666
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but multiple possible merges exist:\n"
 "%s"
 msgstr ""
-"Falló al fusionar el submódulo %s, pero existen múltipes fusiones posibles:\n"
+"Falló al fusionar el submódulo %s, pero existen múltiples fusiones "
+"posibles:\n"
 "%s"
 
-#: merge-ort.c:1415 merge-recursive.c:1362
+#: merge-ort.c:1887 merge-recursive.c:1372
 msgid "Failed to execute internal merge"
 msgstr "Falló al ejecutar la fusión interna"
 
-#: merge-ort.c:1420 merge-recursive.c:1367
+#: merge-ort.c:1892 merge-recursive.c:1377
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "No es posible agregar %s a la base de datos"
 
-#: merge-ort.c:1427 merge-recursive.c:1400
+#: merge-ort.c:1899 merge-recursive.c:1410
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Auto-fusionando %s"
 
-#: merge-ort.c:1566 merge-recursive.c:2122
+#: merge-ort.c:2038 merge-recursive.c:2132
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4747,27 +4882,27 @@ msgstr ""
 "existente en %s se interpone con el cambio de nombres implícito, poniendo "
 "la(s) siguiente(s) ruta(s) aquí: %s."
 
-#: merge-ort.c:1576 merge-recursive.c:2132
+#: merge-ort.c:2048 merge-recursive.c:2142
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
 "implicit directory renames tried to put these paths there: %s"
 msgstr ""
-"CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "
-"para %s; cambio de nombre implícito intentó poner estas rutas: %s"
+"CONFLICTO (cambio de nombre de directorio implícito): No se puede mapear más "
+"de una ruta para %s; cambio de nombre implícito intentó poner estas rutas: %s"
 
-#: merge-ort.c:1634
+#: merge-ort.c:2106
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
 "renamed to multiple other directories, with no destination getting a "
 "majority of the files."
 msgstr ""
-"CONFLICTO (división de cambio de nombre de directorio): No está claro dónde "
+"CONFLICTO (división de cambio de nombre de directorio): No está claro a qué "
 "cambiar el nombre de %s; se le cambió el nombre a varios otros directorios, "
-"sin que ningún destino obtenga la mayoría de los archivos."
+"sin que ningún destino obtuviera la mayoría de los archivos."
 
-#: merge-ort.c:1788 merge-recursive.c:2468
+#: merge-ort.c:2260 merge-recursive.c:2478
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4776,7 +4911,7 @@ msgstr ""
 "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
 "renombrado."
 
-#: merge-ort.c:1932 merge-recursive.c:3244
+#: merge-ort.c:2400 merge-recursive.c:3261
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4785,7 +4920,7 @@ msgstr ""
 "Path actualizado: %s agregado en %s dentro de un directorio que fue "
 "renombrado en %s; moviéndolo a %s."
 
-#: merge-ort.c:1939 merge-recursive.c:3251
+#: merge-ort.c:2407 merge-recursive.c:3268
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4794,7 +4929,7 @@ msgstr ""
 "Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "
 "renombrado en %s; moviéndolo a %s."
 
-#: merge-ort.c:1952 merge-recursive.c:3247
+#: merge-ort.c:2420 merge-recursive.c:3264
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4803,7 +4938,7 @@ msgstr ""
 "CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio "
 "que fue renombrado en %s, sugerimos que debería ser movido a %s."
 
-#: merge-ort.c:1960 merge-recursive.c:3254
+#: merge-ort.c:2428 merge-recursive.c:3271
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4813,87 +4948,87 @@ msgstr ""
 "directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "
 "movido a %s."
 
-#: merge-ort.c:2103
+#: merge-ort.c:2584
 #, c-format
 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
 msgstr ""
 "CONFLICTO (renombrar / renombrar): %s renombrado a %s en %s y %s en %s."
 
-#: merge-ort.c:2198
+#: merge-ort.c:2679
 #, c-format
 msgid ""
 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
 "conflicts AND collides with another path; this may result in nested conflict "
 "markers."
 msgstr ""
-"CONFLICTO (cambio de nombre involucrado en colisión): cambio de nombre de%s -"
-">%s tiene conflictos de contenido Y colisiona con otra ruta; esto puede "
+"CONFLICTO (cambio de nombre involucrado en colisión): cambio de nombre de %s "
+"->%s tiene conflictos de contenido Y colisiona con otra ruta; esto puede "
 "resultar en marcadores de conflicto anidados."
 
-#: merge-ort.c:2217 merge-ort.c:2241
+#: merge-ort.c:2698 merge-ort.c:2722
 #, c-format
 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr ""
 "CONFLICTO (renombrar / eliminar): %s renombrado a %s en %s, pero eliminado "
 "en %s."
 
-#: merge-ort.c:2550 merge-recursive.c:3002
+#: merge-ort.c:3212 merge-recursive.c:3022
 #, c-format
 msgid "cannot read object %s"
 msgstr "no se pudo leer el objeto %s"
 
-#: merge-ort.c:2553 merge-recursive.c:3005
+#: merge-ort.c:3215 merge-recursive.c:3025
 #, c-format
 msgid "object %s is not a blob"
 msgstr "objeto %s no es un blob"
 
-#: merge-ort.c:2981
+#: merge-ort.c:3644
 #, c-format
 msgid ""
 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
 "%s instead."
 msgstr ""
-"CONFLICTO (archivo / directorio): directorio en el camino de%s de%s; "
-"moviéndolo a%s en su lugar."
+"CONFLICTO (archivo / directorio): directorio en el camino de %s de %s; "
+"moviéndolo a %s en su lugar."
 
-#: merge-ort.c:3055
+#: merge-ort.c:3721
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed both "
 "of them so each can be recorded somewhere."
 msgstr ""
-"CONFLICTO (tipos distintos):%s tenía tipos diferentes en cada lado; "
-"renombrado ambos para que cada uno pueda ser grabado en algún lugar "
+"CONFLICTO (tipos distintos): %s tenía tipos diferentes en cada lado; ambos "
+"fueron renombrados para que cada uno pueda ser grabado en algún lugar "
 "diferente."
 
-#: merge-ort.c:3062
+#: merge-ort.c:3728
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed one "
 "of them so each can be recorded somewhere."
 msgstr ""
-"CONFLICTO (tipos distintos):%s tenía tipos diferentes en cada lado; "
-"renombrado uno de ellos para que cada uno pueda ser grabado en algún lugar "
+"CONFLICTO (tipos distintos): %s tenía tipos diferentes en cada lado; uno de "
+"ellos fue renombrado para que cada uno pueda ser grabado en algún lugar "
 "diferente."
 
-#: merge-ort.c:3162 merge-recursive.c:3081
+#: merge-ort.c:3819 merge-recursive.c:3101
 msgid "content"
 msgstr "contenido"
 
-#: merge-ort.c:3164 merge-recursive.c:3085
+#: merge-ort.c:3821 merge-recursive.c:3105
 msgid "add/add"
 msgstr "agregar/agregar"
 
-#: merge-ort.c:3166 merge-recursive.c:3130
+#: merge-ort.c:3823 merge-recursive.c:3150
 msgid "submodule"
 msgstr "submódulo"
 
-#: merge-ort.c:3168 merge-recursive.c:3131
+#: merge-ort.c:3825 merge-recursive.c:3151
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
 
-#: merge-ort.c:3198
+#: merge-ort.c:3856
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -4902,7 +5037,7 @@ msgstr ""
 "CONFLICTO (modificar / eliminar): %s eliminado en %s y modificado en %s. "
 "Versión %s de %s restante en el árbol."
 
-#: merge-ort.c:3433
+#: merge-ort.c:4152
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4914,13 +5049,13 @@ 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:3730
+#: merge-ort.c:4521
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr ""
-"La recopilación de información de fusión falló para los árboles %s, %s, %s"
+"la recopilación de información de fusión falló para los árboles %s, %s, %s"
 
-#: merge-ort-wrappers.c:13 merge-recursive.c:3699
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4930,115 +5065,115 @@ msgstr ""
 "merge:\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
 msgid "Already up to date."
 msgstr "Ya está actualizado."
 
-#: merge-recursive.c:356
+#: merge-recursive.c:353
 msgid "(bad commit)\n"
 msgstr "(commit erróneo)\n"
 
-#: merge-recursive.c:379
+#: merge-recursive.c:381
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión."
 
-#: merge-recursive.c:388
+#: merge-recursive.c:390
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr "add_cacheinfo falló para refrescar la ruta '%s'; abortando fusión."
+msgstr "add_cacheinfo falló al refrescar la ruta '%s'; abortando fusión."
 
-#: merge-recursive.c:876
+#: merge-recursive.c:881
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "falló al crear la ruta '%s'%s"
 
-#: merge-recursive.c:887
+#: merge-recursive.c:892
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
-msgstr "Removiendo %s para hacer espacio para un subdirectorio\n"
+msgstr "Quitando %s para hacer espacio para un subdirectorio\n"
 
-#: merge-recursive.c:901 merge-recursive.c:920
+#: merge-recursive.c:906 merge-recursive.c:925
 msgid ": perhaps a D/F conflict?"
 msgstr ": ¿tal vez un conflicto D/F?"
 
-#: merge-recursive.c:910
+#: merge-recursive.c:915
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
-msgstr "rehusando perder el archivo rastreado en '%s'"
+msgstr "rehusando perder el archivo no rastreado en '%s'"
 
-#: merge-recursive.c:951 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "no se puede leer el objeto %s '%s'"
 
-#: merge-recursive.c:956
+#: merge-recursive.c:961
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "se esperaba blob para %s '%s'"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:986
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "falló al abrir '%s': %s"
 
-#: merge-recursive.c:992
+#: merge-recursive.c:997
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "falló al crear el enlace simbólico '%s': %s"
 
-#: merge-recursive.c:997
+#: merge-recursive.c:1002
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
-msgstr "no se que hacer con %06o %s '%s'"
+msgstr "no sé qué hacer con %06o %s '%s'"
 
-#: merge-recursive.c:1227 merge-recursive.c:1239
+#: merge-recursive.c:1233 merge-recursive.c:1246
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "Haciendo fast-forward a submódulo %s para el siguiente commit:"
+msgstr "Haciendo fast-forward a submódulo %s hasta el siguiente commit:"
 
-#: merge-recursive.c:1230 merge-recursive.c:1242
+#: merge-recursive.c:1236 merge-recursive.c:1249
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Avance rápido en submódulo %s"
 
-#: merge-recursive.c:1265
+#: merge-recursive.c:1273
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)"
 
-#: merge-recursive.c:1269
+#: merge-recursive.c:1277
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)"
+msgstr "Falló al fusionar el submódulo %s (avance rápido no es posible)"
 
-#: merge-recursive.c:1270
+#: merge-recursive.c:1278
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "Se encontró una posible solución de fusión para el submódulo:\n"
 
-#: merge-recursive.c:1282
+#: merge-recursive.c:1290
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)"
+msgstr "Falló al fusionar el submódulo %s (múltiples fusiones encontradas)"
 
-#: merge-recursive.c:1424
+#: merge-recursive.c:1434
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 "Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en "
 "cambio."
 
-#: merge-recursive.c:1496
+#: merge-recursive.c:1506
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree."
 msgstr ""
-"CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s "
-"en el árbol."
+"CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Se dejó la versión %s de "
+"%s en el árbol."
 
-#: merge-recursive.c:1501
+#: merge-recursive.c:1511
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5047,7 +5182,7 @@ msgstr ""
 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
 "permanece en el árbol."
 
-#: merge-recursive.c:1508
+#: merge-recursive.c:1518
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5056,7 +5191,7 @@ msgstr ""
 "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "
 "dejada en el árbol, en %s."
 
-#: merge-recursive.c:1513
+#: merge-recursive.c:1523
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5065,44 +5200,44 @@ msgstr ""
 "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
 "permanece en el árbol en %s."
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "rename"
 msgstr "renombrar"
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "renamed"
 msgstr "renombrado"
 
-#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Rehusando perder el archivo sucio en %s"
 
-#: merge-recursive.c:1609
+#: merge-recursive.c:1619
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 "Rehusando perder el archivo no rastreado en %s, incluso aunque se está "
 "interponiendo."
 
-#: merge-recursive.c:1667
+#: merge-recursive.c:1677
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s.  %s agregado en %s"
 
-#: merge-recursive.c:1698
+#: merge-recursive.c:1708
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s es un directorio en %s agregando como %s más bien"
 
-#: merge-recursive.c:1703
+#: merge-recursive.c:1713
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 "Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio"
 
-#: merge-recursive.c:1730
+#: merge-recursive.c:1740
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5111,18 +5246,18 @@ msgstr ""
 "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "
 "renombrar \"%s\"->\"%s\" en \"%s\"%s"
 
-#: merge-recursive.c:1735
+#: merge-recursive.c:1745
 msgid " (left unresolved)"
 msgstr " (dejado sin resolver)"
 
-#: merge-recursive.c:1827
+#: merge-recursive.c:1837
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en "
 "%s"
 
-#: merge-recursive.c:2090
+#: merge-recursive.c:2100
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5130,10 +5265,10 @@ msgid ""
 "getting a majority of the files."
 msgstr ""
 "CONFLICTO (división de cambio de nombre de directorio): No es claro dónde "
-"colocar %s porque el directorio %s fue renombrado a otros múltiples "
+"colocar %s porque el directorio %s fue renombrado a múltiples otros "
 "directorios, sin ningún que contenga la mayoría de archivos."
 
-#: merge-recursive.c:2224
+#: merge-recursive.c:2234
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5142,81 +5277,81 @@ msgstr ""
 "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "
 "Renombrar directorio %s->%s en %s"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modify"
 msgstr "modificar"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modified"
 msgstr "modificado"
 
-#: merge-recursive.c:3108
+#: merge-recursive.c:3128
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Saltado %s (fusionado como existente)"
 
-#: merge-recursive.c:3161
+#: merge-recursive.c:3181
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Agregando más bien como %s"
 
-#: merge-recursive.c:3368
+#: merge-recursive.c:3385
 #, c-format
 msgid "Removing %s"
 msgstr "Eliminando %s"
 
-#: merge-recursive.c:3391
+#: merge-recursive.c:3408
 msgid "file/directory"
 msgstr "archivo/directorio"
 
-#: merge-recursive.c:3396
+#: merge-recursive.c:3413
 msgid "directory/file"
 msgstr "directorio/archivo"
 
-#: merge-recursive.c:3403
+#: merge-recursive.c:3420
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como "
 "%s"
 
-#: merge-recursive.c:3412
+#: merge-recursive.c:3429
 #, c-format
 msgid "Adding %s"
 msgstr "Agregando %s"
 
-#: merge-recursive.c:3421
+#: merge-recursive.c:3438
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "CONFLICTO (add/add): Conflicto de merge en %s"
 
-#: merge-recursive.c:3474
+#: merge-recursive.c:3491
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "falló la fusión de los árboles %s y %s"
 
-#: merge-recursive.c:3568
+#: merge-recursive.c:3585
 msgid "Merging:"
 msgstr "Fusionando:"
 
-#: merge-recursive.c:3581
+#: merge-recursive.c:3598
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "se encontró %u ancestro común:"
 msgstr[1] "se encontraron %u ancestros comunes:"
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3648
 msgid "merge returned no commit"
 msgstr "la fusión no devolvió ningún commit"
 
-#: merge-recursive.c:3796
+#: merge-recursive.c:3816
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "No se pudo analizar el objeto '%s'"
 
-#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr "Incapaz de escribir el índice."
 
@@ -5224,188 +5359,230 @@ msgstr "Incapaz de escribir el índice."
 msgid "failed to read the cache"
 msgstr "falló al leer la cache"
 
-#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
-#: builtin/stash.c:267
+#: 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
+#: builtin/stash.c:269
 msgid "unable to write new index file"
 msgstr "no es posible escribir el archivo índice"
 
-#: midx.c:74
+#: midx.c:78
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr ""
-"El abanico de OID de índice de paquetes múltiples es del tamaño incorrecto"
+"el abanico de OID de índice de paquetes múltiples es del tamaño incorrecto"
 
-#: midx.c:105
+#: midx.c:109
 #, c-format
 msgid "multi-pack-index file %s is too small"
-msgstr "archivo multi-pack-index %s es muy pequeño"
+msgstr "el archivo multi-pack-index %s es demasiado pequeño"
 
-#: midx.c:121
+#: midx.c:125
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x"
 
-#: midx.c:126
+#: midx.c:130
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "versión %d de multi-pack-index no reconocida"
 
-#: midx.c:131
+#: midx.c:135
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr ""
-"La versión de hash de índice de paquetes múltiples %u no coincide con la "
+"la versión de hash de índice de paquetes múltiples %u no coincide con la "
 "versión %u"
 
-#: midx.c:148
+#: midx.c:152
 msgid "multi-pack-index missing required pack-name chunk"
-msgstr "multi-pack-index le falta el conjunto pack-name requerido"
+msgstr "a multi-pack-index le falta el conjunto pack-name requerido"
 
-#: midx.c:150
+#: midx.c:154
 msgid "multi-pack-index missing required OID fanout chunk"
-msgstr "multi-pack-index le falta el conjunto OID fanout requerido"
+msgstr "a multi-pack-index le falta el conjunto OID fanout requerido"
 
-#: midx.c:152
+#: midx.c:156
 msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "multi-pack-index le falta el conjunto OID fanout requerido"
+msgstr "a multi-pack-index le falta el conjunto OID fanout requerido"
 
-#: midx.c:154
+#: midx.c:158
 msgid "multi-pack-index missing required object offsets chunk"
-msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido"
+msgstr "a multi-pack-index le falta el conjunto de offset del objeto requerido"
 
-#: midx.c:170
+#: midx.c:174
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'"
+msgstr ""
+"nombres de paquete de multi-pack-index fuera de orden: '%s' antes de '%s'"
 
-#: midx.c:214
+#: midx.c:221
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "mal pack-int-id: %u (%u paquetes totales)"
 
-#: midx.c:264
+#: midx.c:271
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
-msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño"
+msgstr ""
+"multi-pack-index guarda un offset de 64-bit, pero off_t es demasiado pequeño"
 
-#: midx.c:490
+#: midx.c:502
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "falló al agregar packfile '%s'"
 
-#: midx.c:496
+#: midx.c:508
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "falló al abrir pack-index '%s'"
 
-#: midx.c:564
+#: midx.c:576
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "falló al ubicar objeto %d en packfile"
 
-#: midx.c:880 builtin/index-pack.c:1535
+#: midx.c:892
 msgid "cannot store reverse index file"
 msgstr "no se puede almacenar el archivo de índice inverso"
 
-#: midx.c:933
-msgid "Adding packfiles to multi-pack-index"
-msgstr "Agregando packfiles a multi-pack-index"
+#: midx.c:990
+#, c-format
+msgid "could not parse line: %s"
+msgstr "no se puede analizar línea: %s"
 
-#: midx.c:979
+#: midx.c:992
 #, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "no se vió pack-file %s caer"
+msgid "malformed line: %s"
+msgstr "línea mal formada: %s"
 
-#: midx.c:1024
+#: midx.c:1159
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "ignorando el actual multi-pack-index; checksum no concuerda"
+
+#: midx.c:1184
+msgid "could not load pack"
+msgstr "no se pudo cargar pack"
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr "no se puede abrir index para %s"
+
+#: midx.c:1201
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Agregando packfiles a multi-pack-index"
+
+#: midx.c:1244
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "pack preferido desconocido: '%s'"
 
-#: midx.c:1029
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "no se pueden seleccionar el paquete preferido %s sin objetos"
+
+#: midx.c:1321
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "no se vió el pack-file que abandonar %s"
+
+#: midx.c:1367
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "pack de referencia '% s' ha expirado"
 
-#: midx.c:1045
+#: midx.c:1380
 msgid "no pack files to index."
 msgstr "no hay archivos pack para indexar."
 
-#: midx.c:1125 builtin/clean.c:37
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr "no se pudo escribir bitmap multi-paquete"
+
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr "no se pudo escribir multi-pack-index"
+
+#: midx.c:1486 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "falló al borrar %s"
 
-#: midx.c:1156
+#: midx.c:1517
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "falló al limpiar multi-pack-index en %s"
 
-#: midx.c:1214
+#: midx.c:1577
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr ""
-"El archivo de índice de paquetes múltiples existe, pero no se pudo analizar"
+"el archivo de índice de paquetes múltiples existe, pero no se pudo analizar"
 
-#: midx.c:1222
+#: midx.c:1585
+msgid "incorrect checksum"
+msgstr "checksum incorrecto"
+
+#: midx.c:1588
 msgid "Looking for referenced packfiles"
-msgstr "Buscando por packfiles referidos"
+msgstr "Buscando packfiles referidos"
 
-#: midx.c:1237
+#: midx.c:1603
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 "oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1242
+#: midx.c:1608
 msgid "the midx contains no oid"
 msgstr "el midx no contiene oid"
 
-#: midx.c:1251
+#: midx.c:1617
 msgid "Verifying OID order in multi-pack-index"
 msgstr "Verificando orden de OID en multi-pack-index"
 
-#: midx.c:1260
+#: midx.c:1626
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1280
+#: midx.c:1646
 msgid "Sorting objects by packfile"
 msgstr "Ordenando objetos por packfile"
 
-#: midx.c:1287
+#: midx.c:1653
 msgid "Verifying object offsets"
 msgstr "Verificando offsets de objetos"
 
-#: midx.c:1303
+#: midx.c:1669
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "fallo al cargar entrada pack para oid[%d] = %s"
 
-#: midx.c:1309
+#: midx.c:1675
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "falló al cargar el pack-index para packfile %s"
 
-#: midx.c:1318
+#: midx.c:1684
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1343
+#: midx.c:1709
 msgid "Counting referenced objects"
 msgstr "Contando objetos no referenciados"
 
-#: midx.c:1353
+#: midx.c:1719
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "Encontrando y borrando packfiles sin referencias"
 
-#: midx.c:1544
+#: midx.c:1911
 msgid "could not start pack-objects"
-msgstr "no se pudo empezar los pack-objetcts"
+msgstr "no se pudo iniciar pack-objects"
 
-#: midx.c:1564
+#: midx.c:1931
 msgid "could not finish pack-objects"
-msgstr "no se pudo finalizar pack-objetcts"
+msgstr "no se pudo finalizar pack-objects"
 
 #: name-hash.c:542
 #, c-format
@@ -5429,21 +5606,20 @@ msgid ""
 "Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
 "commit/abort the previous merge before you start a new notes merge."
 msgstr ""
-"No has concluido tus notas previas de fusión (%s existe).\n"
+"No has concluido tu fusión previa de notas (%s existe).\n"
 "Por favor, usa 'git notes merge --commit' o 'git notes merge --abort' para "
-"confirmar/abortar la fusión previa antes de que puedas comenzar una nueva "
-"nota de fusión."
+"confirmar/abortar la fusión previa antes de comenzar una nueva fusión de "
+"notas."
 
 #: notes-merge.c:284
 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
-msgstr "No has terminado tus notas de fusión (%s existe)."
+msgstr "No has terminado tu fusión de notas (%s existe)."
 
 #: notes-utils.c:46
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
-"No se puede realizar commit, notas del árbol no inicializadas o no "
-"referenciadas"
+"No se puede realizar commit, árbol de notas no inicializado o no referenciado"
 
 #: notes-utils.c:105
 #, c-format
@@ -5464,274 +5640,276 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"
 msgid "Bad %s value: '%s'"
 msgstr "Valor erróneo para %s: '%s'"
 
-#: object-file.c:526
+#: object-file.c:459
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr "objeto directorio %s no existe; revisa .git/objects/info/alternates"
+msgstr ""
+"directorio de objetos %s no existe; revisa .git/objects/info/alternates"
 
-#: object-file.c:577
+#: object-file.c:517
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "incapaz de normalizar la ruta de objeto alterno: %s"
 
-#: object-file.c:649
+#: object-file.c:591
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo"
+msgstr "%s: ignorando espacios de objetos alternos, anidado demasiado profundo"
 
-#: object-file.c:656
+#: object-file.c:598
 #, c-format
 msgid "unable to normalize object directory: %s"
-msgstr "incapaz de normalizar directorio de objeto: %s"
+msgstr "incapaz de normalizar directorio de objetos: %s"
 
-#: object-file.c:699
+#: object-file.c:641
 msgid "unable to fdopen alternates lockfile"
 msgstr "no es posible hacer fdopen en lockfile alternos"
 
-#: object-file.c:717
+#: object-file.c:659
 msgid "unable to read alternates file"
-msgstr "no es posible leer archivos alternos"
+msgstr "no es posible leer el archivo de alternativos"
 
-#: object-file.c:724
+#: object-file.c:666
 msgid "unable to move new alternates file into place"
-msgstr "no es posible mover archivos alternos en el lugar"
+msgstr "no es posible mover el nuevo archivo de alternativos al lugar"
 
-#: object-file.c:759
+#: object-file.c:701
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "ruta '%s' no existe"
 
-#: object-file.c:780
+#: object-file.c:722
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "repositorio de referencia '%s' como un checkout vinculado no es soportado "
 "todavía."
 
-#: object-file.c:786
+#: object-file.c:728
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "repositorio de referencia '%s' no es un repositorio local."
 
-#: object-file.c:792
+#: object-file.c:734
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "repositorio de referencia '%s' es superficial (shallow)"
 
-#: object-file.c:800
+#: object-file.c:742
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "repositorio de referencia '% s' está injertado"
 
-#: object-file.c:860
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "no se pudo encontrar el directorio de objetos concordante con %s"
+
+#: object-file.c:823
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "línea inválida mientras se analizaban refs alternas: %s"
 
-#: object-file.c:1010
+#: object-file.c:973
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>"
 
-#: object-file.c:1031
-msgid "mmap failed"
-msgstr "mmap falló"
+#: object-file.c:1008
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap falló %s"
 
-#: object-file.c:1195
+#: object-file.c:1174
 #, c-format
 msgid "object file %s is empty"
 msgstr "archivo de objeto %s está vacío"
 
-#: object-file.c:1330 object-file.c:2524
+#: object-file.c:1293 object-file.c:2499
 #, c-format
 msgid "corrupt loose object '%s'"
-msgstr "objeto perdido corrupto '%s'"
+msgstr "objeto suelto corrupto '%s'"
 
-#: object-file.c:1332 object-file.c:2528
+#: object-file.c:1295 object-file.c:2503
 #, c-format
 msgid "garbage at end of loose object '%s'"
-msgstr "basura al final del objeto perdido '%s'"
+msgstr "basura al final del objeto suelto '%s'"
+
+#: object-file.c:1417
+#, c-format
+msgid "unable to parse %s header"
+msgstr "incapaz de analizar header %s"
 
-#: object-file.c:1374
+#: object-file.c:1419
 msgid "invalid object type"
 msgstr "tipo de objeto inválido"
 
-#: object-file.c:1458
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "no es posible desempacar header %s con --allow-unknown-type"
-
-#: object-file.c:1461
+#: object-file.c:1430
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "incapaz de desempaquetar header %s"
 
-#: object-file.c:1467
+#: object-file.c:1434
 #, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "no es posible analizar header %s con --allow-unknown-type"
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "cabecera para %s es muy larga, excede %d bytes"
 
-#: object-file.c:1470
-#, c-format
-msgid "unable to parse %s header"
-msgstr "incapaz de analizar header %s"
-
-#: object-file.c:1697
+#: object-file.c:1664
 #, c-format
 msgid "failed to read object %s"
 msgstr "falló al leer objeto %s"
 
-#: object-file.c:1701
+#: object-file.c:1668
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "reemplazo %s no encontrado para %s"
 
-#: object-file.c:1705
+#: object-file.c:1672
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
-msgstr "objeto perdido %s (guardado en %s) está corrompido"
+msgstr "objeto suelto %s (guardado en %s) está corrompido"
 
-#: object-file.c:1709
+#: object-file.c:1676
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
-msgstr "paquete de objeto %s (guardado en %s) está corrompido"
+msgstr "objeto empaquetado %s (guardado en %s) está corrompido"
 
-#: object-file.c:1814
+#: object-file.c:1781
 #, c-format
 msgid "unable to write file %s"
 msgstr "no es posible escribir archivo %s"
 
-#: object-file.c:1821
+#: object-file.c:1788
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "no se pudo poner permisos a '%s'"
 
-#: object-file.c:1828
+#: object-file.c:1795
 msgid "file write error"
 msgstr "falló de escritura"
 
-#: object-file.c:1848
+#: object-file.c:1815
 msgid "error when closing loose object file"
-msgstr "error cerrando el archivo de objeto suelto"
+msgstr "error al cerrar el archivo de objeto suelto"
 
-#: object-file.c:1913
+#: object-file.c:1882
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "permisos insuficientes para agregar un objeto a la base de datos del "
 "repositorio %s"
 
-#: object-file.c:1915
+#: object-file.c:1884
 msgid "unable to create temporary file"
 msgstr "no es posible crear un archivo temporal"
 
-#: object-file.c:1939
+#: object-file.c:1908
 msgid "unable to write loose object file"
 msgstr "no es posible escribir el archivo de objeto suelto"
 
-#: object-file.c:1945
+#: object-file.c:1914
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "no es posible desinflar el objeto nuevo %s (%d)"
 
-#: object-file.c:1949
+#: object-file.c:1918
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "deflateEnd en objeto %s falló (%d)"
 
-#: object-file.c:1953
+#: object-file.c:1922
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "confundido por fuente de data de objetos inestable para %s"
 
-#: object-file.c:1963 builtin/pack-objects.c:1097
+#: object-file.c:1933 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr "falló utime() en %s"
 
-#: object-file.c:2040
+#: object-file.c:2011
 #, c-format
 msgid "cannot read object for %s"
 msgstr "no se pudo leer el objeto para %s"
 
-#: object-file.c:2091
+#: object-file.c:2062
 msgid "corrupt commit"
 msgstr "commit corrupto"
 
-#: object-file.c:2099
+#: object-file.c:2070
 msgid "corrupt tag"
 msgstr "tag corrupto"
 
-#: object-file.c:2199
+#: object-file.c:2170
 #, c-format
 msgid "read error while indexing %s"
-msgstr "error leyendo al indexar %s"
+msgstr "error de lectura al indexar %s"
 
-#: object-file.c:2202
+#: object-file.c:2173
 #, c-format
 msgid "short read while indexing %s"
 msgstr "lectura corta al indexar %s"
 
-#: object-file.c:2275 object-file.c:2285
+#: object-file.c:2246 object-file.c:2256
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s: falló al insertar en la base de datos"
 
-#: object-file.c:2291
+#: object-file.c:2262
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: tipo de archivo no soportado"
 
-#: object-file.c:2315
+#: object-file.c:2286 builtin/fetch.c:1445
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s no es objeto válido"
 
-#: object-file.c:2317
+#: object-file.c:2288
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s no es un objeto '%s' válido"
 
-#: object-file.c:2344 builtin/index-pack.c:192
+#: object-file.c:2315
 #, c-format
 msgid "unable to open %s"
 msgstr "no es posible abrir %s"
 
-#: object-file.c:2535 object-file.c:2588
+#: object-file.c:2510
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "hash no concuerda para %s (se esperaba %s)"
 
-#: object-file.c:2559
+#: object-file.c:2533
 #, c-format
 msgid "unable to mmap %s"
 msgstr "no es posible hacer mmap a %s"
 
-#: object-file.c:2564
+#: object-file.c:2539
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "incapaz de desempaquetar header de %s"
 
-#: object-file.c:2570
+#: object-file.c:2544
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "incapaz de analizar header de %s"
 
-#: object-file.c:2581
+#: object-file.c:2555
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "no es posible desempaquetar contenidos de %s"
 
-#: object-name.c:486
+#: object-name.c:480
 #, c-format
 msgid "short object ID %s is ambiguous"
-msgstr "El ID de objeto corto %s es ambiguo"
+msgstr "el ID de objeto corto %s es ambiguo"
 
-#: object-name.c:497
+#: object-name.c:491
 msgid "The candidates are:"
 msgstr "Los candidatos son:"
 
-#: object-name.c:796
+#: object-name.c:790
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5754,22 +5932,22 @@ msgstr ""
 "examina estas refs y tal vez bórralas. Silencia este mensaje\n"
 "ejecutando \"git config advice.objectNameWarning false\""
 
-#: object-name.c:916
+#: object-name.c:910
 #, c-format
 msgid "log for '%.*s' only goes back to %s"
 msgstr "log para '%.*s' solo va hasta %s"
 
-#: object-name.c:924
+#: object-name.c:918
 #, c-format
 msgid "log for '%.*s' only has %d entries"
 msgstr "log para '%.*s' solo tiene %d entradas"
 
-#: object-name.c:1702
+#: object-name.c:1696
 #, c-format
 msgid "path '%s' exists on disk, but not in '%.*s'"
 msgstr "la ruta '%s' existe en disco, pero no en '%.*s'"
 
-#: object-name.c:1708
+#: object-name.c:1702
 #, c-format
 msgid ""
 "path '%s' exists, but not '%s'\n"
@@ -5778,45 +5956,45 @@ msgstr ""
 "ruta '%s' existe, pero no '%s'\n"
 "ayuda: ¿Quisiste decir '%.*s:%s' o '%.*s:./%s'?"
 
-#: object-name.c:1717
+#: object-name.c:1711
 #, c-format
 msgid "path '%s' does not exist in '%.*s'"
 msgstr "ruta '%s' no existe en '%.*s'"
 
-#: object-name.c:1745
+#: object-name.c:1739
 #, c-format
 msgid ""
 "path '%s' is in the index, but not at stage %d\n"
 "hint: Did you mean ':%d:%s'?"
 msgstr ""
-"ruta '%s' está en el index, pero no en stage %d\n"
-"ayuda:¿Quisiste decir: '%d:%s'?"
+"ruta '%s' está en el índice, pero no en stage %d\n"
+"ayuda: ¿Quisiste decir: '%d:%s'?"
 
-#: object-name.c:1761
+#: object-name.c:1755
 #, c-format
 msgid ""
 "path '%s' is in the index, but not '%s'\n"
 "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
 msgstr ""
-"ruta '%s' está en el index, pero no '%s'\n"
-"ayuda:¿Quisiste decir ':%d:%s' o ':%d:./%s'?"
+"ruta '%s' está en el índice, pero no '%s'\n"
+"ayuda: ¿Quisiste decir ':%d:%s' o ':%d:./%s'?"
 
-#: object-name.c:1769
+#: object-name.c:1763
 #, c-format
 msgid "path '%s' exists on disk, but not in the index"
-msgstr "ruta '%s' existe en el disco, pero no en el index"
+msgstr "ruta '%s' existe en el disco, pero no en el índice"
 
-#: object-name.c:1771
+#: object-name.c:1765
 #, c-format
 msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "ruta '%s' no existe (ni en disco ni en el index)"
+msgstr "ruta '%s' no existe (ni en disco ni en el índice)"
 
-#: object-name.c:1784
+#: object-name.c:1778
 msgid "relative path syntax can't be used outside working tree"
 msgstr ""
 "la sintaxis de ruta relativa no se puede usar fuera del directorio de trabajo"
 
-#: object-name.c:1922
+#: object-name.c:1916
 #, c-format
 msgid "invalid object name '%.*s'."
 msgstr "nombre de objeto no válido: '%.*s'."
@@ -5831,27 +6009,40 @@ msgstr "tipo de objeto \"%s\" inválido"
 msgid "object %s is a %s, not a %s"
 msgstr "objeto %s es un %s, no un %s"
 
-#: object.c:232
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "el objeto %s tiene un id de tipo desconocido %d"
 
-#: object.c:245
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "incapaz de analizar objeto: %s"
 
-#: object.c:265 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "hash no concuerda %s"
 
-#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "a multi-pack-index le falta un índice reveretido"
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: no se pudo abrir el paquete"
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
 #, c-format
 msgid "unable to get size of %s"
 msgstr "no se pudo obtener el tamaño de %s"
 
-#: pack-bitmap.c:1547 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "no se pudo encontrar %s en paquete %s en el offset %<PRIuMAX>"
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "no se puede obtener el uso de disco de %s"
@@ -5859,17 +6050,17 @@ msgstr "no se puede obtener el uso de disco de %s"
 #: pack-revindex.c:221
 #, c-format
 msgid "reverse-index file %s is too small"
-msgstr "El archivo de índice inverso %s es demasiado pequeño"
+msgstr "el archivo de índice inverso %s es demasiado pequeño"
 
 #: pack-revindex.c:226
 #, c-format
 msgid "reverse-index file %s is corrupt"
-msgstr "El archivo de índice inverso %s está dañado"
+msgstr "el archivo de índice inverso %s está dañado"
 
 #: pack-revindex.c:234
 #, c-format
 msgid "reverse-index file %s has unknown signature"
-msgstr "El archivo de índice inverso %s tiene una firma desconocida"
+msgstr "el archivo de índice inverso %s tiene una firma desconocida"
 
 #: pack-revindex.c:238
 #, c-format
@@ -5881,42 +6072,47 @@ msgstr "archivo reverse-index %s tiene una versión no soportada %<PRIu32>"
 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
 msgstr "archivo reverse-index %s tiene un id de hash no soportado %<PRIu32>"
 
-#: pack-write.c:250
+#: pack-write.c:251
 msgid "cannot both write and verify reverse index"
 msgstr "no puede escribir y verificar el índice inverso"
 
-#: pack-write.c:271
+#: pack-write.c:270
 #, c-format
 msgid "could not stat: %s"
-msgstr "no se pudo estad: %s"
+msgstr "no se pudo hacer stat: %s"
 
-#: pack-write.c:283
+#: pack-write.c:282
 #, c-format
 msgid "failed to make %s readable"
 msgstr "no pudo hacer %s legible"
 
-#: pack-write.c:522
+#: pack-write.c:520
 #, c-format
 msgid "could not write '%s' promisor file"
 msgstr "no se pudo escribir el archivo promisor '%s'"
 
-#: packfile.c:625
+#: packfile.c:626
 msgid "offset before end of packfile (broken .idx?)"
-msgstr "offset antes del final del paquete (broken .idx?)"
+msgstr "offset antes del final del paquete (¿.idx roto?)"
 
-#: packfile.c:1937
+#: packfile.c:656
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "objeto %s no puede ser mapeado %s"
+
+#: packfile.c:1923
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 "offset antes del comienzo del índice del paquete para %s (¿índice corrupto?)"
 
-#: packfile.c:1941
+#: packfile.c:1927
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 "offset más allá del índice de fin de paquete para %s (¿índice truncado?)"
 
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
 #, c-format
 msgid "option `%s' expects a numerical value"
 msgstr "opción `%s' espera un valor numérico"
@@ -5924,7 +6120,7 @@ msgstr "opción `%s' espera un valor numérico"
 #: parse-options-cb.c:41
 #, c-format
 msgid "malformed expiration date '%s'"
-msgstr "fecha de expiración mal formada: '%s'"
+msgstr "fecha de caducidad mal formada: '%s'"
 
 #: parse-options-cb.c:54
 #, c-format
@@ -5936,71 +6132,71 @@ msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""
 msgid "malformed object name '%s'"
 msgstr "nombre de objeto mal formado '%s'"
 
-#: parse-options.c:38
+#: parse-options.c:58
 #, c-format
 msgid "%s requires a value"
 msgstr "%s requiere un valor"
 
-#: parse-options.c:73
+#: parse-options.c:93
 #, c-format
 msgid "%s is incompatible with %s"
 msgstr "%s es incompatible con %s"
 
-#: parse-options.c:78
+#: parse-options.c:98
 #, c-format
 msgid "%s : incompatible with something else"
 msgstr "%s : incompatible con otra cosa"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
 #, c-format
 msgid "%s takes no value"
 msgstr "%s no toma valores"
 
-#: parse-options.c:94
+#: parse-options.c:114
 #, c-format
 msgid "%s isn't available"
 msgstr "%s no está disponible"
 
-#: parse-options.c:217
+#: parse-options.c:237
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g"
 
-#: parse-options.c:386
+#: parse-options.c:393
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)"
 
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr "¿quisiste decir `--%s` (con dos guiones)?"
 
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:677 parse-options.c:1053
 #, c-format
 msgid "alias of --%s"
 msgstr "alias de --%s"
 
-#: parse-options.c:879
+#: parse-options.c:891
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opción `%s' desconocida"
 
-#: parse-options.c:881
+#: parse-options.c:893
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "switch desconocido `%c'"
 
-#: parse-options.c:883
+#: parse-options.c:895
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "opción desconocida en string no ascii: `%s'"
 
-#: parse-options.c:907
+#: parse-options.c:919
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:926
+#: parse-options.c:933
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
@@ -6008,49 +6204,73 @@ msgstr "uso: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:932
+#: parse-options.c:948
 #, c-format
 msgid "   or: %s"
 msgstr "   o: %s"
 
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. 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
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:992
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:974
+#: parse-options.c:1039
 msgid "-NUM"
 msgstr "-NUM"
 
-#: path.c:915
+#: path.c:922
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "No se pudo hacer que %s fuera escribible por el grupo"
 
-#: pathspec.c:151
+#: pathspec.c:150
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 "Carácter de escape '\\' no permitido como último carácter en el valor attr"
 
-#: pathspec.c:169
+#: pathspec.c:168
 msgid "Only one 'attr:' specification is allowed."
-msgstr "Solo una especificación 'attr' es permitida."
+msgstr "Solo se permite una única especificación 'attr'."
 
-#: pathspec.c:172
+#: pathspec.c:171
 msgid "attr spec must not be empty"
-msgstr "especificación attr no puede estar vacía"
+msgstr "la especificación attr no puede estar vacía"
 
-#: pathspec.c:215
+#: pathspec.c:214
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nombre de atributo %s inválido"
 
-#: pathspec.c:280
+#: pathspec.c:279
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles"
 
-#: pathspec.c:287
+#: pathspec.c:286
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -6058,54 +6278,54 @@ msgstr ""
 "la configuración global de 'literal' para patrones de ruta es incompatible "
 "con las demás configuraciones globales de patrones de ruta"
 
-#: pathspec.c:327
+#: pathspec.c:326
 msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "parámetro no válido para el prefijo 'magic pathspec'"
+msgstr "parámetro no válido para la magia de pathspec 'prefix'"
 
-#: pathspec.c:348
+#: pathspec.c:347
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "Magic pathspec inválido '%.*s' en '%s'"
+msgstr "Magia de pathspec inválida '%.*s' en '%s'"
 
-#: pathspec.c:353
+#: pathspec.c:352
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "Falta ')' al final del magic pathspec en '%s'"
+msgstr "Falta ')' al final de la magia de pathspec en '%s'"
 
-#: pathspec.c:391
+#: pathspec.c:390
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Magic pathspec '%c' no implementado en '%s'"
+msgstr "Magia de pathspec '%c' no implementada en '%s'"
 
-#: pathspec.c:450
+#: pathspec.c:449
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: 'literal' y 'glob' son incompatibles"
 
-#: pathspec.c:466
+#: pathspec.c:465
 #, c-format
 msgid "%s: '%s' is outside repository at '%s'"
 msgstr "%s: '%s' está fuera del repositorio en '%s'"
 
-#: pathspec.c:542
+#: pathspec.c:541
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (nemotécnico: '%c')"
 
-#: pathspec.c:552
+#: pathspec.c:551
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
-msgstr "%s: magic pathspec no soportado por este comando: %s"
+msgstr "%s: magia de pathspec no soportada por este comando: %s"
 
-#: pathspec.c:619
+#: pathspec.c:618
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico"
 
-#: pathspec.c:664
+#: pathspec.c:663
 #, c-format
 msgid "line is badly quoted: %s"
-msgstr "la línea está mál citada: %s"
+msgstr "la línea está mal entrecomillada: %s"
 
 #: pkt-line.c:92
 msgid "unable to write flush packet"
@@ -6116,14 +6336,14 @@ msgid "unable to write delim packet"
 msgstr "no es posible escribir delim packet"
 
 #: pkt-line.c:106
-msgid "unable to write stateless separator packet"
-msgstr "no es posible escribir un paquete separador sin estado (stateless)"
+msgid "unable to write response end packet"
+msgstr "no es posible escribir paquete de respuesta final"
 
 #: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr "limpieza de escritura de paquetes falló"
 
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
 msgid "protocol error: impossibly long line"
 msgstr "error de protocolo: línea imposiblemente larga"
 
@@ -6131,7 +6351,7 @@ msgstr "error de protocolo: línea imposiblemente larga"
 msgid "packet write with format failed"
 msgstr "escritura de paquetes con formato falló"
 
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
 msgid "packet write failed - data exceeds max packet size"
 msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete"
 
@@ -6140,25 +6360,25 @@ msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete
 msgid "packet write failed: %s"
 msgstr "escritura de paquetes falló: %s"
 
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
 msgid "read error"
 msgstr "error de lectura"
 
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
 msgid "the remote end hung up unexpectedly"
 msgstr "el remoto se colgó de manera inesperada"
 
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:390 pkt-line.c:392
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
-msgstr "error de protocolo: mal caracter de largo de línea: %.4s"
+msgstr "error de protocolo: mal carácter de largo de línea: %.4s"
 
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "error de protocolo: mal largo de línea %d"
 
-#: pkt-line.c:413 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "error remoto: %s"
@@ -6172,23 +6392,23 @@ msgstr "Refrescando index"
 msgid "unable to create threaded lstat: %s"
 msgstr "no es posible crear lstat hilado: %s"
 
-#: pretty.c:988
+#: pretty.c:1051
 msgid "unable to parse --pretty format"
-msgstr "incapaz de analizar el formato --pretty"
+msgstr "incapaz de analizar el formato de --pretty"
 
-#: promisor-remote.c:30
+#: promisor-remote.c:31
 msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr "promisor-remote: no se puede bifurcar el subproceso de recuperación"
+msgstr "promisor-remote: no se puede bifurcar el subproceso de fetch"
 
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
 msgid "promisor-remote: could not write to fetch subprocess"
-msgstr "proiso-remote: no se pudo escribir para recuperar el subproceso"
+msgstr "promisor-remote: no se pudo escribir al subproceso de fetch"
 
-#: promisor-remote.c:41
+#: promisor-remote.c:44
 msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr "promisor-remote: no se pudo cerrar stdin para recuperar el subproceso"
+msgstr "promisor-remote: no se pudo cerrar stdin al subproceso de fetch"
 
-#: promisor-remote.c:53
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "nombre remoto promisor no puede comenzar con '/': %s"
@@ -6199,93 +6419,94 @@ msgstr "info de objeto: se espera flush tras argumentos"
 
 #: prune-packed.c:35
 msgid "Removing duplicate objects"
-msgstr "Removiendo objetos duplicados"
+msgstr "Quitando objetos duplicados"
 
-#: range-diff.c:78
+#: range-diff.c:67
 msgid "could not start `log`"
 msgstr "no se pudo comenzar `log`"
 
-#: range-diff.c:80
+#: range-diff.c:69
 msgid "could not read `log` output"
-msgstr "no se pudo leer output de `log`"
+msgstr "no se pudo leer salida de `log`"
 
-#: range-diff.c:101 sequencer.c:5551
+#: range-diff.c:97 sequencer.c:5605
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "no se pudo analizar commit '%s'"
 
-#: range-diff.c:115
+#: range-diff.c:111
 #, c-format
 msgid ""
 "could not parse first line of `log` output: did not start with 'commit ': "
 "'%s'"
 msgstr ""
-"no se pudo leer la primera línea de salida `log`: no comienza con 'commit ': "
-"'%s'"
+"no se pudo leer la primera línea de salida de `log`: no comienza con 'commit "
+"': '%s'"
 
-#: range-diff.c:140
+#: range-diff.c:137
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "no se puede analizar git header '%.*s'"
 
-#: range-diff.c:306
+#: range-diff.c:304
 msgid "failed to generate diff"
 msgstr "falló al generar diff"
 
-#: range-diff.c:558
+#: range-diff.c:559
 msgid "--left-only and --right-only are mutually exclusive"
 msgstr "--left-only y --right-only son mutuamente exclusivas"
 
-#: range-diff.c:561 range-diff.c:563
+#: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "no se pudo leer el log para '%s'"
 
-#: read-cache.c:708
+#: read-cache.c:710
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr "no agregará alias de archivo '%s' ('%s' ya existe en el index)"
+msgstr "no agregará alias de archivo '%s' ('%s' ya existe en el índice)"
 
-#: read-cache.c:724
+#: read-cache.c:726
 msgid "cannot create an empty blob in the object database"
 msgstr "no se puede crear un blob vacío en la base de datos de objetos"
 
-#: read-cache.c:746
+#: read-cache.c:748
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
-"%s: solo puede agregar archivos regulares, symbolic links o git-directories"
+"%s: solo se pueden agregar archivos regulares, symbolic links o git-"
+"directories"
 
-#: read-cache.c:751
+#: read-cache.c:753 builtin/submodule--helper.c:3241
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "'%s' no tiene un commit checked out"
 
-#: read-cache.c:803
+#: read-cache.c:805
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "no es posible indexar archivo '%s'"
 
-#: read-cache.c:822
+#: read-cache.c:824
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "no es posible agregar '%s' al index"
 
-#: read-cache.c:833
+#: read-cache.c:835
 #, c-format
 msgid "unable to stat '%s'"
-msgstr "incapaz de correr stat en '%s'"
+msgstr "incapaz de hacer stat en '%s'"
 
-#: read-cache.c:1356
+#: read-cache.c:1373
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' parece ser un directorio y un archivo a la vez"
 
-#: read-cache.c:1571
+#: read-cache.c:1588
 msgid "Refresh index"
 msgstr "Refrescar index"
 
-#: read-cache.c:1700
+#: read-cache.c:1720
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6294,7 +6515,7 @@ msgstr ""
 "index.version configurado, pero el valor no es válido.\n"
 "Usando versión %i"
 
-#: read-cache.c:1710
+#: read-cache.c:1730
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6303,146 +6524,146 @@ msgstr ""
 "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
 "Usando versión %i"
 
-#: read-cache.c:1766
+#: read-cache.c:1786
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "mala firma 0x%08x"
 
-#: read-cache.c:1769
+#: read-cache.c:1789
 #, c-format
 msgid "bad index version %d"
-msgstr "mala versión del índice %d"
+msgstr "mala versión de índice %d"
 
-#: read-cache.c:1778
+#: read-cache.c:1798
 msgid "bad index file sha1 signature"
 msgstr "mala firma sha1 del archivo index"
 
-#: read-cache.c:1812
+#: read-cache.c:1832
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
-msgstr "index usa %.4s extensiones, cosa que no entendemos"
+msgstr "index usa la extensión %.4s, cosa que no entendemos"
 
-#: read-cache.c:1814
+#: read-cache.c:1834
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "ignorando extensión %.4s"
 
-#: read-cache.c:1851
+#: read-cache.c:1871
 #, c-format
 msgid "unknown index entry format 0x%08x"
-msgstr "formato de index desconocido 0x%08x"
+msgstr "formato de índice desconocido 0x%08x"
 
-#: read-cache.c:1867
+#: read-cache.c:1887
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
-msgstr "campo nombre malformado en el index, cerca a ruta '%s'"
+msgstr "campo nombre malformado en el índice, cerca de ruta '%s'"
 
-#: read-cache.c:1924
+#: read-cache.c:1944
 msgid "unordered stage entries in index"
 msgstr "entradas en stage desordenadas en index"
 
-#: read-cache.c:1927
+#: read-cache.c:1947
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
-msgstr "múltiples entradas extrañas para archivo fusionado '%s'"
+msgstr "múltiples entradas de stage para archivo fusionado '%s'"
 
-#: read-cache.c:1930
+#: read-cache.c:1950
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "entradas de stage desordenadas para '%s'"
 
-#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:332
+#: 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
+#: 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
 msgid "index file corrupt"
 msgstr "archivo índice corrompido"
 
-#: read-cache.c:2180
+#: read-cache.c:2209
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "no es posible crear hilo load_cache_entries: %s"
 
-#: read-cache.c:2193
+#: read-cache.c:2222
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
-msgstr "no es posible unir hilo load_cache_entires: %s"
+msgstr "no es posible unir hilo load_cache_entries: %s"
 
-#: read-cache.c:2226
+#: read-cache.c:2255
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: falló al abrir el archivo index"
 
-#: read-cache.c:2230
+#: read-cache.c:2259
 #, c-format
 msgid "%s: cannot stat the open index"
-msgstr "%s: no se puede hacer stat del index abierto"
+msgstr "%s: no se puede hacer stat en el índice abierto"
 
-#: read-cache.c:2234
+#: read-cache.c:2263
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: archivo index más pequeño de lo esperado"
 
-#: read-cache.c:2238
+#: read-cache.c:2267
 #, c-format
-msgid "%s: unable to map index file"
-msgstr "%s: no se pudo mapear el archivo index"
+msgid "%s: unable to map index file%s"
+msgstr "%s: no se pudo mapear el archivo index %s"
 
-#: read-cache.c:2280
+#: read-cache.c:2310
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "no es posible crear hilo load_index_extensions: %s"
 
-#: read-cache.c:2307
+#: read-cache.c:2337
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "no es posible unir hilo load_index_extensions: %s"
 
-#: read-cache.c:2345
+#: read-cache.c:2375
 #, c-format
 msgid "could not freshen shared index '%s'"
-msgstr "no se pudo refrescar el index compartido '%s'"
+msgstr "no se pudo refrescar el índice compartido '%s'"
 
-#: read-cache.c:2392
+#: read-cache.c:2434
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "index roto, se esperaba %s en %s, se obtuvo %s"
 
-#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
 #, c-format
 msgid "could not close '%s'"
 msgstr "no se pudo cerrar '%s'"
 
-#: read-cache.c:3138
+#: read-cache.c:3108
 msgid "failed to convert to a sparse-index"
 msgstr "falló al convertir a un índice sparse"
 
-#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
+#: read-cache.c:3179
 #, c-format
 msgid "could not stat '%s'"
-msgstr "no se pudo definir '%s'"
+msgstr "no se pudo hacer stat en '%s'"
 
-#: read-cache.c:3222
+#: read-cache.c:3192
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "no es posible abrir el directorio de git: %s"
 
-#: read-cache.c:3234
+#: read-cache.c:3204
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "no es posible eliminar el vinculo: %s"
 
-#: read-cache.c:3263
+#: read-cache.c:3233
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "no se pudo arreglar bits de permisos en '%s'"
 
-#: read-cache.c:3412
+#: read-cache.c:3390
 #, c-format
 msgid "%s: cannot drop to stage #0"
-msgstr "%s: no se puede eliminar a stage #0"
+msgstr "%s: no se puede eliminar hasta stage #0"
 
 #: rebase-interactive.c:11
 msgid ""
@@ -6496,13 +6717,13 @@ msgstr ""
 "\t, a menos que se use -C, en cuyo caso\n"
 "\tmantiene solo el mensaje del commit; -c es lo mismo que -C\n"
 "\tpero abre el editor\n"
-"x, exec <commit> = ejecuta comando ( el resto de la línea) usando un shell\n"
+"x, exec <commit> = ejecutar comando (el resto de la línea) usando un shell\n"
 "b, break = parar aquí (continuar rebase luego con 'git rebase --continue')\n"
 "d, drop <commit> = eliminar commit\n"
 "l, label <label> = poner label al HEAD actual con un nombre\n"
 "t, reset <label> = reiniciar HEAD al label\n"
 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-".       crea un commit de fusión usando el mensaje original de\n"
+".       crear un commit de fusión usando el mensaje original de\n"
 ".       fusión (o la línea de oneline, si no se especifica un mensaje\n"
 ".       de commit). Use -c <commit> para reescribir el mensaje del commit.\n"
 "\n"
@@ -6516,15 +6737,15 @@ msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Rebase %s en %s (%d comando)"
 msgstr[1] "Rebase %s en %s (%d comandos)"
 
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
 msgstr ""
 "\n"
-"No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit\n"
+"No elimines ninguna línea. Usa 'drop' explícitamente para borrar un commit.\n"
 
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6532,7 +6753,7 @@ msgstr ""
 "\n"
 "Si eliminas una línea aquí EL COMMIT SE PERDER�.\n"
 
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6546,7 +6767,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -6556,14 +6777,14 @@ msgstr ""
 "Como sea, si quieres borrar todo, el rebase será abortado.\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816
-#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
+#: 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
+#: builtin/rebase.c:190
 #, c-format
 msgid "could not write '%s'"
 msgstr "no se pudo escribir '%s'"
 
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
 #, c-format
 msgid "could not write '%s'."
 msgstr "no se pudo escribir '%s'."
@@ -6574,8 +6795,8 @@ msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):\n"
 msgstr ""
-"Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
-"Commits botados (empezando con el más nuevo):\n"
+"Peligro: algunos commits pueden haber sido descartados de forma accidental.\n"
+"Commits descartados (empezando con el más nuevo):\n"
 
 #: rebase-interactive.c:203
 #, c-format
@@ -6587,22 +6808,20 @@ msgid ""
 "The possible behaviours are: ignore, warn, error.\n"
 "\n"
 msgstr ""
-"Para evitar este mensaje, use \"drop\" para eliminar de forma explícita un "
+"Para evitar este mensaje, usa \"drop\" para eliminar de forma explícita un "
 "commit.\n"
 "\n"
-"Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de "
+"Usa 'git config rebase.missingCommitsCheck' para cambiar el nivel de "
 "advertencias.\n"
-"Los posibles comportamientos son: ignore,warn,error.\n"
+"Los posibles comportamientos son: ignore, warn, error.\n"
 "\n"
 
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
 #, c-format
-msgid "could not read '%s'."
-msgstr "no se puede leer '%s'."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve' es supercedido por 'merges'"
 
-#: ref-filter.c:42 wt-status.c:1978
+#: ref-filter.c:42 wt-status.c:2036
 msgid "gone"
 msgstr "desaparecido"
 
@@ -6621,258 +6840,279 @@ msgstr "detrás %d"
 msgid "ahead %d, behind %d"
 msgstr "delante %d, detrás %d"
 
-#: ref-filter.c:175
+#: ref-filter.c:235
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "formato esperado: %%(color:<color>)"
 
-#: ref-filter.c:177
+#: ref-filter.c:237
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "color no reconocido: %%(color:%s)"
 
-#: ref-filter.c:199
+#: ref-filter.c:259
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Valor entero esperado refname:lstrip=%s"
 
-#: ref-filter.c:203
+#: ref-filter.c:263
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Valor entero esperado refname:rstrip=%s"
 
-#: ref-filter.c:205
+#: ref-filter.c:265
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
-msgstr "argumento: %s no reconocido %%(%s)"
+msgstr "argumento %%(%s) no reconocido: %s"
 
-#: ref-filter.c:260
+#: ref-filter.c:320
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) no toma ningún argumento"
 
-#: ref-filter.c:282
+#: ref-filter.c:344
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "%%(objectsize) no reconocido argumento: %s"
+msgstr "argumento %%(objectsize) no reconocido: %s"
 
-#: ref-filter.c:290
+#: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) no toma argumentos"
 
-#: ref-filter.c:302
+#: ref-filter.c:364
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) no toma ningún argumento"
 
-#: ref-filter.c:315
+#: ref-filter.c:377
 #, c-format
 msgid "unrecognized %%(subject) argument: %s"
-msgstr "argumento %%(sujeto) no reconocido: %s"
+msgstr "argumento %%(subject) no reconocido: %s"
 
-#: ref-filter.c:334
+#: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
 msgstr "se esperaba %%(trailers:key=<value>)"
 
-#: ref-filter.c:336
+#: ref-filter.c:398
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
-msgstr "%%(trailers) desconocidos, argumento: %s"
+msgstr "argumento %%(trailers) desconocido: %s"
 
-#: ref-filter.c:367
+#: ref-filter.c:429
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valor positivo esperado contents:lines=%s"
 
-#: ref-filter.c:369
+#: ref-filter.c:431
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
-msgstr "argumento %s no reconocido %%(contents)"
+msgstr "argumento %%(contents) no reconocido: %s"
+
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr "argumento %%(raw) no reconocido: %s"
 
-#: ref-filter.c:384
+#: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
-msgstr "valor positivo esperado '%s' en %% (%s)"
+msgstr "valor positivo esperado '%s' en %%(%s)"
 
-#: ref-filter.c:388
+#: ref-filter.c:462
 #, c-format
 msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "argumento no reconocido:'%s' en %%(%s)"
+msgstr "argumento '%s' no reconocido en %%(%s)"
 
-#: ref-filter.c:402
+#: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
 msgstr "opción de email desconocida: %s"
 
-#: ref-filter.c:432
+#: ref-filter.c:506
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "formato esperado: %%(align:<ancho>,<posición>)"
 
-#: ref-filter.c:444
+#: ref-filter.c:518
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "posición desconocida: %s"
 
-#: ref-filter.c:451
+#: ref-filter.c:525
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "ancho desconocido: %s"
 
-#: ref-filter.c:460
+#: ref-filter.c:534
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "argumento no reconocido para %%(align): %s"
 
-#: ref-filter.c:468
+#: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "se esperaba un ancho positivo con el átomo %%(align)"
 
-#: ref-filter.c:486
+#: ref-filter.c:560
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
-msgstr "argumento: %s no reconocido %%(if)"
+msgstr "argumento %%(if) no reconocido: %s"
+
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) no toma ningún argumento"
 
-#: ref-filter.c:588
+#: ref-filter.c:680
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nombre mal formado de campo: %.*s"
 
-#: ref-filter.c:615
+#: ref-filter.c:707
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nombre de campo desconocido: %.*s"
 
-#: ref-filter.c:619
+#: ref-filter.c:711
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
-"no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data"
+"no es un repositorio git, pero el campo '%.*s' requiere acceso a los datos "
+"de objeto"
 
-#: ref-filter.c:743
+#: ref-filter.c:844
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "formato: átomo %%(if) usado sin un átomo %%(then)"
 
-#: ref-filter.c:807
+#: ref-filter.c:910
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "formato: átomo %%(then) usado sin átomo %%(if)"
 
-#: ref-filter.c:809
+#: ref-filter.c:912
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "formato: átomo %%(then) usado más de una vez"
 
-#: ref-filter.c:811
+#: ref-filter.c:914
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "formato: átomo %%(then) usado después de %%(else)"
 
-#: ref-filter.c:839
+#: ref-filter.c:946
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"
 
-#: ref-filter.c:841
+#: ref-filter.c:948
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "formato: átomo %%(else) usado sin un átomo %%(then)"
 
-#: ref-filter.c:843
+#: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "formato: átomo %%(else) usado más de una vez"
 
-#: ref-filter.c:858
+#: ref-filter.c:965
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "formato: átomo %%(end) usado sin átomo correspondiente"
 
-#: ref-filter.c:915
+#: ref-filter.c:1027
 #, c-format
 msgid "malformed format string %s"
 msgstr "formato de cadena mal formado %s"
 
-#: ref-filter.c:1556
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "este comando rechaza el átomo %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s no se puede usar con --python, --shell, --tcl"
+
+#: ref-filter.c:1706
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(no hay rama, rebasando %s)"
 
-#: ref-filter.c:1559
+#: ref-filter.c:1709
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(no una rama, rebasando con HEAD desacoplado %s)"
+msgstr "(no hay rama, rebasando con HEAD desacoplado %s)"
 
-#: ref-filter.c:1562
+#: ref-filter.c:1712
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(no hay rama, comenzando biseccón en %s)"
 
-#: ref-filter.c:1566
+#: ref-filter.c:1716
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD desacoplado en %s)"
 
-#: ref-filter.c:1569
+#: ref-filter.c:1719
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD desacoplado de %s)"
 
-#: ref-filter.c:1572
+#: ref-filter.c:1722
 msgid "(no branch)"
 msgstr "(sin rama)"
 
-#: ref-filter.c:1604 ref-filter.c:1813
+#: ref-filter.c:1754 ref-filter.c:1972
 #, c-format
 msgid "missing object %s for %s"
 msgstr "falta objeto %s para %s"
 
-#: ref-filter.c:1614
+#: ref-filter.c:1764
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer falló en %s para %s"
 
-#: ref-filter.c:1997
+#: ref-filter.c:2155
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objeto mal formado en '%s'"
 
-#: ref-filter.c:2086
+#: ref-filter.c:2245
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ignorando referencia con nombre roto %s"
 
-#: ref-filter.c:2091 refs.c:676
+#: ref-filter.c:2250 refs.c:673
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ignorando referencia rota %s"
 
-#: ref-filter.c:2431
+#: ref-filter.c:2623
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "formato: falta átomo %%(end)"
 
-#: ref-filter.c:2525
+#: ref-filter.c:2726
 #, c-format
 msgid "malformed object name %s"
 msgstr "nombre de objeto mal formado %s"
 
-#: ref-filter.c:2530
+#: ref-filter.c:2731
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "opción '%s' debe apuntar a un commit"
 
-#: refs.c:264
+#: refs.c:261
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr "¡%s no apunta a ningún objeto válido!"
 
-#: refs.c:566
+#: refs.c:563
 #, c-format
 msgid ""
 "Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6890,95 +7130,94 @@ msgstr ""
 "predeterminado\n"
 "está sujeto a cambios. Para configurar el nombre de la rama inicial para "
 "usar en todos\n"
-"de sus nuevos repositorios, que suprimirán esta advertencia, llame a:\n"
+"de sus nuevos repositorios, reprimiendo esta advertencia, llama a:\n"
 "\n"
 "\tgit config --global init.defaultBranch <nombre>\n"
 "\n"
-"Los nombres comúnmente elegidos en lugar de 'maestro' son 'principal', "
-"'troncal' y\n"
-"'desarrollo'. Se puede cambiar el nombre de la rama recién creada mediante "
+"Los nombres comúnmente elegidos en lugar de 'master' son 'main', 'trunk' y\n"
+"'development'. Se puede cambiar el nombre de la rama recién creada mediante "
 "este comando:\n"
 "\n"
 "\tgit branch -m <nombre>\n"
 
-#: refs.c:588
+#: refs.c:585
 #, c-format
 msgid "could not retrieve `%s`"
 msgstr "no se pudo recibir `%s`"
 
-#: refs.c:598
+#: refs.c:595
 #, c-format
 msgid "invalid branch name: %s = %s"
 msgstr "nombre de rama inválido: %s = %s"
 
-#: refs.c:674
+#: refs.c:671
 #, c-format
 msgid "ignoring dangling symref %s"
-msgstr "ignorando referencia rota %s"
+msgstr "ignorando referencia symbólica rota %s"
 
-#: refs.c:922
+#: refs.c:920
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "log de ref %s tiene un vacío tras %s"
 
-#: refs.c:929
+#: refs.c:927
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "log de ref %s finalizado inesperadamente en %s"
 
-#: refs.c:994
+#: refs.c:992
 #, c-format
 msgid "log for %s is empty"
 msgstr "log de %s está vacío"
 
-#: refs.c:1086
+#: refs.c:1084
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "rehusando actualizar ref con mal nombre '%s'"
 
-#: refs.c:1157
+#: refs.c:1155
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "update_ref falló para ref '%s': %s"
 
-#: refs.c:2051
+#: refs.c:2062
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
-msgstr "múltiples actualizaciones para ref '%s' no permitidas"
+msgstr "no se permiten múltiples actualizaciones para ref '%s'"
 
-#: refs.c:2131
+#: refs.c:2142
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
 
-#: refs.c:2142
+#: refs.c:2153
 msgid "ref updates aborted by hook"
-msgstr "ref update abortado por el hook"
+msgstr "ref updates abortados por el hook"
 
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' existe; no se puede crear '%s'"
 
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "no se puede procesar '%s' y '%s' al mismo tiempo"
 
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
 #, c-format
 msgid "could not remove reference %s"
 msgstr "no se pudo eliminar la referencia %s"
 
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "no se pudo eliminar la referencia %s: %s"
 
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
-msgstr "no se pudo eliminar la referencia: %s"
+msgstr "no se pudo eliminar las referencias: %s"
 
 #: refspec.c:170
 #, c-format
@@ -7026,7 +7265,7 @@ msgstr "valor '%s' del patrón no tiene '*'"
 #: remote.c:1083
 #, c-format
 msgid "src refspec %s does not match any"
-msgstr "src refsoec %s: no concuerda con ninguno"
+msgstr "src refspec %s no concuerda con ninguno"
 
 #: remote.c:1088
 #, c-format
@@ -7050,8 +7289,8 @@ msgid ""
 "\n"
 "Neither worked, so we gave up. You must fully qualify the ref."
 msgstr ""
-"El destino que provees no es un full refname (i.e.,\n"
-"comienza con \"refs/\"). Intentamos adivinar lo que quisiste decir:\n"
+"El destino que has provisto no es un full refname (i.e.,\n"
+"uno que comience con \"refs/\"). Intentamos adivinar lo que quisiste decir:\n"
 "\n"
 "- Buscando un ref que concuerde con '%s' en el lado remoto.\n"
 "- Revisando si el <src> es usado en el push('%s')\n"
@@ -7079,8 +7318,8 @@ msgid ""
 "Did you mean to create a new tag by pushing to\n"
 "'%s:refs/tags/%s'?"
 msgstr ""
-"The <src> part of the refspec is a tag object.\n"
-"Did you mean to create a new tag by pushing to\n"
+"La parte <src> del refspec es un objeto etiqueta.\n"
+"¿Quisiste crear una etiqueta nueva mediante un push a\n"
 "'%s:refs/tags/%s'?"
 
 #: remote.c:1133
@@ -7092,7 +7331,7 @@ msgid ""
 msgstr ""
 "La parte <src> del refspec es un objeto tree.\n"
 "¿Quisiste crear un tag nuevo mediante un push a\n"
-"'%s:refs/heads/%s'?"
+"'%s:refs/tags/%s'?"
 
 #: remote.c:1138
 #, c-format
@@ -7103,12 +7342,12 @@ msgid ""
 msgstr ""
 "La parte <src> del refspec es un objeto blob.\n"
 "¿Quisiste crear un tag nuevo mediante un push a\n"
-"'%s:refs/heads/%s'?"
+"'%s:refs/tags/%s'?"
 
 #: remote.c:1174
 #, c-format
 msgid "%s cannot be resolved to branch"
-msgstr "%s no puede ser resolver a un branch"
+msgstr "%s no puede ser resuelto a un branch"
 
 #: remote.c:1185
 #, c-format
@@ -7142,7 +7381,7 @@ msgstr "no se ha configurado upstream para la rama '%s'"
 #: remote.c:1742
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto"
+msgstr "la rama '%s' de upstream no es guardada como rama de rastreo remoto"
 
 #: remote.c:1757
 #, c-format
@@ -7162,7 +7401,7 @@ msgstr "refspecs del push para '%s' no incluyen '%s'"
 
 #: remote.c:1792
 msgid "push has no destination (push.default is 'nothing')"
-msgstr "push no tiene destino (push.default es 'nada')"
+msgstr "push no tiene destino (push.default es 'nothing')"
 
 #: remote.c:1814
 msgid "cannot resolve 'simple' push to a single destination"
@@ -7171,12 +7410,12 @@ msgstr "no se puede resolver push 'simple' para un destino único"
 #: remote.c:1943
 #, c-format
 msgid "couldn't find remote ref %s"
-msgstr "no se puedo encontrar ref remota %s"
+msgstr "no se pudo encontrar ref remota %s"
 
 #: remote.c:1956
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
-msgstr "* Ignorando ref graciosa '%s' localmente"
+msgstr "* Ignorando ref extraña '%s' localmente"
 
 #: remote.c:2119
 #, c-format
@@ -7237,7 +7476,7 @@ msgid_plural ""
 "and have %d and %d different commits each, respectively.\n"
 msgstr[0] ""
 "Tu rama y '%s' han divergido,\n"
-"y se tiene %d y %d commit diferentes en cada una respectivamente.\n"
+"y tienen %d y %d commits diferentes cada una respectivamente.\n"
 msgstr[1] ""
 "Tu rama y '%s' han divergido,\n"
 "y tienen %d y %d commits diferentes cada una respectivamente.\n"
@@ -7264,7 +7503,7 @@ msgstr "duplicar ref de reemplazo: %s"
 #: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
-msgstr "remplazar profundiad muy elevada para objeto %s"
+msgstr "profundidad de reemplazo demasiada para objeto %s"
 
 #: rerere.c:201 rerere.c:210 rerere.c:213
 msgid "corrupt MERGE_RR"
@@ -7279,7 +7518,7 @@ msgstr "incapaz de escribir entrada rerere"
 msgid "there were errors while writing '%s' (%s)"
 msgstr "hubieron errores mientras se escribía '%s' (%s)"
 
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "falló al hacer flush '%s'"
@@ -7322,10 +7561,10 @@ msgstr "no se puede desvincular stray '%s'"
 #: rerere.c:791
 #, c-format
 msgid "Recorded preimage for '%s'"
-msgstr "Resolución precargada para '%s'"
+msgstr "Preimagen grabada para '%s'"
 
-#: rerere.c:865 submodule.c:2089 builtin/log.c:2000
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "no se pudo crear el directorio '%s'"
@@ -7348,7 +7587,7 @@ msgstr "no se puede desvincular '%s'"
 #: rerere.c:1071
 #, c-format
 msgid "Updated preimage for '%s'"
-msgstr "Actualizada preimagen para '%s'"
+msgstr "Preimagen actualizada para '%s'"
 
 #: rerere.c:1080
 #, c-format
@@ -7363,47 +7602,41 @@ msgstr "no es posible abrir directorio rr-cache"
 msgid "could not determine HEAD revision"
 msgstr "no se pudo determinar revisión HEAD"
 
-#: reset.c:70 reset.c:76 sequencer.c:3669
+#: reset.c:70 reset.c:76 sequencer.c:3705
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "falló al encontrar árbol de %s"
 
-#: revision.c:2343
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr "--unsorted-input es incompatible con --no-walk"
+
+#: revision.c:2346
 msgid "--unpacked=<packfile> no longer supported"
-msgstr "--unpacked=<packfile>  ya no es soportado"
+msgstr "--unpacked=<packfile> ya no es soportado"
 
-#: revision.c:2683
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr "--no-walk es incompatible con --unsorted-input"
+
+#: revision.c:2690
 msgid "your current branch appears to be broken"
 msgstr "tu rama actual parece estar rota"
 
-#: revision.c:2686
+#: revision.c:2693
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "tu rama actual '%s' no tiene ningún commit todavía"
 
-#: revision.c:2892
+#: revision.c:2895
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L no soporta todavía formatos de diff fuera de -p y -s"
 
-#: run-command.c:767
-msgid "open /dev/null failed"
-msgstr "falló al abrir /dev/null"
-
-#: run-command.c:1275
+#: run-command.c:1278
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "no es posible crear hilo async: %s"
 
-#: run-command.c:1345
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"El hook '%s' fue ignorado porque no ha sido configurado como ejecutable.\n"
-"Puedes desactivar esta advertencias con `git config advice.ignoredHook "
-"false`."
-
 #: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
@@ -7423,72 +7656,73 @@ msgstr "desempaquetado remoto falló: %s"
 msgid "failed to sign the push certificate"
 msgstr "falló al firmar el certificado de push"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "send-pack: unable to fork off fetch subprocess"
 msgstr ""
 "send-pack: no es posible bifurcar el proceso de búsqueda en un subproceso"
 
-#: send-pack.c:455
+#: send-pack.c:457
 msgid "push negotiation failed; proceeding anyway with push"
 msgstr "negociación push falló; procediendo con el push de todas formas"
 
-#: send-pack.c:520
+#: send-pack.c:528
 msgid "the receiving end does not support this repository's hash algorithm"
 msgstr "el destino no soporta el algoritmo de hash de este repositorio"
 
-#: send-pack.c:529
+#: send-pack.c:537
 msgid "the receiving end does not support --signed push"
-msgstr "el final receptor no soporta --signed push"
+msgstr "el final receptor no soporta push --signed"
 
-#: send-pack.c:531
+#: send-pack.c:539
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr ""
 "no se manda un certificado de push ya que el destino no soporta push firmado "
-"(--signed )"
+"(--signed)"
 
-#: send-pack.c:543
+#: send-pack.c:546
 msgid "the receiving end does not support --atomic push"
-msgstr "el destino no soporta push atómicos (--atomic)"
+msgstr "el destino no soporta push atómico (--atomic)"
 
-#: send-pack.c:548
+#: send-pack.c:551
 msgid "the receiving end does not support push options"
 msgstr "el destino no soporta opciones de push"
 
-#: sequencer.c:196
+#: sequencer.c:197
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "mensaje de commit inválido, modo cleanup '%s'"
 
-#: sequencer.c:324
+#: sequencer.c:325
 #, c-format
 msgid "could not delete '%s'"
 msgstr "no se pudo borrar '%s'"
 
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
 #, c-format
 msgid "could not remove '%s'"
-msgstr "no se pudo eliminar'%s'"
+msgstr "no se pudo eliminar '%s'"
 
-#: sequencer.c:354
+#: sequencer.c:355
 msgid "revert"
 msgstr "revertir"
 
-#: sequencer.c:356
+#: sequencer.c:357
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:358
+#: sequencer.c:359
 msgid "rebase"
 msgstr "rebase"
 
-#: sequencer.c:360
+#: sequencer.c:361
 #, c-format
 msgid "unknown action: %d"
 msgstr "acción desconocida: %d"
 
-#: sequencer.c:419
+#: sequencer.c:420
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -7496,53 +7730,75 @@ msgstr ""
 "después de resolver los conflictos, marca las rutas corregidas\n"
 "con 'git add <rutas>' o 'git rm <rutas>'"
 
-#: sequencer.c:422
+#: sequencer.c:423
 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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
+msgstr ""
+"Luego de resolver los conflictos, márquelos con\n"
+"\"git add/rm <pathspec>\", luego ejecute\n"
+"\"git cherry-pick --continue\".\n"
+"O puede saltar este commit con \"git cherry-pick --skip\".\n"
+"Para abortar y regresar al estado anterior a \"git cherry-pick\",\n"
+"ejecute \"git cherry-pick --abort\"."
+
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
 msgstr ""
-"tras resolver los conflictos, marca las rutas corregidas\n"
-"con 'git add <rutas>' o 'git rm <rutas>'\n"
-"y haz un commit del resultado con 'git commit'"
+"Tras resolver los conflictos, márquelos con\n"
+"\"git add/rm <pathspec>\", luego ejecute\n"
+"\"git revert --continue\".\n"
+"O puede saltar este commit con \"git revert --skip\".\n"
+"Para abortar y regresar al estado anterior a \"git revert\",\n"
+"ejecute \"git revert --abort\"."
 
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:448 sequencer.c:3290
 #, c-format
 msgid "could not lock '%s'"
 msgstr "no se pudo bloquear '%s'"
 
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
 #, c-format
 msgid "could not write to '%s'"
 msgstr "no se pudo escribir en '%s'"
 
-#: sequencer.c:442
+#: sequencer.c:455
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "no se pudo escribir EOL en '%s'"
 
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3554
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "falló al finalizar '%s'"
 
-#: sequencer.c:486
+#: sequencer.c:499
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "tus cambios locales serán sobreescritos por %s."
 
-#: sequencer.c:490
+#: sequencer.c:503
 msgid "commit your changes or stash them to proceed."
-msgstr "realiza un commit con tus cambios o aplica un stash para proceder."
+msgstr "realiza un commit con tus cambios o haz un stash para proceder."
 
-#: sequencer.c:522
+#: sequencer.c:535
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avance rápido"
 
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:610
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Modo cleanup inválido %s"
@@ -7550,65 +7806,65 @@ msgstr "Modo cleanup inválido %s"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
 #.
-#: sequencer.c:671
+#: sequencer.c:685
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Incapaz de escribir el nuevo archivo índice"
 
-#: sequencer.c:685
+#: sequencer.c:699
 msgid "unable to update cache tree"
-msgstr "no es posible actualizar el árbol de la caché"
+msgstr "no es posible actualizar el árbol de caché"
 
-#: sequencer.c:699
+#: sequencer.c:713
 msgid "could not resolve HEAD commit"
 msgstr "no se pudo resolver el commit de HEAD"
 
-#: sequencer.c:779
+#: sequencer.c:793
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "no hay llave presente en '%.*s'"
 
-#: sequencer.c:790
+#: sequencer.c:804
 #, c-format
 msgid "unable to dequote value of '%s'"
-msgstr "no es posible dequote para '%s'"
+msgstr "no es posible dequote valor de '%s'"
 
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
-#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "no se pudo abrir '%s' para lectura"
 
-#: sequencer.c:837
+#: sequencer.c:851
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "'GIT_AUTHOR_NAME' ya proporcionado"
 
-#: sequencer.c:842
+#: sequencer.c:856
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"
 
-#: sequencer.c:847
+#: sequencer.c:861
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "'GIT_AUTHOR_DATE' ya proporcionado"
 
-#: sequencer.c:851
+#: sequencer.c:865
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "variable desconocida '%s'"
 
-#: sequencer.c:856
+#: sequencer.c:870
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "falta 'GIT_AUTHOR_NAME'"
 
-#: sequencer.c:858
+#: sequencer.c:872
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "falta 'GIT_AUTHOR_EMAIL'"
 
-#: sequencer.c:860
+#: sequencer.c:874
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "falta 'GIT_AUTHOR_DATE'"
 
-#: sequencer.c:925
+#: sequencer.c:939
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -7634,15 +7890,15 @@ msgstr ""
 "\n"
 "  git commit %s\n"
 "\n"
-"en cambos casos, cuando acabes, continua con:\n"
+"en ambos casos, cuando acabes, continúa con:\n"
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1212
+#: sequencer.c:1229
 msgid "'prepare-commit-msg' hook failed"
 msgstr "hook 'prepare-commit-msg' falló"
 
-#: sequencer.c:1218
+#: sequencer.c:1235
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7657,8 +7913,8 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 "Tu nombre y correo fueron configurados automáticamente basados\n"
-"en tu usuario y nombre de host. Por favor verifica que son correctos.\n"
-"Tu puedes suprimir este mensaje configurándolos de forma explicita. Ejecuta "
+"en tu usuario y nombre de host. Por favor verifica que sean correctos.\n"
+"Tú puedes suprimir este mensaje configurándolos de forma explícita. Ejecuta "
 "el\n"
 "siguiente comando y sigue las instrucciones de tu editor\n"
 " para modificar tu archivo de configuración:\n"
@@ -7669,7 +7925,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1231
+#: sequencer.c:1248
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7683,8 +7939,8 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 "Tu nombre y correo fueron configurados automáticamente basados\n"
-"en tu usuario y nombre de host. Por favor verifica que son correctos.\n"
-"Tu puedes suprimir este mensaje configurándolos de forma explicita:\n"
+"en tu usuario y nombre de host. Por favor verifica que sean correctos.\n"
+"Tú puedes suprimir este mensaje configurándolos de forma explícita:\n"
 "\n"
 "    git config --global user.name \"Tu nombre\"\n"
 "    git config --global user.email you@example.com\n"
@@ -7693,342 +7949,348 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1273
+#: sequencer.c:1290
 msgid "couldn't look up newly created commit"
 msgstr "no se pudo revisar el commit recién creado"
 
-#: sequencer.c:1275
+#: sequencer.c:1292
 msgid "could not parse newly created commit"
 msgstr "no se pudo analizar el commit recién creado"
 
-#: sequencer.c:1321
+#: sequencer.c:1338
 msgid "unable to resolve HEAD after creating commit"
 msgstr "no se pudo resolver HEAD tras crear el commit"
 
-#: sequencer.c:1323
+#: sequencer.c:1340
 msgid "detached HEAD"
 msgstr "HEAD desacoplado"
 
-#: sequencer.c:1327
+#: sequencer.c:1344
 msgid " (root-commit)"
 msgstr " (commit-raíz)"
 
-#: sequencer.c:1348
+#: sequencer.c:1365
 msgid "could not parse HEAD"
 msgstr "no se pudo analizar HEAD"
 
-#: sequencer.c:1350
+#: sequencer.c:1367
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "¡HEAD %s no es un commit!"
 
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
 msgid "could not parse HEAD commit"
 msgstr "no se pudo analizar el commit de HEAD"
 
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1427 sequencer.c:2312
 msgid "unable to parse commit author"
 msgstr "no es posible analizar el autor del commit"
 
-#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree falló al escribir el árbol"
 
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1471 sequencer.c:1591
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "no se puede leer el mensaje del commit de '%s'"
 
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1502 sequencer.c:1534
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "identidad de autor inválida '%s'"
 
-#: sequencer.c:1491
+#: sequencer.c:1508
 msgid "corrupt author: missing date information"
-msgstr "autor corrupto: falta información"
+msgstr "autor corrupto: falta información de fecha"
 
-#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
-#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78
+#: 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
 msgid "failed to write commit object"
 msgstr "falló al escribir el objeto commit"
 
-#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: t/helper/test-fast-rebase.c:217
 #, c-format
 msgid "could not update %s"
 msgstr "no se puede actualizar %s"
 
-#: sequencer.c:1606
+#: sequencer.c:1623
 #, c-format
 msgid "could not parse commit %s"
 msgstr "no se pudo analizar commit %s"
 
-#: sequencer.c:1611
+#: sequencer.c:1628
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "no se pudo analizar el commit padre %s"
 
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1711 sequencer.c:1992
 #, c-format
 msgid "unknown command: %d"
 msgstr "comando desconocido: %d"
 
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1753
 msgid "This is the 1st commit message:"
 msgstr "Este es el mensaje del 1er commit:"
 
-#: sequencer.c:1737
+#: sequencer.c:1754
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Este es el mensaje del commit #%d:"
 
-#: sequencer.c:1738
+#: sequencer.c:1755
 msgid "The 1st commit message will be skipped:"
 msgstr "El mensaje del 1er commit será saltado:"
 
-#: sequencer.c:1739
+#: sequencer.c:1756
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "El mensaje del commit #%d será saltado:"
 
-#: sequencer.c:1740
+#: sequencer.c:1757
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Esta es una combinación de %d commits."
 
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1904 sequencer.c:1961
 #, c-format
 msgid "cannot write '%s'"
 msgstr "no se puede escribir '%s'"
 
-#: sequencer.c:1934
+#: sequencer.c:1951
 msgid "need a HEAD to fixup"
 msgstr "se necesita un HEAD para arreglar"
 
-#: sequencer.c:1936 sequencer.c:3581
+#: sequencer.c:1953 sequencer.c:3601
 msgid "could not read HEAD"
 msgstr "no se pudo leer HEAD"
 
-#: sequencer.c:1938
+#: sequencer.c:1955
 msgid "could not read HEAD's commit message"
 msgstr "no se pudo leer el mensaje de commit de HEAD"
 
-#: sequencer.c:1962
+#: sequencer.c:1979
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "no se puede leer el mensaje del commit de %s"
 
-#: sequencer.c:2072
+#: sequencer.c:2089
 msgid "your index file is unmerged."
 msgstr "tu archivo índice no está fusionado."
 
-#: sequencer.c:2079
+#: sequencer.c:2096
 msgid "cannot fixup root commit"
 msgstr "no se puede arreglar el commit raíz"
 
-#: sequencer.c:2098
+#: sequencer.c:2115
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "el commit %s es una fusión pero no se proporcionó la opción -m."
 
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2123 sequencer.c:2131
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "el commit %s no tiene un padre %d"
 
-#: sequencer.c:2120
+#: sequencer.c:2137
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "no se puede obtener el mensaje de commit para %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2139
+#: sequencer.c:2156
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: no se puede analizar el commit padre %s"
 
-#: sequencer.c:2205
+#: sequencer.c:2222
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "no se puede renombrar '%s' a '%s'"
 
-#: sequencer.c:2265
+#: sequencer.c:2282
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "no se pudo revertir %s... %s"
 
-#: sequencer.c:2266
+#: sequencer.c:2283
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "no se pudo aplicar %s... %s"
 
-#: sequencer.c:2287
+#: sequencer.c:2304
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
-msgstr "botando $%s %s -- contenidos del parche ya están en upstream\n"
+msgstr "descartando $%s %s -- contenidos del parche ya están en upstream\n"
 
-#: sequencer.c:2345
+#: sequencer.c:2362
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: falló al leer el índice"
 
-#: sequencer.c:2352
+#: sequencer.c:2370
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: falló al refrescar el índice"
 
-#: sequencer.c:2425
+#: sequencer.c:2450
 #, c-format
 msgid "%s does not accept arguments: '%s'"
-msgstr "%s no acepta los argumentos: '%s'"
+msgstr "%s no acepta argumentos: '%s'"
 
-#: sequencer.c:2434
+#: sequencer.c:2459
 #, c-format
 msgid "missing arguments for %s"
-msgstr "faltan argumentos para para %s"
+msgstr "faltan argumentos para %s"
 
-#: sequencer.c:2477
+#: sequencer.c:2502
 #, c-format
 msgid "could not parse '%s'"
 msgstr "no se puede analizar '%s'"
 
-#: sequencer.c:2538
+#: sequencer.c:2563
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "línea inválida %d: %.*s"
 
-#: sequencer.c:2549
+#: sequencer.c:2574
 #, c-format
 msgid "cannot '%s' without a previous commit"
-msgstr "no se puede  '%s' sin un commit previo"
+msgstr "no se puede '%s' sin un commit previo"
 
-#: sequencer.c:2635
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "no se puede leer '%s'."
+
+#: sequencer.c:2660
 msgid "cancelling a cherry picking in progress"
 msgstr "cancelando cherry-pick en progreso"
 
-#: sequencer.c:2644
+#: sequencer.c:2669
 msgid "cancelling a revert in progress"
 msgstr "cancelando revert en progreso"
 
-#: sequencer.c:2690
+#: sequencer.c:2709
 msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
+msgstr "por favor arregla esto usando 'git rebase --edit-todo'."
 
-#: sequencer.c:2692
+#: sequencer.c:2711
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "hoja de instrucciones inutilizable: '%s'"
 
-#: sequencer.c:2697
+#: sequencer.c:2716
 msgid "no commits parsed."
 msgstr "ningún commit analizado."
 
-#: sequencer.c:2708
+#: sequencer.c:2727
 msgid "cannot cherry-pick during a revert."
 msgstr "no se puede realizar cherry-pick durante un revert."
 
-#: sequencer.c:2710
+#: sequencer.c:2729
 msgid "cannot revert during a cherry-pick."
 msgstr "no se puede realizar un revert durante un cherry-pick."
 
-#: sequencer.c:2788
+#: sequencer.c:2807
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valor inválido para %s: %s"
 
-#: sequencer.c:2897
+#: sequencer.c:2916
 msgid "unusable squash-onto"
 msgstr "squash-onto inservible"
 
-#: sequencer.c:2917
+#: sequencer.c:2936
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "hoja de opciones mal formada: '%s'"
 
-#: sequencer.c:3012 sequencer.c:4869
+#: sequencer.c:3031 sequencer.c:4905
 msgid "empty commit set passed"
 msgstr "conjunto de commits vacío entregado"
 
-#: sequencer.c:3029
+#: sequencer.c:3048
 msgid "revert is already in progress"
 msgstr "revert ya está en progreso"
 
-#: sequencer.c:3031
+#: sequencer.c:3050
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "intenta \"git revert (--continue | --quit | %s --abort)\""
+msgstr "intenta \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3034
+#: sequencer.c:3053
 msgid "cherry-pick is already in progress"
 msgstr "cherry-pick ya está en progreso"
 
-#: sequencer.c:3036
+#: sequencer.c:3055
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\""
+msgstr "intenta \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3050
+#: sequencer.c:3069
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "no se pudo crear un directorio secuenciador '%s'"
 
-#: sequencer.c:3065
+#: sequencer.c:3084
 msgid "could not lock HEAD"
 msgstr "no se pudo bloquear HEAD"
 
-#: sequencer.c:3125 sequencer.c:4582
+#: sequencer.c:3144 sequencer.c:4615
 msgid "no cherry-pick or revert in progress"
 msgstr "ningún cherry-pick o revert en progreso"
 
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3146 sequencer.c:3157
 msgid "cannot resolve HEAD"
 msgstr "no se puede resolver HEAD"
 
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3148 sequencer.c:3192
 msgid "cannot abort from a branch yet to be born"
 msgstr "no se puede abortar de una rama por nacer"
 
-#: sequencer.c:3159 builtin/grep.c:759
+#: sequencer.c:3178 builtin/grep.c:772
 #, c-format
 msgid "cannot open '%s'"
 msgstr "no se puede abrir '%s'"
 
-#: sequencer.c:3161
+#: sequencer.c:3180
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "no se puede leer '%s': %s"
 
-#: sequencer.c:3162
+#: sequencer.c:3181
 msgid "unexpected end of file"
 msgstr "final de archivo inesperado"
 
-#: sequencer.c:3168
+#: sequencer.c:3187
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto"
+msgstr "archivo HEAD '%s' guardado antes de cherry-pick está corrupto"
 
-#: sequencer.c:3179
+#: sequencer.c:3198
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "Parece que se ha movido HEAD. No se hace rebobinado, ¡revisa tu HEAD!"
 
-#: sequencer.c:3220
+#: sequencer.c:3239
 msgid "no revert in progress"
 msgstr "no hay revert en progreso"
 
-#: sequencer.c:3229
+#: sequencer.c:3248
 msgid "no cherry-pick in progress"
 msgstr "ningún cherry-pick en progreso"
 
-#: sequencer.c:3239
+#: sequencer.c:3258
 msgid "failed to skip the commit"
 msgstr "falló al escribir el commit"
 
-#: sequencer.c:3246
+#: sequencer.c:3265
 msgid "there is nothing to skip"
 msgstr "no hay nada que saltar"
 
-#: sequencer.c:3249
+#: sequencer.c:3268
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8037,16 +8299,16 @@ msgstr ""
 "¿ya has hecho el commit?\n"
 "intenta \"git %s --continue\""
 
-#: sequencer.c:3411 sequencer.c:4473
+#: sequencer.c:3430 sequencer.c:4506
 msgid "cannot read HEAD"
 msgstr "no se puede leer HEAD"
 
-#: sequencer.c:3428
+#: sequencer.c:3447
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "no se pudo copiar '%s' a '%s'"
 
-#: sequencer.c:3436
+#: sequencer.c:3455
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8059,33 +8321,33 @@ msgid ""
 msgstr ""
 "Puedes enmendar el commit ahora, con\n"
 "\n"
-"\tgit commit --amend %s\n"
+"  git commit --amend %s\n"
 "\n"
 "Una vez que estés satisfecho con los cambios, ejecuta\n"
 "\n"
-"\tgit rebase --continue\n"
+"  git rebase --continue\n"
 
-#: sequencer.c:3446
+#: sequencer.c:3465
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "No se pudo aplicar %s... %.*s"
 
-#: sequencer.c:3453
+#: sequencer.c:3472
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "No se pudo fusionar %.*s"
 
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "no se pudo copiar '%s' a '%s'"
 
-#: sequencer.c:3483
+#: sequencer.c:3502
 #, c-format
 msgid "Executing: %s\n"
 msgstr "Ejecutando: %s\n"
 
-#: sequencer.c:3498
+#: sequencer.c:3517
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8100,11 +8362,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3504
+#: sequencer.c:3523
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"
 
-#: sequencer.c:3510
+#: sequencer.c:3529
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8121,90 +8383,90 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3571
+#: sequencer.c:3591
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nombre de label ilegal: '%.*s'"
 
-#: sequencer.c:3625
+#: sequencer.c:3664
 msgid "writing fake root commit"
 msgstr "escribiendo commit raíz falso"
 
-#: sequencer.c:3630
+#: sequencer.c:3669
 msgid "writing squash-onto"
 msgstr "escribiendo squash-onto"
 
-#: sequencer.c:3714
+#: sequencer.c:3748
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "no se pudo resolver '%s'"
 
-#: sequencer.c:3747
+#: sequencer.c:3780
 msgid "cannot merge without a current revision"
 msgstr "no se puede fusionar sin una versión actual"
 
-#: sequencer.c:3769
+#: sequencer.c:3802
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "no se puede analizar '%.*s'"
 
-#: sequencer.c:3778
+#: sequencer.c:3811
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "nada para fusionar: '%.*s'"
 
-#: sequencer.c:3790
+#: sequencer.c:3823
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]"
 
-#: sequencer.c:3806
+#: sequencer.c:3878
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "no se puede leer el mensaje del commit '%s'"
 
-#: sequencer.c:3989
+#: sequencer.c:4024
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
-msgstr "no se pudo intentar fusionar '%.*s'"
+msgstr "ni se pudo intentar fusionar '%.*s'"
 
-#: sequencer.c:4005
+#: sequencer.c:4040
 msgid "merge: Unable to write new index file"
 msgstr "fusión: No se puede escribir el nuevo archivo índice"
 
-#: sequencer.c:4079
+#: sequencer.c:4121
 msgid "Cannot autostash"
 msgstr "No se puede ejecutar autostash"
 
-#: sequencer.c:4082
+#: sequencer.c:4124
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Respuesta de stash inesperada: '%s'"
 
-#: sequencer.c:4088
+#: sequencer.c:4130
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "No se pudo crear el directorio para '%s'"
 
-#: sequencer.c:4091
+#: sequencer.c:4133
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Autostash creado: %s\n"
 
-#: sequencer.c:4095
+#: sequencer.c:4137
 msgid "could not reset --hard"
 msgstr "no se pudo reset --hard"
 
-#: sequencer.c:4120
+#: sequencer.c:4162
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autostash aplicado.\n"
 
-#: sequencer.c:4132
+#: sequencer.c:4174
 #, c-format
 msgid "cannot store %s"
 msgstr "no se puede guardar %s"
 
-#: sequencer.c:4135
+#: sequencer.c:4177
 #, c-format
 msgid ""
 "%s\n"
@@ -8216,29 +8478,29 @@ msgstr ""
 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
 "momento.\n"
 
-#: sequencer.c:4140
+#: sequencer.c:4182
 msgid "Applying autostash resulted in conflicts."
-msgstr "Apicar autostash resultó en conflictos."
+msgstr "Aplicar autostash resultó en conflictos."
 
-#: sequencer.c:4141
+#: sequencer.c:4183
 msgid "Autostash exists; creating a new stash entry."
 msgstr "Autostash existe; creando una nueva entrada stash."
 
-#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
 msgid "could not detach HEAD"
-msgstr "no se puede desacoplar HEAD"
+msgstr "no se pudo desacoplar HEAD"
 
-#: sequencer.c:4249
+#: sequencer.c:4270
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Detenido en HEAD\n"
 
-#: sequencer.c:4251
+#: sequencer.c:4272
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Detenido en %s\n"
 
-#: sequencer.c:4259
+#: sequencer.c:4304
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8254,63 +8516,63 @@ msgstr ""
 "\n"
 "    %.*s\n"
 "Ha sido reprogramado; Para editar el comando antes de continuar, por favor\n"
-"edite la lista de \"todo\" primero:\n"
+"edita la lista de \"todo\" primero:\n"
 "\n"
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4305
+#: sequencer.c:4350
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "Aplicando rebase (%d/%d)%s"
 
-#: sequencer.c:4351
+#: sequencer.c:4396
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Detenido en %s...  %.*s\n"
 
-#: sequencer.c:4422
+#: sequencer.c:4466
 #, c-format
 msgid "unknown command %d"
 msgstr "comando desconocido %d"
 
-#: sequencer.c:4481
+#: sequencer.c:4514
 msgid "could not read orig-head"
-msgstr "no se puede leer orig-head"
+msgstr "no se pudo leer orig-head"
 
-#: sequencer.c:4486
+#: sequencer.c:4519
 msgid "could not read 'onto'"
-msgstr "no se puede leer 'onto'"
+msgstr "no se pudo leer 'onto'"
 
-#: sequencer.c:4500
+#: sequencer.c:4533
 #, c-format
 msgid "could not update HEAD to %s"
-msgstr "no se puede actualizar HEAD a %s"
+msgstr "no se pudo actualizar HEAD a %s"
 
-#: sequencer.c:4560
+#: sequencer.c:4593
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "Rebase aplicado satisfactoriamente y actualizado %s.\n"
 
-#: sequencer.c:4612
+#: sequencer.c:4645
 msgid "cannot rebase: You have unstaged changes."
 msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
 
-#: sequencer.c:4621
+#: sequencer.c:4654
 msgid "cannot amend non-existing commit"
 msgstr "no se puede arreglar un commit no existente"
 
-#: sequencer.c:4623
+#: sequencer.c:4656
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "archivo inválido: '%s'"
 
-#: sequencer.c:4625
+#: sequencer.c:4658
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenido inválido: '%s'"
 
-#: sequencer.c:4628
+#: sequencer.c:4661
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8321,50 +8583,59 @@ msgstr ""
 "un commit con estos\n"
 "primero y luego ejecuta 'git rebase --continue' de nuevo."
 
-#: sequencer.c:4664 sequencer.c:4703
+#: sequencer.c:4697 sequencer.c:4736
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "no se pudo escribir el archivo: '%s'"
 
-#: sequencer.c:4719
+#: sequencer.c:4752
 msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "no se puede eliminar CHERRY_PICK_HEAD"
+msgstr "no se pudo eliminar CHERRY_PICK_HEAD"
 
-#: sequencer.c:4726
+#: sequencer.c:4762
 msgid "could not commit staged changes."
 msgstr "no se pudo realizar el commit con los cambios en el área de stage."
 
-#: sequencer.c:4846
+#: sequencer.c:4882
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: no se puede aplicar cherry-pick a un %s"
 
-#: sequencer.c:4850
+#: sequencer.c:4886
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisión errónea"
 
-#: sequencer.c:4885
+#: sequencer.c:4921
 msgid "can't revert as initial commit"
 msgstr "no se puede revertir como commit inicial"
 
-#: sequencer.c:5362
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "se ha saltado el commit %s aplicado previamente"
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "use --reapply-cherry-picks para incluir los commits saltados"
+
+#: sequencer.c:5408
 msgid "make_script: unhandled options"
 msgstr "make_script: opciones desconocidas"
 
-#: sequencer.c:5365
+#: sequencer.c:5411
 msgid "make_script: error preparing revisions"
-msgstr "make_script: error preparando revisiones"
+msgstr "make_script: error al preparar revisiones"
 
-#: sequencer.c:5615 sequencer.c:5632
+#: sequencer.c:5669 sequencer.c:5686
 msgid "nothing to do"
 msgstr "nada que hacer"
 
-#: sequencer.c:5651
+#: sequencer.c:5705
 msgid "could not skip unnecessary pick commands"
 msgstr "no se pudo saltar los comandos pick innecesarios"
 
-#: sequencer.c:5751
+#: sequencer.c:5805
 msgid "the script was already rearranged."
 msgstr "este script ya fue reorganizado."
 
@@ -8380,7 +8651,7 @@ msgid ""
 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
 msgstr ""
 "%s: no existe la ruta en el árbol de trabajo.\n"
-"Use 'git <comando> -- <ruta>...' para especificar rutas que no existen "
+"Usa 'git <comando> -- <ruta>...' para especificar rutas que no existen "
 "localmente."
 
 #: setup.c:198
@@ -8392,7 +8663,7 @@ msgid ""
 msgstr ""
 "argumento ambiguo '%s': revisión desconocida o ruta fuera del árbol de "
 "trabajo.\n"
-"Use '--' para separar las rutas de las revisiones, de esta manera:\n"
+"Usa '--' para separar las rutas de las revisiones, de esta manera:\n"
 "'git <comando> [<revisión>...] -- [<archivo>...]'"
 
 #: setup.c:264
@@ -8408,7 +8679,7 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 "argumento ambiguo '%s': ambos revisión y nombre de archivo\n"
-"Use '--' para separar rutas de revisiones, de esta manera:\n"
+"Usa '--' para separar rutas de revisiones, de esta manera:\n"
 "'git <comando> [<revisión>...] -- [<archivo>...]'"
 
 #: setup.c:419
@@ -8417,103 +8688,107 @@ msgstr ""
 "no es posible configurar el directorio de trabajo usando una configuración "
 "inválida"
 
-#: setup.c:423
+#: setup.c:423 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "esta operación debe ser realizada en un árbol de trabajo"
 
-#: setup.c:661
+#: setup.c:658
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
-msgstr "Se esperaba versión de git repo  <= %d, encontrada %d"
+msgstr "Se esperaba versión de git repo <= %d, se encontró %d"
 
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr "se encontró extensión de repositorio desconocida:"
+#: setup.c:666
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "se encontró extensión de repositorio desconocida:"
+msgstr[1] "se encontraron extensiones de repositorio desconocidas:"
 
-#: setup.c:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "versión de repo es 0, pero extensión v1-only encontrada:"
+#: setup.c:680
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "versión de repo es 0, pero se encontró extensión v1-only:"
+msgstr[1] "versión de repo es 0, pero se encontraron extensiones v1-only:"
 
-#: setup.c:700
+#: setup.c:701
 #, c-format
 msgid "error opening '%s'"
-msgstr "error abriendo '%s'"
+msgstr "error al abrir '%s'"
 
-#: setup.c:702
+#: setup.c:703
 #, c-format
 msgid "too large to be a .git file: '%s'"
-msgstr "muy grande para ser un archivo .git: '%s'"
+msgstr "demasiado grande para ser un archivo .git: '%s'"
 
-#: setup.c:704
+#: setup.c:705
 #, c-format
 msgid "error reading %s"
-msgstr "error leyendo %s"
+msgstr "error al leer %s"
 
-#: setup.c:706
+#: setup.c:707
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "formato gitfile inválido: %s"
 
-#: setup.c:708
+#: setup.c:709
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "no hay ruta en gitfile: %s"
 
-#: setup.c:710
+#: setup.c:711
 #, c-format
 msgid "not a git repository: %s"
 msgstr "no es un repositorio git: %s"
 
-#: setup.c:812
+#: setup.c:813
 #, c-format
 msgid "'$%s' too big"
-msgstr "'$%s' muy grande"
+msgstr "'$%s' demasiado grande"
 
-#: setup.c:826
+#: setup.c:827
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "no es un repositorio git: '%s'"
 
-#: setup.c:855 setup.c:857 setup.c:888
+#: setup.c:856 setup.c:858 setup.c:889
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "no se puede aplicar chdir a '%s'"
 
-#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
 msgid "cannot come back to cwd"
 msgstr "no se puede volver a cwd"
 
-#: setup.c:987
+#: setup.c:988
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "falló al determinar '%*s%s%s'"
 
-#: setup.c:1225
+#: setup.c:1231
 msgid "Unable to read current working directory"
 msgstr "Incapaz de leer el directorio de trabajo actual"
 
-#: setup.c:1234 setup.c:1240
+#: setup.c:1240 setup.c:1246
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "no se puede cambiar a '%s'"
 
-#: setup.c:1245
+#: setup.c:1251
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 "no es un repositorio git (ni ninguno de los directorios superiores): %s"
 
-#: setup.c:1251
+#: setup.c:1257
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
-"no es un repositorio git ( o ningún padre en el punto de montado %s)\n"
-"Parando en el límite del sistema de archivos "
+"no es un repositorio git (ni ningún padre en el punto de montaje %s)\n"
+"Parando a la frontera del sistema de archivos "
 "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
 
-#: setup.c:1370
+#: setup.c:1381
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8522,27 +8797,15 @@ msgstr ""
 "problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"
 "El dueño de los archivos tiene que tener permisos de lectura y escritura."
 
-#: setup.c:1417
-msgid "open /dev/null or dup failed"
-msgstr "falló al abrir /dev/null o dup"
-
-#: setup.c:1432
+#: setup.c:1443
 msgid "fork failed"
 msgstr "falló fork"
 
-#: setup.c:1437 t/helper/test-simple-ipc.c:285
+#: setup.c:1448
 msgid "setsid failed"
 msgstr "falló setsid"
 
-#: sparse-index.c:151
-msgid "attempting to use sparse-index without cone mode"
-msgstr "intentando usar sparse-index sin modo cono"
-
-#: sparse-index.c:156
-msgid "unable to update cache-tree, staying full"
-msgstr "no es posible actualizar el cache del árbol, manteniendo full"
-
-#: sparse-index.c:239
+#: sparse-index.c:273
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr "la entrada de índice es un directorio, pero no escazo (%08x)"
@@ -8599,13 +8862,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] "%u bytes/s"
 msgstr[1] "%u bytes/s"
 
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "no se pudo abrir '%s' para escritura"
 
-#: strbuf.c:1177
+#: strbuf.c:1183
 #, c-format
 msgid "could not edit '%s'"
 msgstr "no se pudo editar '%s'"
@@ -8613,7 +8876,7 @@ msgstr "no se pudo editar '%s'"
 #: submodule-config.c:237
 #, c-format
 msgid "ignoring suspicious submodule name: %s"
-msgstr "ignorando submódulo sospechoso: %s"
+msgstr "ignorando nombre de submódulo sospechoso: %s"
 
 #: submodule-config.c:304
 msgid "negative values not allowed for submodule.fetchjobs"
@@ -8631,7 +8894,7 @@ msgstr ""
 msgid "invalid value for %s"
 msgstr "valor inválido para %s"
 
-#: submodule-config.c:766
+#: submodule-config.c:767
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "No se pudo actualizar la entrada %s de .gitmodules"
@@ -8639,7 +8902,8 @@ msgstr "No se pudo actualizar la entrada %s de .gitmodules"
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
-"No se puede cambiar .gitmodules no fusionados, resuelva este problema primero"
+"No se puede cambiar .gitmodules no fusionados, primero resuelve los "
+"conflictos de fusión"
 
 #: submodule.c:118 submodule.c:147
 #, c-format
@@ -8655,36 +8919,36 @@ msgstr "No se pudo eliminar la entrada %s de .gitmodules"
 msgid "staging updated .gitmodules failed"
 msgstr "falló realizar stage a los .gitmodules actualizados"
 
-#: submodule.c:328
+#: submodule.c:358
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "en el submódulo no poblado '%s'"
 
-#: submodule.c:359
+#: submodule.c:389
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
 
-#: submodule.c:436
+#: submodule.c:466
 #, c-format
 msgid "bad --ignore-submodules argument: %s"
 msgstr "mal argumento --ignore-submodules: %s"
 
-#: submodule.c:818
+#: submodule.c:844
 #, c-format
 msgid ""
 "Submodule in commit %s at path: '%s' collides with a submodule named the "
 "same. Skipping it."
 msgstr ""
-"Submódulo en el commit %s en ruta: '%s' colisiona con un submódulo llamado "
-"igual. Saltandolo."
+"Submódulo en el commit %s en la ruta: '%s' colisiona con un submódulo "
+"llamado igual. Saltándolo."
 
-#: submodule.c:921
+#: submodule.c:954
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit"
 
-#: submodule.c:1006
+#: submodule.c:1042
 #, c-format
 msgid ""
 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8693,36 +8957,36 @@ msgstr ""
 "No se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en "
 "el submódulo %s"
 
-#: submodule.c:1129
+#: submodule.c:1165
 #, c-format
 msgid "process for submodule '%s' failed"
 msgstr "proceso para submódulo '%s' falló"
 
-#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Falló al resolver HEAD como un ref válido."
 
-#: submodule.c:1169
+#: submodule.c:1205
 #, c-format
 msgid "Pushing submodule '%s'\n"
 msgstr "Empujando submódulo '%s'\n"
 
-#: submodule.c:1172
+#: submodule.c:1208
 #, c-format
 msgid "Unable to push submodule '%s'\n"
 msgstr "No es posible hacer push al submódulo '%s'\n"
 
-#: submodule.c:1464
+#: submodule.c:1491
 #, c-format
 msgid "Fetching submodule %s%s\n"
 msgstr "Haciendo fetch al submódulo %s%s\n"
 
-#: submodule.c:1498
+#: submodule.c:1525
 #, c-format
 msgid "Could not access submodule '%s'\n"
-msgstr "No pudo acceder al submódulo '%s'\n"
+msgstr "No se pudo acceder al submódulo '%s'\n"
 
-#: submodule.c:1653
+#: submodule.c:1680
 #, c-format
 msgid ""
 "Errors during submodule fetch:\n"
@@ -8731,61 +8995,62 @@ msgstr ""
 "Errores durante el fetch del submódulo:\n"
 "%s"
 
-#: submodule.c:1678
+#: submodule.c:1705
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' no reconocido como un repositorio git"
 
-#: submodule.c:1695
+#: submodule.c:1722
 #, c-format
 msgid "Could not run 'git status --porcelain=2' in submodule %s"
-msgstr "No se pudo ejecutar 'git status --procelain=2' en el submódulo %s"
+msgstr "No se pudo ejecutar 'git status --porcelain=2' en el submódulo %s"
 
-#: submodule.c:1736
+#: submodule.c:1763
 #, c-format
 msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr "'git status --procelain=2' falló en el submódulo %s"
+msgstr "'git status --porcelain=2' falló en el submódulo %s"
 
-#: submodule.c:1811
+#: submodule.c:1838
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "no se pudo comenzar 'git status' en el submódulo '%s'"
 
-#: submodule.c:1824
+#: submodule.c:1851
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'"
 
-#: submodule.c:1839
+#: submodule.c:1868
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "No se pudo quitar configuración core.worktree en submódulo '%s'"
 
-#: submodule.c:1866 submodule.c:2176
+#: submodule.c:1895 submodule.c:2210
 #, c-format
 msgid "could not recurse into submodule '%s'"
-msgstr "no pudo recursar en el submódulo '%s'"
+msgstr "no se pudo recursar en el submódulo '%s'"
 
-#: submodule.c:1887
+#: submodule.c:1917
 msgid "could not reset submodule index"
-msgstr "no se pudo reiniciar el index del submódulo"
+msgstr "no se pudo reiniciar el índice del submódulo"
 
-#: submodule.c:1929
+#: submodule.c:1959
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "submódulo '%s' tiene un índice corrupto"
 
-#: submodule.c:1981
+#: submodule.c:2013
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Submódulo '%s' no pudo ser actualizado."
 
-#: submodule.c:2049
+#: submodule.c:2081
 #, c-format
 msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr "submódulo git dir '%s' esta dentro de git dir '%.*s'"
+msgstr ""
+"directorio de git del submódulo '%s' está dentro del directorio de git '%.*s'"
 
-#: submodule.c:2070
+#: submodule.c:2102
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8793,17 +9058,17 @@ msgstr ""
 "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
 "soportado"
 
-#: submodule.c:2082 submodule.c:2141
+#: submodule.c:2114 submodule.c:2174
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "no se pudo resolver el nombre para el submódulo '%s'"
 
-#: submodule.c:2086
+#: submodule.c:2118
 #, c-format
 msgid "refusing to move '%s' into an existing git dir"
 msgstr "rechazando mover '%s' dentro de un directorio git existente"
 
-#: submodule.c:2093
+#: submodule.c:2124
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -8814,11 +9079,11 @@ msgstr ""
 "'%s' hacia\n"
 "'%s'\n"
 
-#: submodule.c:2221
+#: submodule.c:2255
 msgid "could not start ls-files in .."
 msgstr "no se pudo comenzar ls-files en .."
 
-#: submodule.c:2261
+#: submodule.c:2295
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree devolvió un código %d inesperado"
@@ -8840,7 +9105,7 @@ msgid "unknown value '%s' for key '%s'"
 msgstr "valor '%s' desconocido para la clave '%s'"
 
 #: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
 #, c-format
 msgid "more than one %s"
 msgstr "más de un %s"
@@ -8855,14 +9120,14 @@ msgstr "token de remolque vacío en el trailer '%.*s'"
 msgid "could not read input file '%s'"
 msgstr "no se pudo leer el archivo de entrada '%s'"
 
-#: trailer.c:766 builtin/mktag.c:88
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
 msgid "could not read from stdin"
 msgstr "no se pudo leer desde stdin"
 
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
 #, c-format
 msgid "could not stat %s"
-msgstr "no se pudo definir %s"
+msgstr "no se pudo hacer stat en %s"
 
 #: trailer.c:1026
 #, c-format
@@ -8894,7 +9159,7 @@ msgstr "no es posible encontrar helper remoto para '%s'"
 
 #: transport-helper.c:161 transport-helper.c:575
 msgid "can't dup helper output fd"
-msgstr "no se puede duplicar output de fd del helper"
+msgstr "no se puede duplicar fd de salida del helper"
 
 #: transport-helper.c:214
 #, c-format
@@ -8927,7 +9192,7 @@ msgstr "no se pudo ejecutar fast-import"
 msgid "error while running fast-import"
 msgstr "error al ejecutar fast-import"
 
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
 #, c-format
 msgid "could not read ref %s"
 msgstr "no se pudo leer la referencia %s"
@@ -8935,17 +9200,17 @@ msgstr "no se pudo leer la referencia %s"
 #: transport-helper.c:594
 #, c-format
 msgid "unknown response to connect: %s"
-msgstr "respuesta para conectar desconocida: %s"
+msgstr "respuesta al conectar desconocida: %s"
 
 #: transport-helper.c:616
 msgid "setting remote service path not supported by protocol"
-msgstr "configurando servicio de ruta remota no soportado por el protocolo"
+msgstr "configurar servicio de ruta remota no soportado por el protocolo"
 
 #: transport-helper.c:618
 msgid "invalid remote service path"
 msgstr "ruta de servicio remoto inválida"
 
-#: transport-helper.c:661 transport.c:1471
+#: transport-helper.c:661 transport.c:1475
 msgid "operation not supported by protocol"
 msgstr "operación no soportada por protocolo"
 
@@ -8954,7 +9219,7 @@ msgstr "operación no soportada por protocolo"
 msgid "can't connect to subservice %s"
 msgstr "no se puede conectar al subservicio %s"
 
-#: transport-helper.c:693 transport.c:397
+#: transport-helper.c:693 transport.c:404
 msgid "--negotiate-only requires protocol v2"
 msgstr "--negotiate-only requiere protocolo v2"
 
@@ -8967,59 +9232,59 @@ msgstr "'opción' sin una directiva correspondiente 'ok/error'"
 msgid "expected ok/error, helper said '%s'"
 msgstr "se esperaba ok/error, helper dijo '%s'"
 
-#: transport-helper.c:855
+#: transport-helper.c:859
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "helper reportó estado inesperado de %s"
 
-#: transport-helper.c:938
+#: transport-helper.c:942
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "helper %s no soporta dry-run"
 
-#: transport-helper.c:941
+#: transport-helper.c:945
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "helper %s no soporta --signed"
 
-#: transport-helper.c:944
+#: transport-helper.c:948
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "helper %s no soporta --signed=if-asked"
 
-#: transport-helper.c:949
+#: transport-helper.c:953
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "helper %s no soporta --atomic"
 
-#: transport-helper.c:953
+#: transport-helper.c:957
 #, c-format
 msgid "helper %s does not support --%s"
 msgstr "helper %s no soporta --%s"
 
-#: transport-helper.c:960
+#: transport-helper.c:964
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "helper %s no soporta 'push-option'"
 
-#: transport-helper.c:1060
+#: transport-helper.c:1064
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "remote-helper no soporta push; se necesita refspec"
 
-#: transport-helper.c:1065
+#: transport-helper.c:1069
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "helper %s no soporta 'force'"
 
-#: transport-helper.c:1112
+#: transport-helper.c:1116
 msgid "couldn't run fast-export"
 msgstr "no se pudo ejecutar fast-export"
 
-#: transport-helper.c:1117
+#: transport-helper.c:1121
 msgid "error while running fast-export"
 msgstr "error al ejecutar fast-export"
 
-#: transport-helper.c:1142
+#: transport-helper.c:1146
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -9028,52 +9293,52 @@ msgstr ""
 "No hay refs comunes y ninguno especificado; no se hace nada.\n"
 "Tal vez deberías especificar un branch.\n"
 
-#: transport-helper.c:1224
+#: transport-helper.c:1228
 #, c-format
 msgid "unsupported object format '%s'"
-msgstr "formado de objeto no soportado '%s'"
+msgstr "formato de objeto no soportado '%s'"
 
-#: transport-helper.c:1233
+#: transport-helper.c:1237
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "respuesta malformada en lista de refs: %s"
 
-#: transport-helper.c:1385
+#: transport-helper.c:1389
 #, c-format
 msgid "read(%s) failed"
-msgstr "leer(%s) falló"
+msgstr "read(%s) falló"
 
-#: transport-helper.c:1412
+#: transport-helper.c:1416
 #, c-format
 msgid "write(%s) failed"
-msgstr "escribir(%s) falló"
+msgstr "write(%s) falló"
 
-#: transport-helper.c:1461
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed"
 msgstr "hilo %s falló"
 
-#: transport-helper.c:1465
+#: transport-helper.c:1469
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "hilo %s falló al unirse: %s"
 
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "no se puede iniciar el hilo para copiar data: %s"
 
-#: transport-helper.c:1525
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed to wait"
 msgstr "proceso %s falló al esperar"
 
-#: transport-helper.c:1529
+#: transport-helper.c:1533
 #, c-format
 msgid "%s process failed"
 msgstr "proceso %s falló"
 
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
 msgid "can't start thread for copying data"
 msgstr "no se puede iniciar hilo para copiar data"
 
@@ -9087,46 +9352,46 @@ msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"
 msgid "could not read bundle '%s'"
 msgstr "no se pudo leer el conjunto '%s'"
 
-#: transport.c:220
+#: transport.c:227
 #, c-format
 msgid "transport: invalid depth option '%s'"
-msgstr "transport: opción inválida '%s'"
+msgstr "transport: opción de profundidad inválida '%s'"
 
-#: transport.c:272
+#: transport.c:279
 msgid "see protocol.version in 'git help config' for more details"
-msgstr "ver protocol.version en 'git help config' para más información"
+msgstr "mira protocol.version en 'git help config' para más información"
 
-#: transport.c:273
+#: transport.c:280
 msgid "server options require protocol version 2 or later"
 msgstr "opciones del servidor requieren protocolo versión 2 o posterior"
 
-#: transport.c:400
+#: transport.c:407
 msgid "server does not support wait-for-done"
 msgstr "el servidor no soporta wait-for-done"
 
-#: transport.c:751
+#: transport.c:759
 msgid "could not parse transport.color.* config"
 msgstr "no se pudo analizar valor de configuración transport.color.*"
 
-#: transport.c:826
+#: transport.c:834
 msgid "support for protocol v2 not implemented yet"
 msgstr "soporte para protocolo v2 no implementado todavía"
 
-#: transport.c:960
+#: transport.c:967
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "valor desconocido para configuración '%s': %s"
 
-#: transport.c:1026
+#: transport.c:1033
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "transporte '%s' no permitido"
 
-#: transport.c:1079
+#: transport.c:1082
 msgid "git-over-rsync is no longer supported"
 msgstr "git-over-rsync ya no es soportado"
 
-#: transport.c:1181
+#: transport.c:1185
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -9135,7 +9400,7 @@ msgstr ""
 "La siguiente ruta de submódulo contiene cambios que no\n"
 "pueden ser encontrados en ningún remoto:\n"
 
-#: transport.c:1185
+#: transport.c:1189
 #, c-format
 msgid ""
 "\n"
@@ -9162,17 +9427,17 @@ msgstr ""
 "para hacer un push al remoto.\n"
 "\n"
 
-#: transport.c:1193
+#: transport.c:1197
 msgid "Aborting."
 msgstr "Abortando."
 
-#: transport.c:1340
+#: transport.c:1344
 msgid "failed to push all needed submodules"
 msgstr "falló al hacer push a todos los submódulos necesarios"
 
 #: tree-walk.c:33
 msgid "too-short tree object"
-msgstr "objeto de árbol muy corto"
+msgstr "objeto de árbol demasiado corto"
 
 #: tree-walk.c:39
 msgid "malformed mode in tree entry"
@@ -9184,7 +9449,7 @@ msgstr "nombre de archivo vacío en la entrada de árbol"
 
 #: tree-walk.c:118
 msgid "too-short tree file"
-msgstr "archivo de árbol muy corto"
+msgstr "archivo de árbol demasiado corto"
 
 #: unpack-trees.c:115
 #, c-format
@@ -9195,7 +9460,7 @@ msgstr ""
 "Los cambios locales de los siguientes archivos serán sobrescritos por "
 "checkout:\n"
 "%%sPor favor realiza un commit con los cambios o un stash antes de cambiar "
-"ramas."
+"de rama."
 
 #: unpack-trees.c:117
 #, c-format
@@ -9263,7 +9528,7 @@ msgid ""
 msgstr ""
 "Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
 "eliminados al actualizar el árbol de trabajo:\n"
-"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
+"%%sPor favor, muévelos o elimínalos antes de cambiar de rama."
 
 #: unpack-trees.c:138
 #, c-format
@@ -9272,7 +9537,7 @@ msgid ""
 "%%s"
 msgstr ""
 "Los siguientes archivos sin seguimiento del árbol de trabajo serán "
-"eliminadosal actualizar el árbol de trabajo:\n"
+"eliminados al actualizar el árbol de trabajo:\n"
 "%%s"
 
 #: unpack-trees.c:141
@@ -9291,8 +9556,8 @@ msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr ""
-"Los siguientes archivos sin seguimiento de árbol de trabajo serán "
-"eliminadosal fusionar:\n"
+"Los siguientes archivos sin seguimiento de árbol de trabajo serán eliminados "
+"al fusionar:\n"
 "%%s"
 
 #: unpack-trees.c:146
@@ -9324,7 +9589,7 @@ msgid ""
 msgstr ""
 "Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
 "sobrescritos al actualizar el árbol de trabajo:\n"
-"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
+"%%sPor favor, muévelos o elimínalos antes de cambiar de rama."
 
 #: unpack-trees.c:156
 #, c-format
@@ -9374,13 +9639,13 @@ msgid ""
 "%%s"
 msgstr ""
 "Los siguientes archivos no rastreados en el árbol de trabajo serán "
-"eliminadospor %s:\n"
+"eliminados por %s:\n"
 "%%s"
 
 #: unpack-trees.c:174
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr "Entrada '%s' se superpone con '%s'.  No se pueden unir."
+msgstr "Entrada '%s' se solapa con '%s'.  No se pueden unir."
 
 #: unpack-trees.c:177
 #, c-format
@@ -9388,7 +9653,7 @@ msgid ""
 "Cannot update submodule:\n"
 "%s"
 msgstr ""
-"No se puede actualizar le submódulo:\n"
+"No se puede actualizar el submódulo:\n"
 "%s"
 
 #: unpack-trees.c:180
@@ -9398,8 +9663,8 @@ msgid ""
 "patterns:\n"
 "%s"
 msgstr ""
-"La siguientes rutas no están actualizadas y fueron dejadas a pesar del "
-"patrón especificado:\n"
+"Las siguientes rutas no están actualizadas y fueron dejadas a pesar de los "
+"patrones sparse:\n"
 "%s"
 
 #: unpack-trees.c:182
@@ -9420,7 +9685,7 @@ msgid ""
 "%s"
 msgstr ""
 "Las siguientes rutas ya estaban presentes y por eso no fueron actualizadas a "
-"pesar del patrón especificado:\n"
+"pesar de los patrones sparse:\n"
 "%s"
 
 #: unpack-trees.c:264
@@ -9447,21 +9712,21 @@ msgid ""
 "on a case-insensitive filesystem) and only one from the same\n"
 "colliding group is in the working tree:\n"
 msgstr ""
-"las siguientes rutas han colisionado (p.e. rutas con case-sensitive\n"
+"las siguientes rutas han colisionado (p.e. rutas case-sensitive\n"
 "en un filesystem case-insensitive) y solo una del grupo\n"
 "colisionando está en el árbol de trabajo:\n"
 
-#: unpack-trees.c:1519
+#: unpack-trees.c:1620
 msgid "Updating index flags"
-msgstr "Actualizando flags del index"
+msgstr "Actualizando flags del índice"
 
-#: unpack-trees.c:2608
+#: unpack-trees.c:2772
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr ""
 "el árbol de trabajo y commits no monitoreados tienen entradas duplicadas: %s"
 
-#: upload-pack.c:1548
+#: upload-pack.c:1561
 msgid "expected flush after fetch arguments"
 msgstr "se espera flush tras argumentos fetch"
 
@@ -9480,7 +9745,7 @@ msgstr "falta host y el esquema no es 'file:'"
 
 #: urlmatch.c:232
 msgid "a 'file:' URL may not have a port number"
-msgstr "un 'archivo:' URL puede no tener un número de puerto"
+msgstr "un URL de 'file:' no puede tener número de puerto"
 
 #: urlmatch.c:247
 msgid "invalid characters in host name"
@@ -9488,7 +9753,7 @@ msgstr "carácter inválido en el nombre del host"
 
 #: urlmatch.c:292 urlmatch.c:303
 msgid "invalid port number"
-msgstr "numero de puerto inválido"
+msgstr "número de puerto inválido"
 
 #: urlmatch.c:371
 msgid "invalid '..' path segment"
@@ -9498,118 +9763,128 @@ msgstr "segmento de ruta '..' inválido"
 msgid "Fetching objects"
 msgstr "Haciendo fetch a objetos"
 
-#: worktree.c:238 builtin/am.c:2151
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr "falló al leer '%s'"
 
-#: worktree.c:304
+#: worktree.c:303
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 "'%s' en el árbol de trabajo principal no es el directorio del repositorio"
 
-#: worktree.c:315
+#: worktree.c:314
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 "archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de "
 "trabajo"
 
-#: worktree.c:327
+#: worktree.c:326
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' no existe"
 
-#: worktree.c:333
+#: worktree.c:332
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' no es un archivo .git, código de error %d"
 
-#: worktree.c:342
+#: worktree.c:341
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' no apunta de vuelta a '%s'"
 
-#: worktree.c:608
+#: worktree.c:603
 msgid "not a directory"
 msgstr "no es un directorio"
 
-#: worktree.c:617
+#: worktree.c:612
 msgid ".git is not a file"
 msgstr ".git no es un archivo"
 
-#: worktree.c:619
+#: worktree.c:614
 msgid ".git file broken"
 msgstr "archivo .git roto"
 
-#: worktree.c:621
+#: worktree.c:616
 msgid ".git file incorrect"
 msgstr "archivo .git incorrecto"
 
-#: worktree.c:727
+#: worktree.c:722
 msgid "not a valid path"
 msgstr "no es una ruta válida"
 
-#: worktree.c:733
+#: worktree.c:728
 msgid "unable to locate repository; .git is not a file"
 msgstr "no es posible ubicar el repositorio; .git no es un archivo"
 
-#: worktree.c:737
+#: worktree.c:732
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr ""
-"incapaz de localizar el repositorio; El archivo .git no hace referencia a un "
+"incapaz de localizar el repositorio; el archivo .git no hace referencia a un "
 "repositorio"
 
-#: worktree.c:741
+#: worktree.c:736
 msgid "unable to locate repository; .git file broken"
 msgstr "no es posible ubicar el repositorio; archivo .git roto"
 
-#: worktree.c:747
+#: worktree.c:742
 msgid "gitdir unreadable"
 msgstr "gitdir ilegible"
 
-#: worktree.c:751
+#: worktree.c:746
 msgid "gitdir incorrect"
 msgstr "gitdir incorrecto"
 
-#: worktree.c:776
+#: worktree.c:771
 msgid "not a valid directory"
 msgstr "no en un directorio válido"
 
-#: worktree.c:782
+#: worktree.c:777
 msgid "gitdir file does not exist"
 msgstr "archivo gitdir no existe"
 
-#: worktree.c:787 worktree.c:796
+#: worktree.c:782 worktree.c:791
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "no es posible leer archivo gitdir (%s)"
 
-#: worktree.c:806
+#: worktree.c:801
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "lectura corta (se esperaba %<PRIuMAX> bytes, se leyó %<PRIuMAX>)"
 
-#: worktree.c:814
+#: worktree.c:809
 msgid "invalid gitdir file"
 msgstr "archivo gitdir inválido"
 
-#: worktree.c:822
+#: worktree.c:817
 msgid "gitdir file points to non-existent location"
 msgstr "archivo gitdir apunta a una ubicación inexistente"
 
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "no se pudo establecer setenv '%s'"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no se puede crear '%s'"
+
+#: wrapper.c:205 wrapper.c:375
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "no se pudo abrir '%s' para lectura y escritura"
 
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
 #, c-format
 msgid "unable to access '%s'"
 msgstr "no es posible acceder '%s'"
 
-#: wrapper.c:607
+#: wrapper.c:615
 msgid "unable to get current working directory"
 msgstr "no es posible obtener el directorio de trabajo actual"
 
@@ -9640,18 +9915,18 @@ msgstr "  (usa \"git add <archivo>...\" para marcar una resolución)"
 #: wt-status.c:199 wt-status.c:203
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
-"  (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la "
+"  (usa \"git add/rm <archivo>...\" como sea apropiado para marcar la "
 "resolución)"
 
 #: wt-status.c:201
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (usa \"git rm <file>...\" para marcar la resolución)"
 
-#: wt-status.c:211 wt-status.c:1075
+#: wt-status.c:211 wt-status.c:1125
 msgid "Changes to be committed:"
 msgstr "Cambios a ser confirmados:"
 
-#: wt-status.c:234 wt-status.c:1084
+#: wt-status.c:234 wt-status.c:1134
 msgid "Changes not staged for commit:"
 msgstr "Cambios no rastreados para el commit:"
 
@@ -9676,8 +9951,8 @@ msgstr ""
 #: wt-status.c:243
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
-"  (confirmar o descartar el contenido sin seguimiento o modificado en los "
-"sub-módulos)"
+"  (confirma o descarta el contenido sin seguimiento o modificado en los sub-"
+"módulos)"
 
 #: wt-status.c:254
 #, c-format
@@ -9687,11 +9962,11 @@ msgstr ""
 
 #: wt-status.c:266
 msgid "both deleted:"
-msgstr "ambos borrados:"
+msgstr "borrados por ambos:"
 
 #: wt-status.c:268
 msgid "added by us:"
-msgstr "agregado por nosotros:"
+msgstr "agregados por nosotros:"
 
 #: wt-status.c:270
 msgid "deleted by them:"
@@ -9699,43 +9974,43 @@ msgstr "borrados por ellos:"
 
 #: wt-status.c:272
 msgid "added by them:"
-msgstr "agregado por ellos:"
+msgstr "agregados por ellos:"
 
 #: wt-status.c:274
 msgid "deleted by us:"
-msgstr "borrado por nosotros:"
+msgstr "borrados por nosotros:"
 
 #: wt-status.c:276
 msgid "both added:"
-msgstr "ambos agregados:"
+msgstr "agregados por ambos:"
 
 #: wt-status.c:278
 msgid "both modified:"
-msgstr "ambos modificados:"
+msgstr "modificados por ambos:"
 
 #: wt-status.c:288
 msgid "new file:"
-msgstr "nuevo archivo:"
+msgstr "nuevos archivos:"
 
 #: wt-status.c:290
 msgid "copied:"
-msgstr "copiado:"
+msgstr "copiados:"
 
 #: wt-status.c:292
 msgid "deleted:"
-msgstr "borrado:"
+msgstr "borrados:"
 
 #: wt-status.c:294
 msgid "modified:"
-msgstr "modificado:"
+msgstr "modificados:"
 
 #: wt-status.c:296
 msgid "renamed:"
-msgstr "renombrado:"
+msgstr "renombrados:"
 
 #: wt-status.c:298
 msgid "typechange:"
-msgstr "cambio de tipo:"
+msgstr "cambios de tipo:"
 
 #: wt-status.c:300
 msgid "unknown:"
@@ -9743,7 +10018,7 @@ msgstr "desconocido:"
 
 #: wt-status.c:302
 msgid "unmerged:"
-msgstr "des-fusionado:"
+msgstr "sin fusión:"
 
 #: wt-status.c:382
 msgid "new commits, "
@@ -9757,30 +10032,30 @@ msgstr "contenido modificado, "
 msgid "untracked content, "
 msgstr "contenido no rastreado, "
 
-#: wt-status.c:908
+#: wt-status.c:958
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "Tu stash actualmente tiene %d entrada"
 msgstr[1] "Tu stash actualmente tiene %d entradas"
 
-#: wt-status.c:939
+#: wt-status.c:989
 msgid "Submodules changed but not updated:"
 msgstr "Submódulos cambiados pero no actualizados:"
 
-#: wt-status.c:941
+#: wt-status.c:991
 msgid "Submodule changes to be committed:"
 msgstr "Submódulos cambiados listos para realizar commit:"
 
-#: wt-status.c:1023
+#: wt-status.c:1073
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
 msgstr ""
-"No modifique o borre la línea de encima.\n"
-"Todo lo que este por abajo será eliminado."
+"No modifiques ni borres la línea de encima.\n"
+"Todo lo que esté por abajo será ignorado."
 
-#: wt-status.c:1115
+#: wt-status.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -9791,107 +10066,107 @@ msgstr ""
 "Tomó %.2f segundos para calcular los valores anterior/posterior del branch.\n"
 "Puedes usar '--no-ahead-behind' para evitar esto.\n"
 
-#: wt-status.c:1145
+#: wt-status.c:1195
 msgid "You have unmerged paths."
 msgstr "Tienes rutas no fusionadas."
 
-#: wt-status.c:1148
+#: wt-status.c:1198
 msgid "  (fix conflicts and run \"git commit\")"
-msgstr "  (arregla los conflictos y corre \"git commit\""
+msgstr "  (arregla los conflictos y ejecuta \"git commit\""
 
-#: wt-status.c:1150
+#: wt-status.c:1200
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (usa \"git merge --abort\" para abortar la fusion)"
 
-#: wt-status.c:1154
+#: wt-status.c:1204
 msgid "All conflicts fixed but you are still merging."
 msgstr "Todos los conflictos resueltos pero sigues fusionando."
 
-#: wt-status.c:1157
+#: wt-status.c:1207
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (usa \"git commit\" para concluir la fusión)"
 
-#: wt-status.c:1166
+#: wt-status.c:1216
 msgid "You are in the middle of an am session."
 msgstr "Estás en medio de una sesión am."
 
-#: wt-status.c:1169
+#: wt-status.c:1219
 msgid "The current patch is empty."
 msgstr "El parche actual está vacío."
 
-#: wt-status.c:1173
+#: wt-status.c:1223
 msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr "  (arregla los conflictos y luego corre \"git am --continue\""
+msgstr "  (arregla los conflictos y luego ejecuta \"git am --continue\""
 
-#: wt-status.c:1175
+#: wt-status.c:1225
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (usa \"git am --skip\" para saltar este parche)"
 
-#: wt-status.c:1177
+#: wt-status.c:1227
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (usa \"git am --abort\" para restaurar la rama original)"
 
-#: wt-status.c:1310
+#: wt-status.c:1360
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo no está presente."
 
-#: wt-status.c:1312
+#: wt-status.c:1362
 msgid "No commands done."
 msgstr "No se realizaron los comandos."
 
-#: wt-status.c:1315
+#: wt-status.c:1365
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "El último comando realizado (%d comando realizado):"
 msgstr[1] "Los últimos comandos realizados (%d comandos realizados):"
 
-#: wt-status.c:1326
+#: wt-status.c:1376
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (ver más en el archivo %s)"
 
-#: wt-status.c:1331
+#: wt-status.c:1381
 msgid "No commands remaining."
 msgstr "No quedan más comandos."
 
-#: wt-status.c:1334
+#: wt-status.c:1384
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Siguiente comando a realizar (%d comando restante):"
-msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes):"
+msgstr[1] "Siguientes comandos a realizar (%d comandos faltantes):"
 
-#: wt-status.c:1342
+#: wt-status.c:1392
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (usa \"git rebase --edit-todo\" para ver y editar)"
 
-#: wt-status.c:1354
+#: wt-status.c:1404
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Estás aplicando un rebase de la rama '%s' en '%s."
+msgstr "Estás aplicando un rebase de la rama '%s' sobre '%s."
 
-#: wt-status.c:1359
+#: wt-status.c:1409
 msgid "You are currently rebasing."
 msgstr "Estás aplicando un rebase."
 
-#: wt-status.c:1372
+#: wt-status.c:1422
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git rebase --continue\")"
 
-#: wt-status.c:1374
+#: wt-status.c:1424
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (usa \"git rebase --skip\" para omitir este parche)"
 
-#: wt-status.c:1376
+#: wt-status.c:1426
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (usa \"git rebase --abort\" para volver a tu rama original)"
 
-#: wt-status.c:1383
+#: wt-status.c:1433
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
 
-#: wt-status.c:1387
+#: wt-status.c:1437
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9899,157 +10174,161 @@ msgstr ""
 "Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
 "'%s'."
 
-#: wt-status.c:1392
+#: wt-status.c:1442
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Estás dividiendo un commit durante un rebase."
 
-#: wt-status.c:1395
+#: wt-status.c:1445
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"
 "continue\")"
 
-#: wt-status.c:1399
+#: wt-status.c:1449
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
-"Estás editando un commit mientras se aplica un rebase de la rama '%s' en "
+"Estás editando un commit mientras se aplica un rebase de la rama '%s' sobre "
 "'%s'."
 
-#: wt-status.c:1404
+#: wt-status.c:1454
 msgid "You are currently editing a commit during a rebase."
 msgstr "Estás editando un commit durante un rebase."
 
-#: wt-status.c:1407
+#: wt-status.c:1457
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (usa \"git commit --amend\" para enmendar el commit actual)"
 
-#: wt-status.c:1409
+#: wt-status.c:1459
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (usa \"git rebase --continue\" una vez que estés satisfecho con tus "
 "cambios)"
 
-#: wt-status.c:1420
+#: wt-status.c:1470
 msgid "Cherry-pick currently in progress."
 msgstr "Cherry-pick en progreso actualmente."
 
-#: wt-status.c:1423
+#: wt-status.c:1473
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Estás realizando un cherry-picking en el commit %s."
 
-#: wt-status.c:1430
+#: wt-status.c:1480
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"
 
-#: wt-status.c:1433
+#: wt-status.c:1483
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (ejecuta \"git cherry-pick --continue\" para continuar)"
 
-#: wt-status.c:1436
+#: wt-status.c:1486
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
 
-#: wt-status.c:1438
+#: wt-status.c:1488
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  (usa \"git cherry-pick --skip\" para saltar este parche)"
 
-#: wt-status.c:1440
+#: wt-status.c:1490
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
-"  (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
+"  (usa \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
 
-#: wt-status.c:1450
+#: wt-status.c:1500
 msgid "Revert currently in progress."
-msgstr "Revierte el estado en progreso actual."
+msgstr "Reversión en progreso actualmente."
 
-#: wt-status.c:1453
+#: wt-status.c:1503
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Estás revirtiendo el commit %s."
 
-#: wt-status.c:1459
+#: wt-status.c:1509
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git revert --continue\")"
 
-#: wt-status.c:1462
+#: wt-status.c:1512
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (ejecuta \"git revert --continue\" para continuar)"
 
-#: wt-status.c:1465
+#: wt-status.c:1515
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
 
-#: wt-status.c:1467
+#: wt-status.c:1517
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (usa \"git revert --skip\" para omitir este parche)"
 
-#: wt-status.c:1469
+#: wt-status.c:1519
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (usa \"git revert --abort\" para cancelar la operación de revertir)"
 
-#: wt-status.c:1479
+#: wt-status.c:1529
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Estás aplicando un bisect, comenzando en la rama '%s'."
 
-#: wt-status.c:1483
+#: wt-status.c:1533
 msgid "You are currently bisecting."
 msgstr "Estás aplicando un bisect."
 
-#: wt-status.c:1486
+#: wt-status.c:1536
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (usa \"git bisect reset\" para volver a la rama original)"
 
-#: wt-status.c:1497
+#: wt-status.c:1547
+msgid "You are in a sparse checkout."
+msgstr "Estás en un sparse checkout."
+
+#: wt-status.c:1550
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr "Estas en un checkout de sparse con %d%% archivos rastreados presentes."
+msgstr "Estás en un checkout de sparse con %d%% archivos rastreados presentes."
 
-#: wt-status.c:1736
+#: wt-status.c:1794
 msgid "On branch "
 msgstr "En la rama "
 
-#: wt-status.c:1743
+#: wt-status.c:1801
 msgid "interactive rebase in progress; onto "
-msgstr "rebase interactivo en progreso; en "
+msgstr "rebase interactivo en progreso; sobre "
 
-#: wt-status.c:1745
+#: wt-status.c:1803
 msgid "rebase in progress; onto "
-msgstr "rebase en progreso; en "
+msgstr "rebase en progreso; sobre "
 
-#: wt-status.c:1750
+#: wt-status.c:1808
 msgid "HEAD detached at "
 msgstr "HEAD desacoplada en "
 
-#: wt-status.c:1752
+#: wt-status.c:1810
 msgid "HEAD detached from "
 msgstr "HEAD desacoplada de "
 
-#: wt-status.c:1755
+#: wt-status.c:1813
 msgid "Not currently on any branch."
 msgstr "Actualmente no estás en ninguna rama."
 
-#: wt-status.c:1772
+#: wt-status.c:1830
 msgid "Initial commit"
 msgstr "Confirmación inicial"
 
-#: wt-status.c:1773
+#: wt-status.c:1831
 msgid "No commits yet"
 msgstr "No hay commits todavía"
 
-#: wt-status.c:1787
+#: wt-status.c:1845
 msgid "Untracked files"
 msgstr "Archivos sin seguimiento"
 
-#: wt-status.c:1789
+#: wt-status.c:1847
 msgid "Ignored files"
 msgstr "Archivos ignorados"
 
-#: wt-status.c:1793
+#: wt-status.c:1851
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10058,33 +10337,33 @@ msgid ""
 msgstr ""
 "Tomó %.2f segundos enumerar los archivos no rastreados. 'status -uno'\n"
 "puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n"
-"nuevos archivos tú mismo (vea 'git help status')."
+"nuevos archivos tú mismo (mira 'git help status')."
 
-#: wt-status.c:1799
+#: wt-status.c:1857
 #, c-format
 msgid "Untracked files not listed%s"
-msgstr "Archivos no rastreados no son mostrados %s"
+msgstr "Archivos no rastreados no son mostrados%s"
 
-#: wt-status.c:1801
+#: wt-status.c:1859
 msgid " (use -u option to show untracked files)"
 msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
 
-#: wt-status.c:1807
+#: wt-status.c:1865
 msgid "No changes"
 msgstr "Sin cambios"
 
-#: wt-status.c:1812
+#: wt-status.c:1870
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"
 
-#: wt-status.c:1816
+#: wt-status.c:1874
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "no se agregaron cambios al commit\n"
 
-#: wt-status.c:1820
+#: wt-status.c:1878
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -10093,225 +10372,225 @@ msgstr ""
 "no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
 "(usa \"git add\" para hacerles seguimiento)\n"
 
-#: wt-status.c:1824
+#: wt-status.c:1882
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "no hay nada agregado para confirmar, pero hay archivos sin seguimiento "
 "presentes\n"
 
-#: wt-status.c:1828
+#: wt-status.c:1886
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "
 "hacerles seguimiento)\n"
 
-#: wt-status.c:1832 wt-status.c:1838
+#: wt-status.c:1890 wt-status.c:1896
 #, c-format
 msgid "nothing to commit\n"
 msgstr "nada para hacer commit\n"
 
-#: wt-status.c:1835
+#: wt-status.c:1893
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"
 
-#: wt-status.c:1840
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "nada para hacer commit, el árbol de trabajo está limpio\n"
 
-#: wt-status.c:1945
+#: wt-status.c:2003
 msgid "No commits yet on "
 msgstr "No hay commits todavía en "
 
-#: wt-status.c:1949
+#: wt-status.c:2007
 msgid "HEAD (no branch)"
 msgstr "HEAD (sin rama)"
 
-#: wt-status.c:1980
+#: wt-status.c:2038
 msgid "different"
 msgstr "diferente"
 
-#: wt-status.c:1982 wt-status.c:1990
+#: wt-status.c:2040 wt-status.c:2048
 msgid "behind "
 msgstr "detrás "
 
-#: wt-status.c:1985 wt-status.c:1988
+#: wt-status.c:2043 wt-status.c:2046
 msgid "ahead "
 msgstr "adelante "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2511
+#: wt-status.c:2569
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "no se puede %s: Tienes cambios sin marcar."
 
-#: wt-status.c:2517
+#: wt-status.c:2575
 msgid "additionally, your index contains uncommitted changes."
 msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."
 
-#: wt-status.c:2519
+#: wt-status.c:2577
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."
 
-#: compat/simple-ipc/ipc-unix-socket.c:178
+#: compat/simple-ipc/ipc-unix-socket.c:183
 msgid "could not send IPC command"
 msgstr "no se pudo enviar el comando IPC"
 
-#: compat/simple-ipc/ipc-unix-socket.c:185
+#: compat/simple-ipc/ipc-unix-socket.c:190
 msgid "could not read IPC response"
 msgstr "no se pudo leer la respuesta IPC"
 
-#: compat/simple-ipc/ipc-unix-socket.c:862
+#: compat/simple-ipc/ipc-unix-socket.c:870
 #, c-format
 msgid "could not start accept_thread '%s'"
 msgstr "no se pudo iniciar el accept_thread '%s'"
 
-#: compat/simple-ipc/ipc-unix-socket.c:874
+#: compat/simple-ipc/ipc-unix-socket.c:882
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr "no se pudo iniciar el worker[0] para '%s'"
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "falló al desvincular '%s'"
 
 #: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<opción>] [--] <especificación-de-ruta>..."
+msgstr "git add [<opciones>] [--] <especificación-de-ruta>..."
 
-#: builtin/add.c:61
+#: builtin/add.c:64
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "no se puede aplicar chmod %cx '%s'"
 
-#: builtin/add.c:99
+#: builtin/add.c:106
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "diff status inesperado %c"
 
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
 msgid "updating files failed"
-msgstr "falló la actualización de carpetas"
+msgstr "falló la actualización de archivos"
 
-#: builtin/add.c:114
+#: builtin/add.c:121
 #, c-format
 msgid "remove '%s'\n"
 msgstr "eliminar '%s'\n"
 
-#: builtin/add.c:198
+#: builtin/add.c:205
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Cambios fuera del área de stage tras refrescar el índice:"
 
-#: builtin/add.c:307 builtin/rev-parse.c:991
+#: builtin/add.c:317 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "No se pudo leer el índice"
 
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "No se pudo abrir '%s' para escritura."
-
-#: builtin/add.c:322
+#: builtin/add.c:330
 msgid "Could not write patch"
 msgstr "No se puede escribir el parche"
 
-#: builtin/add.c:325
+#: builtin/add.c:333
 msgid "editing patch failed"
 msgstr "falló la edición del parche"
 
-#: builtin/add.c:328
+#: builtin/add.c:336
 #, c-format
 msgid "Could not stat '%s'"
-msgstr "No se pudo definir '%s'"
+msgstr "No se pudo hacer stat en '%s'"
 
-#: builtin/add.c:330
+#: builtin/add.c:338
 msgid "Empty patch. Aborted."
 msgstr "Parche vacío. Abortado."
 
-#: builtin/add.c:335
+#: builtin/add.c:343
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "No se pudo aplicar '%s'"
 
-#: builtin/add.c:343
+#: builtin/add.c:351
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"
 
-#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: 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/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
-msgstr "dry run ( ejecución en seco)"
+msgstr "dry run (ejecución en seco)"
 
-#: builtin/add.c:366
+#: builtin/add.c:374
 msgid "interactive picking"
 msgstr "selección interactiva"
 
-#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
 msgid "select hunks interactively"
-msgstr "elegir hunks de forma interactiva"
+msgstr "elegir fragmentos de forma interactiva"
 
-#: builtin/add.c:368
+#: builtin/add.c:376
 msgid "edit current diff and apply"
 msgstr "editar diff actual y aplicar"
 
-#: builtin/add.c:369
+#: builtin/add.c:377
 msgid "allow adding otherwise ignored files"
-msgstr "permitir agregar caso contrario ignorar archivos"
+msgstr "permitir agregar archivos que de otro modo se ignoren"
 
-#: builtin/add.c:370
+#: builtin/add.c:378
 msgid "update tracked files"
-msgstr "actualizado las carpetas rastreadas"
+msgstr "actualizar los archivos rastreados"
 
-#: builtin/add.c:371
+#: builtin/add.c:379
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "renormalizar EOL de los archivos rastreados (implica -u)"
 
-#: builtin/add.c:372
+#: builtin/add.c:380
 msgid "record only the fact that the path will be added later"
-msgstr "grabar solo el hecho de que la ruta será agregada después"
+msgstr "grabar solo el hecho de que la ruta será agregada luego"
 
-#: builtin/add.c:373
+#: builtin/add.c:381
 msgid "add changes from all tracked and untracked files"
-msgstr "agregar los cambios de todas las carpetas con y sin seguimiento"
+msgstr "agregar los cambios de todos los archivos con y sin seguimiento"
 
-#: builtin/add.c:376
+#: builtin/add.c:384
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 "ignorar rutas eliminadas en el árbol de trabajo (lo mismo que --no-all)"
 
-#: builtin/add.c:378
+#: builtin/add.c:386
 msgid "don't add, only refresh the index"
 msgstr "no agregar, solo actualizar el índice"
 
-#: builtin/add.c:379
+#: builtin/add.c:387
 msgid "just skip files which cannot be added because of errors"
-msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores"
+msgstr "saltar los archivos que no pueden ser agregados a causa de errores"
 
-#: builtin/add.c:380
+#: builtin/add.c:388
 msgid "check if - even missing - files are ignored in dry run"
-msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run"
+msgstr ""
+"comprobar si los archivos - incluso los que faltan - se ignoran en dry run"
+
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "permite actualizar entradas fuera del cono de sparse-checkout"
 
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: builtin/add.c:391 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "sobrescribir el bit ejecutable de los archivos listados"
 
-#: builtin/add.c:384
+#: builtin/add.c:393
 msgid "warn when adding an embedded repository"
 msgstr "avisar cuando se agrega un repositorio incrustado"
 
-#: builtin/add.c:386
+#: builtin/add.c:395
 msgid "backend for `git stash -p`"
 msgstr "backend para `git stash -p`"
 
-#: builtin/add.c:404
+#: builtin/add.c:413
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10330,24 +10609,24 @@ msgid ""
 msgstr ""
 "Se ha agregado otro repositorio de git dentro del repositorio actual.\n"
 "Clones del repositorio exterior no tendrán el contenido del\n"
-"repositorio embebido y no sabrán como obtenerla.\n"
+"repositorio embebido y no sabrán como obtenerlo.\n"
 "Si querías agregar un submódulo, usa:\n"
 "\n"
 "\tgit submodule add <url> %s\n"
 "\n"
-"Si se agrego esta ruta por error, puedes eliminar desde el índice\n"
+"Si se agregó esta ruta por error, puedes eliminarla del índice\n"
 "usando:\n"
 "\n"
 "\tgit rm --cached %s\n"
 "\n"
-"Vea \"git help submodule\" para más información."
+"Mira \"git help submodule\" para más información."
 
-#: builtin/add.c:432
+#: builtin/add.c:442
 #, c-format
 msgid "adding embedded git repository: %s"
-msgstr "agregando repositorio embebido: %s"
+msgstr "agregando repositorio de git embebido: %s"
 
-#: builtin/add.c:451
+#: builtin/add.c:462
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10357,190 +10636,189 @@ msgstr ""
 "Desactiva este mensaje ejecutando\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:460
+#: builtin/add.c:477
 msgid "adding files failed"
 msgstr "falló al agregar archivos"
 
-#: builtin/add.c:488
+#: builtin/add.c:513
 msgid "--dry-run is incompatible with --interactive/--patch"
 msgstr "--dry-run es incompatible con --interactive/--patch"
 
-#: builtin/add.c:490 builtin/commit.c:357
+#: builtin/add.c:515 builtin/commit.c:358
 msgid "--pathspec-from-file is incompatible with --interactive/--patch"
 msgstr "--pathspec-from-file es incompatible con --interactive/--patch"
 
-#: builtin/add.c:507
+#: builtin/add.c:532
 msgid "--pathspec-from-file is incompatible with --edit"
 msgstr "--pathspec-from-file es incompatible con --edit"
 
-#: builtin/add.c:519
+#: builtin/add.c:544
 msgid "-A and -u are mutually incompatible"
 msgstr "-A y -u son mutuamente incompatibles"
 
-#: builtin/add.c:522
+#: builtin/add.c:547
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run"
 
-#: builtin/add.c:526
+#: builtin/add.c:551
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
-msgstr "El parámetro '%s' para --chmod debe ser -x ó +x"
+msgstr "El parámetro '%s' para --chmod debe ser -x o +x"
 
-#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
+#: 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 es incompatible con argumentos de pathspec"
 
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
+#: 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 requiere --pathspec-from-file"
 
-#: builtin/add.c:555
+#: builtin/add.c:583
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nada especificado, nada agregado.\n"
 
-#: builtin/add.c:557
+#: builtin/add.c:585
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
 "\"git config advice.addEmptyPathspec false\""
 msgstr ""
-"¿Tal vez quisiste decir 'git add.'?\n"
+"¿Tal vez quisiste decir 'git add .'?\n"
 "Desactiva este mensage ejecutando\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:364
+#: builtin/am.c:366
 msgid "could not parse author script"
 msgstr "no se pudo analizar el script del autor"
 
-#: builtin/am.c:454
+#: builtin/am.c:456
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' fue borrado por el hook de applypatch-msg"
 
-#: builtin/am.c:496
+#: builtin/am.c:498
 #, c-format
 msgid "Malformed input line: '%s'."
-msgstr "Línea mal formada: '%s'."
+msgstr "Línea de entrada mal formada: '%s'."
 
-#: builtin/am.c:534
+#: builtin/am.c:536
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Falló al copiar notas de '%s' a '%s'"
 
-#: builtin/am.c:560
+#: builtin/am.c:562
 msgid "fseek failed"
-msgstr "fall de fseek"
+msgstr "fallo de fseek"
 
-#: builtin/am.c:748
+#: builtin/am.c:750
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "no se pudo analizar el parche '%s'"
 
-#: builtin/am.c:813
+#: builtin/am.c:815
 msgid "Only one StGIT patch series can be applied at once"
-msgstr "Solo un parche StGIT puede ser aplicado de una vez"
+msgstr "Solo un parche StGIT puede ser aplicado a la vez"
 
-#: builtin/am.c:861
+#: builtin/am.c:863
 msgid "invalid timestamp"
 msgstr "timestamp inválido"
 
-#: builtin/am.c:866 builtin/am.c:878
+#: builtin/am.c:868 builtin/am.c:880
 msgid "invalid Date line"
 msgstr "línea Date inválida"
 
-#: builtin/am.c:873
+#: builtin/am.c:875
 msgid "invalid timezone offset"
 msgstr "offset de zona horaria inválido"
 
-#: builtin/am.c:966
+#: builtin/am.c:968
 msgid "Patch format detection failed."
 msgstr "Falló al detectar el formato del parche."
 
-#: builtin/am.c:971 builtin/clone.c:414
+#: builtin/am.c:973 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "falló al crear el directorio '%s'"
 
-#: builtin/am.c:976
+#: builtin/am.c:978
 msgid "Failed to split patches."
 msgstr "Falló al dividir parches."
 
-#: builtin/am.c:1125
+#: builtin/am.c:1127
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Cuando hayas resuelto este problema, ejecuta \"%s --continue\"."
 
-#: builtin/am.c:1126
+#: builtin/am.c:1128
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"."
 
-#: builtin/am.c:1127
+#: builtin/am.c:1129
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
-"Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort"
-"\"."
+"Para restaurar la rama original y detener el parcheo, ejecuta \"%s --abort\"."
 
-#: builtin/am.c:1222
+#: builtin/am.c:1224
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
-"Parche mandado con formato=flowed; espacios al final de las líneas tal vez "
+"Parche enviado con format=flowed; espacios al final de las líneas tal vez "
 "desaparezcan."
 
-#: builtin/am.c:1250
+#: builtin/am.c:1252
 msgid "Patch is empty."
 msgstr "El parche está vacío."
 
-#: builtin/am.c:1315
+#: builtin/am.c:1317
 #, c-format
 msgid "missing author line in commit %s"
-msgstr "falta línea autor en commit %s"
+msgstr "falta línea de autor en commit %s"
 
-#: builtin/am.c:1318
+#: builtin/am.c:1320
 #, c-format
 msgid "invalid ident line: %.*s"
-msgstr "sangría no válida: %.*s"
+msgstr "línea de identificación no válida: %.*s"
 
-#: builtin/am.c:1537
+#: builtin/am.c:1539
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Repositorio carece de los blobs necesarios para retroceder en una fusión de "
-"3-vías."
+"3 vías."
 
-#: builtin/am.c:1539
+#: builtin/am.c:1541
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Usando la información del índice para reconstruir un árbol base..."
 
-#: builtin/am.c:1558
+#: builtin/am.c:1560
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr ""
 "¿Editaste el parche a mano?\n"
-"No aplica a blobs guardados en su índice."
+"No aplica a los blobs registrados en su índice."
 
-#: builtin/am.c:1564
+#: builtin/am.c:1566
 msgid "Falling back to patching base and 3-way merge..."
-msgstr "Retrocediendo para parchar base y fusión de 3-vías..."
+msgstr "Retrocediendo para parchar base y fusionar de 3 vías..."
 
-#: builtin/am.c:1590
+#: builtin/am.c:1592
 msgid "Failed to merge in the changes."
-msgstr "Falló al fusionar en los cambios."
+msgstr "Falló al fusionar los cambios."
 
-#: builtin/am.c:1622
+#: builtin/am.c:1624
 msgid "applying to an empty history"
 msgstr "aplicando a un historial vacío"
 
-#: builtin/am.c:1674 builtin/am.c:1678
+#: builtin/am.c:1676 builtin/am.c:1680
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "no se puede continuar: %s no existe."
 
-#: builtin/am.c:1696
+#: builtin/am.c:1698
 msgid "Commit Body is:"
 msgstr "Cuerpo de commit es:"
 
@@ -10548,49 +10826,49 @@ msgstr "Cuerpo de commit es:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1706
+#: builtin/am.c:1708
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "¿Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 
-#: builtin/am.c:1752 builtin/commit.c:408
+#: builtin/am.c:1754 builtin/commit.c:409
 msgid "unable to write index file"
-msgstr "no es posible escribir en el archivo índice"
+msgstr "no es posible escribir el archivo índice"
 
-#: builtin/am.c:1756
+#: builtin/am.c:1758
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "�ndice sucio: no se puede aplicar parches (sucio: %s)"
 
-#: builtin/am.c:1796 builtin/am.c:1864
+#: builtin/am.c:1798 builtin/am.c:1865
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Aplicando: %.*s"
 
-#: builtin/am.c:1813
+#: builtin/am.c:1815
 msgid "No changes -- Patch already applied."
-msgstr "Sin cambios -- parche ya aplicado."
+msgstr "Sin cambios -- Parche ya aplicado."
 
-#: builtin/am.c:1819
+#: builtin/am.c:1821
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "El parche falló en %s %.*s"
 
-#: builtin/am.c:1823
+#: builtin/am.c:1825
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
-msgstr "Use 'git am --show-current-patch=diff' para ver el parche fallido"
+msgstr "Usa 'git am --show-current-patch=diff' para ver el parche fallido"
 
-#: builtin/am.c:1867
+#: builtin/am.c:1868
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
 "already introduced the same changes; you might want to skip this patch."
 msgstr ""
 "Sin cambios - ¿olvidaste usar 'git add'?\n"
-"Si no hay nada en el área de stage, las posibilidad es que algo mas\n"
-"ya haya introducido el mismo cambio; tal vez quieras omitir este parche."
+"Si no hay nada en el área de stage, lo más probable es que algo más\n"
+"ya ha introducido el mismo cambio; tal vez quieras omitir este parche."
 
-#: builtin/am.c:1874
+#: builtin/am.c:1875
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -10598,22 +10876,22 @@ msgid ""
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 "Todavía tienes rutas sin fusionar en tu índice.\n"
-"Debes realizar 'git add' cada archivo con conflictos resueltos y marcarlos "
-"como tal.\n"
+"Debes realizar 'git add' en cada archivo con conflictos resueltos para "
+"marcarlos como tal.\n"
 "Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" "
 "en él."
 
-#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "No se pudo analizar el objeto '%s'."
 
-#: builtin/am.c:2033
+#: builtin/am.c:2035 builtin/am.c:2111
 msgid "failed to clean index"
 msgstr "falló al limpiar el índice"
 
-#: builtin/am.c:2077
+#: builtin/am.c:2079
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10621,190 +10899,190 @@ msgstr ""
 "Parece haber movido HEAD desde el último falló 'am'.\n"
 "No rebobinando a ORIG_HEAD"
 
-#: builtin/am.c:2184
+#: builtin/am.c:2187
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valor inválido para --patch-format: %s"
 
-#: builtin/am.c:2226
+#: builtin/am.c:2229
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr "Valor inválido para --show-current-patch: %s"
 
-#: builtin/am.c:2230
+#: builtin/am.c:2233
 #, c-format
 msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
 msgstr "--show-current-patch=%s es incompatible con --show-current-patch=%s"
 
-#: builtin/am.c:2261
+#: builtin/am.c:2264
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2265
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opciones>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2268
+#: builtin/am.c:2271
 msgid "run interactively"
 msgstr "ejecutar de manera interactiva"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2273
 msgid "historical option -- no-op"
 msgstr "opción histórica -- no-op"
 
-#: builtin/am.c:2272
+#: builtin/am.c:2275
 msgid "allow fall back on 3way merging if needed"
-msgstr "permitir retroceso en fusión de 3-vías si es necesario"
+msgstr "permitir retroceso en fusión de 3 vías si es necesario"
 
-#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:948
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
 msgid "be quiet"
 msgstr "ser silencioso"
 
-#: builtin/am.c:2275
+#: builtin/am.c:2278
 msgid "add a Signed-off-by trailer to the commit message"
-msgstr "agregar una línea \"Firmado-por\" al mensaje del commit"
+msgstr "agregar una línea \"Signed-off-by\" al mensaje del commit"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2281
 msgid "recode into utf8 (default)"
 msgstr "recodificar en utf8 (default)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2283
 msgid "pass -k flag to git-mailinfo"
 msgstr "pasar flag -k a git-mailinfo"
 
-#: builtin/am.c:2282
+#: builtin/am.c:2285
 msgid "pass -b flag to git-mailinfo"
 msgstr "pasar flag -b a git-mailinfo"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2287
 msgid "pass -m flag to git-mailinfo"
 msgstr "pasar flag -m a git-mailinfo"
 
-#: builtin/am.c:2286
+#: builtin/am.c:2289
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2292
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr"
 
-#: builtin/am.c:2292
+#: builtin/am.c:2295
 msgid "strip everything before a scissors line"
 msgstr "descubrir todo antes de una línea de tijeras"
 
-#: builtin/am.c:2294
+#: builtin/am.c:2297
 msgid "pass it through git-mailinfo"
 msgstr "pasarlo a través de git-mailinfo"
 
-#: builtin/am.c:2297 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:2324
+#: 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
 msgid "pass it through git-apply"
 msgstr "pasarlo a través de git-apply"
 
-#: builtin/am.c:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261
+#: 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:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
-#: parse-options.h:317
+#: 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/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: 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/verify-tag.c:38
 msgid "format"
 msgstr "formato"
 
-#: builtin/am.c:2321
+#: builtin/am.c:2324
 msgid "format the patch(es) are in"
-msgstr "formatear el parche(s)"
+msgstr "formato de los parches"
 
-#: builtin/am.c:2327
+#: builtin/am.c:2330
 msgid "override error message when patch failure occurs"
-msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran"
+msgstr "sobrescribir mensaje de error cuando fallos de parcheo ocurran"
 
-#: builtin/am.c:2329
+#: builtin/am.c:2332
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuar aplicando los parches tras resolver conflictos"
 
-#: builtin/am.c:2332
+#: builtin/am.c:2335
 msgid "synonyms for --continue"
 msgstr "sinónimos para --continue"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2338
 msgid "skip the current patch"
 msgstr "saltar el parche actual"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2341
 msgid "restore the original branch and abort the patching operation"
 msgstr "restaurar la rama original y abortar la operación de parcheo"
 
-#: builtin/am.c:2341
+#: builtin/am.c:2344
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "abortar la operación de parcheo pero mantener HEAD donde está"
 
-#: builtin/am.c:2345
+#: builtin/am.c:2348
 msgid "show the patch being applied"
-msgstr "muestra el parche siendo aplicado"
+msgstr "mostrar el parche siendo aplicado"
 
-#: builtin/am.c:2350
+#: builtin/am.c:2353
 msgid "lie about committer date"
 msgstr "mentir sobre la fecha del committer"
 
-#: builtin/am.c:2352
+#: builtin/am.c:2355
 msgid "use current timestamp for author date"
 msgstr "usar el timestamp actual para la fecha del autor"
 
-#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: 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/revert.c:117 builtin/tag.c:460
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2358 builtin/rebase.c:1100
 msgid "GPG-sign commits"
-msgstr "Commits con firma GPG"
+msgstr "firmar los commits con GPG"
 
-#: builtin/am.c:2358
+#: builtin/am.c:2361
 msgid "(internal use for git-rebase)"
 msgstr "(uso interno para git-rebase)"
 
-#: builtin/am.c:2376
+#: builtin/am.c:2379
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
 msgstr ""
 "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"
-"será eliminada. Por favor no la use más."
+"será eliminada. Por favor no la uses más."
 
-#: builtin/am.c:2383
+#: builtin/am.c:2386
 msgid "failed to read the index"
 msgstr "falló al leer el índice"
 
-#: builtin/am.c:2398
+#: builtin/am.c:2401
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
-msgstr "directorio de rebase previo %s todavía existe en el mbox dado."
+msgstr "directorio de rebase previo %s todavía existe pero un mbox fue dado."
 
-#: builtin/am.c:2422
+#: builtin/am.c:2425
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr ""
 "Directorio extraviado %s encontrado.\n"
-"Use \"git am --abort\" para borrarlo."
+"Usa \"git am --abort\" para borrarlo."
 
-#: builtin/am.c:2428
+#: builtin/am.c:2431
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Operación de resolución no está en progreso, no vamos a continuar."
 
-#: builtin/am.c:2438
+#: builtin/am.c:2441
 msgid "interactive mode requires patches on the command line"
 msgstr "modo interactivo requiere parches en la línea de comando"
 
@@ -10812,44 +11090,35 @@ msgstr "modo interactivo requiere parches en la línea de comando"
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<opciones>] [<parche>...]"
 
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "no se pudo crear el archivo comprimido '%s'"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
 msgid "could not redirect output"
-msgstr "no se pudo direccionar la salida"
+msgstr "no se pudo redirigir la salida"
 
-#: builtin/archive.c:37
+#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Remote sin URL"
 
-#: builtin/archive.c:61
+#: builtin/archive.c:59
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive: se esperaba ACK/NAK, se obtuvo flush packet"
 
-#: builtin/archive.c:64
+#: builtin/archive.c:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: NACK %s"
 
-#: builtin/archive.c:65
+#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive: error de protocolo"
 
-#: builtin/archive.c:69
+#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive: se esperaba un flush"
 
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<commit>]"
 
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check <buen_term> <mal_term> [<term>]"
-
 #: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10882,52 +11151,65 @@ msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]"
 
 #: builtin/bisect--helper.c:31
 msgid "git bisect--helper --bisect-replay <filename>"
-msgstr "git bisect--helper --bisect-replay <archivio>"
+msgstr "git bisect--helper --bisect-replay <archivo>"
 
 #: builtin/bisect--helper.c:32
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<rev>|<rango>)...]"
 
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <cmd>..."
+
+#: builtin/bisect--helper.c:109
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr "no se puede abrir archivo '%s' en modo '%s'"
 
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "no se pudo escribir al archivo '%s'"
 
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "no se puede abrir archivo '%s' para lectura"
+
+#: builtin/bisect--helper.c:170
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' no es un término válido"
 
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "no se puede usar el comando nativo '%s' como un término"
 
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "no se puede cambiar el significado del término '%s'"
 
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
 msgid "please use two different terms"
-msgstr "por favor use dos términos diferentes"
+msgstr "por favor usa dos términos diferentes"
 
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "No estamos bisecando.\n"
 
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "'%s' no es un commit válido"
 
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10935,36 +11217,36 @@ msgstr ""
 "no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset "
 "<commit>'."
 
-#: builtin/bisect--helper.c:254
+#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Mal argumento bisect_write: %s"
 
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
-msgstr "no se puede obtener el oid de la rev '%s'"
+msgstr "no se pudo obtener el oid de la rev '%s'"
 
-#: builtin/bisect--helper.c:271
+#: builtin/bisect--helper.c:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "no se pudo abrir el archivo '%s'"
 
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:314
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "Comando inválido: actualmente se encuentra en un bisect %s/%s"
 
-#: builtin/bisect--helper.c:324
+#: builtin/bisect--helper.c:341
 #, 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 ""
-"Tienes que dar al menos un %s y un %s revision.\n"
+"Tienes que dar al menos una revisión %s y una %s.\n"
 "Se puede ver \"git bisect %s\" y \"git bisect %s\" para eso."
 
-#: builtin/bisect--helper.c:328
+#: builtin/bisect--helper.c:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -10972,10 +11254,10 @@ msgid ""
 "You can use \"git bisect %s\" and \"git bisect %s\" for that."
 msgstr ""
 "Tienes que comenzar por \"git bisect start\".\n"
-"Después tienes que entregar al menos un %s y una revision %s.\n"
+"Después tienes que entregar al menos una revisión %s y una %s.\n"
 "Puedes usar \"git bisect %s\" y \"git bisect %s\" para eso."
 
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "haciendo bisect solo con un commit %s"
@@ -10984,15 +11266,15 @@ msgstr "haciendo bisect solo con un commit %s"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "¿Estás seguro [Y/n]? "
 
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
 msgid "no terms defined"
 msgstr "no hay términos definidos"
 
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -11001,7 +11283,7 @@ msgstr ""
 "Tus términos actuales son %s para el estado viejo\n"
 "y %s para el estado nuevo.\n"
 
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -11010,53 +11292,53 @@ msgstr ""
 "argumento inválido %s para 'git bisect terms'.\n"
 "Las opciones soportadas son: --term-good|--term-old y --term-bad|--term-new."
 
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
-msgstr "la configuración del recorrido de revisión falló\n"
+msgstr "la configuración del recorrido de revisiones falló\n"
 
-#: builtin/bisect--helper.c:519
+#: builtin/bisect--helper.c:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "no se pudo abrir '%s' en modo append"
 
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
 msgstr "'' no es un término válido"
 
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "opción desconocida: '%s'"
 
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' no parece ser una revisión válida"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "mal HEAD - Necesito un HEAD"
 
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
-"error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'."
+"error al hacer checkout '%s'. Intenta 'git bisect start <rama-válida>'."
 
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "no se bisecará en un árbol con cg-seek"
 
-#: builtin/bisect--helper.c:735
+#: builtin/bisect--helper.c:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "mal HEAD - ref simbólico extraño"
 
-#: builtin/bisect--helper.c:755
+#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "ref inválido: '%s'"
 
-#: builtin/bisect--helper.c:813
+#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "Debes iniciar con \"git bisect start\"\n"
 
@@ -11064,261 +11346,311 @@ msgstr "Debes iniciar con \"git bisect start\"\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "¿Quieres que lo haga por ti [Y/n]? "
 
-#: builtin/bisect--helper.c:842
+#: builtin/bisect--helper.c:859
 msgid "Please call `--bisect-state` with at least one argument"
-msgstr "Llame a `--bisect-state` con al menos un argumento"
+msgstr "Por favor llama a `--bisect-state` con al menos un argumento"
 
-#: builtin/bisect--helper.c:855
+#: builtin/bisect--helper.c:872
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "'git bisect %s' solo puede tomar un argumento."
 
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "Mala entrada rev: %s"
 
-#: builtin/bisect--helper.c:887
+#: builtin/bisect--helper.c:904
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "Mala entrada rev (no es un commit): %s"
 
-#: builtin/bisect--helper.c:919
+#: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
 msgstr "No estamos bisecando."
 
-#: builtin/bisect--helper.c:969
+#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
-msgstr "'%s'?? ¿De qué estás hablando?"
+msgstr "¿¿'%s'?? ¿De qué estás hablando?"
 
-#: builtin/bisect--helper.c:981
+#: builtin/bisect--helper.c:998
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr "no se puede leer '%s' para reproducir"
 
-#: builtin/bisect--helper.c:1054
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "bisect falló: no se proveyó comando."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "ejecutando %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "bisect falló: código de salida %d de '%s' es <0 o >=128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "no se pudo abrir archivo '%s' para escritura"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "bisect no puede seguir continuando"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "bisect exitoso"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "bisect encontró el primer mal commit"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"ejecución de bisect falló:  'git bisect--helper --bisect-state %s' terminó "
+"con código de error %d"
+
+#: builtin/bisect--helper.c:1192
 msgid "reset the bisection state"
 msgstr "reiniciar el estado de bisect"
 
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1194
 msgid "check whether bad or good terms exist"
 msgstr "revisar si existen términos malos o buenos"
 
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1196
 msgid "print out the bisect terms"
 msgstr "imprimir los terms del bisect"
 
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1198
 msgid "start the bisect session"
 msgstr "comenzar la sesión de bisect"
 
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1200
 msgid "find the next bisection commit"
 msgstr "encontrar el siguiente commit de bisección"
 
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1202
 msgid "mark the state of ref (or refs)"
 msgstr "marcar el estado de ref (o refs)"
 
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1204
 msgid "list the bisection steps so far"
 msgstr "listar los pasos de bisección hasta ahora"
 
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1206
 msgid "replay the bisection process from the given file"
 msgstr "reproducir el proceso de bisección del archivo dado"
 
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1208
 msgid "skip some commits for checkout"
 msgstr "saltar algunos commits para checkout"
 
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "visualizar bisección"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "use <cmd>... para aplicar bisección automática."
+
+#: builtin/bisect--helper.c:1214
 msgid "no log for BISECT_WRITE"
 msgstr "no hay log para BISECT_WRITE"
 
-#: builtin/bisect--helper.c:1087
+#: builtin/bisect--helper.c:1229
 msgid "--bisect-reset requires either no argument or a commit"
-msgstr "--bisect-reset requiere un commit o ningún argumento"
-
-#: builtin/bisect--helper.c:1092
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check requiere 2 o 3 argumentos"
+msgstr "--bisect-reset requiere o un commit o ningún argumento"
 
-#: builtin/bisect--helper.c:1098
+#: builtin/bisect--helper.c:1234
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms requiere 0 o 1 argumentos"
 
-#: builtin/bisect--helper.c:1107
+#: builtin/bisect--helper.c:1243
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next requiere 0 argumentos"
 
-#: builtin/bisect--helper.c:1118
+#: builtin/bisect--helper.c:1254
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log requiere 0 argumentos"
 
-#: builtin/bisect--helper.c:1123
+#: builtin/bisect--helper.c:1259
 msgid "no logfile given"
 msgstr "ningún logfile proporcionado"
 
 #: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>"
+msgstr "git blame [<opciones>] [<opciones-de-rev>] [<revisión>] [--] <archivo>"
 
 #: builtin/blame.c:37
 msgid "<rev-opts> are documented in git-rev-list(1)"
-msgstr "<rev-opts> están documentadas en git-rev-list(1)"
+msgstr "<opciones-de-rev> están documentadas en git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "esperando un color: %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "tiene que terminar con un color"
 
-#: builtin/blame.c:728
+#: builtin/blame.c:724
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "color inválido '%s' en color.blame.repeatedLines"
 
-#: builtin/blame.c:746
+#: builtin/blame.c:742
 msgid "invalid value for blame.coloring"
 msgstr "valor inválido para blame.coloring"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:841
 #, c-format
 msgid "cannot find revision %s to ignore"
-msgstr "no se pudo encontrar revision %s para ignorar"
+msgstr "no se pudo encontrar revisión %s para ignorar"
 
-#: builtin/blame.c:867
+#: builtin/blame.c:863
 msgid "show blame entries as we find them, incrementally"
 msgstr "mostrar las entradas blame como las encontramos, incrementalmente"
 
-#: builtin/blame.c:868
+#: builtin/blame.c:864
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr "no mostrar nombres de objetos de commits extremos (Default: off)"
 
-#: builtin/blame.c:869
+#: builtin/blame.c:865
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "no tratar commits raíces como extremos (Default: off)"
 
-#: builtin/blame.c:870
+#: builtin/blame.c:866
 msgid "show work cost statistics"
 msgstr "mostrar estadísticas de costo de trabajo"
 
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: 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/send-pack.c:202
 msgid "force progress reporting"
 msgstr "forzar el reporte de progreso"
 
-#: builtin/blame.c:872
+#: builtin/blame.c:868
 msgid "show output score for blame entries"
 msgstr "mostrar la puntuación de salida de las entradas de blame"
 
-#: builtin/blame.c:873
+#: builtin/blame.c:869
 msgid "show original filename (Default: auto)"
 msgstr "mostrar nombre original del archivo (Default: auto)"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:870
 msgid "show original linenumber (Default: off)"
 msgstr "mostrar número de línea original (Default: off)"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:871
 msgid "show in a format designed for machine consumption"
 msgstr "mostrar en un formato diseñado para consumo de máquina"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:872
 msgid "show porcelain format with per-line commit information"
 msgstr "mostrar en formato porcelana con información de commit por línea"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:873
 msgid "use the same output mode as git-annotate (Default: off)"
-msgstr "usar el mismo modo salida como git-annotate (Default: off)"
+msgstr "usar el mismo modo de salida como git-annotate (Default: off)"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:874
 msgid "show raw timestamp (Default: off)"
 msgstr "mostrar timestamp en formato raw (Default: off)"
 
-#: builtin/blame.c:879
+#: builtin/blame.c:875
 msgid "show long commit SHA1 (Default: off)"
 msgstr "mostrar SHA1 del commit en formato largo (Default: off)"
 
-#: builtin/blame.c:880
+#: builtin/blame.c:876
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "suprimir nombre del autor y timestamp (Default: off)"
 
-#: builtin/blame.c:881
+#: builtin/blame.c:877
 msgid "show author email instead of name (Default: off)"
-msgstr "mostrar en cambio el email del autor (Default: off)"
+msgstr "mostrar el email del autor en cambio de su nombre (Default: off)"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:878
 msgid "ignore whitespace differences"
 msgstr "ignorar diferencias de espacios en blanco"
 
-#: builtin/blame.c:883 builtin/log.c:1820
+#: builtin/blame.c:879 builtin/log.c:1823
 msgid "rev"
 msgstr "rev"
 
-#: builtin/blame.c:883
+#: builtin/blame.c:879
 msgid "ignore <rev> when blaming"
 msgstr "ignorar <rev> durante el blame"
 
-#: builtin/blame.c:884
+#: builtin/blame.c:880
 msgid "ignore revisions from <file>"
 msgstr "ignorar revisiones de <archivo>"
 
-#: builtin/blame.c:885
+#: builtin/blame.c:881
 msgid "color redundant metadata from previous line differently"
 msgstr "colorear metadata redundante de líneas previas de manera diferente"
 
-#: builtin/blame.c:886
+#: builtin/blame.c:882
 msgid "color lines by age"
 msgstr "colorear líneas por edad"
 
-#: builtin/blame.c:887
+#: builtin/blame.c:883
 msgid "spend extra cycles to find better match"
-msgstr "ocupar más ciclos para encontrar mejoras resultados"
+msgstr "ocupar más ciclos para encontrar mejores resultados"
 
-#: builtin/blame.c:888
+#: builtin/blame.c:884
 msgid "use revisions from <file> instead of calling git-rev-list"
-msgstr "use revisiones desde <archivo> en lugar de llamar git-rev-list"
+msgstr "usar revisiones en <archivo> en lugar de llamar git-rev-list"
 
-#: builtin/blame.c:889
+#: builtin/blame.c:885
 msgid "use <file>'s contents as the final image"
 msgstr "usar contenido de <archivo> como imagen final"
 
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
 msgid "score"
 msgstr "puntaje"
 
-#: builtin/blame.c:890
+#: builtin/blame.c:886
 msgid "find line copies within and across files"
 msgstr "encontrar copias de líneas entre y a través de archivos"
 
-#: builtin/blame.c:891
+#: builtin/blame.c:887
 msgid "find line movements within and across files"
 msgstr "encontrar movimientos de líneas entre y a través de archivos"
 
-#: builtin/blame.c:892
+#: builtin/blame.c:888
 msgid "range"
 msgstr "rango"
 
-#: builtin/blame.c:893
+#: builtin/blame.c:889
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
-"Procesar solo el rango de líneas <inicio>,<fin> o función: <nombre-función>"
+"procesar solo el rango de líneas <inicio>,<fin> o función :<nombre-de-"
+"función>"
 
-#: builtin/blame.c:945
+#: builtin/blame.c:944
 msgid "--progress can't be used with --incremental or porcelain formats"
-msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
+msgstr ""
+"--progress no puede ser usado con --incremental o formatos de porcelana"
 
 #. TRANSLATORS: This string is used to tell us the
 #. maximum display width for a relative timestamp in
@@ -11328,18 +11660,18 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
 msgid "4 years, 11 months ago"
 msgstr "hace 4 años, 11 meses"
 
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "archivo %s tiene solo %lu línea"
 msgstr[1] "archivo %s tiene solo %lu líneas"
 
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
 msgid "Blaming lines"
 msgstr "Blaming a líneas"
 
@@ -11386,8 +11718,8 @@ msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD."
 msgstr ""
-"no borrando rama '%s' que todavía no ha sido fusionada\n"
-"\ta '%s', aunque se fusione con HEAD."
+"no borrando rama '%s' que todavía no ha sido fusionada a\n"
+"         '%s', aunque se ha fusionado con HEAD."
 
 #: builtin/branch.c:172
 #, c-format
@@ -11409,7 +11741,7 @@ msgstr "Falló de actualización de config-file"
 
 #: builtin/branch.c:223
 msgid "cannot use -a with -d"
-msgstr "no se puede usar-a con -d"
+msgstr "no se puede usar -a con -d"
 
 #: builtin/branch.c:230
 msgid "Couldn't look up commit object for HEAD"
@@ -11438,80 +11770,80 @@ msgstr "Eliminada la rama de rastreo remota %s (era %s).\n"
 #: builtin/branch.c:292
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
-msgstr "Eliminada la rama %s (era %s)..\n"
+msgstr "Eliminada la rama %s (era %s).\n"
 
-#: builtin/branch.c:440 builtin/tag.c:63
+#: builtin/branch.c:441 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "no es posible analizar el string de formato"
 
-#: builtin/branch.c:471
+#: builtin/branch.c:472
 msgid "could not resolve HEAD"
 msgstr "no se pudo resolver HEAD"
 
-#: builtin/branch.c:477
+#: builtin/branch.c:478
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) apunta fuera de refs/heads/"
 
-#: builtin/branch.c:492
+#: builtin/branch.c:493
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Rama %s está siendo rebasada en %s"
 
-#: builtin/branch.c:496
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Rama %s está siendo bisecada en %s"
 
-#: builtin/branch.c:513
+#: builtin/branch.c:514
 msgid "cannot copy the current branch while not on any."
 msgstr "no se puede copiar la rama actual mientras no se está en ninguna."
 
-#: builtin/branch.c:515
+#: builtin/branch.c:516
 msgid "cannot rename the current branch while not on any."
 msgstr "no se puede renombrar la rama actual mientras no se está en ninguna."
 
-#: builtin/branch.c:526
+#: builtin/branch.c:527
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nombre de rama inválido: '%s'"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:556
 msgid "Branch rename failed"
 msgstr "Cambio de nombre de rama fallido"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:558
 msgid "Branch copy failed"
-msgstr "Copiado de rama fallido"
+msgstr "Duplicación de rama fallida"
 
-#: builtin/branch.c:561
+#: builtin/branch.c:562
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Copia creada de la rama malnombrada '%s'"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:565
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Rama mal llamada '%s' renombrada"
 
-#: builtin/branch.c:570
+#: builtin/branch.c:571
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!"
 
-#: builtin/branch.c:579
+#: builtin/branch.c:580
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "La rama está renombrada, pero falló la actualización del archivo de "
 "configuración"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:582
 msgid "Branch is copied, but update of config-file failed"
 msgstr ""
 "La rama está copiada, pero falló la actualización del archivo de "
 "configuración"
 
-#: builtin/branch.c:597
+#: builtin/branch.c:598
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11522,180 +11854,180 @@ msgstr ""
 "%s\n"
 "Las líneas que comiencen con '%c' serán eliminadas.\n"
 
-#: builtin/branch.c:631
+#: builtin/branch.c:632
 msgid "Generic options"
 msgstr "Opciones genéricas"
 
-#: builtin/branch.c:633
+#: builtin/branch.c:634
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "mostrar hash y tema, dar dos veces para rama upstream"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:635
 msgid "suppress informational messages"
 msgstr "suprimir mensajes informativos"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:636
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "configurando modo tracking (mirar git-pull(1))"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:638
 msgid "do not use"
 msgstr "no usar"
 
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:640
 msgid "upstream"
 msgstr "upstream"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:640
 msgid "change the upstream info"
 msgstr "cambiar info de upstream"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:641
 msgid "unset the upstream info"
-msgstr "desconfigurando la info de upstream"
+msgstr "desconfigurar la info de upstream"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:642
 msgid "use colored output"
 msgstr "usar salida con colores"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:643
 msgid "act on remote-tracking branches"
-msgstr "actuar en ramas de traqueo remoto"
+msgstr "actuar en ramas de rastreo remoto"
 
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:645 builtin/branch.c:647
 msgid "print only branches that contain the commit"
-msgstr "mostrar solo ramas que contienen el commit"
+msgstr "mostrar solo ramas que contengan el commit"
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:646 builtin/branch.c:648
 msgid "print only branches that don't contain the commit"
-msgstr "mostrar solo ramas que no contienen el commit"
+msgstr "mostrar solo ramas que no contengan el commit"
 
-#: builtin/branch.c:650
+#: builtin/branch.c:651
 msgid "Specific git-branch actions:"
 msgstr "Acciones específicas de git-branch:"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:652
 msgid "list both remote-tracking and local branches"
-msgstr "listar ramas de remote-tracking y locales"
+msgstr "listar ramas de remote-tracking y locales"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:654
 msgid "delete fully merged branch"
 msgstr "borrar ramas totalmente fusionadas"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:655
 msgid "delete branch (even if not merged)"
 msgstr "borrar rama (incluso si no está fusionada)"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:656
 msgid "move/rename a branch and its reflog"
 msgstr "mover/renombrar una rama y su reflog"
 
-#: builtin/branch.c:656
+#: builtin/branch.c:657
 msgid "move/rename a branch, even if target exists"
 msgstr "mover/renombrar una rama, incluso si el destino existe"
 
-#: builtin/branch.c:657
+#: builtin/branch.c:658
 msgid "copy a branch and its reflog"
 msgstr "copiar una rama y su reflog"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:659
 msgid "copy a branch, even if target exists"
-msgstr "copiar una rama, incluso si el objetivo existe"
+msgstr "copiar una rama, incluso si el destino existe"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:660
 msgid "list branch names"
 msgstr "listar nombres de ramas"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:661
 msgid "show current branch name"
-msgstr "muestra el nombre de branch actual"
+msgstr "mostrar el nombre de branch actual"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:662
 msgid "create the branch's reflog"
-msgstr "crea el reflog de la rama"
+msgstr "crear el reflog de la rama"
 
-#: builtin/branch.c:663
+#: builtin/branch.c:664
 msgid "edit the description for the branch"
-msgstr "edita la descripción de la rama"
+msgstr "editar la descripción de la rama"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:665
 msgid "force creation, move/rename, deletion"
-msgstr "fuerza la creación,movimiento/renombrado,borrado"
+msgstr "forzar la creación, movimiento/renombramiento, eliminación"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:666
 msgid "print only branches that are merged"
-msgstr "muestra solo ramas que han sido fusionadas"
+msgstr "mostrar solo ramas que hayan sido fusionadas"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:667
 msgid "print only branches that are not merged"
-msgstr "muestra solo ramas que no han sido fusionadas"
+msgstr "mostrar solo ramas que no han sido fusionadas"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:668
 msgid "list branches in columns"
-msgstr "muestra las ramas en columnas"
+msgstr "mostrar las ramas en columnas"
 
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
 msgid "object"
 msgstr "objeto"
 
-#: builtin/branch.c:670
+#: builtin/branch.c:671
 msgid "print only branches of the object"
-msgstr "imprimir sólo las ramas del objeto"
+msgstr "imprimir solo las ramas del objeto"
 
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
 msgid "sorting and filtering are case insensitive"
-msgstr "ordenamiento y filtrado son case-insensitive"
+msgstr "ordenamiento y filtración son case-insensitive"
 
-#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "formato para usar para el output"
 
-#: builtin/branch.c:695 builtin/clone.c:794
+#: builtin/branch.c:696 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
-msgstr "¡HEAD no encontrado abajo de refs/heads!"
+msgstr "¡HEAD no encontrado dentro de refs/heads!"
 
-#: builtin/branch.c:719
+#: builtin/branch.c:720
 msgid "--column and --verbose are incompatible"
 msgstr "--column y --verbose son incompatibles"
 
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
 msgid "branch name required"
 msgstr "se necesita el nombre de la rama"
 
-#: builtin/branch.c:766
+#: builtin/branch.c:768
 msgid "Cannot give description to detached HEAD"
 msgstr "No se puede dar descripción al HEAD desacoplado"
 
-#: builtin/branch.c:771
+#: builtin/branch.c:773
 msgid "cannot edit description of more than one branch"
 msgstr "no se puede editar la descripción de más de una rama"
 
-#: builtin/branch.c:778
+#: builtin/branch.c:780
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Aún no hay commits en la rama '%s'."
 
-#: builtin/branch.c:781
+#: builtin/branch.c:783
 #, c-format
 msgid "No branch named '%s'."
 msgstr "No hay ninguna rama llamada '%s'."
 
-#: builtin/branch.c:796
+#: builtin/branch.c:798
 msgid "too many branches for a copy operation"
-msgstr "demasiadas ramas para una operación de copiado"
+msgstr "demasiadas ramas para una operación de duplicación"
 
-#: builtin/branch.c:805
+#: builtin/branch.c:807
 msgid "too many arguments for a rename operation"
-msgstr "demasiados argumentos para una operación de renombrado"
+msgstr "demasiados argumentos para una operación de renombramiento"
 
-#: builtin/branch.c:810
+#: builtin/branch.c:812
 msgid "too many arguments to set new upstream"
 msgstr "demasiados argumentos para configurar un nuevo upstream"
 
-#: builtin/branch.c:814
+#: builtin/branch.c:816
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11703,32 +12035,32 @@ msgstr ""
 "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna "
 "rama."
 
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:819 builtin/branch.c:842
 #, c-format
 msgid "no such branch '%s'"
 msgstr "no hay tal rama '%s'"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:823
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la rama '%s' no existe"
 
-#: builtin/branch.c:834
+#: builtin/branch.c:836
 msgid "too many arguments to unset upstream"
 msgstr "demasiados argumentos para desconfigurar upstream"
 
-#: builtin/branch.c:838
+#: builtin/branch.c:840
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna "
 "rama."
 
-#: builtin/branch.c:844
+#: builtin/branch.c:846
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Rama '%s' no tiene información de upstream"
 
-#: builtin/branch.c:854
+#: builtin/branch.c:856
 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>?"
@@ -11736,41 +12068,41 @@ msgstr ""
 "Las opciones -a, y -r, de 'git branch' no toman un nombre de rama.\n"
 "¿Quisiste usar: -a|-r --list <patrón>?"
 
-#: builtin/branch.c:858
+#: builtin/branch.c:860
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
 msgstr ""
-"la opción '--set-upstream' ya no es soportada. Considere usar '--track' o '--"
+"la opción '--set-upstream' ya no es soportada. Considera usar '--track' o '--"
 "set-upstream-to' en cambio."
 
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "versión de git:\n"
 
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "uname() falló con error '%s' (%d)\n"
 
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
 msgid "compiler info: "
 msgstr "información del compilador: "
 
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "información de libc: "
 
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
 msgid "not run from a git repository - no hooks to show\n"
 msgstr "no ejecutado desde un repositorio git - no hay hooks para mostrar\n"
 
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr ""
 "git bugreport [-o|--output-directory <archivo>] [-s|--suffix <formato>]"
 
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -11789,7 +12121,7 @@ msgid ""
 "You can delete any lines you don't wish to share.\n"
 msgstr ""
 "¡Gracias por prepara un reporte de bug de Git!\n"
-"Por favor responde las siguientes preguntas para ayudarnos a entender el "
+"Por favor contesta las siguientes preguntas para ayudarnos a entender el "
 "problema.\n"
 "\n"
 "¿Qué hiciste antes de que sucediera el bug? (Pasos para reproducir el "
@@ -11797,47 +12129,43 @@ msgstr ""
 "\n"
 "¿Qué esperabas que sucediera? (Comportamiento esperado)\n"
 "\n"
-"¿Qué sucedio en lugar de eso? (Comportamiento real)\n"
+"¿Qué sucedió en lugar de eso? (Comportamiento real)\n"
 "\n"
-"¿Qué es diferente entre lo que esperabas y lo que pasó?\n"
+"¿Qué es diferente entre lo que esperabas y lo que pasó de verdad?\n"
 "\n"
 "Cualquier cosa que quieras agregar:\n"
 "\n"
 "Por favor revisa el resto del reporte abajo.\n"
 "Puedes borrar cualquier línea que no desees compartir.\n"
 
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
 msgid "specify a destination for the bugreport file"
 msgstr "especificar el destino para el archivo de reporte de bug"
 
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
 msgid "specify a strftime format suffix for the filename"
-msgstr "especificar el sufijo formato strftime para el nombre del archivo"
+msgstr ""
+"especificar el sufijo de formato de strftime para el nombre del archivo"
 
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "no se pudo crear directorios principales para '%s'"
 
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "Información del sistema"
 
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
-msgstr "Activar Hooks"
-
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "no se pudo crear un archivo en '%s'"
+msgstr "Hooks habilitados"
 
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "no es posible escribir en %s"
 
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "Crear un nuevo reporte en '%s'.\n"
@@ -11858,27 +12186,27 @@ msgstr "git bundle list-heads <archivo> [<nombre-de-ref>...]"
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]"
 
-#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
 msgid "do not show progress meter"
 msgstr "no mostrar medidor de progreso"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
 msgid "show progress meter"
 msgstr "mostrar medidor de progreso"
 
-#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
 msgid "show progress meter during object writing phase"
 msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
 
-#: builtin/bundle.c:74 builtin/pack-objects.c:3754
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "similar a --all-progress cuando medidor de progreso es mostrado"
 
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
 msgid "specify bundle format version"
 msgstr "especificar la versión del formato del paquete"
 
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
 msgstr "Se necesita un repositorio para agrupar."
 
@@ -11886,25 +12214,25 @@ msgstr "Se necesita un repositorio para agrupar."
 msgid "do not show bundle details"
 msgstr "no mostrar detalles del bundle"
 
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s está bien\n"
 
-#: builtin/bundle.c:163
+#: builtin/bundle.c:182
 msgid "Need a repository to unbundle."
 msgstr "Se necesita un repositorio para desagrupar."
 
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "ser verboso; tiene que ser agregado antes de un subcomando"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Desagrupando objetos"
 
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Sub-comando desconocido: %s"
 
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:622
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11912,7 +12240,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
 
-#: builtin/cat-file.c:599
+#: builtin/cat-file.c:623
 msgid ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
@@ -11920,74 +12248,74 @@ msgstr ""
 "git cat-file (--batch[=<formato>] | --batch-check[=<formato>]) [--follow-"
 "symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:644
 msgid "only one batch option may be specified"
 msgstr "solo se puede especificar una opción batch"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tipo> puede ser: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
 msgid "show object type"
 msgstr "mostrar el tipo del objeto"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
 msgid "show object size"
 msgstr "mostrar el tamaño del objeto"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
 msgid "exit with zero when there's no error"
 msgstr "salir con cero cuando no haya error"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
 msgid "pretty-print object's content"
 msgstr "realizar pretty-print del contenido del objeto"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
 msgid "for blob objects, run textconv on object's content"
 msgstr "para objetos blob, ejecuta textconv en el contenido del objeto"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
 msgid "for blob objects, run filters on object's content"
 msgstr "para objetos blob, ejecuta filters en el contenido del objeto"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
 msgid "use a specific path for --textconv/--filters"
-msgstr "use una ruta específica para --textconv/--filters"
+msgstr "usar una ruta específica para --textconv/--filters"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
 msgid "allow -s and -t to work with broken/corrupt objects"
-msgstr "permita -s y -t para trabajar con objetos rotos o corruptos"
+msgstr "permita que -s y -t funcionen con objetos rotos o corruptos"
 
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
 msgid "buffer --batch output"
 msgstr "salida buffer --batch"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
 msgid "show info and content of objects fed from the standard input"
 msgstr "mostrar info y content de los objetos alimentados por standard input"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
 msgid "show info about objects fed from the standard input"
 msgstr "mostrar info de los objetos alimentados por standard input"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)"
 
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
 msgid "show all objects with --batch or --batch-check"
 msgstr "mostrar todos los objetos con --batch o --batch-check"
 
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:690
 msgid "do not order --batch-all-objects output"
-msgstr "no ordenar el output de --batch-all-objects"
+msgstr "no ordenar la salida de --batch-all-objects"
 
 #: builtin/check-attr.c:13
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -12003,9 +12331,9 @@ msgstr "reportar todos los atributos configurados en el archivo"
 
 #: builtin/check-attr.c:22
 msgid "use .gitattributes only from the index"
-msgstr "use .gitattributes solo desde el índice"
+msgstr "usar .gitattributes solo desde el índice"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "leer nombres de archivos de stdin"
 
@@ -12013,14 +12341,14 @@ msgstr "leer nombres de archivos de stdin"
 msgid "terminate input and output records by a NUL character"
 msgstr "terminar registros de entrada y salida con un carácter NUL"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
-#: builtin/worktree.c:491
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
 msgid "suppress progress reporting"
 msgstr "suprimir el reporte de progreso"
 
 #: builtin/check-ignore.c:29
 msgid "show non-matching input paths"
-msgstr "mostrar rutas de entrada que no concuerdan"
+msgstr "mostrar rutas de entrada que no concuerden"
 
 #: builtin/check-ignore.c:31
 msgid "ignore index when checking"
@@ -12032,7 +12360,7 @@ msgstr "no se puede especificar los nombres de rutas con --stdin"
 
 #: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
-msgstr "-z sólo tiene sentido con --stdin"
+msgstr "-z solo tiene sentido con --stdin"
 
 #: builtin/check-ignore.c:170
 msgid "no path specified"
@@ -12048,7 +12376,7 @@ msgstr "no se puede tener ambos --quiet y --verbose"
 
 #: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
-msgstr "--non-matching sólo es válida con --verbose"
+msgstr "--non-matching solo es válida con --verbose"
 
 #: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
@@ -12072,9 +12400,10 @@ msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<opciones>]"
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1825
-#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836
-#: builtin/submodule--helper.c:2334 builtin/worktree.c:719
+#: 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
 msgid "string"
 msgstr "string"
 
@@ -12170,68 +12499,68 @@ msgstr "ruta '%s': no se puede fusionar"
 msgid "Unable to add merge result for '%s'"
 msgstr "Incapaz de agregar resultados de fusión a '%s'"
 
-#: builtin/checkout.c:414
+#: builtin/checkout.c:411
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "Recreado %d conflicto de merge"
 msgstr[1] "Recreados %d conflictos de merge"
 
-#: builtin/checkout.c:419
+#: builtin/checkout.c:416
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
-msgstr[0] "Actualizada %d ruta para %s"
-msgstr[1] "Actualizadas %d rutas para %s"
+msgstr[0] "Actualizada %d ruta desde %s"
+msgstr[1] "Actualizadas %d rutas desde %s"
 
-#: builtin/checkout.c:426
+#: builtin/checkout.c:423
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
-msgstr[0] "Actualizada %d ruta desde el index"
-msgstr[1] "Actualizadas %d rutas desde el index"
+msgstr[0] "Actualizada %d ruta desde el índice"
+msgstr[1] "Actualizadas %d rutas desde el índice"
 
-#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
+#: builtin/checkout.c:456
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' no puede ser usada con rutas actualizadas"
 
-#: builtin/checkout.c:462 builtin/checkout.c:465
+#: builtin/checkout.c:459 builtin/checkout.c:462
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' no puede ser usado con %s"
 
-#: builtin/checkout.c:469
+#: builtin/checkout.c:466
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo."
 
-#: builtin/checkout.c:473
+#: builtin/checkout.c:470
 #, c-format
 msgid "neither '%s' or '%s' is specified"
-msgstr "ni '%s' o '%s' están especificados"
+msgstr "ni '%s' ni '%s' están especificados"
 
-#: builtin/checkout.c:477
+#: builtin/checkout.c:474
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "'%s' tiene que ser usado cuando '%s' no es especificado"
 
-#: builtin/checkout.c:482 builtin/checkout.c:487
+#: builtin/checkout.c:479 builtin/checkout.c:484
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' o '%s' no puede ser usado con %s"
 
-#: builtin/checkout.c:563 builtin/checkout.c:570
+#: builtin/checkout.c:558 builtin/checkout.c:565
 #, c-format
 msgid "path '%s' is unmerged"
-msgstr "ruta '%s' no esta fusionada"
+msgstr "ruta '%s' no está fusionada"
 
-#: builtin/checkout.c:739
+#: builtin/checkout.c:736
 msgid "you need to resolve your current index first"
 msgstr "necesitas resolver tu índice actual primero"
 
-#: builtin/checkout.c:793
+#: builtin/checkout.c:786
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12240,50 +12569,50 @@ msgstr ""
 "no se puede continuar con los cambios en stage en los siguientes archivos:\n"
 "%s"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:879
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "No se puede hacer reflog para '%s': %s\n"
 
-#: builtin/checkout.c:928
+#: builtin/checkout.c:921
 msgid "HEAD is now at"
 msgstr "HEAD está ahora en"
 
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
-msgstr "no es posible actualizar  HEAD"
+msgstr "no es posible actualizar HEAD"
 
-#: builtin/checkout.c:936
+#: builtin/checkout.c:929
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Reiniciar rama '%s'\n"
 
-#: builtin/checkout.c:939
+#: builtin/checkout.c:932
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Ya en '%s'\n"
 
-#: builtin/checkout.c:943
+#: builtin/checkout.c:936
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Rama reiniciada y cambiada a '%s'\n"
 
-#: builtin/checkout.c:945 builtin/checkout.c:1376
+#: builtin/checkout.c:938 builtin/checkout.c:1369
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Cambiado a nueva rama '%s'\n"
 
-#: builtin/checkout.c:947
+#: builtin/checkout.c:940
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Cambiado a rama '%s'\n"
 
-#: builtin/checkout.c:998
+#: builtin/checkout.c:991
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... y %d más.\n"
 
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:997
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12296,17 +12625,17 @@ msgid_plural ""
 "\n"
 "%s\n"
 msgstr[0] ""
-"Peligro: estás saliendo %d commit atrás, no está conectado\n"
+"Peligro: estás dejando %d commit atrás, no está conectado\n"
 "a ninguna rama:\n"
 "\n"
 "%s\n"
 msgstr[1] ""
-"Peligro: estás saliendo %d commits atrás, no está conectado\n"
+"Peligro: estás dejando %d commits atrás, no están conectados\n"
 "a ninguna rama:\n"
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1023
+#: builtin/checkout.c:1016
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12333,28 +12662,28 @@ msgstr[1] ""
 " git branch <nombre-de-rama> %s\n"
 "\n"
 
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1051
 msgid "internal error in revision walk"
-msgstr "error interno en camino de revisión"
+msgstr "error interno en recorrido de revisiones"
 
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1055
 msgid "Previous HEAD position was"
 msgstr "La posición previa de HEAD era"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
 msgid "You are on a branch yet to be born"
 msgstr "Estás en una rama por nacer"
 
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1177
 #, 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' puede ser tanto un archivo local como una rama de rastreo.\n"
-"Por favor use -- (y opcionalmente --no-guess) para desambiguar"
+"Por favor usa -- (y opcionalmente --no-guess) para desambiguar"
 
-#: builtin/checkout.c:1191
+#: builtin/checkout.c:1184
 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"
@@ -12370,56 +12699,55 @@ msgstr ""
 "\n"
 "    git checkout --track origin/<nombre>\n"
 "\n"
-"Si quisieras que siempre los checkouts de nombres ambiguos prefieran una "
-"rama\n"
-"de nombre <nombre> remota, como 'origin', considera configurar\n"
+"Si quisieras que siempre los checkouts de nombres ambiguos prefieran\n"
+"un remoto particular, como 'origin', considera configurar\n"
 "checkout.defaultRemote=origin en tu configuración."
 
-#: builtin/checkout.c:1201
+#: builtin/checkout.c:1194
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
-msgstr "'%s' concordó con multiples (%d) ramas de rastreo remoto"
+msgstr "'%s' concordó con múltiples (%d) ramas de rastreo remoto"
 
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1260
 msgid "only one reference expected"
 msgstr "solo una referencia esperada"
 
-#: builtin/checkout.c:1284
+#: builtin/checkout.c:1277
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "solo una referencia esperada, %d entregadas."
 
-#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referencia inválida: %s"
 
-#: builtin/checkout.c:1343 builtin/checkout.c:1709
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
 #, c-format
 msgid "reference is not a tree: %s"
-msgstr "la referencia no es n árbol: %s"
+msgstr "la referencia no es un árbol: %s"
 
-#: builtin/checkout.c:1390
+#: builtin/checkout.c:1383
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "se esperaba un branch, se obtuvo tag '%s'"
 
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1385
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "se espera una rama, se obtuvo una rama remota '%s'"
 
-#: builtin/checkout.c:1393 builtin/checkout.c:1401
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
 #, c-format
 msgid "a branch is expected, got '%s'"
-msgstr "se esperaba branch, se obuto '%s'"
+msgstr "se esperaba branch, se obtuvo '%s'"
 
-#: builtin/checkout.c:1396
+#: builtin/checkout.c:1389
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "se espera una rama, se obtuvo commit '%s'"
 
-#: builtin/checkout.c:1412
+#: builtin/checkout.c:1405
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12427,7 +12755,7 @@ msgstr ""
 "no se puede cambiar de branch durante un merge\n"
 "Considera \"git merge --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1416
+#: builtin/checkout.c:1409
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12435,7 +12763,7 @@ msgstr ""
 "no se puede cambiar de branch en medio de una sesión de am\n"
 "Considera \"git am --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1420
+#: builtin/checkout.c:1413
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12443,7 +12771,7 @@ msgstr ""
 "no se puede cambiar de branch durante un rebase\n"
 "Considera \"git rebase --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1424
+#: builtin/checkout.c:1417
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12451,7 +12779,7 @@ msgstr ""
 "no se puede cambiar de branch durante un cherry-pick\n"
 "Considera \"git cherry-pick --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1428
+#: builtin/checkout.c:1421
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12459,137 +12787,137 @@ msgstr ""
 "no se puede cambiar de branch durante un revert\n"
 "Considera \"git revert --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1425
 msgid "you are switching branch while bisecting"
-msgstr "estás cambiando ramas durante un bisect"
+msgstr "estás cambiando de rama durante un bisect"
 
-#: builtin/checkout.c:1439
+#: builtin/checkout.c:1432
 msgid "paths cannot be used with switching branches"
 msgstr "rutas no pueden ser usadas con cambios de rama"
 
-#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' no puede ser usado con cambios de ramas"
 
-#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' no puede ser usado con '%s'"
 
-#: builtin/checkout.c:1467
+#: builtin/checkout.c:1460
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' no puede tomar <punto de partida>"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1468
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "No se puede cambiar rama a un '%s' sin commits"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1475
 msgid "missing branch or commit argument"
 msgstr "falta branch o commit como argumento"
 
-#: builtin/checkout.c:1525
+#: builtin/checkout.c:1518
 msgid "perform a 3-way merge with the new branch"
 msgstr "realizar una fusión de tres vías con la rama nueva"
 
-#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:322
 msgid "style"
 msgstr "estilo"
 
-#: builtin/checkout.c:1527
+#: builtin/checkout.c:1520
 msgid "conflict style (merge or diff3)"
-msgstr "conflicto de estilos (merge o diff3)"
+msgstr "estilo de conflictos (merge o diff3)"
 
-#: builtin/checkout.c:1539 builtin/worktree.c:488
+#: builtin/checkout.c:1532 builtin/worktree.c:489
 msgid "detach HEAD at named commit"
 msgstr "desacoplar HEAD en el commit nombrado"
 
-#: builtin/checkout.c:1540
+#: builtin/checkout.c:1533
 msgid "set upstream info for new branch"
 msgstr "configurar info de upstream para una rama nueva"
 
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1535
 msgid "force checkout (throw away local modifications)"
 msgstr "forzar el checkout (descartar modificaciones locales)"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1537
 msgid "new-branch"
 msgstr "nueva-rama"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1537
 msgid "new unparented branch"
 msgstr "nueva rama no emparentada"
 
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
 msgid "update ignored files (default)"
 msgstr "actualizar archivos ignorados (default)"
 
-#: builtin/checkout.c:1549
+#: builtin/checkout.c:1542
 msgid "do not check if another worktree is holding the given ref"
-msgstr "no revise si otro árbol de trabajo contiene la ref entregada"
+msgstr "no averiguar si otro árbol de trabajo contiene la ref entregada"
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1555
 msgid "checkout our version for unmerged files"
-msgstr "hacer checkout a  nuestra versión para archivos sin fusionar"
+msgstr "hacer checkout a nuestra versión para archivos sin fusionar"
 
-#: builtin/checkout.c:1565
+#: builtin/checkout.c:1558
 msgid "checkout their version for unmerged files"
 msgstr "hacer checkout a su versión para los archivos sin fusionar"
 
-#: builtin/checkout.c:1569
+#: builtin/checkout.c:1562
 msgid "do not limit pathspecs to sparse entries only"
-msgstr "no limitar pathspecs a dispersar entradas solamente"
+msgstr "no limitar pathspecs a entradas escasas solamente"
 
-#: builtin/checkout.c:1624
+#: builtin/checkout.c:1620
 #, c-format
 msgid "-%c, -%c and --orphan are mutually exclusive"
 msgstr "-%c, -%c y --orphan son mutuamente exclusivas"
 
-#: builtin/checkout.c:1628
+#: builtin/checkout.c:1624
 msgid "-p and --overlay are mutually exclusive"
 msgstr "-p y --overlay son mutuamente exclusivas"
 
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1661
 msgid "--track needs a branch name"
 msgstr "--track necesita el nombre de una rama"
 
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1666
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "falta nombre de rama; prueba -%c"
 
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1698
 #, c-format
 msgid "could not resolve %s"
 msgstr "no se pudo resolver %s"
 
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1714
 msgid "invalid path specification"
 msgstr "especificación de ruta inválida"
 
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1721
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este"
 
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1725
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach no toma un argumento de ruta '%s'"
 
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1734
 msgid "--pathspec-from-file is incompatible with --detach"
 msgstr "--pathspec-from-file es incompatible con --detach"
 
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
 msgid "--pathspec-from-file is incompatible with --patch"
 msgstr "--pathspec-from-file es incompatible con --patch"
 
-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1750
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -12597,70 +12925,71 @@ msgstr ""
 "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"
 "se revisa fuera del índice."
 
-#: builtin/checkout.c:1759
+#: builtin/checkout.c:1755
 msgid "you must specify path(s) to restore"
 msgstr "debes especificar path(s) para restaurar"
 
-#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484
-#: builtin/worktree.c:486
+#: 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
 msgid "branch"
 msgstr "rama"
 
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1782
 msgid "create and checkout a new branch"
 msgstr "crear y hacer checkout a una nueva rama"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1784
 msgid "create/reset and checkout a branch"
 msgstr "crear/reiniciar y hacer checkout a una rama"
 
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1785
 msgid "create reflog for new branch"
 msgstr "crear un reflog para una nueva rama"
 
-#: builtin/checkout.c:1791
+#: builtin/checkout.c:1787
 msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)"
+msgstr "cuestionar opción 'git checkout <no-hay-tal-rama>' (default)"
 
-#: builtin/checkout.c:1792
+#: builtin/checkout.c:1788
 msgid "use overlay mode (default)"
 msgstr "usar modo overlay (default)"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1833
 msgid "create and switch to a new branch"
 msgstr "crear y hacer switch a una nueva rama"
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1835
 msgid "create/reset and switch to a branch"
 msgstr "crear/reiniciar y hacer switch a una rama"
 
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1837
 msgid "second guess 'git switch <no-such-branch>'"
-msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'"
+msgstr "cuestionar opción 'git checkout <no-hay-tal-rama>'"
 
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1839
 msgid "throw away local modifications"
 msgstr "descartar modificaciones locales"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1873
 msgid "which tree-ish to checkout from"
 msgstr "de qué árbol hacer el checkout"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1875
 msgid "restore the index"
-msgstr "restaurar el index"
+msgstr "restaurar el índice"
 
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1877
 msgid "restore the working tree (default)"
 msgstr "restaurar el árbol de trabajo (default)"
 
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1879
 msgid "ignore unmerged entries"
 msgstr "ignorar entradas no fusionadas"
 
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1880
 msgid "use overlay mode"
 msgstr "usar modo overlay"
 
@@ -12678,7 +13007,7 @@ msgstr "Borrando %s\n"
 #: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
-msgstr "Sera borrado %s\n"
+msgstr "Será borrado %s\n"
 
 #: builtin/clean.c:35
 #, c-format
@@ -12688,14 +13017,14 @@ msgstr "Saltando repositorio %s\n"
 #: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
-msgstr "Se saltara repositorio %s\n"
+msgstr "Se saltará repositorio %s\n"
 
 #: builtin/clean.c:38
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "no se pudo lstat %s\n"
 
-#: builtin/clean.c:302 git-add--interactive.perl:593
+#: builtin/clean.c:300 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12703,12 +13032,12 @@ msgid ""
 "foo        - select item based on unique prefix\n"
 "           - (empty) select nothing\n"
 msgstr ""
-"Ayuda rápida:\n"
-"1          - selecciona un objeto por numero\n"
-"foo        - selecciona un objeto basado en un prefijo único\n"
+"Ayuda de comandos:\n"
+"1          - seleccionar un objeto por número\n"
+"foo        - seleccionar un objeto basado en un prefijo único\n"
 "           - (vacío) no elegir nada\n"
 
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:304 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12720,42 +13049,42 @@ msgid ""
 "*          - choose all items\n"
 "           - (empty) finish selecting\n"
 msgstr ""
-"Ayuda rápida:\n"
-"1          - selecciona un objeto único\n"
-"3-5        - selecciona un rango de objetos\n"
-"2-3,6-9    - selecciona múltiples rangos\n"
-"foo        - selecciona un objeto basado en un prefijo único\n"
+"Ayuda de comandos:\n"
+"1          - seleccionar un objeto único\n"
+"3-5        - seleccionar un rango de objetos\n"
+"2-3,6-9    - seleccionar múltiples rangos\n"
+"foo        - seleccionar un objeto basado en un prefijo único\n"
 "-...       - de-seleccionar objetos especificados\n"
 "*          - escoger todos los objetos\n"
 "           - (vacío) terminar selección\n"
 
-#: builtin/clean.c:521 git-add--interactive.perl:568
+#: builtin/clean.c:519 git-add--interactive.perl:568
 #: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "¿Ahh (%s)?\n"
 
-#: builtin/clean.c:661
+#: builtin/clean.c:659
 #, c-format
 msgid "Input ignore patterns>> "
-msgstr "Input ignora los patrones >> "
+msgstr "Ingresa los patrones que ignorar>> "
 
-#: builtin/clean.c:696
+#: builtin/clean.c:693
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s"
 
-#: builtin/clean.c:717
+#: builtin/clean.c:714
 msgid "Select items to delete"
 msgstr "Seleccionar objetos para borrar"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:755
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "¿Borrar %s [y/N]? "
 
-#: builtin/clean.c:789
+#: builtin/clean.c:786
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12766,75 +13095,75 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr ""
 "clean               - comenzar la limpieza\n"
-"filtrar por patrón   - excluye objetos del borrado\n"
-"elegir por números   - selecciona objetos a ser borrados por numero\n"
-"preguntar cada uno     - confirmar cada borrado (como \"rm -i\")\n"
+"filter by pattern   - excluir objetos de la eliminación\n"
+"select by numbers   - seleccionar objetos a ser borrados por número\n"
+"ask each            - confirmar cada eliminación (como \"rm -i\")\n"
 "quit                - parar limpieza\n"
-"help                - esta ventana\n"
+"help                - esta pantalla\n"
 "?                   - ayuda para selección de opciones"
 
-#: builtin/clean.c:825
+#: builtin/clean.c:822
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Se eliminará el siguiente objeto:"
 msgstr[1] "Se eliminarán los siguientes objetos:"
 
-#: builtin/clean.c:841
+#: builtin/clean.c:838
 msgid "No more files to clean, exiting."
 msgstr "No hay más archivos para limpiar, saliendo."
 
-#: builtin/clean.c:903
+#: builtin/clean.c:900
 msgid "do not print names of files removed"
 msgstr "no imprimir nombres de archivos borrados"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:902
 msgid "force"
 msgstr "forzar"
 
-#: builtin/clean.c:906
+#: builtin/clean.c:903
 msgid "interactive cleaning"
 msgstr "limpieza interactiva"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:905
 msgid "remove whole directories"
 msgstr "borrar directorios completos"
 
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:906 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/show-ref.c:179
 msgid "pattern"
 msgstr "patrón"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:907
 msgid "add <pattern> to ignore rules"
-msgstr "agregar <patrón> para ignorar reglas"
+msgstr "agregar <patrón> a las reglas de ignorancia"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:908
 msgid "remove ignored files, too"
 msgstr "borrar archivos ignorados, también"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:910
 msgid "remove only ignored files"
 msgstr "borrar solo archivos ignorados"
 
-#: builtin/clean.c:929
+#: builtin/clean.c:925
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
-"clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; "
-"rehusando el clean"
+"clean.requireForce configurado como true y ninguno de -i, -n, ni -f "
+"entregado; rehusando el clean"
 
-#: builtin/clean.c:932
+#: builtin/clean.c:928
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
-"clean.requireForce default en true y ninguno -i, -n, ni -f entregados; "
+"clean.requireForce default en true y ninguno de -i, -n, ni -f entregado; "
 "rehusando el clean"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:940
 msgid "-x and -X cannot be used together"
 msgstr "-x y -X no pueden ser usadas juntas"
 
@@ -12850,13 +13179,13 @@ msgstr "no clonar repositorios superficiales"
 msgid "don't create a checkout"
 msgstr "no crear checkout"
 
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "crear un repositorio vacío"
 
 #: builtin/clone.c:103
 msgid "create a mirror repository (implies bare)"
-msgstr "crear un repositorio espejo (implica vacío)"
+msgstr "crear un repositorio espejo (implica bare)"
 
 #: builtin/clone.c:105
 msgid "to clone from a local repository"
@@ -12876,39 +13205,40 @@ msgstr "pathspec"
 
 #: builtin/clone.c:111
 msgid "initialize submodules in the clone"
-msgstr "inicializar submódulos en el clonado"
+msgstr "inicializar submódulos en el clon"
 
 #: builtin/clone.c:115
 msgid "number of submodules cloned in parallel"
-msgstr "numero de submódulos clonados en paralelo"
+msgstr "número de submódulos clonados en paralelo"
 
-#: builtin/clone.c:116 builtin/init-db.c:538
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "directorio-template"
 
-#: builtin/clone.c:117 builtin/init-db.c:539
+#: builtin/clone.c:117 builtin/init-db.c:540
 msgid "directory from which templates will be used"
 msgstr "directorio del cual los templates serán usados"
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832
-#: builtin/submodule--helper.c:2337
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
 msgid "reference repository"
 msgstr "repositorio de referencia"
 
-#: builtin/clone.c:123 builtin/submodule--helper.c:1834
-#: builtin/submodule--helper.c:2339
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
 msgid "use --reference only while cloning"
-msgstr "usa--reference  solamente si estás clonado"
+msgstr "usar --reference solamente si estás clonando"
 
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:549
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: 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
+#: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "nombre"
 
 #: builtin/clone.c:125
 msgid "use <name> instead of 'origin' to track upstream"
-msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"
+msgstr "usar <nombre> en lugar de 'origin' para rastrear upstream"
 
 #: builtin/clone.c:127
 msgid "checkout <branch> instead of the remote's HEAD"
@@ -12918,16 +13248,16 @@ msgstr "checkout <rama> en lugar de HEAD remota"
 msgid "path to git-upload-pack on the remote"
 msgstr "ruta para git-upload-pack en el remoto"
 
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
 #: builtin/pull.c:208
 msgid "depth"
 msgstr "profundidad"
 
 #: builtin/clone.c:131
 msgid "create a shallow clone of that depth"
-msgstr "crear un clon superficial para esa profundidad"
+msgstr "crear un clon superficial de esa profundidad"
 
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
 #: builtin/pull.c:211
 msgid "time"
 msgstr "tiempo"
@@ -12937,18 +13267,18 @@ msgid "create a shallow clone since a specific time"
 msgstr "crear un clon superficial desde el tiempo específico"
 
 #: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1022
 msgid "revision"
-msgstr "revision"
+msgstr "revisión"
 
 #: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
 msgid "deepen history of shallow clone, excluding rev"
-msgstr "ahondando historia de clon superficial, excluyendo rev"
+msgstr "ahondar historia de clon superficial, excluyendo rev"
 
-#: builtin/clone.c:137 builtin/submodule--helper.c:1844
-#: builtin/submodule--helper.c:2353
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
 msgid "clone only one branch, HEAD or --branch"
-msgstr "clonar solo una rama,HEAD o --branch"
+msgstr "clonar solo una rama, HEAD o --branch"
 
 #: builtin/clone.c:139
 msgid "don't clone any tags, and make later fetches not to follow them"
@@ -12958,13 +13288,13 @@ msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan"
 msgid "any cloned submodules will be shallow"
 msgstr "cualquier submódulo clonado será superficial"
 
-#: builtin/clone.c:142 builtin/init-db.c:547
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:143 builtin/init-db.c:548
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
-msgstr "separa git dir del árbol de trabajo"
+msgstr "separar git dir del árbol de trabajo"
 
 #: builtin/clone.c:144
 msgid "key=value"
@@ -12975,22 +13305,22 @@ msgid "set config inside the new repository"
 msgstr "configurar config dentro del nuevo repositorio"
 
 #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
-msgstr "especifico-de-servidor"
+msgstr "específico-al-servidor"
 
 #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr "opción para trasmitir"
 
 #: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
-#: builtin/push.c:585
+#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "solo usar direcciones IPv4"
 
 #: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
-#: builtin/push.c:587
+#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "solo usar direcciones IPv6"
 
@@ -13003,158 +13333,150 @@ msgid "initialize sparse-checkout file to include only files at root"
 msgstr ""
 "inicializar archivo sparse-checkout para incluir solo archivos en la raíz"
 
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"No se pudo adivinar ningún nombre de directorio.\n"
-"Por favor especifique un directorio en la línea de comando"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: No se pudo agregar un alterno para '%s': %s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:304
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe pero no es un directorio"
 
-#: builtin/clone.c:436
+#: builtin/clone.c:322
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "falló al iniciar el iterador sobre '%s'"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:353
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "falló al crear link '%s'"
 
-#: builtin/clone.c:471
+#: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "falló al copiar archivo a '%s'"
 
-#: builtin/clone.c:476
+#: builtin/clone.c:362
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "falló al iterar sobre '%s'"
 
-#: builtin/clone.c:503
+#: builtin/clone.c:389
 #, c-format
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: builtin/clone.c:517
+#: builtin/clone.c:403
 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 ""
-"Clonado exitoso, pero falló el checkout.\n"
+"Clonación exitosa, pero falló el checkout.\n"
 "Puedes inspeccionar a qué se hizo checkout con 'git status'\n"
 "y volver a intentarlo con 'git restore --source=HEAD :/'\n"
 
-#: builtin/clone.c:594
+#: builtin/clone.c:480
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "No se pudo encontrar la rama remota %s para clonar."
 
-#: builtin/clone.c:713
+#: builtin/clone.c:597
 #, c-format
 msgid "unable to update %s"
 msgstr "incapaz de actualizar %s"
 
-#: builtin/clone.c:761
+#: builtin/clone.c:645
 msgid "failed to initialize sparse-checkout"
 msgstr "falló al inicializar sparse-checkout"
 
-#: builtin/clone.c:784
+#: builtin/clone.c:668
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:701
 msgid "unable to checkout working tree"
 msgstr "no es posible realizar checkout en el árbol de trabajo"
 
-#: builtin/clone.c:894
+#: builtin/clone.c:779
 msgid "unable to write parameters to config file"
 msgstr "no es posible escribir parámetros al archivo config"
 
-#: builtin/clone.c:957
+#: builtin/clone.c:842
 msgid "cannot repack to clean up"
 msgstr "no se puede reempaquetar para limpiar"
 
-#: builtin/clone.c:959
+#: builtin/clone.c:844
 msgid "cannot unlink temporary alternates file"
-msgstr "no se puede desvincular archivos alternos temporales"
+msgstr "no se puede desvincular archivo de alternos temporal"
 
-#: builtin/clone.c:1001 builtin/receive-pack.c:2491
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
 msgid "Too many arguments."
-msgstr "Muchos argumentos."
+msgstr "Demasiados argumentos."
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:890
 msgid "You must specify a repository to clone."
 msgstr "Tienes que especificar un repositorio para clonar."
 
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "Las opciones --bare y --origin %s son incompatibles."
 
-#: builtin/clone.c:1021
+#: builtin/clone.c:906
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare y --separate-git-dir son incompatibles."
 
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "repositorio '%s' no existe"
 
-#: builtin/clone.c:1039 builtin/fetch.c:2011
+#: builtin/clone.c:924 builtin/fetch.c:2029
 #, c-format
 msgid "depth %s is not a positive number"
-msgstr "profundidad %s no es un numero positivo"
+msgstr "profundidad %s no es un número positivo"
 
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío."
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
-msgstr "La ruta del repositorio '%s' ya existe y no es un directorio vacío."
+msgstr "la ruta del repositorio '%s' ya existe y no es un directorio vacío."
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "directorio de trabajo '%s' ya existe."
 
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "no se pudo crear directorios principales de '%s'"
 
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "no se pudo crear un árbol de trabajo '%s'"
 
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Clonando en un repositorio vacío '%s'...\n"
 
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonando en '%s'...\n"
 
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -13162,41 +13484,48 @@ msgstr ""
 "clone --recursive no es compatible con --reference y --reference-if-able al "
 "mismo tiempo"
 
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' no es un nombre remoto válido"
 
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien."
 
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
 msgid "--shallow-since is ignored in local clones; use file:// instead."
-msgstr "--shallow-since es ignorado en el clon local; use file:// ."
+msgstr ""
+"--shallow-since es ignorado en clonaciones locales; usa file:// en su lugar."
 
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
-msgstr "--shallow-exclude es ignorado en clones locales; use file://."
+msgstr ""
+"--shallow-exclude es ignorado en clonaciones locales; usa file:// en su "
+"lugar."
 
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
 msgid "--filter is ignored in local clones; use file:// instead."
-msgstr "--filter es ignorado en clones locales; usa file:// en su lugar."
+msgstr "--filter es ignorado en clonaciones locales; usa file:// en su lugar."
 
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
 msgid "source repository is shallow, ignoring --local"
 msgstr "repositorio fuente es superficial, ignorando --local"
 
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
 msgid "--local is ignored"
 msgstr "--local es ignorado"
 
-#: builtin/clone.c:1337 builtin/clone.c:1345
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr "transporte remoto reportó error"
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Rama remota %s no encontrada en upstream %s"
 
-#: builtin/clone.c:1348
+#: builtin/clone.c:1242
 msgid "You appear to have cloned an empty repository."
 msgstr "Pareces haber clonado un repositorio sin contenido."
 
@@ -13206,11 +13535,11 @@ msgstr "git column [<opciones>]"
 
 #: builtin/column.c:27
 msgid "lookup config vars"
-msgstr "revisa las variables de configuraciones"
+msgstr "revisa las variables de configuración"
 
 #: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
-msgstr "capa a usar"
+msgstr "disposición a usar"
 
 #: builtin/column.c:30
 msgid "maximum width"
@@ -13218,27 +13547,27 @@ msgstr "ancho máximo"
 
 #: builtin/column.c:31
 msgid "padding space on left border"
-msgstr "realizando padding en el borde izquierdo"
+msgstr "espacio padding en el borde izquierdo"
 
 #: builtin/column.c:32
 msgid "padding space on right border"
-msgstr "realizando padding en el borde derecho"
+msgstr "espacio padding en el borde derecho"
 
 #: builtin/column.c:33
 msgid "padding space between columns"
-msgstr "realizando padding entre columnas"
+msgstr "espacio padding entre columnas"
 
 #: builtin/column.c:51
 msgid "--command must be the first argument"
 msgstr "--command debe ser el primer argumento"
 
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
 msgid ""
 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13248,93 +13577,91 @@ msgstr ""
 "split[=<estrategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <opciones de split>"
 
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "no se pudo entoncrar el objeto directorio concordante con %s"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
 msgid "dir"
 msgstr "dir"
 
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
-msgstr "el directorio de objetos para guardar el gráfico"
+msgstr "el directorio de objetos en que guardar el gráfico"
 
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
 msgid "if the commit-graph is split, only verify the tip file"
-msgstr "si el commit-graph está cortado, solo verifica la punta del archivo"
+msgstr "si el commit-graph está cortado, solo verifica el archivo tope"
 
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "No se pudo abrir commit-graph '%s'"
 
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "argumento --split no reconocido, %s"
 
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
 #, c-format
 msgid "unexpected non-hex object ID: %s"
-msgstr "ID de objeto no hex inesperado:%s"
+msgstr "ID de objeto no hex inesperado: %s"
 
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "no es un objeto válido: %s"
 
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
 msgid "start walk at all refs"
-msgstr "comenzar caminata en todas las refs"
+msgstr "comenzar recorrido en todas las refs"
 
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "escanear paquete de índices por stdin por commits"
 
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
 msgid "start walk at commits listed by stdin"
-msgstr "comenzar a caminar a los commits listados por stdin"
+msgstr "comenzar recorrido a los commits listados por stdin"
 
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
-msgstr "inclye todos los commits que ya están en el archivo commit-graph"
+msgstr "incluir todos los commits que ya están en el archivo commit-graph"
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
 msgid "enable computation for changed paths"
 msgstr "habilitar computación para rutas cambiadas"
 
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
 msgid "allow writing an incremental commit-graph file"
 msgstr "permitir escribir un archivo commit-graph incremental"
 
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
 msgid "maximum number of commits in a non-base split commit-graph"
-msgstr "máximo número de commits en un commit-graph sin base cortada"
+msgstr "número máximo de commits en un commit-graph sin base cortada"
 
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
 msgid "maximum ratio between two levels of a split commit-graph"
-msgstr "radio máximo entre dos niveles de corte de commit-graph"
+msgstr "razón máxima entre dos niveles de corte de commit-graph"
 
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
 msgid "only expire files older than a given date-time"
-msgstr "expirar objetos más viejos a una fecha dada"
+msgstr "solo caducar objetos más viejos a una fecha dada"
 
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr "número máximo de cambios de ruta de filtro Bloom para computar"
 
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs"
+msgstr "usa como máximo uno de --reachable, --stdin-commits, o --stdin-packs"
 
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
 msgid "Collecting commits from input"
 msgstr "Recolectando commits del input"
 
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "subcomando desconocido: %s"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13348,80 +13675,75 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "padre duplicado %s ignorado"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
 #, c-format
 msgid "not a valid object name %s"
 msgstr "no es un nombre de objeto válido %s"
 
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: falló al abrir '%s'"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree: falló al leer '%s'"
 
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree: falló al cerrar '%s'"
 
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr "padre"
 
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "id del objeto commit padre"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
-#: builtin/tag.c:456
+#: 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/tag.c:454
 msgid "message"
 msgstr "mensaje"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1614
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
 msgid "commit message"
 msgstr "mensaje del commit"
 
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
 msgstr "leer mensaje de commit desde un archivo"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
 #: builtin/pull.c:176 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "Firmar commit con GPG"
 
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
-msgstr "tiene que dar exactamente un árbol"
+msgstr "hay que dar exactamente un árbol"
 
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: falló al leer"
 
-#: builtin/commit.c:41
+#: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<opciones>] [--] <especificación-de-ruta>..."
 
-#: builtin/commit.c:46
+#: builtin/commit.c:47
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<opciones>] [--] <especificación-de-ruta>..."
 
-#: builtin/commit.c:51
+#: builtin/commit.c:52
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
 "remove the commit entirely with \"git reset HEAD^\".\n"
 msgstr ""
 "Has solicitado un amend en tu commit más reciente, pero hacerlo lo\n"
-"vaciaría. Puedes repetir el comando con --alow-empty, o puedes eliminar\n"
+"vaciaría. Puedes repetir el comando con --allow-empty, o puedes eliminar\n"
 "el commit completamente con \"git reset HEAD^\".\n"
 
-#: builtin/commit.c:56
+#: builtin/commit.c:57
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -13436,15 +13758,15 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:63
+#: builtin/commit.c:64
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "Caso contrario, por favor usa 'git rebase --skip'\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:67
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Caso contrario, por favor usa 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:69
+#: builtin/commit.c:70
 msgid ""
 "and then use:\n"
 "\n"
@@ -13466,117 +13788,158 @@ msgstr ""
 "     git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:324
+#: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
 msgstr "falló al desempaquetar objeto del árbol HEAD"
 
-#: builtin/commit.c:360
+#: builtin/commit.c:361
 msgid "--pathspec-from-file with -a does not make sense"
 msgstr "--pathspec-from-file con -a no tiene sentido"
 
-#: builtin/commit.c:374
+#: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
-msgstr "No hay rutas con --include/--only no tiene sentido."
+msgstr "--include/--only sin ruta no tiene sentido."
 
-#: builtin/commit.c:386
+#: builtin/commit.c:387
 msgid "unable to create temporary index"
 msgstr "no es posible crear un índice temporal"
 
-#: builtin/commit.c:395
+#: builtin/commit.c:396
 msgid "interactive add failed"
 msgstr "adición interactiva fallida"
 
-#: builtin/commit.c:410
+#: builtin/commit.c:411
 msgid "unable to update temporary index"
 msgstr "no es posible actualizar el índice temporal"
 
-#: builtin/commit.c:412
+#: builtin/commit.c:413
 msgid "Failed to update main cache tree"
-msgstr "Falló al actualizar el cache principal del árbol"
+msgstr "Falló al actualizar el árbol de caché principal"
 
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
 msgid "unable to write new_index file"
 msgstr "no es posible escribir archivo new_index"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "cannot do a partial commit during a merge."
 msgstr "no se puede realizar un commit parcial durante una fusión."
 
-#: builtin/commit.c:491
+#: builtin/commit.c:492
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "no se puede realizar un commit parcial durante un cherry-pick."
 
-#: builtin/commit.c:493
+#: builtin/commit.c:494
 msgid "cannot do a partial commit during a rebase."
 msgstr "no se puede realizar un commit parcial durante un rebase."
 
-#: builtin/commit.c:501
+#: builtin/commit.c:502
 msgid "cannot read the index"
 msgstr "no se puede leer el índice"
 
-#: builtin/commit.c:520
+#: builtin/commit.c:521
 msgid "unable to write temporary index file"
 msgstr "no es posible escribir el índice temporal"
 
-#: builtin/commit.c:618
+#: builtin/commit.c:619
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "commit '%s' requiere cabecera de autor"
 
-#: builtin/commit.c:620
+#: builtin/commit.c:621
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "el commit '%s' tiene una línea de autor mal formada"
 
-#: builtin/commit.c:639
+#: builtin/commit.c:640
 msgid "malformed --author parameter"
 msgstr "parámetro --author mal formado"
 
-#: builtin/commit.c:692
+#: builtin/commit.c:693
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr ""
-"no es posible seleccionar un carácter de comentario que no es usado\n"
+"no es posible seleccionar un carácter de comentario que no sea usado\n"
 "en el mensaje de commit actual"
 
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "no se pudo revisar el commit %s"
 
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(leyendo mensajes de logs desde standard input)\n"
 
-#: builtin/commit.c:760
+#: builtin/commit.c:761
 msgid "could not read log from standard input"
 msgstr "no se pudo leer log desde standard input"
 
-#: builtin/commit.c:764
+#: builtin/commit.c:765
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "no se pudo leer el log '%s'"
 
-#: builtin/commit.c:801
+#: builtin/commit.c:802
 #, c-format
 msgid "cannot combine -m with --fixup:%s"
 msgstr "no se puede combinar -m con --fixup:%s"
 
-#: builtin/commit.c:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
 msgstr "no se pudo leer SQUASH_MSG"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:821
 msgid "could not read MERGE_MSG"
 msgstr "no se pudo leer MERGE_MSG"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:881
 msgid "could not write commit template"
 msgstr "no se pudo escribir el template del commit"
 
+#: builtin/commit.c:894
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr ""
+"Por favor ingresa el mensaje del commit para tus cambios. Las\n"
+" líneas que comiencen con '%c' serán ignoradas.\n"
+
+#: builtin/commit.c:896
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Por favor ingresa el mensaje del commit para tus cambios. Las\n"
+" líneas que comiencen con '%c' serán ignoradas, y un mensaje\n"
+" vacío aborta el commit.\n"
+
 #: builtin/commit.c:900
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Por favor ingresa el mensaje del commit para tus cambios. Las\n"
+" líneas que comiencen con '%c' serán guardadas; puedes eliminarlas\n"
+" tú mismo si lo deseas.\n"
+
+#: builtin/commit.c:904
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Por favor ingresa el mensaje del commit para tus cambios. Las\n"
+" líneas que comiencen con '%c' serán guardadas; puedes eliminarlas\n"
+" tú mismo si lo deseas.\n"
+"Un mensaje vacío aborta el commit.\n"
+
+#: builtin/commit.c:916
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -13585,12 +13948,12 @@ msgid ""
 "and try again.\n"
 msgstr ""
 "\n"
-"Parece que está realizando una fusión.\n"
-"Si esto no es correcto, ejecute\n"
+"Parece que estás realizando una fusión.\n"
+"Si esto no es correcto, ejecuta\n"
 "\tgit update-ref -d MERGE_HEAD\n"
 "e intenta de nuevo.\n"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:921
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -13599,100 +13962,78 @@ msgid ""
 "and try again.\n"
 msgstr ""
 "\n"
-"Parece que puede estar cometiendo una selección de cerebros.\n"
-"Si esto no es correcto, ejecute\n"
+"Parece que puedes estar cometiendo una selección de cerezas.\n"
+"Si esto no es correcto, ejecuta\n"
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "e intenta de nuevo.\n"
 
-#: builtin/commit.c:915
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"Por favor ingresa el mensaje del commit para tus cambios. Las\n"
-" líneas que comiencen con '%c' serán ignoradas, y un mensaje\n"
-" vacío aborta el commit.\n"
-
-#: builtin/commit.c:923
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"Por favor ingresa el mensaje del commit para tus cambios. Las\n"
-" líneas que comiencen con '%c' serán guardadas; puede eliminarlas\n"
-" usted mismo si lo desea.\n"
-"Un mensaje vacío aborta el commit.\n"
-
-#: builtin/commit.c:940
+#: builtin/commit.c:948
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:     %.*s <%.*s>"
 
-#: builtin/commit.c:948
+#: builtin/commit.c:956
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sFecha:     %s"
 
-#: builtin/commit.c:955
+#: builtin/commit.c:963
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommitter: %.*s <%.*s>"
 
-#: builtin/commit.c:973
+#: builtin/commit.c:981
 msgid "Cannot read index"
 msgstr "No se puede leer el índice"
 
-#: builtin/commit.c:1018
+#: builtin/commit.c:1026
 msgid "unable to pass trailers to --trailers"
 msgstr "no se puede pasar trailers a --trailers"
 
-#: builtin/commit.c:1058
+#: builtin/commit.c:1066
 msgid "Error building trees"
 msgstr "Error al construir los árboles"
 
-#: builtin/commit.c:1072 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:317
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n"
 
-#: builtin/commit.c:1116
+#: builtin/commit.c:1124
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún "
 "autor existente"
 
-#: builtin/commit.c:1130
+#: builtin/commit.c:1138
 #, c-format
 msgid "Invalid ignored mode '%s'"
-msgstr "Modo ignorado inválido '%s'"
+msgstr "Modo de ignorancia inválido '%s'"
 
-#: builtin/commit.c:1148 builtin/commit.c:1441
+#: builtin/commit.c:1156 builtin/commit.c:1450
 #, c-format
 msgid "Invalid untracked files mode '%s'"
-msgstr "Modo inválido de los archivos no rastreados '%s'"
+msgstr "Modo inválido de archivos no rastreados '%s'"
 
-#: builtin/commit.c:1188
+#: builtin/commit.c:1196
 msgid "--long and -z are incompatible"
 msgstr "--long y -z son incompatibles"
 
-#: builtin/commit.c:1219
+#: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "Estás en medio de una fusión -- no puedes renombrar."
 
-#: builtin/commit.c:1221
+#: builtin/commit.c:1229
 msgid "You are in the middle of a cherry-pick -- cannot reword."
-msgstr "Está en medio de un cherry-pick -- no se puede renombrar."
+msgstr "Estás en medio de un cherry-pick -- no se puede renombrar."
 
-#: builtin/commit.c:1224
+#: builtin/commit.c:1232
 #, c-format
 msgid "cannot combine reword option of --fixup with path '%s'"
 msgstr "no se puede combinar opción de renombrar de --fixup con ruta '%s'"
 
-#: builtin/commit.c:1226
+#: builtin/commit.c:1234
 msgid ""
 "reword option of --fixup is mutually exclusive with --patch/--interactive/--"
 "all/--include/--only"
@@ -13700,103 +14041,103 @@ msgstr ""
 "opción de refraseado de --fixup es mutuamente exclusiva con --patch/--"
 "interactive/--all/--include/--only"
 
-#: builtin/commit.c:1245
+#: builtin/commit.c:1253
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Usar ambos --reset-author y --author no tiene sentido"
 
-#: builtin/commit.c:1254
+#: builtin/commit.c:1260
 msgid "You have nothing to amend."
 msgstr "No tienes nada que enmendar."
 
-#: builtin/commit.c:1257
+#: builtin/commit.c:1263
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Estás en medio de una fusión -- no puedes enmendar."
 
-#: builtin/commit.c:1259
+#: builtin/commit.c:1265
 msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr "Está en medio de un cherry-pick -- no se puede enmendar."
+msgstr "Estás en medio de un cherry-pick -- no se puede enmendar."
 
-#: builtin/commit.c:1261
+#: builtin/commit.c:1267
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "Estás en medio de una fusión -- no puedes enmendar."
 
-#: builtin/commit.c:1264
+#: builtin/commit.c:1270
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
 
-#: builtin/commit.c:1274
+#: builtin/commit.c:1280
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado."
 
-#: builtin/commit.c:1276
+#: builtin/commit.c:1282
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "La opción -m no puede ser combinada con -c/-C/-F."
 
-#: builtin/commit.c:1285
+#: builtin/commit.c:1291
 msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr "--reset-author sólo puede ser usada con -C, -c o --amend."
+msgstr "--reset-author solo puede ser usada con -C, -c o --amend."
 
-#: builtin/commit.c:1303
+#: builtin/commit.c:1309
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Solo uno de --include/--only/--all/--interactive/--patch puede ser usado."
 
-#: builtin/commit.c:1331
+#: builtin/commit.c:1337
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "opción desconocida: --fixup=%s:%s"
 
-#: builtin/commit.c:1345
+#: builtin/commit.c:1354
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "paths '%s ...' con -a no tiene sentido"
 
-#: builtin/commit.c:1476 builtin/commit.c:1642
+#: builtin/commit.c:1485 builtin/commit.c:1654
 msgid "show status concisely"
 msgstr "mostrar status de manera concisa"
 
-#: builtin/commit.c:1478 builtin/commit.c:1644
+#: builtin/commit.c:1487 builtin/commit.c:1656
 msgid "show branch information"
 msgstr "mostrar información de la rama"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1489
 msgid "show stash information"
 msgstr "mostrar información del stash"
 
-#: builtin/commit.c:1482 builtin/commit.c:1646
+#: builtin/commit.c:1491 builtin/commit.c:1658
 msgid "compute full ahead/behind values"
 msgstr "calcular todos los valores delante/atrás"
 
-#: builtin/commit.c:1484
+#: builtin/commit.c:1493
 msgid "version"
-msgstr "version"
+msgstr "versión"
 
-#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
-#: builtin/worktree.c:681
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
 msgid "machine-readable output"
-msgstr "output formato-maquina"
+msgstr "output en formato de máquina"
 
-#: builtin/commit.c:1487 builtin/commit.c:1650
+#: builtin/commit.c:1496 builtin/commit.c:1662
 msgid "show status in long format (default)"
 msgstr "mostrar status en formato largo (default)"
 
-#: builtin/commit.c:1490 builtin/commit.c:1653
+#: builtin/commit.c:1499 builtin/commit.c:1665
 msgid "terminate entries with NUL"
 msgstr "terminar entradas con NUL"
 
-#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: 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
 msgid "mode"
 msgstr "modo"
 
-#: builtin/commit.c:1493 builtin/commit.c:1656
+#: builtin/commit.c:1502 builtin/commit.c:1668
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. "
 "(Predeterminado: all)"
 
-#: builtin/commit.c:1497
+#: builtin/commit.c:1506
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -13804,215 +14145,215 @@ msgstr ""
 "mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
 "(Predeterminado: traditional)"
 
-#: builtin/commit.c:1499 parse-options.h:193
+#: builtin/commit.c:1508 parse-options.h:192
 msgid "when"
 msgstr "cuando"
 
-#: builtin/commit.c:1500
+#: builtin/commit.c:1509
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
-"ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. "
+"ignorar cambios en submódulos, opcional cuando: all, dirty, untracked. "
 "(Default: all)"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1511
 msgid "list untracked files in columns"
 msgstr "listar en columnas los archivos sin seguimiento"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1512
 msgid "do not detect renames"
 msgstr "no detectar renombrados"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1514
 msgid "detect renames, optionally set similarity index"
-msgstr "detectar renombres, opcionalmente configurar similaridad de índice"
+msgstr "detectar renombrados, opcionalmente configurar similaridad de índice"
 
-#: builtin/commit.c:1525
+#: builtin/commit.c:1537
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Combinación de argumentos de archivos ignorados y no rastreados no soportada"
 
-#: builtin/commit.c:1607
+#: builtin/commit.c:1619
 msgid "suppress summary after successful commit"
-msgstr "suprime summary tras un commit exitoso"
+msgstr "suprimir summary tras un commit exitoso"
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1620
 msgid "show diff in commit message template"
 msgstr "mostrar diff en el template del mensaje de commit"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1622
 msgid "Commit message options"
 msgstr "Opciones para el mensaje del commit"
 
-#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
 msgid "read message from file"
 msgstr "leer mensaje desde un archivo"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1624
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1624
 msgid "override author for commit"
-msgstr "sobrescribe el autor del commit"
+msgstr "sobrescribir el autor del commit"
 
-#: builtin/commit.c:1613 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
 msgid "date"
 msgstr "fecha"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1625
 msgid "override date for commit"
-msgstr "sobrescribe la fecha del commit"
+msgstr "sobrescribir la fecha del commit"
 
-#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
-#: parse-options.h:329 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:328 ref-filter.h:92
 msgid "commit"
 msgstr "confirmar"
 
-#: builtin/commit.c:1615
+#: builtin/commit.c:1627
 msgid "reuse and edit message from specified commit"
-msgstr "reusar y editar el mensaje de un commit especifico"
+msgstr "reusar y editar el mensaje de un commit específico"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1628
 msgid "reuse message from specified commit"
-msgstr "reusar el mensaje de un commit especifico"
+msgstr "reusar el mensaje de un commit específico"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1621
+#: builtin/commit.c:1633
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]commit"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1633
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
-"usar mensaje de formato autosquash para arreglar el amend/renombrado del "
+"usar mensaje de formato autosquash para arreglar el amend/renombrado del "
 "commit especificado"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1634
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
-"usar el mensaje de formato autosquash para realizar squash  al commit "
+"usar el mensaje de formato autosquash para realizar squash al commit "
 "especificado"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1635
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)"
 
-#: builtin/commit.c:1624 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "trailer"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1636
 msgid "add custom trailer(s)"
 msgstr "agregando trailer(s) personalizados"
 
-#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
 #: builtin/pull.c:145 builtin/revert.c:110
 msgid "add a Signed-off-by trailer"
-msgstr "agregar un firmado por al final"
+msgstr "agregar una línea Signed-off-by al final"
 
-#: builtin/commit.c:1626
+#: builtin/commit.c:1638
 msgid "use specified template file"
 msgstr "usar archivo de template especificado"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1639
 msgid "force edit of commit"
 msgstr "forzar la edición del commit"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1641
 msgid "include status in commit message template"
 msgstr "incluir status en el template del mensaje de commit"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1646
 msgid "Commit contents options"
 msgstr "Opciones para el contenido del commit"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1647
 msgid "commit all changed files"
 msgstr "confirmar todos los archivos cambiados"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1648
 msgid "add specified files to index for commit"
 msgstr "agregar archivos específicos al índice para confirmar"
 
-#: builtin/commit.c:1637
+#: builtin/commit.c:1649
 msgid "interactively add files"
 msgstr "agregar archivos interactivamente"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1650
 msgid "interactively add changes"
 msgstr "agregar cambios interactivamente"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1651
 msgid "commit only specified files"
-msgstr "sólo confirmar archivos específicos"
+msgstr "solo confirmar archivos específicos"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1652
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1653
 msgid "show what would be committed"
 msgstr "mostrar lo que sería incluido en el commit"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1666
 msgid "amend previous commit"
 msgstr "enmendar commit previo"
 
-#: builtin/commit.c:1655
+#: builtin/commit.c:1667
 msgid "bypass post-rewrite hook"
-msgstr "gancho bypass post reescritura"
+msgstr "saltar el gancho de postreescritura"
 
-#: builtin/commit.c:1662
+#: builtin/commit.c:1674
 msgid "ok to record an empty change"
-msgstr "ok al grabar un cambio vacío"
+msgstr "vale grabar un cambio vacío"
 
-#: builtin/commit.c:1664
+#: builtin/commit.c:1676
 msgid "ok to record a change with an empty message"
-msgstr "ok al grabar un cambio con un mensaje vacío"
+msgstr "vale grabar un cambio con un mensaje vacío"
 
-#: builtin/commit.c:1737
+#: builtin/commit.c:1752
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Archivo MERGE_HEAD (%s) corrupto"
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1759
 msgid "could not read MERGE_MODE"
 msgstr "no se pudo leer MERGE_MODE"
 
-#: builtin/commit.c:1765
+#: builtin/commit.c:1780
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "no se pudo leer el mensaje de commit: %s"
 
-#: builtin/commit.c:1772
+#: builtin/commit.c:1787
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Abortando commit debido que el mensaje está en blanco.\n"
 
-#: builtin/commit.c:1777
+#: builtin/commit.c:1792
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
-msgstr "Abortando commit; no se ha editado el mensaje\n"
+msgstr "Abortando commit; no se ha editado el mensaje.\n"
 
-#: builtin/commit.c:1788
+#: builtin/commit.c:1803
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "Abortando commit debido que el cuerpo del mensaje está en blanco.\n"
 
-#: builtin/commit.c:1824
+#: builtin/commit.c:1839
 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 ""
 "el repositorio ha sido actualizado, pero no se pudo escribir el archivo\n"
-"new_index. Verifique que el disco no este lleno y la quota no ha\n"
-"sido superada, y luego \"git restore --sateged :/\" para recuperar."
+"new_index. Verifica que el disco no esté lleno y la cuota no haya\n"
+"sido superada, y luego \"git restore --staged :/\" para recuperar."
 
 #: builtin/config.c:11
 msgid "git config [<options>]"
@@ -14029,7 +14370,7 @@ msgstr "solo un tipo a la vez"
 
 #: builtin/config.c:130
 msgid "Config file location"
-msgstr "Ubicación del archivo configuración"
+msgstr "Ubicación del archivo de configuración"
 
 #: builtin/config.c:131
 msgid "use global config file"
@@ -14045,11 +14386,11 @@ msgstr "usar archivo de config del repositorio"
 
 #: builtin/config.c:134
 msgid "use per-worktree config file"
-msgstr "usar un archivo de config por árbol de trabajo"
+msgstr "usar archivo de config del árbol de trabajo"
 
 #: builtin/config.c:135
 msgid "use given config file"
-msgstr "usar archivo config especificado"
+msgstr "usar archivo de config especificado"
 
 #: builtin/config.c:136
 msgid "blob-id"
@@ -14077,7 +14418,7 @@ msgstr "obtener valores para regexp: name-regex [value-pattern]"
 
 #: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
-msgstr "obtener valor especifico para el URL: sección[.var] URL"
+msgstr "obtener valor específico para el URL: sección[.var] URL"
 
 #: builtin/config.c:142
 msgid "replace all matching variables: name value [value-pattern]"
@@ -14110,7 +14451,7 @@ msgstr "listar todo"
 
 #: builtin/config.c:149
 msgid "use string equality when comparing values to 'value-pattern'"
-msgstr "use la igualdad de cadenas al comparar valores con 'patrón de valor'"
+msgstr "usar la igualdad de cadenas al comparar valores con 'patrón de valor'"
 
 #: builtin/config.c:150
 msgid "open an editor"
@@ -14138,7 +14479,7 @@ msgstr "valor es \"true\" o \"false\""
 
 #: builtin/config.c:156
 msgid "value is decimal number"
-msgstr "valor es un numero decimal"
+msgstr "valor es un número decimal"
 
 #: builtin/config.c:157
 msgid "value is --bool or --int"
@@ -14154,7 +14495,7 @@ msgstr "valor es una ruta (archivo o nombre de directorio)"
 
 #: builtin/config.c:160
 msgid "value is an expiry date"
-msgstr "valor es una fecha de expiración"
+msgstr "valor es una fecha de caducidad"
 
 #: builtin/config.c:161
 msgid "Other"
@@ -14174,7 +14515,8 @@ msgstr "respetar directivas include en la búsqueda"
 
 #: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
-msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)"
+msgstr ""
+"mostrar el origen de configuración (archivo, stdin, blob, línea de comandos)"
 
 #: builtin/config.c:166
 msgid "show scope of config (worktree, local, global, system, command)"
@@ -14188,7 +14530,7 @@ msgstr "valor"
 
 #: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
-msgstr "con --get, usa el valor por defecto cuando falta una entrada"
+msgstr "con --get, usar el valor por defecto cuando falta una entrada"
 
 #: builtin/config.c:181
 #, c-format
@@ -14213,7 +14555,7 @@ msgstr "falló al formatear el valor por defecto de configuración: %s"
 #: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
-msgstr "no se analizar color '%s'"
+msgstr "no se puede analizar color '%s'"
 
 #: builtin/config.c:483
 msgid "unable to parse default color value"
@@ -14272,15 +14614,15 @@ msgid ""
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
 "section in \"git help worktree\" for details"
 msgstr ""
-"--worktree no puede ser usado con multiples árboles de trabajo a menos que "
+"--worktree no puede ser usado con múltiples árboles de trabajo a menos que "
 "la\n"
-"extensión worktreeConfig esté habilitada. Por favor lea \"CONFIGURATION FILE"
+"extensión worktreeConfig esté habilitada. Por favor lee \"CONFIGURATION FILE"
 "\"\n"
 "en \"git help worktree\" para más detalles"
 
 #: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
-msgstr "--get-color y tipo de variable incoherente"
+msgstr "--get-color con tipo de variable es incoherente"
 
 #: builtin/config.c:748
 msgid "only one action at a time"
@@ -14334,7 +14676,7 @@ msgid ""
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr ""
 "no se puede sobrescribir múltiples valores con un único valor\n"
-"\tUse una regexp, --add o --replace-all para cambiar %s."
+"       Usa una regexp, --add o --replace-all para cambiar %s."
 
 #: builtin/config.c:943 builtin/config.c:954
 #, c-format
@@ -14371,7 +14713,7 @@ msgstr "mostrar mensajes de debug en stderr"
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr "credential-cache--daemon no disponible; sin soporte de socket Unix"
 
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "credential-cache no disponible; sin soporte de socket Unix"
 
@@ -14409,7 +14751,7 @@ msgstr "tag anotado %s no disponible"
 #: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is externally known as '%s'"
-msgstr "tag '%s' es literalmente conocida como '%s'"
+msgstr "tag '%s' es externamente conocida como '%s'"
 
 #: builtin/describe.c:328
 #, c-format
@@ -14419,12 +14761,12 @@ msgstr "no hay tag que concuerde exactamente con '%s'"
 #: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
-msgstr "No hay coincidencia exacta en refs o tags, buscando en describe\n"
+msgstr "No hay coincidencia exacta en refs o tags, buscando para describir\n"
 
 #: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
-msgstr "búsqueda finalizada a las %s\n"
+msgstr "búsqueda finalizada a %s\n"
 
 #: builtin/describe.c:424
 #, c-format
@@ -14433,7 +14775,7 @@ msgid ""
 "However, there were unannotated tags: try --tags."
 msgstr ""
 "No hay tags anotados que puedan describir '%s'.\n"
-"Sin embargo, hubieron tags no anotados: intente --tags."
+"Sin embargo, hubieron tags no anotados: intenta --tags."
 
 #: builtin/describe.c:428
 #, c-format
@@ -14441,8 +14783,8 @@ msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr ""
-"Ningún tag puede describit '%s'.\n"
-"Intente --always, o cree algunos tags."
+"Ningún tag puede describir '%s'.\n"
+"Intenta --always, o crea algunos tags."
 
 #: builtin/describe.c:458
 #, c-format
@@ -14455,7 +14797,7 @@ msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr ""
-"se encontró más de %i tags; se mostró %i más reciente\n"
+"se encontró más de %i tags; se mostraron las %i más recientes\n"
 "fin de la búsqueda en %s\n"
 
 #: builtin/describe.c:529
@@ -14483,11 +14825,11 @@ msgstr "hacer debug a la estrategia de búsqueda en stderr"
 
 #: builtin/describe.c:556
 msgid "use any ref"
-msgstr "use cualquier ref"
+msgstr "usar cualquier ref"
 
 #: builtin/describe.c:557
 msgid "use any tag, even unannotated"
-msgstr "use cualquier tag, incluso los no anotados"
+msgstr "usar cualquier tag, incluso los no anotados"
 
 #: builtin/describe.c:558
 msgid "always use long format"
@@ -14495,7 +14837,7 @@ msgstr "siempre usar formato largo"
 
 #: builtin/describe.c:559
 msgid "only follow first parent"
-msgstr "solo seguir el primer patrón"
+msgstr "solo seguir el primer padre"
 
 #: builtin/describe.c:562
 msgid "only output exact matches"
@@ -14503,7 +14845,7 @@ msgstr "solo mostrar concordancias exactas"
 
 #: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
-msgstr "considerar <n> tags más recientes (default:10)"
+msgstr "considerar <n> tags más recientes (default: 10)"
 
 #: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
@@ -14547,7 +14889,7 @@ msgstr "--broken es incompatible con commit-ismos"
 
 #: builtin/diff-tree.c:155
 msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin and --merge-baseson mutuamente exclusivas"
+msgstr "--stdin and --merge-base son mutuamente exclusivas"
 
 #: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
@@ -14566,13 +14908,13 @@ msgstr "opción inválida: %s"
 #: builtin/diff.c:376
 #, c-format
 msgid "%s...%s: no merge base"
-msgstr "%s...%s: se neceista una base de fusión"
+msgstr "%s...%s: se necesita una base de fusión"
 
 #: builtin/diff.c:486
 msgid "Not a git repository"
 msgstr "No es un repositorio git"
 
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:532 builtin/grep.c:698
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objeto '%s' entregado no es válido."
@@ -14596,114 +14938,114 @@ msgstr "%s...%s: múltiples bases de fusión, usando %s"
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "falló: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:293
 #, c-format
 msgid "could not read symlink %s"
 msgstr "no se pudo leer el symlink %s"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:295
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "no se pudo leer el archivo symlink %s"
 
-#: builtin/difftool.c:313
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "no se pudo leer el objeto %s para el symlink %s"
 
-#: builtin/difftool.c:413
+#: builtin/difftool.c:427
 msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
 msgstr ""
 "formatos combinados de diff ('-c' y '--cc') no soportados en\n"
 "modo diff para directorio('-d' y '--dir-diff')."
 
-#: builtin/difftool.c:637
+#: builtin/difftool.c:632
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "ambos archivos modificados: '%s' y '%s'."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:634
 msgid "working tree file has been left."
 msgstr "archivo del árbol de trabajo ha sido dejado."
 
-#: builtin/difftool.c:650
+#: builtin/difftool.c:645
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "archivo temporal existe en '%s'."
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:646
 msgid "you may want to cleanup or recover these."
 msgstr "tal vez desees limpiar o recuperar estos."
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr "falló: %d"
+
+#: builtin/difftool.c:696
 msgid "use `diff.guitool` instead of `diff.tool`"
-msgstr "use `diff.guitool` en lugar de `diff.tool`"
+msgstr "usar `diff.guitool` en lugar de `diff.tool`"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:698
 msgid "perform a full-directory diff"
 msgstr "realizar un diff de todo el directorio"
 
-#: builtin/difftool.c:704
+#: builtin/difftool.c:700
 msgid "do not prompt before launching a diff tool"
 msgstr "no mostrar antes de lanzar una herramienta de diff"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:705
 msgid "use symlinks in dir-diff mode"
 msgstr "usar enlaces simbólicos en modo dir-diff"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:706
 msgid "tool"
 msgstr "herramienta"
 
-#: builtin/difftool.c:711
+#: builtin/difftool.c:707
 msgid "use the specified diff tool"
 msgstr "usar la herramienta de diff especificada"
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:709
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:712
 msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr ""
 "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
 "código de salida distinto de cero"
 
-#: builtin/difftool.c:719
+#: builtin/difftool.c:715
 msgid "specify a custom command for viewing diffs"
 msgstr "especificar un comando personalizado para ver diffs"
 
-#: builtin/difftool.c:720
+#: builtin/difftool.c:716
 msgid "passed to `diff`"
 msgstr "pasado a `diff`"
 
-#: builtin/difftool.c:735
+#: builtin/difftool.c:732
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool requiere un árbol de trabajo o --no-index"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:739
 msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dirty-diff es incompatible con --no-index"
+msgstr "--dir-diff es incompatible con --no-index"
 
-#: builtin/difftool.c:745
+#: builtin/difftool.c:742
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "--gui, --tool y --extcmd son mutuamente exclusivas"
 
-#: builtin/difftool.c:753
+#: builtin/difftool.c:750
 msgid "no <tool> given for --tool=<tool>"
 msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
 
-#: builtin/difftool.c:760
+#: builtin/difftool.c:757
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "no se ha entregado <comando> para --extcmd=<comando>"
 
@@ -14711,7 +15053,7 @@ msgstr "no se ha entregado <comando> para --extcmd=<comando>"
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <opciones> <env-var>"
 
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
 msgid "type"
 msgstr "tipo"
 
@@ -14740,98 +15082,98 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 "Error: No se puede exportar los tags anidados a menos que --mark-tags sea "
 "especificado."
 
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
 msgid "--anonymize-map token cannot be empty"
 msgstr "token --anonymize-map no puede estar vacío"
 
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
 msgid "show progress after <n> objects"
 msgstr "mostrar progreso después de <n> objetos"
 
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
 msgid "select handling of signed tags"
 msgstr "seleccionar el manejo de tags firmados"
 
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
 msgid "select handling of tags that tag filtered objects"
 msgstr "seleccionar el manejo de tags que son tags de objetos filtrados"
 
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "seleccionar el manejo de mensajes de commit en un encoding diferente"
 
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
 msgid "dump marks to this file"
 msgstr "volcar marcas a este archivo"
 
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
 msgid "import marks from this file"
 msgstr "importar marcas de este archivo"
 
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
 msgid "import marks from this file if it exists"
 msgstr "importar marcas de este archivo si existe"
 
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
 msgid "fake a tagger when tags lack one"
 msgstr "falsificar un tagger cuando les falta uno"
 
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
 msgid "output full tree for each commit"
 msgstr "mostrar todo el árbol para cada commit"
 
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1221
 msgid "use the done feature to terminate the stream"
-msgstr "use el feature done para terminar el stream"
+msgstr "usar el feature done para terminar el stream"
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1222
 msgid "skip output of blob data"
-msgstr "saltar el output de data blob"
+msgstr "saltar la salida de data blob"
 
-#: builtin/fast-export.c:1222 builtin/log.c:1823
+#: builtin/fast-export.c:1223 builtin/log.c:1826
 msgid "refspec"
 msgstr "refspec"
 
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1224
 msgid "apply refspec to exported refs"
 msgstr "aplicar refspec para los refs exportados"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1225
 msgid "anonymize output"
 msgstr "anonimizar la salida"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
 msgid "from:to"
 msgstr "de:para"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
 msgid "convert <from> to <to> in anonymized output"
 msgstr "convertir <de> a <para> en output anonimizado"
 
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
-"padres de la referencia que no estan en fast-export stream por id de objeto"
+"referir a los padres que no estén en fast-export stream por id de objeto"
 
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
 msgid "show original object ids of blobs/commits"
 msgstr "mostrar ids de objetos originales para blobs/commits"
 
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
 msgid "label tags with mark ids"
 msgstr "marcar tags con ids de mark"
 
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
 msgid "--anonymize-map without --anonymize does not make sense"
 msgstr "--anonymize-map sin --anonymize no tiene sentido"
 
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
 msgid "Cannot pass both --import-marks and --import-marks-if-exists"
 msgstr "No se puede pasar ambos --import-marks y --import-marks-if-exists"
 
@@ -14858,7 +15200,7 @@ msgstr "Se esperaba comando 'to', se obtuvo %s"
 #: builtin/fast-import.c:3322
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr ""
-"Formato esperado de nombre:nombre de archivo para la opción de sobreescribir "
+"Formato esperado de nombre:nombre-de-archivo para la opción de sobreescribir "
 "submódulo"
 
 #: builtin/fast-import.c:3377
@@ -14897,7 +15239,7 @@ msgstr "extraer de todos los remotos"
 
 #: builtin/fetch.c:147 builtin/pull.c:245
 msgid "set upstream for git pull/fetch"
-msgstr "configurar upstream para git pulll/fetch"
+msgstr "configurar upstream para git pull/fetch"
 
 #: builtin/fetch.c:149 builtin/pull.c:188
 msgid "append to .git/FETCH_HEAD instead of overwriting"
@@ -14909,7 +15251,7 @@ msgstr "usar transacción atómica para actualizar referencias"
 
 #: builtin/fetch.c:153 builtin/pull.c:191
 msgid "path to upload pack on remote end"
-msgstr "ruta para cargar el paquete al final del remoto"
+msgstr "ruta al paquete al lado remoto"
 
 #: builtin/fetch.c:154
 msgid "force overwrite of local reference"
@@ -14943,7 +15285,7 @@ msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto"
 #: builtin/fetch.c:168
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
-"limpiar tags locales que no se encuentran en el remoto y eliminar tags "
+"limpiar tags locales que no se encuentren en el remoto y eliminar tags "
 "cambiados"
 
 #: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
@@ -14969,11 +15311,11 @@ msgstr "permitir actualizar la ref HEAD"
 #: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
 #: builtin/pull.c:218
 msgid "deepen history of shallow clone"
-msgstr "historia profunda de un clon superficial"
+msgstr "profundizar la historia de un clon superficial"
 
 #: builtin/fetch.c:183 builtin/pull.c:212
 msgid "deepen history of shallow repository based on time"
-msgstr "historia profunda de un repositorio superficial basado en tiempo"
+msgstr "profundizar la historia de un repositorio superficial hasta un tiempo"
 
 #: builtin/fetch.c:189 builtin/pull.c:221
 msgid "convert to a complete repository"
@@ -14981,7 +15323,7 @@ msgstr "convertir a un repositorio completo"
 
 #: builtin/fetch.c:192
 msgid "prepend this to submodule path output"
-msgstr "anteponer esto a salida de la ruta del submódulo"
+msgstr "anteponer esto a la salida de ruta del submódulo"
 
 #: builtin/fetch.c:195
 msgid ""
@@ -15005,17 +15347,17 @@ msgstr "especificar extracción de refmap"
 
 #: builtin/fetch.c:208 builtin/pull.c:240
 msgid "report that we have only objects reachable from this object"
-msgstr "reporta que solo tenemos objetos alcanzables de este objeto"
+msgstr "reportar que solo tenemos objetos alcanzables de este objeto"
 
 #: builtin/fetch.c:210
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
-"no realizar fecth al packfile; en lugar de eso, mostrar los ancestros de las "
+"no realizar fetch al packfile; en lugar de eso, mostrar los ancestros de las "
 "puntas de negociación"
 
 #: builtin/fetch.c:213 builtin/fetch.c:215
 msgid "run 'maintenance --auto' after fetching"
-msgstr "ejecute 'maintenance --auto' después de buscar"
+msgstr "ejecutar 'maintenance --auto' después de buscar"
 
 #: builtin/fetch.c:217 builtin/pull.c:243
 msgid "check for forced-updates on all updated branches"
@@ -15031,75 +15373,75 @@ msgstr "aceptar refspecs de stdin"
 
 #: builtin/fetch.c:586
 msgid "Couldn't find remote ref HEAD"
-msgstr "No se puedo encontrar ref remota HEAD"
+msgstr "No se pudo encontrar ref remota HEAD"
 
-#: builtin/fetch.c:757
+#: builtin/fetch.c:760
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "la configuración fetch.output contiene el valor inválido %s"
 
-#: builtin/fetch.c:856
+#: builtin/fetch.c:862
 #, c-format
 msgid "object %s not found"
 msgstr "objeto %s no encontrado"
 
-#: builtin/fetch.c:860
+#: builtin/fetch.c:866
 msgid "[up to date]"
 msgstr "[actualizado]"
 
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
 msgid "[rejected]"
 msgstr "[rechazado]"
 
-#: builtin/fetch.c:874
+#: builtin/fetch.c:880
 msgid "can't fetch in current branch"
 msgstr "no se puede traer en la rama actual"
 
-#: builtin/fetch.c:884
+#: builtin/fetch.c:890
 msgid "[tag update]"
 msgstr "[actualización de tag]"
 
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
 msgid "unable to update local ref"
-msgstr "no se posible actualizar el ref local"
+msgstr "no es posible actualizar el ref local"
 
-#: builtin/fetch.c:889
+#: builtin/fetch.c:895
 msgid "would clobber existing tag"
-msgstr "podría golpear tag existente"
+msgstr "sobrescribiría tag existente"
 
-#: builtin/fetch.c:911
+#: builtin/fetch.c:917
 msgid "[new tag]"
 msgstr "[nuevo tag]"
 
-#: builtin/fetch.c:914
+#: builtin/fetch.c:920
 msgid "[new branch]"
 msgstr "[nueva rama]"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
 msgid "[new ref]"
 msgstr "[nueva referencia]"
 
-#: builtin/fetch.c:956
+#: builtin/fetch.c:962
 msgid "forced update"
 msgstr "actualización forzada"
 
-#: builtin/fetch.c:961
+#: builtin/fetch.c:967
 msgid "non-fast-forward"
-msgstr "avance lento"
+msgstr "avance no rápido"
 
-#: builtin/fetch.c:1065
+#: builtin/fetch.c:1070
 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'."
 msgstr ""
 "Fetch normalmente incida qué branches han tenido un update forzado,\n"
-"pero esa validación ha sido deshabilitada. Para activarla de nuevo use '--"
+"pero esa validación ha sido deshabilitada. Para activarla de nuevo usa '--"
 "show-forced-updates'\n"
-"o ejecute 'git config fetch.showForcedUpdates true'."
+"o ejecuta 'git config fetch.showForcedUpdates true'."
 
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1074
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -15112,80 +15454,85 @@ msgstr ""
 "false'\n"
 "para evitar esta validación.\n"
 
-#: builtin/fetch.c:1101
+#: builtin/fetch.c:1105
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s no envió todos los objetos necesarios\n"
 
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1134
 #, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas"
+msgid "rejected %s because shallow roots are not allowed to be updated"
+msgstr "rechazado %s porque raíces superficiales no pueden ser actualizada"
 
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
 #, c-format
 msgid "From %.*s\n"
 msgstr "Desde %.*s\n"
 
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1244
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
 " 'git remote prune %s' to remove any old, conflicting branches"
 msgstr ""
-"algunos refs locales no pudieron ser actualizados; intente ejecutar\n"
+"algunos refs locales no pudieron ser actualizados; intenta ejecutar\n"
 " 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva"
 
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1341
 #, c-format
 msgid "   (%s will become dangling)"
-msgstr "   (%s se pondrá colgado)"
+msgstr "   (%s se volverá colgante)"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1342
 #, c-format
 msgid "   (%s has become dangling)"
-msgstr "   (%s se ha colgado)"
+msgstr "   (%s se ha vuelto colgante)"
 
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1374
 msgid "[deleted]"
 msgstr "[eliminado]"
 
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(nada)"
 
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1398
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío"
 
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1417
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "Opción \"%s\" valor \"%s\" no es válido para %s"
+msgstr "Valor \"%2$s\" de opción \"%1$s\" no es válido para %3$s"
 
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1420
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Opción \"%s\" es ignorada por %s\n"
 
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
+msgstr "el objeto %s no existe"
+
+#: builtin/fetch.c:1633
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "múltiples ramas detectadas, incompatible con --set-upstream"
 
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1648
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "no configurar upstream para una rama de rastreo remoto"
 
-#: builtin/fetch.c:1635
+#: builtin/fetch.c:1650
 msgid "not setting upstream for a remote tag"
 msgstr "no configurar upstream para un tag remoto"
 
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1652
 msgid "unknown branch type"
 msgstr "tipo de branch desconocido"
 
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1654
 msgid ""
 "no source branch found.\n"
 "you need to specify exactly one branch with the --set-upstream option."
@@ -15193,87 +15540,91 @@ msgstr ""
 "no se encontró rama fuente.\n"
 "tienes que especificar exactamente una rama con la opción --set-upstream."
 
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Extrayendo %s\n"
 
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "No se pudo extraer %s"
 
-#: builtin/fetch.c:1790
+#: builtin/fetch.c:1805
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "no se pudo hacer fetch a '%s' (código de salida: %d)\n"
 
-#: builtin/fetch.c:1894
+#: builtin/fetch.c:1909
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
 msgstr ""
-"No hay repositorio remoto especificado. Por favor, especifique un URL o un\n"
+"No hay repositorio remoto especificado. Por favor, especifica un URL o un\n"
 "nombre remoto del cual las nuevas revisiones deben ser extraídas."
 
-#: builtin/fetch.c:1930
+#: builtin/fetch.c:1945
 msgid "You need to specify a tag name."
 msgstr "Tienes que especificar un nombre de tag."
 
-#: builtin/fetch.c:1995
+#: builtin/fetch.c:2009
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr "--negotiate-only necesita uno o más --negotiate-tip=*"
+
+#: builtin/fetch.c:2013
 msgid "Negative depth in --deepen is not supported"
 msgstr "Profundidad negativa en --deepen no soportada"
 
-#: builtin/fetch.c:1997
+#: builtin/fetch.c:2015
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen y --depth son mutuamente exclusivas"
 
-#: builtin/fetch.c:2002
+#: builtin/fetch.c:2020
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth y --unshallow no pueden ser usadas juntas"
 
-#: builtin/fetch.c:2004
+#: builtin/fetch.c:2022
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow no tiene sentido en un repositorio completo"
 
-#: builtin/fetch.c:2021
+#: builtin/fetch.c:2039
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all no toma un argumento de repositorio"
 
-#: builtin/fetch.c:2023
+#: builtin/fetch.c:2041
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all no tiene sentido con refspecs"
 
-#: builtin/fetch.c:2032
+#: builtin/fetch.c:2050
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "No existe el remoto o grupo remoto: %s"
 
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2057
 msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Extraer un grupo y especificar un refspecs no tiene sentido"
+msgstr "Extraer un grupo y especificar refspecs no tiene sentido"
 
-#: builtin/fetch.c:2055
+#: builtin/fetch.c:2073
 msgid "must supply remote when using --negotiate-only"
 msgstr "tiene que proveer un remoto cuando usa --negotiate-only"
 
-#: builtin/fetch.c:2060
+#: builtin/fetch.c:2078
 msgid "Protocol does not support --negotiate-only, exiting."
 msgstr "Protocolo no soporta --negotiate-only, saliendo."
 
-#: builtin/fetch.c:2079
+#: builtin/fetch.c:2097
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
 msgstr ""
 "--filter solo puede ser usado con el remoto configurado en extensions."
-"partialClone"
+"partialclone"
 
-#: builtin/fetch.c:2083
+#: builtin/fetch.c:2101
 msgid "--atomic can only be used when fetching from one remote"
 msgstr "--atomic solo se puede usar cuando se busca desde un control remoto"
 
-#: builtin/fetch.c:2087
+#: builtin/fetch.c:2105
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "--stdin solo se puede usar cuando se busca desde un control remoto"
 
@@ -15297,7 +15648,7 @@ msgstr "texto"
 
 #: builtin/fmt-merge-msg.c:25
 msgid "use <text> as start of message"
-msgstr "use <text> como comienzo de mensaje"
+msgstr "usar <text> como comienzo de mensaje"
 
 #: builtin/fmt-merge-msg.c:26
 msgid "file to read from"
@@ -15321,27 +15672,27 @@ msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 
 #: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for shells"
-msgstr "cite los marcadores de posición adecuadamente para los shells"
+msgstr "entrecomillar los marcadores de posición adecuadamente para los shells"
 
 #: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for perl"
-msgstr "cite los marcadores de posición adecuadamente para perl"
+msgstr "entrecomillar los marcadores de posición adecuadamente para perl"
 
 #: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for python"
-msgstr "cite los marcadores de posición adecuadamente para python"
+msgstr "entrecomillar los marcadores de posición adecuadamente para python"
 
 #: builtin/for-each-ref.c:36
 msgid "quote placeholders suitably for Tcl"
-msgstr "cite los marcadores de posición adecuadamente para Tcl"
+msgstr "entrecomillar los marcadores de posición adecuadamente para Tcl"
 
 #: builtin/for-each-ref.c:39
 msgid "show only <n> matched refs"
 msgstr "mostrar solo <n> refs encontradas"
 
-#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
 msgid "respect format colors"
-msgstr "respetar el formato de colores"
+msgstr "respetar los colores de formato"
 
 #: builtin/for-each-ref.c:44
 msgid "print only refs which points at the given object"
@@ -15349,37 +15700,37 @@ msgstr "mostrar solo refs que apunten al objeto dado"
 
 #: builtin/for-each-ref.c:46
 msgid "print only refs that are merged"
-msgstr "mostrar solo refs que son fusionadas"
+msgstr "mostrar solo refs que sean fusionadas"
 
 #: builtin/for-each-ref.c:47
 msgid "print only refs that are not merged"
-msgstr "mostrar solo refs que no son fusionadas"
+msgstr "mostrar solo refs que no sean fusionadas"
 
 #: builtin/for-each-ref.c:48
 msgid "print only refs which contain the commit"
-msgstr "mostrar solo refs que contienen el commit"
+msgstr "mostrar solo refs que contengan el commit"
 
 #: builtin/for-each-ref.c:49
 msgid "print only refs which don't contain the commit"
-msgstr "mostrar solo refs que no contienen el commit"
+msgstr "mostrar solo refs que no contengan el commit"
 
 #: builtin/for-each-repo.c:9
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<config> <argumetnos-de-comando>"
 
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "config"
 
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "clave de configuración que almacena una lista de rutas de repositorio"
 
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "falta --config=<config>"
 
-#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "desconocido"
 
@@ -15395,16 +15746,16 @@ msgstr "error en %s %s: %s"
 msgid "warning in %s %s: %s"
 msgstr "peligro en %s %s: %s"
 
-#: builtin/fsck.c:123 builtin/fsck.c:126
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "link roto de %7s %s"
 
-#: builtin/fsck.c:135
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "tipo de objeto equivocado en link"
 
-#: builtin/fsck.c:151
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -15413,211 +15764,221 @@ msgstr ""
 "link roto de %7s %s\n"
 "              a %7s %s"
 
-#: builtin/fsck.c:263
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
-msgstr "faltan %s %s"
+msgstr "falta %s %s"
 
-#: builtin/fsck.c:290
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "inalcanzable %s %s"
 
-#: builtin/fsck.c:310
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "actualizando %s %s"
 
-#: builtin/fsck.c:320
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "no se pudo crear lost-found"
 
-#: builtin/fsck.c:331
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "no se pudo finalizar '%s'"
 
-#: builtin/fsck.c:348
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Revisando %s"
 
-#: builtin/fsck.c:386
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Verificando conectividad (%d objetos)"
 
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Revisando %s %s"
 
-#: builtin/fsck.c:410
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "links rotos"
 
-#: builtin/fsck.c:419
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "raíz %s"
 
-#: builtin/fsck.c:427
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
-msgstr "tag %s %s (%s) en %s"
+msgstr "tagged %s %s (%s) en %s"
 
-#: builtin/fsck.c:456
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: objecto corrupto o faltante"
 
-#: builtin/fsck.c:481
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: referencia inválida %s"
 
-#: builtin/fsck.c:495
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Revisando reflog %s->%s"
 
-#: builtin/fsck.c:529
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: puntero sha1 inválido %s"
 
-#: builtin/fsck.c:536
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: no es un commit"
 
-#: builtin/fsck.c:590
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "aviso: No hay referencias por defecto"
 
-#: builtin/fsck.c:605
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: hash-path no concuerda, encontrado en: %s"
+
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: objeto corrupto o no encontrado: %s"
 
-#: builtin/fsck.c:618
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: objeto de tipo desconocido '%s':%s"
+
+#: builtin/fsck.c:644
 #, c-format
 msgid "%s: object could not be parsed: %s"
-msgstr "%s: no se puede analizar objeto: %s"
+msgstr "%s: no se pudo analizar objeto: %s"
 
-#: builtin/fsck.c:638
+#: builtin/fsck.c:664
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "mal sha1 de archivo: %s"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:685
 msgid "Checking object directory"
 msgstr "Revisando directorio de objetos"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:688
 msgid "Checking object directories"
 msgstr "Revisando objetos directorios"
 
-#: builtin/fsck.c:671
+#: builtin/fsck.c:704
 #, c-format
 msgid "Checking %s link"
 msgstr "Revisando link %s"
 
-#: builtin/fsck.c:676 builtin/index-pack.c:866
+#: builtin/fsck.c:709 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "%s inválido"
 
-#: builtin/fsck.c:683
+#: builtin/fsck.c:716
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s apunta a algo extraño (%s)"
 
-#: builtin/fsck.c:689
+#: builtin/fsck.c:722
 #, c-format
 msgid "%s: detached HEAD points at nothing"
-msgstr "%s: HEAD desacoplado apunta a nada"
+msgstr "%s: HEAD desacoplado no apunta a nada"
 
-#: builtin/fsck.c:693
+#: builtin/fsck.c:726
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "aviso: %s apunta a un branch no nacido (%s)"
 
-#: builtin/fsck.c:705
+#: builtin/fsck.c:738
 msgid "Checking cache tree"
-msgstr "Revisando el cache tree"
+msgstr "Revisando el tree caché"
 
-#: builtin/fsck.c:710
+#: builtin/fsck.c:743
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: puntero inválido sha1 en cache-tree"
 
-#: builtin/fsck.c:719
+#: builtin/fsck.c:752
 msgid "non-tree in cache-tree"
 msgstr "non-tree en cache-tree"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:783
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opciones>] [<objeto>...]"
 
-#: builtin/fsck.c:756
+#: builtin/fsck.c:789
 msgid "show unreachable objects"
-msgstr "mostrar objetos ilegibles"
+msgstr "mostrar objetos inalcanzables"
 
-#: builtin/fsck.c:757
+#: builtin/fsck.c:790
 msgid "show dangling objects"
-msgstr "mostrar objetos colgados"
+msgstr "mostrar objetos colgantes"
 
-#: builtin/fsck.c:758
+#: builtin/fsck.c:791
 msgid "report tags"
 msgstr "reportar tags"
 
-#: builtin/fsck.c:759
+#: builtin/fsck.c:792
 msgid "report root nodes"
 msgstr "reportar nodos raíz"
 
-#: builtin/fsck.c:760
+#: builtin/fsck.c:793
 msgid "make index objects head nodes"
 msgstr "hacer objetos índices cabezas de nodos"
 
-#: builtin/fsck.c:761
+#: builtin/fsck.c:794
 msgid "make reflogs head nodes (default)"
 msgstr "hacer reflogs cabeza de nodos (default)"
 
-#: builtin/fsck.c:762
+#: builtin/fsck.c:795
 msgid "also consider packs and alternate objects"
 msgstr "también considerar paquetes y objetos alternos"
 
-#: builtin/fsck.c:763
+#: builtin/fsck.c:796
 msgid "check only connectivity"
 msgstr "revisar solo conectividad"
 
-#: builtin/fsck.c:764 builtin/mktag.c:75
+#: builtin/fsck.c:797 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "habilitar revisión más estricta"
 
-#: builtin/fsck.c:766
+#: builtin/fsck.c:799
 msgid "write dangling objects in .git/lost-found"
-msgstr "escribir objetos colgados en .git/lost-found"
+msgstr "escribir objetos colgantes en .git/lost-found"
 
-#: builtin/fsck.c:767 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
 msgid "show progress"
 msgstr "mostrar progreso"
 
-#: builtin/fsck.c:768
+#: builtin/fsck.c:801
 msgid "show verbose names for reachable objects"
-msgstr "mostrar nombres verboso para objetos alcanzables"
+msgstr "mostrar nombres verbosos de objetos alcanzables"
 
-#: builtin/fsck.c:827 builtin/index-pack.c:262
+#: builtin/fsck.c:861 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Revisando objetos"
 
-#: builtin/fsck.c:855
+#: builtin/fsck.c:889
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: objeto faltante"
 
-#: builtin/fsck.c:866
+#: builtin/fsck.c:900
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'"
@@ -15639,9 +16000,9 @@ msgstr "falló al analizar '%s' valor '%s'"
 #: builtin/gc.c:487 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
-msgstr "no se pudo definir '%s'"
+msgstr "no se puede hacer stat en '%s'"
 
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
 #, c-format
 msgid "cannot read '%s'"
 msgstr "no se puede leer '%s'"
@@ -15650,13 +16011,13 @@ msgstr "no se puede leer '%s'"
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
 "Automatic cleanup will not be performed until the file is removed.\n"
 "\n"
 "%s"
 msgstr ""
 "El último gc reportó lo siguiente. Por favor corrige la causa\n"
-"y elimine %s.\n"
+"y elimina %s\n"
 "Limpieza automática no se realizará hasta que el archivo sea eliminado.\n"
 "\n"
 "%s"
@@ -15684,7 +16045,7 @@ msgstr "reempaquetar todos los otros paquetes excepto el paquete más grande"
 #: builtin/gc.c:576
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
-msgstr "falló al analizar valor %s de gc.logexpirity"
+msgstr "falló al analizar valor %s de gc.logexpiry"
 
 #: builtin/gc.c:587
 #, c-format
@@ -15695,32 +16056,32 @@ msgstr "falló al analizar valor %s de prune expiry"
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
-"Auto empaquetado del repositorio en segundo plano para un performance "
+"Auto empaquetado del repositorio en segundo plano para un rendimiento "
 "óptimo.\n"
 
 #: builtin/gc.c:609
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
-msgstr "Auto empaquetado del repositorio para performance óptimo.\n"
+msgstr "Auto empaquetado del repositorio para rendimiento óptimo.\n"
 
 #: builtin/gc.c:610
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
-msgstr "Vea \"git help gc\" para limpieza manual.\n"
+msgstr "Mira \"git help gc\" para limpieza manual.\n"
 
 #: builtin/gc.c:650
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
-"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no "
+"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (usa --force si no "
 "es así)"
 
 #: builtin/gc.c:705
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
-"Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para "
+"Hay demasiados objetos sueltos inalcanzables; ejecute 'git prune' para "
 "eliminarlos."
 
 #: builtin/gc.c:715
@@ -15738,151 +16099,191 @@ msgstr "--no-schedule no está permitido"
 msgid "unrecognized --schedule argument '%s'"
 msgstr "argumento --schedule no reconocido, '%s'"
 
-#: builtin/gc.c:869
+#: builtin/gc.c:868
 msgid "failed to write commit-graph"
 msgstr "no se pudo escribir el commit-graph"
 
-#: builtin/gc.c:905
+#: builtin/gc.c:904
 msgid "failed to prefetch remotes"
 msgstr "falló al hacer prefetch a los remotos"
 
-#: builtin/gc.c:1022
+#: builtin/gc.c:1020
 msgid "failed to start 'git pack-objects' process"
-msgstr "no pudo iniciar el proceso 'git pack-objects'"
+msgstr "no se pudo iniciar el proceso 'git pack-objects'"
 
-#: builtin/gc.c:1039
+#: builtin/gc.c:1037
 msgid "failed to finish 'git pack-objects' process"
-msgstr "no pudo finalizar el proceso 'git pack-objects'"
+msgstr "no se pudo finalizar el proceso 'git pack-objects'"
 
-#: builtin/gc.c:1091
+#: builtin/gc.c:1088
 msgid "failed to write multi-pack-index"
 msgstr "no se pudo escribir el índice de paquetes múltiples"
 
-#: builtin/gc.c:1109
+#: builtin/gc.c:1104
 msgid "'git multi-pack-index expire' failed"
 msgstr "'git multi-pack-index expire' falló"
 
-#: builtin/gc.c:1170
+#: builtin/gc.c:1163
 msgid "'git multi-pack-index repack' failed"
 msgstr "'git multi-pack-index repack' falló"
 
-#: builtin/gc.c:1179
+#: builtin/gc.c:1172
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 "omitiendo la tarea de reempaquetado incremental porque core.multiPackIndex "
 "está deshabilitado"
 
-#: builtin/gc.c:1283
+#: builtin/gc.c:1276
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "el archivo de bloqueo '%s' existe, omitiendo el mantenimiento"
 
-#: builtin/gc.c:1313
+#: builtin/gc.c:1306
 #, c-format
 msgid "task '%s' failed"
 msgstr "tarea '%s' falló"
 
-#: builtin/gc.c:1395
+#: builtin/gc.c:1388
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' no es una tarea válida"
 
-#: builtin/gc.c:1400
+#: builtin/gc.c:1393
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
-msgstr "tarea '%s' no puede ser seleccionada múltipes veces"
+msgstr "tarea '%s' no puede ser seleccionada múltiples veces"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1408
 msgid "run tasks based on the state of the repository"
 msgstr "ejecutar tareas basadas en el estado del repositorio"
 
-#: builtin/gc.c:1416
+#: builtin/gc.c:1409
 msgid "frequency"
 msgstr "frecuencia"
 
-#: builtin/gc.c:1417
+#: builtin/gc.c:1410
 msgid "run tasks based on frequency"
 msgstr "ejecutar tareas basado en frecuencia"
 
-#: builtin/gc.c:1420
+#: builtin/gc.c:1413
 msgid "do not report progress or other information over stderr"
 msgstr "no reportar progreso u otra información por medio de stderr"
 
-#: builtin/gc.c:1421
+#: builtin/gc.c:1414
 msgid "task"
 msgstr "tarea"
 
-#: builtin/gc.c:1422
+#: builtin/gc.c:1415
 msgid "run a specific task"
-msgstr "ruta a tarea específica"
+msgstr "ejecutar una tarea específica"
 
-#: builtin/gc.c:1439
+#: builtin/gc.c:1432
 msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr "usar como máximo una entre --auto y --schedule=<frecuencia>"
+msgstr "usar como máximo una de --auto y --schedule=<frecuencia>"
 
-#: builtin/gc.c:1482
+#: builtin/gc.c:1475
 msgid "failed to run 'git config'"
 msgstr "no pudo ejecutar 'git config'"
 
-#: builtin/gc.c:1547
+#: builtin/gc.c:1627
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "falló al expandir la ruta '%s'"
 
-#: builtin/gc.c:1576
+#: builtin/gc.c:1654 builtin/gc.c:1692
 msgid "failed to start launchctl"
-msgstr "Falló al iniciar launchctl."
+msgstr "falló al iniciar launchctl"
 
-#: builtin/gc.c:1613
+#: builtin/gc.c:1767 builtin/gc.c:2220
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "falló al crear directorios para '%s'"
 
-#: builtin/gc.c:1674
+#: builtin/gc.c:1794
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "falló al generar el servicio %s"
 
-#: builtin/gc.c:1745
+#: builtin/gc.c:1887
 msgid "failed to create temp xml file"
 msgstr "no se pudo crear el archivo temp xml"
 
-#: builtin/gc.c:1835
+#: builtin/gc.c:1977
 msgid "failed to start schtasks"
-msgstr "no pudo iniciar schtasks"
+msgstr "no se pudo iniciar schtasks"
 
-#: builtin/gc.c:1879
+#: builtin/gc.c:2046
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr ""
-"no pudo ejecutar 'crontab -l'; es posible que su sistema no soporte 'cron'"
+"no se pudo ejecutar 'crontab -l'; es posible que su sistema no soporte 'cron'"
 
-#: builtin/gc.c:1896
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr ""
-"no pudo ejecutar 'crontab'; es posible que su sistema no soporte 'cron'"
+"no se pudo ejecutar 'crontab'; es posible que su sistema no soporte 'cron'"
 
-#: builtin/gc.c:1900
+#: builtin/gc.c:2067
 msgid "failed to open stdin of 'crontab'"
-msgstr "no pudo abrir stdin de 'crontab'"
+msgstr "no se pudo abrir stdin de 'crontab'"
 
-#: builtin/gc.c:1942
+#: builtin/gc.c:2109
 msgid "'crontab' died"
 msgstr "'crontab' murió"
 
-#: builtin/gc.c:1976
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr "falló al iniciar systemctl"
+
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr "falló el ejecutar systemctl"
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "falló al borrar '%s'"
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "argumento --scheduler no reconocido '%s'"
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr "ni systemd ni crontab disponibles"
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s planificador no disponible"
+
+#: builtin/gc.c:2432
 msgid "another process is scheduling background maintenance"
 msgstr "otro proceso está programando el mantenimiento en segundo plano"
 
-#: builtin/gc.c:2000
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<planificador>]"
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr "planificador"
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr "planificador para iniciar git maintenance run"
+
+#: builtin/gc.c:2478
 msgid "failed to add repo to global config"
 msgstr "no se pudo agregar el repositorio a la configuración global"
 
-#: builtin/gc.c:2010
+#: builtin/gc.c:2487
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <subcomando> [<opciones>]"
 
-#: builtin/gc.c:2029
+#: builtin/gc.c:2506
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "subcomando no válido: %s"
@@ -15891,12 +16292,12 @@ msgstr "subcomando no válido: %s"
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]"
 
-#: builtin/grep.c:223
+#: builtin/grep.c:239
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: falló al crear el hilo: %s"
 
-#: builtin/grep.c:277
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "número inválido de hilos especificado (%d) para %s"
@@ -15905,266 +16306,266 @@ msgstr "número inválido de hilos especificado (%d) para %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
-#: builtin/pack-objects.c:2969
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "no hay soporte para hilos, ignorando %s"
 
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
 #, c-format
 msgid "unable to read tree (%s)"
-msgstr "no es posible leer el  árbol (%s)"
+msgstr "no es posible leer el árbol (%s)"
 
-#: builtin/grep.c:658
+#: builtin/grep.c:672
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "no es posible realizar grep del objeto de tipo %s"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:752
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "switch `%c' espera un valor numérico"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:851
 msgid "search in index instead of in the work tree"
 msgstr "buscar en el índice en lugar del árbol de trabajo"
 
-#: builtin/grep.c:840
+#: builtin/grep.c:853
 msgid "find in contents not managed by git"
-msgstr "encontrar en contenidos no manejados por git"
+msgstr "buscar en contenidos no manejados por git"
 
-#: builtin/grep.c:842
+#: builtin/grep.c:855
 msgid "search in both tracked and untracked files"
 msgstr "buscar en archivos rastreados y no rastreados"
 
-#: builtin/grep.c:844
+#: builtin/grep.c:857
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorar archivos especificados vía '.gitignore'"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:859
 msgid "recursively search in each submodule"
 msgstr "búsqueda recursiva en cada submódulo"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:862
 msgid "show non-matching lines"
-msgstr "mostrar líneas que no concuerdan"
+msgstr "mostrar líneas que no concuerden"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:864
 msgid "case insensitive matching"
 msgstr "búsqueda insensible a mayúsculas"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:866
 msgid "match patterns only at word boundaries"
 msgstr "concordar patrón solo a los límites de las palabras"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:868
 msgid "process binary files as text"
 msgstr "procesar archivos binarios como texto"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:870
 msgid "don't match patterns in binary files"
 msgstr "no concordar patrones en archivos binarios"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:873
 msgid "process binary files with textconv filters"
 msgstr "procesar archivos binarios con filtros textconv"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:875
 msgid "search in subdirectories (default)"
 msgstr "buscar en subdirectorios (default)"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:877
 msgid "descend at most <depth> levels"
-msgstr "descender como máximo <valor-de-profundiad>  niveles"
+msgstr "descender como máximo <valor-de-profundiad> niveles"
 
-#: builtin/grep.c:868
+#: builtin/grep.c:881
 msgid "use extended POSIX regular expressions"
 msgstr "usar expresiones regulares POSIX extendidas"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:884
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usar expresiones regulares POSIX (default)"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:887
 msgid "interpret patterns as fixed strings"
-msgstr "interpretar patrones como strings arreglados"
+msgstr "interpretar patrones como strings fijos"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:890
 msgid "use Perl-compatible regular expressions"
 msgstr "usar expresiones regulares compatibles con Perl"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:893
 msgid "show line numbers"
 msgstr "mostrar números de línea"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:894
 msgid "show column number of first match"
-msgstr "mostrar el número de columna de la primer coincidencia"
+msgstr "mostrar el número de columna de la primera coincidencia"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:895
 msgid "don't show filenames"
 msgstr "no mostrar nombres de archivo"
 
-#: builtin/grep.c:883
+#: builtin/grep.c:896
 msgid "show filenames"
 msgstr "mostrar nombres de archivo"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:898
 msgid "show filenames relative to top directory"
 msgstr "mostrar nombres de archivo relativos al directorio superior"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:900
 msgid "show only filenames instead of matching lines"
 msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:902
 msgid "synonym for --files-with-matches"
 msgstr "sinónimo para --files-with-matches"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:905
 msgid "show only the names of files without match"
 msgstr "mostrar solo los nombres de archivos sin coincidencias"
 
-#: builtin/grep.c:894
+#: builtin/grep.c:907
 msgid "print NUL after filenames"
 msgstr "imprimir NUL después del nombre de archivo"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:910
 msgid "show only matching parts of a line"
-msgstr "mostrar solo partes que concuerdan de una línea"
+msgstr "mostrar solo las partes que concuerden de una línea"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:912
 msgid "show the number of matches instead of matching lines"
 msgstr "mostrar el número de concordancias en lugar de las líneas concordantes"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:913
 msgid "highlight matches"
 msgstr "resaltar concordancias"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:915
 msgid "print empty line between matches from different files"
 msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:917
 msgid "show filename only once above matches from same file"
 msgstr ""
 "mostrar el nombre de archivo solo una vez para concordancias en el mismo "
 "archivo"
 
-#: builtin/grep.c:907
+#: builtin/grep.c:920
 msgid "show <n> context lines before and after matches"
 msgstr "mostrar <n> líneas de contexto antes y después de la concordancia"
 
-#: builtin/grep.c:910
+#: builtin/grep.c:923
 msgid "show <n> context lines before matches"
 msgstr "mostrar <n> líneas de contexto antes de las concordancias"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:925
 msgid "show <n> context lines after matches"
 msgstr "mostrar <n> líneas de context después de las concordancias"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:927
 msgid "use <n> worker threads"
 msgstr "usar <n> hilos de trabajo"
 
-#: builtin/grep.c:915
+#: builtin/grep.c:928
 msgid "shortcut for -C NUM"
 msgstr "atajo para -C NUM"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:931
 msgid "show a line with the function name before matches"
 msgstr ""
 "mostrar una línea con el nombre de la función antes de las concordancias"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:933
 msgid "show the surrounding function"
 msgstr "mostrar la función circundante"
 
-#: builtin/grep.c:923
+#: builtin/grep.c:936
 msgid "read patterns from file"
 msgstr "leer patrones del archivo"
 
-#: builtin/grep.c:925
+#: builtin/grep.c:938
 msgid "match <pattern>"
 msgstr "concordar <patrón>"
 
-#: builtin/grep.c:927
+#: builtin/grep.c:940
 msgid "combine patterns specified with -e"
 msgstr "combinar patrones especificados con -e"
 
-#: builtin/grep.c:939
+#: builtin/grep.c:952
 msgid "indicate hit with exit status without output"
 msgstr "indicar concordancia con exit status sin output"
 
-#: builtin/grep.c:941
+#: builtin/grep.c:954
 msgid "show only matches from files that match all patterns"
 msgstr ""
-"mostrar solo concordancias con archivos que concuerdan todos los patrones"
+"mostrar solo concordancias con archivos que concuerdan con todos los patrones"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "pager"
 msgstr "paginador"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "show matching files in the pager"
 msgstr "mostrar archivos concordantes en el paginador"
 
-#: builtin/grep.c:948
+#: builtin/grep.c:961
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permitir el llamado de grep(1) (ignorado por esta build)"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1027
 msgid "no pattern given"
-msgstr "no se ha entregado patrón"
+msgstr "no se ha entregado ningún patrón"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:1063
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index o --untracked no se puede usar con revs"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:1071
 #, c-format
 msgid "unable to resolve revision: %s"
-msgstr "no se posible resolver revisión: %s"
+msgstr "no es posible resolver revisión: %s"
 
-#: builtin/grep.c:1088
+#: builtin/grep.c:1101
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked no es soportada con --recurse-submodules"
 
-#: builtin/grep.c:1092
+#: builtin/grep.c:1105
 msgid "invalid option combination, ignoring --threads"
 msgstr "combinación de opciones inválida, ignorando --threads"
 
-#: builtin/grep.c:1095 builtin/pack-objects.c:3930
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
 msgid "no threads support, ignoring --threads"
 msgstr "no se soportan hilos, ignorando --threads"
 
-#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "número inválido de hilos especificado (%d)"
 
-#: builtin/grep.c:1132
+#: builtin/grep.c:1145
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager solo funciona en el árbol de trabajo"
 
-#: builtin/grep.c:1158
+#: builtin/grep.c:1171
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached o --untracked no pueden ser usadas con --no-index"
 
-#: builtin/grep.c:1161
+#: builtin/grep.c:1174
 msgid "--untracked cannot be used with --cached"
 msgstr "--untracked no se puede usar con --cached"
 
-#: builtin/grep.c:1167
+#: builtin/grep.c:1180
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado"
 
-#: builtin/grep.c:1175
+#: builtin/grep.c:1188
 msgid "both --cached and trees are given"
-msgstr "--cached y árboles han sido entregados"
+msgstr "ambos --cached y árboles han sido entregados"
 
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -16172,446 +16573,449 @@ msgstr ""
 "git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] "
 "[--] <archivo>..."
 
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "tipo de objeto"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "escribir el objeto en la base de datos de objetos"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "leer el objeto de stdin"
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
-msgstr "guardar el archivo como es sin filtros"
+msgstr "guardar el archivo tal cual sin filtros"
 
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "solo realizar un hash a cualquier basura random para crear un objeto "
-"corrupto para hacer debugging de Gti"
+"corrupto para hacer debugging de Git"
 
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "procesar el archivo como si fuera de esta ruta"
 
-#: builtin/help.c:47
+#: builtin/help.c:55
 msgid "print all available commands"
 msgstr "mostrar todos los comandos disponibles"
 
-#: builtin/help.c:48
+#: builtin/help.c:57
 msgid "exclude guides"
 msgstr "excluir las guias"
 
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "mostrar una lista de nociones utiles"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "imprimir todos los nombres de variables de configuración"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
 msgid "show man page"
-msgstr "mostrar la pagina del manual"
+msgstr "mostrar la página del manual"
 
-#: builtin/help.c:53
+#: builtin/help.c:59
 msgid "show manual in web browser"
-msgstr "mostrar la pagina del manual en un navegador web"
+msgstr "mostrar la página del manual en un navegador web"
 
-#: builtin/help.c:55
+#: builtin/help.c:61
 msgid "show info page"
-msgstr "mostrar la pagina de info"
+msgstr "mostrar la página de info"
 
-#: builtin/help.c:57
+#: builtin/help.c:63
 msgid "print command description"
 msgstr "imprimir descripción del comando"
 
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "mostrar una lista de guías útiles"
+
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "imprimir todos los nombres de variables de configuración"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
 
-#: builtin/help.c:163
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "formato help no reconocido '%s'"
 
-#: builtin/help.c:190
+#: builtin/help.c:223
 msgid "Failed to start emacsclient."
 msgstr "Falló al iniciar emacsclient."
 
-#: builtin/help.c:203
+#: builtin/help.c:236
 msgid "Failed to parse emacsclient version."
 msgstr "Falló al analizar la versión de emacsclient."
 
-#: builtin/help.c:211
+#: builtin/help.c:244
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
-msgstr "la versión '%d' de emacsclient es muy antigua (<22)."
+msgstr "la versión '%d' de emacsclient es demasiada antigua (<22)."
 
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "falló al ejecutar '%s'"
 
-#: builtin/help.c:307
+#: builtin/help.c:340
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
 "Please consider using 'man.<tool>.cmd' instead."
 msgstr ""
-"'%s': ruta para el visualizador del manual no soportada.\n"
-"Por favor considere usar 'man.<herramienta.cmd'."
+"'%s': ruta para un visualizador del manual no soportado.\n"
+"Por favor considera usar 'man.<herramienta>.cmd'."
 
-#: builtin/help.c:319
+#: builtin/help.c:352
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
 "Please consider using 'man.<tool>.path' instead."
 msgstr ""
-"'%s': comando no soportado para man viewer.\n"
-"Por favor considere usar 'man.<herramienta>.path."
+"'%s': comando para man viewer soportado.\n"
+"Por favor considera usar 'man.<herramienta>.path."
 
-#: builtin/help.c:436
+#: builtin/help.c:467
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': visualizador de man desconocido."
 
-#: builtin/help.c:453
+#: builtin/help.c:483
 msgid "no man viewer handled the request"
-msgstr "ningún visualizador de manual proceso la petición"
+msgstr "ningún visualizador de manual procesó la petición"
 
-#: builtin/help.c:461
+#: builtin/help.c:490
 msgid "no info viewer handled the request"
-msgstr "ningún visor de info manejo la petición"
+msgstr "ningún visor de info manejó la petición"
 
-#: builtin/help.c:520 builtin/help.c:531 git.c:348
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' tiene el alias '%s'"
 
-#: builtin/help.c:534 git.c:380
+#: builtin/help.c:565 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "mal alias.%s string: %s"
 
-#: builtin/help.c:563 builtin/help.c:593
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr "esta opción no requiere argumentos"
+
+#: builtin/help.c:602 builtin/help.c:629
 #, c-format
 msgid "usage: %s%s"
 msgstr "uso: %s%s"
 
-#: builtin/help.c:577
+#: builtin/help.c:624
 msgid "'git help config' for more information"
 msgstr "'git help config' para más información"
 
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "el tipo del objeto no concuerda en %s"
 
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "no se recibió el objeto esperado %s"
 
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objeto %s: tipo esperado %s, encontrado %s"
 
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "no se puede llenar %d byte"
 msgstr[1] "no se pueden llenar %d bytes"
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr "EOF temprano"
 
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
 msgid "read error on input"
-msgstr "leer error en input"
+msgstr "error al leer en input"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "se usaron más bytes de los disponibles"
 
-#: builtin/index-pack.c:325 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
-msgstr "paquete muy grande para la definición actual de off_t"
+msgstr "paquete demasiado grande para la definición actual de off_t"
 
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "paquete excede el máximo tamaño permitido"
 
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "no se puede crear '%s'"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "no se puede abrir el archivo de paquete '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
 msgid "pack signature mismatch"
 msgstr "firma del paquete no concuerda"
 
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "versión de paquete %<PRIu32> no soportada"
 
-#: builtin/index-pack.c:383
+#: builtin/index-pack.c:376
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:489
+#: builtin/index-pack.c:482
 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate devolvió %d"
 
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:531
 msgid "offset value overflow for delta base object"
 msgstr "valor de offset desbordado para el objeto base delta"
 
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:539
 msgid "delta base offset is out of bound"
 msgstr "offset de base delta está fuera de límites"
 
-#: builtin/index-pack.c:554
+#: builtin/index-pack.c:547
 #, c-format
 msgid "unknown object type %d"
 msgstr "tipo de objeto %d desconocido"
 
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:578
 msgid "cannot pread pack file"
-msgstr "no se puede propagar el paquete"
+msgstr "no se puede hacer pread en el paquete"
 
-#: builtin/index-pack.c:587
+#: builtin/index-pack.c:580
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante"
 msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes"
 
-#: builtin/index-pack.c:613
+#: builtin/index-pack.c:606
 msgid "serious inflate inconsistency"
 msgstr "inconsistencia seria en inflate"
 
-#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788
-#: builtin/index-pack.c:827 builtin/index-pack.c:836
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
-msgstr "¡COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !"
+msgstr "¡ COLISIÓN DE SHA1 ENCONTRADA CON %s !"
 
-#: builtin/index-pack.c:761 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
 #, c-format
 msgid "unable to read %s"
-msgstr "no se posible leer %s"
+msgstr "no es posible leer %s"
 
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:818
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "no se puede leer la información existente del objeto %s"
 
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:826
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "no se puede leer el objeto existente %s"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:840
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objeto blob %s inválido"
 
-#: builtin/index-pack.c:850 builtin/index-pack.c:869
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
 msgid "fsck error in packed object"
 msgstr "error de fsck en el objeto empaquetado"
 
-#: builtin/index-pack.c:871
+#: builtin/index-pack.c:864
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "No todos los objetos hijos de %s son alcanzables"
 
-#: builtin/index-pack.c:932 builtin/index-pack.c:979
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
 msgstr "falló al aplicar delta"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Receiving objects"
 msgstr "Recibiendo objetos"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Indexing objects"
 msgstr "Indexando objetos"
 
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1190
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paquete está corrompido (SHA1 no concuerda)"
 
-#: builtin/index-pack.c:1201
+#: builtin/index-pack.c:1195
 msgid "cannot fstat packfile"
 msgstr "no se puede fstat al archivo de paquete"
 
-#: builtin/index-pack.c:1204
+#: builtin/index-pack.c:1198
 msgid "pack has junk at the end"
 msgstr "el paquete tiene basura al final"
 
-#: builtin/index-pack.c:1216
+#: builtin/index-pack.c:1210
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusión más allá de la locura en parse_pack_objects()"
 
-#: builtin/index-pack.c:1239
+#: builtin/index-pack.c:1233
 msgid "Resolving deltas"
 msgstr "Resolviendo deltas"
 
-#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "no es posible crear hilo: %s"
 
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1277
 msgid "confusion beyond insanity"
 msgstr "confusión más allá de la locura"
 
-#: builtin/index-pack.c:1289
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "completado con %d objeto local"
 msgstr[1] "completado con %d objetos locales"
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Tail checksum para %s inesperada (¿corrupción de disco?)"
 
-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "paquete tiene %d delta sin resolver"
 msgstr[1] "paquete tiene %d deltas sin resolver"
 
-#: builtin/index-pack.c:1329
+#: builtin/index-pack.c:1323
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "no es posible desinflar el objeto adjunto (%d)"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1419
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "objeto local %s está corrompido"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1440
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "el nombre del archivo de paquete '%s' no termina con '.%s'"
 
-#: builtin/index-pack.c:1470
+#: builtin/index-pack.c:1464
 #, c-format
 msgid "cannot write %s file '%s'"
-msgstr "no se puede escribir %s en el archivo '%s'"
+msgstr "no se puede escribir archivo '%2$s' de %1$s"
 
-#: builtin/index-pack.c:1478
+#: builtin/index-pack.c:1472
 #, c-format
 msgid "cannot close written %s file '%s'"
-msgstr "no se puede cerrar escrito %s en archivo '%s'"
-
-#: builtin/index-pack.c:1504
-msgid "error while closing pack file"
-msgstr "error mientras se cierra el archivo paquete"
+msgstr "no se puede cerrar el archivo escrito '%2$s' de %1$s"
 
-#: builtin/index-pack.c:1518
-msgid "cannot store pack file"
-msgstr "no se puede guardar el archivo paquete"
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "no se pudo renombrar el archivo temporal '*.%s' a '%s'"
 
-#: builtin/index-pack.c:1526
-msgid "cannot store index file"
-msgstr "no se puede guardar el archivo índice"
+#: builtin/index-pack.c:1514
+msgid "error while closing pack file"
+msgstr "error mientras se cerraba el archivo paquete"
 
-#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mal pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1643
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "No se puede abrir el archivo paquete existente '%s'"
 
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1645
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
-msgstr "No se puede abrir el índice del archivo paquete para '%s'"
+msgstr "No se puede abrir el archivo índice del paquete para '%s'"
 
-#: builtin/index-pack.c:1701
+#: builtin/index-pack.c:1693
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "no delta: %d objeto"
 msgstr[1] "no delta: %d objetos"
 
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1700
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "largo de cadena = %d: %lu objeto"
 msgstr[1] "largo de cadena = %d: %lu objetos"
 
-#: builtin/index-pack.c:1750
+#: builtin/index-pack.c:1742
 msgid "Cannot come back to cwd"
 msgstr "No se puede regresar a cwd"
 
-#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
-#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
 #, c-format
 msgid "bad %s"
 msgstr "mal %s"
 
-#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "algoritmo hash desconocido '%s'"
 
-#: builtin/index-pack.c:1852
+#: builtin/index-pack.c:1848
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin no puede ser usada sin --stdin"
 
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin requiere un repositorio git"
 
-#: builtin/index-pack.c:1856
+#: builtin/index-pack.c:1852
 msgid "--object-format cannot be used with --stdin"
 msgstr "--object-format no se puede usar con --stdin"
 
-#: builtin/index-pack.c:1871
+#: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify no recibió ningún nombre de archivo de paquete"
 
-#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "error de fsck en objetos paquete"
 
 #: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
-msgstr "no se pudo definir template '%s'"
+msgstr "no se pudo hacer stat en la template '%s'"
 
 #: builtin/init-db.c:68
 #, c-format
@@ -16648,56 +17052,56 @@ msgstr "template no encontrado en %s"
 msgid "not copying templates from '%s': %s"
 msgstr "no se copian templates de '%s': %s"
 
-#: builtin/init-db.c:262
+#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "nombre de rama inicial inválido: '%s'"
 
-#: builtin/init-db.c:353
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "no es posible manejar el tipo de archivo %d"
 
-#: builtin/init-db.c:356
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "no se puede mover %s a %s"
 
-#: builtin/init-db.c:372
+#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
-msgstr "intentar reinicializar el repositorio con un hash diferente"
+msgstr "intento de reinicializar el repositorio con un hash diferente"
 
-#: builtin/init-db.c:396 builtin/init-db.c:399
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s ya existe"
 
-#: builtin/init-db.c:431
+#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: ignorando --initial-branch=%s"
 
-#: builtin/init-db.c:462
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Reinicializado el repositorio Git compartido existente en %s%s\n"
 
-#: builtin/init-db.c:463
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Reinicializado el repositorio Git existente en %s%s\n"
 
-#: builtin/init-db.c:467
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Inicializado repositorio Git compartido vacío en %s%s\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Inicializado repositorio Git vacío en %s%s\n"
 
-#: builtin/init-db.c:517
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -16705,42 +17109,42 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--"
 "shared[=<permisos>]] [<directorio>]"
 
-#: builtin/init-db.c:543
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "permisos"
 
-#: builtin/init-db.c:544
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
-"especifica que el repositorio de git será compartido entre varios usuarios"
+"especificar que el repositorio de git será compartido entre varios usuarios"
 
-#: builtin/init-db.c:550
+#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "sobrescribir el nombre de la rama inicial"
 
-#: builtin/init-db.c:551 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "hash"
 
-#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "especificar el algoritmo hash a usar"
 
-#: builtin/init-db.c:559
+#: builtin/init-db.c:560
 msgid "--separate-git-dir and --bare are mutually exclusive"
 msgstr "--separate-git-dir y --bare son mutuamente excluyentes"
 
-#: builtin/init-db.c:590 builtin/init-db.c:595
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
-msgstr "no se pude crear directorio %s"
+msgstr "no se puede crear directorio %s"
 
-#: builtin/init-db.c:599 builtin/init-db.c:654
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "no se puede aplicar chdir a %s"
 
-#: builtin/init-db.c:626
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -16749,12 +17153,12 @@ msgstr ""
 "%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-"
 "dir=<directorio>)"
 
-#: builtin/init-db.c:678
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "No se puede acceder al árbol de trabajo '%s'"
 
-#: builtin/init-db.c:683
+#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir incompatible con el repositorio desnudo"
 
@@ -16768,7 +17172,7 @@ msgstr ""
 
 #: builtin/interpret-trailers.c:95
 msgid "edit files in place"
-msgstr "editar archivos en el lugar"
+msgstr "editar archivos en lugar"
 
 #: builtin/interpret-trailers.c:96
 msgid "trim empty trailers"
@@ -16780,7 +17184,7 @@ msgstr "donde colocar el nuevo trailer"
 
 #: builtin/interpret-trailers.c:101
 msgid "action if trailer already exists"
-msgstr "acción if trailer ya existe"
+msgstr "acción si trailer ya existe"
 
 #: builtin/interpret-trailers.c:103
 msgid "action if trailer is missing"
@@ -16820,7 +17224,7 @@ msgstr "no se entregó archivo de entrada para edición en lugar"
 
 #: builtin/log.c:59
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
-msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]"
+msgstr "git log [<opciones>] [<rango-de-revisiones>] [[--] <ruta>...]"
 
 #: builtin/log.c:60
 msgid "git show [<options>] <object>..."
@@ -16849,99 +17253,99 @@ msgstr "no decorar refs que concuerden con <patrón>"
 
 #: builtin/log.c:187
 msgid "decorate options"
-msgstr "opciones de decorado"
+msgstr "opciones de decoración"
 
 #: builtin/log.c:190
 msgid ""
 "trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
 msgstr ""
-"rastrear la evolución del rango de línea <inicio>, <fin> o función: <nombre-"
+"rastrear la evolución del rango de línea <inicio>,<fin> o función :<nombre-"
 "funcion> en <archivo>"
 
 #: builtin/log.c:213
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<rango>:<archivo> no se puede usar con pathspec"
 
-#: builtin/log.c:303
+#: builtin/log.c:306
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Salida final: %d %s\n"
 
-#: builtin/log.c:568
+#: builtin/log.c:571
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: mal archivo"
 
-#: builtin/log.c:583 builtin/log.c:673
+#: builtin/log.c:586 builtin/log.c:676
 #, c-format
 msgid "could not read object %s"
 msgstr "no se pudo leer objeto %s"
 
-#: builtin/log.c:698
+#: builtin/log.c:701
 #, c-format
 msgid "unknown type: %d"
 msgstr "tipo desconocido: %d"
 
-#: builtin/log.c:843
+#: builtin/log.c:846
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: modo cover from description inválido"
 
-#: builtin/log.c:850
+#: builtin/log.c:853
 msgid "format.headers without value"
-msgstr "formate.headers. sin valor"
+msgstr "format.headers sin valor"
 
-#: builtin/log.c:979
+#: builtin/log.c:982
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "no se puede abrir archivo patch %s"
 
-#: builtin/log.c:996
+#: builtin/log.c:999
 msgid "need exactly one range"
-msgstr "necesita exactamente un rango"
+msgstr "se necesita exactamente un rango"
 
-#: builtin/log.c:1006
+#: builtin/log.c:1009
 msgid "not a range"
 msgstr "no es un rango"
 
-#: builtin/log.c:1170
+#: builtin/log.c:1173
 msgid "cover letter needs email format"
-msgstr "letras de portada necesita formato email"
+msgstr "carta de portada necesita formato email"
 
-#: builtin/log.c:1176
+#: builtin/log.c:1179
 msgid "failed to create cover-letter file"
 msgstr "falló al crear los archivos cover-letter"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1266
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "insano in-reply-to: %s"
 
-#: builtin/log.c:1290
+#: builtin/log.c:1293
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]"
 
-#: builtin/log.c:1348
+#: builtin/log.c:1351
 msgid "two output directories?"
 msgstr "¿dos directorios de salida?"
 
-#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
 #, c-format
 msgid "unknown commit %s"
 msgstr "commit desconocido %s"
 
-#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "falló al resolver '%s' como ref válida"
 
-#: builtin/log.c:1519
+#: builtin/log.c:1522
 msgid "could not find exact merge base"
 msgstr "no se pudo encontrar una base de fusión exacta"
 
-#: builtin/log.c:1529
+#: builtin/log.c:1532
 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"
@@ -16953,428 +17357,430 @@ msgstr ""
 "O puedes especificar un commit base mediante --base=<id-commit-base> "
 "manualmente"
 
-#: builtin/log.c:1552
+#: builtin/log.c:1555
 msgid "failed to find exact merge base"
 msgstr "falló al encontrar una base de fusión exacta"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1572
 msgid "base commit should be the ancestor of revision list"
 msgstr "el commit base debe ser el ancestro de la lista de revisión"
 
-#: builtin/log.c:1579
+#: builtin/log.c:1582
 msgid "base commit shouldn't be in revision list"
 msgstr "el commit base no debe estar en la lista de revisión"
 
-#: builtin/log.c:1637
+#: builtin/log.c:1640
 msgid "cannot get patch id"
 msgstr "no se puede obtener id de patch"
 
-#: builtin/log.c:1700
+#: builtin/log.c:1703
 msgid "failed to infer range-diff origin of current series"
 msgstr "falló al inferir rangos range-diff de la serie actual"
 
-#: builtin/log.c:1702
+#: builtin/log.c:1705
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "usando '%s' como origen de diferencia de rango de la serie actual"
 
-#: builtin/log.c:1746
+#: builtin/log.c:1749
 msgid "use [PATCH n/m] even with a single patch"
-msgstr "use [PATCH n/m] incluso con un único parche"
+msgstr "usar [PATCH n/m] incluso con un único parche"
 
-#: builtin/log.c:1749
+#: builtin/log.c:1752
 msgid "use [PATCH] even with multiple patches"
-msgstr "use [PATCH] incluso con múltiples parches"
+msgstr "usar [PATCH] incluso con múltiples parches"
 
-#: builtin/log.c:1753
+#: builtin/log.c:1756
 msgid "print patches to standard out"
 msgstr "mostrar parches en standard out"
 
-#: builtin/log.c:1755
+#: builtin/log.c:1758
 msgid "generate a cover letter"
-msgstr "generar letra de cover"
+msgstr "generar carta de cover"
 
-#: builtin/log.c:1757
+#: builtin/log.c:1760
 msgid "use simple number sequence for output file names"
 msgstr ""
-"usar una secuencia simple de números para salida de nombres de archivos"
+"usar una secuencia simple de números para los nombres de archivos de salida"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1761
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1759
+#: builtin/log.c:1762
 msgid "use <sfx> instead of '.patch'"
-msgstr "use <sfx> en lugar de '.patch'"
+msgstr "usar <sfx> en lugar de '.patch'"
 
-#: builtin/log.c:1761
+#: builtin/log.c:1764
 msgid "start numbering patches at <n> instead of 1"
 msgstr "comenzar a numerar los parches desde <n> en lugar de 1"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1765
 msgid "reroll-count"
 msgstr "reroll-count"
 
-#: builtin/log.c:1763
+#: builtin/log.c:1766
 msgid "mark the series as Nth re-roll"
 msgstr "marcar las series como Nth re-roll"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1768
 msgid "max length of output filename"
 msgstr "tamaño máximo de nombre de archivo resultante"
 
-#: builtin/log.c:1767
+#: builtin/log.c:1770
 msgid "use [RFC PATCH] instead of [PATCH]"
-msgstr "use [RFC PATCH] en lugar de [PATCH]"
+msgstr "usar [RFC PATCH] en lugar de [PATCH]"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1773
 msgid "cover-from-description-mode"
 msgstr "modo-cover-from-description"
 
-#: builtin/log.c:1771
+#: builtin/log.c:1774
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr ""
-"genera partes de una carta de presentación basado en la descripción de la "
+"generar partes de una carta de presentación basadas en la descripción de la "
 "rama"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1776
 msgid "use [<prefix>] instead of [PATCH]"
-msgstr "use [<prefijo>] en lugar de [PATCH]"
+msgstr "usar [<prefijo>] en lugar de [PATCH]"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1779
 msgid "store resulting files in <dir>"
 msgstr "guardar archivos resultantes en <dir>"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1782
 msgid "don't strip/add [PATCH]"
 msgstr "no cortar/agregar [PATCH]"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1785
 msgid "don't output binary diffs"
 msgstr "no mostrar diffs binarios"
 
-#: builtin/log.c:1784
+#: builtin/log.c:1787
 msgid "output all-zero hash in From header"
-msgstr "salida como hash de todos-ceros en la cabecera From"
+msgstr "poner hash de todos ceros en la cabecera From"
 
-#: builtin/log.c:1786
+#: builtin/log.c:1789
 msgid "don't include a patch matching a commit upstream"
-msgstr "no incluya un parche que coincida con un commit en upstream"
+msgstr "no incluir un parche que coincida con un commit en upstream"
 
-#: builtin/log.c:1788
+#: builtin/log.c:1791
 msgid "show patch format instead of default (patch + stat)"
 msgstr "mostrar formato de parche en lugar del default (parche + stat)"
 
-#: builtin/log.c:1790
+#: builtin/log.c:1793
 msgid "Messaging"
-msgstr "Mensajeando"
+msgstr "Mensajería"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1794
 msgid "header"
 msgstr "cabezal"
 
-#: builtin/log.c:1792
+#: builtin/log.c:1795
 msgid "add email header"
 msgstr "agregar cabecera email"
 
-#: builtin/log.c:1793 builtin/log.c:1794
+#: builtin/log.c:1796 builtin/log.c:1797
 msgid "email"
 msgstr "email"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1796
 msgid "add To: header"
 msgstr "agregar cabecera To:"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1797
 msgid "add Cc: header"
 msgstr "agregar cabecera Cc:"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1798
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1796
+#: builtin/log.c:1799
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
-"configurar dirección From a <ident> ( o identidad de committer si está "
+"configurar dirección From a <ident> (o identidad de committer si está "
 "ausente)"
 
-#: builtin/log.c:1798
+#: builtin/log.c:1801
 msgid "message-id"
 msgstr "id de mensaje"
 
-#: builtin/log.c:1799
+#: builtin/log.c:1802
 msgid "make first mail a reply to <message-id>"
 msgstr "hacer primer mail una respuesta a <id de mensaje>"
 
-#: builtin/log.c:1800 builtin/log.c:1803
+#: builtin/log.c:1803 builtin/log.c:1806
 msgid "boundary"
 msgstr "límite"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1804
 msgid "attach the patch"
 msgstr "adjuntar el parche"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1807
 msgid "inline the patch"
 msgstr "poner el parche en línea"
 
-#: builtin/log.c:1808
+#: builtin/log.c:1811
 msgid "enable message threading, styles: shallow, deep"
 msgstr "habilitar hilos de mensajes, estilos: superficial, profundo"
 
-#: builtin/log.c:1810
+#: builtin/log.c:1813
 msgid "signature"
 msgstr "firma"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1814
 msgid "add a signature"
 msgstr "agregar una firma"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1815
 msgid "base-commit"
 msgstr "commit-base"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1816
 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 "agregar información de árbol de requisitos previos a la serie de parches"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1819
 msgid "add a signature from a file"
 msgstr "agregar una firma de un archivo"
 
-#: builtin/log.c:1817
+#: builtin/log.c:1820
 msgid "don't print the patch filenames"
 msgstr "no mostrar los nombres de archivos de los parches"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1822
 msgid "show progress while generating patches"
 msgstr "mostrar medidor de progreso mientras se generan los parches"
 
-#: builtin/log.c:1821
+#: builtin/log.c:1824
 msgid "show changes against <rev> in cover letter or single patch"
-msgstr "muestra cambios contra <rev> en cover letter o en un solo parche"
+msgstr "mostrar cambios contra <rev> en cover letter o en un solo parche"
 
-#: builtin/log.c:1824
+#: builtin/log.c:1827
 msgid "show changes against <refspec> in cover letter or single patch"
-msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche"
+msgstr "mostrar cambios contra <refspec> en cover letter o en un solo parche"
 
-#: builtin/log.c:1826 builtin/range-diff.c:28
+#: builtin/log.c:1829 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "porcentaje por el cual la creación es pesada"
 
-#: builtin/log.c:1913
+#: builtin/log.c:1916
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "línea de identificación inválida: %s"
 
-#: builtin/log.c:1928
+#: builtin/log.c:1931
 msgid "-n and -k are mutually exclusive"
 msgstr "-n y -k son mutuamente exclusivas"
 
-#: builtin/log.c:1930
+#: builtin/log.c:1933
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos"
 
-#: builtin/log.c:1938
+#: builtin/log.c:1941
 msgid "--name-only does not make sense"
 msgstr "--name-only no tiene sentido"
 
-#: builtin/log.c:1940
+#: builtin/log.c:1943
 msgid "--name-status does not make sense"
 msgstr "--name-status no tiene sentido"
 
-#: builtin/log.c:1942
+#: builtin/log.c:1945
 msgid "--check does not make sense"
 msgstr "--check no tiene sentido"
 
-#: builtin/log.c:1964
+#: builtin/log.c:1967
 msgid "--stdout, --output, and --output-directory are mutually exclusive"
 msgstr "--stdout, --output, and --output-directory son mutuamente exclusivas"
 
-#: builtin/log.c:2087
+#: builtin/log.c:2089
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff requiere --cover-letter o un parche único"
 
-#: builtin/log.c:2091
+#: builtin/log.c:2093
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2092
+#: builtin/log.c:2094
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff contra v%d:"
 
-#: builtin/log.c:2098
+#: builtin/log.c:2100
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor requiere --range-diff"
 
-#: builtin/log.c:2102
+#: builtin/log.c:2104
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff requiere --cover-letter o parche único"
 
-#: builtin/log.c:2110
+#: builtin/log.c:2112
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:2111
+#: builtin/log.c:2113
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff contra v%d:"
 
-#: builtin/log.c:2122
+#: builtin/log.c:2124
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "no se puede leer la firma del archivo '%s'"
 
-#: builtin/log.c:2158
+#: builtin/log.c:2160
 msgid "Generating patches"
 msgstr "Generando parches"
 
-#: builtin/log.c:2202
+#: builtin/log.c:2204
 msgid "failed to create output files"
 msgstr "falló al crear los archivos de salida"
 
-#: builtin/log.c:2261
+#: builtin/log.c:2263
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]"
 
-#: builtin/log.c:2315
+#: builtin/log.c:2317
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr ""
-"No se pudo encontrar una rama remota rastreada, por favor especifique "
+"No se pudo encontrar una rama remota rastreada, por favor especifica "
 "<upstream> manualmente.\n"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opciones>] [<archivo>...]"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "rutas están separadas con un carácter NULL"
+
+#: builtin/ls-files.c:617
 msgid "identify the file status with tags"
-msgstr "identifique el estado del archivo con tags"
+msgstr "identificar el estado del archivo con tags"
 
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:619
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'"
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:621
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'"
 
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:623
 msgid "show cached files in the output (default)"
 msgstr "mostrar archivos en caché en la salida (default)"
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:625
 msgid "show deleted files in the output"
 msgstr "mostrar archivos borrados en la salida"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:627
 msgid "show modified files in the output"
 msgstr "mostrar archivos modificados en la salida"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:629
 msgid "show other files in the output"
 msgstr "mostrar otros archivos en la salida"
 
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:631
 msgid "show ignored files in the output"
 msgstr "mostrar archivos ignorados en la salida"
 
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:634
 msgid "show staged contents' object name in the output"
-msgstr ""
-"mostrar contenido de nombres de objetos en el área de stage en la salida"
+msgstr "mostrar nombre de objeto del contenido del área de stage en la salida"
 
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:636
 msgid "show files on the filesystem that need to be removed"
-msgstr "mostrar archivos en el filesystem que necesitan ser borrados"
+msgstr "mostrar archivos en el filesystem que necesiten ser borrados"
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:638
 msgid "show 'other' directories' names only"
-msgstr "mostrar solo nombres de 'directorios otros'"
+msgstr "mostrar solo nombres de 'otros' directorios"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:640
 msgid "show line endings of files"
 msgstr "mostrar finales de línea de archivos"
 
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:642
 msgid "don't show empty directories"
 msgstr "no mostrar directorios vacíos"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:645
 msgid "show unmerged files in the output"
 msgstr "mostrar archivos no fusionados en la salida"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:647
 msgid "show resolve-undo information"
 msgstr "mostrar información resolver-deshacer"
 
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:649
 msgid "skip files matching pattern"
 msgstr "saltar archivos que concuerden con el patrón"
 
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "excluir patrones leídos de <archivo>"
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
+msgstr "leer patrones exclude del archivo <archivo>"
 
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:655
 msgid "read additional per-directory exclude patterns in <file>"
-msgstr ""
-"leer patrones de exclusión de manera adicional por directorio en <archivo>"
+msgstr "leer patrones adicionales de exclusión por directorio en <archivo>"
 
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:657
 msgid "add the standard git exclusions"
 msgstr "agregar las exclusiones standard de git"
 
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:661
 msgid "make the output relative to the project top directory"
 msgstr "hacer la salida relativa al directorio principal del proyecto"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:664
 msgid "recurse through submodules"
 msgstr "recurrir a través de submódulos"
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:666
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "si cualquier <archivo> no está en el índice, tratarlo como un error"
 
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:667
 msgid "tree-ish"
 msgstr "árbol-ismo"
 
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:668
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
-"fingir que las rutas han sido borradas ya que todavía hay <árbol-ismos> "
+"fingir que las rutas hayan sido borradas ya que todavía hay <árbol-ismos> "
 "presentes"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:670
 msgid "show debugging data"
 msgstr "mostrar data de debug"
 
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:672
 msgid "suppress duplicate entries"
 msgstr "suprimir entradas duplicadas"
 
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<repository> [<refs>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repository> [<refs>...]]"
 msgstr ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<repositorio> [<refs>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repositorio> [<refs>...]]"
 
 #: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "no mostrar el URL remoto"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
 msgid "exec"
 msgstr "ejecutar"
 
@@ -17492,7 +17898,7 @@ msgstr "actión cuando se encuentra un CR citado"
 msgid "use headers in message's body"
 msgstr "usar cabeceras en el cuerpo del mensaje"
 
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "mbox vacío: '%s'"
@@ -17523,7 +17929,7 @@ msgstr "mostrar todos los ancestros comunes"
 
 #: builtin/merge-base.c:145
 msgid "find ancestors for a single n-way merge"
-msgstr "encontrar ancestros para una única fusión de n-vías"
+msgstr "encontrar ancestros para una única fusión de n vías"
 
 #: builtin/merge-base.c:147
 msgid "list revs not reachable from others"
@@ -17531,11 +17937,11 @@ msgstr "listar revs no alcanzables desde otros"
 
 #: builtin/merge-base.c:149
 msgid "is the first one ancestor of the other?"
-msgstr "¿es el primer ancestro del otro?"
+msgstr "¿es el primero ancestro del otro?"
 
 #: builtin/merge-base.c:151
 msgid "find where <commit> forked from reflog of <ref>"
-msgstr "encontrar donde <commit> forjó del reflog de <ref>"
+msgstr "encontrar donde <commit> bifurcó del reflog de <ref>"
 
 #: builtin/merge-file.c:9
 msgid ""
@@ -17551,7 +17957,7 @@ msgstr "mandar resultados a standard output"
 
 #: builtin/merge-file.c:36
 msgid "use a diff3 based merge"
-msgstr "usar un fusión basada en diff3"
+msgstr "usar una fusión basada en diff3"
 
 #: builtin/merge-file.c:37
 msgid "for conflicts, use our version"
@@ -17567,7 +17973,7 @@ msgstr "por conflictos, usar una versión de unión"
 
 #: builtin/merge-file.c:44
 msgid "for conflicts, use this marker size"
-msgstr "por conflictos, usar el tamaño de este marcador"
+msgstr "por conflictos, usar este tamaño de marcador"
 
 #: builtin/merge-file.c:45
 msgid "do not warn about conflicts"
@@ -17596,7 +18002,7 @@ msgstr[1] "no se puede manejar más de %d bases. Ignorando %s."
 
 #: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
-msgstr "no manejando nada distinto a fusiones de dos heads."
+msgstr "no manejando nada distinto a fusión de dos heads."
 
 #: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
@@ -17608,152 +18014,144 @@ msgstr "no se pudo resolver ref '%s'"
 msgid "Merging %s with %s\n"
 msgstr "Fusionando %s con %s\n"
 
-#: builtin/merge.c:58
+#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opciones>] [<commit>...]"
 
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: builtin/merge.c:124
 msgid "switch `m' requires a value"
-msgstr "cambiar `m' requiere un valor"
+msgstr "opción `m' requiere un valor"
 
-#: builtin/merge.c:146
+#: builtin/merge.c:147
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "opción `%s' requiere un valor"
 
-#: builtin/merge.c:199
+#: builtin/merge.c:200
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "No se pudo encontrar estrategia de fusión '%s'.\n"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:201
 #, c-format
 msgid "Available strategies are:"
 msgstr "Estrategias disponibles son:"
 
-#: builtin/merge.c:205
+#: builtin/merge.c:206
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Estrategias personalizadas disponibles son:"
 
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:133
 msgid "do not show a diffstat at the end of the merge"
 msgstr "no mostrar un diffstat al final de la fusión"
 
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:136
 msgid "show a diffstat at the end of the merge"
 msgstr "mostrar un diffstat al final de la fusión"
 
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "(sinónimo para --stat)"
 
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:142
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "agregar (como máximo <n>) entradas del shortlog al mensaje del commit de "
 "fusión"
 
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:148
 msgid "create a single commit instead of doing a merge"
 msgstr "crear un commit único en lugar de hacer una fusión"
 
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:151
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "realizar un commit si la fusión es exitosa (default)"
 
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "editar mensaje antes de realizar commit"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:272
 msgid "allow fast-forward (default)"
-msgstr "permitir fast-forwars (default)"
+msgstr "permitir fast-forward (default)"
 
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:161
 msgid "abort if fast-forward is not possible"
 msgstr "abortar si fast-forward no es posible"
 
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:164
 msgid "verify that the named commit has a valid GPG signature"
-msgstr "verificar que el commit nombrado tiene una firma GPG válida"
+msgstr "verificar que el commit nombrado tenga una firma GPG válida"
 
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:168
+#: builtin/rebase.c:1117 builtin/revert.c:114
 msgid "strategy"
 msgstr "estrategia"
 
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr "estrategia de fusión para usar"
 
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:172
 msgid "option=value"
 msgstr "opción=valor"
 
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:173
 msgid "option for selected merge strategy"
 msgstr "opción para la estrategia de fusión seleccionada"
 
-#: builtin/merge.c:283
+#: builtin/merge.c:284
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "fusionar mensaje de commit (para una fusión no fast-forward)"
 
-#: builtin/merge.c:290
+#: builtin/merge.c:291
 msgid "abort the current in-progress merge"
 msgstr "abortar la fusión en progreso actual"
 
-#: builtin/merge.c:292
+#: builtin/merge.c:293
 msgid "--abort but leave index and working tree alone"
-msgstr "--abort pero deja el índice y el árbol de trabajo solos"
+msgstr "--abort pero no tocar el índice ni el árbol de trabajo"
 
-#: builtin/merge.c:294
+#: builtin/merge.c:295
 msgid "continue the current in-progress merge"
 msgstr "continuar la fusión en progreso actual"
 
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:180
 msgid "allow merging unrelated histories"
 msgstr "permitir fusionar historias no relacionadas"
 
-#: builtin/merge.c:303
+#: builtin/merge.c:304
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg"
 
-#: builtin/merge.c:320
+#: builtin/merge.c:321
 msgid "could not run stash."
 msgstr "no se pudo ejecutar stash."
 
-#: builtin/merge.c:325
+#: builtin/merge.c:326
 msgid "stash failed"
 msgstr "stash falló"
 
-#: builtin/merge.c:330
+#: builtin/merge.c:331
 #, c-format
 msgid "not a valid object: %s"
 msgstr "no es un objeto válido: %s"
 
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
 msgid "read-tree failed"
 msgstr "lectura de árbol falló"
 
-#: builtin/merge.c:400
+#: builtin/merge.c:401
 msgid "Already up to date. (nothing to squash)"
 msgstr "Ya está actualizado. (nada para hacer squash)"
 
-#: builtin/merge.c:414
+#: builtin/merge.c:415
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Commit de squash -- no actualizando HEAD\n"
 
-#: builtin/merge.c:464
+#: builtin/merge.c:465
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
@@ -17763,130 +18161,129 @@ msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
 msgid "'%s' does not point to a commit"
 msgstr "'%s' no apunta a ningún commit"
 
-#: builtin/merge.c:602
+#: builtin/merge.c:603
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mal string branch.%s.mergeoptions: %s"
 
-#: builtin/merge.c:728
+#: builtin/merge.c:730
 msgid "Not handling anything other than two heads merge."
 msgstr "No manejando nada más que fusión de dos heads."
 
-#: builtin/merge.c:741
+#: builtin/merge.c:743
 #, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Opción desconocida para merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "opción de estrategia desconocida: -X%s"
 
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "no es posible escribir %s"
 
-#: builtin/merge.c:812
+#: builtin/merge.c:814
 #, c-format
 msgid "Could not read from '%s'"
-msgstr "No se puedo leer de '%s'"
+msgstr "No se pudo leer de '%s'"
 
-#: builtin/merge.c:821
+#: builtin/merge.c:823
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
-"No se realiza commit de la fusión; use 'git commit' para completar la "
-"fusión.\n"
+"No se realiza commit de fusión; usa 'git commit' para completar la fusión.\n"
 
-#: builtin/merge.c:827
+#: builtin/merge.c:829
 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 ""
-"Por favor ingrese un mensaje de commit que explique por qué es necesaria "
+"Por favor ingresa un mensaje de commit que explique por qué es necesaria "
 "esta fusión,\n"
 "especialmente si esto fusiona un upstream actualizado en una rama de "
 "tópico.\n"
 "\n"
 
-#: builtin/merge.c:832
+#: builtin/merge.c:834
 msgid "An empty message aborts the commit.\n"
 msgstr "Un mensaje vacío aborta el commit.\n"
 
-#: builtin/merge.c:835
+#: builtin/merge.c:837
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
 "the commit.\n"
 msgstr ""
 "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
-" el commit.\n"
+"el commit.\n"
 
-#: builtin/merge.c:888
+#: builtin/merge.c:892
 msgid "Empty commit message."
 msgstr "Mensaje de commit vacío."
 
-#: builtin/merge.c:903
+#: builtin/merge.c:907
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilloso.\n"
 
-#: builtin/merge.c:964
+#: builtin/merge.c:968
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Fusión automática falló; arregle los conflictos y luego realice un commit "
 "con el resultado.\n"
 
-#: builtin/merge.c:1003
+#: builtin/merge.c:1007
 msgid "No current branch."
 msgstr "No rama actual."
 
-#: builtin/merge.c:1005
+#: builtin/merge.c:1009
 msgid "No remote for the current branch."
 msgstr "No hay remoto para la rama actual."
 
-#: builtin/merge.c:1007
+#: builtin/merge.c:1011
 msgid "No default upstream defined for the current branch."
-msgstr "Por defecto, no hay un upstream  definido para la rama actual."
+msgstr "Por defecto, no hay un upstream definido para la rama actual."
 
-#: builtin/merge.c:1012
+#: builtin/merge.c:1016
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
-msgstr "No hay rama de rastreo remoto para %s de %s"
+msgstr "No hay rama de rastreo remota para %s de %s"
 
-#: builtin/merge.c:1069
+#: builtin/merge.c:1073
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valor erróneo '%s' en el entorno '%s'"
 
-#: builtin/merge.c:1172
+#: builtin/merge.c:1174
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "nada que podamos fusionar en %s: %s"
 
-#: builtin/merge.c:1206
+#: builtin/merge.c:1208
 msgid "not something we can merge"
 msgstr "nada que podamos fusionar"
 
-#: builtin/merge.c:1316
+#: builtin/merge.c:1321
 msgid "--abort expects no arguments"
 msgstr "--abort no espera argumentos"
 
-#: builtin/merge.c:1320
+#: builtin/merge.c:1325
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
 
-#: builtin/merge.c:1338
+#: builtin/merge.c:1343
 msgid "--quit expects no arguments"
 msgstr "--quit no espera argumentos"
 
-#: builtin/merge.c:1351
+#: builtin/merge.c:1356
 msgid "--continue expects no arguments"
 msgstr "--continue no espera argumentos"
 
-#: builtin/merge.c:1355
+#: builtin/merge.c:1360
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
 
-#: builtin/merge.c:1371
+#: builtin/merge.c:1376
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17894,7 +18291,7 @@ msgstr ""
 "No has concluido la fusión (existe MERGE_HEAD).\n"
 "Por favor, realiza un commit con los cambios antes de fusionar."
 
-#: builtin/merge.c:1378
+#: builtin/merge.c:1383
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17902,89 +18299,85 @@ msgstr ""
 "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n"
 "Por favor, realiza un commit con los cambios antes de fusionar."
 
-#: builtin/merge.c:1381
+#: builtin/merge.c:1386
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD)."
 
-#: builtin/merge.c:1395
+#: builtin/merge.c:1400
 msgid "You cannot combine --squash with --no-ff."
 msgstr "No se puede combinar --squash con --no-ff."
 
-#: builtin/merge.c:1397
+#: builtin/merge.c:1402
 msgid "You cannot combine --squash with --commit."
 msgstr "No se puede combinar --squash con --commit."
 
-#: builtin/merge.c:1413
+#: builtin/merge.c:1418
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "No hay commit especificado y merge.defaultToUpstream no está configurado."
 
-#: builtin/merge.c:1430
+#: builtin/merge.c:1435
 msgid "Squash commit into empty head not supported yet"
-msgstr "Commit aplastado dentro de un head vacío no es soportado todavía"
+msgstr "Aplastar un commit a un head vacío no es soportado todavía"
 
-#: builtin/merge.c:1432
+#: builtin/merge.c:1437
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1442
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - nada que podamos fusionar"
 
-#: builtin/merge.c:1439
+#: builtin/merge.c:1444
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Solo se puede fusionar exactamente un commit en un head vacío"
 
-#: builtin/merge.c:1520
+#: builtin/merge.c:1531
 msgid "refusing to merge unrelated histories"
 msgstr "rehusando fusionar historias no relacionadas"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1550
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Actualizando %s..%s\n"
 
-#: builtin/merge.c:1585
+#: builtin/merge.c:1598
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Intentando fusión en índice realmente trivial...\n"
 
-#: builtin/merge.c:1592
+#: builtin/merge.c:1605
 #, c-format
 msgid "Nope.\n"
-msgstr "Nop.\n"
+msgstr "No.\n"
 
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr "No es posible hacer fast-forward, abortando."
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: builtin/merge.c:1664 builtin/merge.c:1730
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Rebobinando el árbol a original...\n"
 
-#: builtin/merge.c:1655
+#: builtin/merge.c:1668
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Intentando estrategia de fusión %s...\n"
 
-#: builtin/merge.c:1707
+#: builtin/merge.c:1720
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
 
-#: builtin/merge.c:1709
+#: builtin/merge.c:1722
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Fusionar con estrategia %s falló.\n"
 
-#: builtin/merge.c:1718
+#: builtin/merge.c:1732
 #, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Usando el %s para preparar resolución a mano.\n"
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr "Usando estrategia %s para preparar resolución a mano.\n"
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1746
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -18012,22 +18405,22 @@ msgstr "%d (FSCK_IGNORE?) nunca debería activar esta devolución de llamada"
 #: builtin/mktag.c:56
 #, c-format
 msgid "could not read tagged object '%s'"
-msgstr "no se pudo leer objeto de tag '%s'"
+msgstr "no se pudo leer objeto etiquetado '%s'"
 
 #: builtin/mktag.c:59
 #, c-format
 msgid "object '%s' tagged as '%s', but is a '%s' type"
-msgstr "objeto '%s' es taggeado como '%s', pero es un tipo '%s'"
+msgstr "objeto '%s' es etiquetado como '%s', pero es de tipo '%s'"
 
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr "etiqueta en stdin no pasó nuestro estricto control fsck"
 
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
 msgid "tag on stdin did not refer to a valid object"
 msgstr "tag en stdin no se refería a un objeto válido"
 
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:243
 msgid "unable to write tag file"
 msgstr "incapaz de escribir el archivo de tag"
 
@@ -18048,45 +18441,57 @@ msgid "allow creation of more than one tree"
 msgstr "permitir la creación de más de un árbol"
 
 #: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<opciones>] write [--preferred-pack=<pack>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
 
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
 msgid "git multi-pack-index [<options>] verify"
 msgstr "git multi-pack-index [<opciones>] verify"
 
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<opciones>] expire"
 
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<opciones>] repack [--batch-size=<tamaño>]"
 
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
 msgid "object directory containing set of packfile and pack-index pairs"
-msgstr "objeto directorio conteniendo conjuntos de pares packfile y pack-index"
+msgstr ""
+"directorio de objetos conteniendo conjunto de pares de packfile y pack-index"
 
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
 msgid "preferred-pack"
 msgstr "pack preferido"
 
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr "pack para reuso cuando se calcula un bitmap de múltiples packs"
 
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "escribir bitmap multi-pack"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "escribir el índice multi-pack que contenga los siguientes índices"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "referencia los snapshots para seleccionar los commits de bitmap"
+
+#: builtin/multi-pack-index.c:202
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
 msgstr ""
 "durante el repack, recolectar los pack-files de tamaño menor en un batch que "
-"es más grande que este tamaño"
-
-#: builtin/multi-pack-index.c:180
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "subcomando desconocido: %s"
+"sea más grande que este tamaño"
 
 #: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
@@ -18100,8 +18505,8 @@ msgstr "¿Directorio %s está en el índice y no hay submódulo?"
 #: builtin/mv.c:85
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
-"Por favor agrega el stage de tus cambios a .gitmodules o realiza un stash "
-"para proceder"
+"Por favor agrega tus cambios a .gitmodules al stage o realiza un stash para "
+"proceder"
 
 #: builtin/mv.c:103
 #, c-format
@@ -18110,81 +18515,81 @@ msgstr "%.*s está en el índice"
 
 #: builtin/mv.c:125
 msgid "force move/rename even if target exists"
-msgstr "forzar mover/renombrar incluso si el objetivo existe"
+msgstr "forzar mover/renombrar incluso si el destino existe"
 
 #: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "saltar errores de mover/renombrar"
 
-#: builtin/mv.c:170
+#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "destino '%s' no es un directorio"
 
-#: builtin/mv.c:181
+#: builtin/mv.c:184
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Revisando cambio de nombre de '%s' a '%s'\n"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:190
 msgid "bad source"
 msgstr "mala fuente"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:193
 msgid "can not move directory into itself"
-msgstr "no se pude mover un directorio en sí mismo"
+msgstr "no se puede mover un directorio en sí mismo"
 
-#: builtin/mv.c:191
+#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "no se puede mover un directorio dentro de un archivo"
 
-#: builtin/mv.c:200
+#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "directorio de fuente está vacío"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:231
 msgid "not under version control"
-msgstr "no se encuentra bajo control de versión"
+msgstr "no se encuentra bajo control de versiones"
 
-#: builtin/mv.c:227
+#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "en conflicto"
 
-#: builtin/mv.c:230
+#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "destino existe"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "sobrescribiendo '%s'"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "No se puede sobrescribir"
 
-#: builtin/mv.c:244
+#: builtin/mv.c:250
 msgid "multiple sources for the same target"
-msgstr "múltiples fuentes para el mismo objetivo"
+msgstr "múltiples fuentes para el mismo destino"
 
-#: builtin/mv.c:246
+#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "el directorio de destino no existe"
 
-#: builtin/mv.c:253
+#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, fuente=%s, destino=%s"
 
-#: builtin/mv.c:274
+#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Renombrando %s a %s\n"
 
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
 #, c-format
 msgid "renaming '%s' failed"
-msgstr "renombrando '%s' falló"
+msgstr "renombrar '%s' falló"
 
 #: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
@@ -18204,7 +18609,7 @@ msgstr "imprimir solo nombres basados en referencias (sin nombres de objetos)"
 
 #: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
-msgstr "sólo usar tags para nombrar commits"
+msgstr "solo usar tags para nombrar commits"
 
 #: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
@@ -18362,47 +18767,47 @@ msgstr "no se pudo leer salida de 'show'"
 msgid "failed to finish 'show' for object '%s'"
 msgstr "falló la finalización de 'show' para el objeto '%s'"
 
-#: builtin/notes.c:197
+#: builtin/notes.c:195
 msgid "please supply the note contents using either -m or -F option"
-msgstr "por favor suministrar los contenidos de nota usando la opción -m o -F"
+msgstr "por favor suministra los contenidos de nota usando la opción -m o -F"
 
-#: builtin/notes.c:206
+#: builtin/notes.c:204
 msgid "unable to write note object"
 msgstr "incapaz de escribir el objeto de nota"
 
-#: builtin/notes.c:208
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "los contenidos de nota han sido dejados en %s"
 
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:577
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "no se pudo abrir o leer '%s'"
 
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "falló al resolver '%s' como ref válida."
 
-#: builtin/notes.c:265
+#: builtin/notes.c:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "falló al leer objeto '%s'."
 
-#: builtin/notes.c:268
+#: builtin/notes.c:266
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
-msgstr "no se puede leer la data de la nota de un objeto no-blob '%s'."
+msgstr "no se puede leer los datos de la nota de un objeto no blob '%s'."
 
-#: builtin/notes.c:309
+#: builtin/notes.c:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "línea de entrada mal formada: '%s'."
 
-#: builtin/notes.c:324
+#: builtin/notes.c:322
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "falló al copiar notas de '%s' a '%s'"
@@ -18410,259 +18815,259 @@ msgstr "falló al copiar notas de '%s' a '%s'"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "rechazando %s notas en %s (fuera de refs/notes/)"
 
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: 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
 msgid "too many arguments"
-msgstr "muchos argumentos"
+msgstr "demasiados argumentos"
 
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
 #, c-format
 msgid "no note found for object %s."
 msgstr "no se encontraron notas para objeto %s."
 
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "contenidos de la nota como cadena"
 
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "contenidos de la nota en un archivo"
 
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
 msgid "reuse and edit specified note object"
-msgstr "reutilizar y editar el objeto de nota especificada"
+msgstr "reutilizar y editar el objeto de nota especificado"
 
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "reutilizar el objeto de nota especificado"
 
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "permitir almacenar nota vacía"
 
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "reemplazar notas existentes"
 
-#: builtin/notes.c:448
+#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
-"No se puede agregar notas. Se encontró notas existentes para objeto %s. Use "
+"No se puede agregar notas. Se encontró notas existentes para objeto %s. Usa "
 "'-f' para sobrescribir las notas existentes"
 
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Sobrescribiendo notas existentes para objeto %s\n"
 
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
 #, c-format
 msgid "Removing note for object %s\n"
-msgstr "Removiendo nota para objeto %s\n"
+msgstr "Quitando nota del objeto %s\n"
 
-#: builtin/notes.c:497
+#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "leer objetos desde stdin"
 
-#: builtin/notes.c:499
+#: builtin/notes.c:497
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "cargar configuración de reescritura para <comando> (implica --stdin)"
 
-#: builtin/notes.c:517
+#: builtin/notes.c:515
 msgid "too few arguments"
-msgstr "muy pocos argumentos"
+msgstr "demasiados pocos argumentos"
 
-#: builtin/notes.c:538
+#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
 "No se puede copiar notas. Se encontró notas existentes para el objeto %s. "
-"Use '-f' para sobrescribir las notes existentes"
+"Usa '-f' para sobrescribir las notas existentes"
 
-#: builtin/notes.c:550
+#: builtin/notes.c:548
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
-msgstr "faltan notas en la fuente del objeto %s. No se puede copiar."
+msgstr "faltan notas en el objeto de fuente %s. No se puede copiar."
 
-#: builtin/notes.c:603
+#: builtin/notes.c:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
 msgstr ""
 "Las opciones -m/-F/-c/-C han sido deprecadas por el subcomando 'edit'.\n"
-"Por favor use 'git notes add -f -m/-F/-c/-C' en cambio.\n"
+"Por favor usa 'git notes add -f -m/-F/-c/-C' en cambio.\n"
 
-#: builtin/notes.c:698
+#: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "falló al borrar ref NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:700
+#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "falló al borrar ref NOTES_MERGE_REF"
 
-#: builtin/notes.c:702
+#: builtin/notes.c:700
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "no se pudo eliminar el árbol de trabajo 'git notes merge'"
 
-#: builtin/notes.c:722
+#: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "falló al leer ref NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:724
+#: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "no se pudo encontrar commit de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:726
+#: builtin/notes.c:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "no se pudo analizar commit de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:739
+#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "falló al resolver NOTES_MERGE_REF"
 
-#: builtin/notes.c:742
+#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
-msgstr "falló al finalizar las notas de fusión"
+msgstr "falló al finalizar la fusión de notas"
 
-#: builtin/notes.c:768
+#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "estrategia de fusión de notas %s desconocida"
 
-#: builtin/notes.c:784
+#: builtin/notes.c:782
 msgid "General options"
 msgstr "Opciones generales"
 
-#: builtin/notes.c:786
+#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Opciones de fusión"
 
-#: builtin/notes.c:788
+#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr ""
-"resolver conflictos de notas usando la estrategia entregadas (manual/ours/"
+"resolver conflictos de notas usando la estrategia entregada (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:790
+#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "Realizando commit a las notas no fusionadas"
 
-#: builtin/notes.c:792
+#: builtin/notes.c:790
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 "finalizar fusión de notas realizando un commit de las notas no fusionadas"
 
-#: builtin/notes.c:794
+#: builtin/notes.c:792
 msgid "Aborting notes merge resolution"
-msgstr "Abortando notas de resolución de fusión"
+msgstr "Abortando resolución de fusión de notas"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:794
 msgid "abort notes merge"
-msgstr "abortar notas de fusión"
+msgstr "abortar fusión de notas"
 
-#: builtin/notes.c:807
+#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
-msgstr "no se pueden mezclar --commit, --abort ó -s/--strategy"
+msgstr "no se pueden mezclar --commit, --abort o -s/--strategy"
 
-#: builtin/notes.c:812
+#: builtin/notes.c:810
 msgid "must specify a notes ref to merge"
-msgstr "debe especificar una ref de notas a fusionar"
+msgstr "se debe especificar una ref de notas a fusionar"
 
-#: builtin/notes.c:836
+#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "--strategy/-s desconocida: %s"
 
-#: builtin/notes.c:873
+#: builtin/notes.c:871
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "una fusión de notas en %s ya está en progreso en %s"
 
-#: builtin/notes.c:876
+#: builtin/notes.c:874
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "falló al guardar un link para el ref de notas actual (%s)"
 
-#: builtin/notes.c:878
+#: builtin/notes.c:876
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
 "'git notes merge --commit', or abort the merge with 'git notes merge --"
 "abort'.\n"
 msgstr ""
-"Fusión automática de notas falló. Arregle conflictos en %s y realice un "
-"commit con el resultado 'git notes merge --commit', o aborte la fusión con "
+"Fusión automática de notas falló. Arregla conflictos en %s y realiza un "
+"commit con el resultado 'git notes merge --commit', o aborta la fusión con "
 "'git notes merge --abort'.\n"
 
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:895 builtin/tag.c:590
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Falló al resolver '%s' como una ref válida."
 
-#: builtin/notes.c:900
+#: builtin/notes.c:898
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "El objeto %s no tiene notas\n"
 
-#: builtin/notes.c:912
+#: builtin/notes.c:910
 msgid "attempt to remove non-existent note is not an error"
 msgstr "intentar eliminar una nota no existente no es un error"
 
-#: builtin/notes.c:915
+#: builtin/notes.c:913
 msgid "read object names from the standard input"
 msgstr "leer nombres de objetos de standard input"
 
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr "no eliminar, solo mostrar"
 
-#: builtin/notes.c:955
+#: builtin/notes.c:953
 msgid "report pruned notes"
 msgstr "reportar notas recortadas"
 
-#: builtin/notes.c:998
+#: builtin/notes.c:996
 msgid "notes-ref"
 msgstr "referencia-de-notas"
 
-#: builtin/notes.c:999
+#: builtin/notes.c:997
 msgid "use notes from <notes-ref>"
 msgstr "usar notas desde <referencia-de-notas>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1739
+#: builtin/notes.c:1032 builtin/stash.c:1752
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subcomando desconocido: %s"
 
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-"
 "objetos>]"
 
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
 "de-objetos>]"
 
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18671,111 +19076,115 @@ msgstr ""
 "write_reuse_object: no se pudo localizar %s, se esperaba en el "
 "desplazamiento %<PRIuMAX> en el paquete %s"
 
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
-msgstr "mal paquete de objeto CRC para %s"
+msgstr "mal CRC del paquete de objeto para %s"
 
-#: builtin/pack-objects.c:459
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "objeto empaquetado corrupto para %s"
 
-#: builtin/pack-objects.c:590
+#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
-msgstr "delta recursivo encontrado para objeto %s"
+msgstr "delta recursiva encontrada para objeto %s"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u objetos ordenados, esperados %<PRIu32>"
 
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "objeto esperado en el desplazamiento %<PRIuMAX> en el paquete %s"
 
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1160
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "deshabilitando escritura bitmap, paquetes son divididos debido a pack."
 "packSizeLimit"
 
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
 msgid "Writing objects"
 msgstr "Escribiendo objetos"
 
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "falló al iniciar %s"
 
-#: builtin/pack-objects.c:1141
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "escribir un índice de bitmap"
+
+#: builtin/pack-objects.c:1294
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>"
 
-#: builtin/pack-objects.c:1383
+#: builtin/pack-objects.c:1536
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "deshabilitando escritura bitmap, ya que algunos objetos no están siendo "
 "empaquetados"
 
-#: builtin/pack-objects.c:1831
+#: builtin/pack-objects.c:1984
 #, c-format
 msgid "delta base offset overflow in pack for %s"
-msgstr "overflow de offset en la base de delta en paquete para %s"
+msgstr "overflow de offset de base de delta en paquete para %s"
 
-#: builtin/pack-objects.c:1840
+#: builtin/pack-objects.c:1993
 #, c-format
 msgid "delta base offset out of bound for %s"
-msgstr "outbound de offset en la base de delta para %s"
+msgstr "offset de base de delta está fuera de límites para %s"
 
-#: builtin/pack-objects.c:2121
+#: builtin/pack-objects.c:2274
 msgid "Counting objects"
 msgstr "Contando objetos"
 
-#: builtin/pack-objects.c:2266
+#: builtin/pack-objects.c:2439
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "incapaz de analizar header del objeto %s"
 
-#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
-#: builtin/pack-objects.c:2362
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
 #, c-format
 msgid "object %s cannot be read"
 msgstr "objeto %s no puede ser leído"
 
-#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 "objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2376
+#: builtin/pack-objects.c:2549
 msgid "suboptimal pack - out of memory"
 msgstr "suboptimal pack - fuera de memoria"
 
-#: builtin/pack-objects.c:2691
+#: builtin/pack-objects.c:2864
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Compresión delta usando hasta %d hilos"
 
-#: builtin/pack-objects.c:2830
+#: builtin/pack-objects.c:3003
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "no es posible empaquetar objetos alcanzables desde tag %s"
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:3089
 msgid "Compressing objects"
 msgstr "Comprimiendo objetos"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:3095
 msgid "inconsistency with delta count"
 msgstr "inconsistencia con la cuenta de delta"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3174
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18784,7 +19193,7 @@ msgstr ""
 "valor para uploadpack.blobpackfileuri tiene que ser de la forma '<hash-de-"
 "objeto> <hash-de-pack> <uri>' (se tuvo '%s')"
 
-#: builtin/pack-objects.c:3004
+#: builtin/pack-objects.c:3177
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -18792,287 +19201,287 @@ msgstr ""
 "objeto ya está configurado en otro uploadpack.blobpackfileuri (se obtuvo "
 "'%s')"
 
-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3212
 #, c-format
 msgid "could not get type of object %s in pack %s"
 msgstr "no se puede obtener el tipo de objeto %s en pack %s"
 
-#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "no se pudo encontrar pack '%s'"
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3408
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 " %s"
 msgstr ""
-"se espseraba ID de objeto al borde, se obtuvo basura:\n"
+"se esperaba ID de objeto al borde, se obtuvo basura:\n"
 "%s"
 
-#: builtin/pack-objects.c:3224
+#: builtin/pack-objects.c:3414
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 " %s"
 msgstr ""
-"se esperaba ID de objeto, se obtuvo basuta:\n"
+"se esperaba ID de objeto, se obtuvo basura:\n"
 "%s"
 
-#: builtin/pack-objects.c:3322
+#: builtin/pack-objects.c:3507
 msgid "invalid value for --missing"
 msgstr "valor inválido para --missing"
 
-#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
 msgid "cannot open pack index"
 msgstr "no se puede abrir índice de paquetes"
 
-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3541
 #, c-format
 msgid "loose object at %s could not be examined"
-msgstr "objeto perdido en %s no pudo ser examinado"
+msgstr "objeto suelto en %s no pudo ser examinado"
 
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3627
 msgid "unable to force loose object"
-msgstr "incapaz de forzar un objeto perdido"
+msgstr "incapaz de forzar que el objecto se suelte"
 
-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3757
 #, c-format
 msgid "not a rev '%s'"
 msgstr "no es una rev '%s'"
 
-#: builtin/pack-objects.c:3631
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "mala revisión '%s'"
 
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3788
 msgid "unable to add recent objects"
 msgstr "incapaz de añadir objetos recientes"
 
-#: builtin/pack-objects.c:3712
+#: builtin/pack-objects.c:3841
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versión de índice no soportada %s"
 
-#: builtin/pack-objects.c:3716
+#: builtin/pack-objects.c:3845
 #, c-format
 msgid "bad index version '%s'"
 msgstr "mala versión del índice '%s'"
 
-#: builtin/pack-objects.c:3755
+#: builtin/pack-objects.c:3884
 msgid "<version>[,<offset>]"
 msgstr "<versión>[,<offset>]"
 
-#: builtin/pack-objects.c:3756
+#: builtin/pack-objects.c:3885
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "escribir el índice de paquete en la versión de formato idx especificado"
 
-#: builtin/pack-objects.c:3759
+#: builtin/pack-objects.c:3888
 msgid "maximum size of each output pack file"
 msgstr "tamaño máximo de cada paquete resultante"
 
-#: builtin/pack-objects.c:3761
+#: builtin/pack-objects.c:3890
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorar objetos prestados de otros almacenes de objetos"
 
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c:3892
 msgid "ignore packed objects"
-msgstr "ignorar objetos paquete"
+msgstr "ignorar objetos empaquetados"
 
-#: builtin/pack-objects.c:3765
+#: builtin/pack-objects.c:3894
 msgid "limit pack window by objects"
 msgstr "limitar ventana de paquete por objetos"
 
-#: builtin/pack-objects.c:3767
+#: builtin/pack-objects.c:3896
 msgid "limit pack window by memory in addition to object limit"
 msgstr "limitar ventana de paquete por memoria en adición a límite de objetos"
 
-#: builtin/pack-objects.c:3769
+#: builtin/pack-objects.c:3898
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "longitud máxima de cadena delta permitida en el paquete resultante"
 
-#: builtin/pack-objects.c:3771
+#: builtin/pack-objects.c:3900
 msgid "reuse existing deltas"
 msgstr "reusar deltas existentes"
 
-#: builtin/pack-objects.c:3773
+#: builtin/pack-objects.c:3902
 msgid "reuse existing objects"
 msgstr "reutilizar objetos existentes"
 
-#: builtin/pack-objects.c:3775
+#: builtin/pack-objects.c:3904
 msgid "use OFS_DELTA objects"
 msgstr "usar objetos OFS_DELTA"
 
-#: builtin/pack-objects.c:3777
+#: builtin/pack-objects.c:3906
 msgid "use threads when searching for best delta matches"
 msgstr "usar hilos cuando se busque para mejores concordancias de delta"
 
-#: builtin/pack-objects.c:3779
+#: builtin/pack-objects.c:3908
 msgid "do not create an empty pack output"
 msgstr "no crear un paquete resultante vacío"
 
-#: builtin/pack-objects.c:3781
+#: builtin/pack-objects.c:3910
 msgid "read revision arguments from standard input"
 msgstr "leer argumentos de revisión de standard input"
 
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:3912
 msgid "limit the objects to those that are not yet packed"
-msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía"
+msgstr "limitar los objetos a aquellos que no hayan sido empaquetados todavía"
 
-#: builtin/pack-objects.c:3786
+#: builtin/pack-objects.c:3915
 msgid "include objects reachable from any reference"
 msgstr "incluir objetos alcanzables por cualquier referencia"
 
-#: builtin/pack-objects.c:3789
+#: builtin/pack-objects.c:3918
 msgid "include objects referred by reflog entries"
 msgstr "incluir objetos referidos por entradas de reflog"
 
-#: builtin/pack-objects.c:3792
+#: builtin/pack-objects.c:3921
 msgid "include objects referred to by the index"
 msgstr "incluir objetos referidos por el índice"
 
-#: builtin/pack-objects.c:3795
+#: builtin/pack-objects.c:3924
 msgid "read packs from stdin"
 msgstr "leer packs de stdin"
 
-#: builtin/pack-objects.c:3797
+#: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
 msgstr "mostrar paquete en stdout"
 
-#: builtin/pack-objects.c:3799
+#: builtin/pack-objects.c:3928
 msgid "include tag objects that refer to objects to be packed"
-msgstr "incluir objetos tag que refieren a objetos a ser empaquetados"
+msgstr "incluir objetos tag que refieran a objetos a ser empaquetados"
 
-#: builtin/pack-objects.c:3801
+#: builtin/pack-objects.c:3930
 msgid "keep unreachable objects"
 msgstr "mantener objetos inalcanzables"
 
-#: builtin/pack-objects.c:3803
+#: builtin/pack-objects.c:3932
 msgid "pack loose unreachable objects"
 msgstr "empaquetar objetos sueltos inalcanzables"
 
-#: builtin/pack-objects.c:3805
+#: builtin/pack-objects.c:3934
 msgid "unpack unreachable objects newer than <time>"
 msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
 
-#: builtin/pack-objects.c:3808
+#: builtin/pack-objects.c:3937
 msgid "use the sparse reachability algorithm"
 msgstr "usar el algoritmo sparse reachability"
 
-#: builtin/pack-objects.c:3810
+#: builtin/pack-objects.c:3939
 msgid "create thin packs"
 msgstr "crear paquetes delgados"
 
-#: builtin/pack-objects.c:3812
+#: builtin/pack-objects.c:3941
 msgid "create packs suitable for shallow fetches"
 msgstr "crear paquetes adecuados para fetches superficiales"
 
-#: builtin/pack-objects.c:3814
+#: builtin/pack-objects.c:3943
 msgid "ignore packs that have companion .keep file"
-msgstr "ignorar paquetes que tienen un archivo .keep acompañante"
+msgstr "ignorar paquetes que tengan un archivo .keep acompañante"
 
-#: builtin/pack-objects.c:3816
+#: builtin/pack-objects.c:3945
 msgid "ignore this pack"
 msgstr "ignorar este paquete"
 
-#: builtin/pack-objects.c:3818
+#: builtin/pack-objects.c:3947
 msgid "pack compression level"
 msgstr "nivel de compresión del paquete"
 
-#: builtin/pack-objects.c:3820
+#: builtin/pack-objects.c:3949
 msgid "do not hide commits by grafts"
 msgstr "no ocultar commits por injertos"
 
-#: builtin/pack-objects.c:3822
+#: builtin/pack-objects.c:3951
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "usar un índice bitmap si está disponible para acelerar la cuenta de objetos"
 
-#: builtin/pack-objects.c:3824
+#: builtin/pack-objects.c:3953
 msgid "write a bitmap index together with the pack index"
 msgstr "escribir un índice de bitmap junto al índice de paquete"
 
-#: builtin/pack-objects.c:3828
+#: builtin/pack-objects.c:3957
 msgid "write a bitmap index if possible"
 msgstr "escribir un índice de bitmap si es posible"
 
-#: builtin/pack-objects.c:3832
+#: builtin/pack-objects.c:3961
 msgid "handling for missing objects"
 msgstr "manejo de objetos perdidos"
 
-#: builtin/pack-objects.c:3835
+#: builtin/pack-objects.c:3964
 msgid "do not pack objects in promisor packfiles"
 msgstr "no se puede empaquetar objetos en packfiles promisores"
 
-#: builtin/pack-objects.c:3837
+#: builtin/pack-objects.c:3966
 msgid "respect islands during delta compression"
 msgstr "respetar islas durante la compresión delta"
 
-#: builtin/pack-objects.c:3839
+#: builtin/pack-objects.c:3968
 msgid "protocol"
 msgstr "protocolo"
 
-#: builtin/pack-objects.c:3840
+#: builtin/pack-objects.c:3969
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr ""
-"excluyendo cualquier uploadpack.blobpackfileuri configurado con este "
-"protocolo"
+"excluir cualquier uploadpack.blobpackfileuri configurado con este protocolo"
 
-#: builtin/pack-objects.c:3873
+#: builtin/pack-objects.c:4002
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
-msgstr "profundidad de cadena de delta %d es muy profunda, forzando %d"
+msgstr "profundidad de cadena de delta %d es demasiada profunda, forzando %d"
 
-#: builtin/pack-objects.c:3878
+#: builtin/pack-objects.c:4007
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
-msgstr "pack.deltaCacheLimit es muy grande, forzando %d"
+msgstr "pack.deltaCacheLimit es demasiado grande, forzando %d"
 
-#: builtin/pack-objects.c:3934
+#: builtin/pack-objects.c:4063
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "--max-pack-size no puede ser usado para construir un paquete para "
 "transferencia"
 
-#: builtin/pack-objects.c:3936
+#: builtin/pack-objects.c:4065
 msgid "minimum pack size limit is 1 MiB"
 msgstr "tamaño mínimo del paquete es 1 MiB"
 
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:4070
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin no puede ser usado para construir un paquete indexable"
 
-#: builtin/pack-objects.c:3944
+#: builtin/pack-objects.c:4073
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable y --unpack-unreachable son incompatibles"
 
-#: builtin/pack-objects.c:3950
+#: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
-msgstr "no se puede usar--filter sin --stdout"
+msgstr "no se puede usar --filter sin --stdout"
 
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:4081
 msgid "cannot use --filter with --stdin-packs"
-msgstr "no se puede usar--filter con --stdin-packs"
+msgstr "no se puede usar --filter con --stdin-packs"
 
-#: builtin/pack-objects.c:3956
+#: builtin/pack-objects.c:4085
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr "no se puede usar un lista interna de rev con --stdin-packs"
 
-#: builtin/pack-objects.c:4015
+#: builtin/pack-objects.c:4144
 msgid "Enumerating objects"
 msgstr "Enumerando objetos"
 
-#: builtin/pack-objects.c:4052
+#: builtin/pack-objects.c:4181
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
 "reused %<PRIu32>"
 msgstr ""
-"Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>), pack-"
-"reusado %<PRIu32>"
+"Total %<PRIu32> (delta %<PRIu32>), reusados %<PRIu32> (delta %<PRIu32>), "
+"pack-reusados %<PRIu32>"
 
 #: builtin/pack-redundant.c:601
 msgid ""
@@ -19083,9 +19492,9 @@ msgid ""
 "to <git@vger.kernel.org>.  Thanks.\n"
 msgstr ""
 "'git pack-redundant' está nominado para su eliminación.\n"
-"Si todavía usa este comando, agregue un extra\n"
+"Si todavía usas este comando, agrega una extra\n"
 "opción, '--i-still-use-this', en la línea de comando\n"
-"y háganos saber que todavía lo usa enviando un correo electrónico\n"
+"y háganos saber que todavía lo usas enviando un correo electrónico\n"
 "a <git@vger.kernel.org>. Gracias.\n"
 
 #: builtin/pack-refs.c:8
@@ -19114,15 +19523,15 @@ msgstr "reportar objetos recortados"
 
 #: builtin/prune.c:136
 msgid "expire objects older than <time>"
-msgstr "expirar objetos más viejos a <tiempo>"
+msgstr "caducar objetos más viejos a <tiempo>"
 
 #: builtin/prune.c:138
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor"
 
-#: builtin/prune.c:152
+#: builtin/prune.c:151
 msgid "cannot prune in a precious-objects repo"
-msgstr "no se puede recortar en un repositorio de objetos-preciosos"
+msgstr "no se puede recortar en un repositorio de objetos preciosos"
 
 #: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
@@ -19146,11 +19555,11 @@ msgstr "Opciones relacionadas a fusión"
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporar cambios por rebase en lugar de fusión"
 
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "permitir fast-forward"
 
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:167 parse-options.h:339
 msgid "automatically stash/stash pop before and after"
 msgstr "ejecutar automáticamente stash/stash pop antes y después"
 
@@ -19188,9 +19597,9 @@ msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr ""
-"Generalmente esto significa que has proveído un wildcard de refspec que no "
+"Generalmente esto significa que has proveído un refspec de wildcard que no "
 "tiene\n"
-"concordancia en el final remoto."
+"concordancia en el lado remoto."
 
 #: builtin/pull.c:451
 #, c-format
@@ -19203,9 +19612,9 @@ msgstr ""
 "una rama. Porque este no es el remoto configurado por default\n"
 "para tu rama actual, tienes que especificar una rama en la línea de comando."
 
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:456 builtin/rebase.c:951
 msgid "You are not currently on a branch."
-msgstr "No te encuentras actualmente en la rama."
+msgstr "No te encuentras actualmente en una rama."
 
 #: builtin/pull.c:458 builtin/pull.c:473
 msgid "Please specify which branch you want to rebase against."
@@ -19220,7 +19629,7 @@ msgid "See git-pull(1) for details."
 msgstr "Ver git-pull(1) para detalles."
 
 #: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/rebase.c:957
 msgid "<remote>"
 msgstr "<remoto>"
 
@@ -19228,7 +19637,7 @@ msgstr "<remoto>"
 msgid "<branch>"
 msgstr "<rama>"
 
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:471 builtin/rebase.c:949
 msgid "There is no tracking information for the current branch."
 msgstr "No hay información de rastreo para la rama actual."
 
@@ -19236,7 +19645,7 @@ msgstr "No hay información de rastreo para la rama actual."
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
-"Si deseas configurar el rastreo de información para esta rama, puedes "
+"Si deseas configurar la información de rastreo para esta rama, puedes "
 "hacerlo con:"
 
 #: builtin/pull.c:485
@@ -19246,7 +19655,7 @@ msgid ""
 "from the remote, but no such ref was fetched."
 msgstr ""
 "Tu configuración especifica fusionar con la ref '%s'\n"
-"de tu remoto, pero no se pudo hacer fetch a esa ref."
+"del remoto, pero no se pudo hacer fetch a esa ref."
 
 #: builtin/pull.c:596
 #, c-format
@@ -19257,11 +19666,11 @@ msgstr "no es posible acceder al commit %s"
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignorando --verify-signatures para rebase"
 
-#: builtin/pull.c:930
+#: builtin/pull.c:936
 msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"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 true   # rebase\n"
@@ -19283,23 +19692,22 @@ msgstr ""
 "\n"
 "Puedes reemplazar \"git config\" con \"git config --global\" para aplicar\n"
 "la preferencia en todos los repositorios. Puedes también pasar --rebase,\n"
-"--no-rebase, o --ff-only en el comando para sobreescribir la configuración\n"
+"--no-rebase, o --ff-only en el comando para sobrescribir la configuración\n"
 "por defecto en cada invocación.\n"
-"\n"
 
-#: builtin/pull.c:991
+#: builtin/pull.c:1010
 msgid "Updating an unborn branch with changes added to the index."
-msgstr "Actualizando una rama no nata con cambios agregados al índice."
+msgstr "Actualizando una rama no nacida con cambios agregados al índice."
 
-#: builtin/pull.c:995
+#: builtin/pull.c:1014
 msgid "pull with rebase"
 msgstr "pull con rebase"
 
-#: builtin/pull.c:996
+#: builtin/pull.c:1015
 msgid "please commit or stash them."
 msgstr "por favor realiza un commit o un stash con ellos."
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1040
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19310,7 +19718,7 @@ msgstr ""
 "realizando fast-forward al árbol de trabajo\n"
 "desde commit %s."
 
-#: builtin/pull.c:1027
+#: builtin/pull.c:1046
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19321,21 +19729,29 @@ msgid ""
 "to recover."
 msgstr ""
 "No se puede realizar fast-forward en tu árbol de trabajo.\n"
-"Tras asegurarse que ha guardado todo lo preciado de la salida de\n"
+"Tras asegurarte que hayas guardado todo lo preciado de la salida de\n"
 "$ git diff %s\n"
-",ejecute\n"
+",ejecuta\n"
 "$ git reset --hard\n"
 "para recuperar."
 
-#: builtin/pull.c:1042
+#: builtin/pull.c:1061
 msgid "Cannot merge multiple branches into empty head."
 msgstr "No se puede fusionar múltiples ramas en un head vacío."
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1066
 msgid "Cannot rebase onto multiple branches."
 msgstr "No se puede rebasar en múltiples ramas."
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1068
+msgid "Cannot fast-forward to multiple branches."
+msgstr "No se puede hacer fast-forward en múltiples ramas."
+
+#: builtin/pull.c:1082
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Necesita especificar cómo reconciliar las ramas divergentes."
+
+#: builtin/pull.c:1096
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "no se puede rebasar con modificaciones de submódulos grabadas localmente"
@@ -19343,7 +19759,7 @@ msgstr ""
 #: builtin/push.c:19
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr ""
-"git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]"
+"git push [<opciones>] [<repositorio> [<especificación-de-referencia>...]]"
 
 #: builtin/push.c:111
 msgid "tag shorthand without <tag>"
@@ -19398,11 +19814,11 @@ msgid ""
 msgstr ""
 "Actualmente no estás en una rama.\n"
 "Para hacer un push a la historia que lleva al estado actual\n"
-"(HEAD desacoplado), use\n"
+"(HEAD desacoplado), usa\n"
 "\n"
 "\tgit push %s HEAD:<nombre-de-rama-remota>\n"
 
-#: builtin/push.c:194
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -19412,16 +19828,23 @@ msgid ""
 msgstr ""
 "La rama actual %s no tiene una rama upstream.\n"
 "Para realizar un push de la rama actual y configurar el remoto como "
-"upstream, use\n"
+"upstream, usa\n"
 "\n"
 "\tgit push --set-upstream %s %s\n"
 
-#: builtin/push.c:202
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push."
 
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"No se especificó ningún refspec para hacer push, y push.default es \"nothing"
+"\"."
+
+#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -19432,13 +19855,7 @@ msgstr ""
 "la rama actual '%s', sin decirme qué poner en el push\n"
 "para actualizar en qué rama de remoto."
 
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"No se especificó ningún refspecs para hacer push, y push.default es \"nada\"."
-
-#: builtin/push.c:267
+#: builtin/push.c:258
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19450,7 +19867,7 @@ msgstr ""
 "'git pull ...') antes de hacer push de nuevo.\n"
 "Mira 'Note about fast-forwards' en 'git push --help' para más detalles."
 
-#: builtin/push.c:273
+#: builtin/push.c:264
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -19458,12 +19875,12 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 "Actualizaciones fueron rechazadas porque una punta de rama en el push está\n"
-"detrás de su contraparte remota. Verifique esta rama e integre los cambios "
+"detrás de su contraparte remota. Cambia a esta rama e integra los cambios "
 "remotos\n"
 "(ejem. 'git pull ...') antes de volver a hacer push.\n"
-"Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles."
+"Mira las 'Notes about fast-forwards' en 'git push --help' para más detalles."
 
-#: builtin/push.c:279
+#: builtin/push.c:270
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -19473,136 +19890,135 @@ msgid ""
 msgstr ""
 "Actualizaciones fueron rechazadas porque el remoto contiene trabajo que\n"
 "no existe localmente. Esto es causado usualmente por otro repositorio\n"
-"realizando push a la misma ref. Quizás quiera integrar primero los cambios\n"
+"realizando push a la misma ref. Quizás quieras integrar primero los cambios\n"
 "remotos (ej. 'git pull ...') antes de volver a hacer push.\n"
-"Vea 'Notes about fast-forwards0 en 'git push --help' para detalles."
+"Mira 'Notes about fast-forwards' en 'git push --help' para detalles."
 
-#: builtin/push.c:286
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Actualizaciones fueron rechazadas porque el tag ya existe en el remoto."
 
-#: builtin/push.c:289
+#: builtin/push.c:280
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
 "without using the '--force' option.\n"
 msgstr ""
-"No se puede actualizar un ref remoto que apunta a un objeto no-commit,\n"
-"o actualizar un ref remoto para hacer que  apunte a un objeto no-commit,\n"
+"No se puede actualizar un ref remoto que apunta a un objeto no commit,\n"
+"o actualizar un ref remoto para hacer que apunte a un objeto no commit,\n"
 "sin usar la opción '--force'.\n"
 
-#: builtin/push.c:294
+#: builtin/push.c:285
 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 ""
-"Las actualizaciones se rechazaron porque la sugerencia del seguimiento "
-"remoto\n"
-"rama se ha actualizado desde la última vez que se realizó la compra. Es "
-"posible que desee\n"
-"para integrar esos cambios localmente (por ejemplo, 'git pull ...')\n"
+"Las actualizaciones se rechazaron porque la punta de la rama de seguimiento\n"
+"remoto se ha actualizado desde la última vez que se realizó checkout. Es "
+"posible que desees\n"
+"integrar esos cambios localmente (por ejemplo, 'git pull ...')\n"
 "antes de forzar una actualización.\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Haciendo push a %s\n"
 
-#: builtin/push.c:371
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "falló el push de algunas referencias a '%s'"
 
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
 msgid "repository"
 msgstr "repositorio"
 
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
 msgstr "realizar push a todas las refs"
 
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr "realizar mirror a todas las refs"
 
-#: builtin/push.c:557
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "borrar refs"
 
-#: builtin/push.c:558
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "realizar push a tags (no puede ser usado con --all o --mirror)"
 
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "forzar actualizaciones"
 
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "<refname>:<expect>"
 
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
 msgid "require old value of ref to be at this value"
-msgstr "requiere haber valor viejo de ref en este valor"
+msgstr "requerir que el valor viejo de ref sea este valor"
 
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
 msgid "require remote updates to be integrated locally"
-msgstr "requieren que las actualizaciones remotas se integren localmente"
+msgstr "requerir que las actualizaciones remotas se integren localmente"
 
-#: builtin/push.c:569
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "controlar push recursivo de submódulos"
 
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
 msgid "use thin pack"
 msgstr "usar empaquetado delgado"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
 msgid "receive pack program"
-msgstr "recibir programa de paquete"
+msgstr "programa de recepción de paquetes"
 
-#: builtin/push.c:573
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
-msgstr "configurar upstream para git pulll/status"
+msgstr "configurar upstream para git pull/status"
 
-#: builtin/push.c:576
+#: builtin/push.c:567
 msgid "prune locally removed refs"
-msgstr "recortando refs eliminadas localmente"
+msgstr "recortar refs eliminadas localmente"
 
-#: builtin/push.c:578
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "hacer un bypass al hook pre-push"
 
-#: builtin/push.c:579
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "realizar push de tags faltantes pero relevantes"
 
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
 msgstr "Firmar con GPG el push"
 
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
 msgid "request atomic transaction on remote side"
 msgstr "solicitar transacción atómica en el lado remoto"
 
-#: builtin/push.c:601
+#: builtin/push.c:592
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete es incompatible con --all, --mirror y --tags"
 
-#: builtin/push.c:603
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete no tiene sentido sin ninguna referencia"
 
-#: builtin/push.c:623
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "mal repositorio '%s'"
 
-#: builtin/push.c:624
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -19620,33 +20036,33 @@ msgstr ""
 "\n"
 "    git remote add <nombre> <url>\n"
 "\n"
-"y luego haciendo push al nombre del remoto\n"
+"y luego hacer push al nombre del remoto\n"
 "\n"
 "    git push <nombre>\n"
 
-#: builtin/push.c:639
+#: builtin/push.c:630
 msgid "--all and --tags are incompatible"
 msgstr "--all y --tags son incompatibles"
 
-#: builtin/push.c:641
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all no puede ser combinada con refspecs"
 
-#: builtin/push.c:645
+#: builtin/push.c:636
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror y --tags son incompatibles"
 
-#: builtin/push.c:647
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror no puede ser combinado con refspecs"
 
-#: builtin/push.c:650
+#: builtin/push.c:641
 msgid "--all and --mirror are incompatible"
 msgstr "--all y --mirror son incompatibles"
 
-#: builtin/push.c:657
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
-msgstr "opciones de push no pueden tener caracteres de línea nueva"
+msgstr "opciones de push no pueden tener carácteres de línea nueva"
 
 #: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
@@ -19698,83 +20114,82 @@ msgstr "se necesitan dos rangos de commits"
 #: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
-"prefix=<prefijo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-"
-"sparse-checkout] [--index-output=<archivo>] (--empty | <árbol-ismo1> [<árbol-"
-"ismo2> [<árbol-ismo3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
 
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "escribir índice resultante en <archivo>"
 
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "solo vaciar el índice"
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "Fusionando"
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
 msgid "perform a merge in addition to a read"
 msgstr "realizar un merge en adición a una lectura"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
 msgid "3-way merge if no file level merging required"
-msgstr "fusión de 3-vías si no se requiere ninguna fusión a nivel de archivo"
+msgstr "fusión de 3 vías si no se requiere ninguna fusión a nivel de archivo"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
 msgid "3-way merge in presence of adds and removes"
-msgstr "fusión en 3-vías en presencia de adiciones y remociones"
+msgstr "fusión de 3 vías en presencia de adiciones y eliminaciones"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "igual que -m, pero descarta entradas sin fusionar"
 
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<subdirectorio>/"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
 msgid "read the tree into the index under <subdirectory>/"
-msgstr "lea el árbol en el índice bajo <subdirectorio>/"
+msgstr "leer el árbol en el índice bajo <subdirectorio>/"
 
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
 msgid "update working tree with merge result"
 msgstr "actualiza el árbol de trabajo con el resultado de la fusión"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "permitir sobrescritura de archivos explícitamente ignorados"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
 msgid "don't check the working tree after merging"
 msgstr "no revisar el árbol de trabajo tras fusionar"
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
 msgid "don't update the index or the work tree"
 msgstr "no actualizar el índice o el árbol de trabajo"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
 msgid "skip applying sparse checkout filter"
-msgstr "saltar aplicado de filtro de sparse checkout"
+msgstr "saltar aplicación de filtro de sparse checkout"
 
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
-msgstr "debug de árboles-desempacados"
+msgstr "debug unpack-trees"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "suprimir mensajes de feedback"
 
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
 msgid "You need to resolve your current index first"
 msgstr "Necesitas resolver tu índice actual primero"
 
@@ -19796,193 +20211,44 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "lista de pendientes inutilizable: '%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
 #, c-format
 msgid "could not create temporary %s"
 msgstr "no se pudo crear archivo temporal %s"
 
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
 msgid "could not mark as interactive"
 msgstr "no se pudo marcar como interactivo"
 
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
 msgid "could not generate todo list"
 msgstr "no se pudo generar lista de pendientes"
 
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "un commit base tiene que ser provisto con --upstream o --onto"
 
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<opciones>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "mantener commits que comienzan con vacío"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "permitir commits con mensajes vacíos"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "rebasando commits de fusión"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "mantener puntos originales de la rama de sus primos"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "mover commits que comienzan con squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "firmar commits"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "mostrar un diffstat de lo que cambió en upstream"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "continuar rebase"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "saltar commit"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "editar la lista de pendientes"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "mostrar el parche actual"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "ids de commits cortos en la lista de pendientes"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "expandir ids de commits en la lista de pendientes"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "revisar la lista de pendientes"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "reorganizar líneas fixup/squash"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "insertar comando exec en la lista de pendientes"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "hacia"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "restringir revision"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "squash hacia"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "el commit de upstream"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "nombre de head"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "estrategia de rebase"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "opciones de estrategia"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "cambiar a"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "la rama o commit para hacer checkout"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "hacia-nombre"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "hacia nombre"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "el comando para ejecutar"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "reprogramar automaticamente cualquier `exec` que falle"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s requiere un backend de fusión"
 
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "no se pudo conseguir 'onto': '%s'"
 
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head inválido: '%s'"
 
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "ignorando inválido allow_rerere_autoupdate: '%s'"
 
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19990,14 +20256,14 @@ msgid ""
 "To abort and get back to the state before \"git rebase\", run \"git rebase --"
 "abort\"."
 msgstr ""
-"Resuelva todos los conflictos manualmente ya sea con\n"
-"\"git add/rm <archivo_conflictivo>\", luego ejecute \"git rebase --continue"
+"Resuelve todos los conflictos manualmente ya sea con\n"
+"\"git add/rm <archivo_conflictivo>\", luego ejecuta \"git rebase --continue"
 "\".\n"
 "Si prefieres saltar este parche, ejecuta \"git rebase --skip\" .\n"
 "Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git "
 "rebase --abort\"."
 
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
 #, c-format
 msgid ""
 "\n"
@@ -20016,7 +20282,7 @@ msgstr ""
 "\n"
 "Como resultado, git no puede hacer rebase con ellos."
 
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20025,7 +20291,7 @@ msgstr ""
 "tipo '%s' vacío y desconocido; valores válidos son \"drop\", \"keep\", y "
 "\"ask\"."
 
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -20042,7 +20308,7 @@ msgstr ""
 "    git rebase '<rama>'\n"
 "\n"
 
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -20055,184 +20321,194 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<rama> %s\n"
 "\n"
 
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
 msgid "exec commands cannot contain newlines"
 msgstr "comandos exec no pueden contener newlines"
 
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
 msgid "empty exec command"
 msgstr "comando exec vacío"
 
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
 msgid "rebase onto given branch instead of upstream"
-msgstr "haciendo rebase hacia rama dada en lugar de upstream"
+msgstr "haciendo rebase sobre rama dada en lugar de upstream"
 
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "usar la base de fusión de upstream y la rama como base actual"
 
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
 msgid "allow pre-rebase hook to run"
 msgstr "permitir ejecutar hook pre-rebase"
 
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
 msgid "be quiet. implies --no-stat"
-msgstr "ser silencioso implica --no-stat"
+msgstr "ser silencioso. implica --no-stat"
 
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "mostrar un diffstat de lo que cambió en upstream"
+
+#: builtin/rebase.c:1035
 msgid "do not show diffstat of what changed upstream"
 msgstr "no mostrar un diffstat de lo que cambió en upstream"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
 msgid "add a Signed-off-by trailer to each commit"
-msgstr "agregar una línea \"Firmado-por\" al mensaje de cada commit"
+msgstr "agregar una línea \"Signed-off-by\" al mensaje de cada commit"
 
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
 msgid "make committer date match author date"
 msgstr "hacer que la fecha del commit concuerde con la fecha de autoría"
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
 msgid "ignore author date and use current date"
 msgstr "ignorar la fecha del autor y usar la fecha actual"
 
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
 msgid "synonym of --reset-author-date"
 msgstr "sinónimo para --reset-author-date"
 
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
 msgid "passed to 'git apply'"
-msgstr "pasado a 'git-apply'"
+msgstr "pasado a 'git apply'"
 
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
 msgid "ignore changes in whitespace"
 msgstr "ignorar cambios en espacios en blanco"
 
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "cherry-pick todos los commits, incluso si no han cambiado"
 
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
 msgid "continue"
 msgstr "continuar"
 
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
 msgid "skip current patch and continue"
 msgstr "saltar el parche y continuar"
 
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
 msgid "abort and check out the original branch"
-msgstr "aborta y revisa la rama original"
+msgstr "abortar y cambiar a la rama original"
 
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
 msgid "abort but keep HEAD where it is"
-msgstr "aborta pero mantiene HEAD donde está"
+msgstr "abortar pero mantiene HEAD donde está"
 
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
 msgid "edit the todo list during an interactive rebase"
 msgstr "editar la lista de pendientes durante el rebase interactivo"
 
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
 msgid "show the patch file being applied or merged"
-msgstr "muestra el archivo parche siendo aplicado o fusionado"
+msgstr "mostrar el archivo parche siendo aplicado o fusionado"
 
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
 msgid "use apply strategies to rebase"
 msgstr "usar estrategias de apply para el rebase"
 
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
 msgid "use merging strategies to rebase"
 msgstr "usar estrategias de fusión para el rebase"
 
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
 msgid "let the user edit the list of commits to rebase"
 msgstr "permitir al usuario editar la lista de commits para rebasar"
 
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos"
 
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
 msgid "how to handle commits that become empty"
 msgstr "como manejar commits que se vuelven vacíos"
 
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "mantener commits que comiencen con vacío"
+
+#: builtin/rebase.c:1097
 msgid "move commits that begin with squash!/fixup! under -i"
-msgstr "mover commits que comienzan con squash!/fixup! bajo -i"
+msgstr "mover commits que comiencen con squash!/fixup! bajo -i"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
 msgid "add exec lines after each commit of the editable list"
-msgstr "agregar líneas exec tras cada acommit de la lista editable"
+msgstr "agregar líneas exec tras cada commit de la lista editable"
 
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
 msgid "allow rebasing commits with empty messages"
-msgstr "permitir rebase commits con mensajes vacíos"
+msgstr "permitir rebase de commits con mensajes vacíos"
 
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
 msgid "try to rebase merges instead of skipping them"
-msgstr "intentar fusiones por rebase en lugar de saltarlas"
+msgstr "intentar rebase de fusiones en lugar de saltarlas"
 
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
 msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr "use 'merge-base --fork-point' para refinar upstream"
+msgstr "usar 'merge-base --fork-point' para refinar upstream"
 
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
 msgid "use the given merge strategy"
 msgstr "usar la estrategia de merge dada"
 
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
 msgid "option"
 msgstr "opción"
 
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
 msgid "pass the argument through to the merge strategy"
 msgstr "pasar el argumento para la estrategia de fusión"
 
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "hacer rebase a todos los commits alcanzables hasta la raíz(raíces)"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "reprogramar automaticamente cualquier `exec` que falle"
+
+#: builtin/rebase.c:1128
 msgid "apply all changes, even those already present upstream"
 msgstr ""
 "aplicar todos los cambios, incluso aquellos que ya están presentes en "
 "upstream"
 
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Parece que 'git am' está en progreso. No se puede rebasar."
 
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges está deprecado. Use --rebase-merges en su lugar."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges fue reemplazado por --rebase-merges"
 
-#: builtin/rebase.c:1488
+#: builtin/rebase.c:1193
 msgid "cannot combine '--keep-base' with '--onto'"
 msgstr "no se puede combinar '--keep-base' con '--onto'"
 
-#: builtin/rebase.c:1490
+#: builtin/rebase.c:1195
 msgid "cannot combine '--keep-base' with '--root'"
 msgstr "no se puede combinar '--keep-base' con '--root'"
 
-#: builtin/rebase.c:1494
+#: builtin/rebase.c:1199
 msgid "cannot combine '--root' with '--fork-point'"
 msgstr "no se puede combinar '--root' con '--fork-point'"
 
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "¿No hay rebase en progreso?"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
-"La acción --edit-todo sólo puede ser usada al rebasar interactivamente."
+"La acción --edit-todo solo puede ser usada al rebasar interactivamente."
 
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "No se puede leer el HEAD"
 
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -20240,16 +20516,16 @@ msgstr ""
 "Tienes que editar todos los conflictos de fusión y luego\n"
 "marcarlos como resueltos usando git add"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
 msgid "could not discard worktree changes"
 msgstr "no se pudo descartar los cambios del árbol de trabajo"
 
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
 #, c-format
 msgid "could not move back to %s"
 msgstr "no se puede regresar a %s"
 
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -20270,144 +20546,133 @@ msgstr ""
 "y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n"
 "algo de valor ahí.\n"
 
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
 msgstr "switch `C' espera un valor numérico"
 
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Modo desconocido: %s"
 
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requiere --merge o --interactive"
 
-#: builtin/rebase.c:1759
+#: builtin/rebase.c:1463
 msgid "cannot combine apply options with merge options"
 msgstr "no se pueden combinar opciones de apply con opciones de merge"
 
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Backend de rebase desconocido: %s"
 
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec requiere --exec o --interactive"
 
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"error: no se puede combinar '--preserve-merges' con '--reschedule-failed-"
-"exec'"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "upstream inválido '%s'"
 
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
 msgid "Could not create new root commit"
 msgstr "No se pudo crear commit raíz nuevo"
 
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "'%s': necesita exactamente una base de fusión con rama"
 
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': necesita exactamente una base de fusión"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "No apunta a un commit válido '%s'"
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
 #, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "fatal: no existe la rama/commit: '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "no existe la rama/commit: '%s'"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2415
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
 #, c-format
 msgid "No such ref: %s"
 msgstr "No existe ref: %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
 msgid "Could not resolve HEAD to a revision"
 msgstr "No se pudo resolver HEAD a una revisión"
 
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
 msgid "Please commit or stash them."
 msgstr "Por favor, confírmalos o guárdalos."
 
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
 #, c-format
 msgid "could not switch to %s"
 msgstr "no se pudo cambiar a %s"
 
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
 msgid "HEAD is up to date."
 msgstr "HEAD está actualizado."
 
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "La rama actual %s está actualizada.\n"
 
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD está actualizado, rebase forzado."
 
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Rama actual %s está actualizada, rebase forzado.\n"
 
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
 msgid "The pre-rebase hook refused to rebase."
 msgstr "El hook pre-rebase rechazó el rebase."
 
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Cambios a %s:\n"
 
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Cambios desde %s a %s:\n"
 
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "En primer lugar, rebobinando HEAD para después reproducir tus cambios encima "
-"de ésta...\n"
+"de esta...\n"
 
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
 msgid "Could not detach HEAD"
 msgstr "No se puede desacoplar HEAD"
 
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Avance rápido de %s a %s.\n"
 
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:1276
+#: builtin/receive-pack.c:1280
 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"
@@ -20440,7 +20705,7 @@ msgstr ""
 "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
 "configura 'receive.denyCurrentBranch' a 'refuse'."
 
-#: builtin/receive-pack.c:1296
+#: builtin/receive-pack.c:1300
 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"
@@ -20452,20 +20717,20 @@ msgid ""
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
 "Por defecto, borrar la rama actual está prohibido, porque el siguiente\n"
-"'git clone' no resultara en ningún archivo revisado, causando confusión.\n"
+"'git clone' no resultará en ningún archivo revisado, causando confusión.\n"
 "\n"
 "Se puede configurar la variable 'receive.denyDeleteCurrent' a 'warn' o "
 "'ignore'\n"
-"en el repositorio remoto para permitir borrar la rama actual.\n"
+"en el repositorio remoto para permitir borrar la rama actual,\n"
 "con o sin mensaje de advertencia.\n"
 "\n"
 "Para suprimir este mensaje, puedes configurarlo en 'refuse'."
 
-#: builtin/receive-pack.c:2479
+#: builtin/receive-pack.c:2480
 msgid "quiet"
-msgstr "tranquilo"
+msgstr "silencioso"
 
-#: builtin/receive-pack.c:2493
+#: builtin/receive-pack.c:2495
 msgid "You must specify a directory."
 msgstr "Se tiene que especificar un directorio."
 
@@ -20504,9 +20769,9 @@ msgstr "Marcando objectos alcanzables..."
 #: builtin/reflog.c:647
 #, c-format
 msgid "%s points nowhere!"
-msgstr "¡%s apunta a ningún lado!"
+msgstr "¡%s no apunta a ningún lado!"
 
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
 msgid "no reflog specified to delete"
 msgstr "no reflog especificado para borrar"
 
@@ -20639,7 +20904,7 @@ msgstr "importar todos los tags y objetos asociados cuando realiza el fetch"
 
 #: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
-msgstr "o no realziar fetch a ningún tag (--no-tags)"
+msgstr "o no realizar fetch a ningún tag (--no-tags)"
 
 #: builtin/remote.c:171
 msgid "branch(es) to track"
@@ -20652,7 +20917,7 @@ msgstr "rama master"
 #: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
-"configurar remote como mirror para realizar push o desde el cual realizar "
+"configurar remote como mirror al cual realizar push o desde el cual realizar "
 "fetch"
 
 #: builtin/remote.c:186
@@ -20663,7 +20928,7 @@ msgstr "especificar una rama master no tiene sentido con --mirror"
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors"
 
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
 #, c-format
 msgid "remote %s already exists."
 msgstr "remoto %s ya existe."
@@ -20673,25 +20938,30 @@ msgstr "remoto %s ya existe."
 msgid "Could not setup master '%s'"
 msgstr "No se pudo configurar master '%s'"
 
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "branch.%s.rebase=%s no manejado; se asume 'true'"
+
+#: builtin/remote.c:366
 #, c-format
 msgid "Could not get fetch map for refspec %s"
-msgstr "No se pudo realizar el fetch al mapa para refspec %s"
+msgstr "No se pudo obtener el mapa de fetch para refspec %s"
 
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
 msgid "(matching)"
 msgstr "(concordando)"
 
-#: builtin/remote.c:466
+#: builtin/remote.c:472
 msgid "(delete)"
 msgstr "(eliminar)"
 
-#: builtin/remote.c:655
+#: builtin/remote.c:660
 #, c-format
 msgid "could not set '%s'"
 msgstr "no se pudo configurar '%s'"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:665
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -20702,38 +20972,38 @@ msgstr ""
 "\t%s:%d\n"
 "ahora nombra al remoto inexistente '%s'"
 
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "No existe el remoto '%s'"
 
-#: builtin/remote.c:710
+#: builtin/remote.c:715
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "No se pudo renombrar la sección de configuración '%s' a '%s'"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:735
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
 "\t%s\n"
 "\tPlease update the configuration manually if necessary."
 msgstr ""
-"No se actualizan refspec de fetch no predeterminada\n"
+"No se actualiza refspec de fetch no predeterminada\n"
 "\t%s\n"
-"\tPor favor actualice la configuración manualmente si es necesario."
+"\tPor favor actualiza la configuración manualmente si es necesario."
 
-#: builtin/remote.c:770
+#: builtin/remote.c:775
 #, c-format
 msgid "deleting '%s' failed"
-msgstr "borrando '%s' falló"
+msgstr "borrar '%s' falló"
 
-#: builtin/remote.c:804
+#: builtin/remote.c:809
 #, c-format
 msgid "creating '%s' failed"
-msgstr "creando '%s' falló"
+msgstr "crear '%s' falló"
 
-#: builtin/remote.c:882
+#: builtin/remote.c:887
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -20742,124 +21012,124 @@ msgid_plural ""
 "to delete them, use:"
 msgstr[0] ""
 "Nota: Una rama fuera de la jerarquía refs/remotes/ no fue eliminada;\n"
-"para borrarla, use:"
+"para borrarla, usa:"
 msgstr[1] ""
 "Nota: Algunas ramas fuera de la jerarquía refs/remotes/ no fueron "
 "eliminadas;\n"
-"para borrarlas, use:"
+"para borrarlas, usa:"
 
-#: builtin/remote.c:896
+#: builtin/remote.c:901
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "No se pudo borrar la sección de configuración '%s'"
 
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nuevo (siguiente fetch se guardará en remotes/%s)"
 
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
 msgid " tracked"
 msgstr " rastreada"
 
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
 msgid " stale (use 'git remote prune' to remove)"
-msgstr " viejo ( use 'git remote prune' para eliminar)"
+msgstr " viejo (usa 'git remote prune' para eliminar)"
 
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "inválido branch.%s.merge; no se puede rebasar en > 1 rama"
 
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "rebasa interactivamente en remoto %s"
 
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "rebasa interactivamente (con fusiones) en remoto %s"
 
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "rebasa sobre el remoto %s"
 
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
 #, c-format
 msgid " merges with remote %s"
 msgstr " se fusiona con remoto %s"
 
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
 #, c-format
 msgid "merges with remote %s"
 msgstr "fusiona con remoto %s"
 
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s y con el remoto %s\n"
 
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
 msgid "create"
 msgstr "crear"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
 msgid "delete"
 msgstr "borrar"
 
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
 msgid "up to date"
 msgstr "actualizado"
 
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
 msgid "fast-forwardable"
-msgstr "puede realizar fast-forward"
+msgstr "se puede realizar fast-forward"
 
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
 msgid "local out of date"
 msgstr "desactualizado local"
 
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s fuerza a %-*s (%s)"
 
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s publica a %-*s (%s)"
 
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s fuerza a %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s publica a %s"
 
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
 msgid "do not query remotes"
 msgstr "no consultar remotos"
 
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
 msgstr "* remoto %s"
 
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL  para obtener: %s"
 
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
 msgid "(no URL)"
 msgstr "(sin URL)"
 
@@ -20867,336 +21137,355 @@ msgstr "(sin URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL para publicar: %s"
 
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Rama HEAD: %s"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
 msgid "(not queried)"
 msgstr "(no consultado)"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
 msgid "(unknown)"
 msgstr "(desconocido)"
 
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
-"  HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n"
+"  Rama HEAD (HEAD remoto es ambiguo, puede ser uno de los siguientes):\n"
 
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Rama remota:%s"
 msgstr[1] "  Ramas remotas:%s"
 
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
 msgid " (status not queried)"
 msgstr " (estado no consultado)"
 
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Rama local configurada para 'git pull':"
 msgstr[1] "  Ramas locales configuradas para 'git pull':"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Las referencias locales serán reflejadas por 'git push'"
 
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Referencia local configurada para 'git push'%s:"
 msgstr[1] "  Referencias locales configuradas para 'git push'%s:"
 
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto"
 
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "borrar refs/remotos/<nombre>/HEAD"
 
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
 msgid "Cannot determine remote HEAD"
 msgstr "No se puede determinar el HEAD remoto"
 
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Múltiples ramas HEAD remotas. Por favor escoja una explícitamente con:"
 
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
 #, c-format
 msgid "Could not delete %s"
 msgstr "No se pudo borrar %s"
 
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "No es un ref válido: %s"
 
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
 #, c-format
 msgid "Could not setup %s"
 msgstr "No se pudo configurar %s"
 
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
 #, c-format
 msgid " %s will become dangling!"
-msgstr " ¡%s será colgado!"
+msgstr " ¡%s se volverá colgante!"
 
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
 #, c-format
 msgid " %s has become dangling!"
-msgstr " ¡%s ha sido colgado!"
+msgstr " ¡%s se ha vuelto colgante!"
 
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
 #, c-format
 msgid "Pruning %s"
 msgstr "Recortando %s"
 
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
 #, c-format
 msgid " * [would prune] %s"
-msgstr " * [ejecutará prune] %s"
+msgstr " * [se acortará] %s"
 
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [prune realizado] %s"
 
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
 msgid "prune remotes after fetching"
 msgstr "recortar remotos tras realizar fetch"
 
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
 #, c-format
 msgid "No such remote '%s'"
 msgstr "No existe el remoto '%s'"
 
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
 msgid "add branch"
 msgstr "agregar rama"
 
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
 msgid "no remote specified"
 msgstr "no hay remotos especificados"
 
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
 msgid "query push URLs rather than fetch URLs"
 msgstr "consultar URLs de push en lugar de URLs de fetch"
 
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
 msgid "return all URLs"
 msgstr "retornar todos los URLs"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "no hay URLs configurados para remoto '%s'"
 
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
 msgid "manipulate push URLs"
 msgstr "manipular URLs de push"
 
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
 msgid "add URL"
 msgstr "agregar URL"
 
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
 msgid "delete URLs"
 msgstr "borrar URLs"
 
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete no tiene sentido"
 
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Patrón de URL viejo inválido: %s"
 
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
 #, c-format
 msgid "No such URL found: %s"
 msgstr "No se encontró URL: %s"
 
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
 msgid "Will not delete all non-push URLs"
-msgstr "No borrará todos los URLs de no-push"
+msgstr "No borrará todos los URLs no de push"
+
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "ser verboso; tiene que ser agregado antes de un subcomando"
 
-#: builtin/repack.c:26
+#: builtin/repack.c:28
 msgid "git repack [<options>]"
 msgstr "git repack [<opciones>]"
 
-#: builtin/repack.c:31
+#: builtin/repack.c:33
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
-"Re empaquetados incrementales son incompatibles con índices bitmap. Use\n"
-"--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps."
+"Reempaquetados incrementales son incompatibles con índices bitmap. Usa\n"
+"--no-write-bitmap-index o deshabilita la configuración pack.writebitmaps."
 
-#: builtin/repack.c:198
+#: builtin/repack.c:201
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores"
 
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:273 builtin/repack.c:816
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
-"repack: Esperando líneas de ID de objeto en full hex solo desde pack-objects."
+"repack: Esperando líneas de ID de objeto completas en hex solo desde pack-"
+"objects."
 
-#: builtin/repack.c:294
+#: builtin/repack.c:297
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "no se puede finalizar pack-objects para reempaquetar objetos promisores"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:312
 #, c-format
 msgid "cannot open index for %s"
 msgstr "no se puede abrir index para %s"
 
-#: builtin/repack.c:368
+#: builtin/repack.c:371
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
-msgstr "pack %s es muy grande para considerar en la progresión geométrica"
+msgstr ""
+"pack %s es demasiado grande para considerar en la progresión geométrica"
 
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
 #, c-format
 msgid "pack %s too large to roll up"
-msgstr "pack %s es muy grande para hacer un roll up"
+msgstr "pack %s es demasiado grande para hacer un roll up"
+
+#: builtin/repack.c:496
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "no se pudo abrir %s para escritura"
+
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr "no se pudo cerrar snapshot de refs temporal"
 
-#: builtin/repack.c:460
+#: builtin/repack.c:628
 msgid "pack everything in a single pack"
 msgstr "empaquetar todo en un único paquete"
 
-#: builtin/repack.c:462
+#: builtin/repack.c:630
 msgid "same as -a, and turn unreachable objects loose"
-msgstr "lo mismo que -a, y pierde objetos inaccesibles"
+msgstr "lo mismo que -a, y soltar objetos inalcanzables"
 
-#: builtin/repack.c:465
+#: builtin/repack.c:633
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed"
 
-#: builtin/repack.c:467
+#: builtin/repack.c:635
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "pasar --no-reuse-delta a git-pack-objects"
 
-#: builtin/repack.c:469
+#: builtin/repack.c:637
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "pasar --no-reuse-object a git-pack-objects"
 
-#: builtin/repack.c:471
+#: builtin/repack.c:639
 msgid "do not run git-update-server-info"
 msgstr "no ejecutar git-update-server-info"
 
-#: builtin/repack.c:474
+#: builtin/repack.c:642
 msgid "pass --local to git-pack-objects"
 msgstr "pasar --local a git-pack-objects"
 
-#: builtin/repack.c:476
+#: builtin/repack.c:644
 msgid "write bitmap index"
 msgstr "escribir un índice de bitmap"
 
-#: builtin/repack.c:478
+#: builtin/repack.c:646
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "pasar --delta-islands a git-pack-objects"
 
-#: builtin/repack.c:479
+#: builtin/repack.c:647
 msgid "approxidate"
-msgstr "aproxime"
+msgstr "approxidate"
 
-#: builtin/repack.c:480
+#: builtin/repack.c:648
 msgid "with -A, do not loosen objects older than this"
 msgstr "con -A, no perder objetos más antiguos que este"
 
-#: builtin/repack.c:482
+#: builtin/repack.c:650
 msgid "with -a, repack unreachable objects"
-msgstr "con -a, re empaquetar objetos inalcanzables"
+msgstr "con -a, reempaquetar objetos inalcanzables"
 
-#: builtin/repack.c:484
+#: builtin/repack.c:652
 msgid "size of the window used for delta compression"
-msgstr "tamaño de la ventana usado para la compresión delta"
+msgstr "tamaño de la ventana usada para la compresión delta"
 
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:653 builtin/repack.c:659
 msgid "bytes"
 msgstr "bytes"
 
-#: builtin/repack.c:486
+#: builtin/repack.c:654
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
-"lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar "
+"lo mismo que arriba, pero limita el tamaño de memoria en lugar del número de "
 "entradas"
 
-#: builtin/repack.c:488
+#: builtin/repack.c:656
 msgid "limits the maximum delta depth"
 msgstr "limita la profundidad máxima del delta"
 
-#: builtin/repack.c:490
+#: builtin/repack.c:658
 msgid "limits the maximum number of threads"
 msgstr "limita el número máximo de hilos"
 
-#: builtin/repack.c:492
+#: builtin/repack.c:660
 msgid "maximum size of each packfile"
 msgstr "tamaño máximo de cada paquete"
 
-#: builtin/repack.c:494
+#: builtin/repack.c:662
 msgid "repack objects in packs marked with .keep"
-msgstr "re-empaquetar objetos en paquetes marcados con .keep"
+msgstr "reempaquetar objetos en paquetes marcados con .keep"
 
-#: builtin/repack.c:496
+#: builtin/repack.c:664
 msgid "do not repack this pack"
 msgstr "no reempaquetar este paquete"
 
-#: builtin/repack.c:498
+#: builtin/repack.c:666
 msgid "find a geometric progression with factor <N>"
 msgstr "encontrar una progresión geométrica con factor <N>"
 
-#: builtin/repack.c:508
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr "escribir un índice multi-pack de los paquetes resultantes"
+
+#: builtin/repack.c:678
 msgid "cannot delete packs in a precious-objects repo"
-msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos"
+msgstr "no se pueden borrar paquetes en un repositorio de objetos preciosos"
 
-#: builtin/repack.c:512
+#: builtin/repack.c:682
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable y -A son incompatibles"
 
-#: builtin/repack.c:527
+#: builtin/repack.c:713
 msgid "--geometric is incompatible with -A, -a"
 msgstr "--geometric es incompatible con -A, -a"
 
-#: builtin/repack.c:639
+#: builtin/repack.c:825
 msgid "Nothing new to pack."
 msgstr "Nada nuevo para empaquetar."
 
-#: builtin/repack.c:669
+#: builtin/repack.c:855
 #, c-format
 msgid "missing required file: %s"
 msgstr "falta archivo requerido: %s"
 
-#: builtin/repack.c:671
+#: builtin/repack.c:857
 #, c-format
 msgid "could not unlink: %s"
 msgstr "no se pudo desvincular: %s"
 
 #: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
-msgstr "git replace [-f] <objeto> <remplazo>"
+msgstr "git replace [-f] <objeto> <reemplazo>"
 
 #: builtin/replace.c:23
 msgid "git replace [-f] --edit <object>"
@@ -21230,12 +21519,12 @@ msgstr ""
 #: builtin/replace.c:125
 #, c-format
 msgid "replace ref '%s' not found"
-msgstr "rama de reemplazo '%s' no encontrada"
+msgstr "referencia de reemplazo '%s' no encontrada"
 
 #: builtin/replace.c:141
 #, c-format
 msgid "Deleted replace ref '%s'"
-msgstr "Borradas replace refs '%s'"
+msgstr "Borrada replace ref '%s'"
 
 #: builtin/replace.c:153
 #, c-format
@@ -21255,8 +21544,8 @@ msgid ""
 "while '%s' points to a replacement object of type '%s'."
 msgstr ""
 "Objeto debe ser del mismo tipo.\n"
-"'%s' puntos para un objeto reemplazado de tipo '%s'\n"
-"mientras '%s' puntos para un reemplazo de tipo de objeto '%s'."
+"'%s' apunta a un objeto reemplazado de tipo '%s'\n"
+"mientras '%s' apunta a un objeto de reemplazo de tipo '%s'."
 
 #: builtin/replace.c:229
 #, c-format
@@ -21291,7 +21580,7 @@ msgstr "mktree no devolvió un nombre de objeto"
 #: builtin/replace.c:298
 #, c-format
 msgid "unable to fstat %s"
-msgstr "incapaz de correr fstat %s"
+msgstr "incapaz de ejecutar fstat %s"
 
 #: builtin/replace.c:303
 msgid "unable to write object to database"
@@ -21306,7 +21595,7 @@ msgstr "nombre de objeto no válido: '%s'"
 #: builtin/replace.c:326
 #, c-format
 msgid "unable to get object type for %s"
-msgstr "no es obtener tipo de objeto para %s"
+msgstr "no se puede obtener tipo de objeto para %s"
 
 #: builtin/replace.c:342
 msgid "editing object file failed"
@@ -21338,7 +21627,7 @@ msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr ""
-"commit original '%s' contiene un mergetag '%s' que es descartado; use --edit "
+"commit original '%s' contiene un mergetag '%s' que es descartado; usa --edit "
 "en lugar de --graft"
 
 #: builtin/replace.c:469
@@ -21348,7 +21637,7 @@ msgstr "el commit original '%s' tiene una firma gpg"
 
 #: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
-msgstr "la firma será eliminada en el commit de reemplazo!"
+msgstr "¡la firma será eliminada en el commit de reemplazo!"
 
 #: builtin/replace.c:480
 #, c-format
@@ -21363,7 +21652,7 @@ msgstr "graft para '%s' innecesario"
 #: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
-msgstr "nuevo commit es le mismo que el antiguo: '%s'"
+msgstr "nuevo commit es el mismo que el antiguo: '%s'"
 
 #: builtin/replace.c:527
 #, c-format
@@ -21388,7 +21677,7 @@ msgstr "editar objeto existente"
 
 #: builtin/replace.c:551
 msgid "change a commit's parents"
-msgstr "cambiar un padre de commit"
+msgstr "cambiar los padres de un commit"
 
 #: builtin/replace.c:552
 msgid "convert existing graft file"
@@ -21400,7 +21689,7 @@ msgstr "reemplazar el ref si este existe"
 
 #: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
-msgstr "no se puede imprimir contenidos para --edit"
+msgstr "no imprimir bonitamente los contenidos para --edit"
 
 #: builtin/replace.c:556
 msgid "use this format"
@@ -21446,15 +21735,15 @@ msgstr "solo se puede dar un patrón con -l"
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget <ruta>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "registrar resoluciones limpias en el índice"
 
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "'git rerere forget' sin rutas está deprecado"
 
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "no es posible generar diff para '%s'"
@@ -21499,93 +21788,92 @@ msgstr "fusionar"
 msgid "keep"
 msgstr "mantener"
 
-#: builtin/reset.c:83
+#: builtin/reset.c:89
 msgid "You do not have a valid HEAD."
 msgstr "No hay un HEAD válido."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:91
 msgid "Failed to find tree of HEAD."
-msgstr "Falló al encontrar el HEAD del árbol."
+msgstr "Falló al encontrar el árbol de HEAD."
 
-#: builtin/reset.c:91
+#: builtin/reset.c:97
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Falló al encontrar árbol de %s."
 
-#: builtin/reset.c:116
+#: builtin/reset.c:122
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD está ahora en %s"
 
-#: builtin/reset.c:195
+#: builtin/reset.c:201
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
-msgstr "No se puede realziar un reset %s  en medio de una fusión."
+msgstr "No se puede realizar un reset %s en medio de una fusión."
 
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
 msgid "be quiet, only report errors"
 msgstr "ser silencioso, solo reportar errores"
 
-#: builtin/reset.c:297
+#: builtin/reset.c:303
 msgid "reset HEAD and index"
-msgstr "reiniciar HEAD e index"
+msgstr "reiniciar HEAD e índice"
 
-#: builtin/reset.c:298
+#: builtin/reset.c:304
 msgid "reset only HEAD"
 msgstr "reiniciar solo HEAD"
 
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
 msgid "reset HEAD, index and working tree"
 msgstr "reiniciar HEAD, índice y árbol de trabajo"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:310
 msgid "reset HEAD but keep local changes"
 msgstr "reiniciar HEAD pero mantener cambios locales"
 
-#: builtin/reset.c:310
+#: builtin/reset.c:316
 msgid "record only the fact that removed paths will be added later"
-msgstr ""
-"grabar solo el hecho de que las rutas eliminadas serán agregadas después"
+msgstr "grabar solo el hecho de que las rutas eliminadas serán agregadas luego"
 
-#: builtin/reset.c:344
+#: builtin/reset.c:350
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Falló al resolver '%s' como una revisión válida."
 
-#: builtin/reset.c:352
+#: builtin/reset.c:358
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Falló al resolver '%s' como un árbol válido."
 
-#: builtin/reset.c:361
+#: builtin/reset.c:367
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch es incompatible con --{hard,mixed,soft}"
 
-#: builtin/reset.c:371
+#: builtin/reset.c:377
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
-"--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio."
+"--mixed con rutas ha sido deprecado; usa 'git reset -- <rutas>' en cambio."
 
-#: builtin/reset.c:373
+#: builtin/reset.c:379
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "No se puede hacer un reset %s con rutas."
 
-#: builtin/reset.c:388
+#: builtin/reset.c:394
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "%s reset no está permitido en un repositorio vacío"
 
-#: builtin/reset.c:392
+#: builtin/reset.c:398
 msgid "-N can only be used with --mixed"
-msgstr "-N sólo puede ser usada con --mixed"
+msgstr "-N solo puede ser usada con --mixed"
 
-#: builtin/reset.c:413
+#: builtin/reset.c:419
 msgid "Unstaged changes after reset:"
 msgstr "Cambios fuera del área de stage tras el reset:"
 
-#: builtin/reset.c:416
+#: builtin/reset.c:422
 #, c-format
 msgid ""
 "\n"
@@ -21599,28 +21887,28 @@ msgstr ""
 "usar '--quiet' para evitar esto.  Configura la opción reset.quiet a true\n"
 "para volverlo en el default.\n"
 
-#: builtin/reset.c:434
+#: builtin/reset.c:440
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "No se puede reiniciar el índice a la revisión '%s'."
 
-#: builtin/reset.c:439
+#: builtin/reset.c:445
 msgid "Could not write new index file."
 msgstr "No se puede escribir un nuevo archivo índice."
 
-#: builtin/rev-list.c:538
+#: builtin/rev-list.c:541
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "no se puede combinar --exclude-promisor-objects y --missing"
 
-#: builtin/rev-list.c:599
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
-msgstr "filtrado de objetos requiere --objects"
+msgstr "filtración de objetos requiere --objects"
 
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr "rev-list no soporta mostrar notas"
 
-#: builtin/rev-list.c:664
+#: builtin/rev-list.c:679
 msgid "marked counting is incompatible with --objects"
 msgstr "conteo de marcas es incompatible con --objects"
 
@@ -21634,11 +21922,23 @@ msgstr "mantener el `--` pasado como un arg"
 
 #: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
-msgstr "detener análisis tras el primer argumento que no es opción"
+msgstr "detener análisis tras el primer argumento que no sea opción"
 
 #: builtin/rev-parse.c:419
 msgid "output in stuck long form"
-msgstr "salida en formulario largo de atasco"
+msgstr "salida en forma larga ajuntada"
+
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "fin de input prematuro"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr "no se ha entregado cadena antes del separador`--'"
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "Se necesitó una revisión singular"
 
 #: builtin/rev-parse.c:552
 msgid ""
@@ -21652,9 +21952,53 @@ msgstr ""
 "   or: git rev-parse --sq-quote [<arg>...]\n"
 "   or: git rev-parse [<opciones>] [<arg>...]\n"
 "\n"
-"Ejecute \"git rev-parse --parseopt -h\" para más información sobre el primer "
+"Ejecuta \"git rev-parse --parseopt -h\" para más información sobre el primer "
 "uso."
 
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir requiere un argumento"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "no es un gitdir '%s'"
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "--git-path requiere un argumento"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "-n requiere un argumento"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "--path-format requiere un argumento"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "argumento inválido para --path-format: %s"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "--default requiere un argumento"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "--prefix requiere un argumento"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "modo desconocido para --abbrev-ref: %s"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "modo desconocido para --show-object-format: %s"
+
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<opciones>] <commit-ish>..."
@@ -21729,15 +22073,19 @@ msgstr "adjuntar el nombre del commit"
 msgid "preserve initially empty commits"
 msgstr "preservar commits iniciales vacíos"
 
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "permitir commits con mensajes vacíos"
+
 #: builtin/revert.c:129
 msgid "keep redundant, empty commits"
 msgstr "mantener commits redundantes, vacíos"
 
-#: builtin/revert.c:237
+#: builtin/revert.c:241
 msgid "revert failed"
 msgstr "falló al revertir"
 
-#: builtin/revert.c:250
+#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "cherry-pick falló"
 
@@ -21756,7 +22104,7 @@ msgstr[0] ""
 "el siguiente archivo tiene contenido en stage diferente al archivo\n"
 "y a HEAD:"
 msgstr[1] ""
-"los siguientes archivos tienen contenido diferente a los mismos\n"
+"los siguientes archivos tienen contenido en stage diferente a los mismos\n"
 "y a HEAD:"
 
 #: builtin/rm.c:213
@@ -21787,81 +22135,81 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "el siguiente archivo tiene modificaciones locales:"
 msgstr[1] "los siguientes archivos tienen modificaciones locales:"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "do not list removed files"
-msgstr "no listar archivos eliminado"
+msgstr "no listar archivos eliminados"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "solo eliminar del índice"
 
-#: builtin/rm.c:246
+#: builtin/rm.c:247
 msgid "override the up-to-date check"
-msgstr "sobrescribir el check de actualizado"
+msgstr "saltar el check de actualización"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "permitir eliminar de forma recursiva"
 
-#: builtin/rm.c:249
+#: builtin/rm.c:250
 msgid "exit with a zero status even if nothing matched"
 msgstr "salir con estado cero incluso si nada coincide"
 
-#: builtin/rm.c:283
+#: builtin/rm.c:285
 msgid "No pathspec was given. Which files should I remove?"
-msgstr "Se entregó un nuevo pathspec. ¿Qué archivos debería eliminar?"
+msgstr "No se entregó un pathspec. ¿Qué archivos se deberían eliminar?"
 
-#: builtin/rm.c:310
+#: builtin/rm.c:315
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
-"por favor agrega el stage de tus cambios a .gitmodules o realiza un stash "
-"para proceder"
+"por favor agrega tus cambios a .gitmodules al stage o realiza un stash para "
+"proceder"
 
-#: builtin/rm.c:331
+#: builtin/rm.c:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "no eliminando '%s' de manera recursiva sin -r"
 
-#: builtin/rm.c:379
+#: builtin/rm.c:385
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: no es posible eliminar %s"
 
 #: builtin/send-pack.c:20
 msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-"  --all and explicit <ref> specification are mutually exclusive."
+"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=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-"  --all y especificaciones <ref> explícitas son mutuamente exclusivas."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [<host>:]<directorio> (--all | <ref>...)"
 
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "nombre remoto"
 
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "usar protocolo RPC sin estado"
 
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "leer refs de stdin"
 
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "mostrar status del remote helper"
 
 #: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
-msgstr "git shortlog [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]"
+msgstr "git shortlog [<opciones>] [<rango-de-revisiones>] [[--] <ruta>...]"
 
 #: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
-msgstr "git log --pretty=short | git shorlog [<opciones>]"
+msgstr "git log --pretty=short | git shortlog [<opciones>]"
 
 #: builtin/shortlog.c:123
 msgid "using multiple --group options with stdin is not supported"
@@ -21869,7 +22217,7 @@ msgstr "no se admite el uso de múltiples opciones de grupo --group con stdin"
 
 #: builtin/shortlog.c:133
 msgid "using --group=trailer with stdin is not supported"
-msgstr "el uso de --group = trailer con stdin no es compatible"
+msgstr "el uso de --group=trailer con stdin no es compatible"
 
 #: builtin/shortlog.c:323
 #, c-format
@@ -21898,7 +22246,7 @@ msgstr "<w>[,<i1>[,<i2>]]"
 
 #: builtin/shortlog.c:360
 msgid "linewrap output"
-msgstr "salida de línea"
+msgstr "ajustar las líneas de salida"
 
 #: builtin/shortlog.c:362
 msgid "field"
@@ -21908,21 +22256,21 @@ msgstr "campo"
 msgid "group by field"
 msgstr "agrupar por campo"
 
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
 msgid "too many arguments given outside repository"
 msgstr "demasiados argumentos dados fuera del repositorio"
 
 #: builtin/show-branch.c:13
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"                [--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>]"
@@ -21935,121 +22283,121 @@ msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "ignorando %s; no se puede manejar más de %d ref"
 msgstr[1] "ignorando %s; no se puede manejar más de %d refs"
 
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
 #, c-format
 msgid "no matching refs with %s"
 msgstr "no hay refs que concuerden con %s"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
 msgid "show remote-tracking and local branches"
 msgstr "mostrar ramas locales y de rastreo remoto"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
 msgid "show remote-tracking branches"
 msgstr "mostrar ramas de rastreo remoto"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
 msgid "color '*!+-' corresponding to the branch"
-msgstr "color '*!+-' correspondiendo a la rama"
+msgstr "colorear '*!+-' correspondiendo a la rama"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
 msgid "show <n> more commits after the common ancestor"
 msgstr "mostrar <n> commits más tras encontrar el ancestro común"
 
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
 msgid "synonym to more=-1"
 msgstr "sinónimo de más=-1"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
 msgid "suppress naming strings"
 msgstr "suprimir strings de nombre"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
 msgid "include the current branch"
 msgstr "incluir la rama actual"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
 msgid "name commits with their object names"
 msgstr "nombrar commits con sus nombres de objeto"
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
 msgid "show possible merge bases"
 msgstr "mostrar bases de fusión posibles"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
 msgid "show refs unreachable from any other ref"
 msgstr "mostrar refs inalcanzables por ningún otro ref"
 
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
 msgid "show commits in topological order"
 msgstr "mostrar commits en orden topológico"
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
 msgid "show only commits not on the first branch"
-msgstr "mostrar solo commits que no están en la primera rama"
+msgstr "mostrar solo commits que no estén en la primera rama"
 
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
 msgid "show merges reachable from only one tip"
-msgstr "mostrar fusiones alcanzables solo por una punta"
+msgstr "mostrar fusiones alcanzables por solo una punta"
 
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
 msgid "topologically sort, maintaining date order where possible"
 msgstr "orden topológico, manteniendo el orden de fechas donde sea posible"
 
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "mostrar <n> entradas más recientes de ref-log comenzando desde la base"
 
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
 msgid ""
 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
 msgstr ""
 "--reflog no es compatible con --all, --remotes, --independent o --merge-base"
 
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "no se dieron ramas, y el HEAD no es válido"
 
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
 msgid "--reflog option needs one branch name"
 msgstr "opción --reflog necesita un nombre de rama"
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "solo %d entrada puede ser mostrada a la vez."
 msgstr[1] "solo %d entradas pueden ser mostradas a la vez."
 
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
 #, c-format
 msgid "no such ref %s"
 msgstr "no existe el ref %s"
 
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "no se puede manejar más de %d rev."
 msgstr[1] "no se puede manejar más de %d revs."
 
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' no es una ref válida."
 
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "no se puede encontrar el commit %s (%s)"
 
 #: builtin/show-index.c:21
 msgid "hash-algorithm"
-msgstr "algoritmo-hash"
+msgstr "algoritmo hash"
 
 #: builtin/show-index.c:31
 msgid "Unknown hash algorithm"
@@ -22085,11 +22433,11 @@ msgstr "mostrar la referencia de HEAD, incluso si se filtrara"
 
 #: builtin/show-ref.c:171
 msgid "dereference tags into object IDs"
-msgstr "tags de deferencia en IDs de objeto"
+msgstr "desreferenciar tags a IDs de objeto"
 
 #: builtin/show-ref.c:173
 msgid "only show SHA1 hash using <n> digits"
-msgstr "solo mostrar hash SHA1 usando <n> dígitos"
+msgstr "solo mostrar hash SHA1 usando <n> cifras"
 
 #: builtin/show-ref.c:177
 msgid "do not print results to stdout (useful with --verify)"
@@ -22097,7 +22445,7 @@ msgstr "no mostrar resultados en stdout (útil con --verify)"
 
 #: builtin/show-ref.c:179
 msgid "show refs from stdin that aren't in local repository"
-msgstr "mostrar refs de stdin que no están en el repositorio local"
+msgstr "mostrar refs de stdin que no estén en el repositorio local"
 
 #: builtin/sparse-checkout.c:22
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
@@ -22110,75 +22458,89 @@ msgstr "git sparse-checkout list"
 #: builtin/sparse-checkout.c:72
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
-"este árbol de trabajo no tiene sparse (archivo sparese-checkout tal vez no "
+"este árbol de trabajo no es sparse (archivo sparse-checkout tal vez no "
 "existe)"
 
-#: builtin/sparse-checkout.c:227
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"directorio '%s' contiene archivos no rastreados, pero no está en el cono de "
+"sparse-checkout"
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "falló al borrar directorio '%s'"
+
+#: builtin/sparse-checkout.c:321
 msgid "failed to create directory for sparse-checkout file"
 msgstr "falló al crear directorio para el archivo sparse-checkout"
 
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:362
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr ""
 "no es posible actualizar el formato de repositorio para habilitar "
 "worktreeConfig"
 
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:364
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "falló al configurar opción extensions.worktreeConfig"
 
-#: builtin/sparse-checkout.c:290
+#: builtin/sparse-checkout.c:384
 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:310
+#: builtin/sparse-checkout.c:404
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "inicializa el sparse-checkout en modo cono"
 
-#: builtin/sparse-checkout.c:312
+#: builtin/sparse-checkout.c:406
 msgid "toggle the use of a sparse index"
 msgstr "activar el uso de un índice sparse"
 
-#: builtin/sparse-checkout.c:340
+#: builtin/sparse-checkout.c:434
 msgid "failed to modify sparse-index config"
 msgstr "falló al modificar la configuración del índice sparse"
 
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:455
 #, c-format
 msgid "failed to open '%s'"
 msgstr "falló al abrir '%s'"
 
-#: builtin/sparse-checkout.c:419
+#: builtin/sparse-checkout.c:507
 #, c-format
 msgid "could not normalize path %s"
 msgstr "no se pudo normalizar la ruta %s"
 
-#: builtin/sparse-checkout.c:431
+#: builtin/sparse-checkout.c:519
 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
 msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)"
 
-#: builtin/sparse-checkout.c:456
+#: builtin/sparse-checkout.c:544
 #, c-format
 msgid "unable to unquote C-style string '%s'"
-msgstr "no es posible dequote para la cadena de estilo C '%s'"
+msgstr "no es posible dequote la cadena de estilo C '%s'"
 
-#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "no se pudo cargar patrones de sparse-checkout existentes"
 
-#: builtin/sparse-checkout.c:579
+#: builtin/sparse-checkout.c:667
 msgid "read patterns from standard in"
 msgstr "leer patrones de standard in"
 
-#: builtin/sparse-checkout.c:594
+#: builtin/sparse-checkout.c:682
 msgid "git sparse-checkout reapply"
 msgstr "git sparse-checkout reapply"
 
-#: builtin/sparse-checkout.c:613
+#: builtin/sparse-checkout.c:701
 msgid "git sparse-checkout disable"
 msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:644
+#: builtin/sparse-checkout.c:732
 msgid "error while refreshing working directory"
 msgstr "error al refrescar directorio de trabajo"
 
@@ -22200,11 +22562,7 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 
 #: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
-msgstr "git stash branch <nombre-rama> [<stash>]"
-
-#: builtin/stash.c:29 builtin/stash.c:70
-msgid "git stash clear"
-msgstr "git stash clear"
+msgstr "git stash branch <nombre-de-rama> [<stash>]"
 
 #: builtin/stash.c:30
 msgid ""
@@ -22218,7 +22576,7 @@ msgstr ""
 "          [--pathspec-from-file=<archivo> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 
-#: builtin/stash.c:34 builtin/stash.c:87
+#: builtin/stash.c:34
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
@@ -22248,10 +22606,18 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <mensaje>]\n"
 "          [--] [<pathspec>...]]"
 
+#: builtin/stash.c:87
+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] [<mensaje>]"
+
 #: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
-msgstr "'%s' no es un commit estilo stash"
+msgstr "'%s' no es un commit de estilo stash"
 
 #: builtin/stash.c:150
 #, c-format
@@ -22271,184 +22637,184 @@ msgstr "%s no es una referencia válida"
 msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear con argumentos no está implementado"
 
-#: builtin/stash.c:431
+#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
 "            %s -> %s\n"
 "         to make room.\n"
 msgstr ""
-"ADVERTENCIA: Archivo sin seguimiento en forma de archivo con seguimiento. "
-"Renombrar\n"
+"ADVERTENCIA: Archivo sin seguimiento en el camino de archivo con "
+"seguimiento. Renombrando\n"
 "             %s ->%s\n"
 "          Para hacer espacio.\n"
 
-#: builtin/stash.c:492
+#: builtin/stash.c:508
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "no se puede aplicar un stash en medio de un merge"
 
-#: builtin/stash.c:503
+#: builtin/stash.c:519
 #, c-format
 msgid "could not generate diff %s^!."
-msgstr "no se pudo generar diff %s^!."
+msgstr "¡no se pudo generar diff %s^!."
 
-#: builtin/stash.c:510
+#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
-msgstr "conflictos en índice. Intente sin --index."
+msgstr "conflictos en índice. Intenta sin --index."
 
-#: builtin/stash.c:516
+#: builtin/stash.c:532
 msgid "could not save index tree"
-msgstr "no se puede guardar el índice del árbol"
-
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "no se pueden restaurar archivos no rastreados de la entrada stash"
+msgstr "no se pudo guardar el árbol de índice"
 
-#: builtin/stash.c:539
+#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Fusionando %s con %s"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "El índice no fue sacado de stash."
 
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "no se pudo restaurar archivos no rastreados de la entrada stash"
+
+#: builtin/stash.c:607 builtin/stash.c:705
 msgid "attempt to recreate the index"
-msgstr "intento de recrear el index"
+msgstr "intento de recrear el índice"
 
-#: builtin/stash.c:635
+#: builtin/stash.c:651
 #, c-format
 msgid "Dropped %s (%s)"
-msgstr "Botado %s (%s)"
+msgstr "Descartado %s (%s)"
 
-#: builtin/stash.c:638
+#: builtin/stash.c:654
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: No se pudo borrar entrada stash"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:667
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' no es una referencia stash"
 
-#: builtin/stash.c:701
+#: builtin/stash.c:717
 msgid "The stash entry is kept in case you need it again."
 msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente."
 
-#: builtin/stash.c:724
+#: builtin/stash.c:740
 msgid "No branch name specified"
 msgstr "No se especificó el nombre de la rama"
 
-#: builtin/stash.c:808
+#: builtin/stash.c:824
 msgid "failed to parse tree"
 msgstr "falló al analizar el árbol"
 
-#: builtin/stash.c:819
+#: builtin/stash.c:835
 msgid "failed to unpack trees"
 msgstr "falló al desempaquetar árboles"
 
-#: builtin/stash.c:839
+#: builtin/stash.c:855
 msgid "include untracked files in the stash"
 msgstr "incluir archivos no rastreados en el stash"
 
-#: builtin/stash.c:842
+#: builtin/stash.c:858
 msgid "only show untracked files in the stash"
 msgstr "solo mostrar archivos no rastreados en el stash"
 
-#: builtin/stash.c:932 builtin/stash.c:969
+#: builtin/stash.c:945 builtin/stash.c:982
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "No se puede actualizar %s con %s"
 
-#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
 msgid "stash message"
 msgstr "mensaje de stash"
 
-#: builtin/stash.c:960
+#: builtin/stash.c:973
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" requiere un argumento <commit>"
 
-#: builtin/stash.c:1175
+#: builtin/stash.c:1187
 msgid "No changes selected"
 msgstr "Sin cambios seleccionados"
 
-#: builtin/stash.c:1275
+#: builtin/stash.c:1287
 msgid "You do not have the initial commit yet"
 msgstr "Aún no tienes un commit inicial"
 
-#: builtin/stash.c:1302
+#: builtin/stash.c:1314
 msgid "Cannot save the current index state"
 msgstr "No se puede guardar el estado actual del índice"
 
-#: builtin/stash.c:1311
+#: builtin/stash.c:1323
 msgid "Cannot save the untracked files"
 msgstr "No se pueden guardar los archivos no rastreados"
 
-#: builtin/stash.c:1322 builtin/stash.c:1331
+#: builtin/stash.c:1334 builtin/stash.c:1343
 msgid "Cannot save the current worktree state"
 msgstr "No se puede guardar el estado actual del árbol de trabajo"
 
-#: builtin/stash.c:1359
+#: builtin/stash.c:1371
 msgid "Cannot record working tree state"
 msgstr "No se puede grabar el estado del árbol de trabajo"
 
-#: builtin/stash.c:1408
+#: builtin/stash.c:1420
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo"
 
-#: builtin/stash.c:1426
+#: builtin/stash.c:1438
 msgid "Did you forget to 'git add'?"
 msgstr "¿Olvidaste 'git add'?"
 
-#: builtin/stash.c:1441
+#: builtin/stash.c:1453
 msgid "No local changes to save"
 msgstr "No hay cambios locales para guardar"
 
-#: builtin/stash.c:1448
+#: builtin/stash.c:1460
 msgid "Cannot initialize stash"
 msgstr "No se puede inicializar stash"
 
-#: builtin/stash.c:1463
+#: builtin/stash.c:1475
 msgid "Cannot save the current status"
 msgstr "No se puede guardar el estado actual"
 
-#: builtin/stash.c:1468
+#: builtin/stash.c:1480
 #, c-format
 msgid "Saved working directory and index state %s"
-msgstr "Directorio de trabajo guardado y estado de índice %s"
+msgstr "Directorio de trabajo y estado de índice %s guardados"
 
-#: builtin/stash.c:1558
+#: builtin/stash.c:1571
 msgid "Cannot remove worktree changes"
 msgstr "No se pueden eliminar cambios del árbol de trabajo"
 
-#: builtin/stash.c:1597 builtin/stash.c:1662
+#: builtin/stash.c:1610 builtin/stash.c:1675
 msgid "keep index"
 msgstr "mantener index"
 
-#: builtin/stash.c:1599 builtin/stash.c:1664
+#: builtin/stash.c:1612 builtin/stash.c:1677
 msgid "stash in patch mode"
 msgstr "stash en modo patch"
 
-#: builtin/stash.c:1600 builtin/stash.c:1665
+#: builtin/stash.c:1613 builtin/stash.c:1678
 msgid "quiet mode"
 msgstr "modo tranquilo"
 
-#: builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:1615 builtin/stash.c:1680
 msgid "include untracked files in stash"
 msgstr "incluir archivos sin seguimiento en stash"
 
-#: builtin/stash.c:1604 builtin/stash.c:1669
+#: builtin/stash.c:1617 builtin/stash.c:1682
 msgid "include ignore files"
 msgstr "incluir archivos ignorados"
 
-#: builtin/stash.c:1704
+#: builtin/stash.c:1717
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
 msgstr ""
-"el soporte para stash.useBuiltin ha sido eliminado!\n"
-"Vea su entrada en 'git help config' para detalles."
+"¡el soporte para stash.useBuiltin ha sido eliminado!\n"
+"Mira su entrada en 'git help config' para detalles."
 
 #: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
@@ -22461,138 +22827,138 @@ msgstr "git stripspace [-c | --comment-lines]"
 #: builtin/stripspace.c:37
 msgid "skip and remove all lines starting with comment character"
 msgstr ""
-"saltar y borrar todas las líneas que comienzan con un carácter de comentario"
+"saltar y borrar todas las líneas que comiencen con un carácter de comentario"
 
 #: builtin/stripspace.c:40
 msgid "prepend comment character and space to each line"
 msgstr "anteponer carácter de comentario y espacio a cada línea"
 
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
 
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
-msgstr "subomdule--helper print-default-remote no toma argumentos"
+msgstr "submodule--helper print-default-remote no toma argumentos"
 
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "no se puede quitar un componente del url '%s'"
 
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es "
+"su propio upstream autoritario."
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
 msgid "alternative anchor for relative paths"
 msgstr "ancho alternativo para rutas relativas"
 
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:410
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]"
 
-#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:520
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Entrando '%s'\n"
 
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
 "."
 msgstr ""
-"run_command devolvió estado no-cero para %s\n"
+"run_command devolvió estado no cero para %s\n"
 "."
 
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:545
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
 "submodules of %s\n"
 "."
 msgstr ""
-"run_command devolvió estado no-cero mientras cursaba en los submódulos "
+"run_command devolvió estado no cero mientras cursaba en los submódulos "
 "anidados de %s\n"
 "."
 
-#: builtin/submodule--helper.c:566
+#: builtin/submodule--helper.c:561
 msgid "suppress output of entering each submodule command"
-msgstr "suprime la salida al inicializar cada comando de submódulo"
+msgstr "suprime la salida de inicializar cada comando de submódulo"
 
-#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
-#: builtin/submodule--helper.c:1488
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
 msgid "recurse into nested submodules"
 msgstr "recursar en submódulos anidados"
 
-#: builtin/submodule--helper.c:573
+#: builtin/submodule--helper.c:568
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>"
 
-#: builtin/submodule--helper.c:600
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es "
-"su propio upstream autoritativo."
-
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:642
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Falló al registrar el url para la ruta del submódulo '%s'"
 
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:646
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n"
 
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:656
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 "peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n"
 
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:663
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "Error al registrar el modo de actualización para la ruta del submódulo '%s'"
 
-#: builtin/submodule--helper.c:710
+#: builtin/submodule--helper.c:685
 msgid "suppress output for initializing a submodule"
-msgstr "suprime la salida para inicializar un submódulo"
+msgstr "suprime la salida de inicializar un submódulo"
 
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<opciones>] [<path>]"
 
-#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 "no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'"
 
-#: builtin/submodule--helper.c:836
+#: builtin/submodule--helper.c:811
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
-msgstr "no pudo resolver ref de HEAD dentro del submódulo '%s'"
+msgstr "no se pudo resolver ref de HEAD dentro del submódulo '%s'"
 
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "falló al recursar en el submódulo '%s'"
 
-#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
 msgid "suppress submodule status output"
-msgstr "suprimir output del estado del submódulo"
+msgstr "suprimir salida del estado del submódulo"
 
-#: builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:863
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -22600,157 +22966,157 @@ msgstr ""
 "usar el commit guardado en el índice en lugar del guardado en el submódulo "
 "HEAD"
 
-#: builtin/submodule--helper.c:894
+#: builtin/submodule--helper.c:869
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]"
 
-#: builtin/submodule--helper.c:918
+#: builtin/submodule--helper.c:893
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <ruta>"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:965
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s(blob)->%s(submodule)"
 
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:968
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(submodule)->%s(blob)"
 
-#: builtin/submodule--helper.c:1006
+#: builtin/submodule--helper.c:981
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1056
+#: builtin/submodule--helper.c:1031
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "no se pudo realizar hash del objeto '%s'"
 
-#: builtin/submodule--helper.c:1060
+#: builtin/submodule--helper.c:1035
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "modo %o inesperado\n"
 
-#: builtin/submodule--helper.c:1301
+#: builtin/submodule--helper.c:1276
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr ""
 "usar el commit guardado en el índice en lugar del guardado en el submódulo "
 "HEAD"
 
-#: builtin/submodule--helper.c:1303
-msgid "to compare the commit in the index with that in the submodule HEAD"
+#: builtin/submodule--helper.c:1278
+msgid "compare the commit in the index with that in the submodule HEAD"
 msgstr ""
 "usar el commit guardado en el índice para comparar con el guardado en el "
 "submódulo HEAD"
 
-#: builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1280
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr "omitir submódulos con el valor 'ignore_config' establecido en 'all'"
 
-#: builtin/submodule--helper.c:1307
+#: builtin/submodule--helper.c:1282
 msgid "limit the summary size"
 msgstr "limitar el tamaño de resumen"
 
-#: builtin/submodule--helper.c:1312
+#: builtin/submodule--helper.c:1287
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1311
 msgid "could not fetch a revision for HEAD"
 msgstr "no se puede obtener la revisión para HEAD"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1316
 msgid "--cached and --files are mutually exclusive"
 msgstr "--cached y --files son mutuamente exclusivos"
 
-#: builtin/submodule--helper.c:1408
+#: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Sincronizando url del submódulo para '%s'\n"
 
-#: builtin/submodule--helper.c:1414
+#: builtin/submodule--helper.c:1379
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "falló al registrar el url para la ruta del submódulo '%s'"
 
-#: builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c:1393
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "error al conseguir el remoto por defecto para el submódulo '%s'"
 
-#: builtin/submodule--helper.c:1439
+#: builtin/submodule--helper.c:1404
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "error al actualizar el remoto para el submódulo '%s'"
 
-#: builtin/submodule--helper.c:1486
+#: builtin/submodule--helper.c:1451
 msgid "suppress output of synchronizing submodule url"
-msgstr "suprime la salida del url del submódulo que se sincroniza"
+msgstr "suprime la salida de sincronizar el url del submódulo"
 
-#: builtin/submodule--helper.c:1493
+#: builtin/submodule--helper.c:1458
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]"
 
-#: builtin/submodule--helper.c:1547
+#: builtin/submodule--helper.c:1512
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
 "really want to remove it including all of its history)"
 msgstr ""
-"El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -"
+"El árbol de trabajo de submódulo '%s' contiene un directorio .git (usa 'rm -"
 "rf' si realmente quieres eliminarlo incluyendo todo en su historia)"
 
-#: builtin/submodule--helper.c:1559
+#: builtin/submodule--helper.c:1524
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
-"El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa "
-"'-f' para descartarlas"
+"El árbol de trabajo de submódulo '%s' contiene modificaciones locales; usa '-"
+"f' para descartarlas"
 
-#: builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1532
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Directorio '%s' limpiado\n"
 
-#: builtin/submodule--helper.c:1569
+#: builtin/submodule--helper.c:1534
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
-msgstr "No se pudo eliminar el árbol de trabajo del submódulo '%s'\n"
+msgstr "No se pudo eliminar el árbol de trabajo de submódulo '%s'\n"
 
-#: builtin/submodule--helper.c:1580
+#: builtin/submodule--helper.c:1545
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "no se pudo crear directorio vacío de submódulo %s"
 
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1561
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n"
 
-#: builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:1590
 msgid "remove submodule working trees even if they contain local changes"
 msgstr ""
-"remover árboles de trabajo de submódulos incluso si contienen cambios locales"
+"quitar árboles de trabajo de submódulos incluso si contienen cambios locales"
 
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1591
 msgid "unregister all submodules"
 msgstr "quitar todos los submódulos"
 
-#: builtin/submodule--helper.c:1631
+#: builtin/submodule--helper.c:1596
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]"
 
-#: builtin/submodule--helper.c:1645
+#: builtin/submodule--helper.c:1610
 msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos"
+msgstr "Usa '--all' si realmente quieres desinicializar todos los submódulos"
 
-#: builtin/submodule--helper.c:1714
+#: builtin/submodule--helper.c:1655
 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"
@@ -22759,51 +23125,72 @@ msgid ""
 msgstr ""
 "Una alternativa calculada a partir de la alternativa de un superproyecto no "
 "es válida.\n"
-"Para permitir que Git clone sin una alternativa en ese caso, establezca\n"
-"submodule.alternateErrorStrategy a 'info' o, de manera equivalente, clonar "
+"Para permitir que Git clone sin una alternativa en ese caso, establece\n"
+"submodule.alternateErrorStrategy a 'info' o, de manera equivalente, clona "
 "con\n"
 "'--reference-if-able' en lugar de '--reference'."
 
-#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "submódulo '%s' no puede agregar alterno: %s"
 
-#: builtin/submodule--helper.c:1792
+#: builtin/submodule--helper.c:1739
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido"
 
-#: builtin/submodule--helper.c:1799
+#: builtin/submodule--helper.c:1746
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Valor '%s' para submodule.alternateLocation no es reconocido"
 
-#: builtin/submodule--helper.c:1823
+#: builtin/submodule--helper.c:1771
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "rechazando crear/usar '%s' en el directorio de git de otro submódulo"
+
+#: builtin/submodule--helper.c:1812
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "clonación de '%s' en la ruta de submódulo '%s' falló"
+
+#: builtin/submodule--helper.c:1817
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "directorio no está vacío: '%s'"
+
+#: builtin/submodule--helper.c:1829
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "no se pudo obtener el directorio de submódulo para '%s'"
+
+#: builtin/submodule--helper.c:1861
 msgid "where the new submodule will be cloned to"
 msgstr "a donde el nuevo submódulo será clonado"
 
-#: builtin/submodule--helper.c:1826
+#: builtin/submodule--helper.c:1864
 msgid "name of the new submodule"
 msgstr "nombre del nuevo submódulo"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1867
 msgid "url where to clone the submodule from"
 msgstr "url de dónde clonar el submódulo"
 
-#: builtin/submodule--helper.c:1837
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
 msgid "depth for shallow clones"
 msgstr "profundidad para clones superficiales"
 
-#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
 msgid "force cloning progress"
-msgstr "forzar el proceso de clonado"
+msgstr "forzar el proceso de clonación"
 
-#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
 msgid "disallow cloning into non-empty directory"
 msgstr "no permitir clonar en directorios no vacíos"
 
-#: builtin/submodule--helper.c:1849
+#: builtin/submodule--helper.c:1887
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22813,104 +23200,182 @@ msgstr ""
 "<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --"
 "url <url> --path <ruta>"
 
-#: builtin/submodule--helper.c:1874
-#, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr "rechazando crear/usar '%s' en el directorio de git de otro submódulo"
-
-#: builtin/submodule--helper.c:1885
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "clon de '%s' en la ruta de submódulo '%s' falló"
-
-#: builtin/submodule--helper.c:1889
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "directorio no está vacío: '%s'"
-
-#: builtin/submodule--helper.c:1901
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "no se pudo obtener el directorio de submódulo para '%s'"
-
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:1924
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Modo de actualización inválido '%s' para ruta de submódulo '%s'"
 
-#: builtin/submodule--helper.c:1941
+#: builtin/submodule--helper.c:1928
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Modo de actualización inválido '%s' configurado para ruta de submódulo '%s'"
 
-#: builtin/submodule--helper.c:2042
+#: builtin/submodule--helper.c:2043
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Ruta de submódulo '%s' no inicializada"
 
-#: builtin/submodule--helper.c:2046
+#: builtin/submodule--helper.c:2047
 msgid "Maybe you want to use 'update --init'?"
 msgstr "¿Tal vez quieres usar 'update --init'?"
 
-#: builtin/submodule--helper.c:2076
+#: builtin/submodule--helper.c:2077
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Saltando submódulo %s no fusionado"
 
-#: builtin/submodule--helper.c:2105
+#: builtin/submodule--helper.c:2106
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Saltando submódulo '%s'"
 
-#: builtin/submodule--helper.c:2255
+#: builtin/submodule--helper.c:2256
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Falló al clonar '%s'. Reintento programado"
 
-#: builtin/submodule--helper.c:2266
+#: builtin/submodule--helper.c:2267
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Falló al clonar '%s' una segunda vez, abortando"
 
-#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "No es posible revisar '%s' en la ruta de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "No es posible ejecutar rebase a '%s' en la ruta de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Incapaz de fusionar '%s' en la ruta del submódulo '%s'"
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Falló la ejecución de '%s %s' en la ruta de submódulo '%s'"
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Ruta de submódulo '%s': check out realizado a '%s'\n"
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Ruta de submódulo '%s': rebasado a '%s'\n"
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Ruta de submódulo '%s': fusionado en '%s'\n"
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Ruta de submódulo '%s': '%s %s'\n"
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"No es posible realizar fetch en la ruta de submódulo '%s'; intentando hacer "
+"un fetch directo de %s:"
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Fetch realizado en la ruta de submódulo '%s', pero no contenía %s. Fetch "
+"directo del commit falló."
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
 msgid "path into the working tree"
-msgstr "ruta hacia el árbol de trabajo"
+msgstr "ruta al árbol de trabajo"
 
-#: builtin/submodule--helper.c:2331
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
 msgid "path into the working tree, across nested submodule boundaries"
-msgstr ""
-"ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados"
+msgstr "ruta al árbol de trabajo, a través de fronteras de submódulos anidados"
 
-#: builtin/submodule--helper.c:2335
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout o none"
 
-#: builtin/submodule--helper.c:2341
+#: builtin/submodule--helper.c:2517
 msgid "create a shallow clone truncated to the specified number of revisions"
-msgstr "crea un clon superficial truncado al número especificado de revisión"
+msgstr "crea un clon superficial truncado al número especificado de revisiones"
 
-#: builtin/submodule--helper.c:2344
+#: builtin/submodule--helper.c:2520
 msgid "parallel jobs"
-msgstr "trabajos paralelos"
+msgstr "tareas paralelas"
 
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2522
 msgid "whether the initial clone should follow the shallow recommendation"
-msgstr "si el clon inicial debe seguir la recomendación superficial"
+msgstr "si el clon inicial debe seguir la recomendación de superficialidad"
 
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2523
 msgid "don't print cloning progress"
-msgstr "no mostrar el progreso de clonado"
+msgstr "no mostrar el progreso de clonación"
 
-#: builtin/submodule--helper.c:2358
+#: builtin/submodule--helper.c:2534
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update-clone [--prefix=<ruta>] [<ruta>...]"
 
-#: builtin/submodule--helper.c:2371
+#: builtin/submodule--helper.c:2547
 msgid "bad value for update parameter"
 msgstr "mal valor para parámetro update"
 
-#: builtin/submodule--helper.c:2419
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr "suprime la salida para actualización por rebase o fusión"
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr "forzar actualizaciones de checkout"
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr "no recuperar objetos nuevos del sitio remoto"
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr ""
+"sobreescribe el modo de actualización en caso de que el respositorio sea un "
+"clon fresco"
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr "profundidad para recuperación superficial"
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 esperado para superproyecto"
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 del submódulo de HEAD"
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [<options>] <path>"
+
+#: builtin/submodule--helper.c:2662
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22919,85 +23384,194 @@ msgstr ""
 "Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero "
 "el superproyecto no está en ninguna rama"
 
-#: builtin/submodule--helper.c:2542
+#: builtin/submodule--helper.c:2780
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
-msgstr "no se pudo conseguir un handle para el submódulo '%s'"
+msgstr "no se pudo conseguir un handle de repositorio para el submódulo '%s'"
 
-#: builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
 msgid "recurse into submodules"
 msgstr "recurrir a submódulos"
 
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2819
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]"
 
-#: builtin/submodule--helper.c:2637
+#: builtin/submodule--helper.c:2875
 msgid "check if it is safe to write to the .gitmodules file"
-msgstr "revisar is es seguro escribir el archivo .gitmodules"
+msgstr "revisar si es seguro escribir al archivo .gitmodules"
 
-#: builtin/submodule--helper.c:2640
+#: builtin/submodule--helper.c:2878
 msgid "unset the config in the .gitmodules file"
-msgstr "desconfigura la opción en elarchivo .gitmodules"
+msgstr "desconfigurar la opción en el archivo .gitmodules"
 
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2883
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <nombre> [<valor>]"
 
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nombre>"
 
-#: builtin/submodule--helper.c:2647
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2666 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ""
-"por favor asegúrate que el archivo .gitmodules está en el árbol de trabajo"
+"por favor asegúrate que el archivo .gitmodules esté en el árbol de trabajo"
 
-#: builtin/submodule--helper.c:2682
+#: builtin/submodule--helper.c:2920
 msgid "suppress output for setting url of a submodule"
-msgstr "suprime la salida para inicializar la url de un submódulo"
+msgstr "suprime la salida de inicializar la url de un submódulo"
 
-#: builtin/submodule--helper.c:2686
+#: builtin/submodule--helper.c:2924
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <ruta> <nueva url>"
 
-#: builtin/submodule--helper.c:2719
+#: builtin/submodule--helper.c:2957
 msgid "set the default tracking branch to master"
 msgstr "configurar la rama de rastreo por defecto a master"
 
-#: builtin/submodule--helper.c:2721
+#: builtin/submodule--helper.c:2959
 msgid "set the default tracking branch"
 msgstr "configurar la rama de rastreo por defecto"
 
-#: builtin/submodule--helper.c:2725
+#: builtin/submodule--helper.c:2963
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <ruta>"
 
-#: builtin/submodule--helper.c:2726
+#: builtin/submodule--helper.c:2964
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 msgstr ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <rama> <ruta>"
 
-#: builtin/submodule--helper.c:2733
+#: builtin/submodule--helper.c:2971
 msgid "--branch or --default required"
-msgstr "--branch o --default requeridos"
+msgstr "--branch o --default requerido"
 
-#: builtin/submodule--helper.c:2736
+#: builtin/submodule--helper.c:2974
 msgid "--branch and --default are mutually exclusive"
 msgstr "--branch y --default son mutuamente exclusivos"
 
-#: builtin/submodule--helper.c:2793 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3037
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "Agregando el repositorio existente en '%s' al índice\n"
+
+#: builtin/submodule--helper.c:3040
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr "'%s' ya existe y no es un repositorio git válido"
+
+#: builtin/submodule--helper.c:3053
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr ""
+"Se encontró localmente un directorio git para '%s' con el(los) remoto(s):\n"
+
+#: builtin/submodule--helper.c:3060
+#, 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 quieres reusar este directorio git local en lugar de clonar nuevamente "
+"de\n"
+"  %s\n"
+"usa la opción '--force'. Si el directorio git local no es el repositorio "
+"correcto\n"
+"o no estás seguro de lo que esto significa, escoge otro nombre con la opción "
+"'--name'."
+
+#: builtin/submodule--helper.c:3072
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "Reactivando directorio git local para el submódulo '%s'.\n"
+
+#: builtin/submodule--helper.c:3109
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "no es posible hacer checkout al submódulo '%s'"
+
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Falló al agregar el submódulo '%s'"
+
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Falló al registrar el submódulo '%s'"
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' ya existe en el índice"
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "'%s' ya existe en el índice y no es un submódulo"
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr "rama del repositorio para agregar como submódulo"
+
+#: builtin/submodule--helper.c:3254
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "permitir agregar una ruta de submódulo que de otro modo se ignora"
+
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
+msgstr "mostrar solo mensajes de error"
+
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr "prestar los objetos de los repositorios de referencia"
+
+#: builtin/submodule--helper.c:3262
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"configura el nombre del submódulo para el string dado en lugar de ir a la "
+"ruta por defecto"
+
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<options>] [--] <repository> [<path>]"
+
+#: builtin/submodule--helper.c:3297
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"La ruta relativa solo se puede usar desde el nivel superior del árbol de "
+"trabajo"
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "repo URL: '%s' debe ser absoluta o iniciar con ./|../"
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' no es un nombre de submódulo válido"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s no soporta --super-prefix"
 
-#: builtin/submodule--helper.c:2799
+#: builtin/submodule--helper.c:3410
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' no es un comando submodule--helper válido"
@@ -23022,21 +23596,21 @@ msgstr "eliminar referencia simbólica"
 msgid "shorten ref output"
 msgstr "salida de referencia más corta"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "razón"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr "razón de la actualización"
 
 #: builtin/tag.c:25
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+"        <tagname> [<head>]"
 msgstr ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <archivo>]\n"
-"\t\t<nombre-tag> [<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+"        <tagname> [<head>]"
 
 #: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
@@ -23046,13 +23620,13 @@ msgstr "git tag -d <nombre-de-tag>..."
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
 "[<pattern>...]"
 msgstr ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
-"points-at <objeto>]\n"
-"\t\t[--format=<formato>] [--merged <commit>] [--no-merged <commit>] "
-"[<patrón>...]"
+"points-at <object>]\n"
+"        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"[<pattern>...]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
@@ -23117,130 +23691,130 @@ msgstr ""
 msgid "bad object type."
 msgstr "tipo de objeto erróneo."
 
-#: builtin/tag.c:328
+#: builtin/tag.c:326
 msgid "no tag message?"
-msgstr "¿Sin mensaje de tag?"
+msgstr "¿sin mensaje de tag?"
 
-#: builtin/tag.c:335
+#: builtin/tag.c:333
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "El mensaje del tag ha sido dejado en %s\n"
 
-#: builtin/tag.c:446
+#: builtin/tag.c:444
 msgid "list tag names"
 msgstr "listar nombres de tags"
 
-#: builtin/tag.c:448
+#: builtin/tag.c:446
 msgid "print <n> lines of each tag message"
 msgstr "imprimir <n> líneas de cada mensaje de tag"
 
-#: builtin/tag.c:450
+#: builtin/tag.c:448
 msgid "delete tags"
 msgstr "eliminar tags"
 
-#: builtin/tag.c:451
+#: builtin/tag.c:449
 msgid "verify tags"
 msgstr "verificar tags"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:451
 msgid "Tag creation options"
 msgstr "Opciones de creación de tags"
 
-#: builtin/tag.c:455
+#: builtin/tag.c:453
 msgid "annotated tag, needs a message"
 msgstr "tags anotadas necesitan un mensaje"
 
-#: builtin/tag.c:457
+#: builtin/tag.c:455
 msgid "tag message"
 msgstr "mensaje de tag"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:457
 msgid "force edit of tag message"
 msgstr "forzar la edición del mensaje de tag"
 
-#: builtin/tag.c:460
+#: builtin/tag.c:458
 msgid "annotated and GPG-signed tag"
 msgstr "tag anotado y firmado con GPG"
 
-#: builtin/tag.c:463
+#: builtin/tag.c:461
 msgid "use another key to sign the tag"
 msgstr "usar otra clave para firmar el tag"
 
-#: builtin/tag.c:464
+#: builtin/tag.c:462
 msgid "replace the tag if exists"
 msgstr "remplazar tag si existe"
 
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "crear un reflog"
 
-#: builtin/tag.c:467
+#: builtin/tag.c:465
 msgid "Tag listing options"
 msgstr "Opciones de listado de tag"
 
-#: builtin/tag.c:468
+#: builtin/tag.c:466
 msgid "show tag list in columns"
 msgstr "mostrar lista de tags en columnas"
 
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
 msgid "print only tags that contain the commit"
-msgstr "mostrar solo tags que contienen el commit"
+msgstr "mostrar solo tags que contengan el commit"
 
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that don't contain the commit"
-msgstr "mostrar solo tags que no contienen el commit"
+msgstr "mostrar solo tags que no contengan el commit"
 
-#: builtin/tag.c:473
+#: builtin/tag.c:471
 msgid "print only tags that are merged"
-msgstr "sólo imprimir las tags que están fusionadas"
+msgstr "solo imprimir las tags que estén fusionadas"
 
-#: builtin/tag.c:474
+#: builtin/tag.c:472
 msgid "print only tags that are not merged"
-msgstr "sólo imprimir las tags que no están fusionadas"
+msgstr "solo imprimir las tags que no estén fusionadas"
 
-#: builtin/tag.c:478
+#: builtin/tag.c:476
 msgid "print only tags of the object"
-msgstr "sólo imprimir tags de el objeto"
+msgstr "solo imprimir tags del objeto"
 
-#: builtin/tag.c:526
+#: builtin/tag.c:525
 msgid "--column and -n are incompatible"
 msgstr "--column y -n son incompatibles"
 
-#: builtin/tag.c:548
+#: builtin/tag.c:546
 msgid "-n option is only allowed in list mode"
 msgstr "opción -n solo es permitida en modo lista"
 
-#: builtin/tag.c:550
+#: builtin/tag.c:548
 msgid "--contains option is only allowed in list mode"
 msgstr "opción --contains solo es permitido en modo lista"
 
-#: builtin/tag.c:552
+#: builtin/tag.c:550
 msgid "--no-contains option is only allowed in list mode"
 msgstr "opción --no-contains solo es permitida en modo lista"
 
-#: builtin/tag.c:554
+#: builtin/tag.c:552
 msgid "--points-at option is only allowed in list mode"
 msgstr "opción --points-at solo es permitida en modo lista"
 
-#: builtin/tag.c:556
+#: builtin/tag.c:554
 msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "opciones --merged y --no-merged  solo están permitidas en modo lista"
+msgstr "opciones --merged y --no-merged solo están permitidas en modo lista"
 
-#: builtin/tag.c:567
+#: builtin/tag.c:568
 msgid "only one -F or -m option is allowed."
-msgstr "sólo se permite una de las opciones, -m ó -F."
+msgstr "solo se permite una de las opciones, -m o -F."
 
-#: builtin/tag.c:592
+#: builtin/tag.c:593
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' no es un nombre de tag válido."
 
-#: builtin/tag.c:597
+#: builtin/tag.c:598
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "el tag '%s' ya existe"
 
-#: builtin/tag.c:628
+#: builtin/tag.c:629
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Etiqueta '%s' actualizada (era %s)\n"
@@ -23254,260 +23828,255 @@ msgstr "Desempaquetando objetos"
 msgid "failed to create directory %s"
 msgstr "falló al crear directorio %s"
 
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "falló al crear el archivo %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "falló al eliminar el archivo %s"
 
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "falló al eliminar directorio %s"
 
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Probando mtime en '%s' "
 
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
 msgstr "info de estado del directorio no cambia tras agregar un nuevo archivo"
 
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "info de estado del directorio no cambia tras agregar un nuevo directorio"
 
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
 msgid "directory stat info changes after updating a file"
 msgstr "info de estado del directorio cambia tras actualizar un archivo"
 
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "info de estado del directorio cambia tras agregar un archivo dentro del "
 "subdirectorio"
 
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
 msgid "directory stat info does not change after deleting a file"
 msgstr "info de estado del directorio no cambia tras borrar un archivo"
 
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
 msgid "directory stat info does not change after deleting a directory"
 msgstr "info de estado del directorio no cambia tras borrar un directorio"
 
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opciones>] [--] [<archivo>...]"
 
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr ""
-"continuar refresh (Actualización) incluso cuando el índice necesita "
+"continuar refresh (refrescamiento) incluso cuando el índice necesita "
 "actualización"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "refresh: ignora submódulos"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "no ignorar archivos nuevos"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
-msgstr "permitir que archivos remplacen directorios y vice-versa"
+msgstr "permitir que archivos remplacen directorios y viceversa"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
-msgstr "avisar de archivos faltando en el árbol de trabajo"
+msgstr "avisar de archivos faltando del árbol de trabajo"
 
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
 msgid "refresh stat information"
-msgstr "refresh información de estado"
+msgstr "refrescar información de estado"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "como --refresh, pero ignora configuración assume-unchanged"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<modo>,<objeto>,<ruta>"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "agregar la entrada especificada al índice"
 
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "marcar archivos como \"not changing\""
 
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "limpiar bit assumed-unchanged"
 
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "marcar archivos como \"index-only\""
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "limpiar bit skip-worktree"
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
 msgid "do not touch index-only entries"
 msgstr "no tocar entradas index-only"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "agregar solo al índice; no agregar contenido a la base de datos de objetos"
 
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "eliminar rutas nombradas incluso si están presentes en el árbol de trabajo"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "con --stdin: las líneas de entrada son terminadas con bytes nulos"
 
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
-msgstr "leer la lista de rutas para ser actualizada desde standard input"
+msgstr "leer la lista de rutas que actualizar desde standard input"
 
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "agregar entradas de standard input al índice"
 
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "repoblar stages #2 y #3 para las rutas listadas"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
-msgstr "solo actualizar entradas que difieren de HEAD"
+msgstr "solo actualizar entradas que difieran de HEAD"
 
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "ignorar archivos faltantes en el árbol de trabajo"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "reportar acciones por standard output"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
-msgstr "(para porcelanas) olvidar conflictos sin resolver guardados"
+msgstr "(para porcelanas) olvidar conflictos guardados sin resolución"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "escribir índice en este formato"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "activar o desactivar índice dividido"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "habilitar o deshabilitar caché no rastreado"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "probar si el filesystem soporta caché no rastreado"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "habilitar caché no rastreado sin probar el filesystem"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "escribir el índice incluso si no está marcado como cambiado"
 
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "activar o desactivar monitor de sistema de archivos"
 
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "marcar archivos como válidos para fsmonitor"
 
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
-msgstr "limpia el bit de validación fsmonitor"
+msgstr "limpiar el bit de validación fsmonitor"
 
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
-"core.splitIndex está configurado en false; remuévelo o cámbialo, si "
-"realmente quieres habilitar el índice partido"
+"core.splitIndex está configurado en false; quítalo o cámbialo, si realmente "
+"quieres habilitar el índice partido"
 
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr ""
-"core.splitIndex está configurado en true; remuévelo o cámbialo, si realmente "
+"core.splitIndex está configurado en true; quítalo o cámbialo, si realmente "
 "quieres deshabilitar el índice partido"
 
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
 msgstr ""
-"core.untrackedCache está configurado en true; remuévelo o cámbialo, si "
+"core.untrackedCache está configurado en true; quítalo o cámbialo, si "
 "realmente quieres deshabilitar el chaché no rastreado"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Caché no rastreado deshabilitado"
 
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
 msgstr ""
-"core.untrackedCache está configurado en false; remuévelo o cámbialo, si "
+"core.untrackedCache está configurado en false; quítalo o cámbialo, si "
 "realmente quieres habilitar el caché no rastreado"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Caché no rastreado habilitado para '%s'"
 
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 "core.fsmonitor no está configurado; actívalo si realmente quieres habilitar "
 "fsmonitor"
 
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "fsmonitor activado"
 
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
-"core.fsmonitor está configurado; remuévelo si realmente quieres deshabilitar "
+"core.fsmonitor está configurado; quítalo si realmente quieres deshabilitar "
 "el fsmonitor"
 
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "fsmonitor desactivado"
 
@@ -23525,21 +24094,21 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<opciones>] --stdin [-z]"
 
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "eliminar la referencia"
 
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
-msgstr "actualiza <refname> no a lo que apunta"
+msgstr "actualizar <refname> no la a que apunta"
 
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin tiene argumentos terminados en NUL"
 
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
 msgid "read updates from stdin"
-msgstr "lee actualizaciones de stdin"
+msgstr "leer actualizaciones de stdin"
 
 #: builtin/update-server-info.c:7
 msgid "git update-server-info [--force]"
@@ -23547,25 +24116,25 @@ msgstr "git update-server-info [--force]"
 
 #: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
-msgstr "actualiza los archivos info desde cero"
+msgstr "actualizar los archivos info desde cero"
 
 #: builtin/upload-pack.c:11
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<opciones>] <directorio>"
 
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
 msgid "quit after a single request/response exchange"
-msgstr "sale después de un intercambio petición/respuesta único"
+msgstr "salir después de un solo intercambio petición/respuesta"
 
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "salir inmediatamente tras el anuncio inicial de ref"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "servir los info/refs para git-http-backend"
 
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git"
+msgstr "no probar <directorio>/.git/ si <directorio> no es un directorio Git"
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interrumpir transferencia tras <n> segundos de inactividad"
 
@@ -23579,7 +24148,7 @@ msgstr "imprimir contenido del commit"
 
 #: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
-msgstr "muestra la salida de status gpg en formato raw"
+msgstr "mostrar la salida de status gpg en formato raw"
 
 #: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
@@ -23601,63 +24170,58 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
 msgid "print tag contents"
 msgstr "imprimir contenido del tag"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opciones>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opciones>] <ruta>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <worktree> <nueva-ruta>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opciones>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<opciones>] <worktree>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <ruta>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:935
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "falló al borrar '%s'"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "Eliminando %s/%s: %s"
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
 msgid "report pruned working trees"
-msgstr "reporta árboles de trabajo recortados"
+msgstr "reportar árboles de trabajo recortados"
 
-#: builtin/worktree.c:151
+#: builtin/worktree.c:150
 msgid "expire working trees older than <time>"
-msgstr "expirar árboles de trabajo más viejos a <tiempo>"
+msgstr "caducar árboles de trabajo más viejos a <tiempo>"
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c:220
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' ya existe"
 
-#: builtin/worktree.c:230
+#: builtin/worktree.c:229
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "destino de worktree inutilizable '%s'"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -23667,7 +24231,7 @@ msgstr ""
 "usa '%s -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para "
 "limpiar"
 
-#: builtin/worktree.c:237
+#: builtin/worktree.c:236
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -23676,206 +24240,219 @@ msgstr ""
 "'%s' es un árbol de trabajo faltante pero ya registrado;\n"
 "usa '%s -f' para sobreescribir, o 'prune' o 'remove' para limpiar"
 
-#: builtin/worktree.c:288
+#: builtin/worktree.c:287
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "no se pudo crear directorio de '%s'"
 
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+msgid "initializing"
+msgstr "inicializando"
+
+#: builtin/worktree.c:421 builtin/worktree.c:427
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Preparando árbol de trabajo (nueva rama '%s')"
 
-#: builtin/worktree.c:424
+#: builtin/worktree.c:423
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "Preparando árbol de trabajo (reiniciando rama '%s'; estaba en %s)"
 
-#: builtin/worktree.c:433
+#: builtin/worktree.c:432
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')"
 
-#: builtin/worktree.c:439
+#: builtin/worktree.c:438
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)"
 
-#: builtin/worktree.c:482
+#: builtin/worktree.c:483
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
-"hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de "
+"hacer checkout a <rama> incluso si ya hay checkout de ella en otro árbol de "
 "trabajo"
 
-#: builtin/worktree.c:485
+#: builtin/worktree.c:486
 msgid "create a new branch"
 msgstr "crear una nueva rama"
 
-#: builtin/worktree.c:487
+#: builtin/worktree.c:488
 msgid "create or reset a branch"
 msgstr "crear o restablecer una rama"
 
-#: builtin/worktree.c:489
+#: builtin/worktree.c:490
 msgid "populate the new working tree"
 msgstr "popular el nuevo árbol de trabajo"
 
-#: builtin/worktree.c:490
+#: builtin/worktree.c:491
 msgid "keep the new working tree locked"
 msgstr "mantener el nuevo árbol de trabajo bloqueado"
 
-#: builtin/worktree.c:493
+#: builtin/worktree.c:493 builtin/worktree.c:730
+msgid "reason for locking"
+msgstr "razón para bloquear"
+
+#: builtin/worktree.c:496
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "configurando modo tracking (mirar git-branch(1))"
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:499
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 "intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto"
 
-#: builtin/worktree.c:504
+#: builtin/worktree.c:507
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B, y --detach son mutuamente exclusivas"
 
-#: builtin/worktree.c:565
+#: builtin/worktree.c:509
+msgid "--reason requires --lock"
+msgstr "--reason requiere --lock"
+
+#: builtin/worktree.c:513
+msgid "added with --lock"
+msgstr "agregado con --lock"
+
+#: builtin/worktree.c:575
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track solo puede ser usado si una nueva rama es creada"
 
-#: builtin/worktree.c:682
+#: builtin/worktree.c:692
 msgid "show extended annotations and reasons, if available"
 msgstr "mostrar anotaciones ampliadas y motivos, si están disponibles"
 
-#: builtin/worktree.c:684
+#: builtin/worktree.c:694
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
-"agregue la anotación 'podable' a los árboles de trabajo anteriores a <tiempo>"
+"agregar la anotación 'podable' a los árboles de trabajo anteriores a <tiempo>"
 
-#: builtin/worktree.c:693
+#: builtin/worktree.c:703
 msgid "--verbose and --porcelain are mutually exclusive"
 msgstr "--verbose and --porcelain son mutuamente exclusivas"
 
-#: builtin/worktree.c:720
-msgid "reason for locking"
-msgstr "razón para bloquear"
-
-#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
-#: builtin/worktree.c:963
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' no es un árbol de trabajo"
 
-#: builtin/worktree.c:734 builtin/worktree.c:767
+#: builtin/worktree.c:744 builtin/worktree.c:777
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado"
 
-#: builtin/worktree.c:739
+#: builtin/worktree.c:749
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ya está bloqueado; razón: %s"
 
-#: builtin/worktree.c:741
+#: builtin/worktree.c:751
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ya está bloqueado"
 
-#: builtin/worktree.c:769
+#: builtin/worktree.c:779
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' no está bloqueado"
 
-#: builtin/worktree.c:810
+#: builtin/worktree.c:820
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
-"árboles de trabajo conteniendo submódulos no puede ser movidos o eliminado"
+"árboles de trabajo conteniendo submódulos no pueden ser movidos o eliminados"
 
-#: builtin/worktree.c:818
+#: builtin/worktree.c:828
 msgid "force move even if worktree is dirty or locked"
 msgstr "forzar move incluso si el árbol de trabajo está sucio o bloqueado"
 
-#: builtin/worktree.c:841 builtin/worktree.c:965
+#: builtin/worktree.c:851 builtin/worktree.c:975
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' es un árbol de trabajo principal"
 
-#: builtin/worktree.c:846
+#: builtin/worktree.c:856
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "no se pudo descubrir el nombre de destino de '%s'"
 
-#: builtin/worktree.c:859
+#: builtin/worktree.c:869
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
 "no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n"
-"use 'move -f -f' para sobreescribir o desbloquear primero"
+"usa 'move -f -f' para forzar o desbloquear primero"
 
-#: builtin/worktree.c:861
+#: builtin/worktree.c:871
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
 "no se puede mover un árbol de trabajo bloqueado;\n"
-"use 'move -f -f' para sobreescribir o desbloquear primero"
+"usa 'move -f -f' para forzar o desbloquear primero"
 
-#: builtin/worktree.c:864
+#: builtin/worktree.c:874
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "falló validación, no se puede mover el árbol de trabajo: %s"
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:879
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "falló al mover '%s' a '%s'"
 
-#: builtin/worktree.c:915
+#: builtin/worktree.c:925
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "falló al ejecutar 'git status' en '%s'"
 
-#: builtin/worktree.c:919
+#: builtin/worktree.c:929
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
-"'%s' contiene archivos no rastreados o modificados, use --force para borrarlo"
+"'%s' contiene archivos modificados o no rastreados, usa --force para borrarlo"
 
-#: builtin/worktree.c:924
+#: builtin/worktree.c:934
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "no se pudo ejecutar 'git status' en '%s', código %d"
 
-#: builtin/worktree.c:947
+#: builtin/worktree.c:957
 msgid "force removal even if worktree is dirty or locked"
-msgstr "forzar remoción incluso si el árbol de trabajo está sucio o bloqueado"
+msgstr ""
+"forzar eliminación incluso si el árbol de trabajo está sucio o bloqueado"
 
-#: builtin/worktree.c:970
+#: builtin/worktree.c:980
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
-"no se pueden eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n"
-"use 'remove -f -f' para sobreescribir o desbloquear primero"
+"no se puede eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n"
+"usa 'remove -f -f' para forzar o desbloquear primero"
 
-#: builtin/worktree.c:972
+#: builtin/worktree.c:982
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
 "no se pueden eliminar árbol de trabajo bloqueado;\n"
-"use 'remove -f -f' para sobreescribir o desbloquear primero"
+"usa 'remove -f -f' para forzar o desbloquear primero"
 
-#: builtin/worktree.c:975
+#: builtin/worktree.c:985
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "falló validación, no se puede eliminar árbol de trabajo: %s"
 
-#: builtin/worktree.c:999
+#: builtin/worktree.c:1009
 #, c-format
 msgid "repair: %s: %s"
 msgstr "reparar: %s: %s"
 
-#: builtin/worktree.c:1002
+#: builtin/worktree.c:1012
 #, c-format
 msgid "error: %s: %s"
 msgstr "error: %s: %s"
@@ -23890,11 +24467,11 @@ msgstr "<prefijo>/"
 
 #: builtin/write-tree.c:29
 msgid "write tree object for a subdirectory <prefix>"
-msgstr "escribir objeto de  árbol para un subdirectorio <prefijo>"
+msgstr "escribir objeto de árbol para un subdirectorio <prefijo>"
 
 #: builtin/write-tree.c:31
 msgid "only useful for debugging"
-msgstr "sólo útil para depurar"
+msgstr "solo útil para depurar"
 
 #: git.c:28
 msgid ""
@@ -23923,7 +24500,7 @@ msgid ""
 "See 'git help git' for an overview of the system."
 msgstr ""
 "'git help -a' y 'git help -g' listan los subcomandos disponibles y algunas\n"
-"guías de concepto. Consulte 'git help <command>' o 'git help <concepto>'\n"
+"guías de concepto. Consulta 'git help <command>' o 'git help <concepto>'\n"
 "para leer sobre un subcomando o concepto específico.\n"
 "Mira 'git help git' para una vista general del sistema."
 
@@ -23970,7 +24547,7 @@ msgstr "opción %s desconocida\n"
 #: git.c:375
 #, c-format
 msgid "while expanding alias '%s': '%s'"
-msgstr "al expandir el alias '%s':'%s'"
+msgstr "al expandir el alias '%s': '%s'"
 
 #: git.c:384
 #, c-format
@@ -24003,17 +24580,17 @@ msgstr "error desconocido de escritura en standard output"
 msgid "close failed on standard output"
 msgstr "cierre falló en standard output"
 
-#: git.c:833
+#: git.c:832
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "bucle de alias detectado: expansión de '%s' no termina: %s"
 
-#: git.c:883
+#: git.c:882
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "no se puede manejar %s como un builtin"
 
-#: git.c:896
+#: git.c:895
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -24024,12 +24601,12 @@ msgstr ""
 "\n"
 "\n"
 
-#: git.c:916
+#: git.c:915
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr "expansión del alias '%s' falló; '%s' no es un comando de git\n"
 
-#: git.c:928
+#: git.c:927
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "falló al ejecutar comando '%s': %s\n"
@@ -24076,67 +24653,33 @@ msgstr "test-tool serve-v2 [<opciones>]"
 msgid "exit immediately after advertising capabilities"
 msgstr "salir inmediatamente tras anunciar capacidades"
 
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "socket/pipe ya está en uso: '%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "no se pudo iniciar el servidor en: '%s'"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "no se puede generar demonio en el background"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "falló waitpid"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "demonio no está en línea todavía"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "falló al iniciar demonio"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid está confundido"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "demonio no se ha apagado todavía"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
 msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
 msgstr "test-helper simple-ipc is-active  [<nombre>] [<opciones>]"
 
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
 msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
 msgstr "test-helper simple-ipc run-daemon   [<nombre>] [<hilos>]"
 
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
 msgstr ""
 "test-helper simple-ipc start-daemon [<nombre>] [<hilos>] [<espera-maxima>]"
 
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
 msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
 msgstr "test-helper simple-ipc stop-daemon  [<nombre>] [<espera-maxima>]"
 
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
 msgid "test-helper simple-ipc send         [<name>] [<token>]"
 msgstr "test-helper simple-ipc send         [<nombre>] [<token>]"
 
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
 msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
 msgstr ""
 "test-helper simple-ipc sendbytes    [<nombre>] [<cuenta de bytes>] [<byte>]"
 
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
 msgid ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
@@ -24144,226 +24687,228 @@ msgstr ""
 "test-helper simple-ipc multiple     [<nombre>] [<hilos>] [<cuenta de bytes>] "
 "[<tamaño de batch>]"
 
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
 msgid "name or pathname of unix domain socket"
 msgstr "nombre o ruta de nombre de socket de dominio unix"
 
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
 msgid "named-pipe name"
 msgstr "nombre de named-pipe"
 
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
 msgid "number of threads in server thread pool"
 msgstr "número de hilos en el pool de hilos del servidor"
 
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
 msgid "seconds to wait for daemon to start or stop"
 msgstr "segundos a esperar para que el dominio empiece o se detenga"
 
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
 msgid "number of bytes"
 msgstr "número de bytes"
 
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
 msgid "number of requests per thread"
-msgstr "númeor de peticiones por hilo"
+msgstr "número de peticiones por hilo"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "byte"
 msgstr "byte"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "ballast character"
-msgstr "caracter lastre"
+msgstr "carácter lastre"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "token"
 msgstr "token"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "command token to send to the server"
-msgstr "comando token para enviar al servidor"
+msgstr "token de comando para enviar al servidor"
 
-#: http.c:399
+#: http.c:350
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
-msgstr "valor negativo para http.postbuffer; poniendo el default a %d"
+msgstr "valor negativo para http.postbuffer; poniendo el default %d"
 
-#: http.c:420
+#: http.c:371
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Delegación de control no es soportada con cURL < 7.22.0"
 
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Fijación de llave pública no es soportada con cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Fijación de llave pública no es soportada con cURL < 7.39.0"
 
-#: http.c:910
+#: http.c:812
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0"
 
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Restricción de protocolo no soportada con cURL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:"
 
-#: http.c:1139
+#: http.c:1023
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 "No se pudo configurar backend SSL a '%s': cURL fue construido sin backends "
 "SSL"
 
-#: http.c:1143
+#: http.c:1027
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "No se pudo configurar backend SSL para '%s': ya configurado"
 
-#: http.c:2035
+#: http.c:1876
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
 "  asked for: %s\n"
 "   redirect: %s"
 msgstr ""
-"no puede actualizar la base de url de la redirección:\n"
+"no se puede actualizar la base de url de la redirección:\n"
 "  preguntaba por: %s\n"
-"   redireccionamiento: %s"
+"   redirección: %s"
 
 #: remote-curl.c:183
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "quoting inválido en valor de push-option: '%s'"
 
-#: remote-curl.c:307
+#: remote-curl.c:304
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs no es válido: ¿es este un repositorio git?"
 
-#: remote-curl.c:408
+#: remote-curl.c:405
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 "respuesta de servidor inválida; se esperaba servicio, se obtuvo un flush "
 "packet"
 
-#: remote-curl.c:439
+#: remote-curl.c:436
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "respuesta de servidor inválida; se obtuvo '%s'"
 
-#: remote-curl.c:499
+#: remote-curl.c:496
 #, c-format
 msgid "repository '%s' not found"
 msgstr "repositorio '%s' no encontrado"
 
-#: remote-curl.c:503
+#: remote-curl.c:500
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Autenticación falló para '%s'"
 
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+"no es posible acceder a '%s' con la configuración http.pinnedPubkey: %s"
+
+#: remote-curl.c:508
 #, c-format
 msgid "unable to access '%s': %s"
-msgstr "no es posible acceder '%s':%s"
+msgstr "no es posible acceder a '%s': %s"
 
-#: remote-curl.c:513
+#: remote-curl.c:514
 #, c-format
 msgid "redirecting to %s"
 msgstr "redirigiendo a %s"
 
-#: remote-curl.c:642
+#: remote-curl.c:645
 msgid "shouldn't have EOF when not gentle on EOF"
-msgstr "no debería tener EOF cuando no es gentil en EOF"
+msgstr "no se debería tener EOF cuando no es laxo con EOF"
 
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr "el servidor remoto envió un separador sin estado (stateless)"
+#: remote-curl.c:657
+msgid "remote server sent unexpected response end packet"
+msgstr "el servidor remoto envió una respuesta de fin de paquete inesperada"
 
-#: remote-curl.c:724
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
-"no es posible rebobinar rpc post data - intenta incrementando http.postBuffer"
+"no es posible rebobinar rpc post data - intenta incrementar http.postBuffer"
 
-#: remote-curl.c:754
+#: remote-curl.c:755
 #, c-format
 msgid "remote-curl: bad line length character: %.4s"
-msgstr "remote-curl: mal caracter de largo de línea: %.4s"
+msgstr "remote-curl: mal carácter de largo de línea: %.4s"
 
-#: remote-curl.c:756
+#: remote-curl.c:757
 msgid "remote-curl: unexpected response end packet"
 msgstr "remote-curl: packet de respuesta final inesperado"
 
-#: remote-curl.c:832
+#: remote-curl.c:833
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC falló; %s"
 
-#: remote-curl.c:872
+#: remote-curl.c:873
 msgid "cannot handle pushes this big"
 msgstr "no se puede manejar pushes tan grandes"
 
-#: remote-curl.c:987
+#: remote-curl.c:986
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "no se puede desinflar el request; zlib deflate error %d"
 
-#: remote-curl.c:991
+#: remote-curl.c:990
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "no se puede desinflar el request; zlib end error %d"
 
-#: remote-curl.c:1041
+#: remote-curl.c:1040
 #, c-format
 msgid "%d bytes of length header were received"
 msgstr "%d bytes de header de longitud fueron recibidos"
 
-#: remote-curl.c:1043
+#: remote-curl.c:1042
 #, c-format
 msgid "%d bytes of body are still expected"
 msgstr "%d bytes de cuerpo se siguen esperando"
 
-#: remote-curl.c:1132
+#: remote-curl.c:1131
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "dump http transport no soporta capacidades superficiales"
 
-#: remote-curl.c:1147
+#: remote-curl.c:1146
 msgid "fetch failed."
 msgstr "fetch falló."
 
-#: remote-curl.c:1193
+#: remote-curl.c:1192
 msgid "cannot fetch by sha1 over smart http"
 msgstr "no se puede hacer fetch por sha1 sobre smart http"
 
-#: remote-curl.c:1237 remote-curl.c:1243
+#: remote-curl.c:1236 remote-curl.c:1242
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'"
 
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1254 remote-curl.c:1372
 #, c-format
 msgid "http transport does not support %s"
 msgstr "http transport no soporta %s"
 
-#: remote-curl.c:1291
+#: remote-curl.c:1290
 msgid "git-http-push failed"
 msgstr "git-http-push falló"
 
-#: remote-curl.c:1479
+#: remote-curl.c:1478
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: uso: git remote-curl <remote> [<url>]"
 
-#: remote-curl.c:1511
+#: remote-curl.c:1510
 msgid "remote-curl: error reading command stream from git"
-msgstr "remote-curl: error leyendo command stream de git"
+msgstr "remote-curl: error al leer command stream de git"
 
-#: remote-curl.c:1518
+#: remote-curl.c:1517
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: fetch intentado sin un repositorio local"
 
-#: remote-curl.c:1559
+#: remote-curl.c:1558
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: comando '%s' desconocido de git"
@@ -24384,46 +24929,46 @@ msgstr "args"
 msgid "object filtering"
 msgstr "filtrado de objeto"
 
-#: parse-options.h:184
+#: parse-options.h:183
 msgid "expiry-date"
-msgstr "fecha de expiración"
+msgstr "fecha de caducidad"
 
-#: parse-options.h:198
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "no-op (compatibilidad con versiones anteriores)"
 
-#: parse-options.h:310
+#: parse-options.h:309
 msgid "be more verbose"
 msgstr "ser más verboso"
 
-#: parse-options.h:312
+#: parse-options.h:311
 msgid "be more quiet"
-msgstr "ser más discreto"
+msgstr "ser más callado"
 
-#: parse-options.h:318
+#: parse-options.h:317
 msgid "use <n> digits to display object names"
-msgstr "use <n> dígitos para mostrar los nombres de los objetos"
+msgstr "usar <n> cifras para mostrar los nombres de los objetos"
 
-#: parse-options.h:337
+#: parse-options.h:336
 msgid "how to strip spaces and #comments from message"
 msgstr "cómo quitar espacios y #comentarios de mensajes"
 
-#: parse-options.h:338
+#: parse-options.h:337
 msgid "read pathspec from file"
 msgstr "leer pathspec de archivo"
 
-#: parse-options.h:339
+#: parse-options.h:338
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr ""
-"con --pathspec-from-file, elementos de pathspec son separados con caracter "
+"con --pathspec-from-file, elementos de pathspec son separados con carácter "
 "NUL"
 
-#: ref-filter.h:99
+#: ref-filter.h:101
 msgid "key"
 msgstr "clave"
 
-#: ref-filter.h:99
+#: ref-filter.h:101
 msgid "field name to sort on"
 msgstr "nombre del campo por el cuál ordenar"
 
@@ -24435,7 +24980,7 @@ msgstr ""
 
 #: command-list.h:50
 msgid "Add file contents to the index"
-msgstr "Agrega contenido de carpetas al índice"
+msgstr "Agregar contenido de archivos al índice"
 
 #: command-list.h:51
 msgid "Apply a series of patches from a mailbox"
@@ -24447,7 +24992,7 @@ msgstr "Anotar líneas de archivo con información de commit"
 
 #: command-list.h:53
 msgid "Apply a patch to files and/or to the index"
-msgstr "Aplicar un parche a archivos y/o  el índice"
+msgstr "Aplicar un parche a archivos y/o al índice"
 
 #: command-list.h:54
 msgid "Import a GNU Arch repository into Git"
@@ -24455,11 +25000,11 @@ msgstr "Importar un repositorio GNU Arch en Git"
 
 #: command-list.h:55
 msgid "Create an archive of files from a named tree"
-msgstr "Crear un archivo o archivos de un árbol nombrado"
+msgstr "Crear una crónica de archivos de un árbol nombrado"
 
 #: command-list.h:56
 msgid "Use binary search to find the commit that introduced a bug"
-msgstr "Use la búsqueda binaria para encontrar el commit que introdujo el bug"
+msgstr "Usar la búsqueda binaria para encontrar el commit que introdujo el bug"
 
 #: command-list.h:57
 msgid "Show what revision and author last modified each line of a file"
@@ -24468,7 +25013,7 @@ msgstr ""
 
 #: command-list.h:58
 msgid "List, create, or delete branches"
-msgstr "Lista, crea, o borra ramas"
+msgstr "Listar, crear, o borrar ramas"
 
 #: command-list.h:59
 msgid "Collect information for user to file a bug report"
@@ -24476,12 +25021,13 @@ msgstr "Recolectar información para el usuario para generar un reporte de bug"
 
 #: command-list.h:60
 msgid "Move objects and refs by archive"
-msgstr "Mover objetos y referencias por archivo"
+msgstr "Mover objetos y referencias por crónica"
 
 #: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr ""
-"Proveer contenido o tipo y tamaño de información para objetos de repositorio"
+"Proveer contenido o información de tipo y tamaño de los objetos de "
+"repositorio"
 
 #: command-list.h:62
 msgid "Display gitattributes information"
@@ -24489,15 +25035,16 @@ msgstr "Mostrar información de gitattributes"
 
 #: command-list.h:63
 msgid "Debug gitignore / exclude files"
-msgstr "Debug a gitignore / excluir archivos"
+msgstr "Debug a gitignore / archivos de exclusión"
 
 #: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
-msgstr "Mostrar nombres canónicos y direcciones de correo de contactos"
+msgstr ""
+"Mostrar nombres canónicos y direcciones de correo electrónico de contactos"
 
 #: command-list.h:65
 msgid "Switch branches or restore working tree files"
-msgstr "Cambia ramas o restaura los archivos de tu árbol de trabajo"
+msgstr "Cambiar de rama o restaura archivos del árbol de trabajo"
 
 #: command-list.h:66
 msgid "Copy files from the index to the working tree"
@@ -24505,15 +25052,15 @@ msgstr "Copiar archivos del índice al árbol de trabajo"
 
 #: command-list.h:67
 msgid "Ensures that a reference name is well formed"
-msgstr "Asegura que un nombre de referencia esté bien formado"
+msgstr "Asegurar que un nombre de referencia esté bien formado"
 
 #: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
-msgstr "Encuentra commits que faltan aplicar en upstream"
+msgstr "Encontrar commits que falten aplicar en upstream"
 
 #: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
-msgstr "Aplica los cambios introducidos por algunos commits existentes"
+msgstr "Aplicar los cambios introducidos por algunos commits existentes"
 
 #: command-list.h:70
 msgid "Graphical alternative to git-commit"
@@ -24521,11 +25068,11 @@ msgstr "Opción gráfica a git-commit"
 
 #: command-list.h:71
 msgid "Remove untracked files from the working tree"
-msgstr "Remueve archivos del árbol de trabajo no rastreados"
+msgstr "Quitar archivos no rastreados del árbol de trabajo"
 
 #: command-list.h:72
 msgid "Clone a repository into a new directory"
-msgstr "Clona un repositorio dentro de un nuevo directorio"
+msgstr "Clonar un repositorio dentro de un nuevo directorio"
 
 #: command-list.h:73
 msgid "Display data in columns"
@@ -24533,15 +25080,15 @@ msgstr "Mostrar data en columnas"
 
 #: command-list.h:74
 msgid "Record changes to the repository"
-msgstr "Graba los cambios en tu repositorio"
+msgstr "Grabar los cambios al repositorio"
 
 #: command-list.h:75
 msgid "Write and verify Git commit-graph files"
-msgstr "Escribe y verifica los archivos de Git commit-graph"
+msgstr "Escribir y verificar los archivos commit-graph de Git"
 
 #: command-list.h:76
 msgid "Create a new commit object"
-msgstr "Crea un nuevo objeto commit"
+msgstr "Crear un nuevo objeto commit"
 
 #: command-list.h:77
 msgid "Get and set repository or global options"
@@ -24557,7 +25104,7 @@ msgstr "Obtener y guardar credenciales de usuario"
 
 #: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
-msgstr "Auxiliar para almacenar temporalmente claves en memoria"
+msgstr "Auxiliar para almacenar temporalmente contraseñas en memoria"
 
 #: command-list.h:81
 msgid "Helper to store credentials on disk"
@@ -24565,15 +25112,15 @@ msgstr "Auxiliar para guardar credenciales en disco"
 
 #: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
-msgstr "Exporta un commit único a CVS checkout"
+msgstr "Exportar un commit único a CVS checkout"
 
 #: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
-msgstr "Salva tus datos de otro SCM que la gente adora odiar"
+msgstr "Salvar tus datos de otro SCM que la gente adora odiar"
 
 #: command-list.h:84
 msgid "A CVS server emulator for Git"
-msgstr "Un servidor emulador de CVS para Git"
+msgstr "Un emulador de servidor de CVS para Git"
 
 #: command-list.h:85
 msgid "A really simple server for Git repositories"
@@ -24587,20 +25134,20 @@ msgstr ""
 
 #: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
-msgstr "Muestra los cambios entre commits, commit y árbol de trabajo, etc"
+msgstr "Mostrar los cambios entre commits, commit y árbol de trabajo, etc"
 
 #: command-list.h:88
 msgid "Compares files in the working tree and the index"
-msgstr "Compara archivos del árbol de trabajo y del índice"
+msgstr "Comparar archivos del árbol de trabajo y del índice"
 
 #: command-list.h:89
 msgid "Compare a tree to the working tree or index"
-msgstr "Compara un árbol con el árbol de trabajo o índice"
+msgstr "Comparar un árbol con el árbol de trabajo o índice"
 
 #: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr ""
-"Compara el contenido y el modo de blobs encontrados a través de dos objetos "
+"Comparar el contenido y el modo de blobs encontrados a través de dos objetos "
 "de árbol"
 
 #: command-list.h:91
@@ -24617,11 +25164,11 @@ msgstr "Backend para importadores de data de Git rápidos"
 
 #: command-list.h:94
 msgid "Download objects and refs from another repository"
-msgstr "Descarga objetos y referencias de otro repositorio"
+msgstr "Descargar objetos y referencias de otro repositorio"
 
 #: command-list.h:95
 msgid "Receive missing objects from another repository"
-msgstr "Descarga objetos faltantes de otro repositorio"
+msgstr "Descargar objetos faltantes de otro repositorio"
 
 #: command-list.h:96
 msgid "Rewrite branches"
@@ -24629,7 +25176,7 @@ msgstr "Reescribir ramas"
 
 #: command-list.h:97
 msgid "Produce a merge commit message"
-msgstr "Produce un mensaje de commit para fusión"
+msgstr "Producir un mensaje de commit de fusión"
 
 #: command-list.h:98
 msgid "Output information on each ref"
@@ -24637,28 +25184,28 @@ msgstr "Información de output en cada ref"
 
 #: command-list.h:99
 msgid "Run a Git command on a list of repositories"
-msgstr "Ejecute un comando de Git en una lista de repositorios"
+msgstr "Ejecutar un comando de Git en una lista de repositorios"
 
 #: command-list.h:100
 msgid "Prepare patches for e-mail submission"
-msgstr "Prepara parches para ser enviados por e-mail"
+msgstr "Preparar parches para ser enviados por e-mail"
 
 #: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr ""
-"Verifica la conectividad y disponibilidad de los objetos en la base de datos"
+"Verificar la conectividad y disponibilidad de los objetos en la base de datos"
 
 #: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
-msgstr "Limpia archivos innecesarios y optimiza el repositorio local"
+msgstr "Limpiar archivos innecesarios y optimiza el repositorio local"
 
 #: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
-msgstr "Extrae el ID de commit de un archivo creado usando git-archive"
+msgstr "Extraer el ID de commit de una crónica creada usando git-archive"
 
 #: command-list.h:104
 msgid "Print lines matching a pattern"
-msgstr "Imprime las líneas que concuerdan con el patron"
+msgstr "Imprimir las líneas que concuerden con el patrón"
 
 #: command-list.h:105
 msgid "A portable graphical interface to Git"
@@ -24666,11 +25213,11 @@ msgstr "Una interfaz gráfica portátil para Git"
 
 #: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
-msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo"
+msgstr "Computar ID de objeto y, opcionalmente, crear un blob de un archivo"
 
 #: command-list.h:107
 msgid "Display help information about Git"
-msgstr "Mostrar información sobre Git"
+msgstr "Mostrar información de ayuda sobre Git"
 
 #: command-list.h:108
 msgid "Server side implementation of Git over HTTP"
@@ -24678,11 +25225,11 @@ msgstr "Implementación de lado de servidor de Git por HTTP"
 
 #: command-list.h:109
 msgid "Download from a remote Git repository via HTTP"
-msgstr "Descarga de un repositorio Git remoto vía HTTP"
+msgstr "Descargar de un repositorio Git remoto vía HTTP"
 
 #: command-list.h:110
 msgid "Push objects over HTTP/DAV to another repository"
-msgstr "Empuja objetos por HTTP/DAV a otro repositorio"
+msgstr "Empujar objetos por HTTP/DAV a otro repositorio"
 
 #: command-list.h:111
 msgid "Send a collection of patches from stdin to an IMAP folder"
@@ -24690,15 +25237,15 @@ msgstr "Enviar una colección de parches de stdin a una carpeta IMAP"
 
 #: command-list.h:112
 msgid "Build pack index file for an existing packed archive"
-msgstr "Constuye un archivo de índice para un archivo empaquetado existente"
+msgstr "Construir un archivo de índice para una crónica empaquetada existente"
 
 #: command-list.h:113
 msgid "Create an empty Git repository or reinitialize an existing one"
-msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe"
+msgstr "Crear un repositorio de Git vacío o reinicia el que ya existe"
 
 #: command-list.h:114
 msgid "Instantly browse your working repository in gitweb"
-msgstr "Buscar instantáneamente tu repositorio de trabajo en gitweb"
+msgstr "Navegar instantáneamente tu repositorio de trabajo en gitweb"
 
 #: command-list.h:115
 msgid "Add or parse structured information in commit messages"
@@ -24710,19 +25257,19 @@ msgstr "El navegador de repositorio Git"
 
 #: command-list.h:117
 msgid "Show commit logs"
-msgstr "Muestra los logs de los commits"
+msgstr "Mostrar los logs de los commits"
 
 #: command-list.h:118
 msgid "Show information about files in the index and the working tree"
-msgstr "Muestra información sobre archivos in el índice y el árbol de trabajo"
+msgstr "Mostrar información sobre archivos en el índice y el árbol de trabajo"
 
 #: command-list.h:119
 msgid "List references in a remote repository"
-msgstr "Lista referencias en un repositorio remoto"
+msgstr "Listar referencias en un repositorio remoto"
 
 #: command-list.h:120
 msgid "List the contents of a tree object"
-msgstr "Lista los contenidos de un objeto árbol"
+msgstr "Listar los contenidos de un objeto árbol"
 
 #: command-list.h:121
 msgid "Extracts patch and authorship from a single e-mail message"
@@ -24734,23 +25281,23 @@ msgstr "Programa divisor de mbox simple de UNIX"
 
 #: command-list.h:123
 msgid "Run tasks to optimize Git repository data"
-msgstr "Ejecute tareas para optimizar los datos del repositorio de Git"
+msgstr "Ejecutar tareas para optimizar los datos del repositorio de Git"
 
 #: command-list.h:124
 msgid "Join two or more development histories together"
-msgstr "Junta dos o más historiales de desarrollo juntos"
+msgstr "Juntar dos o más historiales de desarrollo juntos"
 
 #: command-list.h:125
 msgid "Find as good common ancestors as possible for a merge"
-msgstr "Encuentra un ancestro común bueno para una posible fusión"
+msgstr "Encontrar ancestros tan buenos como posible para una fusión"
 
 #: command-list.h:126
 msgid "Run a three-way file merge"
-msgstr "Ejecuta una fusión de tres vías en un archivo"
+msgstr "Ejecutar una fusión de tres vías en un archivo"
 
 #: command-list.h:127
 msgid "Run a merge for files needing merging"
-msgstr "Ejecuta una fusión para archivos que la necesitan"
+msgstr "Ejecutar una fusión para archivos que la necesiten"
 
 #: command-list.h:128
 msgid "The standard helper program to use with git-merge-index"
@@ -24759,8 +25306,8 @@ msgstr "El programa de ayuda estándar para usar con git-merge-index"
 #: command-list.h:129
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
-"Ejecuta las herramientas de fusión de resolución de conflictos para resolver "
-"conflictos de fusión"
+"Ejecutar las herramientas de fusión de resolución de conflictos para "
+"resolver conflictos de fusión"
 
 #: command-list.h:130
 msgid "Show three-way merge without touching index"
@@ -24768,11 +25315,11 @@ msgstr "Mostrar fusión de tres vías sin tocar el índice"
 
 #: command-list.h:131
 msgid "Write and verify multi-pack-indexes"
-msgstr "Escribe y verifica archivos multi-pack-index"
+msgstr "Escribir y verificar archivos multi-pack-index"
 
 #: command-list.h:132
 msgid "Creates a tag object with extra validation"
-msgstr "Crea un objeto de etiqueta con validación adicional"
+msgstr "Crear un objeto de etiqueta con validación adicional"
 
 #: command-list.h:133
 msgid "Build a tree-object from ls-tree formatted text"
@@ -24780,7 +25327,7 @@ msgstr "Construir un objeto árbol de un texto en formato ls-tree"
 
 #: command-list.h:134
 msgid "Move or rename a file, a directory, or a symlink"
-msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbólicos"
+msgstr "Mover o cambiar el nombre a archivos, directorios o enlaces simbólicos"
 
 #: command-list.h:135
 msgid "Find symbolic names for given revs"
@@ -24788,7 +25335,7 @@ msgstr "Encontrar nombres simbólicos para revs dados"
 
 #: command-list.h:136
 msgid "Add or inspect object notes"
-msgstr "Agrega o inspecciona objetos nota"
+msgstr "Agregar o inspeccionar notas de objeto"
 
 #: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
@@ -24796,15 +25343,15 @@ msgstr "Importar desde y enviar a repositorios Perforce"
 
 #: command-list.h:138
 msgid "Create a packed archive of objects"
-msgstr "Crea un archivo de objetos empaquetados"
+msgstr "Crear una crónica de objetos empaquetada"
 
 #: command-list.h:139
 msgid "Find redundant pack files"
-msgstr "Encuentra archivos empaquetados de manera redundante"
+msgstr "Encontrar archivos de paquete redundantes"
 
 #: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
-msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio"
+msgstr "Empaquetar heads y tags para un acceso eficiente al repositorio"
 
 #: command-list.h:141
 msgid "Compute unique ID for a patch"
@@ -24812,35 +25359,36 @@ msgstr "Calcular ID único para un parche"
 
 #: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
-msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos"
+msgstr ""
+"Limpiar todos los objetos no alcanzables de la base de datos de objetos"
 
 #: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
-msgstr "Remover objetos extra que ya están en archivos empaquetados"
+msgstr "Quitar objetos extras que ya estén en archivos empaquetados"
 
 #: command-list.h:144
 msgid "Fetch from and integrate with another repository or a local branch"
-msgstr "Realiza un fetch e integra con otro repositorio o rama local"
+msgstr "Realizar un fetch e integra con otro repositorio o rama local"
 
 #: command-list.h:145
 msgid "Update remote refs along with associated objects"
-msgstr "Actualiza referencias remotas junto con sus objetos asociados"
+msgstr "Actualizar referencias remotas junto con sus objetos asociados"
 
 #: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
-msgstr "Aplica un parche quilt en la rama actual"
+msgstr "Aplicar un parche quilt en la rama actual"
 
 #: command-list.h:147
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
-msgstr "Compara dos rangos de commits (por ejemplo dos versions de un branch)"
+msgstr "Comparar dos rangos de commits (por ejemplo dos versions de un branch)"
 
 #: command-list.h:148
 msgid "Reads tree information into the index"
-msgstr "Lee información del ábol en el índice"
+msgstr "Leer información del árbol al índice"
 
 #: command-list.h:149
 msgid "Reapply commits on top of another base tip"
-msgstr "Vuelve a aplicar commits en la punta de otra rama"
+msgstr "Volver a aplicar commits en la punta de otra rama"
 
 #: command-list.h:150
 msgid "Receive what is pushed into the repository"
@@ -24852,7 +25400,7 @@ msgstr "Gestionar información de reflog"
 
 #: command-list.h:152
 msgid "Manage set of tracked repositories"
-msgstr "Gestiona un conjunto de repositorios rastreados"
+msgstr "Gestionar un conjunto de repositorios rastreados"
 
 #: command-list.h:153
 msgid "Pack unpacked objects in a repository"
@@ -24860,11 +25408,11 @@ msgstr "Empaquetar objetos no empaquetados en un repositorio"
 
 #: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
-msgstr "Crea, lista, borra referencias para reemplazar objetos"
+msgstr "Crear, listar, borrar referencias para reemplazar objetos"
 
 #: command-list.h:155
 msgid "Generates a summary of pending changes"
-msgstr "Genera un resumen de cambios pendientes"
+msgstr "Generar un resumen de cambios pendientes"
 
 #: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
@@ -24872,19 +25420,19 @@ msgstr "Reutilizar la resolución registrada de fusiones conflictivas"
 
 #: command-list.h:157
 msgid "Reset current HEAD to the specified state"
-msgstr "Reinicia el HEAD actual a un estado especifico"
+msgstr "Reiniciar el HEAD actual a un estado específico"
 
 #: command-list.h:158
 msgid "Restore working tree files"
-msgstr "Restaurar archivos de árboles de trabajo"
+msgstr "Restaurar archivos del árbol de trabajo"
 
 #: command-list.h:159
 msgid "Revert some existing commits"
-msgstr "Revierte algunos commits existentes"
+msgstr "Reviertir algunos commits existentes"
 
 #: command-list.h:160
 msgid "Lists commit objects in reverse chronological order"
-msgstr "Lista objetos commit en orden cronológico inverso"
+msgstr "Listar objetos commit en orden cronológico inverso"
 
 #: command-list.h:161
 msgid "Pick out and massage parameters"
@@ -24892,11 +25440,11 @@ msgstr "Seleccionar y masajear los parámetros"
 
 #: command-list.h:162
 msgid "Remove files from the working tree and from the index"
-msgstr "Borra archivos del árbol de trabajo y del índice"
+msgstr "Borrar archivos del árbol de trabajo y del índice"
 
 #: command-list.h:163
 msgid "Send a collection of patches as emails"
-msgstr "Envía una colección de parches como e-mails"
+msgstr "Enviar una colección de parches como e-mails"
 
 #: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
@@ -24908,11 +25456,11 @@ msgstr "Shell de inicio de sesión restringido para acceso SSH exclusivo de Git"
 
 #: command-list.h:166
 msgid "Summarize 'git log' output"
-msgstr "Resumir la salida 'git log'"
+msgstr "Resumir la salida de 'git log'"
 
 #: command-list.h:167
 msgid "Show various types of objects"
-msgstr "Muestra varios tipos de objetos"
+msgstr "Mostrar varios tipos de objetos"
 
 #: command-list.h:168
 msgid "Show branches and their commits"
@@ -24920,7 +25468,7 @@ msgstr "Mostrar ramas y sus commits"
 
 #: command-list.h:169
 msgid "Show packed archive index"
-msgstr "Mostrar el índice de archivo empaquetado"
+msgstr "Mostrar el índice de crónica empaquetado"
 
 #: command-list.h:170
 msgid "List references in a local repository"
@@ -24932,25 +25480,23 @@ msgstr "El código de configuración i18n de Git para scripts de shell"
 
 #: command-list.h:172
 msgid "Common Git shell script setup code"
-msgstr "Código de configuración de script de shell común de Git"
+msgstr "Código común de configuración de script de shell de Git"
 
 #: command-list.h:173
 msgid "Initialize and modify the sparse-checkout"
-msgstr "Inicializa y modifica el sparse-checkout"
+msgstr "Inicializar y modificar el sparse-checkout"
 
 #: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
-msgstr ""
-"Poner en un stash los cambios en un directorio de trabajo sucio de todas "
-"maneras"
+msgstr "Poner en un stash los cambios en un directorio de trabajo sucio"
 
 #: command-list.h:175
 msgid "Add file contents to the staging area"
-msgstr "Agrega contenidos de un archivo al área de staging"
+msgstr "Agregar contenidos de un archivo al área de staging"
 
 #: command-list.h:176
 msgid "Show the working tree status"
-msgstr "Muestra el estado del árbol de trabajo"
+msgstr "Mostrar el estado del árbol de trabajo"
 
 #: command-list.h:177
 msgid "Remove unnecessary whitespace"
@@ -24958,7 +25504,7 @@ msgstr "Eliminar el espacio en blanco innecesario"
 
 #: command-list.h:178
 msgid "Initialize, update or inspect submodules"
-msgstr "Inicializa, actualiza o inspecciona submódulos"
+msgstr "Inicializar, actualizar o inspeccionar submódulos"
 
 #: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
@@ -24970,38 +25516,38 @@ msgstr "Cambiar de branch"
 
 #: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
-msgstr "Lee, modifica y borra referencias simbólicas"
+msgstr "Leer, modificar y borrar referencias simbólicas"
 
 #: command-list.h:182
 msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
+msgstr "Crear, listar, borrar o verificar un objeto de tag firmado con GPG"
 
 #: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
-msgstr "Crea un archivo temporal con contenidos de un blob"
+msgstr "Crear un archivo temporal con contenidos de un blob"
 
 #: command-list.h:184
 msgid "Unpack objects from a packed archive"
-msgstr "Desempaqueta objetos de un archivo empaquetado"
+msgstr "Desempaquetar objetos de una crónica empaquetada"
 
 #: command-list.h:185
 msgid "Register file contents in the working tree to the index"
-msgstr "Registra contenidos de archivos en el árbol de trabajo al índice"
+msgstr "Registrar contenidos de archivos en el árbol de trabajo al índice"
 
 #: command-list.h:186
 msgid "Update the object name stored in a ref safely"
 msgstr ""
-"Actualiza el nombre del objeto almacenado en una referencia de forma segura"
+"Actualizar el nombre del objeto almacenado en una referencia de forma segura"
 
 #: command-list.h:187
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
-"Actualiza el archivo de información auxiliar para ayudar a los servidores "
+"Actualizar el archivo de información auxiliar para ayudar a los servidores "
 "dumb"
 
 #: command-list.h:188
 msgid "Send archive back to git-archive"
-msgstr "Enviar archivo a git-archive"
+msgstr "Enviar crónica de vuelta a git-archive"
 
 #: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
@@ -25017,11 +25563,11 @@ msgstr "Verificar firma GPG de commits"
 
 #: command-list.h:192
 msgid "Validate packed Git archive files"
-msgstr "Valida archivos Git empaquetados"
+msgstr "Validar crónicas Git empaquetadas"
 
 #: command-list.h:193
 msgid "Check the GPG signature of tags"
-msgstr "Verifica la firma GPG de etiquetas"
+msgstr "Verificar la firma GPG de etiquetas"
 
 #: command-list.h:194
 msgid "Git web interface (web frontend to Git repositories)"
@@ -25029,19 +25575,19 @@ msgstr "Interfaz web Git (interfaz web para repositorios Git)"
 
 #: command-list.h:195
 msgid "Show logs with difference each commit introduces"
-msgstr "Muestra logs con las diferencias que cada commit introduce"
+msgstr "Mostrar logs con las diferencias que cada commit introduce"
 
 #: command-list.h:196
 msgid "Manage multiple working trees"
-msgstr "Gestiona múltiples árboles de trabajo"
+msgstr "Gestionar múltiples árboles de trabajo"
 
 #: command-list.h:197
 msgid "Create a tree object from the current index"
-msgstr "Crea un objeto árbol del índice actual"
+msgstr "Crear un objeto árbol del índice actual"
 
 #: command-list.h:198
 msgid "Defining attributes per path"
-msgstr "Definiendo atributos por ruta"
+msgstr "Definir atributos por ruta"
 
 #: command-list.h:199
 msgid "Git command-line interface and conventions"
@@ -25057,7 +25603,7 @@ msgstr "Proporcionar nombres de usuario y contraseñas a Git"
 
 #: command-list.h:202
 msgid "Git for CVS users"
-msgstr "Git para usuarios CVS"
+msgstr "Git para usuarios de CVS"
 
 #: command-list.h:203
 msgid "Tweaking diff output"
@@ -25065,7 +25611,7 @@ msgstr "Afinar la salida de diff"
 
 #: command-list.h:204
 msgid "A useful minimum set of commands for Everyday Git"
-msgstr "Un conjunto mínimo útil de comandos diarios de Git"
+msgstr "Un conjunto mínimo útil de comandos cotidianos de Git"
 
 #: command-list.h:205
 msgid "Frequently asked questions about using Git"
@@ -25081,7 +25627,7 @@ msgstr "Hooks utilizados por Git"
 
 #: command-list.h:208
 msgid "Specifies intentionally untracked files to ignore"
-msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
+msgstr "Especificar de forma intencional archivos sin seguimiento a ignorar"
 
 #: command-list.h:209
 msgid "Map author/committer names and/or E-Mail addresses"
@@ -25091,7 +25637,7 @@ msgstr ""
 
 #: command-list.h:210
 msgid "Defining submodule properties"
-msgstr "Definiendo las propiedades del submódulo"
+msgstr "Definir las propiedades de submódulo"
 
 #: command-list.h:211
 msgid "Git namespaces"
@@ -25125,41 +25671,6 @@ msgstr "Un tutorial de introducción a Git"
 msgid "An overview of recommended workflows with Git"
 msgstr "Una visión general de flujos de trabajo recomendados con Git"
 
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "bisect falló: no se proveyó comando."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "ejecutando $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"bisect falló:\n"
-"código de salida $res de '$command' es <0 o >=128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "bisect no puede seguir continuando"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"bisect run falló:\n"
-"'bisect-state $state' salió con el código de error $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "bisect exitoso"
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -25174,7 +25685,7 @@ msgstr "Fusión automatizada no funcionó."
 
 #: git-merge-octopus.sh:62
 msgid "Should not be doing an octopus."
-msgstr "No debería hacer un pulpo."
+msgstr "No se debería hacer un pulpo."
 
 #: git-merge-octopus.sh:73
 #, sh-format
@@ -25200,504 +25711,32 @@ msgstr "Intentando fusión simple con $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Fusión simple no funcionó, intentando fusión automática."
 
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-"La ruta relativa sólo se puede usar desde el nivel superior del árbol de "
-"trabajo"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' ya existe en el índice"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' ya existe en el índice y no es un submódulo"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' no tiene un commit checked out"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "Agregando el repositorio existente en '$sm_path' al índice"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "'$sm_path' ya existe y no es un repositorio git válido"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-"Se encontró localmente un directorio git para '$sm_name' con el(los) "
-"remoto(s):"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-"  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"Si quiere reusar este directorio git local en lugar de clonar nuevamente de\n"
-"  $realrepo\n"
-"usa la opción '--force'. Si el directorio git local no es el repositorio "
-"correcto\n"
-"o no estás seguro de lo que esto significa, escoge otro nombre con la opción "
-"'--name'."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "Reactivar directorio git local para el submódulo '$sm_name'."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "No es posible hacer checkout al submódulo '$sm_path'"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Falló al agregar el submódulo '$sm_path'"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Falló al registrar el submódulo '$sm_path'"
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "No se pudo encontrar la revisión actual en la ruta de submódulo "
 "'$displaypath'"
 
-#: git-submodule.sh:578
+#: git-submodule.sh:411
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:416
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr ""
 "No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta "
-"de submódulo  '$sm_path'"
+"de submódulo '$sm_path'"
 
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"No es posible realizar fetch en la ruta de submódulo '$displaypath'; "
-"intentando hacer un fetch directo $sha1:"
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. "
-"Fetch directo del commit falló."
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'"
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"No se posible ejecutar rebase a '$sha1' en la ruta de submódulo "
-"'$displaypath'"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'"
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'"
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Falló la ejecución  de  '$command $sha1' en la ruta de submódulo "
-"'$displaypath'"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'"
 
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Autostash aplicado."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "No se puede almacenar $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"Aplicar autostash resultó en conflictos.\n"
-"Tus cambios están seguros en el stash.\n"
-"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
-"momento.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Rebasando ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-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"
-"Comandos:\n"
-"p, pick <commit> = usar commit\n"
-"r, reword <commit> = usar commit, pero editar el mensaje de commit\n"
-"e, edit <commit> = usar commit, pero parar para un amend\n"
-"s, squash <commit> = usar commit, pero fusionarlo en el commit previo\n"
-"f, fixup <commit> = como \"squash\", pero descarta el mensaje del log de "
-"este commit\n"
-"x, exec <commit> = ejecuta comando ( el resto de la línea) usando un shell\n"
-"d, drop <commit> = eliminar commit\n"
-"l, label <label> = poner label al HEAD actual con un nombre\n"
-"t, reset <label> = reiniciar HEAD al label\n"
-"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-".       crea un commit de fusión usando el mensaje original de\n"
-".       fusión (o la línea de oneline, si no se especifica un mensaje\n"
-".       de commit). Use -c <commit> para reescribir el mensaje del commit.\n"
-"\n"
-"Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
-"abajo.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, 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 ""
-"Puedes enmendar el commit ahora, con\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Una vez que estés satisfecho con los cambios, ejecuta\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: no es un commit que pueda ser cogido"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Nombre de commit inválido: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "No se puede escribir el remplazo sha1 del commit actual"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Avance rápido a $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "No se puede realizar avance rápido a $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "No se puede mover HEAD a $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Rehusando a ejecutar squash en fusión: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Error rehaciendo fusión $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "No se pudo coger $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Este es el mensaje del commit #${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "El mensaje del commit  #${n} será ignorado:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Esta es una combinación de $count commit."
-msgstr[1] "Esta es la combinación de $count commits."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "No se puede escribir $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Esto es una combinación de 2 commits."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "No se puede aplicar $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, sh-format
-msgid ""
-"Could not amend commit after successfully picking $sha1... $rest\n"
-"This is most likely due to an empty commit message, or the pre-commit hook\n"
-"failed. If the pre-commit hook failed, you may need to resolve the issue "
-"before\n"
-"you are able to reword the commit."
-msgstr ""
-"No se pudo corregir commit después de seleccionar exitosamente $sha1 ... "
-"$rest\n"
-"Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-"
-"commit\n"
-"ha fallado. Si el hook pre-commit falló, es posible que debas resolver el "
-"problema antes\n"
-"de que sea capaz de reformular el commit."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Detenido en $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "No se puede '$squash_style' sin un commit previo"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Ejecutando: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Ejecución fallida: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "y hizo cambios al índice y/o al árbol de trabajo"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Puedes corregir el problema y entonces ejecutar\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, sh-format
-msgid ""
-"Execution succeeded: $rest\n"
-"but left changes to the index and/or the working tree\n"
-"Commit or stash your changes, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"La ejecución tuvo éxito: $rest\n"
-"Pero dejó cambios en el índice y/o en el árbol de trabajo\n"
-"Realiza un commit o stash con los cambios y, a continuación, ejecuta\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Comando desconocido: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "$head_name rebasado y actualizado satisfactoriamente."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "No se pudo eliminar CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, 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 ""
-"Tienes cambios en el área de stage de tu árbol de trabajo.\n"
-"Si estos cambios están destinados a\n"
-"ser aplastados en el commit previo, ejecuta:\n"
-"\n"
-"  git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Si estos están destinados a ir en un nuevo commit, ejecuta:\n"
-"\n"
-"  git commit $gpg_sign_opt_quoted\n"
-"\n"
-"En ambos casos, cuando termines, continue con:\n"
-"\n"
-"  git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-"Error tratando de encontrar la identidad del autor para remediar el commit"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n"
-"primero y entonces ejecuta 'git rebase --continue' de nuevo."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "No se pudo realizar el commit con los cambios en el área de stage."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "No se pudo ejecutar el editor"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "¿Sin HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "No se pudo crear $state_dir temporalmente"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "No se pudo marcar como interactivo"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)"
-msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Tenga en cuenta que los commits vacíos están comentados"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "No se puede inicializar los commits reescritos"
-
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 msgid "usage: $dashless $USAGE"
@@ -25715,55 +25754,32 @@ msgid "fatal: $program_name cannot be used without a working tree."
 msgstr "fatal: $program_name no puede ser usado sin un árbol de trabajo."
 
 #: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr ""
-"No se puede aplicar rebase: Tienes cambios que no están en el área de stage."
-
-#: git-sh-setup.sh:224
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr ""
 "No se puede reescribir las ramas: Tienes cambios que no están en el área de "
 "stage."
 
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"No se puede aplicar pull con rebase: Tienes cambios que no están en el área "
-"de stage."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "No se puede $action: Tienes cambios que no están en el área de stage."
 
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"No se puede hacer rebase: Tu índice contiene cambios que no están en un "
-"commit."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"No se puede hacer pull con rebase: Tu índice contiene cambios que no están "
-"en un commit."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr "No se puede $action: El índice contiene cambios sin confirmar."
 
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "Adicionalmente, tu índice contiene cambios que no están en un commit."
 
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr ""
 "Necesitas ejecutar este comando desde el nivel superior de tu árbol de "
 "trabajo."
 
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
 msgid "Unable to determine absolute path of git directory"
 msgstr "Incapaz de determinar la ruta absoluta del directorio git"
 
@@ -25785,7 +25801,7 @@ msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr ""
-"Si el parche aplica limpiamente, el hunk editado será marcado\n"
+"Si el parche aplica limpiamente, el fragmento editado será marcado\n"
 "inmediatamente para el área de stage."
 
 #: git-add--interactive.perl:1059
@@ -25793,15 +25809,15 @@ msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr ""
-"Si el parche aplica limpiamente, el hunk editado será marcado\n"
-"inmediatamente para aplicar stash."
+"Si el parche aplica limpiamente, el fragmento editado será marcado\n"
+"inmediatamente para hacer stash."
 
 #: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr ""
-"Si el parche aplica limpiamente, el hunk editado será marcado\n"
+"Si el parche aplica limpiamente, el fragmento editado será marcado\n"
 "inmediatamente para sacar del área de stage."
 
 #: git-add--interactive.perl:1065 git-add--interactive.perl:1074
@@ -25810,7 +25826,7 @@ msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr ""
-"Si el parche aplica de forma limpia, el hunk editado será marcado\n"
+"Si el parche aplica de forma limpia, el fragmento editado será marcado\n"
 "inmediatamente para aplicar."
 
 #: git-add--interactive.perl:1068 git-add--interactive.perl:1071
@@ -25819,13 +25835,13 @@ msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr ""
-"Si el parche aplica de forma limpia, el hunk editado será marcado\n"
+"Si el parche aplica de forma limpia, el fragmento editado será marcado\n"
 "inmediatamente para descarte."
 
 #: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
-msgstr "falló al abrir el archivo de adición del hunk para escritura: %s"
+msgstr "falló al abrir el archivo de adición del fragmento para escritura: %s"
 
 #: git-add--interactive.perl:1121
 #, perl-format
@@ -25836,14 +25852,14 @@ msgid ""
 "Lines starting with %s will be removed.\n"
 msgstr ""
 "---\n"
-"Para eliminar '%s' líneas, haga de ellas líneas  ' '  (contexto).\n"
-"Para eliminar '%s' líneas, bórrelas.\n"
-"Lineas comenzando con  %s serán eliminadas.\n"
+"Para eliminar '%s' líneas, haz de ellas líneas ' ' (contexto).\n"
+"Para eliminar '%s' líneas, bórralas.\n"
+"Líneas comenzando con %s serán eliminadas.\n"
 
 #: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
-msgstr "falló al abrir el archivo de edición del hunk para lectura: %s"
+msgstr "falló al abrir el archivo de edición del fragmento para lectura: %s"
 
 #: git-add--interactive.perl:1251
 msgid ""
@@ -25853,12 +25869,12 @@ msgid ""
 "a - stage this hunk and all later hunks in the file\n"
 "d - do not stage this hunk or any of the later hunks in the file"
 msgstr ""
-"y - aplicar stage a este hunk\n"
-"n - no aplicar stage a este hunk\n"
-"q - quit; no aplicar stage a este hunk ni ninguno de los restantes\n"
-"a - aplicar stage a este hunk y a todos los posteriores en el archivo\n"
-"d - no aplicar stage a este hunk ni a ninguno de los posteriores en este "
-"archivo"
+"y - aplicar stage a este fragmento\n"
+"n - no aplicar stage a este fragmento\n"
+"q - quit; no aplicar stage a este fragmento ni ninguno de los restantes\n"
+"a - aplicar stage a este fragmento y a todos los posteriores en el archivo\n"
+"d - no aplicar stage a este fragmento ni a ninguno de los posteriores en "
+"este archivo"
 
 #: git-add--interactive.perl:1257
 msgid ""
@@ -25868,11 +25884,12 @@ msgid ""
 "a - stash this hunk and all later hunks in the file\n"
 "d - do not stash this hunk or any of the later hunks in the file"
 msgstr ""
-"y - aplicar stash a este hunk\n"
-"n - no aplicar stash a este hunk\n"
-"q - quit; no aplicar stash a este hunk o a ninguno de los restantes\n"
-"a - aplicar stash a este hunk y a todos los posteriores en el archivo\n"
-"d - no aplicar stash a este hunk ni ninguno de los posteriores en el archivo"
+"y - hacer stash a este fragmento\n"
+"n - no hacer stash a este fragmento\n"
+"q - quit; no hacer stash a este fragmento ni a ninguno de los restantes\n"
+"a - hacer stash a este fragmento y a todos los posteriores en el archivo\n"
+"d - no hacer stash a este fragmento ni ninguno de los posteriores en el "
+"archivo"
 
 #: git-add--interactive.perl:1263
 msgid ""
@@ -25882,12 +25899,14 @@ msgid ""
 "a - unstage this hunk and all later hunks in the file\n"
 "d - do not unstage this hunk or any of the later hunks in the file"
 msgstr ""
-"y - sacar desde hunk del área de stage\n"
-"n - no sacar este hunk del area de stage\n"
-"q - quit; no sacar del area de stage este hunk ni ninguno de los restantes\n"
-"a - sacar del area de stage este hunk y todos los posteriores en el archivo\n"
-"d - no sacar del area de stage este hunk ni ninguno de los posteriores en el "
-"archivo"
+"y - sacar este fragmento del área de stage\n"
+"n - no sacar este fragmento del area de stage\n"
+"q - quit; no sacar del area de stage este fragmento ni ninguno de los "
+"restantes\n"
+"a - sacar del area de stage este fragmento y todos los posteriores en el "
+"archivo\n"
+"d - no sacar del area de stage este fragmento ni ninguno de los posteriores "
+"en el archivo"
 
 #: git-add--interactive.perl:1269
 msgid ""
@@ -25897,11 +25916,11 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
-"y - aplicar este hunk al índice\n"
-"n - no aplicar este hunk al índice\n"
-"q - quit; no aplicar este hunk ni ninguno de los restantes\n"
-"a - aplicar este hunk y todos los posteriores en el archivo\n"
-"d - no aplicar este hunk ni ninguno de los posteriores en el archivo"
+"y - aplicar este fragmento al índice\n"
+"n - no aplicar este fragmento al índice\n"
+"q - quit; no aplicar este fragmento ni ninguno de los restantes\n"
+"a - aplicar este fragmento y todos los posteriores en el archivo\n"
+"d - no aplicar este fragmento ni ninguno de los posteriores en el archivo"
 
 #: git-add--interactive.perl:1275 git-add--interactive.perl:1293
 msgid ""
@@ -25911,11 +25930,11 @@ msgid ""
 "a - discard this hunk and all later hunks in the file\n"
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
-"y - descartar este hunk del árbol de trabajo\n"
-"n - no descartar este hunk del árbol de trabajo\n"
-"q - quit; no descartar este hunk ni ninguno de los que restantes\n"
-"a - descartar este hunk y todos los posteriores en este archivo\n"
-"d - no descartar este hunk ni ninguno de los posteriores en el archivo"
+"y - descartar este fragmento del árbol de trabajo\n"
+"n - no descartar este fragmento del árbol de trabajo\n"
+"q - quit; no descartar este fragmento ni ninguno de los que restantes\n"
+"a - descartar este fragmento y todos los posteriores en este archivo\n"
+"d - no descartar este fragmento ni ninguno de los posteriores en el archivo"
 
 #: git-add--interactive.perl:1281
 msgid ""
@@ -25925,11 +25944,11 @@ msgid ""
 "a - discard this hunk and all later hunks in the file\n"
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
-"y - descartar este hunk del índice y el árbol de trabajo\n"
-"n - no descartar este hunk del índice ni el árbol de trabajo\n"
-"q - quit; no descartar este hunk ni ninguno de los que queden\n"
-"a - descartar este hunk y todos los posteriores en este archivo\n"
-"d - no descartar este hunk ni ninguno posterior en el archivo"
+"y - descartar este fragmento del índice y del árbol de trabajo\n"
+"n - no descartar este fragmentodel índice ni del árbol de trabajo\n"
+"q - quit; no descartar este fragmento ni ninguno de los que quedan\n"
+"a - descartar este fragmento y todos los posteriores en este archivo\n"
+"d - no descartar este fragmento ni ninguno posterior en el archivo"
 
 #: git-add--interactive.perl:1287
 msgid ""
@@ -25939,11 +25958,11 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
-"y - aplicar este hunk al índice y al árbol de trabajo\n"
-"n - no aplicar este hunk al índice y al árbol de trabajo\n"
-"q - quit;  no aplicar este hunk ni ninguno de los restantes\n"
-"a - aplicar este hunk y todos los posteriores en el archivo\n"
-"d - no aplicar este hunk ni ninguno de los siguientes en este archivo"
+"y - aplicar este fragmento al índice y al árbol de trabajo\n"
+"n - no aplicar este fragmento al índice y al árbol de trabajo\n"
+"q - quit; no aplicar este fragmento ni ninguno de los restantes\n"
+"a - aplicar este fragmento y todos los posteriores en el archivo\n"
+"d - no aplicar este fragmento ni ninguno de los siguientes en este archivo"
 
 #: git-add--interactive.perl:1299
 msgid ""
@@ -25953,11 +25972,11 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
-"y - aplicar este hunk al índice y al árbol de trabajo\n"
-"n - no aplicar este hunk al índice y al árbol de trabajo\n"
-"q - quit;  no aplicar este hunk ni ninguno de los restantes\n"
-"a - aplicar este hunk y todos los posteriores en el archivo\n"
-"d - no aplicar este hunk ni ninguno de los siguientes en este archivo"
+"y - aplicar este fragmento al índice y al árbol de trabajo\n"
+"n - no aplicar este fragmento al índice y al árbol de trabajo\n"
+"q - quit; no aplicar este fragmento ni ninguno de los restantes\n"
+"a - aplicar este fragmento y todos los posteriores en el archivo\n"
+"d - no aplicar este fragmento ni ninguno de los siguientes en este archivo"
 
 #: git-add--interactive.perl:1314
 msgid ""
@@ -25972,13 +25991,13 @@ msgid ""
 "? - print help\n"
 msgstr ""
 "g - selecciona un hunk a donde ir\n"
-"/ - buscar un hunk que concuerde el  regex\n"
-"j - dejar este hunk por definir, ver siguiente hunk por definir\n"
-"J - dejar este hunk por definir, ver siguiente hunk\n"
-"k - dejar este hunk por definir, ver hunk previo por definir\n"
-"K - dejar este hunk por definir, ver hunk previo\n"
-"s - dividir el  hunk actual en hunks más pequeños\n"
-"e - editar manualmente el hunk actual\n"
+"/ - buscar un hunk que concuerde con el regex dado\n"
+"j - dejar este fragmento por definir, ver siguiente fragmento por definir\n"
+"J - dejar este fragmento por definir, ver siguiente fragmento\n"
+"k - dejar este fragmento por definir, ver fragmento previo por definir\n"
+"K - dejar este fragmento por definir, ver fragmento previo\n"
+"s - dividir el fragmento actual en hunks más pequeños\n"
+"e - editar manualmente el fragmento actual\n"
 "? - imprimir ayuda\n"
 
 #: git-add--interactive.perl:1345
@@ -25993,12 +26012,12 @@ msgstr "ignorando lo no fusionado: %s\n"
 #: git-add--interactive.perl:1479
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar cambio de modo para el árbol de trabajo [y,n,q,a,d%s,?]? "
+msgstr "¿Aplicar cambio de modo al árbol de trabajo [y,n,q,a,d%s,?]? "
 
 #: git-add--interactive.perl:1480
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar borrado al árbol de trabajo [y,n,q,a,d%s,?]? "
+msgstr "¿Aplicar eliminación al árbol de trabajo [y,n,q,a,d%s,?]? "
 
 #: git-add--interactive.perl:1481
 #, perl-format
@@ -26008,16 +26027,16 @@ msgstr "¿Aplicar adición al árbol de trabajo [y,n,q,a,d%s,?]? "
 #: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar este hunk al árbol de trabajo [y,n,q,a,d,/%s,?]? "
+msgstr "¿Aplicar este fragmento al árbol de trabajo [y,n,q,a,d,/%s,?]? "
 
 #: git-add--interactive.perl:1599
 msgid "No other hunks to goto\n"
-msgstr "No hay más pedazos para el ir\n"
+msgstr "No hay más fragmentos a que ir\n"
 
 #: git-add--interactive.perl:1617
 #, perl-format
 msgid "Invalid number: '%s'\n"
-msgstr "Numero inválido: '%s'\n"
+msgstr "Número inválido: '%s'\n"
 
 #: git-add--interactive.perl:1622
 #, perl-format
@@ -26028,7 +26047,7 @@ msgstr[1] "Lo siento, solo %d hunks disponibles.\n"
 
 #: git-add--interactive.perl:1657
 msgid "No other hunks to search\n"
-msgstr "No hay más pedazos para buscar\n"
+msgstr "No hay más fragmentos para buscar\n"
 
 #: git-add--interactive.perl:1674
 #, perl-format
@@ -26037,15 +26056,15 @@ msgstr "Regexp para la búsqueda mal formado %s: %s\n"
 
 #: git-add--interactive.perl:1684
 msgid "No hunk matches the given pattern\n"
-msgstr "No hay hunks que concuerden con el patrón entregado.\n"
+msgstr "No hay fragmentos que concuerden con el patrón entregado.\n"
 
 #: git-add--interactive.perl:1696 git-add--interactive.perl:1718
 msgid "No previous hunk\n"
-msgstr "No el anterior hunk\n"
+msgstr "Sin hunk previo\n"
 
 #: git-add--interactive.perl:1705 git-add--interactive.perl:1724
 msgid "No next hunk\n"
-msgstr "No el siguiente hunk\n"
+msgstr "Sin hunk siguiente\n"
 
 #: git-add--interactive.perl:1730
 msgid "Sorry, cannot split this hunk\n"
@@ -26055,8 +26074,8 @@ msgstr "Perdón, no se puede dividir este pedazo\n"
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
-msgstr[0] "Cortar en %d hunk.\n"
-msgstr[1] "Cortar en  %d hunks.\n"
+msgstr[0] "Cortar en %d fragmento.\n"
+msgstr[1] "Cortar en %d fragmentos.\n"
 
 #: git-add--interactive.perl:1746
 msgid "Sorry, cannot edit this hunk\n"
@@ -26074,14 +26093,14 @@ msgid ""
 "add untracked - add contents of untracked files to the staged set of "
 "changes\n"
 msgstr ""
-"status        - muestra las rutas con cambios\n"
-"update        - agrega el estado del árbol de trabajo al set de cambios en "
+"status        - mostrar las rutas con cambios\n"
+"update        - agregar el estado del árbol de trabajo al set de cambios en "
 "el área de stage\n"
-"revert        - revierte los cambios en el área de stage de regreso a la "
+"revert        - revertir los cambios en el área de stage de regreso a la "
 "versión HEAD\n"
-"patch         - selecciona los hunks y actualiza de forma selectiva\n"
+"patch         - seleccionar los hunks y actualiza de forma selectiva\n"
 "diff          - mirar la diff entre HEAD y el índice\n"
-"add untracked - agrega contenidos de archivos no rastreados al grupo de "
+"add untracked - agregar contenidos de archivos no rastreados al grupo de "
 "cambios del area de stage\n"
 
 #: git-add--interactive.perl:1828 git-add--interactive.perl:1840
@@ -26101,94 +26120,94 @@ msgstr "modo --patch desconocido: %s"
 msgid "invalid argument %s, expecting --"
 msgstr "argumento inválido %s, se esperaba --"
 
-#: git-send-email.perl:138
+#: git-send-email.perl:129
 msgid "local zone differs from GMT by a non-minute interval\n"
-msgstr "la zona local difiere de GMT por un intervalo de cero minutos\n"
+msgstr "la zona local difiere de GMT por un intervalo de minutos no entero\n"
 
-#: git-send-email.perl:145 git-send-email.perl:151
+#: git-send-email.perl:136 git-send-email.perl:142
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "el offset del tiempo local es mayor o igual a 24 horas\n"
 
-#: git-send-email.perl:222
+#: git-send-email.perl:214
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "fatal: comando '%s' murió con código de salida %d"
 
-#: git-send-email.perl:235
+#: git-send-email.perl:227
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "el editor se cerró inapropiadamente, abortando todo"
 
-#: git-send-email.perl:321
+#: git-send-email.perl:316
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 "'%s' contiene una versión intermedia del correo que se estaba generando.\n"
 
-#: git-send-email.perl:326
+#: git-send-email.perl:321
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' contiene el email generado.\n"
 
-#: git-send-email.perl:419
+#: git-send-email.perl:450
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases no es compatible con otras opciones.\n"
 
-#: git-send-email.perl:493
+#: git-send-email.perl:525
 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: opciones de configuración encontradas para 'sendmail'\n"
-"git-send-email está configurado con las opciones sendemail. * - tenga en "
-"cuenta la 'e'.\n"
-"Establezca sendemail.forbidSendmailVariables en false para deshabilitar esta "
+"git-send-email está configurado con las opciones sendemail.* - ten en cuenta "
+"la 'e'.\n"
+"Establece sendemail.forbidSendmailVariables en false para deshabilitar esta "
 "verificación.\n"
 
-#: git-send-email.perl:498 git-send-email.perl:700
+#: git-send-email.perl:530 git-send-email.perl:746
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "No se puede ejecutar git format-patch desde fuera del repositorio.\n"
 
-#: git-send-email.perl:501
+#: git-send-email.perl:533
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
 msgstr ""
-"`batch-size` y `relogin` deben ser especificados juntos (via la línea de "
+"`batch-size` y `relogin` deben ser especificados juntos (vía la línea de "
 "comando o por opción de configuración)\n"
 
-#: git-send-email.perl:514
+#: git-send-email.perl:546
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Campo --suppress-cc desconocido: '%s'\n"
 
-#: git-send-email.perl:545
+#: git-send-email.perl:577
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Configuración --confirm desconocida: '%s'\n"
 
-#: git-send-email.perl:573
+#: git-send-email.perl:617
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
-msgstr "peligro: alias de sendmail  con comillas no es soportado: %s\n"
+msgstr "peligro: alias de sendmail con comillas no es soportado: %s\n"
 
-#: git-send-email.perl:575
+#: git-send-email.perl:619
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "peligro: `:include:` no soportado: %s\n"
 
-#: git-send-email.perl:577
+#: git-send-email.perl:621
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "advertencia: redirección `/file` o `|pipe` no soportada: %s\n"
 
-#: git-send-email.perl:582
+#: git-send-email.perl:626
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "advertencia: línea sendmail no reconocida: %s\n"
 
-#: git-send-email.perl:666
+#: git-send-email.perl:711
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26203,12 +26222,12 @@ msgstr ""
 "    * Diciendo \"./%s\" si se quiere decir un archivo; o\n"
 "    * Agregando la opción --format-patch si se quiere decir un rango.\n"
 
-#: git-send-email.perl:687
+#: git-send-email.perl:732
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Falló al abrir directorio %s: %s"
 
-#: git-send-email.perl:720
+#: git-send-email.perl:767
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26218,17 +26237,17 @@ msgstr ""
 "¡No se especificaron parches!\n"
 "\n"
 
-#: git-send-email.perl:733
+#: git-send-email.perl:780
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "¿No hay línea de subject en %s?"
 
-#: git-send-email.perl:743
+#: git-send-email.perl:791
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Falló al abrir para escritura %s: %s"
 
-#: git-send-email.perl:754
+#: git-send-email.perl:802
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26236,33 +26255,33 @@ msgid ""
 "\n"
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr ""
-"Lineas que comienzan en \"GIT:\" serán eliminadas.\n"
-"Considere incluir un diffstat global o una tabla de contenidos\n"
+"Líneas que comienzan en \"GIT:\" serán eliminadas.\n"
+"Considera incluir un diffstat global o una tabla de contenidos\n"
 "para el parche que estás escribiendo.\n"
 "\n"
-"Limpiar el contenido de body si no deseas mandar un resumen.\n"
+"Limpia el contenido de body si no deseas mandar un resumen.\n"
 
-#: git-send-email.perl:778
+#: git-send-email.perl:826
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Falló al abrir %s: %s"
 
-#: git-send-email.perl:795
+#: git-send-email.perl:843
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Falló al abrir %s.final: %s"
 
-#: git-send-email.perl:838
+#: git-send-email.perl:886
 msgid "Summary email is empty, skipping it\n"
 msgstr "Archivo de resumen está vacío, saltando al siguiente\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:873
+#: git-send-email.perl:935
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "¿Estás seguro de que deseas usar <%s> [y/N]? "
 
-#: git-send-email.perl:928
+#: git-send-email.perl:990
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -26270,11 +26289,11 @@ msgstr ""
 "Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-"
 "Encoding.\n"
 
-#: git-send-email.perl:933
+#: git-send-email.perl:995
 msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr "¿Qué codificación de 8bit debería declarar [UTF-8]? "
+msgstr "¿Qué codificación de 8 bits se debería declarar [UTF-8]? "
 
-#: git-send-email.perl:941
+#: git-send-email.perl:1003
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26284,25 +26303,25 @@ msgid ""
 msgstr ""
 "Rehusando mandar el parche porque\n"
 "\t%s\n"
-"tiene el asunto de template  '*** SUBJECT HERE ***'. Agrega --force si"
+"tiene el asunto de template '*** SUBJECT HERE ***'. Agrega --force si "
 "realmente lo deseas mandar.\n"
 
-#: git-send-email.perl:960
+#: git-send-email.perl:1022
 msgid "To whom should the emails be sent (if anyone)?"
-msgstr "¿A quién se deben mandar los correos (si existe)?"
+msgstr "¿A quién se deben mandar los correos (si alguien hay)?"
 
-#: git-send-email.perl:978
+#: git-send-email.perl:1040
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal: alias '%s' se expande a si mismo\n"
 
-#: git-send-email.perl:990
+#: git-send-email.perl:1052
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
-"¿Qué id de mensaje será usado como In-Reply-To en el primer email (si "
-"existe alguno)? "
+"¿Qué id de mensaje será usado como In-Reply-To en el primer email (si existe "
+"alguno)? "
 
-#: git-send-email.perl:1048 git-send-email.perl:1056
+#: git-send-email.perl:1114 git-send-email.perl:1122
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "error: no es posible extraer una dirección válida de %s\n"
@@ -26310,16 +26329,16 @@ msgstr "error: no es posible extraer una dirección 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:1060
+#: git-send-email.perl:1126
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
-msgstr "¿Qué hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): "
+msgstr "¿Qué hacer con esta dirección? ([q]salir|[d]descartar|[e]ditar): "
 
-#: git-send-email.perl:1377
+#: git-send-email.perl:1446
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "Ruta CA \"%s\" no existe"
 
-#: git-send-email.perl:1460
+#: git-send-email.perl:1529
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -26333,10 +26352,9 @@ msgid ""
 "\n"
 msgstr ""
 "    La lista Cc ha sido expandida por direcciones adicionales\n"
-"    encontradas en el mensaje de commit parchado.. Por defecto\n"
-"    send-email se muestra antes de mandar cualquier cada vez que esto "
-"sucede.\n"
-"    Este comportamiento is controlado por el valor de configuración "
+"    encontradas en el mensaje de commit parchado. Por defecto\n"
+"    send-email se muestra antes de mandar si esto sucede.\n"
+"    Este comportamiento es controlado por el valor de configuración "
 "sendemail.confirm.\n"
 "\n"
 "    Para más información, ejecuta 'git send-email --help'.\n"
@@ -26347,113 +26365,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:1475
+#: git-send-email.perl:1544
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr "¿Mandar este email? ([y]si||[n]o|[e]editar|[q]salir|[a]todo): "
 
-#: git-send-email.perl:1478
+#: git-send-email.perl:1547
 msgid "Send this email reply required"
-msgstr "Necesitas mandar esta respuesta de email"
+msgstr "Se requiere una respuesta a ¿Mandar este email?"
 
-#: git-send-email.perl:1506
+#: git-send-email.perl:1581
 msgid "The required SMTP server is not properly defined."
-msgstr "El servidor SMTP no esta definido adecuadamente."
+msgstr "El servidor SMTP no está definido adecuadamente."
 
-#: git-send-email.perl:1553
+#: git-send-email.perl:1628
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "¡El servidor no soporta STARTTLS! %s"
 
-#: git-send-email.perl:1558 git-send-email.perl:1562
+#: git-send-email.perl:1633 git-send-email.perl:1637
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "¡Falló STARTTLS! %s"
 
-#: git-send-email.perl:1571
+#: git-send-email.perl:1646
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
-"No es posible inicializar SMTP adecuadamente. Verificar config y usar --smtp-debug."
+"No es posible inicializar SMTP adecuadamente. Verificar config y usar --smtp-"
+"debug."
 
-#: git-send-email.perl:1589
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Falló al enviar %s\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Dry-Sent %s\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviado %s\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1669
 msgid "Dry-OK. Log says:\n"
 msgstr "Dry-OK. Log dice:\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1669
 msgid "OK. Log says:\n"
 msgstr "OK. Log dice:\n"
 
-#: git-send-email.perl:1606
+#: git-send-email.perl:1688
 msgid "Result: "
 msgstr "Resultado: "
 
-#: git-send-email.perl:1609
+#: git-send-email.perl:1691
 msgid "Result: OK\n"
 msgstr "Resultado: OK\n"
 
-#: git-send-email.perl:1627
+#: git-send-email.perl:1708
 #, perl-format
 msgid "can't open file %s"
 msgstr "no se puede abrir el archivo %s"
 
-#: git-send-email.perl:1674 git-send-email.perl:1694
+#: git-send-email.perl:1756 git-send-email.perl:1776
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Agregando cc: %s de la línea '%s'\n"
 
-#: git-send-email.perl:1680
+#: git-send-email.perl:1762
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Agregando para: %s de la línea '%s'\n"
 
-#: git-send-email.perl:1737
+#: git-send-email.perl:1819
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n"
 
-#: git-send-email.perl:1772
+#: git-send-email.perl:1854
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Agregando cc: %s de la línea '%s'\n"
 
-#: git-send-email.perl:1883
+#: git-send-email.perl:1973
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) no se pudo ejecutar '%s'"
 
-#: git-send-email.perl:1890
+#: git-send-email.perl:1980
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Agregando %s: %s de: '%s'\n"
 
-#: git-send-email.perl:1894
+#: git-send-email.perl:1984
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) falló al cerrar el pipe a '%s'"
 
-#: git-send-email.perl:1924
+#: git-send-email.perl:2014
 msgid "cannot send message as 7bit"
 msgstr "no se puede mandar mensaje como 7bit"
 
-#: git-send-email.perl:1932
+#: git-send-email.perl:2022
 msgid "invalid transfer encoding"
 msgstr "codificación de transferencia inválida"
 
-#: git-send-email.perl:1966
+#: git-send-email.perl:2059
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -26464,12 +26483,12 @@ msgstr ""
 "%s\n"
 "peligro: no se mandaron parches\n"
 
-#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "no es posible abrir %s: %s\n"
 
-#: git-send-email.perl:1979
+#: git-send-email.perl:2072
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26478,983 +26497,591 @@ msgstr ""
 "fatal: %s: %d es más grande que 998 caracteres\n"
 "peligro: no se mandaron parches\n"
 
-#: git-send-email.perl:1997
+#: git-send-email.perl:2090
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "Saltando %s con el sufijo de backup '%s'.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2001
+#: git-send-email.perl:2094
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "¿Realmente deseas mandar %s? [y|N]: "
 
-#~ msgid "--cached and --3way cannot be used together."
-#~ msgstr "--cached y --3way no se pueden utilizar juntas."
-
-#~ msgid "both"
-#~ msgstr "ambos"
-
-#~ msgid "one"
-#~ msgstr "uno"
-
 #, c-format
-#~ msgid "Already up to date!"
-#~ msgstr "¡Ya está actualizado!"
-
-#~ msgid "Already up to date. Yeeah!"
-#~ msgstr "Ya está actualizado. ¡Oh, yeaahh!"
-
-#~ msgid "--batch-size option is only for 'repack' subcommand"
-#~ msgstr "opción --batch-size es solo para el subcomando 'repack'"
-
-#~ msgid "Percentage by which creation is weighted"
-#~ msgstr "Porcentaje por el cual la creación es pesada"
-
 #~ msgid ""
-#~ "the rebase.useBuiltin support has been removed!\n"
-#~ "See its entry in 'git help config' for details."
+#~ "The following pathspecs didn't match any eligible path, but they do match "
+#~ "index\n"
+#~ "entries outside the current sparse checkout:\n"
 #~ msgstr ""
-#~ "el soporte para rebase.useBuiltin ha sido eliminado!\n"
-#~ "Vea su entrada en 'git help config' para detalles."
-
-#, perl-format
-#~ msgid "%s: patch contains a line longer than 998 characters"
-#~ msgstr "%s: el parche contiene una línea con más de 998 caracteres"
-
-#~ msgid "store only"
-#~ msgstr "solo guardar"
-
-#~ msgid "compress faster"
-#~ msgstr "comprimir más rápido"
-
-#~ msgid "compress better"
-#~ msgstr "comprimir mejor"
-
-#~ msgid "unknown hash algorithm length"
-#~ msgstr "largo del algoritmo hash desconocido"
-
-#~ msgid "rev-list died"
-#~ msgstr "rev-list murió"
+#~ "Los siguientes pathspecs no concuerdan con ninguna ruta elegible, pero "
+#~ "concuerdan\n"
+#~ "con entradas del índice fuera del checkout sparse actual:\n"
 
 #~ msgid ""
-#~ "commit-graph chunk lookup table entry missing; file may be incomplete"
+#~ "Disable or modify the sparsity rules if you intend to update such entries."
 #~ msgstr ""
-#~ "falta tabla de lookup del chunk en commit-graph; el archivo puede estar "
-#~ "incompleto"
-
-#, c-format
-#~ msgid "commit-graph improper chunk offset %08x%08x"
-#~ msgstr "offset del chunk de commit-graph inapropiado %08x%08x"
-
-#, c-format
-#~ msgid "commit-graph chunk id %08x appears multiple times"
-#~ msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos"
-
-#~ msgid "Writing changed paths Bloom filters index"
-#~ msgstr "Escribiendo cambios de ruta del índice de filtros Bloom"
-
-#~ msgid "Counting distinct commits in commit graph"
-#~ msgstr "Contando commits distintos en commit graph"
-
-#, c-format
-#~ msgid "unexpected duplicate commit id %s"
-#~ msgstr "id de commit duplicado inesperado %s"
+#~ "Deshabilitar o modificar las reglas de escasez si tienes intención de "
+#~ "actualizar dichas entradas."
 
 #, c-format
-#~ msgid "the commit graph format cannot write %d commits"
-#~ msgstr "el formato de gráficos de commit no pudede escribir %d commits"
+#~ msgid "could not set GIT_DIR to '%s'"
+#~ msgstr "no se pudo configurar GIT_DIR a '%s'"
 
 #, c-format
-#~ msgid "hash version %u does not match"
-#~ msgstr "versión de hash %u no concuerda"
-
-#~ msgid "invalid chunk offset (too large)"
-#~ msgstr "offset inválido del conjunto (muy grande)"
-
-#~ msgid "error preparing packfile from multi-pack-index"
-#~ msgstr "error preparando packfile de multi-pack-index"
-
-#~ msgid "Writing chunks to multi-pack-index"
-#~ msgstr "Escribiendo chunks a multi-pack-index"
-
-#~ msgid "Remote with no URL"
-#~ msgstr "Remoto sin URL"
+#~ msgid "unable to unpack %s header with --allow-unknown-type"
+#~ msgstr "no es posible desempacar header %s con --allow-unknown-type"
 
 #, c-format
-#~ msgid "%%(subject) does not take arguments"
-#~ msgstr "%%(subject) no toma ningún argumento"
+#~ msgid "unable to parse %s header with --allow-unknown-type"
+#~ msgstr "no es posible analizar header %s con --allow-unknown-type"
 
-#, c-format
-#~ msgid "positive value expected objectname:short=%s"
-#~ msgstr "valor positivo esperado objectname:short=%s"
-
-#, c-format
-#~ msgid "unrecognized %%(objectname) argument: %s"
-#~ msgstr "argumento: %s no reconocido %%(objectname)"
-
-#, c-format
-#~ msgid "option `%s' is incompatible with --merged"
-#~ msgstr "opción `%s' es incompatible con --merged"
-
-#, c-format
-#~ msgid "option `%s' is incompatible with --no-merged"
-#~ msgstr "opción `%s' es incompatible con --no-merged"
-
-#, c-format
-#~ msgid "could not open '%s' for writing: %s"
-#~ msgstr "no se pudo abrir '%s' para escritura: %s"
-
-#, c-format
-#~ msgid "could not read ref '%s'"
-#~ msgstr "no se pudo leer la referencia '%s'"
-
-#, c-format
-#~ msgid "ref '%s' already exists"
-#~ msgstr "ref '%s' ya existe"
-
-#, c-format
-#~ msgid "unexpected object ID when writing '%s'"
-#~ msgstr "ID de objecto inesperado al escribir '%s'"
-
-#, c-format
-#~ msgid "unexpected object ID when deleting '%s'"
-#~ msgstr "ID de objecto inesperado al borrar '%s'"
-
-#, c-format
-#~ msgid "The hash algorithm %s is not supported in this build."
-#~ msgstr "El algoritmo hash %s no está soportado en este build."
-
-#, c-format
-#~ msgid "%s: not a valid OID"
-#~ msgstr "%s no es OID válido"
-
-#~ msgid "git bisect--helper --next-all [--no-checkout]"
-#~ msgstr "git bisect--helper --next-all [--no-checkout]"
-
-#~ msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-#~ msgstr "git bisect--helper --write-terms <mal_término> <buen_término>"
+#~ msgid "open /dev/null failed"
+#~ msgstr "falló al abrir /dev/null"
 
 #~ msgid ""
-#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> "
-#~ "<good_term> <bad_term>"
+#~ "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 bisect--helper --bisect-write [--no-log] <estado> <revision> "
-#~ "<buen_term> <mal_term>"
-
-#~ msgid ""
-#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-#~ "<bad_term>"
-#~ msgstr ""
-#~ "git bisect--helper --bisect-check-and-set-terms <comando> <buen_term> "
-#~ "<mal_term>"
-
-#~ msgid "could not open the file BISECT_TERMS"
-#~ msgstr "no se pudo abrir el archivo BISECT_TERMS"
-
-#~ msgid "perform 'git bisect next'"
-#~ msgstr "realiza 'git bisect next'"
-
-#~ msgid "write the terms to .git/BISECT_TERMS"
-#~ msgstr "escribe los términos a .git/BISECT_TERMS"
-
-#~ msgid "cleanup the bisection state"
-#~ msgstr "limpiar el estado de bisección"
-
-#~ msgid "check for expected revs"
-#~ msgstr "revisar por revs esperados"
-
-#~ msgid "write out the bisection state in BISECT_LOG"
-#~ msgstr "escribir el estado de bisect en BISECT_LOG"
-
-#~ msgid "check and set terms in a bisection state"
-#~ msgstr "revisar y configurar los terms en el estado de bisect"
-
-#~ msgid "update BISECT_HEAD instead of checking out the current commit"
-#~ msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual"
-
-#~ msgid "--write-terms requires two arguments"
-#~ msgstr "--write-terms requiere dos argumentos"
-
-#~ msgid "--bisect-clean-state requires no arguments"
-#~ msgstr "--bisect-clean-state no requiere argumentos"
-
-#~ msgid "--bisect-write requires either 4 or 5 arguments"
-#~ msgstr "--bisect-write requiere entre 4 o 5 argumentos"
-
-#~ msgid "--check-and-set-terms requires 3 arguments"
-#~ msgstr "--bisect-clean-state no requiere argumentos"
-
-#~ msgid "Force progress reporting"
-#~ msgstr "Forzar el reporte de progreso"
-
-#~ msgid "n,m"
-#~ msgstr "n,m"
-
-#, c-format
-#~ msgid "Error deleting remote-tracking branch '%s'"
-#~ msgstr "Error al eliminar la rama de rastreo remota '%s'"
-
-#, c-format
-#~ msgid "Error deleting branch '%s'"
-#~ msgstr "Error al eliminar la rama '%s'"
-
-#~ msgid "show parse tree for grep expression"
-#~ msgstr "mostrar árbol analizado para la expresión grep"
+#~ "tras resolver los conflictos, marca las rutas corregidas\n"
+#~ "con 'git add <rutas>' o 'git rm <rutas>'\n"
+#~ "y haz un commit del resultado con 'git commit'"
 
-#~ msgid "Process line range n,m in file, counting from 1"
-#~ msgstr "Procesar rango de líneas n,m en archivo, contando desde 1"
+#~ msgid "open /dev/null or dup failed"
+#~ msgstr "falló al abrir /dev/null o hacer dup"
 
-#~ msgid "name of output directory is too long"
-#~ msgstr "nombre del directorio de salida es muy largo"
+#~ msgid "attempting to use sparse-index without cone mode"
+#~ msgstr "intentando usar sparse-index sin modo cono"
 
-#~ msgid "standard output, or directory, which one?"
-#~ msgstr "¿salida standard, o directorio, cual?"
-
-#~ msgid "print only names (no SHA-1)"
-#~ msgstr "imprimir sólo nombres (sin SHA-1)"
-
-#~ msgid "too many parameters"
-#~ msgstr "demasiados parámetros"
-
-#~ msgid "too few parameters"
-#~ msgstr "muy pocos parámetros"
-
-#~ msgid "passed to 'git am'"
-#~ msgstr "pasado a 'git am'"
+#~ msgid "unable to update cache-tree, staying full"
+#~ msgstr "no es posible actualizar el cache del árbol, manteniendo full"
 
 #, c-format
-#~ 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 ""
-#~ "WARNING: Algunos packs en uso han sido renombrados\n"
-#~ "WARNING: agregando el prefijo old- a sus nombres,para\n"
-#~ "WARNING: reemplazarlos con la nueva versión del\n"
-#~ "WARNING: archivo. Pero la operación falló, y el intento\n"
-#~ "WARNING: de renombrarlos a sus nombres originales\n"
-#~ "WARNING: también falló.\n"
-#~ "WARNING: Por favor renombralos en %s manualmente:\n"
+#~ msgid "Could not open '%s' for writing."
+#~ msgstr "No se pudo abrir '%s' para escritura."
 
 #, c-format
-#~ msgid "failed to remove '%s'"
-#~ msgstr "falló al eliminar'%s'"
-
-#~ msgid "Recurse into nested submodules"
-#~ msgstr "Recursar en submódulos anidados"
-
-#~ msgid "too many params"
-#~ msgstr "demasiados parámetros"
+#~ msgid "could not create archive file '%s'"
+#~ msgstr "no se pudo crear el archivo de crónica '%s'"
 
-#~ msgid "Routines to help parsing remote repository access parameters"
-#~ msgstr ""
-#~ "Rutinas para ayudar a analizar los parámetros de acceso del repositorio "
-#~ "remoto"
-
-#, sh-format
-#~ msgid "Bad rev input: $bisected_head"
-#~ msgstr "Mala entrada rev: $bisected_head"
-
-#, sh-format
-#~ msgid "Bad rev input: $rev"
-#~ msgstr "Mala entrada rev: $rev"
-
-#~ msgid "The --cached option cannot be used with the --files option"
-#~ msgstr "La opción --cached no puede ser usada con la opción --files"
-
-#, sh-format
-#~ msgid "  Warn: $display_name doesn't contain commit $sha1_src"
-#~ msgstr "  Advertencia: $display_name no contiene el commit $sha1_src"
-
-#, sh-format
-#~ msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
-#~ msgstr "  Advertencia: $display_name no contiene el commit $sha1_dst"
-
-#, sh-format
 #~ msgid ""
-#~ "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
 #~ msgstr ""
-#~ "  Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst"
+#~ "git bisect--helper --bisect-next-check <buen_term> <mal_term> [<term>]"
 
-#, sh-format
-#~ msgid "See git-${cmd}(1) for details."
-#~ msgstr "Véase git-${cmd}(1) para más detalles."
+#~ msgid "--bisect-next-check requires 2 or 3 arguments"
+#~ msgstr "--bisect-next-check requiere 2 o 3 argumentos"
 
 #, c-format
-#~ msgid "Finding commits for commit graph from %d ref"
-#~ msgid_plural "Finding commits for commit graph from %d refs"
-#~ msgstr[0] "Encontrando commits para commit graph de %d ref"
-#~ msgstr[1] "Encontrando commits para commit graph de %d refs"
+#~ msgid "couldn't create a new file at '%s'"
+#~ msgstr "no se pudo crear un archivo nuevo en '%s'"
 
 #, c-format
-#~ msgid "invalid commit object id: %s"
-#~ msgstr "id de objeto commit: %s inválido"
+#~ msgid "git commit-tree: failed to open '%s'"
+#~ msgstr "git commit-tree: falló al abrir '%s'"
 
 #, c-format
-#~ msgid "Removing worktrees/%s: not a valid directory"
-#~ msgstr "Removiendo el worktrees/%s: no es un directorio válido"
+#~ msgid "cannot open packfile '%s'"
+#~ msgstr "no se puede abrir el archivo de paquete '%s'"
 
-#, c-format
-#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-#~ msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)"
+#~ msgid "cannot store pack file"
+#~ msgstr "no se puede guardar el archivo paquete"
 
-#, c-format
-#~ msgid "Removing worktrees/%s: invalid gitdir file"
-#~ msgstr "Removiendo worktrees/%s: archivo gitdir inválido"
+#~ msgid "cannot store index file"
+#~ msgstr "no se puede guardar el archivo índice"
 
-#, c-format
-#~ msgid "unable to re-add worktree '%s'"
-#~ msgstr "no es posible volver a agregar el árbol '%s'"
+#~ msgid "exclude patterns are read from <file>"
+#~ msgstr "excluir patrones leídos de <archivo>"
 
 #, c-format
-#~ msgid "target '%s' already exists"
-#~ msgstr "el objetivo '%s' ya existe"
+#~ msgid "Unknown option for merge-recursive: -X%s"
+#~ msgstr "Opción desconocida para merge-recursive: -X%s"
 
 #, c-format
-#~ msgid ""
-#~ "Cannot update sparse checkout: the following entries are not up to date:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "No se puede actualizar el sparse checkout: las siguientes entradas no "
-#~ "están actualizadas:\n"
-#~ "%s"
+#~ msgid "unusable todo list: '%s'"
+#~ msgstr "lista de pendientes inutilizable: '%s'"
 
-#, c-format
-#~ msgid ""
-#~ "The following working tree files would be overwritten by sparse checkout "
-#~ "update:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Los siguientes archivos del árbol de trabajo serán sobrescritos por la "
-#~ "actualización sparse checkout:\n"
-#~ "%s"
+#~ msgid "git rebase--interactive [<options>]"
+#~ msgstr "git rebase--interactive [<opciones>]"
 
-#, c-format
-#~ msgid ""
-#~ "The following working tree files would be removed by sparse checkout "
-#~ "update:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Los siguientes archivos del árbol de trabajo serán eliminados por la "
-#~ "actualización sparse checkout:\n"
-#~ "%s"
+#~ msgid "rebase merge commits"
+#~ msgstr "rebasar commits de fusión"
 
-#, c-format
-#~ msgid "annotated tag %s has no embedded name"
-#~ msgstr "tag anotado %s no tiene nombre embebido"
+#~ msgid "keep original branch points of cousins"
+#~ msgstr "mantener puntas de bifurcación originales de los primos"
 
-#~ msgid "automatically stash/stash pop before and after rebase"
-#~ msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase"
+#~ msgid "move commits that begin with squash!/fixup!"
+#~ msgstr "mover commits que comiencen con squash!/fixup!"
 
-#~ msgid "--[no-]autostash option is only valid with --rebase."
-#~ msgstr "La opción --[no-]autostash sólo es válida con --rebase."
+#~ msgid "sign commits"
+#~ msgstr "firmar commits"
 
-#~ msgid "(DEPRECATED) keep empty commits"
-#~ msgstr "(DEPRECADO) mantener commits vacíos"
+#~ msgid "continue rebase"
+#~ msgstr "continuar rebase"
 
-#, c-format
-#~ msgid "Could not read '%s'"
-#~ msgstr "No se pudo leer '%s'"
+#~ msgid "skip commit"
+#~ msgstr "saltar commit"
 
-#, c-format
-#~ msgid "Cannot store %s"
-#~ msgstr "No se puede guardar %s"
+#~ msgid "edit the todo list"
+#~ msgstr "editar la lista de pendientes"
 
-#~ msgid "initialize sparse-checkout"
-#~ msgstr "inicializar sparse-checkout"
+#~ msgid "show the current patch"
+#~ msgstr "mostrar el parche actual"
 
-#~ msgid "set sparse-checkout patterns"
-#~ msgstr "configurar patrones de sparse-checkout"
+#~ msgid "shorten commit ids in the todo list"
+#~ msgstr "ids de commits cortos en la lista de pendientes"
 
-#~ msgid "disable sparse-checkout"
-#~ msgstr "deshabilitar sparse-checkout"
+#~ msgid "expand commit ids in the todo list"
+#~ msgstr "expandir ids de commits en la lista de pendientes"
 
-#, c-format
-#~ msgid "could not exec %s"
-#~ msgstr "no se pudo ejecutar %s"
+#~ msgid "check the todo list"
+#~ msgstr "revisar la lista de pendientes"
 
-#~ msgid "Cannot remove temporary index (can't happen)"
-#~ msgstr "No se puede eliminar el índice temporal (no puede suceder)"
+#~ msgid "rearrange fixup/squash lines"
+#~ msgstr "reordenar líneas fixup/squash"
 
-#, sh-format
-#~ msgid "Cannot update $ref_stash with $w_commit"
-#~ msgstr "No se puede actualizar $ref_stash con $w_commit"
+#~ msgid "insert exec commands in todo list"
+#~ msgstr "insertar comando exec en la lista de pendientes"
 
-#, sh-format
-#~ msgid "error: unknown option for 'stash push': $option"
-#~ msgstr "error: opción desconocida para 'stash pus': $option"
+#~ msgid "onto"
+#~ msgstr "sobre"
 
-#, sh-format
-#~ msgid "Saved working directory and index state $stash_msg"
-#~ msgstr "Directorio de trabajo guardado y estado de índice $stash_msg"
+#~ msgid "restrict-revision"
+#~ msgstr "restrict-revision"
 
-#, sh-format
-#~ msgid "unknown option: $opt"
-#~ msgstr "opción desconocida: $opt"
+#~ msgid "restrict revision"
+#~ msgstr "restringir revisión"
 
-#, sh-format
-#~ msgid "Too many revisions specified: $REV"
-#~ msgstr "Se especificaron demasiadas revisiones: $REV"
+#~ msgid "squash-onto"
+#~ msgstr "squash-onto"
 
-#, sh-format
-#~ msgid "$reference is not a valid reference"
-#~ msgstr "$reference no es una referencia válida"
+#~ msgid "squash onto"
+#~ msgstr "squash a"
 
-#, sh-format
-#~ msgid "'$args' is not a stash-like commit"
-#~ msgstr "'$args' no es un commit estilo stash"
+#~ msgid "the upstream commit"
+#~ msgstr "el commit de upstream"
 
-#, sh-format
-#~ msgid "'$args' is not a stash reference"
-#~ msgstr "'$args' no es una referencia stash"
+#~ msgid "head-name"
+#~ msgstr "head-name"
 
-#~ msgid "unable to refresh index"
-#~ msgstr "incapaz de refrescar el índice"
+#~ msgid "head name"
+#~ msgstr "nombre de head"
 
-#~ msgid "Cannot apply a stash in the middle of a merge"
-#~ msgstr "No se puede aplicar un stash en medio de una fusión"
+#~ msgid "rebase strategy"
+#~ msgstr "estrategia de rebase"
 
-#~ msgid "Conflicts in index. Try without --index."
-#~ msgstr "Conflictos en índice. Intente sin --index."
+#~ msgid "strategy-opts"
+#~ msgstr "strategy-opts"
 
-#~ msgid "Could not save index tree"
-#~ msgstr "No se puede guardar el índice del árbol"
+#~ msgid "strategy options"
+#~ msgstr "opciones de estrategia"
 
-#~ msgid "Could not restore untracked files from stash entry"
-#~ msgstr "No se pueden restaurar archivos no rastreados de la entrada stash"
+#~ msgid "switch-to"
+#~ msgstr "cambiar a"
 
-#~ msgid "Cannot unstage modified files"
-#~ msgstr "No se puede sacar de stage archivos modificados"
+#~ msgid "the branch or commit to checkout"
+#~ msgstr "la rama o commit para hacer checkout"
 
-#, sh-format
-#~ msgid "Dropped ${REV} ($s)"
-#~ msgstr "Botado ${REV} ($s)"
+#~ msgid "onto-name"
+#~ msgstr "sobre-nombre"
 
-#, sh-format
-#~ msgid "${REV}: Could not drop stash entry"
-#~ msgstr "${REV}: No se pudo borrar entrada stash"
+#~ msgid "onto name"
+#~ msgstr "sobre nombre"
 
-#~ msgid "(To restore them type \"git stash apply\")"
-#~ msgstr "(Para restaurarlos, escribe \"git stash apply\")"
+#~ msgid "cmd"
+#~ msgstr "cmd"
 
-#, c-format
-#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "
-#~ msgstr "¿Cambio de modo de stage [y,n,a,q,d%s,?]? "
+#~ msgid "the command to run"
+#~ msgstr "el comando para ejecutar"
 
-#, c-format
-#~ msgid "Stage deletion [y,n,a,q,d%s,?]? "
-#~ msgstr "¿Aplicar stage al borrado [y,n,a,q,d%s,?]? "
+#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#~ msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges"
 
-#, c-format
-#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? "
-#~ msgstr "¿Aplicar stage a este hunk [y,n,a,q,d%s,?]? "
+#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'"
 
 #~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for staging.\n"
+#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 #~ msgstr ""
-#~ "Si el parche aplica limpiamente, el hunk editado será marcado\n"
-#~ "inmediatamente para el área de stage.\n"
+#~ "error: no se puede combinar '--preserve-merges' con '--reschedule-failed-"
+#~ "exec'"
 
 #~ 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"
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
+#~ "--name <name>"
 #~ msgstr ""
-#~ "y - aplicar stage a este hunk\n"
-#~ "n - no aplicar stage a este hunk\n"
-#~ "q - quit; no aplicar stage a este hunk ni ninguno de los restantes\n"
-#~ "a - aplicar stage a este hunk y a todos los posteriores en el archivo\n"
-#~ "d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
-#~ "archivo\n"
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <ruta> "
+#~ "--name <nombre>"
 
 #, c-format
-#~ msgid "could not copy '%s' to '%s'."
-#~ msgstr "no se pudo copiar '%s' a '%s'."
+#~ msgid "failed to create file %s"
+#~ msgstr "falló al crear el archivo %s"
 
-#~ msgid "malformed ident line"
-#~ msgstr "línea de entrada mal formada"
+#~ msgid "exit immediately after initial ref advertisement"
+#~ msgstr "salir inmediatamente tras el anuncio inicial de ref"
 
 #, c-format
-#~ msgid "could not parse '%.*s'"
-#~ msgstr "no se puede analizar '%.*s'"
+#~ msgid "socket/pipe already in use: '%s'"
+#~ msgstr "socket/pipe ya está en uso: '%s'"
 
 #, c-format
-#~ msgid "could not checkout %s"
-#~ msgstr "no se puede hacer checkout a %s"
+#~ msgid "could not start server on: '%s'"
+#~ msgstr "no se pudo iniciar el servidor en: '%s'"
 
-#, c-format
-#~ msgid "filename in tree entry contains backslash: '%s'"
-#~ msgstr "nombre de archivo en el árbol contiene un backslash: '%s'"
+#~ msgid "could not spawn daemon in the background"
+#~ msgstr "no se puede generar demonio en el background"
 
-#, c-format
-#~ msgid "Use -f if you really want to add them.\n"
-#~ msgstr "Usa -f si realmente quieres agregarlos.\n"
+#~ msgid "waitpid failed"
+#~ msgstr "falló waitpid"
 
-#, c-format
-#~ msgid "Maybe you wanted to say 'git add .'?\n"
-#~ msgstr "¿Tal vez quiso decir 'git add .'?\n"
+#~ msgid "daemon not online yet"
+#~ msgstr "demonio no está en línea todavía"
 
-#, c-format
-#~ msgid "packfile is invalid: %s"
-#~ msgstr "packfile es inválido: %s"
+#~ msgid "daemon failed to start"
+#~ msgstr "falló al iniciar demonio"
 
-#, c-format
-#~ msgid "unable to open packfile for reuse: %s"
-#~ msgstr "no es posible abrir packfile para reusar: %s"
+#~ msgid "waitpid is confused"
+#~ msgstr "waitpid está confundido"
 
-#~ msgid "unable to seek in reused packfile"
-#~ msgstr "no es posible buscar en los packfile reusados"
+#~ msgid "daemon has not shutdown yet"
+#~ msgstr "demonio no se ha apagado todavía"
 
-#~ msgid "unable to read from reused packfile"
-#~ msgstr "no es posible leer de packfile reusado"
-
-#~ msgid "no HEAD?"
-#~ msgstr "¿Sin HEAD?"
-
-#~ msgid "preserve empty commits during rebase"
-#~ msgstr "preservar commits vacíos durante el rebase"
-
-#~ msgid "cannot combine --use-bitmap-index with object filtering"
-#~ msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado"
+#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
+#~ msgstr "Restricción de protocolo no soportada con cURL < 7.19.4"
 
 #, sh-format
-#~ msgid ""
-#~ "The following path is ignored by one of your .gitignore files:\n"
-#~ "$sm_path\n"
-#~ "Use -f if you really want to add it."
-#~ msgstr ""
-#~ "La siguiente ruta es ignorada por uno de tus archivos .gitignore:\n"
-#~ "$sm_path\n"
-#~ "Usa -f si en verdad quieres agregarlo."
-
-#~ msgid "Use an experimental heuristic to improve diffs"
-#~ msgstr "Usar un heurístico experimental para mejorar los diffs"
+#~ msgid "running $command"
+#~ msgstr "ejecutando $command"
 
-#~ 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 ""
-#~ "valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por "
-#~ "defecto"
-
-#~ msgid "cannot change partial clone promisor remote"
-#~ msgstr "no se puede cambiar un clon parcial remoto promisor"
-
-#~ msgid "error building trees"
-#~ msgstr "error construyendo árboles"
+#, sh-format
+#~ msgid "'$sm_path' does not have a commit checked out"
+#~ msgstr "'$sm_path' no tiene un commit checked out"
 
-#~ msgid "invalid date format '%s' in '%s'"
-#~ msgstr "formato de fecha inválido '%s' en '%s'"
+#, sh-format
+#~ msgid "Submodule path '$displaypath': '$command $sha1'"
+#~ msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
 
-#~ msgid "writing root commit"
-#~ msgstr "escribiendo commit raíz"
+#~ msgid "Applied autostash."
+#~ msgstr "Autostash aplicado."
 
-#~ msgid "staged changes in the following files may be lost: %s"
-#~ msgstr ""
-#~ "cambios en el área de stage en el siguiente archivo pueden ser perdidos: "
-#~ "%s"
+#, sh-format
+#~ msgid "Cannot store $stash_sha1"
+#~ msgstr "No se puede almacenar $stash_sha1"
 
 #~ msgid ""
-#~ "--filter can only be used with the remote configured in extensions."
-#~ "partialClone"
+#~ "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 ""
-#~ "--filter solo puede ser usado con el remoto configurado en extensions."
-#~ "partialClone"
-
-#~ msgid "verify commit-msg hook"
-#~ msgstr "verificar el hook commit-msg"
-
-#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-#~ msgstr "no se puede combinar '--rebase-merges' con '--strategy-option'"
-
-#~ msgid "invalid sparse value '%s'"
-#~ msgstr "valor disperso inválido: '%s'"
-
-#~ msgid "Server supports multi_ack_detailed"
-#~ msgstr "El servidor soporta ulti_ack_detailed"
-
-#~ msgid "Server supports no-done"
-#~ msgstr "El servidor soporta no-done"
-
-#~ msgid "Server supports multi_ack"
-#~ msgstr "El servidor soporta multi_ack"
-
-#~ msgid "Server supports side-band-64k"
-#~ msgstr "El servidor soporta side-band-64k"
+#~ "Aplicar autostash resultó en conflictos.\n"
+#~ "Tus cambios están seguros en el stash.\n"
+#~ "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
+#~ "momento.\n"
 
-#~ msgid "Server supports side-band"
-#~ msgstr "El servidor soporta side-band"
-
-#~ msgid "Server supports allow-tip-sha1-in-want"
-#~ msgstr "El servidor soporta allow-tip-sha1-in-want"
-
-#~ msgid "Server supports allow-reachable-sha1-in-want"
-#~ msgstr "El servidor soporta allow-reachable-sha1-in-want"
-
-#~ msgid "Server supports ofs-delta"
-#~ msgstr "El servidor soporta ofs-delta"
-
-#~ msgid "Checking out files"
-#~ msgstr "Revisando archivos"
-
-#~ msgid "cannot be interactive without stdin connected to a terminal."
-#~ msgstr "no se puede ser interactivo sin stdin conectado a un terminal."
-
-#~ msgid "failed to stat %s\n"
-#~ msgstr "falló al analizar %s\n"
+#, sh-format
+#~ msgid "Rebasing ($new_count/$total)"
+#~ msgstr "Rebasando ($new_count/$total)"
 
 #~ msgid ""
-#~ "If you wish to skip this commit, use:\n"
 #~ "\n"
-#~ "    git reset\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"
-#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-#~ "the remaining commits.\n"
+#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
 #~ msgstr ""
-#~ "Si quiere saltar este commit, use:\n"
 #~ "\n"
-#~ "    git reset\n"
+#~ "Comandos:\n"
+#~ "p, pick <commit> = usar commit\n"
+#~ "r, reword <commit> = usar commit, pero editar el mensaje de commit\n"
+#~ "e, edit <commit> = usar commit, pero parar para un amend\n"
+#~ "s, squash <commit> = usar commit, pero fusionarlo en el commit previo\n"
+#~ "f, fixup <commit> = como \"squash\", pero descarta el mensaje del log de "
+#~ "este commit\n"
+#~ "x, exec <commit> = ejecutar comando (el resto de la línea) usando un "
+#~ "shell\n"
+#~ "d, drop <commit> = eliminar commit\n"
+#~ "l, label <label> = poner label al HEAD actual con un nombre\n"
+#~ "t, reset <label> = reiniciar HEAD al label\n"
+#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+#~ ".       crear un commit de fusión usando el mensaje original de\n"
+#~ ".       fusión (o la línea de oneline, si no se especifica un mensaje\n"
+#~ ".       de commit). Usa -c <commit> para reescribir el mensaje del "
+#~ "commit.\n"
 #~ "\n"
-#~ "Luego \"git cherry-pick --continue\" continuara el cherry-picking\n"
-#~ "para los commits restantes.\n"
-
-#~ msgid "unrecognized verb: %s"
-#~ msgstr "verbo no reconocido: %s"
-
-#~ msgid "option '%s' requires a value"
-#~ msgstr "opción '%s' requiere un valor"
-
-#~ msgid "could not transform the todo list"
-#~ msgstr "no se pudo transformar lista de pendientes"
-
-#~ msgid "default"
-#~ msgstr "default"
-
-#~ msgid "Could not create directory '%s'"
-#~ msgstr "No se pudo crear el directorio '%s'"
-
-#~ msgid "allow rerere to update index with resolved conflict"
-#~ msgstr "permitir rerere actualizar index con conflictos resueltos"
-
-#~ msgid "could not open %s"
-#~ msgstr "no se pudo abrir %s"
-
-#~ msgid "Could not move back to $head_name"
-#~ msgstr "No se puede regresar a $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 ""
-#~ "Parece que ya hay un directorio $state_dir_base, y\n"
-#~ "me pregunto si está en medio de otro rebase. Si ese es el\n"
-#~ "caso, por favor intente\n"
-#~ "\t$cmd_live_rebase\n"
-#~ "Si no es el caso, por favor\n"
-#~ "\t$cmd_clear_stale_rebase\n"
-#~ "y ejecúteme nuevamente.  Me estoy deteniendo en caso de que tenga\n"
-#~ "algo de valor ahí."
+#~ "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
+#~ "abajo.\n"
 
+#, sh-format
 #~ msgid ""
-#~ "fatal: cannot combine am options with either interactive or merge options"
+#~ "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 ""
-#~ "fatal: no se puede combinar opciones am con opciones interactivas o de "
-#~ "merge"
+#~ "Puedes enmendar el commit ahora, con\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Una vez que estés satisfecho con los cambios, ejecuta\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
 
-#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
-#~ msgstr "fatal: no se puede combinar '--signoff' con '--preserve-merges'"
+#, sh-format
+#~ msgid "$sha1: not a commit that can be picked"
+#~ msgstr "$sha1: no es un commit que pueda ser cogido"
 
-#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
-#~ msgstr ""
-#~ "fatal: no se puede combinar '--preserve-merges' con '--rebase-merges'"
+#, sh-format
+#~ msgid "Invalid commit name: $sha1"
+#~ msgstr "Nombre de commit inválido: $sha1"
 
-#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
-#~ msgstr ""
-#~ "fatal: no se puede combinar '--rebase-merges' con '--strategy-option'"
+#~ msgid "Cannot write current commit's replacement sha1"
+#~ msgstr "No se puede escribir el remplazo sha1 del commit actual"
 
-#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
-#~ msgstr "fatal: no se puede combinar '--rebase-merges' con '--strategy'"
+#, sh-format
+#~ msgid "Fast-forward to $sha1"
+#~ msgstr "Avance rápido a $sha1"
 
-#~ msgid "invalid upstream '$upstream_name'"
-#~ msgstr "upstream inválido '$upstream_name'"
+#, sh-format
+#~ msgid "Cannot fast-forward to $sha1"
+#~ msgstr "No se puede realizar avance rápido a $sha1"
 
-#~ msgid "$onto_name: there are more than one merge bases"
-#~ msgstr "$onto_name: hay más de una base de fusión"
+#, sh-format
+#~ msgid "Cannot move HEAD to $first_parent"
+#~ msgstr "No se puede mover HEAD a $first_parent"
 
-#~ msgid "$onto_name: there is no merge base"
-#~ msgstr "$onto_name: no hay base de fusión"
+#, sh-format
+#~ msgid "Refusing to squash a merge: $sha1"
+#~ msgstr "Rehusando ejecutar squash en fusión: $sha1"
 
-#~ msgid "Does not point to a valid commit: $onto_name"
-#~ msgstr "No apunta a un commit válido: $onto_name"
+#, sh-format
+#~ msgid "Error redoing merge $sha1"
+#~ msgstr "Error al rehacer fusión $sha1"
 
-#~ msgid "fatal: no such branch/commit '$branch_name'"
-#~ msgstr "fatal: no existe la rama/commit: '$branch_name'"
+#, sh-format
+#~ msgid "Could not pick $sha1"
+#~ msgstr "No se pudo coger $sha1"
 
-#~ msgid "Created autostash: $stash_abbrev"
-#~ msgstr "Autostash creado: $stash_abbrev"
+#, sh-format
+#~ msgid "This is the commit message #${n}:"
+#~ msgstr "Este es el mensaje del commit #${n}:"
 
-#~ msgid "Current branch $branch_name is up to date."
-#~ msgstr "La rama actual $branch_name está actualizada."
+#, sh-format
+#~ msgid "The commit message #${n} will be skipped:"
+#~ msgstr "El mensaje del commit  #${n} será ignorado:"
 
-#~ msgid "Current branch $branch_name is up to date, rebase forced."
-#~ msgstr "Rama actual $branch_name está actualizada, rebase forzado."
+#, sh-format
+#~ msgid "This is a combination of $count commit."
+#~ msgid_plural "This is a combination of $count commits."
+#~ msgstr[0] "Esta es una combinación de $count commit."
+#~ msgstr[1] "Esta es la combinación de $count commits."
 
-#~ msgid "Changes to $onto:"
-#~ msgstr "Cambios hacia $onto:"
+#, sh-format
+#~ msgid "Cannot write $fixup_msg"
+#~ msgstr "No se puede escribir $fixup_msg"
 
-#~ msgid "Changes from $mb to $onto:"
-#~ msgstr "Cambios desde $mb a $onto:"
+#~ msgid "This is a combination of 2 commits."
+#~ msgstr "Esto es una combinación de 2 commits."
 
-#~ msgid "Fast-forwarded $branch_name to $onto_name."
-#~ msgstr "Avance rápido de $branch_name a $onto_name."
+#, sh-format
+#~ msgid "Could not apply $sha1... $rest"
+#~ msgstr "No se pudo aplicar $sha1... $rest"
 
-#~ msgid "First, rewinding head to replay your work on top of it..."
+#, 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 ""
-#~ "En primer lugar, rebobinando HEAD para después reproducir tus cambios "
-#~ "encima de ésta..."
-
-#~ msgid "ignoring unknown color-moved-ws mode '%s'"
-#~ msgstr "ignorando modo desconocido color-moved-ws '%s'"
-
-#~ msgid "only 'tree:0' is supported"
-#~ msgstr "solo 'tree:0' es soportado"
-
-#~ msgid "Renaming %s to %s and %s to %s instead"
-#~ msgstr "Renombrando %s a %s y %s a %s más bien"
+#~ "No se pudo corregir commit después de seleccionar exitosamente $sha1 ... "
+#~ "$rest\n"
+#~ "Esto es probablemente debido a un mensaje de commit vacío, o el hook pre-"
+#~ "commit\n"
+#~ "ha fallado. Si el hook pre-commit falló, es posible que debas resolver el "
+#~ "problema antes\n"
+#~ "de que seas capaz de reformular el commit."
 
-#~ msgid "Adding merged %s"
-#~ msgstr "Agregar %s fusionado"
+#, sh-format
+#~ msgid "Stopped at $sha1_abbrev... $rest"
+#~ msgstr "Detenido en $sha1_abbrev... $rest"
 
-#~ msgid "Internal error"
-#~ msgstr "Error interno"
+#, sh-format
+#~ msgid "Cannot '$squash_style' without a previous commit"
+#~ msgstr "No se puede '$squash_style' sin un commit previo"
 
-#~ msgid "mainline was specified but commit %s is not a merge."
-#~ msgstr "línea principal especificada pero el commit %s no es una fusión."
+#, sh-format
+#~ msgid "Executing: $rest"
+#~ msgstr "Ejecutando: $rest"
 
-#~ msgid "unable to write sha1 filename %s"
-#~ msgstr "incapaz de escribir el nombre de archivo sha1 %s"
+#, sh-format
+#~ msgid "Execution failed: $rest"
+#~ msgstr "Ejecución fallida: $rest"
 
-#~ msgid "cannot read sha1_file for %s"
-#~ msgstr "no se puede leer sha1_file para %s"
+#~ msgid "and made changes to the index and/or the working tree"
+#~ msgstr "y hizo cambios al índice y/o al árbol de trabajo"
 
 #~ msgid ""
-#~ "error: cannot combine interactive options (--interactive, --exec, --"
-#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am "
-#~ "options (%s)"
+#~ "You can fix the problem, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
 #~ msgstr ""
-#~ "error: no se puede combinar opciones interactivas (--interactive, --exec, "
-#~ "--rebase-merges, --preserve-merges, --keep-empty, --root + --onto) con "
-#~ "opciones (%s)"
+#~ "Puedes corregir el problema y entonces ejecutar\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
 
+#, sh-format
 #~ msgid ""
-#~ "error: cannot combine merge options (--merge, --strategy, --strategy-"
-#~ "option) with am options (%s)"
+#~ "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 ""
-#~ "error: no se puede combinar opciones de merge (--merge, --strategy, --"
-#~ "strategy-option) con opciones de am (%s)"
-
-#~ msgid "unrecognised option: '$arg'"
-#~ msgstr "opción no reconocida: '$arg'"
-
-#~ msgid "'$invalid' is not a valid commit"
-#~ msgstr "'$invalid' no es un commit válido"
-
-#~ msgid "could not parse '%s' (looking for '%s')"
-#~ msgstr "no se pudo configurar '%s' (buscando '%s')"
-
-#~ msgid "deprecated synonym for --create-reflog"
-#~ msgstr "sinónimo deprecado para --create-reflog"
-
-#~ msgid "Can't stat %s"
-#~ msgstr "No se puede definir %s"
+#~ "La ejecución tuvo éxito: $rest\n"
+#~ "Pero dejó cambios en el índice y/o en el árbol de trabajo\n"
+#~ "Realiza un commit o stash con los cambios y, a continuación, ejecuta\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
 
-#~ msgid "abort rebase"
-#~ msgstr "abortar rebase"
+#, sh-format
+#~ msgid "Unknown command: $command $sha1 $rest"
+#~ msgstr "Comando desconocido: $command $sha1 $rest"
 
-#~ msgid "make rebase script"
-#~ msgstr "generar script de rebase"
+#~ msgid "Please fix this using 'git rebase --edit-todo'."
+#~ msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'."
 
-#~ msgid "cannot move a locked working tree"
-#~ msgstr "no se puede mover un árbol de trabajo encerrado"
+#, sh-format
+#~ msgid "Successfully rebased and updated $head_name."
+#~ msgstr "$head_name rebasado y actualizado satisfactoriamente."
 
-#~ msgid "cannot remove a locked working tree"
-#~ msgstr "no se puede eliminar árbol de trabajo encerrado"
+#~ msgid "Could not remove CHERRY_PICK_HEAD"
+#~ msgstr "No se pudo 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"
-#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
+#~ "  git commit --amend $gpg_sign_opt_quoted\n"
 #~ "\n"
-#~ "\t"
-#~ msgstr ""
+#~ "If they are meant to go into a new commit, run:\n"
 #~ "\n"
-#~ "\tComo sea, si quieres borrar todo, el rebase será abortado.\n"
+#~ "  git commit $gpg_sign_opt_quoted\n"
 #~ "\n"
-#~ "\t"
-
-#~ msgid "Dirty index: cannot merge (dirty: %s)"
-#~ msgstr "�ndice sucio: no se puede fusionar (sucio: %s)"
-
-#~ msgid "(+/-)x"
-#~ msgstr "(+/-)x"
-
-#~ msgid "<command>"
-#~ msgstr "<comando>"
-
-#~ msgid "push|fetch"
-#~ msgstr "push|fetch"
-
-#~ msgid "w[,i1[,i2]]"
-#~ msgstr "w[,i1[,i2]]"
-
-#~ msgid "Entering '$displaypath'"
-#~ msgstr "Entrando a '$displaypath'"
-
-#~ msgid "Stopping at '$displaypath'; script returned non-zero status."
-#~ msgstr ""
-#~ "Deteniendo en '$displaypath'; script devolvió un status distinto de cero."
-
-#~ msgid "Everyday Git With 20 Commands Or So"
-#~ msgstr "Git diario con 20 comandos o algo así"
-
-#~ msgid "Could not open '%s' for writing"
-#~ msgstr "No se pudo abrir '%s' para escritura"
-
-#~ msgid ""
-#~ "unexpected 1st line of squash message:\n"
+#~ "In both cases, once you're done, continue with:\n"
 #~ "\n"
-#~ "\t%.*s"
+#~ "  git rebase --continue\n"
 #~ msgstr ""
-#~ "1ra línea del mensaje squash no esperada:\n"
+#~ "Tienes cambios en el área de stage de tu árbol de trabajo.\n"
+#~ "Si estos cambios están destinados a\n"
+#~ "ser aplastados en el commit previo, ejecuta:\n"
 #~ "\n"
-#~ "\t%.*s"
-
-#~ msgid ""
-#~ "invalid 1st line of squash message:\n"
+#~ "  git commit --amend $gpg_sign_opt_quoted\n"
 #~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "1ra línea del mensaje squash inválida:\n"
+#~ "Si estos están destinados a ir en un nuevo commit, ejecuta:\n"
 #~ "\n"
-#~ "\t%.*s"
-
-#~ msgid "BUG: returned path string doesn't match cwd?"
-#~ msgstr "BUG: string de ruta recibido no concuerda con cwd?"
-
-#~ msgid "Error in object"
-#~ msgstr "Error en el objeto"
-
-#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
-#~ msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo EOF"
-
-#~ msgid "invalid filter-spec expression '%s'"
-#~ msgstr "expresión filter-spec inválida '%s'"
-
-#~ msgid "The copy of the patch that failed is found in: %s"
-#~ msgstr "La copia del parche que fallido se encuentra en: %s"
-
-#~ msgid "pathspec and --all are incompatible"
-#~ msgstr "pathspec y --all son incompatibles"
-
-#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-#~ msgstr ""
-#~ "Anulado el registro del submódulo '$name' ($url) para la ruta "
-#~ "'$displaypath'"
+#~ "  git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "En ambos casos, cuando termines, continúa con:\n"
+#~ "\n"
+#~ "  git rebase --continue\n"
 
-#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+#~ msgid "Error trying to find the author identity to amend commit"
 #~ msgstr ""
-#~ "Campos Para/Cc/Bcc no han sido interpretados todavía, han sido ignorados\n"
+#~ "Error al tratar de encontrar la identidad del autor para remediar el "
+#~ "commit"
 
 #~ msgid ""
-#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
-#~ "please use . instead if you meant to match all paths"
+#~ "You have uncommitted changes in your working tree. Please commit them\n"
+#~ "first and then run 'git rebase --continue' again."
 #~ msgstr ""
-#~ "los strings vacíos como pathspecs serán inválidas en las próximas "
-#~ "versiones. por favor use . si quería hacer coincidir todas las rutas"
+#~ "Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, "
+#~ "confírmalos\n"
+#~ "primero y entonces ejecuta 'git rebase --continue' de nuevo."
 
-#~ msgid "could not truncate '%s'"
-#~ msgstr "no se pudo truncar '%s'"
+#~ msgid "Could not commit staged changes."
+#~ msgstr "No se pudo realizar el commit con los cambios en el área de stage."
 
-#~ msgid "could not close %s"
-#~ msgstr "no se pudo cerrar %s"
+#~ msgid "Could not execute editor"
+#~ msgstr "No se pudo ejecutar el editor"
 
-#~ msgid "Copied a misnamed branch '%s' away"
-#~ msgstr "Copiada una rama mal llamada '%s' afuera"
+#, sh-format
+#~ msgid "Could not checkout $switch_to"
+#~ msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
 
-#~ msgid "it does not make sense to create 'HEAD' manually"
-#~ msgstr "No tiene sentido crear 'HEAD' manualmente"
+#~ msgid "No HEAD?"
+#~ msgstr "¿Sin HEAD?"
 
-#~ msgid "Don't know how to clone %s"
-#~ msgstr "No se sabe como clonar %s"
+#, sh-format
+#~ msgid "Could not create temporary $state_dir"
+#~ msgstr "No se pudo crear $state_dir temporalmente"
 
-#~ msgid "Don't know how to fetch from %s"
-#~ msgstr "No se sabe como extraer de %s"
+#~ msgid "Could not mark as interactive"
+#~ msgstr "No se pudo marcar como interactivo"
 
-#~ msgid "'$term' is not a valid term"
-#~ msgstr "'$term' no es un término válido"
+#, sh-format
+#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+#~ msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)"
+#~ msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)"
 
-#~ msgid ""
-#~ "error: unknown option for 'stash save': $option\n"
-#~ "       To provide a message, use git stash save -- '$option'"
-#~ msgstr ""
-#~ "error: opción desconocida para 'stash save': $option\n"
-#~ "       Esto provee un mensaje , use git stash save -- '$option'"
+#~ msgid "Note that empty commits are commented out"
+#~ msgstr "Ten en cuenta que los commits vacíos están comentados"
 
-#~ msgid "Failed to recurse into submodule path '$sm_path'"
-#~ msgstr "Falló al recurrir en la ruta de submódulo '$sm_path'"
+#~ msgid "Could not init rewritten commits"
+#~ msgstr "No se pudo inicializar los commits reescritos"
 
-#~ msgid "%%(trailers) does not take arguments"
-#~ msgstr "%%(trailers) no toma argumentos"
+#~ msgid "Cannot rebase: You have unstaged changes."
+#~ msgstr ""
+#~ "No se puede aplicar rebase: Tienes cambios que no están en el área de "
+#~ "stage."
 
-#~ msgid "submodule update strategy not supported for submodule '%s'"
+#~ msgid "Cannot pull with rebase: You have unstaged changes."
 #~ msgstr ""
-#~ "estrategia de actualización de submódulo no soportada para submódulo '%s'"
+#~ "No se puede aplicar pull con rebase: Tienes cambios que no están en el "
+#~ "área de stage."
 
-#~ msgid "change upstream info"
-#~ msgstr "cambie info de upstream"
+#~ msgid "Cannot rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "No se puede hacer rebase: Tu índice contiene cambios que no están en un "
+#~ "commit."
 
-#~ msgid ""
-#~ "\n"
-#~ "If you wanted to make '%s' track '%s', do this:\n"
-#~ "\n"
+#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
 #~ msgstr ""
-#~ "\n"
-#~ "Si querías hacer que '%s' rastree '%s', haz esto:\n"
-#~ "\n"
+#~ "No se puede hacer pull con rebase: Tu índice contiene cambios que no "
+#~ "están en un commit."
 
-#~ msgid "basename"
-#~ msgstr "nombre base"
+#~ msgid "unable to write stateless separator packet"
+#~ msgstr "no es posible escribir un paquete separador sin estado (stateless)"
 
-#~ msgid ""
-#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Peligro: falta el SHA-1 o no es un commit en la siguiente línea:\n"
-#~ " - $line"
+#~ msgid "git merge --abort"
+#~ msgstr "git merge --abort"
 
-#~ msgid ""
-#~ "Warning: the command isn't recognized in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Peligro: el comando no es reconocido en la siguiente línea:\n"
-#~ " - $line"
+#~ msgid "git merge --continue"
+#~ msgstr "git merge --continue"
+
+#~ msgid "git stash clear"
+#~ msgstr "git stash clear"
 
-#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
-#~ msgstr "O puedes abortar el rebasamiento con 'git rebase --abort'."
+#~ msgid "remote server sent stateless separator"
+#~ msgstr "el servidor remoto envió un separador sin estado (stateless)"
diff --git a/po/fr.po b/po/fr.po
index 336dc606b2..fc004019a3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -51,6 +51,7 @@
 #   to prune         |  éliminer
 #   to push          |  pousser
 #   to rebase        |  rebaser
+#   scheduler        |  planificateur
 #   trailers         |  lignes terminales
 #   repository       |  dépôt
 #   remote           |  distante (ou serveur distant)
@@ -76,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-05-17 16:02+0800\n"
-"PO-Revision-Date: 2021-05-19 17:43+0200\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"
@@ -85,231 +86,249 @@ 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:376
+#: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Hein (%s) ?"
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 builtin/rebase.c:1953
+#: 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"
 
-#: add-interactive.c:584 git-add--interactive.perl:269 git-add--interactive.perl:294
+#: add-interactive.c:588 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
 msgid "binary"
 msgstr "binaire"
 
-#: add-interactive.c:642 git-add--interactive.perl:278 git-add--interactive.perl:332
+#: add-interactive.c:646 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "rien"
 
-#: add-interactive.c:643 git-add--interactive.perl:314 git-add--interactive.perl:329
+#: add-interactive.c:647 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "inchangé"
 
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Mise à jour"
 
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
 #, c-format
 msgid "could not stage '%s'"
 msgstr "impossible d'indexer '%s'"
 
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
+#: 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"
 
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
 #, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "%d chemin mis à jour\n"
 msgstr[1] "%d chemins mis à jour\n"
 
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "note : %s n'est plus suivi à présent.\n"
 
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 builtin/reset.c:145
+#: 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'"
 
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Inverser"
 
-#: add-interactive.c:775
+#: add-interactive.c:779
 msgid "Could not parse HEAD^{tree}"
 msgstr "Impossible d'analyser HEAD^{tree}"
 
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
 #, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "%d chemin inversé\n"
 msgstr[1] "%d chemins inversés\n"
 
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "Aucun Fichier non suivi.\n"
 
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Ajouter un fichier non-suivi"
 
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
 #, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "%d chemin ajouté\n"
 msgstr[1] "%d chemins ajoutés\n"
 
-#: add-interactive.c:925
+#: add-interactive.c:929
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "fichier non-fusionné ignoré : %s"
 
-#: add-interactive.c:937 add-patch.c:1751 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:939 add-patch.c:1749 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:943 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:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Réviser la différence"
 
-#: add-interactive.c:1010
+#: add-interactive.c:1014
 msgid "show paths with changes"
 msgstr "afficher les chemins comprenant des modifications"
 
-#: add-interactive.c:1012
+#: add-interactive.c:1016
 msgid "add working tree state to the staged set of changes"
-msgstr "ajouter l'état de l'arbre de travail à l'ensemble des modifications indexées"
+msgstr ""
+"ajouter l'état de l'arbre de travail à l'ensemble des modifications indexées"
 
-#: add-interactive.c:1014
+#: add-interactive.c:1018
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "retourner l'ensemble de modifications indexées à la version HEAD"
 
-#: add-interactive.c:1016
+#: add-interactive.c:1020
 msgid "pick hunks and update selectively"
 msgstr "sélection et mise à jour individuelle des sections"
 
-#: add-interactive.c:1018
+#: add-interactive.c:1022
 msgid "view diff between HEAD and index"
 msgstr "visualiser les diffs entre HEAD et l'index"
 
-#: add-interactive.c:1020
+#: add-interactive.c:1024
 msgid "add contents of untracked files to the staged set of changes"
-msgstr "ajouter le contenu des fichiers non-suivis à l'ensemble des modifications indexées"
+msgstr ""
+"ajouter le contenu des fichiers non-suivis à l'ensemble des modifications "
+"indexées"
 
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
 msgid "Prompt help:"
 msgstr "Aide :"
 
-#: add-interactive.c:1030
+#: add-interactive.c:1034
 msgid "select a single item"
 msgstr "sélectionner un seul élément"
 
-#: add-interactive.c:1032
+#: add-interactive.c:1036
 msgid "select a range of items"
 msgstr "sélectionner une plage d'éléments"
 
-#: add-interactive.c:1034
+#: add-interactive.c:1038
 msgid "select multiple ranges"
 msgstr "sélectionner plusieurs plages"
 
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
 msgid "select item based on unique prefix"
 msgstr "sélectionner un élément basé sur une préfixe unique"
 
-#: add-interactive.c:1038
+#: add-interactive.c:1042
 msgid "unselect specified items"
 msgstr "désélectionner les éléments spécifiés"
 
-#: add-interactive.c:1040
+#: add-interactive.c:1044
 msgid "choose all items"
 msgstr "choisir tous les éléments"
 
-#: add-interactive.c:1042
+#: add-interactive.c:1046
 msgid "(empty) finish selecting"
 msgstr "(vide) arrêter de sélectionner"
 
-#: add-interactive.c:1079
+#: add-interactive.c:1083
 msgid "select a numbered item"
 msgstr "sélectionner un élément par son numéro"
 
-#: add-interactive.c:1083
+#: add-interactive.c:1087
 msgid "(empty) select nothing"
 msgstr "(vide) ne rien sélectionner"
 
-#: add-interactive.c:1091 builtin/clean.c:816 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:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Et maintenant"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "staged"
 msgstr "indexé"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "non-indexé"
 
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 builtin/fetch.c:152
-#: builtin/merge.c:285 builtin/pull.c:190 builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 builtin/submodule--helper.c:1822
-#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 git-add--interactive.perl:213
+#: 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"
 
-#: add-interactive.c:1151
+#: add-interactive.c:1155
 msgid "could not refresh index"
 msgstr "impossible de rafraîchir l'index"
 
-#: add-interactive.c:1165 builtin/clean.c:781 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,?] ? "
 
 #: add-patch.c:39
-msgid "If the patch applies cleanly, the edited hunk will immediately be marked for staging."
-msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme indexée."
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+"Si le patch s'applique proprement, la section éditée sera immédiatement "
+"marquée comme indexée."
 
 #: add-patch.c:42
 msgid ""
@@ -325,29 +344,33 @@ 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,?] ? "
 
 #: add-patch.c:61
-msgid "If the patch applies cleanly, the edited hunk will immediately be marked for stashing."
-msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme remisée."
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+"Si le patch s'applique proprement, la section éditée sera immédiatement "
+"marquée comme remisée."
 
 #: add-patch.c:64
 msgid ""
@@ -363,29 +386,33 @@ 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,?] ? "
 
 #: add-patch.c:85
-msgid "If the patch applies cleanly, the edited hunk will immediately be marked for unstaging."
-msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme desindexée."
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"Si le patch s'applique proprement, la section éditée sera immédiatement "
+"marquée comme desindexée."
 
 #: add-patch.c:88
 msgid ""
@@ -401,29 +428,33 @@ 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,?] ? "
 
 #: add-patch.c:108 add-patch.c:176 add-patch.c:221
-msgid "If the patch applies cleanly, the edited hunk will immediately be marked for applying."
-msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme appliquée."
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"applying."
+msgstr ""
+"Si le patch s'applique proprement, la section éditée sera immédiatement "
+"marquée comme appliquée."
 
 #: add-patch.c:111
 msgid ""
@@ -439,29 +470,37 @@ 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,?] ? "
 
 #: add-patch.c:131 add-patch.c:154 add-patch.c:199
-msgid "If the patch applies cleanly, the edited hunk will immediately be marked for discarding."
-msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme éliminée."
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"discarding."
+msgstr ""
+"Si le patch s'applique proprement, la section éditée sera immédiatement "
+"marquée comme éliminée."
 
 #: add-patch.c:134 add-patch.c:202
 msgid ""
@@ -477,25 +516,27 @@ 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,?] ? "
+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 "Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
+msgstr ""
+"Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
 
 #: add-patch.c:157
 msgid ""
@@ -511,25 +552,31 @@ 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,?] ? "
+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,?] ? "
+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,?] ? "
+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 "Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
+msgstr ""
+"Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
 
 #: add-patch.c:179
 msgid ""
@@ -559,34 +606,34 @@ 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:342
+#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "impossible d'analyser l'entête de section '%.*s'"
 
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "impossible d'analyser l'entête coloré de section '%.*s'"
 
-#: add-patch.c:419
+#: add-patch.c:420
 msgid "could not parse diff"
 msgstr "impossible d'analyser la diff"
 
-#: add-patch.c:438
+#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr "impossible d'analyser la diff colorée"
 
-#: add-patch.c:452
+#: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
 msgstr "échec pour lancer '%s'"
 
-#: add-patch.c:611
+#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
 msgstr "sortie sans correspondance depuis interactive.diffFilter"
 
-#: add-patch.c:612
+#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -594,7 +641,7 @@ msgstr ""
 "Votre filtre doit maintenir une correspondance un-pour-un\n"
 "entre les lignes en entrée et en sortie."
 
-#: add-patch.c:790
+#: add-patch.c:791
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -603,7 +650,7 @@ msgstr ""
 "ligne de contexte attendue #%d dans\n"
 "%.*s"
 
-#: add-patch.c:805
+#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -616,11 +663,12 @@ msgstr ""
 "\tne se termine pas par :\n"
 "%.*s"
 
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n"
+msgstr ""
+"Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n"
 
-#: add-patch.c:1085
+#: add-patch.c:1086
 #, c-format
 msgid ""
 "---\n"
@@ -634,7 +682,7 @@ msgstr ""
 "Les lignes commençant par %c seront éliminées.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -644,11 +692,11 @@ msgstr ""
 "l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n"
 "alors l'édition sera abandonnée et la section conservée.\n"
 
-#: add-patch.c:1132
+#: add-patch.c:1133
 msgid "could not parse hunk header"
 msgstr "impossible d'analyser l'entête de section"
 
-#: add-patch.c:1177
+#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr "'git apply --cached' a échoué"
 
@@ -664,23 +712,26 @@ 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:1246 git-add--interactive.perl:1242
-msgid "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr "Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" l'élimine !) [y|n] ? "
+#: add-patch.c:1247 git-add--interactive.perl:1244
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" "
+"l'élimine !) [y|n] ? "
 
-#: add-patch.c:1289
+#: add-patch.c:1290
 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:1290 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:1297 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"
 
-#: add-patch.c:1354
+#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -702,73 +753,73 @@ msgstr ""
 "e - éditer manuellement la section actuelle\n"
 "? - afficher l'aide\n"
 
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
 msgstr "Pas de section précédente"
 
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
 msgstr "Pas de section suivante"
 
-#: add-patch.c:1537
+#: add-patch.c:1538
 msgid "No other hunks to goto"
 msgstr "Aucune autre section à atteindre"
 
-#: add-patch.c:1548 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:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "aller à quelle section ? "
 
-#: add-patch.c:1560
+#: add-patch.c:1561
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Numéro invalide : '%s'"
 
-#: add-patch.c:1565
+#: add-patch.c:1566
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Désolé, %d seule section disponible."
 msgstr[1] "Désolé, Seulement %d sections disponibles."
 
-#: add-patch.c:1574
+#: add-patch.c:1575
 msgid "No other hunks to search"
 msgstr "Aucune autre section à rechercher"
 
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "rechercher la regex ? "
 
-#: add-patch.c:1595
+#: add-patch.c:1596
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Regex de recherche malformée %s : %s"
 
-#: add-patch.c:1612
+#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
 msgstr "Aucune section ne correspond au motif donné"
 
-#: add-patch.c:1619
+#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
 msgstr "Désolé, impossible de découper cette section"
 
-#: add-patch.c:1623
+#: add-patch.c:1624
 #, c-format
 msgid "Split into %d hunks."
 msgstr "Découpée en %d sections."
 
-#: add-patch.c:1627
+#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
 msgstr "Désolé, impossible d'éditer cette section"
 
-#: add-patch.c:1679
+#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr "'git apply' a échoué"
 
-#: advice.c:145
+#: advice.c:78
 #, c-format
 msgid ""
 "\n"
@@ -777,37 +828,37 @@ msgstr ""
 "\n"
 "Désactivez ce message avec \"git config advice.%s false\""
 
-#: advice.c:161
+#: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sastuce: %.*s%s\n"
 
-#: advice.c:252
+#: advice.c:178
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "Impossible de picorer car vous avez des fichiers non fusionnés."
 
-#: advice.c:254
+#: advice.c:180
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Impossible de valider car vous avez des fichiers non fusionnés."
 
-#: advice.c:256
+#: advice.c:182
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."
 
-#: advice.c:258
+#: advice.c:184
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."
 
-#: advice.c:260
+#: advice.c:186
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."
 
-#: advice.c:262
+#: advice.c:188
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés."
 
-#: advice.c:270
+#: 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."
@@ -815,36 +866,49 @@ msgstr ""
 "Corrigez-les puis lancez 'git add/rm <fichier>'\n"
 "si nécessaire pour marquer la résolution et valider."
 
-#: advice.c:278
+#: advice.c:204
 msgid "Exiting because of an unresolved conflict."
 msgstr "Abandon à cause de conflit non résolu."
 
-#: advice.c:283 builtin/merge.c:1374
+#: 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)."
 
-#: advice.c:285
+#: advice.c:211
 msgid "Please, commit your changes before merging."
 msgstr "Veuillez valider vos changements avant de fusionner."
 
-#: advice.c:286
+#: advice.c:212
 msgid "Exiting because of unfinished merge."
 msgstr "Abandon à cause d'une fusion non terminée."
 
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "Pas possible d'avancer rapidement, abandon."
+
+#: advice.c:227
 #, 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"
+"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 ""
-"Les spécificateurs de chemin suivants n'ont trouvé aucune correspondance, mais correspondent\n"
-"dans les entrées d'index hors de l'extraction clairsemée actuelle :\n"
+"Les chemins ou spécificateurs de chemins suivants correspondent à des "
+"chemins\n"
+"qui existent hors de votre définition d'extraction clairsemée, et ne seront\n"
+"donc pas mis à jour dans l'index :\n"
 
-#: advice.c:303
-msgid "Disable or modify the sparsity rules if you intend to update such entries."
-msgstr "Désactiver ou modifier les règles de partialisation si vous allez mettre à jour de telles entrées."
+#: advice.c:234
+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 vous souhaitez mettre à jour de telles entrées, essayez au choix :\n"
+"* d'utiliser l'option --sparse,\n"
+"* de désactiver ou modifier les règles de choix clairsemé."
 
-#: advice.c:310
+#: advice.c:242
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -862,16 +926,21 @@ msgid ""
 "\n"
 "  git switch -\n"
 "\n"
-"Turn off this advice by setting config variable advice.detachedHead to false\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
 "\n"
 msgstr ""
 "Note : basculement sur '%s'.\n"
 "\n"
-"Vous êtes dans l'état « HEAD détachée ». Vous pouvez visiter, faire des modifications\n"
-"expérimentales et les valider. Il vous suffit de faire un autre basculement pour\n"
-"abandonner les commits que vous faites dans cet état sans impacter les autres branches\n"
+"Vous êtes dans l'état « HEAD détachée ». Vous pouvez visiter, faire des "
+"modifications\n"
+"expérimentales et les valider. Il vous suffit de faire un autre basculement "
+"pour\n"
+"abandonner les commits que vous faites dans cet état sans impacter les "
+"autres branches\n"
 "\n"
-"Si vous voulez créer une nouvelle branche pour conserver les commits que vous créez,\n"
+"Si vous voulez créer une nouvelle branche pour conserver les commits que "
+"vous créez,\n"
 "il vous suffit d'utiliser l'option -c de la commande switch comme ceci :\n"
 "\n"
 "  git switch -c <nom-de-la-nouvelle-branche>\n"
@@ -880,7 +949,8 @@ msgstr ""
 "\n"
 "  git switch -\n"
 "\n"
-"Désactivez ce conseil en renseignant la variable de configuration advice.detachedHead à false\n"
+"Désactivez ce conseil en renseignant la variable de configuration advice."
+"detachedHead à false\n"
 "\n"
 
 #: alias.c:50
@@ -901,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
@@ -935,22 +1017,29 @@ msgstr "nom de fichier du patch introuvable à la ligne %d"
 #: apply.c:921
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la ligne %d"
+msgstr ""
+"git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "
+"ligne %d"
 
 #: apply.c:927
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant à la ligne %d"
+msgstr ""
+"git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant "
+"à la ligne %d"
 
 #: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant à la ligne %d"
+msgstr ""
+"git apply : mauvais format de git-diff - ancien nom de fichier inconsistant "
+"à la ligne %d"
 
 #: apply.c:933
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"
+msgstr ""
+"git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"
 
 #: apply.c:962
 #, c-format
@@ -964,15 +1053,24 @@ msgstr "lignes d'entête inconsistantes %d et %d"
 
 #: apply.c:1371
 #, c-format
-msgid "git diff header lacks filename information when removing %d leading pathname component (line %d)"
-msgid_plural "git diff header lacks filename information when removing %d leading pathname components (line %d)"
-msgstr[0] "information de nom de fichier manquante dans l'en-tête de git diff lors de la suppression de %d composant de préfixe de chemin (ligne %d)"
-msgstr[1] "information de nom de fichier manquante dans l'en-tête de git diff lors de la suppression de %d composants de préfixe de chemin (ligne %d)"
+msgid ""
+"git diff header lacks filename information when removing %d leading pathname "
+"component (line %d)"
+msgid_plural ""
+"git diff header lacks filename information when removing %d leading pathname "
+"components (line %d)"
+msgstr[0] ""
+"information de nom de fichier manquante dans l'en-tête de git diff lors de "
+"la suppression de %d composant de préfixe de chemin (ligne %d)"
+msgstr[1] ""
+"information de nom de fichier manquante dans l'en-tête de git diff lors de "
+"la suppression de %d composants de préfixe de chemin (ligne %d)"
 
 #: apply.c:1384
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
-msgstr "information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)"
+msgstr ""
+"information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)"
 
 #: apply.c:1480
 #, c-format
@@ -1012,49 +1110,49 @@ msgstr "le fichier supprimé %s a encore du contenu"
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "patch binaire corrompu à la ligne %d : %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "patch binaire non reconnu à la ligne %d"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch totalement incompréhensible à la ligne %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "lecture du lien symbolique %s impossible"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "ouverture ou lecture de %s impossible"
 
-#: apply.c:2935
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "début de ligne invalide : '%c'"
 
-#: apply.c:3056
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)."
 msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)."
 
-#: apply.c:3068
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d"
 
-#: apply.c:3074
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1063,435 +1161,458 @@ msgstr ""
 "pendant la recherche de :\n"
 "%.*s"
 
-#: apply.c:3096
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "données de patch binaire manquantes pour '%s'"
 
-#: apply.c:3104
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
-msgstr "impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section inverse"
+msgstr ""
+"impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section "
+"inverse"
 
-#: apply.c:3151
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
-msgstr "impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"
+msgstr ""
+"impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"
 
-#: apply.c:3162
+#: apply.c:3163
 #, c-format
-msgid "the patch applies to '%s' (%s), which does not match the current contents."
-msgstr "le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr ""
+"le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."
 
-#: apply.c:3170
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide"
 
-#: apply.c:3188
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue"
 
-#: apply.c:3201
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "le patch binaire ne s'applique par correctement à '%s'"
 
-#: apply.c:3208
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s trouvé)"
+msgstr ""
+"le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
+"trouvé)"
 
-#: apply.c:3229
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "le patch a échoué : %s:%ld"
 
-#: apply.c:3352
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "extraction de %s impossible"
 
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 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"
 
-#: apply.c:3412
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
 
-#: apply.c:3441 apply.c:3687
+#: 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:3527 apply.c:3702
+#: 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:3536 apply.c:3710 apply.c:3954
+#: 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:3571
+#: 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."
+msgstr ""
+"le dépôt n'a pas les blobs nécessaires pour effectuer une fusion à 3 points."
 
-#: apply.c:3574
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Application d'une fusion à 3 points…\n"
 
-#: apply.c:3590 apply.c:3594
+#: 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:3606
+#: 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:3620
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch %s appliqué avec des conflits.\n"
 
-#: apply.c:3625
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch %s appliqué proprement.\n"
 
-#: apply.c:3642
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Retour à une application directe…\n"
 
-#: apply.c:3654
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "le patch de suppression laisse un contenu dans le fichier"
 
-#: apply.c:3727
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s : type erroné"
 
-#: apply.c:3729
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s est de type %o, mais %o attendu"
 
-#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 read-cache.c:1351
+#: 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:3952
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s : existe déjà dans l'index"
 
-#: apply.c:3956
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s : existe déjà dans la copie de travail"
 
-#: apply.c:3976
+#: 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:3981
+#: 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"
+msgstr ""
+"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
 
-#: apply.c:4001
+#: 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:4005
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s : le patch ne s'applique pas"
 
-#: apply.c:4020
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Vérification du patch %s..."
 
-#: apply.c:4112
+#: 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"
+msgstr ""
+"l'information sha1 est manquante ou inutilisable pour le sous-module %s"
 
-#: apply.c:4119
+#: 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:4122
+#: 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:4131
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "impossible d'ajouter %s à l'index temporaire"
 
-#: apply.c:4141
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "impossible d'écrire l'index temporaire dans %s"
 
-#: apply.c:4279
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "suppression de %s dans l'index impossible"
 
-#: apply.c:4313
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "patch corrompu pour le sous-module %s"
 
-#: apply.c:4319
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "stat du fichier nouvellement créé '%s' impossible"
 
-#: apply.c:4327
+#: 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"
+msgstr ""
+"création du magasin de stockage pour le fichier nouvellement créé %s "
+"impossible"
 
-#: apply.c:4333 apply.c:4478
+#: 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:4376 builtin/bisect--helper.c:523
+#: 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:4380
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "fermeture du fichier '%s'"
 
-#: apply.c:4450
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "écriture du fichier '%s' mode %o impossible"
 
-#: apply.c:4548
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s appliqué proprement."
 
-#: apply.c:4556
+#: apply.c:4580
 msgid "internal error"
 msgstr "erreur interne"
 
-#: apply.c:4559
+#: 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:4570
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "troncature du nom de fichier .rej en %.*s.rej"
 
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "impossible d'ouvrir %s"
 
-#: apply.c:4592
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Section n°%d appliquée proprement."
 
-#: apply.c:4596
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Section n°%d rejetée."
 
-#: apply.c:4725
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Chemin '%s' non traité."
 
-#: apply.c:4733
-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:4753
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "lecture du fichier d'index impossible"
 
-#: apply.c:4910
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "ouverture impossible du patch '%s' :%s"
 
-#: apply.c:4937
+#: 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:4943 apply.c:4958
+#: 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:4951
+#: 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:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
+#: 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:4995
+#: 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:4998
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "appliquer les modifications qui correspondent au chemin donné"
 
-#: apply.c:5000 builtin/am.c:2317
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "num"
 
-#: apply.c:5001
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
 
-#: apply.c:5004
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "ignorer les additions réalisées par le patch"
 
-#: apply.c:5006
+#: 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:5010
+#: 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"
+msgstr ""
+"afficher le nombre de lignes ajoutées et supprimées en notation décimale"
 
-#: apply.c:5012
+#: 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:5014
+#: 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:5016
+#: 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:5018
+#: 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:5020
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "appliquer les patch sans toucher à la copie de travail"
 
-#: apply.c:5022
+#: 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:5025
+#: 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:5027
+#: 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"
+msgstr ""
+"tenter une fusion à 3 points, revenir à un rustinage normal en cas d'échec"
 
-#: apply.c:5029
+#: 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é"
+msgstr ""
+"construire un index temporaire fondé sur l'information de l'index embarqué"
 
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: 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:5034
+#: 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:5035 builtin/am.c:2293 builtin/am.c:2296 builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3831 builtin/rebase.c:1347
+#: 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:5036
+#: 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"
+msgstr ""
+"détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
+"d'espace"
 
-#: apply.c:5039 apply.c:5042
+#: 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:5045
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "appliquer le patch en sens inverse"
 
-#: apply.c:5047
+#: 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:5049
+#: 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:5051
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "accepter les recouvrements de sections"
 
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 builtin/log.c:2295
-#: builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "mode verbeux"
-
-#: apply.c:5054
+#: 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"
+msgstr ""
+"tolérer des erreurs de détection de retours chariot manquants en fin de "
+"fichier"
 
-#: apply.c:5057
+#: 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:5059 builtin/am.c:2305
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "racine"
 
-#: apply.c:5060
+#: 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"
@@ -1502,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"
@@ -1526,7 +1647,7 @@ msgstr "le chemin n'est pas codé en UTF-8 valide : %s"
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s"
 
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
 msgstr "erreur de compression (%d)"
@@ -1545,156 +1666,162 @@ msgid "git archive --list"
 msgstr "git archive --list"
 
 #: archive.c:16
-msgid "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr "git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou apparenté> [<chemin>...]"
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou "
+"apparenté> [<chemin>...]"
 
 #: archive.c:17
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
 
-#: archive.c:188
-#, c-format
-msgid "cannot read %s"
-msgstr "impossible de lire %s"
-
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 builtin/merge.c:1143
+#: 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 "impossible de lire '%s'"
 
-#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
+#: 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"
 
-#: archive.c:451
+#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "référence inexistante : %.*s"
 
-#: archive.c:457
+#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "nom d'objet invalide : %s"
 
-#: archive.c:470
+#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "objet arbre invalide : %s"
 
-#: archive.c:482
+#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "l'arbre de travail actuel est non-suivi"
 
-#: archive.c:523
+#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Fichier non trouvé : %s"
 
-#: archive.c:525
+#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "'%s' n'est pas un fichier normal"
 
-#: archive.c:552
+#: archive.c:551
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:552
+#: archive.c:551
 msgid "archive format"
 msgstr "format d'archive"
 
-#: archive.c:553 builtin/log.c:1772
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "préfixe"
 
-#: archive.c:554
+#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
 msgstr "préfixer chaque chemin de fichier dans l'archive"
 
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 builtin/ls-files.c:653
-#: builtin/ls-files.c:656 builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: 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: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"
 
-#: archive.c:556
+#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "ajouter les fichiers non suivis à l'archive"
 
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
 msgid "write the archive to this file"
 msgstr "écrire l'archive dans ce fichier"
 
-#: archive.c:561
+#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "lire .gitattributes dans le répertoire de travail"
 
-#: archive.c:562
+#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "afficher les fichiers archivés sur stderr"
 
-#: archive.c:564
+#: archive.c:563
 msgid "set compression level"
 msgstr "régler le niveau de compression"
 
-#: archive.c:567
+#: archive.c:566
 msgid "list supported archive formats"
 msgstr "afficher les formats d'archive supportés"
 
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "dépôt"
 
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
 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:571 builtin/archive.c:93 builtin/difftool.c:718 builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
 msgid "command"
 msgstr "commande"
 
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
 msgid "path to the remote git-upload-archive command"
 msgstr "chemin vers la commande distante git-upload-archive"
 
-#: archive.c:579
+#: archive.c:578
 msgid "Unexpected option --remote"
 msgstr "Option --remote inattendue"
 
-#: archive.c:581
-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:583
+#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Option --output inattendue"
 
-#: archive.c:585
-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:607
+#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Format d'archive inconnu '%s'"
 
-#: archive.c:616
+#: archive.c:615
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argument non supporté pour le format '%s' : -%d"
 
-#: attr.c:202
+#: attr.c:203
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s n'est pas un nom valide d'attribut"
 
-#: attr.c:363
+#: attr.c:364
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s non permis : %s : %d"
 
-#: attr.c:403
+#: attr.c:404
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1702,22 +1829,22 @@ msgstr ""
 "Les motifs de négation sont ignorés dans les attributs git\n"
 "Utilisez '\\!' pour un point d'exclamation littéral."
 
-#: bisect.c:489
+#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Contenu mal cité dans le fichier '%s' : %s"
 
-#: bisect.c:699
+#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Impossible de pousser la bissection plus loin !\n"
 
-#: bisect.c:766
+#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "%s n'est pas un nom de commit valide"
 
-#: bisect.c:791
+#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1726,7 +1853,7 @@ msgstr ""
 "La base de fusion %s est mauvaise.\n"
 "Cela signifie que le bogue été corrigé entre %s et [%s].\n"
 
-#: bisect.c:796
+#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1735,7 +1862,7 @@ msgstr ""
 "La base de fusion %s est nouvelle.\n"
 "La propriété a changé entre %s et [%s].\n"
 
-#: bisect.c:801
+#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1744,7 +1871,7 @@ msgstr ""
 "La base de fusion %s est %s.\n"
 "Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
 
-#: bisect.c:809
+#: bisect.c:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1755,7 +1882,7 @@ msgstr ""
 "git bisect ne peut pas fonctionner correctement dans ce cas.\n"
 "Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n"
 
-#: bisect.c:822
+#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1763,39 +1890,40 @@ msgid ""
 "We continue anyway."
 msgstr ""
 "la base de fusion entre %s et [%s] doit être évitée.\n"
-"On ne peut donc pas être certain que le premier commit %s se trouve entre %s et %s.\n"
+"On ne peut donc pas être certain que le premier commit %s se trouve entre %s "
+"et %s.\n"
 "On continue tout de même."
 
-#: bisect.c:861
+#: bisect.c:859
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bissection : une base de fusion doit être testée\n"
 
-#: bisect.c:911
+#: bisect.c:909
 #, c-format
 msgid "a %s revision is needed"
 msgstr "une révision %s est nécessaire"
 
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
 #, c-format
 msgid "could not create file '%s'"
 msgstr "impossible de créer le fichier '%s'"
 
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "impossible de lire le fichier '%s'"
 
-#: bisect.c:1027
+#: bisect.c:1025
 msgid "reading bisect refs failed"
 msgstr "impossible de lire les références de bissection"
 
-#: bisect.c:1057
+#: bisect.c:1055
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s était à la fois %s et %s\n"
 
-#: bisect.c:1066
+#: bisect.c:1064
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1804,7 +1932,7 @@ msgstr ""
 "Aucun commit testable n'a été trouvé\n"
 "Peut-être avez-vous démarré avec un mauvais arguement de chemin ?\n"
 
-#: bisect.c:1095
+#: bisect.c:1093
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1814,7 +1942,7 @@ msgstr[1] "(à peu près %d étapes)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1101
+#: bisect.c:1099
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1831,17 +1959,25 @@ msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
 
 #: blame.c:2811
 msgid "--reverse and --first-parent together require specified latest commit"
-msgstr "--reverse et --first-parent ensemble nécessitent la spécification d'un dernier commit"
+msgstr ""
+"--reverse et --first-parent ensemble nécessitent la spécification d'un "
+"dernier commit"
 
-#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
-#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
-#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
+#: 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 "échec de la préparation du parcours des révisions"
 
 #: blame.c:2838
-msgid "--reverse --first-parent together require range along first-parent chain"
-msgstr "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de premier parent"
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "
+"premier parent"
 
 #: blame.c:2849
 #, c-format
@@ -1853,98 +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."
-msgstr "La branche '%s' est paramétrée pour suivre la référence distante '%s' en rebasant."
+#: 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"
+"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."
-msgstr "La branche '%s' est paramétrée pour suivre la référence locale '%s' en rebasant."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr ""
+"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."
-msgstr "Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est pas une branche."
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr ""
+"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"
@@ -1964,152 +2096,154 @@ 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"
 
-#: bundle.c:41
+#: bundle.c:44
 #, c-format
 msgid "unrecognized bundle hash algorithm: %s"
 msgstr "algorithme d'empreinte du colis inconnu : %s"
 
-#: bundle.c:45
+#: bundle.c:48
 #, c-format
 msgid "unknown capability '%s'"
 msgstr "capacité inconnue '%s'"
 
-#: bundle.c:71
+#: bundle.c:74
 #, c-format
 msgid "'%s' does not look like a v2 or v3 bundle file"
 msgstr "'%s' ne semble pas être un fichier colis v2 our v3"
 
-#: bundle.c:110
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "en-tête non reconnu : %s%s (%d)"
 
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 builtin/commit.c:861
+#: 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'"
 msgstr "impossible d'ouvrir '%s'"
 
-#: bundle.c:189
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
 
-#: bundle.c:192
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
 msgstr "la vérification d'un colis requiert un dépôt"
 
-#: bundle.c:243
+#: bundle.c:257
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "Le colis contient cette référence :"
 msgstr[1] "Le colis contient ces %d références :"
 
-#: bundle.c:250
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "Le colis enregistre l'historique complet."
 
-#: bundle.c:252
+#: bundle.c:266
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Le colis exige cette référence :"
 msgstr[1] "Le colis exige ces %d références :"
 
-#: bundle.c:319
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "impossible de dupliquer le descripteur de liasse"
 
-#: bundle.c:326
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "Impossible de créer des objets groupés"
 
-#: bundle.c:337
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "les objets groupés ont disparu"
 
-#: bundle.c:386
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "la référence '%s' est exclue par les options de rev-list"
 
-#: bundle.c:490
+#: bundle.c:504
 #, c-format
 msgid "unsupported bundle version %d"
 msgstr "version de colis non supportée %d"
 
-#: bundle.c:492
+#: bundle.c:506
 #, c-format
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "impossible d'écrire une version de colis %d avec l'algorithme %s"
 
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
+#: 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"
 
-#: bundle.c:539
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "Refus de créer un colis vide."
 
-#: bundle.c:549
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "impossible de créer '%s'"
 
-#: bundle.c:574
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "l'index de groupe a disparu"
 
-#: chunk-format.c:113
+#: chunk-format.c:117
 msgid "terminating chunk id appears earlier than expected"
 msgstr "l'identifiant de terminaison de tronçon apparaît plus tôt qu'attendu"
 
-#: chunk-format.c:122
+#: chunk-format.c:126
 #, c-format
 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
 msgstr "décalage(s) de section incorrect(s) %<PRIx64> et %<PRIx64>"
 
-#: chunk-format.c:129
+#: chunk-format.c:133
 #, c-format
 msgid "duplicate chunk ID %<PRIx32> found"
 msgstr "ID de section dupliqué %<PRIx32>"
 
-#: chunk-format.c:143
+#: chunk-format.c:147
 #, c-format
 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"
 
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
 msgid "invalid hash version"
 msgstr "version d'empreinte invalide"
 
@@ -2120,7 +2254,8 @@ msgstr "le graphe de commit est trop petit"
 #: commit-graph.c:355
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
-msgstr "la signature du graphe de commit %X ne correspond pas à la signature %X"
+msgstr ""
+"la signature du graphe de commit %X ne correspond pas à la signature %X"
 
 #: commit-graph.c:362
 #, c-format
@@ -2130,7 +2265,9 @@ msgstr "la version %X du graphe de commit ne correspond pas à la version %X"
 #: commit-graph.c:369
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
-msgstr "l'empreinte de la version %X du graphe de commit ne correspond pas à la version %X"
+msgstr ""
+"l'empreinte de la version %X du graphe de commit ne correspond pas à la "
+"version %X"
 
 #: commit-graph.c:386
 #, c-format
@@ -2148,220 +2285,248 @@ msgstr "la chaîne de graphe de commit ne correspond pas"
 #: commit-graph.c:540
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr "chaîne de graphe de commit invalide : la ligne '%s' n'est pas une empreinte"
+msgstr ""
+"chaîne de graphe de commit invalide : la ligne '%s' n'est pas une empreinte"
 
 #: commit-graph.c:564
 msgid "unable to find all commit-graph files"
 msgstr "impossible de trouver tous les fichiers du graphe de commit"
 
-#: commit-graph.c:745 commit-graph.c:782
+#: 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"
+msgstr ""
+"position de commit invalide. Le graphe de commit est vraisemblablement "
+"corrompu"
 
-#: commit-graph.c:766
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "impossible de trouver le commit %s"
 
-#: commit-graph.c:799
+#: 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"
+msgstr ""
+"le graphe de commits requiert des données de génération de débordement mais "
+"n'en contient pas"
 
-#: commit-graph.c:1075 builtin/am.c:1340
+#: 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:1337 builtin/pack-objects.c:2897
+#: 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:1368
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "Lecture des commits connus dans un graphe de commit"
 
-#: commit-graph.c:1385
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr "Expansion des commits joignables dans un graphe de commit"
 
-#: commit-graph.c:1405
+#: 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:1424
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "Calcul des niveaux topologiques du graphe de commits"
 
-#: commit-graph.c:1477
+#: 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:1558
+#: 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:1635
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "Collecte des commits référencés"
 
-#: commit-graph.c:1660
+#: 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:1673
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "erreur à l'ajout du packet %s"
 
-#: commit-graph.c:1677
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "erreur à l'ouverture de l'index pour %s"
 
-#: commit-graph.c:1714
+#: 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"
+msgstr ""
+"Recherche de commits pour un graphe de commits parmi les objets empaquetés"
 
-#: commit-graph.c:1732
+#: 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:1781
+#: 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:1812 midx.c:906
+#: 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:1825
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "impossible de créer une couche de graphe temporaire"
 
-#: commit-graph.c:1830
+#: 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:1887
+#: 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:1923
+#: 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:1939
+#: 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:1959
+#: 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:2092
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "Analyse des commits de fusion"
 
-#: commit-graph.c:2136
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "Fusion du graphe de commits"
 
-#: commit-graph.c:2244
+#: 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é"
+msgstr ""
+"essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé"
 
-#: commit-graph.c:2351
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr "trop de commits pour écrire un graphe"
 
-#: commit-graph.c:2450
+#: 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"
+msgstr ""
+"le graphe de commit a une somme de contrôle incorrecte et est "
+"vraisemblablement corrompu"
 
-#: commit-graph.c:2460
+#: 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:2470 commit-graph.c:2485
+#: 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"
+msgstr ""
+"le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = "
+"%u != %u"
 
-#: commit-graph.c:2477
+#: 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:2495
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "Verification des commits dans le graphe de commits"
 
-#: commit-graph.c:2510
+#: 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"
+msgstr ""
+"échec de l'analyse du commit %s depuis la base de données d'objets pour le "
+"graphe de commit"
 
-#: commit-graph.c:2517
+#: 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"
+msgstr ""
+"l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != "
+"%s"
 
-#: commit-graph.c:2527
+#: 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"
+msgstr ""
+"la liste des parents du graphe de commit pour le commit %s est trop longue"
 
-#: commit-graph.c:2536
+#: 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:2550
+#: 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"
+msgstr ""
+"la liste de parents du graphe de commit pour le commit %s se termine trop tôt"
 
-#: commit-graph.c:2555
+#: commit-graph.c:2587
 #, c-format
-msgid "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr "le graphe de commit a un numéro de génération nul pour le commit %s, mais non-nul ailleurs"
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+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:2559
+#: commit-graph.c:2591
 #, c-format
-msgid "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr "le graphe de commit a un numéro de génération non-nul pour le commit %s, mais nul ailleurs"
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+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:2576
+#: 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>"
+msgstr ""
+"la génération du graphe de commit pour le commit %s est %<PRIuMAX> < "
+"%<PRIuMAX>"
 
-#: commit-graph.c:2582
+#: 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>"
+msgstr ""
+"la date de validation pour le commit %s dans le graphe de commit est "
+"%<PRIuMAX> != %<PRIuMAX>"
 
-#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416 builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 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"
 
-#: commit.c:54
+#: commit.c:55
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s n'est pas un commit !"
 
-#: commit.c:194
+#: commit.c:196
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -2381,41 +2546,43 @@ msgstr ""
 "Supprimez ce message en lançant\n"
 "\"git config advice.graftFileDeprecated false\""
 
-#: commit.c:1237
+#: 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:1241
+#: 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:1244
+#: 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:1247
+#: 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:1501
+#: 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"
 "variable i18n.commitencoding to the encoding your project uses.\n"
 msgstr ""
 "Avertissement : le message de validation ne se conforme pas à UTF-8.\n"
-"Vous souhaitez peut-être le modifier après correction du message ou régler la\n"
-"variable de configuration i18n.commitencoding à l'encodage utilisé par votre projet.\n"
+"Vous souhaitez peut-être le modifier après correction du message ou régler "
+"la\n"
+"variable de configuration i18n.commitencoding à l'encodage utilisé par votre "
+"projet.\n"
 
 #: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"
 msgstr "plus de mémoire"
 
-#: config.c:126
+#: config.c:125
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -2430,35 +2597,37 @@ msgstr ""
 "\t%s\n"
 "possibilité d'inclusions multiples."
 
-#: config.c:142
+#: config.c:141
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "expansion impossible du chemin d'inclusion '%s'"
 
-#: config.c:153
+#: config.c:152
 msgid "relative config includes must come from files"
 msgstr "les inclusions de configuration relatives doivent venir de fichiers"
 
-#: config.c:199
+#: config.c:201
 msgid "relative config include conditionals must come from files"
-msgstr "les conditions d'inclusion de configuration relative doivent venir de fichiers"
+msgstr ""
+"les conditions d'inclusion de configuration relative doivent venir de "
+"fichiers"
 
-#: config.c:396
+#: config.c:398
 #, c-format
 msgid "invalid config format: %s"
 msgstr "format de config invalide : %s"
 
-#: config.c:400
+#: config.c:402
 #, c-format
 msgid "missing environment variable name for configuration '%.*s'"
 msgstr "nom de variable d'environnement manquant pour le configuration '%.*s'"
 
-#: config.c:405
+#: config.c:407
 #, c-format
 msgid "missing environment variable '%s' for configuration '%.*s'"
 msgstr "variable d'environnement '%s' manquante pour le configuration '%.*s'"
 
-#: config.c:442
+#: config.c:443
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "la clé ne contient pas de section: %s"
@@ -2468,295 +2637,310 @@ 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:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "clé invalide : %s"
 
-#: config.c:478
+#: config.c:475
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "clé invalide (retour chariot) : %s"
 
-#: config.c:511
+#: config.c:495
 msgid "empty config key"
 msgstr "clé de configuration vide"
 
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "paramètre de configuration mal formé: %s"
 
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
 #, c-format
 msgid "bogus format in %s"
 msgstr "formatage mal formé dans %s"
 
-#: config.c:622
+#: config.c:606
 #, c-format
 msgid "bogus count in %s"
 msgstr "compte faux dans %s"
 
-#: config.c:626
+#: config.c:610
 #, c-format
 msgid "too many entries in %s"
 msgstr "trop d'entrées dans %s"
 
-#: config.c:636
+#: config.c:620
 #, c-format
 msgid "missing config key %s"
 msgstr "clé de configuration %s manquante"
 
-#: config.c:644
+#: config.c:628
 #, c-format
 msgid "missing config value %s"
 msgstr "valeur de config manquante %s"
 
-#: config.c:995
+#: config.c:979
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "ligne %d de config incorrecte dans le blob %s"
 
-#: config.c:999
+#: config.c:983
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "ligne %d de config incorrecte dans le fichier %s"
 
-#: config.c:1003
+#: config.c:987
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "ligne %d de config incorrecte dans l'entrée standard"
 
-#: config.c:1007
+#: config.c:991
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "ligne %d de config incorrecte dans le blob de sous-module %s"
 
-#: config.c:1011
+#: config.c:995
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "ligne %d de config incorrecte dans la ligne de commande %s"
 
-#: config.c:1015
+#: config.c:999
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "ligne %d de config incorrecte dans %s"
 
-#: config.c:1152
+#: config.c:1136
 msgid "out of range"
 msgstr "hors plage"
 
-#: config.c:1152
+#: config.c:1136
 msgid "invalid unit"
 msgstr "unité invalide"
 
-#: config.c:1153
+#: config.c:1137
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
 
-#: config.c:1163
+#: config.c:1147
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
-msgstr "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob %s : %s"
+msgstr ""
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob "
+"%s : %s"
 
-#: config.c:1166
+#: config.c:1150
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
-msgstr "valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier %s : %s"
+msgstr ""
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier "
+"%s : %s"
 
-#: config.c:1169
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
-msgstr "valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée standard : %s"
+msgstr ""
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée "
+"standard : %s"
 
-#: config.c:1172
+#: config.c:1156
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
-msgstr "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de sous-module %s : %s"
+msgstr ""
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de "
+"sous-module %s : %s"
 
-#: config.c:1175
+#: config.c:1159
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
-msgstr "valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de commande %s : %s"
+msgstr ""
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de "
+"commande %s : %s"
 
-#: config.c:1178
+#: config.c:1162
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
+msgstr ""
+"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
 
-#: config.c:1257
+#: config.c:1241
 #, c-format
 msgid "bad boolean config value '%s' for '%s'"
 msgstr "valeur booléenne de configuration invalide '%s' pour '%s'"
 
-#: config.c:1275
+#: config.c:1259
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
 
-#: config.c:1284
+#: config.c:1268
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%s' pour '%s' n'est pas un horodatage valide"
 
-#: config.c:1377
+#: config.c:1361
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "longueur d'abbrev hors plage : %d"
 
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "niveau de compression zlib incorrect %d"
 
-#: config.c:1494
+#: config.c:1476
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar ne devrait être qu'un unique caractère"
 
-#: config.c:1527
+#: config.c:1509
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "mode invalide pour la création d'objet : %s"
 
-#: config.c:1599
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "valeur mal formée pour %s"
 
-#: config.c:1625
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "valeur mal formée pour %s : %s"
 
-#: config.c:1626
+#: 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:1687 builtin/pack-objects.c:3924
+#: 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:1809
+#: 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:1812
+#: 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:1829
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "impossible de résoudre le blob de config '%s'"
 
-#: config.c:1873
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "échec de l'analyse de %s"
 
-#: config.c:1929
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr "lecture de la configuration de ligne de commande impossible"
 
-#: config.c:2293
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
 
-#: config.c:2467
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s invalide : '%s'"
 
-#: config.c:2512
+#: 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"
+msgstr ""
+"la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "
+"100"
 
-#: config.c:2558
+#: 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"
+msgstr ""
+"impossible d'analyser '%s' depuis le configuration en ligne de commande"
 
-#: config.c:2560
+#: 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"
+msgstr ""
+"variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
 
-#: config.c:2644
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nom de section invalide '%s'"
 
-#: config.c:2676
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s a des valeurs multiples"
 
-#: config.c:2705
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "impossible d'écrire le fichier de configuration %s"
 
-#: config.c:2957 config.c:3283
+#: 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:2968
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "ouverture de %s"
 
-#: config.c:3005 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "motif invalide : %s"
 
-#: config.c:3030
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "fichier de configuration invalide %s"
 
-#: config.c:3043 config.c:3296
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "échec de fstat sur %s"
 
-#: config.c:3054
+#: config.c:3047
 #, c-format
-msgid "unable to mmap '%s'"
-msgstr "impossible de réaliser un map de '%s'"
+msgid "unable to mmap '%s'%s"
+msgstr "impossible de réaliser un mmap de '%s'%s"
 
-#: config.c:3063 config.c:3301
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "échec de chmod sur %s"
 
-#: config.c:3148 config.c:3398
+#: 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:3182
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "impossible de régler '%s' à '%s'"
 
-#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: 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:3274
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "nom de section invalide : %s"
 
-#: config.c:3441
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "valeur manquante pour '%s'"
@@ -2791,72 +2975,72 @@ msgstr "le serveur ne supporte pas la fonctionnalité '%s'"
 msgid "expected flush after capabilities"
 msgstr "vidage attendu après les capacités"
 
-#: connect.c:263
+#: connect.c:265
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "capacités ignorées après la première ligne '%s'"
 
-#: connect.c:284
+#: connect.c:286
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "erreur de protocole : capabilities^{} inattendu"
 
-#: connect.c:306
+#: connect.c:308
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "erreur de protocole : shallow sha-1 attendu, '%s' trouvé"
 
-#: connect.c:308
+#: connect.c:310
 msgid "repository on the other end cannot be shallow"
 msgstr "le dépôt distant ne peut pas être superficiel"
 
-#: connect.c:347
+#: connect.c:349
 msgid "invalid packet"
 msgstr "paquet invalide"
 
-#: connect.c:367
+#: connect.c:369
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "erreur de protocole : '%s' attendu"
 
-#: connect.c:497
+#: connect.c:499
 #, c-format
 msgid "unknown object format '%s' specified by server"
 msgstr "format d'objet spécifié par le serveur inconnu '%s'"
 
-#: connect.c:526
+#: connect.c:528
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "réponse à ls-ref invalide : %s"
 
-#: connect.c:530
+#: connect.c:532
 msgid "expected flush after ref listing"
 msgstr "vidage attendu après le listage de références"
 
-#: connect.c:533
+#: connect.c:535
 msgid "expected response end packet after ref listing"
 msgstr "paquet de fin de réponse attendu après le listage de références"
 
-#: connect.c:666
+#: connect.c:670
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "le protocole '%s' n'est pas supporté"
 
-#: connect.c:717
+#: connect.c:721
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "impossible de positionner SO_KEEPALIVE sur la socket"
 
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
 #, c-format
 msgid "Looking up %s ... "
 msgstr "Recherche de %s… "
 
-#: connect.c:761
+#: connect.c:765
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "impossible de rechercher %s (port %s) (%s)"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
 #, c-format
 msgid ""
 "done.\n"
@@ -2865,7 +3049,7 @@ msgstr ""
 "fait.\n"
 "Connexion à %s (port %s)… "
 
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2875,77 +3059,80 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
 msgid "done."
 msgstr "fait."
 
-#: connect.c:824
+#: connect.c:828
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "impossible de rechercher %s (%s)"
 
-#: connect.c:830
+#: connect.c:834
 #, c-format
 msgid "unknown port %s"
 msgstr "port inconnu %s"
 
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "nom d'hôte étrange '%s' bloqué"
 
-#: connect.c:969
+#: connect.c:973
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "port étrange '%s' bloqué"
 
-#: connect.c:979
+#: connect.c:983
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "impossible de démarrer un proxy %s"
 
-#: connect.c:1050
+#: connect.c:1054
 msgid "no path specified; see 'git help pull' for valid url syntax"
-msgstr "aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe d'URL valide"
+msgstr ""
+"aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe "
+"d'URL valide"
 
-#: connect.c:1190
+#: connect.c:1194
 msgid "newline is forbidden in git:// hosts and repo paths"
-msgstr "le retour chariot est interdit dans les hôtes git:// et les chemins de dépôt"
+msgstr ""
+"le retour chariot est interdit dans les hôtes git:// et les chemins de dépôt"
 
-#: connect.c:1247
+#: connect.c:1251
 msgid "ssh variant 'simple' does not support -4"
 msgstr "la variante ssh 'simple' ne supporte pas -4"
 
-#: connect.c:1259
+#: connect.c:1263
 msgid "ssh variant 'simple' does not support -6"
 msgstr "la variante ssh 'simple' ne supporte pas -6"
 
-#: connect.c:1276
+#: connect.c:1280
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "la variante ssh 'simple' ne supporte pas de spécifier le port"
 
-#: connect.c:1388
+#: connect.c:1392
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "chemin étrange '%s' bloqué"
 
-#: connect.c:1436
+#: connect.c:1440
 msgid "unable to fork"
 msgstr "fork impossible"
 
-#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "Vérification de la connectivité"
 
-#: connected.c:120
+#: connected.c:122
 msgid "Could not run 'git rev-list'"
 msgstr "Impossible de lancer 'git rev-list'"
 
-#: connected.c:144
+#: connected.c:146
 msgid "failed write to rev-list"
 msgstr "impossible d'écrire dans la rev-list"
 
-#: connected.c:149
+#: connected.c:151
 msgid "failed to close rev-list's stdin"
 msgstr "impossible de fermer l'entrée standard du rev-list"
 
@@ -2989,8 +3176,12 @@ msgstr "Aucun BOM n'est permis dans '%s' s'il est encodé comme %s"
 
 #: convert.c:280
 #, c-format
-msgid "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as working-tree-encoding."
-msgstr "Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez utiliser UTF-%.*s comme encodage d'arbre de travail."
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez "
+"utiliser UTF-%.*s comme encodage d'arbre de travail."
 
 #: convert.c:293
 #, c-format
@@ -2999,9 +3190,13 @@ msgstr "Un BOM est obligatoire dans '%s' s'il est encodé comme %s"
 
 #: convert.c:295
 #, c-format
-msgid "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-%sLE (depending on the byte order) as working-tree-encoding."
+msgid ""
+"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
+"%sLE (depending on the byte order) as working-tree-encoding."
 msgstr ""
-"Il manque un marqueur d'ordre d'octets (BOM) au fichier '%s'. Veuillez utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre de travail."
+"Il manque un marqueur d'ordre d'octets (BOM) au fichier '%s'. Veuillez "
+"utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre "
+"de travail."
 
 #: convert.c:408 convert.c:479
 #, c-format
@@ -3011,7 +3206,9 @@ msgstr "échec de l'encodage de '%s' de %s vers %s"
 #: convert.c:451
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr "encoder '%s' depuis %s vers %s puis inversement ne produit pas le même contenu"
+msgstr ""
+"encoder '%s' depuis %s vers %s puis inversement ne produit pas le même "
+"contenu"
 
 #: convert.c:654
 #, c-format
@@ -3046,21 +3243,25 @@ msgstr "type de filtre inattendu"
 msgid "path name too long for external filter"
 msgstr "nom de chemin trop long pour un filtre externe"
 
-#: convert.c:934
+#: convert.c:935
 #, c-format
-msgid "external filter '%s' is not available anymore although not all paths have been filtered"
-msgstr "le filtre externe '%s' n'est plus disponible bien que tous les chemins n'aient pas été filtrés"
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+"le filtre externe '%s' n'est plus disponible bien que tous les chemins "
+"n'aient pas été filtrés"
 
-#: convert.c:1234
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false ne sont pas des encodages d'arbre de travail valides"
 
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s : le filtre clean '%s' a échoué"
 
-#: convert.c:1490
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s : le filtre smudge '%s' a échoué"
@@ -3068,7 +3269,9 @@ msgstr "%s : le filtre smudge '%s' a échoué"
 #: credential.c:96
 #, c-format
 msgid "skipping credential lookup for key: credential.%s"
-msgstr "vérification des informations d'identification sautée pour la clé : credential.%s"
+msgstr ""
+"vérification des informations d'identification sautée pour la clé : "
+"credential.%s"
 
 #: credential.c:112
 msgid "refusing to work with credential missing host field"
@@ -3076,19 +3279,20 @@ msgstr "refus de travailler avec un champ host manquant dans l'identification"
 
 #: credential.c:114
 msgid "refusing to work with credential missing protocol field"
-msgstr "refus de travailler avec un champ protocol manquant dans l'identification"
+msgstr ""
+"refus de travailler avec un champ protocol manquant dans l'identification"
 
-#: credential.c:394
+#: credential.c:395
 #, c-format
 msgid "url contains a newline in its %s component: %s"
 msgstr "l'url contient un retour chariot dans composant %s : %s"
 
-#: credential.c:438
+#: credential.c:439
 #, c-format
 msgid "url has no scheme: %s"
 msgstr "l'url n'a pas de schéma : %s"
 
-#: credential.c:511
+#: credential.c:512
 #, c-format
 msgid "credential url cannot be parsed: %s"
 msgstr "impossible d'analyser l'url d'identification : %s"
@@ -3178,77 +3382,96 @@ msgstr "impossible de charger la regex île pour '%s' : %s"
 #: delta-islands.c:390
 #, c-format
 msgid "island regex from config has too many capture groups (max=%d)"
-msgstr "l'expression rationnelle depuis la configuration a trop de groupes de capture (max=%d)"
+msgstr ""
+"l'expression rationnelle depuis la configuration a trop de groupes de "
+"capture (max=%d)"
 
 #: delta-islands.c:467
 #, c-format
 msgid "Marked %d islands, done.\n"
 msgstr "Marquage de %d îlots, fait.\n"
 
-#: diff-merges.c:80
+#: diff-merges.c:70
 #, c-format
 msgid "unknown value for --diff-merges: %s"
 msgstr "valeur inconnue pour --diff-merges : %s"
 
-#: diff-lib.c:538
+#: diff-lib.c:561
 msgid "--merge-base does not work with ranges"
 msgstr "--merge-base ne fonctionne pas avec des plages"
 
-#: diff-lib.c:540
+#: diff-lib.c:563
 msgid "--merge-base only works with commits"
 msgstr "--merge-base ne fonctionne qu'avec des commits"
 
-#: diff-lib.c:557
+#: diff-lib.c:580
 msgid "unable to get HEAD"
 msgstr "impossible d'acquérir HEAD"
 
-#: diff-lib.c:564
+#: diff-lib.c:587
 msgid "no merge base found"
 msgstr "aucune base de fusion trouvée"
 
-#: diff-lib.c:566
+#: diff-lib.c:589
 msgid "multiple merge bases found"
 msgstr "bases multiples de fusion trouvées"
 
-#: diff-no-index.c:238
+#: diff-no-index.c:237
 msgid "git diff --no-index [<options>] <path> <path>"
 msgstr "git diff --no-index [<options>] <chemin> <chemin>"
 
-#: diff-no-index.c:263
-msgid "Not a git repository. Use --no-index to compare two paths outside a working tree"
-msgstr "Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un arbre de travail"
+#: diff-no-index.c:262
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un "
+"arbre de travail"
 
-#: diff.c:156
+#: 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"
+msgstr ""
+"  Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
 
-#: diff.c:161
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Paramètre dirstat inconnu '%s'\n"
 
-#: diff.c:297
-msgid "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'"
-msgstr "le paramètre de couleur de déplacement doit être parmi 'no', 'default', 'blocks', 'zebra', 'dimmed_zebra' ou 'plain'"
+#: diff.c:299
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"le paramètre de couleur de déplacement doit être parmi 'no', 'default', "
+"'blocks', 'zebra', 'dimmed-zebra' ou 'plain'"
 
-#: diff.c:325
+#: 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'"
+msgid ""
+"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
+"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
 msgstr ""
-"mode unknown color-moved-ws inconnu '%s', les valeurs possibles sont 'ignore-space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
+"mode unknown color-moved-ws inconnu '%s', les valeurs possibles sont 'ignore-"
+"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
 "change'"
 
-#: diff.c:333
-msgid "color-moved-ws: allow-indentation-change cannot be combined with other whitespace modes"
-msgstr "color-moved-ws : allow-indentation-change ne peut pas être combiné avec d'autres modes d'espace"
+#: diff.c:335
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+"color-moved-ws : allow-indentation-change ne peut pas être combiné avec "
+"d'autres modes d'espace"
 
-#: diff.c:410
+#: 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'"
+msgstr ""
+"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
 
-#: diff.c:470
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3257,34 +3480,53 @@ msgstr ""
 "Erreurs dans la variable de configuration 'diff.dirstat' :\n"
 "%s"
 
-#: diff.c:4278
+#: 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:4630
-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: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:4633
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S et --find-object sont mutuellement exclusifs"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr ""
+"les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez "
+"'%s' avec '%s'"
 
-#: diff.c:4712
+#: diff.c:4601
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez "
+"'%s' avec '%s' et '%s'"
+
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow a besoin d'une spécification de chemin unique"
 
-#: diff.c:4760
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "valeur invalide de --stat : %s"
 
-#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: 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:4797
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3293,504 +3535,567 @@ msgstr ""
 "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
 "%s"
 
-#: diff.c:4882
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s"
+msgstr "classe de modification inconnue '%c' dans --diff-filter=%s"
 
-#: diff.c:4906
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "valeur inconnue après ws-error-highlight=%.*s"
 
-#: diff.c:4920
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "impossible de résoudre '%s'"
 
-#: diff.c:4970 diff.c:4976
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "forme <n>/<m> attendue par %s"
 
-#: diff.c:4988
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "caractère attendu par %s, '%s' trouvé"
 
-#: diff.c:5009
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "mauvais argument --color-moved : %s"
 
-#: diff.c:5028
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "mode invalide '%s' dans --color-moved-ws"
 
-#: diff.c:5068
-msgid "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and \"histogram\""
-msgstr "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et \"histogram\""
+#: diff.c:5037
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "
+"\"histogram\""
 
-#: diff.c:5104 diff.c:5124
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "argument invalide pour %s"
 
-#: diff.c:5228
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "regex invalide fournie à -I : '%s'"
 
-#: diff.c:5277
+#: 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:5333
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "mauvais argument pour --word-diff : %s"
 
-#: diff.c:5369
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "Options de format de sortie de diff"
 
-#: diff.c:5371 diff.c:5377
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "générer la rustine"
 
-#: diff.c:5374 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "supprimer la sortie des différences"
 
-#: diff.c:5379 diff.c:5493 diff.c:5500
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5380 diff.c:5383
+#: 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:5385
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "générer le diff en format brut"
 
-#: diff.c:5388
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "synonyme de '-p --raw'"
 
-#: diff.c:5392
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "synonyme de '-p --stat'"
 
-#: diff.c:5396
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "--stat pour traitement automatique"
 
-#: diff.c:5399
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "afficher seulement la dernière ligne de --stat"
 
-#: diff.c:5401 diff.c:5409
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5402
-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: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:5406
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "synonyme pour --dirstat=cumulative"
 
-#: diff.c:5410
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "synonyme pour --dirstat=files,param1,param2..."
 
-#: diff.c:5414
+#: 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"
+msgstr ""
+"avertir si les modifications introduisent des marqueurs de conflit ou des "
+"erreurs d'espace"
 
-#: diff.c:5417
+#: 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"
+msgstr ""
+"résumé succinct tel que les créations, les renommages et les modifications "
+"de mode"
 
-#: diff.c:5420
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "n'afficher que les noms de fichiers modifiés"
 
-#: diff.c:5423
+#: 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:5425
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"
 
-#: diff.c:5426
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "générer un diffstat"
 
-#: diff.c:5428 diff.c:5431 diff.c:5434
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<largeur>"
 
-#: diff.c:5429
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "générer un diffstat avec la largeur indiquée"
 
-#: diff.c:5432
+#: 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:5435
+#: 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:5437
+#: diff.c:5406
 msgid "<count>"
 msgstr "<compte>"
 
-#: diff.c:5438
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "générer un diffstat avec des lignes limitées"
 
-#: diff.c:5441
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "générer une résumé compact dans le diffstat"
 
-#: diff.c:5444
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "produire un diff binaire qui peut être appliqué"
 
-#: diff.c:5447
+#: 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\""
+msgstr ""
+"afficher les noms complets des objets pre- et post-image sur les lignes "
+"\"index\""
 
-#: diff.c:5449
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "afficher un diff coloré"
 
-#: diff.c:5450
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<sorte>"
 
-#: diff.c:5451
-msgid "highlight whitespace errors in the 'context', 'old' or 'new' lines in the diff"
-msgstr "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', 'nouveau' dans le diff"
+#: diff.c:5420
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "
+"'nouveau' dans le diff"
 
-#: diff.c:5454
-msgid "do not munge pathnames and use NULs as output field terminators in --raw or --numstat"
-msgstr "ne pas compresser les chemins et utiliser des NULs comme terminateurs de champs dans --raw ou --numstat"
+#: diff.c:5423
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"ne pas compresser les chemins et utiliser des NULs comme terminateurs de "
+"champs dans --raw ou --numstat"
 
-#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<préfixe>"
 
-#: diff.c:5458
+#: 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:5461
+#: 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:5464
+#: 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:5467
+#: 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:5470
+#: 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é"
+msgstr ""
+"afficher le contexte entre les sections à concurrence du nombre de ligne "
+"indiqué"
 
-#: diff.c:5474 diff.c:5479 diff.c:5484
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<caractère>"
 
-#: diff.c:5475
+#: 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:5480
+#: 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:5485
+#: 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 ' '"
+msgstr ""
+"spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '"
 
-#: diff.c:5488
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "Options de renommage de diff"
 
-#: diff.c:5489
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5490
+#: 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"
+msgstr ""
+"casser les modifications d'une réécrire complète en paires de suppression et "
+"création"
 
-#: diff.c:5494
+#: diff.c:5463
 msgid "detect renames"
 msgstr "détecter les renommages"
 
-#: diff.c:5498
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "supprimer la pré-image pour les suppressions"
 
-#: diff.c:5501
+#: diff.c:5470
 msgid "detect copies"
 msgstr "détecter les copies"
 
-#: diff.c:5505
+#: 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"
+msgstr ""
+"utiliser les fichiers non-modifiés comme sources pour trouver des copies"
 
-#: diff.c:5507
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "désactiver la détection de renommage"
 
-#: diff.c:5510
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "utiliser des blobs vides comme source de renommage"
 
-#: diff.c:5512
+#: 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:5515
-msgid "prevent rename/copy detection if the number of rename/copy targets exceeds given limit"
-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:5484
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+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:5517
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Options de l'algorithme de diff"
 
-#: diff.c:5519
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "produire le diff le plus petit possible"
 
-#: diff.c:5522
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "ignorer les espaces lors de la comparaison de ligne"
 
-#: diff.c:5525
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "ignorer des modifications du nombre d'espaces"
 
-#: diff.c:5528
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignorer des modifications d'espace en fin de ligne"
 
-#: diff.c:5531
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "ignore le retour chariot en fin de ligne"
 
-#: diff.c:5534
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "ignorer les modifications dont les lignes sont vides"
 
-#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<regex>"
 
-#: diff.c:5537
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr "ignorer les modifications dont les lignes correspondent à <regex>"
 
-#: diff.c:5540
+#: 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"
+msgstr ""
+"heuristique qui déplace les limites de sections de diff pour faciliter la "
+"lecture"
 
-#: diff.c:5543
+#: 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:5547
+#: 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\""
+msgstr ""
+"générer un diff en utilisant l'algorithme de différence \"histogramme\""
 
-#: diff.c:5549
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<algorithme>"
 
-#: diff.c:5550
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "choisir un algorithme de différence"
 
-#: diff.c:5552
+#: diff.c:5521
 msgid "<text>"
 msgstr "<texte>"
 
-#: diff.c:5553
+#: 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:5555 diff.c:5564 diff.c:5567
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<mode>"
 
-#: diff.c:5556
+#: 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"
+msgstr ""
+"afficher des différences par mot, en utilisant <mode> pour délimiter les "
+"mots modifiés"
 
-#: diff.c:5559
+#: 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:5562
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"
 
-#: diff.c:5565
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "les lignes déplacées sont colorées différemment"
 
-#: diff.c:5568
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr "comment les espaces sont ignorés dans --color-moved"
 
-#: diff.c:5571
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Autres options diff"
 
-#: diff.c:5573
+#: 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"
+msgstr ""
+"lancé depuis un sous-répertoire, exclure les modifications en dehors et "
+"afficher les chemins relatifs"
 
-#: diff.c:5577
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "traiter les fichiers comme texte"
 
-#: diff.c:5579
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "échanger les entrées, inverser le diff"
 
-#: diff.c:5581
+#: 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:5583
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "désactiver tous les affichages du programme"
 
-#: diff.c:5585
+#: 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:5587
+#: 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"
+msgstr ""
+"lancer les filtres externes de conversion en texte lors de la comparaison de "
+"fichiers binaires"
 
-#: diff.c:5589
+#: diff.c:5558
 msgid "<when>"
 msgstr "<quand>"
 
-#: diff.c:5590
+#: 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"
+msgstr ""
+"ignorer les modifications dans les sous-modules lors de la génération de diff"
 
-#: diff.c:5593
+#: diff.c:5562
 msgid "<format>"
 msgstr "<format>"
 
-#: diff.c:5594
+#: 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:5598
+#: 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:5601
+#: 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:5603
+#: diff.c:5572
 msgid "<string>"
 msgstr "<chaîne>"
 
-#: diff.c:5604
-msgid "look for differences that change the number of occurrences of the specified string"
-msgstr "rechercher les différences qui modifient le nombre d'occurrences de la chaîne spécifiée"
+#: diff.c:5573
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+"rechercher les différences qui modifient le nombre d'occurrences de la "
+"chaîne spécifiée"
 
-#: diff.c:5607
-msgid "look for differences that change the number of occurrences of the specified regex"
-msgstr "rechercher les différences qui modifient le nombre d'occurrences de la regex spécifiée"
+#: diff.c:5576
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"rechercher les différences qui modifient le nombre d'occurrences de la regex "
+"spécifiée"
 
-#: diff.c:5610
+#: 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"
+msgstr ""
+"afficher toutes les modifications dans l'ensemble de modifications avec -S "
+"ou -G"
 
-#: diff.c:5613
+#: 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"
+msgstr ""
+"traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"
 
-#: diff.c:5616
+#: 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:5617 diff.c:5620
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<chemin>"
 
-#: diff.c:5618
+#: 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:5621
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "sauter la sortie pour le chemin spécifié"
 
-#: diff.c:5623
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<id-objet>"
 
-#: diff.c:5624
-msgid "look for differences that change the number of occurrences of the specified object"
-msgstr "rechercher les différences qui modifient le nombre d'occurrences de l'objet indiqué"
+#: diff.c:5593
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+"rechercher les différences qui modifient le nombre d'occurrences de l'objet "
+"indiqué"
 
-#: diff.c:5626
+#: 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:5627
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "sélectionner les fichiers par types de diff"
 
-#: diff.c:5629
+#: diff.c:5598
 msgid "<file>"
 msgstr "<fichier>"
 
-#: diff.c:5630
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "Sortie vers un fichier spécifié"
 
-#: diff.c:6287
-msgid "inexact rename detection was skipped due to too many files."
-msgstr "détection de renommage inexact annulée à cause d'un trop grand nombre de fichiers."
+#: diff.c: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:6290
+#: 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."
+msgstr ""
+"recherche uniquement des copies par modification de chemin à cause d'un trop "
+"grand nombre de fichiers."
 
-#: diff.c:6293
+#: diff.c:6263
 #, c-format
-msgid "you may want to set your %s variable to at least %d and retry the command."
-msgstr "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le commande."
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
+"commande."
 
 #: diffcore-order.c:24
 #, c-format
 msgid "failed to read orderfile '%s'"
 msgstr "impossible de lire le fichier de commande '%s'"
 
-#: diffcore-rename.c:1418
+#: diffcore-rename.c:1564
 msgid "Performing inexact rename detection"
 msgstr "Détection de renommage inexact en cours"
 
@@ -3799,59 +4104,70 @@ msgstr "Détection de renommage inexact en cours"
 msgid "No such path '%s' in the diff"
 msgstr "Pas de chemin '%s' dans la diff"
 
-#: dir.c:578
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr "le spécificateur de chemin '%s' ne correspond à aucun fichier connu de git"
+msgstr ""
+"le spécificateur de chemin '%s' ne correspond à aucun fichier connu de git"
 
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr "motif non reconnu : '%s'"
 
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "motif négatif non reconnu : '%s'"
 
-#: dir.c:809
+#: dir.c:820
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr "votre fichier d'extraction partielle pourrait présenter des problèmes : le motif '%s' est répété"
+msgstr ""
+"votre fichier d'extraction partielle pourrait présenter des problèmes : le "
+"motif '%s' est répété"
 
-#: dir.c:819
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "désactivation de la correspondance de motif de cone"
 
-#: dir.c:1206
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "impossible d'utiliser %s comme fichier d'exclusion"
 
-#: dir.c:2314
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "impossible d'ouvrir le répertoire '%s'"
 
-#: dir.c:2614
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr "echec de l'obtention d'information de kernel"
 
-#: dir.c:2738
+#: 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:3543
+#: dir.c:3112
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+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:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "fichier d'index corrompu dans le dépôt %s"
 
-#: dir.c:3590 dir.c:3595
+#: 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:3624
+#: 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'"
@@ -3859,7 +4175,9 @@ msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
 #: 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"
+msgstr ""
+"suggestion : en attente de la fermeture du fichier par votre éditeur de "
+"texte…%c"
 
 #: entry.c:179
 msgid "Filtering content"
@@ -3870,398 +4188,475 @@ msgstr "Filtrage du contenu"
 msgid "could not stat file '%s'"
 msgstr "impossible de stat le fichier '%s'"
 
-#: environment.c:152
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "espaces de nom de Git \"%s\""
 
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "impossible de régler GIT_DIR à '%s'"
-
 #: exec-cmd.c:363
 #, c-format
 msgid "too many args to run %s"
 msgstr "trop d'arguments pour lancer %s"
 
-#: fetch-pack.c:182
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack : liste superficielle attendue"
 
-#: fetch-pack.c:185
+#: 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"
+msgstr ""
+"git fetch-pack : paquet de vidage attendu après une liste superficielle"
 
-#: fetch-pack.c:196
+#: 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:216
+#: 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:227
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "impossible d'écrire sur un distant"
 
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc nécessite multi_ack_detailed"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ligne de superficiel invalide : %s"
 
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: 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:391 fetch-pack.c:1431
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "objet non trouvé : %s"
 
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "erreur dans l'objet : %s"
 
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "pas de superficiel trouvé : %s"
 
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: 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:439
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "réponse %s %d %s"
 
-#: fetch-pack.c:456
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "commit invalide %s"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "abandon"
 
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "fait"
 
-#: fetch-pack.c:512
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s trouvé (%d) %s"
 
-#: fetch-pack.c:548
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Marquage de %s comme terminé"
 
-#: fetch-pack.c:763
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "%s déjà possédé (%s)"
 
-#: fetch-pack.c:849
+#: 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:857
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "erreur de protocole : mauvais entête de paquet"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack : impossible de dupliquer %s"
 
-#: fetch-pack.c:957
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack : sortie d'index de pack invalide"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "échec de %s"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "erreur dans le démultiplexer latéral"
 
-#: fetch-pack.c:1019
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La version du serveur est %.*s"
 
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
-#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: 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:1029
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "Le serveur ne supporte les clients superficiels"
 
-#: fetch-pack.c:1089
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "Le receveur ne gère pas --shallow-since"
 
-#: fetch-pack.c:1094
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "Le receveur ne gère pas --shallow-exclude"
 
-#: fetch-pack.c:1098
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "Le receveur ne gère pas --deepen"
 
-#: fetch-pack.c:1100
+#: 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:1113
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "pas de commit commun"
 
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: 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:1128 fetch-pack.c:1651
+#: 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:1242
+#: 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:1246
+#: 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:1279
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "Le serveur ne supporte pas les requêtes superficielles"
 
-#: fetch-pack.c:1286
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "Le serveur supporte filter"
 
-#: fetch-pack.c:1329 fetch-pack.c:2034
+#: 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:1347
+#: 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:1353
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "'%s' attendu, '%s' reçu"
 
-#: fetch-pack.c:1387
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "ligne d'acquittement inattendue : '%s'"
 
-#: fetch-pack.c:1392
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "erreur lors du traitement des acquittements : %d"
 
-#: fetch-pack.c:1402
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr "fichier paquet attendu à envoyer après 'ready'"
 
-#: fetch-pack.c:1404
+#: 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:1445
+#: 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:1494
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "wanted-ref attendu, '%s' trouvé"
 
-#: fetch-pack.c:1499
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref inattendu : '%s'"
 
-#: fetch-pack.c:1504
+#: 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:1534
+#: 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:1930
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "pas de HEAD distante correspondante"
 
-#: fetch-pack.c:1953 builtin/clone.c:697
+#: 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:2056
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "'ready' inattendu depuis le distant"
 
-#: fetch-pack.c:2079
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "référence distante inconnue %s"
 
-#: fetch-pack.c:2082
+#: 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:273
+#: 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:276
+#: 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:470
+#: gpg-interface.c:451
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile doit exister et être configuré pour la "
+"vérification de signature ssh"
+
+#: gpg-interface.c:480
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+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: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:624
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "signature incompatible ou mauvaise '%s'"
+
+#: 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: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: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:857
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand a échoué : %s %s"
+
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr "gpg n'a pas pu signer les données"
 
+#: 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: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: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:1014
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y signe est nécessaire pour pouvoir signer avec ssh (disponible "
+"dans openssh version 8.2p1+)"
+
+#: 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'"
+
 #: graph.c:98
 #, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
+msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"
 
 #: grep.c:531
-msgid "given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2"
-msgstr "le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est supporté qu'avec -P avec PCRE v2"
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est "
+"supporté qu'avec -P avec PCRE v2"
 
-#: grep.c:1893
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s' : lecture de %s impossible"
 
-#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 builtin/rm.c:136
+#: 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:1921
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s' : lecture tronquée"
 
-#: help.c:23
+#: help.c:24
 msgid "start a working area (see also: git help tutorial)"
 msgstr "démarrer une zone de travail (voir aussi : git help tutorial)"
 
-#: help.c:24
+#: help.c:25
 msgid "work on the current change (see also: git help everyday)"
-msgstr "travailler sur la modification actuelle (voir aussi : git help revisions)"
+msgstr ""
+"travailler sur la modification actuelle (voir aussi : git help revisions)"
 
-#: help.c:25
+#: help.c:26
 msgid "examine the history and state (see also: git help revisions)"
 msgstr "examiner l'historique et l'état (voir aussi : git help revisions)"
 
-#: help.c:26
+#: help.c:27
 msgid "grow, mark and tweak your common history"
 msgstr "agrandir, marquer et modifier votre historique"
 
-#: help.c:27
+#: help.c:28
 msgid "collaborate (see also: git help workflows)"
 msgstr "collaborer (voir aussi : git help workflows)"
 
-#: help.c:31
+#: help.c:32
 msgid "Main Porcelain Commands"
 msgstr "Commandes Porcelaine Principales"
 
-#: help.c:32
+#: help.c:33
 msgid "Ancillary Commands / Manipulators"
 msgstr "Commandes Auxiliaires / Manipulateurs"
 
-#: help.c:33
+#: help.c:34
 msgid "Ancillary Commands / Interrogators"
 msgstr "Commandes Auxiliaires / Interrogateurs"
 
-#: help.c:34
+#: help.c:35
 msgid "Interacting with Others"
 msgstr "Interaction avec d'autres développeurs"
 
-#: help.c:35
+#: help.c:36
 msgid "Low-level Commands / Manipulators"
 msgstr "Commandes bas-niveau / Manipulateurs"
 
-#: help.c:36
+#: help.c:37
 msgid "Low-level Commands / Interrogators"
 msgstr "Commandes bas niveau / Interrogateurs"
 
-#: help.c:37
+#: help.c:38
 msgid "Low-level Commands / Syncing Repositories"
 msgstr "Commandes bas niveau / Synchronisation de dépôts"
 
-#: help.c:38
+#: help.c:39
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Commandes bas niveau / Assistants internes"
 
-#: help.c:300
+#: help.c:313
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "commandes git disponibles dans '%s'"
 
-#: help.c:307
+#: help.c:320
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"
 
-#: help.c:316
+#: help.c:329
 msgid "These are common Git commands used in various situations:"
 msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"
 
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "type de liste de commandes non supporté '%s'"
 
-#: help.c:405
+#: help.c:418
 msgid "The Git concept guides are:"
 msgstr "Les guides des concepts de Git sont :"
 
-#: help.c:429
+#: help.c:442
 msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Référez-vous à 'git help <commande>' pour des informations sur une sous-commande spécifique"
+msgstr ""
+"Référez-vous à 'git help <commande>' pour des informations sur une sous-"
+"commande spécifique"
 
-#: help.c:434
+#: help.c:447
 msgid "External commands"
 msgstr "Commandes externes"
 
-#: help.c:449
+#: help.c:462
 msgid "Command aliases"
 msgstr "Alias de commande"
 
-#: help.c:527
+#: help.c:543
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -4270,31 +4665,38 @@ msgstr ""
 "'%s' semble être une commande git, mais elle n'a pas pu\n"
 "être exécutée. Peut-être git-%s est-elle cassée ?"
 
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'."
 
-#: help.c:591
+#: help.c:613
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Ahem. Votre système n'indique aucune commande Git."
 
-#: help.c:613
+#: help.c:635
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr "ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas."
+msgstr ""
+"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas."
 
-#: help.c:618
+#: help.c:640
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "Continuons en supposant que vous avez voulu dire '%s'."
 
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Lancer '%s' à la place [y/N] ? "
+
+#: help.c:654
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr "Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'."
+msgstr ""
+"Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'."
 
-#: help.c:635
+#: help.c:666
 msgid ""
 "\n"
 "The most similar command is"
@@ -4308,16 +4710,16 @@ msgstr[1] ""
 "\n"
 "Les commandes les plus ressemblantes sont"
 
-#: help.c:675
+#: help.c:706
 msgid "git version [<options>]"
 msgstr "git version [<options>]"
 
-#: help.c:730
+#: help.c:761
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:734
+#: help.c:765
 msgid ""
 "\n"
 "Did you mean this?"
@@ -4331,6 +4733,16 @@ msgstr[1] ""
 "\n"
 "Vouliez-vous dire un de ceux-là ?"
 
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n"
+"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "
+"false`."
+
 #: ident.c:353
 msgid "Author identity unknown\n"
 msgstr "Identité d'auteur inconnue\n"
@@ -4393,7 +4805,7 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis"
 msgid "name consists only of disallowed characters: %s"
 msgstr "le nom n'est constitué que de caractères interdits : %s"
 
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
 #, c-format
 msgid "invalid date format: %s"
 msgstr "format de date invalide : %s"
@@ -4408,7 +4820,7 @@ msgstr "sparse : le support des filtres de chemin a été abandonné"
 
 #: list-objects-filter-options.c:105
 #, c-format
-msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
 msgstr "'%s' pour 'object:type=<type>' n'est pas un type d'objet valide"
 
 #: list-objects-filter-options.c:124
@@ -4419,7 +4831,8 @@ msgstr "spécificateur de filtre invalide '%s'"
 #: list-objects-filter-options.c:140
 #, c-format
 msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "le caractère doit être échappé dans le spécificateur de sous-filtre : '%c'"
+msgstr ""
+"le caractère doit être échappé dans le spécificateur de sous-filtre : '%c'"
 
 #: list-objects-filter-options.c:182
 msgid "expected something after combine:"
@@ -4431,7 +4844,9 @@ msgstr "impossible de combiner des spécificateurs multiples de filtre"
 
 #: list-objects-filter-options.c:376
 msgid "unable to upgrade repository format to support partial clone"
-msgstr "impossible de mettre à jour le format de dépôt pour supporter les clones partiels"
+msgstr ""
+"impossible de mettre à jour le format de dépôt pour supporter les clones "
+"partiels"
 
 #: list-objects-filter.c:532
 #, c-format
@@ -4446,14 +4861,16 @@ msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s"
 #: list-objects.c:127
 #, c-format
 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre"
+msgstr ""
+"l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre"
 
 #: list-objects.c:140
 #, c-format
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob"
+msgstr ""
+"l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob"
 
-#: list-objects.c:395
+#: list-objects.c:398
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "impossible de charger l'arbre racine pour le commit %s"
@@ -4487,7 +4904,12 @@ msgstr "Impossible de créer '%s.lock' : %s"
 msgid "invalid value '%s' for lsrefs.unborn"
 msgstr "valeur invalide '%s' pour lsrefs.unborn"
 
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "ligne inattendue : '%s'"
+
+#: ls-refs.c:178
 msgid "expected flush after ls-refs arguments"
 msgstr "vidage attendu après les arguments ls-refs"
 
@@ -4495,46 +4917,49 @@ 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:176 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'"
 
-#: merge-ort.c:1116 merge-recursive.c:1205
+#: merge-ort.c:1584 merge-recursive.c:1211
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Échec de la fusion du sous-module %s (non extrait)"
 
-#: merge-ort.c:1125 merge-recursive.c:1212
+#: merge-ort.c:1593 merge-recursive.c:1218
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "Échec de fusion du sous-module %s (commits non présents)"
 
-#: merge-ort.c:1134 merge-recursive.c:1219
+#: merge-ort.c:1602 merge-recursive.c:1225
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr "Échec de la fusion du sous-module %s (les commits ne descendent pas de la base de fusion)"
+msgstr ""
+"Échec de la fusion du sous-module %s (les commits ne descendent pas de la "
+"base de fusion)"
 
-#: merge-ort.c:1144 merge-ort.c:1151
+#: merge-ort.c:1612 merge-ort.c:1620
 #, c-format
 msgid "Note: Fast-forwarding submodule %s to %s"
 msgstr "Note : Avance rapide du sous-module %s à %s"
 
-#: merge-ort.c:1172
+#: merge-ort.c:1642
 #, c-format
 msgid "Failed to merge submodule %s"
 msgstr "Échec de la fusion du sous-module %s"
 
-#: merge-ort.c:1179
+#: merge-ort.c:1649
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
 "%s\n"
 msgstr ""
-"Échec de fusion du sous-module %s mais une résolution possible de fusion existe :\n"
+"Échec de fusion du sous-module %s mais une résolution possible de fusion "
+"existe :\n"
 "%s\n"
 
-#: merge-ort.c:1183 merge-recursive.c:1273
+#: merge-ort.c:1653 merge-recursive.c:1281
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -4551,412 +4976,504 @@ msgstr ""
 "\n"
 "qui acceptera cette suggestion.\n"
 
-#: merge-ort.c:1196
+#: merge-ort.c:1666
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but multiple possible merges exist:\n"
 "%s"
 msgstr ""
-"Échec de fusion du sous-module %s mais de multiples solutions de fusion existent :\n"
+"Échec de fusion du sous-module %s mais de multiples solutions de fusion "
+"existent :\n"
 "%s"
 
-#: merge-ort.c:1415 merge-recursive.c:1362
+#: merge-ort.c:1887 merge-recursive.c:1372
 msgid "Failed to execute internal merge"
 msgstr "Échec à l'exécution de la fusion interne"
 
-#: merge-ort.c:1420 merge-recursive.c:1367
+#: merge-ort.c:1892 merge-recursive.c:1377
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Impossible d'ajouter %s à la base de données"
 
-#: merge-ort.c:1427 merge-recursive.c:1400
+#: merge-ort.c:1899 merge-recursive.c:1410
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Fusion automatique de %s"
 
-#: merge-ort.c:1566 merge-recursive.c:2122
+#: merge-ort.c:2038 merge-recursive.c:2132
 #, c-format
-msgid "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of implicit directory rename(s) putting the following path(s) there: %s."
-msgstr "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne des renommages implicites de répertoire déplaçant les chemins suivants : %s."
+msgid ""
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
+msgstr ""
+"CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "
+"des renommages implicites de répertoire déplaçant les chemins suivants : %s."
 
-#: merge-ort.c:1576 merge-recursive.c:2132
+#: merge-ort.c:2048 merge-recursive.c:2142
 #, c-format
-msgid "CONFLICT (implicit dir rename): Cannot map more than one path to %s; implicit directory renames tried to put these paths there: %s"
-msgstr "CONFLIT (renommage implicite de répertoire) : impossible de transformer plusieurs chemins sur %s ; les chemins concernés sont : %s"
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
+msgstr ""
+"CONFLIT (renommage implicite de répertoire) : impossible de transformer "
+"plusieurs chemins sur %s ; les chemins concernés sont : %s"
 
-#: merge-ort.c:1634
+#: merge-ort.c:2106
 #, c-format
 msgid ""
-"CONFLICT (directory rename split): Unclear where to rename %s to; it was renamed to multiple other directories, with no destination getting a majority of the "
-"files."
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
 msgstr ""
-"CONFLIT (renommage de répertoire coupé) : le renommage de %s n'est pas clair parce que le répertoire a été renommé en plusieurs autres répertoires, sans aucune "
-"destination récupérant la majorité des fichiers."
+"CONFLIT (renommage de répertoire coupé) : le renommage de %s n'est pas clair "
+"parce que le répertoire a été renommé en plusieurs autres répertoires, sans "
+"aucune destination récupérant la majorité des fichiers."
 
-#: merge-ort.c:1788 merge-recursive.c:2468
+#: merge-ort.c:2260 merge-recursive.c:2478
 #, c-format
-msgid "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was renamed."
-msgstr "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été renommé."
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "
+"renommé."
 
-#: merge-ort.c:1932 merge-recursive.c:3244
+#: merge-ort.c:2400 merge-recursive.c:3261
 #, c-format
-msgid "Path updated: %s added in %s inside a directory that was renamed in %s; moving it to %s."
-msgstr "Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé en %s ; déplacé dans %s."
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "
+"en %s ; déplacé dans %s."
 
-#: merge-ort.c:1939 merge-recursive.c:3251
+#: merge-ort.c:2407 merge-recursive.c:3268
 #, c-format
-msgid "Path updated: %s renamed to %s in %s, inside a directory that was renamed in %s; moving it to %s."
-msgstr "Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été renommé en %s ; déplacé dans %s."
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "
+"renommé en %s ; déplacé dans %s."
 
-#: merge-ort.c:1952 merge-recursive.c:3247
+#: merge-ort.c:2420 merge-recursive.c:3264
 #, c-format
-msgid "CONFLICT (file location): %s added in %s inside a directory that was renamed in %s, suggesting it should perhaps be moved to %s."
+msgid ""
+"CONFLICT (file location): %s added in %s inside a directory that was renamed "
+"in %s, suggesting it should perhaps be moved to %s."
 msgstr ""
-"CONFLIT (localisation de fichier) : %s ajouté dans %s dans un répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé vers %s."
+"CONFLIT (localisation de fichier) : %s ajouté dans %s dans un répertoire qui "
+"a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "
+"vers %s."
 
-#: merge-ort.c:1960 merge-recursive.c:3254
+#: merge-ort.c:2428 merge-recursive.c:3271
 #, c-format
-msgid "CONFLICT (file location): %s renamed to %s in %s, inside a directory that was renamed in %s, suggesting it should perhaps be moved to %s."
+msgid ""
+"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
+"was renamed in %s, suggesting it should perhaps be moved to %s."
 msgstr ""
-"CONFLIT (localisation de fichier) : %s renommé en %s dans %s, dans un répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "
-"vers %s."
+"CONFLIT (localisation de fichier) : %s renommé en %s dans %s, dans un "
+"répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "
+"être déplacé vers %s."
 
-#: merge-ort.c:2103
+#: merge-ort.c:2584
 #, c-format
 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
-msgstr "CONFLIT (renommage/renommage) : %s renommé en %s dans %s et en %s dans %s."
+msgstr ""
+"CONFLIT (renommage/renommage) : %s renommé en %s dans %s et en %s dans %s."
 
-#: merge-ort.c:2198
+#: merge-ort.c:2679
 #, c-format
 msgid ""
-"CONFLICT (rename involved in collision): rename of %s -> %s has content conflicts AND collides with another path; this may result in nested conflict markers."
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
 msgstr ""
-"CONFLIT (renommage au sein d'une collision) : lre renommage de %s -> %s a des conflits de contenu ET entre en collision avec un autre chemin ; ceci peut "
-"resulter en des marqueurs de conflit imbriqués."
+"CONFLIT (renommage au sein d'une collision) : lre renommage de %s -> %s a "
+"des conflits de contenu ET entre en collision avec un autre chemin ; ceci "
+"peut resulter en des marqueurs de conflit imbriqués."
 
-#: merge-ort.c:2217 merge-ort.c:2241
+#: merge-ort.c:2698 merge-ort.c:2722
 #, c-format
 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
-msgstr "CONFLIT (renommage/suppression) : Renommage de %s en %s dans %s mais supprimé dans %s."
+msgstr ""
+"CONFLIT (renommage/suppression) : Renommage de %s en %s dans %s mais "
+"supprimé dans %s."
 
-#: merge-ort.c:2550 merge-recursive.c:3002
+#: merge-ort.c:3212 merge-recursive.c:3022
 #, c-format
 msgid "cannot read object %s"
 msgstr "impossible de lire l'objet %s"
 
-#: merge-ort.c:2553 merge-recursive.c:3005
+#: merge-ort.c:3215 merge-recursive.c:3025
 #, c-format
 msgid "object %s is not a blob"
 msgstr "l'objet %s n'est pas un blob"
 
-#: merge-ort.c:2981
+#: merge-ort.c:3644
 #, c-format
-msgid "CONFLICT (file/directory): directory in the way of %s from %s; moving it to %s instead."
-msgstr "CONFLIT (fichier/répertoire) : répertoire au milieu de %s depuis %s ; déplacement dans %s à la place."
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"CONFLIT (fichier/répertoire) : répertoire au milieu de %s depuis %s ; "
+"déplacement dans %s à la place."
 
-#: merge-ort.c:3055
+#: merge-ort.c:3721
 #, c-format
-msgid "CONFLICT (distinct types): %s had different types on each side; renamed both of them so each can be recorded somewhere."
-msgstr "CONFLIT (types différents) : %s a des types différents des deux côtés ; renommé chacune de manière à pouvoir enregistrer les deux quelque part."
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
+msgstr ""
+"CONFLIT (types différents) : %s a des types différents des deux côtés ; "
+"renommé chacune de manière à pouvoir enregistrer les deux quelque part."
 
-#: merge-ort.c:3062
+#: merge-ort.c:3728
 #, c-format
-msgid "CONFLICT (distinct types): %s had different types on each side; renamed one of them so each can be recorded somewhere."
-msgstr "CONFLIT (types différents) : %s a des types différents des deux côtés ; renommé une d'entre elles de manière à pouvoir enregistrer les deux quelque part."
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
+msgstr ""
+"CONFLIT (types différents) : %s a des types différents des deux côtés ; "
+"renommé une d'entre elles de manière à pouvoir enregistrer les deux quelque "
+"part."
 
-#: merge-ort.c:3162 merge-recursive.c:3081
+#: merge-ort.c:3819 merge-recursive.c:3101
 msgid "content"
 msgstr "contenu"
 
-#: merge-ort.c:3164 merge-recursive.c:3085
+#: merge-ort.c:3821 merge-recursive.c:3105
 msgid "add/add"
 msgstr "ajout/ajout"
 
-#: merge-ort.c:3166 merge-recursive.c:3130
+#: merge-ort.c:3823 merge-recursive.c:3150
 msgid "submodule"
 msgstr "sous-module"
 
-#: merge-ort.c:3168 merge-recursive.c:3131
+#: merge-ort.c:3825 merge-recursive.c:3151
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
 
-#: merge-ort.c:3198
+#: 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 "CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. Version %s de %s laissée dans l'arbre."
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. "
+"Version %s de %s laissée dans l'arbre."
 
-#: merge-ort.c:3433
+#: 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"
-msgstr "Note :%s pas à jour et au milieu de l'extraction d'une version conflictuelle ; la vielle copie a été renommée en %s"
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr ""
+"Note :%s pas à jour et au milieu de l'extraction d'une version "
+"conflictuelle ; la vielle copie a été renommée en %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:3730
+#: 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"
 
-#: merge-ort-wrappers.c:13 merge-recursive.c:3699
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "  %s"
 msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n"
+"Vos modifications locales aux fichiers suivants seraient écrasées par la "
+"fusion :\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "Déjà à jour."
 
-#: merge-recursive.c:356
+#: merge-recursive.c:353
 msgid "(bad commit)\n"
 msgstr "(mauvais commit)\n"
 
-#: merge-recursive.c:379
+#: merge-recursive.c:381
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."
+msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion."
 
-#: merge-recursive.c:388
+#: merge-recursive.c:390
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion."
+msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion."
 
-#: merge-recursive.c:876
+#: merge-recursive.c:881
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "impossible de créer le chemin '%s' %s"
 
-#: merge-recursive.c:887
+#: merge-recursive.c:892
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"
 
-#: merge-recursive.c:901 merge-recursive.c:920
+#: merge-recursive.c:906 merge-recursive.c:925
 msgid ": perhaps a D/F conflict?"
 msgstr ": peut-être un conflit D/F ?"
 
-#: merge-recursive.c:910
+#: merge-recursive.c:915
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "refus de perdre le fichier non suivi '%s'"
 
-#: merge-recursive.c:951 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "impossible de lire l'objet %s '%s'"
 
-#: merge-recursive.c:956
+#: merge-recursive.c:961
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob attendu pour %s '%s'"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:986
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "échec à l'ouverture de '%s' : %s"
 
-#: merge-recursive.c:992
+#: merge-recursive.c:997
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "échec à la création du lien symbolique '%s' : %s"
 
-#: merge-recursive.c:997
+#: merge-recursive.c:1002
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "ne sait pas traiter %06o %s '%s'"
 
-#: merge-recursive.c:1227 merge-recursive.c:1239
+#: merge-recursive.c:1233 merge-recursive.c:1246
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Avance rapide du sous-module %s au commit suivant :"
 
-#: merge-recursive.c:1230 merge-recursive.c:1242
+#: merge-recursive.c:1236 merge-recursive.c:1249
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Avance rapide du sous-module %s"
 
-#: merge-recursive.c:1265
+#: merge-recursive.c:1273
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
-msgstr "Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"
+msgstr ""
+"Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"
 
-#: merge-recursive.c:1269
+#: merge-recursive.c:1277
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "Échec de fusion du sous-module %s (pas en avance rapide)"
 
-#: merge-recursive.c:1270
+#: merge-recursive.c:1278
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "Résolution possible de fusion trouvée pour le sous-module :\n"
 
-#: merge-recursive.c:1282
+#: merge-recursive.c:1290
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)"
 
-#: merge-recursive.c:1424
+#: merge-recursive.c:1434
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-msgstr "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la place."
+msgstr ""
+"Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "
+"place."
 
-#: merge-recursive.c:1496
+#: merge-recursive.c:1506
 #, c-format
-msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree."
-msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de %s laissée dans l'arbre."
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
+"%s laissée dans l'arbre."
 
-#: merge-recursive.c:1501
+#: merge-recursive.c:1511
 #, c-format
-msgid "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s left in tree."
-msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version %s de %s laissée dans l'arbre."
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
+"%s de %s laissée dans l'arbre."
 
-#: merge-recursive.c:1508
+#: merge-recursive.c:1518
 #, c-format
-msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree at %s."
-msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de %s laissée dans l'arbre dans le fichier %s."
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
+"%s laissée dans l'arbre dans le fichier %s."
 
-#: merge-recursive.c:1513
+#: merge-recursive.c:1523
 #, c-format
-msgid "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s left in tree at %s."
-msgstr "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version %s de %s laissée dans l'arbre dans le fichier %s."
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree at %s."
+msgstr ""
+"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
+"%s de %s laissée dans l'arbre dans le fichier %s."
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "rename"
 msgstr "renommage"
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "renamed"
 msgstr "renommé"
 
-#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Refus de perdre le fichier modifié %s"
 
-#: merge-recursive.c:1609
+#: merge-recursive.c:1619
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."
 
-#: merge-recursive.c:1667
+#: merge-recursive.c:1677
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
-msgstr "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
+msgstr ""
+"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
 
-#: merge-recursive.c:1698
+#: merge-recursive.c:1708
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"
 
-#: merge-recursive.c:1703
+#: merge-recursive.c:1713
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"
 
-#: merge-recursive.c:1730
+#: merge-recursive.c:1740
 #, c-format
-msgid "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s\"->\"%s\" in \"%s\"%s"
-msgstr "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche \"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
+"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
 
-#: merge-recursive.c:1735
+#: merge-recursive.c:1745
 msgid " (left unresolved)"
 msgstr " (laissé non résolu)"
 
-#: merge-recursive.c:1827
+#: merge-recursive.c:1837
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
-msgstr "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'->'%s' dans %s"
+msgstr ""
+"CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"
+">'%s' dans %s"
 
-#: merge-recursive.c:2090
+#: merge-recursive.c:2100
 #, c-format
 msgid ""
-"CONFLICT (directory rename split): Unclear where to place %s because directory %s was renamed to multiple other directories, with no destination getting a "
-"majority of the files."
+"CONFLICT (directory rename split): Unclear where to place %s because "
+"directory %s was renamed to multiple other directories, with no destination "
+"getting a majority of the files."
 msgstr ""
-"CONFLIT (renommage de répertoire coupé) : la place de %s n'est pas claire parce que le répertoire %s a été renommé en plusieurs autres répertoires, sans aucune "
-"destination récupérant la majorité des fichiers."
+"CONFLIT (renommage de répertoire coupé) : la place de %s n'est pas claire "
+"parce que le répertoire %s a été renommé en plusieurs autres répertoires, "
+"sans aucune destination récupérant la majorité des fichiers."
 
-#: merge-recursive.c:2224
+#: merge-recursive.c:2234
 #, c-format
-msgid "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s->%s in %s"
-msgstr "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. Renommage de répertoire %s->%s dans %s"
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "
+"Renommage de répertoire %s->%s dans %s"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modify"
 msgstr "modification"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modified"
 msgstr "modifié"
 
-#: merge-recursive.c:3108
+#: merge-recursive.c:3128
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "%s sauté (fusion identique à l'existant)"
 
-#: merge-recursive.c:3161
+#: merge-recursive.c:3181
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Ajout plutôt comme %s"
 
-#: merge-recursive.c:3368
+#: merge-recursive.c:3385
 #, c-format
 msgid "Removing %s"
 msgstr "Suppression de %s"
 
-#: merge-recursive.c:3391
+#: merge-recursive.c:3408
 msgid "file/directory"
 msgstr "fichier/répertoire"
 
-#: merge-recursive.c:3396
+#: merge-recursive.c:3413
 msgid "directory/file"
 msgstr "répertoire/fichier"
 
-#: merge-recursive.c:3403
+#: merge-recursive.c:3420
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
-msgstr "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"
+msgstr ""
+"CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"
 
-#: merge-recursive.c:3412
+#: merge-recursive.c:3429
 #, c-format
 msgid "Adding %s"
 msgstr "Ajout de %s"
 
-#: merge-recursive.c:3421
+#: merge-recursive.c:3438
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"
 
-#: merge-recursive.c:3474
+#: merge-recursive.c:3491
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "échec de fusion des arbres %s et %s"
 
-#: merge-recursive.c:3568
+#: merge-recursive.c:3585
 msgid "Merging:"
 msgstr "Fusion :"
 
-#: merge-recursive.c:3581
+#: merge-recursive.c:3598
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "%u ancêtre commun trouvé :"
 msgstr[1] "%u ancêtres communs trouvés :"
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3648
 msgid "merge returned no commit"
 msgstr "la fusion n'a pas retourné de commit"
 
-#: merge-recursive.c:3796
+#: merge-recursive.c:3816
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Impossible d'analyser l'objet '%s'"
 
-#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900 builtin/stash.c:473
+#: 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."
 
@@ -4964,178 +5481,230 @@ msgstr "Impossible d'écrire l'index."
 msgid "failed to read the cache"
 msgstr "impossible de lire le cache"
 
-#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965 builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821 builtin/stash.c:267
+#: 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"
 
-#: midx.c:74
+#: midx.c:78
 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:105
+#: 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:121
+#: 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"
+msgstr ""
+"la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature "
+"0x%08x"
 
-#: midx.c:126
+#: 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:131
+#: 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"
+msgstr ""
+"la version d'empreinte d'index multi-paquet %u ne correspond pas à la "
+"version %u"
 
-#: midx.c:148
+#: 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:150
+#: 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:152
+#: 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:154
+#: 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:170
+#: 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'"
+msgstr ""
+"index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"
 
-#: midx.c:214
+#: 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:264
+#: 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"
+msgstr ""
+"l'index multi-paquet stock un décalage en 64-bit, mais off_t est trop petit"
 
-#: midx.c:490
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "échec de l'ajout du fichier paquet '%s'"
 
-#: midx.c:496
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "échec à l'ouverture du fichier paquet '%s'"
 
-#: midx.c:564
+#: 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:880 builtin/index-pack.c:1535
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "impossible de stocker le fichier d'index inversé"
 
-#: midx.c:933
-msgid "Adding packfiles to multi-pack-index"
-msgstr "Ajout de fichiers paquet à un index multi-paquet"
+#: midx.c:993
+#, c-format
+msgid "could not parse line: %s"
+msgstr "impossible d'analyser la ligne : %s"
 
-#: midx.c:979
+#: midx.c:995
 #, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "fichier paquet à éliminer %s non trouvé"
+msgid "malformed line: %s"
+msgstr "ligne malformée : %s"
+
+#: 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:1187
+msgid "could not load pack"
+msgstr "impossible de charger le paquet"
+
+#: midx.c:1193
+#, c-format
+msgid "could not open index for %s"
+msgstr "impossible d'ouvrir l'index pour %s"
+
+#: midx.c:1204
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Ajout de fichiers paquet à un index multi-paquet"
 
-#: midx.c:1024
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "paquet préféré inconnu : %s"
 
-#: midx.c:1029
+#: 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:1324
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "fichier paquet à éliminer %s non trouvé"
+
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "le paquet préféré '%s' est expiré"
 
-#: midx.c:1045
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "aucun fichier paquet à l'index."
 
-#: midx.c:1125 builtin/clean.c:37
+#: midx.c:1420
+msgid "could not write multi-pack bitmap"
+msgstr "impossible d'écrire le bitmap multi-paquet"
+
+#: midx.c:1430
+msgid "could not write multi-pack-index"
+msgstr "échec de l'écriture de l'index de multi-paquet"
+
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "échec de la suppression de %s"
 
-#: midx.c:1156
+#: 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:1214
+#: 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:1222
+#: midx.c:1593
+msgid "incorrect checksum"
+msgstr "somme de contrôle incorrecte"
+
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "Recherche de fichiers paquets référencés"
 
-#: midx.c:1237
+#: midx.c:1611
 #, c-format
-msgid "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-msgstr "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = étalement[%d]"
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+"étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "
+"étalement[%d]"
 
-#: midx.c:1242
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "le midx ne contient aucun oid"
 
-#: midx.c:1251
+#: 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:1260
+#: 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:1280
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "Classement des objets par fichier paquet"
 
-#: midx.c:1287
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "Vérification des décalages des objets"
 
-#: midx.c:1303
+#: 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:1309
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "impossible de lire le fichier paquet %s"
 
-#: midx.c:1318
+#: 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:1343
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "Comptage des objets référencés"
 
-#: midx.c:1353
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "Recherche et effacement des fichiers paquets non-référencés"
 
-#: midx.c:1544
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "impossible de démarrer le groupement d'objets"
 
-#: midx.c:1564
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "impossible de finir le groupement d'objets"
 
@@ -5158,10 +5727,12 @@ msgstr "impossible de joindre le fil lazy_name : %s"
 #, c-format
 msgid ""
 "You have not concluded your previous notes merge (%s exists).\n"
-"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you start a new notes merge."
+"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
+"commit/abort the previous merge before you start a new notes merge."
 msgstr ""
 "Vous n'avez pas terminé votre précédente fusion de notes (%s existe).\n"
-"Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle."
+"Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' "
+"pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle."
 
 #: notes-merge.c:284
 #, c-format
@@ -5191,270 +5762,275 @@ 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:526
+#: 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"
+msgstr ""
+"le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates"
 
-#: object-file.c:577
+#: 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:649
+#: 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:656
+#: 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:699
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"
 
-#: object-file.c:717
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "lecture du fichier d'alternatives impossible"
 
-#: object-file.c:724
+#: 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:759
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "le chemin '%s' n'existe pas"
 
-#: object-file.c:780
+#: 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é."
+msgstr ""
+"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
+"encore supporté."
 
-#: object-file.c:786
+#: 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:792
+#: 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:800
+#: 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:860
+#: 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:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
 
-#: object-file.c:1010
+#: 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:1031
-msgid "mmap failed"
-msgstr "échec de mmap"
+#: object-file.c:1048
+#, c-format
+msgid "mmap failed%s"
+msgstr "échec de mmap%s"
 
-#: object-file.c:1195
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "le fichier objet %s est vide"
 
-#: object-file.c:1330 object-file.c:2524
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "objet libre corrompu '%s'"
 
-#: object-file.c:1332 object-file.c:2528
+#: 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:1374
+#: object-file.c:1457
+#, c-format
+msgid "unable to parse %s header"
+msgstr "impossible d'analyser l'entête %s"
+
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "type d'objet invalide"
 
-#: object-file.c:1458
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "impossible de dépaqueter l'entête %s avec --allow-unknow-type"
-
-#: object-file.c:1461
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "impossible de dépaqueter l'entête %s"
 
-#: object-file.c:1467
+#: object-file.c:1474
 #, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type"
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "entête de %s trop long, attendu %d octets"
 
-#: object-file.c:1470
-#, c-format
-msgid "unable to parse %s header"
-msgstr "impossible d'analyser l'entête %s"
-
-#: object-file.c:1697
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr "impossible de lire l'objet %s"
 
-#: object-file.c:1701
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "remplacement %s non trouvé pour %s"
 
-#: object-file.c:1705
+#: 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:1709
+#: 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:1814
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "impossible d'écrire le fichier %s"
 
-#: object-file.c:1821
+#: 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:1828
+#: object-file.c:1835
 msgid "file write error"
 msgstr "erreur d'écriture d'un fichier"
 
-#: object-file.c:1848
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr "erreur en fermeture du fichier d'objet esseulé"
 
-#: object-file.c:1913
+#: 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"
+msgstr ""
+"droits insuffisants pour ajouter un objet à la base de données %s du dépôt"
 
-#: object-file.c:1915
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "impossible de créer un fichier temporaire"
 
-#: object-file.c:1939
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "impossible d'écrire le fichier d'objet esseulé"
 
-#: object-file.c:1945
+#: 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:1949
+#: 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:1953
+#: 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:1963 builtin/pack-objects.c:1097
+#: 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:2040
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "impossible de lire l'objet pour %s"
 
-#: object-file.c:2091
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "commit corrompu"
 
-#: object-file.c:2099
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "étiquette corrompue"
 
-#: object-file.c:2199
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "erreur de lecture à l'indexation de %s"
 
-#: object-file.c:2202
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "lecture tronquée pendant l'indexation de %s"
 
-#: object-file.c:2275 object-file.c:2285
+#: 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:2291
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s : type de fichier non supporté"
 
-#: object-file.c:2315
+#: 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:2317
+#: 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:2344 builtin/index-pack.c:192
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "impossible d'ouvrir %s"
 
-#: object-file.c:2535 object-file.c:2588
+#: 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:2559
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "impossible de mmap %s"
 
-#: object-file.c:2564
+#: 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:2570
+#: 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:2581
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "impossible de dépaqueter le contenu de %s"
 
-#: object-name.c:486
+#: object-name.c:480
 #, c-format
 msgid "short object ID %s is ambiguous"
 msgstr "l'id court d'objet %s est ambigu"
 
-#: object-name.c:497
+#: object-name.c:491
 msgid "The candidates are:"
 msgstr "Les candidats sont :"
 
-#: object-name.c:796
+#: object-name.c:790
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5472,26 +6048,28 @@ msgstr ""
 "\n"
 "  git switch -c $br $(git rev-parse ...)\n"
 "\n"
-"où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa est créée.\n"
-"Veuillez examiner ces références et peut-être les supprimer. Désactivez ce message\n"
+"où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa "
+"est créée.\n"
+"Veuillez examiner ces références et peut-être les supprimer. Désactivez ce "
+"message\n"
 "en lançant \"git config advice.objectNameWarning false\""
 
-#: object-name.c:916
+#: object-name.c:910
 #, c-format
 msgid "log for '%.*s' only goes back to %s"
 msgstr "le journal de '%.*s' ne remonte qu'à %s"
 
-#: object-name.c:924
+#: object-name.c:918
 #, c-format
 msgid "log for '%.*s' only has %d entries"
 msgstr "le journal de '%.*s' n'a que %d entrées"
 
-#: object-name.c:1702
+#: object-name.c:1696
 #, c-format
 msgid "path '%s' exists on disk, but not in '%.*s'"
 msgstr "le chemin '%s' existe sur le disque, mais pas dans '%.*s'"
 
-#: object-name.c:1708
+#: object-name.c:1702
 #, c-format
 msgid ""
 "path '%s' exists, but not '%s'\n"
@@ -5500,12 +6078,12 @@ msgstr ""
 "le chemin '%s' existe, mais pas '%s'\n"
 "conseil : peut-être vouliez-vous dire '%.*s:%s', soit '%.*s:./%s' ?"
 
-#: object-name.c:1717
+#: object-name.c:1711
 #, c-format
 msgid "path '%s' does not exist in '%.*s'"
 msgstr "le chemin '%s' n'existe pas dans '%.*s'"
 
-#: object-name.c:1745
+#: object-name.c:1739
 #, c-format
 msgid ""
 "path '%s' is in the index, but not at stage %d\n"
@@ -5514,7 +6092,7 @@ msgstr ""
 "le chemin '%s' est dans l'index, mais pas à l'étape %d\n"
 "conseil : vous vouliez peut-être dire ':%d:%s' ?"
 
-#: object-name.c:1761
+#: object-name.c:1755
 #, c-format
 msgid ""
 "path '%s' is in the index, but not '%s'\n"
@@ -5523,21 +6101,23 @@ msgstr ""
 "le chemin '%s' est dans l'index, mais pas '%s'\n"
 "conseil : peut-être vouliez-vous dire ':%d:%s', soit '%d:./%s' ?"
 
-#: object-name.c:1769
+#: object-name.c:1763
 #, c-format
 msgid "path '%s' exists on disk, but not in the index"
 msgstr "le chemin '%s' existe sur le disque, mais pas dans l'index"
 
-#: object-name.c:1771
+#: object-name.c:1765
 #, c-format
 msgid "path '%s' does not exist (neither on disk nor in the index)"
 msgstr "le chemin '%s' n'existe pas (ni sur le disque, ni dans l'index)"
 
-#: object-name.c:1784
+#: object-name.c:1778
 msgid "relative path syntax can't be used outside working tree"
-msgstr "la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de travail"
+msgstr ""
+"la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de "
+"travail"
 
-#: object-name.c:1922
+#: object-name.c:1916
 #, c-format
 msgid "invalid object name '%.*s'."
 msgstr "nom d'objet invalide : '%.*s'."
@@ -5552,27 +6132,40 @@ msgstr "type d'objet invalide \"%s\""
 msgid "object %s is a %s, not a %s"
 msgstr "l'objet %s est de type %s, pas de type %s"
 
-#: object.c:232
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "l'objet %s a un id de type inconnu %d"
 
-#: object.c:245
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "impossible d'analyser l'objet : %s"
 
-#: object.c:265 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "incohérence de hachage %s"
 
-#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
+#: 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:429
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index : impossible d'ouvrir le paquet"
+
+#: 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:1547 builtin/rev-list.c:92
+#: 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: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"
@@ -5602,124 +6195,135 @@ msgstr "le fichier d'index inverse %s a une version non gérée %<PRIu32>"
 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
 msgstr "le fichier d'index inverse %s a un id d'empreinte non géré %<PRIu32>"
 
-#: pack-write.c:250
+#: pack-write.c:251
 msgid "cannot both write and verify reverse index"
 msgstr "impossible de lire et vérifier à la fois l'index inverse"
 
-#: pack-write.c:271
+#: pack-write.c:270
 #, c-format
 msgid "could not stat: %s"
 msgstr "stat impossible de %s"
 
-#: pack-write.c:283
+#: pack-write.c:282
 #, c-format
 msgid "failed to make %s readable"
 msgstr "échec de rendre %s lisible"
 
-#: pack-write.c:522
+#: pack-write.c:520
 #, c-format
 msgid "could not write '%s' promisor file"
 msgstr "impossible d'écrire le fichier de prometteur '%s'"
 
-#: packfile.c:625
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
 
-#: packfile.c:1937
+#: packfile.c:657
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "le fichier paquet %s ne peut être mmap%s"
+
+#: 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:1941
+#: 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é ?)"
+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
+#: 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.c:38
+#: 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"
 msgstr "%s a besoin d'une valeur"
 
-#: parse-options.c:73
+#: parse-options.c:93
 #, c-format
 msgid "%s is incompatible with %s"
 msgstr "%s est incompatible avec %s"
 
-#: parse-options.c:78
+#: parse-options.c:98
 #, c-format
 msgid "%s : incompatible with something else"
 msgstr "%s est incompatible avec toute autre option"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
 #, c-format
 msgid "%s takes no value"
 msgstr "%s n'accepte aucune valeur"
 
-#: parse-options.c:94
+#: parse-options.c:114
 #, c-format
 msgid "%s isn't available"
 msgstr "%s n'est pas disponible"
 
-#: parse-options.c:217
+#: parse-options.c:237
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr "%s attend une valeur entière non négative avec une suffixe k/m/g"
 
-#: parse-options.c:386
+#: parse-options.c:393
 #, c-format
 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:420 parse-options.c:428
+#: 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:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "alias pour --%s"
 
-#: parse-options.c:879
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "option inconnue « %s »"
 
-#: parse-options.c:881
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "bascule inconnue « %c »"
 
-#: parse-options.c:883
+#: 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:907
+#: parse-options.c:920
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:926
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "usage : %s"
@@ -5727,95 +6331,129 @@ msgstr "usage : %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:932
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "   ou : %s"
 
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. 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:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:974
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-NUM"
 
-#: path.c:915
+#: path.c:922
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Impossible de rendre %s inscriptible pour le groupe"
 
-#: pathspec.c:151
+#: pathspec.c:150
 msgid "Escape character '\\' not allowed as last character in attr value"
-msgstr "Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une valeur d'attribut"
+msgstr ""
+"Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une "
+"valeur d'attribut"
 
-#: pathspec.c:169
+#: pathspec.c:168
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Une seule spécification 'attr:' est autorisée."
 
-#: pathspec.c:172
+#: pathspec.c:171
 msgid "attr spec must not be empty"
 msgstr "un spécificateur d'attribut ne peut pas être vide"
 
-#: pathspec.c:215
+#: pathspec.c:214
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nom d'attribut invalide %s"
 
-#: pathspec.c:280
+#: pathspec.c:279
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont incompatibles"
+msgstr ""
+"les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont "
+"incompatibles"
 
-#: pathspec.c:287
-msgid "global 'literal' pathspec setting is incompatible with all other global pathspec settings"
-msgstr "le réglage global de spécificateur de chemin 'literal' est incompatible avec tous les autres réglages globaux de spécificateur de chemin"
+#: pathspec.c:286
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"le réglage global de spécificateur de chemin 'literal' est incompatible avec "
+"tous les autres réglages globaux de spécificateur de chemin"
 
-#: pathspec.c:327
+#: pathspec.c:326
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"
 
-#: pathspec.c:348
+#: pathspec.c:347
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"
 
-#: pathspec.c:353
+#: pathspec.c:352
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'"
 
-#: pathspec.c:391
+#: pathspec.c:390
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Spécificateur magique '%c' non implémenté dans '%s'"
 
-#: pathspec.c:450
+#: pathspec.c:449
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s : 'literal' et 'glob' sont incompatibles"
 
-#: pathspec.c:466
+#: pathspec.c:465
 #, c-format
 msgid "%s: '%s' is outside repository at '%s'"
 msgstr "%s : '%s' est hors du dépôt à '%s'"
 
-#: pathspec.c:542
+#: pathspec.c:541
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (mnémonique : '%c')"
 
-#: pathspec.c:552
+#: pathspec.c:551
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
-msgstr "%s : le spécificateur magique de chemin n'est pas supporté par cette commande : %s"
+msgstr ""
+"%s : le spécificateur magique de chemin n'est pas supporté par cette "
+"commande : %s"
 
-#: pathspec.c:619
+#: pathspec.c:618
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "le chemin '%s' est au-delà d'un lien symbolique"
 
-#: pathspec.c:664
+#: pathspec.c:663
 #, c-format
 msgid "line is badly quoted: %s"
 msgstr "la ligne est mal citée : %s"
@@ -5829,14 +6467,14 @@ msgid "unable to write delim packet"
 msgstr "impossible d'écrire le paquet de délimitation"
 
 #: pkt-line.c:106
-msgid "unable to write stateless separator packet"
-msgstr "impossible d'écrire le paquet de séparateur sans état"
+msgid "unable to write response end packet"
+msgstr "impossible d'écrire le paquet de fin de réponse"
 
 #: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr "échec de l'écriture du vidage de paquet"
 
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
 msgid "protocol error: impossibly long line"
 msgstr "erreur de protocole : ligne impossiblement trop longue"
 
@@ -5844,34 +6482,36 @@ msgstr "erreur de protocole : ligne impossiblement trop longue"
 msgid "packet write with format failed"
 msgstr "échec de l'écriture d'un paquet avec format"
 
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
 msgid "packet write failed - data exceeds max packet size"
-msgstr "échec de l'écriture d'un paquet ‑ les données dépassent la taille maximale d'un paquet"
+msgstr ""
+"échec de l'écriture d'un paquet ‑ les données dépassent la taille maximale "
+"d'un paquet"
 
 #: pkt-line.c:222
 #, c-format
 msgid "packet write failed: %s"
 msgstr "échec de l'écriture d'un paquet : %s"
 
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
 msgid "read error"
 msgstr "erreur de lecture"
 
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
 msgid "the remote end hung up unexpectedly"
 msgstr "l'hôte distant a fermé la connexion de manière inattendue"
 
-#: pkt-line.c:369 pkt-line.c:371
+#: 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:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: 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:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "erreur distante : %s"
@@ -5885,23 +6525,27 @@ msgstr "Rafraîchissement de l'index"
 msgid "unable to create threaded lstat: %s"
 msgstr "impossible de créer le lstat en fil : %s"
 
-#: pretty.c:988
+#: pretty.c:1051
 msgid "unable to parse --pretty format"
 msgstr "impossible d'analyser le format --pretty"
 
-#: promisor-remote.c:30
+#: promisor-remote.c:31
 msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr "promisor-remote : impossible de créer un sous-processus de récupération"
+msgstr ""
+"promisor-remote : impossible de créer un sous-processus de récupération"
 
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
 msgid "promisor-remote: could not write to fetch subprocess"
-msgstr "promisor-remote : impossible d'écrire vers un sous-processus de récupération"
+msgstr ""
+"promisor-remote : impossible d'écrire vers un sous-processus de récupération"
 
-#: promisor-remote.c:41
+#: promisor-remote.c:44
 msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr "promisor-remote : impossible de fermer l'entrée standard du sous-processus de récupération"
+msgstr ""
+"promisor-remote : impossible de fermer l'entrée standard du sous-processus "
+"de récupération"
 
-#: promisor-remote.c:53
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "un nom de prometteur distant ne peut pas commencer par '/' : %s"
@@ -5914,95 +6558,97 @@ msgstr "object-info : vidage attendu après les arguments"
 msgid "Removing duplicate objects"
 msgstr "Suppression des objets dupliqués"
 
-#: range-diff.c:78
+#: range-diff.c:67
 msgid "could not start `log`"
 msgstr "impossible de démarrer `log`"
 
-#: range-diff.c:80
+#: range-diff.c:69
 msgid "could not read `log` output"
 msgstr "impossible de lire la sortie de `log`"
 
-#: range-diff.c:101 sequencer.c:5551
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "impossible d'analyser le commit '%s'"
 
-#: range-diff.c:115
+#: range-diff.c:111
 #, c-format
-msgid "could not parse first line of `log` output: did not start with 'commit ': '%s'"
-msgstr "impossible d'analyser la première ligne de la sortie de `log` : ne commence pas par 'commit' : '%s'"
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"impossible d'analyser la première ligne de la sortie de `log` : ne commence "
+"pas par 'commit' : '%s'"
 
-#: range-diff.c:140
+#: range-diff.c:137
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "impossible d'analyser l'entête git '%.*s'"
 
-#: range-diff.c:306
+#: range-diff.c:304
 msgid "failed to generate diff"
 msgstr "échec de la génération de diff"
 
-#: range-diff.c:558
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only et --right-only sont mutuellement exclusifs"
-
-#: range-diff.c:561 range-diff.c:563
+#: 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:708
+#: 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:724
+#: 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:746
+#: 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"
+msgstr ""
+"%s : ne peut ajouter que des fichiers normaux, des liens symboliques ou des "
+"répertoires git"
 
-#: read-cache.c:751
+#: 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:803
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "indexation du fichier '%s' impossible"
 
-#: read-cache.c:822
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "impossible d'ajouter '%s' à l'index"
 
-#: read-cache.c:833
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "fstat de '%s' impossible"
 
-#: read-cache.c:1356
+#: 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:1571
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "Rafraîchir l'index"
 
-#: read-cache.c:1700
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
-"version d'index renseignée, mais la valeur est invalide.\n"
+"index.version renseignée, mais la valeur est invalide.\n"
 "Utilisation de la version %i"
 
-#: read-cache.c:1710
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6011,156 +6657,163 @@ msgstr ""
 "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
 "Utilisation de la version %i"
 
-#: read-cache.c:1766
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "signature incorrecte 0x%08x"
 
-#: read-cache.c:1769
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "mauvaise version d'index %d"
 
-#: read-cache.c:1778
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "mauvaise signature sha1 d'index"
 
-#: read-cache.c:1812
+#: 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:1814
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "extension %.4s ignorée"
 
-#: read-cache.c:1851
+#: 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:1867
+#: 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:1924
+#: 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:1927
+#: 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:1930
+#: 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:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095 submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991 builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 builtin/mv.c:146
-#: builtin/reset.c:247 builtin/rm.c:291 builtin/submodule--helper.c:332
+#: 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: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:2180
+#: 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:2193
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
-msgstr "impossible de joindre le fil load_cach_entries : %s"
+msgstr "impossible de joindre le fil load_cache_entries : %s"
 
-#: read-cache.c:2226
+#: 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:2230
+#: 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:2234
+#: 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:2238
+#: read-cache.c:2280
 #, c-format
-msgid "%s: unable to map index file"
-msgstr "%s : impossible de mapper le fichier d'index"
+msgid "%s: unable to map index file%s"
+msgstr "%s : impossible de mapper le fichier d'index%s"
 
-#: read-cache.c:2280
+#: 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:2307
+#: 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:2345
+#: 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:2392
+#: 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:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: 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:3138
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr "échec de conversion d'un index clairsemé"
 
-#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "impossible de stat '%s'"
 
-#: read-cache.c:3222
+#: 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:3234
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "échec lors de l'unlink : %s"
 
-#: read-cache.c:3263
+#: 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:3412
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s : impossible de revenir à l'étape 0"
 
 #: rebase-interactive.c:11
 msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n"
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
 "Or you can abort the rebase with 'git rebase --abort'.\n"
 msgstr ""
-"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git rebase --continue'.\n"
+"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
+"rebase --continue'.\n"
 "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"
 
 #: rebase-interactive.c:33
 #, c-format
-msgid "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
-msgstr "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."
 
 #: rebase-interactive.c:42
 msgid ""
@@ -6191,13 +6844,18 @@ msgstr ""
 " p, pick <commit> = utiliser le commit\n"
 " r, reword <commit> = utiliser le commit, mais reformuler son message\n"
 " e, edit <commit> = utiliser le commit, mais s'arrêter pour le modifier\n"
-" s, squash <commit> = utiliser le commit, mais le fusionner avec le précédent\n"
-" f, fixup [-C | -c] <commit> = comme \"squash\", mais en ne gardant que le message\n"
-"                    du commit précédent, à moins que -C ne soit utilisé, auquel cas, conserver\n"
-"                    ne conserver que le message de ce commit ; -c est identique à -C mais ouvre\n"
+" s, squash <commit> = utiliser le commit, mais le fusionner avec le "
+"précédent\n"
+" f, fixup [-C | -c] <commit> = comme \"squash\", mais en ne gardant que le "
+"message\n"
+"                    du commit précédent, à moins que -C ne soit utilisé, "
+"auquel cas, conserver\n"
+"                    ne conserver que le message de ce commit ; -c est "
+"identique à -C mais ouvre\n"
 "                    un éditeur\n"
 " x, exec <commit> = lancer la commande (reste de la ligne) dans un shell\n"
-" b, break = s'arrêter ici (on peut continuer ensuite avec 'git rebase --continue')\n"
+" b, break = s'arrêter ici (on peut continuer ensuite avec 'git rebase --"
+"continue')\n"
 " d, drop <commit> = supprimer le commit\n"
 " l, label <label> = étiqueter la HEAD courante avec un nom\n"
 " t, reset <label> = réinitialiser HEAD à label\n"
@@ -6215,15 +6873,16 @@ msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Rebasage de %s sur %s (%d commande)"
 msgstr[1] "Rebasage de %s sur %s (%d commandes)"
 
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
 msgstr ""
 "\n"
-"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un commit.\n"
+"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "
+"commit.\n"
 
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6231,7 +6890,7 @@ msgstr ""
 "\n"
 "Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"
 
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6240,12 +6899,13 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Vous êtes en train d'éditer le fichier todo d'un rebasage interactif en cours.\n"
+"Vous êtes en train d'éditer le fichier todo d'un rebasage interactif en "
+"cours.\n"
 "Pour continuer le rebasage après édition, lancez :\n"
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -6255,12 +6915,14 @@ msgstr ""
 "Cependant, si vous effacez tout, le rebasage sera annulé.\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
+#: 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'"
 msgstr "impossible d'écrire '%s'"
 
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229 builtin/rebase.c:253
+#: rebase-interactive.c:119
 #, c-format
 msgid "could not write '%s'."
 msgstr "impossible d'écrire '%s'."
@@ -6279,23 +6941,26 @@ msgstr ""
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
 "\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
 "The possible behaviours are: ignore, warn, error.\n"
 "\n"
 msgstr ""
-"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un commit.\n"
+"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un "
+"commit.\n"
 "\n"
-"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau d'avertissements.\n"
+"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau "
+"d'avertissements.\n"
 "Les comportements disponibles sont : ignore, warn, error.\n"
 "\n"
 
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597 builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240 builtin/rebase.c:265
+#: rebase.c:29
 #, c-format
-msgid "could not read '%s'."
-msgstr "impossible de lire '%s'."
+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:1978
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "disparue"
 
@@ -6314,256 +6979,229 @@ msgstr "en retard de %d"
 msgid "ahead %d, behind %d"
 msgstr "en avance de %d, en retard de %d"
 
-#: ref-filter.c:175
+#: ref-filter.c:235
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "format attendu : %%(color:<couleur>)"
 
-#: ref-filter.c:177
+#: ref-filter.c:237
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "couleur non reconnue : %%(color:%s)"
 
-#: ref-filter.c:199
+#: ref-filter.c:259
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Valeur entière attendue refname:lstrip=%s"
 
-#: ref-filter.c:203
+#: ref-filter.c:263
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Valeur entière attendue refname:rstrip=%s"
 
-#: ref-filter.c:205
+#: 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"
 
-#: ref-filter.c:260
+#: ref-filter.c:320
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) n'accepte pas d'argument"
 
-#: ref-filter.c:282
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "argument %%(objectsize) non reconnu : %s"
-
-#: ref-filter.c:290
+#: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) n'accepte pas d'argument"
 
-#: ref-filter.c:302
+#: ref-filter.c:364
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) n'accepte pas d'argument"
 
-#: ref-filter.c:315
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "argument %%(subject) non reconnu : %s"
-
-#: ref-filter.c:334
+#: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
 msgstr "%%(trailers:key=<value>) attendu"
 
-#: ref-filter.c:336
+#: ref-filter.c:398
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "argument %%(trailers) inconnu : %s"
 
-#: ref-filter.c:367
+#: ref-filter.c:429
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valeur positive attendue contents:lines=%s"
 
-#: ref-filter.c:369
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "argument %%(contents) non reconnu : %s"
-
-#: ref-filter.c:384
+#: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "valeur positive attendue '%s' dans %%(%s)"
 
-#: ref-filter.c:388
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "argument '%s' non reconnu dans %%(%s)"
-
-#: ref-filter.c:402
+#: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
 msgstr "option de courriel non reconnue : %s"
 
-#: ref-filter.c:432
+#: ref-filter.c:506
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "format attendu : %%(align:<largeur>,<position>)"
 
-#: ref-filter.c:444
+#: ref-filter.c:518
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "position non reconnue : %s"
 
-#: ref-filter.c:451
+#: ref-filter.c:525
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "largeur non reconnue : %s"
 
-#: ref-filter.c:460
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "argument %%(align) non reconnu : %s"
-
-#: ref-filter.c:468
+#: 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:486
+#: ref-filter.c:568
 #, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "argument %%(if) non reconnu : %s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) n'accepte pas d'argument"
 
-#: ref-filter.c:588
+#: ref-filter.c:680
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nom de champ malformé %.*s"
 
-#: ref-filter.c:615
+#: ref-filter.c:707
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nom de champ inconnu : %.*s"
 
-#: ref-filter.c:619
+#: ref-filter.c:711
 #, c-format
-msgid "not a git repository, but the field '%.*s' requires access to object data"
-msgstr "pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet"
-
-#: ref-filter.c:743
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+"pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet"
 
-#: ref-filter.c:807
+#: 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 : 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:809
+#: ref-filter.c:912
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format : atome %%(then) utilisé plus d'une fois"
 
-#: ref-filter.c:811
+#: ref-filter.c:914
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: atome %%(then) utilisé après %%(else)"
 
-#: ref-filter.c:839
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
-
-#: ref-filter.c:841
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
-
-#: ref-filter.c:843
+#: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "format : atome %%(else) utilisé plus d'une fois"
 
-#: ref-filter.c:858
+#: ref-filter.c:965
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "format : atome %%(end) utilisé sans atome correspondant"
 
-#: ref-filter.c:915
+#: ref-filter.c:1027
 #, c-format
 msgid "malformed format string %s"
 msgstr "chaîne de formatage mal formée %s"
 
-#: ref-filter.c:1556
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "cette commande rejette l'atome %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s ne peut pas être utilisé avec --python, --shell, --tcl"
+
+#: ref-filter.c:1706
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(aucune branche, rebasage de %s)"
 
-#: ref-filter.c:1559
+#: ref-filter.c:1709
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr "(aucune branche, rebasage de la HEAD détachée %s)"
 
-#: ref-filter.c:1562
+#: ref-filter.c:1712
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(aucune branche, bisect a démarré sur %s)"
 
-#: ref-filter.c:1566
+#: ref-filter.c:1716
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD détachée sur %s)"
 
-#: ref-filter.c:1569
+#: ref-filter.c:1719
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD détachée depuis %s)"
 
-#: ref-filter.c:1572
+#: ref-filter.c:1722
 msgid "(no branch)"
 msgstr "(aucune branche)"
 
-#: ref-filter.c:1604 ref-filter.c:1813
+#: ref-filter.c:1754 ref-filter.c:1972
 #, c-format
 msgid "missing object %s for %s"
 msgstr "objet manquant %s pour %s"
 
-#: ref-filter.c:1614
+#: ref-filter.c:1764
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "échec de parse_object_buffer sur %s pour %s"
 
-#: ref-filter.c:1997
+#: ref-filter.c:2155
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objet malformé à '%s'"
 
-#: ref-filter.c:2086
+#: ref-filter.c:2245
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "réf avec un nom cassé %s ignoré"
 
-#: ref-filter.c:2091 refs.c:676
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "réf cassé %s ignoré"
 
-#: ref-filter.c:2431
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: atome %%(end) manquant"
 
-#: ref-filter.c:2525
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "nom d'objet malformé %s"
 
-#: ref-filter.c:2530
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "l'option '%s' doit pointer sur un commit"
 
-#: refs.c:264
+#: refs.c:261
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr "%s ne pointe pas sur un objet valide!"
 
-#: refs.c:566
+#: refs.c:563
 #, c-format
 msgid ""
 "Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6588,12 +7226,12 @@ msgstr ""
 "\n"
 "\tgit branch -m <nom>\n"
 
-#: refs.c:588
+#: refs.c:585
 #, c-format
 msgid "could not retrieve `%s`"
 msgstr "impossible de récupérer `%s`"
 
-#: refs.c:598
+#: refs.c:595
 #, c-format
 msgid "invalid branch name: %s = %s"
 msgstr "nom de branche invalide : %s = %s"
@@ -6603,65 +7241,66 @@ msgstr "nom de branche invalide : %s = %s"
 msgid "ignoring dangling symref %s"
 msgstr "symref pendant %s ignoré"
 
-#: refs.c:922
+#: 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:929
+#: 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:994
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "le journal pour la réf %s est vide"
 
-#: refs.c:1086
+#: 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:1157
+#: 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:2051
+#: 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:2131
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "mises à jour des références interdites en environnement de quarantaine"
 
-#: refs.c:2142
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "mises à jour des références annulées par le crochet"
 
-#: refs.c:2242 refs.c:2272
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' existe ; impossible de créer '%s'"
 
-#: refs.c:2248 refs.c:2283
+#: 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:1228
+#: 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:1242 refs/packed-backend.c:1542 refs/packed-backend.c:1552
+#: 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:1245 refs/packed-backend.c:1555
+#: 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"
@@ -6671,59 +7310,62 @@ 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"
+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"
+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 "le spécificateur de référence source %s correspond à plus d'une référence"
+msgstr ""
+"le spécificateur de référence source %s correspond à plus d'une référence"
 
 #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
 #. <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"
@@ -6744,9 +7386,10 @@ msgstr ""
 "  est une référence dans \"refs/{heads,tags}/\". Si oui, ajout du préfixe\n"
 "  refs/{heads,tags}/ correspondant du côté distant.\n"
 "\n"
-"Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence totalement qualifiée."
+"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"
@@ -6757,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"
@@ -6768,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"
@@ -6779,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"
@@ -6790,125 +7433,135 @@ 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"
+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"
+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"
+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 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] "Votre branche est en retard sur '%s' de %d commit, et peut être mise à jour en avance rapide.\n"
-msgstr[1] "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour en avance rapide.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] ""
+"Votre branche est en retard sur '%s' de %d commit, et peut être mise à jour "
+"en avance rapide.\n"
+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"
@@ -6923,11 +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"
+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'"
@@ -6960,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
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "échec du flush de '%s'"
@@ -7005,7 +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:2089 builtin/log.c:2000 builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
+#: 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'"
@@ -7043,49 +7698,38 @@ 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:3669
+#: 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:2343
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "--unpacked=<fichier-paquet> n'est plus géré"
 
-#: revision.c:2683
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr "votre branche actuelle semble cassée"
 
-#: revision.c:2686
+#: 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:2892
+#: 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:767
-msgid "open /dev/null failed"
-msgstr "échec de l'ouverture de /dev/null"
-
-#: run-command.c:1275
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "impossible de créer un fil asynchrone : %s"
 
-#: run-command.c:1345
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n"
-"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook false`."
-
 #: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
-msgstr "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage distant"
+msgstr ""
+"paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage "
+"distant"
 
 #: send-pack.c:152
 #, c-format
@@ -7101,67 +7745,73 @@ msgstr "le dépaquetage a échoué : %s"
 msgid "failed to sign the push certificate"
 msgstr "impossible de signer le certificat de poussée"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "send-pack: unable to fork off fetch subprocess"
 msgstr "send-pack : impossible de créer un sous-processus de récupération"
 
-#: send-pack.c:455
+#: send-pack.c:457
 msgid "push negotiation failed; proceeding anyway with push"
-msgstr "le négociation de poussée a échoué ; poursuite de la poussée de toute façon"
+msgstr ""
+"le négociation de poussée a échoué ; poursuite de la poussée de toute façon"
 
-#: send-pack.c:520
+#: send-pack.c:528
 msgid "the receiving end does not support this repository's hash algorithm"
 msgstr "le receveur ne gère pas l'algorithme d'empreinte de ce dépôt"
 
-#: send-pack.c:529
+#: send-pack.c:537
 msgid "the receiving end does not support --signed push"
 msgstr "le receveur ne gère pas les poussées avec --signed"
 
-#: send-pack.c:531
-msgid "not sending a push certificate since the receiving end does not support --signed push"
-msgstr "pas d'envoi de certificat de poussée car le receveur ne gère pas les poussées avec --signed"
+#: send-pack.c:539
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"pas d'envoi de certificat de poussée car le receveur ne gère pas les "
+"poussées avec --signed"
 
-#: send-pack.c:543
+#: send-pack.c:546
 msgid "the receiving end does not support --atomic push"
 msgstr "le receveur ne gère pas les poussées avec --atomic"
 
-#: send-pack.c:548
+#: send-pack.c:551
 msgid "the receiving end does not support push options"
 msgstr "le receveur ne gère pas les options de poussées"
 
-#: sequencer.c:196
+#: sequencer.c:197
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "mode de nettoyage invalide de message de validation '%s'"
 
-#: sequencer.c:324
+#: sequencer.c:325
 #, c-format
 msgid "could not delete '%s'"
 msgstr "impossible de supprimer '%s'"
 
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: 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'"
 
-#: sequencer.c:354
+#: sequencer.c:355
 msgid "revert"
 msgstr "revert"
 
-#: sequencer.c:356
+#: sequencer.c:357
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:358
+#: sequencer.c:359
 msgid "rebase"
 msgstr "rebase"
 
-#: sequencer.c:360
+#: sequencer.c:361
 #, c-format
 msgid "unknown action: %d"
 msgstr "action inconnue : %d"
 
-#: sequencer.c:419
+#: sequencer.c:420
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -7169,51 +7819,81 @@ msgstr ""
 "après résolution des conflits, marquez les chemins corrigés\n"
 "avec 'git add <chemins>' ou 'git rm <chemins>'"
 
-#: sequencer.c:422
+#: sequencer.c:423
 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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
 msgstr ""
-"après résolution des conflits, marquez les chemins corrigés\n"
-"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
-"puis validez le résultat avec 'git commit'"
+"Après résolution des conflits, marquez-les avec\n"
+"\"git add/rm <spéc-de-réf>\", puis lancez\n"
+"\"git cherry-pick --continue\".\n"
+"Vous pouvez aussi sauter ce commit avec \"git cherry-pick --skip\".\n"
+"Pour arrêter et revenir à l'état antérieur à \"git cherry-pick\",,\n"
+"lancez \"git cherry-pick --abort\"."
 
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Après résolution des conflits, marquez-les avec\n"
+"\"git add/rm <spéc-de-réf>\", puis lancez\n"
+"\"git revert --continue\".\n"
+"Vous pouvez aussi sauter ce commit avec \"git revert --skip\".\n"
+"Pour arrêter et revenir à l'état antérieur à \"git revert\",,\n"
+"lancez \"git revert --abort\"."
+
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "impossible de verrouiller '%s'"
 
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#: 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'"
 
-#: sequencer.c:442
+#: sequencer.c:455
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "impossible d'écrire la fin de ligne dans '%s'"
 
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 sequencer.c:3554
+#: 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:486
+#: 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."
 msgstr "vos modifications locales seraient écrasées par %s."
 
-#: sequencer.c:490
+#: sequencer.c:503
 msgid "commit your changes or stash them to proceed."
 msgstr "validez vos modifications ou les remiser pour continuer."
 
-#: sequencer.c:522
+#: sequencer.c:535
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s : avance rapide"
 
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Mode de nettoyage invalide %s"
@@ -7221,64 +7901,65 @@ msgstr "Mode de nettoyage invalide %s"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
 #.
-#: sequencer.c:671
+#: sequencer.c:685
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Impossible d'écrire le nouveau fichier index"
 
-#: sequencer.c:685
+#: sequencer.c:699
 msgid "unable to update cache tree"
 msgstr "impossible de mettre à jour l'arbre de cache"
 
-#: sequencer.c:699
+#: sequencer.c:713
 msgid "could not resolve HEAD commit"
 msgstr "impossible de résoudre le commit HEAD"
 
-#: sequencer.c:779
+#: sequencer.c:793
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "aucune clé présente dans '%.*s'"
 
-#: sequencer.c:790
+#: sequencer.c:804
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "impossible de décoter la valeur de '%s'"
 
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728 builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
+#: 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"
 
-#: sequencer.c:837
+#: sequencer.c:851
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "'GIT_AUTHOR_NAME' déjà fourni"
 
-#: sequencer.c:842
+#: sequencer.c:856
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"
 
-#: sequencer.c:847
+#: sequencer.c:861
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "'GIT_AUTHOR_DATE' déjà fourni"
 
-#: sequencer.c:851
+#: sequencer.c:865
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "variable inconnue '%s'"
 
-#: sequencer.c:856
+#: sequencer.c:870
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "'GIT_AUTHOR_NAME' manquant"
 
-#: sequencer.c:858
+#: sequencer.c:872
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "'GIT_AUTHOR_EMAIL' manquant"
 
-#: sequencer.c:860
+#: sequencer.c:874
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "'GIT_AUTHOR_DATE' manquant"
 
-#: sequencer.c:925
+#: sequencer.c:939
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -7307,11 +7988,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1212
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "échec du crochet 'prepare-commit-msg'"
 
-#: sequencer.c:1218
+#: 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"
@@ -7325,19 +8006,22 @@ msgid ""
 "\n"
 "    git commit --amend --reset-author\n"
 msgstr ""
-"Votre nom et votre adresse courriel ont été configurés automatiquement en se\n"
+"Votre nom et votre adresse courriel ont été configurés automatiquement en "
+"se\n"
 "fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n"
 "vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n"
 "paramétrant explicitement. Lancez les commandes suivantes et suivez les\n"
-"instructions dans votre éditeur pour éditer votre fichier de configuration :\n"
+"instructions dans votre éditeur pour éditer votre fichier de "
+"configuration :\n"
 "\n"
 "    git config --global --edit\n"
 "\n"
-"Après ceci, vous pouvez corriger l'identité utilisée pour cette validation avec :\n"
+"Après ceci, vous pouvez corriger l'identité utilisée pour cette validation "
+"avec :\n"
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1231
+#: 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"
@@ -7350,8 +8034,10 @@ msgid ""
 "\n"
 "    git commit --amend --reset-author\n"
 msgstr ""
-"Votre nom et votre adresse courriel ont été configurés automatiquement en se fondant\n"
-"sur votre nom d'utilisateur et le nom de votre machine. Veuillez vérifier qu'ils sont corrects.\n"
+"Votre nom et votre adresse courriel ont été configurés automatiquement en se "
+"fondant\n"
+"sur votre nom d'utilisateur et le nom de votre machine. Veuillez vérifier "
+"qu'ils sont corrects.\n"
 "Vous pouvez supprimer ce message en les paramétrant explicitement :\n"
 "\n"
 "    git config --global user.name \"Votre Nom\"\n"
@@ -7361,359 +8047,368 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1273
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "impossible de retrouver le commit nouvellement créé"
 
-#: sequencer.c:1275
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr "impossible d'analyser le commit nouvellement créé"
 
-#: sequencer.c:1321
+#: 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:1323
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "HEAD détachée"
 
-#: sequencer.c:1327
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (commit racine)"
 
-#: sequencer.c:1348
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "impossible de lire HEAD"
 
-#: sequencer.c:1350
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s n'est pas un commit !"
 
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
+#: 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:1410 sequencer.c:2295
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "impossible d'analyser l'auteur du commit"
 
-#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
+#: 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:1454 sequencer.c:1574
+#: 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:1485 sequencer.c:1517
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "identité d'auteur invalide '%s'"
 
-#: sequencer.c:1491
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "auteur corrompu : information de date manquante"
 
-#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909 builtin/merge.c:934 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:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#: 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:1606
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "impossible d'analyser le commit %s"
 
-#: sequencer.c:1611
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "impossible d'analyser le commit parent %s"
 
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "commande inconnue : %d"
 
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "Ceci est le premier message de validation :"
 
-#: sequencer.c:1737
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Ceci est le message de validation numéro %d :"
 
-#: sequencer.c:1738
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "Le premier message de validation sera ignoré :"
 
-#: sequencer.c:1739
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Le message de validation %d sera ignoré :"
 
-#: sequencer.c:1740
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Ceci est la combinaison de %d commits."
 
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "impossible d'écrire '%s'"
 
-#: sequencer.c:1934
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "une HEAD est nécessaire à la correction"
 
-#: sequencer.c:1936 sequencer.c:3581
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "impossible de lire HEAD"
 
-#: sequencer.c:1938
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr "impossible de lire le message de validation de HEAD"
 
-#: sequencer.c:1962
+#: 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:2072
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "votre fichier d'index n'est pas fusionné."
 
-#: sequencer.c:2079
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "impossible de réparer le commit racine"
 
-#: sequencer.c:2098
+#: 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:2106 sequencer.c:2114
+#: 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:2120
+#: 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:2139
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s : impossible d'analyser le commit parent %s"
 
-#: sequencer.c:2205
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "impossible de renommer '%s' en '%s'"
 
-#: sequencer.c:2265
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "impossible d'annuler %s... %s"
 
-#: sequencer.c:2266
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "impossible d'appliquer %s... %s"
 
-#: sequencer.c:2287
+#: 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:2345
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s : échec à la lecture de l'index"
 
-#: sequencer.c:2352
+#: 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:2425
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s n'accepte pas d'argument : '%s'"
 
-#: sequencer.c:2434
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "argument manquant pour %s"
 
-#: sequencer.c:2477
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "impossible d'analyser '%s'"
 
-#: sequencer.c:2538
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ligne %d invalide : %.*s"
 
-#: sequencer.c:2549
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "'%s' impossible avec le commit précédent"
 
-#: sequencer.c:2635
+#: sequencer.c:2624 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "impossible de lire '%s'."
+
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "annulation d'un picorage en cours"
 
-#: sequencer.c:2644
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "annulation d'un retour en cours"
 
-#: sequencer.c:2690
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
 
-#: sequencer.c:2692
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "feuille d'instruction inutilisable : '%s'"
 
-#: sequencer.c:2697
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "aucun commit analysé."
 
-#: sequencer.c:2708
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "impossible de picorer pendant l'annulation d'un commit."
 
-#: sequencer.c:2710
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "impossible d'annuler un commit pendant un picorage."
 
-#: sequencer.c:2788
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valeur invalide pour %s : %s"
 
-#: sequencer.c:2897
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "\"écrase-sur\" inutilisable"
 
-#: sequencer.c:2917
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "feuille d'options malformée : %s"
 
-#: sequencer.c:3012 sequencer.c:4869
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "l'ensemble de commits spécifié est vide"
 
-#: sequencer.c:3029
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "un retour est déjà en cours"
 
-#: sequencer.c:3031
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3034
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "un picorage est déjà en cours"
 
-#: sequencer.c:3036
+#: 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:3050
+#: 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:3065
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "impossible de verrouiller HEAD"
 
-#: sequencer.c:3125 sequencer.c:4582
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
 msgstr "aucun picorage ou retour en cours"
 
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "impossible de résoudre HEAD"
 
-#: sequencer.c:3129 sequencer.c:3173
+#: 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:3159 builtin/grep.c:759
+#: 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:3161
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "impossible de lire '%s' : %s"
 
-#: sequencer.c:3162
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "fin de fichier inattendue"
 
-#: sequencer.c:3168
+#: 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:3179
+#: 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 !"
+msgstr ""
+"Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"
 
-#: sequencer.c:3220
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "pas de retour en cours"
 
-#: sequencer.c:3229
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "aucun picorage en cours"
 
-#: sequencer.c:3239
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "échec du saut de commit"
 
-#: sequencer.c:3246
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "il n'y a rien à sauter"
 
-#: sequencer.c:3249
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
 "try \"git %s --continue\""
 msgstr ""
 "avez-vous déjà validé ?\n"
-"essayez \"git %s -continue\""
+"essayez \"git %s --continue\""
 
-#: sequencer.c:3411 sequencer.c:4473
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "impossible de lire HEAD"
 
-#: sequencer.c:3428
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "impossible de copier '%s' vers '%s'"
 
-#: sequencer.c:3436
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -7732,27 +8427,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3446
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Impossible d'appliquer %s... %.*s"
 
-#: sequencer.c:3453
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Impossible de fusionner %.*s"
 
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: 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:3483
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "Exécution : %s\n"
 
-#: sequencer.c:3498
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -7767,11 +8462,11 @@ msgstr ""
 "git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3504
+#: 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:3510
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -7788,90 +8483,91 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3571
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nom de label illégal '%.*s'"
 
-#: sequencer.c:3625
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "écriture d'un commit racine bidon"
 
-#: sequencer.c:3630
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "écriture de 'écraser-sur'"
 
-#: sequencer.c:3714
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "impossible de résoudre '%s'"
 
-#: sequencer.c:3747
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "impossible de fusionner avec une révision courante"
 
-#: sequencer.c:3769
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "impossible d'analyser '%.*s'"
 
-#: sequencer.c:3778
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "rien à fusionner : '%.*s'"
 
-#: sequencer.c:3790
+#: 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"
+msgstr ""
+"une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"
 
-#: sequencer.c:3806
+#: 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:3989
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "impossible de seulement essayer de fusionner '%.*s'"
 
-#: sequencer.c:4005
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "fusion : Impossible d'écrire le nouveau fichier index"
 
-#: sequencer.c:4079
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr "Autoremisage impossible"
 
-#: sequencer.c:4082
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Réponse de remisage inattendue : '%s'"
 
-#: sequencer.c:4088
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Impossible de créer le répertoire pour '%s'"
 
-#: sequencer.c:4091
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Autoremisage créé : %s\n"
 
-#: sequencer.c:4095
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "impossible de réinitialiser --hard"
 
-#: sequencer.c:4120
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autoremisage appliqué.\n"
 
-#: sequencer.c:4132
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "impossible de stocker %s"
 
-#: sequencer.c:4135
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -7882,29 +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:4140
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "L'application du remisage automatique a créé des conflits."
 
-#: sequencer.c:4141
+#: 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."
+msgstr ""
+"Un remisage automatique existe ; création d'une nouvelle entrée de remisage."
 
-#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "impossible de détacher HEAD"
 
-#: sequencer.c:4249
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Arrêt à HEAD\n"
 
-#: sequencer.c:4251
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Arrêté à %s\n"
 
-#: sequencer.c:4259
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -7925,58 +8622,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4305
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "Rebasage (%d/%d)%s"
 
-#: sequencer.c:4351
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Arrêt à %s... %.*s\n"
 
-#: sequencer.c:4422
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "commande inconnue %d"
 
-#: sequencer.c:4481
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "impossible de lire orig-head"
 
-#: sequencer.c:4486
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "impossible de lire 'onto'"
 
-#: sequencer.c:4500
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "impossible de mettre à jour HEAD sur %s"
 
-#: sequencer.c:4560
+#: 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:4612
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
 msgstr "impossible de rebaser : vous avez des modifications non indexées."
 
-#: sequencer.c:4621
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "impossible de corriger un commit non-existant"
 
-#: sequencer.c:4623
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "fichier invalide : '%s'"
 
-#: sequencer.c:4625
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenu invalide : '%s'"
 
-#: sequencer.c:4628
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7986,68 +8683,78 @@ 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:4664 sequencer.c:4703
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "impossible d'écrire le fichier : '%s'"
 
-#: sequencer.c:4719
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "impossible de supprimer CHERRY_PICK_HEAD"
 
-#: sequencer.c:4726
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "impossible de valider les modifications indexées."
 
-#: sequencer.c:4846
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s : impossible de picorer un %s"
 
-#: sequencer.c:4850
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s : mauvaise révision"
 
-#: sequencer.c:4885
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "impossible d'annuler en tant que commit initial"
 
-#: sequencer.c:5362
+#: 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: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:5405
 msgid "make_script: unhandled options"
 msgstr "make_script : options non gérées"
 
-#: sequencer.c:5365
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script : erreur lors de la préparation des révisions"
 
-#: sequencer.c:5615 sequencer.c:5632
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "rien à faire"
 
-#: sequencer.c:5651
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "impossible d'éviter les commandes de picorage non nécessaires"
 
-#: sequencer.c:5751
+#: 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"
 "Use 'git <command> -- <path>...' to specify paths that do not exist locally."
 msgstr ""
 "%s : ce chemin n'existe pas dans la copie de travail.\n"
-"Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui n'existent pas localement."
+"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"
@@ -8058,12 +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"
+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"
@@ -8074,134 +8783,133 @@ 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"
+msgstr ""
+"impossible de mettre en place le répertoire de travail en utilisant une "
+"configuration invalide"
 
-#: setup.c:423
+#: 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:661
+#: 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:669
-msgid "unknown repository extensions found:"
-msgstr "extensions de dépôt inconnues trouvées :"
+#: 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:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "la version du dépôt est 0, mais des extensions uniquement v1 trouvées :"
+#: 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] ""
+"la version du dépôt est 0, mais une extension uniquement v1 trouvée :"
+msgstr[1] ""
+"la version du dépôt est 0, mais des extensions uniquement v1 trouvées :"
 
-#: setup.c:700
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "erreur à l'ouverture de '%s'"
 
-#: setup.c:702
+#: 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:704
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "erreur à la lecture de %s"
 
-#: setup.c:706
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "format de fichier git invalide : %s"
 
-#: setup.c:708
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "aucun chemin dans le fichier git : %s"
 
-#: setup.c:710
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "ce n'est pas un dépôt git : %s"
 
-#: setup.c:812
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' trop gros"
 
-#: setup.c:826
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "ce n'est pas un dépôt git : '%s'"
 
-#: setup.c:855 setup.c:857 setup.c:888
+#: 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:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: 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:987
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "échec du stat de '%*s%s%s'"
 
-#: setup.c:1225
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "Impossible d'accéder au répertoire de travail courant"
 
-#: setup.c:1234 setup.c:1240
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "impossible de modifier en '%s'"
 
-#: setup.c:1245
+#: 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:1251
+#: 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 ""
-"ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) n'est un dépôt git\n"
-"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM n'est pas défini)."
+"ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) "
+"n'est un dépôt git\n"
+"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
+"n'est pas défini)."
 
-#: setup.c:1370
+#: 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 ""
 "problème avec la valeur de core.sharedRepository (0%.3o).\n"
-"Le propriétaire des fichiers doit toujours avoir les droits en lecture et écriture."
-
-#: setup.c:1417
-msgid "open /dev/null or dup failed"
-msgstr "échec de l'ouverture ou au dup de /dev/null"
+"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
+"écriture."
 
-#: setup.c:1432
+#: setup.c:1508
 msgid "fork failed"
 msgstr "échec de la bifurcation"
 
-#: setup.c:1437 t/helper/test-simple-ipc.c:285
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "échec du setsid"
 
-#: sparse-index.c:151
-msgid "attempting to use sparse-index without cone mode"
-msgstr "tentative d'utilisation de l'index partiel sans mode cone"
-
-#: sparse-index.c:156
-msgid "unable to update cache-tree, staying full"
-msgstr "impossible de mettre à jour l'arbre de cache, full conservé"
-
-#: sparse-index.c:239
+#: 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)"
@@ -8258,12 +8966,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] "%u octet/s"
 msgstr[1] "%u octets/s"
 
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737 builtin/rebase.c:866
+#: 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:1177
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "impossible d'éditer '%s'"
@@ -8275,26 +8984,30 @@ msgstr "nom de sous-module suspicieux %s ignoré"
 
 #: submodule-config.c:304
 msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
+msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchjobs"
 
 #: submodule-config.c:402
 #, c-format
 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr "'%s' ignoré et qui peut être interprété comme une option de ligne de commande : %s"
+msgstr ""
+"'%s' ignoré et qui peut être interprété comme une option de ligne de "
+"commande : %s"
 
 #: submodule-config.c:499
 #, c-format
 msgid "invalid value for %s"
 msgstr "valeur invalide pour %s"
 
-#: submodule-config.c:766
+#: submodule-config.c:767
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
 
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr "Modification impossible de .gitmodules non fusionné, résolvez les conflits d'abord"
+msgstr ""
+"Modification impossible de .gitmodules non fusionné, résolvez les conflits "
+"d'abord"
 
 #: submodule.c:118 submodule.c:147
 #, c-format
@@ -8311,66 +9024,74 @@ msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
 msgid "staging updated .gitmodules failed"
 msgstr "échec de la mise en index du .gitmodules mis à jour"
 
-#: submodule.c:328
+#: submodule.c:358
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "dans le sous-module '%s' non populé"
 
-#: submodule.c:359
+#: submodule.c:389
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
 
-#: submodule.c:436
+#: submodule.c:466
 #, c-format
 msgid "bad --ignore-submodules argument: %s"
 msgstr "mauvais argument --ignore-submodules : %s"
 
-#: submodule.c:818
+#: submodule.c:844
 #, c-format
-msgid "Submodule in commit %s at path: '%s' collides with a submodule named the same. Skipping it."
-msgstr "Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un sous-module du même nom. Ignoré."
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un "
+"sous-module du même nom. Ignoré."
 
-#: submodule.c:921
+#: submodule.c:954
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"
 
-#: submodule.c:1006
+#: submodule.c:1042
 #, c-format
-msgid "Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s"
-msgstr "Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n 1' dans le sous-module %s"
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n "
+"1' dans le sous-module %s"
 
-#: submodule.c:1129
+#: submodule.c:1165
 #, c-format
 msgid "process for submodule '%s' failed"
 msgstr "le processus pour le sous-module '%s' a échoué"
 
-#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
+#: 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."
 
-#: submodule.c:1169
+#: submodule.c:1205
 #, c-format
 msgid "Pushing submodule '%s'\n"
 msgstr "Poussée du sous-module '%s'\n"
 
-#: submodule.c:1172
+#: submodule.c:1208
 #, c-format
 msgid "Unable to push submodule '%s'\n"
 msgstr "Impossible de pousser le sous-module '%s'\n"
 
-#: submodule.c:1464
+#: submodule.c:1491
 #, c-format
 msgid "Fetching submodule %s%s\n"
 msgstr "Récupération du sous-module %s%s\n"
 
-#: submodule.c:1498
+#: submodule.c:1525
 #, c-format
 msgid "Could not access submodule '%s'\n"
 msgstr "Impossible d'accéder au sous-module '%s'\n"
 
-#: submodule.c:1653
+#: submodule.c:1680
 #, c-format
 msgid ""
 "Errors during submodule fetch:\n"
@@ -8379,76 +9100,81 @@ msgstr ""
 "Erreurs pendant la récupération du sous-module :\n"
 "%s"
 
-#: submodule.c:1678
+#: submodule.c:1705
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' n'est pas reconnu comme dépôt git"
 
-#: submodule.c:1695
+#: submodule.c:1722
 #, c-format
 msgid "Could not run 'git status --porcelain=2' in submodule %s"
 msgstr "impossible de lancer 'git status --porcelain=2' dans le sous-module %s"
 
-#: submodule.c:1736
+#: submodule.c:1763
 #, c-format
 msgid "'git status --porcelain=2' failed in submodule %s"
 msgstr "'git status --porcelain=2' a échoué dans le sous-module %s"
 
-#: submodule.c:1811
+#: submodule.c:1838
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"
 
-#: submodule.c:1824
+#: submodule.c:1851
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
 
-#: submodule.c:1839
+#: submodule.c:1868
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "Impossible de désactiver core.worktree dans le sous-module '%s'"
 
-#: submodule.c:1866 submodule.c:2176
+#: submodule.c:1895 submodule.c:2210
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "récursion impossible dans le sous-module '%s'"
 
-#: submodule.c:1887
+#: submodule.c:1917
 msgid "could not reset submodule index"
 msgstr "impossible de réinitialiser l'index du sous-module"
 
-#: submodule.c:1929
+#: submodule.c:1959
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "le sous-module '%s' a un index sale"
 
-#: submodule.c:1981
+#: submodule.c:2013
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Le sous-module '%s' n'a pas pu être mis à jour."
 
-#: submodule.c:2049
+#: submodule.c:2081
 #, c-format
 msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr "le répertoire git du sous-module '%s' est à l'intérieur du répertoire git '%.*s'"
+msgstr ""
+"le répertoire git du sous-module '%s' est à l'intérieur du répertoire git "
+"'%.*s'"
 
-#: submodule.c:2070
+#: submodule.c:2102
 #, c-format
-msgid "relocate_gitdir for submodule '%s' with more than one worktree not supported"
-msgstr "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail n'est pas supporté"
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
+"n'est pas supporté"
 
-#: submodule.c:2082 submodule.c:2141
+#: submodule.c:2114 submodule.c:2174
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "impossible de trouve le nom pour le sous-module '%s'"
 
-#: submodule.c:2086
+#: submodule.c:2118
 #, c-format
 msgid "refusing to move '%s' into an existing git dir"
 msgstr "refus de déplacer '%s' dans une répertoire git existant"
 
-#: submodule.c:2093
+#: submodule.c:2124
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -8459,11 +9185,11 @@ msgstr ""
 "'%s' sur\n"
 "'%s'\n"
 
-#: submodule.c:2221
+#: submodule.c:2255
 msgid "could not start ls-files in .."
 msgstr "impossible de démarrer ls-files dans .."
 
-#: submodule.c:2261
+#: submodule.c:2295
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree a renvoyé un code de retour inattendu %d"
@@ -8478,12 +9204,14 @@ msgstr "échec du lstat de '%s'"
 msgid "running trailer command '%s' failed"
 msgstr "échec de la commande trailer '%s'"
 
-#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566 trailer.c:570
+#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566
+#: trailer.c:570
 #, c-format
 msgid "unknown value '%s' for key '%s'"
 msgstr "valeur inconnue '%s' pour la clé '%s'"
 
-#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
+#: builtin/remote.c:327
 #, c-format
 msgid "more than one %s"
 msgstr "plus d'un %s"
@@ -8498,11 +9226,11 @@ msgstr "symbole vide dans la ligne de fin '%.*s'"
 msgid "could not read input file '%s'"
 msgstr "impossible de lire le fichier d'entrée '%s'"
 
-#: trailer.c:766 builtin/mktag.c:88
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
 msgid "could not read from stdin"
 msgstr "impossible de lire depuis l'entrée standard"
 
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
 #, c-format
 msgid "could not stat %s"
 msgstr "stat impossible de %s"
@@ -8537,12 +9265,17 @@ msgstr "impossible de trouver un assistant distant pour '%s'"
 
 #: transport-helper.c:161 transport-helper.c:575
 msgid "can't dup helper output fd"
-msgstr "impossible de dupliquer le descripteur de flux de sortie de l'assistant"
+msgstr ""
+"impossible de dupliquer le descripteur de flux de sortie de l'assistant"
 
 #: transport-helper.c:214
 #, c-format
-msgid "unknown mandatory capability %s; this remote helper probably needs newer version of Git"
-msgstr "capacité obligatoire inconnue %s ; cet assistant distant requiert probablement une une nouvelle version de Git"
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"capacité obligatoire inconnue %s ; cet assistant distant requiert "
+"probablement une une nouvelle version de Git"
 
 #: transport-helper.c:220
 msgid "this remote helper should implement refspec capability"
@@ -8566,7 +9299,7 @@ msgstr "impossible de lancer fast-import"
 msgid "error while running fast-import"
 msgstr "erreur au lancement de fast-import"
 
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
 #, c-format
 msgid "could not read ref %s"
 msgstr "impossible de lire la réf %s"
@@ -8578,13 +9311,15 @@ msgstr "réponse inconnue à connect : %s"
 
 #: transport-helper.c:616
 msgid "setting remote service path not supported by protocol"
-msgstr "la spécification du chemin de service distant n'est pas supportée par le protocole"
+msgstr ""
+"la spécification du chemin de service distant n'est pas supportée par le "
+"protocole"
 
 #: transport-helper.c:618
 msgid "invalid remote service path"
 msgstr "chemin de service distant invalide"
 
-#: transport-helper.c:661 transport.c:1471
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "option non supportée par le protocole"
 
@@ -8593,9 +9328,9 @@ msgstr "option non supportée par le protocole"
 msgid "can't connect to subservice %s"
 msgstr "impossible de se connecter au sous-service %s"
 
-#: transport-helper.c:693 transport.c:397
+#: transport-helper.c:693 transport.c:404
 msgid "--negotiate-only requires protocol v2"
-msgstr "--negociate-only requiert le protocole v2"
+msgstr "--negotiate-only requiert le protocole v2"
 
 #: transport-helper.c:755
 msgid "'option' without a matching 'ok/error' directive"
@@ -8606,59 +9341,61 @@ msgstr "'option' sans directive 'ok/error' correspondante"
 msgid "expected ok/error, helper said '%s'"
 msgstr "ok/error attendu, l'assistant a dit '%s'"
 
-#: transport-helper.c:855
+#: transport-helper.c:859
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "l'assistant a renvoyé un statut de retour inattendu %s"
 
-#: transport-helper.c:938
+#: transport-helper.c:942
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "l'assistant %s ne gère pas dry-run"
 
-#: transport-helper.c:941
+#: transport-helper.c:945
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "l'assistant %s ne gère pas --signed"
 
-#: transport-helper.c:944
+#: transport-helper.c:948
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "l'assistant %s ne gère pas --signed=if-asked"
 
-#: transport-helper.c:949
+#: transport-helper.c:953
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "l'assistant %s ne gère pas --atomic"
 
-#: transport-helper.c:953
+#: transport-helper.c:957
 #, c-format
 msgid "helper %s does not support --%s"
 msgstr "l'assistant %s ne gère pas --%s"
 
-#: transport-helper.c:960
+#: transport-helper.c:964
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "l'assistant %s ne gère pas 'push-option'"
 
-#: transport-helper.c:1060
+#: transport-helper.c:1064
 msgid "remote-helper doesn't support push; refspec needed"
-msgstr "l'assistant %s ne gère pas push ; un spécificateur de référence est nécessaire"
+msgstr ""
+"l'assistant %s ne gère pas push ; un spécificateur de référence est "
+"nécessaire"
 
-#: transport-helper.c:1065
+#: transport-helper.c:1069
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "l'assistant %s ne gère pas 'force'"
 
-#: transport-helper.c:1112
+#: transport-helper.c:1116
 msgid "couldn't run fast-export"
 msgstr "impossible de lancer fast-export"
 
-#: transport-helper.c:1117
+#: transport-helper.c:1121
 msgid "error while running fast-export"
 msgstr "erreur au lancement de fast-export"
 
-#: transport-helper.c:1142
+#: transport-helper.c:1146
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -8667,52 +9404,52 @@ msgstr ""
 "Aucune référence en commun et aucune spécfiée ; rien à faire.\n"
 "Vous devriez peut-être spécifier une branche.\n"
 
-#: transport-helper.c:1224
+#: transport-helper.c:1228
 #, c-format
 msgid "unsupported object format '%s'"
 msgstr "format d'objet non géré '%s'"
 
-#: transport-helper.c:1233
+#: transport-helper.c:1237
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "réponse malformée dans le liste de réfs : %s"
 
-#: transport-helper.c:1385
+#: transport-helper.c:1389
 #, c-format
 msgid "read(%s) failed"
 msgstr "échec de read(%s)"
 
-#: transport-helper.c:1412
+#: transport-helper.c:1416
 #, c-format
 msgid "write(%s) failed"
 msgstr "échec de write(%s)"
 
-#: transport-helper.c:1461
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed"
 msgstr "échec du fil d'exécution %s"
 
-#: transport-helper.c:1465
+#: transport-helper.c:1469
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "échec de jonction du fil d'exécution %s : %s"
 
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "impossible de démarrer le fil d'exécution pour copier les données : %s"
 
-#: transport-helper.c:1525
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed to wait"
 msgstr "échec du processus %s pour l'attente"
 
-#: transport-helper.c:1529
+#: transport-helper.c:1533
 #, c-format
 msgid "%s process failed"
 msgstr "échec du processus %s"
 
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
 msgid "can't start thread for copying data"
 msgstr "impossible de démarrer le fil d'exécution pour copier les données"
 
@@ -8726,46 +9463,46 @@ msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
 msgid "could not read bundle '%s'"
 msgstr "impossible de lire la liasse '%s'"
 
-#: transport.c:220
+#: transport.c:227
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport : option de profondeur invalide '%s'"
 
-#: transport.c:272
+#: transport.c:279
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "voir protocol.version dans 'git help config' pour plus d'information"
 
-#: transport.c:273
+#: transport.c:280
 msgid "server options require protocol version 2 or later"
 msgstr "les options de serveur exigent une version 2 ou supérieure"
 
-#: transport.c:400
+#: transport.c:407
 msgid "server does not support wait-for-done"
 msgstr "le serveur ne prend pas en charge wait-for-done"
 
-#: transport.c:751
+#: transport.c:759
 msgid "could not parse transport.color.* config"
 msgstr "impossible d'analyser la configuration transport.color.*"
 
-#: transport.c:826
+#: transport.c:834
 msgid "support for protocol v2 not implemented yet"
 msgstr "le support du protocole v2 n'est pas encore implanté"
 
-#: transport.c:960
+#: transport.c:967
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "valeur inconnue pour la config '%s' : %s"
 
-#: transport.c:1026
+#: transport.c:1033
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "transport '%s' non permis"
 
-#: transport.c:1079
+#: transport.c:1082
 msgid "git-over-rsync is no longer supported"
 msgstr "git-over-rsync n'est plus supporté"
 
-#: transport.c:1181
+#: transport.c:1185
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -8774,7 +9511,7 @@ msgstr ""
 "Les chemins suivants de sous-module contiennent des modifications\n"
 "qui ne peuvent être trouvées sur aucun distant :\n"
 
-#: transport.c:1185
+#: transport.c:1189
 #, c-format
 msgid ""
 "\n"
@@ -8801,11 +9538,11 @@ msgstr ""
 "pour les pousser vers un serveur distant.\n"
 "\n"
 
-#: transport.c:1193
+#: transport.c:1197
 msgid "Aborting."
 msgstr "Abandon."
 
-#: transport.c:1340
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr "échec de la poussée de tous les sous-modules nécessaires"
 
@@ -8825,43 +9562,48 @@ 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"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n"
-"%%sVeuillez valider ou remiser vos modifications avant de basculer de branche."
+"Vos modifications locales aux fichiers suivants seraient écrasées par "
+"l'extraction :\n"
+"%%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"
 "%%s"
 msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n"
+"Vos modifications locales aux fichiers suivants seraient écrasées par "
+"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"
 "%%sPlease commit your changes or stash them before you merge."
 msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n"
+"Vos modifications locales aux fichiers suivants seraient écrasées par la "
+"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"
 "%%s"
 msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n"
+"Vos modifications locales aux fichiers suivants seraient écrasées par la "
+"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"
@@ -8870,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"
@@ -8879,25 +9621,36 @@ 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"
 "%s"
 msgstr ""
-"La mise à jour des répertoires suivants effacerait les fichiers non suivis contenus :\n"
+"La mise à jour des répertoires suivants effacerait les fichiers non suivis "
+"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"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient effacés par l'extraction :\n"
+"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"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"
@@ -8906,16 +9659,17 @@ 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"
 "%%sPlease move or remove them before you merge."
 msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient effacés par la fusion :\n"
+"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"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"
@@ -8924,16 +9678,17 @@ 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"
 "%%sPlease move or remove them before you %s."
 msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient effacés par %s :\n"
+"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"%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"
@@ -8942,34 +9697,38 @@ 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 checkout:\n"
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient écrasés par l'extraction :\n"
+"Les fichiers suivants non suivis de la copie de travail seraient écrasés par "
+"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 checkout:\n"
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
 "%%s"
 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"
 "%%sPlease move or remove them before you merge."
 msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient effacés par la fusion :\n"
+"Les fichiers suivants non suivis de la copie de travail seraient effacés par "
+"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"
@@ -8978,16 +9737,17 @@ 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"
 "%%sPlease move or remove them before you %s."
 msgstr ""
-"Les fichiers suivants non suivis de la copie de travail seraient écrasés par %s :\n"
+"Les fichiers suivants non suivis de la copie de travail seraient écrasés par "
+"%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"
@@ -8996,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"
@@ -9010,48 +9770,57 @@ 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 patterns:\n"
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Les chemins suivants ne sont pas à jour et ont été laissés malgré les motifs clairsemés :\n"
+"Les chemins suivants ne sont pas à jour et ont été laissés malgré les motifs "
+"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"
 "%s"
 msgstr ""
-"Les chemins suivants ne sont pas fusionnés et ont été laissés malgré les motifs clairsemés :\n"
+"Les chemins suivants ne sont pas fusionnés et ont été laissés malgré les "
+"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 patterns:\n"
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Les chemins suivants étaient déjà présents et ont été laissés malgré les motifs clairsemés :\n"
+"Les chemins suivants étaient déjà présents et ont été laissés malgré les "
+"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 reapply`.\n"
-msgstr "Après correction des chemins ci-dessus, vous voulez peut-être lancer `git sparse-checkout reapply`.\n"
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+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"
@@ -9061,16 +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:1519
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "Mise à jour des drapeaux de l'index"
 
-#: unpack-trees.c:2608
+#: 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"
+msgstr ""
+"l'arbre de travail et le commit non suivi ont des entrées dupliquées : %s"
 
-#: upload-pack.c:1548
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "vidage attendu après les arguments de récupération"
 
@@ -9107,113 +9877,128 @@ msgstr "segment de chemin '..' invalide"
 msgid "Fetching objects"
 msgstr "Récupération des objets"
 
-#: worktree.c:238 builtin/am.c:2151
+#: 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:304
+#: 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"
+msgstr ""
+"'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt"
 
-#: worktree.c:315
+#: 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"
+msgstr ""
+"le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre "
+"de travail"
 
-#: worktree.c:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' n'existe pas"
 
-#: worktree.c:333
+#: 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:342
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' ne pointe pas en retour sur '%s'"
 
-#: worktree.c:608
+#: worktree.c:604
 msgid "not a directory"
 msgstr "pas un répertoire"
 
-#: worktree.c:617
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git n'est pas un fichier"
 
-#: worktree.c:619
+#: worktree.c:615
 msgid ".git file broken"
 msgstr "fichier .git cassé"
 
-#: worktree.c:621
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr "fichier .git incorrect"
 
-#: worktree.c:727
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "pas un chemin valide"
 
-#: worktree.c:733
+#: 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:737
+#: 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"
+msgstr ""
+"impossible de localiser le dépôt ; .git ne fait pas référence à un dépôt"
 
-#: worktree.c:741
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "impossible de localiser le dépôt ; fichier .git cassé"
 
-#: worktree.c:747
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "gitdir non lisible"
 
-#: worktree.c:751
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "gitdir incorrect"
 
-#: worktree.c:776
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "pas un répertoire valide"
 
-#: worktree.c:782
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "le fichier gitdir n'existe pas"
 
-#: worktree.c:787 worktree.c:796
+#: 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:806
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr "lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)"
+msgstr ""
+"lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)"
 
-#: worktree.c:814
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "fichier gitdir invalide"
 
-#: worktree.c:822
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "le fichier gitdir pointe sur un endroit inexistant"
 
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "impossible de configurer l'environnement '%s'"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "impossible de créer '%s'"
+
+#: wrapper.c:205 wrapper.c:375
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "impossible d'ouvrir '%s' en lecture/écriture"
 
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
 #, c-format
 msgid "unable to access '%s'"
 msgstr "impossible d'accéder à '%s'"
 
-#: wrapper.c:607
+#: wrapper.c:615
 msgid "unable to get current working directory"
 msgstr "impossible d'accéder au répertoire de travail courant"
 
@@ -9228,7 +10013,9 @@ msgstr "  (utilisez \"git restore --staged <fichier>...\" pour désindexer)"
 #: wt-status.c:190 wt-status.c:222
 #, c-format
 msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr "  (utilisez \"git restore --source=%s --staged <fichier>...\" pour désindexer)"
+msgstr ""
+"  (utilisez \"git restore --source=%s --staged <fichier>...\" pour "
+"désindexer)"
 
 #: wt-status.c:193 wt-status.c:225
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
@@ -9240,40 +10027,50 @@ msgstr "  (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
 
 #: wt-status.c:199 wt-status.c:203
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
-msgstr "  (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme résolu)"
+msgstr ""
+"  (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "
+"résolu)"
 
 #: wt-status.c:201
 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:1075
+#: 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:1084
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "Modifications qui ne seront pas validées :"
 
 #: wt-status.c:238
 msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr "  (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
+msgstr ""
+"  (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
 
 #: wt-status.c:240
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr "  (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera validé)"
+msgstr ""
+"  (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "
+"validé)"
 
 #: wt-status.c:241
-msgid "  (use \"git restore <file>...\" to discard changes in working directory)"
-msgstr "  (utilisez \"git restore <fichier>...\" pour annuler les modifications dans le répertoire de travail)"
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (utilisez \"git restore <fichier>...\" pour annuler les modifications dans "
+"le répertoire de travail)"
 
 #: wt-status.c:243
 msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr "  (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"
+msgstr ""
+"  (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"
 
 #: wt-status.c:254
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr "  (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
+msgstr ""
+"  (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
 
 #: wt-status.c:266
 msgid "both deleted:"
@@ -9347,22 +10144,22 @@ msgstr "contenu modifié, "
 msgid "untracked content, "
 msgstr "contenu non suivi, "
 
-#: wt-status.c:908
+#: 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:939
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "Sous-modules modifiés mais non mis à jour :"
 
-#: wt-status.c:941
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "Changements du sous-module à valider :"
 
-#: wt-status.c:1023
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -9370,7 +10167,7 @@ msgstr ""
 "Ne touchez pas à la ligne ci-dessus.\n"
 "Tout ce qui suit sera éliminé."
 
-#: wt-status.c:1115
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -9378,256 +10175,282 @@ msgid ""
 "You can use '--no-ahead-behind' to avoid this.\n"
 msgstr ""
 "\n"
-"%.2f secondes ont été nécessaires pour calculer les valeurs d'avance/retard de la branche.\n"
+"%.2f secondes ont été nécessaires pour calculer les valeurs d'avance/retard "
+"de la branche.\n"
 "Vous pouvez utiliser '--no-ahead-behind' pour éviter ceci.\n"
 
-#: wt-status.c:1145
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "Vous avez des chemins non fusionnés."
 
-#: wt-status.c:1148
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (réglez les conflits puis lancez \"git commit\")"
 
-#: wt-status.c:1150
+#: 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:1154
+#: 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:1157
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (utilisez \"git commit\" pour terminer la fusion)"
 
-#: wt-status.c:1166
+#: 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:1169
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "Le patch actuel est vide."
 
-#: wt-status.c:1173
+#: 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:1175
+#: 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:1177
+#: 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:1310
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo est manquant."
 
-#: wt-status.c:1312
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "Aucune commande réalisée."
 
-#: wt-status.c:1315
+#: 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:1326
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (voir plus dans le fichier %s)"
 
-#: wt-status.c:1331
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "Aucune commande restante."
 
-#: wt-status.c:1334
+#: 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:1342
+#: 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:1354
+#: 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:1359
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "Vous êtes en train de rebaser."
 
-#: wt-status.c:1372
+#: 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:1374
+#: 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:1376
+#: 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:1383
+#: 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:1387
+#: wt-status.c:1449
 #, c-format
-msgid "You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr "Vous êtes actuellement en train de fractionner un commit pendant un rebasage de la branche '%s' sur '%s'."
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
+"de la branche '%s' sur '%s'."
 
-#: wt-status.c:1392
+#: 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."
+msgstr ""
+"Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
 
-#: wt-status.c:1395
+#: 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\")"
+msgstr ""
+"  (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
 
-#: wt-status.c:1399
+#: 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'."
+msgstr ""
+"Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "
+"branche '%s' sur '%s'."
 
-#: wt-status.c:1404
+#: 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."
+msgstr ""
+"Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
 
-#: wt-status.c:1407
+#: 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:1409
-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: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:1420
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "Picorage en cours."
 
-#: wt-status.c:1423
+#: 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:1430
+#: 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:1433
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (lancez \"git cherry-pick --continue\" pour continuer)"
 
-#: wt-status.c:1436
+#: 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\")"
+msgstr ""
+"  (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
 
-#: wt-status.c:1438
+#: 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:1440
+#: 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:1450
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "Rétablissement en cours."
 
-#: wt-status.c:1453
+#: 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:1459
+#: 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:1462
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (lancez \"git revert --continue\" pour continuer)"
 
-#: wt-status.c:1465
+#: 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:1467
+#: 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:1469
+#: 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:1479
+#: 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:1483
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "Vous êtes en cours de bissection."
 
-#: wt-status.c:1486
+#: 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:1497
+#: wt-status.c:1559
+msgid "You are in a sparse checkout."
+msgstr "Vous êtes dans une extraction clairsemée."
+
+#: 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."
+msgstr ""
+"Vous êtes dans une extraction partielle avec %d %% de fichiers suivis "
+"présents."
 
-#: wt-status.c:1736
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "Sur la branche "
 
-#: wt-status.c:1743
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "rebasage interactif en cours ; sur "
 
-#: wt-status.c:1745
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "rebasage en cours ; sur "
 
-#: wt-status.c:1750
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "HEAD détachée sur "
 
-#: wt-status.c:1752
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "HEAD détachée depuis "
 
-#: wt-status.c:1755
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "Actuellement sur aucun branche."
 
-#: wt-status.c:1772
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Validation initiale"
 
-#: wt-status.c:1773
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "Aucun commit"
 
-#: wt-status.c:1787
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "Fichiers non suivis"
 
-#: wt-status.c:1789
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Fichiers ignorés"
 
-#: wt-status.c:1793
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9636,115 +10459,126 @@ msgid ""
 msgstr ""
 "L'énumération des fichiers non suivis a duré %.2f secondes. 'status -uno'\n"
 "peut l'accélérer, mais vous devez alors faire attention à ne pas\n"
-"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help status')."
+"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
+"status')."
 
-#: wt-status.c:1799
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Fichiers non suivis non affichés%s"
 
-#: wt-status.c:1801
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr " (utilisez -u pour afficher les fichiers non suivis)"
 
-#: wt-status.c:1807
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "Aucune modification"
 
-#: wt-status.c:1812
+#: 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"
+msgstr ""
+"aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
+"\"git commit -a\")\n"
 
-#: wt-status.c:1816
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "aucune modification ajoutée à la validation\n"
 
-#: wt-status.c:1820
+#: wt-status.c:1890
 #, c-format
-msgid "nothing added to commit but untracked files present (use \"git add\" to track)\n"
-msgstr "aucune modification ajoutée à la validation mais des fichiers non suivis sont présents (utilisez \"git add\" pour les suivre)\n"
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+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:1824
+#: 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"
+msgstr ""
+"aucune modification ajoutée à la validation mais des fichiers non suivis "
+"sont présents\n"
 
-#: wt-status.c:1828
+#: 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"
+msgstr ""
+"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
+"suivre)\n"
 
-#: wt-status.c:1832 wt-status.c:1838
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "rien à valider\n"
 
-#: wt-status.c:1835
+#: 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:1840
+#: 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:1945
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "Encore aucun commit sur "
 
-#: wt-status.c:1949
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (aucune branche)"
 
-#: wt-status.c:1980
+#: wt-status.c:2050
 msgid "different"
 msgstr "différent"
 
-#: wt-status.c:1982 wt-status.c:1990
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "derrière "
 
-#: wt-status.c:1985 wt-status.c:1988
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr "devant "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2511
+#: 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:2517
+#: 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:2519
+#: 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:178
+#: 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:185
+#: 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:862
+#: 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:874
+#: 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'"
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "échec pour délier '%s'"
@@ -9753,130 +10587,142 @@ msgstr "échec pour délier '%s'"
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<options>] [--] <chemin>..."
 
-#: builtin/add.c:61
+#: builtin/add.c:64
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "impossible de chmod %cx '%s'"
 
-#: builtin/add.c:99
+#: builtin/add.c:106
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "état de diff inattendu %c"
 
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
 msgid "updating files failed"
 msgstr "échec de la mise à jour des fichiers"
 
-#: builtin/add.c:114
+#: builtin/add.c:121
 #, c-format
 msgid "remove '%s'\n"
 msgstr "suppression de '%s'\n"
 
-#: builtin/add.c:198
+#: builtin/add.c:205
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Modifications non indexées après rafraîchissement de l'index :"
 
-#: builtin/add.c:307 builtin/rev-parse.c:991
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Impossible de lire l'index"
 
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Impossible d'ouvrir '%s' en écriture."
-
-#: builtin/add.c:322
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "Impossible d'écrire le patch"
 
-#: builtin/add.c:325
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "échec de l'édition du patch"
 
-#: builtin/add.c:328
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Stat de '%s' impossible"
 
-#: builtin/add.c:330
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "Patch vide. Abandon."
 
-#: builtin/add.c:335
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Impossible d'appliquer '%s'"
 
-#: builtin/add.c:343
+#: 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"
+msgstr ""
+"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
 
-#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124 builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: 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:366
+#: 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:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: 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:368
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "édition du diff actuel et application"
 
-#: builtin/add.c:369
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "permettre l'ajout de fichiers ignorés"
 
-#: builtin/add.c:370
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "mettre à jour les fichiers suivis"
 
-#: builtin/add.c:371
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
-msgstr "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"
+msgstr ""
+"renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"
 
-#: builtin/add.c:372
+#: 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:373
+#: 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:376
+#: 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)"
+msgstr ""
+"ignorer les chemins effacés dans la copie de travail (identique à --no-all)"
 
-#: builtin/add.c:378
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "ne pas ajouter, juste rafraîchir l'index"
 
-#: builtin/add.c:379
+#: 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"
+msgstr ""
+"sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "
+"d'erreurs"
 
-#: builtin/add.c:380
+#: 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:382 builtin/update-index.c:1006
+#: 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: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:384
+#: 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:386
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "backend pour `git stash -p`"
 
-#: builtin/add.c:404
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -9907,12 +10753,12 @@ msgstr ""
 "\n"
 "Référez-vous à \"git help submodule\" pour plus d'information."
 
-#: builtin/add.c:432
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "dépôt git embarqué ajouté : %s"
 
-#: builtin/add.c:451
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -9922,49 +10768,29 @@ msgstr ""
 "Éliminez ce message en lançant\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:460
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "échec de l'ajout de fichiers"
 
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run est incompatible avec --interactive/--patch"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file est incompatible avec --interactive/--patch"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file est incompatible avec --edit"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A et -u sont mutuellement incompatibles"
-
-#: builtin/add.c:522
-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:526
+#: 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:544 builtin/checkout.c:1735 builtin/commit.c:363 builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file est incompatible avec pathspec arguments"
-
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
-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:555
+#: 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:557
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -9974,105 +10800,120 @@ msgstr ""
 "Éliminez ce message en lançant\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:364
+#: 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:454
+#: 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:496
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Ligne en entrée malformée : '%s'."
 
-#: builtin/am.c:534
+#: 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:560
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "échec de fseek"
 
-#: builtin/am.c:748
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "impossible d'analyser le patch '%s'"
 
-#: builtin/am.c:813
+#: 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:861
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "horodatage invalide"
 
-#: builtin/am.c:866 builtin/am.c:878
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "ligne de Date invalide"
 
-#: builtin/am.c:873
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "décalage horaire invalide"
 
-#: builtin/am.c:966
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "Échec de détection du format du patch."
 
-#: builtin/am.c:971 builtin/clone.c:414
+#: 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:976
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Échec de découpage des patchs."
 
-#: builtin/am.c:1125
+#: 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:1126
+#: 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:1127
+#: 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\"."
+msgstr ""
+"Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
+"abort\"."
 
-#: builtin/am.c:1222
+#: 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:1250
-msgid "Patch is empty."
-msgstr "Le patch actuel est vide."
+msgstr ""
+"Rustine envoyée avec format=flowed ; les espaces en fin de ligne peuvent "
+"être perdus."
 
-#: builtin/am.c:1315
+#: 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:1318
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "ligne d'identification invalide : %.*s"
 
-#: builtin/am.c:1537
+#: 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."
+msgstr ""
+"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
+"points."
 
-#: builtin/am.c:1539
+#: 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..."
+msgstr ""
+"Utilisation de l'information de l'index pour reconstruire un arbre de base..."
 
-#: builtin/am.c:1558
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10080,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:1564
+#: 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:1590
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "Échec d'intégration des modifications."
 
-#: builtin/am.c:1622
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "application à un historique vide"
 
-#: builtin/am.c:1674 builtin/am.c:1678
+#: 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:1696
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "Le corps de la validation est :"
 
@@ -10105,39 +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:1706
+#: 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:1752 builtin/commit.c:408
+#: 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:1756
+#: 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:1796 builtin/am.c:1864
+#: 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:1813
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "Pas de changement -- Patch déjà appliqué."
 
-#: builtin/am.c:1819
+#: 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:1823
+#: 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"
+msgstr ""
+"Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec"
+
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "aucune modification - enregistré comme un commit vide."
 
-#: builtin/am.c:1867
+#: 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"
@@ -10145,28 +11005,33 @@ msgid ""
 msgstr ""
 "Aucun changement - avez-vous oublié d'utiliser 'git add' ?\n"
 "S'il n'y a plus rien à indexer, il se peut qu'autre chose ait déjà\n"
-"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce patch."
+"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
+"patch."
 
-#: builtin/am.c:1874
+#: 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"
+"You should 'git add' each file with resolved conflicts to mark them as "
+"such.\n"
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 "Vous avez encore des chemin non-fusionnés dans votre index.\n"
-"Vous devriez lancer 'git add' sur chaque conflit résolu pour les marquer comme tel.\n"
-"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour accepter son état."
+"Vous devriez lancer 'git add' sur chaque conflit résolu pour les marquer "
+"comme tel.\n"
+"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
+"accepter son état."
 
-#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347 builtin/reset.c:355
+#: 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:2033
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "échec du nettoyage de l'index"
 
-#: builtin/am.c:2077
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10174,150 +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:2184
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valeur invalide pour --patch-format : %s"
 
-#: builtin/am.c:2226
+#: 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:2230
+#: 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:2261
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<options>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2268
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "exécution interactive"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "option historique -- no-op"
 
-#: builtin/am.c:2272
+#: 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:2273 builtin/init-db.c:546 builtin/prune-packed.c:16 builtin/repack.c:472 builtin/stash.c:948
+#: 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:2275
+#: 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:2278
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "recoder en utf-8 (par défaut)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "passer l'option -k à git-mailinfo"
 
-#: builtin/am.c:2282
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "passer l'option -b à git-mailinfo"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "passer l'option -m à git-mailinfo"
 
-#: builtin/am.c:2286
+#: 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:2289
+#: 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"
+msgstr ""
+"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
 
-#: builtin/am.c:2292
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "retirer tout le contenu avant la ligne des ciseaux"
 
-#: builtin/am.c:2294
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "le passer à travers git-mailinfo"
 
-#: builtin/am.c:2297 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:2324
+#: 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:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17 builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261 builtin/pull.c:141
-#: builtin/pull.c:200 builtin/pull.c:217 builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 builtin/repack.c:489 builtin/show-branch.c:650
-#: builtin/show-ref.c:172 builtin/tag.c:447 parse-options.h:155 parse-options.h:176 parse-options.h:317
+#: 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:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137 builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 builtin/verify-tag.c:38
+#: 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:2321
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "format de présentation des patchs"
 
-#: builtin/am.c:2327
+#: 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:2329
+#: 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:2332
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "synonymes de --continue"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "sauter le patch courant"
 
-#: builtin/am.c:2338
+#: 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:2341
+#: 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:2345
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "afficher le patch en cours d'application"
 
-#: builtin/am.c:2350
+#: 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:2352
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr "utiliser l'horodatage actuel pour la date d'auteur"
 
-#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630 builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 builtin/rebase.c:1395
-#: builtin/revert.c:117 builtin/tag.c:462
+#: 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:2355 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "signer les commits avec GPG"
 
-#: builtin/am.c:2358
+#: 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:2376
+#: 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."
@@ -10325,16 +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:2383
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr "échec à la lecture de l'index"
 
-#: builtin/am.c:2398
+#: 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."
+msgstr ""
+"le répertoire précédent de rebasage %s existe toujours mais mbox donnée."
 
-#: builtin/am.c:2422
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -10343,11 +11227,13 @@ msgstr ""
 "Répertoire abandonné %s trouvé.\n"
 "Utilisez \"git am --abort\" pour le supprimer."
 
-#: builtin/am.c:2428
+#: 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."
+msgstr ""
+"Pas de résolution de l'opération en cours, nous ne sommes pas dans une "
+"reprise."
 
-#: builtin/am.c:2438
+#: 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"
 
@@ -10355,53 +11241,51 @@ msgstr "le mode interactif requiert des rustines sur la ligne de commande"
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<options>] [<patch>...]"
 
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "création impossible du fichier d'archive '%s'"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "impossible de rediriger la sortie"
 
-#: builtin/archive.c:37
+#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive : Dépôt distant sans URL"
 
-#: builtin/archive.c:61
+#: builtin/archive.c:59
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive : ACK/NACK attendu, paquet de nettoyage reçu"
 
-#: builtin/archive.c:64
+#: builtin/archive.c:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive : NACK %s"
 
-#: builtin/archive.c:65
+#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive : erreur de protocole"
 
-#: builtin/archive.c:69
+#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive : vidage attendu"
 
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<commit>]"
 
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check <terme-pour-bon> <terme-pour-mauvais> [<term>]"
-
 #: builtin/bisect--helper.c:25
-msgid "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]"
-msgstr "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]"
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
 
 #: builtin/bisect--helper.c:26
 msgid ""
-"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]"
+"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
+"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
+"[<paths>...]"
 msgstr ""
-"git bisect--helper --bisect-start [--term-{new,bad}=<terme> --term-{old,good}=<terme>][--no-checkout] [--first-parent] [<mauvais> [<bon>...]] [--] "
+"git bisect--helper --bisect-start [--term-{new,bad}=<terme> --term-{old,good}"
+"=<terme>][--no-checkout] [--first-parent] [<mauvais> [<bon>...]] [--] "
 "[<chemins>...]"
 
 #: builtin/bisect--helper.c:28
@@ -10410,85 +11294,101 @@ msgstr "git bisect--helper --bisect-next"
 
 #: builtin/bisect--helper.c:29
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
-msgstr "git bisect--helper --bisect-reset (bad|new) [<rév>]"
+msgstr "git bisect--helper --bisect-state (bad|new) [<rév>]"
 
 #: builtin/bisect--helper.c:30
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
-msgstr "git bisect--helper --bisect-reset (good|old) [<rév>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<rév>...]"
 
 #: builtin/bisect--helper.c:31
 msgid "git bisect--helper --bisect-replay <filename>"
-msgstr "git bisect--helper --bisect-next <nom-de-fichier>"
+msgstr "git bisect--helper --bisect-replay <nom-de-fichier>"
 
 #: builtin/bisect--helper.c:32
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<rév>|<plage>)...]"
 
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <cmd>..."
+
+#: builtin/bisect--helper.c:109
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr "impossible d'ouvrir le fichier '%s' en mode '%s'"
 
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "impossible d'écrire le fichier '%s'"
 
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "impossible d'ouvrir le fichier '%s' en lecture"
+
+#: builtin/bisect--helper.c:170
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' n'est pas un terme valide"
 
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "impossible d'utiliser la commande incluse '%s' comme terme"
 
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "impossible de modifier la signification du terme '%s'"
 
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
 msgid "please use two different terms"
 msgstr "veuillez utiliser deux termes différents"
 
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "Pas de bissection en cours.\n"
 
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "'%s' n'est pas un commit valide"
 
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:227
 #, c-format
-msgid "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
-msgstr "échec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset <commit>'."
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+"échec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset "
+"<commit>'."
 
-#: builtin/bisect--helper.c:254
+#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Mauvais argument pour bisect_write : %s"
 
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "impossible d'obtenir l'oid de la révision '%s'"
 
-#: builtin/bisect--helper.c:271
+#: builtin/bisect--helper.c:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "impossible d'ouvrir le fichier '%s'"
 
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:314
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "Commande invalide : vous êtes actuellement dans une bissection %s/%s"
 
-#: builtin/bisect--helper.c:324
+#: builtin/bisect--helper.c:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -10497,7 +11397,7 @@ msgstr ""
 "Vous devez me donner au moins une révision %s et une révision %s.\n"
 "Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela."
 
-#: builtin/bisect--helper.c:328
+#: builtin/bisect--helper.c:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -10508,7 +11408,7 @@ msgstr ""
 "Puis vous devez me donner au moins une révision %s et une révision %s.\n"
 "Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela."
 
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "bissection avec seulement un commit %s"
@@ -10517,15 +11417,15 @@ msgstr "bissection avec seulement un commit %s"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "Confirmez-vous [Y/n] ? "
 
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
 msgid "no terms defined"
 msgstr "aucun terme défini"
 
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -10534,61 +11434,63 @@ msgstr ""
 "Vos termes actuels sont %s pour l'état ancien\n"
 "et %s pour le nouvel état.\n"
 
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
 msgstr ""
 "argument invalide %s pour 'git bisect terms'.\n"
-"Les options supportées sont : --term-good|--term-old et --term-bad|--term-new."
+"Les options supportées sont : --term-good|--term-old et --term-bad|--term-"
+"new."
 
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
 msgstr "échec de la préparation du parcours des révisions\n"
 
-#: builtin/bisect--helper.c:519
+#: builtin/bisect--helper.c:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "impossible d'ouvrir '%s' en ajout"
 
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
 msgstr "'' n'est pas un terme valide"
 
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "option non reconnue : '%s'"
 
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' ne semble être une révision valide"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "mauvaise HEAD - j'ai besoin d'une HEAD"
 
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
-msgstr "l'extraction de '%s' a échoué. Essayez 'git bisect start <branche-valide>'."
+msgstr ""
+"l'extraction de '%s' a échoué. Essayez 'git bisect start <branche-valide>'."
 
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "refus de bissecter sur un arbre 'cg-seeked'"
 
-#: builtin/bisect--helper.c:735
+#: builtin/bisect--helper.c:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "mauvaise HEAD - référence symbolique douteuse"
 
-#: builtin/bisect--helper.c:755
+#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "réference invalide : '%s'"
 
-#: builtin/bisect--helper.c:813
+#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "Vous devez démarrer avec \"git bisect start\"\n"
 
@@ -10596,104 +11498,150 @@ msgstr "Vous devez démarrer avec \"git bisect start\"\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? "
 
-#: builtin/bisect--helper.c:842
+#: builtin/bisect--helper.c:859
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr "Veuillez appeler `--bisect-state` avec au moins un argument"
 
-#: builtin/bisect--helper.c:855
+#: builtin/bisect--helper.c:872
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "'git bisect %s' n'accepte qu'un seul argument."
 
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "Mauvaise révision en entrée : %s"
 
-#: builtin/bisect--helper.c:887
+#: builtin/bisect--helper.c:904
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "Mauvaise révision en entrée (pas un commit) : %s"
 
-#: builtin/bisect--helper.c:919
+#: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
 msgstr "Pas de bissection en cours."
 
-#: builtin/bisect--helper.c:969
+#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "'%s' ?? de quoi parlez-vous ?"
 
-#: builtin/bisect--helper.c:981
+#: builtin/bisect--helper.c:998
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr "impossible de lire le fichier '%s' pour rejouer"
 
-#: builtin/bisect--helper.c:1054
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "la bissection a échoué : aucune commande fournie."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "Lancement de %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "la bissection a échoué : le code retour %d de '%s' est < 0 ou >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "impossible d'ouvrir '%s' en écriture"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "la bissection ne peut plus continuer"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "succès de la bissection"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "la bissection a trouvé le premier mauvais commit"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"la bissection a échoué : 'git bisect--helper --bisect-state %s' a retourné "
+"le code erreur %d"
+
+#: builtin/bisect--helper.c:1192
 msgid "reset the bisection state"
 msgstr "réinitialiser l'état de la bissection"
 
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1194
 msgid "check whether bad or good terms exist"
 msgstr "vérifier si les termes bons ou mauvais existent"
 
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1196
 msgid "print out the bisect terms"
 msgstr "afficher les termes de bissection"
 
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1198
 msgid "start the bisect session"
 msgstr "démarrer une session de bissection"
 
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1200
 msgid "find the next bisection commit"
 msgstr "trouver le prochain commit de bissection"
 
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1202
 msgid "mark the state of ref (or refs)"
 msgstr "marquer l'état d'une références (ou plusieurs)"
 
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1204
 msgid "list the bisection steps so far"
 msgstr "lister les étapes de bissection jusqu'ici"
 
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1206
 msgid "replay the bisection process from the given file"
 msgstr "rejouer le processus de bissection depuis le fichier fourni"
 
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1208
 msgid "skip some commits for checkout"
 msgstr "sauter certains commits pour l'extraction"
 
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "visualiser la bissection"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "utiliser <cmd>... pour bissecter automatiquement."
+
+#: builtin/bisect--helper.c:1214
 msgid "no log for BISECT_WRITE"
 msgstr "pas de journal pour BISECT_WRITE"
 
-#: builtin/bisect--helper.c:1087
+#: builtin/bisect--helper.c:1229
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset supporte soit aucun argument, soit un commit"
 
-#: builtin/bisect--helper.c:1092
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check exige 2 ou 3 arguments"
-
-#: builtin/bisect--helper.c:1098
+#: builtin/bisect--helper.c:1234
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms exige 0 ou 1 argument"
 
-#: builtin/bisect--helper.c:1107
+#: builtin/bisect--helper.c:1243
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next exige 0 argument"
 
-#: builtin/bisect--helper.c:1118
+#: builtin/bisect--helper.c:1254
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log exige 0 argument"
 
-#: builtin/bisect--helper.c:1123
+#: builtin/bisect--helper.c:1259
 msgid "no logfile given"
 msgstr "pas de fichier de log donné"
 
@@ -10705,149 +11653,165 @@ msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "couleur attendue : %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "doit finir avec une couleur"
 
-#: builtin/blame.c:728
+#: builtin/blame.c:724
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "couleur invalide '%s' dans color.blame.repeatedlines"
+msgstr "couleur invalide '%s' dans color.blame.repeatedLines"
 
-#: builtin/blame.c:746
+#: builtin/blame.c:742
 msgid "invalid value for blame.coloring"
 msgstr "valeur invalide pour blame.coloring"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:841
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "référence à ignorer %s introuvable"
 
-#: builtin/blame.c:867
+#: builtin/blame.c:863
 msgid "show blame entries as we find them, incrementally"
-msgstr "montrer les éléments de blâme au fur et à mesure de leur découverte, de manière incrémentale"
+msgstr ""
+"montrer les éléments de blâme au fur et à mesure de leur découverte, de "
+"manière incrémentale"
 
-#: builtin/blame.c:868
+#: builtin/blame.c:864
 msgid "do not show object names of boundary commits (Default: off)"
-msgstr "ne pas montrer les noms des objets pour les commits de limite (Défaut : désactivé)"
+msgstr ""
+"ne pas montrer les noms des objets pour les commits de limite (Défaut : "
+"désactivé)"
 
-#: builtin/blame.c:869
+#: builtin/blame.c:865
 msgid "do not treat root commits as boundaries (Default: off)"
-msgstr "ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
+msgstr ""
+"ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
 
-#: builtin/blame.c:870
+#: builtin/blame.c:866
 msgid "show work cost statistics"
 msgstr "montrer les statistiques de coût d'activité"
 
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94 builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 builtin/merge.c:297
-#: builtin/multi-pack-index.c:55 builtin/pull.c:119 builtin/push.c:575 builtin/send-pack.c:198
+#: 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"
 
-#: builtin/blame.c:872
+#: builtin/blame.c:868
 msgid "show output score for blame entries"
 msgstr "montrer le score de sortie pour les éléments de blâme"
 
-#: builtin/blame.c:873
+#: builtin/blame.c:869
 msgid "show original filename (Default: auto)"
 msgstr "montrer les noms de fichier originaux (Défaut : auto)"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:870
 msgid "show original linenumber (Default: off)"
 msgstr "montrer les numéros de lignes originaux (Défaut : désactivé)"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:871
 msgid "show in a format designed for machine consumption"
 msgstr "afficher dans un format propice à la consommation par machine"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:872
 msgid "show porcelain format with per-line commit information"
 msgstr "afficher en format porcelaine avec l'information de commit par ligne"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:873
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr "utiliser le même mode de sortie que git-annotate (Défaut : désactivé)"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:874
 msgid "show raw timestamp (Default: off)"
 msgstr "afficher les horodatages bruts (Défaut : désactivé)"
 
-#: builtin/blame.c:879
+#: builtin/blame.c:875
 msgid "show long commit SHA1 (Default: off)"
 msgstr "afficher les longs SHA1 de commits (Défaut : désactivé)"
 
-#: builtin/blame.c:880
+#: builtin/blame.c:876
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)"
 
-#: builtin/blame.c:881
+#: builtin/blame.c:877
 msgid "show author email instead of name (Default: off)"
 msgstr "afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:878
 msgid "ignore whitespace differences"
 msgstr "ignorer les différences d'espace"
 
-#: builtin/blame.c:883 builtin/log.c:1820
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "rév"
 
-#: builtin/blame.c:883
+#: builtin/blame.c:879
 msgid "ignore <rev> when blaming"
 msgstr "ignorer <rev> pendant le blâme"
 
-#: builtin/blame.c:884
+#: builtin/blame.c:880
 msgid "ignore revisions from <file>"
 msgstr "ignorer les révisions listées dans <fichier>"
 
-#: builtin/blame.c:885
+#: builtin/blame.c:881
 msgid "color redundant metadata from previous line differently"
-msgstr "colorer différemment les métadonnées redondantes avec la ligne précédente"
+msgstr ""
+"colorer différemment les métadonnées redondantes avec la ligne précédente"
 
-#: builtin/blame.c:886
+#: builtin/blame.c:882
 msgid "color lines by age"
 msgstr "colorier les lignes par âge"
 
-#: builtin/blame.c:887
+#: builtin/blame.c:883
 msgid "spend extra cycles to find better match"
-msgstr "dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
+msgstr ""
+"dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
 
-#: builtin/blame.c:888
+#: builtin/blame.c:884
 msgid "use revisions from <file> instead of calling git-rev-list"
-msgstr "utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"
+msgstr ""
+"utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"
 
-#: builtin/blame.c:889
+#: builtin/blame.c:885
 msgid "use <file>'s contents as the final image"
 msgstr "utiliser le contenu de <fichier> comme image finale"
 
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
 msgid "score"
 msgstr "score"
 
-#: builtin/blame.c:890
+#: builtin/blame.c:886
 msgid "find line copies within and across files"
 msgstr "trouver les copies de ligne dans et entre les fichiers"
 
-#: builtin/blame.c:891
+#: builtin/blame.c:887
 msgid "find line movements within and across files"
 msgstr "trouver les mouvements de ligne dans et entre les fichiers"
 
-#: builtin/blame.c:892
+#: builtin/blame.c:888
 msgid "range"
 msgstr "plage"
 
-#: builtin/blame.c:893
+#: builtin/blame.c:889
 msgid "process only line range <start>,<end> or function :<funcname>"
-msgstr "traiter seulement l'intervalle de ligne <début>,<fin> ou la fonction : <nom-de-fonction>"
+msgstr ""
+"traiter seulement l'intervalle de ligne <début>,<fin> ou la fonction : <nom-"
+"de-fonction>"
 
-#: builtin/blame.c:945
+#: 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 porcelaine"
+msgstr ""
+"--progress ne peut pas être utilisé avec --incremental ou les formats "
+"porcelaine"
 
 #. TRANSLATORS: This string is used to tell us the
 #. maximum display width for a relative timestamp in
@@ -10857,18 +11821,18 @@ msgstr "--progress ne peut pas être utilisé avec --incremental ou les formats
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:996
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "il y a 10 ans et 11 mois"
 
-#: builtin/blame.c:1112
+#: 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:1157
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "Assignation de blâme aux lignes"
 
@@ -10886,11 +11850,13 @@ msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..."
 
 #: builtin/branch.c:32
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
-msgstr "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"
+msgstr ""
+"git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"
 
 #: builtin/branch.c:33
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
-msgstr "git branch [<options>] (-c | -C) [<ancienne-branche>] <nouvelle-branche>"
+msgstr ""
+"git branch [<options>] (-c | -C) [<ancienne-branche>] <nouvelle-branche>"
 
 #: builtin/branch.c:34
 msgid "git branch [<options>] [-r | -a] [--points-at]"
@@ -10900,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"
@@ -10909,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"
@@ -10918,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"
@@ -10932,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"
 
@@ -10944,99 +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:440 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:471
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "impossible de résoudre HEAD"
 
-#: builtin/branch.c:477
+#: 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:492
+#: 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:496
+#: 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:513
+#: 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:515
+#: 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:526
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nom de branche invalide : '%s'"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "Échec de renommage de la branche"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "Échec de copie de la branche"
 
-#: builtin/branch.c:561
+#: 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:564
+#: 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:570
+#: 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:579
+#: 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é"
+msgstr ""
+"La branche est renommée, mais la mise à jour du fichier de configuration a "
+"échoué"
 
-#: builtin/branch.c:581
+#: 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é"
+msgstr ""
+"La branche est copiée, mais la mise à jour du fichier de configuration a "
+"échoué"
 
-#: builtin/branch.c:597
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11047,242 +12017,251 @@ msgstr ""
 "  %s\n"
 "Les lignes commençant par '%c' seront ignorées.\n"
 
-#: builtin/branch.c:631
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Options génériques"
 
-#: builtin/branch.c:633
+#: 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:634
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "supprimer les messages d'information"
 
-#: builtin/branch.c:635
-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:637
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "ne pas utiliser"
 
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "amont"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "modifier l'information amont"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "désactiver l'information amont"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "utiliser la coloration dans la sortie"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "agir sur les branches de suivi distantes"
 
-#: builtin/branch.c:644 builtin/branch.c:646
+#: 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:645 builtin/branch.c:647
+#: 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:650
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "Actions spécifiques à git-branch :"
 
-#: builtin/branch.c:651
+#: 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:653
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "supprimer une branche totalement fusionnée"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "supprimer une branche (même non fusionnée)"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr "déplacer/renommer une branche et son reflog"
 
-#: builtin/branch.c:656
+#: 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:657
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "copier une branche et son reflog"
 
-#: builtin/branch.c:658
+#: 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:659
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "afficher les noms des branches"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "afficher le nom de la branche courante"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "créer le reflog de la branche"
 
-#: builtin/branch.c:663
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "éditer la description de la branche"
 
-#: builtin/branch.c:664
+#: 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:665
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "afficher seulement les branches qui sont fusionnées"
 
-#: builtin/branch.c:666
+#: 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:667
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "afficher les branches en colonnes"
 
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 builtin/tag.c:477
+#: 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:670
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "afficher seulement les branches de l'objet"
 
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: 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:672 builtin/for-each-ref.c:40 builtin/tag.c:482 builtin/verify-tag.c:38
+#: 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:695 builtin/clone.c:794
+#: 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:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column et --verbose sont incompatibles"
-
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: 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:766
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "Impossible de décrire une HEAD détachée"
 
-#: builtin/branch.c:771
+#: 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:778
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Aucun commit sur la branche '%s'."
 
-#: builtin/branch.c:781
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Aucune branche nommée '%s'."
 
-#: builtin/branch.c:796
+#: 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:805
+#: 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:810
+#: 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:814
+#: builtin/branch.c:822
 #, c-format
-msgid "could not set upstream of HEAD to %s when it does not point to any branch."
-msgstr "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur aucune branche."
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr ""
+"impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
+"aucune branche."
 
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "pas de branche '%s'"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la branche '%s' n'existe pas"
 
-#: builtin/branch.c:834
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "trop d'arguments pour désactiver un amont"
 
-#: builtin/branch.c:838
+#: 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."
+msgstr ""
+"impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "
+"aucune branche."
 
-#: builtin/branch.c:844
+#: 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:854
+#: 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 options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche.\n"
+"Les options -a et -r de 'git branch' n'ont pas de sens avec un nom de "
+"branche.\n"
 "Vouliez-vous plutôt dire -a|-r --list <motif> ?"
 
-#: builtin/branch.c:858
-msgid "the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead."
-msgstr "l'option '--set-upstream' est obsolète. Utilisez '--track' ou '--set-upstream-to' à la place."
+#: builtin/branch.c:866
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr ""
+"l'option '--set-upstream' est obsolète. Utilisez '--track' ou '--set-"
+"upstream-to' à la place."
 
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "version git ::\n"
 
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "échec de uname() avec l'erreur '%s' (%d)\n"
 
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
 msgid "compiler info: "
 msgstr "info compilateur : "
 
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "info libc : "
 
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
 msgid "not run from a git repository - no hooks to show\n"
 msgstr "lancé hors d'un dépôt git - aucun crochet à montrer\n"
 
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory <fichier>] [-s|--suffix <format>]"
 
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -11301,53 +12280,51 @@ msgid ""
 "You can delete any lines you don't wish to share.\n"
 msgstr ""
 "Merci de remplir le rapport de bogue Git !\n"
-"Veuillez répondre aux questions suivantes pour nous aider à comprendre votre problème.\n"
+"Veuillez répondre aux questions suivantes pour nous aider à comprendre votre "
+"problème.\n"
 "\n"
-"Qu'avez-vous fait avant l'apparition du bogue ? (Étapes pour reproduire votre problème)\n"
+"Qu'avez-vous fait avant l'apparition du bogue ? (Étapes pour reproduire "
+"votre problème)\n"
 "\n"
 "Quel était le résultat attendu ? (comportement attendu)\n"
 "\n"
 "Que s'est-il passé à la place ? (comportement observé)\n"
 "\n"
-"Quelle différence y a-t-il entre ce que vous attendiez et ce qu'il s'est passé ?\n"
+"Quelle différence y a-t-il entre ce que vous attendiez et ce qu'il s'est "
+"passé ?\n"
 "\n"
 "Autres remarques :\n"
 "\n"
 "Veuillez relire le rapport de bogue ci-dessous.\n"
 "Vous pouvez supprimer toute ligne que vous ne souhaitez pas envoyer.\n"
 
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
 msgid "specify a destination for the bugreport file"
 msgstr "spécifier la destination du fichier de rapport de bogue"
 
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
 msgid "specify a strftime format suffix for the filename"
 msgstr "spécifier une suffixe au format strftime pour le nom de fichier"
 
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "impossible de créer les répertoires de premier niveau pour '%s'"
 
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "Info système"
 
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "Crochets activés"
 
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "impossible de créer un fichier nouveau à '%s'"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "impossible d'écrire dans %s"
 
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "Nouveau rapport créé à '%s'.\n"
@@ -11368,27 +12345,27 @@ msgstr "git bundle list-heads <fichier> [<nom-de-ref>...]"
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <fichier> [<nom-de-ref>...]"
 
-#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
 msgid "do not show progress meter"
 msgstr "ne pas afficher la barre de progression"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
 msgid "show progress meter"
 msgstr "afficher la barre de progression"
 
-#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
 msgid "show progress meter during object writing phase"
 msgstr "afficher la barre de progression durant la phase d'écrite des objets"
 
-#: builtin/bundle.c:74 builtin/pack-objects.c:3754
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "similaire à --all-progress quand la barre de progression est affichée"
 
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
 msgid "specify bundle format version"
 msgstr "spécifier la version du format de colis"
 
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
 msgstr "La création d'un colis requiert un dépôt."
 
@@ -11396,97 +12373,108 @@ msgstr "La création d'un colis requiert un dépôt."
 msgid "do not show bundle details"
 msgstr "ne pas afficher les détails du colis"
 
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s est correct\n"
 
-#: builtin/bundle.c:163
+#: builtin/bundle.c:182
 msgid "Need a repository to unbundle."
 msgstr "Le dépaquetage d'un colis requiert un dépôt."
 
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "être verbeux : doit être placé avant une sous-commande"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Dépaquetage d'objets"
 
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Sous-commande inconnue : %s"
 
-#: builtin/cat-file.c:598
-msgid "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>"
-msgstr "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p | <type> | --textconv | --filters) [--path=<chemin>] <objet>"
+#: builtin/cat-file.c:622
+msgid ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <type> | --textconv | --filters) [--path=<path>] <object>"
+msgstr ""
+"git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
+"| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
 
-#: builtin/cat-file.c:599
-msgid "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-symlinks] [--textconv | --filters]"
-msgstr "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-symlinks] [--textconv | --filters]"
+#: builtin/cat-file.c:623
+msgid ""
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"
+msgstr ""
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:644
 msgid "only one batch option may be specified"
 msgstr "une seule option de traitement ne peut être spécifiée à la fois"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<type> peut être : blob, tree, commit ou tag"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
 msgid "show object type"
 msgstr "afficher le type de l'objet"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
 msgid "show object size"
 msgstr "afficher la taille de l'objet"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
 msgid "exit with zero when there's no error"
 msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
 msgid "pretty-print object's content"
 msgstr "afficher avec mise en forme le contenu de l'objet"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
 msgid "for blob objects, run textconv on object's content"
 msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
 msgid "for blob objects, run filters on object's content"
 msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
 msgid "use a specific path for --textconv/--filters"
 msgstr "utiliser un chemin spécifique pour --textconv/--filters"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus"
 
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
 msgid "buffer --batch output"
 msgstr "bufferiser la sortie de --batch"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
 msgid "show info and content of objects fed from the standard input"
-msgstr "afficher l'information et le contenu des objets passés en entrée standard"
+msgstr ""
+"afficher l'information et le contenu des objets passés en entrée standard"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
 msgid "show info about objects fed from the standard input"
 msgstr "afficher l'information des objets passés en entrée standard"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
-msgstr "suivre les liens symbolique internes à la copie de travail (utilisé avec --batch ou --batch-check)"
+msgstr ""
+"suivre les liens symbolique internes à la copie de travail (utilisé avec --"
+"batch ou --batch-check)"
 
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
 msgid "show all objects with --batch or --batch-check"
 msgstr "montrer tous les objets avec --batch ou --batch-check"
 
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:690
 msgid "do not order --batch-all-objects output"
 msgstr "ne pas ordonner la sortie de --batch-all-objects"
 
@@ -11506,15 +12494,17 @@ msgstr "afficher tous les attributs associés au fichier"
 msgid "use .gitattributes only from the index"
 msgstr "utiliser .gitattributes seulement depuis l'index"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "lire les noms de fichier depuis l'entrée standard"
 
 #: builtin/check-attr.c:25 builtin/check-ignore.c:27
 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"
+msgstr ""
+"terminer les enregistrements en entrée et en sortie par un caractère NUL"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549 builtin/worktree.c:491
+#: 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"
 
@@ -11568,12 +12558,14 @@ msgid "no contacts specified"
 msgstr "aucun contact spécifié"
 
 #: builtin/checkout--worker.c:110
-#| msgid "git checkout [<options>] <branch>"
 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/submodule--helper.c:1825 builtin/submodule--helper.c:1828
-#: builtin/submodule--helper.c:1836 builtin/submodule--helper.c:2334 builtin/worktree.c:719
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
+#: 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"
 
@@ -11599,7 +12591,9 @@ msgstr "forcer l'écrasement des fichiers existants"
 
 #: builtin/checkout-index.c:190
 msgid "no warning for existing files and files not in index"
-msgstr "pas d'avertissement pour les fichiers existants et les fichiers absents de l'index"
+msgstr ""
+"pas d'avertissement pour les fichiers existants et les fichiers absents de "
+"l'index"
 
 #: builtin/checkout-index.c:192
 msgid "don't checkout new files"
@@ -11637,149 +12631,148 @@ 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:414
+#: 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:419
+#: 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:426
+#: 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:449 builtin/checkout.c:452 builtin/checkout.c:455 builtin/checkout.c:459
+#: 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:462 builtin/checkout.c:465
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' ne peut pas être utilisé avec %s"
-
-#: builtin/checkout.c:469
+#: 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."
+msgstr ""
+"Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
+"même temps."
 
-#: builtin/checkout.c:473
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "ni '%s', ni '%s' spécifié"
 
-#: builtin/checkout.c:477
+#: 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:482 builtin/checkout.c:487
+#: 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:563 builtin/checkout.c:570
+#: 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:739
+#: 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:793
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
 "%s"
 msgstr ""
-"impossible de continuer avec des modifications indexées dans les fichiers suivants :\n"
+"impossible de continuer avec des modifications indexées dans les fichiers "
+"suivants :\n"
 "%s"
 
-#: builtin/checkout.c:886
+#: 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:928
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD est maintenant sur"
 
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
+#: 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:936
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Remise à zéro de la branche '%s'\n"
 
-#: builtin/checkout.c:939
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Déjà sur '%s'\n"
 
-#: builtin/checkout.c:943
+#: 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:945 builtin/checkout.c:1376
+#: 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:947
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Basculement sur la branche '%s'\n"
 
-#: builtin/checkout.c:998
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... et %d en plus.\n"
 
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -11802,7 +12795,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1023
+#: 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"
@@ -11817,31 +12810,33 @@ msgid_plural ""
 " git branch <new-branch-name> %s\n"
 "\n"
 msgstr[0] ""
-"Si vous souhaitez le garder en créant une nouvelle branche, c'est le bon moment\n"
+"Si vous souhaitez le garder en créant une nouvelle branche, c'est le bon "
+"moment\n"
 "pour le faire avec :\n"
 "\n"
 "git branch <nouvelle-branche> %s\n"
 "\n"
 msgstr[1] ""
-"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon moment\n"
+"Si vous souhaitez les garder en créant une nouvelle branche, c'est le bon "
+"moment\n"
 "pour le faire avec :\n"
 "\n"
 "git branch <nouvelle-branche> %s\n"
 "\n"
 
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "erreur interne lors du parcours des révisions"
 
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "La position précédente de HEAD était sur"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: 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:1184
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -11850,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:1191
+#: 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"
@@ -11870,51 +12865,51 @@ msgstr ""
 "ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
 "votre config."
 
-#: builtin/checkout.c:1201
+#: 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:1267
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "une seule référence attendue"
 
-#: builtin/checkout.c:1284
+#: 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:1330 builtin/worktree.c:270 builtin/worktree.c:438
+#: 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:1343 builtin/checkout.c:1709
+#: 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:1390
+#: 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:1392
+#: 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:1393 builtin/checkout.c:1401
+#: 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:1396
+#: 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:1412
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11922,7 +12917,7 @@ msgstr ""
 "impossible de basculer de branche pendant une fusion\n"
 "Envisagez \"git merge --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1416
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -11930,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:1420
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11938,7 +12933,7 @@ msgstr ""
 "impossible de basculer de branche pendant un rebasage\n"
 "Envisagez \"git rebase --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1424
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11946,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:1428
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11954,136 +12949,128 @@ msgstr ""
 "impossible de basculer de branche pendant un retour\n"
 "Envisagez \"git revert --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr "vous basculez de branche en cours de bissection"
 
-#: builtin/checkout.c:1439
+#: 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:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: 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:1454 builtin/checkout.c:1457 builtin/checkout.c:1460 builtin/checkout.c:1465 builtin/checkout.c:1470
+#: 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:1467
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' n'accepte pas <point-de-départ>"
 
-#: builtin/checkout.c:1475
+#: 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:1482
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "argument de branche ou de commit manquant"
 
-#: builtin/checkout.c:1525
+#: 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:1526 builtin/log.c:1807 parse-options.h:323
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "style"
 
-#: builtin/checkout.c:1527
-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:1539 builtin/worktree.c:488
+#: 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:1540
-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:1542
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "forcer l'extraction (laisser tomber les modifications locales)"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "nouvelle branche"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "nouvelle branche sans parent"
 
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: 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:1549
+#: 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"
+msgstr ""
+"ne pas vérifier si une autre copie de travail contient le référence fournie"
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "extraire notre version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1565
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "extraire leur version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1569
+#: 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:1624
+#: 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:1628
-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:1665
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track requiert un nom de branche"
 
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "nom de branche manquant ; essayez -%c"
 
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "impossible de résoudre %s"
 
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "spécification de chemin invalide"
 
-#: builtin/checkout.c:1725
+#: 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"
+msgstr ""
+"'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis"
 
-#: builtin/checkout.c:1729
+#: 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:1738
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file est incompatible avec --detach"
-
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file est incompatible avec --patch"
-
-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -12091,74 +13078,80 @@ msgstr ""
 "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
 "de l'extraction de l'index."
 
-#: builtin/checkout.c:1759
+#: 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:1785 builtin/checkout.c:1787 builtin/checkout.c:1836 builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170 builtin/remote.c:172
-#: builtin/submodule--helper.c:2720 builtin/worktree.c:484 builtin/worktree.c:486
+#: 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:1786
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "créer et extraire une nouvelle branche"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "créer/réinitialiser et extraire une branche"
 
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "créer un reflog pour une nouvelle branche"
 
-#: builtin/checkout.c:1791
+#: 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)"
+msgstr ""
+"essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)"
 
-#: builtin/checkout.c:1792
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "utiliser le mode de superposition (défaut)"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "créer et basculer sur une nouvelle branche"
 
-#: builtin/checkout.c:1839
+#: 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:1841
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "interpréter 'git switch <branche-inexistante>'"
 
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "laisser tomber les modifications locales"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "de quel <arbre-esque> faire l'extraction"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "restaurer l'index"
 
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "restaurer l'arbre de travail (par défaut)"
 
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "ignorer les entrées non-fusionnées"
 
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "utiliser le mode de superposition"
 
 #: builtin/clean.c:29
-msgid "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
-msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..."
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..."
 
 #: builtin/clean.c:33
 #, c-format
@@ -12185,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:302 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"
@@ -12198,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:306 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12219,32 +13220,33 @@ msgstr ""
 "*          - choisir tous les éléments\n"
 "           - (vide) terminer la sélection\n"
 
-#: builtin/clean.c:521 git-add--interactive.perl:568 git-add--interactive.perl:573
+#: 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:661
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Entrez les motifs à ignorer>> "
 
-#: builtin/clean.c:696
+#: 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:717
+#: 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:758
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Supprimer %s [y/N] ? "
 
-#: builtin/clean.c:789
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12262,58 +13264,68 @@ msgstr ""
 "help                - cet écran\n"
 "?                   - aide pour la sélection en ligne"
 
-#: builtin/clean.c:825
+#: 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:841
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Plus de fichier à nettoyer, sortie."
 
-#: builtin/clean.c:903
+#: 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:905
+#: builtin/clean.c:928
 msgid "force"
 msgstr "forcer"
 
-#: builtin/clean.c:906
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "nettoyage interactif"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "supprimer les répertoires entiers"
 
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186 builtin/ls-files.c:650
-#: builtin/name-rev.c:526 builtin/name-rev.c:528 builtin/show-ref.c:179
+#: 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:651 builtin/name-rev.c:535 builtin/name-rev.c:537
+#: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "motif"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "ajouter <motif> aux règles ignore"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "supprimer les fichiers ignorés, aussi"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "supprimer seulement les fichiers ignorés"
 
-#: builtin/clean.c:929
-msgid "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to clean"
-msgstr "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de nettoyer"
+#: builtin/clean.c:951
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
+"nettoyer"
 
-#: builtin/clean.c:932
-msgid "clean.requireForce defaults to true and neither -i, -n, nor -f given; refusing to clean"
-msgstr "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de nettoyer"
+#: builtin/clean.c:954
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
+"nettoyer"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x et -X ne peuvent pas être utilisés ensemble"
 
@@ -12329,7 +13341,7 @@ msgstr "ne pas cloner un dépôt superficiel"
 msgid "don't create a checkout"
 msgstr "ne pas créer d'extraction"
 
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "créer un dépôt nu"
 
@@ -12361,24 +13373,29 @@ msgstr "initialiser les sous-modules dans le clone"
 msgid "number of submodules cloned in parallel"
 msgstr "nombre de sous-modules clonés en parallèle"
 
-#: builtin/clone.c:116 builtin/init-db.c:538
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "répertoire-modèle"
 
-#: builtin/clone.c:117 builtin/init-db.c:539
+#: builtin/clone.c:117 builtin/init-db.c:540
 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:1832 builtin/submodule--helper.c:2337
+#: 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:1834 builtin/submodule--helper.c:2339
+#: 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:549 builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: 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"
 
@@ -12394,7 +13411,8 @@ 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:863 builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
+#: builtin/pull.c:212
 msgid "depth"
 msgstr "profondeur"
 
@@ -12402,7 +13420,8 @@ 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:3804 builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
 msgid "time"
 msgstr "heure"
 
@@ -12410,31 +13429,36 @@ 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/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: 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:215
+#: 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"
+msgstr ""
+"approfondir l'historique d'un clone superficiel en excluant une révision"
 
-#: builtin/clone.c:137 builtin/submodule--helper.c:1844 builtin/submodule--helper.c:2353
+#: 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"
 
 #: builtin/clone.c:139
 msgid "don't clone any tags, and make later fetches not to follow them"
-msgstr "ne pas cloner les tags et indiquer aux récupérations futures de ne pas le faire"
+msgstr ""
+"ne pas cloner les tags et indiquer aux récupérations futures de ne pas le "
+"faire"
 
 #: builtin/clone.c:141
 msgid "any cloned submodules will be shallow"
 msgstr "tous les sous-modules clonés seront superficiels"
 
-#: builtin/clone.c:142 builtin/init-db.c:547
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:143 builtin/init-db.c:548
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "séparer le répertoire git de la copie de travail"
 
@@ -12446,74 +13470,73 @@ 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/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: 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/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: 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:234 builtin/push.c:585
+#: 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:237 builtin/push.c:587
+#: 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"
 
 #: builtin/clone.c:154
 msgid "any cloned submodules will use their remote-tracking branch"
-msgstr "tous les sous-modules clonés utiliseront leur branche de suivi à distance"
+msgstr ""
+"tous les sous-modules clonés utiliseront leur branche de suivi à distance"
 
 #: builtin/clone.c:156
 msgid "initialize sparse-checkout file to include only files at root"
-msgstr "initialiser le fichier d'extraction clairsemée pour n'inclure que les fichiers à la racine"
-
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
 msgstr ""
-"Aucun nom de répertoire n'a pu être deviné\n"
-"Veuillez spécifier un répertoire dans la ligne de commande"
+"initialiser le fichier d'extraction clairsemée pour n'inclure que les "
+"fichiers à la racine"
 
-#: builtin/clone.c:345
+#: builtin/clone.c:231
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:304
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe et n'est pas un répertoire"
 
-#: builtin/clone.c:436
+#: builtin/clone.c:322
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "échec du démarrage un itérateur sur '%s'"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:353
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "échec de la création du lien '%s'"
 
-#: builtin/clone.c:471
+#: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "échec de la copie vers '%s'"
 
-#: builtin/clone.c:476
+#: builtin/clone.c:362
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "échec de l'itération sur '%s'"
 
-#: builtin/clone.c:503
+#: builtin/clone.c:389
 #, c-format
 msgid "done.\n"
 msgstr "fait.\n"
 
-#: builtin/clone.c:517
+#: builtin/clone.c:403
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -12523,141 +13546,154 @@ msgstr ""
 "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
 "et réessayer avec 'git restore --source=HEAD :/'\n"
 
-#: builtin/clone.c:594
+#: builtin/clone.c:480
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Impossible de trouver la branche distante '%s' à cloner."
 
-#: builtin/clone.c:713
+#: builtin/clone.c:597
 #, c-format
 msgid "unable to update %s"
 msgstr "impossible de mettre à jour %s"
 
-#: builtin/clone.c:761
+#: builtin/clone.c:645
 msgid "failed to initialize sparse-checkout"
 msgstr "échec lors de l'initialisation l'extraction clairsemée"
 
-#: builtin/clone.c:784
+#: builtin/clone.c:668
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "la HEAD distante réfère à une référence non existante, impossible de l'extraire.\n"
+msgstr ""
+"la HEAD distante réfère à une référence non existante, impossible de "
+"l'extraire.\n"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:701
 msgid "unable to checkout working tree"
 msgstr "impossible d'extraire la copie de travail"
 
-#: builtin/clone.c:894
+#: builtin/clone.c:779
 msgid "unable to write parameters to config file"
 msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
 
-#: builtin/clone.c:957
+#: builtin/clone.c:842
 msgid "cannot repack to clean up"
 msgstr "impossible de remballer pour nettoyer"
 
-#: builtin/clone.c:959
+#: builtin/clone.c:844
 msgid "cannot unlink temporary alternates file"
 msgstr "impossible de délier le fichier temporaire alternates"
 
-#: builtin/clone.c:1001 builtin/receive-pack.c:2491
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "Trop d'arguments."
 
-#: builtin/clone.c:1005
+#: 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:1018
+#: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "les options --bare et --origin %s 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:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare et --separate-git-dir sont incompatibles."
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "le dépôt '%s' n'existe pas"
 
-#: builtin/clone.c:1039 builtin/fetch.c:2011
+#: 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"
 
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
-msgstr "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
+msgstr ""
+"le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr "le chemin du dépôt '%s' existe déjà et n'est pas un répertoire vide."
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "la copie de travail '%s' existe déjà."
 
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
+#: 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'"
 
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "impossible de créer le répertoire de la copie de travail '%s'"
 
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Clonage dans le dépôt nu '%s'\n"
 
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonage dans '%s'...\n"
 
-#: builtin/clone.c:1135
-msgid "clone --recursive is not compatible with both --reference and --reference-if-able"
-msgstr "clone --recursive n'est pas compatible avec à la fois --reference et --reference-if-able"
+#: builtin/clone.c:1025
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"clone --recursive n'est pas compatible avec à la fois --reference et --"
+"reference-if-able"
 
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' n'est pas un nom valide de distante"
 
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
 msgid "--depth is ignored in local clones; use file:// instead."
-msgstr "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
+msgstr ""
+"--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
 
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
 msgid "--shallow-since is ignored in local clones; use file:// instead."
-msgstr "--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
+msgstr ""
+"--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://"
+"\"."
 
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
-msgstr "--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
+msgstr ""
+"--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt "
+"\"file://\"."
 
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter est ignoré dans les clones locaux ; utilisez plutôt file:// ."
 
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
 msgid "source repository is shallow, ignoring --local"
 msgstr "le dépôt source est superficiel, option --local ignorée"
 
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
 msgid "--local is ignored"
 msgstr "--local est ignoré"
 
-#: builtin/clone.c:1337 builtin/clone.c:1345
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr "le transport distant a retourné une erreur"
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"
 
-#: builtin/clone.c:1348
+#: builtin/clone.c:1242
 msgid "You appear to have cloned an empty repository."
 msgstr "Vous semblez avoir cloné un dépôt vide."
 
@@ -12693,183 +13729,193 @@ msgstr "remplissage d'espace entre les colonnes"
 msgid "--command must be the first argument"
 msgstr "--command doit être le premier argument"
 
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
-msgid "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:13
 msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--[no-]max-new-"
-"filters <n>] [--[no-]progress] <split options>"
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
-"git commit-graph write [--object-dir <répertoire-d'objet>] [--append] [--split[=<stratégie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--"
-"[no-]max-new-filters <n>] [--[no-]progress] <options de division>"
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "impossible de trouver le répertoire objet correspondant à %s"
+#: builtin/commit-graph.c:16
+msgid ""
+"git commit-graph write [--object-dir <objdir>] [--append] [--"
+"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
+msgstr ""
+"git commit-graph write [--object-dir <répertoire-d'objet>] [--append] [--"
+"split[=<stratégie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <options de division>"
 
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "répertoire"
 
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr "le répertoire d'objet où stocker le graphe"
 
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
 msgid "if the commit-graph is split, only verify the tip file"
-msgstr "si le graphe de commit est divisé, vérifier seulement le fichier sommet"
+msgstr ""
+"si le graphe de commit est divisé, vérifier seulement le fichier sommet"
 
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Impossible d'ouvrir le graphe de commit '%s'"
 
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "argument de --split non reconnu, %s"
 
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr "ID d'objet non hexadécimal inattendu : %s"
 
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "objet invalide : %s"
 
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
 msgid "start walk at all refs"
 msgstr "commencer le parcours à toutes les réfs"
 
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "scanner les index compactés listés sur stdin à la recherche de commits"
 
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
 msgid "start walk at commits listed by stdin"
 msgstr "commencer le parcours aux commits listés sur stdin"
 
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
-msgstr "inclure tous les commits déjà présents dans le fichier de graphe de commits"
+msgstr ""
+"inclure tous les commits déjà présents dans le fichier de graphe de commits"
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
 msgid "enable computation for changed paths"
 msgstr "activer le calcul pour les chemins modifiés"
 
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
 msgid "allow writing an incremental commit-graph file"
 msgstr "permettre d'écrire un fichier incrémental de graphe de commit"
 
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
 msgid "maximum number of commits in a non-base split commit-graph"
-msgstr "le nombre maximum de commits dans un graphe de commit divisé pas de base"
+msgstr ""
+"le nombre maximum de commits dans un graphe de commit divisé pas de base"
 
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "rapport maximum entre deux niveaux d'un graphe de commit divisé"
 
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
 msgid "only expire files older than a given date-time"
 msgstr "ne faire expirer que les fichiers plus vieux qu'une date-time donnée"
 
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr "nombre maximum des filtres Bloom des chemins modifiés à calculer"
 
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs"
 
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
 msgid "Collecting commits from input"
 msgstr "Collecte des commits depuis l'entrée"
 
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "sous-commande non reconnue : %s"
+
 #: builtin/commit-tree.c:18
-msgid "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F <file>)...] <tree>"
-msgstr "git commit-tree [(-p <parent>)...] [-S[<idclé>]] [(-m <message>)...] [(-F <fichier>)...] <arbre>"
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <parent>)...] [-S[<idclé>]] [(-m <message>)...] [(-F "
+"<fichier>)...] <arbre>"
 
 #: builtin/commit-tree.c:31
 #, c-format
 msgid "duplicate parent %s ignored"
 msgstr "le parent dupliqué %s est ignoré"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
+#: 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"
 
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree : échec à l'ouverture de '%s'"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree : échec de la lecture de '%s'"
 
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree : échec de la fermeture de '%s'"
 
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr "parent"
 
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "id d'un objet commit parent"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282 builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605 builtin/tag.c:456
+#: 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:115 builtin/commit.c:1614
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "message de validation"
 
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
 msgstr "lire le message de validation depuis un fichier"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299 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 "signer la validation avec GPG"
 
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "exactement un arbre obligatoire"
 
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree : échec de la lecture"
 
-#: builtin/commit.c:41
+#: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<options>] [--] <spécification-de-chemin>..."
 
-#: builtin/commit.c:46
+#: builtin/commit.c:47
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<options>] [--] <spécification-de-chemin>..."
 
-#: builtin/commit.c:51
+#: builtin/commit.c:52
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
 "remove the commit entirely with \"git reset HEAD^\".\n"
 msgstr ""
-"Vous avez demandé de corriger le commit le plus récent, mais le faire le rendrait\n"
+"Vous avez demandé de corriger le commit le plus récent, mais le faire le "
+"rendrait\n"
 "vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n"
 "supprimer complètement le commit avec \"git reset HEAD^\".\n"
 
-#: builtin/commit.c:56
+#: builtin/commit.c:57
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -12877,21 +13923,22 @@ msgid ""
 "    git commit --allow-empty\n"
 "\n"
 msgstr ""
-"Le picorage précédent est à présent vide, vraisemblablement dû à une résolution de conflit.\n"
+"Le picorage précédent est à présent vide, vraisemblablement dû à une "
+"résolution de conflit.\n"
 "Si vous souhaitez tout de même le valider, utilisez :\n"
 "\n"
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:63
+#: builtin/commit.c:64
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "Sinon, veuillez utiliser 'git rebase --skip'\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:67
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Sinon, veuillez utiliser 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:69
+#: builtin/commit.c:70
 msgid ""
 "and then use:\n"
 "\n"
@@ -12910,76 +13957,72 @@ msgstr ""
 "pour continuer le picorage des commits restants.\n"
 "Si vous souhaitez sauter ce commit, utilisez :\n"
 "\n"
-"    git cherry-pick --skipped\n"
+"    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:324
+#: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
 msgstr "échec du dépaquetage de l'objet arbre HEAD"
 
-#: builtin/commit.c:360
-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:374
+#: 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."
 
-#: builtin/commit.c:386
+#: builtin/commit.c:387
 msgid "unable to create temporary index"
 msgstr "impossible de créer l'index temporaire"
 
-#: builtin/commit.c:395
+#: builtin/commit.c:396
 msgid "interactive add failed"
 msgstr "échec de l'ajout interactif"
 
-#: builtin/commit.c:410
+#: builtin/commit.c:411
 msgid "unable to update temporary index"
 msgstr "impossible de mettre à jour l'index temporaire"
 
-#: builtin/commit.c:412
+#: builtin/commit.c:413
 msgid "Failed to update main cache tree"
 msgstr "Impossible de mettre à jour l'arbre de cache principal"
 
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
 msgid "unable to write new_index file"
 msgstr "impossible d'écrire le fichier new_index"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "cannot do a partial commit during a merge."
 msgstr "impossible de faire une validation partielle pendant une fusion."
 
-#: builtin/commit.c:491
+#: builtin/commit.c:492
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "impossible de faire une validation partielle pendant un picorage."
 
-#: builtin/commit.c:493
+#: builtin/commit.c:494
 msgid "cannot do a partial commit during a rebase."
 msgstr "impossible de faire une validation partielle pendant un rebasage."
 
-#: builtin/commit.c:501
+#: builtin/commit.c:502
 msgid "cannot read the index"
 msgstr "impossible de lire l'index"
 
-#: builtin/commit.c:520
+#: builtin/commit.c:521
 msgid "unable to write temporary index file"
 msgstr "impossible d'écrire le fichier d'index temporaire"
 
-#: builtin/commit.c:618
+#: builtin/commit.c:619
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "entête d'auteur manquant dans le commit '%s'"
 
-#: builtin/commit.c:620
+#: builtin/commit.c:621
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "le commit '%s' a une ligne d'auteur malformée"
 
-#: builtin/commit.c:639
+#: builtin/commit.c:640
 msgid "malformed --author parameter"
 msgstr "paramètre --author mal formé"
 
-#: builtin/commit.c:692
+#: builtin/commit.c:693
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -12987,43 +14030,84 @@ msgstr ""
 "impossible de sélectionner un caractère de commentaire\n"
 "qui n'est pas utilisé dans le message de validation actuel"
 
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "impossible de rechercher le commit %s"
 
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(lecture du message de journal depuis l'entrée standard)\n"
 
-#: builtin/commit.c:760
+#: builtin/commit.c:761
 msgid "could not read log from standard input"
 msgstr "impossible de lire le journal depuis l'entrée standard"
 
-#: builtin/commit.c:764
+#: builtin/commit.c:765
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "impossible de lire le fichier de journal '%s'"
 
-#: builtin/commit.c:801
+#: 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:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
 msgstr "impossible de lire SQUASH_MSG"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:821
 msgid "could not read MERGE_MSG"
 msgstr "impossible de lire MERGE_MSG"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:881
 msgid "could not write commit template"
 msgstr "impossible d'écrire le modèle de commit"
 
+#: builtin/commit.c:894
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr ""
+"Veuillez saisir le message de validation pour vos modifications. Les lignes\n"
+"commençant par '%c' seront ignorées.\n"
+
+#: builtin/commit.c:896
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Veuillez saisir le message de validation pour vos modifications. Les lignes\n"
+"commençant par '%c' seront ignorées, et un message vide abandonne la "
+"validation.\n"
+
 #: builtin/commit.c:900
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Veuillez saisir le message de validation pour vos modifications. Les lignes "
+"commençant\n"
+"par '%c' seront conservées ; vous pouvez les supprimer vous-même si vous le "
+"souhaitez.\n"
+
+#: builtin/commit.c:904
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Veuillez saisir le message de validation pour vos modifications. Les lignes\n"
+"commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"
+"si vous le souhaitez. Un message vide abandonne la validation.\n"
+
+#: builtin/commit.c:916
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -13037,7 +14121,7 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "et essayez à nouveau.\n"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:921
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -13051,379 +14135,386 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "et essayez à nouveau.\n"
 
-#: builtin/commit.c:915
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"Veuillez saisir le message de validation pour vos modifications. Les lignes\n"
-"commençant par '%c' seront ignorées, et un message vide abandonne la validation.\n"
-
-#: builtin/commit.c:923
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"Veuillez saisir le message de validation pour vos modifications. Les lignes\n"
-"commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"
-"si vous le souhaitez. Un message vide abandonne la validation.\n"
-
-#: builtin/commit.c:940
+#: builtin/commit.c:948
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAuteur :     %.*s <%.*s>"
 
-#: builtin/commit.c:948
+#: builtin/commit.c:956
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDate :       %s"
 
-#: builtin/commit.c:955
+#: builtin/commit.c:963
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sValidateur : %.*s <%.*s>"
 
-#: builtin/commit.c:973
+#: builtin/commit.c:981
 msgid "Cannot read index"
 msgstr "Impossible de lire l'index"
 
-#: builtin/commit.c:1018
+#: builtin/commit.c:1026
 msgid "unable to pass trailers to --trailers"
 msgstr "impossible de passer les lignes finales à --trailers"
 
-#: builtin/commit.c:1058
+#: builtin/commit.c:1066
 msgid "Error building trees"
 msgstr "Erreur lors de la construction des arbres"
 
-#: builtin/commit.c:1072 builtin/tag.c:319
+#: 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"
 
-#: builtin/commit.c:1116
+#: builtin/commit.c:1124
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
-msgstr "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun auteur existant"
+msgstr ""
+"--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "
+"auteur existant"
 
-#: builtin/commit.c:1130
+#: builtin/commit.c:1138
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Mode de fichier ignoré invalide '%s'"
 
-#: builtin/commit.c:1148 builtin/commit.c:1441
+#: 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:1188
-msgid "--long and -z are incompatible"
-msgstr "--long et -z sont incompatibles"
-
-#: builtin/commit.c:1219
+#: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "Vous êtes en pleine fusion -- impossible de reformuler."
 
-#: builtin/commit.c:1221
+#: builtin/commit.c:1229
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr "Vous êtes en plein picorage -- impossible de reformuler."
 
-#: builtin/commit.c:1224
+#: 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:1226
-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"
+#: builtin/commit.c:1234
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr ""
+"l'option de reformulation de '%s' et '%s' ne peuvent pas être utilisés "
+"ensemble"
 
-#: builtin/commit.c:1245
+#: 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:1254
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "Il n'y a rien à corriger."
 
-#: builtin/commit.c:1257
+#: 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:1259
+#: 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:1261
+#: 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:1264
+#: 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:1274
+#: 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:1276
+#: 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:1285
+#: 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:1303
+#: 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."
+msgstr ""
+"Une seule option parmi --include/--only/--all/--interactive/--patch peut "
+"être utilisée."
 
-#: builtin/commit.c:1331
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "option inconnue : --fixup=%s:%s"
 
-#: builtin/commit.c:1345
+#: 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:1476 builtin/commit.c:1642
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "afficher l'état avec concision"
 
-#: builtin/commit.c:1478 builtin/commit.c:1644
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "afficher l'information de branche"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "afficher l'information de remisage"
 
-#: builtin/commit.c:1482 builtin/commit.c:1646
+#: 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:1484
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560 builtin/worktree.c:681
+#: 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:1487 builtin/commit.c:1650
+#: 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:1490 builtin/commit.c:1653
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "terminer les éléments par NUL"
 
-#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656 builtin/fast-export.c:1198 builtin/fast-export.c:1201 builtin/fast-export.c:1204
-#: builtin/rebase.c:1407 parse-options.h:337
+#: 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:1493 builtin/commit.c:1656
+#: 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)"
+msgstr ""
+"afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
+"no. (Défaut : all)"
 
-#: builtin/commit.c:1497
-msgid "show ignored files, optional modes: traditional, matching, no. (Default: traditional)"
-msgstr "afficher les fichiers ignorés, \"mode\" facultatif : traditional (traditionnel), matching (correspondant), no. (Défaut : traditional)"
+#: builtin/commit.c:1507
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"afficher les fichiers ignorés, \"mode\" facultatif : traditional "
+"(traditionnel), matching (correspondant), no. (Défaut : traditional)"
 
-#: builtin/commit.c:1499 parse-options.h:193
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "quand"
 
-#: builtin/commit.c:1500
-msgid "ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)"
-msgstr "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all (tous), dirty (sale), untracked (non suivi). (Défaut : all)"
+#: builtin/commit.c:1510
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
+"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "afficher les fichiers non suivis en colonnes"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "ne pas détecter les renommages"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
-msgstr "détecter les renommages, en spécifiant optionnellement le facteur de similarité"
+msgstr ""
+"détecter les renommages, en spécifiant optionnellement le facteur de "
+"similarité"
 
-#: builtin/commit.c:1525
+#: 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"
+msgstr ""
+"Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis"
 
-#: builtin/commit.c:1607
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "supprimer le résumé après une validation réussie"
 
-#: builtin/commit.c:1608
+#: 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:1610
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "Options du message de validation"
 
-#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
+#: 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:1612
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "auteur"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "remplacer l'auteur pour la validation"
 
-#: builtin/commit.c:1613 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "date"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "remplacer la date pour la validation"
 
-#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622 parse-options.h:329 ref-filter.h:90
+#: 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:1615
+#: 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:1616
+#: 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:1621
-#| msgid "amend previous commit"
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]commit"
 
-#: builtin/commit.c:1621
-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
+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:1622
+#: 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é"
+msgstr ""
+"utiliser un message au format autosquash pour compresser le commit spécifié"
 
-#: builtin/commit.c:1623
+#: 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)"
+msgstr ""
+"à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
 
-#: builtin/commit.c:1624 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "ligne de fin"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "ajouter des lignes terminales personnaliser"
 
-#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 builtin/pull.c:145 builtin/revert.c:110
+#: 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:1626
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "utiliser le fichier de modèle spécifié"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "forcer l'édition du commit"
 
-#: builtin/commit.c:1629
+#: 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:1634
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "Valider les options des contenus"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "valider tous les fichiers modifiés"
 
-#: builtin/commit.c:1636
+#: 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:1637
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "ajouter des fichiers en mode interactif"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "ajouter les modifications en mode interactif"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "valider seulement les fichiers spécifiés"
 
-#: builtin/commit.c:1640
+#: 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:1641
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "afficher ce qui serait validé"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "corriger la validation précédente"
 
-#: builtin/commit.c:1655
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "éviter d'utiliser le crochet post-rewrite"
 
-#: builtin/commit.c:1662
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "accepter d'enregistrer une modification vide"
 
-#: builtin/commit.c:1664
+#: 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:1737
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fichier MERGE_HEAD corrompu (%s)"
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "impossible de lire MERGE_MODE"
 
-#: builtin/commit.c:1765
+#: 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:1772
+#: 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:1777
+#: 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:1788
+#: 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"
+msgstr ""
+"Abandon de la validation dû à un corps de message de validation vide.\n"
 
-#: builtin/commit.c:1824
+#: 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"
@@ -13500,7 +14591,8 @@ msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"
 
 #: builtin/config.c:142
 msgid "replace all matching variables: name value [value-pattern]"
-msgstr "remplacer toutes les variables correspondant : nom valeur [motif-de-valeur]"
+msgstr ""
+"remplacer toutes les variables correspondant : nom valeur [motif-de-valeur]"
 
 #: builtin/config.c:143
 msgid "add a new variable: name value"
@@ -13528,7 +14620,8 @@ msgstr "afficher tout"
 
 #: builtin/config.c:149
 msgid "use string equality when comparing values to 'value-pattern'"
-msgstr "utiliser l'égalité de chaînes lors de la comparaison de 'motif-de-valeur'"
+msgstr ""
+"utiliser l'égalité de chaînes lors de la comparaison de 'motif-de-valeur'"
 
 #: builtin/config.c:150
 msgid "open an editor"
@@ -13592,11 +14685,15 @@ msgstr "respecter les directives d'inclusion lors de la recherche"
 
 #: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
-msgstr "afficher l'origine de la configuration (fichier, entrée standard, blob, ligne de commande)"
+msgstr ""
+"afficher l'origine de la configuration (fichier, entrée standard, blob, "
+"ligne de commande)"
 
 #: builtin/config.c:166
 msgid "show scope of config (worktree, local, global, system, command)"
-msgstr "afficher la portée de configuration (arbre de travail, local, global, système, commande)"
+msgstr ""
+"afficher la portée de configuration (arbre de travail, local, global, "
+"système, commande)"
 
 #: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
@@ -13690,7 +14787,8 @@ msgid ""
 msgstr ""
 "--worktree ne peut pas être utilisé avec des arbres de travail multiples\n"
 "à moins que l'extension worktreeConfig soit configuré. Veuillez lire\n"
-"la section \"CONFIGURATION FILE\" de \"git help worktree\" pour plus de détails"
+"la section \"CONFIGURATION FILE\" de \"git help worktree\" pour plus de "
+"détails"
 
 #: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
@@ -13705,8 +14803,12 @@ msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only n'est applicable qu'avec --list ou --get-regexp"
 
 #: builtin/config.c:767
-msgid "--show-origin is only applicable to --get, --get-all, --get-regexp, and --list"
-msgstr "--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --list"
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+"--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --"
+"list"
 
 #: builtin/config.c:773
 msgid "--default is only applicable to --get"
@@ -13779,9 +14881,10 @@ msgstr "afficher les messages de debug sur stderr"
 
 #: builtin/credential-cache--daemon.c:316
 msgid "credential-cache--daemon unavailable; no unix socket support"
-msgstr "credential-cache-daemon non disponible ; pas de gestion des sockets unix"
+msgstr ""
+"credential-cache--daemon non disponible ; pas de gestion des sockets unix"
 
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "credential-cache non disponible ; pas de gestion des socket unix"
 
@@ -13828,7 +14931,9 @@ msgstr "aucune étiquette ne correspond parfaitement à '%s'"
 #: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
-msgstr "Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par describe\n"
+msgstr ""
+"Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par "
+"describe\n"
 
 #: builtin/describe.c:397
 #, c-format
@@ -13864,7 +14969,8 @@ msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr ""
-"plus de %i étiquettes ont été trouvées; seules les %i plus récentes sont affichées\n"
+"plus de %i étiquettes ont été trouvées; seules les %i plus récentes sont "
+"affichées\n"
 "abandon de la recherche à %s\n"
 
 #: builtin/describe.c:529
@@ -13912,7 +15018,8 @@ msgstr "n'afficher que les correspondances exactes"
 
 #: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
-msgstr "considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)"
+msgstr ""
+"considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)"
 
 #: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
@@ -13922,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"
 
@@ -13936,27 +15043,18 @@ msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"
 
 #: builtin/describe.c:575
 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"
+msgstr ""
+"ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"
 
 #: 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"
@@ -13977,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:684
+#: 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"
@@ -14005,109 +15103,105 @@ 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:261
-#, c-format
-msgid "failed: %d"
-msgstr "échec : %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "lecture du lien symbolique %s impossible"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "impossible de lire le fichier symlink %s"
 
-#: builtin/difftool.c:313
+#: 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:413
+#: builtin/difftool.c:421
 msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
 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:637
+#: 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:639
+#: 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:650
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "des fichiers temporaires existent dans '%s'."
 
-#: builtin/difftool.c:651
+#: 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:700
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "échec : %d"
+
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "réalise un diff de répertoire complet"
 
-#: builtin/difftool.c:704
+#: 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:709
+#: 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:710
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "outil"
 
-#: builtin/difftool.c:711
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "utiliser l'outil de diff spécifié"
 
-#: builtin/difftool.c:713
+#: 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:716
-msgid "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit code"
-msgstr "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code non-nul"
+#: builtin/difftool.c:706
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
+"code"
+msgstr ""
+"provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
+"de sortie non-nul"
 
-#: builtin/difftool.c:719
+#: 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:720
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "passé à `diff`"
 
-#: builtin/difftool.c:735
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool exige un arbre de travail ou --no-index"
 
-#: builtin/difftool.c:742
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff est incompatible avec --no-index"
-
-#: builtin/difftool.c:745
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs"
-
-#: builtin/difftool.c:753
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "pas d'<outil> spécifié pour --tool=<outil>"
 
-#: builtin/difftool.c:760
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
 
@@ -14115,7 +15209,7 @@ msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <options> <var d'env>"
 
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
 msgid "type"
 msgstr "type"
 
@@ -14125,391 +15219,424 @@ msgstr "valeur par défaut pour git_env_*(...) en cas d'absence"
 
 #: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
-msgstr "mode silencieux n'utilisant la valeur de git_env_*() que pour le code de sortie"
+msgstr ""
+"mode silencieux n'utilisant la valeur de git_env_*() que pour le code de "
+"sortie"
 
 #: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
-msgstr "l'option `--default` attend une valeur booléenne avec `--type=bool`, pas `%s`"
+msgstr ""
+"l'option `--default` attend une valeur booléenne avec `--type=bool`, pas `%s`"
 
 #: builtin/env--helper.c:82
 #, c-format
-msgid "option `--default' expects an unsigned long value with `--type=ulong`, not `%s`"
-msgstr "l'option `--default` attend une valeur entier long non signé avec `--type=ulong`, pas `%s`"
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"l'option `--default` attend une valeur entier long non signé avec `--"
+"type=ulong`, pas `%s`"
 
 #: builtin/fast-export.c:29
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [options-de-liste-de-révisions]"
 
-#: builtin/fast-export.c:868
+#: 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é."
+msgstr ""
+"Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-"
+"tags ne soit spécifié."
 
-#: builtin/fast-export.c:1177
+#: 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:1197
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "afficher la progression après <n> objets"
 
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "sélectionner la gestion des étiquettes signées"
 
-#: builtin/fast-export.c:1202
+#: 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"
+msgstr ""
+"sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"
 
-#: builtin/fast-export.c:1205
+#: 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"
+msgstr ""
+"sélectionner la gestion des messages de validation dans un encodage "
+"alternatif"
 
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "enregistrer les marques dans ce fichier"
 
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "importer les marques depuis ce fichier"
 
-#: builtin/fast-export.c:1214
+#: 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:1216
+#: 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:1218
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "afficher l'arbre complet pour chaque commit"
 
-#: builtin/fast-export.c:1220
+#: 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:1221
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "sauter l'affichage de données de blob"
 
-#: builtin/fast-export.c:1222 builtin/log.c:1823
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "spécificateur de référence"
 
-#: builtin/fast-export.c:1223
+#: 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:1224
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "anonymise la sortie"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "depuis:vers"
 
-#: builtin/fast-export.c:1226
+#: 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:1229
+#: 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"
+msgstr ""
+"référencer les parents qui ne sont pas dans le flux d'export rapide par id "
+"d'objet"
 
-#: builtin/fast-export.c:1231
+#: 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:1233
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "marquer les étiquettes avec des ids de marque"
 
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map n'a aucune signification sans --anonymize"
-
-#: builtin/fast-export.c:1271
-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"
+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 "la fonctionnalité '%s' est interdite en entrée sans --allow-unsafe-features"
+msgstr ""
+"la fonctionnalité '%s' est interdite en entrée sans --allow-unsafe-features"
 
 #: builtin/fetch-pack.c:242
 #, c-format
 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:185
+#: 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:245
+#: 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:188
+#: 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:191
+#: 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:195
+#: 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/"
+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:198
+#: 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"
+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"
+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:122
+#: 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:206
+#: 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: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 "approfondir l'historique d'un clone superficiel"
 
-#: 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 "approfondir l'historique d'un clone superficiel en fonction d'une date"
 
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: 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
-msgid "default for recursive fetching of submodules (lower priority than config files)"
-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:196
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+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:224
+#: 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:226
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "correspondance de référence"
 
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: 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:240
+#: 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"
+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:243
+#: 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 sur toutes les branches mises à jour"
+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:757
+#: 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"
+msgstr ""
+"le paramètre de configuration fetch.output contient une valeur invalide %s"
 
-#: builtin/fetch.c:856
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "objet %s non trouvé"
 
-#: builtin/fetch.c:860
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[à jour]"
 
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[rejeté]"
 
-#: builtin/fetch.c:874
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "impossible de récupérer dans la branche actuelle"
 
-#: builtin/fetch.c:884
+#: 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:885 builtin/fetch.c:922 builtin/fetch.c:944 builtin/fetch.c:956
+#: 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:889
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "écraserait l'étiquette existante"
 
-#: builtin/fetch.c:911
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[nouvelle étiquette]"
 
-#: builtin/fetch.c:914
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[nouvelle branche]"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[nouvelle référence]"
 
-#: builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "mise à jour forcée"
 
-#: builtin/fetch.c:961
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "pas en avance rapide"
 
-#: builtin/fetch.c:1065
+#: 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-update' ou lancez 'git config fetch.showForcedUpdates true'."
+"'--show-forced-updates' ou lancez 'git config fetch.showForcedUpdates true'"
 
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1080
 #, c-format
 msgid ""
-"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"
+"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"
 msgstr ""
-"%.2f secondes ont été nécessaires pour vérifier les mises à jour forcées.\n"
-"Vous pouvez utiliser '--no-show-forced-update' ou lancer\n"
-"'git config fetch.showForcedUpdates false' pour éviter ceci.\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 cette vérification\n"
 
-#: builtin/fetch.c:1101
+#: 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:1129
+#: builtin/fetch.c:1141
 #, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr "%s rejeté parce que les racines superficielles ne sont pas mises à jour"
+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:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "Depuis %.*s\n"
 
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -14518,164 +15645,186 @@ 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:1327
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s sera en suspens)"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s est devenu en suspens)"
 
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[supprimé]"
 
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(aucun(e))"
 
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1405
+#, c-format
+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:1425
 #, 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 "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:1403
+#: builtin/fetch.c:1428
 #, 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\" is ignored for %s\n"
+msgstr "l'option \"%s\" est ignorée pour %s\n"
 
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1455
 #, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "L'option \"%s\" est ignorée pour %s\n"
+msgid "the object %s does not exist"
+msgstr "l'objet %s n'existe pas"
 
-#: builtin/fetch.c:1618
+#: 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:1633
+#: 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:1635
+#: 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:1637
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "type de branche inconnu"
 
-#: builtin/fetch.c:1639
+#: 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:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Récupération de %s\n"
 
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 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:1790
+#: 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:1894
+#: 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."
-
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "Vous devez spécifier un nom d'étiquette."
+"distant depuis lesquels les nouvelles révisions devraient être récupérées"
 
-#: builtin/fetch.c:1995
-msgid "Negative depth in --deepen is not supported"
-msgstr "Une profondeur négative dans --deepen n'est pas supportée"
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "Vous devez spécifier un nom d'étiquette"
 
-#: builtin/fetch.c:1997
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen et --depth sont mutuellement exclusifs"
+#: 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:2002
-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:2004
+#: 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:2021
+#: 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:2023
+#: 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:2032
+#: 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:2039
-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 sens"
+#: builtin/fetch.c:2081
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr ""
+"la récupération d'un groupe avec des spécifications de référence n'a pas de "
+"sens"
 
-#: builtin/fetch.c:2055
+#: 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:2060
-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:2079
-msgid "--filter can only be used with the remote configured in extensions.partialclone"
-msgstr "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans extensions.partialClone"
+#: builtin/fetch.c:2121
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans "
+"extensions.partialclone"
 
-#: builtin/fetch.c:2083
+#: 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:2087
+#: 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"
 
 #: builtin/fmt-merge-msg.c:7
-msgid "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
-msgstr "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+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"
 
@@ -14695,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:483
+#: 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"
 
@@ -14743,19 +15892,19 @@ msgstr "afficher seulement les références qui ne contiennent pas le commit"
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<config> <arguments-de-commande>"
 
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "config"
 
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "clé de config qui stocke la liste des chemins de dépôts"
 
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "--config=<config> manquant"
 
-#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "inconnu"
 
@@ -14771,16 +15920,16 @@ msgstr "erreur dans l'objet %s %s : %s"
 msgid "warning in %s %s: %s"
 msgstr "avertissement dans l'objet %s %s : %s"
 
-#: builtin/fsck.c:123 builtin/fsck.c:126
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "lien cassé dans l'objet %7s %s"
 
-#: builtin/fsck.c:135
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "type d'objet inconnu dans le lien"
 
-#: builtin/fsck.c:151
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -14789,212 +15938,222 @@ msgstr ""
 "lien cassé depuis %7s %s\n"
 "             vers %7s %s"
 
-#: builtin/fsck.c:263
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "objet %s manquant %s"
 
-#: builtin/fsck.c:290
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "objet %s inatteignable %s"
 
-#: builtin/fsck.c:310
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "objet %s fantôme %s"
 
-#: builtin/fsck.c:320
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "impossible de créer le fichier lost-found"
 
-#: builtin/fsck.c:331
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "impossible de finir '%s'"
 
-#: builtin/fsck.c:348
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Vérification de l'objet %s"
 
-#: builtin/fsck.c:386
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Vérification de la connectivité (%d objets)"
 
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Vérification de l'objet %s %s"
 
-#: builtin/fsck.c:410
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "liens cassés"
 
-#: builtin/fsck.c:419
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "racine %s"
 
-#: builtin/fsck.c:427
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "étiquetage de l'objet %s %s (%s) dans %s"
 
-#: builtin/fsck.c:456
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s : objet corrompu ou manquant"
 
-#: builtin/fsck.c:481
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s : entrée %s de journal de références invalide"
 
-#: builtin/fsck.c:495
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Vérification du journal de réferences %s-> %s"
 
-#: builtin/fsck.c:529
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s : pointeur de sha1 invalide %s"
 
-#: builtin/fsck.c:536
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "l'objet %s n'est pas un commit"
 
-#: builtin/fsck.c:590
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "note : pas de référence par défaut"
 
-#: builtin/fsck.c:605
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s : incohérence de hachage,trouvé à : %s"
+
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s : objet corrompu ou manquant : %s"
 
-#: builtin/fsck.c:618
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s : l'objet a un type '%s' inconnu : %s"
+
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s : impossible d'analyser : %s"
 
-#: builtin/fsck.c:638
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "mauvais fichier de sha1 : %s"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Vérification du répertoire d'objet"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Vérification des répertoires d'objet"
 
-#: builtin/fsck.c:671
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "Vérification du lien %s"
 
-#: builtin/fsck.c:676 builtin/index-pack.c:866
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "%s invalide"
 
-#: builtin/fsck.c:683
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s pointe sur quelque chose bizarre (%s)"
 
-#: builtin/fsck.c:689
+#: 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:693
+#: 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:705
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "Vérification de l'arbre cache"
 
-#: builtin/fsck.c:710
+#: 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:719
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "non-arbre dans l'arbre de cache"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<options>] [<objet>...]"
 
-#: builtin/fsck.c:756
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "afficher les objets inaccessibles"
 
-#: builtin/fsck.c:757
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "afficher les objets en suspens"
 
-#: builtin/fsck.c:758
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "afficher les étiquettes"
 
-#: builtin/fsck.c:759
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "signaler les nœuds racines"
 
-#: builtin/fsck.c:760
+#: 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:761
+#: 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:762
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "inspecter aussi les objets pack et alternatifs"
 
-#: builtin/fsck.c:763
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "ne vérifier que la connectivité"
 
-#: builtin/fsck.c:764 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "activer une vérification plus strict"
 
-#: builtin/fsck.c:766
+#: 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:767 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "afficher la progression"
 
-#: builtin/fsck.c:768
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "afficher les noms étendus pour les objets inaccessibles"
 
-#: builtin/fsck.c:827 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Vérification des objets"
 
-#: builtin/fsck.c:855
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s : objet manquant"
 
-#: builtin/fsck.c:866
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé"
@@ -15013,103 +16172,111 @@ 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:240 builtin/tag.c:573
-#, 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"
-"and remove %s.\n"
+"and remove %s\n"
 "Automatic cleanup will not be performed until the file is removed.\n"
 "\n"
 "%s"
 msgstr ""
 "Le dernier lancement de gc a rapporté l'erreur suivante. Veuillez corriger\n"
-"la cause et supprimer %s.\n"
-"Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit supprimé.\n"
+"la cause et supprimer %s\n"
+"Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit "
+"supprimé.\n"
 "\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à"
+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"
+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)"
-msgstr "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> (utilisez --force si ce n'est pas le cas)"
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+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
-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: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
-msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
-msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<tâche>] [--schedule]"
+#: 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 "--schedule n'est pas accepté"
+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:869
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "échec de l'écriture du graphe de commits"
 
-#: builtin/gc.c:905
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "échec de la pré-récupération des distants"
 
@@ -15121,130 +16288,178 @@ msgstr "impossible de démarrer le processus 'git pack-objects'"
 msgid "failed to finish 'git pack-objects' process"
 msgstr "impossible de finir le processus 'git pack-objects'"
 
-#: builtin/gc.c:1091
+#: 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:1109
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "échec de 'git multi-pack-index expire'"
 
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "échec de 'git multi-pack-index repack'"
 
-#: builtin/gc.c:1179
-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: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:1283
+#: 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:1313
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "échec de la tâche '%s'"
 
-#: builtin/gc.c:1395
+#: 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:1400
+#: 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:1415
+#: 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:1416
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "fréquence"
 
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "lancer les tâches selon une fréquence"
 
-#: builtin/gc.c:1420
+#: 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:1421
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "tâche"
 
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "lancer une tâche spécifique"
 
-#: builtin/gc.c:1439
+#: 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:1482
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "échec du lancement de 'git config'"
 
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "impossible d'étendre le chemin '%s'"
 
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "échec de démarrage de launchctl"
 
-#: builtin/gc.c:1613
+#: 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:1674
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "échec de l'amorçage du service %s"
 
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "échec de création du fichier temporaire xml"
 
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "échec du démarrage de schtasks"
 
-#: builtin/gc.c:1879
+#: 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'"
+msgstr ""
+"echec du lancement de 'crontab -l' ; votre système n'a pas l'air de fournir "
+"'cron'"
 
-#: builtin/gc.c:1896
+#: 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'"
+msgstr ""
+"echec du lancement de 'crontab' ; votre système n'a pas l'air de fournir "
+"'cron'"
 
-#: builtin/gc.c:1900
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "échec à l'ouverture de stdin de 'crontab'"
 
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "'crontab' est mort"
 
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "échec du démarrage de systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "échec pour lancer systemctl"
+
+#: 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:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "argument '%s' de --scheduler non reconnu"
+
+#: 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:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "le planificateur %s n'est pas disponible"
+
+#: 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"
+msgstr ""
+"un autre processus est en train de programmer une maintenance en tâche de "
+"fond"
+
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<planificateur>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "planificateur"
 
-#: builtin/gc.c:2000
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "planificateur qui lancera les maintenances git"
+
+#: 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:2010
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <subcommand> [<options>]"
 
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "sous-commande invalide : %s"
@@ -15253,12 +16468,12 @@ msgstr "sous-commande invalide : %s"
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"
 
-#: builtin/grep.c:223
+#: builtin/grep.c:239
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep : échec de création du fil: %s"
 
-#: builtin/grep.c:277
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "nombre de fils spécifié invalide (%d) pour %s"
@@ -15267,352 +16482,380 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793 builtin/pack-objects.c:2969
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "pas de support des fils, ignore %s"
 
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "impossible de lire l'arbre (%s)"
 
-#: builtin/grep.c:658
+#: builtin/grep.c:672
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "impossible de faire un grep sur un objet de type %s"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:752
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "l'option '%c' attend une valeur numérique"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:851
 msgid "search in index instead of in the work tree"
 msgstr "rechercher dans l'index plutôt que dans la copie de travail"
 
-#: builtin/grep.c:840
+#: builtin/grep.c:853
 msgid "find in contents not managed by git"
 msgstr "rechercher dans les contenus non gérés par git"
 
-#: builtin/grep.c:842
+#: builtin/grep.c:855
 msgid "search in both tracked and untracked files"
 msgstr "rechercher dans les fichiers suivis et non-suivis"
 
-#: builtin/grep.c:844
+#: builtin/grep.c:857
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorer les fichiers spécifiés via '.gitignore'"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:859
 msgid "recursively search in each submodule"
 msgstr "rechercher récursivement dans chaque sous-module"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:862
 msgid "show non-matching lines"
 msgstr "afficher les lignes qui ne correspondent pas"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:864
 msgid "case insensitive matching"
 msgstr "correspondance insensible à la casse"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:866
 msgid "match patterns only at word boundaries"
 msgstr "rechercher les motifs aux séparateurs de mots"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:868
 msgid "process binary files as text"
 msgstr "traiter les fichiers binaires comme texte"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:870
 msgid "don't match patterns in binary files"
 msgstr "ne pas chercher les motifs dans les fichiers binaires"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:873
 msgid "process binary files with textconv filters"
 msgstr "traiter les fichiers binaires avec les filtres textconv"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:875
 msgid "search in subdirectories (default)"
 msgstr "rechercher dans les sous-répertoires (défaut)"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:877
 msgid "descend at most <depth> levels"
 msgstr "descendre au plus de <profondeur> dans l'arborescence"
 
-#: builtin/grep.c:868
+#: builtin/grep.c:881
 msgid "use extended POSIX regular expressions"
 msgstr "utiliser des expressions régulières étendues POSIX"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:884
 msgid "use basic POSIX regular expressions (default)"
 msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:887
 msgid "interpret patterns as fixed strings"
 msgstr "interpréter les motifs comme de chaînes fixes"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:890
 msgid "use Perl-compatible regular expressions"
 msgstr "utiliser des expressions régulières compatibles avec Perl"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:893
 msgid "show line numbers"
 msgstr "afficher les numéros de ligne"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:894
 msgid "show column number of first match"
 msgstr "afficher le numéro de colonne de la première correspondance"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:895
 msgid "don't show filenames"
 msgstr "ne pas pas afficher les noms de fichier"
 
-#: builtin/grep.c:883
+#: builtin/grep.c:896
 msgid "show filenames"
 msgstr "afficher les noms de fichier"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:898
 msgid "show filenames relative to top directory"
 msgstr "afficher les noms de fichiers relativement au répertoire de base"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:900
 msgid "show only filenames instead of matching lines"
 msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:902
 msgid "synonym for --files-with-matches"
 msgstr "synonyme pour --files-with-matches"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:905
 msgid "show only the names of files without match"
 msgstr "n'afficher que les noms des fichiers sans correspondance"
 
-#: builtin/grep.c:894
+#: builtin/grep.c:907
 msgid "print NUL after filenames"
 msgstr "imprimer une caractère NUL après le noms de fichier"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:910
 msgid "show only matching parts of a line"
 msgstr "n'afficher que les parties correspondantes d'une ligne"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:912
 msgid "show the number of matches instead of matching lines"
 msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:913
 msgid "highlight matches"
 msgstr "mettre en évidence les correspondances"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:915
 msgid "print empty line between matches from different files"
-msgstr "imprimer une ligne vide entre les correspondances de fichiers différents"
+msgstr ""
+"imprimer une ligne vide entre les correspondances de fichiers différents"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:917
 msgid "show filename only once above matches from same file"
-msgstr "afficher le nom de fichier une fois au dessus des correspondances du même fichier"
+msgstr ""
+"afficher le nom de fichier une fois au dessus des correspondances du même "
+"fichier"
 
-#: builtin/grep.c:907
+#: builtin/grep.c:920
 msgid "show <n> context lines before and after matches"
 msgstr "afficher <n> lignes de contexte avant et après les correspondances"
 
-#: builtin/grep.c:910
+#: builtin/grep.c:923
 msgid "show <n> context lines before matches"
 msgstr "afficher <n> lignes de contexte avant les correspondances"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:925
 msgid "show <n> context lines after matches"
 msgstr "afficher <n> lignes de contexte après les correspondances"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:927
 msgid "use <n> worker threads"
 msgstr "utiliser <n> fils de travail"
 
-#: builtin/grep.c:915
+#: builtin/grep.c:928
 msgid "shortcut for -C NUM"
 msgstr "raccourci pour -C NUM"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:931
 msgid "show a line with the function name before matches"
-msgstr "afficher une ligne avec le nom de la fonction avant les correspondances"
+msgstr ""
+"afficher une ligne avec le nom de la fonction avant les correspondances"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:933
 msgid "show the surrounding function"
 msgstr "afficher la fonction contenante"
 
-#: builtin/grep.c:923
+#: builtin/grep.c:936
 msgid "read patterns from file"
 msgstr "lire les motifs depuis fichier"
 
-#: builtin/grep.c:925
+#: builtin/grep.c:938
 msgid "match <pattern>"
 msgstr "rechercher <motif>"
 
-#: builtin/grep.c:927
+#: builtin/grep.c:940
 msgid "combine patterns specified with -e"
 msgstr "combiner les motifs spécifiés par -e"
 
-#: builtin/grep.c:939
+#: builtin/grep.c:952
 msgid "indicate hit with exit status without output"
-msgstr "indiquer des correspondances avec le code de sortie mais sans rien afficher"
+msgstr ""
+"indiquer des correspondances avec le code de sortie mais sans rien afficher"
 
-#: builtin/grep.c:941
+#: builtin/grep.c:954
 msgid "show only matches from files that match all patterns"
-msgstr "n'afficher que les correspondances de fichiers qui correspondent à tous les motifs"
+msgstr ""
+"n'afficher que les correspondances de fichiers qui correspondent à tous les "
+"motifs"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "pager"
 msgstr "pagineur"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "show matching files in the pager"
 msgstr "afficher les fichiers correspondant dans le pagineur"
 
-#: builtin/grep.c:948
+#: builtin/grep.c:961
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1027
 msgid "no pattern given"
 msgstr "aucun motif fourni"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:1063
 msgid "--no-index or --untracked cannot be used with revs"
-msgstr "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions"
+msgstr ""
+"--no-index ou --untracked ne peuvent pas être utilisés avec des révisions"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:1071
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "impossible de résoudre la révision : %s"
 
-#: builtin/grep.c:1088
+#: builtin/grep.c:1101
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked non supportée avec --recurse-submodules"
 
-#: builtin/grep.c:1092
+#: builtin/grep.c:1105
 msgid "invalid option combination, ignoring --threads"
 msgstr "option de combinaison invalide, ignore --threads"
 
-#: builtin/grep.c:1095 builtin/pack-objects.c:3930
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
 msgid "no threads support, ignoring --threads"
 msgstr "pas de support des fils, ignore --threads"
 
-#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "nombre de fils spécifié invalide (%d)"
 
-#: builtin/grep.c:1132
+#: builtin/grep.c:1145
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"
 
-#: builtin/grep.c:1158
+#: builtin/grep.c:1171
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index"
 
-#: builtin/grep.c:1161
+#: builtin/grep.c:1174
 msgid "--untracked cannot be used with --cached"
 msgstr "--untracked ne peut pas être utilisé avec --cached"
 
-#: builtin/grep.c:1167
+#: builtin/grep.c:1180
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi"
 
-#: builtin/grep.c:1175
+#: builtin/grep.c:1188
 msgid "both --cached and trees are given"
 msgstr "--cached et des arbres sont fournis en même temps"
 
-#: builtin/hash-object.c:85
-msgid "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] [--] <file>..."
-msgstr "git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] [--] <fichier>..."
+#: builtin/hash-object.c:83
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+"git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] "
+"[--] <fichier>..."
 
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "type d'objet"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "écrire l'objet dans la base de donnée d'objets"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "lire l'objet depuis l'entrée standard"
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "stocker le fichier tel quel sans filtrage"
 
-#: builtin/hash-object.c:104
-msgid "just hash any random garbage to create corrupt objects for debugging Git"
-msgstr "juste hasher n'importe quel contenu pour créer des objets corrompus pour debugger Git"
+#: builtin/hash-object.c:102
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr ""
+"juste hasher n'importe quel contenu pour créer des objets corrompus pour "
+"debugger Git"
 
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "traiter le fichier comme s'il venait de ce chemin"
 
-#: builtin/help.c:47
+#: builtin/help.c:55
 msgid "print all available commands"
 msgstr "afficher toutes les commandes disponibles"
 
-#: builtin/help.c:48
+#: builtin/help.c:57
 msgid "exclude guides"
 msgstr "exclure les guides"
 
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "afficher une liste de guides utiles"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "afficher tous les noms de variables de configuration"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
 msgid "show man page"
 msgstr "afficher la page de manuel"
 
-#: builtin/help.c:53
+#: builtin/help.c:59
 msgid "show manual in web browser"
 msgstr "afficher le manuel dans un navigateur web"
 
-#: builtin/help.c:55
+#: builtin/help.c:61
 msgid "show info page"
 msgstr "afficher la page info"
 
-#: builtin/help.c:57
+#: builtin/help.c:63
 msgid "print command description"
 msgstr "afficher la description de la commande"
 
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "afficher une liste de guides utiles"
+
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "afficher tous les noms de variables de configuration"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<commande>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
 
-#: builtin/help.c:163
+#: builtin/help.c:196
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "format d'aide non reconnu '%s'"
 
-#: builtin/help.c:190
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "Échec de démarrage d'emacsclient."
 
-#: builtin/help.c:203
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "Échec d'analyse de la version d'emacsclient."
 
-#: builtin/help.c:211
+#: 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:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: 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:307
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -15621,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:319
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -15630,328 +16873,315 @@ msgstr ""
 "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
 "Veuillez utiliser plutôt 'man.<outil>.cmd'."
 
-#: builtin/help.c:436
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s' : visualiseur de manuel inconnu."
 
-#: builtin/help.c:453
+#: 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:461
+#: 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:520 builtin/help.c:531 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:534 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:563 builtin/help.c:593
+#: builtin/help.c:580
+msgid "this option doesn't take any other arguments"
+msgstr "cette option n'accepte pas d'autre argument"
+
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "usage : %s%s"
 
-#: builtin/help.c:577
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "'git help config' pour plus d'information"
 
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "type d'objet non correspondant à %s"
 
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "objet attendu non reçu %s"
 
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objet %s : type attendu %s, reçu %s"
 
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "impossible de remplir %d octet"
 msgstr[1] "impossible de remplir %d octets"
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr "fin de fichier prématurée"
 
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "erreur de lecture sur l'entrée"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "plus d'octets utilisés que disponibles"
 
-#: builtin/index-pack.c:325 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr "le paquet est trop grand pour la définition actuelle de off_t"
 
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "le paquet dépasse la taille maximale permise"
 
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "impossible de créer '%s'"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "impossible d'ouvrir le fichier paquet '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
 msgid "pack signature mismatch"
 msgstr "la signature du paquet ne correspond pas"
 
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "la version de paquet %<PRIu32> non supportée"
 
-#: builtin/index-pack.c:383
+#: builtin/index-pack.c:376
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s"
 
-#: builtin/index-pack.c:489
+#: builtin/index-pack.c:482
 #, c-format
 msgid "inflate returned %d"
 msgstr "la décompression (inflate) a retourné %d"
 
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:531
 msgid "offset value overflow for delta base object"
 msgstr "dépassement de la valeur d'offset pour l'objet delta de base"
 
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:539
 msgid "delta base offset is out of bound"
 msgstr "l'objet delta de base est hors limite"
 
-#: builtin/index-pack.c:554
+#: builtin/index-pack.c:547
 #, c-format
 msgid "unknown object type %d"
 msgstr "type d'objet inconnu %d"
 
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:578
 msgid "cannot pread pack file"
 msgstr "impossible de lire (pread) le fichier paquet"
 
-#: builtin/index-pack.c:587
+#: builtin/index-pack.c:580
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "fin prématurée du fichier paquet, %<PRIuMAX> octet lu"
 msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus"
 
-#: builtin/index-pack.c:613
+#: builtin/index-pack.c:606
 msgid "serious inflate inconsistency"
 msgstr "grave incohérence dans la décompression (inflate)"
 
-#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788 builtin/index-pack.c:827 builtin/index-pack.c:836
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
 
-#: builtin/index-pack.c:761 builtin/pack-objects.c:171 builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
 #, c-format
 msgid "unable to read %s"
 msgstr "impossible de lire %s"
 
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:818
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "impossible de lire l'information existante de l'objet %s"
 
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:826
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "impossible de lire l'objet existant %s"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:840
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objet blob invalide %s"
 
-#: builtin/index-pack.c:850 builtin/index-pack.c:869
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
 msgid "fsck error in packed object"
 msgstr "erreur de fsck dans l'objet empaqueté"
 
-#: builtin/index-pack.c:871
+#: builtin/index-pack.c:864
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Tous les objets enfants de %s ne sont pas accessibles"
 
-#: builtin/index-pack.c:932 builtin/index-pack.c:979
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
 msgstr "échec d'application du delta"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Receiving objects"
 msgstr "Réception d'objets"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Indexing objects"
 msgstr "Indexation d'objets"
 
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1190
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
 
-#: builtin/index-pack.c:1201
+#: builtin/index-pack.c:1195
 msgid "cannot fstat packfile"
 msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
 
-#: builtin/index-pack.c:1204
+#: builtin/index-pack.c:1198
 msgid "pack has junk at the end"
 msgstr "le paquet est invalide à la fin"
 
-#: builtin/index-pack.c:1216
+#: builtin/index-pack.c:1210
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusion extrême dans parse_pack_objects()"
 
-#: builtin/index-pack.c:1239
+#: builtin/index-pack.c:1233
 msgid "Resolving deltas"
 msgstr "Résolution des deltas"
 
-#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "impossible de créer le fil : %s"
 
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1277
 msgid "confusion beyond insanity"
 msgstr "confusion extrême"
 
-#: builtin/index-pack.c:1289
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "complété avec %d objet local"
 msgstr[1] "complété avec %d objets locaux"
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
-msgstr "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"
+msgstr ""
+"Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"
 
-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "le paquet a %d delta non résolu"
 msgstr[1] "le paquet a %d deltas non résolus"
 
-#: builtin/index-pack.c:1329
+#: builtin/index-pack.c:1323
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "impossible de compresser l'objet ajouté (%d)"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1419
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "l'objet local %s est corrompu"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1440
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "le nom de fichier paquet '%s' ne se termine pas par '.%s'"
 
-#: builtin/index-pack.c:1470
+#: builtin/index-pack.c:1464
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "impossible d'écrire le fichier %s '%s'"
 
-#: builtin/index-pack.c:1478
+#: builtin/index-pack.c:1472
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "impossible de fermer le fichier %s écrit '%s'"
 
-#: builtin/index-pack.c:1504
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "impossible de renommer un fichier temporaire '*.%s' en '%s'"
+
+#: builtin/index-pack.c:1514
 msgid "error while closing pack file"
 msgstr "erreur en fermeture du fichier paquet"
 
-#: builtin/index-pack.c:1518
-msgid "cannot store pack file"
-msgstr "impossible de stocker le fichier paquet"
-
-#: builtin/index-pack.c:1526
-msgid "cannot store index file"
-msgstr "impossible de stocker le fichier d'index"
-
-#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mauvais pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1643
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
 
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1645
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"
 
-#: builtin/index-pack.c:1701
+#: builtin/index-pack.c:1693
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "pas un delta : %d objet"
 msgstr[1] "pas un delta : %d objets"
 
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1700
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "longueur chaînée = %d : %lu objet"
 msgstr[1] "longueur chaînée = %d : %lu objets"
 
-#: builtin/index-pack.c:1750
+#: builtin/index-pack.c:1742
 msgid "Cannot come back to cwd"
 msgstr "Impossible de revenir au répertoire de travail courant"
 
-#: builtin/index-pack.c:1804 builtin/index-pack.c:1807 builtin/index-pack.c:1823 builtin/index-pack.c:1827
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
 #, c-format
 msgid "bad %s"
 msgstr "mauvais %s"
 
-#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "algorithme d'empreinte inconnu '%s'"
 
-#: builtin/index-pack.c:1852
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin requiert un dépôt git"
 
-#: builtin/index-pack.c:1856
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format ne peut pas être utilisé avec --stdin"
-
-#: builtin/index-pack.c:1871
+#: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify sans nom de fichier paquet donné"
 
-#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "erreur de fsck dans les objets paquets"
 
@@ -15995,110 +17225,118 @@ msgstr "modèles non trouvés dans %s"
 msgid "not copying templates from '%s': %s"
 msgstr "pas de copie des modèles depuis '%s' : %s"
 
-#: builtin/init-db.c:262
+#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "nom de branche initiale invalide : '%s'"
 
-#: builtin/init-db.c:353
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "impossible de traiter le fichier de type %d"
 
-#: builtin/init-db.c:356
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "impossible de déplacer %s vers %s"
 
-#: builtin/init-db.c:372
+#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr "essai de réinitialisation du dépôt avec une empreinte différente"
 
-#: builtin/init-db.c:396 builtin/init-db.c:399
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s existe déjà"
 
-#: builtin/init-db.c:431
+#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-initialisation : --initial-branch=%s ignoré"
 
-#: builtin/init-db.c:462
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n"
 
-#: builtin/init-db.c:463
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Dépôt Git existant réinitialisé dans %s%s\n"
 
-#: builtin/init-db.c:467
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Dépôt Git vide partagé initialisé dans %s%s\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Dépôt Git vide initialisé dans %s%s\n"
 
-#: builtin/init-db.c:517
-msgid "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]] [<directory>]"
-msgstr "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--shared[=<permissions>]] [<répertoire>]"
+#: builtin/init-db.c:518
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
+"shared[=<permissions>]] [<répertoire>]"
 
-#: builtin/init-db.c:543
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "permissions"
 
-#: builtin/init-db.c:544
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs"
 
-#: builtin/init-db.c:550
+#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "outrepasser le nom de la branche initiale"
 
-#: builtin/init-db.c:551 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "empreinte"
 
-#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "spécifier l'algorithme d'empreinte à utiliser"
 
-#: builtin/init-db.c:559
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir et --bare sont mutuellement exclusifs"
-
-#: builtin/init-db.c:590 builtin/init-db.c:595
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "impossible de créer le répertoire (mkdir) %s"
 
-#: builtin/init-db.c:599 builtin/init-db.c:654
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "impossible de se déplacer vers le répertoire (chdir) %s"
 
-#: builtin/init-db.c:626
+#: builtin/init-db.c:627
 #, c-format
-msgid "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-dir=<directory>)"
-msgstr "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --git-dir=<répertoire>)"
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"
+"git-dir=<répertoire>)"
 
-#: builtin/init-db.c:678
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Impossible d'accéder à l'arbre de travail '%s'"
 
-#: builtin/init-db.c:683
+#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir est incompatible avec un dépôt nu"
 
 #: builtin/interpret-trailers.c:16
-msgid "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]"
-msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <symbole>[(=|:)<valeur>])...] [<fichier>...]"
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<symbole>[(=|:)<valeur>])...] [<fichier>...]"
 
 #: builtin/interpret-trailers.c:95
 msgid "edit files in place"
@@ -16186,509 +17424,529 @@ msgid "decorate options"
 msgstr "décorer les options"
 
 #: builtin/log.c:190
-msgid "trace the evolution of line range <start>,<end> or function :<funcname> in <file>"
-msgstr "tracer l'évolution d'une plage <début>,<fin> ou d'une fonction <nom-de-fonction> dans <fichier>"
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"tracer l'évolution d'une plage <début>,<fin> ou d'une fonction <nom-de-"
+"fonction> dans <fichier>"
 
 #: builtin/log.c:213
 msgid "-L<range>:<file> cannot be used with pathspec"
-msgstr "-L<plage>:<fichier> ne peut pas être utilisé avec une spécificateur de chemin"
+msgstr ""
+"-L<plage>:<fichier> ne peut pas être utilisé avec une spécificateur de chemin"
 
-#: builtin/log.c:303
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortie finale : %d %s\n"
 
-#: builtin/log.c:568
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s : fichier incorrect"
 
-#: builtin/log.c:583 builtin/log.c:673
+#: 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:698
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "type inconnu : %d"
 
-#: builtin/log.c:843
+#: 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:850
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers sans valeur"
 
-#: builtin/log.c:979
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "impossible d'ouvrir le fichier correctif %s"
 
-#: builtin/log.c:996
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "exactement une plage nécessaire"
 
-#: builtin/log.c:1006
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "ceci n'est pas une plage"
 
-#: builtin/log.c:1170
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "la lettre de motivation doit être au format courriel"
 
-#: builtin/log.c:1176
+#: 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:1263
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to aberrant : %s"
 
-#: builtin/log.c:1290
+#: 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:1348
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "deux répertoires de sortie ?"
 
-#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#: 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:1510 builtin/replace.c:58 builtin/replace.c:207 builtin/replace.c:210
+#: 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:1519
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "impossible de trouver la base de fusion exacte"
 
-#: builtin/log.c:1529
+#: 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 ""
-"impossible de récupérer l'amont, si vous voulez enregistrer le commit de base automatiquement,\n"
-"veuillez utiliser git branch --set-upstream-to pour suivre une branche distante.\n"
-"Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> manuellement"
+"impossible de récupérer l'amont, si vous voulez enregistrer le commit de "
+"base automatiquement,\n"
+"veuillez utiliser git branch --set-upstream-to pour suivre une branche "
+"distante.\n"
+"Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
+"manuellement"
 
-#: builtin/log.c:1552
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "échec à trouver la base de fusion exacte"
 
-#: builtin/log.c:1569
+#: 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:1579
+#: 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:1637
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "impossible d'obtenir l'id du patch"
 
-#: builtin/log.c:1700
+#: 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"
+msgstr ""
+"échec d'inférence de l'origine de différence d'intervalles de la série "
+"actuelle"
 
-#: builtin/log.c:1702
+#: 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"
+msgstr ""
+"utilisation de '%s' comme une différence d'intervalle pour la série actuelle"
 
-#: builtin/log.c:1746
+#: 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:1749
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "utiliser [PATCH] même avec des patchs multiples"
 
-#: builtin/log.c:1753
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "afficher les patchs sur la sortie standard"
 
-#: builtin/log.c:1755
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "générer une lettre de motivation"
 
-#: builtin/log.c:1757
+#: 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"
+msgstr ""
+"utiliser une séquence simple de nombres pour les nom des fichiers de sortie"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1759
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "utiliser <sfx> au lieu de '.patch'"
 
-#: builtin/log.c:1761
+#: 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:1762
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "reroll-count"
 
-#: builtin/log.c:1763
+#: 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:1765
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "taille maximum du nom du fichier de sortie"
 
-#: builtin/log.c:1767
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "cover-from-description-mode"
 
-#: builtin/log.c:1771
+#: 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"
+msgstr ""
+"générer des parties de la lettre d'introduction à partir de la description "
+"de la branche"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "stocker les fichiers résultats dans <répertoire>"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "ne pas retirer/ajouter [PATCH]"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "ne pas imprimer les diffs binaires"
 
-#: builtin/log.c:1784
+#: 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:1786
+#: 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:1788
+#: 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:1790
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "Communication"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1809
 msgid "header"
 msgstr "en-tête"
 
-#: builtin/log.c:1792
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "ajouter l'en-tête de courriel"
 
-#: builtin/log.c:1793 builtin/log.c:1794
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "courriel"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "ajouter l'en-tête \"To:\""
 
-#: builtin/log.c:1794
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "ajouter l'en-tête \"Cc:\""
 
-#: builtin/log.c:1795
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1796
+#: 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)"
+msgstr ""
+"renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
 
-#: builtin/log.c:1798
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "id-message"
 
-#: builtin/log.c:1799
+#: 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:1800 builtin/log.c:1803
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "limite"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "attacher le patch"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "patch à l'intérieur"
 
-#: builtin/log.c:1808
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
-msgstr "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
+msgstr ""
+"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
 
-#: builtin/log.c:1810
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "signature"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "ajouter une signature"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "commit-de-base"
 
-#: builtin/log.c:1813
+#: 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:1816
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "ajouter une signature depuis un fichier"
 
-#: builtin/log.c:1817
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "ne pas afficher les noms de fichiers des patchs"
 
-#: builtin/log.c:1819
+#: 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"
+msgstr ""
+"afficher la barre de progression durant la phase de génération des patchs"
 
-#: builtin/log.c:1821
+#: 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"
+msgstr ""
+"afficher les modifications par rapport à <rév> dans la première page ou une "
+"rustine"
 
-#: builtin/log.c:1824
+#: 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"
+msgstr ""
+"afficher les modifications par rapport à <refspec> dans la première page ou "
+"une rustine"
 
-#: builtin/log.c:1826 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:1913
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ligne d'identification invalide : %s"
 
-#: builtin/log.c:1928
-msgid "-n and -k are mutually exclusive"
-msgstr "-n et -k sont mutuellement exclusifs"
-
-#: builtin/log.c:1930
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs"
-
-#: builtin/log.c:1938
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only n'a pas de sens"
 
-#: builtin/log.c:1940
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status n'a pas de sens"
 
-#: builtin/log.c:1942
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check n'a pas de sens"
 
-#: builtin/log.c:1964
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output, et --output-directory sont mutuellement exclusifs"
-
-#: builtin/log.c:2087
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff requiert --cover-letter ou une rustine unique"
 
-#: builtin/log.c:2091
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Interdiff :"
 
-#: builtin/log.c:2092
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff contre v%d :"
 
-#: builtin/log.c:2098
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor requiert --range-diff"
-
-#: builtin/log.c:2102
+#: 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:2110
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "Diff-intervalle :"
 
-#: builtin/log.c:2111
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Diff-intervalle contre v%d :"
 
-#: builtin/log.c:2122
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "lecture du fichier de signature '%s' impossible"
 
-#: builtin/log.c:2158
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "Génération des patchs"
 
-#: builtin/log.c:2202
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "échec de création des fichiers en sortie"
 
-#: builtin/log.c:2261
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
 
-#: builtin/log.c:2315
+#: builtin/log.c:2333
 #, c-format
-msgid "Could not find a tracked remote branch, please specify <upstream> manually.\n"
-msgstr "Impossible de trouver une branche distante suivie, merci de spécifier <branche_amont> manuellement.\n"
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+"Impossible de trouver une branche distante suivie, merci de spécifier "
+"<branche_amont> manuellement.\n"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<options>] [<fichier>...]"
 
-#: builtin/ls-files.c:619
+#: 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:620
 msgid "identify the file status with tags"
 msgstr "identifier l'état de fichier avec les étiquettes"
 
-#: builtin/ls-files.c:621
+#: 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:623
+#: 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:625
+#: 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:627
+#: 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:629
+#: 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:631
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "afficher les autres fichiers dans la sortie"
 
-#: builtin/ls-files.c:633
+#: 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:636
+#: 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:638
+#: 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"
+msgstr ""
+"afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "afficher seulement les noms des répertoires 'other'"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "afficher les fins de lignes des fichiers"
 
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "ne pas afficher les répertoires vides"
 
-#: builtin/ls-files.c:647
+#: 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:649
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "afficher l'information resolv-undo"
 
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "sauter les fichiers correspondant au motif"
 
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "les motifs d'exclusion sont lus depuis <fichier>"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "lire les motifs d'exclusion depuis <fichier>"
 
-#: builtin/ls-files.c:657
+#: 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:659
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "ajouter les exclusions git standard"
 
-#: builtin/ls-files.c:663
+#: 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:666
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "parcourir récursivement les sous-modules"
 
-#: builtin/ls-files.c:668
+#: 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:669
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "arbre ou apparenté"
 
-#: builtin/ls-files.c:670
+#: 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"
+msgstr ""
+"considérer que les chemins supprimés depuis <arbre ou apparenté> sont "
+"toujours présents"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "afficher les données de débogage"
 
-#: builtin/ls-files.c:674
+#: 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"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<repository> [<refs>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repository> [<refs>...]]"
 msgstr ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<dépôt> [<références>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<dépôt> [<réf>...]]"
 
 #: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "ne pas afficher les URL distantes"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
 msgid "exec"
 msgstr "exécutable"
 
@@ -16714,7 +17972,9 @@ msgstr "prendre en compte url.<base>.insteadOf"
 
 #: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
-msgstr "sortir avec un code d'erreur 2 si aucune correspondance de référence n'est trouvée"
+msgstr ""
+"sortir avec un code d'erreur 2 si aucune correspondance de référence n'est "
+"trouvée"
 
 #: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
@@ -16754,11 +18014,12 @@ msgstr "utiliser les noms de chemins complets"
 
 #: builtin/ls-tree.c:145
 msgid "list entire tree; not just current directory (implies --full-name)"
-msgstr "afficher l'arbre entier ; pas seulement le répertoire courant (implique --full-name)"
+msgstr ""
+"afficher l'arbre entier ; pas seulement le répertoire courant (implique --"
+"full-name)"
 
 #. TRANSLATORS: keep <> in "<" mail ">" info.
 #: builtin/mailinfo.c:14
-#| msgid "git diff --no-index [<options>] <path> <path>"
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
 msgstr "git mailinfo [<options>] <msg> <rustine> < mail >info"
 
@@ -16806,7 +18067,7 @@ msgstr "action lorsqu'un CR cité est trouvé"
 msgid "use headers in message's body"
 msgstr "utiliser l'entête dans le corps de message"
 
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "mbox vide : '%s'"
@@ -16852,8 +18113,12 @@ msgid "find where <commit> forked from reflog of <ref>"
 msgstr "trouver où <validation> a divergé du reflog de <référence>"
 
 #: builtin/merge-file.c:9
-msgid "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> <file2>"
-msgstr "git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> <fichier-orig> <fichier2>"
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> "
+"<fichier-orig> <fichier2>"
 
 #: builtin/merge-file.c:35
 msgid "send results to standard output"
@@ -16864,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"
 
@@ -16918,202 +18187,206 @@ msgstr "impossible de résoudre la référence '%s'"
 msgid "Merging %s with %s\n"
 msgstr "Fusion de %s avec %s\n"
 
-#: builtin/merge.c:58
+#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<options>] [<commit>...]"
 
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "le commutateur `m' a besoin d'une valeur"
 
-#: builtin/merge.c:146
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "le commutateur '%s' a besoin d'une valeur"
 
-#: builtin/merge.c:199
+#: 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:200
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les stratégies disponibles sont :"
 
-#: builtin/merge.c:205
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les stratégies personnalisées sont :"
 
-#: builtin/merge.c:256 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 "ne pas afficher un diffstat à la fin de la fusion"
 
-#: builtin/merge.c:259 builtin/pull.c:136
+#: 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:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(synonyme de --stat)"
 
-#: builtin/merge.c:262 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 "ajouter (au plus <n>) éléments du journal court au message de validation de la fusion"
+msgstr ""
+"ajouter (au plus <n>) éléments du journal court au message de validation de "
+"la fusion"
 
-#: builtin/merge.c:265 builtin/pull.c:148
+#: 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:267 builtin/pull.c:151
+#: 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:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "éditer le message avant la validation"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "autoriser l'avance rapide (défaut)"
 
-#: builtin/merge.c:273 builtin/pull.c:161
+#: 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:277 builtin/pull.c:164
+#: 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:278 builtin/notes.c:787 builtin/pull.c:168 builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: 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:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "stratégie de fusion à utiliser"
 
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "option=valeur"
 
-#: builtin/merge.c:281 builtin/pull.c:173
+#: 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:283
+#: 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)"
+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:290
+#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "abandonner la fusion en cours"
 
-#: builtin/merge.c:292
+#: 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:294
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "continuer la fusion en cours"
 
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "permettre la fusion d'historiques sans rapport"
 
-#: builtin/merge.c:303
+#: 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:320
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "impossible de lancer le remisage."
 
-#: builtin/merge.c:325
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "échec du remisage"
 
-#: builtin/merge.c:330
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "pas un objet valide : %s"
 
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree a échoué"
 
-#: builtin/merge.c:400
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Déjà à jour. (rien à compresser)"
 
-#: builtin/merge.c:414
+#: 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:464
+#: 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:602
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
 
-#: builtin/merge.c:728
+#: 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:741
+#: builtin/merge.c:745
 #, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Options inconnue pour merge-recursive : -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "option de stratégie inconnue : -X%s"
 
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
+#: 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:812
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Impossible de lire depuis '%s'"
 
-#: builtin/merge.c:821
+#: 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"
+msgstr ""
+"Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "
+"fusion.\n"
 
-#: builtin/merge.c:827
+#: 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 ""
-"Veuillez entrer un message de validation pour expliquer en quoi cette fusion est\n"
-"nécessaire, surtout si cela fusionne une branche amont mise à jour dans une branche de sujet.\n"
+"Veuillez entrer un message de validation pour expliquer en quoi cette fusion "
+"est\n"
+"nécessaire, surtout si cela fusionne une branche amont mise à jour dans une "
+"branche de sujet.\n"
 "\n"
 
-#: builtin/merge.c:832
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Un message vide abandonne la validation.\n"
 
-#: builtin/merge.c:835
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17122,72 +18395,74 @@ msgstr ""
 "Les lignes commençant par '%c' seront ignorées, et un message vide\n"
 "abandonne la validation.\n"
 
-#: builtin/merge.c:888
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "Message de validation vide."
 
-#: builtin/merge.c:903
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Merveilleux.\n"
 
-#: builtin/merge.c:964
+#: 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"
+msgstr ""
+"La fusion automatique a échoué ; réglez les conflits et validez le "
+"résultat.\n"
 
-#: builtin/merge.c:1003
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "Pas de branche courante."
 
-#: builtin/merge.c:1005
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "Pas de branche distante pour la branche courante."
 
-#: builtin/merge.c:1007
+#: 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:1012
+#: 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:1069
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
 
-#: builtin/merge.c:1172
+#: 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:1206
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "pas possible de fusionner ceci"
 
-#: builtin/merge.c:1316
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort n'accepte pas d'argument"
 
-#: builtin/merge.c:1320
+#: 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:1338
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit n'accepte pas d'argument"
 
-#: builtin/merge.c:1351
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue ne supporte aucun argument"
 
-#: builtin/merge.c:1355
+#: 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:1371
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17195,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:1378
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17203,91 +18478,82 @@ msgstr ""
 "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1381
+#: 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:1395
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-
-#: builtin/merge.c:1397
-msgid "You cannot combine --squash with --commit."
-msgstr "Vous ne pouvez pas combiner --squash avec --commit."
-
-#: builtin/merge.c:1413
+#: 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."
+msgstr ""
+"Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."
 
-#: builtin/merge.c:1430
+#: 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:1432
+#: 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:1437
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - pas possible de fusionner ceci"
 
-#: builtin/merge.c:1439
+#: 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"
+msgstr ""
+"Possible de fusionner exactement une seule validation dans une tête vide"
 
-#: builtin/merge.c:1520
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "refus de fusionner des historiques sans relation"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Mise à jour %s..%s\n"
 
-#: builtin/merge.c:1585
+#: 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:1592
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "Non.\n"
 
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr "Pas possible d'avancer rapidement, abandon."
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: 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:1655
+#: 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:1707
+#: 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:1709
+#: 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:1718
+#: builtin/merge.c:1735
 #, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+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:1732
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr "La fusion automatique a réussi ; stoppée avant la validation comme demandé\n"
+msgstr ""
+"La fusion automatique a réussi ; stoppée avant la validation comme demandé\n"
 
 #: builtin/mktag.c:10
 msgid "git mktag"
@@ -17318,15 +18584,15 @@ msgstr "impossible de lire l'objet étiqueté '%s'"
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr "l'objet '%s' étiqueté comme '%s', mais est de type '%s'"
 
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr "l'étiquette sur stdin n'a pas passé le test strict fsck"
 
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
 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:103 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"
 
@@ -17347,45 +18613,58 @@ msgid "allow creation of more than one tree"
 msgstr "autoriser la création de plus d'un arbre"
 
 #: builtin/multi-pack-index.c:10
-#| msgid "git multi-pack-index [<options>] (write|verify|expire|repack --batch-size=<size>)"
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<options>] write [--preferred-pack=<paquet>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<options>] write [--preferred-pack=<paquet>][--refs-"
+"snapshot=<chemin>]"
 
-#: builtin/multi-pack-index.c:13
-#| msgid "git upload-pack [<options>] <dir>"
+#: builtin/multi-pack-index.c:14
 msgid "git multi-pack-index [<options>] verify"
 msgstr "git multi-pack-index [<options>] verify"
 
-#: builtin/multi-pack-index.c:16
-#| msgid "git upload-pack [<options>] <dir>"
+#: builtin/multi-pack-index.c:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<options>] expire"
 
-#: builtin/multi-pack-index.c:19
-#| msgid "git multi-pack-index [<options>] (write|verify|expire|repack --batch-size=<size>)"
+#: builtin/multi-pack-index.c:20
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<options>] repack [--batch-size=<taille>]"
 
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
 msgid "object directory containing set of packfile and pack-index pairs"
-msgstr "répertoire objet contenant un ensemble de paires de fichiers paquet et d'index de paquet"
+msgstr ""
+"répertoire objet contenant un ensemble de paires de fichiers paquet et "
+"d'index de paquet"
 
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
 msgid "preferred-pack"
 msgstr "paquet-préféré"
 
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr "paquet à réutiliser lors du calcul de bitmap de multi-paquet"
 
-#: builtin/multi-pack-index.c:128
-msgid "during repack, collect pack-files of smaller size into a batch that is larger than this size"
-msgstr "pendant le repaquetage, collecter les fichiers paquet de plus petite taille dans un lot plus grand que cette taille"
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "écriture du bitmap de multi-paquet"
 
-#: builtin/multi-pack-index.c:180
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "sous-commande non reconnue : %s"
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "écrire l'index multi-paquet ne contenant que les index fournis"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "instantané des réfs pour sélectionner les commits de bitmap"
+
+#: 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 ""
+"pendant le repaquetage, collecter les fichiers paquet de plus petite taille "
+"dans un lot plus grand que cette taille"
 
 #: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
@@ -17398,7 +18677,9 @@ msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?"
 
 #: builtin/mv.c:85
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr "Veuillez indexer vos modifications de .gitmodules ou les remiser pour continuer"
+msgstr ""
+"Veuillez indexer vos modifications de .gitmodules ou les remiser pour "
+"continuer"
 
 #: builtin/mv.c:103
 #, c-format
@@ -17413,117 +18694,119 @@ msgstr "forcer le déplacement/renommage même si la cible existe"
 msgid "skip move/rename errors"
 msgstr "sauter les erreurs de déplacement/renommage"
 
-#: builtin/mv.c:170
+#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "la destination '%s' n'est pas un répertoire"
 
-#: builtin/mv.c:181
+#: builtin/mv.c:184
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Vérification du renommage de '%s' en '%s'\n"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:190
 msgid "bad source"
 msgstr "mauvaise source"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "impossible de déplacer un répertoire dans lui-même"
 
-#: builtin/mv.c:191
+#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "impossible de déplacer un répertoire sur un fichier"
 
-#: builtin/mv.c:200
+#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "le répertoire source est vide"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "pas sous le contrôle de version"
 
-#: builtin/mv.c:227
+#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "en conflit"
 
-#: builtin/mv.c:230
+#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "la destination existe"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "écrasement de '%s'"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "Impossible d'écraser"
 
-#: builtin/mv.c:244
+#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "multiples sources pour la même destination"
 
-#: builtin/mv.c:246
+#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "le répertoire de destination n'existe pas"
 
-#: builtin/mv.c:253
+#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, source=%s, destination=%s"
 
-#: builtin/mv.c:274
+#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Renommage de %s en %s\n"
 
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: 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)"
+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"
+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)"
 
@@ -17532,16 +18815,25 @@ msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <références-notes>] [list [<object>]]"
 
 #: builtin/notes.c:29
-msgid "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"
-msgstr "git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> | -F <fichier> | (-c | -C) <objet>] [<objet>]"
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> "
+"| -F <fichier> | (-c | -C) <objet>] [<objet>]"
 
 #: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr "git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>"
+msgstr ""
+"git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>"
 
 #: builtin/notes.c:31
-msgid "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"
-msgstr "git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -F <fichier> | (-c | -C) <objet>] [<objet>]"
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -"
+"F <fichier> | (-c | -C) <objet>] [<objet>]"
 
 #: builtin/notes.c:32
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
@@ -17552,8 +18844,11 @@ msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <références-notes>] show [<objet>]"
 
 #: builtin/notes.c:34
-msgid "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
-msgstr "git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] <références-notes>"
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+"git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] "
+"<références-notes>"
 
 #: builtin/notes.c:35
 msgid "git notes merge --commit [-v | -q]"
@@ -17631,60 +18926,61 @@ 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:197
+#: 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:206
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "impossible d'écrire l'objet note"
 
-#: builtin/notes.c:208
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "le contenu de la note a été laissé dans %s"
 
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "impossible d'ouvrir ou lire '%s'"
 
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 builtin/notes.c:531 builtin/notes.c:610
-#: builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
 #, 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:265
+#: builtin/notes.c:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "impossible de lire l'objet '%s'."
 
-#: builtin/notes.c:268
+#: builtin/notes.c:266
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "impossible de lire les informations de note d'un objet non-blob '%s'."
 
-#: builtin/notes.c:309
+#: builtin/notes.c:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "ligne en entrée malformée : '%s'."
 
-#: builtin/notes.c:324
+#: builtin/notes.c:322
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "impossible de copier les notes de '%s' vers '%s'"
@@ -17692,83 +18988,94 @@ msgstr "impossible de copier les notes de '%s' vers '%s'"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "refus de faire %s sur des notes dans %s (hors de refs/notes/)"
 
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963
-#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:586
+#: 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: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"
 
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
 #, c-format
 msgid "no note found for object %s."
 msgstr "pas de note trouvée pour l'objet %s."
 
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "contenu de la note sous forme de chaîne"
 
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "contenu de la note dans un fichier"
 
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
 msgid "reuse and edit specified note object"
 msgstr "réutiliser et éditer l'objet de note spécifié"
 
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "réutiliser l'objet de note spécifié"
 
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "permettre de stocker une note vide"
 
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "remplacer les notes existantes"
 
-#: builtin/notes.c:448
+#: builtin/notes.c:446
 #, c-format
-msgid "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite existing notes"
-msgstr "Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. Utilisez '-f' pour écraser les notes existantes"
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. "
+"Utilisez '-f' pour écraser les notes existantes"
 
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Écrasement des notes existantes pour l'objet %s\n"
 
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: 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"
 
-#: builtin/notes.c:497
+#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "lire les objets depuis l'entrée standard"
 
-#: builtin/notes.c:499
+#: builtin/notes.c:497
 msgid "load rewriting config for <command> (implies --stdin)"
-msgstr "charger la configuration de réécriture pour <commande> (implique --stdin)"
+msgstr ""
+"charger la configuration de réécriture pour <commande> (implique --stdin)"
 
-#: builtin/notes.c:517
+#: builtin/notes.c:515
 msgid "too few arguments"
 msgstr "trop peu d'arguments"
 
-#: builtin/notes.c:538
+#: builtin/notes.c:536
 #, c-format
-msgid "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite existing notes"
-msgstr "Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. Utilisez '-f' pour écraser les notes existantes"
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. "
+"Utilisez '-f' pour écraser les notes existantes"
 
-#: builtin/notes.c:550
+#: builtin/notes.c:548
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "notes manquantes sur l'objet source %s. Impossible de copier."
 
-#: builtin/notes.c:603
+#: builtin/notes.c:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -17777,273 +19084,310 @@ msgstr ""
 "Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n"
 "Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n"
 
-#: builtin/notes.c:698
+#: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:700
+#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "échec de la suppression de la référence NOTES_MERGE_REF"
 
-#: builtin/notes.c:702
+#: builtin/notes.c:700
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "échec de la suppression de la copie de travail 'git notes merge'"
 
-#: builtin/notes.c:722
+#: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:724
+#: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:726
+#: builtin/notes.c:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:739
+#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "échec de la résolution de NOTES_MERGE_REF"
 
-#: builtin/notes.c:742
+#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "impossible de finaliser la fusion de notes"
 
-#: builtin/notes.c:768
+#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "stratégie de fusion de notes inconnue %s"
 
-#: builtin/notes.c:784
+#: builtin/notes.c:782
 msgid "General options"
 msgstr "Options générales"
 
-#: builtin/notes.c:786
+#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Options de fusion"
 
-#: builtin/notes.c:788
-msgid "resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)"
-msgstr "résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/theirs/union/cat_sort_uniq)"
+#: builtin/notes.c:786
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+"résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
+"theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:790
+#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "Validation des notes non fusionnées"
 
-#: builtin/notes.c:792
+#: builtin/notes.c:790
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
 
-#: builtin/notes.c:794
+#: builtin/notes.c:792
 msgid "Aborting notes merge resolution"
 msgstr "Abandon de la résolution de fusion des notes"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "abandonner la fusion de notes"
 
-#: builtin/notes.c:807
+#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles"
 
-#: builtin/notes.c:812
+#: builtin/notes.c:810
 msgid "must specify a notes ref to merge"
 msgstr "vous devez spécifier une référence de notes à fusionner"
 
-#: builtin/notes.c:836
+#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "-s/--strategy inconnu : %s"
 
-#: builtin/notes.c:873
+#: 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:876
+#: 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)"
+msgstr ""
+"impossible de stocker le lien vers la référence actuelle aux notes (%s)"
 
-#: builtin/notes.c:878
+#: builtin/notes.c:880
 #, c-format
 msgid ""
-"Automatic notes merge failed. Fix conflicts in %s and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.\n"
+"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
+"'git notes merge --commit', or abort the merge with 'git notes merge --"
+"abort'.\n"
 msgstr ""
-"La fusion automatique des notes a échoué. Corrigez les conflits dans %s et validez le résultat avec 'git notes merges --commit', ou abandonnez la fusion avec "
-"'git notes merge --abort'.\n"
+"La fusion automatique des notes a échoué. Corrigez les conflits dans %s et "
+"validez le résultat avec 'git notes merges --commit', ou abandonnez la "
+"fusion avec 'git notes merge --abort'.\n"
 
-#: builtin/notes.c:897 builtin/tag.c:589
+#: 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:900
+#: 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:912
+#: 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"
+msgstr ""
+"la tentative de suppression d'une note non existante n'est pas une erreur"
 
-#: builtin/notes.c:915
+#: 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:954 builtin/prune.c:132 builtin/worktree.c:148
+#: 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:955
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "afficher les notes éliminées"
 
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "références-notes"
 
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "utiliser les notes depuis <références-notes>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1739
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "sous-commande inconnue : %s"
 
-#: builtin/pack-objects.c:54
-msgid "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects --stdout [options...] [< <liste-références> | < <liste-objets>]"
+#: builtin/pack-objects.c:182
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects --stdout [options...] [< <liste-références> | < <liste-"
+"objets>]"
 
-#: builtin/pack-objects.c:55
-msgid "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects [options...] base-name [< <liste-références> | < <liste-objets>]"
+#: builtin/pack-objects.c:183
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects [options...] base-name [< <liste-références> | < <liste-"
+"objets>]"
 
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
 #, c-format
-msgid "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in pack %s"
-msgstr "write_reuse_object : impossible de localiser %s, attendu à l'offset %<PRIuMAX> dans le paquet %s"
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+"write_reuse_object : impossible de localiser %s, attendu à l'offset "
+"%<PRIuMAX> dans le paquet %s"
 
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "mauvais CRC d'objet empaqueté pour %s"
 
-#: builtin/pack-objects.c:459
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "objet empaqueté corrompu pour %s"
 
-#: builtin/pack-objects.c:590
+#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "delta récursif détecté pour l'objet %s"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u objets commandés, %<PRIu32> attendus"
 
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "objet attendu à l'offset %<PRIuMAX> dans le paquet %s"
 
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1160
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
-msgstr "désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à cause de pack.packSizeLimit"
+msgstr ""
+"désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à "
+"cause de pack.packSizeLimit"
 
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
 msgid "Writing objects"
 msgstr "Écriture des objets"
 
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "échec du stat de %s"
 
-#: builtin/pack-objects.c:1141
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "écrire un index de bitmap"
+
+#: builtin/pack-objects.c:1294
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus"
 
-#: builtin/pack-objects.c:1383
+#: builtin/pack-objects.c:1536
 msgid "disabling bitmap writing, as some objects are not being packed"
-msgstr "désactivation de l'écriture en bitmap car certains objets ne sont pas compressés"
+msgstr ""
+"désactivation de l'écriture en bitmap car certains objets ne sont pas "
+"compressés"
 
-#: builtin/pack-objects.c:1831
+#: builtin/pack-objects.c:1984
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "dépassement de décalage de base de delta pour %s"
 
-#: builtin/pack-objects.c:1840
+#: builtin/pack-objects.c:1993
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "décalage de base de delta est hors limite pour %s"
 
-#: builtin/pack-objects.c:2121
+#: builtin/pack-objects.c:2274
 msgid "Counting objects"
 msgstr "Décompte des objets"
 
-#: builtin/pack-objects.c:2266
+#: builtin/pack-objects.c:2439
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "impossible d'analyser l'entête d'objet de %s"
 
-#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 builtin/pack-objects.c:2362
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
 #, c-format
 msgid "object %s cannot be read"
 msgstr "l'objet %s ne peut être lu"
 
-#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
-msgstr "objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)"
+msgstr ""
+"objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2376
+#: builtin/pack-objects.c:2549
 msgid "suboptimal pack - out of memory"
 msgstr "paquet sous-optimal - mémoire insuffisante"
 
-#: builtin/pack-objects.c:2691
+#: builtin/pack-objects.c:2864
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Compression par delta en utilisant jusqu'à %d fils d'exécution"
 
-#: builtin/pack-objects.c:2830
+#: builtin/pack-objects.c:3003
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "impossible d'empaqueter les objets joignables depuis l'étiquette %s"
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:3089
 msgid "Compressing objects"
 msgstr "Compression des objets"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:3095
 msgid "inconsistency with delta count"
 msgstr "inconsistance dans le compte de delta"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3174
 #, c-format
-msgid "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-hash> <uri>' (got '%s')"
-msgstr "la valeur de uploadpack.blobpackfileuri doit être de la forme '<empreinte-d-objet> <empreinte-de-pack> <uri>' ('%s' reçu)"
+msgid ""
+"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
+"hash> <uri>' (got '%s')"
+msgstr ""
+"la valeur de uploadpack.blobpackfileuri doit être de la forme '<empreinte-d-"
+"objet> <empreinte-de-pack> <uri>' ('%s' reçu)"
 
-#: builtin/pack-objects.c:3004
+#: builtin/pack-objects.c:3177
 #, c-format
-msgid "object already configured in another uploadpack.blobpackfileuri (got '%s')"
-msgstr "l'objet est déjà configuré dans un autre uploadpack.blobpackfileuri ('%s' reçu)"
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+"l'objet est déjà configuré dans un autre uploadpack.blobpackfileuri ('%s' "
+"reçu)"
 
-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3212
 #, c-format
 msgid "could not get type of object %s in pack %s"
 msgstr "impossible d'obtenir le type de l'objet %s dans le paquet %s"
 
-#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "impossible de trouver le paquet '%s'"
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3408
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -18052,7 +19396,7 @@ msgstr ""
 "ID d'objet de bord attendu, reçu des données illisibles :\n"
 "%s"
 
-#: builtin/pack-objects.c:3224
+#: builtin/pack-objects.c:3414
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -18061,249 +19405,259 @@ msgstr ""
 "ID d'objet attendu, reçu des données illisibles :\n"
 "%s"
 
-#: builtin/pack-objects.c:3322
+#: builtin/pack-objects.c:3507
 msgid "invalid value for --missing"
 msgstr "valeur invalide pour --missing"
 
-#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
 msgid "cannot open pack index"
 msgstr "impossible d'ouvrir l'index de paquet"
 
-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3541
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "l'objet libre à %s n'a pas pu être examiné"
 
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3627
 msgid "unable to force loose object"
 msgstr "impossible de forcer l'objet libre"
 
-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3757
 #, c-format
 msgid "not a rev '%s'"
 msgstr "'%s' n'est pas une révision"
 
-#: builtin/pack-objects.c:3631
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "mauvaise révision '%s'"
 
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3788
 msgid "unable to add recent objects"
 msgstr "impossible d'ajouter les objets récents"
 
-#: builtin/pack-objects.c:3712
+#: builtin/pack-objects.c:3841
 #, c-format
 msgid "unsupported index version %s"
 msgstr "version d'index non supportée %s"
 
-#: builtin/pack-objects.c:3716
+#: builtin/pack-objects.c:3845
 #, c-format
 msgid "bad index version '%s'"
 msgstr "mauvaise version d'index '%s'"
 
-#: builtin/pack-objects.c:3755
+#: builtin/pack-objects.c:3884
 msgid "<version>[,<offset>]"
 msgstr "<version>[,<décalage>]"
 
-#: builtin/pack-objects.c:3756
+#: builtin/pack-objects.c:3885
 msgid "write the pack index file in the specified idx format version"
-msgstr "écrire le fichier d'index du paquet dans le format d'index de version spécifié"
+msgstr ""
+"écrire le fichier d'index du paquet dans le format d'index de version "
+"spécifié"
 
-#: builtin/pack-objects.c:3759
+#: builtin/pack-objects.c:3888
 msgid "maximum size of each output pack file"
 msgstr "taille maximum de chaque fichier paquet en sortie"
 
-#: builtin/pack-objects.c:3761
+#: builtin/pack-objects.c:3890
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorer les objets empruntés à un autre magasin d'objets"
 
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c:3892
 msgid "ignore packed objects"
 msgstr "ignorer les objets empaquetés"
 
-#: builtin/pack-objects.c:3765
+#: builtin/pack-objects.c:3894
 msgid "limit pack window by objects"
 msgstr "limiter la fenêtre d'empaquetage par objets"
 
-#: builtin/pack-objects.c:3767
+#: builtin/pack-objects.c:3896
 msgid "limit pack window by memory in addition to object limit"
-msgstr "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"
+msgstr ""
+"limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"
 
-#: builtin/pack-objects.c:3769
+#: builtin/pack-objects.c:3898
 msgid "maximum length of delta chain allowed in the resulting pack"
-msgstr "longueur maximum de la chaîne de delta autorisée dans le paquet résultant"
+msgstr ""
+"longueur maximum de la chaîne de delta autorisée dans le paquet résultant"
 
-#: builtin/pack-objects.c:3771
+#: builtin/pack-objects.c:3900
 msgid "reuse existing deltas"
 msgstr "réutiliser les deltas existants"
 
-#: builtin/pack-objects.c:3773
+#: builtin/pack-objects.c:3902
 msgid "reuse existing objects"
 msgstr "réutiliser les objets existants"
 
-#: builtin/pack-objects.c:3775
+#: builtin/pack-objects.c:3904
 msgid "use OFS_DELTA objects"
 msgstr "utiliser les objets OFS_DELTA"
 
-#: builtin/pack-objects.c:3777
+#: builtin/pack-objects.c:3906
 msgid "use threads when searching for best delta matches"
-msgstr "utiliser des fils lors de la recherche pour une meilleure correspondance des deltas"
+msgstr ""
+"utiliser des fils lors de la recherche pour une meilleure correspondance des "
+"deltas"
 
-#: builtin/pack-objects.c:3779
+#: builtin/pack-objects.c:3908
 msgid "do not create an empty pack output"
 msgstr "ne pas créer un paquet vide"
 
-#: builtin/pack-objects.c:3781
+#: builtin/pack-objects.c:3910
 msgid "read revision arguments from standard input"
 msgstr "lire les paramètres de révision depuis l'entrée standard"
 
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:3912
 msgid "limit the objects to those that are not yet packed"
 msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés"
 
-#: builtin/pack-objects.c:3786
+#: builtin/pack-objects.c:3915
 msgid "include objects reachable from any reference"
 msgstr "inclure les objets accessibles depuis toute référence"
 
-#: builtin/pack-objects.c:3789
+#: builtin/pack-objects.c:3918
 msgid "include objects referred by reflog entries"
 msgstr "inclure les objets référencés par les éléments de reflog"
 
-#: builtin/pack-objects.c:3792
+#: builtin/pack-objects.c:3921
 msgid "include objects referred to by the index"
 msgstr "inclure les objets référencés par l'index"
 
-#: builtin/pack-objects.c:3795
+#: builtin/pack-objects.c:3924
 msgid "read packs from stdin"
 msgstr "lire les paquets depuis l'entrée standard"
 
-#: builtin/pack-objects.c:3797
+#: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
 msgstr "afficher l'empaquetage sur la sortie standard"
 
-#: builtin/pack-objects.c:3799
+#: builtin/pack-objects.c:3928
 msgid "include tag objects that refer to objects to be packed"
 msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter"
 
-#: builtin/pack-objects.c:3801
+#: builtin/pack-objects.c:3930
 msgid "keep unreachable objects"
 msgstr "garder les objets inaccessibles"
 
-#: builtin/pack-objects.c:3803
+#: builtin/pack-objects.c:3932
 msgid "pack loose unreachable objects"
 msgstr "empaqueter les objets inaccessibles détachés"
 
-#: builtin/pack-objects.c:3805
+#: builtin/pack-objects.c:3934
 msgid "unpack unreachable objects newer than <time>"
 msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
 
-#: builtin/pack-objects.c:3808
+#: builtin/pack-objects.c:3937
 msgid "use the sparse reachability algorithm"
 msgstr "utiliser l'algorithme de joignabilité creuse"
 
-#: builtin/pack-objects.c:3810
+#: builtin/pack-objects.c:3939
 msgid "create thin packs"
 msgstr "créer des paquets légers"
 
-#: builtin/pack-objects.c:3812
+#: builtin/pack-objects.c:3941
 msgid "create packs suitable for shallow fetches"
 msgstr "créer des paquets permettant des récupérations superficielles"
 
-#: builtin/pack-objects.c:3814
+#: builtin/pack-objects.c:3943
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorer les paquets qui ont un fichier .keep"
 
-#: builtin/pack-objects.c:3816
+#: builtin/pack-objects.c:3945
 msgid "ignore this pack"
 msgstr "ignorer ce paquet"
 
-#: builtin/pack-objects.c:3818
+#: builtin/pack-objects.c:3947
 msgid "pack compression level"
 msgstr "niveau de compression du paquet"
 
-#: builtin/pack-objects.c:3820
+#: builtin/pack-objects.c:3949
 msgid "do not hide commits by grafts"
 msgstr "ne pas cacher les validations par greffes"
 
-#: builtin/pack-objects.c:3822
+#: builtin/pack-objects.c:3951
 msgid "use a bitmap index if available to speed up counting objects"
-msgstr "utiliser un index en bitmap si disponible pour accélerer le décompte des objets"
+msgstr ""
+"utiliser un index en bitmap si disponible pour accélerer le décompte des "
+"objets"
 
-#: builtin/pack-objects.c:3824
+#: builtin/pack-objects.c:3953
 msgid "write a bitmap index together with the pack index"
 msgstr "écrire un index en bitmap associé à l'index de paquet"
 
-#: builtin/pack-objects.c:3828
+#: builtin/pack-objects.c:3957
 msgid "write a bitmap index if possible"
 msgstr "écrire un index de bitmap si possible"
 
-#: builtin/pack-objects.c:3832
+#: builtin/pack-objects.c:3961
 msgid "handling for missing objects"
 msgstr "gestion des objets manquants"
 
-#: builtin/pack-objects.c:3835
+#: builtin/pack-objects.c:3964
 msgid "do not pack objects in promisor packfiles"
 msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs"
 
-#: builtin/pack-objects.c:3837
+#: builtin/pack-objects.c:3966
 msgid "respect islands during delta compression"
 msgstr "respecter les îlots pendant la compression des deltas"
 
-#: builtin/pack-objects.c:3839
+#: builtin/pack-objects.c:3968
 msgid "protocol"
 msgstr "protocole"
 
-#: builtin/pack-objects.c:3840
+#: builtin/pack-objects.c:3969
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr "exclure tout uploadpack.blobpackfileuri configuré avec ce protocole"
 
-#: builtin/pack-objects.c:3873
+#: builtin/pack-objects.c:4002
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "la profondeur %d de chaîne de delta est trop grande, forcée à %d"
 
-#: builtin/pack-objects.c:3878
+#: builtin/pack-objects.c:4007
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit est trop grand, forcé à %d"
 
-#: builtin/pack-objects.c:3934
+#: builtin/pack-objects.c:4063
 msgid "--max-pack-size cannot be used to build a pack for transfer"
-msgstr "--max-pack-size ne peut pas être utilisé pour construire un paquet à transférer"
+msgstr ""
+"--max-pack-size ne peut pas être utilisé pour construire un paquet à "
+"transférer"
 
-#: builtin/pack-objects.c:3936
+#: builtin/pack-objects.c:4065
 msgid "minimum pack size limit is 1 MiB"
 msgstr "la taille limite minimale d'un paquet est 1 MiB"
 
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:4070
 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:3944
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles"
-
-#: builtin/pack-objects.c:3950
+#: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "impossible d'utiliser --filter sans --stdout"
 
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:4081
 msgid "cannot use --filter with --stdin-packs"
 msgstr "impossible d'utiliser --filter avec --stdin-packs"
 
-#: builtin/pack-objects.c:3956
+#: builtin/pack-objects.c:4085
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr "impossible d'utiliser un liste interne de révisions avec --stdin-packs"
 
-#: builtin/pack-objects.c:4015
+#: builtin/pack-objects.c:4144
 msgid "Enumerating objects"
 msgstr "Énumération des objets"
 
-#: builtin/pack-objects.c:4052
+#: builtin/pack-objects.c:4180
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-reused %<PRIu32>"
-msgstr "Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>), réutilisés du pack %<PRIu32>"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>), "
+"réutilisés du pack %<PRIu32>"
 
 #: builtin/pack-redundant.c:601
 msgid ""
@@ -18339,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:152
+#: 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"
 
@@ -18364,52 +19718,63 @@ msgstr "Valeur invalide pour %s : %s"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
 
-#: builtin/pull.c:123
+#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
 msgstr "contrôler la récupération récursive dans les sous-modules"
 
-#: builtin/pull.c:127
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Options relatives à la fusion"
 
-#: builtin/pull.c:130
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
 
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "autoriser l'avance rapide"
 
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+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:340
 msgid "automatically stash/stash pop before and after"
 msgstr "remiser et réappliquer automatiquement avant et après"
 
-#: builtin/pull.c:183
+#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "Options relatives au rapatriement"
 
-#: builtin/pull.c:193
+#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "forcer l'écrasement de la branche locale"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr "nombre de sous-modules tirés en parallèle"
 
-#: builtin/pull.c:317
+#: builtin/pull.c:321
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valeur invalide pour pull.ff : %s"
 
-#: builtin/pull.c:445
-msgid "There is no candidate for rebasing against among the refs that you just fetched."
-msgstr "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous venez de récupérer."
+#: builtin/pull.c:449
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+"Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous "
+"venez de récupérer."
 
-#: builtin/pull.c:447
-msgid "There are no candidates for merging among the refs that you just fetched."
-msgstr "Il n'y a pas de candidate avec laquelle fusionner parmi les références que vous venez de récupérer."
+#: builtin/pull.c:451
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+"Il n'y a pas de candidate avec laquelle fusionner parmi les références que "
+"vous venez de récupérer."
 
-#: builtin/pull.c:448
+#: builtin/pull.c:452
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -18417,7 +19782,7 @@ msgstr ""
 "Généralement, cela signifie que vous avez indiqué un spécificateur\n"
 "de référence joker qui n'a pas eu de correspondance sur le serveur distant."
 
-#: builtin/pull.c:451
+#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -18425,76 +19790,84 @@ msgid ""
 "for your current branch, you must specify a branch on the command line."
 msgstr ""
 "Vous avez demandé de tirer depuis le dépôt distant '%s', mais sans indiquer\n"
-"la branche. Comme ce n'est pas le dépôt distant par défaut dans la configuration\n"
+"la branche. Comme ce n'est pas le dépôt distant par défaut dans la "
+"configuration\n"
 "pour la branche actuelle, vous devez spécifier la branche avec la commande."
 
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
 msgid "You are not currently on a branch."
 msgstr "Vous n'êtes actuellement sur aucune branche."
 
-#: 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 "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
 
-#: 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 "Veuillez spécifier une branche avec laquelle fusionner."
 
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
 
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
 msgid "<remote>"
 msgstr "<distant>"
 
-#: 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 "<branche>"
 
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
 msgid "There is no tracking information for the current branch."
 msgstr "Pas d'information de suivi distant pour la branche actuelle."
 
-#: builtin/pull.c:480
-msgid "If you wish to set tracking information for this branch you can do so with:"
-msgstr "Si vous souhaitez indiquer l'information de suivi distant pour cette branche, vous pouvez le faire avec :"
+#: builtin/pull.c:484
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr ""
+"Si vous souhaitez indiquer l'information de suivi distant pour cette "
+"branche, vous pouvez le faire avec :"
 
-#: builtin/pull.c:485
+#: builtin/pull.c:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr ""
-"Votre information de configuration indique de fusionner avec la référence '%s'\n"
+"Votre information de configuration indique de fusionner avec la référence "
+"'%s'\n"
 "du serveur distant, mais cette référence n'a pas été récupérée."
 
-#: builtin/pull.c:596
+#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "impossible d'accéder le commit %s"
 
-#: builtin/pull.c:902
+#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "--verify-signatures est ignoré pour un rebasage"
 
-#: builtin/pull.c:930
+#: builtin/pull.c:969
 msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"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"
-"You can replace \"git config\" with \"git config --global\" to set a default\n"
+"You can replace \"git config\" with \"git config --global\" to set a "
+"default\n"
 "preference for all repositories. You can also pass --rebase, --no-rebase,\n"
 "or --ff-only on the command line to override the configured default per\n"
 "invocation.\n"
 msgstr ""
-"Tirer sans spécifier comment réconcilier les branches divergentes\n"
-"est découragé. Vous pouvez éliminer ce message en lançant une des\n"
+"Vous avez des branches divergentes et vous devez spécifier comment\n"
+"les réconcilier. Vous pouvez le faire en lançant une des\n"
 "commandes suivantes avant votre prochain tirage :\n"
 "\n"
 "  git config pull.rebase false  # fusion (stratégie par défaut)\n"
@@ -18506,19 +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:991
+#: 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."
+msgstr ""
+"Mise à jour d'une branche non encore créée avec les changements ajoutés dans "
+"l'index."
 
-#: builtin/pull.c:995
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "tirer avec un rebasage"
 
-#: builtin/pull.c:996
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "veuillez les valider ou les remiser."
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -18529,7 +19904,7 @@ msgstr ""
 "avance rapide de votre copie de travail\n"
 "depuis le commit %s."
 
-#: builtin/pull.c:1027
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -18546,17 +19921,27 @@ msgstr ""
 "$ git reset --hard\n"
 "pour régénérer."
 
-#: builtin/pull.c:1042
+#: 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:1046
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "Impossible de rebaser sur de multiples branches."
 
-#: builtin/pull.c:1067
+#: 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:1119
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Besoin de spécifier comment réconcilier des branches divergentes."
+
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
-msgstr "impossible de rebaser avec des modifications de sous-modules enregistrées localement"
+msgstr ""
+"impossible de rebaser avec des modifications de sous-modules enregistrées "
+"localement"
 
 #: builtin/push.c:19
 msgid "git push [<options>] [<repository> [<refspec>...]]"
@@ -18576,7 +19961,8 @@ msgid ""
 "To choose either option permanently, see push.default in 'git help config'."
 msgstr ""
 "\n"
-"Pour choisir l'option de manière permanente, voir push.default dans 'git help config'."
+"Pour choisir l'option de manière permanente, voir push.default dans 'git "
+"help config'."
 
 #: builtin/push.c:167
 #, c-format
@@ -18618,7 +20004,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nom-de-la-branche-amont>\n"
 
-#: builtin/push.c:194
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -18627,16 +20013,25 @@ msgid ""
 "    git push --set-upstream %s %s\n"
 msgstr ""
 "La branche courante %s n'a pas de branche amont.\n"
-"Pour pousser la branche courante et définir la distante comme amont, utilisez\n"
+"Pour pousser la branche courante et définir la distante comme amont, "
+"utilisez\n"
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:202
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
-msgstr "La branche courante %s a de multiples branches amont, impossible de pousser."
+msgstr ""
+"La branche courante %s a de multiples branches amont, impossible de pousser."
 
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Vous n'avez pas spécifié de spécifications de référence à pousser, et push."
+"default est \"nothing\"."
+
+#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -18647,35 +20042,37 @@ msgstr ""
 "qui n'est pas l'amont de votre branche courante '%s', sans\n"
 "me dire quoi pousser pour mettre à jour quelle branche amont."
 
-#: builtin/push.c:260
-msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "Vous n'avez pas spécifié de spécifications de référence à pousser, et push.default est \"nothing\"."
-
-#: builtin/push.c:267
+#: builtin/push.c:258
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
 "'git pull ...') before pushing again.\n"
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
-"Les mises à jour ont été rejetées car la pointe de la branche courante est derrière\n"
-"son homologue distant. Intégrez les changements distants (par exemple 'git pull ...')\n"
+"Les mises à jour ont été rejetées car la pointe de la branche courante est "
+"derrière\n"
+"son homologue distant. Intégrez les changements distants (par exemple 'git "
+"pull ...')\n"
 "avant de pousser à nouveau.\n"
-"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus d'information."
+"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
+"d'information."
 
-#: builtin/push.c:273
+#: builtin/push.c:264
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
 "(e.g. 'git pull ...') before pushing again.\n"
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
-"Les mises à jour ont été rejetées car la pointe de la branche courante est derrière\n"
-"son homologue distant. Extrayez cette branche et intégrez les changements distants\n"
+"Les mises à jour ont été rejetées car la pointe de la branche courante est "
+"derrière\n"
+"son homologue distant. Extrayez cette branche et intégrez les changements "
+"distants\n"
 "(par exemple 'git pull ...') avant de pousser à nouveau.\n"
-"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus d'information."
+"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
+"d'information."
 
-#: builtin/push.c:279
+#: builtin/push.c:270
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -18683,27 +20080,35 @@ msgid ""
 "(e.g., 'git pull ...') before pushing again.\n"
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
-"Les mises à jour ont été rejetées car la branche distante contient du travail que\n"
-"vous n'avez pas en local. Ceci est généralement causé par un autre dépôt poussé\n"
-"vers la même référence. Vous pourriez intégrer d'abord les changements distants\n"
+"Les mises à jour ont été rejetées car la branche distante contient du "
+"travail que\n"
+"vous n'avez pas en local. Ceci est généralement causé par un autre dépôt "
+"poussé\n"
+"vers la même référence. Vous pourriez intégrer d'abord les changements "
+"distants\n"
 "(par exemple 'git pull ...') avant de pousser à nouveau.\n"
-"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus d'information."
+"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
+"d'information."
 
-#: builtin/push.c:286
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
-msgstr "Les mises à jour ont été rejetées car l'étiquette existe déjà dans la branche distante."
+msgstr ""
+"Les mises à jour ont été rejetées car l'étiquette existe déjà dans la "
+"branche distante."
 
-#: builtin/push.c:289
+#: builtin/push.c:280
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
 "without using the '--force' option.\n"
 msgstr ""
-"Vous ne pouvez pas mettre à jour une référence distante qui pointe sur un objet qui\n"
-"n'est pas un commit, ou mettre à jour une référence distante pour la faire pointer\n"
+"Vous ne pouvez pas mettre à jour une référence distante qui pointe sur un "
+"objet qui\n"
+"n'est pas un commit, ou mettre à jour une référence distante pour la faire "
+"pointer\n"
 "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
 
-#: builtin/push.c:294
+#: builtin/push.c:285
 msgid ""
 "Updates were rejected because the tip of the remote-tracking\n"
 "branch has been updated since the last checkout. You may want\n"
@@ -18715,105 +20120,104 @@ msgstr ""
 "ces changements localement (par exemple 'git pull ...') avant de\n"
 "forcer à nouveau une mise à jour.\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Poussée vers %s\n"
 
-#: builtin/push.c:371
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "impossible de pousser des références vers '%s'"
 
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "dépôt"
 
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
 msgstr "pousser toutes les références"
 
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr "refléter toutes les références"
 
-#: builtin/push.c:557
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "supprimer les références"
 
-#: builtin/push.c:558
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
-msgstr "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
+msgstr ""
+"pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
 
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "forcer les mises à jour"
 
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "<nom-de-ref>:<attendu>"
 
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
 msgid "require old value of ref to be at this value"
 msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur"
 
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
 msgid "require remote updates to be integrated locally"
 msgstr "exiger des mises à jours distantes pour une intégration locale"
 
-#: builtin/push.c:569
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "contrôler la poussée récursive des sous-modules"
 
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
 msgid "use thin pack"
 msgstr "utiliser un empaquetage léger"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "recevoir le programme d'empaquetage"
 
-#: builtin/push.c:573
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "définir la branche amont pour git pull/status"
 
-#: builtin/push.c:576
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "éliminer les références locales supprimées"
 
-#: builtin/push.c:578
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "éviter d'utiliser le crochet pre-push"
 
-#: builtin/push.c:579
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "pousser les étiquettes manquantes mais pertinentes"
 
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
 msgstr "signer la poussée avec GPG"
 
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
 msgid "request atomic transaction on remote side"
 msgstr "demande une transaction atomique sur le serveur distant"
 
-#: builtin/push.c:601
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete est incompatible avec --all, --mirror et --tags"
-
-#: builtin/push.c:603
+#: 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"
 
-#: builtin/push.c:623
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "mauvais dépôt '%s'"
 
-#: builtin/push.c:624
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote repository using\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
 "\n"
 "    git remote add <name> <url>\n"
 "\n"
@@ -18822,7 +20226,8 @@ msgid ""
 "    git push <name>\n"
 msgstr ""
 "Pas de destination pour pousser.\n"
-"Spécifiez une URL depuis la ligne de commande ou configurez un dépôt distant en utilisant\n"
+"Spécifiez une URL depuis la ligne de commande ou configurez un dépôt distant "
+"en utilisant\n"
 "\n"
 "    git remote add <nom> <url>\n"
 "\n"
@@ -18830,33 +20235,25 @@ msgstr ""
 "\n"
 "    git push <nom>\n"
 
-#: builtin/push.c:639
-msgid "--all and --tags are incompatible"
-msgstr "--all et --tags sont incompatibles"
-
-#: builtin/push.c:641
+#: 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:645
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror et --tags sont incompatibles"
-
-#: builtin/push.c:647
+#: 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:650
-msgid "--all and --mirror are incompatible"
-msgstr "--all et --mirror sont incompatibles"
-
-#: builtin/push.c:657
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
-msgstr "les options de poussée ne peuvent pas contenir de caractères de nouvelle ligne"
+msgstr ""
+"les options de poussée ne peuvent pas contenir de caractères de nouvelle "
+"ligne"
 
 #: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
-msgstr "git range-diff [<options>] <ancienne-base>..<ancien-sommet> <nouvelle-base>..<nouveau-sommet>"
+msgstr ""
+"git range-diff [<options>] <ancienne-base>..<ancien-sommet> <nouvelle-base>.."
+"<nouveau-sommet>"
 
 #: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
@@ -18901,295 +20298,158 @@ msgstr "plage entre deux commits requise"
 
 #: builtin/read-tree.c:41
 msgid ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-"
-"output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<préfixe>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-"
-"output=<fichier>] (--empty | <arbre-esque> [<arbre-esque 2> [<arbre-esque 3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<préfixe>) [-u | -i]] [--no-sparse-checkout] [--index-"
+"output=<fichier>] (--empty | <arbre-esque1> [<arbre-esque2> [<arbre-"
+"esque3>]])"
 
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "écrire l'index résultant dans <fichier>"
 
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "juste vider l'index"
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "Fusion"
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
 msgid "perform a merge in addition to a read"
 msgstr "effectuer une fusion en plus d'une lecture"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
 msgid "3-way merge if no file level merging required"
 msgstr "fusion à 3 points si aucune fusion de niveau fichier n'est requise"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
 msgid "3-way merge in presence of adds and removes"
 msgstr "fusion à 3 points en présence d'ajouts et suppressions"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "comme -m, mais annule les éléments non fusionnés"
 
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<sous-répertoire>/"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "lire l'arbre dans l'index dans <sous-répertoire>/"
 
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
 msgid "update working tree with merge result"
 msgstr "mettre à jour la copie de travail avec le résultat de la fusion"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "autoriser explicitement les fichiers ignorés à être écrasés"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
 msgid "don't check the working tree after merging"
 msgstr "ne pas vérifier la copie de travail après la fusion"
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
 msgid "don't update the index or the work tree"
 msgstr "ne pas mettre à jour l'index ou la copie de travail"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
 msgid "skip applying sparse checkout filter"
 msgstr "sauter l'application du filtre d'extraction creuse"
 
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "déboguer unpack-trees"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "supprimer les messages d'information de suivi"
 
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
 msgid "You need to resolve your current index first"
 msgstr "Vous devez d'abord résoudre votre index courant"
 
 #: builtin/rebase.c:35
-msgid "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] [<upstream> [<branch>]]"
-msgstr "git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base> | --keep-base] [<amont> [<branche>]]"
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
+msgstr ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base> | --keep-"
+"base] [<amont> [<branche>]]"
 
 #: builtin/rebase.c:37
-msgid "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
-msgstr "git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base>] --root [<branche>]"
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base>] --root "
+"[<branche>]"
 
 #: builtin/rebase.c:39
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "liste à faire inutilisable : '%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
 #, c-format
 msgid "could not create temporary %s"
 msgstr "impossible de créer un fichier temporaire %s"
 
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
 msgid "could not mark as interactive"
 msgstr "impossible de marquer comme interactif"
 
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
 msgid "could not generate todo list"
 msgstr "impossible de générer la liste à-faire"
 
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "un commit de base doit être fourni avec --upstream ou --onto"
 
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<options>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "conserver les commits qui commencent vides"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "autoriser les validations avec des messages vides"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "rebaser les commits de fusion"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "conserver les points de branchement de cousins originaux"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "déplacer les commits qui commencent par squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "signer les commits"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "afficher un diffstat de ce qui a changé en amont"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "continuer le rebasage"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "sauter le commit"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "éditer la liste à-faire"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "afficher le patch courant"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "raccourcir les identifiants de commits dans la liste à-faire"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "étendre les identifiants de commit dans la liste à-faire"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "vérifier la liste à-faire"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "réarranger les lignes fixup/squash"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "insérer les commandes exec dans la liste à-faire"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "sur"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "restreindre la révision"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "écraser-sur"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "écraser sur"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "le commit amont"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "nom du head"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "nom du head"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "stratégie de rebasage"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "options de stratégie"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "options de stratégie"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "switch-to"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "la branche ou le commit à extraire"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "sur-le-nom"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "sur le nom"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "la commande à lancer"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "re-planifier automatiquement tout `exec` qui échoue"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s requiert un moteur de fusion"
 
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "impossible d'accéder 'onto' : '%s'"
 
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head invalide : '%s'"
 
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "allow_rerere_autoupdate invalide ignoré : '%s'"
 
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
 "You can instead skip this commit: run \"git rebase --skip\".\n"
-"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"."
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
 msgstr ""
 "Résolvez tous les conflits manuellement, marquez-les comme résolus avec\n"
 "\"git add/rm <fichier en conflit>\", puis lancez \"git rebase --continue\".\n"
-"Si vous préférez sauter ce commit, lancez \"git rebase --skip\". Pour arrêter\n"
+"Si vous préférez sauter ce commit, lancez \"git rebase --skip\". Pour "
+"arrêter\n"
 "et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"."
 
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
 #, c-format
 msgid ""
 "\n"
@@ -19208,12 +20468,16 @@ msgstr ""
 "\n"
 "Résultat, git ne peut pas les rebaser."
 
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
 #, c-format
-msgid "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."
-msgstr "type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), \"keep\" (garder) et \"ask\" (demander)."
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), "
+"\"keep\" (garder) et \"ask\" (demander)."
 
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -19230,7 +20494,7 @@ msgstr ""
 "    git rebase '<branche>'\n"
 "\n"
 
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -19238,184 +20502,189 @@ msgid ""
 "    git branch --set-upstream-to=%s/<branch> %s\n"
 "\n"
 msgstr ""
-"Si vous souhaitez indiquer l'information de suivi distant pour cette branche, vous pouvez le faire avec :\n"
+"Si vous souhaitez indiquer l'information de suivi distant pour cette "
+"branche, vous pouvez le faire avec :\n"
 "\n"
 "    git branch --set-upstream-to=%s/<branche> %s\n"
 "\n"
 
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
 msgid "exec commands cannot contain newlines"
 msgstr "les commandes exec ne peut pas contenir de retour à la ligne"
 
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
 msgid "empty exec command"
 msgstr "commande exec vide"
 
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
 msgid "rebase onto given branch instead of upstream"
 msgstr "rebaser sur la branche %s au lieu de la branche amont"
 
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
 msgid "use the merge-base of upstream and branch as the current base"
-msgstr "utiliser la base de fusion de l'amont et la branche comme base actuelle"
+msgstr ""
+"utiliser la base de fusion de l'amont et la branche comme base actuelle"
 
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
 msgid "allow pre-rebase hook to run"
 msgstr "permettre le lancement du crochet pre-rebase"
 
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
 msgid "be quiet. implies --no-stat"
 msgstr "être silencieux. implique --no-stat"
 
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "afficher un diffstat de ce qui a changé en amont"
+
+#: builtin/rebase.c:1035
 msgid "do not show diffstat of what changed upstream"
 msgstr "ne pas afficher un diffstat de ce qui a changé en amont"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "ajouter une ligne Signed-off-by à chaque message de validation"
 
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
 msgid "make committer date match author date"
 msgstr "mettre la date de validateur à la date auteur"
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
 msgid "ignore author date and use current date"
 msgstr "ignorer la date d'auteur et utilise la date actuelle"
 
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
 msgid "synonym of --reset-author-date"
 msgstr "synonyme pour --reset-author-date"
 
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
 msgid "passed to 'git apply'"
-msgstr "passé jusqu'à git-apply"
+msgstr "passé jusqu'à git apply"
 
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
 msgid "ignore changes in whitespace"
 msgstr "ignorer des modifications d'espaces"
 
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "picorer tous les commits, même sans modifiant"
 
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
 msgid "continue"
 msgstr "continuer"
 
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
 msgid "skip current patch and continue"
 msgstr "sauter le patch courant et continuer"
 
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
 msgid "abort and check out the original branch"
 msgstr "abandonner et extraire la branche d'origine"
 
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
 msgid "abort but keep HEAD where it is"
 msgstr "abandonne mais garde HEAD où il est"
 
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
 msgid "edit the todo list during an interactive rebase"
 msgstr "éditer la liste à faire lors d'un rebasage interactif"
 
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
 msgid "show the patch file being applied or merged"
 msgstr "afficher le patch en cours d'application ou de fusion"
 
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
 msgid "use apply strategies to rebase"
 msgstr "utiliser des stratégies d'application pour rebaser"
 
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
 msgid "use merging strategies to rebase"
 msgstr "utiliser des stratégies de fusion pour rebaser"
 
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
 msgid "let the user edit the list of commits to rebase"
 msgstr "laisser l'utilisateur éditer la liste des commits à rebaser"
 
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "(DÉCONSEILLÉ) essayer de recréer les fusions au lieu de les ignorer"
 
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
 msgid "how to handle commits that become empty"
 msgstr "comment gérer les commits qui deviennent vides"
 
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "conserver les commits qui commencent vides"
+
+#: builtin/rebase.c:1097
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "déplace les commits qui commencent par squash!/fixup! sous -i"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
 msgid "add exec lines after each commit of the editable list"
 msgstr "ajouter les lignes exec après chaque commit de la liste éditable"
 
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
 msgid "allow rebasing commits with empty messages"
 msgstr "autoriser les commits de rebasage avec des messages vides"
 
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
 msgid "try to rebase merges instead of skipping them"
 msgstr "essayer de rebaser les fusions au lieu de les garder"
 
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont"
 
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
 msgid "use the given merge strategy"
 msgstr "utiliser la stratégie de fusion indiquée"
 
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
 msgid "option"
 msgstr "option"
 
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
 msgid "pass the argument through to the merge strategy"
 msgstr "passer les arguments jusqu'à la stratégie de fusion"
 
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "rebaser tous les objets inatteignables depuis les racines"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "re-planifier automatiquement tout `exec` qui échoue"
+
+#: builtin/rebase.c:1128
 msgid "apply all changes, even those already present upstream"
-msgstr "appliquer toutes les modifications, même celles déjà présentes en amont"
+msgstr ""
+"appliquer toutes les modifications, même celles déjà présentes en amont"
 
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
 msgid "It looks like 'git am' is in progress. Cannot rebase."
-msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser."
-
-#: builtin/rebase.c:1483
-msgid "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr "git rebase --preserve-merges est déconseillé. Utilisez --rebase-merges à la place."
-
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "impossible de combiner '--keep-base' avec '--onto'"
+msgstr "Il semble que 'git am' soit en cours. Impossible de rebaser."
 
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "impossible de combiner '--keep-base' avec '--root'"
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges a été remplacé par --rebase-merges"
 
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "impossible de combiner '--root' avec '--fork-point'"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Pas de rebasage en cours ?"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
 msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr "L'action --edit-todo peut seulement être utilisée lors d'un rebasage interactif."
+msgstr ""
+"L'action --edit-todo peut seulement être utilisée lors d'un rebasage "
+"interactif."
 
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Impossible de lire HEAD"
 
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -19423,16 +20692,16 @@ msgstr ""
 "Vous devez éditer tous les conflits de fusion et\n"
 "les marquer comme résolus avec git add"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
 msgid "could not discard worktree changes"
 msgstr "impossible de supprimer les changements de l'arbre de travail"
 
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
 #, c-format
 msgid "could not move back to %s"
 msgstr "impossible de revenir à %s"
 
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -19450,141 +20719,138 @@ msgstr ""
 "\t%s\n"
 "Sinon, essayez\n"
 "\t%s\n"
-"puis relancez-moi à nouveau.  Je m'arrête au cas où vous auriez quelque chose\n"
+"puis relancez-moi à nouveau.  Je m'arrête au cas où vous auriez quelque "
+"chose\n"
 "d'important ici.\n"
 
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
 msgstr "l'option `C' attend un valeur numérique"
 
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Mode inconnu : %s"
 
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requiert --merge ou --interactive"
 
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr "impossible de combiner les options d'application avec les options de fusion"
+#: builtin/rebase.c:1463
+msgid "apply options and merge options cannot be used together"
+msgstr ""
+"Les options d'apply et celles de merge ne peuvent pas être utilisées ensemble"
 
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Backend de rebasage inconnu : %s"
 
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec requiert --exec ou --interactive"
 
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'"
-
-#: builtin/rebase.c:1826
-msgid "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr "erreur : impossible de combiner '--preserve-merges' avec '--reschedule-failed-exec'"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "amont invalide '%s'"
 
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
 msgid "Could not create new root commit"
 msgstr "Impossible de créer un nouveau commit racine"
 
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "'%s': exactement une base de fusion nécessaire avec une branche"
 
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': exactement une base de fusion nécessaire"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "Ne pointe pas sur une validation valide : '%s'"
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
 #, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "fatal : pas de branche ou commit '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "pas de branche ou commit '%s'"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:40 builtin/submodule--helper.c:2415
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "Référence inexistante : %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
 msgid "Could not resolve HEAD to a revision"
 msgstr "Impossible de résoudre le commit HEAD vers un révision"
 
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
 msgid "Please commit or stash them."
 msgstr "Veuillez les valider ou les remiser."
 
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
 #, c-format
 msgid "could not switch to %s"
 msgstr "impossible de basculer vers %s"
 
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
 msgid "HEAD is up to date."
 msgstr "HEAD est à jour."
 
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "La branche courante %s est à jour.\n"
 
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD est à jour, rebasage forcé."
 
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "La branche courante %s est à jour, rebasage forcé.\n"
 
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Le crochet pre-rebase a refusé de rebaser."
 
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Changements vers %s :\n"
 
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Changements de %s sur %s :\n"
 
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
-msgstr "Rembobinage préalable de head pour pouvoir rejouer votre travail par-dessus...\n"
+msgstr ""
+"Rembobinage préalable de head pour pouvoir rejouer votre travail par-"
+"dessus...\n"
 
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
 msgid "Could not detach HEAD"
 msgstr "Impossible de détacher HEAD"
 
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Avance rapide de %s sur %s.\n"
 
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <répertoire-git>"
 
-#: builtin/receive-pack.c:1276
+#: 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"
@@ -19614,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:1296
+#: 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"
@@ -19634,62 +20900,71 @@ msgstr ""
 "\n"
 "Pour éliminer ce message, réglez-le à 'refuse'."
 
-#: builtin/receive-pack.c:2479
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "quiet"
 
-#: builtin/receive-pack.c:2493
-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 "git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <refs>..."
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
 msgstr ""
-"git reflog expire [--expire=<date>] [--expire-unreachable=<date>] [--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <réferences>..."
+"git reflog expire [--expire=<date>] [--expire-unreachable=<date>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<réferences>..."
 
 #: builtin/reflog.c:22
-msgid "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <refs>..."
-msgstr "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <références>..."
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<références>..."
 
 #: builtin/reflog.c:25
 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:699
+#: 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 ]"
 
@@ -19698,8 +20973,12 @@ msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
 #: builtin/remote.c:18
-msgid "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <name> <url>"
-msgstr "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <nom> <url>"
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+"git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <nom> <url>"
 
 #: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
@@ -19722,8 +21001,11 @@ msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nom>"
 
 #: builtin/remote.c:24
-msgid "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
-msgstr "git remote [-v | --verbose] update [-p | --prune] [(<groupe> | <distante>)...]"
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<groupe> | "
+"<distante>)...]"
 
 #: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
@@ -19774,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"
@@ -19793,7 +21080,8 @@ msgstr "rapatrier les branches distantes"
 
 #: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
-msgstr "importer toutes les étiquettes et les objets associés lors du rapatriement"
+msgstr ""
+"importer toutes les étiquettes et les objets associés lors du rapatriement"
 
 #: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
@@ -19809,7 +21097,8 @@ msgstr "branche maîtresse"
 
 #: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
-msgstr "paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis"
+msgstr ""
+"paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis"
 
 #: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
@@ -19817,9 +21106,11 @@ msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror"
 
 #: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
-msgstr "spécifier les branches à suivre n'a de sens qu'avec des miroirs de rapatriement"
+msgstr ""
+"spécifier les branches à suivre n'a de sens qu'avec des miroirs de "
+"rapatriement"
 
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
 #, c-format
 msgid "remote %s already exists."
 msgstr "la distante %s existe déjà."
@@ -19829,25 +21120,32 @@ msgstr "la distante %s existe déjà."
 msgid "Could not setup master '%s'"
 msgstr "Impossible de paramétrer la maîtresse '%s'"
 
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "branch.%s.rebase=%s non géré ; 'true' supposé"
+
+#: builtin/remote.c:366
 #, c-format
 msgid "Could not get fetch map for refspec %s"
-msgstr "Impossible d'obtenir une correspondance distante pour la spécification de référence %s"
+msgstr ""
+"Impossible d'obtenir une correspondance distante pour la spécification de "
+"référence %s"
 
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
 msgid "(matching)"
 msgstr "(correspond)"
 
-#: builtin/remote.c:466
+#: builtin/remote.c:472
 msgid "(delete)"
 msgstr "(supprimer)"
 
-#: builtin/remote.c:655
+#: builtin/remote.c:660
 #, c-format
 msgid "could not set '%s'"
 msgstr "impossible d'assigner '%s'"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:665
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -19858,17 +21156,17 @@ msgstr ""
 "\t%s%d\n"
 "nomme à présent le distant inexistant '%s'"
 
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Pas de serveur remote : '%s'"
 
-#: builtin/remote.c:710
+#: builtin/remote.c:715
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Impossible de renommer la section de configuration '%s' en '%s'"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:735
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -19879,17 +21177,17 @@ msgstr ""
 "\t%s\n"
 "\tVeuillez mettre à jour la configuration manuellement si nécessaire."
 
-#: builtin/remote.c:770
+#: builtin/remote.c:775
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "échec de suppression de '%s'"
 
-#: builtin/remote.c:804
+#: builtin/remote.c:809
 #, c-format
 msgid "creating '%s' failed"
 msgstr "échec de création de '%s'"
 
-#: builtin/remote.c:882
+#: builtin/remote.c:887
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -19900,121 +21198,122 @@ msgstr[0] ""
 "Note : Une branche en dehors de refs/remotes/ n'a pas été supprimée ;\n"
 "pour la supprimer, utilisez :"
 msgstr[1] ""
-"Note : Plusieurs branches en dehors de refs/remotes/ n'ont pas été supprimées ;\n"
+"Note : Plusieurs branches en dehors de refs/remotes/ n'ont pas été "
+"supprimées ;\n"
 "pour les supprimer, utilisez :"
 
-#: builtin/remote.c:896
+#: builtin/remote.c:901
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Impossible de supprimer la section de configuration '%s'"
 
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
 
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
 msgid " tracked"
 msgstr " suivi"
 
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
 
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche"
 
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "rebase de manière interactive sur la distante %s"
 
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "rebase de manière interactive (avec fusions) sur la distante %s"
 
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "rebase sur la distante %s"
 
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
 #, c-format
 msgid " merges with remote %s"
 msgstr " fusionne avec la distante %s"
 
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
 #, c-format
 msgid "merges with remote %s"
 msgstr "fusionne avec la distante %s"
 
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    et avec la distante %s\n"
 
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
 msgid "create"
 msgstr "créer"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
 msgid "delete"
 msgstr "supprimer"
 
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
 msgid "up to date"
 msgstr "à jour"
 
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
 msgid "fast-forwardable"
 msgstr "peut être mis à jour en avance rapide"
 
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
 msgid "local out of date"
 msgstr "le local n'est pas à jour"
 
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s force vers %-*s (%s)"
 
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s pousse vers %-*s (%s)"
 
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s force vers %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s pousse vers %s"
 
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
 msgid "do not query remotes"
 msgstr "ne pas interroger les distantes"
 
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
-msgstr "* distante %s"
+msgstr "* distant %s"
 
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL de rapatriement : %s"
 
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
 msgid "(no URL)"
 msgstr "(pas d'URL)"
 
@@ -20022,324 +21321,346 @@ msgstr "(pas d'URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL push : %s"
 
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Branche HEAD : %s"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
 msgid "(not queried)"
 msgstr "(non demandé)"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
 #, c-format
-msgid "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
-msgstr "  Branche HEAD (la HEAD distante est ambiguë, peut être l'une des suivantes) :\n"
+msgid ""
+"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+"  Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
+"suivantes) :\n"
 
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Branche distante :%s"
 msgstr[1] "  Branches distantes :%s"
 
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
 msgid " (status not queried)"
 msgstr " (état non demandé)"
 
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Branche locale configurée pour 'git pull' :"
 msgstr[1] "  Branches locales configurées pour 'git pull' :"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Les références locales seront reflétées par 'git push'"
 
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Référence locale configurée pour 'git push'%s :"
 msgstr[1] "  Références locales configurées pour 'git push'%s :"
 
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
 
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "supprimer refs/remotes/<nom>/HEAD"
 
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
 msgid "Cannot determine remote HEAD"
 msgstr "Impossible de déterminer la HEAD distante"
 
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
-msgstr "Il y a de multiples branches HEAD distantes. Veuillez en choisir une explicitement avec :"
+msgstr ""
+"Il y a de multiples branches HEAD distantes. Veuillez en choisir une "
+"explicitement avec :"
 
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
 #, c-format
 msgid "Could not delete %s"
 msgstr "Impossible de supprimer %s"
 
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Référence non valide : %s"
 
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
 #, c-format
 msgid "Could not setup %s"
 msgstr "Impossible de paramétrer %s"
 
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s se retrouvera en suspens !"
 
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s se retrouve en suspens !"
 
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
 #, c-format
 msgid "Pruning %s"
 msgstr "Élimination de %s"
 
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
 #, c-format
 msgid "URL: %s"
 msgstr "URL : %s"
 
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [serait éliminé] %s"
 
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [éliminé] %s"
 
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
 msgid "prune remotes after fetching"
 msgstr "éliminer les distants après le rapatriement"
 
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Pas de serveur remote '%s'"
 
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
 msgid "add branch"
 msgstr "ajouter une branche"
 
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
 msgid "no remote specified"
 msgstr "pas de serveur distant spécifié"
 
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
 msgid "query push URLs rather than fetch URLs"
 msgstr "interroger les URLs de poussée plutôt que les URLs de récupération"
 
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
 msgid "return all URLs"
 msgstr "retourner toutes les URLs"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "aucune URL configurée pour le dépôt distant '%s'"
 
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
 msgid "manipulate push URLs"
 msgstr "manipuler les URLs push"
 
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
 msgid "add URL"
 msgstr "ajouter une URL"
 
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
 msgid "delete URLs"
 msgstr "supprimer des URLs"
 
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete n'a aucun sens"
 
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Motif d'URL ancien invalide : %s"
 
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Pas d'URL trouvée : %s"
 
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
 msgid "Will not delete all non-push URLs"
 msgstr "Pas de suppression de toutes les URLs non-push"
 
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "être verbeux : doit être placé avant une sous-commande"
+
+#: builtin/repack.c:28
 msgid "git repack [<options>]"
 msgstr "git repack [<options>]"
 
-#: builtin/repack.c:31
+#: builtin/repack.c:33
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
-"Les repaquetages incrémentaux sont incompatibles avec les index bitmap. Utilisez\n"
+"Les repaquetages incrémentaux sont incompatibles avec les index bitmap. "
+"Utilisez\n"
 "--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps."
 
-#: builtin/repack.c:198
+#: builtin/repack.c:201
 msgid "could not start pack-objects to repack promisor objects"
-msgstr "ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur"
+msgstr ""
+"ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur"
 
-#: builtin/repack.c:270 builtin/repack.c:630
+#: 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."
+msgstr ""
+"repack : attente de lignes d'Id d'objets en hexa complet seulement depuis "
+"les objects de paquet."
 
-#: builtin/repack.c:294
+#: 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"
+msgstr ""
+"impossible de terminer pack-objects  pour ré-empaqueter les objets de "
+"prometteur"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "impossible d'ouvrir l'index pour %s"
 
-#: builtin/repack.c:368
+#: 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"
+msgstr ""
+"le paquet %s est trop gros pour être pris en compte dans un progression "
+"géométrique"
 
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: 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:460
+#: 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:516
+msgid "could not close refs snapshot tempfile"
+msgstr "impossible de fermer le fichier temporaire d'instantané des réfs"
+
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "empaqueter tout dans un seul paquet"
 
-#: builtin/repack.c:462
+#: 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:465
+#: 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:467
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "passer --no-reuse-delta à git-pack-objects"
 
-#: builtin/repack.c:469
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "passer --no-reuse-object à git-pack-objects"
 
-#: builtin/repack.c:471
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
-msgstr "ne pas lancer git update-server-info"
+msgstr "ne pas lancer git-update-server-info"
 
-#: builtin/repack.c:474
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "passer --local à git-pack-objects"
 
-#: builtin/repack.c:476
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "écrire un index en bitmap"
 
-#: builtin/repack.c:478
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "passer --delta-islands à git-pack-objects"
 
-#: builtin/repack.c:479
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "date approximative"
 
-#: builtin/repack.c:480
+#: 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:482
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "avec -a, repaquétiser les objets inaccessibles"
 
-#: builtin/repack.c:484
+#: 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:485 builtin/repack.c:491
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "octets"
 
-#: builtin/repack.c:486
+#: 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"
+msgstr ""
+"idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments"
 
-#: builtin/repack.c:488
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "limite la profondeur maximale des deltas"
 
-#: builtin/repack.c:490
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "limite le nombre maximal de fils"
 
-#: builtin/repack.c:492
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "taille maximum de chaque fichier paquet"
 
-#: builtin/repack.c:494
+#: 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:496
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "ne pas rempaqueter ce paquet"
 
-#: builtin/repack.c:498
+#: 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:508
+#: 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: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:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable et -A sont incompatibles"
-
-#: builtin/repack.c:527
-#| msgid "--long is incompatible with --abbrev=0"
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric est incompatible avec -A, -a"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "Rien de neuf à empaqueter."
 
-#: builtin/repack.c:669
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "fichier nécessaire manquant : %s"
 
-#: builtin/repack.c:671
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "impossible de délier : '%s'"
@@ -20422,95 +21743,94 @@ 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 instead of --graft"
-msgstr "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; utilisez --edit au lieu de --graft"
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+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"
@@ -20519,211 +21839,214 @@ 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"
 
 #: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
-msgstr "git rerere [clear | forget <chemin>... | status | remaining | diff | gc]"
+msgstr ""
+"git rerere [clear | forget <chemin>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "enregistrer des résolutions propres dans l'index"
 
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "'git rerere forget' sans chemin est obsolète"
 
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "échec de la génération de diff pour '%s'"
 
-#: builtin/reset.c:32
-msgid "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
-
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
-msgstr "git reset [-q] [<arbre ou apparenté>] [--] <spécificateur-de-chemin>..."
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
 #: builtin/reset.c:34
-msgid "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
-msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<arbre-esque>]"
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr ""
+"git reset [-q] [<arbre ou apparenté>] [--] <spécificateur-de-chemin>..."
 
 #: 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: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:83
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Vous n'avez pas une HEAD valide."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Impossible de trouver l'arbre pour HEAD."
 
-#: builtin/reset.c:91
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Impossible de trouver l'arbre pour %s."
 
-#: builtin/reset.c:116
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD est maintenant à %s"
 
-#: builtin/reset.c:195
+#: 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:295 builtin/stash.c:589 builtin/stash.c:663 builtin/stash.c:687
+#: 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:297
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "réinitialiser HEAD et l'index"
 
-#: builtin/reset.c:298
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "réinitialiser seulement HEAD"
 
-#: builtin/reset.c:300 builtin/reset.c:302
+#: 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:304
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "réinitialiser HEAD mais garder les changements locaux"
 
-#: builtin/reset.c:310
+#: 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"
+msgstr ""
+"enregistrer seulement le fait que les chemins effacés seront ajoutés plus "
+"tard"
 
-#: builtin/reset.c:344
+#: 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:352
+#: 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:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch est incompatible avec --{hard,mixed,soft}"
-
-#: builtin/reset.c:371
+#: 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."
+msgstr ""
+"--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la "
+"place."
 
-#: builtin/reset.c:373
+#: 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:388
+#: 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:392
-msgid "-N can only be used with --mixed"
-msgstr "-N ne peut être utilisé qu'avec --mixed"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "Modifications non indexées après reset :"
 
-#: builtin/reset.c:416
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -20732,34 +22055,33 @@ msgid ""
 "to make this the default.\n"
 msgstr ""
 "\n"
-"Les modifications non-indexées ont pris %.2f secondes à énumérer après reset.\n"
-"Vous pouvez utiliser '--quiet' pour éviter ce message. Réglez le paramètre de\n"
+"Les modifications non-indexées ont pris %.2f secondes à énumérer après "
+"reset.\n"
+"Vous pouvez utiliser '--quiet' pour éviter ce message. Réglez le paramètre "
+"de\n"
 "config reset.quiet à true pour avoir ce comportement en permanence.\n"
 
-#: builtin/reset.c:434
+#: 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:439
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "Impossible d'écrire le nouveau fichier d'index."
 
-#: builtin/rev-list.c:538
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "impossible de combiner --exclude-promisor-objects et --missing"
-
-#: builtin/rev-list.c:599
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "le filtrage d'objet exige --objects"
 
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr "rev-list ne supporte l'affichage des notes"
 
-#: builtin/rev-list.c:664
-msgid "marked counting is incompatible with --objects"
-msgstr "le comptage marqué est incompatible avec --objects"
+#: builtin/rev-list.c:679
+#, 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>...]"
@@ -20777,6 +22099,18 @@ msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option"
 msgid "output in stuck long form"
 msgstr "sortie en forme longue fixée"
 
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "fin prématurée de l'entrée"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr "pas de chaîne d'usage fournie avant le séparateur `--'"
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "Une seule révision attendue"
+
 #: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -20789,7 +22123,52 @@ msgstr ""
 "   ou : git rev-parse --sq-quote [<argument>...]\n"
 "   ou : git rev-parse [options] [<argument>...]\n"
 "\n"
-"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur l'utilisation principale."
+"Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur "
+"l'utilisation principale."
+
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir exige un argument"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "'%s' n'est pas un gitdir"
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "--git-path exige un argument"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "-n exige un argument"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "--path-format exige un argument"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "argument inconnu pour --path-format : %s"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "--default exige un argument"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "--prefix exige un argument"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "mode inconnu pour --abbrev-ref : %s"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "mode inconnu pour --show-object-format : %s"
 
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
@@ -20865,15 +22244,19 @@ msgstr "ajouter le nom de validation"
 msgid "preserve initially empty commits"
 msgstr "préserver les validations vides initialement"
 
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "autoriser les validations avec des messages vides"
+
 #: builtin/revert.c:129
 msgid "keep redundant, empty commits"
 msgstr "garder les validations redondantes, vides"
 
-#: builtin/revert.c:237
+#: builtin/revert.c:241
 msgid "revert failed"
 msgstr "revert a échoué"
 
-#: builtin/revert.c:250
+#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "le picorage a échoué"
 
@@ -20923,66 +22306,72 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "le fichier suivant a des modifications locales :"
 msgstr[1] "les fichiers suivants ont des modifications locales :"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "ne pas afficher les fichiers supprimés"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "supprimer seulement de l'index"
 
-#: builtin/rm.c:246
+#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "outrepasser la vérification des fichiers à jour"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "autoriser la suppression récursive"
 
-#: builtin/rm.c:249
+#: builtin/rm.c:250
 msgid "exit with a zero status even if nothing matched"
 msgstr "sortir avec un état zéro même si rien ne correspondait"
 
-#: builtin/rm.c:283
+#: builtin/rm.c:285
 msgid "No pathspec was given. Which files should I remove?"
-msgstr "Aucun spécificateur de chemin fourni. Quel fichier doit être supprimé ?"
+msgstr ""
+"Aucun spécificateur de chemin fourni. Quel fichier doit être supprimé ?"
 
-#: builtin/rm.c:310
+#: builtin/rm.c:315
 msgid "please stage your changes to .gitmodules or stash them to proceed"
-msgstr "veuillez indexer vos modifications de .gitmodules ou les remiser pour continuer"
+msgstr ""
+"veuillez indexer vos modifications de .gitmodules ou les remiser pour "
+"continuer"
 
-#: builtin/rm.c:331
+#: builtin/rm.c:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "pas de suppression récursive de '%s' sans -r"
 
-#: builtin/rm.c:379
+#: builtin/rm.c:385
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm : impossible de supprimer %s"
 
 #: builtin/send-pack.c:20
 msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]\n"
-"  --all and explicit <ref> specification are mutually exclusive."
+"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=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<hôte>:]<répertoire> "
-"[<référence>...]\n"
-"  --all et la spécification explicite de <référence> sont mutuellement exclusifs."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [<hôte>:]<répertoire> (--all | <réf>...)"
 
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "nom distant"
 
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "utiliser un protocole RPC sans état"
 
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "lire les références depuis l'entrée standard"
 
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "afficher les messages du greffon de protocole distant"
 
@@ -20996,7 +22385,8 @@ msgstr "git log --pretty=short | git shortlog [<options>]"
 
 #: builtin/shortlog.c:123
 msgid "using multiple --group options with stdin is not supported"
-msgstr "l'utilisation de plusieurs options --group avec stdin n'est pas supportée"
+msgstr ""
+"l'utilisation de plusieurs options --group avec stdin n'est pas supportée"
 
 #: builtin/shortlog.c:133
 msgid "using --group=trailer with stdin is not supported"
@@ -21017,7 +22407,9 @@ msgstr "trier la sortie sur le nombre de validations par auteur"
 
 #: builtin/shortlog.c:356
 msgid "suppress commit descriptions, only provides commit count"
-msgstr "supprimer les descriptions de validation, fournit seulement le nombre de validations"
+msgstr ""
+"supprimer les descriptions de validation, fournit seulement le nombre de "
+"validations"
 
 #: builtin/shortlog.c:358
 msgid "show the email address of each author"
@@ -21039,21 +22431,21 @@ msgstr "champ"
 msgid "group by field"
 msgstr "grouper par champ"
 
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
 msgid "too many arguments given outside repository"
 msgstr "trop d'arguments fournis hors d'un dépôt"
 
 #: builtin/show-branch.c:13
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
-"git show-branch [-a | --all] [-r|--remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<quand>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"                [--current] [--color[=<quand>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"
 
 #: builtin/show-branch.c:17
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -21066,112 +22458,110 @@ msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "%s ignoré; impossible de gérer plus de %d référence"
 msgstr[1] "%s ignoré; impossible de gérer plus de %d références"
 
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
 #, c-format
 msgid "no matching refs with %s"
 msgstr "aucune référence correspond à %s"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
 msgid "show remote-tracking and local branches"
 msgstr "afficher les branches de suivi distantes et les branches locales"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
 msgid "show remote-tracking branches"
 msgstr "afficher les branches de suivi distantes"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
 msgid "color '*!+-' corresponding to the branch"
 msgstr "couleur '*!+-' correspondant à la branche"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
 msgid "show <n> more commits after the common ancestor"
 msgstr "afficher <n> validations de plus après l'ancêtre commun"
 
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
 msgid "synonym to more=-1"
 msgstr "synonyme de more=-1"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
 msgid "suppress naming strings"
 msgstr "supprimer les chaînes de nommage"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
 msgid "include the current branch"
 msgstr "inclure la branche courante"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
 msgid "name commits with their object names"
 msgstr "nommer les validations avec leurs noms d'objet"
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
 msgid "show possible merge bases"
 msgstr "afficher les bases possibles de fusion"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
 msgid "show refs unreachable from any other ref"
 msgstr "afficher les références inaccessibles depuis toute autre référence"
 
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
 msgid "show commits in topological order"
 msgstr "afficher les validations dans l'ordre topologique"
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
 msgid "show only commits not on the first branch"
-msgstr "afficher seulement les validations qui ne sont pas sur la première branche"
+msgstr ""
+"afficher seulement les validations qui ne sont pas sur la première branche"
 
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
 msgid "show merges reachable from only one tip"
 msgstr "afficher les fusions accessibles depuis une seule pointe"
 
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
 msgid "topologically sort, maintaining date order where possible"
 msgstr "tri topologique, maintenant l'ordre par date si possible"
 
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
 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:711
-msgid "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr "--reflog est incompatible avec --all, --remotes, --independant et --merge-base"
+msgstr ""
+"afficher les <n> plus récents éléments de ref-log en commençant à la base"
 
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "aucune branche spécifiée, et HEAD est invalide"
 
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
 msgid "--reflog option needs one branch name"
 msgstr "--reflog requiert un nom de branche"
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "%d entrée seulement ne peut être montrée en même temps."
 msgstr[1] "%d entrées seulement ne peuvent être montrée en même temps."
 
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
 #, c-format
 msgid "no such ref %s"
 msgstr "référence inexistante %s"
 
-#: builtin/show-branch.c:831
+#: 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:835
+#: 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:838
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "impossible de trouver le commit %s (%s)"
@@ -21185,8 +22575,12 @@ msgid "Unknown hash algorithm"
 msgstr "Algorithme d'empreinte inconnu"
 
 #: builtin/show-ref.c:12
-msgid "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
-msgstr "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]"
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+msgstr ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]"
 
 #: builtin/show-ref.c:13
 msgid "git show-ref --exclude-existing[=<pattern>]"
@@ -21202,7 +22596,9 @@ msgstr "afficher seulement les têtes (peut être combiné avec tags)"
 
 #: builtin/show-ref.c:164
 msgid "stricter reference checking, requires exact ref path"
-msgstr "vérification de référence plus stricte, nécessite un chemin de référence exact"
+msgstr ""
+"vérification de référence plus stricte, nécessite un chemin de référence "
+"exact"
 
 #: builtin/show-ref.c:167 builtin/show-ref.c:169
 msgid "show the HEAD reference, even if it would be filtered out"
@@ -21218,11 +22614,14 @@ msgstr "afficher seulement le hachage SHA1 en utilisant <n> chiffres"
 
 #: builtin/show-ref.c:177
 msgid "do not print results to stdout (useful with --verify)"
-msgstr "ne pas afficher les résultats sur la sortie standard (pratique avec --verify)"
+msgstr ""
+"ne pas afficher les résultats sur la sortie standard (pratique avec --verify)"
 
 #: builtin/show-ref.c:179
 msgid "show refs from stdin that aren't in local repository"
-msgstr "afficher les références de l'entrée standard qui ne sont pas dans le dépôt local"
+msgstr ""
+"afficher les références de l'entrée standard qui ne sont pas dans le dépôt "
+"local"
 
 #: builtin/sparse-checkout.c:22
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
@@ -21232,75 +22631,121 @@ 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)"
+msgstr ""
+"cet arbre de travail n'est pas clairsemé (le fichier sparse-checkout "
+"pourrait ne pas exister)"
+
+#: builtin/sparse-checkout.c:176
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"le dossier '%s' contient des fichiers non-suivis, mais n'est pas dans le "
+"cone d'extraction clairsemée"
 
-#: builtin/sparse-checkout.c:227
+#: 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: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"
+msgstr ""
+"échec de la création du répertoire pour le fichier d'extraction clairsemée"
 
-#: builtin/sparse-checkout.c:268
+#: 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"
+msgstr ""
+"impossible de mettre à jour le format de dépôt pour activer worktreeConfig"
 
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "échec de paramétrage extensions.worktreeConfig"
 
-#: builtin/sparse-checkout.c:290
-#| msgid "git sparse-checkout init [--cone]"
+#: 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:310
+#: 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:312
+#: 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:340
-msgid "failed to modify sparse-index config"
-msgstr "impossible de modifier la configuration d'index clairsemé"
-
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "échec à l'ouverture de '%s'"
 
-#: builtin/sparse-checkout.c:419
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr "impossible de normaliser le chemin '%s'"
 
-#: builtin/sparse-checkout.c:431
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)"
-
-#: builtin/sparse-checkout.c:456
+#: 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:510 builtin/sparse-checkout.c:534
+#: 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:579
+#: 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:594
-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: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:613
+#: builtin/sparse-checkout.c:803
 msgid "git sparse-checkout disable"
 msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:644
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "erreur lors du rafraîchissement du répertoire de travail"
 
@@ -21324,28 +22769,28 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<remise>]"
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <nom-de-branche> [<remise>]"
 
-#: builtin/stash.c:29 builtin/stash.c:70
-msgid "git stash clear"
-msgstr "git stash clear"
-
 #: 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 builtin/stash.c:87
+#: 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
@@ -21370,6 +22815,14 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--] [<spécificateur-de-chemin>...]]"
 
+#: builtin/stash.c:87
+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] [<message>]"
+
 #: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
@@ -21393,177 +22846,197 @@ msgstr "%s n'est pas une référence valide"
 msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear avec des arguments n'est pas implémenté"
 
-#: builtin/stash.c:431
+#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
 "            %s -> %s\n"
 "         to make room.\n"
 msgstr ""
-"AVERTISSEMENT : un fichier non-suivi en travers d'un fichier suivi ! Renommage\n"
+"AVERTISSEMENT : un fichier non-suivi en travers d'un fichier suivi ! "
+"Renommage\n"
 "            %s -> %s\n"
 "         pour faire de la place.\n"
 
-#: builtin/stash.c:492
+#: builtin/stash.c:508
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "impossible d'appliquer un remisage en cours de fusion"
 
-#: builtin/stash.c:503
+#: builtin/stash.c:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "impossible de générer %s^!."
 
-#: builtin/stash.c:510
+#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr "conflits dans l'index. Essayez sans --index."
 
-#: builtin/stash.c:516
+#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "impossible de sauvegarder l'arbre d'index"
 
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Fusion de %s avec %s"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "L'index n'a pas été sorti de remise."
 
-#: builtin/stash.c:591 builtin/stash.c:689
+#: 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:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "tentative de recréer l'index"
 
-#: builtin/stash.c:635
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s supprimé (%s)"
 
-#: builtin/stash.c:638
+#: 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:651
+#: 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:701
+#: 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."
+msgstr ""
+"L'entrée de remisage est conservée au cas où vous en auriez encore besoin."
 
-#: builtin/stash.c:724
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "Aucune branche spécifiée"
 
-#: builtin/stash.c:808
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "échec de l'analyse de l'arbre"
 
-#: builtin/stash.c:819
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "échec du dépaquetage des arbres"
 
-#: builtin/stash.c:839
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "inclure les fichiers non suivis dans le remisage"
 
-#: builtin/stash.c:842
+#: 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:932 builtin/stash.c:969
+#: 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:950 builtin/stash.c:1606 builtin/stash.c:1671
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "message pour le remisage"
 
-#: builtin/stash.c:960
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" exige un argument <commit>"
 
-#: builtin/stash.c:1175
+#: 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:1275
+#: 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:1302
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "Impossible de sauver l'état courant de l'index"
 
-#: builtin/stash.c:1311
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "Impossible de sauver les fichiers non-suivis"
 
-#: builtin/stash.c:1322 builtin/stash.c:1331
+#: 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:1359
+#: 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:1408
+#: 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"
+msgstr ""
+"Impossible d'utiliser --patch et --include-untracked ou --all en même temps"
+
+#: 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:1426
+#: builtin/stash.c:1492
 msgid "Did you forget to 'git add'?"
 msgstr "Vous avez sûrement oublié 'git add' ?"
 
-#: builtin/stash.c:1441
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "Pas de modifications locales à sauver"
 
-#: builtin/stash.c:1448
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "Impossible d'initialiser le remisage"
 
-#: builtin/stash.c:1463
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "Impossible de sauver l'état courant"
 
-#: builtin/stash.c:1468
+#: 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:1558
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "Impossible de supprimer les changements de la copie de travail"
 
-#: builtin/stash.c:1597 builtin/stash.c:1662
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "conserver l'index"
 
-#: builtin/stash.c:1599 builtin/stash.c:1664
+#: 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:1600 builtin/stash.c:1665
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "mode silencieux"
 
-#: builtin/stash.c:1602 builtin/stash.c:1667
+#: 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:1604 builtin/stash.c:1669
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "inclure les fichiers ignorés"
 
-#: builtin/stash.c:1704
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -21581,45 +23054,57 @@ msgstr "git stripspace [-c | --comment-lines]"
 
 #: builtin/stripspace.c:37
 msgid "skip and remove all lines starting with comment character"
-msgstr "sauter et supprimer toutes les lignes commençant par le caractère de commentaire"
+msgstr ""
+"sauter et supprimer toutes les lignes commençant par le caractère de "
+"commentaire"
 
 #: builtin/stripspace.c:40
 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:47 builtin/submodule--helper.c:2424
+#: 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"
 
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper  print-default-remote n'accepte aucun argument"
 
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "impossible de supprimer un composant de l'URL '%s'"
 
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+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:1859
 msgid "alternative anchor for relative paths"
 msgstr "ancre alternative pour les chemins relatifs"
 
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:410
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630 builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:520
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Entrée dans '%s'\n"
 
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -21628,220 +23113,239 @@ msgstr ""
 "run_command a retourné un statut non-nul pour %s\n"
 "."
 
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:545
 #, c-format
 msgid ""
-"run_command returned non-zero status while recursing in the nested submodules of %s\n"
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
 "."
 msgstr ""
-"run_command a retourné un statut non-nul pendant la récursion dans les sous-modules inclus de %s\n"
+"run_command a retourné un statut non-nul pendant la récursion dans les sous-"
+"modules inclus de %s\n"
 "."
 
-#: builtin/submodule--helper.c:566
+#: builtin/submodule--helper.c:561
 msgid "suppress output of entering each submodule command"
-msgstr "supprimer la sortie lors de l'entrée dans chaque commande de sous-module"
+msgstr ""
+"supprimer la sortie lors de l'entrée dans chaque commande de sous-module"
 
-#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889 builtin/submodule--helper.c:1488
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
 msgid "recurse into nested submodules"
 msgstr "parcourir récursivement les sous-modules"
 
-#: builtin/submodule--helper.c:573
+#: builtin/submodule--helper.c:568
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <commande>"
 
-#: builtin/submodule--helper.c:600
-#, c-format
-msgid "could not look up configuration '%s'. Assuming this repository is its own authoritative upstream."
-msgstr "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme son propre amont d'autorité."
-
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:642
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:646
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n"
 
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:656
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
-msgstr "attention : nous vous suggérons de spécifier une commande de mode de mise à jour pour le sous-module '%s'\n"
+msgstr ""
+"attention : nous vous suggérons de spécifier une commande de mode de mise à "
+"jour pour le sous-module '%s'\n"
 
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:663
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
-msgstr "Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module '%s'"
+msgstr ""
+"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
+"'%s'"
 
-#: builtin/submodule--helper.c:710
+#: builtin/submodule--helper.c:685
 msgid "suppress output for initializing a submodule"
 msgstr "supprimer la sortie lors de l'initialisation d'un sous-module"
 
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<options>] [<chemin>]"
 
-#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
-msgstr "pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le chemin '%s'"
+msgstr ""
+"pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
+"chemin '%s'"
 
-#: builtin/submodule--helper.c:836
+#: builtin/submodule--helper.c:811
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "impossible de résoudre HEAD dans le sous-module '%s'"
 
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "récursion impossible dans le sous-module '%s'"
 
-#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "supprimer la sortie d'état du sous-module"
 
-#: builtin/submodule--helper.c:888
-msgid "use commit stored in the index instead of the one stored in the submodule HEAD"
-msgstr "utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD du sous-module"
+#: builtin/submodule--helper.c:863
+msgid ""
+"use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+"utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD "
+"du sous-module"
 
-#: builtin/submodule--helper.c:894
+#: builtin/submodule--helper.c:869
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]"
 
-#: builtin/submodule--helper.c:918
+#: builtin/submodule--helper.c:893
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper <nom> <chemin>"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:965
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s(blob)->%s(submodule)"
 
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:968
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(submodule)->%s(blob)"
 
-#: builtin/submodule--helper.c:1006
+#: builtin/submodule--helper.c:981
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1056
+#: builtin/submodule--helper.c:1031
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "impossible de calculer l'empreinte de l'objet depuis '%s'"
 
-#: builtin/submodule--helper.c:1060
+#: builtin/submodule--helper.c:1035
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "mode %o inattendu\n"
 
-#: builtin/submodule--helper.c:1301
+#: builtin/submodule--helper.c:1276
 msgid "use the commit stored in the index instead of the submodule HEAD"
-msgstr "utiliser le commit stocké dans l'index au lieu de la HEAD du sous-module"
+msgstr ""
+"utiliser le commit stocké dans l'index au lieu de la HEAD du sous-module"
 
-#: builtin/submodule--helper.c:1303
-msgid "to compare the commit in the index with that in the submodule HEAD"
-msgstr "pour comparer le commit dans l'index au lieu de celui dans la HEAD du sous-module"
+#: builtin/submodule--helper.c:1278
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "comparer le commit dans l'index avec celui dans la HEAD du sous-module"
 
-#: builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1280
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr "sauter les sous-modules avec la valeur 'ignore_config' à 'all'"
 
-#: builtin/submodule--helper.c:1307
+#: builtin/submodule--helper.c:1282
 msgid "limit the summary size"
 msgstr "limiter la taille du résumé"
 
-#: builtin/submodule--helper.c:1312
+#: builtin/submodule--helper.c:1287
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<chemin>]"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1311
 msgid "could not fetch a revision for HEAD"
 msgstr "impossible de récupérer une révision pour HEAD"
 
-#: builtin/submodule--helper.c:1341
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached et --files sont mutuellement exclusifs"
-
-#: builtin/submodule--helper.c:1408
+#: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Synchronisation de l'URL sous-module pour '%s'\n"
 
-#: builtin/submodule--helper.c:1414
+#: builtin/submodule--helper.c:1379
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c:1393
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "échec d'obtention du dépôt distant par défaut pour le sous-module '%s'"
 
-#: builtin/submodule--helper.c:1439
+#: builtin/submodule--helper.c:1404
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "échec de mise à jour du dépôt distant pour le sous-module '%s'"
 
-#: builtin/submodule--helper.c:1486
+#: builtin/submodule--helper.c:1451
 msgid "suppress output of synchronizing submodule url"
-msgstr "supprimer la sortie lors de la synchronisation de l'URL d'un sous-module"
+msgstr ""
+"supprimer la sortie lors de la synchronisation de l'URL d'un sous-module"
 
-#: builtin/submodule--helper.c:1493
+#: builtin/submodule--helper.c:1458
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]"
 
-#: builtin/submodule--helper.c:1547
+#: 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)"
+msgid ""
+"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:1559
+#: builtin/submodule--helper.c:1525
 #, c-format
-msgid "Submodule work tree '%s' contains local modifications; use '-f' to discard them"
-msgstr "L'arbre de travail du sous-module '%s' contient des modifications locales ; utilisez '-f' pour les annuler"
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+"L'arbre de travail du sous-module '%s' contient des modifications locales ; "
+"utilisez '-f' pour les annuler"
 
-#: builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Répertoire '%s' nettoyé\n"
 
-#: builtin/submodule--helper.c:1569
+#: 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:1580
+#: 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:1596
+#: 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:1625
+#: 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"
+msgstr ""
+"éliminer les arbres de travail des sous-modules même s'ils contiennent des "
+"modifications locales"
 
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "désenregistrer tous les sous-modules"
 
-#: builtin/submodule--helper.c:1631
-msgid "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
-msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]"
+#: 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:1645
+#: 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"
+msgstr ""
+"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
 
-#: builtin/submodule--helper.c:1714
+#: 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"
@@ -21853,235 +23357,455 @@ msgstr ""
 "submodule.alternateErrorStrategy à 'info', ou de manière équivalente,\n"
 "clonez avec '--reference-if-able' au lieu de '--reference'."
 
-#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756
+#: 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:1792
+#: 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"
+msgstr ""
+"La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
 
-#: builtin/submodule--helper.c:1799
+#: 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:1823
+#: 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: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:1818
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "le répertoire n'est pas vide : '%s'"
+
+#: 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:1862
 msgid "where the new submodule will be cloned to"
 msgstr "emplacement où le sous-module sera cloné"
 
-#: builtin/submodule--helper.c:1826
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "nom du nouveau sous-module"
 
-#: builtin/submodule--helper.c:1829
+#: 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:1837
+#: 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:1840 builtin/submodule--helper.c:2349
+#: 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:1842 builtin/submodule--helper.c:2351
+#: 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:1849
+#: 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>"
+"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=<chemin>] [--quiet] [--reference <dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> --path "
-"<chemin>"
-
-#: builtin/submodule--helper.c:1874
-#, 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:1885
-#, 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:1889
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "le répertoire n'est pas vide : '%s'"
+"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
+"<dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> "
+"--path <chemin>"
 
-#: builtin/submodule--helper.c:1901
-#, 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:1937
+#: 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:1941
+#: 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'"
+msgstr ""
+"Mode de mise à jour '%s'invalide configuré pour le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:2042
+#: 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:2046
+#: 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:2076
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Sous-module non fusionné %s non traité"
 
-#: builtin/submodule--helper.c:2105
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Sous-module '%s' non traité"
 
-#: builtin/submodule--helper.c:2255
+#: 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:2266
+#: 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:2328 builtin/submodule--helper.c:2574
+#: 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: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: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: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:2409
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Chemin de sous-module '%s' : '%s' extrait\n"
+
+#: 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: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:2421
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Le chemin de sous-module '%s' : '%s %s'\n"
+
+#: 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:2454
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+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: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:2331
+#: 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"
+msgstr ""
+"chemin dans la copie de travail, traversant les frontières de sous-modules"
 
-#: builtin/submodule--helper.c:2335
+#: 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:2341
+#: 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:2344
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "jobs parallèles"
 
-#: builtin/submodule--helper.c:2346
+#: 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:2347
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "ne pas afficher la progression du clonage"
 
-#: builtin/submodule--helper.c:2358
+#: 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:2371
+#: 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:2419
+#: 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:2567
+msgid "force checkout updates"
+msgstr "forcer les mises à jour d'extraction"
+
+#: 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: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:2572
+msgid "depth for shallow fetch"
+msgstr "profondeur pour une récupération superficielle"
+
+#: builtin/submodule--helper.c:2582
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2583
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 attendu par le super-projet"
+
+#: builtin/submodule--helper.c:2585
+msgid "subsha1"
+msgstr "sous-sha1"
+
+#: builtin/submodule--helper.c:2586
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 de la HEAD du sous-module"
+
+#: 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:2663
 #, c-format
-msgid "Submodule (%s) branch configured to inherit branch from superproject, but the superproject is not on any branch"
-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"
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+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:2542
+#: 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:2575
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "parcourir récursivement les sous-modules"
 
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
-msgstr "git submodule--helper embed-git-dir [<options>] [<chemin>...]"
+msgstr "git submodule--helper absorb-git-dirs [<options>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:2637
+#: 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:2640
+#: 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:2645
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config name [<valeur>]"
 
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nom>"
 
-#: builtin/submodule--helper.c:2647
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2666 git-submodule.sh:150
-#, sh-format
+#: 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"
+msgstr ""
+"veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail"
 
-#: builtin/submodule--helper.c:2682
+#: 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:2686
+#: 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:2719
+#: 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:2721
+#: 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:2725
+#: 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:2726
-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: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:2733
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "--branch ou --default requis"
 
-#: builtin/submodule--helper.c:2736
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch et --default sont mutuellement exclusifs"
+#: 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: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: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:2793 git.c:449 git.c:724
+#: 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 vous voulez réutiliser ce répertoire local git au lieu de le recloner "
+"depuis\n"
+"  %s\n"
+"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt "
+"correct\n"
+"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
+
+#: 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:3110
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "Impossible d'extraire le sous-module '%s'"
+
+#: 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: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:3222
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' existe déjà dans l'index"
+
+#: 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:3254
+msgid "branch of repository to add as submodule"
+msgstr "la branche du dépôt à ajouter comme sous-module"
+
+#: 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:3257
+msgid "print only error messages"
+msgstr "afficher seulement les messages d'erreur"
+
+#: 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:3263
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+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:3270
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<options>] [--] <dépôt> [<chemin>]"
+
+#: 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: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: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: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:2799
+#: 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"
 
 #: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
-msgstr "git symbolic-ref [<options>] nom [<référence>]"
+msgstr "git symbolic-ref [<options>] <nom> [<référence>]"
 
 #: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
@@ -22089,7 +23813,8 @@ msgstr "git symbolic-ref -d [-q] <nom>"
 
 #: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
-msgstr "supprimer le message d'erreur pour une référence non symbolique (détachée)"
+msgstr ""
+"supprimer le message d'erreur pour une référence non symbolique (détachée)"
 
 #: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
@@ -22099,37 +23824,41 @@ msgstr "supprimer la référence symbolique"
 msgid "shorten ref output"
 msgstr "raccourcir l'affichage de la référence"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "raison"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr "raison de la mise à jour"
 
 #: builtin/tag.c:25
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+"        <tagname> [<head>]"
 msgstr ""
-"git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <fichier>]\n"
-"\t\t<nom-étiquette> [<head>]"
+"git tag [-a | -s | -u <id-clé>] [-f] [-m <msg> | -F <fichier>]\n"
+"        <nom-d-étiquette> [<tête>]"
 
 #: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
-msgstr "git tag -d <nométiquette>..."
+msgstr "git tag -d <nom-d-étiquette>..."
 
 #: builtin/tag.c:28
 msgid ""
-"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"
+"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[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <objet>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] [<motif>...]"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <objet>]\n"
+"        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"[<motif>...]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
-msgstr "git tag -v [--format=<format>] <nométiquette>..."
+msgstr "git tag -v [--format=<format>] <nom-d-étiquette>..."
 
 #: builtin/tag.c:100
 #, c-format
@@ -22160,18 +23889,20 @@ msgid ""
 "\n"
 "Write a message for tag:\n"
 "  %s\n"
-"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
 msgstr ""
 "\n"
 "Écrivez un message pour l'étiquette :\n"
 "  %s\n"
-"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-même si vous le souhaitez.\n"
+"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"
@@ -22179,139 +23910,118 @@ msgid ""
 "\n"
 "\tgit tag -f %s %s^{}"
 msgstr ""
-"Vous avez créé une étiquette nichée. L'objet pointé par votre nouvelle étiquette\n"
-"est déjà une étiquette. Si vous vouliez étiqueter l'objet pointé, utilisez :\n"
+"Vous avez créé une étiquette nichée. L'objet pointé par votre nouvelle "
+"étiquette\n"
+"est déjà une étiquette. Si vous vouliez étiqueter l'objet pointé, "
+"utilisez :\n"
 "\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:328
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "pas de message pour l'étiquette ?"
 
-#: builtin/tag.c:335
+#: 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"
 
-#: builtin/tag.c:446
+#: builtin/tag.c:444
 msgid "list tag names"
 msgstr "afficher les noms des étiquettes"
 
-#: builtin/tag.c:448
+#: builtin/tag.c:446
 msgid "print <n> lines of each tag message"
 msgstr "affiche <n> lignes de chaque message d'étiquette"
 
-#: builtin/tag.c:450
+#: builtin/tag.c:448
 msgid "delete tags"
 msgstr "supprimer des étiquettes"
 
-#: builtin/tag.c:451
+#: builtin/tag.c:449
 msgid "verify tags"
 msgstr "vérifier des étiquettes"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:451
 msgid "Tag creation options"
 msgstr "Options de création de l'étiquette"
 
-#: builtin/tag.c:455
+#: builtin/tag.c:453
 msgid "annotated tag, needs a message"
 msgstr "étiquette annotée, nécessite un message"
 
-#: builtin/tag.c:457
+#: builtin/tag.c:455
 msgid "tag message"
 msgstr "message pour l'étiquette"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:457
 msgid "force edit of tag message"
 msgstr "forcer l'édition du message d'étiquetage"
 
-#: builtin/tag.c:460
+#: builtin/tag.c:458
 msgid "annotated and GPG-signed tag"
 msgstr "étiquette annotée et signée avec GPG"
 
-#: builtin/tag.c:463
+#: builtin/tag.c:461
 msgid "use another key to sign the tag"
 msgstr "utiliser une autre clé pour signer l'étiquette"
 
-#: builtin/tag.c:464
+#: builtin/tag.c:462
 msgid "replace the tag if exists"
 msgstr "remplacer l'étiquette si elle existe"
 
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "créer un reflog"
 
-#: builtin/tag.c:467
+#: builtin/tag.c:465
 msgid "Tag listing options"
 msgstr "Options d'affichage des étiquettes"
 
-#: builtin/tag.c:468
+#: builtin/tag.c:466
 msgid "show tag list in columns"
 msgstr "afficher la liste des étiquettes sous forme de colonnes"
 
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
 msgid "print only tags that contain the commit"
 msgstr "afficher seulement les étiquettes qui contiennent la validation"
 
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that don't contain the commit"
 msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation"
 
-#: builtin/tag.c:473
+#: builtin/tag.c:471
 msgid "print only tags that are merged"
 msgstr "afficher seulement les étiquettes qui sont fusionnées"
 
-#: builtin/tag.c:474
+#: builtin/tag.c:472
 msgid "print only tags that are not merged"
 msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
 
-#: builtin/tag.c:478
+#: builtin/tag.c:476
 msgid "print only tags of the object"
 msgstr "afficher seulement les étiquettes de l'objet"
 
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column et -n sont incompatibles"
-
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "l'option -n est autorisée seulement en mode de liste"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "l'option --contains est autorisée seulement en mode de liste"
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "l'option --contains est autorisée seulement en mode liste"
-
-#: builtin/tag.c:554
-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:556
-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:567
-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:592
+#: 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:597
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "l'étiquette '%s' existe déjà"
 
-#: builtin/tag.c:628
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
@@ -22325,232 +24035,262 @@ msgstr "Dépaquetage des objets"
 msgid "failed to create directory %s"
 msgstr "échec de la création du répertoire %s"
 
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "échec de la création du fichier %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "échec de la suppression du fichier %s"
 
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "échec de la suppression du répertoire %s"
 
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Test du mtime dans '%s' "
 
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
-msgstr "l'information de stat du répertoire ne change pas après ajout d'un fichier"
+msgstr ""
+"l'information de stat du répertoire ne change pas après ajout d'un fichier"
 
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
 msgid "directory stat info does not change after adding a new directory"
-msgstr "l'information de stat du répertoire ne change pas après ajout d'un répertoire"
+msgstr ""
+"l'information de stat du répertoire ne change pas après ajout d'un répertoire"
 
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
 msgid "directory stat info changes after updating a file"
-msgstr "l'information de stat du répertoire change après mise à jour d'un fichier"
+msgstr ""
+"l'information de stat du répertoire change après mise à jour d'un fichier"
 
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
 msgid "directory stat info changes after adding a file inside subdirectory"
-msgstr "l'information de stat du répertoire change après l'ajout d'un fichier dans un sous-répertoire"
+msgstr ""
+"l'information de stat du répertoire change après l'ajout d'un fichier dans "
+"un sous-répertoire"
 
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
 msgid "directory stat info does not change after deleting a file"
-msgstr "l'information de stat du répertoire ne change pas après la suppression d'un fichier<"
+msgstr ""
+"l'information de stat du répertoire ne change pas après la suppression d'un "
+"fichier<"
 
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
 msgid "directory stat info does not change after deleting a directory"
-msgstr "l'information de stat du répertoire ne change pas après la suppression d'un répertoire"
+msgstr ""
+"l'information de stat du répertoire ne change pas après la suppression d'un "
+"répertoire"
 
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<options>] [--] [<fichier>...]"
 
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "rafraîchir : ignorer les sous-modules"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "ne pas ignorer les nouveaux fichiers"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "aviser des fichiers manquants dans la copie de travail"
 
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "rafraîchir même si l'index contient des éléments non fusionnés"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "rafraîchir l'information de stat"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<mode>, <objet>, <chemin>"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "ajouter l'élément spécifié dans l'index"
 
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "marquer les fichiers comme \"non changeants\""
 
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "mettre à zéro le bit supposé-non-modifié"
 
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "marquer les fichiers comme \"index seulement\""
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "mettre à zéro le bit sauter-la-copie-de travail"
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
 msgid "do not touch index-only entries"
 msgstr "ne pas toucher aux entrées restreintes à l'index"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
-msgstr "ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de données des objets"
+msgstr ""
+"ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de "
+"données des objets"
 
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
-msgstr "supprimer les chemins nommés même s'ils sont présents dans la copie de travail"
+msgstr ""
+"supprimer les chemins nommés même s'ils sont présents dans la copie de "
+"travail"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls"
 
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard"
 
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "ajouter les éléments depuis l'entrée standard à l'index"
 
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
 
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "ignorer les fichiers manquants dans la copie de travail"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "afficher les actions sur la sortie standard"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "écrire l'index dans ce format"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "activer ou désactiver l'index divisé"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "activer ou désactiver le cache de non-suivis"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "tester si le système de fichier supporte le cache de non-suivis"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "activer le cache de non-suivis sans tester le système de fichier"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "écrire l'index même s'il n'est pas marqué comme modifié"
 
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
-msgstr "activer ou désactiver la surveillance du système de fichier (fsmonitor)"
+msgstr ""
+"activer ou désactiver la surveillance du système de fichier (fsmonitor)"
 
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "marquer les fichiers comme valides pour fsmonitor"
 
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "effacer le bit de validité fsmonitor"
 
-#: builtin/update-index.c:1175
-msgid "core.splitIndex is set to false; remove or change it, if you really want to enable split index"
-msgstr "core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous souhaitez vraiment activer l'index coupé"
+#: builtin/update-index.c:1173
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous "
+"souhaitez vraiment activer l'index coupé"
 
-#: builtin/update-index.c:1184
-msgid "core.splitIndex is set to true; remove or change it, if you really want to disable split index"
-msgstr "core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous souhaitez vraiment désactiver l'index coupé"
+#: builtin/update-index.c:1182
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous "
+"souhaitez vraiment désactiver l'index coupé"
 
-#: builtin/update-index.c:1196
-msgid "core.untrackedCache is set to true; remove or change it, if you really want to disable the untracked cache"
-msgstr "core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous souhaitez vraiment désactiver le cache des fichiers non-suivis"
+#: builtin/update-index.c:1194
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous "
+"souhaitez vraiment désactiver le cache des fichiers non-suivis"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Le cache non suivi est désactivé"
 
-#: builtin/update-index.c:1208
-msgid "core.untrackedCache is set to false; remove or change it, if you really want to enable the untracked cache"
-msgstr "core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous souhaitez vraiment activer le cache des fichiers non-suivis"
+#: builtin/update-index.c:1206
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+"core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous "
+"souhaitez vraiment activer le cache des fichiers non-suivis"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Le cache non suivi est activé pour '%s'"
 
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
-msgstr "core.fsmonitor est réglé à false ; changez-le si vous souhaitez vraiment activer la surveillance du système de fichiers"
+msgstr ""
+"core.fsmonitor est réglé à false ; changez-le si vous souhaitez vraiment "
+"activer la surveillance du système de fichiers"
 
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "fsmonitor activé"
 
-#: builtin/update-index.c:1227
-msgid "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
-msgstr "core.fsmonitor est réglé à true ; supprimez-le ou changez-le si vous souhaitez vraiment désactiver la surveillance du système de fichiers"
+#: builtin/update-index.c:1225
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+"core.fsmonitor est réglé à true ; supprimez-le ou changez-le si vous "
+"souhaitez vraiment désactiver la surveillance du système de fichiers"
 
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "fsmonitor désactivé"
 
@@ -22560,25 +24300,27 @@ msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]"
 
 #: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
-msgstr "git update-ref [<options>]    <nom-référence> <nouvelle-valeur> [<ancienne-valeur>]"
+msgstr ""
+"git update-ref [<options>]    <nom-référence> <nouvelle-valeur> [<ancienne-"
+"valeur>]"
 
 #: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<options>] --stdin [-z]"
 
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "supprimer la référence"
 
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
 msgstr "mettre à jour <nomréférence> et non la référence pointée par lui"
 
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "l'entrée standard a des arguments qui se terminent par NUL"
 
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "lire les mises à jour depuis l'entrée standard"
 
@@ -22594,19 +24336,20 @@ msgstr "mettre à jour les fichiers d'information à partir de zéro"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<options>] <répertoire>"
 
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
 msgid "quit after a single request/response exchange"
 msgstr "quitter après un unique échange requête/réponse"
 
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "sortir immédiatement après l'annonce initiale des références"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "servir l'information et les références pour git-http-backend"
 
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr "ne pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire Git"
+msgstr ""
+"ne pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire Git"
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interrompre le transfert après <n> secondes d'inactivité"
 
@@ -22642,72 +24385,68 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..."
 msgid "print tag contents"
 msgstr "afficher le contenu de l'étiquette"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<options>] <chemin> [<commit>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<options>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<options>] <chemin>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<options>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<options>] <arbre-de-travail>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <chemin>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:935
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "échec de la suppression de '%s'"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "Suppression de %s/%s : %s"
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
 msgid "report pruned working trees"
 msgstr "afficher les arbres de travail éliminés"
 
-#: builtin/worktree.c:151
+#: builtin/worktree.c:150
 msgid "expire working trees older than <time>"
 msgstr "faire expirer les arbres de travail plus vieux que <temps>"
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c:220
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existe déjà"
 
-#: builtin/worktree.c:230
+#: builtin/worktree.c:229
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "arbre de travail destination '%s' inutilisable"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, 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' est un arbre de travail manquant mais verrouillé ;\n"
-"utilisez '%s -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' pour corriger"
+"utilisez '%s -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' "
+"pour corriger"
 
-#: builtin/worktree.c:237
+#: builtin/worktree.c:236
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -22716,34 +24455,42 @@ msgstr ""
 "'%s' est un arbre de travail manquant mais déjà enregistré ;\n"
 "utilisez '%s -f' pour passer outre, ou 'prune' ou 'remove' pour corriger"
 
-#: builtin/worktree.c:288
+#: builtin/worktree.c:287
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "impossible de créer le répertoire de '%s'"
 
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+msgid "initializing"
+msgstr "initialisation"
+
+#: 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:424
+#: 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)"
+msgstr ""
+"Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; "
+"précédemment sur %s)"
 
-#: builtin/worktree.c:433
+#: 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:439
+#: 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: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"
+msgstr ""
+"extraire la <branche> même si elle est déjà extraite dans une autre copie de "
+"travail"
 
 #: builtin/worktree.c:485
 msgid "create a new branch"
@@ -22761,90 +24508,94 @@ msgstr "remplissage de la nouvelle copie de travail"
 msgid "keep the new working tree locked"
 msgstr "conserver le verrou sur le nouvel arbre de travail"
 
-#: builtin/worktree.c:493
+#: builtin/worktree.c:492 builtin/worktree.c:729
+msgid "reason for locking"
+msgstr "raison du verrouillage"
+
+#: 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:496
+#: 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:504
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B et --detach sont mutuellement exclusifs"
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "ajouté avec --lock"
 
-#: builtin/worktree.c:565
+#: 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"
+msgstr ""
+"--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche"
 
-#: builtin/worktree.c:682
+#: 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:684
-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:693
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose et --porcelain sont mutuellement exclusifs"
-
-#: builtin/worktree.c:720
-msgid "reason for locking"
-msgstr "raison du verrouillage"
+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:732 builtin/worktree.c:765 builtin/worktree.c:839 builtin/worktree.c:963
+#: 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:734 builtin/worktree.c:767
+#: 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"
+msgstr ""
+"La copie de travail principale ne peut pas être verrouillée ou déverrouillée"
 
-#: builtin/worktree.c:739
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' est déjà verrouillé, car '%s'"
 
-#: builtin/worktree.c:741
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' est déjà verrouillé"
 
-#: builtin/worktree.c:769
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' n'est pas verrouillé"
 
-#: builtin/worktree.c:810
+#: 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"
+msgstr ""
+"les arbres de travail contenant des sous-modules ne peuvent pas être "
+"déplacés ou supprimés"
 
-#: builtin/worktree.c:818
+#: 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é"
+msgstr ""
+"forcer le déplacement même si l'arbre de travail est sale ou verrouillé"
 
-#: builtin/worktree.c:841 builtin/worktree.c:965
+#: 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:846
+#: 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:859
+#: 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 ""
-"impossible de déplacer un arbre de travail verrouillé, raison du verrouillage : %s\n"
+"impossible de déplacer un arbre de travail verrouillé, raison du "
+"verrouillage : %s\n"
 "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
 
-#: builtin/worktree.c:861
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -22852,45 +24603,49 @@ msgstr ""
 "impossible de déplacer un arbre de travail verrouillé;\n"
 "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
 
-#: builtin/worktree.c:864
+#: 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:869
+#: 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:915
+#: 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:919
+#: 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"
+msgstr ""
+"'%s' contient des fichiers modifiés ou non-suivis, utilisez --force pour le "
+"supprimer"
 
-#: builtin/worktree.c:924
+#: 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:947
+#: 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é"
+msgstr ""
+"forcer la suppression même si l'arbre de travail est sale ou verrouillé"
 
-#: builtin/worktree.c:970
+#: 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 ""
-"impossible de supprimer un arbre de travail verrouillé, raison du verrouillage : %s\n"
+"impossible de supprimer un arbre de travail verrouillé, raison du "
+"verrouillage : %s\n"
 "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
 
-#: builtin/worktree.c:972
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -22898,17 +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:975
+#: 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"
+msgstr ""
+"la validation a échoué, impossible de supprimer l'arbre de travail : %s"
 
-#: builtin/worktree.c:999
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "réparation : %s : '%s'"
 
-#: builtin/worktree.c:1002
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "erreur : %s : %s"
@@ -22933,16 +24689,20 @@ msgstr "seulement utile pour le débogage"
 msgid ""
 "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"
+"           [-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>]"
 msgstr ""
 "git [--version] [--help] [-C <chemin>] [-c <nom>=<valeur>]\n"
-"           [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-path]\n"
-"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-"
+"path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
 "           [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n"
-"           [--super-prefix=<chemin>] [--config-env=<nom>=<variable-d-environnement>]\n"
+"           [--super-prefix=<chemin>] [--config-env=<nom>=<variable-d-"
+"environnement>]\n"
 "           <commande> [<args>]"
 
 #: git.c:36
@@ -22957,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"
@@ -22985,12 +24740,7 @@ msgstr "-c requiert une chaîne de configuration\n"
 #: git.c:260
 #, c-format
 msgid "no config key given for --config-env\n"
-msgstr "aucune clé de configuration fournie pour --conf-env\n"
-
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "aucun répertoire fourni pour -C\n"
+msgstr "aucune clé de configuration fournie pour --config-env\n"
 
 #: git.c:326
 #, c-format
@@ -23021,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:833
+#: 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:883
+#: 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:896
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -23052,33 +24802,26 @@ msgstr ""
 "usage : %s\n"
 "\n"
 
-#: git.c:916
+#: 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"
+msgstr ""
+"l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n"
 
-#: git.c:928
+#: 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"
@@ -23104,145 +24847,118 @@ msgstr "test-tool serve-v2 [<options>]"
 msgid "exit immediately after advertising capabilities"
 msgstr "sortir immédiatement après l'annonce des capacités"
 
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "socket/pipe déjà en cours d'utilisation : '%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "impossible de démarrer les serveur sur : '%s'"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "échec du lancement d'un daemon en tâche de fond"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "échec du waitpid"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "daemon pas encore en ligne"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "échec du démarrage du daemon"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid est embrouillé"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "le daemon n'est pas encore arrêté"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
 msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
 msgstr "test-helper simple-ipc-is-active [<nom>] [<options>]"
 
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
 msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
 msgstr "test-helper simple-ipc run-daemon   [<nom>] [<fils-d'exécution>]"
 
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
-msgstr "test-helper simple-ipc start-daemon [<nom>] [<fils-d'exécution>] [<attente-max>]"
+msgstr ""
+"test-helper simple-ipc start-daemon [<nom>] [<fils-d'exécution>] [<attente-"
+"max>]"
 
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
 msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
 msgstr "test-helper simple-ipc stop-daemon  [<nom>] [<attente-max>]"
 
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
 msgid "test-helper simple-ipc send         [<name>] [<token>]"
 msgstr "test-helper simple-ipc send         [<nom>] [<jeton>]"
 
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
 msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
-msgstr "test-helper simple-ipc sendbytes    [<nom>] [<nombre-d'octets>] [<octets>]"
+msgstr ""
+"test-helper simple-ipc sendbytes    [<nom>] [<nombre-d'octets>] [<octets>]"
 
-#: t/helper/test-simple-ipc.c:688
-msgid "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] [<batchsize>]"
-msgstr "test-helper simple-ipc multiple     [<nom>] [<fils-d'exécution>] [<nombre-d'octets>] [<taille-de-lot>]"
+#: t/helper/test-simple-ipc.c:587
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<nom>] [<fils-d'exécution>] [<nombre-"
+"d'octets>] [<taille-de-lot>]"
 
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
 msgid "name or pathname of unix domain socket"
 msgstr "nom ou nom de chemin du socket unix"
 
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
 msgid "named-pipe name"
 msgstr "nom du pipe nommé"
 
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
 msgid "number of threads in server thread pool"
-msgstr "nombre de fils d'exécution dans le réservoir de fils d'exécution du serveur"
+msgstr ""
+"nombre de fils d'exécution dans le réservoir de fils d'exécution du serveur"
 
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
 msgid "seconds to wait for daemon to start or stop"
 msgstr "nombre de secondes à attendre que le daemon démarre ou s'arrête"
 
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
 msgid "number of bytes"
 msgstr "nombre d'octets"
 
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
 msgid "number of requests per thread"
 msgstr "nombre de requêtes par fil d'exécution"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "byte"
 msgstr "octet"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "ballast character"
 msgstr "caractère ballast"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "token"
 msgstr "jeton"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "command token to send to the server"
 msgstr "jeton de commande à envoyer au serveur"
 
-#: http.c:399
+#: http.c:350
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
-msgstr "valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d"
+msgstr ""
+"valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d"
 
-#: http.c:420
+#: http.c:371
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0"
 
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.39.0"
 
-#: http.c:910
+#: http.c:812
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
-msgstr "CURLSSLOPT_NO_REMOVE n'est pas supporté avec cuRL < 7.44.0"
-
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Les restrictions de protocole ne sont pas supportés avec cuRL < 7.19.4"
+msgstr "CURLSSLOPT_NO_REVOKE n'est pas supporté avec cuRL < 7.44.0"
 
-#: http.c:1132
+#: http.c:1016
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "Dorsale SSL '%s' non supportée. Dorsales SSL supportées :"
 
-#: http.c:1139
+#: http.c:1023
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
-msgstr "Impossible de régler la dorsale SSL à '%s' : cURL a été construit sans dorsale SSL"
+msgstr ""
+"Impossible de régler la dorsale SSL à '%s' : cURL a été construit sans "
+"dorsale SSL"
 
-#: http.c:1143
+#: http.c:1027
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "Impossible de spécifier le dorsal SSL à '%s' : déjà spécifié"
 
-#: http.c:2035
+#: http.c:1876
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -23258,133 +24974,312 @@ msgstr ""
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "citation invalide dans la valeur push-option : '%s'"
 
-#: remote-curl.c:307
+#: remote-curl.c:304
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs n'est pas valide : est-ce bien un dépôt git ?"
 
-#: remote-curl.c:408
+#: remote-curl.c:405
 msgid "invalid server response; expected service, got flush packet"
 msgstr "réponse du serveur invalide ; service attendu, paquet de vidage reçu"
 
-#: remote-curl.c:439
+#: remote-curl.c:436
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "réponse du serveur invalide ; '%s' reçu"
 
-#: remote-curl.c:499
+#: remote-curl.c:496
 #, c-format
 msgid "repository '%s' not found"
 msgstr "dépôt '%s' non trouvé"
 
-#: remote-curl.c:503
+#: remote-curl.c:500
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Échec d'authentification pour '%s'"
 
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+"impossible d'accéder à '%s' avec la configuration http.pinnedPubkey : %s"
+
+#: remote-curl.c:508
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "impossible d'accéder à '%s' : %s"
 
-#: remote-curl.c:513
+#: remote-curl.c:514
 #, c-format
 msgid "redirecting to %s"
 msgstr "redirection vers %s"
 
-#: remote-curl.c:642
+#: remote-curl.c:645
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "ne devrait pas recevoir OEF quand on n'est pas gentil sur EOF"
 
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr "le serveur distant a envoyé un séparateur sans état"
+#: remote-curl.c:657
+msgid "remote server sent unexpected response end packet"
+msgstr "le serveur distant a envoyé un paquet de fin de réponse inattendu"
 
-#: remote-curl.c:724
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
-msgstr "impossible de rembobiner le données post rpc - essayer d'augmenter http.postBuffer"
+msgstr ""
+"impossible de rembobiner le données post rpc - essayer d'augmenter http."
+"postBuffer"
 
-#: remote-curl.c:754
+#: remote-curl.c:755
 #, c-format
 msgid "remote-curl: bad line length character: %.4s"
 msgstr "remote-curl : mauvais caractère de longueur de ligne : %.4s"
 
-#: remote-curl.c:756
+#: remote-curl.c:757
 msgid "remote-curl: unexpected response end packet"
 msgstr "remote-curl : paquet de fin de réponse inattendu"
 
-#: remote-curl.c:832
+#: remote-curl.c:833
 #, c-format
 msgid "RPC failed; %s"
 msgstr "échec RPC ; %s"
 
-#: remote-curl.c:872
+#: remote-curl.c:873
 msgid "cannot handle pushes this big"
 msgstr "impossible de gérer des poussées aussi grosses"
 
-#: remote-curl.c:987
+#: remote-curl.c:986
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "impossible de compresser la requête ; erreur de compression zlib %d"
 
-#: remote-curl.c:991
+#: remote-curl.c:990
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "impossible de compresser la requête ; erreur de fin zlib %d"
 
-#: remote-curl.c:1041
+#: remote-curl.c:1040
 #, c-format
 msgid "%d bytes of length header were received"
 msgstr "%d octets de longueur d'entête ont été reçus"
 
-#: remote-curl.c:1043
+#: remote-curl.c:1042
 #, c-format
 msgid "%d bytes of body are still expected"
 msgstr "%d octets de corps sont encore attendus"
 
-#: remote-curl.c:1132
+#: remote-curl.c:1131
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "le protocole http idiot ne supporte la capacité superficielle"
 
-#: remote-curl.c:1147
+#: remote-curl.c:1146
 msgid "fetch failed."
 msgstr "échec du récupération."
 
-#: remote-curl.c:1193
+#: remote-curl.c:1192
 msgid "cannot fetch by sha1 over smart http"
 msgstr "impossible de récupérer par sha1 sur http intelligent"
 
-#: remote-curl.c:1237 remote-curl.c:1243
+#: remote-curl.c:1236 remote-curl.c:1242
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé"
 
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1254 remote-curl.c:1372
 #, c-format
 msgid "http transport does not support %s"
 msgstr "le transport http ne supporte pas %s"
 
-#: remote-curl.c:1291
+#: remote-curl.c:1290
 msgid "git-http-push failed"
 msgstr "échec de git-http-push"
 
-#: remote-curl.c:1479
+#: remote-curl.c:1478
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: usage: git remote-curl <distant> [<url>]"
 
-#: remote-curl.c:1511
+#: remote-curl.c:1510
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl : erreur de lecture du flux de commande depuis git"
 
-#: remote-curl.c:1518
+#: remote-curl.c:1517
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl : récupération tentée sans dépôt local"
 
-#: remote-curl.c:1559
+#: remote-curl.c:1558
 #, c-format
 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"
@@ -23401,11 +25296,11 @@ msgstr "args"
 msgid "object filtering"
 msgstr "filtrage d'objet"
 
-#: parse-options.h:184
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "date-d'expiration"
 
-#: parse-options.h:198
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "sans action (rétrocompatibilité)"
 
@@ -23430,20 +25325,24 @@ msgid "read pathspec from file"
 msgstr "lire les spécificateurs de fichier depuis fichier"
 
 #: 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"
+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:99
+#: ref-filter.h:98
 msgid "key"
 msgstr "clé"
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "nom du champ servant à trier"
 
 #: rerere.h:44
 msgid "update the index with reused conflict resolution if possible"
-msgstr "met à jour l'index avec les résolutions de conflit réutilisées si possible"
+msgstr ""
+"met à jour l'index avec les résolutions de conflit réutilisées si possible"
 
 #: command-list.h:50
 msgid "Add file contents to the index"
@@ -23475,7 +25374,9 @@ msgstr "Trouver par recherche binaire la modification qui a introduit un bogue"
 
 #: command-list.h:57
 msgid "Show what revision and author last modified each line of a file"
-msgstr "Montrer la révision et l'auteur qui ont modifié en dernier chaque ligne d'un fichier"
+msgstr ""
+"Montrer la révision et l'auteur qui ont modifié en dernier chaque ligne d'un "
+"fichier"
 
 #: command-list.h:58
 msgid "List, create, or delete branches"
@@ -23483,7 +25384,8 @@ msgstr "Lister, créer ou supprimer des branches"
 
 #: command-list.h:59
 msgid "Collect information for user to file a bug report"
-msgstr "Collecter l'information pour l'utilisateur pour remplir un rapport de bogue"
+msgstr ""
+"Collecter l'information pour l'utilisateur pour remplir un rapport de bogue"
 
 #: command-list.h:60
 msgid "Move objects and refs by archive"
@@ -23491,7 +25393,9 @@ msgstr "Déplacer les objets et références par archive"
 
 #: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
-msgstr "Fournir le contenu ou l'information de type et taille pour les objets du dépôt"
+msgstr ""
+"Fournir le contenu ou l'information de type et taille pour les objets du "
+"dépôt"
 
 #: command-list.h:62
 msgid "Display gitattributes information"
@@ -23506,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"
@@ -23559,7 +25463,9 @@ msgstr "Voir et régler les options globales ou de dépôt"
 
 #: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
-msgstr "Compter le nombre d'objets non-empaquetés et leur consommation d'espace disque"
+msgstr ""
+"Compter le nombre d'objets non-empaquetés et leur consommation d'espace "
+"disque"
 
 #: command-list.h:79
 msgid "Retrieve and store user credentials"
@@ -23591,11 +25497,14 @@ msgstr "Un serveur vraiment simple pour les dépôts Git"
 
 #: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
-msgstr "Baptiser un objet avec un nom lisible à partir d'une référence disponible"
+msgstr ""
+"Baptiser un objet avec un nom lisible à partir d'une référence disponible"
 
 #: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
-msgstr "Afficher les changements entre les validations, entre validation et copie de travail, etc"
+msgstr ""
+"Afficher les changements entre les validations, entre validation et copie de "
+"travail, etc"
 
 #: command-list.h:88
 msgid "Compares files in the working tree and the index"
@@ -23651,7 +25560,8 @@ msgstr "Préparer les patchs pour soumission par courriel"
 
 #: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
-msgstr "Vérifier la connectivité et la validité des objets dans la base de données"
+msgstr ""
+"Vérifier la connectivité et la validité des objets dans la base de données"
 
 #: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
@@ -23671,7 +25581,8 @@ msgstr "Une interface graphique portable pour Git"
 
 #: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
-msgstr "Calculer l'ID d'objet et créer optionnellement un blob depuis un fichier"
+msgstr ""
+"Calculer l'ID d'objet et créer optionnellement un blob depuis un fichier"
 
 #: command-list.h:107
 msgid "Display help information about Git"
@@ -23695,7 +25606,8 @@ msgstr "Envoyer un ensemble de rustines depuis stdin vers un répertoire IMAP"
 
 #: command-list.h:112
 msgid "Build pack index file for an existing packed archive"
-msgstr "Construire un fichier d'index pack depuis une archive compactée existante"
+msgstr ""
+"Construire un fichier d'index pack depuis une archive compactée existante"
 
 #: command-list.h:113
 msgid "Create an empty Git repository or reinitialize an existing one"
@@ -23707,458 +25619,441 @@ msgstr "Naviguer instantanément votre dépôt de travail dans gitweb"
 
 #: command-list.h:115
 msgid "Add or parse structured information in commit messages"
-msgstr "Ajouter ou analyser l'information structurée dans les messages de validation"
+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"
+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"
+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:129
-msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr "Lancer les outils de résolution de conflit de fusion pour résoudre les conflits de fusion"
-
-#: command-list.h:130
+#: 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:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "Écrire et vérifier les index multi-paquet"
+#: command-list.h:129
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr ""
+"Lancer les outils de résolution de conflit de fusion pour résoudre les "
+"conflits de fusion"
 
-#: command-list.h:132
+#: command-list.h:130
 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"
+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)"
+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"
+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é"
+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"
+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"
+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"
 msgstr "Un aperçu des flux de travail recommandés avec Git"
 
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "la bissection a échoué : aucune commande fournie."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "lancement de $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"la bissection a échoué :\n"
-"le code retour $res de '$command' est < 0 ou >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "la bissection ne peut plus continuer"
-
-#: git-bisect.sh:111
-#, sh-format
+#: git-merge-octopus.sh:46
 msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
 msgstr ""
-"la bissection a échoué :\n"
-"'bisect-state $state' a retourné le code erreur $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "succès de la bissection"
-
-#: git-merge-octopus.sh:46
-msgid "Error: Your local changes to the following files would be overwritten by merge"
-msgstr "Erreur : vos modifications locales aux fichiers suivants seraient écrasées par la fusion"
+"Erreur : vos modifications locales aux fichiers suivants seraient écrasées "
+"par la fusion"
 
 #: git-merge-octopus.sh:61
 msgid "Automated merge did not work."
@@ -24192,523 +26087,76 @@ msgstr "Essai de fusion simple avec $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "La fusion simple a échoué, essai avec la fusion automatique."
 
-#: git-submodule.sh:179
-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"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "l'URL de dépôt : '$repo' doit être absolu ou commencer par ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' existe déjà dans l'index"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' n'a pas de commit extrait"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "Ajout du dépôt existant à '$sm_path' dans l'index"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr "Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) distant(s) :"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-"  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct repo\n"
-"or you are unsure what this means choose another name with the '--name' option."
-msgstr ""
-"Si vous voulez réutiliser ce répertoire local git au lieu de le recloner depuis\n"
-"  $realrepo\n"
-"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt correct\n"
-"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Impossible d'extraire le sous-module '$sm_path'"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Échec d'ajout du sous-module '$sm_path'"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Échec d'enregistrement du sous-module '$sm_path'"
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr "Impossible de trouver la révision courante dans le chemin de sous-module '$displaypath'"
+msgstr ""
+"Impossible de trouver la révision courante dans le chemin de sous-module "
+"'$displaypath'"
 
-#: git-submodule.sh:578
+#: git-submodule.sh:411
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'"
 
-#: git-submodule.sh:583
-#, sh-format
-msgid "Unable to find current ${remote_name}/${branch} revision in submodule path '$sm_path'"
-msgstr "Impossible de trouver la révision courante ${remote_name}/${branch} dans le chemin de sous-module '$sm_path'"
-
-#: git-submodule.sh:601
-#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'; trying to directly fetch $sha1:"
-msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath' ; essai de rapatriement direct de $sha1 :"
-
-#: git-submodule.sh:607
-#, sh-format
-msgid "Fetched in submodule path '$displaypath', but it did not contain $sha1. Direct fetching of that commit failed."
-msgstr "Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas $sha1. La récupération directe de ce commit a échoué."
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'"
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'"
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr "L'exécution de '$command $sha1' a échoué dans le chemin de sous-module '$displaypath'"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
-
-#: git-submodule.sh:663
-#, sh-format
-msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Autoremisage appliqué."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Impossible de stocker $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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'application de l'autoremisage a provoqué des conflits\n"
-"Vos  modifications sont à l'abri dans la remise.\n"
-"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Rebasage ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-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"
-"Commandes :\n"
-" p, pick <commit> = utiliser le commit\n"
-" r, reword <commit> = utiliser le commit, mais reformuler son message\n"
-" e, edit <commit> = utiliser le commit, mais s'arrêter pour le modifier\n"
-" s, squash <commit> = utiliser le commit, mais le fusionner avec le précédent\n"
-" f, fixup <commit> = comme \"squash\", mais en éliminant son message\n"
-" x, exec <commit> = lancer la commande (reste de la ligne) dans un shell\n"
-" d, drop <commit> = supprimer le commit\n"
-" l, label <label> = étiqueter la HEAD courante avec un nom\n"
-" t, reset <label> = réinitialiser HEAD à label\n"
-" m, merge [-C <commit> | -c <commit>] <label> [# <uniligne>]\n"
-"         créer un commit de fusion utilisant le message de fusion original\n"
-"         (ou l'uniligne, si aucun commit de fusion n'a été spécifié).\n"
-"         Utilisez -c <commit> pour reformuler le message de validation.\n"
-"\n"
-"Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, 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 ""
-"Vous pouvez corriger le commit maintenant, avec\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"après avoir réalisé vos modifications, lancez\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1 n'est pas un commit qui peut être picorer"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Nom de commit invalide : $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Impossible de sauver le sha1 du remplaçant du commit en cours"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Avance rapide sur $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Avance rapide impossible sur $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Impossible de déplacer HEAD sur $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Refus d'écraser un commit de fusion: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Erreur lors de la réapplication de la fusion $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Impossible de picorer $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Ceci est le ${n}ième message de validation :"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Le message de validation ${n} sera ignoré :"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Ceci est la combinaison de $count commit."
-msgstr[1] "Ceci est la combinaison de $count commits."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Impossible d'écrire $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Ceci est la combinaison de 2 commits."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Impossible d'appliquer $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
+#: git-submodule.sh:416
 #, 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."
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
 msgstr ""
-"Impossible de corriger le commit après avoir réussi à picorer $sha1... $rest\n"
-"C'est probablement dû à un message de validation vide ou le crochet pre-commit\n"
-"a échoué. Si le crochet pre-commit a échoué, vous devez peut-être résoudre le\n"
-"problème avant de pouvoir reformuler le message du commit."
+"Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
+"chemin de sous-module '$sm_path'"
 
-#: git-rebase--preserve-merges.sh:616
+#: git-submodule.sh:464
 #, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Arrêté à $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "'$squash_style' impossible avec le commit précédent"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Exécution : $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "L'exécution a échoué : $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "et a mis à jour l'index ou la copie de travail"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Vous pouvez corriger le problème, puis lancer\n"
-"\n"
-"git rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, 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'exécution a réussi : $rest\n"
-"mais a laissé des modifications dans l'index ou la copie de travail\n"
-"Validez ou remisez vos modification, puis lancez\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Commande inconnue : $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Rebasage et mise à jour de $head_name avec succès."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Impossible de supprimer CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, 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 ""
-"Vous avez des modifications indexées dans votre copie de travail.\n"
-"Si ces modifications devaient être ajoutées\n"
-"dans le commit précédent, lancez :\n"
-"\n"
-"  git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Si elles devaient aller dans un nouveau commit, lancez :\n"
-"\n"
-"  git commit $gpg_sign_opt_quoted\n"
-"\n"
-"Dans les deux cas, une fois fini, continuez avec :\n"
-"\n"
-"  git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Vous avez des modifications non validées dans votre copie de travail.\n"
-"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "impossible de valider les modifications indexées."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Impossible de lancer l'éditeur"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Impossible d'extraire $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Pas de HEAD ?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Impossible de créer un répertoire temporaire $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Impossible de marquer comme interactif"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)"
-msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Veuillez noter que les commits vides sont en commentaire"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Impossible d'initialiser les commits réécrits"
+msgid "Failed to recurse into submodule path '$displaypath'"
+msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
 
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 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"
+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
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Impossible de rebaser : vous avez des modifications non indexées."
-
-#: git-sh-setup.sh:224
+#: 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:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "impossible de tirer avec rebasage. Vous avez des modifications non indexées."
+msgstr ""
+"Impossible de réécrire les branches : vous avez des modifications non "
+"indexées."
 
-#: git-sh-setup.sh:230
+#: 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:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "Impossible de rebaser : votre index contient des modifications non validées."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "impossible de tirer avec rebasage : votre index contient des modifications non validées."
-
-#: git-sh-setup.sh:249
+#: 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."
+msgstr ""
+"$action est impossible : votre index contient des modifications non validées."
 
-#: git-sh-setup.sh:253
+#: 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:373
+#: 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."
+msgstr ""
+"Vous devez lancer cette commande depuis la racine de votre copie de travail."
 
-#: git-sh-setup.sh:378
+#: 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"
 
@@ -24749,7 +26197,8 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme desindexée."
 
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1074 git-add--interactive.perl:1080
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -24757,7 +26206,8 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme appliquée."
 
-#: git-add--interactive.perl:1068 git-add--interactive.perl:1071 git-add--interactive.perl:1077
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -24788,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"
@@ -24802,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"
@@ -24816,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"
@@ -24830,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"
@@ -24844,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"
@@ -24858,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"
@@ -24872,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"
@@ -24886,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"
@@ -24900,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"
@@ -24922,200 +26372,216 @@ 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,?] ? "
+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"
 "revert        - revert staged set of changes back to the HEAD version\n"
 "patch         - pick hunks and update selectively\n"
 "diff          - view diff between HEAD and index\n"
-"add untracked - add contents of untracked files to the staged set of changes\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
 msgstr ""
 "status        - montrer les chemins modifiés\n"
-"update        - ajouter l'état de l'arbre de travail aux modifications à indexer\n"
+"update        - ajouter l'état de l'arbre de travail aux modifications à "
+"indexer\n"
 "revert        - faire revenir les modifications à indexer à la version HEAD\n"
 "patch         - sélectionner les sections et mettre à jour sélectivement\n"
 "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:138
+#: 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"
+msgstr ""
+"la zone locale diffère du GMT par un intervalle supérieur à une minute\n"
 
-#: git-send-email.perl:145 git-send-email.perl:151
+#: 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:222
+#: 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:235
+#: 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:321
+#: 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"
+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:326
+#: 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:419
+#: 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:493
+#: 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 : options de configuration trouvées pour 'sendmail'\n"
-"git-send-mail est configuré avec des options sendemail.* - veuillez noter le 'e'.\n"
-"Positionnez sendemail.forbidSendmailVariables à false pour désactiver cette vérification.\n"
+"git-send-email est configuré avec des options sendemail.* - veuillez noter "
+"le 'e'.\n"
+"Positionnez sendemail.forbidSendmailVariables à false pour désactiver cette "
+"vérification.\n"
 
-#: git-send-email.perl:498 git-send-email.perl:700
+#: 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:501
-msgid "`batch-size` and `relogin` must be specified together (via command-line or configuration option)\n"
-msgstr "`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de commande ou des options de configuration)\n"
+#: git-send-email.perl:569
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+"`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de "
+"commande ou des options de configuration)\n"
 
-#: git-send-email.perl:514
+#: 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:545
+#: 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:573
+#: 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"
+msgstr ""
+"attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n"
 
-#: git-send-email.perl:575
+#: 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:577
+#: 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"
+msgstr ""
+"attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n"
 
-#: git-send-email.perl:582
+#: 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:666
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -25124,18 +26590,18 @@ msgid ""
 "    * Saying \"./%s\" if you mean a file; or\n"
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
-"Le fichier '%s' existe mais ce pourrait aussi être la plage de commmits\n"
-"pour lequel les patches sont à produire. Veuillez préciser...\n"
+"Le fichier '%s' existe, mais ce pourrait aussi être la plage de commits\n"
+"pour lequel les rustines sont à produire. Veuillez préciser...\n"
 "\n"
 "    * 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:687
+#: 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:720
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -25145,17 +26611,17 @@ msgstr ""
 "Aucun fichier patch spécifié !\n"
 "\n"
 
-#: git-send-email.perl:733
+#: 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:743
+#: 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:754
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -25169,59 +26635,67 @@ msgstr ""
 "\n"
 "Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n"
 
-#: git-send-email.perl:778
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Échec à l'ouverture de %s : %s"
 
-#: git-send-email.perl:795
+#: 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:838
+#: 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:873
+#: 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:928
-msgid "The following files are 8bit, but do not declare a Content-Transfer-Encoding.\n"
-msgstr "Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-Transfer-Encoding.\n"
+#: git-send-email.perl:1026
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+"Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-"
+"Transfer-Encoding.\n"
 
-#: git-send-email.perl:933
+#: 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:941
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
 "\t%s\n"
-"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
 msgstr ""
 "Envoi refusé parce que le patch\n"
 "\t%s\n"
-"a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez vraiment envoyer.\n"
+"a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez "
+"vraiment envoyer.\n"
 
-#: git-send-email.perl:960
+#: 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:978
+#: 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:990
+#: 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) ? "
+msgstr ""
+"Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en "
+"a) ? "
 
-#: git-send-email.perl:1048 git-send-email.perl:1056
+#: 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"
@@ -25229,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:1060
+#: 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:1377
+#: 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:1460
+#: 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"
@@ -25265,112 +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:1475
+#: 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:1478
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Une réponse est nécessaire"
 
-#: git-send-email.perl:1506
+#: 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:1553
+#: 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:1558 git-send-email.perl:1562
+#: 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:1571
+#: 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."
+msgstr ""
+"Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-"
+"debug."
 
-#: git-send-email.perl:1589
+#: 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:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Envoi simulé de %s\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s envoyé\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulation OK. Le journal indique :\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK. Le journal indique :\n"
 
-#: git-send-email.perl:1606
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Résultat : "
 
-#: git-send-email.perl:1609
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Résultat : OK\n"
 
-#: git-send-email.perl:1627
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "impossible d'ouvrir le fichier %s"
 
-#: git-send-email.perl:1674 git-send-email.perl:1694
+#: 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:1680
+#: 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:1737
+#: 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:1772
+#: 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:1883
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Impossible d'exécuter '%s'"
 
-#: git-send-email.perl:1890
+#: 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:1894
+#: 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:1924
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "impossible d'envoyer un message comme 7bit"
 
-#: git-send-email.perl:1932
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "codage de transfert invalide"
 
-#: git-send-email.perl:1966
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -25381,12 +26857,12 @@ msgstr ""
 "%s\n"
 "attention : aucun patch envoyé\n"
 
-#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039
+#: 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:1979
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -25395,69 +26871,392 @@ msgstr ""
 "fatal : %s : %d est plus long que 998 caractères \n"
 "attention : aucun patch envoyé\n"
 
-#: git-send-email.perl:1997
+#: 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:2001
+#: 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 "--cached and --3way cannot be used together."
-#~ msgstr "--cached et --3way ne peuvent pas être utilisés ensemble."
+#~ msgid "--index outside a repository"
+#~ msgstr "--index hors d'un dépôt"
 
-#~ msgid "both"
-#~ msgstr "les deux"
+#~ msgid "--cached outside a repository"
+#~ msgstr "--cached hors d'un dépôt"
 
-#~ msgid "one"
-#~ msgstr "un"
+#~ msgid "unrecognized input"
+#~ msgstr "entrée non reconnue"
 
 #, c-format
-#~ msgid "Already up to date!"
-#~ msgstr "Déjà à jour !"
+#~ msgid "cannot read %s"
+#~ msgstr "impossible de lire %s"
 
-#~ msgid "Already up to date. Yeeah!"
-#~ msgstr "Déjà à jour. Ouais !"
+#~ 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"
 
-#~ msgid "--batch-size option is only for 'repack' subcommand"
-#~ msgstr "l'option --batch-size ne sert que pour la sous-commande 'repack'"
+#, 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'."
 
-#~ msgid "Percentage by which creation is weighted"
-#~ msgstr "Pourcentage par lequel la création est pondérée"
+#, 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 ""
-#~ "the rebase.useBuiltin support has been removed!\n"
-#~ "See its entry in 'git help config' for details."
+#~ "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
 #~ msgstr ""
-#~ "les support de rebase.useBuiltin a été supprimé !\n"
-#~ "Voir son entrée dans 'git help config' pour plus de détails."
+#~ "-G et --pickaxe-regex sont mutuellement exclusifs, utilisez --pickaxe-"
+#~ "regex avec -S"
 
-#, perl-format
-#~ msgid "%s: patch contains a line longer than 998 characters"
-#~ msgstr "%s : le patch contient une ligne plus longue que 998 caractères"
+#~ 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 "repository contains replace objects; skipping commit-graph"
-#~ msgstr "le dépôt contient des object de remplacement ; saut du graphe de commits"
+#~ msgid "-b, -B, and --detach are mutually exclusive"
+#~ msgstr "-b, -B et --detach sont mutuellement exclusifs"
 
-#~ msgid "repository contains (deprecated) grafts; skipping commit-graph"
-#~ msgstr "le dépôt contient des greffes (déconseillées) ; saut du graphe de commits"
+#~ msgid "--reason requires --lock"
+#~ msgstr "--reason exige --lock"
 
-#~ msgid "repository is shallow; skipping commit-graph"
-#~ msgstr "le dépôt est superficiel ; saut du graphe de commit"
+#~ msgid "--verbose and --porcelain are mutually exclusive"
+#~ msgstr "--verbose et --porcelain sont mutuellement exclusifs"
 
 #, c-format
-#~ msgid "commit-graph improper chunk offset %08x%08x"
-#~ msgstr "décalage de bloc %08x%08x du graphe de commit inadéquat"
+#~ msgid "no directory given for --git-dir\n"
+#~ msgstr "aucun répertoire fourni pour --git-dir\n"
 
 #, c-format
-#~ msgid "commit-graph chunk id %08x appears multiple times"
-#~ msgstr "l'id de bloc de graphe de commit %08x apparaît des multiples fois"
+#~ msgid "no directory given for --work-tree\n"
+#~ msgstr "aucun répertoire fourni pour --work-tree\n"
 
-#~ msgid "invalid chunk offset (too large)"
-#~ msgstr "décalage de section invalide (trop grand)"
+#~ msgid "--packfile requires --index-pack-args"
+#~ msgstr "--packfile nécessite --index-pack-args"
 
-#~ msgid "Writing chunks to multi-pack-index"
-#~ msgstr "Écriture des sections dans l'index multi-paquet"
+#~ 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 7889c2c77b..196249abd4 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,242 +8,243 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-05-17 16:02+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"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: add-interactive.c:376
+#: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr ""
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: 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 ""
 
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
 #: git-add--interactive.perl:294
 msgid "binary"
 msgstr ""
 
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
 #: git-add--interactive.perl:332
 msgid "nothing"
 msgstr ""
 
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
 #: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr ""
 
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
 msgid "Update"
 msgstr ""
 
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
 #, c-format
 msgid "could not stage '%s'"
 msgstr ""
 
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr ""
 
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
 #, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr ""
 
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: 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 ""
 
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
 msgid "Revert"
 msgstr ""
 
-#: add-interactive.c:775
+#: add-interactive.c:779
 msgid "Could not parse HEAD^{tree}"
 msgstr ""
 
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
 #, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr ""
 
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr ""
 
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
 #, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: add-interactive.c:925
+#: add-interactive.c:929
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr ""
 
-#: add-interactive.c:937 add-patch.c:1751 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:939 add-patch.c:1749 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:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr ""
 
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr ""
 
-#: add-interactive.c:1010
+#: add-interactive.c:1014
 msgid "show paths with changes"
 msgstr ""
 
-#: add-interactive.c:1012
+#: add-interactive.c:1016
 msgid "add working tree state to the staged set of changes"
 msgstr ""
 
-#: add-interactive.c:1014
+#: add-interactive.c:1018
 msgid "revert staged set of changes back to the HEAD version"
 msgstr ""
 
-#: add-interactive.c:1016
+#: add-interactive.c:1020
 msgid "pick hunks and update selectively"
 msgstr ""
 
-#: add-interactive.c:1018
+#: add-interactive.c:1022
 msgid "view diff between HEAD and index"
 msgstr ""
 
-#: add-interactive.c:1020
+#: add-interactive.c:1024
 msgid "add contents of untracked files to the staged set of changes"
 msgstr ""
 
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
 msgid "Prompt help:"
 msgstr ""
 
-#: add-interactive.c:1030
+#: add-interactive.c:1034
 msgid "select a single item"
 msgstr ""
 
-#: add-interactive.c:1032
+#: add-interactive.c:1036
 msgid "select a range of items"
 msgstr ""
 
-#: add-interactive.c:1034
+#: add-interactive.c:1038
 msgid "select multiple ranges"
 msgstr ""
 
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
 msgid "select item based on unique prefix"
 msgstr ""
 
-#: add-interactive.c:1038
+#: add-interactive.c:1042
 msgid "unselect specified items"
 msgstr ""
 
-#: add-interactive.c:1040
+#: add-interactive.c:1044
 msgid "choose all items"
 msgstr ""
 
-#: add-interactive.c:1042
+#: add-interactive.c:1046
 msgid "(empty) finish selecting"
 msgstr ""
 
-#: add-interactive.c:1079
+#: add-interactive.c:1083
 msgid "select a numbered item"
 msgstr ""
 
-#: add-interactive.c:1083
+#: add-interactive.c:1087
 msgid "(empty) select nothing"
 msgstr ""
 
-#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr ""
 
-#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr ""
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "staged"
 msgstr ""
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr ""
 
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
-#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
-#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
-#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
+#: 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 ""
 
-#: add-interactive.c:1151
+#: add-interactive.c:1155
 msgid "could not refresh index"
 msgstr ""
 
-#: add-interactive.c:1165 builtin/clean.c:781 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 ""
@@ -263,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 ""
@@ -298,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 ""
@@ -333,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 ""
@@ -368,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 ""
@@ -407,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 ""
@@ -436,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 ""
@@ -474,47 +475,47 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file\n"
 msgstr ""
 
-#: add-patch.c:342
+#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr ""
 
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr ""
 
-#: add-patch.c:419
+#: add-patch.c:420
 msgid "could not parse diff"
 msgstr ""
 
-#: add-patch.c:438
+#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr ""
 
-#: add-patch.c:452
+#: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
 msgstr ""
 
-#: add-patch.c:611
+#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
 msgstr ""
 
-#: add-patch.c:612
+#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
 msgstr ""
 
-#: add-patch.c:790
+#: add-patch.c:791
 #, c-format
 msgid ""
 "expected context line #%d in\n"
 "%.*s"
 msgstr ""
 
-#: add-patch.c:805
+#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -523,11 +524,11 @@ msgid ""
 "%.*s"
 msgstr ""
 
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr ""
 
-#: add-patch.c:1085
+#: add-patch.c:1086
 #, c-format
 msgid ""
 "---\n"
@@ -537,18 +538,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
 "aborted and the hunk is left unchanged.\n"
 msgstr ""
 
-#: add-patch.c:1132
+#: add-patch.c:1133
 msgid "could not parse hunk header"
 msgstr ""
 
-#: add-patch.c:1177
+#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr ""
 
@@ -564,24 +565,24 @@ 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:1246 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 ""
 
-#: add-patch.c:1289
+#: add-patch.c:1290
 msgid "The selected hunks do not apply to the index!"
 msgstr ""
 
-#: add-patch.c:1290 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:1297 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr ""
 
-#: add-patch.c:1354
+#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -594,145 +595,151 @@ msgid ""
 "? - print help\n"
 msgstr ""
 
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
 msgstr ""
 
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
 msgstr ""
 
-#: add-patch.c:1537
+#: add-patch.c:1538
 msgid "No other hunks to goto"
 msgstr ""
 
-#: add-patch.c:1548 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:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr ""
 
-#: add-patch.c:1560
+#: add-patch.c:1561
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr ""
 
-#: add-patch.c:1565
+#: add-patch.c:1566
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] ""
 msgstr[1] ""
 
-#: add-patch.c:1574
+#: add-patch.c:1575
 msgid "No other hunks to search"
 msgstr ""
 
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr ""
 
-#: add-patch.c:1595
+#: add-patch.c:1596
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr ""
 
-#: add-patch.c:1612
+#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
 msgstr ""
 
-#: add-patch.c:1619
+#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
 msgstr ""
 
-#: add-patch.c:1623
+#: add-patch.c:1624
 #, c-format
 msgid "Split into %d hunks."
 msgstr ""
 
-#: add-patch.c:1627
+#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
 msgstr ""
 
-#: add-patch.c:1679
+#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr ""
 
-#: advice.c:145
+#: advice.c:78
 #, c-format
 msgid ""
 "\n"
 "Disable this message with \"git config advice.%s false\""
 msgstr ""
 
-#: advice.c:161
+#: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr ""
 
-#: advice.c:252
+#: advice.c:178
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 
-#: advice.c:254
+#: advice.c:180
 msgid "Committing is not possible because you have unmerged files."
 msgstr ""
 
-#: advice.c:256
+#: advice.c:182
 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
 
-#: advice.c:258
+#: advice.c:184
 msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
 
-#: advice.c:260
+#: advice.c:186
 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
 
-#: advice.c:262
+#: advice.c:188
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr ""
 
-#: advice.c:270
+#: 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 ""
 
-#: advice.c:278
+#: advice.c:204
 msgid "Exiting because of an unresolved conflict."
 msgstr ""
 
-#: advice.c:283 builtin/merge.c:1374
+#: advice.c:209 builtin/merge.c:1382
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr ""
 
-#: advice.c:285
+#: advice.c:211
 msgid "Please, commit your changes before merging."
 msgstr ""
 
-#: advice.c:286
+#: advice.c:212
 msgid "Exiting because of unfinished merge."
 msgstr ""
 
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#: advice.c:227
 #, 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"
+"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 ""
 
-#: advice.c:303
+#: advice.c:234
 msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"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 ""
 
-#: advice.c:310
+#: advice.c:242
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -773,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
@@ -888,490 +907,489 @@ msgstr ""
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr ""
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr ""
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr ""
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr ""
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr ""
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr ""
 
-#: apply.c:2935
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr ""
 
-#: apply.c:3056
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:3068
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 
-#: apply.c:3074
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
 "%.*s"
 msgstr ""
 
-#: apply.c:3096
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr ""
 
-#: apply.c:3104
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 
-#: apply.c:3151
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 
-#: apply.c:3162
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
 
-#: apply.c:3170
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr ""
 
-#: apply.c:3188
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr ""
 
-#: apply.c:3201
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr ""
 
-#: apply.c:3208
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 
-#: apply.c:3229
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr ""
 
-#: apply.c:3352
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr ""
 
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 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 ""
 
-#: apply.c:3412
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr ""
 
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr ""
 
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr ""
 
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr ""
 
-#: apply.c:3571
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr ""
 
-#: apply.c:3574
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr ""
 
-#: apply.c:3590 apply.c:3594
+#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr ""
 
-#: apply.c:3606
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr ""
 
-#: apply.c:3620
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr ""
 
-#: apply.c:3625
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr ""
 
-#: apply.c:3642
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr ""
 
-#: apply.c:3654
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr ""
 
-#: apply.c:3727
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr ""
 
-#: apply.c:3729
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr ""
 
-#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
-#: read-cache.c:1351
+#: 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:3952
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr ""
 
-#: apply.c:3956
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr ""
 
-#: apply.c:3976
+#: apply.c:4000
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr ""
 
-#: apply.c:3981
+#: apply.c:4005
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 
-#: apply.c:4001
+#: apply.c:4025
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr ""
 
-#: apply.c:4005
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr ""
 
-#: apply.c:4020
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr ""
 
-#: apply.c:4112
+#: apply.c:4136
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 
-#: apply.c:4119
+#: apply.c:4143
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr ""
 
-#: apply.c:4122
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr ""
 
-#: apply.c:4131
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr ""
 
-#: apply.c:4141
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr ""
 
-#: apply.c:4279
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr ""
 
-#: apply.c:4313
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr ""
 
-#: apply.c:4319
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr ""
 
-#: apply.c:4327
+#: apply.c:4351
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 
-#: apply.c:4333 apply.c:4478
+#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr ""
 
-#: apply.c:4376 builtin/bisect--helper.c:523
+#: 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:4380
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr ""
 
-#: apply.c:4450
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr ""
 
-#: apply.c:4548
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr ""
 
-#: apply.c:4556
+#: apply.c:4580
 msgid "internal error"
 msgstr ""
 
-#: apply.c:4559
+#: 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:4570
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr ""
 
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr ""
 
-#: apply.c:4592
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr ""
 
-#: apply.c:4596
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr ""
 
-#: apply.c:4725
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr ""
 
-#: apply.c:4733
-msgid "unrecognized input"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
 msgstr ""
 
-#: apply.c:4753
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr ""
 
-#: apply.c:4910
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr ""
 
-#: apply.c:4937
+#: apply.c:4963
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:4943 apply.c:4958
+#: 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:4951
+#: 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:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
+#: 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:4995
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
 msgstr ""
 
-#: apply.c:4998
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr ""
 
-#: apply.c:5000 builtin/am.c:2317
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr ""
 
-#: apply.c:5001
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 
-#: apply.c:5004
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr ""
 
-#: apply.c:5006
+#: apply.c:5032
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 
-#: apply.c:5010
+#: apply.c:5036
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 
-#: apply.c:5012
+#: apply.c:5038
 msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
 
-#: apply.c:5014
+#: apply.c:5040
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
 
-#: apply.c:5016
+#: apply.c:5042
 msgid "make sure the patch is applicable to the current index"
 msgstr ""
 
-#: apply.c:5018
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr ""
 
-#: apply.c:5020
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr ""
 
-#: apply.c:5022
+#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 
-#: apply.c:5025
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 
-#: apply.c:5027
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr ""
 
-#: apply.c:5029
+#: apply.c:5055
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr ""
 
-#: apply.c:5034
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 
-#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296
+#: 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:3831
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
 msgid "action"
 msgstr ""
 
-#: apply.c:5036
+#: apply.c:5062
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 
-#: apply.c:5039 apply.c:5042
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 
-#: apply.c:5045
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr ""
 
-#: apply.c:5047
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr ""
 
-#: apply.c:5049
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 
-#: apply.c:5051
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr ""
 
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
-#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr ""
-
-#: apply.c:5054
+#: apply.c:5080
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 
-#: apply.c:5057
+#: apply.c:5083
 msgid "do not trust the line counts in the hunk headers"
 msgstr ""
 
-#: apply.c:5059 builtin/am.c:2305
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr ""
 
-#: apply.c:5060
+#: 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"
@@ -1382,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 ""
@@ -1406,7 +1424,7 @@ msgstr ""
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr ""
 
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
 msgstr ""
@@ -1433,198 +1451,194 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr ""
 
-#: archive.c:188
-#, c-format
-msgid "cannot read %s"
-msgstr ""
-
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
-#: builtin/merge.c:1143
+#: 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 ""
 
-#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
+#: 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 ""
 
-#: archive.c:451
+#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr ""
 
-#: archive.c:457
+#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr ""
 
-#: archive.c:470
+#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr ""
 
-#: archive.c:482
+#: archive.c:481
 msgid "current working directory is untracked"
 msgstr ""
 
-#: archive.c:523
+#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: archive.c:525
+#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr ""
 
-#: archive.c:552
+#: archive.c:551
 msgid "fmt"
 msgstr ""
 
-#: archive.c:552
+#: archive.c:551
 msgid "archive format"
 msgstr ""
 
-#: archive.c:553 builtin/log.c:1772
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr ""
 
-#: archive.c:554
+#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: 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: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 ""
 
-#: archive.c:556
+#: archive.c:555
 msgid "add untracked file to archive"
 msgstr ""
 
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
 msgid "write the archive to this file"
 msgstr ""
 
-#: archive.c:561
+#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr ""
 
-#: archive.c:562
+#: archive.c:561
 msgid "report archived files on stderr"
 msgstr ""
 
-#: archive.c:564
+#: archive.c:563
 msgid "set compression level"
 msgstr ""
 
-#: archive.c:567
+#: archive.c:566
 msgid "list supported archive formats"
 msgstr ""
 
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr ""
 
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
 msgid "retrieve the archive from remote repository <repo>"
 msgstr ""
 
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
 msgid "command"
 msgstr ""
 
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
 msgid "path to the remote git-upload-archive command"
 msgstr ""
 
-#: archive.c:579
+#: archive.c:578
 msgid "Unexpected option --remote"
 msgstr ""
 
-#: archive.c:581
-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:583
+#: archive.c:582
 msgid "Unexpected option --output"
 msgstr ""
 
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr ""
-
-#: archive.c:607
+#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr ""
 
-#: archive.c:616
+#: archive.c:615
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr ""
 
-#: attr.c:202
+#: attr.c:203
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr ""
 
-#: attr.c:363
+#: attr.c:364
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr ""
 
-#: attr.c:403
+#: attr.c:404
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
 msgstr ""
 
-#: bisect.c:489
+#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr ""
 
-#: bisect.c:699
+#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr ""
 
-#: bisect.c:766
+#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr ""
 
-#: bisect.c:791
+#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
 "This means the bug has been fixed between %s and [%s].\n"
 msgstr ""
 
-#: bisect.c:796
+#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
 "The property has changed between %s and [%s].\n"
 msgstr ""
 
-#: bisect.c:801
+#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
 "This means the first '%s' commit is between %s and [%s].\n"
 msgstr ""
 
-#: bisect.c:809
+#: bisect.c:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1632,7 +1646,7 @@ msgid ""
 "Maybe you mistook %s and %s revs?\n"
 msgstr ""
 
-#: bisect.c:822
+#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1640,43 +1654,43 @@ msgid ""
 "We continue anyway."
 msgstr ""
 
-#: bisect.c:861
+#: bisect.c:859
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr ""
 
-#: bisect.c:911
+#: bisect.c:909
 #, c-format
 msgid "a %s revision is needed"
 msgstr ""
 
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
 #, c-format
 msgid "could not create file '%s'"
 msgstr ""
 
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr ""
 
-#: bisect.c:1027
+#: bisect.c:1025
 msgid "reading bisect refs failed"
 msgstr ""
 
-#: bisect.c:1057
+#: bisect.c:1055
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr ""
 
-#: bisect.c:1066
+#: bisect.c:1064
 #, c-format
 msgid ""
 "No testable commit found.\n"
 "Maybe you started with bad path arguments?\n"
 msgstr ""
 
-#: bisect.c:1095
+#: bisect.c:1093
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1686,7 +1700,7 @@ msgstr[1] ""
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1101
+#: bisect.c:1099
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1705,11 +1719,12 @@ msgstr ""
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 
-#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
-#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
-#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
-#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
+#: 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 ""
 
@@ -1728,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'."
-msgstr ""
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
+msgid "not tracking: ambiguous information for ref %s"
 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"
@@ -1827,153 +1832,154 @@ 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 ""
 
-#: bundle.c:41
+#: bundle.c:44
 #, c-format
 msgid "unrecognized bundle hash algorithm: %s"
 msgstr ""
 
-#: bundle.c:45
+#: bundle.c:48
 #, c-format
 msgid "unknown capability '%s'"
 msgstr ""
 
-#: bundle.c:71
+#: bundle.c:74
 #, c-format
 msgid "'%s' does not look like a v2 or v3 bundle file"
 msgstr ""
 
-#: bundle.c:110
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: 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'"
 msgstr ""
 
-#: bundle.c:189
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr ""
 
-#: bundle.c:192
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
 msgstr ""
 
-#: bundle.c:243
+#: bundle.c:257
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bundle.c:250
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr ""
 
-#: bundle.c:252
+#: bundle.c:266
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bundle.c:319
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr ""
 
-#: bundle.c:326
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr ""
 
-#: bundle.c:337
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr ""
 
-#: bundle.c:386
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 
-#: bundle.c:490
+#: bundle.c:504
 #, c-format
 msgid "unsupported bundle version %d"
 msgstr ""
 
-#: bundle.c:492
+#: bundle.c:506
 #, c-format
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr ""
 
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr ""
 
-#: bundle.c:539
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr ""
 
-#: bundle.c:549
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr ""
 
-#: bundle.c:574
+#: bundle.c:588
 msgid "index-pack died"
 msgstr ""
 
-#: chunk-format.c:113
+#: chunk-format.c:117
 msgid "terminating chunk id appears earlier than expected"
 msgstr ""
 
-#: chunk-format.c:122
+#: chunk-format.c:126
 #, c-format
 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
 msgstr ""
 
-#: chunk-format.c:129
+#: chunk-format.c:133
 #, c-format
 msgid "duplicate chunk ID %<PRIx32> found"
 msgstr ""
 
-#: chunk-format.c:143
+#: chunk-format.c:147
 #, c-format
 msgid "final chunk has non-zero id %<PRIx32>"
 msgstr ""
 
-#: color.c:329
+#: color.c:354
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr ""
 
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
 msgid "invalid hash version"
 msgstr ""
 
@@ -2018,217 +2024,217 @@ msgstr ""
 msgid "unable to find all commit-graph files"
 msgstr ""
 
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 
-#: commit-graph.c:766
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr ""
 
-#: commit-graph.c:799
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr ""
 
-#: commit-graph.c:1075 builtin/am.c:1340
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr ""
 
-#: commit-graph.c:1337 builtin/pack-objects.c:2897
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr ""
 
-#: commit-graph.c:1368
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:1385
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:1405
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr ""
 
-#: commit-graph.c:1424
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr ""
 
-#: commit-graph.c:1477
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr ""
 
-#: commit-graph.c:1558
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr ""
 
-#: commit-graph.c:1635
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr ""
 
-#: commit-graph.c:1660
+#: 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:1673
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr ""
 
-#: commit-graph.c:1677
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr ""
 
-#: commit-graph.c:1714
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
 
-#: commit-graph.c:1732
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr ""
 
-#: commit-graph.c:1781
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr ""
 
-#: commit-graph.c:1812 midx.c:906
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr ""
 
-#: commit-graph.c:1825
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr ""
 
-#: commit-graph.c:1830
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr ""
 
-#: commit-graph.c:1887
+#: 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:1923
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr ""
 
-#: commit-graph.c:1939
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr ""
 
-#: commit-graph.c:1959
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr ""
 
-#: commit-graph.c:2092
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr ""
 
-#: commit-graph.c:2136
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr ""
 
-#: commit-graph.c:2244
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
 
-#: commit-graph.c:2351
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr ""
 
-#: commit-graph.c:2450
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 
-#: commit-graph.c:2460
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr ""
 
-#: commit-graph.c:2470 commit-graph.c:2485
+#: 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:2477
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr ""
 
-#: commit-graph.c:2495
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:2510
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 
-#: commit-graph.c:2517
+#: commit-graph.c:2549
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2527
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr ""
 
-#: commit-graph.c:2536
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2550
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 
-#: commit-graph.c:2555
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2559
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2576
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr ""
 
-#: commit-graph.c:2582
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 
-#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
-#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 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 ""
 
-#: commit.c:54
+#: commit.c:55
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr ""
 
-#: commit.c:194
+#: commit.c:196
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -2240,27 +2246,27 @@ msgid ""
 "\"git config advice.graftFileDeprecated false\""
 msgstr ""
 
-#: commit.c:1237
+#: commit.c:1241
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 
-#: commit.c:1241
+#: commit.c:1245
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 
-#: commit.c:1244
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr ""
 
-#: commit.c:1247
+#: commit.c:1251
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr ""
 
-#: commit.c:1501
+#: 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"
@@ -2271,7 +2277,7 @@ msgstr ""
 msgid "memory exhausted"
 msgstr ""
 
-#: config.c:126
+#: config.c:125
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -2281,35 +2287,35 @@ msgid ""
 "This might be due to circular includes."
 msgstr ""
 
-#: config.c:142
+#: config.c:141
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr ""
 
-#: config.c:153
+#: config.c:152
 msgid "relative config includes must come from files"
 msgstr ""
 
-#: config.c:199
+#: config.c:201
 msgid "relative config include conditionals must come from files"
 msgstr ""
 
-#: config.c:396
+#: config.c:398
 #, c-format
 msgid "invalid config format: %s"
 msgstr ""
 
-#: config.c:400
+#: config.c:402
 #, c-format
 msgid "missing environment variable name for configuration '%.*s'"
 msgstr ""
 
-#: config.c:405
+#: config.c:407
 #, c-format
 msgid "missing environment variable '%s' for configuration '%.*s'"
 msgstr ""
 
-#: config.c:442
+#: config.c:443
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr ""
@@ -2319,295 +2325,295 @@ msgstr ""
 msgid "key does not contain variable name: %s"
 msgstr ""
 
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr ""
 
-#: config.c:478
+#: config.c:475
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr ""
 
-#: config.c:511
+#: config.c:495
 msgid "empty config key"
 msgstr ""
 
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr ""
 
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
 #, c-format
 msgid "bogus format in %s"
 msgstr ""
 
-#: config.c:622
+#: config.c:606
 #, c-format
 msgid "bogus count in %s"
 msgstr ""
 
-#: config.c:626
+#: config.c:610
 #, c-format
 msgid "too many entries in %s"
 msgstr ""
 
-#: config.c:636
+#: config.c:620
 #, c-format
 msgid "missing config key %s"
 msgstr ""
 
-#: config.c:644
+#: config.c:628
 #, c-format
 msgid "missing config value %s"
 msgstr ""
 
-#: config.c:995
+#: config.c:979
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr ""
 
-#: config.c:999
+#: config.c:983
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr ""
 
-#: config.c:1003
+#: config.c:987
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr ""
 
-#: config.c:1007
+#: config.c:991
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr ""
 
-#: config.c:1011
+#: config.c:995
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr ""
 
-#: config.c:1015
+#: config.c:999
 #, c-format
 msgid "bad config line %d in %s"
 msgstr ""
 
-#: config.c:1152
+#: config.c:1136
 msgid "out of range"
 msgstr ""
 
-#: config.c:1152
+#: config.c:1136
 msgid "invalid unit"
 msgstr ""
 
-#: config.c:1153
+#: config.c:1137
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr ""
 
-#: config.c:1163
+#: config.c:1147
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr ""
 
-#: config.c:1166
+#: config.c:1150
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 
-#: config.c:1169
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 
-#: config.c:1172
+#: config.c:1156
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 
-#: config.c:1175
+#: config.c:1159
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 
-#: config.c:1178
+#: config.c:1162
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr ""
 
-#: config.c:1257
+#: config.c:1241
 #, c-format
 msgid "bad boolean config value '%s' for '%s'"
 msgstr ""
 
-#: config.c:1275
+#: config.c:1259
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr ""
 
-#: config.c:1284
+#: config.c:1268
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr ""
 
-#: config.c:1377
+#: config.c:1361
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr ""
 
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr ""
 
-#: config.c:1494
+#: config.c:1476
 msgid "core.commentChar should only be one character"
 msgstr ""
 
-#: config.c:1527
+#: config.c:1509
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr ""
 
-#: config.c:1599
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr ""
 
-#: config.c:1625
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr ""
 
-#: config.c:1626
+#: config.c:1611
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 
-#: config.c:1687 builtin/pack-objects.c:3924
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr ""
 
-#: config.c:1809
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr ""
 
-#: config.c:1812
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr ""
 
-#: config.c:1829
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr ""
 
-#: config.c:1873
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr ""
 
-#: config.c:1929
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr ""
 
-#: config.c:2293
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 
-#: config.c:2467
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr ""
 
-#: config.c:2512
+#: config.c:2504
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 
-#: config.c:2558
+#: config.c:2550
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr ""
 
-#: config.c:2560
+#: config.c:2552
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr ""
 
-#: config.c:2644
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr ""
 
-#: config.c:2676
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr ""
 
-#: config.c:2705
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr ""
 
-#: config.c:2957 config.c:3283
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr ""
 
-#: config.c:2968
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr ""
 
-#: config.c:3005 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr ""
 
-#: config.c:3030
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr ""
 
-#: config.c:3043 config.c:3296
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr ""
 
-#: config.c:3054
+#: config.c:3047
 #, c-format
-msgid "unable to mmap '%s'"
+msgid "unable to mmap '%s'%s"
 msgstr ""
 
-#: config.c:3063 config.c:3301
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr ""
 
-#: config.c:3148 config.c:3398
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr ""
 
-#: config.c:3182
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr ""
 
-#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: 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:3274
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr ""
 
-#: config.c:3441
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr ""
@@ -2638,79 +2644,79 @@ msgstr ""
 msgid "expected flush after capabilities"
 msgstr ""
 
-#: connect.c:263
+#: connect.c:265
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr ""
 
-#: connect.c:284
+#: connect.c:286
 msgid "protocol error: unexpected capabilities^{}"
 msgstr ""
 
-#: connect.c:306
+#: connect.c:308
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr ""
 
-#: connect.c:308
+#: connect.c:310
 msgid "repository on the other end cannot be shallow"
 msgstr ""
 
-#: connect.c:347
+#: connect.c:349
 msgid "invalid packet"
 msgstr ""
 
-#: connect.c:367
+#: connect.c:369
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr ""
 
-#: connect.c:497
+#: connect.c:499
 #, c-format
 msgid "unknown object format '%s' specified by server"
 msgstr ""
 
-#: connect.c:526
+#: connect.c:528
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr ""
 
-#: connect.c:530
+#: connect.c:532
 msgid "expected flush after ref listing"
 msgstr ""
 
-#: connect.c:533
+#: connect.c:535
 msgid "expected response end packet after ref listing"
 msgstr ""
 
-#: connect.c:666
+#: connect.c:670
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr ""
 
-#: connect.c:717
+#: connect.c:721
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr ""
 
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
 #, c-format
 msgid "Looking up %s ... "
 msgstr ""
 
-#: connect.c:761
+#: connect.c:765
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr ""
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
 #, c-format
 msgid ""
 "done.\n"
 "Connecting to %s (port %s) ... "
 msgstr ""
 
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2718,77 +2724,77 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
 msgid "done."
 msgstr ""
 
-#: connect.c:824
+#: connect.c:828
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr ""
 
-#: connect.c:830
+#: connect.c:834
 #, c-format
 msgid "unknown port %s"
 msgstr ""
 
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr ""
 
-#: connect.c:969
+#: connect.c:973
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr ""
 
-#: connect.c:979
+#: connect.c:983
 #, c-format
 msgid "cannot start proxy %s"
 msgstr ""
 
-#: connect.c:1050
+#: connect.c:1054
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 
-#: connect.c:1190
+#: connect.c:1194
 msgid "newline is forbidden in git:// hosts and repo paths"
 msgstr ""
 
-#: connect.c:1247
+#: connect.c:1251
 msgid "ssh variant 'simple' does not support -4"
 msgstr ""
 
-#: connect.c:1259
+#: connect.c:1263
 msgid "ssh variant 'simple' does not support -6"
 msgstr ""
 
-#: connect.c:1276
+#: connect.c:1280
 msgid "ssh variant 'simple' does not support setting port"
 msgstr ""
 
-#: connect.c:1388
+#: connect.c:1392
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr ""
 
-#: connect.c:1436
+#: connect.c:1440
 msgid "unable to fork"
 msgstr ""
 
-#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr ""
 
-#: connected.c:120
+#: connected.c:122
 msgid "Could not run 'git rev-list'"
 msgstr ""
 
-#: connected.c:144
+#: connected.c:146
 msgid "failed write to rev-list"
 msgstr ""
 
-#: connected.c:149
+#: connected.c:151
 msgid "failed to close rev-list's stdin"
 msgstr ""
 
@@ -2888,23 +2894,23 @@ msgstr ""
 msgid "path name too long for external filter"
 msgstr ""
 
-#: convert.c:934
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
 "been filtered"
 msgstr ""
 
-#: convert.c:1234
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr ""
 
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr ""
 
-#: convert.c:1490
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr ""
@@ -2922,17 +2928,17 @@ msgstr ""
 msgid "refusing to work with credential missing protocol field"
 msgstr ""
 
-#: credential.c:394
+#: credential.c:395
 #, c-format
 msgid "url contains a newline in its %s component: %s"
 msgstr ""
 
-#: credential.c:438
+#: credential.c:439
 #, c-format
 msgid "url has no scheme: %s"
 msgstr ""
 
-#: credential.c:511
+#: credential.c:512
 #, c-format
 msgid "credential url cannot be parsed: %s"
 msgstr ""
@@ -3029,620 +3035,633 @@ msgstr ""
 msgid "Marked %d islands, done.\n"
 msgstr ""
 
-#: diff-merges.c:80
+#: diff-merges.c:70
 #, c-format
 msgid "unknown value for --diff-merges: %s"
 msgstr ""
 
-#: diff-lib.c:538
+#: diff-lib.c:561
 msgid "--merge-base does not work with ranges"
 msgstr ""
 
-#: diff-lib.c:540
+#: diff-lib.c:563
 msgid "--merge-base only works with commits"
 msgstr ""
 
-#: diff-lib.c:557
+#: diff-lib.c:580
 msgid "unable to get HEAD"
 msgstr ""
 
-#: diff-lib.c:564
+#: diff-lib.c:587
 msgid "no merge base found"
 msgstr ""
 
-#: diff-lib.c:566
+#: diff-lib.c:589
 msgid "multiple merge bases found"
 msgstr ""
 
-#: diff-no-index.c:238
+#: diff-no-index.c:237
 msgid "git diff --no-index [<options>] <path> <path>"
 msgstr ""
 
-#: diff-no-index.c:263
+#: diff-no-index.c:262
 msgid ""
 "Not a git repository. Use --no-index to compare two paths outside a working "
 "tree"
 msgstr ""
 
-#: diff.c:156
+#: diff.c:158
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 
-#: diff.c:161
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr ""
 
-#: diff.c:297
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
 msgstr ""
 
-#: diff.c:325
+#: 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:333
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
 msgstr ""
 
-#: diff.c:410
+#: diff.c:412
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 
-#: diff.c:470
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 "%s"
 msgstr ""
 
-#: diff.c:4278
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 
-#: diff.c:4630
-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:4633
-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:4712
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr ""
+
+#: diff.c:4601
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr ""
 
-#: diff.c:4760
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr ""
 
-#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: 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:4797
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 "%s"
 msgstr ""
 
-#: diff.c:4882
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr ""
 
-#: diff.c:4906
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr ""
 
-#: diff.c:4920
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr ""
 
-#: diff.c:4970 diff.c:4976
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr ""
 
-#: diff.c:4988
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr ""
 
-#: diff.c:5009
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr ""
 
-#: diff.c:5028
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr ""
 
-#: diff.c:5068
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
 
-#: diff.c:5104 diff.c:5124
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr ""
 
-#: diff.c:5228
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr ""
 
-#: diff.c:5277
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr ""
 
-#: diff.c:5333
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr ""
 
-#: diff.c:5369
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr ""
 
-#: diff.c:5371 diff.c:5377
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr ""
 
-#: diff.c:5374 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr ""
 
-#: diff.c:5379 diff.c:5493 diff.c:5500
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr ""
 
-#: diff.c:5380 diff.c:5383
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr ""
 
-#: diff.c:5385
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr ""
 
-#: diff.c:5388
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr ""
 
-#: diff.c:5392
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr ""
 
-#: diff.c:5396
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr ""
 
-#: diff.c:5399
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr ""
 
-#: diff.c:5401 diff.c:5409
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr ""
 
-#: diff.c:5402
+#: diff.c:5371
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 
-#: diff.c:5406
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr ""
 
-#: diff.c:5410
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr ""
 
-#: diff.c:5414
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 
-#: diff.c:5417
+#: diff.c:5386
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 
-#: diff.c:5420
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr ""
 
-#: diff.c:5423
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr ""
 
-#: diff.c:5425
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr ""
 
-#: diff.c:5426
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr ""
 
-#: diff.c:5428 diff.c:5431 diff.c:5434
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr ""
 
-#: diff.c:5429
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr ""
 
-#: diff.c:5432
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr ""
 
-#: diff.c:5435
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr ""
 
-#: diff.c:5437
+#: diff.c:5406
 msgid "<count>"
 msgstr ""
 
-#: diff.c:5438
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr ""
 
-#: diff.c:5441
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr ""
 
-#: diff.c:5444
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr ""
 
-#: diff.c:5447
+#: diff.c:5416
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 
-#: diff.c:5449
+#: diff.c:5418
 msgid "show colored diff"
 msgstr ""
 
-#: diff.c:5450
+#: diff.c:5419
 msgid "<kind>"
 msgstr ""
 
-#: diff.c:5451
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr ""
 
-#: diff.c:5454
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
 msgstr ""
 
-#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr ""
 
-#: diff.c:5458
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr ""
 
-#: diff.c:5461
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr ""
 
-#: diff.c:5464
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr ""
 
-#: diff.c:5467
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr ""
 
-#: diff.c:5470
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 
-#: diff.c:5474 diff.c:5479 diff.c:5484
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr ""
 
-#: diff.c:5475
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr ""
 
-#: diff.c:5480
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr ""
 
-#: diff.c:5485
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr ""
 
-#: diff.c:5488
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr ""
 
-#: diff.c:5489
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr ""
 
-#: diff.c:5490
+#: diff.c:5459
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 
-#: diff.c:5494
+#: diff.c:5463
 msgid "detect renames"
 msgstr ""
 
-#: diff.c:5498
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr ""
 
-#: diff.c:5501
+#: diff.c:5470
 msgid "detect copies"
 msgstr ""
 
-#: diff.c:5505
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
 msgstr ""
 
-#: diff.c:5507
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr ""
 
-#: diff.c:5510
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr ""
 
-#: diff.c:5512
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr ""
 
-#: diff.c:5515
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr ""
 
-#: diff.c:5517
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr ""
 
-#: diff.c:5519
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr ""
 
-#: diff.c:5522
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr ""
 
-#: diff.c:5525
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr ""
 
-#: diff.c:5528
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr ""
 
-#: diff.c:5531
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr ""
 
-#: diff.c:5534
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr ""
 
-#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr ""
 
-#: diff.c:5537
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr ""
 
-#: diff.c:5540
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 
-#: diff.c:5543
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr ""
 
-#: diff.c:5547
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr ""
 
-#: diff.c:5549
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr ""
 
-#: diff.c:5550
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr ""
 
-#: diff.c:5552
+#: diff.c:5521
 msgid "<text>"
 msgstr ""
 
-#: diff.c:5553
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr ""
 
-#: diff.c:5555 diff.c:5564 diff.c:5567
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr ""
 
-#: diff.c:5556
+#: diff.c:5525
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 
-#: diff.c:5559
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr ""
 
-#: diff.c:5562
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr ""
 
-#: diff.c:5565
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr ""
 
-#: diff.c:5568
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr ""
 
-#: diff.c:5571
+#: diff.c:5540
 msgid "Other diff options"
 msgstr ""
 
-#: diff.c:5573
+#: diff.c:5542
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 
-#: diff.c:5577
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr ""
 
-#: diff.c:5579
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr ""
 
-#: diff.c:5581
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr ""
 
-#: diff.c:5583
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr ""
 
-#: diff.c:5585
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr ""
 
-#: diff.c:5587
+#: diff.c:5556
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 
-#: diff.c:5589
+#: diff.c:5558
 msgid "<when>"
 msgstr ""
 
-#: diff.c:5590
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr ""
 
-#: diff.c:5593
+#: diff.c:5562
 msgid "<format>"
 msgstr ""
 
-#: diff.c:5594
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr ""
 
-#: diff.c:5598
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr ""
 
-#: diff.c:5601
+#: diff.c:5570
 msgid "treat 'git add -N' entries as real in the index"
 msgstr ""
 
-#: diff.c:5603
+#: diff.c:5572
 msgid "<string>"
 msgstr ""
 
-#: diff.c:5604
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr ""
 
-#: diff.c:5607
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr ""
 
-#: diff.c:5610
+#: diff.c:5579
 msgid "show all changes in the changeset with -S or -G"
 msgstr ""
 
-#: diff.c:5613
+#: diff.c:5582
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr ""
 
-#: diff.c:5616
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr ""
 
-#: diff.c:5617 diff.c:5620
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr ""
 
-#: diff.c:5618
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr ""
 
-#: diff.c:5621
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr ""
 
-#: diff.c:5623
+#: diff.c:5592
 msgid "<object-id>"
 msgstr ""
 
-#: diff.c:5624
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr ""
 
-#: diff.c:5626
+#: diff.c:5595
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr ""
 
-#: diff.c:5627
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr ""
 
-#: diff.c:5629
+#: diff.c:5598
 msgid "<file>"
 msgstr ""
 
-#: diff.c:5630
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr ""
 
-#: diff.c:6287
-msgid "inexact rename detection was skipped due to too many files."
+#: diff.c:6257
+msgid "exhaustive rename detection was skipped due to too many files."
 msgstr ""
 
-#: diff.c:6290
+#: diff.c:6260
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 
-#: diff.c:6293
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3653,7 +3672,7 @@ msgstr ""
 msgid "failed to read orderfile '%s'"
 msgstr ""
 
-#: diffcore-rename.c:1418
+#: diffcore-rename.c:1564
 msgid "Performing inexact rename detection"
 msgstr ""
 
@@ -3662,59 +3681,65 @@ msgstr ""
 msgid "No such path '%s' in the diff"
 msgstr ""
 
-#: dir.c:578
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr ""
 
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr ""
 
-#: dir.c:809
+#: dir.c:820
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr ""
 
-#: dir.c:819
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr ""
 
-#: dir.c:1206
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr ""
 
-#: dir.c:2314
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr ""
 
-#: dir.c:2614
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr ""
 
-#: dir.c:2738
+#: dir.c:2844
 msgid "untracked cache is disabled on this system or location"
 msgstr ""
 
-#: dir.c:3543
+#: dir.c:3112
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr ""
 
-#: dir.c:3590 dir.c:3595
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr ""
 
-#: dir.c:3624
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr ""
@@ -3733,292 +3758,351 @@ msgstr ""
 msgid "could not stat file '%s'"
 msgstr ""
 
-#: environment.c:152
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr ""
 
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr ""
-
 #: exec-cmd.c:363
 #, c-format
 msgid "too many args to run %s"
 msgstr ""
 
-#: fetch-pack.c:182
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr ""
 
-#: fetch-pack.c:185
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr ""
 
-#: fetch-pack.c:196
+#: fetch-pack.c:208
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr ""
 
-#: fetch-pack.c:216
+#: fetch-pack.c:228
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr ""
 
-#: fetch-pack.c:227
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr ""
 
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr ""
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr ""
 
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr ""
 
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr ""
 
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr ""
 
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr ""
 
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr ""
 
-#: fetch-pack.c:439
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr ""
 
-#: fetch-pack.c:456
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr ""
 
-#: fetch-pack.c:487
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr ""
 
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr ""
 
-#: fetch-pack.c:512
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr ""
 
-#: fetch-pack.c:548
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr ""
 
-#: fetch-pack.c:763
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr ""
 
-#: fetch-pack.c:849
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr ""
 
-#: fetch-pack.c:857
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr ""
 
-#: fetch-pack.c:951
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr ""
 
-#: fetch-pack.c:957
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr ""
 
-#: fetch-pack.c:974
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: fetch-pack.c:976
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr ""
 
-#: fetch-pack.c:1019
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr ""
 
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
+#: 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:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: 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:1029
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr ""
 
-#: fetch-pack.c:1089
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr ""
 
-#: fetch-pack.c:1094
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr ""
 
-#: fetch-pack.c:1098
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr ""
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
 msgstr ""
 
-#: fetch-pack.c:1113
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr ""
 
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
 msgstr ""
 
-#: fetch-pack.c:1128 fetch-pack.c:1651
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
 msgstr ""
 
-#: fetch-pack.c:1242
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr ""
 
-#: fetch-pack.c:1246
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr ""
 
-#: fetch-pack.c:1279
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr ""
 
-#: fetch-pack.c:1286
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr ""
 
-#: fetch-pack.c:1329 fetch-pack.c:2034
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
 msgstr ""
 
-#: fetch-pack.c:1347
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr ""
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr ""
 
-#: fetch-pack.c:1387
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr ""
 
-#: fetch-pack.c:1392
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr ""
 
-#: fetch-pack.c:1402
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr ""
 
-#: fetch-pack.c:1404
+#: fetch-pack.c:1420
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 
-#: fetch-pack.c:1445
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr ""
 
-#: fetch-pack.c:1494
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr ""
 
-#: fetch-pack.c:1499
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr ""
 
-#: fetch-pack.c:1504
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr ""
 
-#: fetch-pack.c:1534
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr ""
 
-#: fetch-pack.c:1930
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr ""
 
-#: fetch-pack.c:1953 builtin/clone.c:697
+#: fetch-pack.c:1982 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
 msgstr ""
 
-#: fetch-pack.c:2056
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr ""
 
-#: fetch-pack.c:2079
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr ""
 
-#: fetch-pack.c:2082
+#: fetch-pack.c:2111
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr ""
 
-#: gpg-interface.c:273
+#: 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:276
+#: gpg-interface.c:332 gpg-interface.c:460
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr ""
 
-#: gpg-interface.c:470
+#: gpg-interface.c:451
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+
+#: 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:536
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr ""
+
+#: gpg-interface.c:624
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr ""
+
+#: gpg-interface.c:801 gpg-interface.c:806
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr ""
+
+#: gpg-interface.c:829
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr ""
+
+#: gpg-interface.c:851
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+
+#: gpg-interface.c:857
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr ""
+
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr ""
 
+#: gpg-interface.c:967
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr ""
+
+#: gpg-interface.c:978
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr ""
+
+#: gpg-interface.c:996
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr ""
+
+#: gpg-interface.c:1014
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+
+#: gpg-interface.c:1026
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr ""
+
 #: graph.c:98
 #, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
+msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr ""
 
 #: grep.c:531
@@ -4027,140 +4111,145 @@ msgid ""
 "with -P under PCRE v2"
 msgstr ""
 
-#: grep.c:1893
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr ""
 
-#: grep.c:1910 setup.c:176 builtin/clone.c:416 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:1921
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr ""
 
-#: help.c:23
+#: help.c:24
 msgid "start a working area (see also: git help tutorial)"
 msgstr ""
 
-#: help.c:24
+#: help.c:25
 msgid "work on the current change (see also: git help everyday)"
 msgstr ""
 
-#: help.c:25
+#: help.c:26
 msgid "examine the history and state (see also: git help revisions)"
 msgstr ""
 
-#: help.c:26
+#: help.c:27
 msgid "grow, mark and tweak your common history"
 msgstr ""
 
-#: help.c:27
+#: help.c:28
 msgid "collaborate (see also: git help workflows)"
 msgstr ""
 
-#: help.c:31
+#: help.c:32
 msgid "Main Porcelain Commands"
 msgstr ""
 
-#: help.c:32
+#: help.c:33
 msgid "Ancillary Commands / Manipulators"
 msgstr ""
 
-#: help.c:33
+#: help.c:34
 msgid "Ancillary Commands / Interrogators"
 msgstr ""
 
-#: help.c:34
+#: help.c:35
 msgid "Interacting with Others"
 msgstr ""
 
-#: help.c:35
+#: help.c:36
 msgid "Low-level Commands / Manipulators"
 msgstr ""
 
-#: help.c:36
+#: help.c:37
 msgid "Low-level Commands / Interrogators"
 msgstr ""
 
-#: help.c:37
+#: help.c:38
 msgid "Low-level Commands / Syncing Repositories"
 msgstr ""
 
-#: help.c:38
+#: help.c:39
 msgid "Low-level Commands / Internal Helpers"
 msgstr ""
 
-#: help.c:300
+#: help.c:313
 #, c-format
 msgid "available git commands in '%s'"
 msgstr ""
 
-#: help.c:307
+#: help.c:320
 msgid "git commands available from elsewhere on your $PATH"
 msgstr ""
 
-#: help.c:316
+#: help.c:329
 msgid "These are common Git commands used in various situations:"
 msgstr ""
 
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr ""
 
-#: help.c:405
+#: help.c:418
 msgid "The Git concept guides are:"
 msgstr ""
 
-#: help.c:429
+#: help.c:442
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr ""
 
-#: help.c:434
+#: help.c:447
 msgid "External commands"
 msgstr ""
 
-#: help.c:449
+#: help.c:462
 msgid "Command aliases"
 msgstr ""
 
-#: help.c:527
+#: help.c:543
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
 "able to execute it. Maybe git-%s is broken?"
 msgstr ""
 
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr ""
 
-#: help.c:591
+#: help.c:613
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr ""
 
-#: help.c:613
+#: help.c:635
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr ""
 
-#: help.c:618
+#: help.c:640
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr ""
 
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr ""
+
+#: help.c:654
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr ""
 
-#: help.c:635
+#: help.c:666
 msgid ""
 "\n"
 "The most similar command is"
@@ -4170,16 +4259,16 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: help.c:675
+#: help.c:706
 msgid "git version [<options>]"
 msgstr ""
 
-#: help.c:730
+#: help.c:761
 #, c-format
 msgid "%s: %s - %s"
 msgstr ""
 
-#: help.c:734
+#: help.c:765
 msgid ""
 "\n"
 "Did you mean this?"
@@ -4189,6 +4278,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+
 #: ident.c:353
 msgid "Author identity unknown\n"
 msgstr ""
@@ -4240,7 +4336,7 @@ msgstr ""
 msgid "name consists only of disallowed characters: %s"
 msgstr ""
 
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
 #, c-format
 msgid "invalid date format: %s"
 msgstr ""
@@ -4255,7 +4351,7 @@ msgstr ""
 
 #: list-objects-filter-options.c:105
 #, c-format
-msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
 msgstr ""
 
 #: list-objects-filter-options.c:124
@@ -4300,7 +4396,7 @@ msgstr ""
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr ""
 
-#: list-objects.c:395
+#: list-objects.c:398
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr ""
@@ -4327,7 +4423,12 @@ msgstr ""
 msgid "invalid value '%s' for lsrefs.unborn"
 msgstr ""
 
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr ""
+
+#: ls-refs.c:178
 msgid "expected flush after ls-refs arguments"
 msgstr ""
 
@@ -4335,44 +4436,44 @@ msgstr ""
 msgid "quoted CRLF detected"
 msgstr ""
 
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
 #, c-format
 msgid "bad action '%s' for '%s'"
 msgstr ""
 
-#: merge-ort.c:1116 merge-recursive.c:1205
+#: merge-ort.c:1584 merge-recursive.c:1211
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr ""
 
-#: merge-ort.c:1125 merge-recursive.c:1212
+#: merge-ort.c:1593 merge-recursive.c:1218
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr ""
 
-#: merge-ort.c:1134 merge-recursive.c:1219
+#: merge-ort.c:1602 merge-recursive.c:1225
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 
-#: merge-ort.c:1144 merge-ort.c:1151
+#: merge-ort.c:1612 merge-ort.c:1620
 #, c-format
 msgid "Note: Fast-forwarding submodule %s to %s"
 msgstr ""
 
-#: merge-ort.c:1172
+#: merge-ort.c:1642
 #, c-format
 msgid "Failed to merge submodule %s"
 msgstr ""
 
-#: merge-ort.c:1179
+#: merge-ort.c:1649
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
 "%s\n"
 msgstr ""
 
-#: merge-ort.c:1183 merge-recursive.c:1273
+#: merge-ort.c:1653 merge-recursive.c:1281
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -4383,42 +4484,42 @@ msgid ""
 "which will accept this suggestion.\n"
 msgstr ""
 
-#: merge-ort.c:1196
+#: merge-ort.c:1666
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but multiple possible merges exist:\n"
 "%s"
 msgstr ""
 
-#: merge-ort.c:1415 merge-recursive.c:1362
+#: merge-ort.c:1887 merge-recursive.c:1372
 msgid "Failed to execute internal merge"
 msgstr ""
 
-#: merge-ort.c:1420 merge-recursive.c:1367
+#: merge-ort.c:1892 merge-recursive.c:1377
 #, c-format
 msgid "Unable to add %s to database"
 msgstr ""
 
-#: merge-ort.c:1427 merge-recursive.c:1400
+#: merge-ort.c:1899 merge-recursive.c:1410
 #, c-format
 msgid "Auto-merging %s"
 msgstr ""
 
-#: merge-ort.c:1566 merge-recursive.c:2122
+#: merge-ort.c:2038 merge-recursive.c:2132
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
 "implicit directory rename(s) putting the following path(s) there: %s."
 msgstr ""
 
-#: merge-ort.c:1576 merge-recursive.c:2132
+#: merge-ort.c:2048 merge-recursive.c:2142
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
 "implicit directory renames tried to put these paths there: %s"
 msgstr ""
 
-#: merge-ort.c:1634
+#: merge-ort.c:2106
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4426,47 +4527,47 @@ msgid ""
 "majority of the files."
 msgstr ""
 
-#: merge-ort.c:1788 merge-recursive.c:2468
+#: merge-ort.c:2260 merge-recursive.c:2478
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
 "renamed."
 msgstr ""
 
-#: merge-ort.c:1932 merge-recursive.c:3244
+#: merge-ort.c:2400 merge-recursive.c:3261
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
 "moving it to %s."
 msgstr ""
 
-#: merge-ort.c:1939 merge-recursive.c:3251
+#: merge-ort.c:2407 merge-recursive.c:3268
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
 "%s; moving it to %s."
 msgstr ""
 
-#: merge-ort.c:1952 merge-recursive.c:3247
+#: merge-ort.c:2420 merge-recursive.c:3264
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
 "in %s, suggesting it should perhaps be moved to %s."
 msgstr ""
 
-#: merge-ort.c:1960 merge-recursive.c:3254
+#: merge-ort.c:2428 merge-recursive.c:3271
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
 "was renamed in %s, suggesting it should perhaps be moved to %s."
 msgstr ""
 
-#: merge-ort.c:2103
+#: merge-ort.c:2584
 #, c-format
 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
 msgstr ""
 
-#: merge-ort.c:2198
+#: merge-ort.c:2679
 #, c-format
 msgid ""
 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4474,67 +4575,67 @@ msgid ""
 "markers."
 msgstr ""
 
-#: merge-ort.c:2217 merge-ort.c:2241
+#: merge-ort.c:2698 merge-ort.c:2722
 #, c-format
 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr ""
 
-#: merge-ort.c:2550 merge-recursive.c:3002
+#: merge-ort.c:3212 merge-recursive.c:3022
 #, c-format
 msgid "cannot read object %s"
 msgstr ""
 
-#: merge-ort.c:2553 merge-recursive.c:3005
+#: merge-ort.c:3215 merge-recursive.c:3025
 #, c-format
 msgid "object %s is not a blob"
 msgstr ""
 
-#: merge-ort.c:2981
+#: merge-ort.c:3644
 #, c-format
 msgid ""
 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
 "%s instead."
 msgstr ""
 
-#: merge-ort.c:3055
+#: merge-ort.c:3721
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed both "
 "of them so each can be recorded somewhere."
 msgstr ""
 
-#: merge-ort.c:3062
+#: merge-ort.c:3728
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed one "
 "of them so each can be recorded somewhere."
 msgstr ""
 
-#: merge-ort.c:3162 merge-recursive.c:3081
+#: merge-ort.c:3819 merge-recursive.c:3101
 msgid "content"
 msgstr ""
 
-#: merge-ort.c:3164 merge-recursive.c:3085
+#: merge-ort.c:3821 merge-recursive.c:3105
 msgid "add/add"
 msgstr ""
 
-#: merge-ort.c:3166 merge-recursive.c:3130
+#: merge-ort.c:3823 merge-recursive.c:3150
 msgid "submodule"
 msgstr ""
 
-#: merge-ort.c:3168 merge-recursive.c:3131
+#: merge-ort.c:3825 merge-recursive.c:3151
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr ""
 
-#: merge-ort.c:3198
+#: 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:3433
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4544,192 +4645,192 @@ 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:3730
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr ""
 
-#: merge-ort-wrappers.c:13 merge-recursive.c:3699
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "  %s"
 msgstr ""
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr ""
 
-#: merge-recursive.c:356
+#: merge-recursive.c:353
 msgid "(bad commit)\n"
 msgstr ""
 
-#: merge-recursive.c:379
+#: merge-recursive.c:381
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr ""
 
-#: merge-recursive.c:388
+#: merge-recursive.c:390
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 
-#: merge-recursive.c:876
+#: merge-recursive.c:881
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr ""
 
-#: merge-recursive.c:887
+#: merge-recursive.c:892
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr ""
 
-#: merge-recursive.c:901 merge-recursive.c:920
+#: merge-recursive.c:906 merge-recursive.c:925
 msgid ": perhaps a D/F conflict?"
 msgstr ""
 
-#: merge-recursive.c:910
+#: merge-recursive.c:915
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr ""
 
-#: merge-recursive.c:951 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:956
+#: merge-recursive.c:961
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:981
+#: merge-recursive.c:986
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr ""
 
-#: merge-recursive.c:992
+#: merge-recursive.c:997
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr ""
 
-#: merge-recursive.c:997
+#: merge-recursive.c:1002
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:1227 merge-recursive.c:1239
+#: merge-recursive.c:1233 merge-recursive.c:1246
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr ""
 
-#: merge-recursive.c:1230 merge-recursive.c:1242
+#: merge-recursive.c:1236 merge-recursive.c:1249
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr ""
 
-#: merge-recursive.c:1265
+#: merge-recursive.c:1273
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 
-#: merge-recursive.c:1269
+#: merge-recursive.c:1277
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr ""
 
-#: merge-recursive.c:1270
+#: merge-recursive.c:1278
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr ""
 
-#: merge-recursive.c:1282
+#: merge-recursive.c:1290
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr ""
 
-#: merge-recursive.c:1424
+#: merge-recursive.c:1434
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 
-#: merge-recursive.c:1496
+#: merge-recursive.c:1506
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree."
 msgstr ""
 
-#: merge-recursive.c:1501
+#: merge-recursive.c:1511
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree."
 msgstr ""
 
-#: merge-recursive.c:1508
+#: merge-recursive.c:1518
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree at %s."
 msgstr ""
 
-#: merge-recursive.c:1513
+#: merge-recursive.c:1523
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree at %s."
 msgstr ""
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "rename"
 msgstr ""
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "renamed"
 msgstr ""
 
-#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr ""
 
-#: merge-recursive.c:1609
+#: merge-recursive.c:1619
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 
-#: merge-recursive.c:1667
+#: merge-recursive.c:1677
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 
-#: merge-recursive.c:1698
+#: merge-recursive.c:1708
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr ""
 
-#: merge-recursive.c:1703
+#: merge-recursive.c:1713
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 
-#: merge-recursive.c:1730
+#: merge-recursive.c:1740
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 "\"->\"%s\" in \"%s\"%s"
 msgstr ""
 
-#: merge-recursive.c:1735
+#: merge-recursive.c:1745
 msgid " (left unresolved)"
 msgstr ""
 
-#: merge-recursive.c:1827
+#: merge-recursive.c:1837
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 
-#: merge-recursive.c:2090
+#: merge-recursive.c:2100
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4737,86 +4838,86 @@ msgid ""
 "getting a majority of the files."
 msgstr ""
 
-#: merge-recursive.c:2224
+#: merge-recursive.c:2234
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
 ">%s in %s"
 msgstr ""
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modify"
 msgstr ""
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modified"
 msgstr ""
 
-#: merge-recursive.c:3108
+#: merge-recursive.c:3128
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr ""
 
-#: merge-recursive.c:3161
+#: merge-recursive.c:3181
 #, c-format
 msgid "Adding as %s instead"
 msgstr ""
 
-#: merge-recursive.c:3368
+#: merge-recursive.c:3385
 #, c-format
 msgid "Removing %s"
 msgstr ""
 
-#: merge-recursive.c:3391
+#: merge-recursive.c:3408
 msgid "file/directory"
 msgstr ""
 
-#: merge-recursive.c:3396
+#: merge-recursive.c:3413
 msgid "directory/file"
 msgstr ""
 
-#: merge-recursive.c:3403
+#: merge-recursive.c:3420
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 
-#: merge-recursive.c:3412
+#: merge-recursive.c:3429
 #, c-format
 msgid "Adding %s"
 msgstr ""
 
-#: merge-recursive.c:3421
+#: merge-recursive.c:3438
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr ""
 
-#: merge-recursive.c:3474
+#: merge-recursive.c:3491
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr ""
 
-#: merge-recursive.c:3568
+#: merge-recursive.c:3585
 msgid "Merging:"
 msgstr ""
 
-#: merge-recursive.c:3581
+#: merge-recursive.c:3598
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3648
 msgid "merge returned no commit"
 msgstr ""
 
-#: merge-recursive.c:3796
+#: merge-recursive.c:3816
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr ""
 
-#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
+#: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr ""
 
@@ -4824,181 +4925,221 @@ msgstr ""
 msgid "failed to read the cache"
 msgstr ""
 
-#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
-#: builtin/stash.c:267
+#: 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 ""
 
-#: midx.c:74
+#: midx.c:78
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr ""
 
-#: midx.c:105
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr ""
 
-#: midx.c:121
+#: midx.c:127
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
 
-#: midx.c:126
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr ""
 
-#: midx.c:131
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr ""
 
-#: midx.c:148
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr ""
 
-#: midx.c:150
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr ""
 
-#: midx.c:152
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr ""
 
-#: midx.c:154
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr ""
 
-#: midx.c:170
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 
-#: midx.c:214
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr ""
 
-#: midx.c:264
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 
-#: midx.c:490
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr ""
 
-#: midx.c:496
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr ""
 
-#: midx.c:564
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr ""
 
-#: midx.c:880 builtin/index-pack.c:1535
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr ""
 
-#: midx.c:933
-msgid "Adding packfiles to multi-pack-index"
+#: midx.c:993
+#, c-format
+msgid "could not parse line: %s"
 msgstr ""
 
-#: midx.c:979
+#: midx.c:995
 #, c-format
-msgid "did not see pack-file %s to drop"
+msgid "malformed line: %s"
+msgstr ""
+
+#: midx.c:1162
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+
+#: midx.c:1187
+msgid "could not load pack"
 msgstr ""
 
-#: midx.c:1024
+#: midx.c:1193
+#, c-format
+msgid "could not open index for %s"
+msgstr ""
+
+#: midx.c:1204
+msgid "Adding packfiles to multi-pack-index"
+msgstr ""
+
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr ""
 
-#: midx.c:1029
+#: midx.c:1292
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr ""
+
+#: midx.c:1324
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr ""
+
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr ""
 
-#: midx.c:1045
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr ""
 
-#: midx.c:1125 builtin/clean.c:37
+#: midx.c:1420
+msgid "could not write multi-pack bitmap"
+msgstr ""
+
+#: midx.c:1430
+msgid "could not write multi-pack-index"
+msgstr ""
+
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr ""
 
-#: midx.c:1156
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr ""
 
-#: midx.c:1214
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr ""
 
-#: midx.c:1222
+#: midx.c:1593
+msgid "incorrect checksum"
+msgstr ""
+
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr ""
 
-#: midx.c:1237
+#: midx.c:1611
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 
-#: midx.c:1242
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr ""
 
-#: midx.c:1251
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr ""
 
-#: midx.c:1260
+#: midx.c:1634
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr ""
 
-#: midx.c:1280
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr ""
 
-#: midx.c:1287
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr ""
 
-#: midx.c:1303
+#: midx.c:1677
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr ""
 
-#: midx.c:1309
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr ""
 
-#: midx.c:1318
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr ""
 
-#: midx.c:1343
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr ""
 
-#: midx.c:1353
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr ""
 
-#: midx.c:1544
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr ""
 
-#: midx.c:1564
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr ""
 
@@ -5053,270 +5194,271 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr ""
 
-#: object-file.c:526
+#: object-file.c:456
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 
-#: object-file.c:577
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr ""
 
-#: object-file.c:649
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 
-#: object-file.c:656
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr ""
 
-#: object-file.c:699
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr ""
 
-#: object-file.c:717
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr ""
 
-#: object-file.c:724
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr ""
 
-#: object-file.c:759
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr ""
 
-#: object-file.c:780
+#: object-file.c:762
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 
-#: object-file.c:786
+#: object-file.c:768
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr ""
 
-#: object-file.c:792
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 
-#: object-file.c:800
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
 
-#: object-file.c:860
+#: object-file.c:813
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr ""
+
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr ""
 
-#: object-file.c:1010
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr ""
 
-#: object-file.c:1031
-msgid "mmap failed"
+#: object-file.c:1048
+#, c-format
+msgid "mmap failed%s"
 msgstr ""
 
-#: object-file.c:1195
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr ""
 
-#: object-file.c:1330 object-file.c:2524
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr ""
 
-#: object-file.c:1332 object-file.c:2528
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr ""
 
-#: object-file.c:1374
-msgid "invalid object type"
-msgstr ""
-
-#: object-file.c:1458
+#: object-file.c:1457
 #, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
+msgid "unable to parse %s header"
 msgstr ""
 
-#: object-file.c:1461
-#, c-format
-msgid "unable to unpack %s header"
+#: object-file.c:1459
+msgid "invalid object type"
 msgstr ""
 
-#: object-file.c:1467
+#: object-file.c:1470
 #, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
+msgid "unable to unpack %s header"
 msgstr ""
 
-#: object-file.c:1470
+#: object-file.c:1474
 #, c-format
-msgid "unable to parse %s header"
+msgid "header for %s too long, exceeds %d bytes"
 msgstr ""
 
-#: object-file.c:1697
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr ""
 
-#: object-file.c:1701
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr ""
 
-#: object-file.c:1705
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr ""
 
-#: object-file.c:1709
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr ""
 
-#: object-file.c:1814
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr ""
 
-#: object-file.c:1821
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr ""
 
-#: object-file.c:1828
+#: object-file.c:1835
 msgid "file write error"
 msgstr ""
 
-#: object-file.c:1848
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr ""
 
-#: object-file.c:1913
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 
-#: object-file.c:1915
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr ""
 
-#: object-file.c:1939
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr ""
 
-#: object-file.c:1945
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr ""
 
-#: object-file.c:1949
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr ""
 
-#: object-file.c:1953
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr ""
 
-#: object-file.c:1963 builtin/pack-objects.c:1097
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr ""
 
-#: object-file.c:2040
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr ""
 
-#: object-file.c:2091
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr ""
 
-#: object-file.c:2099
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr ""
 
-#: object-file.c:2199
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr ""
 
-#: object-file.c:2202
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr ""
 
-#: object-file.c:2275 object-file.c:2285
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr ""
 
-#: object-file.c:2291
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr ""
 
-#: object-file.c:2315
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr ""
 
-#: object-file.c:2317
+#: object-file.c:2331
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr ""
 
-#: object-file.c:2344 builtin/index-pack.c:192
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr ""
 
-#: object-file.c:2535 object-file.c:2588
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr ""
 
-#: object-file.c:2559
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr ""
 
-#: object-file.c:2564
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr ""
 
-#: object-file.c:2570
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr ""
 
-#: object-file.c:2581
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr ""
 
-#: object-name.c:486
+#: object-name.c:480
 #, c-format
 msgid "short object ID %s is ambiguous"
 msgstr ""
 
-#: object-name.c:497
+#: object-name.c:491
 msgid "The candidates are:"
 msgstr ""
 
-#: object-name.c:796
+#: object-name.c:790
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5329,62 +5471,62 @@ msgid ""
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
 
-#: object-name.c:916
+#: object-name.c:910
 #, c-format
 msgid "log for '%.*s' only goes back to %s"
 msgstr ""
 
-#: object-name.c:924
+#: object-name.c:918
 #, c-format
 msgid "log for '%.*s' only has %d entries"
 msgstr ""
 
-#: object-name.c:1702
+#: object-name.c:1696
 #, c-format
 msgid "path '%s' exists on disk, but not in '%.*s'"
 msgstr ""
 
-#: object-name.c:1708
+#: object-name.c:1702
 #, c-format
 msgid ""
 "path '%s' exists, but not '%s'\n"
 "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
 msgstr ""
 
-#: object-name.c:1717
+#: object-name.c:1711
 #, c-format
 msgid "path '%s' does not exist in '%.*s'"
 msgstr ""
 
-#: object-name.c:1745
+#: object-name.c:1739
 #, c-format
 msgid ""
 "path '%s' is in the index, but not at stage %d\n"
 "hint: Did you mean ':%d:%s'?"
 msgstr ""
 
-#: object-name.c:1761
+#: object-name.c:1755
 #, c-format
 msgid ""
 "path '%s' is in the index, but not '%s'\n"
 "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
 msgstr ""
 
-#: object-name.c:1769
+#: object-name.c:1763
 #, c-format
 msgid "path '%s' exists on disk, but not in the index"
 msgstr ""
 
-#: object-name.c:1771
+#: object-name.c:1765
 #, c-format
 msgid "path '%s' does not exist (neither on disk nor in the index)"
 msgstr ""
 
-#: object-name.c:1784
+#: object-name.c:1778
 msgid "relative path syntax can't be used outside working tree"
 msgstr ""
 
-#: object-name.c:1922
+#: object-name.c:1916
 #, c-format
 msgid "invalid object name '%.*s'."
 msgstr ""
@@ -5399,27 +5541,40 @@ msgstr ""
 msgid "object %s is a %s, not a %s"
 msgstr ""
 
-#: object.c:232
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr ""
 
-#: object.c:245
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr ""
 
-#: object.c:265 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr ""
 
-#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr ""
+
+#: pack-bitmap.c:429
+msgid "load_reverse_index: could not open pack"
+msgstr ""
+
+#: 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:1547 builtin/rev-list.c:92
+#: pack-bitmap.c:1935
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr ""
+
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr ""
@@ -5449,124 +5604,134 @@ msgstr ""
 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
 msgstr ""
 
-#: pack-write.c:250
+#: pack-write.c:251
 msgid "cannot both write and verify reverse index"
 msgstr ""
 
-#: pack-write.c:271
+#: pack-write.c:270
 #, c-format
 msgid "could not stat: %s"
 msgstr ""
 
-#: pack-write.c:283
+#: pack-write.c:282
 #, c-format
 msgid "failed to make %s readable"
 msgstr ""
 
-#: pack-write.c:522
+#: pack-write.c:520
 #, c-format
 msgid "could not write '%s' promisor file"
 msgstr ""
 
-#: packfile.c:625
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 
-#: packfile.c:1937
+#: packfile.c:657
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr ""
+
+#: packfile.c:1924
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 
-#: packfile.c:1941
+#: 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
+#: 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.c:38
+#: 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"
 msgstr ""
 
-#: parse-options.c:73
+#: parse-options.c:93
 #, c-format
 msgid "%s is incompatible with %s"
 msgstr ""
 
-#: parse-options.c:78
+#: parse-options.c:98
 #, c-format
 msgid "%s : incompatible with something else"
 msgstr ""
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
 #, c-format
 msgid "%s takes no value"
 msgstr ""
 
-#: parse-options.c:94
+#: parse-options.c:114
 #, c-format
 msgid "%s isn't available"
 msgstr ""
 
-#: parse-options.c:217
+#: parse-options.c:237
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr ""
 
-#: parse-options.c:386
+#: parse-options.c:393
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr ""
 
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr ""
 
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr ""
 
-#: parse-options.c:879
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: parse-options.c:881
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr ""
 
-#: parse-options.c:883
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr ""
 
-#: parse-options.c:907
+#: parse-options.c:920
 msgid "..."
 msgstr ""
 
-#: parse-options.c:926
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr ""
@@ -5574,97 +5739,121 @@ msgstr ""
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:932
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr ""
 
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. 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:970
+#, c-format
+msgid "%*s%s"
+msgstr ""
+
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr ""
 
-#: parse-options.c:974
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr ""
 
-#: path.c:915
+#: path.c:922
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr ""
 
-#: pathspec.c:151
+#: pathspec.c:150
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 
-#: pathspec.c:169
+#: pathspec.c:168
 msgid "Only one 'attr:' specification is allowed."
 msgstr ""
 
-#: pathspec.c:172
+#: pathspec.c:171
 msgid "attr spec must not be empty"
 msgstr ""
 
-#: pathspec.c:215
+#: pathspec.c:214
 #, c-format
 msgid "invalid attribute name %s"
 msgstr ""
 
-#: pathspec.c:280
+#: pathspec.c:279
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 
-#: pathspec.c:287
+#: pathspec.c:286
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr ""
 
-#: pathspec.c:327
+#: pathspec.c:326
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr ""
 
-#: pathspec.c:348
+#: pathspec.c:347
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr ""
 
-#: pathspec.c:353
+#: pathspec.c:352
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr ""
 
-#: pathspec.c:391
+#: pathspec.c:390
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr ""
 
-#: pathspec.c:450
+#: pathspec.c:449
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr ""
 
-#: pathspec.c:466
+#: pathspec.c:465
 #, c-format
 msgid "%s: '%s' is outside repository at '%s'"
 msgstr ""
 
-#: pathspec.c:542
+#: pathspec.c:541
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr ""
 
-#: pathspec.c:552
+#: pathspec.c:551
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 
-#: pathspec.c:619
+#: pathspec.c:618
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr ""
 
-#: pathspec.c:664
+#: pathspec.c:663
 #, c-format
 msgid "line is badly quoted: %s"
 msgstr ""
@@ -5678,14 +5867,14 @@ msgid "unable to write delim packet"
 msgstr ""
 
 #: pkt-line.c:106
-msgid "unable to write stateless separator packet"
+msgid "unable to write response end packet"
 msgstr ""
 
 #: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr ""
 
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
 msgid "protocol error: impossibly long line"
 msgstr ""
 
@@ -5693,7 +5882,7 @@ msgstr ""
 msgid "packet write with format failed"
 msgstr ""
 
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
 msgid "packet write failed - data exceeds max packet size"
 msgstr ""
 
@@ -5702,25 +5891,25 @@ msgstr ""
 msgid "packet write failed: %s"
 msgstr ""
 
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
 msgid "read error"
 msgstr ""
 
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
 msgid "the remote end hung up unexpectedly"
 msgstr ""
 
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr ""
 
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: 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:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr ""
@@ -5734,23 +5923,23 @@ msgstr ""
 msgid "unable to create threaded lstat: %s"
 msgstr ""
 
-#: pretty.c:988
+#: pretty.c:1051
 msgid "unable to parse --pretty format"
 msgstr ""
 
-#: promisor-remote.c:30
+#: promisor-remote.c:31
 msgid "promisor-remote: unable to fork off fetch subprocess"
 msgstr ""
 
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
 msgid "promisor-remote: could not write to fetch subprocess"
 msgstr ""
 
-#: promisor-remote.c:41
+#: promisor-remote.c:44
 msgid "promisor-remote: could not close stdin to fetch subprocess"
 msgstr ""
 
-#: promisor-remote.c:53
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr ""
@@ -5763,238 +5952,234 @@ msgstr ""
 msgid "Removing duplicate objects"
 msgstr ""
 
-#: range-diff.c:78
+#: range-diff.c:67
 msgid "could not start `log`"
 msgstr ""
 
-#: range-diff.c:80
+#: range-diff.c:69
 msgid "could not read `log` output"
 msgstr ""
 
-#: range-diff.c:101 sequencer.c:5551
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr ""
 
-#: range-diff.c:115
+#: range-diff.c:111
 #, c-format
 msgid ""
 "could not parse first line of `log` output: did not start with 'commit ': "
 "'%s'"
 msgstr ""
 
-#: range-diff.c:140
+#: range-diff.c:137
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr ""
 
-#: range-diff.c:306
+#: range-diff.c:304
 msgid "failed to generate diff"
 msgstr ""
 
-#: range-diff.c:558
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr ""
-
-#: range-diff.c:561 range-diff.c:563
+#: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr ""
 
-#: read-cache.c:708
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr ""
 
-#: read-cache.c:724
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr ""
 
-#: read-cache.c:746
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 
-#: read-cache.c:751
+#: read-cache.c:766 builtin/submodule--helper.c:3242
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr ""
 
-#: read-cache.c:803
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr ""
 
-#: read-cache.c:822
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr ""
 
-#: read-cache.c:833
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr ""
 
-#: read-cache.c:1356
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr ""
 
-#: read-cache.c:1571
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr ""
 
-#: read-cache.c:1700
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
-#: read-cache.c:1710
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
-#: read-cache.c:1766
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr ""
 
-#: read-cache.c:1769
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr ""
 
-#: read-cache.c:1778
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr ""
 
-#: read-cache.c:1812
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr ""
 
-#: read-cache.c:1814
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr ""
 
-#: read-cache.c:1851
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr ""
 
-#: read-cache.c:1867
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr ""
 
-#: read-cache.c:1924
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr ""
 
-#: read-cache.c:1927
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr ""
 
-#: read-cache.c:1930
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr ""
 
-#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:332
+#: 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:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr ""
 
-#: read-cache.c:2180
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr ""
 
-#: read-cache.c:2193
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr ""
 
-#: read-cache.c:2226
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr ""
 
-#: read-cache.c:2230
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr ""
 
-#: read-cache.c:2234
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr ""
 
-#: read-cache.c:2238
+#: read-cache.c:2280
 #, c-format
-msgid "%s: unable to map index file"
+msgid "%s: unable to map index file%s"
 msgstr ""
 
-#: read-cache.c:2280
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr ""
 
-#: read-cache.c:2307
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr ""
 
-#: read-cache.c:2345
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr ""
 
-#: read-cache.c:2392
+#: read-cache.c:2455
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr ""
 
-#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: 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:3138
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr ""
 
-#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr ""
 
-#: read-cache.c:3222
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr ""
 
-#: read-cache.c:3234
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr ""
 
-#: read-cache.c:3263
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr ""
 
-#: read-cache.c:3412
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr ""
@@ -6044,19 +6229,19 @@ msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
 msgstr ""
 
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
 msgstr ""
 
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6065,21 +6250,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
 "\n"
 msgstr ""
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816
-#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
+#: 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'"
 msgstr ""
 
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
 #, c-format
 msgid "could not write '%s'."
 msgstr ""
@@ -6102,14 +6287,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
 #, c-format
-msgid "could not read '%s'."
+msgid "%s: 'preserve' superseded by 'merges'"
 msgstr ""
 
-#: ref-filter.c:42 wt-status.c:1978
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr ""
 
@@ -6128,257 +6311,228 @@ msgstr ""
 msgid "ahead %d, behind %d"
 msgstr ""
 
-#: ref-filter.c:175
+#: ref-filter.c:235
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr ""
 
-#: ref-filter.c:177
+#: ref-filter.c:237
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr ""
 
-#: ref-filter.c:199
+#: ref-filter.c:259
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr ""
 
-#: ref-filter.c:203
+#: ref-filter.c:263
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr ""
 
-#: ref-filter.c:205
+#: 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 ""
 
-#: ref-filter.c:260
+#: ref-filter.c:320
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:282
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr ""
-
-#: ref-filter.c:290
+#: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:302
+#: ref-filter.c:364
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:315
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr ""
-
-#: ref-filter.c:334
+#: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
 msgstr ""
 
-#: ref-filter.c:336
+#: ref-filter.c:398
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr ""
 
-#: ref-filter.c:367
+#: ref-filter.c:429
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr ""
 
-#: ref-filter.c:369
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr ""
-
-#: ref-filter.c:384
+#: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr ""
 
-#: ref-filter.c:388
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr ""
-
-#: ref-filter.c:402
+#: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
 msgstr ""
 
-#: ref-filter.c:432
+#: ref-filter.c:506
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr ""
 
-#: ref-filter.c:444
+#: ref-filter.c:518
 #, c-format
 msgid "unrecognized position:%s"
 msgstr ""
 
-#: ref-filter.c:451
+#: ref-filter.c:525
 #, c-format
 msgid "unrecognized width:%s"
 msgstr ""
 
-#: ref-filter.c:460
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr ""
-
-#: ref-filter.c:468
+#: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr ""
 
-#: ref-filter.c:486
+#: ref-filter.c:568
 #, c-format
-msgid "unrecognized %%(if) argument: %s"
+msgid "%%(rest) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:588
+#: ref-filter.c:680
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr ""
 
-#: ref-filter.c:615
+#: ref-filter.c:707
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr ""
 
-#: ref-filter.c:619
+#: ref-filter.c:711
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 
-#: ref-filter.c:743
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr ""
-
-#: ref-filter.c:807
+#: 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"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
 msgstr ""
 
-#: ref-filter.c:809
+#: ref-filter.c:912
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr ""
 
-#: ref-filter.c:811
+#: ref-filter.c:914
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr ""
 
-#: ref-filter.c:839
+#: ref-filter.c:950
 #, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
+msgid "format: %%(else) atom used more than once"
 msgstr ""
 
-#: ref-filter.c:841
+#: ref-filter.c:965
 #, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
+msgid "format: %%(end) atom used without corresponding atom"
 msgstr ""
 
-#: ref-filter.c:843
+#: ref-filter.c:1027
 #, c-format
-msgid "format: %%(else) atom used more than once"
+msgid "malformed format string %s"
 msgstr ""
 
-#: ref-filter.c:858
+#: ref-filter.c:1033
 #, c-format
-msgid "format: %%(end) atom used without corresponding atom"
+msgid "this command reject atom %%(%.*s)"
 msgstr ""
 
-#: ref-filter.c:915
+#: ref-filter.c:1040
 #, c-format
-msgid "malformed format string %s"
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
 msgstr ""
 
-#: ref-filter.c:1556
+#: ref-filter.c:1706
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr ""
 
-#: ref-filter.c:1559
+#: ref-filter.c:1709
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr ""
 
-#: ref-filter.c:1562
+#: ref-filter.c:1712
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr ""
 
-#: ref-filter.c:1566
+#: ref-filter.c:1716
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr ""
 
-#: ref-filter.c:1569
+#: ref-filter.c:1719
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr ""
 
-#: ref-filter.c:1572
+#: ref-filter.c:1722
 msgid "(no branch)"
 msgstr ""
 
-#: ref-filter.c:1604 ref-filter.c:1813
+#: ref-filter.c:1754 ref-filter.c:1972
 #, c-format
 msgid "missing object %s for %s"
 msgstr ""
 
-#: ref-filter.c:1614
+#: ref-filter.c:1764
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr ""
 
-#: ref-filter.c:1997
+#: ref-filter.c:2155
 #, c-format
 msgid "malformed object at '%s'"
 msgstr ""
 
-#: ref-filter.c:2086
+#: ref-filter.c:2245
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr ""
 
-#: ref-filter.c:2091 refs.c:676
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr ""
 
-#: ref-filter.c:2431
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr ""
 
-#: ref-filter.c:2525
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr ""
 
-#: ref-filter.c:2530
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr ""
 
-#: refs.c:264
+#: refs.c:261
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr ""
 
-#: refs.c:566
+#: refs.c:563
 #, c-format
 msgid ""
 "Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6393,12 +6547,12 @@ msgid ""
 "\tgit branch -m <name>\n"
 msgstr ""
 
-#: refs.c:588
+#: refs.c:585
 #, c-format
 msgid "could not retrieve `%s`"
 msgstr ""
 
-#: refs.c:598
+#: refs.c:595
 #, c-format
 msgid "invalid branch name: %s = %s"
 msgstr ""
@@ -6408,66 +6562,66 @@ msgstr ""
 msgid "ignoring dangling symref %s"
 msgstr ""
 
-#: refs.c:922
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr ""
 
-#: refs.c:929
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr ""
 
-#: refs.c:994
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr ""
 
-#: refs.c:1086
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr ""
 
-#: refs.c:1157
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr ""
 
-#: refs.c:2051
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr ""
 
-#: refs.c:2131
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 
-#: refs.c:2142
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr ""
 
-#: refs.c:2242 refs.c:2272
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr ""
 
-#: refs.c:2248 refs.c:2283
+#: refs.c:2275 refs.c:2310
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr ""
 
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr ""
 
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: 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:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr ""
@@ -6477,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 ""
@@ -6529,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"
@@ -6543,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"
@@ -6551,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"
@@ -6559,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"
@@ -6567,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"
@@ -6575,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 ""
@@ -6690,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"
@@ -6705,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 ""
@@ -6742,7 +6896,7 @@ msgstr ""
 msgid "there were errors while writing '%s' (%s)"
 msgstr ""
 
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr ""
@@ -6787,8 +6941,8 @@ msgstr ""
 msgid "Recorded preimage for '%s'"
 msgstr ""
 
-#: rerere.c:865 submodule.c:2089 builtin/log.c:2000
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
+#: 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 ""
@@ -6826,44 +6980,33 @@ msgstr ""
 msgid "could not determine HEAD revision"
 msgstr ""
 
-#: reset.c:70 reset.c:76 sequencer.c:3669
+#: reset.c:70 reset.c:76 sequencer.c:3700
 #, c-format
 msgid "failed to find tree of %s"
 msgstr ""
 
-#: revision.c:2343
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr ""
 
-#: revision.c:2683
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr ""
 
-#: revision.c:2686
+#: revision.c:2689
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr ""
 
-#: revision.c:2892
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr ""
 
-#: run-command.c:767
-msgid "open /dev/null failed"
-msgstr ""
-
-#: run-command.c:1275
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr ""
 
-#: run-command.c:1345
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-
 #: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
@@ -6882,118 +7025,138 @@ msgstr ""
 msgid "failed to sign the push certificate"
 msgstr ""
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "send-pack: unable to fork off fetch subprocess"
 msgstr ""
 
-#: send-pack.c:455
+#: send-pack.c:457
 msgid "push negotiation failed; proceeding anyway with push"
 msgstr ""
 
-#: send-pack.c:520
+#: send-pack.c:528
 msgid "the receiving end does not support this repository's hash algorithm"
 msgstr ""
 
-#: send-pack.c:529
+#: send-pack.c:537
 msgid "the receiving end does not support --signed push"
 msgstr ""
 
-#: send-pack.c:531
+#: send-pack.c:539
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr ""
 
-#: send-pack.c:543
+#: send-pack.c:546
 msgid "the receiving end does not support --atomic push"
 msgstr ""
 
-#: send-pack.c:548
+#: send-pack.c:551
 msgid "the receiving end does not support push options"
 msgstr ""
 
-#: sequencer.c:196
+#: sequencer.c:197
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr ""
 
-#: sequencer.c:324
+#: sequencer.c:325
 #, c-format
 msgid "could not delete '%s'"
 msgstr ""
 
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: 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 ""
 
-#: sequencer.c:354
+#: sequencer.c:355
 msgid "revert"
 msgstr ""
 
-#: sequencer.c:356
+#: sequencer.c:357
 msgid "cherry-pick"
 msgstr ""
 
-#: sequencer.c:358
+#: sequencer.c:359
 msgid "rebase"
 msgstr ""
 
-#: sequencer.c:360
+#: sequencer.c:361
 #, c-format
 msgid "unknown action: %d"
 msgstr ""
 
-#: sequencer.c:419
+#: sequencer.c:420
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr ""
 
-#: sequencer.c:422
+#: sequencer.c:423
 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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
+msgstr ""
+
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
 msgstr ""
 
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr ""
 
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#: 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 ""
 
-#: sequencer.c:442
+#: sequencer.c:455
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr ""
 
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3554
+#: 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:486
+#: 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."
 msgstr ""
 
-#: sequencer.c:490
+#: sequencer.c:503
 msgid "commit your changes or stash them to proceed."
 msgstr ""
 
-#: sequencer.c:522
+#: sequencer.c:535
 #, c-format
 msgid "%s: fast-forward"
 msgstr ""
 
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
@@ -7001,65 +7164,65 @@ msgstr ""
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
 #.
-#: sequencer.c:671
+#: sequencer.c:685
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr ""
 
-#: sequencer.c:685
+#: sequencer.c:699
 msgid "unable to update cache tree"
 msgstr ""
 
-#: sequencer.c:699
+#: sequencer.c:713
 msgid "could not resolve HEAD commit"
 msgstr ""
 
-#: sequencer.c:779
+#: sequencer.c:793
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr ""
 
-#: sequencer.c:790
+#: sequencer.c:804
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr ""
 
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
-#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
+#: 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 ""
 
-#: sequencer.c:837
+#: sequencer.c:851
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr ""
 
-#: sequencer.c:842
+#: sequencer.c:856
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr ""
 
-#: sequencer.c:847
+#: sequencer.c:861
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr ""
 
-#: sequencer.c:851
+#: sequencer.c:865
 #, c-format
 msgid "unknown variable '%s'"
 msgstr ""
 
-#: sequencer.c:856
+#: sequencer.c:870
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr ""
 
-#: sequencer.c:858
+#: sequencer.c:872
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr ""
 
-#: sequencer.c:860
+#: sequencer.c:874
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr ""
 
-#: sequencer.c:925
+#: sequencer.c:939
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -7076,11 +7239,11 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:1212
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 
-#: sequencer.c:1218
+#: 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"
@@ -7095,7 +7258,7 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 
-#: sequencer.c:1231
+#: 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"
@@ -7109,358 +7272,365 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 
-#: sequencer.c:1273
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr ""
 
-#: sequencer.c:1275
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr ""
 
-#: sequencer.c:1321
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr ""
 
-#: sequencer.c:1323
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr ""
 
-#: sequencer.c:1327
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr ""
 
-#: sequencer.c:1348
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr ""
 
-#: sequencer.c:1350
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr ""
 
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
 msgid "could not parse HEAD commit"
 msgstr ""
 
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr ""
 
-#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
 msgid "git write-tree failed to write a tree"
 msgstr ""
 
-#: sequencer.c:1454 sequencer.c:1574
+#: sequencer.c:1473 sequencer.c:1593
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr ""
 
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr ""
 
-#: sequencer.c:1491
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr ""
 
-#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
-#: builtin/merge.c:934 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:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#: 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:1606
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr ""
 
-#: sequencer.c:1611
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr ""
 
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr ""
 
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr ""
 
-#: sequencer.c:1737
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr ""
 
-#: sequencer.c:1738
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr ""
 
-#: sequencer.c:1739
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr ""
 
-#: sequencer.c:1740
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr ""
 
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr ""
 
-#: sequencer.c:1934
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr ""
 
-#: sequencer.c:1936 sequencer.c:3581
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr ""
 
-#: sequencer.c:1938
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr ""
 
-#: sequencer.c:1962
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr ""
 
-#: sequencer.c:2072
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr ""
 
-#: sequencer.c:2079
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr ""
 
-#: sequencer.c:2098
+#: sequencer.c:2117
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr ""
 
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2125 sequencer.c:2133
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr ""
 
-#: sequencer.c:2120
+#: 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:2139
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr ""
 
-#: sequencer.c:2205
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:2265
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr ""
 
-#: sequencer.c:2266
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr ""
 
-#: sequencer.c:2287
+#: sequencer.c:2306
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr ""
 
-#: sequencer.c:2345
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr ""
 
-#: sequencer.c:2352
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr ""
 
-#: sequencer.c:2425
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr ""
 
-#: sequencer.c:2434
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr ""
 
-#: sequencer.c:2477
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr ""
 
-#: sequencer.c:2538
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr ""
 
-#: sequencer.c:2549
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr ""
 
-#: sequencer.c:2635
+#: sequencer.c:2624 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr ""
+
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr ""
 
-#: sequencer.c:2644
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr ""
 
-#: sequencer.c:2690
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
-#: sequencer.c:2692
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr ""
 
-#: sequencer.c:2697
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr ""
 
-#: sequencer.c:2708
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr ""
 
-#: sequencer.c:2710
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr ""
 
-#: sequencer.c:2788
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr ""
 
-#: sequencer.c:2897
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr ""
 
-#: sequencer.c:2917
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr ""
 
-#: sequencer.c:3012 sequencer.c:4869
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr ""
 
-#: sequencer.c:3029
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr ""
 
-#: sequencer.c:3031
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr ""
 
-#: sequencer.c:3034
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr ""
 
-#: sequencer.c:3036
+#: sequencer.c:3057
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr ""
 
-#: sequencer.c:3050
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr ""
 
-#: sequencer.c:3065
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr ""
 
-#: sequencer.c:3125 sequencer.c:4582
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr ""
 
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3150 sequencer.c:3194
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 
-#: sequencer.c:3159 builtin/grep.c:759
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
+#: builtin/grep.c:772
 #, c-format
 msgid "cannot open '%s'"
 msgstr ""
 
-#: sequencer.c:3161
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr ""
 
-#: sequencer.c:3162
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr ""
 
-#: sequencer.c:3168
+#: sequencer.c:3189
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 
-#: sequencer.c:3179
+#: sequencer.c:3200
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 
-#: sequencer.c:3220
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr ""
 
-#: sequencer.c:3229
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr ""
 
-#: sequencer.c:3239
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr ""
 
-#: sequencer.c:3246
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr ""
 
-#: sequencer.c:3249
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
 "try \"git %s --continue\""
 msgstr ""
 
-#: sequencer.c:3411 sequencer.c:4473
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr ""
 
-#: sequencer.c:3428
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:3436
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -7472,27 +7642,27 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:3446
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr ""
 
-#: sequencer.c:3453
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr ""
 
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:3483
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr ""
 
-#: sequencer.c:3498
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -7502,11 +7672,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sequencer.c:3504
+#: sequencer.c:3520
 msgid "and made changes to the index and/or the working tree\n"
 msgstr ""
 
-#: sequencer.c:3510
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -7517,90 +7687,90 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sequencer.c:3571
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr ""
 
-#: sequencer.c:3625
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr ""
 
-#: sequencer.c:3630
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr ""
 
-#: sequencer.c:3714
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr ""
 
-#: sequencer.c:3747
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr ""
 
-#: sequencer.c:3769
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr ""
 
-#: sequencer.c:3778
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr ""
 
-#: sequencer.c:3790
+#: sequencer.c:3818
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
 
-#: sequencer.c:3806
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr ""
 
-#: sequencer.c:3989
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr ""
 
-#: sequencer.c:4005
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr ""
 
-#: sequencer.c:4079
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr ""
 
-#: sequencer.c:4082
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr ""
 
-#: sequencer.c:4088
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr ""
 
-#: sequencer.c:4091
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr ""
 
-#: sequencer.c:4095
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr ""
 
-#: sequencer.c:4120
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr ""
 
-#: sequencer.c:4132
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr ""
 
-#: sequencer.c:4135
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -7608,29 +7778,29 @@ msgid ""
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 
-#: sequencer.c:4140
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr ""
 
-#: sequencer.c:4141
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr ""
 
-#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr ""
 
-#: sequencer.c:4249
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr ""
 
-#: sequencer.c:4251
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr ""
 
-#: sequencer.c:4259
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -7643,124 +7813,133 @@ msgid ""
 "    git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:4305
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr ""
 
-#: sequencer.c:4351
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr ""
 
-#: sequencer.c:4422
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr ""
 
-#: sequencer.c:4481
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr ""
 
-#: sequencer.c:4486
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr ""
 
-#: sequencer.c:4500
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr ""
 
-#: sequencer.c:4560
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr ""
 
-#: sequencer.c:4612
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 
-#: sequencer.c:4621
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr ""
 
-#: sequencer.c:4623
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr ""
 
-#: sequencer.c:4625
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr ""
 
-#: sequencer.c:4628
+#: 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:4664 sequencer.c:4703
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr ""
 
-#: sequencer.c:4719
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
-#: sequencer.c:4726
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr ""
 
-#: sequencer.c:4846
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr ""
 
-#: sequencer.c:4850
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr ""
 
-#: sequencer.c:4885
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr ""
 
-#: sequencer.c:5362
+#: sequencer.c:5189 sequencer.c:5418
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr ""
+
+#: sequencer.c:5259 sequencer.c:5434
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr ""
+
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
 msgstr ""
 
-#: sequencer.c:5365
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr ""
 
-#: sequencer.c:5615 sequencer.c:5632
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr ""
 
-#: sequencer.c:5651
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr ""
 
-#: sequencer.c:5751
+#: 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"
@@ -7768,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"
@@ -7781,130 +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
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr ""
 
-#: setup.c:661
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr ""
 
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr ""
+#: setup.c:730
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: setup.c:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr ""
+#: 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:700
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr ""
 
-#: setup.c:702
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr ""
 
-#: setup.c:704
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr ""
 
-#: setup.c:706
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr ""
 
-#: setup.c:708
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr ""
 
-#: setup.c:710
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr ""
 
-#: setup.c:812
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr ""
 
-#: setup.c:826
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr ""
 
-#: setup.c:855 setup.c:857 setup.c:888
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr ""
 
-#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr ""
 
-#: setup.c:987
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr ""
 
-#: setup.c:1225
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr ""
 
-#: setup.c:1234 setup.c:1240
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr ""
 
-#: setup.c:1245
+#: setup.c:1315
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 
-#: setup.c:1251
+#: 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:1370
+#: 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:1417
-msgid "open /dev/null or dup failed"
-msgstr ""
-
-#: setup.c:1432
+#: setup.c:1508
 msgid "fork failed"
 msgstr ""
 
-#: setup.c:1437 t/helper/test-simple-ipc.c:285
+#: setup.c:1513
 msgid "setsid failed"
 msgstr ""
 
-#: sparse-index.c:151
-msgid "attempting to use sparse-index without cone mode"
-msgstr ""
-
-#: sparse-index.c:156
-msgid "unable to update cache-tree, staying full"
-msgstr ""
-
-#: sparse-index.c:239
+#: sparse-index.c:289
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr ""
@@ -7961,13 +8132,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
-#: builtin/rebase.c:866
+#: 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:1177
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr ""
@@ -7991,7 +8162,7 @@ msgstr ""
 msgid "invalid value for %s"
 msgstr ""
 
-#: submodule-config.c:766
+#: submodule-config.c:767
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr ""
@@ -8014,147 +8185,147 @@ msgstr ""
 msgid "staging updated .gitmodules failed"
 msgstr ""
 
-#: submodule.c:328
+#: submodule.c:358
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr ""
 
-#: submodule.c:359
+#: submodule.c:389
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr ""
 
-#: submodule.c:436
+#: submodule.c:466
 #, c-format
 msgid "bad --ignore-submodules argument: %s"
 msgstr ""
 
-#: submodule.c:818
+#: submodule.c:844
 #, c-format
 msgid ""
 "Submodule in commit %s at path: '%s' collides with a submodule named the "
 "same. Skipping it."
 msgstr ""
 
-#: submodule.c:921
+#: submodule.c:954
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr ""
 
-#: submodule.c:1006
+#: submodule.c:1042
 #, c-format
 msgid ""
 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
 "submodule %s"
 msgstr ""
 
-#: submodule.c:1129
+#: submodule.c:1165
 #, c-format
 msgid "process for submodule '%s' failed"
 msgstr ""
 
-#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 
-#: submodule.c:1169
+#: submodule.c:1205
 #, c-format
 msgid "Pushing submodule '%s'\n"
 msgstr ""
 
-#: submodule.c:1172
+#: submodule.c:1208
 #, c-format
 msgid "Unable to push submodule '%s'\n"
 msgstr ""
 
-#: submodule.c:1464
+#: submodule.c:1491
 #, c-format
 msgid "Fetching submodule %s%s\n"
 msgstr ""
 
-#: submodule.c:1498
+#: submodule.c:1525
 #, c-format
 msgid "Could not access submodule '%s'\n"
 msgstr ""
 
-#: submodule.c:1653
+#: submodule.c:1680
 #, c-format
 msgid ""
 "Errors during submodule fetch:\n"
 "%s"
 msgstr ""
 
-#: submodule.c:1678
+#: submodule.c:1705
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr ""
 
-#: submodule.c:1695
+#: submodule.c:1722
 #, c-format
 msgid "Could not run 'git status --porcelain=2' in submodule %s"
 msgstr ""
 
-#: submodule.c:1736
+#: submodule.c:1763
 #, c-format
 msgid "'git status --porcelain=2' failed in submodule %s"
 msgstr ""
 
-#: submodule.c:1811
+#: submodule.c:1838
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr ""
 
-#: submodule.c:1824
+#: submodule.c:1851
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr ""
 
-#: submodule.c:1839
+#: submodule.c:1868
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr ""
 
-#: submodule.c:1866 submodule.c:2176
+#: submodule.c:1895 submodule.c:2210
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr ""
 
-#: submodule.c:1887
+#: submodule.c:1917
 msgid "could not reset submodule index"
 msgstr ""
 
-#: submodule.c:1929
+#: submodule.c:1959
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr ""
 
-#: submodule.c:1981
+#: submodule.c:2013
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr ""
 
-#: submodule.c:2049
+#: submodule.c:2081
 #, c-format
 msgid "submodule git dir '%s' is inside git dir '%.*s'"
 msgstr ""
 
-#: submodule.c:2070
+#: submodule.c:2102
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr ""
 
-#: submodule.c:2082 submodule.c:2141
+#: submodule.c:2114 submodule.c:2174
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr ""
 
-#: submodule.c:2086
+#: submodule.c:2118
 #, c-format
 msgid "refusing to move '%s' into an existing git dir"
 msgstr ""
 
-#: submodule.c:2093
+#: submodule.c:2124
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -8162,11 +8333,11 @@ msgid ""
 "'%s'\n"
 msgstr ""
 
-#: submodule.c:2221
+#: submodule.c:2255
 msgid "could not start ls-files in .."
 msgstr ""
 
-#: submodule.c:2261
+#: submodule.c:2295
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr ""
@@ -8188,7 +8359,7 @@ msgid "unknown value '%s' for key '%s'"
 msgstr ""
 
 #: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
 #, c-format
 msgid "more than one %s"
 msgstr ""
@@ -8203,11 +8374,11 @@ msgstr ""
 msgid "could not read input file '%s'"
 msgstr ""
 
-#: trailer.c:766 builtin/mktag.c:88
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
 msgid "could not read from stdin"
 msgstr ""
 
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
 #, c-format
 msgid "could not stat %s"
 msgstr ""
@@ -8273,7 +8444,7 @@ msgstr ""
 msgid "error while running fast-import"
 msgstr ""
 
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
 #, c-format
 msgid "could not read ref %s"
 msgstr ""
@@ -8291,7 +8462,7 @@ msgstr ""
 msgid "invalid remote service path"
 msgstr ""
 
-#: transport-helper.c:661 transport.c:1471
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr ""
 
@@ -8300,7 +8471,7 @@ msgstr ""
 msgid "can't connect to subservice %s"
 msgstr ""
 
-#: transport-helper.c:693 transport.c:397
+#: transport-helper.c:693 transport.c:404
 msgid "--negotiate-only requires protocol v2"
 msgstr ""
 
@@ -8313,111 +8484,111 @@ msgstr ""
 msgid "expected ok/error, helper said '%s'"
 msgstr ""
 
-#: transport-helper.c:855
+#: transport-helper.c:859
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr ""
 
-#: transport-helper.c:938
+#: transport-helper.c:942
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr ""
 
-#: transport-helper.c:941
+#: transport-helper.c:945
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr ""
 
-#: transport-helper.c:944
+#: transport-helper.c:948
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr ""
 
-#: transport-helper.c:949
+#: transport-helper.c:953
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr ""
 
-#: transport-helper.c:953
+#: transport-helper.c:957
 #, c-format
 msgid "helper %s does not support --%s"
 msgstr ""
 
-#: transport-helper.c:960
+#: transport-helper.c:964
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr ""
 
-#: transport-helper.c:1060
+#: transport-helper.c:1064
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 
-#: transport-helper.c:1065
+#: transport-helper.c:1069
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr ""
 
-#: transport-helper.c:1112
+#: transport-helper.c:1116
 msgid "couldn't run fast-export"
 msgstr ""
 
-#: transport-helper.c:1117
+#: transport-helper.c:1121
 msgid "error while running fast-export"
 msgstr ""
 
-#: transport-helper.c:1142
+#: transport-helper.c:1146
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
 "Perhaps you should specify a branch.\n"
 msgstr ""
 
-#: transport-helper.c:1224
+#: transport-helper.c:1228
 #, c-format
 msgid "unsupported object format '%s'"
 msgstr ""
 
-#: transport-helper.c:1233
+#: transport-helper.c:1237
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr ""
 
-#: transport-helper.c:1385
+#: transport-helper.c:1389
 #, c-format
 msgid "read(%s) failed"
 msgstr ""
 
-#: transport-helper.c:1412
+#: transport-helper.c:1416
 #, c-format
 msgid "write(%s) failed"
 msgstr ""
 
-#: transport-helper.c:1461
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed"
 msgstr ""
 
-#: transport-helper.c:1465
+#: transport-helper.c:1469
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr ""
 
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr ""
 
-#: transport-helper.c:1525
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed to wait"
 msgstr ""
 
-#: transport-helper.c:1529
+#: transport-helper.c:1533
 #, c-format
 msgid "%s process failed"
 msgstr ""
 
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
 msgid "can't start thread for copying data"
 msgstr ""
 
@@ -8431,53 +8602,53 @@ msgstr ""
 msgid "could not read bundle '%s'"
 msgstr ""
 
-#: transport.c:220
+#: transport.c:227
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr ""
 
-#: transport.c:272
+#: transport.c:279
 msgid "see protocol.version in 'git help config' for more details"
 msgstr ""
 
-#: transport.c:273
+#: transport.c:280
 msgid "server options require protocol version 2 or later"
 msgstr ""
 
-#: transport.c:400
+#: transport.c:407
 msgid "server does not support wait-for-done"
 msgstr ""
 
-#: transport.c:751
+#: transport.c:759
 msgid "could not parse transport.color.* config"
 msgstr ""
 
-#: transport.c:826
+#: transport.c:834
 msgid "support for protocol v2 not implemented yet"
 msgstr ""
 
-#: transport.c:960
+#: transport.c:967
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr ""
 
-#: transport.c:1026
+#: transport.c:1033
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr ""
 
-#: transport.c:1079
+#: transport.c:1082
 msgid "git-over-rsync is no longer supported"
 msgstr ""
 
-#: transport.c:1181
+#: transport.c:1185
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr ""
 
-#: transport.c:1185
+#: transport.c:1189
 #, c-format
 msgid ""
 "\n"
@@ -8493,11 +8664,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: transport.c:1193
+#: transport.c:1197
 msgid "Aborting."
 msgstr ""
 
-#: transport.c:1340
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr ""
 
@@ -8517,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 "
@@ -8616,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 "
@@ -8624,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 "
@@ -8672,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 "
@@ -8687,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:1519
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr ""
 
-#: unpack-trees.c:2608
+#: unpack-trees.c:2803
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr ""
 
-#: upload-pack.c:1548
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr ""
 
@@ -8756,113 +8934,123 @@ msgstr ""
 msgid "Fetching objects"
 msgstr ""
 
-#: worktree.c:238 builtin/am.c:2151
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr ""
 
-#: worktree.c:304
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 
-#: worktree.c:315
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 
-#: worktree.c:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr ""
 
-#: worktree.c:333
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr ""
 
-#: worktree.c:342
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr ""
 
-#: worktree.c:608
+#: worktree.c:604
 msgid "not a directory"
 msgstr ""
 
-#: worktree.c:617
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ""
 
-#: worktree.c:619
+#: worktree.c:615
 msgid ".git file broken"
 msgstr ""
 
-#: worktree.c:621
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr ""
 
-#: worktree.c:727
+#: worktree.c:723
 msgid "not a valid path"
 msgstr ""
 
-#: worktree.c:733
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr ""
 
-#: worktree.c:737
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr ""
 
-#: worktree.c:741
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr ""
 
-#: worktree.c:747
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr ""
 
-#: worktree.c:751
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr ""
 
-#: worktree.c:776
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr ""
 
-#: worktree.c:782
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr ""
 
-#: worktree.c:787 worktree.c:796
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr ""
 
-#: worktree.c:806
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr ""
 
-#: worktree.c:814
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr ""
 
-#: worktree.c:822
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr ""
 
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr ""
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr ""
+
+#: wrapper.c:205 wrapper.c:375
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr ""
 
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
 #, c-format
 msgid "unable to access '%s'"
 msgstr ""
 
-#: wrapper.c:607
+#: wrapper.c:615
 msgid "unable to get current working directory"
 msgstr ""
 
@@ -8895,11 +9083,11 @@ msgstr ""
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 
-#: wt-status.c:211 wt-status.c:1075
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr ""
 
-#: wt-status.c:234 wt-status.c:1084
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr ""
 
@@ -8997,28 +9185,28 @@ msgstr ""
 msgid "untracked content, "
 msgstr ""
 
-#: wt-status.c:908
+#: 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:939
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr ""
 
-#: wt-status.c:941
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr ""
 
-#: wt-status.c:1023
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
 msgstr ""
 
-#: wt-status.c:1115
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -9026,255 +9214,264 @@ msgid ""
 "You can use '--no-ahead-behind' to avoid this.\n"
 msgstr ""
 
-#: wt-status.c:1145
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr ""
 
-#: wt-status.c:1148
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 
-#: wt-status.c:1150
+#: wt-status.c:1206
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr ""
 
-#: wt-status.c:1154
+#: wt-status.c:1210
 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 
-#: wt-status.c:1157
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 
-#: wt-status.c:1166
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr ""
 
-#: wt-status.c:1169
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr ""
 
-#: wt-status.c:1173
+#: wt-status.c:1232
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 
-#: wt-status.c:1175
+#: wt-status.c:1234
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:1177
+#: 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:1310
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr ""
 
-#: wt-status.c:1312
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr ""
 
-#: wt-status.c:1315
+#: 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:1326
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr ""
 
-#: wt-status.c:1331
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr ""
 
-#: wt-status.c:1334
+#: 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:1342
+#: wt-status.c:1404
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr ""
 
-#: wt-status.c:1354
+#: wt-status.c:1416
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: wt-status.c:1359
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr ""
 
-#: wt-status.c:1372
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 
-#: wt-status.c:1374
+#: wt-status.c:1436
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:1376
+#: wt-status.c:1438
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 
-#: wt-status.c:1383
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 
-#: wt-status.c:1387
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: wt-status.c:1392
+#: wt-status.c:1454
 msgid "You are currently splitting a commit during a rebase."
 msgstr ""
 
-#: wt-status.c:1395
+#: wt-status.c:1457
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 
-#: wt-status.c:1399
+#: wt-status.c:1461
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: wt-status.c:1404
+#: wt-status.c:1466
 msgid "You are currently editing a commit during a rebase."
 msgstr ""
 
-#: wt-status.c:1407
+#: wt-status.c:1469
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 
-#: wt-status.c:1409
+#: wt-status.c:1471
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 
-#: wt-status.c:1420
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr ""
 
-#: wt-status.c:1423
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr ""
 
-#: wt-status.c:1430
+#: wt-status.c:1492
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 
-#: wt-status.c:1433
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr ""
 
-#: wt-status.c:1436
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 
-#: wt-status.c:1438
+#: wt-status.c:1500
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:1440
+#: wt-status.c:1502
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 
-#: wt-status.c:1450
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr ""
 
-#: wt-status.c:1453
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr ""
 
-#: wt-status.c:1459
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 
-#: wt-status.c:1462
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr ""
 
-#: wt-status.c:1465
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 
-#: wt-status.c:1467
+#: wt-status.c:1529
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:1469
+#: wt-status.c:1531
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 
-#: wt-status.c:1479
+#: wt-status.c:1541
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr ""
 
-#: wt-status.c:1483
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr ""
 
-#: wt-status.c:1486
+#: wt-status.c:1548
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 
-#: wt-status.c:1497
+#: wt-status.c:1559
+msgid "You are in a sparse checkout."
+msgstr ""
+
+#: wt-status.c:1562
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr ""
 
-#: wt-status.c:1736
+#: wt-status.c:1806
 msgid "On branch "
 msgstr ""
 
-#: wt-status.c:1743
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr ""
 
-#: wt-status.c:1745
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr ""
 
-#: wt-status.c:1750
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr ""
 
-#: wt-status.c:1752
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr ""
 
-#: wt-status.c:1755
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr ""
 
-#: wt-status.c:1772
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr ""
 
-#: wt-status.c:1773
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr ""
 
-#: wt-status.c:1787
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr ""
 
-#: wt-status.c:1789
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr ""
 
-#: wt-status.c:1793
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9282,115 +9479,115 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr ""
 
-#: wt-status.c:1799
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 
-#: wt-status.c:1801
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr ""
 
-#: wt-status.c:1807
+#: wt-status.c:1877
 msgid "No changes"
 msgstr ""
 
-#: wt-status.c:1812
+#: 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:1816
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr ""
 
-#: wt-status.c:1820
+#: 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:1824
+#: wt-status.c:1894
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 
-#: wt-status.c:1828
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 
-#: wt-status.c:1832 wt-status.c:1838
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr ""
 
-#: wt-status.c:1835
+#: wt-status.c:1905
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 
-#: wt-status.c:1840
+#: wt-status.c:1910
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr ""
 
-#: wt-status.c:1945
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr ""
 
-#: wt-status.c:1949
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr ""
 
-#: wt-status.c:1980
+#: wt-status.c:2050
 msgid "different"
 msgstr ""
 
-#: wt-status.c:1982 wt-status.c:1990
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr ""
 
-#: wt-status.c:1985 wt-status.c:1988
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr ""
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2511
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 
-#: wt-status.c:2517
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 
-#: wt-status.c:2519
+#: wt-status.c:2604
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 
-#: compat/simple-ipc/ipc-unix-socket.c:178
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr ""
 
-#: compat/simple-ipc/ipc-unix-socket.c:185
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr ""
 
-#: compat/simple-ipc/ipc-unix-socket.c:862
+#: 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:874
+#: compat/simple-ipc/ipc-unix-socket.c:904
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr ""
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr ""
@@ -9399,131 +9596,136 @@ msgstr ""
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr ""
 
-#: builtin/add.c:61
+#: builtin/add.c:64
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr ""
 
-#: builtin/add.c:99
+#: builtin/add.c:106
 #, c-format
 msgid "unexpected diff status %c"
 msgstr ""
 
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
 msgid "updating files failed"
 msgstr ""
 
-#: builtin/add.c:114
+#: builtin/add.c:121
 #, c-format
 msgid "remove '%s'\n"
 msgstr ""
 
-#: builtin/add.c:198
+#: builtin/add.c:205
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 
-#: builtin/add.c:307 builtin/rev-parse.c:991
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr ""
 
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr ""
-
-#: builtin/add.c:322
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr ""
 
-#: builtin/add.c:325
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr ""
 
-#: builtin/add.c:328
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr ""
 
-#: builtin/add.c:330
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr ""
 
-#: builtin/add.c:335
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr ""
 
-#: builtin/add.c:343
+#: builtin/add.c:348
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 
-#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: 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:366
+#: 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:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr ""
 
-#: builtin/add.c:368
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr ""
 
-#: builtin/add.c:369
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr ""
 
-#: builtin/add.c:370
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr ""
 
-#: builtin/add.c:371
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 
-#: builtin/add.c:372
+#: builtin/add.c:377
 msgid "record only the fact that the path will be added later"
 msgstr ""
 
-#: builtin/add.c:373
+#: builtin/add.c:378
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 
-#: builtin/add.c:376
+#: builtin/add.c:381
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 
-#: builtin/add.c:378
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr ""
 
-#: builtin/add.c:379
+#: builtin/add.c:384
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 
-#: builtin/add.c:380
+#: builtin/add.c:385
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: 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:388 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr ""
 
-#: builtin/add.c:384
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr ""
 
-#: builtin/add.c:386
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr ""
 
-#: builtin/add.c:404
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -9541,191 +9743,173 @@ msgid ""
 "See \"git help submodule\" for more information."
 msgstr ""
 
-#: builtin/add.c:432
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr ""
 
-#: builtin/add.c:451
+#: 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:460
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr ""
 
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr ""
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr ""
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr ""
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr ""
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr ""
-
-#: builtin/add.c:526
+#: builtin/add.c:548
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr ""
 
-#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr ""
-
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
-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:555
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr ""
 
-#: builtin/add.c:557
+#: 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:364
+#: 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:454
+#: builtin/am.c:482
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr ""
 
-#: builtin/am.c:496
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr ""
 
-#: builtin/am.c:534
+#: builtin/am.c:562
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr ""
 
-#: builtin/am.c:560
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr ""
 
-#: builtin/am.c:748
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr ""
 
-#: builtin/am.c:813
+#: builtin/am.c:841
 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 
-#: builtin/am.c:861
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr ""
 
-#: builtin/am.c:866 builtin/am.c:878
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr ""
 
-#: builtin/am.c:873
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr ""
 
-#: builtin/am.c:966
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr ""
 
-#: builtin/am.c:971 builtin/clone.c:414
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr ""
 
-#: builtin/am.c:976
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr ""
 
-#: builtin/am.c:1125
+#: builtin/am.c:1153
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr ""
 
-#: builtin/am.c:1126
+#: builtin/am.c:1154
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 
-#: builtin/am.c:1127
+#: 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:1222
-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:1250
-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:1315
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr ""
 
-#: builtin/am.c:1318
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr ""
 
-#: builtin/am.c:1537
+#: builtin/am.c:1566
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 
-#: builtin/am.c:1539
+#: builtin/am.c:1568
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 
-#: builtin/am.c:1558
+#: 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:1564
+#: builtin/am.c:1593
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 
-#: builtin/am.c:1590
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr ""
 
-#: builtin/am.c:1622
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr ""
 
-#: builtin/am.c:1674 builtin/am.c:1678
+#: builtin/am.c:1703 builtin/am.c:1707
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr ""
 
-#: builtin/am.c:1696
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr ""
 
@@ -9733,46 +9917,64 @@ msgstr ""
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1706
+#: builtin/am.c:1735
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 
-#: builtin/am.c:1752 builtin/commit.c:408
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr ""
 
-#: builtin/am.c:1756
+#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 
-#: builtin/am.c:1796 builtin/am.c:1864
+#: 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:1813
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr ""
 
-#: builtin/am.c:1819
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr ""
 
-#: builtin/am.c:1823
+#: builtin/am.c:1874
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
 
-#: builtin/am.c:1867
+#: 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:1874
+#: 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 "
@@ -9780,201 +9982,209 @@ msgid ""
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 
-#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
-#: builtin/reset.c:355
+#: 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:2033
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr ""
 
-#: builtin/am.c:2077
+#: 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:2184
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr ""
 
-#: builtin/am.c:2226
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr ""
 
-#: builtin/am.c:2230
+#: 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:2261
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr ""
 
-#: builtin/am.c:2262
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr ""
 
-#: builtin/am.c:2268
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr ""
 
-#: builtin/am.c:2270
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr ""
 
-#: builtin/am.c:2272
+#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
 msgstr ""
 
-#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:948
+#: 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:2275
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr ""
 
-#: builtin/am.c:2278
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr ""
 
-#: builtin/am.c:2280
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2282
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2284
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2286
+#: builtin/am.c:2345
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 
-#: builtin/am.c:2289
+#: builtin/am.c:2348
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 
-#: builtin/am.c:2292
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr ""
 
-#: builtin/am.c:2294
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2297 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:2324
+#: 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:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
+#: 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:317
 msgid "n"
 msgstr ""
 
-#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: 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:2321
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr ""
 
-#: builtin/am.c:2327
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
 msgstr ""
 
-#: builtin/am.c:2329
+#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 
-#: builtin/am.c:2332
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr ""
 
-#: builtin/am.c:2335
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr ""
 
-#: builtin/am.c:2338
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr ""
 
-#: builtin/am.c:2341
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr ""
 
-#: builtin/am.c:2345
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr ""
 
-#: builtin/am.c:2350
+#: 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:2352
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr ""
 
-#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: 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:2355 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr ""
 
-#: builtin/am.c:2358
+#: 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:2376
+#: 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:2383
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr ""
 
-#: builtin/am.c:2398
+#: builtin/am.c:2463
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 
-#: builtin/am.c:2422
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr ""
 
-#: builtin/am.c:2428
+#: builtin/am.c:2493
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 
-#: builtin/am.c:2438
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr ""
 
@@ -9982,42 +10192,33 @@ msgstr ""
 msgid "git apply [<options>] [<patch>...]"
 msgstr ""
 
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr ""
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr ""
 
-#: builtin/archive.c:37
+#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr ""
 
-#: builtin/archive.c:61
+#: builtin/archive.c:59
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr ""
 
-#: builtin/archive.c:64
+#: builtin/archive.c:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr ""
 
-#: builtin/archive.c:65
+#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr ""
 
-#: builtin/archive.c:69
+#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr ""
 
-#: builtin/bisect--helper.c:23
-msgid "git bisect--helper --bisect-reset [<commit>]"
-msgstr ""
-
 #: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr ""
 
 #: builtin/bisect--helper.c:25
@@ -10053,79 +10254,92 @@ msgstr ""
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr ""
 
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr ""
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr ""
+
+#: builtin/bisect--helper.c:109
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr ""
+
+#: builtin/bisect--helper.c:170
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr ""
 
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr ""
 
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
 msgid "please use two different terms"
 msgstr ""
 
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr ""
 
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr ""
 
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr ""
 
-#: builtin/bisect--helper.c:254
+#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr ""
 
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:271
+#: builtin/bisect--helper.c:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:314
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr ""
 
-#: builtin/bisect--helper.c:324
+#: builtin/bisect--helper.c:341
 #, 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 ""
 
-#: builtin/bisect--helper.c:328
+#: builtin/bisect--helper.c:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -10133,7 +10347,7 @@ msgid ""
 "You can use \"git bisect %s\" and \"git bisect %s\" for that."
 msgstr ""
 
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr ""
@@ -10142,74 +10356,74 @@ msgstr ""
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr ""
 
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
 msgid "no terms defined"
 msgstr ""
 
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
 "and %s for the new state.\n"
 msgstr ""
 
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
 msgstr ""
 
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
 msgstr ""
 
-#: builtin/bisect--helper.c:519
+#: builtin/bisect--helper.c:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr ""
 
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
 msgstr ""
 
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr ""
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
 msgid "bad HEAD - I need a HEAD"
 msgstr ""
 
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
 msgid "won't bisect on cg-seek'ed tree"
 msgstr ""
 
-#: builtin/bisect--helper.c:735
+#: builtin/bisect--helper.c:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr ""
 
-#: builtin/bisect--helper.c:755
+#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:813
+#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
 msgstr ""
 
@@ -10217,104 +10431,148 @@ msgstr ""
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr ""
 
-#: builtin/bisect--helper.c:842
+#: builtin/bisect--helper.c:859
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr ""
 
-#: builtin/bisect--helper.c:855
+#: builtin/bisect--helper.c:872
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr ""
 
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr ""
 
-#: builtin/bisect--helper.c:887
+#: builtin/bisect--helper.c:904
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr ""
 
-#: builtin/bisect--helper.c:919
+#: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
 msgstr ""
 
-#: builtin/bisect--helper.c:969
+#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr ""
 
-#: builtin/bisect--helper.c:981
+#: builtin/bisect--helper.c:998
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr ""
 
-#: builtin/bisect--helper.c:1054
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr ""
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr ""
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr ""
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr ""
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr ""
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+
+#: builtin/bisect--helper.c:1192
 msgid "reset the bisection state"
 msgstr ""
 
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1194
 msgid "check whether bad or good terms exist"
 msgstr ""
 
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1196
 msgid "print out the bisect terms"
 msgstr ""
 
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1198
 msgid "start the bisect session"
 msgstr ""
 
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1200
 msgid "find the next bisection commit"
 msgstr ""
 
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1202
 msgid "mark the state of ref (or refs)"
 msgstr ""
 
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1204
 msgid "list the bisection steps so far"
 msgstr ""
 
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1206
 msgid "replay the bisection process from the given file"
 msgstr ""
 
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1208
 msgid "skip some commits for checkout"
 msgstr ""
 
-#: builtin/bisect--helper.c:1072
-msgid "no log for BISECT_WRITE"
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
 msgstr ""
 
-#: builtin/bisect--helper.c:1087
-msgid "--bisect-reset requires either no argument or a commit"
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
 msgstr ""
 
-#: builtin/bisect--helper.c:1092
-msgid "--bisect-next-check requires 2 or 3 arguments"
+#: builtin/bisect--helper.c:1214
+msgid "no log for BISECT_WRITE"
 msgstr ""
 
-#: builtin/bisect--helper.c:1098
+#: builtin/bisect--helper.c:1229
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:1234
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr ""
 
-#: builtin/bisect--helper.c:1107
+#: builtin/bisect--helper.c:1243
 msgid "--bisect-next requires 0 arguments"
 msgstr ""
 
-#: builtin/bisect--helper.c:1118
+#: builtin/bisect--helper.c:1254
 msgid "--bisect-log requires 0 arguments"
 msgstr ""
 
-#: builtin/bisect--helper.c:1123
+#: builtin/bisect--helper.c:1259
 msgid "no logfile given"
 msgstr ""
 
@@ -10326,149 +10584,151 @@ msgstr ""
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr ""
 
-#: builtin/blame.c:410
+#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr ""
 
-#: builtin/blame.c:417
+#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr ""
 
-#: builtin/blame.c:728
+#: builtin/blame.c:724
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr ""
 
-#: builtin/blame.c:746
+#: builtin/blame.c:742
 msgid "invalid value for blame.coloring"
 msgstr ""
 
-#: builtin/blame.c:845
+#: builtin/blame.c:841
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr ""
 
-#: builtin/blame.c:867
+#: builtin/blame.c:863
 msgid "show blame entries as we find them, incrementally"
 msgstr ""
 
-#: builtin/blame.c:868
+#: builtin/blame.c:864
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:869
+#: builtin/blame.c:865
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:870
+#: builtin/blame.c:866
 msgid "show work cost statistics"
 msgstr ""
 
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: 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 ""
 
-#: builtin/blame.c:872
+#: builtin/blame.c:868
 msgid "show output score for blame entries"
 msgstr ""
 
-#: builtin/blame.c:873
+#: builtin/blame.c:869
 msgid "show original filename (Default: auto)"
 msgstr ""
 
-#: builtin/blame.c:874
+#: builtin/blame.c:870
 msgid "show original linenumber (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:875
+#: builtin/blame.c:871
 msgid "show in a format designed for machine consumption"
 msgstr ""
 
-#: builtin/blame.c:876
+#: builtin/blame.c:872
 msgid "show porcelain format with per-line commit information"
 msgstr ""
 
-#: builtin/blame.c:877
+#: builtin/blame.c:873
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:878
+#: builtin/blame.c:874
 msgid "show raw timestamp (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:879
+#: builtin/blame.c:875
 msgid "show long commit SHA1 (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:880
+#: builtin/blame.c:876
 msgid "suppress author name and timestamp (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:881
+#: builtin/blame.c:877
 msgid "show author email instead of name (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:882
+#: builtin/blame.c:878
 msgid "ignore whitespace differences"
 msgstr ""
 
-#: builtin/blame.c:883 builtin/log.c:1820
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr ""
 
-#: builtin/blame.c:883
+#: builtin/blame.c:879
 msgid "ignore <rev> when blaming"
 msgstr ""
 
-#: builtin/blame.c:884
+#: builtin/blame.c:880
 msgid "ignore revisions from <file>"
 msgstr ""
 
-#: builtin/blame.c:885
+#: builtin/blame.c:881
 msgid "color redundant metadata from previous line differently"
 msgstr ""
 
-#: builtin/blame.c:886
+#: builtin/blame.c:882
 msgid "color lines by age"
 msgstr ""
 
-#: builtin/blame.c:887
+#: builtin/blame.c:883
 msgid "spend extra cycles to find better match"
 msgstr ""
 
-#: builtin/blame.c:888
+#: builtin/blame.c:884
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 
-#: builtin/blame.c:889
+#: builtin/blame.c:885
 msgid "use <file>'s contents as the final image"
 msgstr ""
 
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
 msgid "score"
 msgstr ""
 
-#: builtin/blame.c:890
+#: builtin/blame.c:886
 msgid "find line copies within and across files"
 msgstr ""
 
-#: builtin/blame.c:891
+#: builtin/blame.c:887
 msgid "find line movements within and across files"
 msgstr ""
 
-#: builtin/blame.c:892
+#: builtin/blame.c:888
 msgid "range"
 msgstr ""
 
-#: builtin/blame.c:893
+#: builtin/blame.c:889
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
 
-#: builtin/blame.c:945
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 
@@ -10480,18 +10740,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:996
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr ""
 
-#: builtin/blame.c:1112
+#: 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:1157
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr ""
 
@@ -10523,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 ""
 
@@ -10561,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:440 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr ""
 
-#: builtin/branch.c:471
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr ""
 
-#: builtin/branch.c:477
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr ""
 
-#: builtin/branch.c:492
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr ""
 
-#: builtin/branch.c:496
+#: builtin/branch.c:501
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr ""
 
-#: builtin/branch.c:513
+#: builtin/branch.c:518
 msgid "cannot copy the current branch while not on any."
 msgstr ""
 
-#: builtin/branch.c:515
+#: builtin/branch.c:520
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 
-#: builtin/branch.c:526
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr ""
 
-#: builtin/branch.c:555
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr ""
 
-#: builtin/branch.c:557
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr ""
 
-#: builtin/branch.c:561
+#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr ""
 
-#: builtin/branch.c:564
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr ""
 
-#: builtin/branch.c:570
+#: builtin/branch.c:575
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr ""
 
-#: builtin/branch.c:579
+#: builtin/branch.c:584
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 
-#: builtin/branch.c:581
+#: builtin/branch.c:586
 msgid "Branch is copied, but update of config-file failed"
 msgstr ""
 
-#: builtin/branch.c:597
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -10661,246 +10921,242 @@ msgid ""
 "Lines starting with '%c' will be stripped.\n"
 msgstr ""
 
-#: builtin/branch.c:631
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr ""
 
-#: builtin/branch.c:633
+#: builtin/branch.c:639
 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 
-#: builtin/branch.c:634
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr ""
 
-#: builtin/branch.c:635
-msgid "set up tracking mode (see git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
 msgstr ""
 
-#: builtin/branch.c:637
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr ""
 
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr ""
 
-#: builtin/branch.c:639
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr ""
 
-#: builtin/branch.c:640
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr ""
 
-#: builtin/branch.c:641
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr ""
 
-#: builtin/branch.c:642
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr ""
 
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:652 builtin/branch.c:654
 msgid "print only branches that contain the commit"
 msgstr ""
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:653 builtin/branch.c:655
 msgid "print only branches that don't contain the commit"
 msgstr ""
 
-#: builtin/branch.c:650
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr ""
 
-#: builtin/branch.c:651
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr ""
 
-#: builtin/branch.c:653
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr ""
 
-#: builtin/branch.c:654
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr ""
 
-#: builtin/branch.c:655
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr ""
 
-#: builtin/branch.c:656
+#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 
-#: builtin/branch.c:657
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr ""
 
-#: builtin/branch.c:658
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr ""
 
-#: builtin/branch.c:659
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr ""
 
-#: builtin/branch.c:660
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr ""
 
-#: builtin/branch.c:661
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr ""
 
-#: builtin/branch.c:663
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr ""
 
-#: builtin/branch.c:664
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr ""
 
-#: builtin/branch.c:665
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr ""
 
-#: builtin/branch.c:666
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr ""
 
-#: builtin/branch.c:667
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr ""
 
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: 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:670
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr ""
 
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: 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:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: 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:695 builtin/clone.c:794
+#: builtin/branch.c:703 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr ""
 
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr ""
-
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr ""
 
-#: builtin/branch.c:766
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr ""
 
-#: builtin/branch.c:771
+#: builtin/branch.c:779
 msgid "cannot edit description of more than one branch"
 msgstr ""
 
-#: builtin/branch.c:778
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr ""
 
-#: builtin/branch.c:781
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr ""
 
-#: builtin/branch.c:796
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr ""
 
-#: builtin/branch.c:805
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr ""
 
-#: builtin/branch.c:810
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr ""
 
-#: builtin/branch.c:814
+#: 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:817 builtin/branch.c:840
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr ""
 
-#: builtin/branch.c:821
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr ""
 
-#: builtin/branch.c:834
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr ""
 
-#: builtin/branch.c:838
+#: builtin/branch.c:846
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 
-#: builtin/branch.c:844
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr ""
 
-#: builtin/branch.c:854
+#: 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:858
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
 msgstr ""
 
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr ""
 
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr ""
 
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
 msgid "compiler info: "
 msgstr ""
 
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr ""
 
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
 msgid "not run from a git repository - no hooks to show\n"
 msgstr ""
 
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr ""
 
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -10919,38 +11175,33 @@ msgid ""
 "You can delete any lines you don't wish to share.\n"
 msgstr ""
 
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
 msgid "specify a destination for the bugreport file"
 msgstr ""
 
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
 msgid "specify a strftime format suffix for the filename"
 msgstr ""
 
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr ""
 
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr ""
 
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr ""
 
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr ""
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr ""
 
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr ""
@@ -10971,27 +11222,27 @@ msgstr ""
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr ""
 
-#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
 msgid "do not show progress meter"
 msgstr ""
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
 msgid "show progress meter"
 msgstr ""
 
-#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
 msgid "show progress meter during object writing phase"
 msgstr ""
 
-#: builtin/bundle.c:74 builtin/pack-objects.c:3754
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
 msgid "similar to --all-progress when progress meter is shown"
 msgstr ""
 
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
 msgid "specify bundle format version"
 msgstr ""
 
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
 msgstr ""
 
@@ -10999,101 +11250,101 @@ msgstr ""
 msgid "do not show bundle details"
 msgstr ""
 
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
 #, c-format
 msgid "%s is okay\n"
 msgstr ""
 
-#: builtin/bundle.c:163
+#: builtin/bundle.c:182
 msgid "Need a repository to unbundle."
 msgstr ""
 
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
 msgstr ""
 
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr ""
 
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:622
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
 msgstr ""
 
-#: builtin/cat-file.c:599
+#: builtin/cat-file.c:623
 msgid ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
 msgstr ""
 
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:644
 msgid "only one batch option may be specified"
 msgstr ""
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
 msgid "show object type"
 msgstr ""
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
 msgid "show object size"
 msgstr ""
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
 msgid "exit with zero when there's no error"
 msgstr ""
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
 msgid "pretty-print object's content"
 msgstr ""
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
 msgid "for blob objects, run filters on object's content"
 msgstr ""
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
 msgid "blob"
 msgstr ""
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
 msgid "use a specific path for --textconv/--filters"
 msgstr ""
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr ""
 
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
 msgid "buffer --batch output"
 msgstr ""
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
 msgid "show info about objects fed from the standard input"
 msgstr ""
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
 msgid "show all objects with --batch or --batch-check"
 msgstr ""
 
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:690
 msgid "do not order --batch-all-objects output"
 msgstr ""
 
@@ -11113,7 +11364,7 @@ msgstr ""
 msgid "use .gitattributes only from the index"
 msgstr ""
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr ""
 
@@ -11121,8 +11372,8 @@ msgstr ""
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
-#: builtin/worktree.c:491
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr ""
 
@@ -11180,9 +11431,10 @@ msgid "git checkout--worker [<options>]"
 msgstr ""
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1825
-#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836
-#: builtin/submodule--helper.c:2334 builtin/worktree.c:719
+#: 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 ""
 
@@ -11246,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:414
+#: builtin/checkout.c:419
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:419
+#: 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:426
+#: 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:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: 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:462 builtin/checkout.c:465
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr ""
-
-#: builtin/checkout.c:469
+#: builtin/checkout.c:474
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 
-#: builtin/checkout.c:473
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr ""
 
-#: builtin/checkout.c:477
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr ""
 
-#: builtin/checkout.c:482 builtin/checkout.c:487
+#: builtin/checkout.c:487 builtin/checkout.c:492
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr ""
 
-#: builtin/checkout.c:563 builtin/checkout.c:570
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr ""
 
-#: builtin/checkout.c:739
+#: builtin/checkout.c:747
 msgid "you need to resolve your current index first"
 msgstr ""
 
-#: builtin/checkout.c:793
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
 "%s"
 msgstr ""
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:890
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr ""
 
-#: builtin/checkout.c:928
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr ""
 
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr ""
 
-#: builtin/checkout.c:936
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:939
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:943
+#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:945 builtin/checkout.c:1376
+#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:947
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:998
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -11402,7 +11649,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:1023
+#: 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"
@@ -11419,26 +11666,26 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr ""
 
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr ""
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
 msgid "You are on a branch yet to be born"
 msgstr ""
 
-#: builtin/checkout.c:1184
+#: 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:1191
+#: 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"
@@ -11450,280 +11697,269 @@ msgid ""
 "checkout.defaultRemote=origin in your config."
 msgstr ""
 
-#: builtin/checkout.c:1201
+#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr ""
 
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr ""
 
-#: builtin/checkout.c:1284
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 
-#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr ""
 
-#: builtin/checkout.c:1343 builtin/checkout.c:1709
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 
-#: builtin/checkout.c:1390
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1393 builtin/checkout.c:1401
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1396
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1412
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1416
+#: 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:1420
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1424
+#: 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:1428
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr ""
 
-#: builtin/checkout.c:1439
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr ""
 
-#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: 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:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: 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:1467
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr ""
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1487
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr ""
 
-#: builtin/checkout.c:1525
+#: builtin/checkout.c:1537
 msgid "perform a 3-way merge with the new branch"
 msgstr ""
 
-#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr ""
 
-#: builtin/checkout.c:1527
-msgid "conflict style (merge or diff3)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
 msgstr ""
 
-#: builtin/checkout.c:1539 builtin/worktree.c:488
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr ""
 
-#: builtin/checkout.c:1540
-msgid "set upstream info for new branch"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
 msgstr ""
 
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr ""
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr ""
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr ""
 
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr ""
 
-#: builtin/checkout.c:1549
+#: builtin/checkout.c:1563
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr ""
 
-#: builtin/checkout.c:1565
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr ""
 
-#: builtin/checkout.c:1569
+#: builtin/checkout.c:1583
 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 
-#: builtin/checkout.c:1624
+#: 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:1628
-msgid "-p and --overlay are mutually exclusive"
-msgstr ""
-
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr ""
 
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr ""
 
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr ""
 
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr ""
 
-#: builtin/checkout.c:1725
+#: 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:1729
+#: builtin/checkout.c:1745
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1738
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr ""
-
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr ""
-
-#: builtin/checkout.c:1754
+#: 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:1759
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr ""
 
-#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484
+#: 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:1786
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr ""
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr ""
 
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr ""
 
-#: builtin/checkout.c:1791
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr ""
 
-#: builtin/checkout.c:1792
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr ""
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr ""
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr ""
 
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr ""
 
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr ""
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr ""
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr ""
 
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr ""
 
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr ""
 
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr ""
 
@@ -11757,7 +11993,15 @@ msgstr ""
 msgid "could not lstat %s\n"
 msgstr ""
 
-#: builtin/clean.c:302 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"
@@ -11766,7 +12010,7 @@ msgid ""
 "           - (empty) select nothing\n"
 msgstr ""
 
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -11779,33 +12023,33 @@ msgid ""
 "           - (empty) finish selecting\n"
 msgstr ""
 
-#: builtin/clean.c:521 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:661
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr ""
 
-#: builtin/clean.c:696
+#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr ""
 
-#: builtin/clean.c:717
+#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr ""
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr ""
 
-#: builtin/clean.c:789
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -11816,64 +12060,64 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr ""
 
-#: builtin/clean.c:825
+#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/clean.c:841
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr ""
 
-#: builtin/clean.c:903
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr ""
 
-#: builtin/clean.c:905
+#: builtin/clean.c:928
 msgid "force"
 msgstr ""
 
-#: builtin/clean.c:906
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr ""
 
-#: builtin/clean.c:908
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr ""
 
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: 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:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr ""
 
-#: builtin/clean.c:910
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr ""
 
-#: builtin/clean.c:911
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr ""
 
-#: builtin/clean.c:913
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr ""
 
-#: builtin/clean.c:929
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 
-#: builtin/clean.c:932
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 
-#: builtin/clean.c:944
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr ""
 
@@ -11889,7 +12133,7 @@ msgstr ""
 msgid "don't create a checkout"
 msgstr ""
 
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr ""
 
@@ -11921,27 +12165,29 @@ msgstr ""
 msgid "number of submodules cloned in parallel"
 msgstr ""
 
-#: builtin/clone.c:116 builtin/init-db.c:538
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr ""
 
-#: builtin/clone.c:117 builtin/init-db.c:539
+#: builtin/clone.c:117 builtin/init-db.c:540
 msgid "directory from which templates will be used"
 msgstr ""
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832
-#: builtin/submodule--helper.c:2337
+#: 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:1834
-#: builtin/submodule--helper.c:2339
+#: 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:549
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: 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 ""
 
@@ -11957,8 +12203,8 @@ msgstr ""
 msgid "path to git-upload-pack on the remote"
 msgstr ""
 
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
+#: builtin/pull.c:212
 msgid "depth"
 msgstr ""
 
@@ -11966,8 +12212,8 @@ msgstr ""
 msgid "create a shallow clone of that depth"
 msgstr ""
 
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
 msgid "time"
 msgstr ""
 
@@ -11975,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/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: 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:215
+#: 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:1844
-#: builtin/submodule--helper.c:2353
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 
@@ -11997,11 +12243,11 @@ msgstr ""
 msgid "any cloned submodules will be shallow"
 msgstr ""
 
-#: builtin/clone.c:142 builtin/init-db.c:547
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr ""
 
-#: builtin/clone.c:143 builtin/init-db.c:548
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr ""
 
@@ -12013,23 +12259,23 @@ msgstr ""
 msgid "set config inside the new repository"
 msgstr ""
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: 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/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: 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:234
-#: builtin/push.c:585
+#: 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:237
-#: builtin/push.c:587
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
+#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr ""
 
@@ -12041,192 +12287,186 @@ msgstr ""
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr ""
 
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr ""
 
-#: builtin/clone.c:418
+#: builtin/clone.c:304
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr ""
 
-#: builtin/clone.c:436
+#: builtin/clone.c:322
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr ""
 
-#: builtin/clone.c:467
+#: builtin/clone.c:353
 #, c-format
 msgid "failed to create link '%s'"
 msgstr ""
 
-#: builtin/clone.c:471
+#: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr ""
 
-#: builtin/clone.c:476
+#: builtin/clone.c:362
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr ""
 
-#: builtin/clone.c:503
+#: builtin/clone.c:389
 #, c-format
 msgid "done.\n"
 msgstr ""
 
-#: builtin/clone.c:517
+#: builtin/clone.c:403
 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 ""
 
-#: builtin/clone.c:594
+#: builtin/clone.c:480
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 
-#: builtin/clone.c:713
+#: builtin/clone.c:597
 #, c-format
 msgid "unable to update %s"
 msgstr ""
 
-#: builtin/clone.c:761
+#: builtin/clone.c:645
 msgid "failed to initialize sparse-checkout"
 msgstr ""
 
-#: builtin/clone.c:784
+#: builtin/clone.c:668
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 
-#: builtin/clone.c:816
+#: builtin/clone.c:701
 msgid "unable to checkout working tree"
 msgstr ""
 
-#: builtin/clone.c:894
+#: builtin/clone.c:779
 msgid "unable to write parameters to config file"
 msgstr ""
 
-#: builtin/clone.c:957
+#: builtin/clone.c:842
 msgid "cannot repack to clean up"
 msgstr ""
 
-#: builtin/clone.c:959
+#: builtin/clone.c:844
 msgid "cannot unlink temporary alternates file"
 msgstr ""
 
-#: builtin/clone.c:1001 builtin/receive-pack.c:2491
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr ""
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
 msgstr ""
 
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr ""
-
-#: builtin/clone.c:1021
-msgid "--bare and --separate-git-dir are incompatible."
+msgid "options '%s' and '%s %s' cannot be used together"
 msgstr ""
 
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr ""
 
-#: builtin/clone.c:1039 builtin/fetch.c:2011
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr ""
 
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr ""
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
+#: 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 ""
 
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr ""
 
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr ""
 
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr ""
 
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
 msgid "--local is ignored"
 msgstr ""
 
-#: builtin/clone.c:1337 builtin/clone.c:1345
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr ""
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr ""
 
-#: builtin/clone.c:1348
+#: builtin/clone.c:1242
 msgid "You appear to have cloned an empty repository."
 msgstr ""
 
@@ -12262,105 +12502,103 @@ msgstr ""
 msgid "--command must be the first argument"
 msgstr ""
 
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
 msgid ""
 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
 msgstr ""
 
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr ""
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr ""
 
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr ""
 
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr ""
 
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr ""
 
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr ""
 
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
 #, c-format
 msgid "invalid object: %s"
 msgstr ""
 
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
 msgid "start walk at all refs"
 msgstr ""
 
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr ""
 
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
 msgid "start walk at commits listed by stdin"
 msgstr ""
 
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
 msgstr ""
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
 msgid "enable computation for changed paths"
 msgstr ""
 
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
 msgid "allow writing an incremental commit-graph file"
 msgstr ""
 
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr ""
 
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr ""
 
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
 msgid "only expire files older than a given date-time"
 msgstr ""
 
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr ""
 
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr ""
 
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
 msgid "Collecting commits from input"
 msgstr ""
 
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr ""
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -12372,77 +12610,72 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr ""
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
 #, c-format
 msgid "not a valid object name %s"
 msgstr ""
 
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr ""
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr ""
 
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr ""
 
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr ""
 
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr ""
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
-#: builtin/tag.c:456
+#: 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:115 builtin/commit.c:1614
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr ""
 
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
 msgstr ""
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299
-#: 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 ""
 
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr ""
 
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr ""
 
-#: builtin/commit.c:41
+#: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr ""
 
-#: builtin/commit.c:46
+#: builtin/commit.c:47
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr ""
 
-#: builtin/commit.c:51
+#: builtin/commit.c:52
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
 "remove the commit entirely with \"git reset HEAD^\".\n"
 msgstr ""
 
-#: builtin/commit.c:56
+#: builtin/commit.c:57
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -12451,15 +12684,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/commit.c:63
+#: builtin/commit.c:64
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr ""
 
-#: builtin/commit.c:66
+#: builtin/commit.c:67
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr ""
 
-#: builtin/commit.c:69
+#: builtin/commit.c:70
 msgid ""
 "and then use:\n"
 "\n"
@@ -12472,140 +12705,132 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/commit.c:324
+#: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
 msgstr ""
 
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr ""
-
-#: builtin/commit.c:374
+#: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr ""
 
-#: builtin/commit.c:386
+#: builtin/commit.c:387
 msgid "unable to create temporary index"
 msgstr ""
 
-#: builtin/commit.c:395
+#: builtin/commit.c:396
 msgid "interactive add failed"
 msgstr ""
 
-#: builtin/commit.c:410
+#: builtin/commit.c:411
 msgid "unable to update temporary index"
 msgstr ""
 
-#: builtin/commit.c:412
+#: builtin/commit.c:413
 msgid "Failed to update main cache tree"
 msgstr ""
 
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
 msgid "unable to write new_index file"
 msgstr ""
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 
-#: builtin/commit.c:491
+#: builtin/commit.c:492
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 
-#: builtin/commit.c:493
+#: builtin/commit.c:494
 msgid "cannot do a partial commit during a rebase."
 msgstr ""
 
-#: builtin/commit.c:501
+#: builtin/commit.c:502
 msgid "cannot read the index"
 msgstr ""
 
-#: builtin/commit.c:520
+#: builtin/commit.c:521
 msgid "unable to write temporary index file"
 msgstr ""
 
-#: builtin/commit.c:618
+#: builtin/commit.c:619
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr ""
 
-#: builtin/commit.c:620
+#: builtin/commit.c:621
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr ""
 
-#: builtin/commit.c:639
+#: builtin/commit.c:640
 msgid "malformed --author parameter"
 msgstr ""
 
-#: builtin/commit.c:692
+#: builtin/commit.c:693
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr ""
 
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
 #, c-format
 msgid "could not lookup commit %s"
 msgstr ""
 
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr ""
 
-#: builtin/commit.c:760
+#: builtin/commit.c:761
 msgid "could not read log from standard input"
 msgstr ""
 
-#: builtin/commit.c:764
+#: builtin/commit.c:765
 #, c-format
 msgid "could not read log file '%s'"
 msgstr ""
 
-#: builtin/commit.c:801
+#: 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:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
 msgstr ""
 
-#: builtin/commit.c:820
+#: builtin/commit.c:821
 msgid "could not read MERGE_MSG"
 msgstr ""
 
-#: builtin/commit.c:880
+#: builtin/commit.c:881
 msgid "could not write commit template"
 msgstr ""
 
-#: builtin/commit.c:900
+#: builtin/commit.c:894
+#, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please run\n"
-"\tgit update-ref -d MERGE_HEAD\n"
-"and try again.\n"
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
 msgstr ""
 
-#: builtin/commit.c:905
+#: builtin/commit.c:896
+#, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please run\n"
-"\tgit update-ref -d CHERRY_PICK_HEAD\n"
-"and try again.\n"
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
 msgstr ""
 
-#: builtin/commit.c:915
+#: builtin/commit.c:900
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
 msgstr ""
 
-#: builtin/commit.c:923
+#: builtin/commit.c:904
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -12613,369 +12838,382 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 
-#: builtin/commit.c:940
+#: builtin/commit.c:916
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"and try again.\n"
+msgstr ""
+
+#: builtin/commit.c:921
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"and try again.\n"
+msgstr ""
+
+#: builtin/commit.c:948
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 
-#: builtin/commit.c:948
+#: builtin/commit.c:956
 #, c-format
 msgid "%sDate:      %s"
 msgstr ""
 
-#: builtin/commit.c:955
+#: builtin/commit.c:963
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 
-#: builtin/commit.c:973
+#: builtin/commit.c:981
 msgid "Cannot read index"
 msgstr ""
 
-#: builtin/commit.c:1018
+#: builtin/commit.c:1026
 msgid "unable to pass trailers to --trailers"
 msgstr ""
 
-#: builtin/commit.c:1058
+#: builtin/commit.c:1066
 msgid "Error building trees"
 msgstr ""
 
-#: builtin/commit.c:1072 builtin/tag.c:319
+#: builtin/commit.c:1080 builtin/tag.c:316
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
 
-#: builtin/commit.c:1116
+#: builtin/commit.c:1124
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 
-#: builtin/commit.c:1130
+#: builtin/commit.c:1138
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr ""
 
-#: builtin/commit.c:1148 builtin/commit.c:1441
+#: builtin/commit.c:1156 builtin/commit.c:1451
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 
-#: builtin/commit.c:1188
-msgid "--long and -z are incompatible"
-msgstr ""
-
-#: builtin/commit.c:1219
+#: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr ""
 
-#: builtin/commit.c:1221
+#: builtin/commit.c:1229
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr ""
 
-#: builtin/commit.c:1224
+#: 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:1226
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
+#: builtin/commit.c:1234
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
 msgstr ""
 
-#: builtin/commit.c:1245
+#: builtin/commit.c:1254
 msgid "Using both --reset-author and --author does not make sense"
 msgstr ""
 
-#: builtin/commit.c:1254
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr ""
 
-#: builtin/commit.c:1257
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1259
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1261
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1264
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 
-#: builtin/commit.c:1274
+#: builtin/commit.c:1281
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr ""
 
-#: builtin/commit.c:1276
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr ""
 
-#: builtin/commit.c:1285
+#: builtin/commit.c:1292
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 
-#: builtin/commit.c:1303
+#: builtin/commit.c:1310
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 
-#: builtin/commit.c:1331
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr ""
 
-#: builtin/commit.c:1345
+#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr ""
 
-#: builtin/commit.c:1476 builtin/commit.c:1642
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr ""
 
-#: builtin/commit.c:1478 builtin/commit.c:1644
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr ""
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr ""
 
-#: builtin/commit.c:1482 builtin/commit.c:1646
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr ""
 
-#: builtin/commit.c:1484
+#: builtin/commit.c:1494
 msgid "version"
 msgstr ""
 
-#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
-#: builtin/worktree.c:681
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr ""
 
-#: builtin/commit.c:1487 builtin/commit.c:1650
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr ""
 
-#: builtin/commit.c:1490 builtin/commit.c:1653
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr ""
 
-#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: 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:1493 builtin/commit.c:1656
+#: builtin/commit.c:1503 builtin/commit.c:1669
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 
-#: builtin/commit.c:1497
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
 
-#: builtin/commit.c:1499 parse-options.h:193
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr ""
 
-#: builtin/commit.c:1500
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr ""
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr ""
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr ""
 
-#: builtin/commit.c:1525
+#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 
-#: builtin/commit.c:1607
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr ""
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr ""
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr ""
 
-#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr ""
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1625
 msgid "author"
 msgstr ""
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr ""
 
-#: builtin/commit.c:1613 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr ""
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr ""
 
-#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
-#: parse-options.h:329 ref-filter.h:90
+#: 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:1615
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr ""
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr ""
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1621
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr ""
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1635
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1636
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 
-#: builtin/commit.c:1624 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr ""
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr ""
 
-#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: 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:1626
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr ""
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr ""
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr ""
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr ""
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr ""
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr ""
 
-#: builtin/commit.c:1637
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr ""
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr ""
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr ""
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr ""
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr ""
 
-#: builtin/commit.c:1655
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr ""
 
-#: builtin/commit.c:1662
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr ""
 
-#: builtin/commit.c:1664
+#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr ""
 
-#: builtin/commit.c:1737
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr ""
 
-#: builtin/commit.c:1765
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr ""
 
-#: builtin/commit.c:1772
+#: builtin/commit.c:1788
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr ""
 
-#: builtin/commit.c:1777
+#: builtin/commit.c:1793
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr ""
 
-#: builtin/commit.c:1788
+#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr ""
 
-#: builtin/commit.c:1824
+#: 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"
@@ -13318,7 +13556,7 @@ msgstr ""
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr ""
 
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr ""
 
@@ -13453,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 ""
 
@@ -13469,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
@@ -13508,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:684
+#: 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 ""
@@ -13536,109 +13763,101 @@ msgstr ""
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr ""
 
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr ""
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr ""
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr ""
 
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr ""
 
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
 msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
 msgstr ""
 
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr ""
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr ""
 
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr ""
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr ""
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr ""
+
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr ""
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr ""
 
-#: builtin/difftool.c:704
+#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr ""
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr ""
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr ""
 
-#: builtin/difftool.c:711
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr ""
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:706
 msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr ""
 
-#: builtin/difftool.c:719
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr ""
 
-#: builtin/difftool.c:720
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr ""
 
-#: builtin/difftool.c:735
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr ""
 
-#: builtin/difftool.c:742
-msgid "--dir-diff is incompatible with --no-index"
-msgstr ""
-
-#: builtin/difftool.c:745
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr ""
-
-#: builtin/difftool.c:753
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr ""
 
-#: builtin/difftool.c:760
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr ""
 
@@ -13646,7 +13865,7 @@ msgstr ""
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr ""
 
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
 msgid "type"
 msgstr ""
 
@@ -13674,123 +13893,115 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr ""
 
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr ""
 
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr ""
 
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr ""
 
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr ""
 
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr ""
 
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr ""
 
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr ""
 
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr ""
 
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr ""
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr ""
 
-#: builtin/fast-export.c:1222 builtin/log.c:1823
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr ""
 
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr ""
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr ""
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr ""
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr ""
 
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
 
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr ""
 
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr ""
 
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr ""
-
-#: builtin/fast-export.c:1271
-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 ""
@@ -13800,386 +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:185
+#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr ""
 
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:148 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr ""
 
-#: 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 ""
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
 msgid "use atomic transaction to update references"
 msgstr ""
 
-#: 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 ""
 
-#: 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:195
+#: 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:198
+#: 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:122
+#: 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:206
+#: 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: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 ""
 
-#: 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 ""
 
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: 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:224
+#: builtin/fetch.c:200 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr ""
 
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr ""
 
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr ""
 
-#: 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 ""
 
-#: 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:243
+#: 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:757
+#: builtin/fetch.c:766
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr ""
 
-#: builtin/fetch.c:856
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr ""
 
-#: builtin/fetch.c:860
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr ""
 
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr ""
 
-#: builtin/fetch.c:874
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr ""
 
-#: builtin/fetch.c:884
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr ""
+
+#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr ""
 
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: 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:889
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr ""
 
-#: builtin/fetch.c:911
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr ""
 
-#: builtin/fetch.c:914
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr ""
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr ""
 
-#: builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr ""
 
-#: builtin/fetch.c:961
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr ""
 
-#: builtin/fetch.c:1065
+#: 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:1069
+#: 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:1101
+#: builtin/fetch.c:1112
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr ""
 
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1141
 #, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr ""
 
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr ""
 
-#: builtin/fetch.c:1228
+#: 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:1327
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr ""
 
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr ""
 
-#: builtin/fetch.c:1384
+#: 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:1403
+#: 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:1406
+#: 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:1618
+#: builtin/fetch.c:1455
+#, c-format
+msgid "the object %s does not exist"
+msgstr ""
+
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr ""
 
-#: builtin/fetch.c:1633
+#: 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:1635
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr ""
 
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr ""
 
-#: builtin/fetch.c:1639
+#: 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:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 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:1790
+#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr ""
 
-#: builtin/fetch.c:1894
-msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
-msgstr ""
-
 #: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
+msgid ""
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
 msgstr ""
 
-#: builtin/fetch.c:1995
-msgid "Negative depth in --deepen is not supported"
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
 msgstr ""
 
-#: builtin/fetch.c:1997
-msgid "--deepen and --depth are mutually exclusive"
+#: builtin/fetch.c:2032
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
 msgstr ""
 
-#: builtin/fetch.c:2002
-msgid "--depth and --unshallow cannot be used together"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
 msgstr ""
 
-#: builtin/fetch.c:2004
+#: builtin/fetch.c:2045
 msgid "--unshallow on a complete repository does not make sense"
 msgstr ""
 
-#: builtin/fetch.c:2021
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr ""
 
-#: builtin/fetch.c:2023
+#: builtin/fetch.c:2064
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 
-#: builtin/fetch.c:2032
+#: 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:2039
-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:2055
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr ""
 
-#: builtin/fetch.c:2060
-msgid "Protocol does not support --negotiate-only, exiting."
+#: builtin/fetch.c:2102
+msgid "protocol does not support --negotiate-only, exiting"
 msgstr ""
 
-#: builtin/fetch.c:2079
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
 msgstr ""
 
-#: builtin/fetch.c:2083
+#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
 msgstr ""
 
-#: builtin/fetch.c:2087
+#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
 msgstr ""
 
@@ -14188,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 ""
 
@@ -14224,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:483
+#: 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 ""
 
@@ -14272,19 +14499,19 @@ msgstr ""
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr ""
 
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr ""
 
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr ""
 
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr ""
 
-#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr ""
 
@@ -14300,227 +14527,237 @@ msgstr ""
 msgid "warning in %s %s: %s"
 msgstr ""
 
-#: builtin/fsck.c:123 builtin/fsck.c:126
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr ""
 
-#: builtin/fsck.c:135
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr ""
 
-#: builtin/fsck.c:151
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
 "              to %7s %s"
 msgstr ""
 
-#: builtin/fsck.c:263
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr ""
 
-#: builtin/fsck.c:290
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr ""
 
-#: builtin/fsck.c:310
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr ""
 
-#: builtin/fsck.c:320
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr ""
 
-#: builtin/fsck.c:331
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr ""
 
-#: builtin/fsck.c:348
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr ""
 
-#: builtin/fsck.c:386
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr ""
 
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr ""
 
-#: builtin/fsck.c:410
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr ""
 
-#: builtin/fsck.c:419
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr ""
 
-#: builtin/fsck.c:427
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr ""
 
-#: builtin/fsck.c:456
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr ""
 
-#: builtin/fsck.c:481
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr ""
 
-#: builtin/fsck.c:495
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr ""
 
-#: builtin/fsck.c:529
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr ""
 
-#: builtin/fsck.c:536
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr ""
 
-#: builtin/fsck.c:590
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr ""
 
-#: builtin/fsck.c:605
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr ""
+
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr ""
 
-#: builtin/fsck.c:618
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr ""
+
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr ""
 
-#: builtin/fsck.c:638
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr ""
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr ""
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr ""
 
-#: builtin/fsck.c:671
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr ""
 
-#: builtin/fsck.c:676 builtin/index-pack.c:866
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr ""
 
-#: builtin/fsck.c:683
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr ""
 
-#: builtin/fsck.c:689
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr ""
 
-#: builtin/fsck.c:693
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr ""
 
-#: builtin/fsck.c:705
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr ""
 
-#: builtin/fsck.c:710
+#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr ""
 
-#: builtin/fsck.c:719
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr ""
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 
-#: builtin/fsck.c:756
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr ""
 
-#: builtin/fsck.c:757
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr ""
 
-#: builtin/fsck.c:758
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr ""
 
-#: builtin/fsck.c:759
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr ""
 
-#: builtin/fsck.c:760
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr ""
 
-#: builtin/fsck.c:761
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr ""
 
-#: builtin/fsck.c:762
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr ""
 
-#: builtin/fsck.c:763
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr ""
 
-#: builtin/fsck.c:764 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr ""
 
-#: builtin/fsck.c:766
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 
-#: builtin/fsck.c:767 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr ""
 
-#: builtin/fsck.c:768
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr ""
 
-#: builtin/fsck.c:827 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr ""
 
-#: builtin/fsck.c:855
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr ""
 
-#: builtin/fsck.c:866
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr ""
@@ -14539,101 +14776,96 @@ 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:240 builtin/tag.c:573
-#, 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"
-"and remove %s.\n"
+"and remove %s\n"
 "Automatic cleanup will not be performed until the file is removed.\n"
 "\n"
 "%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:869
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr ""
 
-#: builtin/gc.c:905
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr ""
 
@@ -14645,131 +14877,171 @@ msgstr ""
 msgid "failed to finish 'git pack-objects' process"
 msgstr ""
 
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr ""
 
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr ""
 
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr ""
 
-#: builtin/gc.c:1179
+#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 
-#: builtin/gc.c:1283
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr ""
 
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr ""
 
-#: builtin/gc.c:1395
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr ""
 
-#: builtin/gc.c:1400
+#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr ""
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr ""
 
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr ""
 
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr ""
 
-#: builtin/gc.c:1420
+#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr ""
 
-#: builtin/gc.c:1421
+#: builtin/gc.c:1416
 msgid "task"
 msgstr ""
 
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr ""
 
-#: builtin/gc.c:1439
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr ""
 
-#: builtin/gc.c:1482
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr ""
 
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr ""
 
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr ""
 
-#: builtin/gc.c:1613
+#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr ""
 
-#: builtin/gc.c:1674
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr ""
 
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr ""
 
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr ""
 
-#: builtin/gc.c:1879
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr ""
 
-#: builtin/gc.c:1896
+#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr ""
 
-#: builtin/gc.c:1900
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr ""
 
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr ""
 
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr ""
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr ""
+
+#: 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:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr ""
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr ""
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr ""
+
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr ""
 
-#: builtin/gc.c:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr ""
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr ""
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr ""
+
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr ""
 
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr ""
 
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr ""
@@ -14778,12 +15050,12 @@ msgstr ""
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 
-#: builtin/grep.c:223
+#: builtin/grep.c:239
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr ""
 
-#: builtin/grep.c:277
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr ""
@@ -14792,694 +15064,687 @@ msgstr ""
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
-#: builtin/pack-objects.c:2969
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr ""
 
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 
-#: builtin/grep.c:658
+#: builtin/grep.c:672
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr ""
 
-#: builtin/grep.c:739
+#: builtin/grep.c:752
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 
-#: builtin/grep.c:838
+#: builtin/grep.c:851
 msgid "search in index instead of in the work tree"
 msgstr ""
 
-#: builtin/grep.c:840
+#: builtin/grep.c:853
 msgid "find in contents not managed by git"
 msgstr ""
 
-#: builtin/grep.c:842
+#: builtin/grep.c:855
 msgid "search in both tracked and untracked files"
 msgstr ""
 
-#: builtin/grep.c:844
+#: builtin/grep.c:857
 msgid "ignore files specified via '.gitignore'"
 msgstr ""
 
-#: builtin/grep.c:846
+#: builtin/grep.c:859
 msgid "recursively search in each submodule"
 msgstr ""
 
-#: builtin/grep.c:849
+#: builtin/grep.c:862
 msgid "show non-matching lines"
 msgstr ""
 
-#: builtin/grep.c:851
+#: builtin/grep.c:864
 msgid "case insensitive matching"
 msgstr ""
 
-#: builtin/grep.c:853
+#: builtin/grep.c:866
 msgid "match patterns only at word boundaries"
 msgstr ""
 
-#: builtin/grep.c:855
+#: builtin/grep.c:868
 msgid "process binary files as text"
 msgstr ""
 
-#: builtin/grep.c:857
+#: builtin/grep.c:870
 msgid "don't match patterns in binary files"
 msgstr ""
 
-#: builtin/grep.c:860
+#: builtin/grep.c:873
 msgid "process binary files with textconv filters"
 msgstr ""
 
-#: builtin/grep.c:862
+#: builtin/grep.c:875
 msgid "search in subdirectories (default)"
 msgstr ""
 
-#: builtin/grep.c:864
+#: builtin/grep.c:877
 msgid "descend at most <depth> levels"
 msgstr ""
 
-#: builtin/grep.c:868
+#: builtin/grep.c:881
 msgid "use extended POSIX regular expressions"
 msgstr ""
 
-#: builtin/grep.c:871
+#: builtin/grep.c:884
 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 
-#: builtin/grep.c:874
+#: builtin/grep.c:887
 msgid "interpret patterns as fixed strings"
 msgstr ""
 
-#: builtin/grep.c:877
+#: builtin/grep.c:890
 msgid "use Perl-compatible regular expressions"
 msgstr ""
 
-#: builtin/grep.c:880
+#: builtin/grep.c:893
 msgid "show line numbers"
 msgstr ""
 
-#: builtin/grep.c:881
+#: builtin/grep.c:894
 msgid "show column number of first match"
 msgstr ""
 
-#: builtin/grep.c:882
+#: builtin/grep.c:895
 msgid "don't show filenames"
 msgstr ""
 
-#: builtin/grep.c:883
+#: builtin/grep.c:896
 msgid "show filenames"
 msgstr ""
 
-#: builtin/grep.c:885
+#: builtin/grep.c:898
 msgid "show filenames relative to top directory"
 msgstr ""
 
-#: builtin/grep.c:887
+#: builtin/grep.c:900
 msgid "show only filenames instead of matching lines"
 msgstr ""
 
-#: builtin/grep.c:889
+#: builtin/grep.c:902
 msgid "synonym for --files-with-matches"
 msgstr ""
 
-#: builtin/grep.c:892
+#: builtin/grep.c:905
 msgid "show only the names of files without match"
 msgstr ""
 
-#: builtin/grep.c:894
+#: builtin/grep.c:907
 msgid "print NUL after filenames"
 msgstr ""
 
-#: builtin/grep.c:897
+#: builtin/grep.c:910
 msgid "show only matching parts of a line"
 msgstr ""
 
-#: builtin/grep.c:899
+#: builtin/grep.c:912
 msgid "show the number of matches instead of matching lines"
 msgstr ""
 
-#: builtin/grep.c:900
+#: builtin/grep.c:913
 msgid "highlight matches"
 msgstr ""
 
-#: builtin/grep.c:902
+#: builtin/grep.c:915
 msgid "print empty line between matches from different files"
 msgstr ""
 
-#: builtin/grep.c:904
+#: builtin/grep.c:917
 msgid "show filename only once above matches from same file"
 msgstr ""
 
-#: builtin/grep.c:907
+#: builtin/grep.c:920
 msgid "show <n> context lines before and after matches"
 msgstr ""
 
-#: builtin/grep.c:910
+#: builtin/grep.c:923
 msgid "show <n> context lines before matches"
 msgstr ""
 
-#: builtin/grep.c:912
+#: builtin/grep.c:925
 msgid "show <n> context lines after matches"
 msgstr ""
 
-#: builtin/grep.c:914
+#: builtin/grep.c:927
 msgid "use <n> worker threads"
 msgstr ""
 
-#: builtin/grep.c:915
+#: builtin/grep.c:928
 msgid "shortcut for -C NUM"
 msgstr ""
 
-#: builtin/grep.c:918
+#: builtin/grep.c:931
 msgid "show a line with the function name before matches"
 msgstr ""
 
-#: builtin/grep.c:920
+#: builtin/grep.c:933
 msgid "show the surrounding function"
 msgstr ""
 
-#: builtin/grep.c:923
+#: builtin/grep.c:936
 msgid "read patterns from file"
 msgstr ""
 
-#: builtin/grep.c:925
+#: builtin/grep.c:938
 msgid "match <pattern>"
 msgstr ""
 
-#: builtin/grep.c:927
+#: builtin/grep.c:940
 msgid "combine patterns specified with -e"
 msgstr ""
 
-#: builtin/grep.c:939
+#: builtin/grep.c:952
 msgid "indicate hit with exit status without output"
 msgstr ""
 
-#: builtin/grep.c:941
+#: builtin/grep.c:954
 msgid "show only matches from files that match all patterns"
 msgstr ""
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "pager"
 msgstr ""
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "show matching files in the pager"
 msgstr ""
 
-#: builtin/grep.c:948
+#: builtin/grep.c:961
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1027
 msgid "no pattern given"
 msgstr ""
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:1063
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr ""
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:1071
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr ""
 
-#: builtin/grep.c:1088
+#: builtin/grep.c:1101
 msgid "--untracked not supported with --recurse-submodules"
 msgstr ""
 
-#: builtin/grep.c:1092
+#: builtin/grep.c:1105
 msgid "invalid option combination, ignoring --threads"
 msgstr ""
 
-#: builtin/grep.c:1095 builtin/pack-objects.c:3930
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
 msgid "no threads support, ignoring --threads"
 msgstr ""
 
-#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 
-#: builtin/grep.c:1132
+#: builtin/grep.c:1145
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 
-#: builtin/grep.c:1158
+#: builtin/grep.c:1171
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr ""
 
-#: builtin/grep.c:1161
+#: builtin/grep.c:1174
 msgid "--untracked cannot be used with --cached"
 msgstr ""
 
-#: builtin/grep.c:1167
+#: builtin/grep.c:1180
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
 
-#: builtin/grep.c:1175
+#: builtin/grep.c:1188
 msgid "both --cached and trees are given"
 msgstr ""
 
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
 msgstr ""
 
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr ""
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr ""
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr ""
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr ""
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr ""
 
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr ""
 
-#: builtin/help.c:47
+#: builtin/help.c:55
 msgid "print all available commands"
 msgstr ""
 
-#: builtin/help.c:48
+#: builtin/help.c:57
 msgid "exclude guides"
 msgstr ""
 
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr ""
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr ""
-
-#: builtin/help.c:52
+#: builtin/help.c:58
 msgid "show man page"
 msgstr ""
 
-#: builtin/help.c:53
+#: builtin/help.c:59
 msgid "show manual in web browser"
 msgstr ""
 
-#: builtin/help.c:55
+#: builtin/help.c:61
 msgid "show info page"
 msgstr ""
 
-#: builtin/help.c:57
+#: builtin/help.c:63
 msgid "print command description"
 msgstr ""
 
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr ""
+
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr ""
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr ""
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
 msgstr ""
 
-#: builtin/help.c:163
+#: builtin/help.c:196
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr ""
 
-#: builtin/help.c:190
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr ""
 
-#: builtin/help.c:203
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr ""
 
-#: builtin/help.c:211
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr ""
 
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: 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:307
+#: 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:319
+#: 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:436
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr ""
 
-#: builtin/help.c:453
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr ""
 
-#: builtin/help.c:461
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr ""
 
-#: builtin/help.c:520 builtin/help.c:531 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:534 git.c:380
+#: builtin/help.c:564 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr ""
 
-#: builtin/help.c:563 builtin/help.c:593
+#: builtin/help.c:580
+msgid "this option doesn't take any other arguments"
+msgstr ""
+
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr ""
 
-#: builtin/help.c:577
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr ""
 
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
 #, c-format
 msgid "object type mismatch at %s"
 msgstr ""
 
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr ""
 
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr ""
 
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr ""
 
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr ""
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr ""
 
-#: builtin/index-pack.c:325 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr ""
 
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr ""
 
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr ""
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
 msgid "pack signature mismatch"
 msgstr ""
 
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr ""
 
-#: builtin/index-pack.c:383
+#: builtin/index-pack.c:376
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr ""
 
-#: builtin/index-pack.c:489
+#: builtin/index-pack.c:482
 #, c-format
 msgid "inflate returned %d"
 msgstr ""
 
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:531
 msgid "offset value overflow for delta base object"
 msgstr ""
 
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:539
 msgid "delta base offset is out of bound"
 msgstr ""
 
-#: builtin/index-pack.c:554
+#: builtin/index-pack.c:547
 #, c-format
 msgid "unknown object type %d"
 msgstr ""
 
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:578
 msgid "cannot pread pack file"
 msgstr ""
 
-#: builtin/index-pack.c:587
+#: builtin/index-pack.c:580
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:613
+#: builtin/index-pack.c:606
 msgid "serious inflate inconsistency"
 msgstr ""
 
-#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788
-#: builtin/index-pack.c:827 builtin/index-pack.c:836
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr ""
 
-#: builtin/index-pack.c:761 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
 #, c-format
 msgid "unable to read %s"
 msgstr ""
 
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:818
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr ""
 
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:826
 #, c-format
 msgid "cannot read existing object %s"
 msgstr ""
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:840
 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 
-#: builtin/index-pack.c:850 builtin/index-pack.c:869
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
 msgid "fsck error in packed object"
 msgstr ""
 
-#: builtin/index-pack.c:871
+#: builtin/index-pack.c:864
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr ""
 
-#: builtin/index-pack.c:932 builtin/index-pack.c:979
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
 msgstr ""
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Receiving objects"
 msgstr ""
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Indexing objects"
 msgstr ""
 
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1190
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr ""
 
-#: builtin/index-pack.c:1201
+#: builtin/index-pack.c:1195
 msgid "cannot fstat packfile"
 msgstr ""
 
-#: builtin/index-pack.c:1204
+#: builtin/index-pack.c:1198
 msgid "pack has junk at the end"
 msgstr ""
 
-#: builtin/index-pack.c:1216
+#: builtin/index-pack.c:1210
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 
-#: builtin/index-pack.c:1239
+#: builtin/index-pack.c:1233
 msgid "Resolving deltas"
 msgstr ""
 
-#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
 #, c-format
 msgid "unable to create thread: %s"
 msgstr ""
 
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1277
 msgid "confusion beyond insanity"
 msgstr ""
 
-#: builtin/index-pack.c:1289
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 
-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1329
+#: builtin/index-pack.c:1323
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr ""
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1419
 #, c-format
 msgid "local object %s is corrupt"
 msgstr ""
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1440
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1470
+#: builtin/index-pack.c:1464
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1478
+#: builtin/index-pack.c:1472
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1504
-msgid "error while closing pack file"
-msgstr ""
-
-#: builtin/index-pack.c:1518
-msgid "cannot store pack file"
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1526
-msgid "cannot store index file"
+#: builtin/index-pack.c:1514
+msgid "error while closing pack file"
 msgstr ""
 
-#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1643
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1645
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1701
+#: builtin/index-pack.c:1693
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1700
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1750
+#: builtin/index-pack.c:1742
 msgid "Cannot come back to cwd"
 msgstr ""
 
-#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
-#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
 #, c-format
 msgid "bad %s"
 msgstr ""
 
-#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1852
-msgid "--fix-thin cannot be used without --stdin"
-msgstr ""
-
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr ""
 
-#: builtin/index-pack.c:1856
-msgid "--object-format cannot be used with --stdin"
-msgstr ""
-
-#: builtin/index-pack.c:1871
+#: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr ""
 
-#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr ""
 
@@ -15523,108 +15788,104 @@ msgstr ""
 msgid "not copying templates from '%s': %s"
 msgstr ""
 
-#: builtin/init-db.c:262
+#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr ""
 
-#: builtin/init-db.c:353
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr ""
 
-#: builtin/init-db.c:356
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr ""
 
-#: builtin/init-db.c:372
+#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr ""
 
-#: builtin/init-db.c:396 builtin/init-db.c:399
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr ""
 
-#: builtin/init-db.c:431
+#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr ""
 
-#: builtin/init-db.c:462
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr ""
 
-#: builtin/init-db.c:463
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr ""
 
-#: builtin/init-db.c:467
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr ""
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr ""
 
-#: builtin/init-db.c:517
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
 msgstr ""
 
-#: builtin/init-db.c:543
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr ""
 
-#: builtin/init-db.c:544
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 
-#: builtin/init-db.c:550
+#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr ""
 
-#: builtin/init-db.c:551 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr ""
 
-#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr ""
 
-#: builtin/init-db.c:559
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr ""
-
-#: builtin/init-db.c:590 builtin/init-db.c:595
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr ""
 
-#: builtin/init-db.c:599 builtin/init-db.c:654
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr ""
 
-#: builtin/init-db.c:626
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr ""
 
-#: builtin/init-db.c:678
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr ""
 
-#: builtin/init-db.c:683
+#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr ""
 
@@ -15729,498 +15990,490 @@ msgstr ""
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr ""
 
-#: builtin/log.c:303
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 
-#: builtin/log.c:568
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr ""
 
-#: builtin/log.c:583 builtin/log.c:673
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr ""
 
-#: builtin/log.c:698
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr ""
 
-#: builtin/log.c:843
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr ""
 
-#: builtin/log.c:850
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr ""
 
-#: builtin/log.c:979
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr ""
 
-#: builtin/log.c:996
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr ""
 
-#: builtin/log.c:1006
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr ""
 
-#: builtin/log.c:1170
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr ""
 
-#: builtin/log.c:1176
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr ""
 
-#: builtin/log.c:1263
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 
-#: builtin/log.c:1290
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr ""
 
-#: builtin/log.c:1348
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr ""
 
-#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#: 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:1510 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:1519
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr ""
 
-#: builtin/log.c:1529
+#: 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:1552
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr ""
 
-#: builtin/log.c:1569
+#: builtin/log.c:1587
 msgid "base commit should be the ancestor of revision list"
 msgstr ""
 
-#: builtin/log.c:1579
+#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr ""
 
-#: builtin/log.c:1637
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr ""
 
-#: builtin/log.c:1700
+#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
 msgstr ""
 
-#: builtin/log.c:1702
+#: builtin/log.c:1720
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr ""
 
-#: builtin/log.c:1746
+#: builtin/log.c:1764
 msgid "use [PATCH n/m] even with a single patch"
 msgstr ""
 
-#: builtin/log.c:1749
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 
-#: builtin/log.c:1753
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr ""
 
-#: builtin/log.c:1755
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr ""
 
-#: builtin/log.c:1757
+#: builtin/log.c:1775
 msgid "use simple number sequence for output file names"
 msgstr ""
 
-#: builtin/log.c:1758
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr ""
 
-#: builtin/log.c:1759
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 
-#: builtin/log.c:1761
+#: builtin/log.c:1779
 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 
-#: builtin/log.c:1762
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr ""
 
-#: builtin/log.c:1763
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr ""
 
-#: builtin/log.c:1765
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr ""
 
-#: builtin/log.c:1767
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1770
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr ""
 
-#: builtin/log.c:1771
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr ""
 
-#: builtin/log.c:1773
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1776
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr ""
 
-#: builtin/log.c:1779
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1782
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr ""
 
-#: builtin/log.c:1784
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr ""
 
-#: builtin/log.c:1786
+#: builtin/log.c:1804
 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 
-#: builtin/log.c:1788
+#: builtin/log.c:1806
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 
-#: builtin/log.c:1790
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr ""
 
-#: builtin/log.c:1791
+#: builtin/log.c:1809
 msgid "header"
 msgstr ""
 
-#: builtin/log.c:1792
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr ""
 
-#: builtin/log.c:1793 builtin/log.c:1794
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr ""
 
-#: builtin/log.c:1793
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr ""
 
-#: builtin/log.c:1794
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr ""
 
-#: builtin/log.c:1795
+#: builtin/log.c:1813
 msgid "ident"
 msgstr ""
 
-#: builtin/log.c:1796
+#: builtin/log.c:1814
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 
-#: builtin/log.c:1798
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr ""
 
-#: builtin/log.c:1799
+#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 
-#: builtin/log.c:1800 builtin/log.c:1803
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr ""
 
-#: builtin/log.c:1801
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr ""
 
-#: builtin/log.c:1804
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr ""
 
-#: builtin/log.c:1808
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 
-#: builtin/log.c:1810
+#: builtin/log.c:1828
 msgid "signature"
 msgstr ""
 
-#: builtin/log.c:1811
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr ""
 
-#: builtin/log.c:1812
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr ""
 
-#: builtin/log.c:1813
+#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 
-#: builtin/log.c:1816
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr ""
 
-#: builtin/log.c:1817
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr ""
 
-#: builtin/log.c:1819
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr ""
 
-#: builtin/log.c:1821
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1824
+#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1826 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:1913
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr ""
 
-#: builtin/log.c:1928
-msgid "-n and -k are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:1930
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:1938
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr ""
 
-#: builtin/log.c:1940
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr ""
 
-#: builtin/log.c:1942
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr ""
 
-#: builtin/log.c:1964
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:2087
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:2091
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr ""
 
-#: builtin/log.c:2092
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr ""
 
-#: builtin/log.c:2098
-msgid "--creation-factor requires --range-diff"
-msgstr ""
-
-#: builtin/log.c:2102
+#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:2110
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr ""
 
-#: builtin/log.c:2111
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr ""
 
-#: builtin/log.c:2122
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr ""
 
-#: builtin/log.c:2158
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr ""
 
-#: builtin/log.c:2202
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr ""
 
-#: builtin/log.c:2261
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 
-#: builtin/log.c:2315
+#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr ""
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr ""
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr ""
+
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr ""
 
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr ""
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr ""
 
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr ""
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
 msgstr ""
 
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:639
 msgid "show files on the filesystem that need to be removed"
 msgstr ""
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr ""
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr ""
 
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr ""
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr ""
 
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr ""
 
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
 msgstr ""
 
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr ""
 
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr ""
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr ""
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:669
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr ""
 
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr ""
 
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:671
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr ""
 
-#: builtin/ls-files.c:674
+#: 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"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<repository> [<refs>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repository> [<refs>...]]"
 msgstr ""
 
 #: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr ""
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
 msgid "exec"
 msgstr ""
 
@@ -16337,7 +16590,7 @@ msgstr ""
 msgid "use headers in message's body"
 msgstr ""
 
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr ""
@@ -16397,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 ""
 
@@ -16451,365 +16708,349 @@ msgstr ""
 msgid "Merging %s with %s\n"
 msgstr ""
 
-#: builtin/merge.c:58
-msgid "git merge [<options>] [<commit>...]"
-msgstr ""
-
 #: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr ""
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
+msgid "git merge [<options>] [<commit>...]"
 msgstr ""
 
-#: builtin/merge.c:123
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr ""
 
-#: builtin/merge.c:146
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr ""
 
-#: builtin/merge.c:199
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr ""
 
-#: builtin/merge.c:200
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 
-#: builtin/merge.c:205
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 
-#: builtin/merge.c:256 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 ""
 
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:261 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr ""
 
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr ""
 
-#: builtin/merge.c:262 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 ""
 
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr ""
 
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr ""
 
-#: builtin/merge.c:271
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr ""
 
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr ""
 
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
 msgid "verify that the named commit has a valid GPG signature"
 msgstr ""
 
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: 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:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr ""
 
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr ""
 
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr ""
 
-#: builtin/merge.c:283
+#: builtin/merge.c:285
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 
-#: builtin/merge.c:290
+#: 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:292
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr ""
 
-#: builtin/merge.c:294
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr ""
 
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr ""
 
-#: builtin/merge.c:303
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr ""
 
-#: builtin/merge.c:320
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr ""
 
-#: builtin/merge.c:325
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr ""
 
-#: builtin/merge.c:330
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr ""
 
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr ""
 
-#: builtin/merge.c:400
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr ""
 
-#: builtin/merge.c:414
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 
-#: builtin/merge.c:464
+#: 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:602
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 
-#: builtin/merge.c:728
+#: builtin/merge.c:732
 msgid "Not handling anything other than two heads merge."
 msgstr ""
 
-#: builtin/merge.c:741
+#: builtin/merge.c:745
 #, c-format
-msgid "Unknown option for merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
 msgstr ""
 
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr ""
 
-#: builtin/merge.c:812
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr ""
 
-#: builtin/merge.c:821
+#: builtin/merge.c:825
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 
-#: builtin/merge.c:827
+#: 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:832
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr ""
 
-#: builtin/merge.c:835
+#: 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:888
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr ""
 
-#: builtin/merge.c:903
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 
-#: builtin/merge.c:964
+#: builtin/merge.c:970
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 
-#: builtin/merge.c:1003
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr ""
 
-#: builtin/merge.c:1005
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr ""
 
-#: builtin/merge.c:1007
+#: builtin/merge.c:1013
 msgid "No default upstream defined for the current branch."
 msgstr ""
 
-#: builtin/merge.c:1012
+#: builtin/merge.c:1018
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr ""
 
-#: builtin/merge.c:1069
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr ""
 
-#: builtin/merge.c:1172
+#: builtin/merge.c:1177
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr ""
 
-#: builtin/merge.c:1206
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr ""
 
-#: builtin/merge.c:1316
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1320
+#: builtin/merge.c:1328
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 
-#: builtin/merge.c:1338
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1351
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1355
+#: builtin/merge.c:1363
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr ""
 
-#: builtin/merge.c:1371
+#: 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:1378
+#: 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:1381
+#: builtin/merge.c:1389
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 
-#: builtin/merge.c:1395
-msgid "You cannot combine --squash with --no-ff."
-msgstr ""
-
-#: builtin/merge.c:1397
-msgid "You cannot combine --squash with --commit."
-msgstr ""
-
-#: builtin/merge.c:1413
+#: builtin/merge.c:1421
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 
-#: builtin/merge.c:1430
+#: builtin/merge.c:1438
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 
-#: builtin/merge.c:1432
+#: builtin/merge.c:1440
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 
-#: builtin/merge.c:1439
+#: builtin/merge.c:1447
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 
-#: builtin/merge.c:1520
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr ""
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 
-#: builtin/merge.c:1585
+#: builtin/merge.c:1601
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr ""
 
-#: builtin/merge.c:1592
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr ""
 
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr ""
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: builtin/merge.c:1667 builtin/merge.c:1733
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
-#: builtin/merge.c:1655
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 
-#: builtin/merge.c:1707
+#: builtin/merge.c:1723
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr ""
 
-#: builtin/merge.c:1709
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
-#: builtin/merge.c:1718
+#: builtin/merge.c:1735
 #, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr ""
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -16843,15 +17084,15 @@ msgstr ""
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr ""
 
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr ""
 
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
 msgid "tag on stdin did not refer to a valid object"
 msgstr ""
 
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr ""
 
@@ -16872,44 +17113,53 @@ msgid "allow creation of more than one tree"
 msgstr ""
 
 #: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
 msgstr ""
 
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
 msgid "git multi-pack-index [<options>] verify"
 msgstr ""
 
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr ""
 
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr ""
 
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
 msgid "preferred-pack"
 msgstr ""
 
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr ""
 
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr ""
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr ""
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr ""
+
+#: 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 ""
 
-#: builtin/multi-pack-index.c:180
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr ""
-
 #: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr ""
@@ -16936,117 +17186,117 @@ msgstr ""
 msgid "skip move/rename errors"
 msgstr ""
 
-#: builtin/mv.c:170
+#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr ""
 
-#: builtin/mv.c:181
+#: builtin/mv.c:184
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr ""
 
-#: builtin/mv.c:185
+#: builtin/mv.c:190
 msgid "bad source"
 msgstr ""
 
-#: builtin/mv.c:188
+#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr ""
 
-#: builtin/mv.c:191
+#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr ""
 
-#: builtin/mv.c:200
+#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr ""
 
-#: builtin/mv.c:225
+#: builtin/mv.c:231
 msgid "not under version control"
 msgstr ""
 
-#: builtin/mv.c:227
+#: builtin/mv.c:233
 msgid "conflicted"
 msgstr ""
 
-#: builtin/mv.c:230
+#: builtin/mv.c:236
 msgid "destination exists"
 msgstr ""
 
-#: builtin/mv.c:238
+#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr ""
 
-#: builtin/mv.c:241
+#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr ""
 
-#: builtin/mv.c:244
+#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr ""
 
-#: builtin/mv.c:246
+#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr ""
 
-#: builtin/mv.c:253
+#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr ""
 
-#: builtin/mv.c:274
+#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr ""
 
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: 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 ""
 
@@ -17159,61 +17409,61 @@ 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:197
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr ""
 
-#: builtin/notes.c:206
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr ""
 
-#: builtin/notes.c:208
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr ""
 
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr ""
 
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr ""
 
-#: builtin/notes.c:265
+#: builtin/notes.c:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr ""
 
-#: builtin/notes.c:268
+#: builtin/notes.c:266
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr ""
 
-#: builtin/notes.c:309
+#: builtin/notes.c:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr ""
 
-#: builtin/notes.c:324
+#: builtin/notes.c:322
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr ""
@@ -17221,186 +17471,186 @@ msgstr ""
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr ""
 
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: 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:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr ""
 
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
 #, c-format
 msgid "no note found for object %s."
 msgstr ""
 
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr ""
 
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr ""
 
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
 msgid "reuse and edit specified note object"
 msgstr ""
 
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr ""
 
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr ""
 
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr ""
 
-#: builtin/notes.c:448
+#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
 
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr ""
 
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr ""
 
-#: builtin/notes.c:497
+#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr ""
 
-#: builtin/notes.c:499
+#: builtin/notes.c:497
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 
-#: builtin/notes.c:517
+#: builtin/notes.c:515
 msgid "too few arguments"
 msgstr ""
 
-#: builtin/notes.c:538
+#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
 
-#: builtin/notes.c:550
+#: builtin/notes.c:548
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr ""
 
-#: builtin/notes.c:603
+#: builtin/notes.c:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
 msgstr ""
 
-#: builtin/notes.c:698
+#: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr ""
 
-#: builtin/notes.c:700
+#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr ""
 
-#: builtin/notes.c:702
+#: builtin/notes.c:700
 msgid "failed to remove 'git notes merge' worktree"
 msgstr ""
 
-#: builtin/notes.c:722
+#: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr ""
 
-#: builtin/notes.c:724
+#: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr ""
 
-#: builtin/notes.c:726
+#: builtin/notes.c:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr ""
 
-#: builtin/notes.c:739
+#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr ""
 
-#: builtin/notes.c:742
+#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr ""
 
-#: builtin/notes.c:768
+#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr ""
 
-#: builtin/notes.c:784
+#: builtin/notes.c:782
 msgid "General options"
 msgstr ""
 
-#: builtin/notes.c:786
+#: builtin/notes.c:784
 msgid "Merge options"
 msgstr ""
 
-#: builtin/notes.c:788
+#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr ""
 
-#: builtin/notes.c:790
+#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr ""
 
-#: builtin/notes.c:792
+#: builtin/notes.c:790
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 
-#: builtin/notes.c:794
+#: builtin/notes.c:792
 msgid "Aborting notes merge resolution"
 msgstr ""
 
-#: builtin/notes.c:796
+#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr ""
 
-#: builtin/notes.c:807
+#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr ""
 
-#: builtin/notes.c:812
+#: builtin/notes.c:810
 msgid "must specify a notes ref to merge"
 msgstr ""
 
-#: builtin/notes.c:836
+#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr ""
 
-#: builtin/notes.c:873
+#: builtin/notes.c:874
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr ""
 
-#: builtin/notes.c:876
+#: builtin/notes.c:878
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr ""
 
-#: builtin/notes.c:878
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -17408,438 +17658,439 @@ msgid ""
 "abort'.\n"
 msgstr ""
 
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
 
-#: builtin/notes.c:900
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr ""
 
-#: builtin/notes.c:912
+#: builtin/notes.c:914
 msgid "attempt to remove non-existent note is not an error"
 msgstr ""
 
-#: builtin/notes.c:915
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr ""
 
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr ""
 
-#: builtin/notes.c:955
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr ""
 
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr ""
 
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr ""
 
-#: builtin/notes.c:1034 builtin/stash.c:1739
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr ""
 
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
 "pack %s"
 msgstr ""
 
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:459
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:590
+#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr ""
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr ""
 
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1160
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
 msgid "Writing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr ""
 
-#: builtin/pack-objects.c:1141
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr ""
+
+#: builtin/pack-objects.c:1294
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:1383
+#: builtin/pack-objects.c:1536
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 
-#: builtin/pack-objects.c:1831
+#: builtin/pack-objects.c:1984
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:1840
+#: builtin/pack-objects.c:1993
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2121
+#: builtin/pack-objects.c:2274
 msgid "Counting objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2266
+#: builtin/pack-objects.c:2439
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
-#: builtin/pack-objects.c:2362
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
 #, c-format
 msgid "object %s cannot be read"
 msgstr ""
 
-#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 
-#: builtin/pack-objects.c:2376
+#: builtin/pack-objects.c:2549
 msgid "suboptimal pack - out of memory"
 msgstr ""
 
-#: builtin/pack-objects.c:2691
+#: builtin/pack-objects.c:2864
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr ""
 
-#: builtin/pack-objects.c:2830
+#: builtin/pack-objects.c:3003
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:3089
 msgid "Compressing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:3095
 msgid "inconsistency with delta count"
 msgstr ""
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3174
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
 "hash> <uri>' (got '%s')"
 msgstr ""
 
-#: builtin/pack-objects.c:3004
+#: builtin/pack-objects.c:3177
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
 msgstr ""
 
-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3212
 #, c-format
 msgid "could not get type of object %s in pack %s"
 msgstr ""
 
-#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
 #, c-format
 msgid "could not find pack '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3408
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:3224
+#: builtin/pack-objects.c:3414
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:3322
+#: builtin/pack-objects.c:3507
 msgid "invalid value for --missing"
 msgstr ""
 
-#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
 msgid "cannot open pack index"
 msgstr ""
 
-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3541
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr ""
 
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3627
 msgid "unable to force loose object"
 msgstr ""
 
-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3757
 #, c-format
 msgid "not a rev '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3631
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3788
 msgid "unable to add recent objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3712
+#: builtin/pack-objects.c:3841
 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 
-#: builtin/pack-objects.c:3716
+#: builtin/pack-objects.c:3845
 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3755
+#: builtin/pack-objects.c:3884
 msgid "<version>[,<offset>]"
 msgstr ""
 
-#: builtin/pack-objects.c:3756
+#: builtin/pack-objects.c:3885
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 
-#: builtin/pack-objects.c:3759
+#: builtin/pack-objects.c:3888
 msgid "maximum size of each output pack file"
 msgstr ""
 
-#: builtin/pack-objects.c:3761
+#: builtin/pack-objects.c:3890
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c:3892
 msgid "ignore packed objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3765
+#: builtin/pack-objects.c:3894
 msgid "limit pack window by objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3767
+#: builtin/pack-objects.c:3896
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 
-#: builtin/pack-objects.c:3769
+#: builtin/pack-objects.c:3898
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 
-#: builtin/pack-objects.c:3771
+#: builtin/pack-objects.c:3900
 msgid "reuse existing deltas"
 msgstr ""
 
-#: builtin/pack-objects.c:3773
+#: builtin/pack-objects.c:3902
 msgid "reuse existing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3775
+#: builtin/pack-objects.c:3904
 msgid "use OFS_DELTA objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3777
+#: builtin/pack-objects.c:3906
 msgid "use threads when searching for best delta matches"
 msgstr ""
 
-#: builtin/pack-objects.c:3779
+#: builtin/pack-objects.c:3908
 msgid "do not create an empty pack output"
 msgstr ""
 
-#: builtin/pack-objects.c:3781
+#: builtin/pack-objects.c:3910
 msgid "read revision arguments from standard input"
 msgstr ""
 
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:3912
 msgid "limit the objects to those that are not yet packed"
 msgstr ""
 
-#: builtin/pack-objects.c:3786
+#: builtin/pack-objects.c:3915
 msgid "include objects reachable from any reference"
 msgstr ""
 
-#: builtin/pack-objects.c:3789
+#: builtin/pack-objects.c:3918
 msgid "include objects referred by reflog entries"
 msgstr ""
 
-#: builtin/pack-objects.c:3792
+#: builtin/pack-objects.c:3921
 msgid "include objects referred to by the index"
 msgstr ""
 
-#: builtin/pack-objects.c:3795
+#: builtin/pack-objects.c:3924
 msgid "read packs from stdin"
 msgstr ""
 
-#: builtin/pack-objects.c:3797
+#: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
 msgstr ""
 
-#: builtin/pack-objects.c:3799
+#: builtin/pack-objects.c:3928
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 
-#: builtin/pack-objects.c:3801
+#: builtin/pack-objects.c:3930
 msgid "keep unreachable objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3803
+#: builtin/pack-objects.c:3932
 msgid "pack loose unreachable objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3805
+#: builtin/pack-objects.c:3934
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 
-#: builtin/pack-objects.c:3808
+#: builtin/pack-objects.c:3937
 msgid "use the sparse reachability algorithm"
 msgstr ""
 
-#: builtin/pack-objects.c:3810
+#: builtin/pack-objects.c:3939
 msgid "create thin packs"
 msgstr ""
 
-#: builtin/pack-objects.c:3812
+#: builtin/pack-objects.c:3941
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 
-#: builtin/pack-objects.c:3814
+#: builtin/pack-objects.c:3943
 msgid "ignore packs that have companion .keep file"
 msgstr ""
 
-#: builtin/pack-objects.c:3816
+#: builtin/pack-objects.c:3945
 msgid "ignore this pack"
 msgstr ""
 
-#: builtin/pack-objects.c:3818
+#: builtin/pack-objects.c:3947
 msgid "pack compression level"
 msgstr ""
 
-#: builtin/pack-objects.c:3820
+#: builtin/pack-objects.c:3949
 msgid "do not hide commits by grafts"
 msgstr ""
 
-#: builtin/pack-objects.c:3822
+#: builtin/pack-objects.c:3951
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3824
+#: builtin/pack-objects.c:3953
 msgid "write a bitmap index together with the pack index"
 msgstr ""
 
-#: builtin/pack-objects.c:3828
+#: builtin/pack-objects.c:3957
 msgid "write a bitmap index if possible"
 msgstr ""
 
-#: builtin/pack-objects.c:3832
+#: builtin/pack-objects.c:3961
 msgid "handling for missing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3835
+#: builtin/pack-objects.c:3964
 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 
-#: builtin/pack-objects.c:3837
+#: builtin/pack-objects.c:3966
 msgid "respect islands during delta compression"
 msgstr ""
 
-#: builtin/pack-objects.c:3839
+#: builtin/pack-objects.c:3968
 msgid "protocol"
 msgstr ""
 
-#: builtin/pack-objects.c:3840
+#: builtin/pack-objects.c:3969
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr ""
 
-#: builtin/pack-objects.c:3873
+#: builtin/pack-objects.c:4002
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr ""
 
-#: builtin/pack-objects.c:3878
+#: builtin/pack-objects.c:4007
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr ""
 
-#: builtin/pack-objects.c:3934
+#: builtin/pack-objects.c:4063
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 
-#: builtin/pack-objects.c:3936
+#: builtin/pack-objects.c:4065
 msgid "minimum pack size limit is 1 MiB"
 msgstr ""
 
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:4070
 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 
-#: builtin/pack-objects.c:3944
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr ""
-
-#: builtin/pack-objects.c:3950
+#: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr ""
 
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:4081
 msgid "cannot use --filter with --stdin-packs"
 msgstr ""
 
-#: builtin/pack-objects.c:3956
+#: builtin/pack-objects.c:4085
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr ""
 
-#: builtin/pack-objects.c:4015
+#: builtin/pack-objects.c:4144
 msgid "Enumerating objects"
 msgstr ""
 
-#: builtin/pack-objects.c:4052
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17875,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:152
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 
@@ -17900,61 +18151,65 @@ msgstr ""
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
-#: builtin/pull.c:123
+#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
 msgstr ""
 
-#: builtin/pull.c:127
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr ""
 
-#: builtin/pull.c:130
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr ""
 
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr ""
 
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr ""
+
+#: builtin/pull.c:171 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr ""
 
-#: builtin/pull.c:183
+#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr ""
 
-#: builtin/pull.c:193
+#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr ""
 
-#: builtin/pull.c:201
+#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr ""
 
-#: builtin/pull.c:317
+#: builtin/pull.c:321
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr ""
 
-#: builtin/pull.c:445
+#: builtin/pull.c:449
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr ""
 
-#: builtin/pull.c:447
+#: builtin/pull.c:451
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: builtin/pull.c:451
+#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -17962,63 +18217,64 @@ msgid ""
 "for your current branch, you must specify a branch on the command line."
 msgstr ""
 
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
 msgid "You are not currently on a branch."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr ""
 
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
 msgid "<remote>"
 msgstr ""
 
-#: 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 ""
 
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
 msgid "There is no tracking information for the current branch."
 msgstr ""
 
-#: 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 ""
 
-#: builtin/pull.c:485
+#: builtin/pull.c:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr ""
 
-#: builtin/pull.c:596
+#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr ""
 
-#: builtin/pull.c:902
+#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr ""
 
-#: builtin/pull.c:930
+#: builtin/pull.c:969
 msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"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"
@@ -18029,19 +18285,19 @@ msgid ""
 "invocation.\n"
 msgstr ""
 
-#: builtin/pull.c:991
+#: builtin/pull.c:1046
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 
-#: builtin/pull.c:995
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr ""
 
-#: builtin/pull.c:996
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr ""
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -18049,7 +18305,7 @@ msgid ""
 "commit %s."
 msgstr ""
 
-#: builtin/pull.c:1027
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -18060,15 +18316,23 @@ msgid ""
 "to recover."
 msgstr ""
 
-#: builtin/pull.c:1042
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr ""
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr ""
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1104
+msgid "Cannot fast-forward to multiple branches."
+msgstr ""
+
+#: builtin/pull.c:1119
+msgid "Need to specify how to reconcile divergent branches."
+msgstr ""
+
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 
@@ -18115,7 +18379,7 @@ msgid ""
 "    git push %s HEAD:<name-of-remote-branch>\n"
 msgstr ""
 
-#: builtin/push.c:194
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -18124,12 +18388,17 @@ msgid ""
 "    git push --set-upstream %s %s\n"
 msgstr ""
 
-#: builtin/push.c:202
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+
+#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -18137,12 +18406,7 @@ msgid ""
 "to update which remote branch."
 msgstr ""
 
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-
-#: builtin/push.c:267
+#: builtin/push.c:258
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -18150,7 +18414,7 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
-#: builtin/push.c:273
+#: builtin/push.c:264
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -18158,7 +18422,7 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
-#: builtin/push.c:279
+#: builtin/push.c:270
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -18167,18 +18431,18 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
-#: builtin/push.c:286
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 
-#: builtin/push.c:289
+#: builtin/push.c:280
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
 "without using the '--force' option.\n"
 msgstr ""
 
-#: builtin/push.c:294
+#: builtin/push.c:285
 msgid ""
 "Updates were rejected because the tip of the remote-tracking\n"
 "branch has been updated since the last checkout. You may want\n"
@@ -18186,103 +18450,99 @@ msgid ""
 "before forcing an update.\n"
 msgstr ""
 
-#: builtin/push.c:364
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr ""
 
-#: builtin/push.c:371
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr ""
 
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr ""
 
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
 msgstr ""
 
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr ""
 
-#: builtin/push.c:557
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr ""
 
-#: builtin/push.c:558
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr ""
 
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr ""
 
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr ""
 
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
 msgid "require old value of ref to be at this value"
 msgstr ""
 
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
 msgid "require remote updates to be integrated locally"
 msgstr ""
 
-#: builtin/push.c:569
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr ""
 
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
 msgid "use thin pack"
 msgstr ""
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr ""
 
-#: builtin/push.c:573
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr ""
 
-#: builtin/push.c:576
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr ""
 
-#: builtin/push.c:578
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr ""
 
-#: builtin/push.c:579
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr ""
 
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
 msgstr ""
 
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
 msgid "request atomic transaction on remote side"
 msgstr ""
 
-#: builtin/push.c:601
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr ""
-
-#: builtin/push.c:603
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr ""
 
-#: builtin/push.c:623
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr ""
 
-#: builtin/push.c:624
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -18295,27 +18555,15 @@ msgid ""
 "    git push <name>\n"
 msgstr ""
 
-#: builtin/push.c:639
-msgid "--all and --tags are incompatible"
-msgstr ""
-
-#: builtin/push.c:641
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr ""
 
-#: builtin/push.c:645
-msgid "--mirror and --tags are incompatible"
-msgstr ""
-
-#: builtin/push.c:647
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr ""
 
-#: builtin/push.c:650
-msgid "--all and --mirror are incompatible"
-msgstr ""
-
-#: builtin/push.c:657
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr ""
 
@@ -18367,79 +18615,79 @@ msgstr ""
 #: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
 
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr ""
 
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr ""
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr ""
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
 msgid "perform a merge in addition to a read"
 msgstr ""
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
 msgid "3-way merge if no file level merging required"
 msgstr ""
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
 msgid "3-way merge in presence of adds and removes"
 msgstr ""
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
 msgid "same as -m, but discard unmerged entries"
 msgstr ""
 
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr ""
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
 msgid "read the tree into the index under <subdirectory>/"
 msgstr ""
 
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
 msgid "update working tree with merge result"
 msgstr ""
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr ""
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
 msgid "allow explicitly ignored files to be overwritten"
 msgstr ""
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
 msgid "don't check the working tree after merging"
 msgstr ""
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
 msgid "don't update the index or the work tree"
 msgstr ""
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
 msgid "skip applying sparse checkout filter"
 msgstr ""
 
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr ""
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr ""
 
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
 msgid "You need to resolve your current index first"
 msgstr ""
 
@@ -18458,193 +18706,44 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr ""
 
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr ""
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
 #, c-format
 msgid "could not create temporary %s"
 msgstr ""
 
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
 msgid "could not mark as interactive"
 msgstr ""
 
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
 msgid "could not generate todo list"
 msgstr ""
 
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr ""
 
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr ""
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr ""
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr ""
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr ""
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr ""
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr ""
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr ""
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr ""
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr ""
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr ""
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr ""
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr ""
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr ""
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr ""
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr ""
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr ""
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr ""
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr ""
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr ""
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr ""
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr ""
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr ""
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr ""
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr ""
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr ""
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr ""
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr ""
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr ""
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr ""
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr ""
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr ""
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr ""
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr ""
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr ""
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr ""
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr ""
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
 #, c-format
 msgid "%s requires the merge backend"
 msgstr ""
 
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr ""
 
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr ""
 
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr ""
 
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -18653,7 +18752,7 @@ msgid ""
 "abort\"."
 msgstr ""
 
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
 #, c-format
 msgid ""
 "\n"
@@ -18665,14 +18764,14 @@ msgid ""
 "As a result, git cannot rebase them."
 msgstr ""
 
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
 "\"."
 msgstr ""
 
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -18683,7 +18782,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -18692,195 +18791,194 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
 msgid "exec commands cannot contain newlines"
 msgstr ""
 
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
 msgid "empty exec command"
 msgstr ""
 
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
 msgid "rebase onto given branch instead of upstream"
 msgstr ""
 
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr ""
 
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
 msgid "allow pre-rebase hook to run"
 msgstr ""
 
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
 msgid "be quiet. implies --no-stat"
 msgstr ""
 
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:1035
 msgid "do not show diffstat of what changed upstream"
 msgstr ""
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
 msgid "add a Signed-off-by trailer to each commit"
 msgstr ""
 
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
 msgid "make committer date match author date"
 msgstr ""
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
 msgid "ignore author date and use current date"
 msgstr ""
 
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
 msgid "synonym of --reset-author-date"
 msgstr ""
 
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
 msgid "passed to 'git apply'"
 msgstr ""
 
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
 msgid "ignore changes in whitespace"
 msgstr ""
 
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
 msgid "cherry-pick all commits, even if unchanged"
 msgstr ""
 
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
 msgid "continue"
 msgstr ""
 
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
 msgid "skip current patch and continue"
 msgstr ""
 
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
 msgid "abort and check out the original branch"
 msgstr ""
 
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
 msgid "abort but keep HEAD where it is"
 msgstr ""
 
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
 msgid "edit the todo list during an interactive rebase"
 msgstr ""
 
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
 msgid "show the patch file being applied or merged"
 msgstr ""
 
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
 msgid "use apply strategies to rebase"
 msgstr ""
 
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
 msgid "use merging strategies to rebase"
 msgstr ""
 
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr ""
 
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
 msgid "how to handle commits that become empty"
 msgstr ""
 
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr ""
+
+#: builtin/rebase.c:1097
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr ""
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
 msgid "add exec lines after each commit of the editable list"
 msgstr ""
 
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
 msgid "allow rebasing commits with empty messages"
 msgstr ""
 
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
 msgid "try to rebase merges instead of skipping them"
 msgstr ""
 
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr ""
 
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
 msgid "use the given merge strategy"
 msgstr ""
 
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
 msgid "option"
 msgstr ""
 
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
 msgid "pass the argument through to the merge strategy"
 msgstr ""
 
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
 msgid "rebase all reachable commits up to the root(s)"
 msgstr ""
 
-#: builtin/rebase.c:1424
-msgid "apply all changes, even those already present upstream"
-msgstr ""
-
-#: builtin/rebase.c:1442
-msgid "It looks like 'git am' is in progress. Cannot rebase."
-msgstr ""
-
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
 msgstr ""
 
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
+#: builtin/rebase.c:1128
+msgid "apply all changes, even those already present upstream"
 msgstr ""
 
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
+#: builtin/rebase.c:1149
+msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
 
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
 msgstr ""
 
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr ""
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr ""
 
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr ""
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
 msgid "could not discard worktree changes"
 msgstr ""
 
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
 #, c-format
 msgid "could not move back to %s"
 msgstr ""
 
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -18893,140 +18991,131 @@ msgid ""
 "valuable there.\n"
 msgstr ""
 
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
 msgstr ""
 
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
 #, c-format
 msgid "Unknown mode: %s"
 msgstr ""
 
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
 msgid "--strategy requires --merge or --interactive"
 msgstr ""
 
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
+#: builtin/rebase.c:1463
+msgid "apply options and merge options cannot be used together"
 msgstr ""
 
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr ""
 
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr ""
 
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr ""
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
 msgid "Could not create new root commit"
 msgstr ""
 
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr ""
 
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr ""
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
 #, c-format
-msgid "fatal: no such branch/commit '%s'"
+msgid "no such branch/commit '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2415
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr ""
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
 msgid "Could not resolve HEAD to a revision"
 msgstr ""
 
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
 msgid "Please commit or stash them."
 msgstr ""
 
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
 #, c-format
 msgid "could not switch to %s"
 msgstr ""
 
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
 msgid "HEAD is up to date."
 msgstr ""
 
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr ""
 
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
 msgid "HEAD is up to date, rebase forced."
 msgstr ""
 
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr ""
 
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
 #, c-format
 msgid "Changes to %s:\n"
 msgstr ""
 
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr ""
 
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
 msgid "Could not detach HEAD"
 msgstr ""
 
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr ""
 
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr ""
 
-#: builtin/receive-pack.c:1276
+#: 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"
@@ -19043,7 +19132,7 @@ msgid ""
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
 
-#: builtin/receive-pack.c:1296
+#: 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"
@@ -19055,12 +19144,12 @@ msgid ""
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
 
-#: builtin/receive-pack.c:2479
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr ""
 
-#: builtin/receive-pack.c:2493
-msgid "You must specify a directory."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
 msgstr ""
 
 #: builtin/reflog.c:17
@@ -19080,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:699
+#: 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 ""
 
@@ -19202,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"
@@ -19245,7 +19339,7 @@ msgstr ""
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
 #, c-format
 msgid "remote %s already exists."
 msgstr ""
@@ -19255,25 +19349,30 @@ msgstr ""
 msgid "Could not setup master '%s'"
 msgstr ""
 
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr ""
+
+#: builtin/remote.c:366
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr ""
 
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
 msgid "(matching)"
 msgstr ""
 
-#: builtin/remote.c:466
+#: builtin/remote.c:472
 msgid "(delete)"
 msgstr ""
 
-#: builtin/remote.c:655
+#: builtin/remote.c:660
 #, c-format
 msgid "could not set '%s'"
 msgstr ""
 
-#: builtin/remote.c:660
+#: builtin/remote.c:665
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -19281,17 +19380,17 @@ msgid ""
 "now names the non-existent remote '%s'"
 msgstr ""
 
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
 #, c-format
 msgid "No such remote: '%s'"
 msgstr ""
 
-#: builtin/remote.c:710
+#: builtin/remote.c:715
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr ""
 
-#: builtin/remote.c:730
+#: builtin/remote.c:735
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -19299,17 +19398,17 @@ msgid ""
 "\tPlease update the configuration manually if necessary."
 msgstr ""
 
-#: builtin/remote.c:770
+#: builtin/remote.c:775
 #, c-format
 msgid "deleting '%s' failed"
 msgstr ""
 
-#: builtin/remote.c:804
+#: builtin/remote.c:809
 #, c-format
 msgid "creating '%s' failed"
 msgstr ""
 
-#: builtin/remote.c:882
+#: builtin/remote.c:887
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -19319,118 +19418,118 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:896
+#: builtin/remote.c:901
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr ""
 
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr ""
 
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
 msgid " tracked"
 msgstr ""
 
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
 msgid " stale (use 'git remote prune' to remove)"
 msgstr ""
 
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
 msgid " ???"
 msgstr ""
 
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr ""
 
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr ""
 
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
 #, c-format
 msgid "rebases onto remote %s"
 msgstr ""
 
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
 #, c-format
 msgid " merges with remote %s"
 msgstr ""
 
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
 #, c-format
 msgid "merges with remote %s"
 msgstr ""
 
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr ""
 
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
 msgid "create"
 msgstr ""
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
 msgid "delete"
 msgstr ""
 
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
 msgid "up to date"
 msgstr ""
 
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
 msgid "fast-forwardable"
 msgstr ""
 
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
 msgid "local out of date"
 msgstr ""
 
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr ""
 
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr ""
 
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr ""
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr ""
 
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
 msgid "do not query remotes"
 msgstr ""
 
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
 msgstr ""
 
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr ""
 
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
 msgid "(no URL)"
 msgstr ""
 
@@ -19438,322 +19537,331 @@ msgstr ""
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
 #, c-format
 msgid "  Push  URL: %s"
 msgstr ""
 
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr ""
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
 msgid "(not queried)"
 msgstr ""
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
 msgid "(unknown)"
 msgstr ""
 
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
 msgid " (status not queried)"
 msgstr ""
 
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr ""
 
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr ""
 
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr ""
 
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
 msgid "Cannot determine remote HEAD"
 msgstr ""
 
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
 #, c-format
 msgid "Could not delete %s"
 msgstr ""
 
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr ""
 
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
 #, c-format
 msgid "Could not setup %s"
 msgstr ""
 
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
 #, c-format
 msgid " %s will become dangling!"
 msgstr ""
 
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
 #, c-format
 msgid " %s has become dangling!"
 msgstr ""
 
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
 #, c-format
 msgid "Pruning %s"
 msgstr ""
 
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
 #, c-format
 msgid " * [would prune] %s"
 msgstr ""
 
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
 #, c-format
 msgid " * [pruned] %s"
 msgstr ""
 
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
 msgid "prune remotes after fetching"
 msgstr ""
 
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
 #, c-format
 msgid "No such remote '%s'"
 msgstr ""
 
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
 msgid "add branch"
 msgstr ""
 
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
 msgid "no remote specified"
 msgstr ""
 
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
 msgid "query push URLs rather than fetch URLs"
 msgstr ""
 
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
 msgid "return all URLs"
 msgstr ""
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr ""
 
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
 msgid "manipulate push URLs"
 msgstr ""
 
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
 msgid "add URL"
 msgstr ""
 
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
 msgid "delete URLs"
 msgstr ""
 
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
 msgid "--add --delete doesn't make sense"
 msgstr ""
 
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr ""
 
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
 #, c-format
 msgid "No such URL found: %s"
 msgstr ""
 
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
 msgid "Will not delete all non-push URLs"
 msgstr ""
 
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr ""
+
+#: builtin/repack.c:28
 msgid "git repack [<options>]"
 msgstr ""
 
-#: builtin/repack.c:31
+#: builtin/repack.c:33
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
 
-#: builtin/repack.c:198
+#: builtin/repack.c:201
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:275 builtin/repack.c:820
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 
-#: builtin/repack.c:294
+#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:309
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr ""
 
-#: builtin/repack.c:368
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr ""
 
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: 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:460
+#: builtin/repack.c:498
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr ""
+
+#: builtin/repack.c:516
+msgid "could not close refs snapshot tempfile"
+msgstr ""
+
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr ""
 
-#: builtin/repack.c:462
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 
-#: builtin/repack.c:465
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 
-#: builtin/repack.c:467
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:469
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:471
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr ""
 
-#: builtin/repack.c:474
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:476
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr ""
 
-#: builtin/repack.c:478
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:479
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr ""
 
-#: builtin/repack.c:480
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 
-#: builtin/repack.c:482
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr ""
 
-#: builtin/repack.c:484
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr ""
 
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr ""
 
-#: builtin/repack.c:486
+#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 
-#: builtin/repack.c:488
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr ""
 
-#: builtin/repack.c:490
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr ""
 
-#: builtin/repack.c:492
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr ""
 
-#: builtin/repack.c:494
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 
-#: builtin/repack.c:496
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr ""
 
-#: builtin/repack.c:498
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr ""
 
-#: builtin/repack.c:508
-msgid "cannot delete packs in a precious-objects repo"
+#: builtin/repack.c:670
+msgid "write a multi-pack index of the resulting packs"
 msgstr ""
 
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr ""
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
+#: builtin/repack.c:680
+msgid "cannot delete packs in a precious-objects repo"
 msgstr ""
 
-#: builtin/repack.c:639
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr ""
 
-#: builtin/repack.c:669
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr ""
 
-#: builtin/repack.c:671
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr ""
@@ -19831,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 ""
 
@@ -20001,142 +20103,134 @@ msgstr ""
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr ""
 
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr ""
 
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr ""
 
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
 #, c-format
 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:83
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr ""
 
-#: builtin/reset.c:85
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr ""
 
-#: builtin/reset.c:91
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr ""
 
-#: builtin/reset.c:116
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr ""
 
-#: builtin/reset.c:195
+#: builtin/reset.c:299
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr ""
 
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: 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:297
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr ""
 
-#: builtin/reset.c:298
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr ""
 
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr ""
 
-#: builtin/reset.c:304
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr ""
 
-#: builtin/reset.c:310
+#: builtin/reset.c:411
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 
-#: builtin/reset.c:344
+#: builtin/reset.c:445
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr ""
 
-#: builtin/reset.c:352
+#: builtin/reset.c:453
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr ""
 
-#: builtin/reset.c:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr ""
-
-#: builtin/reset.c:371
+#: builtin/reset.c:472
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 
-#: builtin/reset.c:373
+#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 
-#: builtin/reset.c:388
+#: builtin/reset.c:489
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr ""
 
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr ""
-
-#: builtin/reset.c:413
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr ""
 
-#: builtin/reset.c:416
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -20145,29 +20239,26 @@ msgid ""
 "to make this the default.\n"
 msgstr ""
 
-#: builtin/reset.c:434
+#: builtin/reset.c:541
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr ""
 
-#: builtin/reset.c:439
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr ""
 
-#: builtin/rev-list.c:538
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr ""
-
-#: builtin/rev-list.c:599
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr ""
 
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr ""
 
-#: builtin/rev-list.c:664
-msgid "marked counting is incompatible with --objects"
+#: builtin/rev-list.c:679
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
 msgstr ""
 
 #: builtin/rev-parse.c:409
@@ -20186,6 +20277,18 @@ msgstr ""
 msgid "output in stuck long form"
 msgstr ""
 
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr ""
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr ""
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr ""
+
 #: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -20195,6 +20298,50 @@ msgid ""
 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
 msgstr ""
 
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr ""
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr ""
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr ""
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr ""
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr ""
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr ""
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr ""
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr ""
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr ""
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr ""
+
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr ""
@@ -20269,15 +20416,19 @@ msgstr ""
 msgid "preserve initially empty commits"
 msgstr ""
 
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr ""
+
 #: builtin/revert.c:129
 msgid "keep redundant, empty commits"
 msgstr ""
 
-#: builtin/revert.c:237
+#: builtin/revert.c:241
 msgid "revert failed"
 msgstr ""
 
-#: builtin/revert.c:250
+#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr ""
 
@@ -20319,65 +20470,65 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr ""
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr ""
 
-#: builtin/rm.c:246
+#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr ""
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr ""
 
-#: builtin/rm.c:249
+#: builtin/rm.c:250
 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 
-#: builtin/rm.c:283
+#: builtin/rm.c:285
 msgid "No pathspec was given. Which files should I remove?"
 msgstr ""
 
-#: builtin/rm.c:310
+#: builtin/rm.c:315
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 
-#: builtin/rm.c:331
+#: builtin/rm.c:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr ""
 
-#: builtin/rm.c:379
+#: builtin/rm.c:385
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr ""
 
 #: builtin/send-pack.c:20
 msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-"  --all and explicit <ref> specification are mutually exclusive."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [<host>:]<directory> (--all | <ref>...)"
 msgstr ""
 
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr ""
 
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr ""
 
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr ""
 
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr ""
 
@@ -20434,16 +20585,16 @@ msgstr ""
 msgid "group by field"
 msgstr ""
 
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
 msgid "too many arguments given outside repository"
 msgstr ""
 
 #: builtin/show-branch.c:13
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 
 #: builtin/show-branch.c:17
@@ -20457,113 +20608,108 @@ msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
 #, c-format
 msgid "no matching refs with %s"
 msgstr ""
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
 msgid "show remote-tracking and local branches"
 msgstr ""
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
 msgid "show remote-tracking branches"
 msgstr ""
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
 msgid "color '*!+-' corresponding to the branch"
 msgstr ""
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
 msgid "show <n> more commits after the common ancestor"
 msgstr ""
 
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
 msgid "synonym to more=-1"
 msgstr ""
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
 msgid "suppress naming strings"
 msgstr ""
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
 msgid "include the current branch"
 msgstr ""
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
 msgid "name commits with their object names"
 msgstr ""
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
 msgid "show possible merge bases"
 msgstr ""
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
 msgid "show refs unreachable from any other ref"
 msgstr ""
 
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
 msgid "show commits in topological order"
 msgstr ""
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
 msgid "show only commits not on the first branch"
 msgstr ""
 
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
 msgid "show merges reachable from only one tip"
 msgstr ""
 
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
 msgid "topologically sort, maintaining date order where possible"
 msgstr ""
 
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
 msgid "<n>[,<base>]"
 msgstr ""
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr ""
 
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr ""
 
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
 msgid "--reflog option needs one branch name"
 msgstr ""
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
 #, c-format
 msgid "no such ref %s"
 msgstr ""
 
-#: builtin/show-branch.c:831
+#: 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:835
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr ""
 
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr ""
@@ -20626,74 +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:227
+#: 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:184
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr ""
+
+#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
 msgstr ""
 
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr ""
 
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr ""
 
-#: builtin/sparse-checkout.c:290
+#: 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:310
+#: 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:312
+#: 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:340
-msgid "failed to modify sparse-index config"
-msgstr ""
-
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr ""
 
-#: builtin/sparse-checkout.c:419
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr ""
 
-#: builtin/sparse-checkout.c:431
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr ""
-
-#: builtin/sparse-checkout.c:456
+#: builtin/sparse-checkout.c:557
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr ""
 
-#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
 msgstr ""
 
-#: builtin/sparse-checkout.c:579
+#: 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 ""
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
 msgid "read patterns from standard in"
 msgstr ""
 
-#: builtin/sparse-checkout.c:594
-msgid "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 ""
+
+#: 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:613
+#: builtin/sparse-checkout.c:803
 msgid "git sparse-checkout disable"
 msgstr ""
 
-#: builtin/sparse-checkout.c:644
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr ""
 
@@ -20717,21 +20899,19 @@ msgstr ""
 msgid "git stash branch <branchname> [<stash>]"
 msgstr ""
 
-#: builtin/stash.c:29 builtin/stash.c:70
-msgid "git stash clear"
-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>...]]"
 msgstr ""
 
-#: builtin/stash.c:34 builtin/stash.c:87
+#: 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 ""
 
@@ -20754,6 +20934,12 @@ msgid ""
 "          [--] [<pathspec>...]]"
 msgstr ""
 
+#: builtin/stash.c:87
+msgid ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"               [-u|--include-untracked] [-a|--all] [<message>]"
+msgstr ""
+
 #: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
@@ -20777,7 +20963,7 @@ msgstr ""
 msgid "git stash clear with arguments is unimplemented"
 msgstr ""
 
-#: builtin/stash.c:431
+#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -20785,166 +20971,182 @@ msgid ""
 "         to make room.\n"
 msgstr ""
 
-#: builtin/stash.c:492
+#: builtin/stash.c:508
 msgid "cannot apply a stash in the middle of a merge"
 msgstr ""
 
-#: builtin/stash.c:503
+#: builtin/stash.c:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr ""
 
-#: builtin/stash.c:510
+#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr ""
 
-#: builtin/stash.c:516
+#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr ""
 
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr ""
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr ""
 
-#: builtin/stash.c:549
+#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr ""
 
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr ""
+
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr ""
 
-#: builtin/stash.c:635
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr ""
 
-#: builtin/stash.c:638
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr ""
 
-#: builtin/stash.c:651
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr ""
 
-#: builtin/stash.c:701
+#: builtin/stash.c:718
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 
-#: builtin/stash.c:724
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr ""
 
-#: builtin/stash.c:808
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr ""
 
-#: builtin/stash.c:819
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr ""
 
-#: builtin/stash.c:839
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr ""
 
-#: builtin/stash.c:842
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr ""
 
-#: builtin/stash.c:932 builtin/stash.c:969
+#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr ""
 
-#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr ""
 
-#: builtin/stash.c:960
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr ""
 
-#: builtin/stash.c:1175
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr ""
+
+#: builtin/stash.c:1220
 msgid "No changes selected"
 msgstr ""
 
-#: builtin/stash.c:1275
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr ""
 
-#: builtin/stash.c:1302
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr ""
 
-#: builtin/stash.c:1311
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr ""
 
-#: builtin/stash.c:1322 builtin/stash.c:1331
+#: builtin/stash.c:1367 builtin/stash.c:1386
 msgid "Cannot save the current worktree state"
 msgstr ""
 
-#: builtin/stash.c:1359
+#: 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:1408
+#: builtin/stash.c:1463
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 
-#: builtin/stash.c:1426
+#: 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:1441
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr ""
 
-#: builtin/stash.c:1448
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr ""
 
-#: builtin/stash.c:1463
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr ""
 
-#: builtin/stash.c:1468
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr ""
 
-#: builtin/stash.c:1558
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr ""
 
-#: builtin/stash.c:1597 builtin/stash.c:1662
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr ""
 
-#: builtin/stash.c:1599 builtin/stash.c:1664
+#: 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:1600 builtin/stash.c:1665
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr ""
 
-#: builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr ""
 
-#: builtin/stash.c:1604 builtin/stash.c:1669
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr ""
 
-#: builtin/stash.c:1704
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -20966,47 +21168,54 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr ""
 
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr ""
 
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr ""
 
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:410
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:520
 #, c-format
 msgid "Entering '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
 "."
 msgstr ""
 
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:545
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -21014,220 +21223,209 @@ msgid ""
 "."
 msgstr ""
 
-#: builtin/submodule--helper.c:566
+#: builtin/submodule--helper.c:561
 msgid "suppress output of entering each submodule command"
 msgstr ""
 
-#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
-#: builtin/submodule--helper.c:1488
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
 msgid "recurse into nested submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:573
+#: builtin/submodule--helper.c:568
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr ""
 
-#: builtin/submodule--helper.c:600
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:642
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:646
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:656
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:663
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:710
+#: builtin/submodule--helper.c:685
 msgid "suppress output for initializing a submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:836
+#: builtin/submodule--helper.c:811
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr ""
 
-#: builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:863
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr ""
 
-#: builtin/submodule--helper.c:894
+#: builtin/submodule--helper.c:869
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:918
+#: builtin/submodule--helper.c:893
 msgid "git submodule--helper name <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:965
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr ""
 
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:968
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr ""
 
-#: builtin/submodule--helper.c:1006
+#: builtin/submodule--helper.c:981
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1056
+#: builtin/submodule--helper.c:1031
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1060
+#: builtin/submodule--helper.c:1035
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1301
+#: builtin/submodule--helper.c:1276
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr ""
 
-#: builtin/submodule--helper.c:1303
-msgid "to compare the commit in the index with that in the submodule HEAD"
+#: builtin/submodule--helper.c:1278
+msgid "compare the commit in the index with that in the submodule HEAD"
 msgstr ""
 
-#: builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1280
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1307
+#: builtin/submodule--helper.c:1282
 msgid "limit the summary size"
 msgstr ""
 
-#: builtin/submodule--helper.c:1312
+#: builtin/submodule--helper.c:1287
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1311
 msgid "could not fetch a revision for HEAD"
 msgstr ""
 
-#: builtin/submodule--helper.c:1341
-msgid "--cached and --files are mutually exclusive"
-msgstr ""
-
-#: builtin/submodule--helper.c:1408
+#: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1414
+#: builtin/submodule--helper.c:1379
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c:1393
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1439
+#: builtin/submodule--helper.c:1404
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1486
+#: builtin/submodule--helper.c:1451
 msgid "suppress output of synchronizing submodule url"
 msgstr ""
 
-#: builtin/submodule--helper.c:1493
+#: builtin/submodule--helper.c:1458
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1547
+#: 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:1559
+#: 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:1567
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1569
+#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1580
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1562
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr ""
 
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:1631
+#: builtin/submodule--helper.c:1597
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1645
+#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:1714
+#: 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"
@@ -21235,231 +21433,418 @@ msgid ""
 "'--reference-if-able' instead of '--reference'."
 msgstr ""
 
-#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1792
+#: builtin/submodule--helper.c:1740
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 
-#: builtin/submodule--helper.c:1799
+#: builtin/submodule--helper.c:1747
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr ""
 
-#: builtin/submodule--helper.c:1823
+#: builtin/submodule--helper.c:1772
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
+
+#: builtin/submodule--helper.c:1813
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr ""
+
+#: builtin/submodule--helper.c:1818
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1830
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1862
 msgid "where the new submodule will be cloned to"
 msgstr ""
 
-#: builtin/submodule--helper.c:1826
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr ""
 
-#: builtin/submodule--helper.c:1837
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr ""
 
-#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr ""
 
-#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr ""
 
-#: builtin/submodule--helper.c:1849
+#: 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:1874
+#: builtin/submodule--helper.c:1925
 #, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
+msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1885
+#: builtin/submodule--helper.c:1929
 #, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:2044
 #, c-format
-msgid "directory not empty: '%s'"
+msgid "Submodule path '%s' not initialized"
+msgstr ""
+
+#: builtin/submodule--helper.c:2048
+msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 
-#: builtin/submodule--helper.c:1901
+#: builtin/submodule--helper.c:2078
 #, c-format
-msgid "could not get submodule directory for '%s'"
+msgid "Skipping unmerged submodule %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:2107
 #, c-format
-msgid "Invalid update mode '%s' for submodule path '%s'"
+msgid "Skipping submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1941
+#: builtin/submodule--helper.c:2257
 #, c-format
-msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 
-#: builtin/submodule--helper.c:2042
+#: builtin/submodule--helper.c:2268
 #, c-format
-msgid "Submodule path '%s' not initialized"
+msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 
-#: builtin/submodule--helper.c:2046
-msgid "Maybe you want to use 'update --init'?"
+#: builtin/submodule--helper.c:2373
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2076
+#: builtin/submodule--helper.c:2377
 #, c-format
-msgid "Skipping unmerged submodule %s"
+msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2105
+#: builtin/submodule--helper.c:2381
 #, c-format
-msgid "Skipping submodule '%s'"
+msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2255
+#: builtin/submodule--helper.c:2385
 #, c-format
-msgid "Failed to clone '%s'. Retry scheduled"
+msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2266
+#: builtin/submodule--helper.c:2409
 #, c-format
-msgid "Failed to clone '%s' a second time, aborting"
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:2413
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:2417
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:2421
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr ""
+
+#: 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:2328 builtin/submodule--helper.c:2574
+#: 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:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
 msgid "path into the working tree"
 msgstr ""
 
-#: builtin/submodule--helper.c:2331
+#: 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:2335
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
 msgid "rebase, merge, checkout or none"
 msgstr ""
 
-#: builtin/submodule--helper.c:2341
+#: builtin/submodule--helper.c:2518
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr ""
 
-#: builtin/submodule--helper.c:2344
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr ""
 
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2523
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr ""
 
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr ""
 
-#: builtin/submodule--helper.c:2358
+#: builtin/submodule--helper.c:2535
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:2371
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr ""
 
-#: builtin/submodule--helper.c:2419
+#: builtin/submodule--helper.c:2566
+msgid "suppress output for update by rebase or merge"
+msgstr ""
+
+#: builtin/submodule--helper.c:2567
+msgid "force checkout updates"
+msgstr ""
+
+#: builtin/submodule--helper.c:2569
+msgid "don't fetch new objects from the remote site"
+msgstr ""
+
+#: builtin/submodule--helper.c:2571
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr ""
+
+#: builtin/submodule--helper.c:2572
+msgid "depth for shallow fetch"
+msgstr ""
+
+#: builtin/submodule--helper.c:2582
+msgid "sha1"
+msgstr ""
+
+#: builtin/submodule--helper.c:2583
+msgid "SHA1 expected by superproject"
+msgstr ""
+
+#: builtin/submodule--helper.c:2585
+msgid "subsha1"
+msgstr ""
+
+#: builtin/submodule--helper.c:2586
+msgid "SHA1 of submodule's HEAD"
+msgstr ""
+
+#: builtin/submodule--helper.c:2592
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr ""
+
+#: 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:2542
+#: builtin/submodule--helper.c:2781
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:2637
+#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr ""
 
-#: builtin/submodule--helper.c:2640
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr ""
 
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr ""
 
-#: builtin/submodule--helper.c:2647
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr ""
 
-#: builtin/submodule--helper.c:2666 git-submodule.sh:150
-#, sh-format
+#: 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:2682
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:2686
+#: builtin/submodule--helper.c:2925
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr ""
 
-#: builtin/submodule--helper.c:2719
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr ""
 
-#: builtin/submodule--helper.c:2721
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr ""
 
-#: builtin/submodule--helper.c:2725
+#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:2726
+#: builtin/submodule--helper.c:2965
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:2733
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr ""
 
-#: builtin/submodule--helper.c:2736
-msgid "--branch and --default are mutually exclusive"
+#: builtin/submodule--helper.c:3038
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:3041
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr ""
+
+#: 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: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 ""
+
+#: builtin/submodule--helper.c:3073
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:3110
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:3149
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr ""
+
+#: 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:3222
+#, c-format
+msgid "'%s' already exists in the index"
 msgstr ""
 
-#: builtin/submodule--helper.c:2793 git.c:449 git.c:724
+#: builtin/submodule--helper.c:3225
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:3254
+msgid "branch of repository to add as submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:3255
+msgid "allow adding an otherwise ignored submodule path"
+msgstr ""
+
+#: builtin/submodule--helper.c:3257
+msgid "print only error messages"
+msgstr ""
+
+#: builtin/submodule--helper.c:3261
+msgid "borrow the objects from reference repositories"
+msgstr ""
+
+#: 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:3270
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:3298
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+
+#: builtin/submodule--helper.c:3306
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr ""
+
+#: builtin/submodule--helper.c:3341
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr ""
+
+#: 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:2799
+#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""
@@ -21484,18 +21869,18 @@ msgstr ""
 msgid "shorten ref output"
 msgstr ""
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr ""
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr ""
 
 #: builtin/tag.c:25
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+"        <tagname> [<head>]"
 msgstr ""
 
 #: builtin/tag.c:27
@@ -21506,7 +21891,7 @@ msgstr ""
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
 "[<pattern>...]"
 msgstr ""
 
@@ -21543,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"
@@ -21556,134 +21941,111 @@ msgid ""
 "\tgit tag -f %s %s^{}"
 msgstr ""
 
-#: builtin/tag.c:275
+#: builtin/tag.c:274
 msgid "bad object type."
 msgstr ""
 
-#: builtin/tag.c:328
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr ""
 
-#: builtin/tag.c:335
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr ""
 
-#: builtin/tag.c:446
+#: builtin/tag.c:444
 msgid "list tag names"
 msgstr ""
 
-#: builtin/tag.c:448
+#: builtin/tag.c:446
 msgid "print <n> lines of each tag message"
 msgstr ""
 
-#: builtin/tag.c:450
+#: builtin/tag.c:448
 msgid "delete tags"
 msgstr ""
 
-#: builtin/tag.c:451
+#: builtin/tag.c:449
 msgid "verify tags"
 msgstr ""
 
-#: builtin/tag.c:453
+#: builtin/tag.c:451
 msgid "Tag creation options"
 msgstr ""
 
-#: builtin/tag.c:455
+#: builtin/tag.c:453
 msgid "annotated tag, needs a message"
 msgstr ""
 
-#: builtin/tag.c:457
+#: builtin/tag.c:455
 msgid "tag message"
 msgstr ""
 
-#: builtin/tag.c:459
+#: builtin/tag.c:457
 msgid "force edit of tag message"
 msgstr ""
 
-#: builtin/tag.c:460
+#: builtin/tag.c:458
 msgid "annotated and GPG-signed tag"
 msgstr ""
 
-#: builtin/tag.c:463
+#: builtin/tag.c:461
 msgid "use another key to sign the tag"
 msgstr ""
 
-#: builtin/tag.c:464
+#: builtin/tag.c:462
 msgid "replace the tag if exists"
 msgstr ""
 
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr ""
 
-#: builtin/tag.c:467
+#: builtin/tag.c:465
 msgid "Tag listing options"
 msgstr ""
 
-#: builtin/tag.c:468
+#: builtin/tag.c:466
 msgid "show tag list in columns"
 msgstr ""
 
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
 msgid "print only tags that contain the commit"
 msgstr ""
 
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that don't contain the commit"
 msgstr ""
 
-#: builtin/tag.c:473
+#: builtin/tag.c:471
 msgid "print only tags that are merged"
 msgstr ""
 
-#: builtin/tag.c:474
+#: builtin/tag.c:472
 msgid "print only tags that are not merged"
 msgstr ""
 
-#: builtin/tag.c:478
+#: builtin/tag.c:476
 msgid "print only tags of the object"
 msgstr ""
 
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr ""
-
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:556
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:567
-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:592
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr ""
 
-#: builtin/tag.c:597
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 
-#: builtin/tag.c:628
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
@@ -21697,241 +22059,236 @@ msgstr ""
 msgid "failed to create directory %s"
 msgstr ""
 
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr ""
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr ""
 
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
 msgstr ""
 
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr ""
 
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
 msgid "directory stat info changes after updating a file"
 msgstr ""
 
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
 msgid " OK"
 msgstr ""
 
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr ""
 
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr ""
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr ""
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr ""
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr ""
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr ""
 
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr ""
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr ""
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr ""
 
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr ""
 
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr ""
 
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr ""
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr ""
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
 msgid "do not touch index-only entries"
 msgstr ""
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr ""
 
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr ""
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr ""
 
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr ""
 
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr ""
 
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr ""
 
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr ""
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr ""
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr ""
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr ""
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr ""
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr ""
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr ""
 
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr ""
 
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr ""
 
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr ""
 
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
 
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr ""
 
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
 msgstr ""
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr ""
 
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
 msgstr ""
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr ""
 
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr ""
 
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr ""
 
@@ -21947,19 +22304,19 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr ""
 
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr ""
 
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
 msgstr ""
 
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
 msgstr ""
 
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr ""
 
@@ -21975,19 +22332,19 @@ msgstr ""
 msgid "git upload-pack [<options>] <dir>"
 msgstr ""
 
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
 msgid "quit after a single request/response exchange"
 msgstr ""
 
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
 msgstr ""
 
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr ""
 
@@ -22023,97 +22380,96 @@ msgstr ""
 msgid "print tag contents"
 msgstr ""
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr ""
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr ""
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr ""
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr ""
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr ""
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr ""
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
 msgid "git worktree unlock <path>"
 msgstr ""
 
-#: builtin/worktree.c:61 builtin/worktree.c:935
-#, c-format
-msgid "failed to delete '%s'"
-msgstr ""
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr ""
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
 msgid "report pruned working trees"
 msgstr ""
 
-#: builtin/worktree.c:151
+#: builtin/worktree.c:150
 msgid "expire working trees older than <time>"
 msgstr ""
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c:220
 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 
-#: builtin/worktree.c:230
+#: builtin/worktree.c:229
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr ""
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, 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 ""
 
-#: builtin/worktree.c:237
+#: builtin/worktree.c:236
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
 "use '%s -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 
-#: builtin/worktree.c:288
+#: builtin/worktree.c:287
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr ""
 
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+msgid "initializing"
+msgstr ""
+
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr ""
 
-#: builtin/worktree.c:424
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 
-#: builtin/worktree.c:433
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr ""
 
-#: builtin/worktree.c:439
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr ""
@@ -22138,147 +22494,143 @@ msgstr ""
 msgid "keep the new working tree locked"
 msgstr ""
 
-#: builtin/worktree.c:493
+#: builtin/worktree.c:492 builtin/worktree.c:729
+msgid "reason for locking"
+msgstr ""
+
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr ""
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 
-#: builtin/worktree.c:504
-msgid "-b, -B, and --detach are mutually exclusive"
+#: builtin/worktree.c:512
+msgid "added with --lock"
 msgstr ""
 
-#: builtin/worktree.c:565
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 
-#: builtin/worktree.c:682
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr ""
 
-#: builtin/worktree.c:684
-msgid "add 'prunable' annotation to worktrees older than <time>"
-msgstr ""
-
 #: builtin/worktree.c:693
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:720
-msgid "reason for locking"
+msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 
-#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
-#: builtin/worktree.c:963
+#: 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:734 builtin/worktree.c:767
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
 
-#: builtin/worktree.c:739
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 
-#: builtin/worktree.c:741
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 
-#: builtin/worktree.c:769
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr ""
 
-#: builtin/worktree.c:810
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 
-#: builtin/worktree.c:818
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:841 builtin/worktree.c:965
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr ""
 
-#: builtin/worktree.c:846
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr ""
 
-#: builtin/worktree.c:859
+#: 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:861
+#: 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:864
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr ""
 
-#: builtin/worktree.c:915
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr ""
 
-#: builtin/worktree.c:919
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 
-#: builtin/worktree.c:924
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 
-#: builtin/worktree.c:947
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:970
+#: 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:972
+#: 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:975
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
 
-#: builtin/worktree.c:999
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr ""
 
-#: builtin/worktree.c:1002
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr ""
@@ -22318,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
@@ -22328,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"
@@ -22348,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"
@@ -22380,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:833
+#: git.c:835
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr ""
 
-#: git.c:883
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr ""
 
-#: git.c:896
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
 "\n"
 msgstr ""
 
-#: git.c:916
+#: git.c:918
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 
-#: git.c:928
+#: 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 ""
@@ -22461,147 +22795,109 @@ msgstr ""
 msgid "exit immediately after advertising capabilities"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
 msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
 msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
 msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
 msgid "test-helper simple-ipc send         [<name>] [<token>]"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
 msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
 msgid ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
 msgid "name or pathname of unix domain socket"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
 msgid "named-pipe name"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
 msgid "number of threads in server thread pool"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
 msgid "seconds to wait for daemon to start or stop"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
 msgid "number of bytes"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
 msgid "number of requests per thread"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "byte"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "ballast character"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "token"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "command token to send to the server"
 msgstr ""
 
-#: http.c:399
+#: http.c:350
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 
-#: http.c:420
+#: http.c:371
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr ""
 
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
 msgstr ""
 
-#: http.c:910
+#: http.c:812
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr ""
 
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr ""
-
-#: http.c:1132
+#: http.c:1016
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr ""
 
-#: http.c:1139
+#: http.c:1023
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 
-#: http.c:1143
+#: http.c:1027
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr ""
 
-#: http.c:2035
+#: http.c:1876
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -22614,133 +22910,302 @@ msgstr ""
 msgid "invalid quoting in push-option value: '%s'"
 msgstr ""
 
-#: remote-curl.c:307
+#: remote-curl.c:304
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr ""
 
-#: remote-curl.c:408
+#: remote-curl.c:405
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 
-#: remote-curl.c:439
+#: remote-curl.c:436
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr ""
 
-#: remote-curl.c:499
+#: remote-curl.c:496
 #, c-format
 msgid "repository '%s' not found"
 msgstr ""
 
-#: remote-curl.c:503
+#: remote-curl.c:500
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr ""
 
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+
+#: remote-curl.c:508
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr ""
 
-#: remote-curl.c:513
+#: remote-curl.c:514
 #, c-format
 msgid "redirecting to %s"
 msgstr ""
 
-#: remote-curl.c:642
+#: remote-curl.c:645
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr ""
 
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
+#: remote-curl.c:657
+msgid "remote server sent unexpected response end packet"
 msgstr ""
 
-#: remote-curl.c:724
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 
-#: remote-curl.c:754
+#: remote-curl.c:755
 #, c-format
 msgid "remote-curl: bad line length character: %.4s"
 msgstr ""
 
-#: remote-curl.c:756
+#: remote-curl.c:757
 msgid "remote-curl: unexpected response end packet"
 msgstr ""
 
-#: remote-curl.c:832
+#: remote-curl.c:833
 #, c-format
 msgid "RPC failed; %s"
 msgstr ""
 
-#: remote-curl.c:872
+#: remote-curl.c:873
 msgid "cannot handle pushes this big"
 msgstr ""
 
-#: remote-curl.c:987
+#: remote-curl.c:986
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr ""
 
-#: remote-curl.c:991
+#: remote-curl.c:990
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr ""
 
-#: remote-curl.c:1041
+#: remote-curl.c:1040
 #, c-format
 msgid "%d bytes of length header were received"
 msgstr ""
 
-#: remote-curl.c:1043
+#: remote-curl.c:1042
 #, c-format
 msgid "%d bytes of body are still expected"
 msgstr ""
 
-#: remote-curl.c:1132
+#: remote-curl.c:1131
 msgid "dumb http transport does not support shallow capabilities"
 msgstr ""
 
-#: remote-curl.c:1147
+#: remote-curl.c:1146
 msgid "fetch failed."
 msgstr ""
 
-#: remote-curl.c:1193
+#: remote-curl.c:1192
 msgid "cannot fetch by sha1 over smart http"
 msgstr ""
 
-#: remote-curl.c:1237 remote-curl.c:1243
+#: remote-curl.c:1236 remote-curl.c:1242
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr ""
 
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1254 remote-curl.c:1372
 #, c-format
 msgid "http transport does not support %s"
 msgstr ""
 
-#: remote-curl.c:1291
+#: remote-curl.c:1290
 msgid "git-http-push failed"
 msgstr ""
 
-#: remote-curl.c:1479
+#: remote-curl.c:1478
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr ""
 
-#: remote-curl.c:1511
+#: remote-curl.c:1510
 msgid "remote-curl: error reading command stream from git"
 msgstr ""
 
-#: remote-curl.c:1518
+#: remote-curl.c:1517
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr ""
 
-#: remote-curl.c:1559
+#: remote-curl.c:1558
 #, c-format
 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 ""
@@ -22757,11 +23222,11 @@ msgstr ""
 msgid "object filtering"
 msgstr ""
 
-#: parse-options.h:184
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr ""
 
-#: parse-options.h:198
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr ""
 
@@ -22790,11 +23255,11 @@ msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr ""
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "key"
 msgstr ""
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr ""
 
@@ -22863,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
@@ -23067,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
@@ -23123,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
@@ -23303,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
@@ -23471,44 +23936,13 @@ 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
 msgid "An overview of recommended workflows with Git"
 msgstr ""
 
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr ""
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr ""
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr ""
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr ""
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -23547,475 +23981,66 @@ msgstr ""
 msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr ""
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr ""
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr ""
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr ""
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr ""
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr ""
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-"  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr ""
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:578
+#: git-submodule.sh:411
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:583
+#: git-submodule.sh:416
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr ""
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:197
-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 ""
-
-#: git-rebase--preserve-merges.sh:260
-#, 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 ""
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:601
-#, 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 ""
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, 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 ""
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:807
-#, 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 ""
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr ""
-
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 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
-msgid "Cannot rebase: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr ""
 
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr ""
 
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr ""
 
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr ""
 
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr ""
 
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr ""
 
@@ -24083,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"
@@ -24092,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"
@@ -24101,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"
@@ -24110,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"
@@ -24119,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"
@@ -24128,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"
@@ -24137,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"
@@ -24146,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"
@@ -24155,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"
@@ -24168,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"
@@ -24262,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:138
+#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 
-#: git-send-email.perl:145 git-send-email.perl:151
+#: 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:222
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr ""
 
-#: git-send-email.perl:235
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr ""
 
-#: git-send-email.perl:321
+#: 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:326
+#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr ""
 
-#: git-send-email.perl:419
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr ""
 
-#: git-send-email.perl:493
+#: 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:498 git-send-email.perl:700
+#: 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:501
+#: 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:514
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:545
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:573
+#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 
-#: git-send-email.perl:575
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr ""
 
-#: git-send-email.perl:577
+#: git-send-email.perl:657
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 
-#: git-send-email.perl:582
+#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr ""
 
-#: git-send-email.perl:666
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -24368,29 +24393,29 @@ msgid ""
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
 
-#: git-send-email.perl:687
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr ""
 
-#: git-send-email.perl:720
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
 msgstr ""
 
-#: git-send-email.perl:733
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr ""
 
-#: git-send-email.perl:743
+#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr ""
 
-#: git-send-email.perl:754
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -24399,37 +24424,37 @@ msgid ""
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr ""
 
-#: git-send-email.perl:778
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr ""
 
-#: git-send-email.perl:795
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr ""
 
-#: git-send-email.perl:838
+#: 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:873
+#: git-send-email.perl:971
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr ""
 
-#: git-send-email.perl:928
+#: 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:933
+#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr ""
 
-#: git-send-email.perl:941
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -24438,20 +24463,20 @@ msgid ""
 "want to send.\n"
 msgstr ""
 
-#: git-send-email.perl:960
+#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr ""
 
-#: git-send-email.perl:978
+#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr ""
 
-#: git-send-email.perl:990
+#: 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:1048 git-send-email.perl:1056
+#: git-send-email.perl:1150 git-send-email.perl:1158
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr ""
@@ -24459,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:1060
+#: git-send-email.perl:1162
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 
-#: git-send-email.perl:1377
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr ""
 
-#: git-send-email.perl:1460
+#: 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"
@@ -24485,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:1475
+#: git-send-email.perl:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 
-#: git-send-email.perl:1478
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr ""
 
-#: git-send-email.perl:1506
+#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr ""
 
-#: git-send-email.perl:1553
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr ""
 
-#: git-send-email.perl:1558 git-send-email.perl:1562
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr ""
 
-#: git-send-email.perl:1571
+#: git-send-email.perl:1682
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 
-#: git-send-email.perl:1589
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr ""
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr ""
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr ""
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr ""
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr ""
 
-#: git-send-email.perl:1606
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr ""
 
-#: git-send-email.perl:1609
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr ""
 
-#: git-send-email.perl:1627
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr ""
 
-#: git-send-email.perl:1674 git-send-email.perl:1694
+#: 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:1680
+#: git-send-email.perl:1798
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1737
+#: git-send-email.perl:1855
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1772
+#: git-send-email.perl:1890
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1883
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr ""
 
-#: git-send-email.perl:1890
+#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1894
+#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr ""
 
-#: git-send-email.perl:1924
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr ""
 
-#: git-send-email.perl:1932
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr ""
 
-#: git-send-email.perl:1966
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -24598,25 +24623,25 @@ msgid ""
 "warning: no patches were sent\n"
 msgstr ""
 
-#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039
+#: 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:1979
+#: 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:1997
+#: 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:2001
+#: 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 50e2e1dc3c..aa6f170b8e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-05-17 16:02+0800\n"
-"PO-Revision-Date: 2021-05-17 18:32+0700\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"
 "Language: id\n"
@@ -17,243 +17,244 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: add-interactive.c:376
+#: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Huh (%s)"
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: 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"
 
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
 #: git-add--interactive.perl:294
 msgid "binary"
 msgstr "biner"
 
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
 #: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "tidak ada"
 
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
 #: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "tak berubah"
 
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Perbarui"
 
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
 #, c-format
 msgid "could not stage '%s'"
 msgstr "tidak dapat menggelar '%s'"
 
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "tidak dapat menulis indeks"
 
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
 #, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "%d jalur diperbarui\n"
 msgstr[1] "%d jalur diperbarui\n"
 
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "catatan: %s sekarang tak terlacak.\n"
 
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: 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'"
 
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Kembalikan"
 
-#: add-interactive.c:775
+#: add-interactive.c:779
 msgid "Could not parse HEAD^{tree}"
 msgstr "Tidak dapat menguraikan HEAD^{tree}"
 
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
 #, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "%d jalur dikembalikan\n"
 msgstr[1] "%d jalur dikembalikan\n"
 
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "Tidak ada berkas tak terlacak.\n"
 
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Tambahkan tak terlacak"
 
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
 #, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "%d jalur ditambahkan\n"
 msgstr[1] "%d jalur ditambahkan\n"
 
-#: add-interactive.c:925
+#: add-interactive.c:929
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "mengabaikan tak tergabung: %s"
 
-#: add-interactive.c:937 add-patch.c:1751 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:939 add-patch.c:1749 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:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Pembaruan tambalan"
 
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Tinjau diff"
 
-#: add-interactive.c:1010
+#: add-interactive.c:1014
 msgid "show paths with changes"
 msgstr "perlihatkan jalur dengan perubahan"
 
-#: add-interactive.c:1012
+#: add-interactive.c:1016
 msgid "add working tree state to the staged set of changes"
 msgstr "tambahkan keadaan pohon kerja ke set perubahan yang tergelar"
 
-#: add-interactive.c:1014
+#: add-interactive.c:1018
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "kembalikan set perubahan yang tergelar kembali ke versi HEAD"
 
-#: add-interactive.c:1016
+#: add-interactive.c:1020
 msgid "pick hunks and update selectively"
-msgstr "ambil hunk dan perbarui secara selektif"
+msgstr "ambil bingkah dan perbarui secara selektif"
 
-#: add-interactive.c:1018
+#: add-interactive.c:1022
 msgid "view diff between HEAD and index"
 msgstr "lihat diff antara HEAD dan indeks"
 
-#: add-interactive.c:1020
+#: add-interactive.c:1024
 msgid "add contents of untracked files to the staged set of changes"
 msgstr "tambahkan isi berkas tak terlacak ke set perubahan yang tergelar"
 
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
 msgid "Prompt help:"
 msgstr "Permintaan bantuan:"
 
-#: add-interactive.c:1030
+#: add-interactive.c:1034
 msgid "select a single item"
 msgstr "pilih satu item"
 
-#: add-interactive.c:1032
+#: add-interactive.c:1036
 msgid "select a range of items"
 msgstr "pilih kisaran item"
 
-#: add-interactive.c:1034
+#: add-interactive.c:1038
 msgid "select multiple ranges"
 msgstr "pilih banyak kisaran"
 
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
 msgid "select item based on unique prefix"
 msgstr "pilih item berdasarkan prefiks unik"
 
-#: add-interactive.c:1038
+#: add-interactive.c:1042
 msgid "unselect specified items"
 msgstr "batal pilih item yang disebutkan"
 
-#: add-interactive.c:1040
+#: add-interactive.c:1044
 msgid "choose all items"
 msgstr "pilih semua item"
 
-#: add-interactive.c:1042
+#: add-interactive.c:1046
 msgid "(empty) finish selecting"
 msgstr "(kosong) sudah memilih"
 
-#: add-interactive.c:1079
+#: add-interactive.c:1083
 msgid "select a numbered item"
 msgstr "pilih item bernomor"
 
-#: add-interactive.c:1083
+#: add-interactive.c:1087
 msgid "(empty) select nothing"
 msgstr "(empty) tidak pilih apapun"
 
-#: add-interactive.c:1091 builtin/clean.c:816 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:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Apa sekarang"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "staged"
 msgstr "tergelar"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "tak tergelar"
 
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
-#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
-#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
-#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
+#: 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"
 
-#: add-interactive.c:1151
+#: add-interactive.c:1155
 msgid "could not refresh index"
 msgstr "tidak dapat menyegarkan indeks"
 
-#: add-interactive.c:1165 builtin/clean.c:781 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 hunk ini [y,n,q,a,d%s,?]? "
+msgstr "Gelar bingkah ini [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:39
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "staging."
 msgstr ""
-"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
-"untuk digelar."
+"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
+"ditandai untuk digelar."
 
 #: add-patch.c:42
 msgid ""
@@ -263,39 +264,39 @@ msgid ""
 "a - stage this hunk and all later hunks in the file\n"
 "d - do not stage this hunk or any of the later hunks in the file\n"
 msgstr ""
-"y - gelar hunk ini\n"
-"n - jangan gelar hunk ini\n"
-"q - keluar; jangan gelar hunk ini atau yang sisanya\n"
-"a - gelar hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan gelar hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - gelar bingkah ini\n"
+"n - jangan gelar bingkah ini\n"
+"q - keluar; jangan gelar bingkah ini atau yang sisanya\n"
+"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 hunk ini [y,n,q,a,d%s,?]? "
+msgstr "Stase bingkah ini [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:61
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "stashing."
 msgstr ""
-"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
-"untuk distase."
+"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
+"ditandai untuk distase."
 
 #: add-patch.c:64
 msgid ""
@@ -305,39 +306,39 @@ msgid ""
 "a - stash this hunk and all later hunks in the file\n"
 "d - do not stash this hunk or any of the later hunks in the file\n"
 msgstr ""
-"y - stase hunk ini\n"
-"n - jangan stase hunk ini\n"
-"q - keluar; jangan stase hunk ini atau yang sisanya\n"
-"a - stase hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan stase hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - stase bingkah ini\n"
+"n - jangan stase bingkah ini\n"
+"q - keluar; jangan stase bingkah ini atau yang sisanya\n"
+"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 hunk ini [y,n,q,a,d%s,?]? "
+msgstr "Batal gelar bingkah ini [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:85
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "unstaging."
 msgstr ""
-"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
-"untuk dibatalgelarkan."
+"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
+"ditandai untuk dibatalgelarkan."
 
 #: add-patch.c:88
 msgid ""
@@ -347,39 +348,39 @@ msgid ""
 "a - unstage this hunk and all later hunks in the file\n"
 "d - do not unstage this hunk or any of the later hunks in the file\n"
 msgstr ""
-"y - batal gelar hunk ini\n"
-"n - jangan batal gelar hunk ini\n"
-"q - keluar; jangan batal gelar hunk ini atau yang sisanya\n"
-"a - batal gelar hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan batal gelar hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - batal gelar bingkah ini\n"
+"n - jangan batal gelar bingkah ini\n"
+"q - keluar; jangan batal gelar bingkah ini atau yang sisanya\n"
+"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 hunk ini ke indeks [y,n,q,a,d%s,?]? "
+msgstr "Terapkan bingkah ini ke indeks [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:108 add-patch.c:176 add-patch.c:221
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "applying."
 msgstr ""
-"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
-"untuk diterapkan."
+"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
+"ditandai untuk diterapkan."
 
 #: add-patch.c:111
 msgid ""
@@ -389,43 +390,43 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file\n"
 msgstr ""
-"y - terapkan hunk ini ke indeks\n"
-"n - jangan terapkan hunk ini ke indeks\n"
-"q - keluar; jangan terapkan hunk ini atau yang sisanya\n"
-"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - terapkan bingkah ini ke indeks\n"
+"n - jangan terapkan bingkah ini ke indeks\n"
+"q - keluar; jangan terapkan bingkah ini atau yang sisanya\n"
+"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 hunk ini dari pohon kerja [y,n,q,a,d%s,?]? "
+msgstr "Buang bingkah ini dari pohon kerja [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:131 add-patch.c:154 add-patch.c:199
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "discarding."
 msgstr ""
-"Jika tambalan diterapkan bersih, hunk yang disunting akan langsung ditandai "
-"untuk dibuang."
+"Jika tambalan diterapkan bersih, bingkah yang disunting akan langsung "
+"ditandai untuk dibuang."
 
 #: add-patch.c:134 add-patch.c:202
 msgid ""
@@ -435,31 +436,31 @@ msgid ""
 "a - discard this hunk and all later hunks in the file\n"
 "d - do not discard this hunk or any of the later hunks in the file\n"
 msgstr ""
-"y - buang hunk ini dari pohon kerja\n"
-"n - jangan buang hunk ini dari pohon kerja\n"
-"q - keluar; jangan buang hunk ini atau yang sisanya\n"
-"a - buang hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan buang hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - buang bingkah ini dari pohon kerja\n"
+"n - jangan buang bingkah ini dari pohon kerja\n"
+"q - keluar; jangan buang bingkah ini atau yang sisanya\n"
+"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 hunk ini dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
+msgstr "Buang bingkah ini dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:157
 msgid ""
@@ -469,31 +470,31 @@ msgid ""
 "a - discard this hunk and all later hunks in the file\n"
 "d - do not discard this hunk or any of the later hunks in the file\n"
 msgstr ""
-"y - buang hunk ini dari indeks dan pohon kerja\n"
-"n - jangan buang hunk ini dari indeks dan pohon kerja\n"
-"q - keluar; jangan buang hunk ini atau yang sisanya\n"
-"a - buang hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan buang hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - buang bingkah ini dari indeks dan pohon kerja\n"
+"n - jangan buang bingkah ini dari indeks dan pohon kerja\n"
+"q - keluar; jangan buang bingkah ini atau yang sisanya\n"
+"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 hunk ini ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
+msgstr "Terapkan bingkah ini ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:179
 msgid ""
@@ -503,11 +504,11 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file\n"
 msgstr ""
-"y - terapkan hunk ini ke indeks dan pohon kerja\n"
-"n - jangan terapkan hunk ini ke indeks dan pohon kerja\n"
-"q - keluar; jangan terapkan hunk ini atau yang sisanya\n"
-"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - terapkan bingkah ini ke indeks dan pohon kerja\n"
+"n - jangan terapkan bingkah ini ke indeks dan pohon kerja\n"
+"q - keluar; jangan terapkan bingkah ini atau yang sisanya\n"
+"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:224
 msgid ""
@@ -517,40 +518,40 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file\n"
 msgstr ""
-"y - terapkan hunk ini ke pohon kerja\n"
-"n - jangan terapkan hunk ini ke pohon kerja\n"
-"q - keluar; jangan terapkan hunk ini atau yang sisanya\n"
-"a - terapkan hunk ini dan semua hunk selanjutnya dalam berkas\n"
-"d - jangan terapkan hunk ini atau hunk selanjutnya dalam berkas\n"
+"y - terapkan bingkah ini ke pohon kerja\n"
+"n - jangan terapkan bingkah ini ke pohon kerja\n"
+"q - keluar; jangan terapkan bingkah ini atau yang sisanya\n"
+"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:342
+#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
-msgstr "tidak dapat menguraikan kepala hunk '%.*s'"
+msgstr "tidak dapat menguraikan kepala bingkah '%.*s'"
 
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
-msgstr "tidak dapat menguraikan kepala hunk berwarna '%.*s'"
+msgstr "tidak dapat menguraikan kepala bingkah berwarna '%.*s'"
 
-#: add-patch.c:419
+#: add-patch.c:420
 msgid "could not parse diff"
 msgstr "tidak dapat menguraikan diff"
 
-#: add-patch.c:438
+#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr "tidak dapat menguraikan diff berwarna"
 
-#: add-patch.c:452
+#: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
 msgstr "gagal menjalankan '%s'"
 
-#: add-patch.c:611
+#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
 msgstr "keluaran tak cocok dari interactive.diffFilter"
 
-#: add-patch.c:612
+#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -558,7 +559,7 @@ msgstr ""
 "Saringan Anda haru menjaga korespondensi satu-satu antara masukannya\n"
 "dan baris keluaran."
 
-#: add-patch.c:790
+#: add-patch.c:791
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -567,7 +568,7 @@ msgstr ""
 "baris konteks #%d diharapkan dalam\n"
 "%.*s"
 
-#: add-patch.c:805
+#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -575,16 +576,16 @@ msgid ""
 "\tdoes not end with:\n"
 "%.*s"
 msgstr ""
-"hunk tidak tumpang tindih:\n"
+"bingkah tidak tumpang tindih:\n"
 "%.*s\n"
 "tidak berakhir dengan:\n"
 "%.*s"
 
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Mode sunting hunk manual -- lihat dibawah untuk panduan cepat.\n"
+msgstr "Mode sunting bingkah manual -- lihat dibawah untuk panduan cepat.\n"
 
-#: add-patch.c:1085
+#: add-patch.c:1086
 #, c-format
 msgid ""
 "---\n"
@@ -598,21 +599,21 @@ msgstr ""
 "Baris yang diawali dengan %c akan dihapus.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
 "aborted and the hunk is left unchanged.\n"
 msgstr ""
 "Jika itu tidak diterapkan dengan bersih, Anda akan diberikan kesempatan\n"
-"untuk menyunting lagi. Jika semua baris dalam hunk dihapus, suntingan\n"
-"dibatalkan dan hunk tetap tidak berubah.\n"
+"untuk menyunting lagi. Jika semua baris dalam bingkah dihapus, suntingan\n"
+"dibatalkan dan bingkah tetap tidak berubah.\n"
 
-#: add-patch.c:1132
+#: add-patch.c:1133
 msgid "could not parse hunk header"
-msgstr "tidak dapat menguraikan kepala hunk"
+msgstr "tidak dapat menguraikan kepala bingkah"
 
-#: add-patch.c:1177
+#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr "'git apply --cached' gagal"
 
@@ -628,26 +629,26 @@ 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:1246 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 ""
-"Hunk Anda tak diterapkan. Sunting lagi (bilang \"n\" untuk \"tidak\" buang!) "
-"[y/n]?"
+"Bingkah Anda tak diterapkan. Sunting lagi (bilang \"n\" untuk \"tidak\" "
+"buang!) [y/n]?"
 
-#: add-patch.c:1289
+#: add-patch.c:1290
 msgid "The selected hunks do not apply to the index!"
-msgstr "Hunk yang dipilih tidak diterapkan ke indeks!"
+msgstr "Bingkah yang dipilih tidak diterapkan ke indeks!"
 
-#: add-patch.c:1290 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:1297 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"
 
-#: add-patch.c:1354
+#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -659,155 +660,171 @@ msgid ""
 "e - manually edit the current hunk\n"
 "? - print help\n"
 msgstr ""
-"j - biarkan hunk ini ragu, lihat hunk ragu berikutnya\n"
-"J - biarkan hunk ini ragu, lihat hunk berikutnya\n"
-"k - biarkan hunk ini ragu, lihat hunk ragu sebelumnya\n"
-"K - biarkan hunk ini ragu, lihat hunk sebelumnya\n"
-"g - pilih satu hunk untuk dikunjungi\n"
-"/ - cari satu hunk yang cocok dengan regex yang diberikan\n"
-"s - belah hunk saat ini ke dalam hunk yang lebih kecil\n"
-"e - sunting hunk saat ini secara manual\n"
+"j - biarkan bingkah ini ragu, lihat bingkah ragu berikutnya\n"
+"J - biarkan bingkah ini ragu, lihat bingkah berikutnya\n"
+"k - biarkan bingkah ini ragu, lihat bingkah ragu sebelumnya\n"
+"K - biarkan bingkah ini ragu, lihat bingkah sebelumnya\n"
+"g - pilih satu bingkah untuk dikunjungi\n"
+"/ - cari satu bingkah yang cocok dengan regex yang diberikan\n"
+"s - belah bingkah saat ini ke dalam bingkah yang lebih kecil\n"
+"e - sunting bingkah saat ini secara manual\n"
 "? - cetak bantuan\n"
 
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
-msgstr "Tidak ada hunk sebelumnya"
+msgstr "Tidak ada bingkah sebelumnya"
 
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
-msgstr "Tidak ada hunk selanjutnya"
+msgstr "Tidak ada bingkah selanjutnya"
 
-#: add-patch.c:1537
+#: add-patch.c:1538
 msgid "No other hunks to goto"
-msgstr "Tidak ada hunk lainnya untuk dikunjungi"
+msgstr "Tidak ada bingkah lainnya untuk dikunjungi"
 
-#: add-patch.c:1548 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 hunk yang mana (<ret> untuk lihat lebih)? "
+msgstr "pergi ke bingkah yang mana (<ret> untuk lihat lebih)? "
 
-#: add-patch.c:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
-msgstr "pergi ke hunk yang mana?"
+msgstr "pergi ke bingkah yang mana?"
 
-#: add-patch.c:1560
+#: add-patch.c:1561
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Angka tidak valid: '%s'"
 
-#: add-patch.c:1565
+#: add-patch.c:1566
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
-msgstr[0] "Maaf, hanya %d hunk yang tersedia."
-msgstr[1] "Maaf, hanya %d hunk yang tersedia."
+msgstr[0] "Maaf, hanya %d bingkah yang tersedia."
+msgstr[1] "Maaf, hanya %d bingkah yang tersedia."
 
-#: add-patch.c:1574
+#: add-patch.c:1575
 msgid "No other hunks to search"
-msgstr "Tidak ada hunk lainnya untuk dicari"
+msgstr "Tidak ada bingkah lainnya untuk dicari"
 
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "cari untuk regex? "
 
-#: add-patch.c:1595
+#: add-patch.c:1596
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "regexp pencarian %s cacat: %s"
 
-#: add-patch.c:1612
+#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
-msgstr "Tidak ada hunk yang cocok dengan pola yang diberikan"
+msgstr "Tidak ada bingkah yang cocok dengan pola yang diberikan"
 
-#: add-patch.c:1619
+#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
-msgstr "Maaf, tidak dapat membelah hunk ini"
+msgstr "Maaf, tidak dapat membelah bingkah ini"
 
-#: add-patch.c:1623
+#: add-patch.c:1624
 #, c-format
 msgid "Split into %d hunks."
-msgstr "Terbelah ke dalam %d hunk."
+msgstr "Terbelah ke dalam %d bingkah."
 
-#: add-patch.c:1627
+#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
-msgstr "Maaf, tidak dapat menyunting hunk ini"
+msgstr "Maaf, tidak dapat menyunting bingkah ini"
 
-#: add-patch.c:1679
+#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr "'git apply' gagal"
 
-#: advice.c:145
+#: advice.c:78
 #, c-format
 msgid ""
 "\n"
 "Disable this message with \"git config advice.%s false\""
 msgstr ""
+"\n"
+"Nonaktifkan pesan ini dengan \"git config advice.%s false\""
 
-#: advice.c:161
+#: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
-msgstr ""
+msgstr "%shint: %.*s%s\n"
 
-#: advice.c:252
+#: 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:254
+#: 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:256
+#: 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:258
+#: 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:260
+#: 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:262
+#: 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:270
+#: 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:278
+#: advice.c:204
 msgid "Exiting because of an unresolved conflict."
-msgstr ""
+msgstr "Keluar karena sebuah konflik tak terselesaikan."
 
-#: advice.c:283 builtin/merge.c:1374
+#: 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:285
+#: advice.c:211
 msgid "Please, commit your changes before merging."
-msgstr ""
+msgstr "Mohon komit perubahan Anda sebelum menggabungkan."
 
-#: advice.c:286
+#: advice.c:212
 msgid "Exiting because of unfinished merge."
-msgstr ""
+msgstr "Keluar karena penggabungan belum selesai."
 
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "Tidak mungkin untuk maju cepat, batalkan."
+
+#: advice.c:227
 #, 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"
+"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 ""
+"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:303
+#: advice.c:234
 msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"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 ""
+"Jika Anda berniat memperbarui entri tersebut, coba salah satu dari:\n"
+"* Gunakan opsi --sparse\n"
+"* Nonaktifkan atau modifikasi aturan kejarangan."
 
-#: advice.c:310
+#: advice.c:242
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -829,85 +846,118 @@ 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
 msgid "unrecognized whitespace option '%s'"
-msgstr ""
+msgstr "opsi spasi putih tidak dikenal '%s'"
 
 #: apply.c:86
 #, c-format
 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"
-msgstr ""
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr ""
+msgstr "opsi abai spasi putih tidak dikenal '%s'"
+
+#: 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
 msgid "Cannot prepare timestamp regexp %s"
-msgstr ""
+msgstr "Tidak dapat menyiapkan ekspresi reguler stempel waktu %s"
 
 #: apply.c:809
 #, c-format
 msgid "regexec returned %d for input: %s"
-msgstr ""
+msgstr "regexec kembalikan %d untuk input: %s"
 
 #: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
-msgstr ""
+msgstr "tidak dapat menemukan nama berkas dalam tambalan pada baris %d"
 
 #: apply.c:921
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr ""
+msgstr "git apply: git-diff jelek - berharap /dev/null, dapat %s pada baris %d"
 
 #: apply.c:927
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
+"git apply: git-diff jelek - nama berkas baru tidak konsisten pada baris %d"
 
 #: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
+"git apply: git-diff jelek - nama berkas lama tidak konsisten pada baris %d"
 
 #: apply.c:933
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr ""
+msgstr "git apply: git-diff jelek - berharap /dev/null pada baris %d"
 
 #: apply.c:962
 #, c-format
 msgid "invalid mode on line %d: %s"
-msgstr ""
+msgstr "mode tidak valid pada baris %d: %s"
 
 #: apply.c:1281
 #, c-format
 msgid "inconsistent header lines %d and %d"
-msgstr ""
+msgstr "kepala baris %d dan %d tidak konsisten"
 
 #: apply.c:1371
 #, c-format
@@ -918,578 +968,590 @@ msgid_plural ""
 "git diff header lacks filename information when removing %d leading pathname "
 "components (line %d)"
 msgstr[0] ""
+"kepala git diff kekurangan informasi nama berkas ketika menghapus %d "
+"komponen nama jalur terkemuka (baris %d)"
 msgstr[1] ""
+"kepala git diff kekurangan informasi nama berkas ketika menghapus %d "
+"komponen nama jalur terkemuka (baris %d)"
 
 #: apply.c:1384
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
-msgstr ""
+msgstr "kepala git diff kekurangan informasi nama berkas (baris %d)"
 
 #: apply.c:1480
 #, c-format
 msgid "recount: unexpected line: %.*s"
-msgstr ""
+msgstr "recount: baris tidak diharapkan: %.*s"
 
 #: apply.c:1549
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
-msgstr ""
+msgstr "pecahan tambalan tanpa kepala pada baris %d: %.*s"
 
 #: apply.c:1752
 msgid "new file depends on old contents"
-msgstr ""
+msgstr "berkas baru bergantung pada konten yang lama"
 
 #: apply.c:1754
 msgid "deleted file still has contents"
-msgstr ""
+msgstr "berkas terhapus masih ada konten"
 
 #: apply.c:1788
 #, c-format
 msgid "corrupt patch at line %d"
-msgstr ""
+msgstr "tambalan rusak pada baris %d"
 
 #: apply.c:1825
 #, c-format
 msgid "new file %s depends on old contents"
-msgstr ""
+msgstr "berkas baru %s bergantung pada konten yang lama"
 
 #: apply.c:1827
 #, c-format
 msgid "deleted file %s still has contents"
-msgstr ""
+msgstr "berkas yang dihapus %s masih ada konten"
 
 #: apply.c:1830
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
-msgstr ""
+msgstr "** peringatan: berkas %s menjadi kosong tetapi tidak dihapus"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
-msgstr ""
+msgstr "tambalan biner rusak pada baris %d: %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
-msgstr ""
+msgstr "tambalan biner tidak dikenal pada baris %d"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
-msgstr ""
+msgstr "tambal dengan hanya sampah pada baris %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
-msgstr ""
+msgstr "tidak dapat membaca tautan simbolik %s"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
-msgstr ""
+msgstr "tidak dapat membuka atau membaca %s"
 
-#: apply.c:2935
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
-msgstr ""
+msgstr "awal baris tidak valid: '%c'"
 
-#: apply.c:3056
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bingkah #%d berhasil pada %d (ganti %d baris)."
+msgstr[1] "Bingkah #%d berhasil pada %d (ganti %d baris)."
 
-#: apply.c:3068
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr ""
+msgstr "Konteks dikurangi menjadi (%ld/%ld) untuk terapkan pecahan pada %d"
 
-#: apply.c:3074
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
 "%.*s"
 msgstr ""
+"ketika mencari:\n"
+"%.*s"
 
-#: apply.c:3096
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
-msgstr ""
+msgstr "data tambalan biner hilang untuk '%s'"
 
-#: apply.c:3104
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
+"tidak dapat menerapkan balik tambalan biner tanpa membalikkan bingkah ke '%s'"
 
-#: apply.c:3151
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
-msgstr ""
+msgstr "tidak dapat menerapkan tambalan biner ke '%s' tanpa baris indeks penuh"
 
-#: apply.c:3162
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
+"tambalan diterapkan ke '%s' (%s), yang tidak cocok dengan konten saat ini."
 
-#: apply.c:3170
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
-msgstr ""
+msgstr "tambalan diterapkan ke '%s' kosong tapi tidak kosong"
 
-#: apply.c:3188
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
-msgstr ""
+msgstr "pascacitra %s yang diperlukan untuk '%s' tidak dapat dibaca"
 
-#: apply.c:3201
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
-msgstr ""
+msgstr "tambalan biner tidak dapat diterapkan ke '%s'"
 
-#: apply.c:3208
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
+"tambalan biner ke '%s' membuat hasil yang salah (diharapkan %s, dapat %s)"
 
-#: apply.c:3229
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
-msgstr ""
+msgstr "tambalan gagal: %s:%ld"
 
-#: apply.c:3352
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
-msgstr ""
+msgstr "tidak dapat men-checkout %s"
 
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 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 ""
+msgstr "gagal membaca %s"
 
-#: apply.c:3412
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
-msgstr ""
+msgstr "membaca dari '%s' diluar tautan simbolik"
 
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
-msgstr ""
+msgstr "jalus %s sudah dinamai ulang/dihapus"
 
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
-msgstr ""
+msgstr "%s: tidak ada di indeks"
 
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
-msgstr ""
+msgstr "%s: tidak cocok dengan indeks"
 
-#: apply.c:3571
+#: 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:3574
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
-msgstr ""
+msgstr "Melakukan penggabungan 3 arah...\n"
 
-#: apply.c:3590 apply.c:3594
+#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
-msgstr ""
+msgstr "tidak dapat membaca konten saat ini dari '%s'"
 
-#: apply.c:3606
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
-msgstr ""
+msgstr "Gagal melakukan penggabungan 3 arah...\n"
 
-#: apply.c:3620
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
-msgstr ""
+msgstr "Tambalan diterapkan ke '%s' dengan konflik.\n"
 
-#: apply.c:3625
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
-msgstr ""
+msgstr "Tambalan diterapkan ke '%s' dengan rapi.\n"
 
-#: apply.c:3642
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
-msgstr ""
+msgstr "Mundur ke penerapan langsung...\n"
 
-#: apply.c:3654
+#: apply.c:3678
 msgid "removal patch leaves file contents"
-msgstr ""
+msgstr "tambalan penghapusan meninggalkan isi berkas"
 
-#: apply.c:3727
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
-msgstr ""
+msgstr "%s: salah tipe"
 
-#: apply.c:3729
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
-msgstr ""
+msgstr "%s bertipe %o, diharapkan %o"
 
-#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
-#: read-cache.c:1351
+#: 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 ""
+msgstr "jalur tidak valid '%s'"
 
-#: apply.c:3952
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
-msgstr ""
+msgstr "%s: sudah ada di indeks"
 
-#: apply.c:3956
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
-msgstr ""
+msgstr "%s: sudah ada di direktori kerja"
 
-#: apply.c:3976
+#: apply.c:4000
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr ""
+msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o)"
 
-#: apply.c:3981
+#: apply.c:4005
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr ""
+msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o) dari %s"
 
-#: apply.c:4001
+#: apply.c:4025
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
-msgstr ""
+msgstr "berkas yang terpengaruh '%s' diluar tautan simbolik"
 
-#: apply.c:4005
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
-msgstr ""
+msgstr "%s: tambalan tak diterapkan"
 
-#: apply.c:4020
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
-msgstr ""
+msgstr "Memeriksa tambalan %s..."
 
-#: apply.c:4112
+#: apply.c:4136
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
-msgstr ""
+msgstr "informasi sha1 kurang atau tidak berguna untuk submodul %s"
 
-#: apply.c:4119
+#: apply.c:4143
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
-msgstr ""
+msgstr "perubahan mode untuk %s, yang bukan dalam HEAD saat ini"
 
-#: apply.c:4122
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
-msgstr ""
+msgstr "informasi sha1 kurang atau tidak berguna (%s)"
 
-#: apply.c:4131
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
-msgstr ""
+msgstr "tidak dapat menambahkan %s ke indeks sementara"
 
-#: apply.c:4141
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
-msgstr ""
+msgstr "tidak dapat menulis indeks sementara ke %s"
 
-#: apply.c:4279
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
-msgstr ""
+msgstr "tidak dapat menghapus %s dari indeks"
 
-#: apply.c:4313
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
-msgstr ""
+msgstr "tambalan rusak untuk submodul %s"
 
-#: apply.c:4319
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
-msgstr ""
+msgstr "tidak dapat men-stat berkas yang baru dibuat '%s'"
 
-#: apply.c:4327
+#: 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:4333 apply.c:4478
+#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
-msgstr ""
+msgstr "tidak dapat menambahkan entri tembolok untuk %s"
 
-#: apply.c:4376 builtin/bisect--helper.c:523
+#: 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 ""
+msgstr "gagal menulis ke '%s'"
 
-#: apply.c:4380
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
-msgstr ""
+msgstr "menutup berkas '%s'"
 
-#: apply.c:4450
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
-msgstr ""
+msgstr "tidak dapat menulis berkas '%s' mode %o"
 
-#: apply.c:4548
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
-msgstr ""
+msgstr "Tambalan %s diterapkan dengan rapi."
 
-#: apply.c:4556
+#: apply.c:4580
 msgid "internal error"
-msgstr ""
+msgstr "kesalahan internal"
 
-#: apply.c:4559
+#: apply.c:4583
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Menerapkan tambalan %%s dengan %d penolakan..."
+msgstr[1] "Menerapkan tambalan %%s dengan %d penolakan..."
 
-#: apply.c:4570
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
-msgstr ""
+msgstr "memotong nama berkas .rej ke %.*s.rej"
 
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
-msgstr ""
+msgstr "tidak dapat membuka %s"
 
-#: apply.c:4592
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
-msgstr ""
+msgstr "Bingkah #%d diterapkan dengan rapi."
 
-#: apply.c:4596
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
-msgstr ""
+msgstr "Bingkah #%d ditolak."
 
-#: apply.c:4725
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
-msgstr ""
+msgstr "Tambalan '%s' dilewatkan."
 
-#: apply.c:4733
-msgid "unrecognized input"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
 msgstr ""
 
-#: apply.c:4753
+#: apply.c:4779
 msgid "unable to read index file"
-msgstr ""
+msgstr "tidak dapa membaca berkas indeks"
 
-#: apply.c:4910
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
-msgstr ""
+msgstr "tidak dapat membuka tambalan '%s': %s"
 
-#: apply.c:4937
+#: apply.c:4963
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d kesalahan spasi putih dipadamkan"
+msgstr[1] "%d kesalahan spasi putih dipadamkan"
 
-#: apply.c:4943 apply.c:4958
+#: 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] ""
+msgstr[0] "%d baris menambahkan kesalahan spasi putih."
+msgstr[1] "%d baris menambahkan kesalahan spasi putih."
 
-#: apply.c:4951
+#: 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] ""
+msgstr[0] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih."
+msgstr[1] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih."
 
-#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
-msgstr ""
+msgstr "Tidak dapat menulis berkas indeks baru"
 
-#: apply.c:4995
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
-msgstr ""
+msgstr "jangan terapkan perubahan yang cocok dengan jalur yang diberikan"
 
-#: apply.c:4998
+#: apply.c:5024
 msgid "apply changes matching the given path"
-msgstr ""
+msgstr "terapkan perubahan yang cocok dengan jalur yang diberikan"
 
-#: apply.c:5000 builtin/am.c:2317
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
-msgstr ""
+msgstr "jumlah"
 
-#: apply.c:5001
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
-msgstr ""
+msgstr "hapus <jumlah> garis miring terkemuka dari jalur diff tradisional"
 
-#: apply.c:5004
+#: apply.c:5030
 msgid "ignore additions made by the patch"
-msgstr ""
+msgstr "abaikan penambahan yang dibuat oleh tambalan"
 
-#: apply.c:5006
+#: apply.c:5032
 msgid "instead of applying the patch, output diffstat for the input"
-msgstr ""
+msgstr "daripada menerapkan tambalan, keluarkan diffstat untuk masukan"
 
-#: apply.c:5010
+#: 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:5012
+#: apply.c:5038
 msgid "instead of applying the patch, output a summary for the input"
-msgstr ""
+msgstr "daripada menerapkan tambalan, keluarkan ringkasan untuk masukan"
 
-#: apply.c:5014
+#: apply.c:5040
 msgid "instead of applying the patch, see if the patch is applicable"
-msgstr ""
+msgstr "daripada menerapkan tambalan, lihat jika tambalan bisa diterapkan"
 
-#: apply.c:5016
+#: apply.c:5042
 msgid "make sure the patch is applicable to the current index"
-msgstr ""
+msgstr "pastikan tambalan bisa diterapkan ke indeks saat ini"
 
-#: apply.c:5018
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
-msgstr ""
+msgstr "tandai berkas baru dengan `git add --intent-to-add`"
 
-#: apply.c:5020
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
-msgstr ""
+msgstr "terapkan sebuah tambalan tanpa menyentuh pohon kerja"
 
-#: apply.c:5022
+#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
-msgstr ""
+msgstr "terima sebuah tambalan yang menyentuh di luar area kerja"
 
-#: apply.c:5025
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr ""
+msgstr "juga terapkan tambalan (gunakan dengan --stat/--summary/--check)"
 
-#: apply.c:5027
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
-msgstr ""
+msgstr "coba penggabungan tiga arah, mundur ke penambalan normal jika gagal"
 
-#: apply.c:5029
+#: apply.c:5055
 msgid "build a temporary index based on embedded index information"
-msgstr ""
+msgstr "bangun sebuah indeks sementara berdasarkan informasi indeks tertanam"
 
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
-msgstr ""
+msgstr "jalur dipisahkan dengan karakter NUL"
 
-#: apply.c:5034
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
-msgstr ""
+msgstr "pastikan setidaknya <n> baris dari konteks cocokan"
 
-#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296
+#: 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:3831
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
 msgid "action"
-msgstr ""
+msgstr "aksi"
 
-#: apply.c:5036
+#: apply.c:5062
 msgid "detect new or modified lines that have whitespace errors"
-msgstr ""
+msgstr "deteksi baris baru atau yang diubah yang ada kesalahan spasi putih"
 
-#: apply.c:5039 apply.c:5042
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
-msgstr ""
+msgstr "abaikan perubahan spasi putih ketika menemukan konteks"
 
-#: apply.c:5045
+#: apply.c:5071
 msgid "apply the patch in reverse"
-msgstr ""
+msgstr "terapkan tambalan terbalik"
 
-#: apply.c:5047
+#: apply.c:5073
 msgid "don't expect at least one line of context"
-msgstr ""
+msgstr "jangan harap setidaknya satu baris konteks"
 
-#: apply.c:5049
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr ""
+msgstr "tinggalkan bingkah yang ditolak pada berkas *.rej yang bersesuaian"
 
-#: apply.c:5051
+#: apply.c:5077
 msgid "allow overlapping hunks"
-msgstr ""
-
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
-#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr ""
+msgstr "perbolehkan bingkah yang tumpang tindih"
 
-#: apply.c:5054
+#: apply.c:5080
 msgid "tolerate incorrectly detected missing new-line at the end of file"
-msgstr ""
+msgstr "tolerir baris baru hilang yang salah dideteksi pada akhir berkas"
 
-#: apply.c:5057
+#: apply.c:5083
 msgid "do not trust the line counts in the hunk headers"
-msgstr ""
+msgstr "jangan percaya hitungan baris pada kepala bingkah"
 
-#: apply.c:5059 builtin/am.c:2305
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
-msgstr ""
+msgstr "akar"
 
-#: apply.c:5060
+#: apply.c:5086
 msgid "prepend <root> to all filenames"
-msgstr ""
+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:244 builtin/pack-objects.c:247
+#: 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>...]"
@@ -1510,283 +1572,295 @@ 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:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
-#: builtin/merge.c:1143
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
 msgstr "tidak dapat membaca '%s'"
 
-#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
+#: 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"
 
-#: archive.c:451
+#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "tidak ada referensi seperti: %.*s"
 
-#: archive.c:457
+#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "bukan nama objek valid: %s"
 
-#: archive.c:470
+#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "bukan objek pohon: %s"
 
-#: archive.c:482
+#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "direktori kerja saat ini tak terlacak"
 
-#: archive.c:523
+#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Berkas tidak ditemukan: %s"
 
-#: archive.c:525
+#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "Bukan berkas reguler: %s"
 
-#: archive.c:552
+#: archive.c:551
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:552
+#: archive.c:551
 msgid "archive format"
 msgstr "format arsip"
 
-#: archive.c:553 builtin/log.c:1772
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "prefiks"
 
-#: archive.c:554
+#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
 msgstr "tambahkan prefiks di depan setiap nama jalur dalam arsip"
 
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: 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: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"
 
-#: archive.c:556
+#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "tambahkan berkas tak terlacak ke arsip"
 
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
 msgid "write the archive to this file"
 msgstr "tulis arsip ke berkas ini"
 
-#: archive.c:561
+#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "baca .gitattributes dalam direktori kerja"
 
-#: archive.c:562
+#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "laporkan berkas terarsip ke error standar"
 
-#: archive.c:564
+#: archive.c:563
 msgid "set compression level"
 msgstr "setel level kompresi"
 
-#: archive.c:567
+#: archive.c:566
 msgid "list supported archive formats"
 msgstr "daftar format arsip yang didukung"
 
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "repositori"
 
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "ambil arsip dari repositori remote <repo>"
 
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
 msgid "command"
 msgstr "perintah"
 
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
 msgid "path to the remote git-upload-archive command"
 msgstr "jalur ke perintah git-upload-archive remote"
 
-#: archive.c:579
+#: archive.c:578
 msgid "Unexpected option --remote"
 msgstr "Opsi --remote tak diharapkan"
 
-#: archive.c:581
-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:583
+#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Opsi --output tak diharapkan"
 
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "Opsi --add-file dan --remote tidak dapat digunakan bersamaan"
-
-#: archive.c:607
+#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Format arsip tidak dikenal '%s'"
 
-#: archive.c:616
+#: archive.c:615
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argumen tidak didukung untuk format '%s': -%d"
 
-#: attr.c:202
+#: attr.c:203
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr ""
 
-#: attr.c:363
+#: attr.c:364
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr ""
 
-#: attr.c:403
+#: attr.c:404
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
 msgstr ""
 
-#: bisect.c:489
+#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
-msgstr ""
+msgstr "Kontent terkutip jelek dalam berkas '%s': %s"
 
-#: bisect.c:699
+#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
-msgstr ""
+msgstr "Kami tidak dapat membagi dua lagi!\n"
 
-#: bisect.c:766
+#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
-msgstr ""
+msgstr "Bukan sebuah nama komit yang valid %s"
 
-#: bisect.c:791
+#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
 "This means the bug has been fixed between %s and [%s].\n"
 msgstr ""
+"Dasar penggabungan %s jelek.\n"
+"Ini berarti bug telah diperbaiki antara %s dan [%s].\n"
 
-#: bisect.c:796
+#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
 "The property has changed between %s and [%s].\n"
 msgstr ""
+"Dasar penggabungan %s baru.\n"
+"Properti telah berubah antara %s dan [%s].\n"
 
-#: bisect.c:801
+#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
 "This means the first '%s' commit is between %s and [%s].\n"
 msgstr ""
+"Dasar penggabungan %s adalah %s.\n"
+"Ini berarti komit '%s' pertama adalah di antara %s dan [%s].\n"
 
-#: bisect.c:809
+#: bisect.c:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
 "git bisect cannot work properly in this case.\n"
 "Maybe you mistook %s and %s revs?\n"
 msgstr ""
+"Beberapa revisi %s bukan nenek moyang dari revisi %s.\n"
+"git bisect tidak dapat bekerja dengan benar pada kasus ini.\n"
+"Mungkin Anda salah mengira revisi %s dan %s?\n"
 
-#: bisect.c:822
+#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
 "So we cannot be sure the first %s commit is between %s and %s.\n"
 "We continue anyway."
 msgstr ""
+"dasar penggabungan antara %s dan [%s] harus dilewatkan.\n"
+"Jadi kami tidak dapat yakin komit %s pertama di antara %s dan %s.\n"
+"Kami tetap lanjutkan."
 
-#: bisect.c:861
+#: bisect.c:859
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
-msgstr ""
+msgstr "Membagi dua: dasar penggabungan harus diuji\n"
 
-#: bisect.c:911
+#: bisect.c:909
 #, c-format
 msgid "a %s revision is needed"
-msgstr ""
+msgstr "sebuah revisi %s diperlukan"
 
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
 #, c-format
 msgid "could not create file '%s'"
-msgstr ""
+msgstr "tidak dapat membuat berkas '%s'"
 
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
-msgstr ""
+msgstr "tidak dapat membaca berkas '%s'"
 
-#: bisect.c:1027
+#: bisect.c:1025
 msgid "reading bisect refs failed"
-msgstr ""
+msgstr "gagal membaca berkas referensi bagi dua"
 
-#: bisect.c:1057
+#: bisect.c:1055
 #, c-format
 msgid "%s was both %s and %s\n"
-msgstr ""
+msgstr "%s sama-sama %s dan %s\n"
 
-#: bisect.c:1066
+#: bisect.c:1064
 #, c-format
 msgid ""
 "No testable commit found.\n"
 "Maybe you started with bad path arguments?\n"
 msgstr ""
+"Tidak ada komit yang bisa diuji ditemukan.\n"
+"Mungkin Anda mulai dengan argumen jalur jelek?\n"
 
-#: bisect.c:1095
+#: bisect.c:1093
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(kira-kira %d langkah)"
+msgstr[1] "(kira-kira %d langkah)"
 
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1101
+#: bisect.c:1099
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Membagi dua: %d revisi tersisa untuk diuji setelah ini %s\n"
+msgstr[1] "Membagi dua: %d revisi tersisa untuk diuji setelah ini %s\n"
 
 #: blame.c:2776
 msgid "--contents and --reverse do not blend well."
-msgstr ""
+msgstr "--contents dan --reverse tidak dapat dipadu dengan baik."
 
 #: blame.c:2790
 msgid "cannot use --contents with final commit object name"
-msgstr ""
+msgstr "tidak dapat menggunakan --contents dengan nama objek komit final"
 
 #: blame.c:2811
 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:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
-#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
-#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
-#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
+#: 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 "persiapan jalan revisi gagal"
 
@@ -1794,105 +1868,107 @@ msgstr "persiapan jalan revisi gagal"
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
+"--reverse --first-parent bersama-sama butuh rentang bersama rantai induk "
+"pertama"
 
 #: blame.c:2849
 #, c-format
 msgid "no such path %s in %s"
-msgstr ""
+msgstr "tidak ada jalur seperti %s di %s"
 
 #: blame.c:2860
 #, c-format
 msgid "cannot read blob %s for path %s"
-msgstr ""
+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 ""
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr ""
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "tak melacak: informasi ambigu untuk referensi %s"
 
-#: 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"
@@ -1904,153 +1980,154 @@ 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:41
+#: bundle.c:44
 #, c-format
 msgid "unrecognized bundle hash algorithm: %s"
-msgstr ""
+msgstr "algoritma hash bundel tidak dikenal: %s"
 
-#: bundle.c:45
+#: bundle.c:48
 #, c-format
 msgid "unknown capability '%s'"
-msgstr ""
+msgstr "kapabilitas '%s' tidak dikenal"
 
-#: bundle.c:71
+#: bundle.c:74
 #, c-format
 msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr ""
+msgstr "'%s' tidak terlihat seperti berkas bundel v2 atau v3"
 
-#: bundle.c:110
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
-msgstr ""
+msgstr "kepala tidak dikenal: %s%s (%d)"
 
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: 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'"
-msgstr ""
+msgstr "tidak dapat membuka '%s'"
 
-#: bundle.c:189
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
-msgstr ""
+msgstr "Repositori kekurangan komit prasyarat berikut:"
 
-#: bundle.c:192
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
-msgstr ""
+msgstr "perlu sebuah repositori untuk verifikasi bundel"
 
-#: bundle.c:243
+#: bundle.c:257
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bundel berisi referensi ini:"
+msgstr[1] "Bundel berisi %d referensi berikut:"
 
-#: bundle.c:250
+#: bundle.c:264
 msgid "The bundle records a complete history."
-msgstr ""
+msgstr "Bundel merekam riwayat penuh."
 
-#: bundle.c:252
+#: bundle.c:266
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bundel membutuhkan referensi ini:"
+msgstr[1] "Bundel membutuhkan %d referensi berikut:"
 
-#: bundle.c:319
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
-msgstr ""
+msgstr "tidak dapat men-dup pendeskripsi bundel"
 
-#: bundle.c:326
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
-msgstr ""
+msgstr "Tidak dapat menghidupkan pack-objects"
 
-#: bundle.c:337
+#: bundle.c:351
 msgid "pack-objects died"
-msgstr ""
+msgstr "pack-objects mati"
 
-#: bundle.c:386
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
-msgstr ""
+msgstr "referensi '%s' dikecualikan oleh opsi rev-list"
 
-#: bundle.c:490
+#: bundle.c:504
 #, c-format
 msgid "unsupported bundle version %d"
-msgstr ""
+msgstr "versi bundle %d tidak didukung"
 
-#: bundle.c:492
+#: bundle.c:506
 #, c-format
 msgid "cannot write bundle version %d with algorithm %s"
-msgstr ""
+msgstr "tidak dapat menulis versi bundel %d dengan algoritma %s"
 
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
-msgstr ""
+msgstr "argumen tidak dikenal: %s"
 
-#: bundle.c:539
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
-msgstr ""
+msgstr "Menolak memuat bundel kosong."
 
-#: bundle.c:549
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
-msgstr ""
+msgstr "tidak dapat membuat '%s'"
 
-#: bundle.c:574
+#: bundle.c:588
 msgid "index-pack died"
-msgstr ""
+msgstr "index-pack mati"
 
-#: chunk-format.c:113
+#: chunk-format.c:117
 msgid "terminating chunk id appears earlier than expected"
 msgstr ""
 
-#: chunk-format.c:122
+#: chunk-format.c:126
 #, c-format
 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
 msgstr ""
 
-#: chunk-format.c:129
+#: chunk-format.c:133
 #, c-format
 msgid "duplicate chunk ID %<PRIx32> found"
 msgstr ""
 
-#: chunk-format.c:143
+#: chunk-format.c:147
 #, c-format
 msgid "final chunk has non-zero id %<PRIx32>"
 msgstr ""
 
-#: color.c:329
+#: color.c:354
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr ""
 
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
 msgid "invalid hash version"
 msgstr ""
 
@@ -2095,217 +2172,217 @@ msgstr ""
 msgid "unable to find all commit-graph files"
 msgstr ""
 
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 
-#: commit-graph.c:766
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr ""
 
-#: commit-graph.c:799
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr ""
 
-#: commit-graph.c:1075 builtin/am.c:1340
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr ""
 
-#: commit-graph.c:1337 builtin/pack-objects.c:2897
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr ""
 
-#: commit-graph.c:1368
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:1385
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:1405
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr ""
 
-#: commit-graph.c:1424
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr ""
 
-#: commit-graph.c:1477
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr ""
 
-#: commit-graph.c:1558
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr ""
 
-#: commit-graph.c:1635
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr ""
 
-#: commit-graph.c:1660
+#: 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:1673
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr ""
 
-#: commit-graph.c:1677
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr ""
 
-#: commit-graph.c:1714
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
 
-#: commit-graph.c:1732
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr ""
 
-#: commit-graph.c:1781
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr ""
 
-#: commit-graph.c:1812 midx.c:906
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr ""
 
-#: commit-graph.c:1825
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr ""
 
-#: commit-graph.c:1830
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr ""
 
-#: commit-graph.c:1887
+#: 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:1923
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr ""
 
-#: commit-graph.c:1939
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr ""
 
-#: commit-graph.c:1959
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr ""
 
-#: commit-graph.c:2092
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr ""
 
-#: commit-graph.c:2136
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr ""
 
-#: commit-graph.c:2244
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
 
-#: commit-graph.c:2351
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr ""
 
-#: commit-graph.c:2450
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 
-#: commit-graph.c:2460
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr ""
 
-#: commit-graph.c:2470 commit-graph.c:2485
+#: 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:2477
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr ""
 
-#: commit-graph.c:2495
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:2510
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 
-#: commit-graph.c:2517
+#: commit-graph.c:2549
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2527
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr ""
 
-#: commit-graph.c:2536
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2550
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 
-#: commit-graph.c:2555
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2559
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2576
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr ""
 
-#: commit-graph.c:2582
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 
-#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
-#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 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 ""
 
-#: commit.c:54
+#: commit.c:55
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr ""
 
-#: commit.c:194
+#: commit.c:196
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -2317,27 +2394,27 @@ msgid ""
 "\"git config advice.graftFileDeprecated false\""
 msgstr ""
 
-#: commit.c:1237
+#: commit.c:1241
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 
-#: commit.c:1241
+#: commit.c:1245
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 
-#: commit.c:1244
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr ""
 
-#: commit.c:1247
+#: commit.c:1251
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr ""
 
-#: commit.c:1501
+#: 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"
@@ -2348,7 +2425,7 @@ msgstr ""
 msgid "memory exhausted"
 msgstr ""
 
-#: config.c:126
+#: config.c:125
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -2363,35 +2440,35 @@ msgstr ""
 "\t%s\n"
 "Ini mungkin disebabkan oleh include sirkular."
 
-#: config.c:142
+#: config.c:141
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "tidak dapat menjabarkan jalur include '%s'"
 
-#: config.c:153
+#: config.c:152
 msgid "relative config includes must come from files"
 msgstr "include konfigurasi relatif harus dari berkas"
 
-#: config.c:199
+#: config.c:201
 msgid "relative config include conditionals must come from files"
 msgstr "kondisional include konfigurasi relative harus dari berkas"
 
-#: config.c:396
+#: config.c:398
 #, c-format
 msgid "invalid config format: %s"
 msgstr "format konfigurasi tidak valid: %s"
 
-#: config.c:400
+#: config.c:402
 #, c-format
 msgid "missing environment variable name for configuration '%.*s'"
 msgstr "nama variabel lingkungan untuk konfigurasi hilang '%.*s'"
 
-#: config.c:405
+#: config.c:407
 #, c-format
 msgid "missing environment variable '%s' for configuration '%.*s'"
 msgstr "variabel lingkungan '%s' untuk konfigurasi '%.*s'"
 
-#: config.c:442
+#: config.c:443
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "kunci tidak berisi bagian: %s"
@@ -2401,298 +2478,298 @@ msgstr "kunci tidak berisi bagian: %s"
 msgid "key does not contain variable name: %s"
 msgstr "kunci tidak berisi nama variabel: %s"
 
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "kunci tidak valid: %s"
 
-#: config.c:478
+#: config.c:475
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "kunci tidak valid (barisbaru): %s"
 
-#: config.c:511
+#: config.c:495
 msgid "empty config key"
 msgstr "kunci konfigurasi kosong"
 
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "parameter konfigurasi gadungan: %s"
 
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
 #, c-format
 msgid "bogus format in %s"
 msgstr "format gadungan dalam %s"
 
-#: config.c:622
+#: config.c:606
 #, c-format
 msgid "bogus count in %s"
 msgstr "hitungan gadungan dalam %s"
 
-#: config.c:626
+#: config.c:610
 #, c-format
 msgid "too many entries in %s"
 msgstr "terlalu banyak entri di %s"
 
-#: config.c:636
+#: config.c:620
 #, c-format
 msgid "missing config key %s"
 msgstr "kunci konfigurasi %s hilang"
 
-#: config.c:644
+#: config.c:628
 #, c-format
 msgid "missing config value %s"
 msgstr "nilai konfigurasi %s hilang"
 
-#: config.c:995
+#: config.c:979
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "baris konfigurasi %d jelek dalam blob %s"
 
-#: config.c:999
+#: config.c:983
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "baris konfigurasi %d jelek dalam berkas %s"
 
-#: config.c:1003
+#: config.c:987
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "baris konfigurasi %d jelek pada masukan standar"
 
-#: config.c:1007
+#: config.c:991
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "baris konfigurasi %d jelek dalam blob submodul %s"
 
-#: config.c:1011
+#: config.c:995
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "baris konfigurasi %d jelek pada baris perintah %s"
 
-#: config.c:1015
+#: config.c:999
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "baris konfigurasi %d jelek dalam %s"
 
-#: config.c:1152
+#: config.c:1136
 msgid "out of range"
 msgstr "di luar rentang"
 
-#: config.c:1152
+#: config.c:1136
 msgid "invalid unit"
 msgstr "satuan tidak valid"
 
-#: config.c:1153
+#: config.c:1137
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s': %s"
 
-#: config.c:1163
+#: config.c:1147
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam blob %s: %s"
 
-#: config.c:1166
+#: config.c:1150
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam berkas %s: %s"
 
-#: config.c:1169
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "nilai konfigurasi numerik '%s' jelek untuk '%s' pada masukan standar: %s"
 
-#: config.c:1172
+#: config.c:1156
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam blob submodul %s: %s"
 
-#: config.c:1175
+#: config.c:1159
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "nilai konfigurasi numerik '%s' jelek untuk '%s' pada baris perintah %s: %s"
 
-#: config.c:1178
+#: config.c:1162
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s' dalam %s: %s"
 
-#: config.c:1257
+#: config.c:1241
 #, c-format
 msgid "bad boolean config value '%s' for '%s'"
 msgstr "nilai konfigurasi boolean '%s' jelek untuk '%s'"
 
-#: config.c:1275
+#: config.c:1259
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "gagal menjabarkan direktori pengguna di: '%s'"
 
-#: config.c:1284
+#: config.c:1268
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%s' untuk '%s' bukan stempel waktu valid"
 
-#: config.c:1377
+#: config.c:1361
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "panjang singkatan di luar rentang: %d"
 
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "level kompresi zlib jelek %d"
 
-#: config.c:1494
+#: config.c:1476
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar harusnya hanya satu karakter"
 
-#: config.c:1527
+#: config.c:1509
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "mode tidak valid untuk pembuatan objek: %s"
 
-#: config.c:1599
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "nilai rusak untuk %s"
 
-#: config.c:1625
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "nilai rusak untuk %s: %s"
 
-#: config.c:1626
+#: 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:1687 builtin/pack-objects.c:3924
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "level kompresi pak jelek %d"
 
-#: config.c:1809
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "tidak dapat memuat objek blob konfigurasi '%s'"
 
-#: config.c:1812
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "referensi '%s' tidak menunjuk pada sebuah blob"
 
-#: config.c:1829
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "tidak dapat menguraikan blob konfigurasi '%s'"
 
-#: config.c:1873
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "gagal menguraikan %s"
 
-#: config.c:1929
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr "gagal menguraikan konfigurasi baris perintah"
 
-#: config.c:2293
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr "error tidak diketahui ketika membaca berkas konfigurasi"
 
-#: config.c:2467
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s tidak valid: '%s'"
 
-#: config.c:2512
+#: 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:2558
+#: 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:2560
+#: 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:2644
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nama bagian '%s' tidak valid"
 
-#: config.c:2676
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s punya banyak nilai"
 
-#: config.c:2705
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "gagal menulis berkas konfigurasi baru %s"
 
-#: config.c:2957 config.c:3283
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "tidak dapat mengunci berkas konfigurasi %s"
 
-#: config.c:2968
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "membuka %s"
 
-#: config.c:3005 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "pola tidak valid: %s"
 
-#: config.c:3030
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "berkas konfigurasi %s tidak valid"
 
-#: config.c:3043 config.c:3296
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat pada %s gagal"
 
-#: config.c:3054
+#: config.c:3047
 #, c-format
-msgid "unable to mmap '%s'"
-msgstr "tidak dapat me-mmap '%s'"
+msgid "unable to mmap '%s'%s"
+msgstr "tidak dapat me-mmap '%s'%s"
 
-#: config.c:3063 config.c:3301
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod pada %s gagal"
 
-#: config.c:3148 config.c:3398
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "tidak dapat menulis berkas konfigurasi %s"
 
-#: config.c:3182
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "tidak dapat menyetel '%s' ke '%s'"
 
-#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: 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:3274
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "nama bagian tidak valid: %s"
 
-#: config.c:3441
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "nilai hilang untuk '%s'"
@@ -2723,79 +2800,79 @@ msgstr ""
 msgid "expected flush after capabilities"
 msgstr ""
 
-#: connect.c:263
+#: connect.c:265
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr ""
 
-#: connect.c:284
+#: connect.c:286
 msgid "protocol error: unexpected capabilities^{}"
 msgstr ""
 
-#: connect.c:306
+#: connect.c:308
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr ""
 
-#: connect.c:308
+#: connect.c:310
 msgid "repository on the other end cannot be shallow"
 msgstr ""
 
-#: connect.c:347
+#: connect.c:349
 msgid "invalid packet"
 msgstr ""
 
-#: connect.c:367
+#: connect.c:369
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr ""
 
-#: connect.c:497
+#: connect.c:499
 #, c-format
 msgid "unknown object format '%s' specified by server"
 msgstr ""
 
-#: connect.c:526
+#: connect.c:528
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr ""
 
-#: connect.c:530
+#: connect.c:532
 msgid "expected flush after ref listing"
 msgstr ""
 
-#: connect.c:533
+#: connect.c:535
 msgid "expected response end packet after ref listing"
 msgstr ""
 
-#: connect.c:666
+#: connect.c:670
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr ""
 
-#: connect.c:717
+#: connect.c:721
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr ""
 
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
 #, c-format
 msgid "Looking up %s ... "
 msgstr ""
 
-#: connect.c:761
+#: connect.c:765
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr ""
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
 #, c-format
 msgid ""
 "done.\n"
 "Connecting to %s (port %s) ... "
 msgstr ""
 
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2803,77 +2880,77 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
 msgid "done."
 msgstr ""
 
-#: connect.c:824
+#: connect.c:828
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr ""
 
-#: connect.c:830
+#: connect.c:834
 #, c-format
 msgid "unknown port %s"
 msgstr ""
 
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr ""
 
-#: connect.c:969
+#: connect.c:973
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr ""
 
-#: connect.c:979
+#: connect.c:983
 #, c-format
 msgid "cannot start proxy %s"
 msgstr ""
 
-#: connect.c:1050
+#: connect.c:1054
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 
-#: connect.c:1190
+#: connect.c:1194
 msgid "newline is forbidden in git:// hosts and repo paths"
 msgstr ""
 
-#: connect.c:1247
+#: connect.c:1251
 msgid "ssh variant 'simple' does not support -4"
 msgstr ""
 
-#: connect.c:1259
+#: connect.c:1263
 msgid "ssh variant 'simple' does not support -6"
 msgstr ""
 
-#: connect.c:1276
+#: connect.c:1280
 msgid "ssh variant 'simple' does not support setting port"
 msgstr ""
 
-#: connect.c:1388
+#: connect.c:1392
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr ""
 
-#: connect.c:1436
+#: connect.c:1440
 msgid "unable to fork"
 msgstr ""
 
-#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr ""
 
-#: connected.c:120
+#: connected.c:122
 msgid "Could not run 'git rev-list'"
 msgstr ""
 
-#: connected.c:144
+#: connected.c:146
 msgid "failed write to rev-list"
 msgstr ""
 
-#: connected.c:149
+#: connected.c:151
 msgid "failed to close rev-list's stdin"
 msgstr ""
 
@@ -2973,23 +3050,23 @@ msgstr ""
 msgid "path name too long for external filter"
 msgstr ""
 
-#: convert.c:934
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
 "been filtered"
 msgstr ""
 
-#: convert.c:1234
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr ""
 
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr ""
 
-#: convert.c:1490
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr ""
@@ -3007,17 +3084,17 @@ msgstr ""
 msgid "refusing to work with credential missing protocol field"
 msgstr ""
 
-#: credential.c:394
+#: credential.c:395
 #, c-format
 msgid "url contains a newline in its %s component: %s"
 msgstr ""
 
-#: credential.c:438
+#: credential.c:439
 #, c-format
 msgid "url has no scheme: %s"
 msgstr ""
 
-#: credential.c:511
+#: credential.c:512
 #, c-format
 msgid "credential url cannot be parsed: %s"
 msgstr ""
@@ -3114,52 +3191,52 @@ msgstr ""
 msgid "Marked %d islands, done.\n"
 msgstr ""
 
-#: diff-merges.c:80
+#: diff-merges.c:70
 #, c-format
 msgid "unknown value for --diff-merges: %s"
 msgstr ""
 
-#: diff-lib.c:538
+#: diff-lib.c:561
 msgid "--merge-base does not work with ranges"
 msgstr ""
 
-#: diff-lib.c:540
+#: diff-lib.c:563
 msgid "--merge-base only works with commits"
 msgstr ""
 
-#: diff-lib.c:557
+#: diff-lib.c:580
 msgid "unable to get HEAD"
 msgstr ""
 
-#: diff-lib.c:564
+#: diff-lib.c:587
 msgid "no merge base found"
 msgstr ""
 
-#: diff-lib.c:566
+#: diff-lib.c:589
 msgid "multiple merge bases found"
 msgstr ""
 
-#: diff-no-index.c:238
+#: diff-no-index.c:237
 msgid "git diff --no-index [<options>] <path> <path>"
 msgstr ""
 
-#: diff-no-index.c:263
+#: diff-no-index.c:262
 msgid ""
 "Not a git repository. Use --no-index to compare two paths outside a working "
 "tree"
 msgstr ""
 
-#: diff.c:156
+#: 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:161
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Parameter dirstat tidak ditketahui '%s'\n"
 
-#: diff.c:297
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -3167,7 +3244,7 @@ msgstr ""
 "Setelan warna berpindah harus salah satu dari 'no', 'default', 'blocks', "
 "'dimmed-zebra', 'plain'"
 
-#: diff.c:325
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3177,7 +3254,7 @@ msgstr ""
 "space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
 "change'"
 
-#: diff.c:333
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3185,12 +3262,12 @@ msgstr ""
 "color-moved-ws: allow-indentation-change tidak dapat digabungkan dengan mode "
 "spasi yang lainnya"
 
-#: diff.c:410
+#: 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:470
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3199,35 +3276,51 @@ msgstr ""
 "Ditemukan error dalam variable konfigurasi 'diff.dirstat':\n"
 "%s"
 
-#: diff.c:4278
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "diff eksternal mati, berhenti pada %s"
 
-#: diff.c:4630
-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: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:4633
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S dan --find-object saling eksklusif"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr ""
+"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s'"
+
+#: diff.c:4601
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s' "
+"dan '%s'"
 
-#: diff.c:4712
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow butuh tepatnya satu spek jalur"
 
-#: diff.c:4760
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "nilai --stat tidak valid: %s"
 
-#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: 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:4797
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3236,42 +3329,42 @@ msgstr ""
 "Gagal menguraikan parameter opsi --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4882
+#: 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:4906
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "nilai tidak dikenal setelah ws-error-highlight=%.*s"
 
-#: diff.c:4920
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "tidak dapat menguraikan '%s'"
 
-#: diff.c:4970 diff.c:4976
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s butuh bentuk <n>/<m>"
 
-#: diff.c:4988
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s butuh sebuah karakter, dapat '%s'"
 
-#: diff.c:5009
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "argumen --color-moved jelek: %s"
 
-#: diff.c:5028
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "mode tidak valid '%s' dalam --color-moved-ws"
 
-#: diff.c:5068
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -3279,162 +3372,162 @@ msgstr ""
 "opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan "
 "\"histogram\""
 
-#: diff.c:5104 diff.c:5124
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "argumen tidak valid ke %s"
 
-#: diff.c:5228
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "regex tidak valid diberikan ke -I: '%s'"
 
-#: diff.c:5277
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "gagal menguraikan parameter opsi --submodule: '%s'"
 
-#: diff.c:5333
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "argumen --word-diff jelek: %s"
 
-#: diff.c:5369
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "Opsi format keluaran diff"
 
-#: diff.c:5371 diff.c:5377
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "buat tambalan"
 
-#: diff.c:5374 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "sembunyikan keluaran diff"
 
-#: diff.c:5379 diff.c:5493 diff.c:5500
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5380 diff.c:5383
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "buat diff dengan <n> baris konteks"
 
-#: diff.c:5385
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "buat diff dalam format mentah"
 
-#: diff.c:5388
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "sinonim untuk '-p --raw'"
 
-#: diff.c:5392
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "sinonim untuk '-p --stat'"
 
-#: diff.c:5396
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "--stat yang ramah mesin"
 
-#: diff.c:5399
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "keluarkan hanya baris terakhir --stat"
 
-#: diff.c:5401 diff.c:5409
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<parameter 1,parameter 2>..."
 
-#: diff.c:5402
+#: 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:5406
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "sinonim untuk --dirstat=cumulative"
 
-#: diff.c:5410
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "sinonim untuk --dirstat=files,param1,param2..."
 
-#: diff.c:5414
+#: 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:5417
+#: 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:5420
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "perlihatkan hanya nama berkas yang berubah"
 
-#: diff.c:5423
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "perlihatkan hanya nama dan status berkas yang berubah"
 
-#: diff.c:5425
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<lebar>[,<nama lebar>[,<hitungan>]]"
 
-#: diff.c:5426
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "buat diffstat"
 
-#: diff.c:5428 diff.c:5431 diff.c:5434
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<lebar>"
 
-#: diff.c:5429
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "buat diffstat dengan lebar yang diberikan"
 
-#: diff.c:5432
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "buat diffstat dengan nama lebar yang diberikan"
 
-#: diff.c:5435
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "buat diffstat dengan lebar grafik yang diberikan"
 
-#: diff.c:5437
+#: diff.c:5406
 msgid "<count>"
 msgstr "<hitungan>"
 
-#: diff.c:5438
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "buat diffstat dengan baris yang terbatas"
 
-#: diff.c:5441
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "buat ringkasan singkat dalam diffstat"
 
-#: diff.c:5444
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "keluarkan diff biner yang dapat diterapkan"
 
-#: diff.c:5447
+#: 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:5449
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "perlihatkan diff berwarna"
 
-#: diff.c:5450
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<tipe>"
 
-#: diff.c:5451
+#: 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:5454
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3442,91 +3535,91 @@ msgstr ""
 "jangan tengkar jalur nama dan gunakan NUL sebagai pembatas bidang keluaran "
 "pada --raw atau --numstat"
 
-#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<prefiks>"
 
-#: diff.c:5458
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "perlihatkan prefiks sumber yang diberikan daripada \"a/\""
 
-#: diff.c:5461
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "perlihatkan prefiks tujuan daripada \"b/\""
 
-#: diff.c:5464
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr "tambah depan prefiks tambahan pada setiap baris keluaran"
 
-#: diff.c:5467
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "jangan perlihatkan prefiks sumber atau tujuan apapun"
 
-#: diff.c:5470
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
-"perlihatkan konteks diantara hunk diff hingga jumlah baris yang disebutkan"
+"perlihatkan konteks diantara bingkah diff hingga jumlah baris yang disebutkan"
 
-#: diff.c:5474 diff.c:5479 diff.c:5484
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<karakter>"
 
-#: diff.c:5475
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "sebutkan karakter yang menandai baris baru daripada '+'"
 
-#: diff.c:5480
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "sebutkan karakter yang menandai baris lama daripada '-'"
 
-#: diff.c:5485
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "sebutkan karakter yang menandai konteks daripada ' '"
 
-#: diff.c:5488
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "Opsi penamaan ulang diff"
 
-#: diff.c:5489
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5490
+#: 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:5494
+#: diff.c:5463
 msgid "detect renames"
 msgstr "deteksi penamaan ulang"
 
-#: diff.c:5498
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "lewati pracitra untuk penghapusan"
 
-#: diff.c:5501
+#: diff.c:5470
 msgid "detect copies"
 msgstr "deteksi penyalinan"
 
-#: diff.c:5505
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
 msgstr ""
 "gunakan berkas tak termodifikasi sebagai sumber untuk menemukan salinan"
 
-#: diff.c:5507
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "nonaktifkan deteksi penamaan ulang"
 
-#: diff.c:5510
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "gunakan blob kosong sebagai sumber penamaan ulang"
 
-#: diff.c:5512
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr "lanjutkan daftarkan riwayat berkas di luar penamaan ulang"
 
-#: diff.c:5515
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -3534,232 +3627,232 @@ msgstr ""
 "cegah pendeteksian penamaan ulang/penyalinan jika jumlah target penamaan "
 "ulang/penyalinan melebihi batas yang diberikan"
 
-#: diff.c:5517
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Opsi algoritma diff"
 
-#: diff.c:5519
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "hasilkan diff yang paling kecil yang dimungkinkan"
 
-#: diff.c:5522
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "abaikan spasi saat membandingkan baris"
 
-#: diff.c:5525
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "abaikan perubahan dalam jumlah spasi"
 
-#: diff.c:5528
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "abaikan perubahan spasi pada EOL"
 
-#: diff.c:5531
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "abaikan kembalian-kurir pada akhir baris"
 
-#: diff.c:5534
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "abaikan perubahan yang semua baris kosong"
 
-#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<regex>"
 
-#: diff.c:5537
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr "abaikan perubahan yang semua baris cocok dengan <regex>"
 
-#: diff.c:5540
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr "heuristik untuk geser perbatasan hunk diff untuk pembacaan yang mudah"
+msgstr ""
+"heuristik untuk geser perbatasan bingkah diff untuk pembacaan yang mudah"
 
-#: diff.c:5543
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "buat diff menggunakan algoritma \"diff sabar\""
 
-#: diff.c:5547
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "buat diff menggunakan algoritma \"diff histogram\""
 
-#: diff.c:5549
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<algoritma>"
 
-#: diff.c:5550
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "pilih algoritma diff"
 
-#: diff.c:5552
+#: diff.c:5521
 msgid "<text>"
 msgstr "<teks>"
 
-#: diff.c:5553
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "buat diff menggunakan algoritma \"diff terlabuh\""
 
-#: diff.c:5555 diff.c:5564 diff.c:5567
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<mode>"
 
-#: diff.c:5556
+#: 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:5559
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr "gunakan <regex> untuk menentukan apa itu kata"
 
-#: diff.c:5562
+#: 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:5565
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "baris kode yang berpindah diwarnai berbeda"
 
-#: diff.c:5568
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr "bagaimana spasi diabaikan di --color-moved"
 
-#: diff.c:5571
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Opsi diff yang lainnya"
 
-#: diff.c:5573
+#: 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:5577
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "perlakukan semua berkas sebagai teks"
 
-#: diff.c:5579
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "tukar dua masukkan, balikkan diff"
 
-#: diff.c:5581
+#: 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:5583
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "nonaktifkan semua keluaran program"
 
-#: diff.c:5585
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "perbolehkan pembantu diff eksternal untuk dieksekusi"
 
-#: diff.c:5587
+#: 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:5589
+#: diff.c:5558
 msgid "<when>"
 msgstr "<kapan>"
 
-#: diff.c:5590
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr "abaikan perubahan submodul dalam pembuatan diff"
 
-#: diff.c:5593
+#: diff.c:5562
 msgid "<format>"
 msgstr "<format>"
 
-#: diff.c:5594
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "sebutkan bagaimana perbedaan dalam submodul diperlihatkan"
 
-#: diff.c:5598
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "sembunyikan entri 'git add -N' dari indeks"
 
-#: diff.c:5601
+#: 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:5603
+#: diff.c:5572
 msgid "<string>"
 msgstr "<untai>"
 
-#: diff.c:5604
+#: 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:5607
+#: 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:5610
+#: 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:5613
+#: 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:5616
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr "kontrol urutan berkas yang muncul dalam keluaran"
 
-#: diff.c:5617 diff.c:5620
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<jalur>"
 
-#: diff.c:5618
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "perlihatkan perubahan dalam jalur yang disebutkan terlebih dahulu"
 
-#: diff.c:5621
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "lewati keluaran ke jalur yang disebutkan"
 
-#: diff.c:5623
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<id objek>"
 
-#: diff.c:5624
+#: 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:5626
+#: 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:5627
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "pilih berkas oleh tipe diff"
 
-#: diff.c:5629
+#: diff.c:5598
 msgid "<file>"
 msgstr "<berkas>"
 
-#: diff.c:5630
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "Keluarkan ke berkas yang disebutkan"
 
-#: diff.c:6287
-msgid "inexact rename detection was skipped due to too many files."
-msgstr ""
-"deteksi penamaan ulang tak eksak dilewati karena terlalu banyak berkas."
+#: 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:6290
+#: 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:6293
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3772,7 +3865,7 @@ msgstr ""
 msgid "failed to read orderfile '%s'"
 msgstr ""
 
-#: diffcore-rename.c:1418
+#: diffcore-rename.c:1564
 msgid "Performing inexact rename detection"
 msgstr ""
 
@@ -3781,59 +3874,67 @@ msgstr ""
 msgid "No such path '%s' in the diff"
 msgstr ""
 
-#: dir.c:578
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr ""
 
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr ""
 
-#: dir.c:809
+#: dir.c:820
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr ""
 
-#: dir.c:819
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr ""
 
-#: dir.c:1206
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr ""
 
-#: dir.c:2314
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr ""
 
-#: dir.c:2614
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr ""
 
-#: dir.c:2738
+#: dir.c:2844
 msgid "untracked cache is disabled on this system or location"
 msgstr ""
 
-#: dir.c:3543
+#: dir.c:3112
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Nama direktori tidak dapat ditebak.\n"
+"Mohon sebutkan direktori pada baris perintah"
+
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr ""
 
-#: dir.c:3590 dir.c:3595
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr ""
 
-#: dir.c:3624
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr ""
@@ -3852,434 +3953,511 @@ msgstr ""
 msgid "could not stat file '%s'"
 msgstr ""
 
-#: environment.c:152
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr ""
 
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr ""
-
 #: exec-cmd.c:363
 #, c-format
 msgid "too many args to run %s"
 msgstr ""
 
-#: fetch-pack.c:182
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
-msgstr ""
+msgstr "git fetch-pack: daftar dangkal diharapkan"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
-msgstr ""
+msgstr "git fetch-pack: sebuah paket bilasan diharapkan setelah daftar dangkal"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:208
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr ""
+msgstr "git fetch-pack: ACK/NAK diharapkan, dapat paket bilasan"
 
-#: fetch-pack.c:216
+#: fetch-pack.c:228
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr ""
+msgstr "git fetch-pack: ACK/NAK diharapkan, dapat '%s'"
 
-#: fetch-pack.c:227
+#: fetch-pack.c:239
 msgid "unable to write to remote"
-msgstr ""
-
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr ""
+msgstr "tidak dapat menulis ke remote"
 
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
-msgstr ""
+msgstr "baris dangkal tidak valid: %s"
 
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
-msgstr ""
+msgstr "baris dangkal-balik tidak valid: %s"
 
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
-msgstr ""
+msgstr "object tidak ditemukan: %s"
 
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
-msgstr ""
+msgstr "kesalahan dalam objek: %s"
 
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
-msgstr ""
+msgstr "tidak ada dangkal yang ditemukan: %s"
 
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
-msgstr ""
+msgstr "dangkal/dangkal-balik diharapkan, dapat %s"
 
-#: fetch-pack.c:439
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
-msgstr ""
+msgstr "dapat %s %d %s"
 
-#: fetch-pack.c:456
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
-msgstr ""
+msgstr "komit tidak valid %s"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:499
 msgid "giving up"
-msgstr ""
+msgstr "menyerah"
 
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
-msgstr ""
+msgstr "selesai"
 
-#: fetch-pack.c:512
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
-msgstr ""
+msgstr "dapat %s (%d) %s"
 
-#: fetch-pack.c:548
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
-msgstr ""
+msgstr "Menandai %s sebagai lengkap"
 
-#: fetch-pack.c:763
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
-msgstr ""
+msgstr "sudah punya %s (%s)"
 
-#: fetch-pack.c:849
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr ""
+msgstr "fetch-pack: tidak dapat menggarpu pemultipleks-balik pita samping"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
-msgstr ""
+msgstr "kesalahan protokol: kepala pak jelek"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
-msgstr ""
+msgstr "fetch-pack: tidak dapat menggarpu %s"
 
-#: fetch-pack.c:957
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
-msgstr ""
+msgstr "fetch-pack: keluaran index-pack tidak valid"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
-msgstr ""
+msgstr "%s gagal"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
-msgstr ""
+msgstr "kesalahan dalam pemultipleks-balik pita samping"
 
-#: fetch-pack.c:1019
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
-msgstr ""
+msgstr "Versi peladen %.*s"
 
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
+#: 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:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: 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 ""
+msgstr "Peladen mendukung %s"
 
-#: fetch-pack.c:1029
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
-msgstr ""
+msgstr "Peladen tidak mendukung klien dangkal"
 
-#: fetch-pack.c:1089
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
-msgstr ""
+msgstr "Peladen tidak mendukung --shallow-since"
 
-#: fetch-pack.c:1094
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
-msgstr ""
+msgstr "Peladen tidak mendukung --shallow-exclude"
 
-#: fetch-pack.c:1098
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
-msgstr ""
+msgstr "Peladen tidak mendukung --deepen"
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
-msgstr ""
+msgstr "Peladen tidak mendukung objek format repositori ini"
 
-#: fetch-pack.c:1113
+#: fetch-pack.c:1129
 msgid "no common commits"
-msgstr ""
+msgstr "tidak ada komit umum"
 
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
-msgstr ""
+msgstr "repositori sumber dangkal, menolak mengkloning."
 
-#: fetch-pack.c:1128 fetch-pack.c:1651
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
-msgstr ""
+msgstr "git fetch-pack: pengambilan gagal."
 
-#: fetch-pack.c:1242
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
-msgstr ""
+msgstr "algoritma tidak cocok: klien %s; peladen %s"
 
-#: fetch-pack.c:1246
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
-msgstr ""
+msgstr "peladen tidak mendukung algoritma '%s'"
 
-#: fetch-pack.c:1279
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
-msgstr ""
+msgstr "Peladen tidak mendukung permintaan dangkal"
 
-#: fetch-pack.c:1286
+#: fetch-pack.c:1302
 msgid "Server supports filter"
-msgstr ""
+msgstr "Peladen mendukung saringan"
 
-#: fetch-pack.c:1329 fetch-pack.c:2034
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
-msgstr ""
+msgstr "tidak dapat menulis permintaan kepada remote"
 
-#: fetch-pack.c:1347
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
-msgstr ""
+msgstr "kesalahan membaca kepala seksi '%s'"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
-msgstr ""
+msgstr "diharapkan '%s', diterima '%s'"
 
-#: fetch-pack.c:1387
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
-msgstr ""
+msgstr "baris pengakuan tidak diharapkan: %s"
 
-#: fetch-pack.c:1392
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
-msgstr ""
+msgstr "kesalahan memproses ack: %d"
 
-#: fetch-pack.c:1402
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
-msgstr ""
+msgstr "berkas pak diharapkan dikirim setelah 'ready'"
 
-#: fetch-pack.c:1404
+#: 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:1445
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
-msgstr ""
+msgstr "gagal memproses info dangkal: %d"
 
-#: fetch-pack.c:1494
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
-msgstr ""
+msgstr "wanted-ref diharapkan, dapat '%s'"
 
-#: fetch-pack.c:1499
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
-msgstr ""
+msgstr "wanted-ref tidak diharapkan: '%s'"
 
-#: fetch-pack.c:1504
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
-msgstr ""
+msgstr "kesalahan memproses referensi yang diminta: %d"
 
-#: fetch-pack.c:1534
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
-msgstr ""
+msgstr "git fetch-pack: paket jawaban akhir diharapkan"
 
-#: fetch-pack.c:1930
+#: fetch-pack.c:1959
 msgid "no matching remote head"
-msgstr ""
+msgstr "tidak ada kepala remote yang cocok"
 
-#: fetch-pack.c:1953 builtin/clone.c:697
+#: fetch-pack.c:1982 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
-msgstr ""
+msgstr "remote tidak mengirim semua objek yang dibutuhkan"
 
-#: fetch-pack.c:2056
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
-msgstr ""
+msgstr "'ready' tidak diharapkan dari remote"
 
-#: fetch-pack.c:2079
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
-msgstr ""
+msgstr "tidak ada referensi remote seperti %s"
 
-#: fetch-pack.c:2082
+#: fetch-pack.c:2111
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
-msgstr ""
+msgstr "Peladen tidak memperbolehkan permintaan untuk objek tak diiklankan %s"
 
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
 msgid "could not create temporary file"
-msgstr ""
+msgstr "tidak dapat membuat berkas sementara"
 
-#: gpg-interface.c:276
+#: 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:451
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile perlu dikonfigurasi dan ada untuk verifikasi "
+"tandatangan ssh"
+
+#: gpg-interface.c:480
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh-keygen -Y find-principals/verify diperlukan untuk verifikasi tandatangan "
+"ssh (tersedia di openssh versi 8.2p1+)"
+
+#: 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:624
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "tanda tangan '%s' jelek/tidak kompatibel"
+
+#: 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: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: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:470
+#: gpg-interface.c:857
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand gagal: %s %s"
+
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
+msgstr "gpg gagal menandatangani data"
+
+#: 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:978
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "gagal menulis kunci penandatanganan ssh ke '%s'"
+
+#: 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:1014
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
 msgstr ""
+"ssh-keygen -Y sign diperlukan untuk penandatanganan ssh (tersedia di "
+"openssh  versi 8.2p1+)"
+
+#: gpg-interface.c:1026
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "gagal membaca penyangga data penandatanganan ssh dari '%s'"
 
 #: graph.c:98
 #, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr ""
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "warna tidak valid '%.*s' diabaikan di log.graphColors"
 
 #: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
 msgstr ""
+"pola yang diberikan berisi bita NULL (via -f <berkas>). Hal ini hanya "
+"didukung dengan -P di bawah PCRE v2"
 
-#: grep.c:1893
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
-msgstr ""
+msgstr "'%s': tidak dapat membaca %s"
 
-#: grep.c:1910 setup.c:176 builtin/clone.c:416 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 ""
+msgstr "gagal men-stat '%s'"
 
-#: grep.c:1921
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
-msgstr ""
+msgstr "'%s': baca pendek"
 
-#: help.c:23
+#: help.c:24
 msgid "start a working area (see also: git help tutorial)"
-msgstr ""
+msgstr "mulai area kerja (lihat pula: git help tutorial)"
 
-#: help.c:24
+#: help.c:25
 msgid "work on the current change (see also: git help everyday)"
-msgstr ""
+msgstr "bekerja pada perubahan saat ini (lihat pula: git help everyday)"
 
-#: help.c:25
+#: help.c:26
 msgid "examine the history and state (see also: git help revisions)"
-msgstr ""
+msgstr "periksa riwayat dan keadaan (lihat pula: git help revisions)"
 
-#: help.c:26
+#: help.c:27
 msgid "grow, mark and tweak your common history"
-msgstr ""
+msgstr "tumbuhkan, tandai, dan cubit riwayat umum Anda"
 
-#: help.c:27
+#: help.c:28
 msgid "collaborate (see also: git help workflows)"
-msgstr ""
+msgstr "kolaborasi (lihat pula: git help workflows)"
 
-#: help.c:31
+#: help.c:32
 msgid "Main Porcelain Commands"
-msgstr ""
+msgstr "Perintah Porselen Utama"
 
-#: help.c:32
+#: help.c:33
 msgid "Ancillary Commands / Manipulators"
-msgstr ""
+msgstr "Perintah Tambahan / Peubah"
 
-#: help.c:33
+#: help.c:34
 msgid "Ancillary Commands / Interrogators"
-msgstr ""
+msgstr "Perintah Tambahan / Pemeriksa"
 
-#: help.c:34
+#: help.c:35
 msgid "Interacting with Others"
-msgstr ""
+msgstr "Berinteraksi dengan yang Lain"
 
-#: help.c:35
+#: help.c:36
 msgid "Low-level Commands / Manipulators"
-msgstr ""
+msgstr "Perintah Tingkat Rendah / Peubah"
 
-#: help.c:36
+#: help.c:37
 msgid "Low-level Commands / Interrogators"
-msgstr ""
+msgstr "Perintah Tingkat Rendah / Pemeriksa"
 
-#: help.c:37
+#: help.c:38
 msgid "Low-level Commands / Syncing Repositories"
-msgstr ""
+msgstr "Perintah Tingkat Rendah / Sinkronisasi Repositori"
 
-#: help.c:38
+#: help.c:39
 msgid "Low-level Commands / Internal Helpers"
-msgstr ""
+msgstr "Perintah Tingak Rendah / Pembantu Internal"
 
-#: help.c:300
+#: help.c:313
 #, c-format
 msgid "available git commands in '%s'"
-msgstr ""
+msgstr "perintah git yang tersedia di '%s'"
 
-#: help.c:307
+#: help.c:320
 msgid "git commands available from elsewhere on your $PATH"
-msgstr ""
+msgstr "perintah git yang tersedia dari tempat lain pada $PATH Anda"
 
-#: help.c:316
+#: help.c:329
 msgid "These are common Git commands used in various situations:"
-msgstr ""
+msgstr "Berikut ini perintah Git umum yang digunakan dalam beragam situasi:"
 
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
-msgstr ""
+msgstr "tipe daftar perintah '%s' tidak didukung"
 
-#: help.c:405
+#: help.c:418
 msgid "The Git concept guides are:"
-msgstr ""
+msgstr "Panduan konsep Git adalah:"
 
-#: help.c:429
+#: help.c:442
 msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr ""
+msgstr "Lihat 'git help <perintah>' untuk baca tentang subperintah spesifik"
 
-#: help.c:434
+#: help.c:447
 msgid "External commands"
-msgstr ""
+msgstr "Perintah eksternal"
 
-#: help.c:449
+#: help.c:462
 msgid "Command aliases"
-msgstr ""
+msgstr "Alias perintah"
 
-#: help.c:527
+#: help.c:543
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
 "able to execute it. Maybe git-%s is broken?"
 msgstr ""
+"'%s' sepertinya perintah git, tetapi kami tidak dapat\n"
+"menjalankannya. Mungkin git-%s rusak?"
 
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr ""
+msgstr "git: '%s' bukan perintah git. Lihat 'git --help'."
 
-#: help.c:591
+#: help.c:613
 msgid "Uh oh. Your system reports no Git commands at all."
-msgstr ""
+msgstr "Eh oh. Sistem Anda melaporkan tidak ada perintah Git sama sekali."
 
-#: help.c:613
+#: help.c:635
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr ""
+msgstr "PERINGATAN: Anda memanggil perintah Git bernama '%s' yang tidak ada."
 
-#: help.c:618
+#: help.c:640
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Melanjutkan di bawah asumsi bahwa maksud Anda '%s'."
+
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead [y/N]? "
 msgstr ""
 
-#: help.c:623
+#: help.c:654
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr ""
+msgstr "Melanjutkan dalam %0.1f detik, mengasumsikan bahwa maksud Anda '%s'."
 
-#: help.c:635
+#: help.c:666
 msgid ""
 "\n"
 "The most similar command is"
@@ -4287,18 +4465,22 @@ msgid_plural ""
 "\n"
 "The most similar commands are"
 msgstr[0] ""
+"\n"
+"Perintah paling mirip adalah"
 msgstr[1] ""
+"\n"
+"Perintah paling mirip adalah"
 
-#: help.c:675
+#: help.c:706
 msgid "git version [<options>]"
-msgstr ""
+msgstr "git version [<opsi>]"
 
-#: help.c:730
+#: help.c:761
 #, c-format
 msgid "%s: %s - %s"
-msgstr ""
+msgstr "%s: %s - %s"
 
-#: help.c:734
+#: help.c:765
 msgid ""
 "\n"
 "Did you mean this?"
@@ -4306,7 +4488,18 @@ msgid_plural ""
 "\n"
 "Did you mean one of these?"
 msgstr[0] ""
+"\n"
+"Mungkin maksud Anda yang ini?"
 msgstr[1] ""
+"\n"
+"Mungkin maksud Anda salah satu dari yang ini?"
+
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
 
 #: ident.c:353
 msgid "Author identity unknown\n"
@@ -4359,7 +4552,7 @@ msgstr ""
 msgid "name consists only of disallowed characters: %s"
 msgstr ""
 
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
 #, c-format
 msgid "invalid date format: %s"
 msgstr ""
@@ -4374,7 +4567,7 @@ msgstr ""
 
 #: list-objects-filter-options.c:105
 #, c-format
-msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
 msgstr ""
 
 #: list-objects-filter-options.c:124
@@ -4419,7 +4612,7 @@ msgstr ""
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr ""
 
-#: list-objects.c:395
+#: list-objects.c:398
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr ""
@@ -4446,7 +4639,12 @@ msgstr ""
 msgid "invalid value '%s' for lsrefs.unborn"
 msgstr ""
 
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr ""
+
+#: ls-refs.c:178
 msgid "expected flush after ls-refs arguments"
 msgstr ""
 
@@ -4454,44 +4652,44 @@ msgstr ""
 msgid "quoted CRLF detected"
 msgstr ""
 
-#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
 #, c-format
 msgid "bad action '%s' for '%s'"
 msgstr ""
 
-#: merge-ort.c:1116 merge-recursive.c:1205
+#: merge-ort.c:1584 merge-recursive.c:1211
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr ""
 
-#: merge-ort.c:1125 merge-recursive.c:1212
+#: merge-ort.c:1593 merge-recursive.c:1218
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr ""
 
-#: merge-ort.c:1134 merge-recursive.c:1219
+#: merge-ort.c:1602 merge-recursive.c:1225
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 
-#: merge-ort.c:1144 merge-ort.c:1151
+#: merge-ort.c:1612 merge-ort.c:1620
 #, c-format
 msgid "Note: Fast-forwarding submodule %s to %s"
 msgstr ""
 
-#: merge-ort.c:1172
+#: merge-ort.c:1642
 #, c-format
 msgid "Failed to merge submodule %s"
 msgstr ""
 
-#: merge-ort.c:1179
+#: merge-ort.c:1649
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
 "%s\n"
 msgstr ""
 
-#: merge-ort.c:1183 merge-recursive.c:1273
+#: merge-ort.c:1653 merge-recursive.c:1281
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -4502,42 +4700,42 @@ msgid ""
 "which will accept this suggestion.\n"
 msgstr ""
 
-#: merge-ort.c:1196
+#: merge-ort.c:1666
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but multiple possible merges exist:\n"
 "%s"
 msgstr ""
 
-#: merge-ort.c:1415 merge-recursive.c:1362
+#: merge-ort.c:1887 merge-recursive.c:1372
 msgid "Failed to execute internal merge"
 msgstr ""
 
-#: merge-ort.c:1420 merge-recursive.c:1367
+#: merge-ort.c:1892 merge-recursive.c:1377
 #, c-format
 msgid "Unable to add %s to database"
 msgstr ""
 
-#: merge-ort.c:1427 merge-recursive.c:1400
+#: merge-ort.c:1899 merge-recursive.c:1410
 #, c-format
 msgid "Auto-merging %s"
 msgstr ""
 
-#: merge-ort.c:1566 merge-recursive.c:2122
+#: merge-ort.c:2038 merge-recursive.c:2132
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
 "implicit directory rename(s) putting the following path(s) there: %s."
 msgstr ""
 
-#: merge-ort.c:1576 merge-recursive.c:2132
+#: merge-ort.c:2048 merge-recursive.c:2142
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
 "implicit directory renames tried to put these paths there: %s"
 msgstr ""
 
-#: merge-ort.c:1634
+#: merge-ort.c:2106
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4545,47 +4743,47 @@ msgid ""
 "majority of the files."
 msgstr ""
 
-#: merge-ort.c:1788 merge-recursive.c:2468
+#: merge-ort.c:2260 merge-recursive.c:2478
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
 "renamed."
 msgstr ""
 
-#: merge-ort.c:1932 merge-recursive.c:3244
+#: merge-ort.c:2400 merge-recursive.c:3261
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
 "moving it to %s."
 msgstr ""
 
-#: merge-ort.c:1939 merge-recursive.c:3251
+#: merge-ort.c:2407 merge-recursive.c:3268
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
 "%s; moving it to %s."
 msgstr ""
 
-#: merge-ort.c:1952 merge-recursive.c:3247
+#: merge-ort.c:2420 merge-recursive.c:3264
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
 "in %s, suggesting it should perhaps be moved to %s."
 msgstr ""
 
-#: merge-ort.c:1960 merge-recursive.c:3254
+#: merge-ort.c:2428 merge-recursive.c:3271
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
 "was renamed in %s, suggesting it should perhaps be moved to %s."
 msgstr ""
 
-#: merge-ort.c:2103
+#: merge-ort.c:2584
 #, c-format
 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
 msgstr ""
 
-#: merge-ort.c:2198
+#: merge-ort.c:2679
 #, c-format
 msgid ""
 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4593,67 +4791,67 @@ msgid ""
 "markers."
 msgstr ""
 
-#: merge-ort.c:2217 merge-ort.c:2241
+#: merge-ort.c:2698 merge-ort.c:2722
 #, c-format
 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr ""
 
-#: merge-ort.c:2550 merge-recursive.c:3002
+#: merge-ort.c:3212 merge-recursive.c:3022
 #, c-format
 msgid "cannot read object %s"
 msgstr ""
 
-#: merge-ort.c:2553 merge-recursive.c:3005
+#: merge-ort.c:3215 merge-recursive.c:3025
 #, c-format
 msgid "object %s is not a blob"
 msgstr ""
 
-#: merge-ort.c:2981
+#: merge-ort.c:3644
 #, c-format
 msgid ""
 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
 "%s instead."
 msgstr ""
 
-#: merge-ort.c:3055
+#: merge-ort.c:3721
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed both "
 "of them so each can be recorded somewhere."
 msgstr ""
 
-#: merge-ort.c:3062
+#: merge-ort.c:3728
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed one "
 "of them so each can be recorded somewhere."
 msgstr ""
 
-#: merge-ort.c:3162 merge-recursive.c:3081
+#: merge-ort.c:3819 merge-recursive.c:3101
 msgid "content"
 msgstr ""
 
-#: merge-ort.c:3164 merge-recursive.c:3085
+#: merge-ort.c:3821 merge-recursive.c:3105
 msgid "add/add"
 msgstr ""
 
-#: merge-ort.c:3166 merge-recursive.c:3130
+#: merge-ort.c:3823 merge-recursive.c:3150
 msgid "submodule"
 msgstr ""
 
-#: merge-ort.c:3168 merge-recursive.c:3131
+#: merge-ort.c:3825 merge-recursive.c:3151
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr ""
 
-#: merge-ort.c:3198
+#: 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:3433
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4663,192 +4861,192 @@ 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:3730
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr ""
 
-#: merge-ort-wrappers.c:13 merge-recursive.c:3699
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "  %s"
 msgstr ""
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "Sudah terbaru."
 
-#: merge-recursive.c:356
+#: merge-recursive.c:353
 msgid "(bad commit)\n"
 msgstr ""
 
-#: merge-recursive.c:379
+#: merge-recursive.c:381
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr ""
 
-#: merge-recursive.c:388
+#: merge-recursive.c:390
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 
-#: merge-recursive.c:876
+#: merge-recursive.c:881
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr ""
 
-#: merge-recursive.c:887
+#: merge-recursive.c:892
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr ""
 
-#: merge-recursive.c:901 merge-recursive.c:920
+#: merge-recursive.c:906 merge-recursive.c:925
 msgid ": perhaps a D/F conflict?"
 msgstr ""
 
-#: merge-recursive.c:910
+#: merge-recursive.c:915
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr ""
 
-#: merge-recursive.c:951 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:956
+#: merge-recursive.c:961
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:981
+#: merge-recursive.c:986
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr ""
 
-#: merge-recursive.c:992
+#: merge-recursive.c:997
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr ""
 
-#: merge-recursive.c:997
+#: merge-recursive.c:1002
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:1227 merge-recursive.c:1239
+#: merge-recursive.c:1233 merge-recursive.c:1246
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr ""
 
-#: merge-recursive.c:1230 merge-recursive.c:1242
+#: merge-recursive.c:1236 merge-recursive.c:1249
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr ""
 
-#: merge-recursive.c:1265
+#: merge-recursive.c:1273
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 
-#: merge-recursive.c:1269
+#: merge-recursive.c:1277
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr ""
 
-#: merge-recursive.c:1270
+#: merge-recursive.c:1278
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr ""
 
-#: merge-recursive.c:1282
+#: merge-recursive.c:1290
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr ""
 
-#: merge-recursive.c:1424
+#: merge-recursive.c:1434
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 
-#: merge-recursive.c:1496
+#: merge-recursive.c:1506
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree."
 msgstr ""
 
-#: merge-recursive.c:1501
+#: merge-recursive.c:1511
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree."
 msgstr ""
 
-#: merge-recursive.c:1508
+#: merge-recursive.c:1518
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree at %s."
 msgstr ""
 
-#: merge-recursive.c:1513
+#: merge-recursive.c:1523
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree at %s."
 msgstr ""
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "rename"
 msgstr ""
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "renamed"
 msgstr ""
 
-#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr ""
 
-#: merge-recursive.c:1609
+#: merge-recursive.c:1619
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 
-#: merge-recursive.c:1667
+#: merge-recursive.c:1677
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 
-#: merge-recursive.c:1698
+#: merge-recursive.c:1708
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr ""
 
-#: merge-recursive.c:1703
+#: merge-recursive.c:1713
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 
-#: merge-recursive.c:1730
+#: merge-recursive.c:1740
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 "\"->\"%s\" in \"%s\"%s"
 msgstr ""
 
-#: merge-recursive.c:1735
+#: merge-recursive.c:1745
 msgid " (left unresolved)"
 msgstr ""
 
-#: merge-recursive.c:1827
+#: merge-recursive.c:1837
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 
-#: merge-recursive.c:2090
+#: merge-recursive.c:2100
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4856,270 +5054,313 @@ msgid ""
 "getting a majority of the files."
 msgstr ""
 
-#: merge-recursive.c:2224
+#: merge-recursive.c:2234
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
 ">%s in %s"
 msgstr ""
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modify"
 msgstr ""
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modified"
 msgstr ""
 
-#: merge-recursive.c:3108
+#: merge-recursive.c:3128
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr ""
 
-#: merge-recursive.c:3161
+#: merge-recursive.c:3181
 #, c-format
 msgid "Adding as %s instead"
 msgstr ""
 
-#: merge-recursive.c:3368
+#: merge-recursive.c:3385
 #, c-format
 msgid "Removing %s"
 msgstr ""
 
-#: merge-recursive.c:3391
+#: merge-recursive.c:3408
 msgid "file/directory"
 msgstr ""
 
-#: merge-recursive.c:3396
+#: merge-recursive.c:3413
 msgid "directory/file"
 msgstr ""
 
-#: merge-recursive.c:3403
+#: merge-recursive.c:3420
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 
-#: merge-recursive.c:3412
+#: merge-recursive.c:3429
 #, c-format
 msgid "Adding %s"
 msgstr ""
 
-#: merge-recursive.c:3421
+#: merge-recursive.c:3438
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr ""
 
-#: merge-recursive.c:3474
+#: merge-recursive.c:3491
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr ""
 
-#: merge-recursive.c:3568
+#: merge-recursive.c:3585
 msgid "Merging:"
 msgstr ""
 
-#: merge-recursive.c:3581
+#: merge-recursive.c:3598
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3648
 msgid "merge returned no commit"
 msgstr ""
 
-#: merge-recursive.c:3796
+#: merge-recursive.c:3816
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr ""
 
-#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
-#: builtin/stash.c:473
+#: 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 "gagal membaca tembolok"
 
-#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
-#: builtin/stash.c:267
+#: 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 ""
+msgstr "gagal menulis berkas indeks baru"
 
-#: midx.c:74
+#: midx.c:78
 msgid "multi-pack-index OID fanout is of the wrong size"
-msgstr ""
+msgstr "OID kipas-keluar indeks multipak salah ukuran"
 
-#: midx.c:105
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
-msgstr ""
+msgstr "berkas indeks multipak %s terlalu kecil"
 
-#: midx.c:121
+#: 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"
 
-#: midx.c:126
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
-msgstr ""
+msgstr "versi indeks multipak %d tidak dikenal"
 
-#: midx.c:131
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
-msgstr ""
+msgstr "versi hash indeks multipak %u tidak cocok dengan versi %u"
 
-#: midx.c:148
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
-msgstr ""
+msgstr "indeks multipak kehilangan bingkah pack-name yang diperlukan"
 
-#: midx.c:150
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
-msgstr ""
+msgstr "indeks multipak kehilangan bingkah OID kipas keluar yang diperlukan"
 
-#: midx.c:152
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
-msgstr ""
+msgstr "indeks multipak kehilangan bingkah pencarian OID yang diperlukan"
 
-#: midx.c:154
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
-msgstr ""
+msgstr "indeks multipak kehilangan bingkah offset objek yang diperlukan"
 
-#: midx.c:170
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr ""
+msgstr "nama pak indeks multipak tidak berurutan: '%s' sebelum '%s'"
 
-#: midx.c:214
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
-msgstr ""
+msgstr "pack-int-id jelek: %u (total pak %u)"
 
-#: midx.c:264
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
-msgstr ""
+msgstr "indeks multipak simpan offset 64-bit, tapi off_t terlalu kecil"
 
-#: midx.c:490
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
-msgstr ""
+msgstr "gagal menambah berkas pak '%s'"
 
-#: midx.c:496
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
-msgstr ""
+msgstr "gagal membuka indeks pak '%s'"
 
-#: midx.c:564
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
-msgstr ""
+msgstr "gagal melokasi objek %d di dalam berkas pak"
 
-#: midx.c:880 builtin/index-pack.c:1535
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "tidak dapat menyimpan berkas indeks balik"
 
-#: midx.c:933
-msgid "Adding packfiles to multi-pack-index"
-msgstr ""
+#: midx.c:993
+#, c-format
+msgid "could not parse line: %s"
+msgstr "tidak dapat menguraikan baris: %s"
 
-#: midx.c:979
+#: midx.c:995
 #, c-format
-msgid "did not see pack-file %s to drop"
-msgstr ""
+msgid "malformed line: %s"
+msgstr "baris jelek '%s'."
+
+#: midx.c:1162
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "abaikan indeks multipak yang sudah ada; checksum tidak cocok"
+
+#: midx.c:1187
+msgid "could not load pack"
+msgstr "tidak dapat memuat pak"
+
+#: midx.c:1193
+#, c-format
+msgid "could not open index for %s"
+msgstr "tidak dapat membuka indeks untuk %s"
 
-#: midx.c:1024
+#: midx.c:1204
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Menambahkan berkas pak ke indeks multipak"
+
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
-msgstr ""
+msgstr "pak yang disukai tidak dikenal: '%s'"
+
+#: 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:1324
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "tidak melihat berkas pak %s untuk dijeblokkan"
 
-#: midx.c:1029
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
-msgstr ""
+msgstr "pak yang disukai '%s' kadaluarsa"
 
-#: midx.c:1045
+#: midx.c:1383
 msgid "no pack files to index."
-msgstr ""
+msgstr "tidak ada berkas pak untuk diindeks."
+
+#: midx.c:1420
+msgid "could not write multi-pack bitmap"
+msgstr "tidak dapat menulis bitmap multipak"
 
-#: midx.c:1125 builtin/clean.c:37
+#: midx.c:1430
+msgid "could not write multi-pack-index"
+msgstr "gagal menulis indeks multipak"
+
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "gagal menghapus %s"
 
-#: midx.c:1156
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
-msgstr ""
+msgstr "gagal membersihkan indeks multipak pada %s"
 
-#: midx.c:1214
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
-msgstr ""
+msgstr "berkas indeks multipak ada, tetapi gagal diurai"
 
-#: midx.c:1222
+#: midx.c:1593
+msgid "incorrect checksum"
+msgstr "checksum salah"
+
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
-msgstr ""
+msgstr "Mencari berkas pak yang direferensikan"
 
-#: midx.c:1237
+#: 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]"
 
-#: midx.c:1242
+#: midx.c:1616
 msgid "the midx contains no oid"
-msgstr ""
+msgstr "midx tidak berisi oid"
 
-#: midx.c:1251
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
-msgstr ""
+msgstr "Memverifikasi urutan OID di dalam indeks multipak"
 
-#: midx.c:1260
+#: midx.c:1634
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
-msgstr ""
+msgstr "urutan pencarian oid tidak berurutan: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1280
+#: midx.c:1654
 msgid "Sorting objects by packfile"
-msgstr ""
+msgstr "Mengurutkan objek oleh berkas pak"
 
-#: midx.c:1287
+#: midx.c:1661
 msgid "Verifying object offsets"
-msgstr ""
+msgstr "Memverifikasi offset objek"
 
-#: midx.c:1303
+#: midx.c:1677
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
-msgstr ""
+msgstr "gagal memuat entri pak untuk oid[%d] = %s"
 
-#: midx.c:1309
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
-msgstr ""
+msgstr "gagal memuat indeks pak untuk berkas pak %s"
 
-#: midx.c:1318
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-msgstr ""
+msgstr "offset objek salah untuk oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1343
+#: midx.c:1719
 msgid "Counting referenced objects"
-msgstr ""
+msgstr "Menghitung objek tereferensi"
 
-#: midx.c:1353
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
-msgstr ""
+msgstr "Mencari dan menghapus berkas pak tak tereferensi"
 
-#: midx.c:1544
+#: midx.c:1921
 msgid "could not start pack-objects"
-msgstr ""
+msgstr "tidak dapat memulai pack-objects"
 
-#: midx.c:1564
+#: midx.c:1941
 msgid "could not finish pack-objects"
-msgstr ""
+msgstr "tidak dapat menyelesaikan pack-objects"
 
 #: name-hash.c:542
 #, c-format
@@ -5172,270 +5413,271 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr ""
 
-#: object-file.c:526
+#: object-file.c:456
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 
-#: object-file.c:577
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr ""
 
-#: object-file.c:649
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 
-#: object-file.c:656
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr ""
 
-#: object-file.c:699
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr ""
 
-#: object-file.c:717
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr ""
 
-#: object-file.c:724
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr ""
 
-#: object-file.c:759
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr ""
 
-#: object-file.c:780
+#: object-file.c:762
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 
-#: object-file.c:786
+#: object-file.c:768
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr ""
 
-#: object-file.c:792
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 
-#: object-file.c:800
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
 
-#: object-file.c:860
+#: object-file.c:813
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr ""
+
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr ""
 
-#: object-file.c:1010
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr ""
 
-#: object-file.c:1031
-msgid "mmap failed"
+#: object-file.c:1048
+#, c-format
+msgid "mmap failed%s"
 msgstr ""
 
-#: object-file.c:1195
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr ""
 
-#: object-file.c:1330 object-file.c:2524
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr ""
 
-#: object-file.c:1332 object-file.c:2528
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr ""
 
-#: object-file.c:1374
-msgid "invalid object type"
-msgstr ""
-
-#: object-file.c:1458
+#: object-file.c:1457
 #, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
+msgid "unable to parse %s header"
 msgstr ""
 
-#: object-file.c:1461
-#, c-format
-msgid "unable to unpack %s header"
+#: object-file.c:1459
+msgid "invalid object type"
 msgstr ""
 
-#: object-file.c:1467
+#: object-file.c:1470
 #, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
+msgid "unable to unpack %s header"
 msgstr ""
 
-#: object-file.c:1470
+#: object-file.c:1474
 #, c-format
-msgid "unable to parse %s header"
+msgid "header for %s too long, exceeds %d bytes"
 msgstr ""
 
-#: object-file.c:1697
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr ""
 
-#: object-file.c:1701
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr ""
 
-#: object-file.c:1705
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr ""
 
-#: object-file.c:1709
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr ""
 
-#: object-file.c:1814
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr ""
 
-#: object-file.c:1821
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr ""
 
-#: object-file.c:1828
+#: object-file.c:1835
 msgid "file write error"
 msgstr ""
 
-#: object-file.c:1848
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr ""
 
-#: object-file.c:1913
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 
-#: object-file.c:1915
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr ""
 
-#: object-file.c:1939
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr ""
 
-#: object-file.c:1945
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr ""
 
-#: object-file.c:1949
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr ""
 
-#: object-file.c:1953
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr ""
 
-#: object-file.c:1963 builtin/pack-objects.c:1097
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr ""
 
-#: object-file.c:2040
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr ""
 
-#: object-file.c:2091
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr ""
 
-#: object-file.c:2099
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr ""
 
-#: object-file.c:2199
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr ""
 
-#: object-file.c:2202
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr ""
 
-#: object-file.c:2275 object-file.c:2285
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr ""
 
-#: object-file.c:2291
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr ""
 
-#: object-file.c:2315
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr ""
 
-#: object-file.c:2317
+#: object-file.c:2331
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr ""
 
-#: object-file.c:2344 builtin/index-pack.c:192
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "tidak dapat membuka %s"
 
-#: object-file.c:2535 object-file.c:2588
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr ""
 
-#: object-file.c:2559
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr ""
 
-#: object-file.c:2564
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr ""
 
-#: object-file.c:2570
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr ""
 
-#: object-file.c:2581
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr ""
 
-#: object-name.c:486
+#: object-name.c:480
 #, c-format
 msgid "short object ID %s is ambiguous"
 msgstr ""
 
-#: object-name.c:497
+#: object-name.c:491
 msgid "The candidates are:"
 msgstr ""
 
-#: object-name.c:796
+#: object-name.c:790
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5448,62 +5690,62 @@ msgid ""
 "running \"git config advice.objectNameWarning false\""
 msgstr ""
 
-#: object-name.c:916
+#: object-name.c:910
 #, c-format
 msgid "log for '%.*s' only goes back to %s"
 msgstr ""
 
-#: object-name.c:924
+#: object-name.c:918
 #, c-format
 msgid "log for '%.*s' only has %d entries"
 msgstr ""
 
-#: object-name.c:1702
+#: object-name.c:1696
 #, c-format
 msgid "path '%s' exists on disk, but not in '%.*s'"
 msgstr ""
 
-#: object-name.c:1708
+#: object-name.c:1702
 #, c-format
 msgid ""
 "path '%s' exists, but not '%s'\n"
 "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
 msgstr ""
 
-#: object-name.c:1717
+#: object-name.c:1711
 #, c-format
 msgid "path '%s' does not exist in '%.*s'"
 msgstr ""
 
-#: object-name.c:1745
+#: object-name.c:1739
 #, c-format
 msgid ""
 "path '%s' is in the index, but not at stage %d\n"
 "hint: Did you mean ':%d:%s'?"
 msgstr ""
 
-#: object-name.c:1761
+#: object-name.c:1755
 #, c-format
 msgid ""
 "path '%s' is in the index, but not '%s'\n"
 "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
 msgstr ""
 
-#: object-name.c:1769
+#: object-name.c:1763
 #, c-format
 msgid "path '%s' exists on disk, but not in the index"
 msgstr ""
 
-#: object-name.c:1771
+#: object-name.c:1765
 #, c-format
 msgid "path '%s' does not exist (neither on disk nor in the index)"
 msgstr ""
 
-#: object-name.c:1784
+#: object-name.c:1778
 msgid "relative path syntax can't be used outside working tree"
 msgstr ""
 
-#: object-name.c:1922
+#: object-name.c:1916
 #, c-format
 msgid "invalid object name '%.*s'."
 msgstr ""
@@ -5518,27 +5760,40 @@ msgstr ""
 msgid "object %s is a %s, not a %s"
 msgstr ""
 
-#: object.c:232
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr ""
 
-#: object.c:245
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr ""
 
-#: object.c:265 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr ""
 
-#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr ""
+
+#: pack-bitmap.c:429
+msgid "load_reverse_index: could not open pack"
+msgstr ""
+
+#: 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:1547 builtin/rev-list.c:92
+#: pack-bitmap.c:1935
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr ""
+
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr ""
@@ -5568,124 +5823,134 @@ msgstr ""
 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
 msgstr ""
 
-#: pack-write.c:250
+#: pack-write.c:251
 msgid "cannot both write and verify reverse index"
 msgstr ""
 
-#: pack-write.c:271
+#: pack-write.c:270
 #, c-format
 msgid "could not stat: %s"
 msgstr ""
 
-#: pack-write.c:283
+#: pack-write.c:282
 #, c-format
 msgid "failed to make %s readable"
 msgstr ""
 
-#: pack-write.c:522
+#: pack-write.c:520
 #, c-format
 msgid "could not write '%s' promisor file"
 msgstr ""
 
-#: packfile.c:625
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 
-#: packfile.c:1937
+#: packfile.c:657
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr ""
+
+#: packfile.c:1924
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 
-#: packfile.c:1941
+#: 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
+#: 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.c:38
+#: 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"
 msgstr ""
 
-#: parse-options.c:73
+#: parse-options.c:93
 #, c-format
 msgid "%s is incompatible with %s"
 msgstr ""
 
-#: parse-options.c:78
+#: parse-options.c:98
 #, c-format
 msgid "%s : incompatible with something else"
 msgstr ""
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
 #, c-format
 msgid "%s takes no value"
 msgstr ""
 
-#: parse-options.c:94
+#: parse-options.c:114
 #, c-format
 msgid "%s isn't available"
 msgstr ""
 
-#: parse-options.c:217
+#: parse-options.c:237
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr ""
 
-#: parse-options.c:386
+#: parse-options.c:393
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr ""
 
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr ""
 
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr ""
 
-#: parse-options.c:879
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: parse-options.c:881
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr ""
 
-#: parse-options.c:883
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr ""
 
-#: parse-options.c:907
+#: parse-options.c:920
 msgid "..."
 msgstr ""
 
-#: parse-options.c:926
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr ""
@@ -5693,97 +5958,121 @@ msgstr ""
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:932
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr ""
 
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. 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:970
+#, c-format
+msgid "%*s%s"
+msgstr ""
+
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr ""
 
-#: parse-options.c:974
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr ""
 
-#: path.c:915
+#: path.c:922
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr ""
 
-#: pathspec.c:151
+#: pathspec.c:150
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 
-#: pathspec.c:169
+#: pathspec.c:168
 msgid "Only one 'attr:' specification is allowed."
 msgstr ""
 
-#: pathspec.c:172
+#: pathspec.c:171
 msgid "attr spec must not be empty"
 msgstr ""
 
-#: pathspec.c:215
+#: pathspec.c:214
 #, c-format
 msgid "invalid attribute name %s"
 msgstr ""
 
-#: pathspec.c:280
+#: pathspec.c:279
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 
-#: pathspec.c:287
+#: pathspec.c:286
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr ""
 
-#: pathspec.c:327
+#: pathspec.c:326
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr ""
 
-#: pathspec.c:348
+#: pathspec.c:347
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr ""
 
-#: pathspec.c:353
+#: pathspec.c:352
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr ""
 
-#: pathspec.c:391
+#: pathspec.c:390
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr ""
 
-#: pathspec.c:450
+#: pathspec.c:449
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr ""
 
-#: pathspec.c:466
+#: pathspec.c:465
 #, c-format
 msgid "%s: '%s' is outside repository at '%s'"
 msgstr ""
 
-#: pathspec.c:542
+#: pathspec.c:541
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr ""
 
-#: pathspec.c:552
+#: pathspec.c:551
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 
-#: pathspec.c:619
+#: pathspec.c:618
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr ""
 
-#: pathspec.c:664
+#: pathspec.c:663
 #, c-format
 msgid "line is badly quoted: %s"
 msgstr ""
@@ -5797,14 +6086,14 @@ msgid "unable to write delim packet"
 msgstr ""
 
 #: pkt-line.c:106
-msgid "unable to write stateless separator packet"
+msgid "unable to write response end packet"
 msgstr ""
 
 #: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr ""
 
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
 msgid "protocol error: impossibly long line"
 msgstr ""
 
@@ -5812,7 +6101,7 @@ msgstr ""
 msgid "packet write with format failed"
 msgstr ""
 
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
 msgid "packet write failed - data exceeds max packet size"
 msgstr ""
 
@@ -5821,25 +6110,25 @@ msgstr ""
 msgid "packet write failed: %s"
 msgstr ""
 
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
 msgid "read error"
 msgstr ""
 
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
 msgid "the remote end hung up unexpectedly"
 msgstr ""
 
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr ""
 
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: 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:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr ""
@@ -5853,23 +6142,23 @@ msgstr ""
 msgid "unable to create threaded lstat: %s"
 msgstr ""
 
-#: pretty.c:988
+#: pretty.c:1051
 msgid "unable to parse --pretty format"
 msgstr ""
 
-#: promisor-remote.c:30
+#: promisor-remote.c:31
 msgid "promisor-remote: unable to fork off fetch subprocess"
 msgstr ""
 
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
 msgid "promisor-remote: could not write to fetch subprocess"
 msgstr ""
 
-#: promisor-remote.c:41
+#: promisor-remote.c:44
 msgid "promisor-remote: could not close stdin to fetch subprocess"
 msgstr ""
 
-#: promisor-remote.c:53
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr ""
@@ -5882,238 +6171,234 @@ msgstr ""
 msgid "Removing duplicate objects"
 msgstr ""
 
-#: range-diff.c:78
+#: range-diff.c:67
 msgid "could not start `log`"
 msgstr ""
 
-#: range-diff.c:80
+#: range-diff.c:69
 msgid "could not read `log` output"
 msgstr ""
 
-#: range-diff.c:101 sequencer.c:5551
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr ""
 
-#: range-diff.c:115
+#: range-diff.c:111
 #, c-format
 msgid ""
 "could not parse first line of `log` output: did not start with 'commit ': "
 "'%s'"
 msgstr ""
 
-#: range-diff.c:140
+#: range-diff.c:137
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr ""
 
-#: range-diff.c:306
+#: range-diff.c:304
 msgid "failed to generate diff"
 msgstr ""
 
-#: range-diff.c:558
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr ""
-
-#: range-diff.c:561 range-diff.c:563
+#: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr ""
 
-#: read-cache.c:708
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr ""
 
-#: read-cache.c:724
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr ""
 
-#: read-cache.c:746
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 
-#: read-cache.c:751
+#: read-cache.c:766 builtin/submodule--helper.c:3242
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr ""
 
-#: read-cache.c:803
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr ""
 
-#: read-cache.c:822
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr ""
 
-#: read-cache.c:833
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr ""
 
-#: read-cache.c:1356
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr ""
 
-#: read-cache.c:1571
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr ""
 
-#: read-cache.c:1700
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
-#: read-cache.c:1710
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
-#: read-cache.c:1766
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr ""
 
-#: read-cache.c:1769
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr ""
 
-#: read-cache.c:1778
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr ""
 
-#: read-cache.c:1812
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr ""
 
-#: read-cache.c:1814
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr ""
 
-#: read-cache.c:1851
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr ""
 
-#: read-cache.c:1867
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr ""
 
-#: read-cache.c:1924
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr ""
 
-#: read-cache.c:1927
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr ""
 
-#: read-cache.c:1930
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr ""
 
-#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:332
+#: 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:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr ""
 
-#: read-cache.c:2180
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr ""
 
-#: read-cache.c:2193
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr ""
 
-#: read-cache.c:2226
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr ""
 
-#: read-cache.c:2230
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr ""
 
-#: read-cache.c:2234
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr ""
 
-#: read-cache.c:2238
+#: read-cache.c:2280
 #, c-format
-msgid "%s: unable to map index file"
+msgid "%s: unable to map index file%s"
 msgstr ""
 
-#: read-cache.c:2280
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr ""
 
-#: read-cache.c:2307
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr ""
 
-#: read-cache.c:2345
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr ""
 
-#: read-cache.c:2392
+#: read-cache.c:2455
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr ""
 
-#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: 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:3138
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr ""
 
-#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr ""
 
-#: read-cache.c:3222
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr ""
 
-#: read-cache.c:3234
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr ""
 
-#: read-cache.c:3263
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr ""
 
-#: read-cache.c:3412
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr ""
@@ -6124,12 +6409,16 @@ 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"
+"Atau Anda dapat membatalkan pendasaran ulang dengan 'git rebase --abort'.\n"
 
 #: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
+"setelan %s tidak dikenal untuk opsi rebase.missingCommitsCheck. Abaikan."
 
 #: rebase-interactive.c:42
 msgid ""
@@ -6155,27 +6444,55 @@ msgid ""
 "\n"
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
+"\n"
+"Perintah:\n"
+"p, pick <komit> = gunakan komit\n"
+"r, reword <komit> = gunakan komit, tapi sunting pesan komit\n"
+"e, edit <komit> = gunakan komit, tapi berhenti untuk amandemen\n"
+"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 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"
+"m, merge [-C <komit> | -c <komit>] <label> [# <satu baris>]\n"
+".       buat komit penggabungan dengan pesan komit penggabungan asli\n"
+".       (atau satu baris, jika tidak ada komit penggabungan asli yang\n"
+".       disebutkan); gunakan -c <komit> untuk menulis ulang pesan komit\n"
+"\n"
+"Baris diatas dapat disusun ulang; hal itu dieksekusi dari atas ke bawah.\n"
 
 #: rebase-interactive.c:66
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Dasarkan ulang %s kepada %s (%d perintah)"
+msgstr[1] "Dasarkan ulang %s kepada %s (%d perintah)"
 
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
 msgid ""
 "\n"
 "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"
 
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
 msgstr ""
+"\n"
+"Jika Anda menghapus sebaris disini KOMIT TERSEBUT AKAN HILANG.\n"
 
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6183,25 +6500,35 @@ msgid ""
 "    git rebase --continue\n"
 "\n"
 msgstr ""
+"\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"
 
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
 "\n"
 msgstr ""
+"\n"
+"Bagaimanapun, jika Anda menghapus semuanya, pendasaran ulang akan "
+"dibatalkan.\n"
+"\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816
-#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
+#: 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'"
-msgstr ""
+msgstr "tidak dapat menulis '%s'"
 
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
 #, c-format
 msgid "could not write '%s'."
-msgstr ""
+msgstr "tidak dapat menulis '%s'."
 
 #: rebase-interactive.c:196
 #, c-format
@@ -6209,6 +6536,8 @@ msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):\n"
 msgstr ""
+"Peringatan: beberapa komit mungkin sudah tidak sengaja dihapus.\n"
+"Komit terhapus (terbaru ke terlama):\n"
 
 #: rebase-interactive.c:203
 #, c-format
@@ -6220,15 +6549,19 @@ msgid ""
 "The possible behaviours are: ignore, warn, error.\n"
 "\n"
 msgstr ""
+"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"
+"\n"
 
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
 #, c-format
-msgid "could not read '%s'."
-msgstr ""
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve' digantikan oleh 'merges'"
 
-#: ref-filter.c:42 wt-status.c:1978
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr ""
 
@@ -6247,257 +6580,228 @@ msgstr ""
 msgid "ahead %d, behind %d"
 msgstr ""
 
-#: ref-filter.c:175
+#: ref-filter.c:235
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr ""
 
-#: ref-filter.c:177
+#: ref-filter.c:237
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr ""
 
-#: ref-filter.c:199
+#: ref-filter.c:259
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr ""
 
-#: ref-filter.c:203
+#: ref-filter.c:263
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr ""
 
-#: ref-filter.c:205
+#: 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 ""
 
-#: ref-filter.c:260
+#: ref-filter.c:320
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:282
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr ""
-
-#: ref-filter.c:290
+#: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:302
+#: ref-filter.c:364
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:315
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr ""
-
-#: ref-filter.c:334
+#: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
 msgstr ""
 
-#: ref-filter.c:336
+#: ref-filter.c:398
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr ""
 
-#: ref-filter.c:367
+#: ref-filter.c:429
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr ""
 
-#: ref-filter.c:369
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr ""
-
-#: ref-filter.c:384
+#: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr ""
 
-#: ref-filter.c:388
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr ""
-
-#: ref-filter.c:402
+#: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
 msgstr ""
 
-#: ref-filter.c:432
+#: ref-filter.c:506
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr ""
 
-#: ref-filter.c:444
+#: ref-filter.c:518
 #, c-format
 msgid "unrecognized position:%s"
 msgstr ""
 
-#: ref-filter.c:451
+#: ref-filter.c:525
 #, c-format
 msgid "unrecognized width:%s"
 msgstr ""
 
-#: ref-filter.c:460
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr ""
-
-#: ref-filter.c:468
+#: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr ""
 
-#: ref-filter.c:486
+#: ref-filter.c:568
 #, c-format
-msgid "unrecognized %%(if) argument: %s"
+msgid "%%(rest) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:588
+#: ref-filter.c:680
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr ""
 
-#: ref-filter.c:615
+#: ref-filter.c:707
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr ""
 
-#: ref-filter.c:619
+#: ref-filter.c:711
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 
-#: ref-filter.c:743
+#: 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"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
 msgstr ""
 
-#: ref-filter.c:807
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr ""
-
-#: ref-filter.c:809
+#: ref-filter.c:912
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr ""
 
-#: ref-filter.c:811
+#: ref-filter.c:914
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr ""
 
-#: ref-filter.c:839
+#: ref-filter.c:950
 #, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
+msgid "format: %%(else) atom used more than once"
 msgstr ""
 
-#: ref-filter.c:841
+#: ref-filter.c:965
 #, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
+msgid "format: %%(end) atom used without corresponding atom"
 msgstr ""
 
-#: ref-filter.c:843
+#: ref-filter.c:1027
 #, c-format
-msgid "format: %%(else) atom used more than once"
+msgid "malformed format string %s"
 msgstr ""
 
-#: ref-filter.c:858
+#: ref-filter.c:1033
 #, c-format
-msgid "format: %%(end) atom used without corresponding atom"
+msgid "this command reject atom %%(%.*s)"
 msgstr ""
 
-#: ref-filter.c:915
+#: ref-filter.c:1040
 #, c-format
-msgid "malformed format string %s"
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
 msgstr ""
 
-#: ref-filter.c:1556
+#: ref-filter.c:1706
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr ""
 
-#: ref-filter.c:1559
+#: ref-filter.c:1709
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr ""
 
-#: ref-filter.c:1562
+#: ref-filter.c:1712
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr ""
 
-#: ref-filter.c:1566
+#: ref-filter.c:1716
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr ""
 
-#: ref-filter.c:1569
+#: ref-filter.c:1719
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr ""
 
-#: ref-filter.c:1572
+#: ref-filter.c:1722
 msgid "(no branch)"
 msgstr ""
 
-#: ref-filter.c:1604 ref-filter.c:1813
+#: ref-filter.c:1754 ref-filter.c:1972
 #, c-format
 msgid "missing object %s for %s"
 msgstr ""
 
-#: ref-filter.c:1614
+#: ref-filter.c:1764
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr ""
 
-#: ref-filter.c:1997
+#: ref-filter.c:2155
 #, c-format
 msgid "malformed object at '%s'"
 msgstr ""
 
-#: ref-filter.c:2086
+#: ref-filter.c:2245
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr ""
 
-#: ref-filter.c:2091 refs.c:676
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr ""
 
-#: ref-filter.c:2431
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr ""
 
-#: ref-filter.c:2525
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr ""
 
-#: ref-filter.c:2530
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr ""
 
-#: refs.c:264
+#: refs.c:261
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr ""
 
-#: refs.c:566
+#: refs.c:563
 #, c-format
 msgid ""
 "Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6512,12 +6816,12 @@ msgid ""
 "\tgit branch -m <name>\n"
 msgstr ""
 
-#: refs.c:588
+#: refs.c:585
 #, c-format
 msgid "could not retrieve `%s`"
 msgstr ""
 
-#: refs.c:598
+#: refs.c:595
 #, c-format
 msgid "invalid branch name: %s = %s"
 msgstr ""
@@ -6527,66 +6831,66 @@ msgstr ""
 msgid "ignoring dangling symref %s"
 msgstr ""
 
-#: refs.c:922
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr ""
 
-#: refs.c:929
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr ""
 
-#: refs.c:994
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr ""
 
-#: refs.c:1086
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr ""
 
-#: refs.c:1157
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr ""
 
-#: refs.c:2051
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr ""
 
-#: refs.c:2131
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 
-#: refs.c:2142
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr ""
 
-#: refs.c:2242 refs.c:2272
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr ""
 
-#: refs.c:2248 refs.c:2283
+#: refs.c:2275 refs.c:2310
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr ""
 
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr ""
 
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: 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:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr ""
@@ -6596,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"
@@ -6648,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"
@@ -6672,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"
@@ -6683,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"
@@ -6694,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"
@@ -6705,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"
@@ -6716,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 ""
@@ -6831,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"
@@ -6846,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'"
@@ -6872,335 +7176,360 @@ msgstr ""
 
 #: rerere.c:201 rerere.c:210 rerere.c:213
 msgid "corrupt MERGE_RR"
-msgstr ""
+msgstr "MERGE_RR rusak"
 
 #: rerere.c:248 rerere.c:253
 msgid "unable to write rerere record"
-msgstr ""
+msgstr "tidak dapat menulis rekaman rerere"
 
 #: rerere.c:479
 #, c-format
 msgid "there were errors while writing '%s' (%s)"
-msgstr ""
+msgstr "ada kesalahan saat menulis '%s' (%s)"
 
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
-msgstr ""
+msgstr "gagal membilas '%s'"
 
 #: rerere.c:487 rerere.c:1023
 #, c-format
 msgid "could not parse conflict hunks in '%s'"
-msgstr ""
+msgstr "tidak dapat mengurai bingkah konflik di '%s'"
 
 #: rerere.c:668
 #, c-format
 msgid "failed utime() on '%s'"
-msgstr ""
+msgstr "utime() gagal pada '%s'"
 
 #: rerere.c:678
 #, c-format
 msgid "writing '%s' failed"
-msgstr ""
+msgstr "gagal menulis '%s'"
 
 #: rerere.c:698
 #, c-format
 msgid "Staged '%s' using previous resolution."
-msgstr ""
+msgstr "'%s' digelarkan menggunakan resolusi sebelumnya."
 
 #: rerere.c:737
 #, c-format
 msgid "Recorded resolution for '%s'."
-msgstr ""
+msgstr "Resolusi direkam untuk '%s'."
 
 #: rerere.c:772
 #, c-format
 msgid "Resolved '%s' using previous resolution."
-msgstr ""
+msgstr "'%s' diselesaikan menggunakan resolusi sebelumnya."
 
 #: rerere.c:787
 #, c-format
 msgid "cannot unlink stray '%s'"
-msgstr ""
+msgstr "tidak dapat batal taut simpangan '%s'"
 
 #: rerere.c:791
 #, c-format
 msgid "Recorded preimage for '%s'"
-msgstr ""
+msgstr "Pracitra direkam untuk '%s'"
 
-#: rerere.c:865 submodule.c:2089 builtin/log.c:2000
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
+#: 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 ""
+msgstr "tidak dapat membuat direktori '%s'"
 
 #: rerere.c:1041
 #, c-format
 msgid "failed to update conflicted state in '%s'"
-msgstr ""
+msgstr "gagal memperbarui keadaan konflik di '%s'"
 
 #: rerere.c:1052 rerere.c:1059
 #, c-format
 msgid "no remembered resolution for '%s'"
-msgstr ""
+msgstr "tidak ada resolusi yang diingat untuk '%s'"
 
 #: rerere.c:1061
 #, c-format
 msgid "cannot unlink '%s'"
-msgstr ""
+msgstr "tidak dapat batal taut '%s'"
 
 #: rerere.c:1071
 #, c-format
 msgid "Updated preimage for '%s'"
-msgstr ""
+msgstr "Pracitra diperbarui untuk '%s'"
 
 #: rerere.c:1080
 #, c-format
 msgid "Forgot resolution for '%s'\n"
-msgstr ""
+msgstr "Resolusi dilupakan untuk '%s'\n"
 
 #: rerere.c:1191
 msgid "unable to open rr-cache directory"
-msgstr ""
+msgstr "tidak dapat membuka direktori rr-cache"
 
 #: reset.c:42
 msgid "could not determine HEAD revision"
 msgstr "tidak dapat menentukan revisi HEAD"
 
-#: reset.c:70 reset.c:76 sequencer.c:3669
+#: 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:2343
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr ""
 
-#: revision.c:2683
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr ""
 
-#: revision.c:2686
+#: revision.c:2689
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr ""
 
-#: revision.c:2892
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr ""
 
-#: run-command.c:767
-msgid "open /dev/null failed"
-msgstr ""
-
-#: run-command.c:1275
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr ""
 
-#: run-command.c:1345
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-
 #: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
-msgstr ""
+msgstr "paket bilas tidak diharapkan ketika membaca status pembongkaran remote"
 
 #: send-pack.c:152
 #, c-format
 msgid "unable to parse remote unpack status: %s"
-msgstr ""
+msgstr "tidak dapat menguraikan status pembongkaran remote: %s"
 
 #: send-pack.c:154
 #, c-format
 msgid "remote unpack failed: %s"
-msgstr ""
+msgstr "pembongkaran remote gagal: %s"
 
 #: send-pack.c:378
 msgid "failed to sign the push certificate"
-msgstr ""
+msgstr "gagal menandatangani sertifikat dorong"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "send-pack: unable to fork off fetch subprocess"
-msgstr ""
+msgstr "send-pack: tidak dapat menggarpu subproses pengambilan"
 
-#: send-pack.c:455
+#: send-pack.c:457
 msgid "push negotiation failed; proceeding anyway with push"
-msgstr ""
+msgstr "negosiasi pendorongan gagal; langsung dilanjutkan dengan mendorong"
 
-#: send-pack.c:520
+#: send-pack.c:528
 msgid "the receiving end does not support this repository's hash algorithm"
-msgstr ""
+msgstr "ujung penerima tidak mendukung algoritma hash repositori ini"
 
-#: send-pack.c:529
+#: send-pack.c:537
 msgid "the receiving end does not support --signed push"
-msgstr ""
+msgstr "ujung penerima tidak mendukung dorongan --signed"
 
-#: send-pack.c:531
+#: send-pack.c:539
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr ""
+"tidak mengirim sertifikat pendorongan karena ujung penerima tidak mendukung "
+"dorongan --signed"
 
-#: send-pack.c:543
+#: send-pack.c:546
 msgid "the receiving end does not support --atomic push"
-msgstr ""
+msgstr "ujung penerima tidak mendukung dorongan --atomic"
 
-#: send-pack.c:548
+#: send-pack.c:551
 msgid "the receiving end does not support push options"
-msgstr ""
+msgstr "ujung penerima tidak mendukung opsi dorong"
 
-#: sequencer.c:196
+#: sequencer.c:197
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
-msgstr ""
+msgstr "mode pembersihan pesan komit tidak valid '%s'"
 
-#: sequencer.c:324
+#: sequencer.c:325
 #, c-format
 msgid "could not delete '%s'"
-msgstr ""
+msgstr "tidak dapat menghapus '%s'"
 
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: 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:354
+#: sequencer.c:355
 msgid "revert"
-msgstr ""
+msgstr "balik"
 
-#: sequencer.c:356
+#: sequencer.c:357
 msgid "cherry-pick"
-msgstr ""
+msgstr "petik ceri"
 
-#: sequencer.c:358
+#: sequencer.c:359
 msgid "rebase"
-msgstr ""
+msgstr "dasar ulang"
 
-#: sequencer.c:360
+#: sequencer.c:361
 #, c-format
 msgid "unknown action: %d"
-msgstr ""
+msgstr "aksi tidak dikenal: %d"
 
-#: sequencer.c:419
+#: 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:422
+#: sequencer.c:423
 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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"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:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"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:3292
 #, c-format
 msgid "could not lock '%s'"
-msgstr ""
+msgstr "tidak dapat mengunci '%s'"
 
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#: 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:442
+#: sequencer.c:455
 #, c-format
 msgid "could not write eol to '%s'"
-msgstr ""
+msgstr "tidak dapat menulis akhir baris ke '%s'"
 
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3554
+#: 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:486
+#: 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:490
+#: sequencer.c:503
 msgid "commit your changes or stash them to proceed."
-msgstr ""
+msgstr "komit perubahan Anda atau stase untuk melanjutkan."
 
-#: sequencer.c:522
+#: sequencer.c:535
 #, c-format
 msgid "%s: fast-forward"
-msgstr ""
+msgstr "%s: maju-cepat"
 
-#: sequencer.c:561 builtin/tag.c:609
+#: 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".
 #.
-#: sequencer.c:671
+#: sequencer.c:685
 #, c-format
 msgid "%s: Unable to write new index file"
-msgstr ""
+msgstr "%s: Tidak dapat menulis berkas indeks baru"
 
-#: sequencer.c:685
+#: sequencer.c:699
 msgid "unable to update cache tree"
-msgstr ""
+msgstr "tidak dapat memperbarui pohon tembolok"
 
-#: sequencer.c:699
+#: sequencer.c:713
 msgid "could not resolve HEAD commit"
-msgstr ""
+msgstr "tidak dapat menguraikan komit HEAD"
 
-#: sequencer.c:779
+#: sequencer.c:793
 #, c-format
 msgid "no key present in '%.*s'"
-msgstr ""
+msgstr "tidak ada kunci yang ada di pada '%.*s'"
 
-#: sequencer.c:790
+#: sequencer.c:804
 #, c-format
 msgid "unable to dequote value of '%s'"
-msgstr ""
+msgstr "tidak dapat membatal-kutip nilai dari '%s'"
 
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
-#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
+#: 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:837
+#: sequencer.c:851
 msgid "'GIT_AUTHOR_NAME' already given"
-msgstr ""
+msgstr "'GIT_AUTHOR_NAME' sudah diberikan"
 
-#: sequencer.c:842
+#: sequencer.c:856
 msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr ""
+msgstr "'GIT_AUTHOR_EMAIL' sudah diberikan"
 
-#: sequencer.c:847
+#: sequencer.c:861
 msgid "'GIT_AUTHOR_DATE' already given"
-msgstr ""
+msgstr "'GIT_AUTHOR_DATE' sudah diberikan"
 
-#: sequencer.c:851
+#: sequencer.c:865
 #, c-format
 msgid "unknown variable '%s'"
-msgstr ""
+msgstr "variabel tidak dikenal '%s'"
 
-#: sequencer.c:856
+#: sequencer.c:870
 msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr ""
+msgstr "'GIT_AUTHOR_NAME' hilang"
 
-#: sequencer.c:858
+#: sequencer.c:872
 msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr ""
+msgstr "'GIT_AUTHOR_EMAIL' hilang"
 
-#: sequencer.c:860
+#: sequencer.c:874
 msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr ""
+msgstr "'GIT_AUTHOR_DATE' hilang"
 
-#: sequencer.c:925
+#: sequencer.c:939
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -7216,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:1212
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
-msgstr ""
+msgstr "kait 'prepare-commit-msg' gagal"
 
-#: sequencer.c:1218
+#: 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"
@@ -7235,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:1231
+#: 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"
@@ -7249,359 +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:1273
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
-msgstr ""
+msgstr "tidak dapat mencari komit yang baru saja dibuat"
 
-#: sequencer.c:1275
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
-msgstr ""
+msgstr "tidak dapat menguraikan komit yang baru saja dibuat"
 
-#: sequencer.c:1321
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
-msgstr ""
+msgstr "tidak dapat menguraikan HEAD setelah membuat komit"
 
-#: sequencer.c:1323
+#: sequencer.c:1342
 msgid "detached HEAD"
-msgstr ""
+msgstr "HEAD terpisah"
 
-#: sequencer.c:1327
+#: sequencer.c:1346
 msgid " (root-commit)"
-msgstr ""
+msgstr " (komit-akar)"
 
-#: sequencer.c:1348
+#: sequencer.c:1367
 msgid "could not parse HEAD"
-msgstr ""
+msgstr "tidak dapat menguraikan HEAD"
 
-#: sequencer.c:1350
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
-msgstr ""
+msgstr "HEAD %s bukan sebuah komit!"
 
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
+#: 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:1410 sequencer.c:2295
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
-msgstr ""
+msgstr "tidak dapat menguraikan pengarang komit"
 
-#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
+#: 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:1454 sequencer.c:1574
+#: 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:1485 sequencer.c:1517
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
-msgstr ""
+msgstr "identitas pengarang tidak valid '%s'"
 
-#: sequencer.c:1491
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
-msgstr ""
+msgstr "pengarang rusak: informasi tanggal hilang"
 
-#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
-#: builtin/merge.c:934 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:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#: 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:1606
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
-msgstr ""
+msgstr "tidak dapat menguraikan komit %s"
 
-#: sequencer.c:1611
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
-msgstr ""
+msgstr "tidak dapat menguraikan komit induk %s"
 
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
-msgstr ""
+msgstr "perintah tidak dikenal: %d"
 
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
-msgstr ""
+msgstr "Ini komit pertama:"
 
-#: sequencer.c:1737
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
-msgstr ""
+msgstr "Ini komit ke-%d:"
 
-#: sequencer.c:1738
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
-msgstr ""
+msgstr "Pesan komit pertama akan dilewati:"
 
-#: sequencer.c:1739
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
-msgstr ""
+msgstr "Pesan komit ke-%d akan dilewati"
 
-#: sequencer.c:1740
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
-msgstr ""
+msgstr "Ini kombinasi dari %d komit."
 
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
-msgstr ""
+msgstr "tidak dapat menulis '%s'"
 
-#: sequencer.c:1934
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
-msgstr ""
+msgstr "butuh sebuah HEAD untuk memperbaiki"
 
-#: sequencer.c:1936 sequencer.c:3581
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
-msgstr ""
+msgstr "tidak dapat membaca HEAD"
 
-#: sequencer.c:1938
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
-msgstr ""
+msgstr "tidak dapat membaca pesan komit HEAD"
 
-#: sequencer.c:1962
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
-msgstr ""
+msgstr "tidak dapat membaca pesan komit %s"
 
-#: sequencer.c:2072
+#: sequencer.c:2091
 msgid "your index file is unmerged."
-msgstr ""
+msgstr "berkas indeks Anda tak tergabung."
 
-#: sequencer.c:2079
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
-msgstr ""
+msgstr "tidak dapat memperbaiki komit akar"
 
-#: sequencer.c:2098
+#: 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:2106 sequencer.c:2114
+#: 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:2120
+#: 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:2139
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
-msgstr ""
+msgstr "%s: tidak dapat menguraikan komit induk %s"
 
-#: sequencer.c:2205
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
-msgstr ""
+msgstr "tidak dapat menamai ulang '%s' ke '%s'"
 
-#: sequencer.c:2265
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
-msgstr ""
+msgstr "tidak dapat membalikkan %s... %s"
 
-#: sequencer.c:2266
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
-msgstr ""
+msgstr "tidak dapat menerapkan %s... %s"
 
-#: sequencer.c:2287
+#: 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:2345
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
-msgstr ""
+msgstr "git %s: gagal membaca indeks"
 
-#: sequencer.c:2352
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
-msgstr ""
+msgstr "git %s: gagal menyegarkan indeks"
 
-#: sequencer.c:2425
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
-msgstr ""
+msgstr "%s tidak menerima argumen: '%s'"
 
-#: sequencer.c:2434
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
-msgstr ""
+msgstr "argumen hilang untuk %s"
 
-#: sequencer.c:2477
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
-msgstr ""
+msgstr "tidak dapat menguraikan '%s'"
 
-#: sequencer.c:2538
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
-msgstr ""
+msgstr "baris %d tidak valid: %.*s"
 
-#: sequencer.c:2549
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
-msgstr ""
+msgstr "tidak dapat '%s' tanpa komit sebelumnya"
+
+#: sequencer.c:2624 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "tidak dapat membaca '%s'."
 
-#: sequencer.c:2635
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
-msgstr ""
+msgstr "membatalkan pemetikan ceri yang sedang berlangsung"
 
-#: sequencer.c:2644
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
-msgstr ""
+msgstr "membatalkan pembalikkan yang sedang berlangsung"
 
-#: sequencer.c:2690
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
-msgstr ""
+msgstr "mohon perbaiki menggunakan 'git rebase --edit-todo'."
 
-#: sequencer.c:2692
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
-msgstr ""
+msgstr "lembar perintah tidak dapat digunakan: '%s'"
 
-#: sequencer.c:2697
+#: sequencer.c:2718
 msgid "no commits parsed."
-msgstr ""
+msgstr "tidak ada komit yang diuraikan."
 
-#: sequencer.c:2708
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
-msgstr ""
+msgstr "tidak dapat memetik ceri selama pembalikkan."
 
-#: sequencer.c:2710
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
-msgstr ""
+msgstr "tidak dapat membalikkan selama petik ceri."
 
-#: sequencer.c:2788
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
-msgstr ""
+msgstr "nilai tidak valid untuk %s: %s"
 
-#: sequencer.c:2897
+#: sequencer.c:2918
 msgid "unusable squash-onto"
-msgstr ""
+msgstr "squash-onto tidak dapat digunakan"
 
-#: sequencer.c:2917
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
-msgstr ""
+msgstr "lembar opsi jelek: '%s'"
 
-#: sequencer.c:3012 sequencer.c:4869
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
-msgstr ""
+msgstr "himpunan komit kosong dilewatkan"
 
-#: sequencer.c:3029
+#: sequencer.c:3050
 msgid "revert is already in progress"
-msgstr ""
+msgstr "pembalikkan sudah berjalan"
 
-#: sequencer.c:3031
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr ""
+msgstr "coba \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3034
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
-msgstr ""
+msgstr "pemetikan ceri sudah berjalan"
 
-#: sequencer.c:3036
+#: 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:3050
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
-msgstr ""
+msgstr "tidak dapat membuat direktori pembaris '%s'"
 
-#: sequencer.c:3065
+#: sequencer.c:3086
 msgid "could not lock HEAD"
-msgstr ""
+msgstr "tidak dapat mengunci HEAD"
 
-#: sequencer.c:3125 sequencer.c:4582
+#: 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:3127 sequencer.c:3138
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
-msgstr ""
+msgstr "tidak dapat menguraikan HEAD"
 
-#: sequencer.c:3129 sequencer.c:3173
+#: 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:3159 builtin/grep.c:759
+#: 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:3161
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
-msgstr ""
+msgstr "tidak dapat membaca '%s': %s"
 
-#: sequencer.c:3162
+#: sequencer.c:3183
 msgid "unexpected end of file"
-msgstr ""
+msgstr "akhir berkas tidak diharapkan"
 
-#: sequencer.c:3168
+#: 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:3179
+#: 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:3220
+#: sequencer.c:3241
 msgid "no revert in progress"
-msgstr ""
+msgstr "tidak ada pembalikkan yang sedang berjalan"
 
-#: sequencer.c:3229
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
-msgstr ""
+msgstr "tidak ada pemetikan ceri yang sedang berjalan"
 
-#: sequencer.c:3239
+#: sequencer.c:3260
 msgid "failed to skip the commit"
-msgstr ""
+msgstr "gagal melewati komit"
 
-#: sequencer.c:3246
+#: sequencer.c:3267
 msgid "there is nothing to skip"
-msgstr ""
+msgstr "tidak ada yang dilewati"
 
-#: sequencer.c:3249
+#: 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:3411 sequencer.c:4473
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
-msgstr ""
+msgstr "tidak dapat membaca HEAD"
 
-#: sequencer.c:3428
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
-msgstr ""
+msgstr "tidak dapat menyalin '%s' ke '%s'"
 
-#: sequencer.c:3436
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -7612,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:3446
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
-msgstr ""
+msgstr "Tidak dapat menerapkan %s... %.*s"
 
-#: sequencer.c:3453
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
-msgstr ""
+msgstr "Tidak dapat menggabungkan %.*s"
 
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: 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:3483
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
-msgstr ""
+msgstr "Mengeksekusi: %s\n"
 
-#: sequencer.c:3498
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -7642,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:3504
+#: 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:3510
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -7657,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:3571
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
-msgstr ""
+msgstr "nama label ilegal: '%.*s'"
 
-#: sequencer.c:3625
+#: sequencer.c:3659
 msgid "writing fake root commit"
-msgstr ""
+msgstr "menulis komit akar palsu"
 
-#: sequencer.c:3630
+#: sequencer.c:3664
 msgid "writing squash-onto"
-msgstr ""
+msgstr "menulis squash-onto"
 
-#: sequencer.c:3714
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
-msgstr ""
+msgstr "tidak dapat menguraikan '%s'"
 
-#: sequencer.c:3747
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
-msgstr ""
+msgstr "tidak dapat menggabungkan tanpa revisi saat ini"
 
-#: sequencer.c:3769
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
-msgstr ""
+msgstr "tidak dapat menguraikan '%.*s'"
 
-#: sequencer.c:3778
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
-msgstr ""
+msgstr "tidak ada yang digabungkan: '%.*s'"
 
-#: sequencer.c:3790
+#: 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:3806
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
-msgstr ""
+msgstr "tidak dapat mendapatkan pesan komit dari '%s'"
 
-#: sequencer.c:3989
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
-msgstr ""
+msgstr "bahkan tidak dapat mencoba menggabungkan '%.*s'"
 
-#: sequencer.c:4005
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
-msgstr ""
+msgstr "merge: Tidak dapat menulis berkas indeks baru"
 
-#: sequencer.c:4079
+#: sequencer.c:4116
 msgid "Cannot autostash"
-msgstr ""
+msgstr "Tidak dapat menstase otomatis"
 
-#: sequencer.c:4082
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
-msgstr ""
+msgstr "Respons stase tidak diharapkan: '%s'"
 
-#: sequencer.c:4088
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
-msgstr ""
+msgstr "Tidak dapat membuat direktori untuk '%s'"
 
-#: sequencer.c:4091
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
-msgstr ""
+msgstr "Stase otomatis dibuat: %s\n"
 
-#: sequencer.c:4095
+#: sequencer.c:4132
 msgid "could not reset --hard"
-msgstr ""
+msgstr "tidak dapat reset --hard"
 
-#: sequencer.c:4120
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
-msgstr ""
+msgstr "Stase otomatis diterapkan.\n"
 
-#: sequencer.c:4132
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
-msgstr ""
+msgstr "tidak dapat menyimpan %s"
 
-#: sequencer.c:4135
+#: 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:4140
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
-msgstr ""
+msgstr "Menerapkan stase otomatis menghasilkan konflik."
 
-#: sequencer.c:4141
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
-msgstr ""
+msgstr "Stase otomatis sudah ada; membuat entri stase baru."
 
-#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4252
 msgid "could not detach HEAD"
-msgstr ""
+msgstr "tidak dapat melepas HEAD"
 
-#: sequencer.c:4249
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
-msgstr ""
+msgstr "Berhenti pada HEAD\n"
 
-#: sequencer.c:4251
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
-msgstr ""
+msgstr "Berhenti pada %s\n"
 
-#: sequencer.c:4259
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -7783,125 +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:4305
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
-msgstr ""
+msgstr "Mendasarkan ulang (%d/%d)%s"
 
-#: sequencer.c:4351
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
-msgstr ""
+msgstr "Berhenti pada %s... %.*s\n"
 
-#: sequencer.c:4422
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
-msgstr ""
+msgstr "perintah tidak dikenal %d"
 
-#: sequencer.c:4481
+#: sequencer.c:4511
 msgid "could not read orig-head"
-msgstr ""
+msgstr "tidak dapat membaca orig-head"
 
-#: sequencer.c:4486
+#: sequencer.c:4516
 msgid "could not read 'onto'"
-msgstr ""
+msgstr "tidak dapat membaca 'onto'"
 
-#: sequencer.c:4500
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
-msgstr ""
+msgstr "tidak dapat memperbarui HEAD ke %s"
 
-#: sequencer.c:4560
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
-msgstr ""
+msgstr "%s didasarkan ulang dan diperbarui dengan sukses.\n"
 
-#: sequencer.c:4612
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
-msgstr ""
+msgstr "tidak dapat mendasarkan ulang: Anda punya perubahan tak tergelar."
 
-#: sequencer.c:4621
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
-msgstr ""
+msgstr "tidak dapat mengubah komit yang tidak ada"
 
-#: sequencer.c:4623
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
-msgstr ""
+msgstr "berkas tidak valid: '%s'"
 
-#: sequencer.c:4625
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
-msgstr ""
+msgstr "konten tidak valid: '%s'"
 
-#: sequencer.c:4628
+#: 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:4664 sequencer.c:4703
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
-msgstr ""
+msgstr "tidak dapat menulis berkas: '%s'"
 
-#: sequencer.c:4719
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
-msgstr ""
+msgstr "tidak dapat menghapus CHERRY_PICK_HEAD"
 
-#: sequencer.c:4726
+#: sequencer.c:4759
 msgid "could not commit staged changes."
-msgstr ""
+msgstr "tidak dapat mengkomit perubahan tergelar."
 
-#: sequencer.c:4846
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
-msgstr ""
+msgstr "%s: tidak dapat memetik ceri sebuah %s"
 
-#: sequencer.c:4850
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
-msgstr ""
+msgstr "%s: revisi jelek"
 
-#: sequencer.c:4885
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
-msgstr ""
+msgstr "tidak dapat membalikkan sebagai komit awal"
+
+#: sequencer.c:5189 sequencer.c:5418
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "melewatkan komit yang sudah diterapkan sebelumnya %s"
 
-#: sequencer.c:5362
+#: sequencer.c:5259 sequencer.c:5434
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "gunakan --reapply-cherry-picks untuk memasukkan komit yang terlewat"
+
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
-msgstr ""
+msgstr "make_script: opsi tak ditangani"
 
-#: sequencer.c:5365
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
-msgstr ""
+msgstr "make_script: kesalahan membuat revisi"
 
-#: sequencer.c:5615 sequencer.c:5632
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
-msgstr ""
+msgstr "tidak ada yang dilakukan"
 
-#: sequencer.c:5651
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
-msgstr ""
+msgstr "tidak dapat melewatkan perintah pick yang tidak perlu"
 
-#: sequencer.c:5751
+#: 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"
@@ -7909,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"
@@ -7922,133 +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
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr ""
 
-#: setup.c:661
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr ""
 
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr ""
+#: setup.c:730
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: setup.c:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr ""
+#: 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:700
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr ""
 
-#: setup.c:702
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr ""
 
-#: setup.c:704
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr ""
 
-#: setup.c:706
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr ""
 
-#: setup.c:708
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr ""
 
-#: setup.c:710
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr ""
 
-#: setup.c:812
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr ""
 
-#: setup.c:826
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr ""
 
-#: setup.c:855 setup.c:857 setup.c:888
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr ""
 
-#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr ""
 
-#: setup.c:987
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr ""
 
-#: setup.c:1225
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr ""
 
-#: setup.c:1234 setup.c:1240
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr ""
 
-#: setup.c:1245
+#: setup.c:1315
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 
-#: setup.c:1251
+#: 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:1370
+#: 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:1417
-msgid "open /dev/null or dup failed"
-msgstr ""
-
-#: setup.c:1432
+#: setup.c:1508
 msgid "fork failed"
 msgstr ""
 
-#: setup.c:1437 t/helper/test-simple-ipc.c:285
+#: setup.c:1513
 msgid "setsid failed"
 msgstr ""
 
-#: sparse-index.c:151
-msgid "attempting to use sparse-index without cone mode"
-msgstr ""
-
-#: sparse-index.c:156
-msgid "unable to update cache-tree, staying full"
-msgstr ""
-
-#: sparse-index.c:239
+#: 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
@@ -8102,13 +8506,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
-#: builtin/rebase.c:866
+#: 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:1177
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr ""
@@ -8132,7 +8536,7 @@ msgstr "abaikan '%s' yang mungkin ditafsirkan sebagai opsi baris perintah: %s"
 msgid "invalid value for %s"
 msgstr "nilai tidak valid untuk %s"
 
-#: submodule-config.c:766
+#: submodule-config.c:767
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Tidak dapat memperbarui entri .gitmodules %s"
@@ -8157,22 +8561,22 @@ msgstr "Tidak dapat menghapus entri .gitmodules untuk %s"
 msgid "staging updated .gitmodules failed"
 msgstr "gagal menggelar .gitmodules terbarui"
 
-#: submodule.c:328
+#: submodule.c:358
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "dalam submodul tak terisi '%s'"
 
-#: submodule.c:359
+#: submodule.c:389
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Spek jalur '%s' di dalam submodul '%.*s'"
 
-#: submodule.c:436
+#: submodule.c:466
 #, c-format
 msgid "bad --ignore-submodules argument: %s"
 msgstr "argumen --ignore-submodules jelek: %s"
 
-#: submodule.c:818
+#: submodule.c:844
 #, c-format
 msgid ""
 "Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8181,12 +8585,12 @@ msgstr ""
 "Submodul dalam komit %s pada jalur '%s' bertabrakan dengan submodul yang "
 "bernama sama. Melewati itu."
 
-#: submodule.c:921
+#: submodule.c:954
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "entri submodul '%s' (%s) adalah %s, bukan komit"
 
-#: submodule.c:1006
+#: submodule.c:1042
 #, c-format
 msgid ""
 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8195,36 +8599,36 @@ msgstr ""
 "Tidak dapat menjalankan perintah 'git rev-list <komit> --not --remotes -n 1' "
 "dalam submodul %s"
 
-#: submodule.c:1129
+#: submodule.c:1165
 #, c-format
 msgid "process for submodule '%s' failed"
 msgstr "proses untuk submodul '%s' gagal"
 
-#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
+#: 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."
 
-#: submodule.c:1169
+#: submodule.c:1205
 #, c-format
 msgid "Pushing submodule '%s'\n"
 msgstr "Mendorong submodul '%s'\n"
 
-#: submodule.c:1172
+#: submodule.c:1208
 #, c-format
 msgid "Unable to push submodule '%s'\n"
 msgstr "Tidak dapat mendorong submodul '%s'\n"
 
-#: submodule.c:1464
+#: submodule.c:1491
 #, c-format
 msgid "Fetching submodule %s%s\n"
 msgstr "Mengambil submodul %s%s\n"
 
-#: submodule.c:1498
+#: submodule.c:1525
 #, c-format
 msgid "Could not access submodule '%s'\n"
 msgstr "Tidak dapat mengakses submodul '%s'\n"
 
-#: submodule.c:1653
+#: submodule.c:1680
 #, c-format
 msgid ""
 "Errors during submodule fetch:\n"
@@ -8233,61 +8637,61 @@ msgstr ""
 "Kesalahan saat pengambilan submodul:\n"
 "%s"
 
-#: submodule.c:1678
+#: submodule.c:1705
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' tak dikenal sebagai repositori git"
 
-#: submodule.c:1695
+#: submodule.c:1722
 #, c-format
 msgid "Could not run 'git status --porcelain=2' in submodule %s"
 msgstr "Tidak dapat menjalankan 'git status --porcelain=2' dalam submodul %s"
 
-#: submodule.c:1736
+#: submodule.c:1763
 #, c-format
 msgid "'git status --porcelain=2' failed in submodule %s"
 msgstr "'git status --porcelain=2' gagal dalam submodul %s"
 
-#: submodule.c:1811
+#: submodule.c:1838
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "Tidak dalat memulai 'git status' dalam submodul '%s'"
 
-#: submodule.c:1824
+#: submodule.c:1851
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "tidak dapat menjalankan 'git status' dalam submodul '%s'"
 
-#: submodule.c:1839
+#: submodule.c:1868
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "Tidak dapat batal setel setelan core.worktree dalam submodul '%s'"
 
-#: submodule.c:1866 submodule.c:2176
+#: submodule.c:1895 submodule.c:2210
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "tidak dapat rekursi ke dalam submodul '%s'"
 
-#: submodule.c:1887
+#: submodule.c:1917
 msgid "could not reset submodule index"
 msgstr "tidak dapat reset indeks submodul"
 
-#: submodule.c:1929
+#: submodule.c:1959
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "submodul '%s' punya indeks kotor"
 
-#: submodule.c:1981
+#: submodule.c:2013
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Submodul '%s' tidak dapat diperbarui."
 
-#: submodule.c:2049
+#: submodule.c:2081
 #, c-format
 msgid "submodule git dir '%s' is inside git dir '%.*s'"
 msgstr "direktori submodul git '%s' di dalam direktori git '%.*s'"
 
-#: submodule.c:2070
+#: submodule.c:2102
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8295,17 +8699,17 @@ msgstr ""
 "relocate_gitdir untuk submodul '%s' dengan lebih dari satu pohon kerja tidak "
 "didukung"
 
-#: submodule.c:2082 submodule.c:2141
+#: submodule.c:2114 submodule.c:2174
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "tidak dapat mencari nama untuk submodul '%s'"
 
-#: submodule.c:2086
+#: submodule.c:2118
 #, c-format
 msgid "refusing to move '%s' into an existing git dir"
 msgstr "menolak memindahkan '%s' ke dalam direktori git yang ada"
 
-#: submodule.c:2093
+#: submodule.c:2124
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -8316,11 +8720,11 @@ msgstr ""
 "'%s' ke\n"
 "'%s'\n"
 
-#: submodule.c:2221
+#: submodule.c:2255
 msgid "could not start ls-files in .."
 msgstr "tidak dapat memulai ls-files dalam .."
 
-#: submodule.c:2261
+#: submodule.c:2295
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree kembalikan kode kembali %d yang tak diharapkan"
@@ -8342,7 +8746,7 @@ msgid "unknown value '%s' for key '%s'"
 msgstr ""
 
 #: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
 #, c-format
 msgid "more than one %s"
 msgstr ""
@@ -8357,11 +8761,11 @@ msgstr ""
 msgid "could not read input file '%s'"
 msgstr ""
 
-#: trailer.c:766 builtin/mktag.c:88
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
 msgid "could not read from stdin"
 msgstr ""
 
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
 #, c-format
 msgid "could not stat %s"
 msgstr ""
@@ -8427,7 +8831,7 @@ msgstr ""
 msgid "error while running fast-import"
 msgstr ""
 
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
 #, c-format
 msgid "could not read ref %s"
 msgstr ""
@@ -8445,7 +8849,7 @@ msgstr ""
 msgid "invalid remote service path"
 msgstr ""
 
-#: transport-helper.c:661 transport.c:1471
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr ""
 
@@ -8454,7 +8858,7 @@ msgstr ""
 msgid "can't connect to subservice %s"
 msgstr ""
 
-#: transport-helper.c:693 transport.c:397
+#: transport-helper.c:693 transport.c:404
 msgid "--negotiate-only requires protocol v2"
 msgstr ""
 
@@ -8467,111 +8871,111 @@ msgstr ""
 msgid "expected ok/error, helper said '%s'"
 msgstr ""
 
-#: transport-helper.c:855
+#: transport-helper.c:859
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr ""
 
-#: transport-helper.c:938
+#: transport-helper.c:942
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr ""
 
-#: transport-helper.c:941
+#: transport-helper.c:945
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr ""
 
-#: transport-helper.c:944
+#: transport-helper.c:948
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr ""
 
-#: transport-helper.c:949
+#: transport-helper.c:953
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr ""
 
-#: transport-helper.c:953
+#: transport-helper.c:957
 #, c-format
 msgid "helper %s does not support --%s"
 msgstr ""
 
-#: transport-helper.c:960
+#: transport-helper.c:964
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr ""
 
-#: transport-helper.c:1060
+#: transport-helper.c:1064
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 
-#: transport-helper.c:1065
+#: transport-helper.c:1069
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr ""
 
-#: transport-helper.c:1112
+#: transport-helper.c:1116
 msgid "couldn't run fast-export"
 msgstr ""
 
-#: transport-helper.c:1117
+#: transport-helper.c:1121
 msgid "error while running fast-export"
 msgstr ""
 
-#: transport-helper.c:1142
+#: transport-helper.c:1146
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
 "Perhaps you should specify a branch.\n"
 msgstr ""
 
-#: transport-helper.c:1224
+#: transport-helper.c:1228
 #, c-format
 msgid "unsupported object format '%s'"
 msgstr ""
 
-#: transport-helper.c:1233
+#: transport-helper.c:1237
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr ""
 
-#: transport-helper.c:1385
+#: transport-helper.c:1389
 #, c-format
 msgid "read(%s) failed"
 msgstr ""
 
-#: transport-helper.c:1412
+#: transport-helper.c:1416
 #, c-format
 msgid "write(%s) failed"
 msgstr ""
 
-#: transport-helper.c:1461
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed"
 msgstr ""
 
-#: transport-helper.c:1465
+#: transport-helper.c:1469
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr ""
 
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr ""
 
-#: transport-helper.c:1525
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed to wait"
 msgstr ""
 
-#: transport-helper.c:1529
+#: transport-helper.c:1533
 #, c-format
 msgid "%s process failed"
 msgstr ""
 
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
 msgid "can't start thread for copying data"
 msgstr ""
 
@@ -8585,53 +8989,53 @@ msgstr ""
 msgid "could not read bundle '%s'"
 msgstr ""
 
-#: transport.c:220
+#: transport.c:227
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr ""
 
-#: transport.c:272
+#: transport.c:279
 msgid "see protocol.version in 'git help config' for more details"
 msgstr ""
 
-#: transport.c:273
+#: transport.c:280
 msgid "server options require protocol version 2 or later"
 msgstr ""
 
-#: transport.c:400
+#: transport.c:407
 msgid "server does not support wait-for-done"
 msgstr ""
 
-#: transport.c:751
+#: transport.c:759
 msgid "could not parse transport.color.* config"
 msgstr ""
 
-#: transport.c:826
+#: transport.c:834
 msgid "support for protocol v2 not implemented yet"
 msgstr ""
 
-#: transport.c:960
+#: transport.c:967
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr ""
 
-#: transport.c:1026
+#: transport.c:1033
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr ""
 
-#: transport.c:1079
+#: transport.c:1082
 msgid "git-over-rsync is no longer supported"
 msgstr ""
 
-#: transport.c:1181
+#: transport.c:1185
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr ""
 
-#: transport.c:1185
+#: transport.c:1189
 #, c-format
 msgid ""
 "\n"
@@ -8647,11 +9051,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: transport.c:1193
+#: transport.c:1197
 msgid "Aborting."
 msgstr ""
 
-#: transport.c:1340
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr ""
 
@@ -8671,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 "
@@ -8770,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 "
@@ -8778,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 "
@@ -8826,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 "
@@ -8841,41 +9252,41 @@ 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:1519
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr ""
 
-#: unpack-trees.c:2608
+#: unpack-trees.c:2803
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr ""
 
-#: upload-pack.c:1548
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
-msgstr ""
+msgstr "bilasan diharapkan setelah argumen pengambilan"
 
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
@@ -8910,114 +9321,124 @@ msgstr ""
 msgid "Fetching objects"
 msgstr ""
 
-#: worktree.c:238 builtin/am.c:2151
+#: 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:304
+#: 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:315
+#: 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:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' tidak ada"
 
-#: worktree.c:333
+#: 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:342
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' tidak menunjuk kembali ke '%s'"
 
-#: worktree.c:608
+#: worktree.c:604
 msgid "not a directory"
 msgstr "bukan direktori"
 
-#: worktree.c:617
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git bukan berkas"
 
-#: worktree.c:619
+#: worktree.c:615
 msgid ".git file broken"
 msgstr "berkas .git rusak"
 
-#: worktree.c:621
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr "berkas .git salah"
 
-#: worktree.c:727
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "bukan jalur valid"
 
-#: worktree.c:733
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr "tidak dapat menempatkan repositori; .git bukan berkas"
 
-#: worktree.c:737
+#: 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:741
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "tidak dapat menempatkan repositori; berkas .git rusak"
 
-#: worktree.c:747
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "gitdir tidak dapat dibaca"
 
-#: worktree.c:751
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "gitdir salah"
 
-#: worktree.c:776
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "bukan direktori valid"
 
-#: worktree.c:782
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "berkas gitdir tidak ada"
 
-#: worktree.c:787 worktree.c:796
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "tidak dapat membaca berkas gitdir (%s)"
 
-#: worktree.c:806
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "baca singkat (diharapkan %<PRIuMAX> bita, terbaca %<PRIuMAX>)"
 
-#: worktree.c:814
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "berkas gitdir tidak valid"
 
-#: worktree.c:822
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "berkas gitdir menunjuk ke lokasi yang tidak ada"
 
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr ""
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "tidak dapat membuat '%s'"
+
+#: wrapper.c:205 wrapper.c:375
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr ""
 
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
 #, c-format
 msgid "unable to access '%s'"
 msgstr ""
 
-#: wrapper.c:607
+#: wrapper.c:615
 msgid "unable to get current working directory"
 msgstr ""
 
@@ -9047,18 +9468,18 @@ msgstr "  (gunakan \"git add <berkas>...\" untuk menandai penyelesaian)"
 #: wt-status.c:199 wt-status.c:203
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
-"  (gunakan \"git add.rm <berkas>...\" sebagaimana mestinya untuk menandai "
+"  (gunakan \"git add/rm <berkas>...\" sebagaimana mestinya untuk menandai "
 "penyelesaian)"
 
 #: wt-status.c:201
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (gunakan \"git rm <berkas>\" untuk menandai penyelesaian)"
 
-#: wt-status.c:211 wt-status.c:1075
+#: 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:1084
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "Perubahan yang tidak digelar untuk komit:"
 
@@ -9162,22 +9583,22 @@ msgstr "konten yang dimodifikasi, "
 msgid "untracked content, "
 msgstr "konten yang tak dilacak, "
 
-#: wt-status.c:908
+#: 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:939
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "Submodul berubah tapi tak diperbarui:"
 
-#: wt-status.c:941
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "Perubahan submodul yang akan dikomit:"
 
-#: wt-status.c:1023
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -9185,7 +9606,7 @@ msgstr ""
 "Jangan ubah atau hapus baris diatas.\n"
 "Semua dibawahnya akan diabaikan."
 
-#: wt-status.c:1115
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -9196,262 +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:1145
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "Anda punya jalur yang tak tergabung."
 
-#: wt-status.c:1148
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (selesaikan konflik dan jalankan \"git commit\")"
 
-#: wt-status.c:1150
+#: wt-status.c:1206
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (gunakan \"git merge --abort\" untuk membatalkan penggabungan)"
 
-#: wt-status.c:1154
+#: 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:1157
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (gunakan \"git commit\" untuk mengakhiri penggabungan)"
 
-#: wt-status.c:1166
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr "Anda berada ditengah-tengah sesi am."
 
-#: wt-status.c:1169
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "Jalur saat ini kosong"
 
-#: wt-status.c:1173
+#: wt-status.c:1232
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (selesaikan konflik lalu jalankan \"git am --continue\")"
 
-#: wt-status.c:1175
+#: 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:1177
+#: 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:1310
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo hilang."
 
-#: wt-status.c:1312
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "Tidak ada perintah selesai."
 
-#: wt-status.c:1315
+#: 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:1326
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (lihat lebih lanjut di berkas %s)"
 
-#: wt-status.c:1331
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "Tidak ada perintah yang tersisa."
 
-#: wt-status.c:1334
+#: 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:1342
+#: 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:1354
+#: 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:1359
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "Anda sedang mendasarkan ulang."
 
-#: wt-status.c:1372
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (selesaikan konflik lalu jalankan \"git rebase --continue\")"
 
-#: wt-status.c:1374
+#: 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:1376
+#: 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:1383
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (semua konflik sudah selesai: jalankan \"git rebase --continue\")"
 
-#: wt-status.c:1387
+#: 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:1392
+#: 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:1395
+#: 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:1399
+#: 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:1404
+#: 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:1407
+#: 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:1409
+#: 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:1420
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "Petik ceri sedang berjalan."
 
-#: wt-status.c:1423
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Anda sedang memetik ceri komit %s."
 
-#: wt-status.c:1430
+#: 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:1433
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (jalankan \"git cherry-pick --continue\" untuk melanjutkan)"
 
-#: wt-status.c:1436
+#: 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:1438
+#: 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:1440
+#: 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:1450
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "Pengembalian sedang berjalang."
 
-#: wt-status.c:1453
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Anda sedang mengembalikan komit %s."
 
-#: wt-status.c:1459
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (selesaikan konflik dan jalankan \"git revert --continue\")"
 
-#: wt-status.c:1462
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (jalankan \"git revert --continue\" untuk melanjutkan)"
 
-#: wt-status.c:1465
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (semua konflik sudah selesai: jalankan \"git revert --continue\")"
 
-#: wt-status.c:1467
+#: 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:1469
+#: 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:1479
+#: 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:1483
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "Anda sedang membagi dua."
 
-#: wt-status.c:1486
+#: 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:1497
+#: wt-status.c:1559
+msgid "You are in a sparse checkout."
+msgstr "Anda berada dalam checkout tipis."
+
+#: 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:1736
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "Pada cabang "
 
-#: wt-status.c:1743
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "sedang mendasarkan ulang interaktif; ke "
 
-#: wt-status.c:1745
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "sedang mendasarkan ulang; ke "
 
-#: wt-status.c:1750
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr ""
 
-#: wt-status.c:1752
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr ""
 
-#: wt-status.c:1755
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "Tidak sedang berada pada cabang apapun."
 
-#: wt-status.c:1772
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Komit awal"
 
-#: wt-status.c:1773
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "Tidak ada komit"
 
-#: wt-status.c:1787
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "Berkas tak terlacak"
 
-#: wt-status.c:1789
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Berkas yang diabaikan"
 
-#: wt-status.c:1793
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9462,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:1799
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Berkas tak terlacak yang tak disebutkan%s"
 
-#: wt-status.c:1801
+#: 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:1807
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "Tidak ada perubahan"
 
-#: wt-status.c:1812
+#: 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:1816
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "tidak ada perubahan untuk dikomit\n"
 
-#: wt-status.c:1820
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -9496,87 +9928,87 @@ msgstr ""
 "tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada(gunakan "
 "\"git add\" untuk lacak)\n"
 
-#: wt-status.c:1824
+#: 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:1828
+#: 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:1832 wt-status.c:1838
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "tidak ada yang dikomit\n"
 
-#: wt-status.c:1835
+#: 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:1840
+#: 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:1945
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "Tidak ada komit apapun pada "
 
-#: wt-status.c:1949
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (tanpa cabang)"
 
-#: wt-status.c:1980
+#: wt-status.c:2050
 msgid "different"
 msgstr "berbeda"
 
-#: wt-status.c:1982 wt-status.c:1990
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "di belakang "
 
-#: wt-status.c:1985 wt-status.c:1988
+#: 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:2511
+#: 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:2517
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr "juga indeks Anda berisi perubahan yang belum dikomit."
 
-#: wt-status.c:2519
+#: 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:178
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr ""
 
-#: compat/simple-ipc/ipc-unix-socket.c:185
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr ""
 
-#: compat/simple-ipc/ipc-unix-socket.c:862
+#: 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:874
+#: compat/simple-ipc/ipc-unix-socket.c:904
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr ""
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr ""
@@ -9585,131 +10017,136 @@ msgstr ""
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opsi>] [--] <pathspec>..."
 
-#: builtin/add.c:61
+#: builtin/add.c:64
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "tidak dapat chmod %cx '%s'"
 
-#: builtin/add.c:99
+#: builtin/add.c:106
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "status diff tak diharapkan %c"
 
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
 msgid "updating files failed"
 msgstr "gagal memperbarui berkas"
 
-#: builtin/add.c:114
+#: builtin/add.c:121
 #, c-format
 msgid "remove '%s'\n"
 msgstr "hapus '%s'\n"
 
-#: builtin/add.c:198
+#: builtin/add.c:205
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Perubahan tak tergelar setelah menyegarkan indeks:"
 
-#: builtin/add.c:307 builtin/rev-parse.c:991
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Tidak dapat membaca indeks"
 
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Tidak dapat membuka '%s' untuk ditulis."
-
-#: builtin/add.c:322
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "Tidak dapat menulis tambalan"
 
-#: builtin/add.c:325
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "Gagal menyunting tambalan"
 
-#: builtin/add.c:328
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Tidak dapat men-stat '%s'"
 
-#: builtin/add.c:330
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "Tambalan kosong. Dibatalkan."
 
-#: builtin/add.c:335
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Tidak dapat terapkan '%s'"
 
-#: builtin/add.c:343
+#: 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:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: 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:366
+#: 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:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "pilih bingkah secara interaktif"
 
-#: builtin/add.c:368
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "sunting diff saat ini dan terapkan"
 
-#: builtin/add.c:369
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "perbolehkan tambah berkas yang diabaikan"
 
-#: builtin/add.c:370
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "perbarui berkas terlacak"
 
-#: builtin/add.c:371
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "normalisasi ulang EOL berkas terlacak (menyiratkan -u)"
 
-#: builtin/add.c:372
+#: 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:373
+#: 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:376
+#: 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:378
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "jangan tambahkan, hanya segarkan indeks"
 
-#: builtin/add.c:379
+#: 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:380
+#: 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:382 builtin/update-index.c:1006
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "perbolehkan perbarui entri di luar kerucut checkout tipis"
+
+#: 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:384
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "peringatkan ketika menambahkan repositori tertanam"
 
-#: builtin/add.c:386
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "tulang belakang untuk `git stash -p`"
 
-#: builtin/add.c:404
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -9740,12 +10177,12 @@ msgstr ""
 "\n"
 "Lihat \"git help submodule\" untuk selengkapnya."
 
-#: builtin/add.c:432
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "menambahkan repositori git tertanam: %s"
 
-#: builtin/add.c:451
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -9755,51 +10192,27 @@ msgstr ""
 "Matikan pesan ini dengan menjalankan\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:460
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "gagal menambahkan berkas"
 
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run tidak kompatibel dengan --interactive/--patch"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file tidak kompatibel dengan --interactive/--patch"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file tidak kompatibel dengan --edit"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A dan -u saling tak kompatibel"
-
-#: builtin/add.c:522
-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:526
+#: 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:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file tidak kompatibel dengan argumen pathspec"
-
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
-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:555
+#: 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:557
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -9809,427 +10222,482 @@ msgstr ""
 "Matikan pesan ini dengan menjalankan\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:364
+#: 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 ""
+msgstr "tidak dapat mengurai skrip pengarang"
 
-#: builtin/am.c:454
+#: builtin/am.c:482
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr ""
+msgstr "'%s' dihapus oleh kail applypatch-msg"
 
-#: builtin/am.c:496
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
-msgstr ""
+msgstr "Baris masukan salah format: '%s'."
 
-#: builtin/am.c:534
+#: builtin/am.c:562
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
-msgstr ""
+msgstr "Gagal menyalin catatan dari '%s' ke '%s'"
 
-#: builtin/am.c:560
+#: builtin/am.c:588
 msgid "fseek failed"
-msgstr ""
+msgstr "fseek gagal"
 
-#: builtin/am.c:748
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
-msgstr ""
+msgstr "tidak dapat mengurai tambalan '%s'"
 
-#: builtin/am.c:813
+#: builtin/am.c:841
 msgid "Only one StGIT patch series can be applied at once"
-msgstr ""
+msgstr "Hanya satu rangkaian tambalan StGIT yang bisa diterapkan sekaligus"
 
-#: builtin/am.c:861
+#: builtin/am.c:889
 msgid "invalid timestamp"
-msgstr ""
+msgstr "stempel waktu tidak valid"
 
-#: builtin/am.c:866 builtin/am.c:878
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
-msgstr ""
+msgstr "baris Date tidak valid"
 
-#: builtin/am.c:873
+#: builtin/am.c:901
 msgid "invalid timezone offset"
-msgstr ""
+msgstr "offset zona waktu tidak valid"
 
-#: builtin/am.c:966
+#: builtin/am.c:994
 msgid "Patch format detection failed."
-msgstr ""
+msgstr "Pendeteksian format tambalan gagal."
 
-#: builtin/am.c:971 builtin/clone.c:414
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
-msgstr ""
+msgstr "gagal membuat direktori '%s'"
 
-#: builtin/am.c:976
+#: builtin/am.c:1004
 msgid "Failed to split patches."
-msgstr ""
+msgstr "Gagal memecah tambalan."
 
-#: builtin/am.c:1125
+#: builtin/am.c:1153
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr ""
+msgstr "Saat Anda sudah menyelesaikan masalah ini, jalankan \"%s --continue\"."
 
-#: builtin/am.c:1126
+#: 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:1127
+#: 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 ""
+"Untuk merekam tambalan kosong sebagai komit kosong, jalankan \"%s --allow-"
+"empty\"."
 
-#: builtin/am.c:1222
-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 ""
+"Untuk mengembalikan cabang yang asli dan berhenti menambal, jalankan \"%s --"
+"abort\""
 
-#: builtin/am.c:1250
-msgid "Patch is empty."
+#: 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:1315
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
-msgstr ""
+msgstr "baris pengarang hilang dalam komit %s"
 
-#: builtin/am.c:1318
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
-msgstr ""
+msgstr "baris identitas tidak valid: %.*s"
 
-#: builtin/am.c:1537
+#: 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:1539
+#: builtin/am.c:1568
 msgid "Using index info to reconstruct a base tree..."
-msgstr ""
+msgstr "Menggunakan info indeks untuk membangun ulang sebuah pohon dasar..."
 
-#: builtin/am.c:1558
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr ""
+"Apakah Anda menyunting tambalan Anda?\n"
+"Itu tidak diterapkan ke blob yang direkam dalam indeksnya."
 
-#: builtin/am.c:1564
+#: builtin/am.c:1593
 msgid "Falling back to patching base and 3-way merge..."
-msgstr ""
+msgstr "Mundur ke penambalan dasar dan penggabungan 3 arah..."
 
-#: builtin/am.c:1590
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
-msgstr ""
+msgstr "Gagal menggabungkan perubahan."
 
-#: builtin/am.c:1622
+#: builtin/am.c:1651
 msgid "applying to an empty history"
-msgstr ""
+msgstr "menerapkan ke sebuah riwayat kosong"
 
-#: builtin/am.c:1674 builtin/am.c:1678
+#: builtin/am.c:1703 builtin/am.c:1707
 #, c-format
 msgid "cannot resume: %s does not exist."
-msgstr ""
+msgstr "tidak dapat melanjutkan: %s tidak ada."
 
-#: builtin/am.c:1696
+#: builtin/am.c:1725
 msgid "Commit Body is:"
-msgstr ""
+msgstr "Badan komit adalah:"
 
 #. 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:1706
+#: 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:1752 builtin/commit.c:408
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
-msgstr ""
+msgstr "tidak dapat menulis berkas indeks"
 
-#: builtin/am.c:1756
+#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr ""
+msgstr "Indeks kotor: tidak dapat menerapkan tambalan (kotor: %s)"
+
+#: 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:1796 builtin/am.c:1864
+#: builtin/am.c:1847 builtin/am.c:1916
 #, c-format
 msgid "Applying: %.*s"
-msgstr ""
+msgstr "Menerapkan: %.*s"
 
-#: builtin/am.c:1813
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
-msgstr ""
+msgstr "Tidak ada perubahan -- tambalan sudah diterapkan"
 
-#: builtin/am.c:1819
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
-msgstr ""
+msgstr "Penambalan gagal pada %s %.*s"
 
-#: builtin/am.c:1823
+#: 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:1867
+#: 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"
 "already introduced the same changes; you might want to skip this patch."
 msgstr ""
+"Tidak ada perubahan - apakah Anda lupa untuk menggunakan 'git add'?\n"
+"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:1874
+#: 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"
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
+"Anda masih punya jalur yang belum digabung pada indeks Anda.\n"
+"Anda harus 'git add' setiap berkas dengan konflik terselesai untuk "
+"menandainya.\n"
+"Anda mungkin jalankan `git rm` pada berkas untuk menerima \"penghapusan oleh "
+"mereka\" untuk itu."
 
-#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
-#: builtin/reset.c:355
+#: 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:2033
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
-msgstr ""
+msgstr "gagal membersihkan indeks"
 
-#: builtin/am.c:2077
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""
+"Sepertinya Anda telah memindahkan HEAD sejak kegagalan 'am' terakhir.\n"
+"Tidak memutar ulang ke ORIG_HEAD"
 
-#: builtin/am.c:2184
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
-msgstr ""
+msgstr "Nilai tidak valid untuk --patch-format: %s"
 
-#: builtin/am.c:2226
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
-msgstr ""
+msgstr "Nilai tidak valid untuk --show-current-patch: %s"
 
-#: builtin/am.c:2230
+#: builtin/am.c:2289
 #, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr ""
+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:2261
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
-msgstr ""
+msgstr "git am [<opsi>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
-msgstr ""
+msgstr "git am [<opsi>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2268
+#: builtin/am.c:2327
 msgid "run interactively"
-msgstr ""
+msgstr "jalankan secara interaktif"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
-msgstr ""
+msgstr "opsi bersejarah -- no-op"
 
-#: builtin/am.c:2272
+#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
-msgstr ""
+msgstr "perbolehkan mundur ke penggabungan 3 arah jika diperlukan"
 
-#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:948
+#: 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 ""
+msgstr "jadi senyap"
 
-#: builtin/am.c:2275
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
-msgstr ""
+msgstr "tambahkan trailer Signed-off-by kepada pesan komit"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
-msgstr ""
+msgstr "koding ulang ke dalam utf8 (asali)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
-msgstr ""
+msgstr "lewatkan opsi -k ke git-mailinfo"
 
-#: builtin/am.c:2282
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
-msgstr ""
+msgstr "lewatkan opsi -b ke git-mailinfo"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
-msgstr ""
+msgstr "lewatkan opsi -m ke git-mailinfo"
 
-#: builtin/am.c:2286
+#: builtin/am.c:2345
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr ""
+msgstr "lewatkan opsi --keep-cr ke git-mailsplit untuk format mbox"
 
-#: builtin/am.c:2289
+#: 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:2292
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
-msgstr ""
+msgstr "copot semuanya sebelum garis gunting"
 
-#: builtin/am.c:2294
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
-msgstr ""
+msgstr "lewatkannya melalui git-mailinfo"
 
-#: builtin/am.c:2297 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:2324
+#: 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:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
+msgstr "lewatkannya melalui git-apply"
+
+#: 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:317
 msgid "n"
-msgstr ""
+msgstr "n"
 
-#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: 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 ""
+msgstr "format"
 
-#: builtin/am.c:2321
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
-msgstr ""
+msgstr "format tambalan yang ada di"
 
-#: builtin/am.c:2327
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
-msgstr ""
+msgstr "timpa pesan error ketika kegagalan penambalan terjadi"
 
-#: builtin/am.c:2329
+#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
-msgstr ""
+msgstr "lanjutkan penerapan tambalan setelah menyelesaikan konflik"
 
-#: builtin/am.c:2332
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
-msgstr ""
+msgstr "sinonim untuk --continue"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2394
 msgid "skip the current patch"
-msgstr ""
+msgstr "lewati tambalan saat ini"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
-msgstr ""
+msgstr "kembalikan cabang asli dan batalkan operasi penambalan"
 
-#: builtin/am.c:2341
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
-msgstr ""
+msgstr "batalkan operasi penambalan tetapi simpan HEAD dimanapun itu"
 
-#: builtin/am.c:2345
+#: builtin/am.c:2404
 msgid "show the patch being applied"
-msgstr ""
+msgstr "perlihatkan tambalan yang diterapkan"
+
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "rekam tambalan kosong sebagai komit kosong"
 
-#: builtin/am.c:2350
+#: builtin/am.c:2412
 msgid "lie about committer date"
-msgstr ""
+msgstr "berbohong soal tanggal pengkomit"
 
-#: builtin/am.c:2352
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
-msgstr ""
+msgstr "gunakan stempel waktu saat ini untuk tanggal pengarang"
 
-#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: 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 ""
+msgstr "key-id"
 
-#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
-msgstr ""
+msgstr "tandatangani komit dengan GPG"
+
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "bagaimana cara menangani tambalan kosong"
 
-#: builtin/am.c:2358
+#: builtin/am.c:2423
 msgid "(internal use for git-rebase)"
-msgstr ""
+msgstr "(penggunaan internal untuk git-rebase)"
 
-#: builtin/am.c:2376
+#: 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 ""
+"Opsi -b/--binary telah menjadi no-op untuk waktu yang lama, dan\n"
+"itu akan dihapus. Mohon jangan gunakan itu lagi."
 
-#: builtin/am.c:2383
+#: builtin/am.c:2448
 msgid "failed to read the index"
-msgstr ""
+msgstr "gagal membaca indeks"
 
-#: builtin/am.c:2398
+#: 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:2422
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr ""
+"Direktori menyimpang %s ditemukan.\n"
+"Gunakan \"git am --abort\" untuk menghapusnya."
 
-#: builtin/am.c:2428
+#: builtin/am.c:2493
 msgid "Resolve operation not in progress, we are not resuming."
-msgstr ""
+msgstr "Operasi penguraian tidak berjalan, kami tidak melanjutkan."
 
-#: builtin/am.c:2438
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
-msgstr ""
+msgstr "mode interaktif butuh tambalan pada baris perintah"
 
 #: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
-msgstr ""
-
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr ""
+msgstr "git apply [<opsi>] [<tambalan>...]"
 
-#: builtin/archive.c:20
+#: builtin/archive.c:18
 msgid "could not redirect output"
-msgstr ""
+msgstr "tidak dapat mengalihkan keluaran"
 
-#: builtin/archive.c:37
+#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
-msgstr ""
+msgstr "git archive: Remote tanpa URL"
 
-#: builtin/archive.c:61
+#: builtin/archive.c:59
 msgid "git archive: expected ACK/NAK, got a flush packet"
-msgstr ""
+msgstr "git archive: ACK/NAK diharapkan, dapat paket bilasan"
 
-#: builtin/archive.c:64
+#: builtin/archive.c:62
 #, c-format
 msgid "git archive: NACK %s"
-msgstr ""
+msgstr "git archive: NACK %s"
 
-#: builtin/archive.c:65
+#: builtin/archive.c:63
 msgid "git archive: protocol error"
-msgstr ""
+msgstr "git archive: kesalahan protokol"
 
-#: builtin/archive.c:69
+#: builtin/archive.c:67
 msgid "git archive: expected a flush"
-msgstr ""
-
-#: builtin/bisect--helper.c:23
-msgid "git bisect--helper --bisect-reset [<commit>]"
-msgstr ""
+msgstr "git archive: sebuah bilasan diharapkan"
 
 #: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<komit>]"
 
 #: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
 msgstr ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
 
 #: builtin/bisect--helper.c:26
 msgid ""
@@ -10237,445 +10705,520 @@ msgid ""
 "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
 "[<paths>...]"
 msgstr ""
+"git bisect--helper --bisect-start [--term-{new,bad}=<istilah> --term-{old,"
+"good}=<istilah>] [--no-checkout] [--first-parent] [<jelek> [<bagus>...]] "
+"[--] [<jalur>...]"
 
 #: builtin/bisect--helper.c:28
 msgid "git bisect--helper --bisect-next"
-msgstr ""
+msgstr "git bisect--helper --bisect-next"
 
 #: builtin/bisect--helper.c:29
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
-msgstr ""
+msgstr "git bisect--helper --bisect-state (bad|new) [<revisi>]"
 
 #: builtin/bisect--helper.c:30
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
-msgstr ""
+msgstr "git bisect--helper --bisect-state (good|old) [<revisi>...]"
 
 #: builtin/bisect--helper.c:31
 msgid "git bisect--helper --bisect-replay <filename>"
-msgstr ""
+msgstr "git bisect--helper --bisect-replay <nama berkas>"
 
 #: builtin/bisect--helper.c:32
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-msgstr ""
+msgstr "git bisect--helper --bisect-skip [(<revisi>|<rentang>)...]"
+
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
 
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <perintah>..."
+
+#: builtin/bisect--helper.c:109
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
-msgstr ""
+msgstr "tidak dapat membuka berkas '%s' dalam mode '%s'"
 
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
 #, c-format
 msgid "could not write to file '%s'"
-msgstr ""
+msgstr "tidak dapat menulis ke berkas '%s'"
+
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "tidak dapat membuka berkas '%s' untuk dibaca"
 
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:170
 #, c-format
 msgid "'%s' is not a valid term"
-msgstr ""
+msgstr "'%s' bukan istilah yang valid"
 
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
-msgstr ""
+msgstr "tidak dapat menggunakan perintah bawaan '%s' sebagai istilah"
 
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
 #, c-format
 msgid "can't change the meaning of the term '%s'"
-msgstr ""
+msgstr "tidak dapat mengubah makna istilah '%s'"
 
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
 msgid "please use two different terms"
-msgstr ""
+msgstr "mohon gunakan dua istilah yang berbeda"
 
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
-msgstr ""
+msgstr "Kami tidak sedang membagi dua.\n"
 
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
 #, c-format
 msgid "'%s' is not a valid commit"
-msgstr ""
+msgstr "'%s' bukan sebuah komit yang valid"
 
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr ""
+"tidak dapat men-checkout HEAD asli '%s'. Coba 'git bisect reset <komit>'."
 
-#: builtin/bisect--helper.c:254
+#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
-msgstr ""
+msgstr "argument bisect_write jelek: %s"
 
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
-msgstr ""
+msgstr "tidak dapat mendapatkan oid revisi '%s'"
 
-#: builtin/bisect--helper.c:271
+#: builtin/bisect--helper.c:288
 #, c-format
 msgid "couldn't open the file '%s'"
-msgstr ""
+msgstr "tidak dapat membuka berkas '%s'"
 
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:314
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
-msgstr ""
+msgstr "Perintah tidak valid: sekarang Anda berada dalam pembagian dua %s/%s"
 
-#: builtin/bisect--helper.c:324
+#: builtin/bisect--helper.c:341
 #, 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 ""
+"Anda perlu berikan saya setidaknya satu revisi %s dan %s.\n"
+"Untuk itu Anda dapat menggunakan \"git bisect %s\" dan \"git bisect %s\"."
 
-#: builtin/bisect--helper.c:328
+#: builtin/bisect--helper.c:345
 #, 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 ""
+"Anda perlu memulai dengan \"git bisect start\".\n"
+"Lalu Anda perlu berikan saya setidaknya satu revisi %s dan %s.\n"
+"Untuk itu Anda dapat menggunakan \"git bisect %s\" dan \"git bisect %s\"."
 
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
 #, c-format
 msgid "bisecting only with a %s commit"
-msgstr ""
+msgstr "membagi dua hanya dengan sebuah komit %s"
 
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
-msgstr ""
+msgstr "Anda yakin [Y/n]?"
 
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
 msgid "no terms defined"
-msgstr ""
+msgstr "tidak ada istilah yang didefinisikan"
 
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
 "and %s for the new state.\n"
 msgstr ""
+"Istilah Anda saat ini adalah %s untuk keadaan lama\n"
+"dan %s untuk keadaan baru.\n"
 
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
 msgstr ""
+"argumen %s tidak valid untuk 'git bisect terms'.\n"
+"Opsi yang didukung adalah: --term-good|--term-old dan --term-bad|--term-new."
 
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
-msgstr ""
+msgstr "setup jalan revisi gagal\n"
 
-#: builtin/bisect--helper.c:519
+#: builtin/bisect--helper.c:536
 #, c-format
 msgid "could not open '%s' for appending"
-msgstr ""
+msgstr "tidak dapat membuka '%s' untuk menambahkan"
 
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
-msgstr ""
+msgstr "'' bukan istilah yang valid"
 
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
-msgstr ""
+msgstr "opsi tidak dikenal: '%s'"
 
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
-msgstr ""
+msgstr "'%s' sepertinya bukan revisi valid"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
 msgid "bad HEAD - I need a HEAD"
-msgstr ""
+msgstr "HEAD jelek - saya butuh HEAD"
 
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
-msgstr ""
+msgstr "gagal men-checkout '%s'. Coba 'git bisect start <cabang valid>'."
 
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
 msgid "won't bisect on cg-seek'ed tree"
-msgstr ""
+msgstr "tidak akan membagi dua pada pohon yang di-cg-seek"
 
-#: builtin/bisect--helper.c:735
+#: builtin/bisect--helper.c:752
 msgid "bad HEAD - strange symbolic ref"
-msgstr ""
+msgstr "HEAD jelek - referensi simbolik aneh"
 
-#: builtin/bisect--helper.c:755
+#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
-msgstr ""
+msgstr "referensi tidak valid: '%s'"
 
-#: builtin/bisect--helper.c:813
+#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
-msgstr ""
+msgstr "Anda perlu memulai dengan \"git bisect start\"\n"
 
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
 msgid "Do you want me to do it for you [Y/n]? "
-msgstr ""
+msgstr "Anda ingin saya melakukannya untuk Anda [Y/n]"
 
-#: builtin/bisect--helper.c:842
+#: builtin/bisect--helper.c:859
 msgid "Please call `--bisect-state` with at least one argument"
-msgstr ""
+msgstr "Mohon panggil `--bisect-state` dengan setidaknya satu argumen"
 
-#: builtin/bisect--helper.c:855
+#: builtin/bisect--helper.c:872
 #, c-format
 msgid "'git bisect %s' can take only one argument."
-msgstr ""
+msgstr "'git bisect %s' hanya dapat mengambil satu argumen."
 
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
-msgstr ""
+msgstr "Masukan revisi jelek: %s"
 
-#: builtin/bisect--helper.c:887
+#: builtin/bisect--helper.c:904
 #, c-format
 msgid "Bad rev input (not a commit): %s"
-msgstr ""
+msgstr "Masukan revisi jelek (bukan sebuah komit): %s"
 
-#: builtin/bisect--helper.c:919
+#: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
-msgstr ""
+msgstr "Kami tidak sedang membagi dua."
 
-#: builtin/bisect--helper.c:969
+#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
-msgstr ""
+msgstr "'%s'?? Anda bilang tentang apa?"
 
-#: builtin/bisect--helper.c:981
+#: builtin/bisect--helper.c:998
 #, c-format
 msgid "cannot read file '%s' for replaying"
+msgstr "tidak dapat membuka berkas '%s' untuk memainkan ulang"
+
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "bisect run gagal: tidak ada perintah yang diberikan"
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "menjalankan %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "bisect run gagal: kode keluar %d dari '%s' < 0 atau >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "tidak dapat membuka berkas '%s' untuk ditulis"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "bisect run tidak dapat dilanjutkan lagi"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "bisect run sukses"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "pembagian dua menemukan komit jelek pertama"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
 msgstr ""
+"bisect run gagal: 'git bisect--helper --bisect-state %s' keluar dengan kode "
+"keluar %d"
 
-#: builtin/bisect--helper.c:1054
+#: builtin/bisect--helper.c:1192
 msgid "reset the bisection state"
-msgstr ""
+msgstr "setel ulang keadaan pembagian dua"
 
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1194
 msgid "check whether bad or good terms exist"
-msgstr ""
+msgstr "periksa apakah ada istilah jelek atau bagus"
 
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1196
 msgid "print out the bisect terms"
-msgstr ""
+msgstr "cetak istilah pembagian dua"
 
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1198
 msgid "start the bisect session"
-msgstr ""
+msgstr "mulai sesi pembagian dua"
 
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1200
 msgid "find the next bisection commit"
-msgstr ""
+msgstr "temukan komit pembagian dua berikutnya"
 
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1202
 msgid "mark the state of ref (or refs)"
-msgstr ""
+msgstr "tandai keadaan referensi"
 
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1204
 msgid "list the bisection steps so far"
-msgstr ""
+msgstr "daftar langkah pembagian dua sejauh ini"
 
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1206
 msgid "replay the bisection process from the given file"
-msgstr ""
+msgstr "mainkan ulang proses pembagian dua dari berkas yang diberikan"
 
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1208
 msgid "skip some commits for checkout"
-msgstr ""
+msgstr "lewati beberapa komit untuk checkout"
+
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "visualisasikan pembagian dua"
 
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "gunakan <cmd>... untuk bagi dua otomatis."
+
+#: builtin/bisect--helper.c:1214
 msgid "no log for BISECT_WRITE"
-msgstr ""
+msgstr "tidak ada log untuk BISECT_WRITE"
 
-#: builtin/bisect--helper.c:1087
+#: builtin/bisect--helper.c:1229
 msgid "--bisect-reset requires either no argument or a commit"
-msgstr ""
+msgstr "--bisect-reset butuh baik tanpa argumen atau sebuah komit"
 
-#: builtin/bisect--helper.c:1092
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr ""
-
-#: builtin/bisect--helper.c:1098
+#: builtin/bisect--helper.c:1234
 msgid "--bisect-terms requires 0 or 1 argument"
-msgstr ""
+msgstr "--bisect-terms butuh 0 atau 1 argumen"
 
-#: builtin/bisect--helper.c:1107
+#: builtin/bisect--helper.c:1243
 msgid "--bisect-next requires 0 arguments"
-msgstr ""
+msgstr "--bisect-next butuh 0 argumen"
 
-#: builtin/bisect--helper.c:1118
+#: builtin/bisect--helper.c:1254
 msgid "--bisect-log requires 0 arguments"
-msgstr ""
+msgstr "--bisect-log butuh 0 argumen"
 
-#: builtin/bisect--helper.c:1123
+#: builtin/bisect--helper.c:1259
 msgid "no logfile given"
-msgstr ""
+msgstr "tidak ada berkas log yang diberikan"
 
 #: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr ""
+msgstr "git blame [<opsi>] [<opsi revisi>] [<revisi>] [--] <berkas>"
 
 #: builtin/blame.c:37
 msgid "<rev-opts> are documented in git-rev-list(1)"
-msgstr ""
+msgstr "<opsi revisi> didokumentasikan dalam git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
-msgstr ""
+msgstr "mengharapkan warna: %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:413
 msgid "must end with a color"
-msgstr ""
+msgstr "harus berakhir dengan warna"
 
-#: builtin/blame.c:728
+#: builtin/blame.c:724
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr ""
+msgstr "warna tidak valid '%s' pada color.blame.repeatedLines"
 
-#: builtin/blame.c:746
+#: builtin/blame.c:742
 msgid "invalid value for blame.coloring"
-msgstr ""
+msgstr "nilai tidak valid untuk blame.coloring"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:841
 #, c-format
 msgid "cannot find revision %s to ignore"
-msgstr ""
+msgstr "tidak dapat menemukan revisi %s untuk diabaikan"
 
-#: builtin/blame.c:867
+#: builtin/blame.c:863
 msgid "show blame entries as we find them, incrementally"
-msgstr ""
+msgstr "perlihatkan entri penyalahan seperti yang kami temukan secara bertahap"
 
-#: builtin/blame.c:868
+#: builtin/blame.c:864
 msgid "do not show object names of boundary commits (Default: off)"
-msgstr ""
+msgstr "jangan perlihatkan nama objek dari komit perbatasan (asali: off)"
 
-#: builtin/blame.c:869
+#: builtin/blame.c:865
 msgid "do not treat root commits as boundaries (Default: off)"
-msgstr ""
+msgstr "jangan perlakukan komit akar sebagai perbatasan (asali: off)"
 
-#: builtin/blame.c:870
+#: builtin/blame.c:866
 msgid "show work cost statistics"
-msgstr ""
+msgstr "perlihatkan statistik biaya usaha"
 
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: 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"
 
-#: builtin/blame.c:872
+#: builtin/blame.c:868
 msgid "show output score for blame entries"
-msgstr ""
+msgstr "perlihatkan nilai keluaran untuk entri penyalahan"
 
-#: builtin/blame.c:873
+#: builtin/blame.c:869
 msgid "show original filename (Default: auto)"
-msgstr ""
+msgstr "perlihatkan nama berkas asli (asali: auto)"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:870
 msgid "show original linenumber (Default: off)"
-msgstr ""
+msgstr "perlihatkan nomor baris asli (asali: off)"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:871
 msgid "show in a format designed for machine consumption"
-msgstr ""
+msgstr "perlihatkan dalam format yang didesain untuk konsumsi mesin"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:872
 msgid "show porcelain format with per-line commit information"
-msgstr ""
+msgstr "perlihatkan format porselen dengan informasi komit per baris"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:873
 msgid "use the same output mode as git-annotate (Default: off)"
-msgstr ""
+msgstr "gunakan mode keluaran yang sama dengan git-annotate (asali: off)"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:874
 msgid "show raw timestamp (Default: off)"
-msgstr ""
+msgstr "perlihatkan stempel waktu mentah (asali: off)"
 
-#: builtin/blame.c:879
+#: builtin/blame.c:875
 msgid "show long commit SHA1 (Default: off)"
-msgstr ""
+msgstr "perlihatkan SHA1 komit panjang (asali: off)"
 
-#: builtin/blame.c:880
+#: builtin/blame.c:876
 msgid "suppress author name and timestamp (Default: off)"
-msgstr ""
+msgstr "sembunyikan nama pengarang dan stempel waktu (asali: off)"
 
-#: builtin/blame.c:881
+#: builtin/blame.c:877
 msgid "show author email instead of name (Default: off)"
-msgstr ""
+msgstr "perlihatkan email pengarang daripada nama (asali: off)"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:878
 msgid "ignore whitespace differences"
-msgstr ""
+msgstr "abaikan perbedaan spasi putih"
 
-#: builtin/blame.c:883 builtin/log.c:1820
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
-msgstr ""
+msgstr "revisi"
 
-#: builtin/blame.c:883
+#: builtin/blame.c:879
 msgid "ignore <rev> when blaming"
-msgstr ""
+msgstr "abaikan <revisi> ketika menyalahkan"
 
-#: builtin/blame.c:884
+#: builtin/blame.c:880
 msgid "ignore revisions from <file>"
-msgstr ""
+msgstr "abaikan revisi dari <berkas>"
 
-#: builtin/blame.c:885
+#: builtin/blame.c:881
 msgid "color redundant metadata from previous line differently"
-msgstr ""
+msgstr "metadata warna berlebihan dari baris sebelumnya secara berbeda"
 
-#: builtin/blame.c:886
+#: builtin/blame.c:882
 msgid "color lines by age"
-msgstr ""
+msgstr "warnai baris oleh umur"
 
-#: builtin/blame.c:887
+#: builtin/blame.c:883
 msgid "spend extra cycles to find better match"
-msgstr ""
+msgstr "perlihatkan siklus ekstra untuk menemukan cocokan yang lebih baik"
 
-#: builtin/blame.c:888
+#: builtin/blame.c:884
 msgid "use revisions from <file> instead of calling git-rev-list"
-msgstr ""
+msgstr "gunakan revisi dari <berkas> daripada memanggil git-rev-list"
 
-#: builtin/blame.c:889
+#: builtin/blame.c:885
 msgid "use <file>'s contents as the final image"
-msgstr ""
+msgstr "gunakan konten <berkas> sebagai citra final"
 
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
 msgid "score"
-msgstr ""
+msgstr "nilai"
 
-#: builtin/blame.c:890
+#: builtin/blame.c:886
 msgid "find line copies within and across files"
-msgstr ""
+msgstr "temukan salinan baris di dalam dan di seluruh berkas"
 
-#: builtin/blame.c:891
+#: builtin/blame.c:887
 msgid "find line movements within and across files"
-msgstr ""
+msgstr "temukan gerakan baris di dalam dan di seluruh baris"
 
-#: builtin/blame.c:892
+#: builtin/blame.c:888
 msgid "range"
-msgstr ""
+msgstr "rentang"
 
-#: builtin/blame.c:893
+#: builtin/blame.c:889
 msgid "process only line range <start>,<end> or function :<funcname>"
-msgstr ""
+msgstr "hanya proses rentang baris <awal>,<akhir> atau fungsi :<nama fungsi>"
 
-#: builtin/blame.c:945
+#: 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"
 
 #. TRANSLATORS: This string is used to tell us the
 #. maximum display width for a relative timestamp in
@@ -10685,20 +11228,20 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:996
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
-msgstr ""
+msgstr "4 tahun, 11 bulan yang lalu"
 
-#: builtin/blame.c:1112
+#: 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] ""
+msgstr[0] "berkas %s hanya punya %lu baris"
+msgstr[1] "berkas %s hanya punya %lu baris"
 
-#: builtin/blame.c:1157
+#: builtin/blame.c:1159
 msgid "Blaming lines"
-msgstr ""
+msgstr "Menyalahkan baris"
 
 #: builtin/branch.c:29
 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
@@ -10728,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"
@@ -10737,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"
@@ -10746,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"
@@ -10760,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"
 
@@ -10772,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:440 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:471
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "tidak dapat menguraikan HEAD"
 
-#: builtin/branch.c:477
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) merujuk diluar refs/heads/"
 
-#: builtin/branch.c:492
+#: 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:496
+#: 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:513
+#: 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:515
+#: 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:526
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nama cabang tidak valid: '%s'"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "Penggantian nama cabang gagal"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "Penyalinan cabang gagal"
 
-#: builtin/branch.c:561
+#: 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:564
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Cabang salah nama '%s' berganti nama"
 
-#: builtin/branch.c:570
+#: 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:579
+#: 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:581
+#: 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:597
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -10875,180 +11418,176 @@ msgstr ""
 "  %s\n"
 "Baris yang diawali dengan '%c' akan dicopot.\n"
 
-#: builtin/branch.c:631
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Opsi generik"
 
-#: builtin/branch.c:633
+#: 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:634
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "sembunyikan pesan informasi"
 
-#: builtin/branch.c:635
-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:637
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "jangan gunakan"
 
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "hulu"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "ubah info hulu"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "batal-setel info hulu"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "gunakan keluaran berwarna"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "lakukan pada cabang pelacak remote"
 
-#: builtin/branch.c:644 builtin/branch.c:646
+#: 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:645 builtin/branch.c:647
+#: 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:650
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "Aksi git-branch spesifik:"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "sebut baik cabang pelacak remote dan cabang lokal"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "hapus cabang yang tergabung sepenuhnya"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "hapus cabang (walaupun tak tergabung)"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr "pindah/ganti nama cabang dan reflog-nya"
 
-#: builtin/branch.c:656
+#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr "pindah/ganti nama cabang, walaupun target ada"
 
-#: builtin/branch.c:657
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "salin cabang dan reflog-nya"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "salin cabang, walapun target ada"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "sebut nama cabang"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "perlihatkan nama cabang saat ini"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "buat reflog cabang"
 
-#: builtin/branch.c:663
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "sunting deskripsi cabang"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "paksa buat, pindah/ganti nama, hapus"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "cetak hanya cabang yang tergabung"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "cetak hanya cabang yang tak tergabung"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "sebut cabang dalam kolom"
 
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: 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:670
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "cetak hanya cabang objek"
 
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: 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:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: 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:695 builtin/clone.c:794
+#: 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:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column dan --verbose tidak kompatibel"
-
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "nama cabang diperlukan"
 
-#: builtin/branch.c:766
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "Tidak dapat memberikan deskripsi ke HEAD terpisah"
 
-#: builtin/branch.c:771
+#: 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:778
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Belum ada komit pada cabang '%s'."
 
-#: builtin/branch.c:781
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Tidak ada cabang bernama '%s'."
 
-#: builtin/branch.c:796
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "terlalu banyak cabang untuk operasi penyalinan"
 
-#: builtin/branch.c:805
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "terlalu banyak argumen untuk operasi penggantian nama"
 
-#: builtin/branch.c:810
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr "terlalu banyak argumen untuk menyetel hulu baru"
 
-#: builtin/branch.c:814
+#: builtin/branch.c:822
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11056,32 +11595,32 @@ msgstr ""
 "tidak dapat menyetel hulu HEAD ke %s ketika itu tak menunjuk pada cabang "
 "apapun."
 
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "tidak ada cabang '%s'"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "cabang '%s' tidak ada"
 
-#: builtin/branch.c:834
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "terlalu banyak argumen untuk batal-setel hulu"
 
-#: builtin/branch.c:838
+#: 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:844
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Cabang '%s' tidak ada informasi hulu"
 
-#: builtin/branch.c:854
+#: 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>?"
@@ -11089,7 +11628,7 @@ msgstr ""
 "Opsi -a dan -r tidak mengambil nama cabang.\n"
 "Mungkin maksud Anda gunakan: -a|-r --list <pola>?"
 
-#: builtin/branch.c:858
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -11097,32 +11636,32 @@ msgstr ""
 "opsi '--set-upstream' tidak lagi didukung. Mohon gunakan '--track' atau '--"
 "set-upstream-to' sebagai gantinya."
 
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr ""
 
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr ""
 
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
 msgid "compiler info: "
 msgstr ""
 
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr ""
 
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
 msgid "not run from a git repository - no hooks to show\n"
 msgstr ""
 
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr ""
 
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -11141,183 +11680,184 @@ msgid ""
 "You can delete any lines you don't wish to share.\n"
 msgstr ""
 
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
 msgid "specify a destination for the bugreport file"
 msgstr ""
 
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
 msgid "specify a strftime format suffix for the filename"
 msgstr ""
 
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr ""
 
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr ""
 
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr ""
 
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr ""
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr ""
 
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr ""
 
 #: builtin/bundle.c:15 builtin/bundle.c:23
 msgid "git bundle create [<options>] <file> <git-rev-list args>"
-msgstr ""
+msgstr "git bundle create [<opsi>] <berkas> <argumen git-rev-list>"
 
 #: builtin/bundle.c:16 builtin/bundle.c:28
 msgid "git bundle verify [<options>] <file>"
-msgstr ""
+msgstr "git bundle verify [<opsi>] <berkas>"
 
 #: builtin/bundle.c:17 builtin/bundle.c:33
 msgid "git bundle list-heads <file> [<refname>...]"
-msgstr ""
+msgstr "git bundle list-heads <berkas> [<nama referensi>...]"
 
 #: builtin/bundle.c:18 builtin/bundle.c:38
 msgid "git bundle unbundle <file> [<refname>...]"
-msgstr ""
+msgstr "git bundle unbundle <berkas> [<nama referensi>...]"
 
-#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
 msgid "do not show progress meter"
-msgstr ""
+msgstr "jangan perlihatkan meteran perkembangan"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
 msgid "show progress meter"
-msgstr ""
+msgstr "perlihatkan meteran perkembangan"
 
-#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
 msgid "show progress meter during object writing phase"
-msgstr ""
+msgstr "perlihatkan meteran perkembangan saat fase penulisan objek"
 
-#: builtin/bundle.c:74 builtin/pack-objects.c:3754
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
 msgid "similar to --all-progress when progress meter is shown"
-msgstr ""
+msgstr "sama seperti --all-progress ketika meteran perkembangan diperlihatkan"
 
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
 msgid "specify bundle format version"
-msgstr ""
+msgstr "sebutkan versi format bundel"
 
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
-msgstr ""
+msgstr "Perlu sebuah repositori untuk membuat bundel."
 
 #: builtin/bundle.c:107
 msgid "do not show bundle details"
-msgstr ""
+msgstr "jangan perlihatkan detail bundel"
 
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
 #, c-format
 msgid "%s is okay\n"
-msgstr ""
+msgstr "%s oke \n"
 
-#: builtin/bundle.c:163
+#: builtin/bundle.c:182
 msgid "Need a repository to unbundle."
-msgstr ""
+msgstr "Perlu sebuah repositori untuk membongkar bundel."
 
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr ""
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Membongkar bundel objek"
 
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
 msgid "Unknown subcommand: %s"
-msgstr ""
+msgstr "Subperintah tidak dikenal: %s"
 
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:622
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
 msgstr ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <tipe> | --textconv | --filters) [--path=<jalur>] <objek>"
 
-#: builtin/cat-file.c:599
+#: builtin/cat-file.c:623
 msgid ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
 msgstr ""
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:644
 msgid "only one batch option may be specified"
-msgstr ""
+msgstr "hanya satu opsi setumpuk yang mungkin disebutkan"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
 msgid "<type> can be one of: blob, tree, commit, tag"
-msgstr ""
+msgstr "<tipe> bisa salah satu dari: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
 msgid "show object type"
-msgstr ""
+msgstr "perlihatkan tipe objek"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
 msgid "show object size"
-msgstr ""
+msgstr "perlihatkan ukuran objek"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
 msgid "exit with zero when there's no error"
-msgstr ""
+msgstr "keluar dengan nol ketika tidak ada kesalahan"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
 msgid "pretty-print object's content"
-msgstr ""
+msgstr "cetak-cantik isi objek"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
 msgid "for blob objects, run textconv on object's content"
-msgstr ""
+msgstr "untuk objek blob, jalankan textconv pada isi objek"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
 msgid "for blob objects, run filters on object's content"
-msgstr ""
+msgstr "untuk objek blob, jalankan penyaring pada isi objek"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
 msgid "blob"
-msgstr ""
+msgstr "blob"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
 msgid "use a specific path for --textconv/--filters"
-msgstr ""
+msgstr "gunakan jalur spesifik untuk --textconv/--filters"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
 msgid "allow -s and -t to work with broken/corrupt objects"
-msgstr ""
+msgstr "perbolehkan -s dan -t bekerja dengan objek rusak"
 
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
 msgid "buffer --batch output"
-msgstr ""
+msgstr "sannga keluaran --batch"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
 msgid "show info and content of objects fed from the standard input"
-msgstr ""
+msgstr "perlihatkan info dan isi objek yang disuap dari masukan standar"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
 msgid "show info about objects fed from the standard input"
-msgstr ""
+msgstr "perlihatkan info tentang objek yang disuap dari masukan standar"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
+"ikuti tautan simbolik dalam pohon (digunakan dengan --batch atau --batch-"
+"check)"
 
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
 msgid "show all objects with --batch or --batch-check"
-msgstr ""
+msgstr "perlihatkan semua objek dengan --batch atau --batch-check"
 
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:690
 msgid "do not order --batch-all-objects output"
-msgstr ""
+msgstr "jangan urutkan keluaran --batch-all-objects"
 
 #: builtin/check-attr.c:13
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -11335,7 +11875,7 @@ msgstr ""
 msgid "use .gitattributes only from the index"
 msgstr ""
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr ""
 
@@ -11343,8 +11883,8 @@ msgstr ""
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
-#: builtin/worktree.c:491
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr ""
 
@@ -11402,9 +11942,10 @@ msgid "git checkout--worker [<options>]"
 msgstr ""
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1825
-#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836
-#: builtin/submodule--helper.c:2334 builtin/worktree.c:719
+#: 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 ""
 
@@ -11468,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:414
+#: 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:419
+#: 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:426
+#: 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:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: 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:462 builtin/checkout.c:465
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' tidak dapat digunakan untuk %s"
-
-#: builtin/checkout.c:469
+#: 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:473
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "baik '%s' atau '%s' tidak disebutkan"
 
-#: builtin/checkout.c:477
+#: 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:482 builtin/checkout.c:487
+#: 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:563 builtin/checkout.c:570
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "jalur '%s' tak tergabung"
 
-#: builtin/checkout.c:739
+#: 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:793
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -11571,50 +12107,50 @@ msgstr ""
 "berikut:\n"
 "%s"
 
-#: builtin/checkout.c:886
+#: 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:928
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD sekarang berada di"
 
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
+#: 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:936
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Ganti ulang cabang '%s'\n"
 
-#: builtin/checkout.c:939
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Sudah berada pada '%s'\n"
 
-#: builtin/checkout.c:943
+#: 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:945 builtin/checkout.c:1376
+#: 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:947
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Ganti ke cabang '%s'\n"
 
-#: builtin/checkout.c:998
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr "... dan %d lainnya.\n"
 
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -11637,7 +12173,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1023
+#: 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"
@@ -11660,19 +12196,19 @@ msgstr[1] ""
 "saat yang tepat untuk dilakukan dengan:\n"
 "git branch <nama-cabang-baru> %s\n"
 
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "kesalahan internal dalam jalan revisi"
 
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "Posisi HEAD sebelumnya adalah"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: 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:1184
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -11681,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:1191
+#: 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"
@@ -11701,51 +12237,51 @@ msgstr ""
 "seperti remote 'origin', pertimbangkan untuk menyetel\n"
 "checkout.defaultRemote=origin di konfigurasi Anda"
 
-#: builtin/checkout.c:1201
+#: 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:1267
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "hanya satu referensi yang diharapkan"
 
-#: builtin/checkout.c:1284
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "hanya satu referensi yang diharapkan, %d diberikan"
 
-#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438
+#: 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:1343 builtin/checkout.c:1709
+#: 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:1390
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "sebuah cabang diharapkan, dapat tag '%s'"
 
-#: builtin/checkout.c:1392
+#: 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:1393 builtin/checkout.c:1401
+#: 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:1396
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "sebuah cabang diharapkan, dapat komit '%s'"
 
-#: builtin/checkout.c:1412
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11754,7 +12290,7 @@ msgstr ""
 "Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree add"
 "\"."
 
-#: builtin/checkout.c:1416
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -11762,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:1420
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11771,7 +12307,7 @@ msgstr ""
 "Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree add"
 "\"."
 
-#: builtin/checkout.c:1424
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11780,218 +12316,207 @@ msgstr ""
 "Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git "
 "worktree add\"."
 
-#: builtin/checkout.c:1428
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
 msgstr ""
 "tidak dapat mengganti cabang saat pembalikan\n"
-"Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git "
-"worktree add\"."
+"Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git worktree add"
+"\"."
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr "Anda mengganti cabang saat pembagian dua"
 
-#: builtin/checkout.c:1439
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr "jalur tidak dapat digunakan dengan mengganti cabang"
 
-#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: 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:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: 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:1467
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' tidak bisa mengambil <titik-awal>"
 
-#: builtin/checkout.c:1475
+#: 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:1482
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "kehilangan argumen cabang atau komit"
 
-#: builtin/checkout.c:1525
+#: 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:1526 builtin/log.c:1807 parse-options.h:323
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "gaya"
 
-#: builtin/checkout.c:1527
-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:1539 builtin/worktree.c:488
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "lepas HEAD pada komit bernama"
 
-#: builtin/checkout.c:1540
-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:1542
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "paksa checkout (buang modifikasi lokal)"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "cabang baru"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "cabang baru tanpa induk"
 
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "perbarui berkas yang diabaikan (default)"
 
-#: builtin/checkout.c:1549
+#: 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:1562
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "checkout versi kami untuk berkas yang tak tergabung"
 
-#: builtin/checkout.c:1565
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "checkout versi mereka untuk berkas yang tak tergabung"
 
-#: builtin/checkout.c:1569
+#: 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:1624
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c dan --orphan 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:1628
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p dan --overlay saling eksklusif"
-
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track butuh nama cabang"
 
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "kehilangan nama cabang; coba -%c"
 
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "tidak dapat menyelesaikan %s"
 
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "spesifikasi jalur tidak valid"
 
-#: builtin/checkout.c:1725
+#: 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:1729
+#: 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:1738
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file tidak kompatible dengan --detach"
-
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file tidak kompatibel dengan --patch"
-
-#: builtin/checkout.c:1754
+#: 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 dan --merge tidak kompatibel saat\n"
+"git checkout: --ours/--theirs, --force dan --merge tidak kompatibel saat\n"
 "men-checkout index"
 
-#: builtin/checkout.c:1759
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "Anda harus sebutkan jalur untuk dipulihkan"
 
-#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484
+#: 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:1786
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "buat dan checkout cabang baru"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "buat/setel ulang dan checkout cabang"
 
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "buat reflog untuk cabang baru"
 
-#: builtin/checkout.c:1791
+#: 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:1792
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "gunakan mode hamparan (default)"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "buat dan ganti ke cabang baru"
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "buat/setel ulang dan ganti ke cabang"
 
-#: builtin/checkout.c:1841
+#: 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:1843
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "buang modifikasi lokal"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "mana mirip-cabang untuk di-checkout"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "pulihkan indeks"
 
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "pulihkan pohon kerja (default)"
 
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "abaikan entri yang tak tergabung"
 
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "gunakan mode hamparan"
 
@@ -12026,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:302 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"
@@ -12039,7 +12572,7 @@ msgstr ""
 "foo        - pilih item berdasarkan prefiks unik\n"
 "           - (kosong) tidak pilih apa-apa\n"
 
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12060,33 +12593,33 @@ msgstr ""
 "*          - pilih semua item\n"
 "           - (kosong) selesai memilih\n"
 
-#: builtin/clean.c:521 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:661
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Masukkan pola pengabaian>> "
 
-#: builtin/clean.c:696
+#: 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:717
+#: 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:758
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Hapus %s [y/N]? "
 
-#: builtin/clean.c:789
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12104,52 +12637,52 @@ msgstr ""
 "help                - layar ini\n"
 "?                   - bantuan untuk bisik pemilihan"
 
-#: builtin/clean.c:825
+#: 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:841
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Tidak ada lagi berkas untuk dibersihkan, keluar."
 
-#: builtin/clean.c:903
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "jangan cetak nama berkas yang dihapus"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:928
 msgid "force"
 msgstr "paksa"
 
-#: builtin/clean.c:906
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "pembersihan interaktif"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "hapus keseluruhan direktori"
 
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: 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:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "pola"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "tambahkan <pola> ke aturan pengabaian"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "juga hapus berkas terabaikan"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "hanya hapus berkas terabaikan"
 
-#: builtin/clean.c:929
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -12157,7 +12690,7 @@ msgstr ""
 "clean.requireForce disetel ke true dan baik -i, -n, atau -f tidak diberikan; "
 "menolak membersihkan"
 
-#: builtin/clean.c:932
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -12165,7 +12698,7 @@ msgstr ""
 "clean.requireForce asal ke true dan baik -i, -n, atau -f tidak diberikan; "
 "menolak membersihkan"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x dan -X tidak dapat digunakan bersamaan"
 
@@ -12181,7 +12714,7 @@ msgstr "jangan kloning repositori dangkal"
 msgid "don't create a checkout"
 msgstr "jangan buat checkout"
 
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "buat repositori bare"
 
@@ -12213,27 +12746,29 @@ msgstr "inisialisasi submodul dalam klon"
 msgid "number of submodules cloned in parallel"
 msgstr "jumlah submodul yang diklon secara paralel"
 
-#: builtin/clone.c:116 builtin/init-db.c:538
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "direktori templat"
 
-#: builtin/clone.c:117 builtin/init-db.c:539
+#: builtin/clone.c:117 builtin/init-db.c:540
 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:1832
-#: builtin/submodule--helper.c:2337
+#: 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:1834
-#: builtin/submodule--helper.c:2339
+#: 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:549
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: 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"
 
@@ -12249,8 +12784,8 @@ 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:863
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
+#: builtin/pull.c:212
 msgid "depth"
 msgstr "kedalaman"
 
@@ -12258,8 +12793,8 @@ 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:3804
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
 msgid "time"
 msgstr "waktu"
 
@@ -12267,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/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: 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 "perdalam riwayat klon dangkal, tidak termasuk rev"
 
-#: builtin/clone.c:137 builtin/submodule--helper.c:1844
-#: builtin/submodule--helper.c:2353
+#: 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"
 
@@ -12289,11 +12824,11 @@ msgstr "jangan klon tag apapun, dan buat pengambilan nanti tidak mengikutinya"
 msgid "any cloned submodules will be shallow"
 msgstr "submodul yang diklon akan dangkal"
 
-#: builtin/clone.c:142 builtin/init-db.c:547
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "direktori git"
 
-#: builtin/clone.c:143 builtin/init-db.c:548
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "pisahkan direktori git dari pohon kerja"
 
@@ -12305,23 +12840,23 @@ 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/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: 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/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: 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:234
-#: builtin/push.c:585
+#: 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:237
-#: builtin/push.c:587
+#: 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"
 
@@ -12334,50 +12869,42 @@ msgid "initialize sparse-checkout file to include only files at root"
 msgstr ""
 "inisialisasi berkas checkout tipis agar memasukkan hanya berkas pada akar"
 
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Nama direktori tidak dapat ditebak.\n"
-"Mohon sebutkan direktori pada baris perintah"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: Tidak dapat menambahkan alternatif untuk '%s': %s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:304
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s ada dan bukan direktori"
 
-#: builtin/clone.c:436
+#: builtin/clone.c:322
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "gagal memulai iterator pada '%s'"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:353
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "gagal membuat tautan '%s'"
 
-#: builtin/clone.c:471
+#: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "gagal menyalin berkas ke '%s'"
 
-#: builtin/clone.c:476
+#: builtin/clone.c:362
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "gagal iterasi pada '%s'"
 
-#: builtin/clone.c:503
+#: builtin/clone.c:389
 #, c-format
 msgid "done.\n"
 msgstr "selesai.\n"
 
-#: builtin/clone.c:517
+#: builtin/clone.c:403
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -12387,105 +12914,101 @@ msgstr ""
 "Anda dapat periksa apa yang dicheckout dengan 'git status'\n"
 "dan coba lagi dengan 'git restore --source=HEAD :/'\n"
 
-#: builtin/clone.c:594
+#: builtin/clone.c:480
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Tidak dapat menemukan cabang remote %s untuk diklon."
 
-#: builtin/clone.c:713
+#: builtin/clone.c:597
 #, c-format
 msgid "unable to update %s"
 msgstr "tidak dapat memperbarui %s"
 
-#: builtin/clone.c:761
+#: builtin/clone.c:645
 msgid "failed to initialize sparse-checkout"
 msgstr "gagal menginisalisasi checkout tipis"
 
-#: builtin/clone.c:784
+#: builtin/clone.c:668
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "HEAD remote merujuk pada ref yang tidak ada, tidak dapat men-checkout.\n"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:701
 msgid "unable to checkout working tree"
 msgstr "tidak dapat men-checkout pohon kerja"
 
-#: builtin/clone.c:894
+#: builtin/clone.c:779
 msgid "unable to write parameters to config file"
 msgstr "tidak dapat menulis parameter ke berkas konfigurasi"
 
-#: builtin/clone.c:957
+#: builtin/clone.c:842
 msgid "cannot repack to clean up"
 msgstr "tidak dapat memaket ulang untuk pembersihan"
 
-#: builtin/clone.c:959
+#: builtin/clone.c:844
 msgid "cannot unlink temporary alternates file"
 msgstr "tidak dapat batal-taut berkas alternatif sementara"
 
-#: builtin/clone.c:1001 builtin/receive-pack.c:2491
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "Terlalu banyak argumen."
 
-#: builtin/clone.c:1005
+#: 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:1018
+#: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare dan --origin %s tidak kompatibel."
-
-#: builtin/clone.c:1021
-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:1035
+#: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "repositori '%s' tidak ada"
 
-#: builtin/clone.c:1039 builtin/fetch.c:2011
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "kedalaman %s bukan bilangan positif"
 
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "jalur tujuan '%s' sudah ada dan bukan direktori kosong"
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr "jalur repositori '%s' sudah ada dan bukan direktori kosong"
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "pohon kerja '%s' sudah ada."
 
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
+#: 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'"
 
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "tidak dapat membuat direktori pohon kerja '%s'"
 
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Kloning ke repositori bare '%s'...\n"
 
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Kloning ke '%s'...\n"
 
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -12493,43 +13016,47 @@ msgstr ""
 "clone --recursive tidak kompatibel dengan baik --reference dan --reference-"
 "if-able"
 
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' bukan nama remote yang valid"
 
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth diabaikan di klon lokal; gunakan file:// sebagai gantinya."
 
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since diabaikan di klon lokal; gunakan file:// sebagai gantinya."
 
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude diabaikan di klon lokal; gunakan file:// sebagai gantinya."
 
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter diabaikan di klon lokal; gunakan file:// sebagai gantinya."
 
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
 msgid "source repository is shallow, ignoring --local"
 msgstr "repositori sumber dangkal, abaikan --local"
 
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
 msgid "--local is ignored"
 msgstr "--local diabaikan"
 
-#: builtin/clone.c:1337 builtin/clone.c:1345
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr "transportasi remote melaporkan kesalahan"
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Cabang remote %s tidak ditemukan di hulu %s"
 
-#: builtin/clone.c:1348
+#: builtin/clone.c:1242
 msgid "You appear to have cloned an empty repository."
 msgstr "Anda tampaknya mengklon repositori kosong."
 
@@ -12565,180 +13092,175 @@ msgstr ""
 msgid "--command must be the first argument"
 msgstr ""
 
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
 msgid ""
 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
 msgstr ""
 
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr ""
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr ""
 
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr ""
 
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr ""
 
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr ""
 
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr ""
 
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
 #, c-format
 msgid "invalid object: %s"
 msgstr ""
 
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
 msgid "start walk at all refs"
 msgstr ""
 
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr ""
 
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
 msgid "start walk at commits listed by stdin"
 msgstr ""
 
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
 msgstr ""
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
 msgid "enable computation for changed paths"
 msgstr ""
 
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
 msgid "allow writing an incremental commit-graph file"
 msgstr ""
 
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr ""
 
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr ""
 
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
 msgid "only expire files older than a given date-time"
 msgstr ""
 
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr ""
 
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr ""
 
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
 msgid "Collecting commits from input"
 msgstr ""
 
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr ""
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
 "<file>)...] <tree>"
 msgstr ""
+"git commit-tree [(-p <induk>)...] [-S[<id kunci>]] [(-m <pesan>)...] [(-F "
+"<berkas>)...] <pohon>"
 
 #: builtin/commit-tree.c:31
 #, c-format
 msgid "duplicate parent %s ignored"
-msgstr ""
+msgstr "induk duplikat %s diabaikan"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
 #, c-format
 msgid "not a valid object name %s"
-msgstr ""
+msgstr "bukan nama objek valid %s"
 
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr ""
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
-msgstr ""
+msgstr "git commit-tree: gagal membaca '%s'"
 
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
-msgstr ""
+msgstr "git commit-tree: gagal menutup '%s'"
 
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
 msgid "parent"
-msgstr ""
+msgstr "induk"
 
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
-msgstr ""
+msgstr "id objek komit induk"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
-#: builtin/tag.c:456
+#: 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 ""
+msgstr "pesan"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1614
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
-msgstr ""
+msgstr "pesan komit"
 
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
-msgstr ""
+msgstr "baca pesan log komit dari berkas"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299
-#: 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 ""
+msgstr "Tandatangani komit dengan GPG"
 
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
-msgstr ""
+msgstr "harus berikan tepat satu pohon"
 
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
-msgstr ""
+msgstr "git commit-tree: gagal membaca"
 
-#: builtin/commit.c:41
+#: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<opsi>] [--] <spek jalur>..."
 
-#: builtin/commit.c:46
+#: builtin/commit.c:47
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<opsi>] [--] <spek jalur>..."
 
-#: builtin/commit.c:51
+#: builtin/commit.c:52
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -12749,7 +13271,7 @@ msgstr ""
 "dengan --allow-empty, atau Anda dapat menghapus keseluruhan komit\n"
 "dengan \"git reset HEAD^\".\n"
 
-#: builtin/commit.c:56
+#: builtin/commit.c:57
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -12763,15 +13285,15 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:63
+#: builtin/commit.c:64
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "Selain itu, gunakan 'git rebase --skip'\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:67
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Selain itu, gunakan 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:69
+#: builtin/commit.c:70
 msgid ""
 "and then use:\n"
 "\n"
@@ -12792,73 +13314,69 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:324
+#: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
 msgstr "gagal membuka objek pohon HEAD"
 
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file dengan -a tidak masuk akal"
-
-#: builtin/commit.c:374
+#: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "Tanpa jalur dengan --include/--only tidak masuk akal."
 
-#: builtin/commit.c:386
+#: builtin/commit.c:387
 msgid "unable to create temporary index"
 msgstr "tidak dapat membuat indeks sementara"
 
-#: builtin/commit.c:395
+#: builtin/commit.c:396
 msgid "interactive add failed"
 msgstr "penambahan interaktif gagal"
 
-#: builtin/commit.c:410
+#: builtin/commit.c:411
 msgid "unable to update temporary index"
 msgstr "tidak dapat memperbarui indeks sementara"
 
-#: builtin/commit.c:412
+#: builtin/commit.c:413
 msgid "Failed to update main cache tree"
 msgstr "gagal memperbarui tembolok pohon utama"
 
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
 msgid "unable to write new_index file"
-msgstr "tidak dapat menulis berkas indeks baru"
+msgstr "tidak dapat menulis berkas new_index"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "cannot do a partial commit during a merge."
 msgstr "tidak dapat melakukan komit sebagian selama penggabungan."
 
-#: builtin/commit.c:491
+#: builtin/commit.c:492
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "tidak dapat melakukan komit sebagian selama pemetikan ceri."
 
-#: builtin/commit.c:493
+#: builtin/commit.c:494
 msgid "cannot do a partial commit during a rebase."
 msgstr "tidak dapat melakukan komit sebagian selama pendasaran ulang."
 
-#: builtin/commit.c:501
+#: builtin/commit.c:502
 msgid "cannot read the index"
 msgstr "tidak dapat membaca indeks"
 
-#: builtin/commit.c:520
+#: builtin/commit.c:521
 msgid "unable to write temporary index file"
 msgstr "tidak dapat menulis berkas indeks sementara"
 
-#: builtin/commit.c:618
+#: builtin/commit.c:619
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "komit '%s' kurang kepala pengarang"
 
-#: builtin/commit.c:620
+#: builtin/commit.c:621
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "komit '%s' ada baris pengarang cacat"
 
-#: builtin/commit.c:639
+#: builtin/commit.c:640
 msgid "malformed --author parameter"
 msgstr "parameter --author cacat"
 
-#: builtin/commit.c:692
+#: builtin/commit.c:693
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -12866,43 +13384,81 @@ msgstr ""
 "tidak dapat memilih karakter komentar yang tidak terpakai\n"
 "dalam pesan komit saat ini"
 
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "tidak dapat mencari komit %s"
 
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(baca pesan log dari standar masukan)\n"
 
-#: builtin/commit.c:760
+#: builtin/commit.c:761
 msgid "could not read log from standard input"
 msgstr "tidak dapat membaca log dari standar masukan"
 
-#: builtin/commit.c:764
+#: builtin/commit.c:765
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "tidak dapat membaca berkas log '%s'"
 
-#: builtin/commit.c:801
+#: 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:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
 msgstr "tidak dapat membaca SQUASH_MSG"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:821
 msgid "could not read MERGE_MSG"
 msgstr "tidak dapat membaca MERGE_MSG"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:881
 msgid "could not write commit template"
 msgstr "tidak dapat menulis templat komit"
 
+#: builtin/commit.c:894
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr ""
+"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
+"dengan '%c' akan diabaikan.\n"
+
+#: builtin/commit.c:896
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
+"dengan '%c' akan diabaikan, dan pesan kosong batalkan komit.\n"
+
 #: builtin/commit.c:900
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
+"dengan '%c' akan tetap; Anda dapat menghapus itu jika Anda mau.\n"
+
+#: builtin/commit.c:904
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
+"dengan '%c' akan tetap; Anda dapat menghapus itu jika Anda mau.\n"
+"Pesan kosong batalkan komit.\n"
+
+#: builtin/commit.c:916
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -12916,7 +13472,7 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "dan coba lagi.\n"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:921
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -12930,195 +13486,169 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "dan coba lagi.\n"
 
-#: builtin/commit.c:915
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
-"dengan '%c' akan diabaikan, dan pesan kosong batalkan komit.\n"
-
-#: builtin/commit.c:923
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"Mohon masukkan pesan komit untuk perubahan Anda. Baris yang diawali\n"
-"dengan '%c' akan tetap; Anda dapat menghapus itu jika Anda mau.\n"
-"Pesan kosong batalkan komit.\n"
-
-#: builtin/commit.c:940
+#: builtin/commit.c:948
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sPengarang:    %.*s <%.*s>"
 
-#: builtin/commit.c:948
+#: builtin/commit.c:956
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sTanggal:       %s"
 
-#: builtin/commit.c:955
+#: builtin/commit.c:963
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sPengkomit: %.*s <%.*s>"
 
-#: builtin/commit.c:973
+#: builtin/commit.c:981
 msgid "Cannot read index"
 msgstr "Tidak dapat membaca indeks"
 
-#: builtin/commit.c:1018
+#: builtin/commit.c:1026
 msgid "unable to pass trailers to --trailers"
 msgstr "tidak dapat melewatkan trailer ke --trailers"
 
-#: builtin/commit.c:1058
+#: builtin/commit.c:1066
 msgid "Error building trees"
 msgstr "Kesalahan membangun pohon"
 
-#: builtin/commit.c:1072 builtin/tag.c:319
+#: 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"
 
-#: builtin/commit.c:1116
+#: builtin/commit.c:1124
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' bukan 'Nama <email>' dan tidak cocok dengan pengarang yang ada"
 
-#: builtin/commit.c:1130
+#: builtin/commit.c:1138
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Mode terabaikan '%s' tidak valid"
 
-#: builtin/commit.c:1148 builtin/commit.c:1441
+#: 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:1188
-msgid "--long and -z are incompatible"
-msgstr "--long dan -z tidak kompatibel"
-
-#: builtin/commit.c:1219
+#: 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."
 
-#: builtin/commit.c:1221
+#: builtin/commit.c:1229
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat menulis ulang."
 
-#: builtin/commit.c:1224
+#: 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:1226
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
+#: builtin/commit.c:1234
+#, 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:1245
+#: 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:1254
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "Anda tidak punya apapun untuk diubah."
 
-#: builtin/commit.c:1257
+#: 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:1259
+#: 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:1261
+#: 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:1264
+#: 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:1274
+#: 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:1276
+#: 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:1285
+#: 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:1303
+#: 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:1331
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr ""
 
-#: builtin/commit.c:1345
+#: 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:1476 builtin/commit.c:1642
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "perlihatkan status dengan ringkas"
 
-#: builtin/commit.c:1478 builtin/commit.c:1644
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "perlihatkan informasi cabang"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "perlihatkan informasi stase"
 
-#: builtin/commit.c:1482 builtin/commit.c:1646
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "hitung nilai didepan/dibelakang penuh"
 
-#: builtin/commit.c:1484
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "versi"
 
-#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
-#: builtin/worktree.c:681
+#: 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:1487 builtin/commit.c:1650
+#: 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:1490 builtin/commit.c:1653
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "akhiri entri dengan NUL"
 
-#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: 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:1493 builtin/commit.c:1656
+#: 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:1497
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -13126,11 +13656,11 @@ msgstr ""
 "perlihatkan berkas terabaikan, mode opsional: traditional, matching, no. "
 "(Asali: traditional)"
 
-#: builtin/commit.c:1499 parse-options.h:193
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "bila"
 
-#: builtin/commit.c:1500
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -13138,199 +13668,199 @@ msgstr ""
 "abaikan perubahan submodul, bila opsional: all, dirty, untracked. (Asali: "
 "all)"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "sebut berkas tak terlacak dalam kolom"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "jangan deteksi penggantian nama"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr "deteksi penggantian nama, setel indeks kemiripan secara opsional"
 
-#: builtin/commit.c:1525
+#: 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:1607
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "sembunyikan rangkuman setelah komit berhasil"
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "perlihatkan diff dalam templat pesan komit"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "Opsi pesan komit"
 
-#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
+#: 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:1612
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "pengarang"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "timpa pengarang komit"
 
-#: builtin/commit.c:1613 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "tangal"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "timpa tanggal komit"
 
-#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
-#: parse-options.h:329 ref-filter.h:90
+#: 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:1615
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr "gunakan kembali dan sunting pesan dari komit tersebut"
 
-#: builtin/commit.c:1616
+#: 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:1621
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]komit"
 
-#: builtin/commit.c:1621
+#: 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:1622
+#: 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:1623
+#: 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:1624 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr ""
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr ""
 
-#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: 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:1626
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "gunakan templat berkas tersebut"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "paksa sunting komit"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr "masukkan status dalam templat pesaan komit"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "Opsi isi komit"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "komit semua berkas terubah"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "tambahakn berkas tersebut ke indeks untuk dikomit"
 
-#: builtin/commit.c:1637
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "tambah berkas secara interaktif"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "tambah perubahan secara interaktif"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "hanya komit berkas tersebut"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
-msgstr "lewati hook pre-commit dan commit-msg"
+msgstr "lewati kail pre-commit dan commit-msg"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "perlihatkan apa yang akan dikomit"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "ubah komit sebelumnya"
 
-#: builtin/commit.c:1655
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
-msgstr "lewati hook post-rewrite"
+msgstr "lewati kail post-rewrite"
 
-#: builtin/commit.c:1662
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "ok merekam perubahan kosong"
 
-#: builtin/commit.c:1664
+#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr "ok merekam perubahan dengan pesan kosong"
 
-#: builtin/commit.c:1737
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Berkas MERGE_HEAD (%s) rusak"
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "tidak dapat membaca MERGE_MODE"
 
-#: builtin/commit.c:1765
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "tidak dapat membaca pesan komit: %s"
 
-#: builtin/commit.c:1772
+#: 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:1777
+#: 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:1788
+#: 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:1824
+#: 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 ""
 "repositori sudah diperbarui, tetapi tidak dapat menulis\n"
-"berkas indeks baru. Periksa bahwa disk tidak penuh dan kuota\n"
+"berkas new_index. Periksa bahwa disk tidak penuh dan kuota\n"
 "tidak terlampaui, lalu \"git restore --staged :/\" untuk pulihkan."
 
 #: builtin/config.c:11
@@ -13661,11 +14191,11 @@ msgstr "tidak ada bagian seperti: %s"
 
 #: builtin/count-objects.c:90
 msgid "git count-objects [-v] [-H | --human-readable]"
-msgstr ""
+msgstr "git count-objects [-v] [-H | --human-readable]"
 
 #: builtin/count-objects.c:100
 msgid "print sizes in human readable format"
-msgstr ""
+msgstr "cetak ukuran dalam format yang bisa dibaca manusia"
 
 #: builtin/credential-cache--daemon.c:227
 #, c-format
@@ -13684,7 +14214,7 @@ msgstr ""
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr ""
 
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr ""
 
@@ -13695,48 +14225,50 @@ msgstr ""
 
 #: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
-msgstr ""
+msgstr "git describe [<opsi>] [<mirip-komit>...]"
 
 #: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
-msgstr ""
+msgstr "git describe [<opsi>] --dirty"
 
 #: builtin/describe.c:63
 msgid "head"
-msgstr ""
+msgstr "kepala"
 
 #: builtin/describe.c:63
 msgid "lightweight"
-msgstr ""
+msgstr "ringan"
 
 #: builtin/describe.c:63
 msgid "annotated"
-msgstr ""
+msgstr "teranotasi"
 
 #: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
-msgstr ""
+msgstr "tag teranotasi %s tidak tersedia"
 
 #: builtin/describe.c:281
 #, c-format
 msgid "tag '%s' is externally known as '%s'"
-msgstr ""
+msgstr "tag '%s' dikenal luar sebagai '%s'"
 
 #: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
-msgstr ""
+msgstr "tidak ada tag yang tepat cocok dengan '%s'"
 
 #: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
+"tidak ada kecocokan eksak pada referensi atau tag, mencari untuk "
+"menjelaskan \n"
 
 #: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
-msgstr ""
+msgstr "selesai mencari pada %s\n"
 
 #: builtin/describe.c:424
 #, c-format
@@ -13744,6 +14276,8 @@ msgid ""
 "No annotated tags can describe '%s'.\n"
 "However, there were unannotated tags: try --tags."
 msgstr ""
+"Tidak ada tag teranotasi yang dapat menjelaskan '%s'.\n"
+"Bagaimanapun, ada tag tak teranotasi: coba --tags."
 
 #: builtin/describe.c:428
 #, c-format
@@ -13751,11 +14285,13 @@ msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr ""
+"Tidak ada tag yang dapat menjelaskan '%s'\n"
+"Coba --always, atau buat beberapa tag."
 
 #: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
-msgstr ""
+msgstr "%lu komit dilintasi\n"
 
 #: builtin/describe.c:461
 #, c-format
@@ -13763,256 +14299,243 @@ msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr ""
+"lebih dari %i tag ditemukan; %i terbaru didaftarkan\n"
+"menyerah mencari pada %s\n"
 
 #: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
-msgstr ""
+msgstr "jelaskan %s\n"
 
 #: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
-msgstr ""
+msgstr "Bukan nama objek yang valid %s"
 
 #: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
-msgstr ""
+msgstr "%s bukan sebuah komit atau blob"
 
 #: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
-msgstr ""
+msgstr "temukan tag yang datang setelah komit"
 
 #: builtin/describe.c:555
 msgid "debug search strategy on stderr"
-msgstr ""
+msgstr "debug strategi pencarian pada keluaran standar"
 
 #: builtin/describe.c:556
 msgid "use any ref"
-msgstr ""
+msgstr "gunakan referensi apapun"
 
 #: builtin/describe.c:557
 msgid "use any tag, even unannotated"
-msgstr ""
+msgstr "gunakan tag apapun, bahkan tak teranotasi"
 
 #: builtin/describe.c:558
 msgid "always use long format"
-msgstr ""
+msgstr "selalu gunakan format panjang"
 
 #: builtin/describe.c:559
 msgid "only follow first parent"
-msgstr ""
+msgstr "hanya ikuti induk pertama"
 
 #: builtin/describe.c:562
 msgid "only output exact matches"
-msgstr ""
+msgstr "hanya keluarkan kecocokan eksak"
 
 #: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
-msgstr ""
+msgstr "pertimbangkan <n> tag terbaru (asali: 10)"
 
 #: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
-msgstr ""
+msgstr "hanya pertimbangkan tag yang cocok dengan <pola>"
 
 #: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
-msgstr ""
+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 ""
+msgstr "perlihatkan objek komit singkat sebagai langkah terakhir"
 
 #: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
-msgstr ""
+msgstr "tanda"
 
 #: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
-msgstr ""
+msgstr "tambahkan <tanda> pada direktori kerja kotor (asali: \"-dirty\")"
 
 #: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
-msgstr ""
-
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr ""
+msgstr "tambahkan <tanda> pada direktori kerja rusak (asali: \"-broken\")"
 
 #: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
-msgstr ""
-
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr ""
+msgstr "Tidak ada nama yang ditemukan, tidak dapat menjelaskan apapun."
 
-#: 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"
-msgstr ""
+#: 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"
-msgstr ""
+msgstr "--merge-base hanya bekerja dengan dua komit"
 
 #: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
-msgstr ""
+msgstr "'%s': bukan berkas reguler atau tautan simbolik"
 
 #: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
-msgstr ""
+msgstr "opsi tidak valid: %s"
 
 #: builtin/diff.c:376
 #, c-format
 msgid "%s...%s: no merge base"
-msgstr ""
+msgstr "%s...%s: tidak ada dasar penggabungan"
 
-#: builtin/diff.c:486
+#: builtin/diff.c:491
 msgid "Not a git repository"
-msgstr ""
+msgstr "bukan repositori git"
 
-#: builtin/diff.c:532 builtin/grep.c:684
+#: builtin/diff.c:537 builtin/grep.c:698
 #, c-format
 msgid "invalid object '%s' given."
-msgstr ""
+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 ""
+msgstr "lebih dari dua blob diberikan: '%s'"
 
-#: builtin/diff.c:548
+#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
-msgstr ""
+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 ""
+msgstr "%s...%s: banyak dasar penggabungan, menggunakan %s"
 
 #: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
-msgstr ""
+msgstr "git difftool [<opsi>] [<komit> [<komit>]] [--] [<jalur>...]"
 
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr ""
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
-msgstr ""
+msgstr "tidak dapat membaca tautan simbolik %s"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
-msgstr ""
+msgstr "tidak dapat membaca berkas tautan simbolik %s"
 
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
 #, c-format
 msgid "could not read object %s for symlink %s"
-msgstr ""
+msgstr "tidak dapat membaca objek %s untuk symlink %s"
 
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
 msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
 msgstr ""
+"format diff tergabung ('-c' dan '--cc') tidak didukung dalam\n"
+"mode diff direktori ('-d' dan '--dir-diff')."
 
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
-msgstr ""
+msgstr "kedua berkas berubah: '%s' dan '%s'."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
-msgstr ""
+msgstr "berkas pohon kerja telah ditinggalkan."
 
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
-msgstr ""
+msgstr "berkas sementara ada di '%s'."
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
-msgstr ""
+msgstr "mungkin Anda ingin membersihkan atau memulihkan itu."
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "gagal: %d"
+
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
-msgstr ""
+msgstr "gunakan `diff.guitool` daripada `diff.tool`"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
-msgstr ""
+msgstr "lakukan diff direktori penuh"
 
-#: builtin/difftool.c:704
+#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
-msgstr ""
+msgstr "jangan bisiki sebelum meluncurkan alat diff"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
-msgstr ""
+msgstr "gunakan tautan simbolik dalam mode diff direktori"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:700
 msgid "tool"
-msgstr ""
+msgstr "alat"
 
-#: builtin/difftool.c:711
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
-msgstr ""
+msgstr "gunakan alat diff yang disebutkan"
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
-msgstr ""
+msgstr "cetak daftar alat diff yang bisa digunakan dengan `--tool`"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:706
 msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr ""
+"buat 'git-difftool' keluar ketika alat diff yang dijalankan mengembalikan "
+"kode keluar bukan nol"
 
-#: builtin/difftool.c:719
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
-msgstr ""
+msgstr "sebutkan perintah kustom untuk melihat diff"
 
-#: builtin/difftool.c:720
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
-msgstr ""
+msgstr "dilewatkan ke `diff`"
 
-#: builtin/difftool.c:735
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
-msgstr ""
-
-#: builtin/difftool.c:742
-msgid "--dir-diff is incompatible with --no-index"
-msgstr ""
-
-#: builtin/difftool.c:745
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr ""
+msgstr "difftool butuh pohon kerja atau --no-index"
 
-#: builtin/difftool.c:753
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
-msgstr ""
+msgstr "tidak ada <alat> yang diberikan untuk --tool=<alat>"
 
-#: builtin/difftool.c:760
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
-msgstr ""
+msgstr "tidak ada <perintah> yang diberikan untuk --extcmd=<perintah>"
 
 #: builtin/env--helper.c:6
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr ""
 
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
 msgid "type"
 msgstr ""
 
@@ -14038,244 +14561,241 @@ msgstr ""
 
 #: builtin/fast-export.c:29
 msgid "git fast-export [rev-list-opts]"
-msgstr ""
+msgstr "git fast-export [opsi rev-list]"
 
-#: builtin/fast-export.c:868
+#: 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:1177
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
-msgstr ""
+msgstr "token --anonymize-map tidak bisa kosong"
 
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
-msgstr ""
+msgstr "perlihatkan perkembangan setelah <n> objek"
 
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
-msgstr ""
+msgstr "pilih penanganan tag bertandatangan"
 
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
-msgstr ""
+msgstr "pilih penanganan tag yang men-tag objek tersaring"
 
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
-msgstr ""
+msgstr "pilih penanganan pesan komit dalam pengkodean alternatif"
 
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
-msgstr ""
+msgstr "buang tanda ke berkas ini"
 
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
-msgstr ""
+msgstr "impor tanda dari berkas ini"
 
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
-msgstr ""
+msgstr "impor tanda dari berkas ini jika ada"
 
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
-msgstr ""
+msgstr "palsukan pen-tag ketika tidak ada pada tag"
 
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
-msgstr ""
+msgstr "keluarkan pohon penuh untuk setiap komit"
 
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
-msgstr ""
+msgstr "gunakan fitur selesai untuk mengakhiri arus"
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
-msgstr ""
+msgstr "lewati keluaran data blob"
 
-#: builtin/fast-export.c:1222 builtin/log.c:1823
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
-msgstr ""
+msgstr "spek referensi"
 
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
-msgstr ""
+msgstr "terapkan spek referensi ke referensi terekspor"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
-msgstr ""
+msgstr "anonimkan keluaran"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
 msgid "from:to"
-msgstr ""
+msgstr "dari:ke"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
-msgstr ""
+msgstr "ubah <dari> ke <ke> pada keluaran teranonim"
 
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
-msgstr ""
+msgstr "referensikan induk yang tidak ada dalam arus fast-export oleh id objek"
 
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
-msgstr ""
+msgstr "perlihatkan id objek asli dari blob/komit"
 
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
-msgstr ""
-
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr ""
-
-#: builtin/fast-export.c:1271
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr ""
+msgstr "label tag dengan id tanda"
 
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing from marks for submodule '%s'"
-msgstr ""
+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 ""
+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 ""
+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 ""
+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 ""
+msgstr "fitur '%s' dilarang dalam input tanpa --allow-unsafe-features"
 
 #: builtin/fetch-pack.c:242
 #, c-format
 msgid "Lockfile created but not reported: %s"
-msgstr ""
+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:185
+#: 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:245
+#: 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:188
+#: 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:191
+#: 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:195
+#: 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:198
+#: 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:122
+#: 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:206
+#: 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: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 "perdalam riwayat klon dangkal"
 
-#: 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 "perdalam riwayat repositori dangkal berdasarkan waktu"
 
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: 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)"
@@ -14283,142 +14803,148 @@ msgstr ""
 "default untuk ambil submodul secara rekursif (prioritas lebih rendah "
 "dariberkas konfigurasi)"
 
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: 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:226
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "peta referensi"
 
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "sebutkan ambil peta referensi"
 
-#: 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 ""
 "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:243
+#: 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:757
+#: 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:856
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "objek %s tidak ditemukan"
 
-#: builtin/fetch.c:860
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[terkini]"
 
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[tertolak]"
 
-#: builtin/fetch.c:874
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "tidak dapat mengambil di cabang saat ini"
 
-#: builtin/fetch.c:884
+#: 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:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: 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:889
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "akan klob tag yang ada"
 
-#: builtin/fetch.c:911
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[tag baru]"
 
-#: builtin/fetch.c:914
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[cabang baru]"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[referensi baru]"
 
-#: builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "pembaruan terpaksa"
 
-#: builtin/fetch.c:961
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "bukan-maju-cepat"
 
-#: builtin/fetch.c:1065
+#: 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:1069
+#: 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:1101
+#: 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:1129
+#: builtin/fetch.c:1141
 #, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+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:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "Dari %.*s\n"
 
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -14427,132 +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:1327
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s akan menjadi terjuntai)"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s telah menjadi terjuntai)"
 
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[dihapus]"
 
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(tidak ada)"
 
-#: builtin/fetch.c:1384
+#: 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:1403
+#: 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:1406
+#: 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:1618
+#: builtin/fetch.c:1455
+#, c-format
+msgid "the object %s does not exist"
+msgstr "objek '%s' tidak ada"
+
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "banyak cabang terdeteksi, tidak kompatibel dengan --set-upstream"
 
-#: builtin/fetch.c:1633
+#: 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:1635
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr "tidak setel hulu untuk tag remote"
 
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "tipe cabang tidak diketahui"
 
-#: builtin/fetch.c:1639
+#: 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:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Mengambil %s\n"
 
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 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:1790
+#: 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:1894
+#: 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."
-
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "Anda perlu sebutkan nama tag"
+"repositori remote tidak disebutkan; mohon sebutkan baik URL atau nama\n"
+"remote yang mana revisi baru sebaiknya diambil"
 
-#: builtin/fetch.c:1995
-msgid "Negative depth in --deepen is not supported"
-msgstr "Kedalaman negatif di --deepen tidak didukung"
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "Anda perlu sebutkan sebuah nama tag"
 
-#: builtin/fetch.c:1997
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen dan --depth saling eksklusif"
+#: 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:2002
-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:2004
+#: 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:2021
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all tidak mengambil argumen repositori"
 
-#: builtin/fetch.c:2023
+#: 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:2032
+#: 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:2039
-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:2055
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
-msgstr ""
+msgstr "harus suplai remote ketika menggunakan --negotiate-only"
 
-#: builtin/fetch.c:2060
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr ""
+#: builtin/fetch.c:2102
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "protokol tidak mendukung --negotiate-only, keluar."
 
-#: builtin/fetch.c:2079
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -14560,11 +15096,11 @@ msgstr ""
 "--filter hanya dapat digunakan dengan remote yang terkonfigurasi di "
 "extensions.partialclone"
 
-#: builtin/fetch.c:2083
+#: 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:2087
+#: 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"
 
@@ -14573,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 ""
 
@@ -14609,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:483
+#: 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 ""
 
@@ -14657,876 +15197,952 @@ msgstr ""
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr ""
 
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr ""
 
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr ""
 
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr ""
 
-#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
-msgstr ""
+msgstr "tidak dikenal"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
 #: builtin/fsck.c:78 builtin/fsck.c:100
 #, c-format
 msgid "error in %s %s: %s"
-msgstr ""
+msgstr "kesalahan pada %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
 #: builtin/fsck.c:94
 #, c-format
 msgid "warning in %s %s: %s"
-msgstr ""
+msgstr "peringatan pada %s %s: %s"
 
-#: builtin/fsck.c:123 builtin/fsck.c:126
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
-msgstr ""
+msgstr "tautan rusak dari %7s %s"
 
-#: builtin/fsck.c:135
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
-msgstr ""
+msgstr "tipe objek salah dalam tautan"
 
-#: builtin/fsck.c:151
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
 "              to %7s %s"
 msgstr ""
+"tautan rusak dari %7s %s\n"
+"               ke %7s %s"
 
-#: builtin/fsck.c:263
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
-msgstr ""
+msgstr "kehilangan %s %s"
 
-#: builtin/fsck.c:290
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
-msgstr ""
+msgstr "tidak dapat dicapai %s %s"
 
-#: builtin/fsck.c:310
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
-msgstr ""
+msgstr "teruntai %s %s"
 
-#: builtin/fsck.c:320
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
-msgstr ""
+msgstr "tidak dapat membuat lost-found"
 
-#: builtin/fsck.c:331
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
-msgstr ""
+msgstr "tidak dapat menyelesaikan '%s'"
 
-#: builtin/fsck.c:348
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
-msgstr ""
+msgstr "Memeriksa %s"
 
-#: builtin/fsck.c:386
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
-msgstr ""
+msgstr "Memerika konektivitas (%d objek)"
 
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
-msgstr ""
+msgstr "Memeriksa %s %s"
 
-#: builtin/fsck.c:410
+#: builtin/fsck.c:411
 msgid "broken links"
-msgstr ""
+msgstr "tautan rusak"
 
-#: builtin/fsck.c:419
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
-msgstr ""
+msgstr "akar %s"
 
-#: builtin/fsck.c:427
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
-msgstr ""
+msgstr "ter-tag %s %s (%s) di %s"
 
-#: builtin/fsck.c:456
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
-msgstr ""
+msgstr "%s: objek rusak atau hilang"
 
-#: builtin/fsck.c:481
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
-msgstr ""
+msgstr "%s: entri log referensi tidak valid %s"
 
-#: builtin/fsck.c:495
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
-msgstr ""
+msgstr "Memeriksa log referensi %s->%s"
 
-#: builtin/fsck.c:529
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
-msgstr ""
+msgstr "%s: penunjuk sha1 tidak valid %s"
 
-#: builtin/fsck.c:536
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
-msgstr ""
+msgstr "%s: bukan sebuah komit"
 
-#: builtin/fsck.c:590
+#: builtin/fsck.c:591
 msgid "notice: No default references"
+msgstr "catatan: Tidak ada referensi asali"
+
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
 msgstr ""
 
-#: builtin/fsck.c:605
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
-msgstr ""
+msgstr "%s: objek rusak atau hilang: %s"
+
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: objek bertipe tidak dikenal '%s': %s"
 
-#: builtin/fsck.c:618
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
-msgstr ""
+msgstr "%s: objek tidak dapat diuraikan: %s"
 
-#: builtin/fsck.c:638
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
-msgstr ""
+msgstr "sha1 berkas jelek: %s"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:686
 msgid "Checking object directory"
-msgstr ""
+msgstr "Memeriksa direktori objek"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:689
 msgid "Checking object directories"
-msgstr ""
+msgstr "Memeriksa direktori objek"
 
-#: builtin/fsck.c:671
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
-msgstr ""
+msgstr "Memeriksa tautan %s"
 
-#: builtin/fsck.c:676 builtin/index-pack.c:866
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "%s tidak valid"
 
-#: builtin/fsck.c:683
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
-msgstr ""
+msgstr "%s menunjuk ke sesuatu yang aneh (%s)"
 
-#: builtin/fsck.c:689
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
-msgstr ""
+msgstr "%s: HEAD terpisah tidak menunjuk ke apapun"
 
-#: builtin/fsck.c:693
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
-msgstr ""
+msgstr "catatan: %s menunjuk ke cabang yang belum lahir (%s)"
 
-#: builtin/fsck.c:705
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
-msgstr ""
+msgstr "Memeriksa pohon tembolok"
 
-#: builtin/fsck.c:710
+#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
-msgstr ""
+msgstr "%s: penunjuk sha1 tidak valid pada pohon tembolok"
 
-#: builtin/fsck.c:719
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
-msgstr ""
+msgstr "bukan pohon pada pohon tembolok"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
-msgstr ""
+msgstr "git fsck [<opsi>] [<objek>...]"
 
-#: builtin/fsck.c:756
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
-msgstr ""
+msgstr "perlihatkan objek yang tak dapat dicapai"
 
-#: builtin/fsck.c:757
+#: builtin/fsck.c:791
 msgid "show dangling objects"
-msgstr ""
+msgstr "perlihatkan objek teruntai"
 
-#: builtin/fsck.c:758
+#: builtin/fsck.c:792
 msgid "report tags"
-msgstr ""
+msgstr "laporkan tag"
 
-#: builtin/fsck.c:759
+#: builtin/fsck.c:793
 msgid "report root nodes"
-msgstr ""
+msgstr "laporkan simpul akar"
 
-#: builtin/fsck.c:760
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
-msgstr ""
+msgstr "buat objek indeks simpul kepala"
 
-#: builtin/fsck.c:761
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
-msgstr ""
+msgstr "buat log referensi simpul kepala (asali)"
 
-#: builtin/fsck.c:762
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
-msgstr ""
+msgstr "juga pertimbangkan pak dan objek alternatif"
 
-#: builtin/fsck.c:763
+#: builtin/fsck.c:797
 msgid "check only connectivity"
-msgstr ""
+msgstr "hanya periksa konektivitas"
 
-#: builtin/fsck.c:764 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
-msgstr ""
+msgstr "aktifkan pemeriksaan lebih ketat"
 
-#: builtin/fsck.c:766
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
-msgstr ""
+msgstr "tulis objek teruntai dalam .git/lost-found"
 
-#: builtin/fsck.c:767 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
-msgstr ""
+msgstr "perlihatkan perkembangan"
 
-#: builtin/fsck.c:768
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
-msgstr ""
+msgstr "perlihatkan nama lantung untuk objek yang dapat dicapai"
 
-#: builtin/fsck.c:827 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Memeriksa objek"
 
-#: builtin/fsck.c:855
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
-msgstr ""
+msgstr "%s: objek hilang"
 
-#: builtin/fsck.c:866
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
-msgstr ""
+msgstr "parameter tidak valid: sha1 diharapkan, dapat '%s'"
 
 #: builtin/gc.c:39
 msgid "git gc [<options>]"
-msgstr ""
+msgstr "git gc [<opsi>]"
 
 #: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
-msgstr ""
+msgstr "Gagal men-fstat %s: %s"
 
 #: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
-msgstr ""
+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 ""
-
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
-#, c-format
-msgid "cannot read '%s'"
-msgstr ""
+msgstr "tidak dapat men-stat '%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"
-"and remove %s.\n"
+"and remove %s\n"
 "Automatic cleanup will not be performed until the file is removed.\n"
 "\n"
 "%s"
 msgstr ""
+"Aksi gc terakhir melaporkan berikut. Mohon koreksi akar masalah\n"
+"dan hapus %s\n"
+"Pembersihan otomatis tidak akan dilakukan sampai berkas dihapus.\n"
+"\n"
+"%s"
 
-#: builtin/gc.c:551
+#: builtin/gc.c:552
 msgid "prune unreferenced objects"
-msgstr ""
+msgstr "pangkas objek tak tereferensi"
 
-#: builtin/gc.c:553
+#: builtin/gc.c:554
 msgid "be more thorough (increased runtime)"
-msgstr ""
+msgstr "jadi lebih cermat (waktu yang dijalankan bertambah)"
 
-#: builtin/gc.c:554
+#: builtin/gc.c:555
 msgid "enable auto-gc mode"
-msgstr ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+msgstr "--no-schedule tidak diperbolehkan"
 
-#: builtin/gc.c:750
+#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
-msgstr ""
+msgstr "argumen --schedule tidak dikenal '%s'"
 
-#: builtin/gc.c:869
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
-msgstr ""
+msgstr "gagal menulis grafik komit"
 
-#: builtin/gc.c:905
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
-msgstr ""
+msgstr "gagal mem-praambil remote"
 
 #: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
-msgstr ""
+msgstr "gagal memulai proses 'git pack-objects'"
 
 #: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
-msgstr ""
+msgstr "gagal menyelesaikan proses 'git pack-objects'"
 
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
-msgstr ""
+msgstr "gagal menulis indeks multipak"
 
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
-msgstr ""
+msgstr "'git multi-pack-index expire' gagal"
 
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
-msgstr ""
+msgstr "'git multi-pack-index repack' gagal"
 
-#: builtin/gc.c:1179
+#: 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:1283
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
-msgstr ""
+msgstr "berkas kunci '%s' ada, melewatkan pemeliharaan"
 
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
-msgstr ""
+msgstr "tugas '%s' gagal"
 
-#: builtin/gc.c:1395
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
-msgstr ""
+msgstr "'%s' bukan tugas yang valid"
 
-#: builtin/gc.c:1400
+#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
-msgstr ""
+msgstr "tugas '%s' tidak dapat dipilih berulang kali"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
-msgstr ""
+msgstr "jalankan tugas berdasarkan keadaan repositori"
 
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
 msgid "frequency"
-msgstr ""
+msgstr "frekuensi"
 
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
-msgstr ""
+msgstr "jalankan tugas berdasarkan frekuensi"
 
-#: builtin/gc.c:1420
+#: 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:1421
+#: builtin/gc.c:1416
 msgid "task"
-msgstr ""
+msgstr "tugas"
 
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
 msgid "run a specific task"
-msgstr ""
+msgstr "jalankan tugas spesifik"
 
-#: builtin/gc.c:1439
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr ""
+msgstr "gunakan paling banyak satu dari --auto dan --schedule=<frekuensi>"
 
-#: builtin/gc.c:1482
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
-msgstr ""
+msgstr "gagal menjalankan 'git config'"
 
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
-msgstr ""
+msgstr "gagal memperluas jalur '%s'"
 
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
-msgstr ""
+msgstr "gagal menjalankan launchctl"
 
-#: builtin/gc.c:1613
+#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
-msgstr ""
+msgstr "gagal membuat direktori untuk '%s'"
 
-#: builtin/gc.c:1674
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
-msgstr ""
+msgstr "gagal men-tali-botkan layanan %s"
 
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
-msgstr ""
+msgstr "gagal membuat berkas xml sementara"
 
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
-msgstr ""
+msgstr "gagal menjalankan schtasks"
 
-#: builtin/gc.c:1879
+#: 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:1896
+#: 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:1900
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
-msgstr ""
+msgstr "gagal membuka masukan standar dari 'crontab'"
 
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
 msgid "'crontab' died"
-msgstr ""
+msgstr "'crontab' mati"
+
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "gagal memulai systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "gagal menjalankan systemctl"
 
-#: builtin/gc.c:1976
+#: 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:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "argumen --scheduler tidak dikenal '%s'"
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "baik pewaktu systemd atau crontab tidak tersedia"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "penjadwal %s tidak tersedia"
+
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
-msgstr ""
+msgstr "proses lainnya sedang menjadwalkan peme"
+
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<penjadwal>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "penjadwal"
 
-#: builtin/gc.c:2000
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "penjadwal untuk memicu git maintenance run"
+
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
-msgstr ""
+msgstr "gagal menambahkan repositori ke konfigurasi global"
 
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
-msgstr ""
+msgstr "git maintenance <subperintah> [<opsi>]"
 
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
-msgstr ""
+msgstr "subperintah tidak valid: %s"
 
 #: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
-msgstr ""
+msgstr "git grep [<opsi>] [-e] <pola> [<revisi>...] [[--] <pola>...]"
 
-#: builtin/grep.c:223
+#: builtin/grep.c:239
 #, c-format
 msgid "grep: failed to create thread: %s"
-msgstr ""
+msgstr "grep: gagal membuat utas: %s"
 
-#: builtin/grep.c:277
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
-msgstr ""
+msgstr "jumlah utas yang diberikan (%d) tidak valid untuk %s"
 
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
-#: builtin/pack-objects.c:2969
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "tidak ada dukungan utas, abaikan %s"
 
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
 #, c-format
 msgid "unable to read tree (%s)"
-msgstr ""
+msgstr "tidak dapat membaca pohon (%s)"
 
-#: builtin/grep.c:658
+#: builtin/grep.c:672
 #, c-format
 msgid "unable to grep from object of type %s"
-msgstr ""
+msgstr "tidak dapan men-grep dari objek dengan tipe %s"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:752
 #, c-format
 msgid "switch `%c' expects a numerical value"
-msgstr ""
+msgstr "saklar '%c' mengharapkan nilai numerik"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:851
 msgid "search in index instead of in the work tree"
-msgstr ""
+msgstr "cari dalam index daripada dalam pohon kerja"
 
-#: builtin/grep.c:840
+#: builtin/grep.c:853
 msgid "find in contents not managed by git"
-msgstr ""
+msgstr "temukan dalam konten yang tak dikelola oleh git"
 
-#: builtin/grep.c:842
+#: builtin/grep.c:855
 msgid "search in both tracked and untracked files"
-msgstr ""
+msgstr "cari dalam berkas terlacak dan tak terlacak"
 
-#: builtin/grep.c:844
+#: builtin/grep.c:857
 msgid "ignore files specified via '.gitignore'"
-msgstr ""
+msgstr "abaikan berkas yang disebutkan via '.gitignore'"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:859
 msgid "recursively search in each submodule"
-msgstr ""
+msgstr "cari secara rekursif dalam setiap submodul"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:862
 msgid "show non-matching lines"
-msgstr ""
+msgstr "perlihatkan baris nir-cocok"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:864
 msgid "case insensitive matching"
-msgstr ""
+msgstr "pencocokan tak peka kapital"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:866
 msgid "match patterns only at word boundaries"
-msgstr ""
+msgstr "cocokkan pola hanya pada batas kata"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:868
 msgid "process binary files as text"
-msgstr ""
+msgstr "proses berkas biner sebagai teks"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:870
 msgid "don't match patterns in binary files"
-msgstr ""
+msgstr "jangan cocokkan pola pada berkas biner"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:873
 msgid "process binary files with textconv filters"
-msgstr ""
+msgstr "proses berkas biner dengan saringan textconv"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:875
 msgid "search in subdirectories (default)"
-msgstr ""
+msgstr "cari dalam subdirektori (asali)"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:877
 msgid "descend at most <depth> levels"
-msgstr ""
+msgstr "turun paling banyak <kedalaman> tingkat"
 
-#: builtin/grep.c:868
+#: builtin/grep.c:881
 msgid "use extended POSIX regular expressions"
-msgstr ""
+msgstr "gunakan ekspresi reguler POSIX diperpanjang"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:884
 msgid "use basic POSIX regular expressions (default)"
-msgstr ""
+msgstr "gunakan ekspresi reguler POSIX dasar (asali)"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:887
 msgid "interpret patterns as fixed strings"
-msgstr ""
+msgstr "tafsirkan pola sebagai untai tetap"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:890
 msgid "use Perl-compatible regular expressions"
-msgstr ""
+msgstr "gunakan ekspresi reguler kompatibel dengan Perl"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:893
 msgid "show line numbers"
-msgstr ""
+msgstr "perlihatkan nomor baris"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:894
 msgid "show column number of first match"
-msgstr ""
+msgstr "perlihatkan nomor kolom cocokan pertama"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:895
 msgid "don't show filenames"
-msgstr ""
+msgstr "jangan perlihatkan nama berkas"
 
-#: builtin/grep.c:883
+#: builtin/grep.c:896
 msgid "show filenames"
-msgstr ""
+msgstr "perlihatkan nama berkas"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:898
 msgid "show filenames relative to top directory"
-msgstr ""
+msgstr "perlihatkan nama berkas relatif terhadap direktori puncak"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:900
 msgid "show only filenames instead of matching lines"
-msgstr ""
+msgstr "hanya perlihatkan nama berkas daripada baris yang cocok"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:902
 msgid "synonym for --files-with-matches"
-msgstr ""
+msgstr "sinonim untuk --files-with-matches"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:905
 msgid "show only the names of files without match"
-msgstr ""
+msgstr "hanya perlihatkan nama berkas tanpa cocok"
 
-#: builtin/grep.c:894
+#: builtin/grep.c:907
 msgid "print NUL after filenames"
-msgstr ""
+msgstr "cetak NUL setelah nama berkas"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:910
 msgid "show only matching parts of a line"
-msgstr ""
+msgstr "hanya perlihatkan bagian cocokan baris"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:912
 msgid "show the number of matches instead of matching lines"
-msgstr ""
+msgstr "perlihatkan jumlah cocokan daripada baris yang cocok"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:913
 msgid "highlight matches"
-msgstr ""
+msgstr "sorot cocokan"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:915
 msgid "print empty line between matches from different files"
-msgstr ""
+msgstr "cetak baris kosong di antara cocokan dari berkas yang berbeda"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:917
 msgid "show filename only once above matches from same file"
 msgstr ""
+"perlihatkan nama berkas hanya sekali di atas cocokan dari berkas yang sama"
 
-#: builtin/grep.c:907
+#: builtin/grep.c:920
 msgid "show <n> context lines before and after matches"
-msgstr ""
+msgstr "perlihatkan <n> baris konteks sebelum dan sesudah cocokan"
 
-#: builtin/grep.c:910
+#: builtin/grep.c:923
 msgid "show <n> context lines before matches"
-msgstr ""
+msgstr "perlihatkan <n> baris konteks sebelum cocokan"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:925
 msgid "show <n> context lines after matches"
-msgstr ""
+msgstr "perlihatkan <n> baris konteks setelah cocokan"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:927
 msgid "use <n> worker threads"
-msgstr ""
+msgstr "gunakan <n> utas pekerja"
 
-#: builtin/grep.c:915
+#: builtin/grep.c:928
 msgid "shortcut for -C NUM"
-msgstr ""
+msgstr "pintasan untuk -C NUM"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:931
 msgid "show a line with the function name before matches"
-msgstr ""
+msgstr "perlihatkan sebuah baris dengan nama fungsi sebelum cocokan"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:933
 msgid "show the surrounding function"
-msgstr ""
+msgstr "perlihatkan fungsi di sekitar"
 
-#: builtin/grep.c:923
+#: builtin/grep.c:936
 msgid "read patterns from file"
-msgstr ""
+msgstr "baca pola dari berkas"
 
-#: builtin/grep.c:925
+#: builtin/grep.c:938
 msgid "match <pattern>"
-msgstr ""
+msgstr "cocokkan <pola>"
 
-#: builtin/grep.c:927
+#: builtin/grep.c:940
 msgid "combine patterns specified with -e"
-msgstr ""
+msgstr "kombinasikan pola yang disebutkan dengan -e"
 
-#: builtin/grep.c:939
+#: builtin/grep.c:952
 msgid "indicate hit with exit status without output"
-msgstr ""
+msgstr "tunjukkan kena dengan status keluar tanpa keluaran"
 
-#: builtin/grep.c:941
+#: builtin/grep.c:954
 msgid "show only matches from files that match all patterns"
-msgstr ""
+msgstr "hanya perlihatkan cocokan dari berkas yang cocok dengan semua pola"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "pager"
-msgstr ""
+msgstr "penghalaman"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "show matching files in the pager"
-msgstr ""
+msgstr "perlihatkan berkas yang cocok dalam penghalaman"
 
-#: builtin/grep.c:948
+#: builtin/grep.c:961
 msgid "allow calling of grep(1) (ignored by this build)"
-msgstr ""
+msgstr "perbolehkan pemanggilan grep(1) (diabaikan oleh bangunan ini)"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1027
 msgid "no pattern given"
-msgstr ""
+msgstr "tidak ada pola yang diberikan"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:1063
 msgid "--no-index or --untracked cannot be used with revs"
-msgstr ""
+msgstr "--no-index atau --untracked tidak dapat digunakan dengan revisi"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:1071
 #, c-format
 msgid "unable to resolve revision: %s"
-msgstr ""
+msgstr "tidak dapat menguraikan revisi: %s"
 
-#: builtin/grep.c:1088
+#: builtin/grep.c:1101
 msgid "--untracked not supported with --recurse-submodules"
-msgstr ""
+msgstr "--untracked tidak didukung dengan --recurse-submodules"
 
-#: builtin/grep.c:1092
+#: builtin/grep.c:1105
 msgid "invalid option combination, ignoring --threads"
-msgstr ""
+msgstr "kombinasi opsi tidak valid, abaikan --threads"
 
-#: builtin/grep.c:1095 builtin/pack-objects.c:3930
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
 msgid "no threads support, ignoring --threads"
-msgstr ""
+msgstr "tidak ada dukungan utas, abaikan --threads"
 
-#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "jumlah utas tersebut (%d) tidak valid"
 
-#: builtin/grep.c:1132
+#: builtin/grep.c:1145
 msgid "--open-files-in-pager only works on the worktree"
-msgstr ""
+msgstr "--open-files-in-pager hanya bekerja pada pohon kerja"
 
-#: builtin/grep.c:1158
+#: builtin/grep.c:1171
 msgid "--cached or --untracked cannot be used with --no-index"
-msgstr ""
+msgstr "--cached atau --untracked tidak dapat digunakan dengan --no-index"
 
-#: builtin/grep.c:1161
+#: builtin/grep.c:1174
 msgid "--untracked cannot be used with --cached"
-msgstr ""
+msgstr "--untracked tidak dapat digunakan dengan --cached"
 
-#: builtin/grep.c:1167
+#: builtin/grep.c:1180
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
-msgstr ""
+msgstr "--[no-]exclude-standard tidak dapat digunakan untuk konten terlacak"
 
-#: builtin/grep.c:1175
+#: builtin/grep.c:1188
 msgid "both --cached and trees are given"
-msgstr ""
+msgstr "baik --cached dan pohon diberikan"
 
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
 msgstr ""
+"git hash-object [-t <tipe>] [-w] [--path=<berkas> | --no-filters] [--stdin] "
+"[--] <berkas>..."
 
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
-msgstr ""
+msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
 msgid "object type"
-msgstr ""
+msgstr "tipe objek"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
-msgstr ""
+msgstr "tulis objek ke dalam basis data objek"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
-msgstr ""
+msgstr "baca objek dari masukan standar"
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
-msgstr ""
+msgstr "simpan berkas apa adanya tanpa penyaring"
 
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
+"hanya hash sampah acak apapun untuk membuat objek rusak demi menirkutukan Git"
 
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
-msgstr ""
+msgstr "proses berkas seperti dari jalur ini"
 
-#: builtin/help.c:47
+#: builtin/help.c:55
 msgid "print all available commands"
 msgstr "cetak semua perintah yang tersedia"
 
-#: builtin/help.c:48
+#: builtin/help.c:57
 msgid "exclude guides"
 msgstr "kecualikan panduan"
 
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "cetak daftar panduan berguna"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "cetak semua nama variabel konfigurasi"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
 msgid "show man page"
 msgstr "perlihatkan halaman man"
 
-#: builtin/help.c:53
+#: builtin/help.c:59
 msgid "show manual in web browser"
 msgstr "perlihatkan manual dalam penjelajah web"
 
-#: builtin/help.c:55
+#: builtin/help.c:61
 msgid "show info page"
 msgstr "perlihatkan halaman info"
 
-#: builtin/help.c:57
+#: builtin/help.c:63
 msgid "print command description"
 msgstr "perlihatkan deskripsi perintah"
 
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "cetak daftar panduan berguna"
+
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "cetak semua nama variabel konfigurasi"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<perintah>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr ""
 
-#: builtin/help.c:163
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr ""
+
+#: builtin/help.c:196
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "format bantuan tidak dikenal '%s'"
 
-#: builtin/help.c:190
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "gagal menjalankan emacsclient."
 
-#: builtin/help.c:203
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "gagal menguraikan versi emacsclient."
 
-#: builtin/help.c:211
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "versi emacsclient '%d' terlalu usang (< 22)."
 
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: 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:307
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -15535,7 +16151,7 @@ msgstr ""
 "'%s': jalur untuk pembaca man yang tidak didukung.\n"
 "Mohon gunakan 'man.<tool>.cmd' sebagai gantinya."
 
-#: builtin/help.c:319
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -15544,331 +16160,314 @@ msgstr ""
 "'%s': cmd untuk pembaca man yang didukung.\n"
 "Mohon gunakan 'man.<tool>.path' sebagai gantinya."
 
-#: builtin/help.c:436
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': pembaca man tidak dikenal"
 
-#: builtin/help.c:453
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "tidak ada pembaca man yang menangani permintaan"
 
-#: builtin/help.c:461
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr "tidak ada pembaca info yang menangani permintaan"
 
-#: builtin/help.c:520 builtin/help.c:531 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:534 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:563 builtin/help.c:593
+#: builtin/help.c:580
+msgid "this option doesn't take any other arguments"
+msgstr "opsi ini tidak mengambil argumen lainnya"
+
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "penggunaan: %s%s"
 
-#: builtin/help.c:577
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "'git help config' untuk informasi lebih lanjut"
 
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "tipe objek tidak cocok pada %s"
 
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "tidak menerima objek yang diharapkan %s"
 
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objek %s: yang diharapkan %s, yang didapat %s"
 
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr "EOF awal"
 
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "kesalahan baca pada masukan"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "gunakan lebih banyak pita dari pada yang tersedia"
 
-#: builtin/index-pack.c:325 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr "paket terlalu besar untuk definisi off_t saat ini"
 
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "paket melebihi ukuran maksimum yang diperbolehkan"
 
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "tidak dapat membuat '%s'"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "tidak dapat membuka berkas paket '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
 msgid "pack signature mismatch"
 msgstr "tanda tangan paket tidak cocok"
 
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "versi paket %<PRIu32> tidak didukung"
 
-#: builtin/index-pack.c:383
+#: builtin/index-pack.c:376
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "paket ada objek jelek pada offset %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:489
+#: builtin/index-pack.c:482
 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate mengembalikan %d"
 
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:531
 msgid "offset value overflow for delta base object"
 msgstr "nilai offset meluap untuk objek basis delta"
 
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:539
 msgid "delta base offset is out of bound"
 msgstr "offset basis delta di luar jangkauan"
 
-#: builtin/index-pack.c:554
+#: builtin/index-pack.c:547
 #, c-format
 msgid "unknown object type %d"
 msgstr "tipe objek tidak diketahui %d"
 
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:578
 msgid "cannot pread pack file"
 msgstr "tidak dapat pread berkas paket"
 
-#: builtin/index-pack.c:587
+#: builtin/index-pack.c:580
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:613
+#: builtin/index-pack.c:606
 msgid "serious inflate inconsistency"
 msgstr "inkonsistensi inflate serius"
 
-#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788
-#: builtin/index-pack.c:827 builtin/index-pack.c:836
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "TUMBUKAN SHA1 DITEMUKAN DENGAN %s !"
 
-#: builtin/index-pack.c:761 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
 #, c-format
 msgid "unable to read %s"
 msgstr "tidak dapat membaca %s"
 
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:818
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "tidak dapat membaca info objek yang ada %s"
 
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:826
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "tidak dapat membaca objek yang ada %s"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:840
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objek blob tidak valid %s"
 
-#: builtin/index-pack.c:850 builtin/index-pack.c:869
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
 msgid "fsck error in packed object"
 msgstr "kesalahan fsck dalam objek terpaket"
 
-#: builtin/index-pack.c:871
+#: builtin/index-pack.c:864
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Tidak semua objek anak dari %s bisa dicapai"
 
-#: builtin/index-pack.c:932 builtin/index-pack.c:979
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
 msgstr "gagal menerapkan delta"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Receiving objects"
 msgstr "Menerima objek"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Indexing objects"
 msgstr "Mengindeks objek"
 
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1190
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paket rusak (SHA1 tidak cocok)"
 
-#: builtin/index-pack.c:1201
+#: builtin/index-pack.c:1195
 msgid "cannot fstat packfile"
 msgstr "tidak dapat fstat berkas paket"
 
-#: builtin/index-pack.c:1204
+#: builtin/index-pack.c:1198
 msgid "pack has junk at the end"
 msgstr "paket memiliki sampah pada ujung"
 
-#: builtin/index-pack.c:1216
+#: builtin/index-pack.c:1210
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "bingung di luar kegilaan di parse_pack_objects()"
 
-#: builtin/index-pack.c:1239
+#: builtin/index-pack.c:1233
 msgid "Resolving deltas"
 msgstr "Menguraikan delta"
 
-#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "tidak dapat membuat utas: %s"
 
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1277
 msgid "confusion beyond insanity"
 msgstr "bingung di luar kegilaan"
 
-#: builtin/index-pack.c:1289
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Checksum ekor tidak diharapkan untuk %s (kerusakan disk?)"
 
-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1329
+#: builtin/index-pack.c:1323
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "tidak dapat menggemboskan objek tertambah (%d)"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1419
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "objek lokal %s rusak"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1440
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "nama berkas paket '%s' tidak diakhiri dengan '.%s'"
 
-#: builtin/index-pack.c:1470
+#: builtin/index-pack.c:1464
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "tidak dapat menulis %s berkas '%s'"
 
-#: builtin/index-pack.c:1478
+#: builtin/index-pack.c:1472
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "tidak dapat menutup %s berkas tertulis '%s'"
 
-#: builtin/index-pack.c:1504
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "tidak dapat menamai ulang berkas sementara '*.%s' ke '%s'"
+
+#: builtin/index-pack.c:1514
 msgid "error while closing pack file"
 msgstr "kesalahan menutup berkas paket"
 
-#: builtin/index-pack.c:1518
-msgid "cannot store pack file"
-msgstr "tidak dapat menyimpan berkas paket"
-
-#: builtin/index-pack.c:1526
-msgid "cannot store index file"
-msgstr "tidak dapat menyimpan berkas indeks"
-
-#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "pack.indexversion=%<PRIu32> jelek"
 
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1643
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "tidak dapat membuka berkas paket yang ada '%s'"
 
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1645
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "tidak dapat membuka berkas indeks paket untuk '%s'"
 
-#: builtin/index-pack.c:1701
+#: builtin/index-pack.c:1693
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1700
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1750
+#: builtin/index-pack.c:1742
 msgid "Cannot come back to cwd"
 msgstr "tidak dapat kembali ke direktori kerja saat ini"
 
-#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
-#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
 #, c-format
 msgid "bad %s"
 msgstr "%s jelek"
 
-#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "algoritma hash tak dikenal '%s'"
 
-#: builtin/index-pack.c:1852
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin tidak dapat digunakan tanpa --stdin"
-
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin memerlukan repositori git"
 
-#: builtin/index-pack.c:1856
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format tidak dapat digunakan dengan --stdin"
-
-#: builtin/index-pack.c:1871
+#: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify tanpa nama berkas paket diberikan"
 
-#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "kesalahan fsck dalam objek paket"
 
@@ -15912,56 +16511,56 @@ msgstr "templat tidak ditemukan di %s"
 msgid "not copying templates from '%s': %s"
 msgstr "tidak menyalin templat dari '%s': %s"
 
-#: builtin/init-db.c:262
+#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "nama cabang asal salah: '%s'"
 
-#: builtin/init-db.c:353
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "tidak dapat menangani tipe berkas %d"
 
-#: builtin/init-db.c:356
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "tidak dapat memindahkan %s ke %s"
 
-#: builtin/init-db.c:372
+#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr "mencoba menginisialisasi ulang repositori dengan hash yang berbeda"
 
-#: builtin/init-db.c:396 builtin/init-db.c:399
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s sudah ada"
 
-#: builtin/init-db.c:431
+#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: --initial-branch=%s diabaikan"
 
-#: builtin/init-db.c:462
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Repositori berbagi Git yang sudah ada diinisialisasi ulang di %s%s\n"
 
-#: builtin/init-db.c:463
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Repositori Git diinisialisasi ulang di %s%s\n"
 
-#: builtin/init-db.c:467
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Repositori berbagi Git kosong diinisialisasi di %s%s\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Repositori Git kosong dinisialisasi di %s%s\n"
 
-#: builtin/init-db.c:517
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -15969,56 +16568,52 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<direktori-templat>][--"
 "shared[=<perizinan>]] [<direktori>]"
 
-#: builtin/init-db.c:543
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "perizinan"
 
-#: builtin/init-db.c:544
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 "tentukan bahwa repositori git untuk dibagikan di antara beberapa pengguna"
 
-#: builtin/init-db.c:550
+#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "timpa nama cabang asal"
 
-#: builtin/init-db.c:551 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr ""
 
-#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "tentukan algoritma hash yang akan digunakan"
 
-#: builtin/init-db.c:559
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir dan --bare saling eksklusif"
-
-#: builtin/init-db.c:590 builtin/init-db.c:595
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "tidak dapat membuat direktori %s"
 
-#: builtin/init-db.c:599 builtin/init-db.c:654
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "tidak dapat mengganti direktori ke %s"
 
-#: builtin/init-db.c:626
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr ""
 "%s (atau --work-tree=<direktori>) tidak diperbolehkan tanpa sebutkan %s "
-"(atau--git-dir=<direktori>)"
+"(atau --git-dir=<direktori>)"
 
-#: builtin/init-db.c:678
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Tidak dapat mengakses pohon kerja '%s'"
 
-#: builtin/init-db.c:683
+#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir tidak kompatibel dengan repositori bare"
 
@@ -16125,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:303
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Keluaran terakhir: %d %s\n"
 
-#: builtin/log.c:568
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: berkas jelek"
 
-#: builtin/log.c:583 builtin/log.c:673
+#: 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:698
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "tipe tidak dikenal: %d"
 
-#: builtin/log.c:843
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: sampul tidak valid dari mode deskripsi"
 
-#: builtin/log.c:850
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers tanpa nilai"
 
-#: builtin/log.c:979
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "tidak dapat membuka berkas tambalan %s"
 
-#: builtin/log.c:996
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "butuh tepatnya satu rentang"
 
-#: builtin/log.c:1006
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "bukan sebuah rentang"
 
-#: builtin/log.c:1170
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "sampul surat butuh format email"
 
-#: builtin/log.c:1176
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "gagal membuat berkas sampul surat"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to gila: %s"
 
-#: builtin/log.c:1290
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opsi>] [<sejak> | <rentang revisi>]"
 
-#: builtin/log.c:1348
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "dua direktori keluaran?"
 
-#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#: 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:1510 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:1519
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "tidak dapat menemukan dasar penggabungan eksak"
 
-#: builtin/log.c:1529
+#: 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"
@@ -16215,292 +16810,276 @@ msgstr ""
 "Atau Anda dapat menyebutkan dasar komit secara manual dengan --base=<id "
 "dasar komit>"
 
-#: builtin/log.c:1552
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "tidak dapat menemukan dasar penggabungan eksak"
 
-#: builtin/log.c:1569
+#: 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:1579
+#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr "dasar komit tidak seharusnya dalam daftar revisi"
 
-#: builtin/log.c:1637
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "tidak dapat mendapatkan id tambalan"
 
-#: builtin/log.c:1700
+#: 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:1702
+#: 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:1746
+#: 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:1749
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "gunakan [PATCH] bahkan dengan banyak tambalan"
 
-#: builtin/log.c:1753
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "cetak tambalan ke keluaran standar"
 
-#: builtin/log.c:1755
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "buat sampul surat"
 
-#: builtin/log.c:1757
+#: 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:1758
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1759
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "gunakan <akhiran> daripada '.patch'"
 
-#: builtin/log.c:1761
+#: builtin/log.c:1779
 msgid "start numbering patches at <n> instead of 1"
 msgstr "mulai menomorkan tambalan pada <n> daripada 1"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr ""
 
-#: builtin/log.c:1763
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "tandai seri sebagai gulung ulang ke-N"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "panjang nama berkas keluaran maksimum"
 
-#: builtin/log.c:1767
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "gunakan [RFC PATCH] daripada [PATCH]"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "cover-from-description-mode"
 
-#: builtin/log.c:1771
+#: 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:1773
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "gunakan [<prefix>] daripada [PATCH]"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "simpan hasil berkas di <direktori>"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "jangan copot/tambah [PATCH]"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "jangan keluarkan diff biner"
 
-#: builtin/log.c:1784
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr "keluarkan hash semua-nol di kepala From"
 
-#: builtin/log.c:1786
+#: 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:1788
+#: builtin/log.c:1806
 msgid "show patch format instead of default (patch + stat)"
 msgstr "perlihatkan format tambalan daripada asali (tambalan + stat)"
 
-#: builtin/log.c:1790
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "Perpesanan"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1809
 msgid "header"
 msgstr "kepala"
 
-#: builtin/log.c:1792
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "tambahkan kepala email"
 
-#: builtin/log.c:1793 builtin/log.c:1794
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "email"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "tambahkan kepala To:"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "tambahkan kepala Cc:"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1796
+#: 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:1798
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1799
+#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr "buat surat pertama balasan ke <id pesan>"
 
-#: builtin/log.c:1800 builtin/log.c:1803
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "perbatasan"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "lampirkan tambalan"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "bariskan tambalan"
 
-#: builtin/log.c:1808
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr "aktifkan utasan pesan, gaya: shallow, deep"
 
-#: builtin/log.c:1810
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "tanda tangan"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "tambah tanda tangan"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "dasar komit"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr "tambahkan info pohon prasyarat ke seri tambalan"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "tambahkan tandatangan dari berkas"
 
-#: builtin/log.c:1817
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "jangan cetak nama berkas tambalan"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "perlihatkan perkembangan ketika membuat tambalan"
 
-#: builtin/log.c:1821
+#: 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:1824
+#: 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:1826 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:1913
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "baris identitas tidak valid: %s"
 
-#: builtin/log.c:1928
-msgid "-n and -k are mutually exclusive"
-msgstr "-n dan -k saling eksklusif"
-
-#: builtin/log.c:1930
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc dan -k saling eksklusif"
-
-#: builtin/log.c:1938
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only tidak masuk akal"
 
-#: builtin/log.c:1940
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status tidak masuk akal"
 
-#: builtin/log.c:1942
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check tidak masuk akal"
 
-#: builtin/log.c:1964
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output, dan --output-directory saling eksklusif"
-
-#: builtin/log.c:2087
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff butuh --cover-letter atau satu tambalan"
 
-#: builtin/log.c:2091
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2092
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff terhadap v%d:"
 
-#: builtin/log.c:2098
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor butuh --range-diff"
-
-#: builtin/log.c:2102
+#: 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:2110
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:2111
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff terhadap v%d:"
 
-#: builtin/log.c:2122
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "tidak dapat membaca berkas tanda tangan '%s'"
 
-#: builtin/log.c:2158
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "Membuat tambalan"
 
-#: builtin/log.c:2202
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "tidak dapat membuat berkas keluaran"
 
-#: builtin/log.c:2261
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<hulu> [<kepala> [<batas>]]]"
 
-#: builtin/log.c:2315
+#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -16508,192 +17087,207 @@ msgstr ""
 "Tidak dapat menemukan cabang remote terlacak, mohon sebutkan <hulu>\n"
 "secara manual.\n"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
-msgstr ""
+msgstr "git ls-files [<opsi>] [<berkas>...]"
+
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "pisahkan jalur dengan karakter NUL"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
-msgstr ""
+msgstr "identifikasi status berkas dengan tag"
 
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
-msgstr ""
+msgstr "gunakan huruf kecil untuk berkas 'asumsikan tak berubah'"
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
-msgstr ""
+msgstr "gunakan huruf kecil untuk berkas 'fsmonitor bersih'"
 
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
-msgstr ""
+msgstr "perlihatkan berkas tertembolok di dalam keluaran (asali)"
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
-msgstr ""
+msgstr "perlihatkan berkas yang dihapus di dalam keluaran"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
-msgstr ""
+msgstr "perlihatkan berkas yang berubah di dalam keluaran"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
-msgstr ""
+msgstr "perlihatkan berkas lainnya di dalam keluaran"
 
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
-msgstr ""
+msgstr "perlihatkan berkas terabaikan di dalam keluaran"
 
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
-msgstr ""
+msgstr "perlihatkan nama objek dari konten tergelar di dalam keluaran"
 
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:639
 msgid "show files on the filesystem that need to be removed"
-msgstr ""
+msgstr "perlihatkan berkas pada sistem berkas yang perlu dihapus"
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
-msgstr ""
+msgstr "hanya perlihatkan nama direktori 'lainnya'"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
-msgstr ""
+msgstr "perlihatkan akhiran baris berkas"
 
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
-msgstr ""
+msgstr "jangan perlihatkan direktori kosong"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
-msgstr ""
+msgstr "perlihatkan berkas tak tergabung di dalam keluaran"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
-msgstr ""
+msgstr "perlihatkan informasi resolve-undo"
 
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
-msgstr ""
+msgstr "lewati berkas yang cocok dengan pola"
 
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr ""
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "baca pola pengecualian dari <berkas>"
 
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
-msgstr ""
+msgstr "baca pola pengecualian tambahan per direktor dalam <berkas>"
 
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
-msgstr ""
+msgstr "tambahkan pengecualian git standar"
 
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
-msgstr ""
+msgstr "buat keluaran relatif terhadap direktori puncak proyek"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
-msgstr ""
+msgstr "rekursi melalui submodul"
 
-#: builtin/ls-files.c:668
+#: 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:669
+#: builtin/ls-files.c:670
 msgid "tree-ish"
-msgstr ""
+msgstr "mirip-pohon"
 
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:671
 msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr ""
+msgstr "berpura-pura bahwa jalur yang dihapus sejak <mirip-pohon> masih ada"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:673
 msgid "show debugging data"
-msgstr ""
+msgstr "perlihatkan data penirkutuan"
 
-#: builtin/ls-files.c:674
+#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
-msgstr ""
+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"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<repository> [<refs>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repository> [<refs>...]]"
 msgstr ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repositori> [<referensi>...]]"
 
 #: builtin/ls-remote.c:60
 msgid "do not print remote URL"
-msgstr ""
+msgstr "jangan cetak URL remote"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
 msgid "exec"
-msgstr ""
+msgstr "exec"
 
 #: builtin/ls-remote.c:62 builtin/ls-remote.c:64
 msgid "path of git-upload-pack on the remote host"
-msgstr ""
+msgstr "jalur git-upload-pack pada host remote"
 
 #: builtin/ls-remote.c:66
 msgid "limit to tags"
-msgstr ""
+msgstr "batasi ke tag"
 
 #: builtin/ls-remote.c:67
 msgid "limit to heads"
-msgstr ""
+msgstr "batasi ke kepala"
 
 #: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
-msgstr ""
+msgstr "jangan perlihatkan tag terkupas"
 
 #: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
-msgstr ""
+msgstr "perhitungkan url.<dasar>.insteadOf"
 
 #: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr ""
+"keluar dengan kode keluar 2 jika tidak ada referensi yang cocok ditemukan"
 
 #: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
-msgstr ""
+msgstr "perlihatkan referensi pokok selain objek yang ditunjuk olehnya"
 
 #: builtin/ls-tree.c:30
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr ""
+msgstr "git ls-tree [<opsi>] <mirip-pohon> [<jalur>...]"
 
 #: builtin/ls-tree.c:128
 msgid "only show trees"
-msgstr ""
+msgstr "hanya perlihatkan pohon"
 
 #: builtin/ls-tree.c:130
 msgid "recurse into subtrees"
-msgstr ""
+msgstr "rekursi ke dalam subpohon"
 
 #: builtin/ls-tree.c:132
 msgid "show trees when recursing"
-msgstr ""
+msgstr "perlihatkan pohon ketika rekursi"
 
 #: builtin/ls-tree.c:135
 msgid "terminate entries with NUL byte"
-msgstr ""
+msgstr "akhiri entri dengan bita NUL"
 
 #: builtin/ls-tree.c:136
 msgid "include object size"
-msgstr ""
+msgstr "masukkan ukuran objek"
 
 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
 msgid "list only filenames"
-msgstr ""
+msgstr "hanya daftar nama berkas"
 
 #: builtin/ls-tree.c:143
 msgid "use full path names"
-msgstr ""
+msgstr "gunakan nama berkas lengkap"
 
 #: builtin/ls-tree.c:145
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
+"daftar pohon keseluruhan; bukan hanya direktori saat ini (menyiratkan --full-"
+"name)"
 
 #. TRANSLATORS: keep <> in "<" mail ">" info.
 #: builtin/mailinfo.c:14
@@ -16744,7 +17338,7 @@ msgstr ""
 msgid "use headers in message's body"
 msgstr ""
 
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr ""
@@ -16804,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 ""
 
@@ -16858,192 +17456,188 @@ msgstr ""
 msgid "Merging %s with %s\n"
 msgstr ""
 
-#: builtin/merge.c:58
+#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opsi>] [<komit>...]"
 
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "tombol `m' butuh sebuah nilai"
 
-#: builtin/merge.c:146
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "opsi `%s' butuh sebuah nilai"
 
-#: builtin/merge.c:199
+#: 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:200
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Strategi yang tersedia:"
 
-#: builtin/merge.c:205
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Strategi kustom yang tersedia:"
 
-#: builtin/merge.c:256 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 "jangan perlihatkan diffstat pada akhir penggabungan"
 
-#: builtin/merge.c:259 builtin/pull.c:136
+#: 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:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(sinonim untuk --stat)"
 
-#: builtin/merge.c:262 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 ""
 "tambah (paling banyak <n>) entri dari log pendek ke pesan komit penggabungan"
 
-#: builtin/merge.c:265 builtin/pull.c:148
+#: 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:267 builtin/pull.c:151
+#: 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:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "sunting pesan sebelum komit"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "perbolehkan maju cepat (asali)"
 
-#: builtin/merge.c:273 builtin/pull.c:161
+#: 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:277 builtin/pull.c:164
+#: 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:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: 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:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "strategi penggabungan yang digunakan"
 
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "opsi=nilai"
 
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "opsi untuk strategi penggabungan yang dipilih"
 
-#: builtin/merge.c:283
+#: 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:290
+#: 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:292
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort tapi biarkan indeks dan pohon kerja"
 
-#: builtin/merge.c:294
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "lanjutkan penggabungan yang sedang berlangsung saat ini"
 
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "perbolehkan penggabungan riwayat yang tak terkait"
 
-#: builtin/merge.c:303
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "lewati hook pre-merge-commit dan commit-msg"
+msgstr "lewati kail pre-merge-commit dan commit-msg"
 
-#: builtin/merge.c:320
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "tidak dapat menjalankan stase."
 
-#: builtin/merge.c:325
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "stase gagal"
 
-#: builtin/merge.c:330
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "bukan objek valid: %s"
 
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree gagal"
 
-#: builtin/merge.c:400
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Sudah diperbarui. (tidak ada yang bisa dilumat)"
 
-#: builtin/merge.c:414
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Lumat komit -- tak perbarui HEAD\n"
 
-#: builtin/merge.c:464
+#: 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:602
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Untai branch.%s.mergeoptions jelek: %s"
 
-#: builtin/merge.c:728
+#: builtin/merge.c:732
 msgid "Not handling anything other than two heads merge."
 msgstr "Tak tangani apapun selain penggabungan dua kepala."
 
-#: builtin/merge.c:741
+#: builtin/merge.c:745
 #, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Opsi merge-recursive tak dikenal: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "opsi strategi tidak dikenal: -X%s"
 
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
+#: 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:812
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Tidak dapat membaca dari '%s'"
 
-#: builtin/merge.c:821
+#: 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:827
+#: 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"
@@ -17053,11 +17647,11 @@ msgstr ""
 "diperlukan, khususnya jika itu menggabungkan hulu terbarui ke cabang\n"
 "topik.\n"
 
-#: builtin/merge.c:832
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Pesan kosong membatalkan komit.\n"
 
-#: builtin/merge.c:835
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17066,72 +17660,72 @@ msgstr ""
 "Baris yang diawali dengan '%c' akan diabaikan, dan pesan kosong batalkan\n"
 "komit.\n"
 
-#: builtin/merge.c:888
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "Pesan komit kosong"
 
-#: builtin/merge.c:903
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Luar biasa.\n"
 
-#: builtin/merge.c:964
+#: 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:1003
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "Tidak ada cabang saat ini."
 
-#: builtin/merge.c:1005
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "Tidak ada remote untuk cabang saat ini."
 
-#: builtin/merge.c:1007
+#: 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:1012
+#: 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:1069
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Nilai jelek '%s' dalam lingkungan '%s'"
 
-#: builtin/merge.c:1172
+#: 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:1206
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "bukan sesuatu yang kami bisa gabungkan"
 
-#: builtin/merge.c:1316
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort harap tanpa argumen"
 
-#: builtin/merge.c:1320
+#: 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:1338
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit harap tanpa argumen"
 
-#: builtin/merge.c:1351
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue harap tanpa argumen"
 
-#: builtin/merge.c:1355
+#: 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:1371
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17139,7 +17733,7 @@ msgstr ""
 "Anda belum mengakhiri penggabungan Anda (MERGE_HEAD ada).\n"
 "Mohon komit perubahan Anda sebelum Anda gabungkan."
 
-#: builtin/merge.c:1378
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17147,89 +17741,77 @@ msgstr ""
 "Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada).\n"
 "Mohon komit perubahan Anda sebelum Anda gabungkan."
 
-#: builtin/merge.c:1381
+#: 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:1395
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Anda tidak dapat menggabungkan --squash dengan --no-ff."
-
-#: builtin/merge.c:1397
-msgid "You cannot combine --squash with --commit."
-msgstr "Anda tidak dapat menggabungkan --squash dengan --commit"
-
-#: builtin/merge.c:1413
+#: 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:1430
+#: builtin/merge.c:1438
 msgid "Squash commit into empty head not supported yet"
 msgstr "Lumat komit ke kepala kosong belum didukung"
 
-#: builtin/merge.c:1432
+#: 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:1437
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - bukan sesuatu yang kami bisa gabungkan"
 
-#: builtin/merge.c:1439
+#: 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:1520
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "menolak menggabungkan riwayat tak terkait"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Memperbarui %s..%s\n"
 
-#: builtin/merge.c:1585
+#: 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:1592
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "Tidak.\n"
 
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr "Tidak mungkin untuk maju cepat, batalkan."
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: 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:1655
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Mencoba strategi penggabungan %s...\n"
 
-#: builtin/merge.c:1707
+#: 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:1709
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Penggabungan dengan strategi %s gagal.\n"
 
-#: builtin/merge.c:1718
+#: builtin/merge.c:1735
 #, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Menggunakan %s untuk menyiapkan penyelesaian dengan tangan.\n"
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr "Menggunakan strategi %s untuk menyiapkan penyelesaian dengan tangan.\n"
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -17265,15 +17847,15 @@ msgstr ""
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr ""
 
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr ""
 
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
 msgid "tag on stdin did not refer to a valid object"
 msgstr ""
 
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr ""
 
@@ -17294,44 +17876,53 @@ msgid "allow creation of more than one tree"
 msgstr ""
 
 #: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
 msgstr ""
 
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
 msgid "git multi-pack-index [<options>] verify"
 msgstr ""
 
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr ""
 
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr ""
 
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
 msgid "preferred-pack"
 msgstr ""
 
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr ""
 
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr ""
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr ""
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr ""
+
+#: 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 ""
 
-#: builtin/multi-pack-index.c:180
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr ""
-
 #: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<opsi>] <sumber>... <tujuan>"
@@ -17359,117 +17950,117 @@ msgstr "paksa pindah/ganti nama bahkan jika target ada"
 msgid "skip move/rename errors"
 msgstr "lewati kesalahan pindah/ganti nama"
 
-#: builtin/mv.c:170
+#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "tujuan '%s' bukan direktori"
 
-#: builtin/mv.c:181
+#: builtin/mv.c:184
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Memeriksa penamaan ulang '%s' ke '%s'\n"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:190
 msgid "bad source"
 msgstr "sumber jelek"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "tidak dapat memindahkan direktori ke dirinya sendiri"
 
-#: builtin/mv.c:191
+#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "tidak dapat memindahkan direktori ke berkas"
 
-#: builtin/mv.c:200
+#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "direktori asal kosong"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "bukan dalam kontrol versi"
 
-#: builtin/mv.c:227
+#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "terkonflik"
 
-#: builtin/mv.c:230
+#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "tujuan ada"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "menimpa '%s'"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "Tidak dapat menimpa"
 
-#: builtin/mv.c:244
+#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "banyak asal untuk target yang sama"
 
-#: builtin/mv.c:246
+#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "direktori tujuan tidak ada"
 
-#: builtin/mv.c:253
+#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, source=%s, destination=%s"
 
-#: builtin/mv.c:274
+#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Mengganti nama %s ke %s\n"
 
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: 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 ""
 
@@ -17582,61 +18173,61 @@ 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:197
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr ""
 
-#: builtin/notes.c:206
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr ""
 
-#: builtin/notes.c:208
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr ""
 
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr ""
 
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr ""
 
-#: builtin/notes.c:265
+#: builtin/notes.c:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr ""
 
-#: builtin/notes.c:268
+#: builtin/notes.c:266
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr ""
 
-#: builtin/notes.c:309
+#: builtin/notes.c:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr ""
 
-#: builtin/notes.c:324
+#: builtin/notes.c:322
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr ""
@@ -17644,186 +18235,186 @@ msgstr ""
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr ""
 
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: 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:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr ""
 
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
 #, c-format
 msgid "no note found for object %s."
 msgstr ""
 
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr ""
 
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr ""
 
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
 msgid "reuse and edit specified note object"
 msgstr ""
 
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr ""
 
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr ""
 
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr ""
 
-#: builtin/notes.c:448
+#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
 
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr ""
 
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr ""
 
-#: builtin/notes.c:497
+#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr ""
 
-#: builtin/notes.c:499
+#: builtin/notes.c:497
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 
-#: builtin/notes.c:517
+#: builtin/notes.c:515
 msgid "too few arguments"
 msgstr ""
 
-#: builtin/notes.c:538
+#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
 
-#: builtin/notes.c:550
+#: builtin/notes.c:548
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr ""
 
-#: builtin/notes.c:603
+#: builtin/notes.c:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
 "Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
 msgstr ""
 
-#: builtin/notes.c:698
+#: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr ""
 
-#: builtin/notes.c:700
+#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr ""
 
-#: builtin/notes.c:702
+#: builtin/notes.c:700
 msgid "failed to remove 'git notes merge' worktree"
 msgstr ""
 
-#: builtin/notes.c:722
+#: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr ""
 
-#: builtin/notes.c:724
+#: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr ""
 
-#: builtin/notes.c:726
+#: builtin/notes.c:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr ""
 
-#: builtin/notes.c:739
+#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr ""
 
-#: builtin/notes.c:742
+#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr ""
 
-#: builtin/notes.c:768
+#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr ""
 
-#: builtin/notes.c:784
+#: builtin/notes.c:782
 msgid "General options"
 msgstr ""
 
-#: builtin/notes.c:786
+#: builtin/notes.c:784
 msgid "Merge options"
 msgstr ""
 
-#: builtin/notes.c:788
+#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr ""
 
-#: builtin/notes.c:790
+#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr ""
 
-#: builtin/notes.c:792
+#: builtin/notes.c:790
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 
-#: builtin/notes.c:794
+#: builtin/notes.c:792
 msgid "Aborting notes merge resolution"
 msgstr ""
 
-#: builtin/notes.c:796
+#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr ""
 
-#: builtin/notes.c:807
+#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr ""
 
-#: builtin/notes.c:812
+#: builtin/notes.c:810
 msgid "must specify a notes ref to merge"
 msgstr ""
 
-#: builtin/notes.c:836
+#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr ""
 
-#: builtin/notes.c:873
+#: builtin/notes.c:874
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr ""
 
-#: builtin/notes.c:876
+#: builtin/notes.c:878
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr ""
 
-#: builtin/notes.c:878
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -17831,438 +18422,439 @@ msgid ""
 "abort'.\n"
 msgstr ""
 
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
 
-#: builtin/notes.c:900
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr ""
 
-#: builtin/notes.c:912
+#: builtin/notes.c:914
 msgid "attempt to remove non-existent note is not an error"
 msgstr ""
 
-#: builtin/notes.c:915
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr ""
 
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr ""
 
-#: builtin/notes.c:955
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr ""
 
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr ""
 
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr ""
 
-#: builtin/notes.c:1034 builtin/stash.c:1739
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr ""
 
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
 "pack %s"
 msgstr ""
 
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:459
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:590
+#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr ""
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr ""
 
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1160
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
 msgid "Writing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr ""
 
-#: builtin/pack-objects.c:1141
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr ""
+
+#: builtin/pack-objects.c:1294
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:1383
+#: builtin/pack-objects.c:1536
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 
-#: builtin/pack-objects.c:1831
+#: builtin/pack-objects.c:1984
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:1840
+#: builtin/pack-objects.c:1993
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2121
+#: builtin/pack-objects.c:2274
 msgid "Counting objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2266
+#: builtin/pack-objects.c:2439
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
-#: builtin/pack-objects.c:2362
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
 #, c-format
 msgid "object %s cannot be read"
 msgstr ""
 
-#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 
-#: builtin/pack-objects.c:2376
+#: builtin/pack-objects.c:2549
 msgid "suboptimal pack - out of memory"
 msgstr ""
 
-#: builtin/pack-objects.c:2691
+#: builtin/pack-objects.c:2864
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr ""
 
-#: builtin/pack-objects.c:2830
+#: builtin/pack-objects.c:3003
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:3089
 msgid "Compressing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:3095
 msgid "inconsistency with delta count"
 msgstr ""
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3174
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
 "hash> <uri>' (got '%s')"
 msgstr ""
 
-#: builtin/pack-objects.c:3004
+#: builtin/pack-objects.c:3177
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
 msgstr ""
 
-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3212
 #, c-format
 msgid "could not get type of object %s in pack %s"
 msgstr ""
 
-#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
 #, c-format
 msgid "could not find pack '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3408
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:3224
+#: builtin/pack-objects.c:3414
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:3322
+#: builtin/pack-objects.c:3507
 msgid "invalid value for --missing"
 msgstr ""
 
-#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
 msgid "cannot open pack index"
 msgstr ""
 
-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3541
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr ""
 
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3627
 msgid "unable to force loose object"
 msgstr ""
 
-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3757
 #, c-format
 msgid "not a rev '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3631
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3788
 msgid "unable to add recent objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3712
+#: builtin/pack-objects.c:3841
 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 
-#: builtin/pack-objects.c:3716
+#: builtin/pack-objects.c:3845
 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3755
+#: builtin/pack-objects.c:3884
 msgid "<version>[,<offset>]"
 msgstr ""
 
-#: builtin/pack-objects.c:3756
+#: builtin/pack-objects.c:3885
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 
-#: builtin/pack-objects.c:3759
+#: builtin/pack-objects.c:3888
 msgid "maximum size of each output pack file"
 msgstr ""
 
-#: builtin/pack-objects.c:3761
+#: builtin/pack-objects.c:3890
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c:3892
 msgid "ignore packed objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3765
+#: builtin/pack-objects.c:3894
 msgid "limit pack window by objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3767
+#: builtin/pack-objects.c:3896
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 
-#: builtin/pack-objects.c:3769
+#: builtin/pack-objects.c:3898
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 
-#: builtin/pack-objects.c:3771
+#: builtin/pack-objects.c:3900
 msgid "reuse existing deltas"
 msgstr ""
 
-#: builtin/pack-objects.c:3773
+#: builtin/pack-objects.c:3902
 msgid "reuse existing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3775
+#: builtin/pack-objects.c:3904
 msgid "use OFS_DELTA objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3777
+#: builtin/pack-objects.c:3906
 msgid "use threads when searching for best delta matches"
 msgstr ""
 
-#: builtin/pack-objects.c:3779
+#: builtin/pack-objects.c:3908
 msgid "do not create an empty pack output"
 msgstr ""
 
-#: builtin/pack-objects.c:3781
+#: builtin/pack-objects.c:3910
 msgid "read revision arguments from standard input"
 msgstr ""
 
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:3912
 msgid "limit the objects to those that are not yet packed"
 msgstr ""
 
-#: builtin/pack-objects.c:3786
+#: builtin/pack-objects.c:3915
 msgid "include objects reachable from any reference"
 msgstr ""
 
-#: builtin/pack-objects.c:3789
+#: builtin/pack-objects.c:3918
 msgid "include objects referred by reflog entries"
 msgstr ""
 
-#: builtin/pack-objects.c:3792
+#: builtin/pack-objects.c:3921
 msgid "include objects referred to by the index"
 msgstr ""
 
-#: builtin/pack-objects.c:3795
+#: builtin/pack-objects.c:3924
 msgid "read packs from stdin"
 msgstr ""
 
-#: builtin/pack-objects.c:3797
+#: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
 msgstr ""
 
-#: builtin/pack-objects.c:3799
+#: builtin/pack-objects.c:3928
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 
-#: builtin/pack-objects.c:3801
+#: builtin/pack-objects.c:3930
 msgid "keep unreachable objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3803
+#: builtin/pack-objects.c:3932
 msgid "pack loose unreachable objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3805
+#: builtin/pack-objects.c:3934
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 
-#: builtin/pack-objects.c:3808
+#: builtin/pack-objects.c:3937
 msgid "use the sparse reachability algorithm"
 msgstr ""
 
-#: builtin/pack-objects.c:3810
+#: builtin/pack-objects.c:3939
 msgid "create thin packs"
 msgstr ""
 
-#: builtin/pack-objects.c:3812
+#: builtin/pack-objects.c:3941
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 
-#: builtin/pack-objects.c:3814
+#: builtin/pack-objects.c:3943
 msgid "ignore packs that have companion .keep file"
 msgstr ""
 
-#: builtin/pack-objects.c:3816
+#: builtin/pack-objects.c:3945
 msgid "ignore this pack"
 msgstr ""
 
-#: builtin/pack-objects.c:3818
+#: builtin/pack-objects.c:3947
 msgid "pack compression level"
 msgstr ""
 
-#: builtin/pack-objects.c:3820
+#: builtin/pack-objects.c:3949
 msgid "do not hide commits by grafts"
 msgstr ""
 
-#: builtin/pack-objects.c:3822
+#: builtin/pack-objects.c:3951
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3824
+#: builtin/pack-objects.c:3953
 msgid "write a bitmap index together with the pack index"
 msgstr ""
 
-#: builtin/pack-objects.c:3828
+#: builtin/pack-objects.c:3957
 msgid "write a bitmap index if possible"
 msgstr ""
 
-#: builtin/pack-objects.c:3832
+#: builtin/pack-objects.c:3961
 msgid "handling for missing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3835
+#: builtin/pack-objects.c:3964
 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 
-#: builtin/pack-objects.c:3837
+#: builtin/pack-objects.c:3966
 msgid "respect islands during delta compression"
 msgstr ""
 
-#: builtin/pack-objects.c:3839
+#: builtin/pack-objects.c:3968
 msgid "protocol"
 msgstr ""
 
-#: builtin/pack-objects.c:3840
+#: builtin/pack-objects.c:3969
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr ""
 
-#: builtin/pack-objects.c:3873
+#: builtin/pack-objects.c:4002
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr ""
 
-#: builtin/pack-objects.c:3878
+#: builtin/pack-objects.c:4007
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr ""
 
-#: builtin/pack-objects.c:3934
+#: builtin/pack-objects.c:4063
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 
-#: builtin/pack-objects.c:3936
+#: builtin/pack-objects.c:4065
 msgid "minimum pack size limit is 1 MiB"
 msgstr ""
 
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:4070
 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 
-#: builtin/pack-objects.c:3944
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr ""
-
-#: builtin/pack-objects.c:3950
+#: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr ""
 
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:4081
 msgid "cannot use --filter with --stdin-packs"
 msgstr ""
 
-#: builtin/pack-objects.c:3956
+#: builtin/pack-objects.c:4085
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr ""
 
-#: builtin/pack-objects.c:4015
+#: builtin/pack-objects.c:4144
 msgid "Enumerating objects"
 msgstr ""
 
-#: builtin/pack-objects.c:4052
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -18298,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:152
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 
@@ -18323,44 +18915,48 @@ msgstr "Nilai tidak valid untuk %s: %s"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<opsi>] [<repositori> [<spek referensi>]]"
 
-#: builtin/pull.c:123
+#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
 msgstr "kontrol pengambilan rekursif submodul"
 
-#: builtin/pull.c:127
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Opsi yang berkaitan dengan penggabungan"
 
-#: builtin/pull.c:130
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "masukkan perubahan dengan pendasaran ulang daripada penggabungan"
 
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "perbolehkan maju cepat"
 
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+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:340
 msgid "automatically stash/stash pop before and after"
 msgstr "stash/stash pop otomatis sebelum dan sesudah"
 
-#: builtin/pull.c:183
+#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "Opsi yang berkaitan dengan pengambilan"
 
-#: builtin/pull.c:193
+#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "paksa timpa cabang lokal"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr "nomor submodul ditarik dalam paralel"
 
-#: builtin/pull.c:317
+#: builtin/pull.c:321
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Nilai tidak valid untuk 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."
@@ -18368,14 +18964,14 @@ msgstr ""
 "Tidak ada kandidat untuk didasarkan ulang diantara referensi yang baru saja "
 "Anda ambil."
 
-#: builtin/pull.c:447
+#: builtin/pull.c:451
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Tidak ada kandidat untuk digabungkan diantara referensi yang baru sajaAnda "
 "ambil."
 
-#: 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."
@@ -18383,7 +18979,7 @@ msgstr ""
 "Umumnya itu berarti Anda memberikan spek referensi wildcard yang tidak\n"
 "cocok pada ujung remote."
 
-#: builtin/pull.c:451
+#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -18394,43 +18990,44 @@ msgstr ""
 "satu cabang. Oleh karena ini bukan remote terkonfigurasi asali untuk\n"
 "cabang Anda saat ini, Anda harus sebutkan satu cabang pada baris perintah."
 
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
 msgid "You are not currently on a branch."
 msgstr "Anda tidak berada pada sebuah cabang."
 
-#: 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 "Mohon sebutkan cabang mana yang Anda ingin didasarkan ulang."
 
-#: 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 "Mohon sebutkan cabang mana yang Anda ingin digabungkan."
 
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "Lihat git-pull(1) untuk selengkapnya."
 
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
 msgid "<remote>"
 msgstr "<remote>"
 
-#: 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 "<cabang>"
 
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
 msgid "There is no tracking information for the current branch."
 msgstr "Tidak ada informasi pelacakan untuk cabang saat ini."
 
-#: 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 ""
 "Jika Anda ingin menyetel informasi pelacakan untuk cabang ini Anda bisa "
 "melakukannya dengan:"
 
-#: builtin/pull.c:485
+#: builtin/pull.c:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -18439,22 +19036,22 @@ msgstr ""
 "Konfigurasi Anda menyebutkan untuk menggabungkan dengan referensi '%s'\n"
 "dari remote, tapi tidak ada referensi seperti itu yang diambil."
 
-#: builtin/pull.c:596
+#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "Tidak dapat mengakses komit %s"
 
-#: builtin/pull.c:902
+#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "mengabaikan --verify-signatures untuk pendasaran ulang"
 
-#: builtin/pull.c:930
+#: builtin/pull.c:969
 msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"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"
@@ -18464,34 +19061,36 @@ msgid ""
 "or --ff-only on the command line to override the configured default per\n"
 "invocation.\n"
 msgstr ""
-"Menarik tanpa menyebutkan cara merujukkan cabang yang berlainan tidak\n"
-"disarankan. Anda dapat mematikan pesan ini dengan menjalankan salah\n"
-"satu perintah berikut sebelum penarikan berikutnya:\n"
+"Anda punya cabang-cabang yang berlainan dan perlu menyebutkan cara\n"
+"merujukkannya.\n"
+"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:991
+#: 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:995
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "tarik dengan pendasaran ulang"
 
-#: builtin/pull.c:996
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "mohon komit atau stase itu."
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -18501,7 +19100,7 @@ msgstr ""
 "fetch memperbarui kepala cabang saat ini.\n"
 "memajukan-cepat pohon kerja Anda dari komit %s."
 
-#: builtin/pull.c:1027
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -18518,15 +19117,23 @@ msgstr ""
 "$ git reset --hard\n"
 "untuk memulihkan."
 
-#: builtin/pull.c:1042
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Tidak dapat menggabungkan banyak cabang ke kepala kosong."
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "Tidak dapat mendasarkan ulang pada banyak cabang."
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1104
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Tidak dapat maju cepat ke banyak cabang."
+
+#: builtin/pull.c:1119
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Perlu sebutkan cara merujukkan cabang yang berlainan."
+
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "tidak dapat mendasarkan ulang dengan modifikasi submodul yang terekam lokal."
@@ -18592,7 +19199,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nama-cabang-remote>\n"
 
-#: builtin/push.c:194
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -18605,12 +19212,19 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:202
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "Cabang saat ini %s punya banyak cabang hulu, tolak dorong. "
 
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Anda tidak sebutkan spek referensi apapun untuk didorong, dan push.default "
+"yaitu \"nothing\""
+
+#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -18621,14 +19235,7 @@ msgstr ""
 "cabang Anda saat ini '%s', tanpa beri tahu saya apa yang harus\n"
 "didorong untuk perbarui cabang remote yang mana."
 
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"Anda tidak sebutkan spek referensi apapun untuk didorong, dan push.default "
-"yaitu \"nothing\""
-
-#: builtin/push.c:267
+#: builtin/push.c:258
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -18640,7 +19247,7 @@ msgstr ""
 "'git pull') sebelum dorong lagi.\n"
 "Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
 
-#: builtin/push.c:273
+#: builtin/push.c:264
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -18652,7 +19259,7 @@ msgstr ""
 "remote (seperti 'git pull') sebelum dorong lagi.\n"
 "Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
 
-#: builtin/push.c:279
+#: builtin/push.c:270
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -18666,11 +19273,11 @@ msgstr ""
 "perubahan remote (seperti 'git pull') sebelum dorong lagi.\n"
 "Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
 
-#: builtin/push.c:286
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "Pembaruan ditolak karena tag sudah ada di remote."
 
-#: builtin/push.c:289
+#: builtin/push.c:280
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -18680,7 +19287,7 @@ msgstr ""
 "non komit atau memperbarui referensi remote agar itu memnunjuk ke\n"
 "objek non komit, tanpa menggunakan opsi '--force'.\n"
 
-#: builtin/push.c:294
+#: builtin/push.c:285
 msgid ""
 "Updates were rejected because the tip of the remote-tracking\n"
 "branch has been updated since the last checkout. You may want\n"
@@ -18692,103 +19299,99 @@ msgstr ""
 "integrasikan perubahan tersebut ke lokal (seperti 'git pull...')\n"
 "sebelum memaksa pembaruan.\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Mendorong ke %s\n"
 
-#: builtin/push.c:371
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "gagal dorong beberapa referensi ke '%s'"
 
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "repositori"
 
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
 msgstr "dorong semua referensi"
 
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr "cermin semua referensi"
 
-#: builtin/push.c:557
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "hapus referensi"
 
-#: builtin/push.c:558
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "dorong tag (tidak dapat digunakan dengan --all atau --mirror)"
 
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "paksa pembaruan"
 
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "<nama referensi>:<harapan>"
 
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
 msgid "require old value of ref to be at this value"
 msgstr "memerlukan nilai lama referensi berada pada nilai saat ini"
 
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
 msgid "require remote updates to be integrated locally"
 msgstr "memerlukan pembaruan remote diintegrasikan ke lokal"
 
-#: builtin/push.c:569
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "kontrol dorong rekursif submodul"
 
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
 msgid "use thin pack"
 msgstr "gunakan paket tipis"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "program terima paket"
 
-#: builtin/push.c:573
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "setel hulu untuk git pull/status"
 
-#: builtin/push.c:576
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "buang referensi terhapus lokal"
 
-#: builtin/push.c:578
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
-msgstr "lewati kait pra-dorong"
+msgstr "lewati kail pra-dorong"
 
-#: builtin/push.c:579
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "dorong tag yang hilang tapi relevan"
 
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
 msgstr "Tandatangan GPG dorong"
 
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
 msgid "request atomic transaction on remote side"
 msgstr "minta transaksi atomik pada sisi remote"
 
-#: builtin/push.c:601
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete tidak kompatibel dengan --all, --mirror dan --tags "
-
-#: builtin/push.c:603
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete tidak masuk akal tanpa referensi"
 
-#: builtin/push.c:623
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "repositori jelek '%s'"
 
-#: builtin/push.c:624
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -18810,27 +19413,15 @@ msgstr ""
 "\n"
 "    git push <nama>\n"
 
-#: builtin/push.c:639
-msgid "--all and --tags are incompatible"
-msgstr "--all dan --tags tidak kompatibel"
-
-#: builtin/push.c:641
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all tidak dapat digabung dengan spek referensi"
 
-#: builtin/push.c:645
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror dan --tags tidak kompatibel"
-
-#: builtin/push.c:647
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror tidak dapat digabungkan dengan spek referensi"
 
-#: builtin/push.c:650
-msgid "--all and --mirror are incompatible"
-msgstr "--all dan --mirror tidak kompatibel"
-
-#: builtin/push.c:657
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "opsi dorong harus tidak ada karakter baris baru"
 
@@ -18882,81 +19473,86 @@ msgstr ""
 #: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<prefiks>) [-u | -i]] [--no-sparse-checkout] [--index-"
+"output=<berkas>] (--empty | <mirip-pohon 1> [<mirip-pohon 2> <mirip-pohon "
+"3>])"
 
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
-msgstr ""
+msgstr "tulis indeks yang dihasilkan ke <berkas>"
 
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
 msgid "only empty the index"
-msgstr ""
+msgstr "hanya kosongkan indeks"
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
 msgid "Merging"
-msgstr ""
+msgstr "Menggabungkan"
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
 msgid "perform a merge in addition to a read"
-msgstr ""
+msgstr "lakukan penggabungan selain pembacaan"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
 msgid "3-way merge if no file level merging required"
 msgstr ""
+"penggabungan 3 arah jika tidak ada penggabungan level berkas yang dibutuhkan"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
 msgid "3-way merge in presence of adds and removes"
-msgstr ""
+msgstr "penggabungan 3 arah dengan kehadiran penambahan dan penghapusan"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
 msgid "same as -m, but discard unmerged entries"
-msgstr ""
+msgstr "sama seperti -m, tapi buang entri tak tergabung"
 
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
-msgstr ""
+msgstr "<subdirektori>/"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
 msgid "read the tree into the index under <subdirectory>/"
-msgstr ""
+msgstr "baca pohon ke dalam indeks pada <subdirektori>/"
 
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
 msgid "update working tree with merge result"
-msgstr ""
+msgstr "perbarui pohon kerja dengan hasil penggabungan"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
 msgid "gitignore"
-msgstr ""
+msgstr "gitignore"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
 msgid "allow explicitly ignored files to be overwritten"
-msgstr ""
+msgstr "perbolehkan berkas yang diabaikan secara eksplisit untuk ditimpa"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
 msgid "don't check the working tree after merging"
-msgstr ""
+msgstr "jangan periksa pohon kerja setelah penggabungan"
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
 msgid "don't update the index or the work tree"
-msgstr ""
+msgstr "jangan perbarui indeks atau pohon kerja"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
 msgid "skip applying sparse checkout filter"
-msgstr ""
+msgstr "lewatkan penerapan saringan checkout tipis"
 
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
-msgstr ""
+msgstr "nirkutukan unpack-trees"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
-msgstr ""
+msgstr "matikan pesan umpan balik"
 
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
 msgid "You need to resolve your current index first"
-msgstr ""
+msgstr "Anda perlu menguraikan indeks Anda saat ini dulu"
 
 #: builtin/rebase.c:35
 msgid ""
@@ -18977,193 +19573,44 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "daftar todo tidak dapat digunakan: '%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
 #, c-format
 msgid "could not create temporary %s"
 msgstr "tidak dapat membuat %s sementara"
 
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
 msgid "could not mark as interactive"
 msgstr "tidak dapat menandai sebagai interaktif"
 
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
 msgid "could not generate todo list"
 msgstr "tidak dapat membuat daftar todo"
 
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "basis komit harus diberikan dengan --upstream atau --onto"
 
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<opsi>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "simpan komit yang dimulai kosong"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "perbolehkan komit dengan pesan kosong"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "dasarkan ulang komit penggabungan"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "simpan titik cabang sepupu asal "
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "pindahkan komit yang diawali dengan squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "tandatangani komit"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "perlihatkan diffstat apa yang berubah di hulu"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "lanjutkan pendasaran ulang"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "lewatkan komit"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "sunting daftar todo"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "perlihatkan tambalan saat ini"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "pendekkan id komit dalam daftar todo"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "jabarkan id komit dalam daftar todo"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "periksa daftar todo"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "susun ulang baris fixup/squash"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "masukkan perintah exec ke dalam daftar todo"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "ke"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "batasi revisi"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "lumat ke"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "komit hulu"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "nama kepala"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "strategi pendasaran"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "opsi strategi"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "switch-to"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "cabang atau komit untuk di-checkout"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "nama ke"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "perintah untuk dijalankan"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "jadwal ulang otomatis `exec` apa saja yang gagal"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins tidak ada efek tanpa --rebase-merges"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s butuh tulang belakang penggabungan"
 
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "tidak dapat mendapatkan 'ke': '%s'"
 
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head tidak valid: '%s'"
 
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "abaikan allow_rerere_autoupdate yang tak valid: '%s'"
 
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19178,7 +19625,7 @@ msgstr ""
 "Untuk membatalkan dan kembali ke kondisi sebelum \"git rebase\",jalankan "
 "\"git rebase --abort\"."
 
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
 #, c-format
 msgid ""
 "\n"
@@ -19197,7 +19644,7 @@ msgstr ""
 "\n"
 "Hasilnya git tidak dapat mendasarkan ulang itu."
 
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -19206,7 +19653,7 @@ msgstr ""
 "tipe kosong tak dikenali '%s'; nilai yang valid adalah \"drop\", \"keep\", "
 "dan \"ask\"."
 
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -19223,7 +19670,7 @@ msgstr ""
 "    git rebase '<cabang>'.\n"
 "\n"
 
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -19236,183 +19683,181 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<cabang> %s\n"
 "\n"
 
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
 msgid "exec commands cannot contain newlines"
 msgstr "perintah exec tidak dapat berisi baris baru"
 
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
 msgid "empty exec command"
 msgstr "perintah exec kosong"
 
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
 msgid "rebase onto given branch instead of upstream"
 msgstr "dasarkan ulang kepada cabang yang diberikan daripada hulu"
 
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "gunakan merge-base hulu dan cabang sebagai dasar saat ini"
 
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
 msgid "allow pre-rebase hook to run"
-msgstr "perbolehkan hook pre-rebase untuk dijalankan"
+msgstr "perbolehkan kail pre-rebase untuk dijalankan"
 
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
 msgid "be quiet. implies --no-stat"
 msgstr "diam. menyiratkan --no-stat"
 
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "perlihatkan diffstat apa yang berubah di hulu"
+
+#: builtin/rebase.c:1035
 msgid "do not show diffstat of what changed upstream"
 msgstr "jangan perlihatkan diffstat apa yang berubah di hulu"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "tambahkan trailer Signed-off-by ke setiap komit"
 
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
 msgid "make committer date match author date"
 msgstr "jadikan tanggal pengkomit sama dengan tanggal pengarang"
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
 msgid "ignore author date and use current date"
 msgstr "abaikan tanggal pengarang dan gunakan tanggal saat ini"
 
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
 msgid "synonym of --reset-author-date"
 msgstr "sinonim dari --reset-author-date"
 
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
 msgid "passed to 'git apply'"
 msgstr "lewatkan ke 'git apply'"
 
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
 msgid "ignore changes in whitespace"
 msgstr "abaikan perubahan spasi"
 
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "petik ceri semua komit, bahkan jika tak berubah"
 
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
 msgid "continue"
 msgstr "lanjutkan"
 
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
 msgid "skip current patch and continue"
 msgstr "lewatkan tambalan saat ini dan lanjutkan"
 
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
 msgid "abort and check out the original branch"
 msgstr "hentikan dan check out cabang asli"
 
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
 msgid "abort but keep HEAD where it is"
 msgstr "hentikan tapi simpan HEAD dimana itu berada"
 
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
 msgid "edit the todo list during an interactive rebase"
 msgstr "sunting daftar todo selama pendasaran ulang interaktif"
 
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
 msgid "show the patch file being applied or merged"
 msgstr "perlihatkan berkas tambalan yang sedang diterapkan atau digabungkan"
 
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
 msgid "use apply strategies to rebase"
 msgstr "gunakan strategi penerapan ke pendasaran ulang"
 
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
 msgid "use merging strategies to rebase"
 msgstr "gunakan strategi penggabungan ke pendasaran ulang"
 
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
 msgid "let the user edit the list of commits to rebase"
 msgstr "biarkan pengguna menyunting daftar komit untuk didasarkan ulang"
 
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "(USANG) coba buat ulang penggabungan daripada abaikan itu"
 
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
 msgid "how to handle commits that become empty"
 msgstr "bagaimana cara menangani komit yang menjadi kosong"
 
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "simpan komit yang dimulai kosong"
+
+#: builtin/rebase.c:1097
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "pindahakan komit yang diawali dengan squash!/fixup! di bawah -i"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
 msgid "add exec lines after each commit of the editable list"
 msgstr ""
 "tambahkan baris exec setelah setiap komit dari daftar yang bisa disunting"
 
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
 msgid "allow rebasing commits with empty messages"
 msgstr "perbolehkan mendasarkan ulang komit dengan pesan kosong"
 
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
 msgid "try to rebase merges instead of skipping them"
 msgstr "coba mendasarkan ulang penggabungan daripada melewatkan itu"
 
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "gunakan 'merge-base --fork-point' untuk menyaring hulu"
 
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
 msgid "use the given merge strategy"
 msgstr "gunakan strategi penggabungan yang diberikan"
 
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
 msgid "option"
 msgstr "opsi"
 
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
 msgid "pass the argument through to the merge strategy"
 msgstr "lewatkan argumen ke strategi penggabungan"
 
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "dasarkan ulang semua komit yang bisa dicapai hingga ke akar"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "jadwal ulang otomatis `exec` apa saja yang gagal"
+
+#: builtin/rebase.c:1128
 msgid "apply all changes, even those already present upstream"
 msgstr "terapkan semua perubahan, bahkan yang sudah ada di hulu"
 
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Sepertinya 'git am' sedang berjalan. Tidak dapat mendasarkan ulang"
 
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges usang. Gunakan --rebase-merges sebagai gantinya."
-
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "tidak dapat menggabungkan '--keep-base' dengan '--onto'"
-
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "tidak dapat menggabungkan '--keep-base' dengan '--root'"
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges digantikan oleh --rebase-merges"
 
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "tidak dapat menggabungkan '--root' dengan '--fork-point'"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Tidak ada pendasaran ulang yang sedang berjalan?"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "Aksi --edit-todo hanya dapat digunakan selama pendasaran ulang interaktif."
 
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Tidak dapat membaca HEAD"
 
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -19420,16 +19865,16 @@ msgstr ""
 "Anda harus menyunting semua konflik penggabungan lalu\n"
 "tandai itu sebagai terselesaikan menggunakan git add"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
 msgid "could not discard worktree changes"
 msgstr "tidak dapat menyingkirkan perubahan pohon kerja"
 
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
 #, c-format
 msgid "could not move back to %s"
 msgstr "tidak dapt memindahkan kembali ke %s"
 
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -19450,144 +19895,133 @@ msgstr ""
 "dan jalankan saya lagi. Saya berhenti seandainya Anda masih punya\n"
 "sesuatu yang berharga di sana.\n"
 
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
 msgstr "tombol `C' harap nilai numerik"
 
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Mode tidak dikenal: %s"
 
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy butuh --merge atau --interactive"
 
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr "tidak dapat menggabungkan opsi penerapan dengan opsi penggabungan"
+#: builtin/rebase.c:1463
+msgid "apply options and merge options cannot be used together"
+msgstr "opsi apply dan opsi merge tidak dapat digunakan bersamaan"
 
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Tulang belakang pendasaran ulang tidak dikenal: %s"
 
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec butuh --exec atau --interactive"
 
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "tidak dapat menggabungkan '--preserve-merges' dengan '--rebase-merges'"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"error: tidak dapat menggabungkan '--preserve-merges' dengan '--reschedule-"
-"failed-exec'"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "hulu tidak valid '%s'"
 
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
 msgid "Could not create new root commit"
 msgstr "tidak dapat membuat komit akar baru"
 
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "'%s': butuh tepatnya satu dasar penggabungan dengan cabang"
 
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': butuh tepatnya satu dasar penggabungan"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "Tidak menunjuk pada komit yang valid '%s'"
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
 #, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "fatal: tidak ada cabang/komit seperti '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "tidak ada cabang/komit seperti '%s'"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2415
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "Tidak ada referensi seperti: %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
 msgid "Could not resolve HEAD to a revision"
 msgstr "Tidak dapat menguraikan HEAD ke sebuah revisi"
 
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
 msgid "Please commit or stash them."
 msgstr "Mohon komit atau stase itu."
 
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
 #, c-format
 msgid "could not switch to %s"
 msgstr "tidak dapat mengganti ke %s"
 
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
 msgid "HEAD is up to date."
 msgstr "HEAD terbaru."
 
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Cabang saat ini %s terbaru.\n"
 
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD terbaru, pendasaran ulang dipaksa."
 
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Cabang saat ini %s terbaru, pendasaran ulang dipaksa.\n"
 
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
 msgid "The pre-rebase hook refused to rebase."
-msgstr "Hook pre-rebase menolak mendasarkan ulang."
+msgstr "Kail pre-rebase menolak mendasarkan ulang."
 
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Perubahan unuk %s:\n"
 
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Perubahan dari %s ke %s:\n"
 
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "Pertama, memutar ulang kepala untuk memainkan ulang karya Anda diatas "
 "itu...\n"
 
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
 msgid "Could not detach HEAD"
 msgstr "Tidak dapat melepas HEAD"
 
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Maju-cepat %s ke %s.\n"
 
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
-msgstr ""
+msgstr "git receive-pack <direktori git>"
 
-#: builtin/receive-pack.c:1276
+#: 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"
@@ -19603,8 +20037,20 @@ msgid ""
 "To squelch this message and still keep the default behaviour, set\n"
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
+"Secara asali, memperbarui cabang saat ini di dalam repositori non-bare\n"
+"tidak diperbolehkan, karena akan membuat indeks dan pohon kerja inkonsisten\n"
+"dengan yang Anda dorong, dan akan memerlukan 'git reset --hard' untuk\n"
+"mencocokkan pohon kerja dengan HEAD.\n"
+"\n"
+"Anda dapat menyetel variabel konfigurasi 'receive.denyCurrentBranch' ke\n"
+"'ignore' atau 'warn' di repositori remote untuk memperbolehkan dorong ke\n"
+"cabang saat itu; tetapi tidak disarankan kecuali Anda dapat memperbarui\n"
+"pohon kerjanya agar cocok dengan apa yang Anda dorong dengan cara lain.\n"
+"\n"
+"Untuk mematikan pesan ini dan tetap menjaga kebiasaan asali, setel\n"
+"variabel konfigurasi 'receive.denyCurrentBranch' ke 'refuse'."
 
-#: builtin/receive-pack.c:1296
+#: 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"
@@ -19615,14 +20061,22 @@ msgid ""
 "\n"
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
+"Secara asali, menghapus cabang saat ini tidak diperbolehkan, karena\n"
+"'git clone' selanjutnya tidak berujung pada berkas apapun ter-checkout,\n"
+"dan mengakibatkan kebingungan.\n"
+"Anda dapat menyetel variabel konfigurasi 'receive.denyDeleteCurrent' ke\n"
+"'warn' atau 'ignore' di dalam repositori remote untuk memperbolehkan\n"
+"menghapus cabang saat ini, dengan atau tanpa pesan peringatan.\n"
+"\n"
+"Untuk mematikan pesan ini, Anda dapat menyetelnya ke 'refuse'."
 
-#: builtin/receive-pack.c:2479
+#: builtin/receive-pack.c:2474
 msgid "quiet"
-msgstr ""
+msgstr "diam"
 
-#: builtin/receive-pack.c:2493
-msgid "You must specify a directory."
-msgstr ""
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "Anda harus menyebutkan sebuah direktori"
 
 #: builtin/reflog.c:17
 msgid ""
@@ -19630,54 +20084,59 @@ msgid ""
 "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
 "<refs>..."
 msgstr ""
+"git reflog expire [--expire=<waktu>] [--expire-unreachable=<waktu>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<referensi>..."
 
 #: builtin/reflog.c:22
 msgid ""
 "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
 "<refs>..."
 msgstr ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<referensi>..."
 
 #: builtin/reflog.c:25
 msgid "git reflog exists <ref>"
-msgstr ""
+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 ""
+msgstr "'%s' bukan stempel waktu valid"
 
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
 #, c-format
 msgid "Marking reachable objects..."
-msgstr ""
+msgstr "Menandai objek yang bisa dicapai..."
 
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
 #, c-format
 msgid "%s points nowhere!"
-msgstr ""
+msgstr "%s tidak menunjuk ke apapun!"
 
-#: builtin/reflog.c:699
+#: builtin/reflog.c:731
 msgid "no reflog specified to delete"
-msgstr ""
+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 ""
+msgstr "bukan sebuah log referensi: %s"
 
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
 #, c-format
 msgid "no reflog for '%s'"
-msgstr ""
+msgstr "tidak ada log referensi untuk '%s'"
 
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
 #, c-format
 msgid "invalid ref format: %s"
-msgstr ""
+msgstr "format referensi tidak valid: %s"
 
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
 msgid "git reflog [ show | expire | delete | exists ]"
-msgstr ""
+msgstr "git reflog [ show | expire | delete | exists ]"
 
 #: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
@@ -19766,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"
@@ -19811,7 +20275,7 @@ msgstr "menyebutkan cabang master tidak masuk akal dengan --mirror"
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "menyebutkan cabang untuk dilacak hanya masuk akal dengan cermin ambil"
 
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
 #, c-format
 msgid "remote %s already exists."
 msgstr "remote %s sudah ada"
@@ -19821,25 +20285,30 @@ msgstr "remote %s sudah ada"
 msgid "Could not setup master '%s'"
 msgstr "Tidak dapat mengatur master '%s'"
 
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr ""
+
+#: builtin/remote.c:366
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Tidak dapat mendapatkan peta pengambilan untuk spek referensi %s"
 
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
 msgid "(matching)"
 msgstr "(sepadan)"
 
-#: builtin/remote.c:466
+#: builtin/remote.c:472
 msgid "(delete)"
 msgstr "(hapus)"
 
-#: builtin/remote.c:655
+#: builtin/remote.c:660
 #, c-format
 msgid "could not set '%s'"
 msgstr "tidak dapat menyetel '%s'"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:665
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -19850,17 +20319,17 @@ msgstr ""
 "\t%s:%d\n"
 "sekarang menamai remote yang tiada '%s'"
 
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Tidak ada remote seperti: '%s'"
 
-#: builtin/remote.c:710
+#: builtin/remote.c:715
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Tidak dapat menamai ulang bagian konfigurasi '%s' ke '%s'"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:735
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -19871,17 +20340,17 @@ msgstr ""
 "\t%s\n"
 "\tMohon perbarui konfigurasi secara manual bila diperlukan."
 
-#: builtin/remote.c:770
+#: builtin/remote.c:775
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "menghapus '%s' gagal"
 
-#: builtin/remote.c:804
+#: builtin/remote.c:809
 #, c-format
 msgid "creating '%s' failed"
 msgstr "membuat '%s' gagal"
 
-#: builtin/remote.c:882
+#: builtin/remote.c:887
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -19895,120 +20364,120 @@ msgstr[1] ""
 "Catatan: Beberapa cabang diluar hierarki refs/remotes tidak dihapus;\n"
 "untuk menghapus itu, gunakan:"
 
-#: builtin/remote.c:896
+#: builtin/remote.c:901
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Tidak dapat menghapus bagian konfigurasi '%s'"
 
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " baru (pengambilan berikutnya akan simpan di remotes/%s)"
 
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
 msgid " tracked"
 msgstr " dilacak"
 
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " basi (gunakan 'git remote prune' untuk hapus)"
 
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 "branch.%s.merge tidak valid; tidak dapat mendasarkan ulang ke lebih dari "
 "satu cabang"
 
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "dasarkan ulang secara interaktif ke remote %s"
 
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "dasarkan ulang secara interaktif (dengan penggabungan) ke remote %s"
 
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "dasarkan ulang ke remote %s"
 
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
 #, c-format
 msgid " merges with remote %s"
 msgstr " gabungkan dengan remote %s"
 
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
 #, c-format
 msgid "merges with remote %s"
 msgstr "gabungkan dengan remote %s"
 
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    dan dengan remote %s\n"
 
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
 msgid "create"
 msgstr "buat"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
 msgid "delete"
 msgstr "hapus"
 
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
 msgid "up to date"
 msgstr "terbaru"
 
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
 msgid "fast-forwardable"
 msgstr "bisa dimaju cepat"
 
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
 msgid "local out of date"
 msgstr "lokal kuno"
 
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s memaksa untuk %-*s (%s)"
 
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s mendorong ke %-*s (%s)"
 
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s memaksa untuk %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s mendorong ke %s"
 
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
 msgid "do not query remotes"
 msgstr "jangan tanyakan remote"
 
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
 msgstr "* remote %s"
 
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL pengambilan: %s"
 
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
 msgid "(no URL)"
 msgstr "(tidak ada URL)"
 
@@ -20016,326 +20485,340 @@ msgstr "(tidak ada URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL pendorongan: %s"
 
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Cabang HEAD: %s"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
 msgid "(not queried)"
 msgstr "(tidak ditanyakan)"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
 msgid "(unknown)"
 msgstr "(tidak diketahui)"
 
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 "  Cabang HEAD (HEAD remote ambigu, bisa jadi salah satu dari yang berikut):\n"
 
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Cabang remote:%s"
 msgstr[1] "  Cabang remote:%s"
 
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
 msgid " (status not queried)"
 msgstr " (status tidak ditanyakan)"
 
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Cabang lokal dikonfigurasi untuk 'git pull':"
 msgstr[1] "  Cabang lokal dikonfigurasi untuk 'git pull':"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Referensi lokal yang akan dicerminkan oleh 'git push'"
 
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Referensi lokal dikonfigurasi untuk 'git push'%s:"
 msgstr[1] "  Referensi lokal dikonfigurasi untuk 'git push'%s:"
 
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "setel refs/remotes/<nama>/HEAD tergantung remote"
 
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "hapus refs/remotes/<nama>/HEAD"
 
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
 msgid "Cannot determine remote HEAD"
 msgstr "Tidak dapat menentukan HEAD remote"
 
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Banyak cabang HEAD remote. Mohon pilih satu secara eksplisit dengan:"
 
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
 #, c-format
 msgid "Could not delete %s"
 msgstr "Tidak dapat menghapus %s"
 
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Bukan referensi valid: %s"
 
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
 #, c-format
 msgid "Could not setup %s"
 msgstr "Tidak dapat mengatur %s"
 
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s akan menjadi teruntai!"
 
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s telah menjadi teruntai!"
 
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
 #, c-format
 msgid "Pruning %s"
 msgstr "Memangkas %s"
 
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [akan pangkas] %s"
 
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [dipangkas] %s"
 
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
 msgid "prune remotes after fetching"
 msgstr "pangkas remote setelah pengambilan"
 
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Tidak ada remote seperti '%s'"
 
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
 msgid "add branch"
 msgstr "tambah cabang"
 
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
 msgid "no remote specified"
 msgstr "tidak ada remote yang disebutkan"
 
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
 msgid "query push URLs rather than fetch URLs"
 msgstr "tanyakan URL pendorongan daripada URL pengambilan"
 
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
 msgid "return all URLs"
 msgstr "kembalikan semua URL"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "tidak ada URL yang dikonfigurasi untuk remote '%s'"
 
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
 msgid "manipulate push URLs"
 msgstr "manipulasi URL pendorongan"
 
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
 msgid "add URL"
 msgstr "tambah URL"
 
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
 msgid "delete URLs"
 msgstr "hapus URL"
 
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete tidak masuk akal"
 
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "pola URL lama tidak valid: %s"
 
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Tidak ada URL yang ditemukan seperti: %s"
 
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
 msgid "Will not delete all non-push URLs"
 msgstr "Tidak akan hapus semua URL non-dorong"
 
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "jadi lebih bertele-tele; harus ditempatkan sebelum subperintah"
+
+#: builtin/repack.c:28
 msgid "git repack [<options>]"
-msgstr ""
+msgstr "git repack [<opsi>]"
 
-#: builtin/repack.c:31
+#: builtin/repack.c:33
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
+"Pengepakan ulang tambahan tidak kompatibel dengan indeks bitmap. Gunakan\n"
+" --no-write-bitmap-index atau nonaktifkan konfigurasi pack.writebitmaps."
 
-#: builtin/repack.c:198
+#: builtin/repack.c:201
 msgid "could not start pack-objects to repack promisor objects"
-msgstr ""
+msgstr "tidak dapat memulai pack-objects untuk mengepak ulang objek pejanji"
 
-#: builtin/repack.c:270 builtin/repack.c:630
+#: builtin/repack.c:275 builtin/repack.c:820
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
-msgstr ""
+msgstr "repack: Mengharapkan baris ID objek hex penuh hanya dari pack-objects."
 
-#: builtin/repack.c:294
+#: 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:309
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
-msgstr ""
+msgstr "tidak dapat membuka indeks untuk %s"
 
-#: builtin/repack.c:368
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
-msgstr ""
+msgstr "pak %s terlalu besar untuk dipertimbangkan dalam deret geometri"
 
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
 #, c-format
 msgid "pack %s too large to roll up"
-msgstr ""
+msgstr "pak %s terlalu besar untuk digulung"
+
+#: 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:516
+msgid "could not close refs snapshot tempfile"
+msgstr "tidak dapat menutup berkas sementara jepretan referensi"
 
-#: builtin/repack.c:460
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
-msgstr ""
+msgstr "pak semuanya dalam satu pak"
 
-#: builtin/repack.c:462
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
-msgstr ""
+msgstr "sama seperti -a, dan jadikan objek yang tak dapat dicapai longgar"
 
-#: builtin/repack.c:465
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
-msgstr ""
+msgstr "hapus pak berlebihan, dan jalankan git-prune-packed"
 
-#: builtin/repack.c:467
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
-msgstr ""
+msgstr "lewatkan --no-reuse-delta ke git-pack-objects"
 
-#: builtin/repack.c:469
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
-msgstr ""
+msgstr "lewatkan --no-reuse-object ke git-pack-objects"
 
-#: builtin/repack.c:471
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
-msgstr ""
+msgstr "jangan jalankan git-update-server-info"
 
-#: builtin/repack.c:474
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
-msgstr ""
+msgstr "lewatkan --local ke git-pack-objects"
 
-#: builtin/repack.c:476
+#: builtin/repack.c:646
 msgid "write bitmap index"
-msgstr ""
+msgstr "tulis indeks bitmap"
 
-#: builtin/repack.c:478
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
-msgstr ""
+msgstr "lewatkan --delta-islands ke git-pack-objects"
 
-#: builtin/repack.c:479
+#: builtin/repack.c:649
 msgid "approxidate"
-msgstr ""
+msgstr "tanggal aproksimasi"
 
-#: builtin/repack.c:480
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
-msgstr ""
+msgstr "dengan -A, jangan longgarkan objek lebih lama dari ini"
 
-#: builtin/repack.c:482
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
-msgstr ""
+msgstr "dengan -a, pak ulang objek yang tak dapat dicapai"
 
-#: builtin/repack.c:484
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
-msgstr ""
+msgstr "ukuran jendela yang digunakan untuk kompresi delta"
 
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
-msgstr ""
+msgstr "bita"
 
-#: builtin/repack.c:486
+#: 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:488
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
-msgstr ""
+msgstr "batasi kedalaman delta maksimum"
 
-#: builtin/repack.c:490
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
-msgstr ""
+msgstr "batasi jumlah utas maksimum"
 
-#: builtin/repack.c:492
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
-msgstr ""
+msgstr "ukuran maksimum setiap berkas pak"
 
-#: builtin/repack.c:494
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
-msgstr ""
+msgstr "pak ulang objek dalam pak yang ditandai dengan .keep"
 
-#: builtin/repack.c:496
+#: builtin/repack.c:666
 msgid "do not repack this pack"
-msgstr ""
+msgstr "jangan pak ulang pak ini"
 
-#: builtin/repack.c:498
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
-msgstr ""
+msgstr "temukan deret geometri dengan faktor <N>"
 
-#: builtin/repack.c:508
-msgid "cannot delete packs in a precious-objects repo"
-msgstr ""
-
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr ""
+#: 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:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr ""
+#: 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:639
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
-msgstr ""
+msgstr "Tidak ada yang baru untuk dipak."
 
-#: builtin/repack.c:669
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
-msgstr ""
+msgstr "berkas yang diperlukan hilang: %s"
 
-#: builtin/repack.c:671
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
-msgstr ""
+msgstr "tidak dapat membatal taut: %s"
 
 #: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
@@ -20410,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 ""
 
@@ -20580,145 +21057,137 @@ msgstr ""
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr ""
 
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr ""
 
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr ""
 
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
 #, c-format
 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:83
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Anda tidak punya HEAD yang valid."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Gagal menemukan pohon HEAD."
 
-#: builtin/reset.c:91
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Gagal menemukan pohon dari %s."
 
-#: builtin/reset.c:116
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD sekarang pada %s"
 
-#: builtin/reset.c:195
+#: 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:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: 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:297
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "setel ulang HEAD dan indeks"
 
-#: builtin/reset.c:298
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "hanya setel ulang HEAD"
 
-#: builtin/reset.c:300 builtin/reset.c:302
+#: 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:304
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "setel ulang HEAD tapi simpan perubahan lokal"
 
-#: builtin/reset.c:310
+#: 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:344
+#: 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:352
+#: 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:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch tidak kompatibel dengan --{hard,mixed,soft}"
-
-#: builtin/reset.c:371
+#: 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:373
+#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Tidak dapat lakukan reset %s dengan jalur."
 
-#: builtin/reset.c:388
+#: 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:392
-msgid "-N can only be used with --mixed"
-msgstr "-N hanya dapat digunakan dengan --mixed"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "Perubahan tak tergelar setelah setel ulang:"
 
-#: builtin/reset.c:416
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -20731,46 +21200,55 @@ 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:434
+#: 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:439
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "Tidak dapat menulis berkas indeks baru."
 
-#: builtin/rev-list.c:538
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr ""
-
-#: builtin/rev-list.c:599
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
-msgstr ""
+msgstr "penyaringan objek memerlukan --objects"
 
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
-msgstr ""
+msgstr "rev-list tidak mendukung penampilan catatan"
 
-#: builtin/rev-list.c:664
-msgid "marked counting is incompatible with --objects"
-msgstr ""
+#: builtin/rev-list.c:679
+#, 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>...]"
-msgstr ""
+msgstr "git rev-parse --parseopt [<opsi>] -- [<argumen>...]"
 
 #: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
-msgstr ""
+msgstr "tetap `--` dilewatkan sebagai argumen"
 
 #: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
-msgstr ""
+msgstr "hentikan penguraian setelah argumen non-opsi pertama"
 
 #: builtin/rev-parse.c:419
 msgid "output in stuck long form"
-msgstr ""
+msgstr "keluarkan dalam bentuk lengket panjang"
+
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "akhir masukan prematur"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr "tidak ada untai penggunaan yang diberikan sebelum pemisah `--'"
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "Butuh satu revisi"
 
 #: builtin/rev-parse.c:552
 msgid ""
@@ -20780,92 +21258,145 @@ msgid ""
 "\n"
 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
 msgstr ""
+"git rev-parse --parseopt [<opsi>] -- [<argumen>...]\n"
+"   atau: git rev-parse --sq-quote [<argumen>...]\n"
+"   atau: git rev-parse [<opsi>] [<argumen>...]\n"
+"Jalankan \"git rev-parse --parseopt -h\" untuk informasi lebih lanjut pada "
+"penggunaan pertama."
+
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir butuh sebuah argumen"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "bukan sebuah gitdir '%s'"
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "--git-path buth sebuah argumen"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "-n butuh sebuah argumen"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "--path-format butuh sebuah argumen"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "argumen ke --path-format tidak dikenal: %s"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "--default butuh sebuah argumen"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "--prefix butuh sebuah argumen"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "mode untuk --abbrev-ref tidak dikenal: %s"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "mode untuk --show-object-format tidak dikenal: %s"
 
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
-msgstr ""
+msgstr "git revert [<opsi>] <mirip-komit>..."
 
 #: builtin/revert.c:25
 msgid "git revert <subcommand>"
-msgstr ""
+msgstr "git revert <subperintah>"
 
 #: builtin/revert.c:30
 msgid "git cherry-pick [<options>] <commit-ish>..."
-msgstr ""
+msgstr "git cherry-pick [<opsi>] <mirip-komit>..."
 
 #: builtin/revert.c:31
 msgid "git cherry-pick <subcommand>"
-msgstr ""
+msgstr "git cherry-pick <subperintah>"
 
 #: builtin/revert.c:72
 #, c-format
 msgid "option `%s' expects a number greater than zero"
-msgstr ""
+msgstr "opsi `%s' harap sebuah angka lebih dari nol"
 
 #: builtin/revert.c:92
 #, c-format
 msgid "%s: %s cannot be used with %s"
-msgstr ""
+msgstr "%s: %s tidak dapat digunakan dengan %s"
 
 #: builtin/revert.c:102
 msgid "end revert or cherry-pick sequence"
-msgstr ""
+msgstr "akhiri rangkaian pembalikan atau pemetikan ceri"
 
 #: builtin/revert.c:103
 msgid "resume revert or cherry-pick sequence"
-msgstr ""
+msgstr "lanjutkan rangkaian pembalikan atau pemetikan ceri"
 
 #: builtin/revert.c:104
 msgid "cancel revert or cherry-pick sequence"
-msgstr ""
+msgstr "batalkan rangkaian pembalikan atau pemetikan ceri"
 
 #: builtin/revert.c:105
 msgid "skip current commit and continue"
-msgstr ""
+msgstr "lewati komit saat ini dan lanjutkan"
 
 #: builtin/revert.c:107
 msgid "don't automatically commit"
-msgstr ""
+msgstr "jangan komit otomatis"
 
 #: builtin/revert.c:108
 msgid "edit the commit message"
-msgstr ""
+msgstr "sunting pesan komit"
 
 #: builtin/revert.c:111
 msgid "parent-number"
-msgstr ""
+msgstr "nomor-induk"
 
 #: builtin/revert.c:112
 msgid "select mainline parent"
-msgstr ""
+msgstr "pilih induk garis utama"
 
 #: builtin/revert.c:114
 msgid "merge strategy"
-msgstr ""
+msgstr "strategi penggabungan"
 
 #: builtin/revert.c:116
 msgid "option for merge strategy"
-msgstr ""
+msgstr "opsi untuk strategi penggabungan"
 
 #: builtin/revert.c:125
 msgid "append commit name"
-msgstr ""
+msgstr "tambahkan nama komit"
 
 #: builtin/revert.c:127
 msgid "preserve initially empty commits"
-msgstr ""
+msgstr "pertahankan komit kosong awal"
+
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "perbolehkan komit dengan pesan kosong"
 
 #: builtin/revert.c:129
 msgid "keep redundant, empty commits"
-msgstr ""
+msgstr "simpan komit kosong mubazir"
 
-#: builtin/revert.c:237
+#: builtin/revert.c:241
 msgid "revert failed"
-msgstr ""
+msgstr "pembalikan gagal"
 
-#: builtin/revert.c:250
+#: builtin/revert.c:254
 msgid "cherry-pick failed"
-msgstr ""
+msgstr "pemetikan ceri gagal"
 
 #: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
@@ -20913,385 +21444,433 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "berkas berikut punya modifikasi lokal:"
 msgstr[1] "berkas berikut punya modifikasi lokal:"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "jangan daftar berkas terhapus"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "hanya hapus dari indeks"
 
-#: builtin/rm.c:246
+#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "timpa pemeriksaan terbaru"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "perbolehkan penghapusan rekursif"
 
-#: builtin/rm.c:249
+#: builtin/rm.c:250
 msgid "exit with a zero status even if nothing matched"
 msgstr "keluar dengan nol bahkan jika tidak ada yang cocok"
 
-#: builtin/rm.c:283
+#: builtin/rm.c:285
 msgid "No pathspec was given. Which files should I remove?"
 msgstr ""
 "Tidak ada spek jalur yang diberikan. Berkas mana yang harusnya saya hapus?"
 
-#: builtin/rm.c:310
+#: builtin/rm.c:315
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "mohon gelar perubahan Anda ke .gitmodules atau stase itu untuk melanjutkan"
 
-#: builtin/rm.c:331
+#: builtin/rm.c:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "tidak menghapus '%s' secara rekursif tanpa -r"
 
-#: builtin/rm.c:379
+#: builtin/rm.c:385
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: tidak dapat menghapus %s"
 
 #: builtin/send-pack.c:20
 msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-"  --all and explicit <ref> specification are mutually exclusive."
+"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 [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>\n"
+"]              [--verbose] [--thin] [--atomic]\n"
+"              [<tuan rumah>:]<direktori> (--all | <referensi>...)"
 
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
 msgid "remote name"
-msgstr ""
+msgstr "nama remote"
 
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
-msgstr ""
+msgstr "gunakan protokol RPC nirkeadaan"
 
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
 msgid "read refs from stdin"
-msgstr ""
+msgstr "baca referensi dari masukan standar"
 
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
 msgid "print status from remote helper"
-msgstr ""
+msgstr "cetak status dari pembantu remote"
 
 #: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
-msgstr ""
+msgstr "git shortlog [<opsi>] [<rentang revisi>] [[--] <jalur>...]"
 
 #: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
-msgstr ""
+msgstr "git log --pretty=short | git shortlog [<opsi>]"
 
 #: builtin/shortlog.c:123
 msgid "using multiple --group options with stdin is not supported"
-msgstr ""
+msgstr "menggunakan banyak opsi --group dengan masukan standar tidak didukung"
 
 #: builtin/shortlog.c:133
 msgid "using --group=trailer with stdin is not supported"
-msgstr ""
+msgstr "mengguanakn --group=trailer dengan stdin tidak didukung"
 
 #: builtin/shortlog.c:323
 #, c-format
 msgid "unknown group type: %s"
-msgstr ""
+msgstr "tipe kelompok tidak dikenal: %s"
 
 #: builtin/shortlog.c:351
 msgid "group by committer rather than author"
-msgstr ""
+msgstr "kelompokkan oleh pengkomit daripada pengarang"
 
 #: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
-msgstr ""
+msgstr "urutkan keluaran berdasarkan jumlah komit per pengarang"
 
 #: builtin/shortlog.c:356
 msgid "suppress commit descriptions, only provides commit count"
-msgstr ""
+msgstr "sembunyikan deskripsi komit, hanya sediakan hitungan komit"
 
 #: builtin/shortlog.c:358
 msgid "show the email address of each author"
-msgstr ""
+msgstr "perlihatkan alamat email setiap pengarang"
 
 #: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
-msgstr ""
+msgstr "<w>[,<i1>[,<i2>]]"
 
 #: builtin/shortlog.c:360
 msgid "linewrap output"
-msgstr ""
+msgstr "bungkus-baris keluaran"
 
 #: builtin/shortlog.c:362
 msgid "field"
-msgstr ""
+msgstr "bidang"
 
 #: builtin/shortlog.c:363
 msgid "group by field"
-msgstr ""
+msgstr "kelompokkan oleh bidang"
 
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
 msgid "too many arguments given outside repository"
-msgstr ""
+msgstr "terlalu banyak argumen diberikan di luar repositori"
 
 #: builtin/show-branch.c:13
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"                [--current] [--color[=<kapan>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<revisi> | <glob>)...]"
 
 #: builtin/show-branch.c:17
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
-msgstr ""
+msgstr "git show-branch (-g | --reflog)[=<n>[,<dasar>]] [--list] [<referensi>]"
 
 #: builtin/show-branch.c:395
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "mengabaikan %s; tidak dapat menangani lebih dari %d referensi"
+msgstr[1] "mengabaikan %s; tidak dapat menangani lebih dari %d referensi"
 
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
 #, c-format
 msgid "no matching refs with %s"
-msgstr ""
+msgstr "tidak ada referensi yang cocok dengan %s"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
 msgid "show remote-tracking and local branches"
-msgstr ""
+msgstr "perlihatkan cabang pelacak remote dan lokal"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
 msgid "show remote-tracking branches"
-msgstr ""
+msgstr "perlihatkan cabang pelacak remote"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
 msgid "color '*!+-' corresponding to the branch"
-msgstr ""
+msgstr "warna '*!+-' bersesuaian pada cabang"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
 msgid "show <n> more commits after the common ancestor"
-msgstr ""
+msgstr "perlihatkan <n> komit lagi setelah nenek moyang yang sama"
 
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
 msgid "synonym to more=-1"
-msgstr ""
+msgstr "sinonim untuk more=-1"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
 msgid "suppress naming strings"
-msgstr ""
+msgstr "sembunyikan untai penamaan"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
 msgid "include the current branch"
-msgstr ""
+msgstr "masukkan cabang saat ini"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
 msgid "name commits with their object names"
-msgstr ""
+msgstr "namai komit dengan nama objeknya"
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
 msgid "show possible merge bases"
-msgstr ""
+msgstr "perlihatkan dasar penggabungan yang mungkin"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
 msgid "show refs unreachable from any other ref"
 msgstr ""
+"perlihatkan referensi yang tidak dapat dicapai dari referensi yang lainnya"
 
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
 msgid "show commits in topological order"
-msgstr ""
+msgstr "perlihatkan komit dalam urutan topologis"
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
 msgid "show only commits not on the first branch"
-msgstr ""
+msgstr "hanya perlihatkan komit yang bukan pada cabang pertama"
 
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
 msgid "show merges reachable from only one tip"
-msgstr ""
+msgstr "perlihatkan penggabungan yang bisa dicapai hanya dari satu ujung"
 
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
 msgid "topologically sort, maintaining date order where possible"
-msgstr ""
+msgstr "urutkan secara topologis, pelihara urutan tanggal bila memungkinkan"
 
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
 msgid "<n>[,<base>]"
-msgstr ""
+msgstr "<n>[,<dasar>]"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
 msgid "show <n> most recent ref-log entries starting at base"
-msgstr ""
-
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
+msgstr "perlihatkan <n> entri ref-log terkini dimulai dari dasar"
 
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
-msgstr ""
+msgstr "tidak ada cabang yang diberikan, dan HEAD tidak valid"
 
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
 msgid "--reflog option needs one branch name"
-msgstr ""
+msgstr "opsi --reflog butuh satu nama cabang"
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "hanya %d entri yang bisa diperlihatkan pada satu waktu."
+msgstr[1] "hanya %d entri yang bisa diperlihatkan pada satu waktu."
 
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
 #, c-format
 msgid "no such ref %s"
-msgstr ""
+msgstr "tidak ada referensi seperti %s"
 
-#: builtin/show-branch.c:831
+#: 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] ""
+msgstr[0] "tidak dapat menangani lebih dari %d revisi."
+msgstr[1] "tidak dapat menangani lebih dari %d revisi."
 
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
-msgstr ""
+msgstr "'%s' bukan sebuah referensi yang valid."
 
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
-msgstr ""
+msgstr "tidak dapat menemukan komit %s (%s)"
 
 #: builtin/show-index.c:21
 msgid "hash-algorithm"
-msgstr ""
+msgstr "algoritma hash"
 
 #: builtin/show-index.c:31
 msgid "Unknown hash algorithm"
-msgstr ""
+msgstr "algoritma hash tidak dikenal"
 
 #: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
 msgstr ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pola>...]"
 
 #: builtin/show-ref.c:13
 msgid "git show-ref --exclude-existing[=<pattern>]"
-msgstr ""
+msgstr "git show-ref --exclude-existing[=<pola>]"
 
 #: builtin/show-ref.c:162
 msgid "only show tags (can be combined with heads)"
-msgstr ""
+msgstr "hanya perlihatkan tag (bisa dikombinasikan dengan kepala)"
 
 #: builtin/show-ref.c:163
 msgid "only show heads (can be combined with tags)"
-msgstr ""
+msgstr "hanya perlihatkan kepala (bisa dikombinasikan dengan tag)"
 
 #: builtin/show-ref.c:164
 msgid "stricter reference checking, requires exact ref path"
-msgstr ""
+msgstr "pemeriksaan referensi lebih ketat, butuh jalur referensi eksak"
 
 #: builtin/show-ref.c:167 builtin/show-ref.c:169
 msgid "show the HEAD reference, even if it would be filtered out"
-msgstr ""
+msgstr "perlihatkan referensi HEAD, bahkan jika itu akan disaring"
 
 #: builtin/show-ref.c:171
 msgid "dereference tags into object IDs"
-msgstr ""
+msgstr "dereferensi tag ke dalam ID objek"
 
 #: builtin/show-ref.c:173
 msgid "only show SHA1 hash using <n> digits"
-msgstr ""
+msgstr "hanya perlihatkan hash SHA1 menggunakan <n> digit"
 
 #: builtin/show-ref.c:177
 msgid "do not print results to stdout (useful with --verify)"
-msgstr ""
+msgstr "jangan cetak hasil ke keluaran standar (berguna dengan --verify)"
 
 #: builtin/show-ref.c:179
 msgid "show refs from stdin that aren't in local repository"
 msgstr ""
+"perlihatkan referensi dari masukan standar yang tidak ada dalam repositori "
+"lokal"
 
 #: 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 "pohon kerja ini bukan tipis (berkas sparse-checkout mungkin tidak ada)"
+
+#: 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:227
+#: builtin/sparse-checkout.c:184
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "gagal menghapus direktori '%s'"
+
+#: 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:268
+#: 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:270
+#: 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:290
+#: 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:310
+#: 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:312
+#: 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:340
-msgid "failed to modify sparse-index config"
-msgstr ""
-
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
-msgstr ""
+msgstr "gagal membuka '%s'"
 
-#: builtin/sparse-checkout.c:419
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
-msgstr ""
-
-#: builtin/sparse-checkout.c:431
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr ""
+msgstr "tidak dapat menormalkan jalur %s"
 
-#: builtin/sparse-checkout.c:456
+#: 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:510 builtin/sparse-checkout.c:534
+#: 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: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 add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | <pola>)"
 
-#: builtin/sparse-checkout.c:579
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
 msgid "read patterns from standard in"
-msgstr ""
+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:594
-msgid "git sparse-checkout reapply"
+#: 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:613
+#: 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:644
+#: 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>]"
@@ -21313,29 +21892,27 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stase>]"
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <nama cabang> [<stase>]"
 
-#: builtin/stash.c:29 builtin/stash.c:70
-msgid "git stash clear"
-msgstr "git stash clear"
-
 #: 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 builtin/stash.c:87
+#: 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>]"
@@ -21359,6 +21936,14 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <pesan>]\n"
 "          [--] [<spek jalur>...]"
 
+#: builtin/stash.c:87
+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] [<pesan>]"
+
 #: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
@@ -21382,7 +21967,7 @@ msgstr "%s bukan referensi valid"
 msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear dengan argument tak diimplementasikan"
 
-#: builtin/stash.c:431
+#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -21394,168 +21979,186 @@ msgstr ""
 "            %s -> %s\n"
 "         untuk buat ruang.\n"
 
-#: builtin/stash.c:492
+#: builtin/stash.c:508
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "tidak dapat menerapkan stase di tengah-tengah penggabungan"
 
-#: builtin/stash.c:503
+#: builtin/stash.c:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "tidak dapat membuat diff %s^!."
 
-#: builtin/stash.c:510
+#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr "konflik dalam indeks. Coba tanpa --index."
 
-#: builtin/stash.c:516
+#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "tidak dapat menyimpan pohon indeks"
 
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "tidak dapat mengembalikan berkas tak terlacak dari stase"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Menggabungkan %s dengan %s"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "Indeks tak dibatal-stasekan."
 
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "tidak dapat mengembalikan berkas tak terlacak dari stase"
+
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "coba membuat ulang indeks"
 
-#: builtin/stash.c:635
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s (%s) dijatuhkan"
 
-#: builtin/stash.c:638
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Tidak dapat menjatuhkan entri stase"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' bukan referensi stase"
 
-#: builtin/stash.c:701
+#: 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:724
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "Tidak ada nama cabang yang disebutkan"
 
-#: builtin/stash.c:808
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "gagal menguraikan pohon"
 
-#: builtin/stash.c:819
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "gagal membongkar pohon"
 
-#: builtin/stash.c:839
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "masukkan berkas tak terlacak ke dalam stase"
 
-#: builtin/stash.c:842
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "hanya perlihatkan berkas tak terlacak dalam stase"
 
-#: builtin/stash.c:932 builtin/stash.c:969
+#: 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:950 builtin/stash.c:1606 builtin/stash.c:1671
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "pesan stase"
 
-#: builtin/stash.c:960
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" butuh satu argumen <komit>"
 
-#: builtin/stash.c:1175
+#: 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:1275
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "Anda belum punya komit awal"
 
-#: builtin/stash.c:1302
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "Tidak dapat menyimpan keadaan indeks saat ini"
 
-#: builtin/stash.c:1311
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "Tidak dapat menyimpan berkas tak terlacak"
 
-#: builtin/stash.c:1322 builtin/stash.c:1331
+#: 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:1359
+#: 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:1408
+#: 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:1426
+#: 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:1441
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "Tidak ada perubahan lokal untuk disimpan"
 
-#: builtin/stash.c:1448
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "Tidak dapat menginisialisasi stase"
 
-#: builtin/stash.c:1463
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "Tidak dapat menyimpan status saat ini"
 
-#: builtin/stash.c:1468
+#: 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:1558
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "Tidak dapat menghapus perubahaan pohon kerja"
 
-#: builtin/stash.c:1597 builtin/stash.c:1662
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "jaga indeks"
 
-#: builtin/stash.c:1599 builtin/stash.c:1664
+#: 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:1600 builtin/stash.c:1665
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "mode hening"
 
-#: builtin/stash.c:1602 builtin/stash.c:1667
+#: 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:1604 builtin/stash.c:1669
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "masukkan berkas ignore"
 
-#: builtin/stash.c:1704
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -21579,41 +22182,49 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr ""
 
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424
+#: 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"
 
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper print-default-remote tidak membutuhkan argumen"
 
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "tidak dapat mencopot satu komponen dari url '%s'"
 
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"tidak dapat mencari konfigurasi '%s'. Asumsi bahwa repositori ini adalah "
+"hulu otoritatif tersendiri."
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr "jangkar alternatif untuk jalur relatif"
 
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:410
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<jalur>] [<jalur>...]"
 
-#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr ""
-"Tidak ada url yang ditemukan untuk jalur submodul '%s' dalam .gitmodules"
+msgstr "Tidak ada url yang ditemukan untuk jalur submodul '%s' di .gitmodules"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:520
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Memasuki '%s'\n"
 
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -21622,7 +22233,7 @@ msgstr ""
 "run_command mengembalikan status bukan nol untuk %s\n"
 "."
 
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:545
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -21633,77 +22244,68 @@ msgstr ""
 "bersarang %s\n"
 "."
 
-#: builtin/submodule--helper.c:566
+#: builtin/submodule--helper.c:561
 msgid "suppress output of entering each submodule command"
 msgstr "sembunyikan keluaran memasuki setiap perintah submodul"
 
-#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
-#: builtin/submodule--helper.c:1488
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
 msgid "recurse into nested submodules"
 msgstr "rekursi ke dalam submodul bersarang"
 
-#: builtin/submodule--helper.c:573
+#: builtin/submodule--helper.c:568
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr ""
 "git submodule--helper foreach [--quiet] [--recursive] [--] [<perintah>]"
 
-#: builtin/submodule--helper.c:600
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"tidak dapat mencari konfigurasi '%s'. Asumsi bahwa repositori ini adalah "
-"hulu otoritatif tersendiri."
-
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:642
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Gagal mendaftarkan url untuk jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:646
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Submodul '%s' (%s) didaftarkan untuk jalur '%s'\n"
 
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:656
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "peringatan: perintah mode pembaruan disarankan untuk submodul '%s'\n"
 
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:663
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "Gagal mendaftarkan mode pembaruan untuk jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:710
+#: builtin/submodule--helper.c:685
 msgid "suppress output for initializing a submodule"
 msgstr "sembunyikan keluaran menginisialisasi submodul"
 
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<opsi>] [<jalur>]"
 
-#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "tidak ada pemetaan submodul ditemukan di .gitmodules untuk jalur '%s'"
 
-#: builtin/submodule--helper.c:836
+#: builtin/submodule--helper.c:811
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "tidak dapat menguraikan referensi HEAD di dalam submodul '%s'"
 
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "gagal merekursi ke dalam submodul '%s'"
 
-#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "sembunyikan keluaran status submodul"
 
-#: builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:863
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -21711,106 +22313,101 @@ msgstr ""
 "gunakan komit yang disimpan di dalam indeks daripada yang disimpan di dalam "
 "HEAD"
 
-#: builtin/submodule--helper.c:894
+#: builtin/submodule--helper.c:869
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<jalur>...]"
 
-#: builtin/submodule--helper.c:918
+#: builtin/submodule--helper.c:893
 msgid "git submodule--helper name <path>"
-msgstr "git submodule==helper name <jalur>"
+msgstr "git submodule--helper name <jalur>"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:965
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s(blob)->%s(submodul)"
 
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:968
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(submodul)->%s(blob)"
 
-#: builtin/submodule--helper.c:1006
+#: builtin/submodule--helper.c:981
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1056
+#: builtin/submodule--helper.c:1031
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "tidak dapat hash objek dari '%s'"
 
-#: builtin/submodule--helper.c:1060
+#: builtin/submodule--helper.c:1035
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "mode tidak diharapkan %o\n"
 
-#: builtin/submodule--helper.c:1301
+#: builtin/submodule--helper.c:1276
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr "gunakan komit yang disimpan di dalam indeks daripada HEAD submodul"
 
-#: builtin/submodule--helper.c:1303
-msgid "to compare the commit in the index with that in the submodule HEAD"
-msgstr ""
-"untuk membandingkan komit di dalam indeks dengan yang di dalam HEAD submodul"
+#: builtin/submodule--helper.c:1278
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "bandingkan komit di dalam indeks dengan yang di dalam HEAD submodul"
 
-#: builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1280
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr "lewatkan submodul dengan nilai 'ignore_config' disetel ke 'all'"
 
-#: builtin/submodule--helper.c:1307
+#: builtin/submodule--helper.c:1282
 msgid "limit the summary size"
 msgstr "batasi ukuran ringkasan"
 
-#: builtin/submodule--helper.c:1312
+#: builtin/submodule--helper.c:1287
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [<opsi>] [<commit>] -- [<jalur>]"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1311
 msgid "could not fetch a revision for HEAD"
 msgstr "tidak dapat mengambil revisi untuk HEAD"
 
-#: builtin/submodule--helper.c:1341
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached dan --files saling eksklusif"
-
-#: builtin/submodule--helper.c:1408
+#: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Mensinkronisasi url submodul untuk '%s'\n"
 
-#: builtin/submodule--helper.c:1414
+#: builtin/submodule--helper.c:1379
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "gagal mendaftarkan url untuk jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c:1393
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "gagal mendapatkan remote asali untuk submodul '%s'"
 
-#: builtin/submodule--helper.c:1439
+#: builtin/submodule--helper.c:1404
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "gagal memperbarui remote untuk submodul '%s'"
 
-#: builtin/submodule--helper.c:1486
+#: builtin/submodule--helper.c:1451
 msgid "suppress output of synchronizing submodule url"
 msgstr "sembunyikan keluaran mensinkronisasi url submodul"
 
-#: builtin/submodule--helper.c:1493
+#: builtin/submodule--helper.c:1458
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<jalur>]"
 
-#: builtin/submodule--helper.c:1547
+#: 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:1559
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -21819,46 +22416,46 @@ msgstr ""
 "Pohon kerja submodul '%s' berisi modifikasi lokal; gunakan '-f' untuk "
 "menyingkirkan itu"
 
-#: builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Direktori '%s' dibersihkan\n"
 
-#: builtin/submodule--helper.c:1569
+#: 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:1580
+#: 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:1596
+#: 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:1625
+#: 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:1626
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "batal daftar semua submodul"
 
-#: builtin/submodule--helper.c:1631
+#: 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:1645
+#: 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:1714
+#: 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"
@@ -21870,46 +22467,68 @@ msgstr ""
 " itu, setel submodule.alternateErrorStrategy ke 'info' atau yang sama,\n"
 "kloning degan '--reference-if-able' daripada '--reference'."
 
-#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756
+#: 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:1792
+#: 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:1799
+#: 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:1823
+#: 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: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:1818
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "direktori tidak kosong: '%s'"
+
+#: 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:1862
 msgid "where the new submodule will be cloned to"
 msgstr "di mana submodul baru akan dikloning"
 
-#: builtin/submodule--helper.c:1826
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "nama submodul baru"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr "url di mana submodul dikloning"
 
-#: builtin/submodule--helper.c:1837
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "kedalaman untuk kloning dangkal"
 
-#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349
+#: 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:1842 builtin/submodule--helper.c:2351
+#: 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:1849
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -21919,103 +22538,180 @@ msgstr ""
 "<repositori>] [--name <nama>] [--depth <kedalaman>] [--single-branch] --url "
 "<url> --path <jalur>"
 
-#: builtin/submodule--helper.c:1874
-#, 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:1885
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'"
-
-#: builtin/submodule--helper.c:1889
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "direktori tidak kosong: '%s'"
-
-#: builtin/submodule--helper.c:1901
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "tidak dapat mendapatkan direktori submodul untuk '%s'"
-
-#: builtin/submodule--helper.c:1937
+#: 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:1941
+#: 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:2042
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Jalur submodul '%s' tidak diinisialisasi"
 
-#: builtin/submodule--helper.c:2046
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Mungkin Anda ingin menggunakan 'update --init'?"
 
-#: builtin/submodule--helper.c:2076
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Melewati submodul tak tergabung %s"
 
-#: builtin/submodule--helper.c:2105
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Melewati submodul '%s'"
 
-#: builtin/submodule--helper.c:2255
+#: 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:2266
+#: 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:2328 builtin/submodule--helper.c:2574
+#: 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: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: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: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:2409
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Jalur submodul '%s': ter-checkout '%s'\n"
+
+#: 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:2417
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Jalur submodul '%s': tergabung dalam '%s'\n"
+
+#: 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: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:2454
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Terambil di dalam jalur submodul '%s', tetapi itu tidak berisi %s. "
+"Pengambilan langsung komit tersebut gagal."
+
+#: 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:2331
+#: 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:2335
+#: 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:2341
+#: 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:2344
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "pekerjaan paralel"
 
-#: builtin/submodule--helper.c:2346
+#: 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:2347
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "jangan cetak perkembangan pengkloningan"
 
-#: builtin/submodule--helper.c:2358
+#: 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:2371
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "nilai jelek untuk parameter pembaruan"
 
-#: builtin/submodule--helper.c:2419
+#: 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:2567
+msgid "force checkout updates"
+msgstr "paksa pembaruan checkout"
+
+#: 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: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:2572
+msgid "depth for shallow fetch"
+msgstr "kedalaman untuk pengambilan dangkal"
+
+#: builtin/submodule--helper.c:2582
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2583
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 diharapkan oleh proyek super"
+
+#: builtin/submodule--helper.c:2585
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2586
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 dari HEAD submodul"
+
+#: 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:2663
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22024,123 +22720,223 @@ msgstr ""
 "Cabang submodul (%s) dikonfigurasikan untuk mewarisi cabang dari proyek "
 "super, tapi proyek super tidak pada cabang apapun"
 
-#: builtin/submodule--helper.c:2542
+#: 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:2575
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "rekursi ke dalam submodul"
 
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
-msgstr "giit submodule--helper absorb-git-dirs [<opsi>] [<jalur>...]"
+msgstr "git submodule--helper absorb-git-dirs [<opsi>] [<jalur>...]"
 
-#: builtin/submodule--helper.c:2637
+#: 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:2640
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr "batal setel konfigurasi dalam berkas .gitmodules"
 
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <nama> [<nilai>]"
 
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nama>"
 
-#: builtin/submodule--helper.c:2647
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2666 git-submodule.sh:150
-#, sh-format
+#: 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:2682
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr "sembunyikan keluaran penyetelan url submodule"
 
-#: builtin/submodule--helper.c:2686
+#: 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:2719
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr "setel cabang pelacak asali ke master"
 
-#: builtin/submodule--helper.c:2721
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "setel cabang pelacak asali"
 
-#: builtin/submodule--helper.c:2725
+#: 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:2726
+#: 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:2733
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "--branch atau --default dibutuhkan"
 
-#: builtin/submodule--helper.c:2736
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch dan --default saling eksklusif"
+#: 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: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: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:2793 git.c:449 git.c:724
+#: 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 ""
+"Jika Anda ingin menggunakan ulang direktori git lokal ini daripada "
+"mengkloning lagi dari\n"
+"  %s\n"
+"gunakan opsi '--force'. Jika direktori git lokal bukan repo yang benar\n"
+"atau Anda tidak yakin apa maksudnya, pilih nama yang lain dengan opsi '--"
+"name'."
+
+#: 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:3110
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "Tidak dapat men-checkout submodul '%s'"
+
+#: builtin/submodule--helper.c:3149
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Tidak dapat menambahkan submodul '%s'"
+
+#: 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:3222
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' sudah ada di dalam indeks"
+
+#: 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:3254
+msgid "branch of repository to add as submodule"
+msgstr "cabang repositori untuk ditambahkan sebagai submodul"
+
+#: builtin/submodule--helper.c:3255
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "perbolehkan menambah jalur submodul yang diabaikan"
+
+#: builtin/submodule--helper.c:3257
+msgid "print only error messages"
+msgstr "hanya cetak pesan kesalahan"
+
+#: builtin/submodule--helper.c:3261
+msgid "borrow the objects from reference repositories"
+msgstr "pinjam objek dari repositori referensi"
+
+#: 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:3270
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<opsi>] [--] <repositori> [<jalur>]"
+
+#: 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: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:3341
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' bukan nama submodul yang valid"
+
+#: 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:2799
+#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' bukan subperintah submodule--helper valid"
 
 #: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
-msgstr ""
+msgstr "git symbolic-ref [<opsi>] <nama> [<referensi>]"
 
 #: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
-msgstr ""
+msgstr "git symbolic-ref -d [-q] <nama>"
 
 #: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
-msgstr ""
+msgstr "matikan pesan kesalahan untuk referensi non-simbolik (terlepas)"
 
 #: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
-msgstr ""
+msgstr "hapus referensi simbolik"
 
 #: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
-msgstr ""
+msgstr "pendekkan keluaran referensi"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
-msgstr ""
+msgstr "alasan"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
-msgstr ""
+msgstr "alasan pembaruan"
 
 #: builtin/tag.c:25
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+"        <tagname> [<head>]"
 msgstr ""
 "git tag [-a | -s | -u <id kunci>] [-f] [-m <pesan | -F <berkas>]\n"
-"\t\t<nama tag> [<kepala>]"
+"        <nama tag> [<kepala>]"
 
 #: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
@@ -22150,12 +22946,13 @@ msgstr "git tag -d <nama tag>..."
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
 "[<pattern>...]"
 msgstr ""
 "git tag -l [-n[<angka>]] [--contains <komit>] [--no-contains <komit>] [--"
 "points-at <objek>]\n"
-"\t\t[--format=<format>] [--merged <komit>] [--no-merged <komit>] [<pola>...]"
+"        [--format=<format>] [--merged <komit>] [--no-merged <komit>] "
+"[<pola>...]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
@@ -22199,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"
@@ -22217,134 +23014,111 @@ 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:328
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "tidak ada pesan tag?"
 
-#: builtin/tag.c:335
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Pesan tag dibiarkan di %s\n"
 
-#: builtin/tag.c:446
+#: builtin/tag.c:444
 msgid "list tag names"
 msgstr "daftarkan nama tag"
 
-#: builtin/tag.c:448
+#: builtin/tag.c:446
 msgid "print <n> lines of each tag message"
 msgstr "cetak <n> baris dari setiap pesan tag"
 
-#: builtin/tag.c:450
+#: builtin/tag.c:448
 msgid "delete tags"
 msgstr "hapus tag"
 
-#: builtin/tag.c:451
+#: builtin/tag.c:449
 msgid "verify tags"
 msgstr "verifikasi tag"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:451
 msgid "Tag creation options"
 msgstr "Opsi pembuatan tag"
 
-#: builtin/tag.c:455
+#: builtin/tag.c:453
 msgid "annotated tag, needs a message"
 msgstr "tag bercatat, butuh sebuah pesan"
 
-#: builtin/tag.c:457
+#: builtin/tag.c:455
 msgid "tag message"
 msgstr "pesan tag"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:457
 msgid "force edit of tag message"
 msgstr "paksa sunting pesan tag"
 
-#: builtin/tag.c:460
+#: builtin/tag.c:458
 msgid "annotated and GPG-signed tag"
 msgstr "tag bercatat dan bertandatangan GPG"
 
-#: builtin/tag.c:463
+#: builtin/tag.c:461
 msgid "use another key to sign the tag"
 msgstr "gunakan kunci yang lain untuk menandatangani tag"
 
-#: builtin/tag.c:464
+#: builtin/tag.c:462
 msgid "replace the tag if exists"
 msgstr "ganti tag jika ada"
 
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "buat log referensi"
 
-#: builtin/tag.c:467
+#: builtin/tag.c:465
 msgid "Tag listing options"
 msgstr "Opsi daftar tag"
 
-#: builtin/tag.c:468
+#: builtin/tag.c:466
 msgid "show tag list in columns"
 msgstr "perlihatkan daftar tag dalam kolom"
 
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
 msgid "print only tags that contain the commit"
 msgstr "hanya cetak tag yang berisi komit"
 
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that don't contain the commit"
 msgstr "hanya cetak tag yang tidak berisi komit"
 
-#: builtin/tag.c:473
+#: builtin/tag.c:471
 msgid "print only tags that are merged"
 msgstr "hanya cetak tag yang tergabung"
 
-#: builtin/tag.c:474
+#: builtin/tag.c:472
 msgid "print only tags that are not merged"
 msgstr "hanya cetak tag yang tak tergabung"
 
-#: builtin/tag.c:478
+#: builtin/tag.c:476
 msgid "print only tags of the object"
 msgstr "hanya cetak tag dari objek"
 
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column dan -n tidak kompatibel"
-
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "opsi -n hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "opsi --contains hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "opsi --no-contains hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "opsi --points-at hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:556
-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:567
-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:592
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' bukan nama tag yang valid."
 
-#: builtin/tag.c:597
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "tag '%s' sudah ada"
 
-#: builtin/tag.c:628
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Tag '%s' diperbarui (yaitu %s)\n"
@@ -22356,273 +23130,282 @@ msgstr ""
 #: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
-msgstr ""
-
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr ""
+msgstr "gagal membuat direktori %s"
 
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
-msgstr ""
+msgstr "gagal menghapus berkas %s"
 
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
-msgstr ""
+msgstr "gagal menghapus direktori %s"
 
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
-msgstr ""
+msgstr "Menguji mtime di '%s' "
 
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
-msgstr ""
+msgstr "info stat direktori tidak berubah setelah menambahkan berkas baru"
 
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
 msgid "directory stat info does not change after adding a new directory"
-msgstr ""
+msgstr "info stat direktori tidak berubah setelah menambahkan direktori baru"
 
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
 msgid "directory stat info changes after updating a file"
-msgstr ""
+msgstr "info stat direktori berubah setelah memperbarui berkas"
 
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
+"info stat direktori berubah setelah menambahkan berkas di dalam subdirektori"
 
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
 msgid "directory stat info does not change after deleting a file"
-msgstr ""
+msgstr "info stat direktori tidak berubah setelah menghapus berkas"
 
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
 msgid "directory stat info does not change after deleting a directory"
-msgstr ""
+msgstr "info stat direktori tidak berubah setelah menghapus direktori"
 
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
 msgid " OK"
-msgstr ""
+msgstr " OK"
 
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
-msgstr ""
+msgstr "git update-index [<opsi>] [--] [<berkas>...]"
 
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
-msgstr ""
+msgstr "lanjutkan penyegaran bahkan ketika indeks perlu diperbarui"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
-msgstr ""
+msgstr "refresh: abaikan submodul"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
-msgstr ""
+msgstr "jangan abaikan berkas baru"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
-msgstr ""
+msgstr "biarkan berkas menggantikan direktori dan sebaliknya"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
-msgstr ""
+msgstr "catat berkas hilang dari pohon kerja"
 
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
-msgstr ""
+msgstr "segarkan bahkan jika indeks berisi entri tak tergabung"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
 msgid "refresh stat information"
-msgstr ""
+msgstr "segarkan informasi stat"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
-msgstr ""
+msgstr "seperti --refresh, tapi abaikan setelan assume-unchanged"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
-msgstr ""
+msgstr "<mode>,<objek>,<jalur>"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
-msgstr ""
+msgstr "tambahkan entri yang disebutkan ke indeks"
 
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
-msgstr ""
+msgstr "tandai berkas sebagai \"not changing\""
 
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
-msgstr ""
+msgstr "bersihkan bita assumed-unchanged"
 
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
-msgstr ""
+msgstr "tandai berkas sebagai \"index-only\""
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
-msgstr ""
+msgstr "bersihkan bita skip-worktree"
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
 msgid "do not touch index-only entries"
-msgstr ""
+msgstr "jangan sentuh entri index-only"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
-msgstr ""
+msgstr "hanya tambahkan ke indeks; jangan tambahkan konten ke basis data objek"
 
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
-msgstr ""
+msgstr "hapus jalur bernama bahkan jika ada dalam pohon kerja"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
-msgstr ""
+msgstr "dengan --stdin: baris masukan diakhiri dengan bita null"
 
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
-msgstr ""
+msgstr "baca daftar jalur yang akan diperbarui dari masukan standar"
 
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
-msgstr ""
+msgstr "tambahkan entri dari masukan standar ke indeks"
 
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
-msgstr ""
+msgstr "populasi ulang tahapan #2 dan #3 untuk jalur yang terdaftar"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
-msgstr ""
+msgstr "hanya perbarui entri yang berbeda dari HEAD"
 
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
-msgstr ""
+msgstr "abaikan berkas yang hilang dari pohon kerja"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
-msgstr ""
+msgstr "laporkan aksi ke keluaran standar"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
-msgstr ""
+msgstr "(untuk porselen) lupakan konflik tak terselesaikan yang disimpan"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
 msgid "write index in this format"
-msgstr ""
+msgstr "tulis indeks dalam format ini"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
-msgstr ""
+msgstr "aktifkan atau nonaktifkan indeks terpisah"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
-msgstr ""
+msgstr "aktifkan/nonaktifkan tembolok tak terlacak"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
-msgstr ""
+msgstr "uji jika sistem berkas mendukung tembolok tak terlacak"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
-msgstr ""
+msgstr "aktifkan tembolok tak terlacak tanpa menguji sistem berkas"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
-msgstr ""
+msgstr "tulis indeks bahkan jika tidak dianggap berubah"
 
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
-msgstr ""
+msgstr "aktifkan atau nonaktifkan monitor sistem berkas"
 
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
-msgstr ""
+msgstr "tandai berkas sebagai fsmonitor valid"
 
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
-msgstr ""
+msgstr "bersihkan bita fsmonitor valid"
 
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
+"core.splitIndex disetel ke false; hapus atau ubah, jika Anda benar-benar "
+"ingin mengaktifkan indeks terpisah"
 
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr ""
+"core.splitIndex disetel ke true; hapus atau ubah, jika Anda benar-benar  "
+"ingin menonaktifkan indeks terpisah"
 
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
 msgstr ""
+"core.untrackedCache disetel ke true; hapus atau ubah, jika Anda benar-benar "
+"ingin menonaktifkan tembolok tak terlacak"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
-msgstr ""
+msgstr "Tembolok tak terlacak dinonaktifkan"
 
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
 msgstr ""
+"core.untrackedCache disetel ke false; hapus atau ubah, jika Anda benar-benar "
+"ingin mengaktifkan tembolok tak terlacak"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
-msgstr ""
+msgstr "Tembolok tak terlacak diaktifkan untuk '%s'"
 
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
+"core.fsmonitor tak disetel; setel jika Anda benar-benar ingin mengaktifkan "
+"fsmonitor"
 
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
-msgstr ""
+msgstr "fsmonitor diaktifkan"
 
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
+"core.fsmonitor disetel; hapus jika Anda benar-benar ingin menonaktifkan "
+"fsmonitor"
 
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
-msgstr ""
+msgstr "fsmonitor dinonaktifkan"
 
 #: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
-msgstr ""
+msgstr "git update-ref [<opsi>] -d <nama referensi> [<nilai lama>]"
 
 #: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr ""
+"git update-ref [<opsi>]    <nama referensi> <nilai baru> [<nilai lama>]"
 
 #: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
-msgstr ""
+msgstr "git update-ref [<opsi>] --stdin [-z]"
 
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
 msgid "delete the reference"
-msgstr ""
+msgstr "hapus referensi"
 
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
-msgstr ""
+msgstr "perbarui <nama referensi> bukan yang ditunjuknya"
 
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
-msgstr ""
+msgstr "stdin punya argumen yang diakhiri dengan NUL"
 
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
 msgid "read updates from stdin"
-msgstr ""
+msgstr "baca pembaruan dari masukan standar"
 
 #: builtin/update-server-info.c:7
 msgid "git update-server-info [--force]"
@@ -22634,147 +23417,146 @@ msgstr ""
 
 #: builtin/upload-pack.c:11
 msgid "git upload-pack [<options>] <dir>"
-msgstr ""
+msgstr "git upload-pack [<opsi>] <direktori>"
 
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
 msgid "quit after a single request/response exchange"
-msgstr ""
+msgstr "keluar setelah pertukaran permintaan/jawaban tunggal"
 
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr ""
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "layani info/referensi untuk git-http-backend"
 
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr ""
+msgstr "jangan coba <direktori>.git/ jika <direktori> bukan direktori Git"
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
 msgid "interrupt transfer after <n> seconds of inactivity"
-msgstr ""
+msgstr "interupsi transfer setelah <n> detik niraktivitas"
 
 #: builtin/verify-commit.c:19
 msgid "git verify-commit [-v | --verbose] <commit>..."
-msgstr ""
+msgstr "git verify-commit [-v | --verbose] <komit>..."
 
 #: builtin/verify-commit.c:68
 msgid "print commit contents"
-msgstr ""
+msgstr "cetak isi komit"
 
 #: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
-msgstr ""
+msgstr "cetak keluaran status gpg mentah"
 
 #: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
-msgstr ""
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pak>..."
 
 #: builtin/verify-pack.c:70
 msgid "verbose"
-msgstr ""
+msgstr "bertele-tele"
 
 #: builtin/verify-pack.c:72
 msgid "show statistics only"
-msgstr ""
+msgstr "hanya perlihatkan statistik"
 
 #: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
-msgstr ""
+msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 
 #: builtin/verify-tag.c:36
 msgid "print tag contents"
-msgstr ""
+msgstr "cetak isi tag"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr ""
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr ""
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr ""
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr ""
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr ""
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr ""
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
 msgid "git worktree unlock <path>"
 msgstr ""
 
-#: builtin/worktree.c:61 builtin/worktree.c:935
-#, c-format
-msgid "failed to delete '%s'"
-msgstr ""
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr ""
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
 msgid "report pruned working trees"
 msgstr ""
 
-#: builtin/worktree.c:151
+#: builtin/worktree.c:150
 msgid "expire working trees older than <time>"
 msgstr ""
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c:220
 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 
-#: builtin/worktree.c:230
+#: builtin/worktree.c:229
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr ""
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, 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 ""
 
-#: builtin/worktree.c:237
+#: builtin/worktree.c:236
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
 "use '%s -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 
-#: builtin/worktree.c:288
+#: builtin/worktree.c:287
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr ""
 
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+msgid "initializing"
+msgstr ""
+
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr ""
 
-#: builtin/worktree.c:424
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 
-#: builtin/worktree.c:433
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr ""
 
-#: builtin/worktree.c:439
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr ""
@@ -22799,166 +23581,162 @@ msgstr ""
 msgid "keep the new working tree locked"
 msgstr ""
 
-#: builtin/worktree.c:493
+#: builtin/worktree.c:492 builtin/worktree.c:729
+msgid "reason for locking"
+msgstr ""
+
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr ""
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 
-#: builtin/worktree.c:504
-msgid "-b, -B, and --detach are mutually exclusive"
+#: builtin/worktree.c:512
+msgid "added with --lock"
 msgstr ""
 
-#: builtin/worktree.c:565
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 
-#: builtin/worktree.c:682
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr ""
 
-#: builtin/worktree.c:684
-msgid "add 'prunable' annotation to worktrees older than <time>"
-msgstr ""
-
 #: builtin/worktree.c:693
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:720
-msgid "reason for locking"
+msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 
-#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
-#: builtin/worktree.c:963
+#: 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:734 builtin/worktree.c:767
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
 
-#: builtin/worktree.c:739
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 
-#: builtin/worktree.c:741
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 
-#: builtin/worktree.c:769
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr ""
 
-#: builtin/worktree.c:810
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 
-#: builtin/worktree.c:818
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:841 builtin/worktree.c:965
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr ""
 
-#: builtin/worktree.c:846
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr ""
 
-#: builtin/worktree.c:859
+#: 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:861
+#: 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:864
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr ""
 
-#: builtin/worktree.c:915
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr ""
 
-#: builtin/worktree.c:919
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 
-#: builtin/worktree.c:924
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 
-#: builtin/worktree.c:947
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:970
+#: 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:972
+#: 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:975
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
 
-#: builtin/worktree.c:999
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr ""
 
-#: builtin/worktree.c:1002
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr ""
 
 #: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
-msgstr ""
+msgstr "git write-tree [--missing-ok] [--prefix=<prefiks>/]"
 
 #: builtin/write-tree.c:28
 msgid "<prefix>/"
-msgstr ""
+msgstr "<prefiks>/"
 
 #: builtin/write-tree.c:29
 msgid "write tree object for a subdirectory <prefix>"
-msgstr ""
+msgstr "tulis objek pohon untuk subdirektori <prefiks>"
 
 #: builtin/write-tree.c:31
 msgid "only useful for debugging"
-msgstr ""
+msgstr "hanya berguna untuk penirkutuan"
 
 #: git.c:28
 msgid ""
@@ -22970,6 +23748,14 @@ msgid ""
 "           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
 "           <command> [<args>]"
 msgstr ""
+"git [--version] [--help] [-C <jalur>] [-c <nama>=<nilai>]\n"
+"           [--exec-path[=<jalur>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"           [--git-dir=<jalur>] [--work-tree=<jalur>] [--namespace=<nama>]\n"
+"           [--super-prefix=<jalur>] [--config-env=<nama>=<variabel "
+"lingkungan>]\n"
+"           <perintah> [<argumen>]"
 
 #: git.c:36
 msgid ""
@@ -22978,51 +23764,45 @@ msgid ""
 "to read about a specific subcommand or concept.\n"
 "See 'git help git' for an overview of the system."
 msgstr ""
+"'git help -a' dan 'git help -g' daftar subperintah tersedia dan beberapa\n"
+"panduan konsep. Lihat 'git help <perintah>' atau 'git help <konsep>'\n"
+"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 ""
+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 ""
-
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr ""
+msgstr "tidak ada ruang nama yang diberikan untuk --namespace\n"
 
 #: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
-msgstr ""
+msgstr "tidak ada prefiks yang diberikan untuk --super-prefix\n"
 
 #: git.c:252
 #, c-format
 msgid "-c expects a configuration string\n"
-msgstr ""
+msgstr "-c mengharapkan sebuah untai konfigurasi\n"
 
 #: git.c:260
 #, c-format
 msgid "no config key given for --config-env\n"
-msgstr ""
-
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr ""
+msgstr "tidak ada kunci konfigurasi yang diberikan untuk --config-env\n"
 
 #: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
-msgstr ""
+msgstr "opsi tidak dikenal: %s\n"
 
 #: git.c:375
 #, c-format
 msgid "while expanding alias '%s': '%s'"
-msgstr ""
+msgstr "ketika memperluas alias '%s': '%s'"
 
 #: git.c:384
 #, c-format
@@ -23030,73 +23810,69 @@ msgid ""
 "alias '%s' changes environment variables.\n"
 "You can use '!git' in the alias to do this"
 msgstr ""
+"alias '%s' merubah variabel lingkungan.\n"
+"Anda dapat menggunakan '!git' dalam alias untuk melakukannya."
 
 #: git.c:391
 #, c-format
 msgid "empty alias for %s"
-msgstr ""
+msgstr "alias kosong untuk %s"
 
 #: git.c:394
 #, c-format
 msgid "recursive alias: %s"
-msgstr ""
+msgstr "alias rekursif: %s"
 
-#: git.c:476
+#: git.c:479
 msgid "write failure on standard output"
-msgstr ""
+msgstr "kegagalan menulis pada keluaran standar"
 
-#: git.c:478
+#: git.c:481
 msgid "unknown write failure on standard output"
-msgstr ""
+msgstr "kegagal menulis tidak diketahui pada keluaran standar"
 
-#: git.c:480
+#: git.c:483
 msgid "close failed on standard output"
-msgstr ""
+msgstr "penutupan gagal pada keluaran standar"
 
-#: git.c:833
+#: git.c:835
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr ""
+msgstr "putaran alias terdeteksi: perluasan '%s' tidak berhenti:%s"
 
-#: git.c:883
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
-msgstr ""
+msgstr "tidak dapat menangani %s sebagai bawaan"
 
-#: git.c:896
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
 "\n"
 msgstr ""
+"penggunaan: %s\n"
+"\n"
 
-#: git.c:916
+#: git.c:918
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
-msgstr ""
+msgstr "perluasan alias '%s' gagal; '%s' bukan sebuah perintah git\n"
 
-#: git.c:928
+#: git.c:930
 #, c-format
 msgid "failed to run command '%s': %s\n"
-msgstr ""
+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 ""
@@ -23122,147 +23898,109 @@ msgstr ""
 msgid "exit immediately after advertising capabilities"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
 msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
 msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
 msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
 msgid "test-helper simple-ipc send         [<name>] [<token>]"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
 msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
 msgid ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
 msgid "name or pathname of unix domain socket"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
 msgid "named-pipe name"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
 msgid "number of threads in server thread pool"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
 msgid "seconds to wait for daemon to start or stop"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
 msgid "number of bytes"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
 msgid "number of requests per thread"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "byte"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "ballast character"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "token"
 msgstr ""
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "command token to send to the server"
 msgstr ""
 
-#: http.c:399
+#: http.c:350
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 
-#: http.c:420
+#: http.c:371
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr ""
 
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
 msgstr ""
 
-#: http.c:910
+#: http.c:812
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr ""
 
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr ""
-
-#: http.c:1132
+#: http.c:1016
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr ""
 
-#: http.c:1139
+#: http.c:1023
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 
-#: http.c:1143
+#: http.c:1027
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr ""
 
-#: http.c:2035
+#: http.c:1876
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -23275,133 +24013,302 @@ msgstr ""
 msgid "invalid quoting in push-option value: '%s'"
 msgstr ""
 
-#: remote-curl.c:307
+#: remote-curl.c:304
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr ""
 
-#: remote-curl.c:408
+#: remote-curl.c:405
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 
-#: remote-curl.c:439
+#: remote-curl.c:436
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr ""
 
-#: remote-curl.c:499
+#: remote-curl.c:496
 #, c-format
 msgid "repository '%s' not found"
 msgstr ""
 
-#: remote-curl.c:503
+#: remote-curl.c:500
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr ""
 
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr ""
+
+#: remote-curl.c:508
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr ""
 
-#: remote-curl.c:513
+#: remote-curl.c:514
 #, c-format
 msgid "redirecting to %s"
 msgstr ""
 
-#: remote-curl.c:642
+#: remote-curl.c:645
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr ""
 
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
+#: remote-curl.c:657
+msgid "remote server sent unexpected response end packet"
 msgstr ""
 
-#: remote-curl.c:724
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 
-#: remote-curl.c:754
+#: remote-curl.c:755
 #, c-format
 msgid "remote-curl: bad line length character: %.4s"
 msgstr ""
 
-#: remote-curl.c:756
+#: remote-curl.c:757
 msgid "remote-curl: unexpected response end packet"
 msgstr ""
 
-#: remote-curl.c:832
+#: remote-curl.c:833
 #, c-format
 msgid "RPC failed; %s"
 msgstr ""
 
-#: remote-curl.c:872
+#: remote-curl.c:873
 msgid "cannot handle pushes this big"
 msgstr ""
 
-#: remote-curl.c:987
+#: remote-curl.c:986
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr ""
 
-#: remote-curl.c:991
+#: remote-curl.c:990
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr ""
 
-#: remote-curl.c:1041
+#: remote-curl.c:1040
 #, c-format
 msgid "%d bytes of length header were received"
 msgstr ""
 
-#: remote-curl.c:1043
+#: remote-curl.c:1042
 #, c-format
 msgid "%d bytes of body are still expected"
 msgstr ""
 
-#: remote-curl.c:1132
+#: remote-curl.c:1131
 msgid "dumb http transport does not support shallow capabilities"
 msgstr ""
 
-#: remote-curl.c:1147
+#: remote-curl.c:1146
 msgid "fetch failed."
 msgstr ""
 
-#: remote-curl.c:1193
+#: remote-curl.c:1192
 msgid "cannot fetch by sha1 over smart http"
 msgstr ""
 
-#: remote-curl.c:1237 remote-curl.c:1243
+#: remote-curl.c:1236 remote-curl.c:1242
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr ""
 
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1254 remote-curl.c:1372
 #, c-format
 msgid "http transport does not support %s"
 msgstr ""
 
-#: remote-curl.c:1291
+#: remote-curl.c:1290
 msgid "git-http-push failed"
 msgstr ""
 
-#: remote-curl.c:1479
+#: remote-curl.c:1478
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr ""
 
-#: remote-curl.c:1511
+#: remote-curl.c:1510
 msgid "remote-curl: error reading command stream from git"
 msgstr ""
 
-#: remote-curl.c:1518
+#: remote-curl.c:1517
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr ""
 
-#: remote-curl.c:1559
+#: remote-curl.c:1558
 #, c-format
 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 ""
@@ -23418,11 +24325,11 @@ msgstr ""
 msgid "object filtering"
 msgstr ""
 
-#: parse-options.h:184
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr ""
 
-#: parse-options.h:198
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr ""
 
@@ -23451,11 +24358,11 @@ msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr ""
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "key"
 msgstr ""
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr ""
 
@@ -23524,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
@@ -23728,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
@@ -23784,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
@@ -23964,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
@@ -24132,44 +25039,13 @@ 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
 msgid "An overview of recommended workflows with Git"
 msgstr ""
 
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr ""
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr ""
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr ""
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr ""
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -24208,475 +25084,66 @@ msgstr ""
 msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr ""
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr ""
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr ""
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr ""
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr ""
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr ""
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr ""
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-"  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr ""
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:578
+#: git-submodule.sh:411
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:583
+#: git-submodule.sh:416
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr ""
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr ""
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:197
-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 ""
-
-#: git-rebase--preserve-merges.sh:260
-#, 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 ""
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:601
-#, 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 ""
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, 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 ""
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:807
-#, 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 ""
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr ""
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr ""
-
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 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
-msgid "Cannot rebase: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr ""
 
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr ""
 
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr ""
 
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr ""
 
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr ""
 
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr ""
 
@@ -24744,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"
@@ -24753,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"
@@ -24762,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"
@@ -24771,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"
@@ -24780,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"
@@ -24789,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"
@@ -24798,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"
@@ -24807,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"
@@ -24816,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"
@@ -24829,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"
@@ -24923,103 +25390,109 @@ 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:138
+#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
-msgstr ""
+msgstr "zona lokal berbeda dari GMT oleh selang non-menit\n"
 
-#: git-send-email.perl:145 git-send-email.perl:151
+#: git-send-email.perl:166 git-send-email.perl:172
 msgid "local time offset greater than or equal to 24 hours\n"
-msgstr ""
+msgstr "offset waktu lokal lebih dari atau sama dengan 24 jam\n"
 
-#: git-send-email.perl:222
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
-msgstr ""
+msgstr "fatal: perintah '%s' mati dengan kode keluar %d"
 
-#: git-send-email.perl:235
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
-msgstr ""
+msgstr "penyunting keluar dengan kotor, membatalkan semua"
 
-#: git-send-email.perl:321
+#: git-send-email.perl:346
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
-msgstr ""
+msgstr "'%s' berisi versi menengah dari email yang Anda buat.\n"
 
-#: git-send-email.perl:326
+#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
-msgstr ""
+msgstr "'%s.final' berisi email yang dibuat.\n"
 
-#: git-send-email.perl:419
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
-msgstr ""
+msgstr "--dump-aliases tidak kompatibel dengan opsi yang lain\n"
 
-#: git-send-email.perl:493
+#: 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: opsi konfigurasi untuk 'sendmail' ditemukan\n"
+"git-send-email dikonfigurasikan dengan opsi sendemail.* - catat 'e'.\n"
+"Setel sendemail.forbidSendmailVariables ke false untuk menonaktifkan "
+"pemeriksaan ini.\n"
 
-#: git-send-email.perl:498 git-send-email.perl:700
+#: git-send-email.perl:566 git-send-email.perl:782
 msgid "Cannot run git format-patch from outside a repository\n"
-msgstr ""
+msgstr "tidak dapat menjalankan git format-patch diluar repositori\n"
 
-#: git-send-email.perl:501
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
 msgstr ""
+"`batch-size` dan `relogin` harus disebutkan bersamaan (lewat baris perintah "
+"atau opsi konfigurasi)\n"
 
-#: git-send-email.perl:514
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
-msgstr ""
+msgstr "Bidang --suppress-cc tidak dikenal: '%s'\n"
 
-#: git-send-email.perl:545
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
-msgstr ""
+msgstr "Setelan --confirm tidak dikenal: '%s'\n"
 
-#: git-send-email.perl:573
+#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
-msgstr ""
+msgstr "peringatan: alias sendmail dengan kutipan tidak didukung: %s\n"
 
-#: git-send-email.perl:575
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
-msgstr ""
+msgstr "peringatan: `:include:` tidak didukung: %s\n"
 
-#: git-send-email.perl:577
+#: git-send-email.perl:657
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
-msgstr ""
+msgstr "peringatan: pengalihan `/file` atau `|pipe` tidak didukung: %s\n"
 
-#: git-send-email.perl:582
+#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
-msgstr ""
+msgstr "peringatan: baris sendmail tidak dikenal: %s\n"
 
-#: git-send-email.perl:666
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -25028,30 +25501,38 @@ msgid ""
 "    * Saying \"./%s\" if you mean a file; or\n"
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
+"Berkas '%s' ada tetapi bisa jadi itu rentang komit\n"
+"untuk membuat tambalan. Mohon disambiguasi dengan...\n"
+"\n"
+"    * Sebutkan \"./%s\" jika maksud Anda sebuah berkas; atau\n"
+"    * Berikan opsi --format-patch jika maksud Anda sebuah rentang.\n"
 
-#: git-send-email.perl:687
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
-msgstr ""
+msgstr "Gagal membuka direktori %s: %s"
 
-#: git-send-email.perl:720
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
 msgstr ""
+"\n"
+"Tidak ada berkas tambalan yang disebutkan!\n"
+"\n"
 
-#: git-send-email.perl:733
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
-msgstr ""
+msgstr "Tidak ada baris subjek di %s?"
 
-#: git-send-email.perl:743
+#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
-msgstr ""
+msgstr "Gagal membuka untuk menulis %s: %s"
 
-#: git-send-email.perl:754
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -25059,38 +25540,44 @@ msgid ""
 "\n"
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr ""
+"Baris yang diawali dengan \"GIT:\" akan dihapus.\n"
+"Pertimbangkan memasukkan diffstat keseluruhan atau daftar isi\n"
+"untuk tambalan yang Anda tulis.\n"
+"\n"
+"Bersihkan konten badan jika Anda tidak ingin mengirimkan rangkuman.\n"
 
-#: git-send-email.perl:778
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
-msgstr ""
+msgstr "Gagal membuka %s: %s"
 
-#: git-send-email.perl:795
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
-msgstr ""
+msgstr "Gagal membuka %s.final: %s"
 
-#: git-send-email.perl:838
+#: git-send-email.perl:922
 msgid "Summary email is empty, skipping it\n"
-msgstr ""
+msgstr "Surel rangkuman kosong, lewati\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:873
+#: git-send-email.perl:971
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
-msgstr ""
+msgstr "Anda yakin ingin menggunakan <%s> [y/N]? "
 
-#: git-send-email.perl:928
+#: 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:933
+#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr ""
+msgstr "Pengkodean 8bit apa yang harus saya sebut [UTF-8]? "
 
-#: git-send-email.perl:941
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -25098,38 +25585,45 @@ msgid ""
 "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
 "want to send.\n"
 msgstr ""
+"Menolak mengirim karena tambalan\n"
+"\t%s\n"
+"punya subjek templat '*** SUBJECT HERE ***'. Lewatkan --force jika Anda "
+"benar-benar ingin mengirim.\n"
 
-#: git-send-email.perl:960
+#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
-msgstr ""
+msgstr "Kepada siapa surel harus dikirim (jika ada)?"
 
-#: git-send-email.perl:978
+#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
-msgstr ""
+msgstr "fatal: alias '%s' diperluas ke dirinya sendiri\n"
 
-#: git-send-email.perl:990
+#: 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:1048 git-send-email.perl:1056
+#: git-send-email.perl:1150 git-send-email.perl:1158
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
-msgstr ""
+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:1060
+#: 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:1377
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
-msgstr ""
+msgstr "Jalur CA \"%s\" tidak ada"
 
-#: git-send-email.perl:1460
+#: 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"
@@ -25142,152 +25636,157 @@ msgid ""
 "    run 'git config --global sendemail.confirm auto'.\n"
 "\n"
 msgstr ""
+"    Daftar Cc diatas telah diperluas oleh alamat tambahan\n"
+"    yang ditemukan dalam pesan komit tambalan. Secara asali\n"
+"    send-email membisiki sebelum mengirim ketika ini terjadi.\n"
+"    Perilaku ini dikontrol oleh setelan konfigurasi sendemail.confirm.\n"
+"\n"
+"    Untuk informasi lebih lanjut, jalankan 'git send-email --help'.\n"
+"    Untuk menjaga perilaku saat ini, tetapi mematikan pesan ini,\n"
+"    jalankan 'git config --global sendemail.confirm auto'.\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:1475
+#: git-send-email.perl:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
-msgstr ""
+msgstr "Kirim surel ini? ([y]a|[n] tidak|[e] sunting|[q] keluar|semu[a]): "
 
-#: git-send-email.perl:1478
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
-msgstr ""
+msgstr "Balasan kirim surel ini diperlukan"
 
-#: git-send-email.perl:1506
+#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
-msgstr ""
+msgstr "Peladen SMTP yang diperlukan tidak dijelaskan dengan baik."
 
-#: git-send-email.perl:1553
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
-msgstr ""
+msgstr "Peladen tidak mendukung STARTTLS! %s"
 
-#: git-send-email.perl:1558 git-send-email.perl:1562
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
-msgstr ""
+msgstr "STARTTLS gagal! %s"
 
-#: git-send-email.perl:1571
+#: 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:1589
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
-msgstr ""
+msgstr "Gagal mengirim %s\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
-msgstr ""
+msgstr "Terkirim-kering %s\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
-msgstr ""
+msgstr "Terkirim %s\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
-msgstr ""
+msgstr "OK-kering. Log berkata:\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
-msgstr ""
+msgstr "OK. Log berkata:\n"
 
-#: git-send-email.perl:1606
+#: git-send-email.perl:1724
 msgid "Result: "
-msgstr ""
+msgstr "Hasil: "
 
-#: git-send-email.perl:1609
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
-msgstr ""
+msgstr "Hasil: OK\n"
 
-#: git-send-email.perl:1627
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
-msgstr ""
+msgstr "tidak dapat membuka berkas %s"
 
-#: git-send-email.perl:1674 git-send-email.perl:1694
+#: git-send-email.perl:1792 git-send-email.perl:1812
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
-msgstr ""
+msgstr "(mbox) Menambahkan cc: %s dari baris '%s'\n"
 
-#: git-send-email.perl:1680
+#: git-send-email.perl:1798
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
-msgstr ""
+msgstr "(mbox) Menambahkan to: %s dari baris '%s'\n"
 
-#: git-send-email.perl:1737
+#: git-send-email.perl:1855
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
-msgstr ""
+msgstr "(non-mbox) Menambahkan cc: %s dari baris '%s'\n"
 
-#: git-send-email.perl:1772
+#: git-send-email.perl:1890
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
-msgstr ""
+msgstr "(body) Menambahkan cc: %s dari baris '%s'\n"
 
-#: git-send-email.perl:1883
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
-msgstr ""
+msgstr "(%s) Tidak dapat menjalankan '%s'"
 
-#: git-send-email.perl:1890
+#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
-msgstr ""
+msgstr "(%s) Menambahkan %s: %s dari: '%s'\n"
 
-#: git-send-email.perl:1894
+#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
-msgstr ""
+msgstr "(%s) gagal menutup pipa ke '%s'"
 
-#: git-send-email.perl:1924
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
-msgstr ""
+msgstr "tidak dapat mengirim pesan sebagai 7bit"
 
-#: git-send-email.perl:1932
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
-msgstr ""
+msgstr "pengkodean transfer tidak valid"
 
-#: git-send-email.perl:1966
+#: 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: ditolak oleh kail sendemail-validate\n"
+"%s\n"
+"peringatan: tidak ada tambalan yang dikirimkan\n"
 
-#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039
+#: 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 ""
+msgstr "tidak dapat membuka %s: %s\n"
 
-#: git-send-email.perl:1979
+#: 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:%d lebih panjang dari 998 karakter\n"
+"peringatan: tidak ada tambalan yang dikirimkan\n"
 
-#: git-send-email.perl:1997
+#: git-send-email.perl:2126
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
-msgstr ""
+msgstr "Melewati %s dengan akhiran cadangan '%s'.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2001
+#: git-send-email.perl:2130
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
-msgstr ""
-
-#~ msgid "Already up to date. Yeeah!"
-#~ msgstr "Sudah terbaru. Ya!"
-
-#~ msgid ""
-#~ "the rebase.useBuiltin support has been removed!\n"
-#~ "See its entry in 'git help config' for details."
-#~ msgstr ""
-#~ "dukungan untuk rebase.useBuiltin sudah dihapus!\n"
-#~ "Lihat entri itu di 'git help config' untuk selengkapnya."
+msgstr "Anda benar-benar ingin mengirim %s? [y|N]: "
diff --git a/po/it.po b/po/it.po
index 8f793659f5..c31560834d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2994,7 +2994,7 @@ msgstr "Controllo connessione in corso"
 
 #: connected.c:120
 msgid "Could not run 'git rev-list'"
-msgstr "Impossibile eseguire 'git-rev-list'"
+msgstr "Impossibile eseguire 'git rev-list'"
 
 #: connected.c:144
 msgid "failed write to rev-list"
@@ -14953,7 +14953,7 @@ msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
 msgstr ""
-"--filter può essere usato solo con il remoto configurato nelle estensioni."
+"--filter può essere usato solo con il remoto configurato nelle extensions."
 "partialclone"
 
 #: builtin/fetch.c:1891
@@ -18722,7 +18722,7 @@ msgstr "impossibile accedere al commit %s"
 
 #: builtin/pull.c:894
 msgid "ignoring --verify-signatures for rebase"
-msgstr "ignoro --verify-signature per il rebase"
+msgstr "ignoro --verify-signatures per il rebase"
 
 #: builtin/pull.c:954
 msgid "Updating an unborn branch with changes added to the index."
@@ -19253,7 +19253,7 @@ msgstr ""
 
 #: builtin/rebase.c:474
 msgid "git rebase--interactive [<options>]"
-msgstr "git rebase --interactive [<opzioni>]"
+msgstr "git rebase--interactive [<opzioni>]"
 
 #: builtin/rebase.c:487 builtin/rebase.c:1382
 msgid "keep commits which start empty"
@@ -20073,7 +20073,7 @@ msgid ""
 "\t use --mirror=fetch or --mirror=push instead"
 msgstr ""
 "--mirror è pericoloso e deprecato; per favore\n"
-"\t usa invece --mirror-fetch o --mirror-push"
+"\t usa invece --mirror=fetch o --mirror=push"
 
 #: builtin/remote.c:148
 #, c-format
@@ -21746,7 +21746,7 @@ msgid "could not generate diff %s^!."
 msgstr "impossibile generare il diff %s^!"
 
 #: builtin/stash.c:422
-msgid "conflicts in index.Try without --index."
+msgid "conflicts in index. Try without --index."
 msgstr "ci sono conflitti nell'indice. Prova senza --index."
 
 #: builtin/stash.c:428
diff --git a/po/ko.po b/po/ko.po
index dcfe21c223..5d190e5238 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1702,7 +1702,7 @@ msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 "%s"
 msgstr ""
-"'diff.submodule' 설정 변수� 오류:\n"
+"'diff.dirstat' 설정 변수� 오류:\n"
 "%s'"
 
 #: diff.c:3823
@@ -1946,7 +1946,7 @@ msgstr "서버 버전� %.*s입니다"
 
 #: fetch-pack.c:1048
 msgid "Server does not support --shallow-since"
-msgstr "서버�서 --shallow-signed 옵션� 지�하지 않습니다"
+msgstr "서버�서 --shallow-since 옵션� 지�하지 않습니다"
 
 #: fetch-pack.c:1052
 msgid "Server does not support --shallow-exclude"
@@ -2261,12 +2261,12 @@ msgstr "(잘못� 커밋)\n"
 #: merge-recursive.c:320
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "'%s' 경로� 대해 addinfo_cache 실패. 병합 중지."
+msgstr "'%s' 경로� 대해 add_cacheinfo 실패. 병합 중지."
 
 #: merge-recursive.c:328
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr "'%s' 경로� 대해 addinfo_cache 새로 고침 실패. 병합 중지."
+msgstr "'%s' 경로� 대해 add_cacheinfo 새로 고침 실패. 병합 중지."
 
 #: merge-recursive.c:410
 msgid "error building trees"
@@ -8384,7 +8384,7 @@ msgstr "ê°’"
 
 #: builtin/config.c:156
 msgid "with --get, use default value when missing entry"
-msgstr "--wget 옵션�서, 해당 항목� 없으면 기본값� 사용합니다"
+msgstr "--get 옵션�서, 해당 항목� 없으면 기본값� 사용합니다"
 
 #: builtin/config.c:332
 #, c-format
@@ -10983,7 +10983,7 @@ msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
-"커밋 빼오기를 마치지 않았습니다. (COMMIT_PICK_HEAD 있�)\n"
+"커밋 빼오기를 마치지 않았습니다. (CHERRY_PICK_HEAD 있�)\n"
 "병합하기 전� 변경 사항� 커밋하십시오."
 
 #: builtin/merge.c:1257
@@ -12800,7 +12800,7 @@ msgstr ""
 #: builtin/remote.c:145
 #, c-format
 msgid "unknown mirror argument: %s"
-msgstr "알 수 없는 --mirror 옵션 ��: %s"
+msgstr "알 수 없는 mirror 옵션 ��: %s"
 
 #: builtin/remote.c:161
 msgid "fetch the remote branches"
@@ -13879,7 +13879,7 @@ msgstr "공통 �전 커밋 뒤� <n>개� 커밋� 표시합니다"
 
 #: builtin/show-branch.c:634
 msgid "synonym to more=-1"
-msgstr "--more=-1 옵션과 ��"
+msgstr "more=-1 옵션과 ��"
 
 #: builtin/show-branch.c:635
 msgid "suppress naming strings"
@@ -17858,7 +17858,7 @@ msgid ""
 msgstr ""
 "    위� Cc 목�� 패치 커밋 메시지� 들어 있는 추가 주소로\n"
 "    확장�니다. 기본값으로 확장�기 전� send-email�서\n"
-"    물어봅니다. �런 �작� sendmail.confirm 설정�서\n"
+"    물어봅니다. �런 �작� sendemail.confirm 설정�서\n"
 "    조정할 수 있습니다.\n"
 "\n"
 "    정보를 � 보려면, 'git send-email --help'를 실행하십시오.\n"
diff --git a/po/pl.po b/po/pl.po
index 6bb665e846..0ec127e14c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -58,58 +58,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-02-26 22:09+0800\n"
-"PO-Revision-Date: 2021-02-27 17:10+0100\n"
+"POT-Creation-Date: 2021-11-10 08:55+0800\n"
+"PO-Revision-Date: 2021-11-03 11:38+0100\n"
 "Last-Translator: Arusekk <arek_koz@o2.pl>\n"
 "Language-Team: Polish\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10"
-" || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 20.12.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 21.08.2\n"
 
-#: add-interactive.c:376
+#: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "HÄ™ (%s)?"
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
-#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
-#: builtin/rebase.c:1963
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
+#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: builtin/rebase.c:1642
 msgid "could not read index"
 msgstr "nie można odczytać indeksu"
 
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
 #: git-add--interactive.perl:294
 msgid "binary"
 msgstr "binarne"
 
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
 #: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "nic"
 
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
 #: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "brak zmian"
 
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Aktualizacja"
 
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
 #, c-format
 msgid "could not stage '%s'"
 msgstr "nie można przygotować „%s�"
 
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
 msgid "could not write index"
 msgstr "nie można zapisać indeksu"
 
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
 #, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
@@ -117,27 +117,27 @@ msgstr[0] "zaktualizowano %d ścieżkę\n"
 msgstr[1] "zaktualizowano %d ścieżki\n"
 msgstr[2] "zaktualizowano %d ścieżek\n"
 
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "uwaga: %s jest teraz nieśledzony.\n"
 
-#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295
-#: builtin/reset.c:145
+#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
+#: builtin/reset.c:151
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry nie powiodło się na ścieżce „%s�"
 
 # odwoływanie / wycofywanie
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Odwracanie"
 
-#: add-interactive.c:775
+#: add-interactive.c:779
 msgid "Could not parse HEAD^{tree}"
 msgstr "Nie można przetworzyć HEAD^{tree}"
 
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
 #, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
@@ -145,16 +145,16 @@ msgstr[0] "odwrócono %d ścieżkę\n"
 msgstr[1] "odwrócono %d ścieżki\n"
 msgstr[2] "odwrócono %d ścieżek\n"
 
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "Brak nieśledzonych plików.\n"
 
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Dodaj nieśledzone"
 
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
 #, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
@@ -162,124 +162,125 @@ msgstr[0] "dodano %d ścieżkę\n"
 msgstr[1] "dodano %d ścieżki\n"
 msgstr[2] "dodano %d ścieżek\n"
 
-#: add-interactive.c:925
+#: add-interactive.c:929
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "pomijanie niescalonego: %s"
 
-#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Zmiany tylko w plikach binarnych.\n"
 
-#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
 #, c-format
 msgid "No changes.\n"
 msgstr "Brak zmian.\n"
 
-#: add-interactive.c:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1379
 msgid "Patch update"
 msgstr "Aktualizacja Å‚atki"
 
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1792
 msgid "Review diff"
 msgstr "Przejrzyj zmiany"
 
-#: add-interactive.c:1010
+#: add-interactive.c:1014
 msgid "show paths with changes"
 msgstr "pokaż ścieżkę ze zmianami"
 
-#: add-interactive.c:1012
+#: add-interactive.c:1016
 msgid "add working tree state to the staged set of changes"
 msgstr "dodaj stan drzewa roboczego do przygotowanego zestawu zmian"
 
-#: add-interactive.c:1014
+#: add-interactive.c:1018
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "przywróć przygotowany zestaw zmian do wersji HEAD"
 
-#: add-interactive.c:1016
+#: add-interactive.c:1020
 msgid "pick hunks and update selectively"
 msgstr "wybierz skrawki i zaktualizuj wybiórczo"
 
-#: add-interactive.c:1018
+#: add-interactive.c:1022
 msgid "view diff between HEAD and index"
 msgstr "wyświetl różnice między HEAD i indeksem"
 
-#: add-interactive.c:1020
+#: add-interactive.c:1024
 msgid "add contents of untracked files to the staged set of changes"
 msgstr "dodaj zawartość nieśledzonych plików do przygotowanego zestawu zmian"
 
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
 msgid "Prompt help:"
 msgstr "Pomoc do zachęty:"
 
-#: add-interactive.c:1030
+#: add-interactive.c:1034
 msgid "select a single item"
 msgstr "wybierz pojedynczy element"
 
-#: add-interactive.c:1032
+#: add-interactive.c:1036
 msgid "select a range of items"
 msgstr "wybierz zakres elementów"
 
-#: add-interactive.c:1034
+#: add-interactive.c:1038
 msgid "select multiple ranges"
 msgstr "wybierz wiele zakresów"
 
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
 msgid "select item based on unique prefix"
 msgstr "wybierz element na podstawie jednoznacznego poczÄ…tku"
 
-#: add-interactive.c:1038
+#: add-interactive.c:1042
 msgid "unselect specified items"
 msgstr "odznacz podane elementy"
 
-#: add-interactive.c:1040
+#: add-interactive.c:1044
 msgid "choose all items"
 msgstr "wybierz wszystkie elementy"
 
-#: add-interactive.c:1042
+#: add-interactive.c:1046
 msgid "(empty) finish selecting"
 msgstr "(puste) zakończ zaznaczanie"
 
-#: add-interactive.c:1079
+#: add-interactive.c:1083
 msgid "select a numbered item"
 msgstr "wybierz kolejny element"
 
-#: add-interactive.c:1083
+#: add-interactive.c:1087
 msgid "(empty) select nothing"
 msgstr "(puste) nic nie wybieraj"
 
-#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
 msgid "*** Commands ***"
 msgstr "*** Polecenia ***"
 
-#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
 msgid "What now"
 msgstr "Co teraz"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "staged"
 msgstr "przygotowane"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "nieprzygotowane"
 
-#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
-#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
-#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818
-#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
-#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
+#: 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
 #: git-add--interactive.perl:213
 msgid "path"
 msgstr "ścieżka"
 
-#: add-interactive.c:1151
+#: add-interactive.c:1155
 msgid "could not refresh index"
 msgstr "nie można odświeżyć indeksu"
 
-#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
 #, c-format
 msgid "Bye.\n"
 msgstr "Do zobaczenia.\n"
@@ -581,34 +582,34 @@ msgstr ""
 "a - zastosuj ten skrawek i wszystkie kolejne w tym pliku\n"
 "d - nie stosuj tego skrawka ani żadnych kolejnych w tym pliku\n"
 
-#: add-patch.c:342
+#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "nie można przetworzyć nagłówka skrawka „%.*s�"
 
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "nie można przetworzyć nagłówka kolorowego skrawka „%.*s�"
 
-#: add-patch.c:419
+#: add-patch.c:420
 msgid "could not parse diff"
 msgstr "nie można przetworzyć różnic"
 
-#: add-patch.c:438
+#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr "nie można przetworzyć kolorowych różnic"
 
-#: add-patch.c:452
+#: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
 msgstr "nie można wykonać „%s�"
 
-#: add-patch.c:611
+#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
 msgstr "błędne wyjście z interactive.diffFilter"
 
-#: add-patch.c:612
+#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -616,7 +617,7 @@ msgstr ""
 "Twój filtr musi zachować odpowiedniość jeden do jednego\n"
 "między wierszami z wejścia i wyjścia."
 
-#: add-patch.c:790
+#: add-patch.c:791
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -625,7 +626,7 @@ msgstr ""
 "oczekiwano wiersza kontekstu nr %d w\n"
 "%.*s"
 
-#: add-patch.c:805
+#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -638,11 +639,11 @@ msgstr ""
 "\tnie kończy się na:\n"
 "%.*s"
 
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Tryb ręcznej edycji skrawka — zobacz szybki przewodnik na dole.\n"
 
-#: add-patch.c:1085
+#: add-patch.c:1086
 #, c-format
 msgid ""
 "---\n"
@@ -656,7 +657,7 @@ msgstr ""
 "Wiersze zaczynające się od %c zostaną usunięte.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -666,11 +667,11 @@ msgstr ""
 "zmienić.  Jeśli wszystkie wiersze skrawka zostaną usunięte, edycja\n"
 "będzie przerwana, a skrawek niezmieniony.\n"
 
-#: add-patch.c:1132
+#: add-patch.c:1133
 msgid "could not parse hunk header"
 msgstr "nie można przetworzyć nagłówka skrawka"
 
-#: add-patch.c:1177
+#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr "„git apply --cached� nie powiodło się"
 
@@ -686,26 +687,26 @@ msgstr "„git apply --cached� nie powiodło się"
 #. 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:1246 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1242
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
 "Zmieniony skrawek się nie stosuje.  Edytować ponownie (odpowiedź „nie� go "
 "porzuci!) [y/n]? "
 
-#: add-patch.c:1289
+#: add-patch.c:1290
 msgid "The selected hunks do not apply to the index!"
 msgstr "Wybrane skrawki nie stosujÄ… siÄ™ do indeksu!"
 
-#: add-patch.c:1290 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1346
 msgid "Apply them to the worktree anyway? "
 msgstr "Zastosować je do drzewa roboczego mimo to? "
 
-#: add-patch.c:1297 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1349
 msgid "Nothing was applied.\n"
 msgstr "Nic nie zastosowano.\n"
 
-#: add-patch.c:1354
+#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -729,32 +730,32 @@ msgstr ""
 "e - ręcznie zmień bieżący skrawek\n"
 "? - wypisz pomoc\n"
 
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
 msgstr "Nie ma poprzedniego skrawka"
 
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
 msgstr "Nie ma następnego skrawka"
 
-#: add-patch.c:1537
+#: add-patch.c:1538
 msgid "No other hunks to goto"
 msgstr "Nie ma innych skrawków do przejścia"
 
-#: add-patch.c:1548 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1606
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "przejść do którego skrawka (<enter> aby zobaczyć więcej)? "
 
-#: add-patch.c:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1608
 msgid "go to which hunk? "
 msgstr "przejść do którego skrawka? "
 
-#: add-patch.c:1560
+#: add-patch.c:1561
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Nieprawidłowa liczba: „%s�"
 
-#: add-patch.c:1565
+#: add-patch.c:1566
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
@@ -762,41 +763,41 @@ msgstr[0] "Niestety dostępny jest tylko %d skrawek."
 msgstr[1] "Niestety dostępne są tylko %d skrawki."
 msgstr[2] "Niestety dostępnych jest tylko %d skrawków."
 
-#: add-patch.c:1574
+#: add-patch.c:1575
 msgid "No other hunks to search"
 msgstr "Nie ma innych skrawków do wyszukania"
 
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1661
 msgid "search for regex? "
 msgstr "wyszukaj wyrażenie regularne? "
 
-#: add-patch.c:1595
+#: add-patch.c:1596
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Nieprawidłowe wyrażenie regularne %s: %s"
 
-#: add-patch.c:1612
+#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
 msgstr "Żaden skrawek nie pasuje do podanego wzorca"
 
-#: add-patch.c:1619
+#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
 msgstr "Niestety nie można podzielić tego skrawka"
 
-#: add-patch.c:1623
+#: add-patch.c:1624
 #, c-format
 msgid "Split into %d hunks."
 msgstr "Podzielono na %d skrawków."
 
-#: add-patch.c:1627
+#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
 msgstr "Niestety nie można zmienić tego skrawka"
 
-#: add-patch.c:1679
+#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr "„git apply� nie powiodło się"
 
-#: advice.c:143
+#: advice.c:78
 #, c-format
 msgid ""
 "\n"
@@ -805,37 +806,37 @@ msgstr ""
 "\n"
 "Wyłącz ten komunikat przez „git config advice.%s false�"
 
-#: advice.c:159
+#: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%spodpowiedź: %.*s%s\n"
 
-#: advice.c:250
+#: advice.c:178
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "Dobieranie nie jest możliwe, ponieważ istnieją niescalone pliki."
 
-#: advice.c:252
+#: advice.c:180
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Składanie nie jest możliwe, ponieważ istnieją niescalone pliki."
 
-#: advice.c:254
+#: advice.c:182
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Scalanie jest możliwe, ponieważ istnieją niescalone pliki."
 
-#: advice.c:256
+#: advice.c:184
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Zaciąganie jest możliwe, ponieważ istnieją niescalone pliki."
 
-#: advice.c:258
+#: advice.c:186
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Odwracanie jest możliwe, ponieważ istnieją niescalone pliki."
 
-#: advice.c:260
+#: advice.c:188
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "Nie można wykonać %s, ponieważ istnieją niescalone pliki."
 
-#: advice.c:268
+#: 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."
@@ -843,23 +844,48 @@ msgstr ""
 "Napraw je w drzewie roboczym, i użyj odpowiednio „git add/rm <plik>�,\n"
 "aby oznaczyć rozwiązanie i złożyć zapis."
 
-#: advice.c:276
+#: advice.c:204
 msgid "Exiting because of an unresolved conflict."
 msgstr "Wyjście z powodu nierozwiązanego konfliktu."
 
-#: advice.c:281 builtin/merge.c:1370
+#: advice.c:209 builtin/merge.c:1379
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Nie zwieńczono scalania (MERGE_HEAD istnieje)."
 
-#: advice.c:283
+#: advice.c:211
 msgid "Please, commit your changes before merging."
 msgstr "Złóż swoje zmiany przez scalaniem."
 
-#: advice.c:284
+#: advice.c:212
 msgid "Exiting because of unfinished merge."
 msgstr "Wyjście z powodu niedokończonego scalania."
 
-#: advice.c:290
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "Nie da się przewinąć, przerywanie."
+
+#: advice.c:227
+#, 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 ""
+"Następujące ścieżki dopasowano do ścieżek istniejących poza\n"
+"definicją rzadkiego wybrania, więc nie zostaną zaktualizowane\n"
+"w indeksie:\n"
+
+#: advice.c:234
+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 ""
+"Jeśli chcesz zaktualizować takie elementy, spróbuj jednego z poniższych:\n"
+"* Użyj opcji --sparse.\n"
+"* Wyłącz lub zmień zasady rzadkości."
+
+#: advice.c:242
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -911,83 +937,79 @@ msgstr "wiersz poleceń kończy się na \\"
 msgid "unclosed quote"
 msgstr "niezamknięty cudzysłów"
 
-#: apply.c:69
+#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "Nierozpoznana opcja z białych znaków: „%s�"
 
-#: apply.c:85
+#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "nierozpoznana opcja ignorowania z białych znaków: „%s�"
 
-#: apply.c:135
+#: apply.c:136
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject i --3way wykluczajÄ… siÄ™."
 
-#: apply.c:137
-msgid "--cached and --3way cannot be used together."
-msgstr "--cached i --3way wykluczajÄ… siÄ™."
-
-#: apply.c:140
+#: apply.c:139
 msgid "--3way outside a repository"
 msgstr "--3way poza repozytorium"
 
-#: apply.c:151
+#: apply.c:150
 msgid "--index outside a repository"
 msgstr "--index poza repozytorium"
 
-#: apply.c:154
+#: apply.c:153
 msgid "--cached outside a repository"
 msgstr "--cached poza repozytorium"
 
-#: apply.c:801
+#: apply.c:800
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Nie można przygotować wyrażenia regularnego znacznika czasu %s"
 
-#: apply.c:810
+#: apply.c:809
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec zwrócił %d dla wejścia: %s"
 
-#: apply.c:884
+#: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "nie znaleziono nazwy pliku w Å‚atce w wierszu %d"
 
-#: apply.c:922
+#: apply.c:921
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 "git apply: zły git-diff — oczekiwano /dev/null, znaleziono %s w wierszu %d"
 
-#: apply.c:928
+#: apply.c:927
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply: zły git-diff — niespójna nowa nazwa pliku w wierszu %d"
 
-#: apply.c:929
+#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply: zły git-diff — niespójna stara nazwa pliku w wierszu %d"
 
-#: apply.c:934
+#: apply.c:933
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: zły git-diff — oczekiwano /dev/null w wierszu %d"
 
-#: apply.c:963
+#: apply.c:962
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "błędny tryb w wierszu %d: %s"
 
-#: apply.c:1282
+#: apply.c:1281
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "niespójne wiersze nagłówka %d i %d"
 
-#: apply.c:1372
+#: apply.c:1371
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -1005,45 +1027,45 @@ msgstr[2] ""
 "w nagłówku git diff brakuje informacji o nazwach plików po usunięciu %d "
 "wiodących komponentów ścieżki (wiersz %d)"
 
-#: apply.c:1385
+#: apply.c:1384
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "w nagłówku git diff brakuje informacji o nazwie pliku (wiersz %d)"
 
-#: apply.c:1481
+#: apply.c:1480
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "przeliczanie: nieoczekiwany wiersz: %.*s"
 
-#: apply.c:1550
+#: apply.c:1549
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "fragment łatki bez nagłówka w wierszu %d: %.*s"
 
-#: apply.c:1753
+#: apply.c:1752
 msgid "new file depends on old contents"
 msgstr "nowy plik zależy od starej zawartości"
 
-#: apply.c:1755
+#: apply.c:1754
 msgid "deleted file still has contents"
 msgstr "usunięty plik nadal ma zawartość"
 
-#: apply.c:1789
+#: apply.c:1788
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "uszkodzona Å‚atka w wierszu %d"
 
-#: apply.c:1826
+#: apply.c:1825
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "nowy plik %s zależy od starej zawartości"
 
-#: apply.c:1828
+#: apply.c:1827
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "usunięty plik %s nadal ma zawartość"
 
-#: apply.c:1831
+#: apply.c:1830
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** ostrzeżenie: plik %s staje się pusty, ale nie jest usunięty"
@@ -1155,7 +1177,7 @@ msgstr "łatanie nie powiodło się: %s:%ld"
 msgid "cannot checkout %s"
 msgstr "nie można wybrać %s"
 
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 pack-revindex.c:213
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
 #: setup.c:308
 #, c-format
 msgid "failed to read %s"
@@ -1166,182 +1188,186 @@ msgstr "nie można odczytać %s"
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "czytanie z „%s� przechodzącego przez dowiązanie"
 
-#: apply.c:3442 apply.c:3685
+#: apply.c:3442 apply.c:3709
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "ścieżka %s została przeniesiona/usunięta"
 
-#: apply.c:3528 apply.c:3700
+#: apply.c:3549 apply.c:3724
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: brak w indeksie"
 
-#: apply.c:3537 apply.c:3708 apply.c:3952
+#: apply.c:3558 apply.c:3732 apply.c:3976
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: nie pasuje do indeksu"
 
-#: apply.c:3572
-msgid "repository lacks the necessary blob to fall back on 3-way merge."
-msgstr ""
-"w repozytorium brakuje blobu, potrzebnego żeby uciec się do trójstronnego "
-"scalania."
+#: apply.c:3593
+msgid "repository lacks the necessary blob to perform 3-way merge."
+msgstr "w repozytorium brakuje blobu koniecznego do trójstronnego scalania."
 
-#: apply.c:3575
+#: apply.c:3596
 #, c-format
-msgid "Falling back to three-way merge...\n"
-msgstr "Uciekanie się do trójstronnego scalania...\n"
+msgid "Performing three-way merge...\n"
+msgstr "Trójstronne scalanie...\n"
 
-#: apply.c:3591 apply.c:3595
+#: apply.c:3612 apply.c:3616
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "nie można odczytać bieżącej zawartości „%s�"
 
-#: apply.c:3607
+#: apply.c:3628
 #, c-format
-msgid "Failed to fall back on three-way merge...\n"
-msgstr "Nie można uciec się do trójstronnego scalania...\n"
+msgid "Failed to perform three-way merge...\n"
+msgstr "Nie można wykonać trójstronnego scalania...\n"
 
-#: apply.c:3621
+#: apply.c:3642
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Zastosowano łatkę do „%s� z konfliktami\n"
 
-#: apply.c:3626
+#: apply.c:3647
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Gładko zastosowano łatkę do „%s�.\n"
 
-#: apply.c:3652
+#: apply.c:3664
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "Uciekanie się do bezpośredniego zastosowania...\n"
+
+#: apply.c:3676
 msgid "removal patch leaves file contents"
 msgstr "łatka usuwająca pozostawia zawartość pliku"
 
-#: apply.c:3725
+#: apply.c:3749
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: nieprawidłowy rodzaj"
 
-#: apply.c:3727
+#: apply.c:3751
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s jest rodzaju %o, oczekiwano %o"
 
-#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
-#: read-cache.c:1313
+#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
+#: read-cache.c:1368
 #, c-format
 msgid "invalid path '%s'"
 msgstr "nieprawidłowa ścieżka „%s�"
 
-#: apply.c:3950
+#: apply.c:3974
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: już widnieje w indeksie"
 
-#: apply.c:3954
+#: apply.c:3978
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: już istnieje w katalogu roboczym"
 
-#: apply.c:3974
+#: apply.c:3998
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "nowy tryb (%o) %s nie pasuje do starego trybu (%o)"
 
-#: apply.c:3979
+#: apply.c:4003
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "nowy tryb (%o) %s nie pasuje do starego trybu (%o) %s"
 
-#: apply.c:3999
+#: apply.c:4023
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "dotknięty plik „%s� jest pod dowiązaniem"
 
-#: apply.c:4003
+#: apply.c:4027
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: Å‚atka siÄ™ nie stosuje"
 
-#: apply.c:4018
+#: apply.c:4042
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Sprawdzanie Å‚atki %s..."
 
-#: apply.c:4110
+#: apply.c:4134
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
-msgstr "brakuje informacji SHA-1 lub jest bezużyteczna w pod-module %s"
+msgstr "brakuje informacji SHA-1 lub jest bezużyteczna w podmodule %s"
 
-#: apply.c:4117
+#: apply.c:4141
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "zmiana trybu w %s, który nie jest w bieżącym HEAD"
 
-#: apply.c:4120
+#: apply.c:4144
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "brakuje informacji SHA-1 lub jest bezużyteczna (%s)."
 
-#: apply.c:4129
+#: apply.c:4153
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "nie można dodać %s do indeksu tymczasowego"
 
-#: apply.c:4139
+#: apply.c:4163
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "nie można zapisać indeksu tymczasowego w %s"
 
-#: apply.c:4277
+#: apply.c:4301
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "nie można usunąć %s z indeksu"
 
-#: apply.c:4311
+#: apply.c:4335
 #, c-format
 msgid "corrupt patch for submodule %s"
-msgstr "uszkodzona łatka pod-modułu %s"
+msgstr "uszkodzona łatka podmodułu %s"
 
-#: apply.c:4317
+#: apply.c:4341
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "nie można wykonać stat na nowo utworzonym pliku „%s�"
 
-#: apply.c:4325
+#: apply.c:4349
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "nie można utworzyć wspierającego składu dla nowo utworzonego pliku %s"
 
-#: apply.c:4331 apply.c:4476
+#: apply.c:4355 apply.c:4500
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "nie można dodać %s do pamięci podręcznej"
 
-#: apply.c:4374 builtin/bisect--helper.c:523
+#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
+#: builtin/gc.c:2276
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "nie można pisać do „%s�"
 
-#: apply.c:4378
+#: apply.c:4402
 #, c-format
 msgid "closing file '%s'"
 msgstr "zamykanie pliku „%s�"
 
-#: apply.c:4448
+#: apply.c:4472
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "nie można ustawić w pliku „%s� trybu %o"
 
-#: apply.c:4546
+#: apply.c:4570
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "GÅ‚adko zastosowano Å‚atkÄ™ %s."
 
-#: apply.c:4554
+#: apply.c:4578
 msgid "internal error"
 msgstr "wewnętrzny błąd"
 
-#: apply.c:4557
+#: apply.c:4581
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
@@ -1349,45 +1375,45 @@ msgstr[0] "Stosowanie Å‚atki %%s z %d odrzuceniem..."
 msgstr[1] "Stosowanie Å‚atki %%s z %d odrzuceniami..."
 msgstr[2] "Stosowanie Å‚atki %%s z %d odrzuceniami..."
 
-#: apply.c:4568
+#: apply.c:4592
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "ucinanie nazwy pliku .rej do %.*s.rej"
 
-#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
+#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
 #, c-format
 msgid "cannot open %s"
 msgstr "nie można otworzyć %s"
 
-#: apply.c:4590
+#: apply.c:4614
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Skrawek nr %d gładko zastosowany."
 
-#: apply.c:4594
+#: apply.c:4618
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Odrzucono skrawek nr %d."
 
-#: apply.c:4718
+#: apply.c:4747
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Pominięto łatkę „%s�."
 
-#: apply.c:4726
+#: apply.c:4755
 msgid "unrecognized input"
 msgstr "nierozpoznawane wejście"
 
-#: apply.c:4746
+#: apply.c:4775
 msgid "unable to read index file"
 msgstr "nie można odczytać pliku indeksu"
 
-#: apply.c:4903
+#: apply.c:4932
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "nie można otworzyć łatki „%s�: %s"
 
-#: apply.c:4930
+#: apply.c:4959
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
@@ -1395,7 +1421,7 @@ msgstr[0] "zduszono %d błąd białych znaków"
 msgstr[1] "zduszono %d błędy białych znaków"
 msgstr[2] "zduszono %d błędów białych znaków"
 
-#: apply.c:4936 apply.c:4951
+#: apply.c:4965 apply.c:4980
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
@@ -1403,7 +1429,7 @@ msgstr[0] "%d wiersz dodaje błędy białych znaków."
 msgstr[1] "%d wiersze dodają błędy białych znaków."
 msgstr[2] "%d wierszy dodaje błędy białych znaków."
 
-#: apply.c:4944
+#: apply.c:4973
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1411,132 +1437,135 @@ msgstr[0] "Zastosowano %d wiersz po naprawieniu błędów białych znaków."
 msgstr[1] "Zastosowano %d wiersze po naprawieniu błędów białych znaków."
 msgstr[2] "Zastosowano %d wierszy po naprawieniu błędów białych znaków."
 
-#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
+#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
 msgid "Unable to write new index file"
 msgstr "Nie można zapisać nowego pliku indeksu"
 
-#: apply.c:4988
+#: apply.c:5017
 msgid "don't apply changes matching the given path"
 msgstr "nie stosuj zmian pasujących do podanej ścieżki"
 
-#: apply.c:4991
+#: apply.c:5020
 msgid "apply changes matching the given path"
 msgstr "zastosuj zmiany pasujące do podanej ścieżki"
 
-#: apply.c:4993 builtin/am.c:2266
+#: apply.c:5022 builtin/am.c:2320
 msgid "num"
 msgstr "ile"
 
-#: apply.c:4994
+#: apply.c:5023
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "usuń <ile> początkowych ukośników z tradycyjnych ścieżek diff"
 
-#: apply.c:4997
+#: apply.c:5026
 msgid "ignore additions made by the patch"
 msgstr "ignoruj wstawienia wykonywane przez Å‚atkÄ™"
 
-#: apply.c:4999
+#: apply.c:5028
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "zamiast stosować łatkę, wypisz statystyki różnic dla wejścia"
 
-#: apply.c:5003
+#: apply.c:5032
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "pokazuj liczbę dodanych i usuniętych wierszy w systemie dziesiętnym"
 
-#: apply.c:5005
+#: apply.c:5034
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "zamiast stosować łatkę, wypisz podsumowanie dla wejścia"
 
-#: apply.c:5007
+#: apply.c:5036
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "zamiast stosować łatkę, zobacz, czy się stosuje"
 
-#: apply.c:5009
+#: apply.c:5038
 msgid "make sure the patch is applicable to the current index"
 msgstr "upewnij się, że łatka ma zastosowanie do bieżącego indeksu"
 
-#: apply.c:5011
+#: apply.c:5040
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "oznacz nowe pliki przez „git add --intent-to-add�"
 
-#: apply.c:5013
+#: apply.c:5042
 msgid "apply a patch without touching the working tree"
 msgstr "zastosuj Å‚atkÄ™ bez dotykania drzewa roboczego"
 
-#: apply.c:5015
+#: apply.c:5044
 msgid "accept a patch that touches outside the working area"
 msgstr "przyjmuj łatkę, która wychodzi poza obszar roboczy"
 
-#: apply.c:5018
+#: apply.c:5047
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "zastosuj też łatkę (do użycia z --stat/--summary/--check)"
 
-#: apply.c:5020
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "spróbuj trójstronnego scalania, jeśli łatka się nie stosuje"
+#: apply.c:5049
+msgid "attempt three-way merge, fall back on normal patch if that fails"
+msgstr ""
+"spróbuj trójstronnego scalania, uciekając się do normalnego łatania, jeśli "
+"tamto zawiedzie"
 
-#: apply.c:5022
+#: apply.c:5051
 msgid "build a temporary index based on embedded index information"
 msgstr "zbuduj tymczasowy indeks oparty o wbudowane informacje indeksu"
 
-#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
+#: apply.c:5054 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "ścieżki są rozdzielone znakiem NUL"
 
-#: apply.c:5027
+#: apply.c:5056
 msgid "ensure at least <n> lines of context match"
 msgstr "zapewnij przynajmniej <n> wierszy dopasowanego kontekstu"
 
-#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
-#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
+#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: 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 "działanie"
 
-#: apply.c:5029
+#: apply.c:5058
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "wykryj nowe i zmienione wiersze, które mają błędy białych znaków"
 
-#: apply.c:5032 apply.c:5035
+#: apply.c:5061 apply.c:5064
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignoruj zmiany w białych znakach przy znajdywaniu kontekstu"
 
-#: apply.c:5038
+#: apply.c:5067
 msgid "apply the patch in reverse"
 msgstr "zastosuj łatkę na odwrót"
 
-#: apply.c:5040
+#: apply.c:5069
 msgid "don't expect at least one line of context"
 msgstr "nie oczekuj przynajmniej jednego wiersza kontekstu"
 
-#: apply.c:5042
+#: apply.c:5071
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "zostaw odrzucone skrawki w odpowiednich plikach *.rej"
 
-#: apply.c:5044
+#: apply.c:5073
 msgid "allow overlapping hunks"
 msgstr "zezwól, by skrawki na siebie nachodziły"
 
-#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
-#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
-#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
+#: 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 "więcej komunikatów"
 
-#: apply.c:5047
+#: apply.c:5076
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "toleruj nieprawidłowo wykryte brakujące znaki końca wiersza na końcu pliku"
 
-#: apply.c:5050
+#: apply.c:5079
 msgid "do not trust the line counts in the hunk headers"
 msgstr "nie ufaj liczbie wierszy w nagłówkach skrawków"
 
-#: apply.c:5052 builtin/am.c:2254
+#: apply.c:5081 builtin/am.c:2308
 msgid "root"
 msgstr "korzeń"
 
-#: apply.c:5053
+#: apply.c:5082
 msgid "prepend <root> to all filenames"
 msgstr "dodaj <korzeń> przed wszystkimi nazwami plików"
 
@@ -1574,7 +1603,7 @@ msgstr "ścieżka nie jest prawidłowym UTF-8: %s"
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "ścieżka za długa (%d znaków, SHA-1: %s): %s"
 
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
 msgstr "błąd kompresji (%d)"
@@ -1603,156 +1632,156 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repozytorium> [--exec <polecenie>] --list"
 
-#: archive.c:192
+#: archive.c:188
 #, c-format
 msgid "cannot read %s"
 msgstr "nie można odczytać %s"
 
-#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
-#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
-#: builtin/merge.c:1139
+#: 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 "nie można odczytać „%s�"
 
-#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
+#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "ścieżka „%s� nie pasuje do żadnych plików"
 
-#: archive.c:454
+#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "nie ma takiej referencji: %*.s"
 
-#: archive.c:460
+#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "nieprawidłowa nazwa obiektu: %s"
 
-#: archive.c:473
+#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "nie jest obiektem drzewa: %s"
 
-#: archive.c:485
+#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "bieżący katalog roboczy jest nieśledzony"
 
-#: archive.c:526
+#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Nie znaleziono pliku: %s"
 
-#: archive.c:528
+#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "Nie jest zwykłym plikiem: %s"
 
-#: archive.c:555
+#: archive.c:551
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:555
+#: archive.c:551
 msgid "archive format"
 msgstr "format archiwum"
 
-#: archive.c:556 builtin/log.c:1764
+#: archive.c:552 builtin/log.c:1775
 msgid "prefix"
 msgstr "prefiks"
 
-#: archive.c:557
+#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
 msgstr "dodaj prefiks przed każdą ścieżką w archiwum"
 
-#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
-#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+#: 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/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
 msgid "file"
 msgstr "plik"
 
-#: archive.c:559
+#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "dodaj nieśledzony plik do archiwum"
 
-#: archive.c:562 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
 msgid "write the archive to this file"
 msgstr "zapisz archiwum do tego pliku"
 
-#: archive.c:564
+#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "przeczytaj .gitattributes w katalogu roboczym"
 
-#: archive.c:565
+#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "zgłaszaj zarchiwizowane pliki na standardowe wyjście diagnostyczne"
 
-#: archive.c:567
+#: archive.c:563
 msgid "set compression level"
 msgstr "ustaw stopień kompresji"
 
-#: archive.c:570
+#: archive.c:566
 msgid "list supported archive formats"
 msgstr "wypisz wspierane formaty archiwów"
 
-#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
-#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+#: 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
 msgid "repo"
 msgstr "repozytorium"
 
-#: archive.c:573 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "pobierz archiwum ze zdalnego <repozytorium>"
 
-#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: builtin/notes.c:496
 msgid "command"
 msgstr "polecenie"
 
-#: archive.c:575 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
 msgid "path to the remote git-upload-archive command"
 msgstr "ścieżka do zdalnego polecenia git-upload-archive"
 
-#: archive.c:582
+#: archive.c:578
 msgid "Unexpected option --remote"
 msgstr "Nieoczekiwana opcja --remote"
 
-#: archive.c:584
+#: archive.c:580
 msgid "Option --exec can only be used together with --remote"
-msgstr "Opcja --exec może być użyta tylko z --remote"
+msgstr "Opcji --exec można użyć tylko z --remote"
 
-#: archive.c:586
+#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Nieoczekiwana opcja --output"
 
-#: archive.c:588
+#: archive.c:584
 msgid "Options --add-file and --remote cannot be used together"
 msgstr "Opcje --add-file i --remote siÄ™ wykluczajÄ…"
 
-#: archive.c:610
+#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Nieznany format archiwum „%s�"
 
-#: archive.c:619
+#: archive.c:615
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argument niewspierany w formacie „%s�: -%d"
 
-#: attr.c:202
+#: attr.c:203
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%*.s nie jest prawidłową nazwą atrybutu"
 
-#: attr.c:359
+#: attr.c:364
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s niedozwolone: %s:%d"
 
-#: attr.c:399
+#: attr.c:404
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1760,22 +1789,22 @@ msgstr ""
 "Negatywne wzorce sÄ… pomijane w atrybutach gita\n"
 "Użyj „\\!� dla dosłownego początkowego wykrzyknika."
 
-#: bisect.c:489
+#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Źle zacytowana zawartość w pliku „%s�: %s"
 
-#: bisect.c:699
+#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Nie można już przeszukiwać!\n"
 
-#: bisect.c:766
+#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "Nieprawidłowa nazwa zapisu %s"
 
-#: bisect.c:791
+#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1784,7 +1813,7 @@ msgstr ""
 "Podstawa scalania %s jest zła.\n"
 "To znaczy, że błąd naprawiono pomiędzy %s i [%s].\n"
 
-#: bisect.c:796
+#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1793,7 +1822,7 @@ msgstr ""
 "Podstawa scalenia %s jest nowa.\n"
 "Właściwość zmieniła się między %s i [%s].\n"
 
-#: bisect.c:801
+#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1802,7 +1831,7 @@ msgstr ""
 "Podstawa scalania %s jest %s.\n"
 "To znaczy, że pierwszy zapis „%s� jest pomiędzy %s i [%s].\n"
 
-#: bisect.c:809
+#: bisect.c:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1813,7 +1842,7 @@ msgstr ""
 "git bisect nie może w tym przypadku działać poprawnie.\n"
 "Może pomylono rewizje %s i %s?\n"
 
-#: bisect.c:822
+#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1824,36 +1853,36 @@ msgstr ""
 "Nie możemy być więc pewni, że pierwszy zapis %s jest między %s i %s.\n"
 "Kontynuowanie mimo to."
 
-#: bisect.c:861
+#: bisect.c:859
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Przeszukiwanie: podstawa scalenia musi być sprawdzona\n"
 
-#: bisect.c:911
+#: bisect.c:909
 #, c-format
 msgid "a %s revision is needed"
 msgstr "potrzebna jest rewizja %s"
 
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
+#: bisect.c:939
 #, c-format
 msgid "could not create file '%s'"
 msgstr "nie można utworzyć pliku „%s�"
 
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:154
 #, c-format
 msgid "could not read file '%s'"
 msgstr "nie można odczytać pliku „%s�"
 
-#: bisect.c:1027
+#: bisect.c:1025
 msgid "reading bisect refs failed"
 msgstr "nie można odczytać referencji przeszukiwania"
 
-#: bisect.c:1057
+#: bisect.c:1055
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s był jednocześnie %s i %s\n"
 
-#: bisect.c:1066
+#: bisect.c:1064
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1862,7 +1891,7 @@ msgstr ""
 "Nie znaleziono sprawdzalnego zapisu.\n"
 "Może zaczęto ze złymi argumentami ścieżek?\n"
 
-#: bisect.c:1095
+#: bisect.c:1093
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1873,7 +1902,7 @@ msgstr[2] "(około %d kroków)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1101
+#: bisect.c:1099
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1881,39 +1910,40 @@ msgstr[0] "Przeszukiwanie: pozostała %d rewizja do sprawdzenia %s\n"
 msgstr[1] "Przeszukiwanie: pozostały %d rewizje do sprawdzenia %s\n"
 msgstr[2] "Przeszukiwanie: pozostało %d rewizji do sprawdzenia %s\n"
 
-#: blame.c:2777
+#: blame.c:2776
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents i --reverse siÄ™ wykluczajÄ…."
 
-#: blame.c:2791
+#: blame.c:2790
 msgid "cannot use --contents with final commit object name"
 msgstr "--contents i nazwa obiektu ostatniego zapisu wykluczajÄ… siÄ™"
 
-#: blame.c:2812
+#: blame.c:2811
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse i --first-parent razem wymagajÄ… podanego ostatniego zapisu"
 
-#: blame.c:2821 bundle.c:213 ref-filter.c:2202 remote.c:2041 sequencer.c:2146
-#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
-#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
-#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: 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
+#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
 #: builtin/shortlog.c:255
 msgid "revision walk setup failed"
 msgstr "nie udało się przygotować przejścia rewizji"
 
-#: blame.c:2839
+#: blame.c:2838
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent razem wymagają zakresu wzdłuż łańcucha pierwszych "
 "rodziców"
 
-#: blame.c:2850
+#: blame.c:2849
 #, c-format
 msgid "no such path %s in %s"
 msgstr "nie ma ścieżki %s w %s"
 
-#: blame.c:2861
+#: blame.c:2860
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "nie można odczytać blobu %s ścieżki %s"
@@ -2053,51 +2083,51 @@ msgstr "Niejednoznaczna nazwa obiektu: „%s�."
 msgid "Not a valid branch point: '%s'."
 msgstr "Nieprawidłowy punkt rozgałęzienia: „%s�."
 
-#: branch.c:365
+#: branch.c:366
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "„%s� jest już wybrana w „%s�"
 
-#: branch.c:388
+#: branch.c:389
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "nie zaktualizowano HEAD drzewa roboczego %s"
 
-#: bundle.c:41
+#: bundle.c:44
 #, c-format
 msgid "unrecognized bundle hash algorithm: %s"
 msgstr "nierozpoznany algorytm skrótu wiązki: %s"
 
-#: bundle.c:45
+#: bundle.c:48
 #, c-format
 msgid "unknown capability '%s'"
 msgstr "nieznana zdolność (capability) „%s�"
 
-#: bundle.c:71
+#: bundle.c:74
 #, c-format
 msgid "'%s' does not look like a v2 or v3 bundle file"
 msgstr "„%s� nie wygląda jak plik wiązki v2 ani v3"
 
-#: bundle.c:110
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "nierozpoznany nagłówek: %s%s (%d)"
 
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
-#: builtin/commit.c:814
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: builtin/commit.c:862
 #, c-format
 msgid "could not open '%s'"
 msgstr "nie można otworzyć „%s�"
 
-#: bundle.c:189
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr "W repozytorium brakuje tych wymaganych zapisów:"
 
-#: bundle.c:192
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
 msgstr "należy podać repozytorium, aby sprawdzić wiązkę"
 
-#: bundle.c:243
+#: bundle.c:257
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
@@ -2105,11 +2135,11 @@ msgstr[0] "WiÄ…zka zawiera tÄ™ referencjÄ™:"
 msgstr[1] "WiÄ…zka zawiera te %d referencje:"
 msgstr[2] "WiÄ…zka zawiera tych %d referencji:"
 
-#: bundle.c:250
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "Wiązka zapisuje pełną historię."
 
-#: bundle.c:252
+#: bundle.c:266
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
@@ -2117,176 +2147,173 @@ msgstr[0] "WiÄ…zka potrzebuje tej referencji:"
 msgstr[1] "WiÄ…zka potrzebuje tych %d referencji:"
 msgstr[2] "WiÄ…zka potrzebuje tych %d referencji:"
 
-#: bundle.c:319
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "nie można wykonać dup deskryptora wiązki"
 
-#: bundle.c:326
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "Nie można uruchomić pack-objects"
 
-#: bundle.c:337
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "pack-objects padł"
 
-#: bundle.c:386
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "referencja „%s� jest wyłączona przez opcje listy rewizji"
 
-#: bundle.c:490
+#: bundle.c:504
 #, c-format
 msgid "unsupported bundle version %d"
 msgstr "nieobsługiwana wersja wiązki %d"
 
-#: bundle.c:492
+#: bundle.c:506
 #, c-format
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "nie można zapisać wersji wiązki %d z algorytmem %s"
 
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "nierozpoznany argument: %s"
 
-#: bundle.c:539
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "Odmawiam utworzenia pustej wiÄ…zki."
 
-#: bundle.c:549
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "nie można utworzyć „%s�"
 
-#: bundle.c:574
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "index-pack padł"
 
+#: chunk-format.c:117
+msgid "terminating chunk id appears earlier than expected"
+msgstr "kończący identyfikator kawałka występuje przedwcześnie"
+
+#: chunk-format.c:126
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "nieprawidłowe przesunięcie(a) kawałka %<PRIx64> i %<PRIx64>"
+
+#: chunk-format.c:133
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "znaleziono podwójny identyfikator kawałka %<PRIx32>"
+
+#: chunk-format.c:147
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "końcowy kawałek ma niezerowy identyfikator %<PRIx32>"
+
 #: color.c:329
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "nieprawidłowa wartość koloru: %.*s"
 
-#: commit-graph.c:198 midx.c:47
+#: commit-graph.c:204 midx.c:51
 msgid "invalid hash version"
 msgstr "nieprawidłowa wersja skrótu"
 
-#: commit-graph.c:219
-msgid "repository contains replace objects; skipping commit-graph"
-msgstr "repozytorium zawiera obiekty zamienne; pomijanie grafu zapisów"
-
-#: commit-graph.c:228
-msgid "repository contains (deprecated) grafts; skipping commit-graph"
-msgstr "repozytorium zawiera (przestarzałe) szczepki; pomijanie grafu zapisów"
-
-#: commit-graph.c:233
-msgid "repository is shallow; skipping commit-graph"
-msgstr "źródłowe repozytorium jest płytkie, pomijanie grafu zapisów"
-
-#: commit-graph.c:264
+#: commit-graph.c:262
 msgid "commit-graph file is too small"
 msgstr "plik grafu zapisów jest za mały"
 
-#: commit-graph.c:329
+#: commit-graph.c:355
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "podpis grafu zapisów %X nie zgadza się z podpisem %X"
 
-#: commit-graph.c:336
+#: commit-graph.c:362
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "wersja grafu zapisów %X nie zgadza się z wersją %X"
 
-#: commit-graph.c:343
+#: commit-graph.c:369
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "wersja skrótu grafu zapisów %X nie zgadza się z wersją %X"
 
-#: commit-graph.c:360
+#: commit-graph.c:386
 #, c-format
 msgid "commit-graph file is too small to hold %u chunks"
 msgstr "plik grafu zapisów jest za mały, żeby przechować %u kawałków"
 
-#: commit-graph.c:379
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "nieprawidłowe przesunięcie kawałka grafu zapisów %08x%08x"
-
-#: commit-graph.c:465
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "identyfikator kawałka grafu zapisów %08x pojawia się wiele razy"
-
-#: commit-graph.c:531
+#: commit-graph.c:482
 msgid "commit-graph has no base graphs chunk"
 msgstr "graf zapisów nie ma podstawowego kawałka grafów"
 
-#: commit-graph.c:541
+#: commit-graph.c:492
 msgid "commit-graph chain does not match"
 msgstr "łańcuch grafu zapisów się nie zgadza"
 
-#: commit-graph.c:589
+#: commit-graph.c:540
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr "nieprawidłowy łańcuch grafu zapisów: wiersz „%s� nie jest skrótem"
 
-#: commit-graph.c:613
+#: commit-graph.c:564
 msgid "unable to find all commit-graph files"
 msgstr "nie znaleziono wszystkich plików grafu zapisów"
 
-#: commit-graph.c:794 commit-graph.c:831
+#: commit-graph.c:746 commit-graph.c:783
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 "nieprawidłowa pozycja zapisu. Graf zapisów jest prawdopodobnie uszkodzony"
 
-#: commit-graph.c:815
+#: commit-graph.c:767
 #, c-format
 msgid "could not find commit %s"
 msgstr "nie znaleziono zapisu %s"
 
-#: commit-graph.c:848
+#: commit-graph.c:800
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "graf zapisów wymaga danych przepełnionych pokoleń, ale ich nie ma"
 
-#: commit-graph.c:1121 builtin/am.c:1292
+#: commit-graph.c:1105 builtin/am.c:1342
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "nie można przeanalizować zapisu %s"
 
-#: commit-graph.c:1378 builtin/pack-objects.c:2872
+#: commit-graph.c:1367 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "nie można uzyskać rodzaju obiektu %s"
 
-#: commit-graph.c:1409
+#: commit-graph.c:1398
 msgid "Loading known commits in commit graph"
 msgstr "�adowanie znanych zapisów w graf zapisów"
 
-#: commit-graph.c:1426
+#: commit-graph.c:1415
 msgid "Expanding reachable commits in commit graph"
 msgstr "Rozwijanie osiągalnych zapisów w grafie zapisów"
 
-#: commit-graph.c:1446
+#: commit-graph.c:1435
 msgid "Clearing commit marks in commit graph"
 msgstr "Czyszczenie znamion zapisów w grafie zapisów"
 
-#: commit-graph.c:1465
+#: commit-graph.c:1454
 msgid "Computing commit graph topological levels"
 msgstr "Obliczanie topologicznych poziomów grafu zapisów"
 
-#: commit-graph.c:1518
+#: commit-graph.c:1507
 msgid "Computing commit graph generation numbers"
 msgstr "Obliczanie numerów pokoleń grafu zapisów"
 
-#: commit-graph.c:1599
+#: commit-graph.c:1588
 msgid "Computing commit changed paths Bloom filters"
 msgstr "Obliczanie filtrów Blooma zmienionych ścieżek zapisu"
 
-#: commit-graph.c:1676
+#: commit-graph.c:1665
 msgid "Collecting referenced commits"
 msgstr "Zbieranie wspominanych zapisów"
 
-#: commit-graph.c:1701
+#: commit-graph.c:1690
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
@@ -2294,44 +2321,44 @@ msgstr[0] "Znajdywanie zapisów do grafu zapisów w %d paczce"
 msgstr[1] "Znajdywanie zapisów do grafu zapisów w %d paczkach"
 msgstr[2] "Znajdywanie zapisów do grafu zapisów w %d paczkach"
 
-#: commit-graph.c:1714
+#: commit-graph.c:1703
 #, c-format
 msgid "error adding pack %s"
 msgstr "błąd przy dodawaniu paczki %s"
 
-#: commit-graph.c:1718
+#: commit-graph.c:1707
 #, c-format
 msgid "error opening index for %s"
 msgstr "błąd otwierania indeksu dla %s"
 
-#: commit-graph.c:1755
+#: commit-graph.c:1744
 msgid "Finding commits for commit graph among packed objects"
 msgstr "Znajdywanie zapisów do grafu zapisów wśród spakowanych obiektów"
 
-#: commit-graph.c:1773
+#: commit-graph.c:1762
 msgid "Finding extra edges in commit graph"
 msgstr "Znajdywanie dodatkowych krawędzi w grafie zapisów"
 
-#: commit-graph.c:1821
+#: commit-graph.c:1811
 msgid "failed to write correct number of base graph ids"
 msgstr ""
 "nie można zapisać prawidłowej liczby podstawowych identyfikatorów grafu"
 
-#: commit-graph.c:1863 midx.c:819
+#: commit-graph.c:1842 midx.c:1146
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "nie można utworzyć wiodących katalogów %s"
 
-#: commit-graph.c:1876
+#: commit-graph.c:1855
 msgid "unable to create temporary graph layer"
 msgstr "nie można utworzyć tymczasowej warstwy grafu"
 
-#: commit-graph.c:1881
+#: commit-graph.c:1860
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "nie można dostroić współdzielonych uprawnień „%s�"
 
-#: commit-graph.c:1966
+#: commit-graph.c:1917
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
@@ -2339,86 +2366,86 @@ msgstr[0] "Wypisywanie grafu zapisów w %d przebiegu"
 msgstr[1] "Wypisywanie grafu zapisów w %d przebiegach"
 msgstr[2] "Wypisywanie grafu zapisów w %d przebiegach"
 
-#: commit-graph.c:2011
+#: commit-graph.c:1953
 msgid "unable to open commit-graph chain file"
 msgstr "nie można otworzyć pliku łańcucha grafu zapisów"
 
-#: commit-graph.c:2027
+#: commit-graph.c:1969
 msgid "failed to rename base commit-graph file"
 msgstr "nie można zmienić nazwy podstawowego pliku grafu zapisów"
 
-#: commit-graph.c:2047
+#: commit-graph.c:1989
 msgid "failed to rename temporary commit-graph file"
 msgstr "nie można zmienić nazwy tymczasowego pliku grafu zapisów"
 
-#: commit-graph.c:2180
+#: commit-graph.c:2122
 msgid "Scanning merged commits"
 msgstr "Skanowanie scalonych zapisów"
 
-#: commit-graph.c:2224
+#: commit-graph.c:2166
 msgid "Merging commit-graph"
 msgstr "Scalanie grafu zapisów"
 
-#: commit-graph.c:2331
+#: commit-graph.c:2274
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr "próba wypisania grafu zapisów, ale „core.commitGraph� jest wyłączone"
 
-#: commit-graph.c:2438
+#: commit-graph.c:2381
 msgid "too many commits to write graph"
 msgstr "za dużo zapisów, by wypisać graf"
 
-#: commit-graph.c:2536
+#: commit-graph.c:2479
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "plik grafu zapisów ma nieprawidłową sumę kontrolną i jest prawdopodobnie "
 "uszkodzony"
 
-#: commit-graph.c:2546
+#: commit-graph.c:2489
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "graf zapisów ma nieprawidłową kolejność OID: %s i wtedy %s"
 
-#: commit-graph.c:2556 commit-graph.c:2571
+#: commit-graph.c:2499 commit-graph.c:2514
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr "graf zapisów ma nieprawidłową wartość fanout: fanout[%d] = %u != %u"
 
-#: commit-graph.c:2563
+#: commit-graph.c:2506
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "nie można przetworzyć zapisu %s z grafu zapisów"
 
-#: commit-graph.c:2581
+#: commit-graph.c:2524
 msgid "Verifying commits in commit graph"
 msgstr "Sprawdzanie zapisów w grafie zapisów"
 
-#: commit-graph.c:2596
+#: commit-graph.c:2539
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "nie można przetworzyć zapisu %s z bazy danych obiektów do grafu zapisów"
 
-#: commit-graph.c:2603
+#: commit-graph.c:2546
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr "OID korzenia drzewa w zapisie %s w grafie zapisów to %s != %s"
 
-#: commit-graph.c:2613
+#: commit-graph.c:2556
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "lista rodziców grafu zapisów zapisu %s jest za długa"
 
-#: commit-graph.c:2622
+#: commit-graph.c:2565
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "rodzic grafu zapisów zapisu %s to %s != %s"
 
-#: commit-graph.c:2636
+#: commit-graph.c:2579
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "lista rodziców grafu zapisów zapisu %s kończy się przedwcześnie"
 
-#: commit-graph.c:2641
+#: commit-graph.c:2584
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2426,7 +2453,7 @@ msgstr ""
 "graf zapisów ma numer pokolenia zerowy w zapisie %s, ale niezerowy gdzie "
 "indziej"
 
-#: commit-graph.c:2645
+#: commit-graph.c:2588
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2434,29 +2461,29 @@ msgstr ""
 "graf zapisów ma numer pokolenia niezerowy w zapisie %s, ale zerowy gdzie "
 "indziej"
 
-#: commit-graph.c:2662
+#: commit-graph.c:2605
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr "pokolenie grafu zapisów zapisu %s to %<PRIuMAX> < %<PRIuMAX>"
 
-#: commit-graph.c:2668
+#: commit-graph.c:2611
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 "data złożenia w zapisie %s w grafie zapisów to %<PRIuMAX> != %<PRIuMAX>"
 
-#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
+#: 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
 #, c-format
 msgid "could not parse %s"
 msgstr "nie można przetworzyć „%s�"
 
-#: commit.c:54
+#: commit.c:55
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s nie jest zapisem!"
 
-#: commit.c:194
+#: commit.c:196
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -2476,27 +2503,27 @@ msgstr ""
 "Wyłącz ten komunikat uruchamiając\n"
 "„git config advice.graftFileDeprecated false�"
 
-#: commit.c:1223
+#: commit.c:1239
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "Zapis %s ma niezaufany podpis GPG rzekomo od %s."
 
-#: commit.c:1227
+#: commit.c:1243
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Zapis %s ma zły podpis GPG rzekomo od %s."
 
-#: commit.c:1230
+#: commit.c:1246
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Zapis %s nie ma podpisu GPG."
 
-#: commit.c:1233
+#: commit.c:1249
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Zapis %s ma dobry podpis GPG od %s\n"
 
-#: commit.c:1487
+#: commit.c:1503
 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"
@@ -2511,7 +2538,7 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "pamięć wyczerpana"
 
-#: config.c:126
+#: config.c:125
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -2526,35 +2553,35 @@ msgstr ""
 "\t%s\n"
 "Może to być spowodowane cyklicznymi załączeniami."
 
-#: config.c:142
+#: config.c:141
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "nie można rozwinąć ścieżki załączeń (include) „%s�"
 
-#: config.c:153
+#: config.c:152
 msgid "relative config includes must come from files"
 msgstr "względne załączenia konfiguracji muszą pochodzić z plików"
 
-#: config.c:199
+#: config.c:201
 msgid "relative config include conditionals must come from files"
 msgstr "względne warunkowe załączenia konfiguracji muszą pochodzić z plików"
 
-#: config.c:396
+#: config.c:398
 #, c-format
 msgid "invalid config format: %s"
 msgstr "nieprawidłowy format ustawień: %s"
 
-#: config.c:400
+#: config.c:402
 #, c-format
 msgid "missing environment variable name for configuration '%.*s'"
 msgstr "brak nazwy zmiennej środowiska dla ustawienia „%.*s�"
 
-#: config.c:405
+#: config.c:407
 #, c-format
 msgid "missing environment variable '%s' for configuration '%.*s'"
 msgstr "brak zmiennej środowiska „%s� dla ustawienia „%.*s�"
 
-#: config.c:442
+#: config.c:443
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "klucz nie zawiera rozdziału: %s"
@@ -2564,298 +2591,298 @@ msgstr "klucz nie zawiera rozdziału: %s"
 msgid "key does not contain variable name: %s"
 msgstr "klucz nie zawiera nazwy zmiennej: %s"
 
-#: config.c:472 sequencer.c:2588
+#: config.c:470 sequencer.c:2804
 #, c-format
 msgid "invalid key: %s"
 msgstr "nieprawidłowy klucz: %s"
 
-#: config.c:478
+#: config.c:475
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "błędny klucz (nowy wiersz): %s"
 
-#: config.c:511
+#: config.c:495
 msgid "empty config key"
 msgstr "pusty klucz ustawień"
 
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "fałszywy parametr konfiguracji: %s"
 
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
 #, c-format
 msgid "bogus format in %s"
 msgstr "fałszywy format %s"
 
-#: config.c:622
+#: config.c:606
 #, c-format
 msgid "bogus count in %s"
 msgstr "fałszywy licznik w %s"
 
-#: config.c:626
+#: config.c:610
 #, c-format
 msgid "too many entries in %s"
 msgstr "za dużo wpisów w %s"
 
-#: config.c:636
+#: config.c:620
 #, c-format
 msgid "missing config key %s"
 msgstr "brak klucza ustawień %s"
 
-#: config.c:644
+#: config.c:628
 #, c-format
 msgid "missing config value %s"
 msgstr "brakująca wartość ustawienia %s"
 
-#: config.c:995
+#: config.c:979
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "zły wiersz konfiguracji %d w blobie %s"
 
-#: config.c:999
+#: config.c:983
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "zły wiersz konfiguracji %d w pliku %s"
 
-#: config.c:1003
+#: config.c:987
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "zły wiersz konfiguracji %d na standardowym wejściu"
 
-#: config.c:1007
+#: config.c:991
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
-msgstr "zły wiersz konfiguracji %d w blobie pod-modułu %s"
+msgstr "zły wiersz konfiguracji %d w blobie podmodułu %s"
 
-#: config.c:1011
+#: config.c:995
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "zły wiersz konfiguracji %d w wierszu poleceń %s"
 
-#: config.c:1015
+#: config.c:999
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "zły wiersz konfiguracji %d w %s"
 
-#: config.c:1152
+#: config.c:1136
 msgid "out of range"
 msgstr "poza zakresem"
 
-#: config.c:1152
+#: config.c:1136
 msgid "invalid unit"
 msgstr "nieprawidłowa jednostka"
 
-#: config.c:1153
+#: config.c:1137
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "zła liczbowa wartość konfiguracji „%s� dla „%s�: %s"
 
-#: config.c:1163
+#: config.c:1147
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "zła liczbowa wartość konfiguracji „%s� dla „%s� w blobie %s: %s"
 
-#: config.c:1166
+#: config.c:1150
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "zła liczbowa wartość konfiguracji „%s� dla „%s� w pliku %s: %s"
 
-#: config.c:1169
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "zła liczbowa wartość konfiguracji „%s� dla „%s� na standardowym wejściu: %s"
 
-#: config.c:1172
+#: config.c:1156
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
-"zła liczbowa wartość konfiguracji „%s� dla „%s� w blobie pod-modułu %s: %s"
+"zła liczbowa wartość konfiguracji „%s� dla „%s� w blobie podmodułu %s: %s"
 
-#: config.c:1175
+#: config.c:1159
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "zła liczbowa wartość konfiguracji „%s� dla „%s� w wierszu poleceń %s: %s"
 
-#: config.c:1178
+#: config.c:1162
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "zła liczbowa wartość konfiguracji „%s� dla „%s� w %s: %s"
 
-#: config.c:1194
+#: config.c:1241
 #, c-format
 msgid "bad boolean config value '%s' for '%s'"
 msgstr "zła logiczna wartość konfiguracji „%s� w „%s�"
 
-#: config.c:1289
+#: config.c:1259
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "nie można rozwinąć katalogu użytkownika w: „%s�"
 
-#: config.c:1298
+#: config.c:1268
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "„%s� do „%s� nie jest prawidłowym znacznikiem czasu"
 
-#: config.c:1391
+#: config.c:1361
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "długość skrótu poza zakresem: %d"
 
-#: config.c:1405 config.c:1416
+#: config.c:1375 config.c:1386
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "zły stopień kompresji zlib %d"
 
-#: config.c:1508
+#: config.c:1476
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar powinno być tylko jednym znakiem"
 
-#: config.c:1541
+#: config.c:1509
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "nieprawidłowy tryb utworzenia obiektu: %s"
 
-#: config.c:1613
+#: config.c:1581
 #, c-format
 msgid "malformed value for %s"
 msgstr "nieprawidłowa wartość %s"
 
-#: config.c:1639
+#: config.c:1607
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "nieprawidłowa wartość %s: %s"
 
-#: config.c:1640
+#: config.c:1608
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "musi być jednym z nothing, matching, simple, upstream lub current"
 
-#: config.c:1701 builtin/pack-objects.c:3666
+#: config.c:1669 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "zły stopień kompresji paczki %d"
 
-#: config.c:1823
+#: config.c:1792
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "nie można wczytać konfiguracyjnego obiektu blobu „%s�"
 
-#: config.c:1826
+#: config.c:1795
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "referencja „%s� nie wskazuje blobu"
 
-#: config.c:1843
+#: config.c:1813
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "nie można rozwiązać blobu konfiguracji „%s�"
 
-#: config.c:1873
+#: config.c:1858
 #, c-format
 msgid "failed to parse %s"
 msgstr "nie można przetworzyć %s"
 
-#: config.c:1927
+#: config.c:1914
 msgid "unable to parse command-line config"
 msgstr "nie można przeanalizować konfiguracji wiersza poleceń"
 
-#: config.c:2290
+#: config.c:2282
 msgid "unknown error occurred while reading the configuration files"
 msgstr "wystąpił nieznany błąd podczas odczytywania plików konfiguracyjnych"
 
-#: config.c:2464
+#: config.c:2456
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Nieprawidłowy %s: „%s�"
 
-#: config.c:2509
+#: config.c:2501
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "wartość splitIndex.maxPercentChange „%d� powinna być pomiędzy 0 a 100"
 
-#: config.c:2555
+#: config.c:2547
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "nie można przetworzyć „%s� z konfiguracji wiersza poleceń"
 
-#: config.c:2557
+#: config.c:2549
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "zła zmienna konfiguracji „%s� w pliku „%s� w wierszu %d"
 
-#: config.c:2641
+#: config.c:2633
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nieprawidłowa nazwa rozdziału „%s�"
 
-#: config.c:2673
+#: config.c:2665
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s ma wiele wartości"
 
-#: config.c:2702
+#: config.c:2694
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "nie można zapisać nowego pliku konfiguracyjnego %s"
 
-#: config.c:2954 config.c:3280
+#: config.c:2946 config.c:3273
 #, c-format
 msgid "could not lock config file %s"
 msgstr "nie można zablokować pliku konfiguracyjnego %s"
 
-#: config.c:2965
+#: config.c:2957
 #, c-format
 msgid "opening %s"
 msgstr "otwieranie %s"
 
-#: config.c:3002 builtin/config.c:361
+#: config.c:2994 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "nieprawidłowy wzorzec: %s"
 
-#: config.c:3027
+#: config.c:3019
 #, c-format
 msgid "invalid config file %s"
 msgstr "nieprawidłowy plik konfiguracyjny %s"
 
-#: config.c:3040 config.c:3293
+#: config.c:3032 config.c:3286
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat na %s nie powiódł się"
 
-#: config.c:3051
+#: config.c:3043
 #, c-format
-msgid "unable to mmap '%s'"
-msgstr "nie można wykonać mmap „%s�"
+msgid "unable to mmap '%s'%s"
+msgstr "nie można wykonać mmap „%s�%s"
 
-#: config.c:3060 config.c:3298
+#: config.c:3053 config.c:3291
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod na %s nie powiodło się"
 
-#: config.c:3145 config.c:3395
+#: config.c:3138 config.c:3388
 #, c-format
 msgid "could not write config file %s"
 msgstr "nie można zapisać pliku konfiguracji %s"
 
-#: config.c:3179
+#: config.c:3172
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "nie można ustawić „%s� na „%s�"
 
-#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
 #, c-format
 msgid "could not unset '%s'"
 msgstr "nie można usunąć ustawienia „%s�"
 
-#: config.c:3271
+#: config.c:3264
 #, c-format
 msgid "invalid section name: %s"
 msgstr "nieprawidłowa nazwa rozdziału: %s"
 
-#: config.c:3438
+#: config.c:3431
 #, c-format
 msgid "missing value for '%s'"
 msgstr "brakująca wartość „%s�"
@@ -2890,72 +2917,72 @@ msgstr "serwer nie wspiera funkcji „%s�"
 msgid "expected flush after capabilities"
 msgstr "oczekiwano wypróżnienia po możliwościach (capabilities)"
 
-#: connect.c:263
+#: connect.c:265
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "pomijanie możliwości (capabilities) po pierwszym wierszu „%s�"
 
-#: connect.c:284
+#: connect.c:286
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "błąd protokołu: nieoczekiwane możliwości capabilities^{}"
 
-#: connect.c:306
+#: connect.c:308
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "błąd protokołu: oczekiwano płytkiego SHA-1, otrzymano „%s�"
 
-#: connect.c:308
+#: connect.c:310
 msgid "repository on the other end cannot be shallow"
 msgstr "repozytorium po drugiej stronie nie może być płytkie"
 
-#: connect.c:347
+#: connect.c:349
 msgid "invalid packet"
 msgstr "nieprawidłowy pakiet"
 
-#: connect.c:367
+#: connect.c:369
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "błąd protokołu: nieoczekiwane „%s�"
 
-#: connect.c:497
+#: connect.c:499
 #, c-format
 msgid "unknown object format '%s' specified by server"
 msgstr "serwer podał nieznany format obiektu „%s�"
 
-#: connect.c:526
+#: connect.c:528
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "nieprawidłowa odpowiedź ls-refs: %s"
 
-#: connect.c:530
+#: connect.c:532
 msgid "expected flush after ref listing"
 msgstr "oczekiwano wypróżnienia po wypisaniu referencji"
 
-#: connect.c:533
+#: connect.c:535
 msgid "expected response end packet after ref listing"
 msgstr "oczekiwano pakietu końca odpowiedzi po wypisaniu referencji"
 
-#: connect.c:666
+#: connect.c:670
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "protokół „%s� jest niewspierany"
 
-#: connect.c:717
+#: connect.c:721
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "nie można ustawić w gnieździe SO_KEEPALIVE"
 
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
 #, c-format
 msgid "Looking up %s ... "
 msgstr "Odnajdywanie %s ... "
 
-#: connect.c:761
+#: connect.c:765
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "nie można odnaleźć %s (port %s) (%s)"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
 #, c-format
 msgid ""
 "done.\n"
@@ -2964,7 +2991,7 @@ msgstr ""
 "gotowe.\n"
 "�ączenie z %s (port %s) ... "
 
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2974,93 +3001,94 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
 msgid "done."
 msgstr "gotowe."
 
-#: connect.c:824
+#: connect.c:828
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "nie odnaleziono %s (%s)"
 
-#: connect.c:830
+#: connect.c:834
 #, c-format
 msgid "unknown port %s"
 msgstr "nieznany port %s"
 
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "zablokowano dziwną nazwę hosta „%s�"
 
-#: connect.c:969
+#: connect.c:973
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "zablokowano dziwny port „%s�"
 
-#: connect.c:979
+#: connect.c:983
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "nie można uruchomić pośrednika %s"
 
-#: connect.c:1050
+#: connect.c:1054
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 "nie podano ścieżki; zobacz składnię prawidłowych adresów w „git help pull�"
 
-#: connect.c:1190
+#: connect.c:1194
 msgid "newline is forbidden in git:// hosts and repo paths"
 msgstr ""
-"nie można użyć znaku nowego wiersza w adresach git:// i ścieżkach repozytoriów"
+"nie można użyć znaku nowego wiersza w adresach git:// i ścieżkach "
+"repozytoriów"
 
-#: connect.c:1247
+#: connect.c:1251
 msgid "ssh variant 'simple' does not support -4"
 msgstr "wariant SSH „simple� nie wspiera -4"
 
-#: connect.c:1259
+#: connect.c:1263
 msgid "ssh variant 'simple' does not support -6"
 msgstr "wariant SSH „simple� nie wspiera -6"
 
-#: connect.c:1276
+#: connect.c:1280
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "wariant SSH „simple� nie wspiera ustawiania portu"
 
-#: connect.c:1388
+#: connect.c:1392
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "zablokowano dziwną ścieżkę „%s�"
 
-#: connect.c:1436
+#: connect.c:1440
 msgid "unable to fork"
 msgstr "nie można wykonać fork"
 
-#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr "Sprawdzanie spójności"
 
-#: connected.c:120
+#: connected.c:122
 msgid "Could not run 'git rev-list'"
 msgstr "Nie można wykonać „git rev-list�"
 
-#: connected.c:144
+#: connected.c:146
 msgid "failed write to rev-list"
 msgstr "nie można zapisać do rev-list"
 
-#: connected.c:149
+#: connected.c:151
 msgid "failed to close rev-list's stdin"
 msgstr "nie można zamknąć wejścia rev-list"
 
-#: convert.c:194
+#: convert.c:183
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "błędne działanie crlf_action %d"
 
-#: convert.c:207
+#: convert.c:196
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "CRLFy zostałyby zastąpione LFami w %s"
 
-#: convert.c:209
+#: convert.c:198
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -3069,12 +3097,12 @@ msgstr ""
 "CRLFy zostanÄ… zastÄ…pione LFami %s.\n"
 "Plik zachowa swoje pierwotne końce wiersza w katalogu roboczym"
 
-#: convert.c:217
+#: convert.c:206
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LFy zostałyby zastąpione CRLFami w %s"
 
-#: convert.c:219
+#: convert.c:208
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -3083,12 +3111,12 @@ msgstr ""
 "LFy zostanÄ… zastÄ…pione CRLFami %s.\n"
 "Plik zachowa swoje pierwotne końce wiersza w katalogu roboczym"
 
-#: convert.c:284
+#: convert.c:273
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "Znacznik kolejności bajtów zabroniony, jeśli „%s� zakodowano jako %s"
 
-#: convert.c:291
+#: convert.c:280
 #, c-format
 msgid ""
 "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
@@ -3097,12 +3125,12 @@ msgstr ""
 "Plik „%s� zawiera znacznik kolejności bajtów (BOM). Użyj UTF-%.*s jako "
 "kodowania drzewa roboczego."
 
-#: convert.c:304
+#: convert.c:293
 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
 msgstr "Znacznik kolejności bajtów wymagany, jeśli „%s� zakodowano jako %s"
 
-#: convert.c:306
+#: convert.c:295
 #, c-format
 msgid ""
 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -3111,50 +3139,50 @@ msgstr ""
 "W pliku „%s� brakuje znacznika kolejności bajtów (BOM). Użyj UTF-%sBE lub "
 "UTF-%sLE (zależnie od kolejności bajtów) jako kodowania drzewa roboczego."
 
-#: convert.c:419 convert.c:490
+#: convert.c:408 convert.c:479
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "nie można przekodować „%s� z %s na %s"
 
-#: convert.c:462
+#: convert.c:451
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "kodowanie „%s� z %s na %s i z powrotem nie jest tym samym"
 
-#: convert.c:665
+#: convert.c:654
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "nie można wykonać fork, by uruchomić zewnętrzny filtr „%s�"
 
-#: convert.c:685
+#: convert.c:674
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "nie można nakarmić wejściem zewnętrznego filtra „%s�"
 
-#: convert.c:692
+#: convert.c:681
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "zewnętrzny filtr „%s� nie powiódł się %d"
 
-#: convert.c:727 convert.c:730
+#: convert.c:716 convert.c:719
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "odczyt z zewnętrznego filtra „%s� nie powiódł się"
 
-#: convert.c:733 convert.c:788
+#: convert.c:722 convert.c:777
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "zewnętrzny filtr „%s� nie powiódł się"
 
-#: convert.c:837
+#: convert.c:826
 msgid "unexpected filter type"
 msgstr "nieoczekiwany rodzaj filtra"
 
-#: convert.c:848
+#: convert.c:837
 msgid "path name too long for external filter"
 msgstr "ścieżka zewnętrznego filtra za długa"
 
-#: convert.c:940
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -3163,16 +3191,16 @@ msgstr ""
 "zewnętrzny filtr „%s� nie jest już dostępny, chociaż nie wszystkie ścieżki "
 "zostały przefiltrowane"
 
-#: convert.c:1240
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false nie są prawidłowymi kodowaniami drzewa roboczego"
 
-#: convert.c:1428 convert.c:1462
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: filtr czyszczenia „%s� zawiódł"
 
-#: convert.c:1508
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: filtr smarowania %s zawiódł"
@@ -3190,17 +3218,17 @@ msgstr "odmawiam pracy z poświadczeniem bez pola maszyny (hosta)"
 msgid "refusing to work with credential missing protocol field"
 msgstr "odmawiam pracy z poświadczeniem bez pola protokołu"
 
-#: credential.c:394
+#: credential.c:395
 #, c-format
 msgid "url contains a newline in its %s component: %s"
 msgstr "adres URL zawiera znak nowego wiersza w komponencie %s: %s"
 
-#: credential.c:438
+#: credential.c:439
 #, c-format
 msgid "url has no scheme: %s"
 msgstr "adres URL nie ma schematu: %s"
 
-#: credential.c:511
+#: credential.c:512
 #, c-format
 msgid "credential url cannot be parsed: %s"
 msgstr "nie można przetworzyć poświadczenia adresu URL: %s"
@@ -3312,31 +3340,31 @@ msgstr "Oznaczono %d wysp, gotowe.\n"
 msgid "unknown value for --diff-merges: %s"
 msgstr "nierozpoznana wartość --diff-merges: %s"
 
-#: diff-lib.c:534
+#: diff-lib.c:561
 msgid "--merge-base does not work with ranges"
 msgstr "--merge-base nie działa z zakresami"
 
-#: diff-lib.c:536
+#: diff-lib.c:563
 msgid "--merge-base only works with commits"
 msgstr "--merge-base działa tylko z zapisami"
 
-#: diff-lib.c:553
+#: diff-lib.c:580
 msgid "unable to get HEAD"
 msgstr "nie można uzyskać HEAD"
 
-#: diff-lib.c:560
+#: diff-lib.c:587
 msgid "no merge base found"
 msgstr "nie znaleziono podstawy scalenia"
 
-#: diff-lib.c:562
+#: diff-lib.c:589
 msgid "multiple merge bases found"
 msgstr "znaleziono wiele podstaw scalenia"
 
-#: diff-no-index.c:238
+#: diff-no-index.c:237
 msgid "git diff --no-index [<options>] <path> <path>"
 msgstr "git diff --no-index [<opcje>] <ścieżka> <ścieżka>"
 
-#: diff-no-index.c:263
+#: diff-no-index.c:262
 msgid ""
 "Not a git repository. Use --no-index to compare two paths outside a working "
 "tree"
@@ -3344,17 +3372,17 @@ msgstr ""
 "To nie jest repozytorium gita. Użyj --no-index, aby porównać dwie ścieżki "
 "poza drzewem roboczym"
 
-#: diff.c:156
+#: diff.c:157
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Nie można przetworzyć procentu odcięcia dirstat „%s�\n"
 
-#: diff.c:161
+#: diff.c:162
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Nieznany parametr dirstat „%s�\n"
 
-#: diff.c:297
+#: diff.c:298
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -3362,7 +3390,7 @@ msgstr ""
 "ustawienie kolorowania przeniesień musi być jednym z „no�, „default�, "
 "„blocks�, „zebra�, „dimmed-zebra� czy „plain�"
 
-#: diff.c:325
+#: diff.c:326
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3372,7 +3400,7 @@ msgstr ""
 "change�, „ignore-space-at-eol�, „ignore-all-space�, „allow-indentation-"
 "change�"
 
-#: diff.c:333
+#: diff.c:334
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3380,12 +3408,12 @@ msgstr ""
 "color-moved-ws: allow-indentation-change nie może być łączone z innymi "
 "trybami białych znaków"
 
-#: diff.c:410
+#: diff.c:411
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "Nierozpoznana wartość zmiennej konfiguracji „diff.submodule�: „%s�"
 
-#: diff.c:470
+#: diff.c:471
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3394,35 +3422,47 @@ msgstr ""
 "Znaleziono błędy w zmiennej konfiguracji „diff.dirstat�:\n"
 "%s"
 
-#: diff.c:4276
+#: diff.c:4290
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "zewnętrzny diff padł, zatrzymano na %s"
 
-#: diff.c:4628
+#: diff.c:4642
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check i -s siÄ™ wykluczajÄ…"
 
-#: diff.c:4631
+#: diff.c:4645
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G, -S i --find-object siÄ™ wykluczajÄ…"
 
-#: diff.c:4710
+#: diff.c:4648
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr "-G i --pickaxe-regex się wykluczają, użyj --pickaxe-regex z -S"
+
+#: diff.c:4651
+msgid ""
+"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+"with -G and -S"
+msgstr ""
+"--pickaxe-all i --find-object się wykluczają, użyj --pickaxe-all z -G i -S"
+
+#: diff.c:4730
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow wymaga dokładnie jednej ścieżki"
 
-#: diff.c:4758
+#: diff.c:4778
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "nieprawidłowa wartość --stat: %s"
 
-#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: parse-options.c:217 parse-options.c:221
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s oczekuje wartości liczbowej"
 
-#: diff.c:4795
+#: diff.c:4815
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3431,197 +3471,197 @@ msgstr ""
 "Nie można przetworzyć parametru opcji --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4880
+#: diff.c:4900
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "nieznana klasa zmian „%c� w --diff-filter=%s"
 
-#: diff.c:4904
+#: diff.c:4924
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "nieznana wartość po ws-error-highlight=%.*s"
 
-#: diff.c:4918
+#: diff.c:4938
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "nie można rozwiązać „%s�"
 
-#: diff.c:4968 diff.c:4974
+#: diff.c:4988 diff.c:4994
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s oczekuje postaci <n>/<m>"
 
-#: diff.c:4986
+#: diff.c:5006
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s oczekuje znaku, otrzymano „%s�"
 
-#: diff.c:5007
+#: diff.c:5027
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "zły argument --color-moved: %s"
 
-#: diff.c:5026
+#: diff.c:5046
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "nieprawidłowy tryb „%s� w --color-moved-ws"
 
-#: diff.c:5066
+#: diff.c:5086
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
 "opcja diff-algorithm przyjmuje „myers�, „minimal�, „patience� i „histogram�"
 
-#: diff.c:5102 diff.c:5122
+#: diff.c:5122 diff.c:5142
 #, c-format
 msgid "invalid argument to %s"
 msgstr "nieprawidłowy argument do %s"
 
-#: diff.c:5226
+#: diff.c:5246
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "w -I podano nieprawidłowe wyrażenie regularne: „%s�"
 
-#: diff.c:5275
+#: diff.c:5295
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "nie można przetworzyć parametru opcji --submodule: „%s�"
 
-#: diff.c:5331
+#: diff.c:5351
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "zły argument --word-diff: %s"
 
-#: diff.c:5367
+#: diff.c:5387
 msgid "Diff output format options"
 msgstr "Opcje formatu wyjściowego różnic"
 
-#: diff.c:5369 diff.c:5375
+#: diff.c:5389 diff.c:5395
 msgid "generate patch"
 msgstr "wygeneruj Å‚atkÄ™"
 
-#: diff.c:5372 builtin/log.c:179
+#: diff.c:5392 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "nie wypisuj różnic"
 
-#: diff.c:5377 diff.c:5491 diff.c:5498
+#: diff.c:5397 diff.c:5511 diff.c:5518
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5378 diff.c:5381
+#: diff.c:5398 diff.c:5401
 msgid "generate diffs with <n> lines context"
 msgstr "wygeneruj różnice z <n> wierszami kontekstu"
 
-#: diff.c:5383
+#: diff.c:5403
 msgid "generate the diff in raw format"
 msgstr "wygeneruj różnice w surowym formacie"
 
-#: diff.c:5386
+#: diff.c:5406
 msgid "synonym for '-p --raw'"
 msgstr "synonim do „-p --raw�"
 
-#: diff.c:5390
+#: diff.c:5410
 msgid "synonym for '-p --stat'"
 msgstr "synonim do „-p --stat�"
 
-#: diff.c:5394
+#: diff.c:5414
 msgid "machine friendly --stat"
 msgstr "--stat czytelne dla maszyny"
 
-#: diff.c:5397
+#: diff.c:5417
 msgid "output only the last line of --stat"
 msgstr "wypisz tylko ostatni wiersz --stat"
 
-#: diff.c:5399 diff.c:5407
+#: diff.c:5419 diff.c:5427
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5400
+#: diff.c:5420
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "wypisz rozkład względnej ilości zmian w każdym podkatalogu"
 
-#: diff.c:5404
+#: diff.c:5424
 msgid "synonym for --dirstat=cumulative"
 msgstr "zamiennik na --dirstat=cumulative"
 
-#: diff.c:5408
+#: diff.c:5428
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "synonim do --dirstat=files,param1,param2..."
 
-#: diff.c:5412
+#: diff.c:5432
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "ostrzegaj, jeśli zmiany wprowadzają znaczniki konfliktów lub błędy białych "
 "znaków"
 
-#: diff.c:5415
+#: diff.c:5435
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "zwarte podsumowanie takie jak utworzenia czy zmiany nazw i trybów"
 
-#: diff.c:5418
+#: diff.c:5438
 msgid "show only names of changed files"
 msgstr "pokazuj tylko nazwy zmienionych plików"
 
-#: diff.c:5421
+#: diff.c:5441
 msgid "show only names and status of changed files"
 msgstr "pokazuj tylko nazwy i stan zmienionych plików"
 
-#: diff.c:5423
+#: diff.c:5443
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<szerokość>[,<szerokość-nazwy>[,<liczba>]]"
 
-#: diff.c:5424
+#: diff.c:5444
 msgid "generate diffstat"
 msgstr "wygeneruj statystyki różnic"
 
-#: diff.c:5426 diff.c:5429 diff.c:5432
+#: diff.c:5446 diff.c:5449 diff.c:5452
 msgid "<width>"
 msgstr "<szerokość>"
 
-#: diff.c:5427
+#: diff.c:5447
 msgid "generate diffstat with a given width"
 msgstr "wygeneruj statystyki różnic o podanej szerokości"
 
-#: diff.c:5430
+#: diff.c:5450
 msgid "generate diffstat with a given name width"
 msgstr "wygeneruj statystyki różnic o podanej szerokości nazw"
 
-#: diff.c:5433
+#: diff.c:5453
 msgid "generate diffstat with a given graph width"
 msgstr "wygeneruj statystyki różnic o podanej szerokości grafu"
 
-#: diff.c:5435
+#: diff.c:5455
 msgid "<count>"
 msgstr "<liczba>"
 
-#: diff.c:5436
+#: diff.c:5456
 msgid "generate diffstat with limited lines"
 msgstr "wygeneruj statystyki różnic o ograniczonych wierszach"
 
-#: diff.c:5439
+#: diff.c:5459
 msgid "generate compact summary in diffstat"
 msgstr "wygeneruj zwięzłe podsumowanie w statystykach różnic"
 
-#: diff.c:5442
+#: diff.c:5462
 msgid "output a binary diff that can be applied"
 msgstr "wypisz binarne różnice, które mogą być zastosowane"
 
-#: diff.c:5445
+#: diff.c:5465
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 "pokaż pełne nazwy obiektów wstępnego i końcowego obrazu w wierszach „index�"
 
-#: diff.c:5447
+#: diff.c:5467
 msgid "show colored diff"
 msgstr "pokaż kolorowe różnice"
 
-#: diff.c:5448
+#: diff.c:5468
 msgid "<kind>"
 msgstr "<rodzaj>"
 
-#: diff.c:5449
+#: diff.c:5469
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -3629,94 +3669,94 @@ msgstr ""
 "podświetl błędy białych znaków w rodzaju wierszy różnic: „context�, „old� "
 "lub „new�"
 
-#: diff.c:5452
+#: diff.c:5472
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
 msgstr ""
 "nie męcz ścieżek i użyj znaków NUL do rozdzielenia pól w --raw lub --numstat"
 
-#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
+#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
 msgid "<prefix>"
 msgstr "<prefiks>"
 
-#: diff.c:5456
+#: diff.c:5476
 msgid "show the given source prefix instead of \"a/\""
 msgstr "pokaż podany prefiks źródła zamiast „a/�"
 
-#: diff.c:5459
+#: diff.c:5479
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "pokaż podany prefiks celu zamiast „b/�"
 
-#: diff.c:5462
+#: diff.c:5482
 msgid "prepend an additional prefix to every line of output"
 msgstr "dodatkowy prefiks do dodania przed każdym wierszem wyjścia"
 
-#: diff.c:5465
+#: diff.c:5485
 msgid "do not show any source or destination prefix"
 msgstr "nie pokazuj żadnego prefiksu źródła ani celu"
 
-#: diff.c:5468
+#: diff.c:5488
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr "pokaż kontekst między skrawkami różnic do podanej liczby wierszy"
 
-#: diff.c:5472 diff.c:5477 diff.c:5482
+#: diff.c:5492 diff.c:5497 diff.c:5502
 msgid "<char>"
 msgstr "<znak>"
 
-#: diff.c:5473
+#: diff.c:5493
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "podaj znak wskazujący nowy wiersz zamiast „+�"
 
-#: diff.c:5478
+#: diff.c:5498
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "podaj znak wskazujący stary wiersz zamiast „-�"
 
-#: diff.c:5483
+#: diff.c:5503
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "podaj znak wskazujący kontekst zamiast odstępu „ �"
 
-#: diff.c:5486
+#: diff.c:5506
 msgid "Diff rename options"
 msgstr "Opcje zmiany nazw różnic"
 
-#: diff.c:5487
+#: diff.c:5507
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5488
+#: diff.c:5508
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "rozbij zmiany zupełnego przepisania na pary usunięć i utworzeń"
 
-#: diff.c:5492
+#: diff.c:5512
 msgid "detect renames"
 msgstr "wykrywaj zmiany nazw"
 
-#: diff.c:5496
+#: diff.c:5516
 msgid "omit the preimage for deletes"
 msgstr "omiń wstępny obraz przy usunięciach"
 
-#: diff.c:5499
+#: diff.c:5519
 msgid "detect copies"
 msgstr "wykrywaj kopie"
 
-#: diff.c:5503
+#: diff.c:5523
 msgid "use unmodified files as source to find copies"
 msgstr "użyj niezmodyfikowanych plików jako źródła do znalezienia kopii"
 
-#: diff.c:5505
+#: diff.c:5525
 msgid "disable rename detection"
 msgstr "wyłącz wykrywanie zmian nazw"
 
-#: diff.c:5508
+#: diff.c:5528
 msgid "use empty blobs as rename source"
 msgstr "użyj pustych blobów jako źródła zmiany nazwy"
 
-#: diff.c:5510
+#: diff.c:5530
 msgid "continue listing the history of a file beyond renames"
 msgstr "kontynuuj wypisywanie historii pliku poza zmianami nazw"
 
-#: diff.c:5513
+#: diff.c:5533
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -3724,165 +3764,165 @@ msgstr ""
 "powstrzymaj wykrywanie zmian nazw i kopii, jeśli liczba zmian nazw / kopii "
 "przekracza podanÄ… granicÄ™"
 
-#: diff.c:5515
+#: diff.c:5535
 msgid "Diff algorithm options"
 msgstr "Opcje algorytmu różnic"
 
-#: diff.c:5517
+#: diff.c:5537
 msgid "produce the smallest possible diff"
 msgstr "wyprodukuj najmniejsze możliwe różnice"
 
-#: diff.c:5520
+#: diff.c:5540
 msgid "ignore whitespace when comparing lines"
 msgstr "ignoruj zmiany w białych znakach przy porównywaniu plików"
 
-#: diff.c:5523
+#: diff.c:5543
 msgid "ignore changes in amount of whitespace"
 msgstr "ignoruj zmiany w liczbie białych znaków"
 
-#: diff.c:5526
+#: diff.c:5546
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignoruj zmiany w białych znakach na końcu wiersza"
 
-#: diff.c:5529
+#: diff.c:5549
 msgid "ignore carrier-return at the end of line"
 msgstr "ignoruj powrót karetki (CR) na końcu wiersza"
 
-#: diff.c:5532
+#: diff.c:5552
 msgid "ignore changes whose lines are all blank"
 msgstr "ignoruj zmiany, których wszystkie wiersze są puste"
 
-#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
+#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
 msgid "<regex>"
 msgstr "<wyr-reg>"
 
-#: diff.c:5535
+#: diff.c:5555
 msgid "ignore changes whose all lines match <regex>"
 msgstr "ignoruj zmiany, których wszystkie wiersze pasują do <wyr-reg>"
 
-#: diff.c:5538
+#: diff.c:5558
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 "heurystyka do przesunięcia granic skrawków różnic, aby ułatwić czytanie"
 
-#: diff.c:5541
+#: diff.c:5561
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "wygeneruj różnice używając algorytmu „cierpliwych różnic�"
 
-#: diff.c:5545
+#: diff.c:5565
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "wygeneruj różnice używając algorytmu „histogramu różnic�"
 
-#: diff.c:5547
+#: diff.c:5567
 msgid "<algorithm>"
 msgstr "<algorytm>"
 
-#: diff.c:5548
+#: diff.c:5568
 msgid "choose a diff algorithm"
 msgstr "wybierz algorytm różnic"
 
-#: diff.c:5550
+#: diff.c:5570
 msgid "<text>"
 msgstr "<tekst>"
 
-#: diff.c:5551
+#: diff.c:5571
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "wygeneruj różnice używając algorytmu „zakotwiczonych różnic�"
 
-#: diff.c:5553 diff.c:5562 diff.c:5565
+#: diff.c:5573 diff.c:5582 diff.c:5585
 msgid "<mode>"
 msgstr "<tryb>"
 
-#: diff.c:5554
+#: diff.c:5574
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr "pokaż różnice słów, używając <trybu> do rozdzielenia zmienionych słów"
 
-#: diff.c:5557
+#: diff.c:5577
 msgid "use <regex> to decide what a word is"
 msgstr "użyj <wyr-reg>, aby zdecydować, czym jest słowo"
 
-#: diff.c:5560
+#: diff.c:5580
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "równoważne --word-diff=color --word-diff-regex=<wyr-reg>"
 
-#: diff.c:5563
+#: diff.c:5583
 msgid "moved lines of code are colored differently"
 msgstr "przeniesione wiersze kodu sÄ… kolorowane inaczej"
 
-#: diff.c:5566
+#: diff.c:5586
 msgid "how white spaces are ignored in --color-moved"
 msgstr "jak są ignorowane białe znaki w --color-moved"
 
-#: diff.c:5569
+#: diff.c:5589
 msgid "Other diff options"
 msgstr "Inne opcje różnic"
 
-#: diff.c:5571
+#: diff.c:5591
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "kiedy uruchomione z podkatalogu, pomiń zmiany poza nim i pokaż względne "
 "ścieżki"
 
-#: diff.c:5575
+#: diff.c:5595
 msgid "treat all files as text"
 msgstr "traktuj wszystkie pliki jako tekstowe"
 
-#: diff.c:5577
+#: diff.c:5597
 msgid "swap two inputs, reverse the diff"
 msgstr "zamień dwa wejścia, odwróć różnice"
 
-#: diff.c:5579
+#: diff.c:5599
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "wyjdź z 1 jeśli nie ma różnic, 0 w przeciwnym wypadku"
 
-#: diff.c:5581
+#: diff.c:5601
 msgid "disable all output of the program"
 msgstr "wyłącz całe wyjście programu"
 
-#: diff.c:5583
+#: diff.c:5603
 msgid "allow an external diff helper to be executed"
 msgstr "pozwól wykonać zewnętrzny pomocnik różnic"
 
-#: diff.c:5585
+#: diff.c:5605
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "wykonaj zewnętrzne filtry konwersji tekstu przy porównywaniu plików binarnych"
 
-#: diff.c:5587
+#: diff.c:5607
 msgid "<when>"
 msgstr "<kiedy>"
 
-#: diff.c:5588
+#: diff.c:5608
 msgid "ignore changes to submodules in the diff generation"
-msgstr "ignoruj zmiany w pod-modułach przy generowaniu różnic"
+msgstr "ignoruj zmiany w podmodułach przy generowaniu różnic"
 
-#: diff.c:5591
+#: diff.c:5611
 msgid "<format>"
 msgstr "<format>"
 
-#: diff.c:5592
+#: diff.c:5612
 msgid "specify how differences in submodules are shown"
-msgstr "podaj, jak będą pokazywane różnice w pod-modułach"
+msgstr "podaj, jak będą pokazywane różnice w podmodułach"
 
-#: diff.c:5596
+#: diff.c:5616
 msgid "hide 'git add -N' entries from the index"
 msgstr "ukryj elementy „git add -N� z indeksu"
 
-#: diff.c:5599
+#: diff.c:5619
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "traktuj elementy „git add -N� jako prawdziwe w indeksie"
 
-#: diff.c:5601
+#: diff.c:5621
 msgid "<string>"
 msgstr "<łańcuch>"
 
-#: diff.c:5602
+#: diff.c:5622
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "szukaj różnic, które zmieniają liczbę wystąpień podanego łańcucha"
 
-#: diff.c:5605
+#: diff.c:5625
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3890,67 +3930,67 @@ msgstr ""
 "szukaj różnic, które zmieniają liczbę wystąpień podanego wyrażenia "
 "regularnego"
 
-#: diff.c:5608
+#: diff.c:5628
 msgid "show all changes in the changeset with -S or -G"
 msgstr "pokaż wszystkie zmiany w zestawie z -S lub -G"
 
-#: diff.c:5611
+#: diff.c:5631
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "traktuj <łańcuch> w -S jako rozszerzone wyrażenie regularne POSIX"
 
-#: diff.c:5614
+#: diff.c:5634
 msgid "control the order in which files appear in the output"
 msgstr "ustaw kolejność, w jakiej pliki pojawią się na wyjściu"
 
-#: diff.c:5615 diff.c:5618
+#: diff.c:5635 diff.c:5638
 msgid "<path>"
 msgstr "<ścieżka>"
 
-#: diff.c:5616
+#: diff.c:5636
 msgid "show the change in the specified path first"
 msgstr "pokaż najpierw zmianę w podanej ścieżce"
 
-#: diff.c:5619
+#: diff.c:5639
 msgid "skip the output to the specified path"
 msgstr "pomiń wyjście do podanej ścieżki"
 
-#: diff.c:5621
+#: diff.c:5641
 msgid "<object-id>"
 msgstr "<id-obiektu>"
 
-#: diff.c:5622
+#: diff.c:5642
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "szukaj różnic, które zmieniają liczbę wystąpień podanego obiektu"
 
-#: diff.c:5624
+#: diff.c:5644
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5625
+#: diff.c:5645
 msgid "select files by diff type"
 msgstr "wybierz pliki według rodzaju różnic"
 
-#: diff.c:5627
+#: diff.c:5647
 msgid "<file>"
 msgstr "<plik>"
 
-#: diff.c:5628
+#: diff.c:5648
 msgid "Output to a specific file"
 msgstr "Wyjście do podanego pliku"
 
-#: diff.c:6285
-msgid "inexact rename detection was skipped due to too many files."
+#: diff.c:6306
+msgid "exhaustive rename detection was skipped due to too many files."
 msgstr ""
-"pominięto wykrywanie niedokładnych zmian nazw z powodu zbyt wielu plików."
+"pominięto wyczerpujące wykrywanie zmian nazw z powodu zbyt wielu plików."
 
-#: diff.c:6288
+#: diff.c:6309
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "znaleziono kopie tylko ze zmienionych ścieżek z powodu zbyt wielu plików."
 
-#: diff.c:6291
+#: diff.c:6312
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3962,7 +4002,7 @@ msgstr ""
 msgid "failed to read orderfile '%s'"
 msgstr "nie można odczytać pliku kolejności „%s�"
 
-#: diffcore-rename.c:555
+#: diffcore-rename.c:1564
 msgid "Performing inexact rename detection"
 msgstr "Wykrywanie niedokładnych zmian nazw"
 
@@ -3971,65 +4011,73 @@ msgstr "Wykrywanie niedokładnych zmian nazw"
 msgid "No such path '%s' in the diff"
 msgstr "W różnicy nie ma ścieżki „%s�"
 
-#: dir.c:578
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "ścieżka „%s� nie pasuje do żadnych plików znanych gitowi"
 
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr "nierozpoznany wzorzec: %s"
 
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "nierozpoznany antywzorzec: „%s�"
 
-#: dir.c:809
+#: dir.c:820
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr ""
 "twój plik rzadkiego wybrania może mieć problemy: wzorzec „%s� jest powtórzony"
 
-#: dir.c:819
+#: dir.c:830
 msgid "disabling cone pattern matching"
 msgstr "wyłączanie stożkowego dopasowania wzorca"
 
-#: dir.c:1198
+#: dir.c:1214
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "nie można użyć %s jako pliku wyłączeń"
 
-#: dir.c:2305
+#: dir.c:2464
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "nie można otworzyć katalogu „%s�"
 
-#: dir.c:2605
+#: dir.c:2766
 msgid "failed to get kernel name and information"
 msgstr "nie można uzyskać nazwy i informacji jądra"
 
-#: dir.c:2729
+#: dir.c:2890
 msgid "untracked cache is disabled on this system or location"
 msgstr "pamięć o nieśledzonych jest wyłączona w tym systemie lub położeniu"
 
-#: dir.c:3537
+#: dir.c:3158
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Nie można zgadnąć nazwy katalogu.\n"
+"Podaj katalog w wierszu poleceń"
+
+#: dir.c:3837
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "uszkodzony plik indeksu w repozytorium %s"
 
-#: dir.c:3582 dir.c:3587
+#: dir.c:3884 dir.c:3889
 #, c-format
 msgid "could not create directories for %s"
 msgstr "nie można utworzyć katalogów dla %s"
 
-#: dir.c:3616
+#: dir.c:3918
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "nie można zmigrować katalogu gita z „%s� do „%s�"
 
-#: editor.c:74
+#: editor.c:77
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "wskazówka: Czekanie, aż edytor zamknie plik...%c"
@@ -4038,288 +4086,371 @@ msgstr "wskazówka: Czekanie, aż edytor zamknie plik...%c"
 msgid "Filtering content"
 msgstr "Filtrowanie zawartości"
 
-#: entry.c:478
+#: entry.c:498
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "nie można wykonać stat na pliku „%s�"
 
-#: environment.c:152
+#: environment.c:143
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "zła ścieżka przestrzeni nazw gita „%s�"
 
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "nie można ustawić GIT_DIR na „%s�"
-
 #: exec-cmd.c:363
 #, c-format
 msgid "too many args to run %s"
 msgstr "za dużo argumentów, aby wykonać %s"
 
-#: fetch-pack.c:177
+#: fetch-pack.c:193
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: oczekiwano listy shallow"
 
-#: fetch-pack.c:180
+#: fetch-pack.c:196
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: oczekiwano pakietu wypróżnienia po płytkiej liście"
 
-#: fetch-pack.c:191
+#: fetch-pack.c:207
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: oczekiwano ACK/NAK, otrzymano pakiet wypróżnienia"
 
-#: fetch-pack.c:211
+#: fetch-pack.c:227
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: oczekiwano ACK/NAK, otrzymano „%s�"
 
-#: fetch-pack.c:222
+#: fetch-pack.c:238
 msgid "unable to write to remote"
 msgstr "nie można pisać do zdalnego repozytorium"
 
-#: fetch-pack.c:283
+#: fetch-pack.c:299
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc wymaga multi_ack_detailed"
 
-#: fetch-pack.c:378 fetch-pack.c:1400
+#: fetch-pack.c:394 fetch-pack.c:1434
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "nieprawidłowy wiersz shallow: %s"
 
-#: fetch-pack.c:384 fetch-pack.c:1406
+#: fetch-pack.c:400 fetch-pack.c:1440
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "nieprawidłowy wiersz unshallow: %s"
 
-#: fetch-pack.c:386 fetch-pack.c:1408
+#: fetch-pack.c:402 fetch-pack.c:1442
 #, c-format
 msgid "object not found: %s"
 msgstr "nie znaleziono obiektu: %s"
 
-#: fetch-pack.c:389 fetch-pack.c:1411
+#: fetch-pack.c:405 fetch-pack.c:1445
 #, c-format
 msgid "error in object: %s"
 msgstr "błąd w obiekcie: %s"
 
-#: fetch-pack.c:391 fetch-pack.c:1413
+#: fetch-pack.c:407 fetch-pack.c:1447
 #, c-format
 msgid "no shallow found: %s"
 msgstr "nie znaleziono shallow: %s"
 
-#: fetch-pack.c:394 fetch-pack.c:1417
+#: fetch-pack.c:410 fetch-pack.c:1451
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "oczekiwano shallow/unshallow, otrzymano %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:450
 #, c-format
 msgid "got %s %d %s"
 msgstr "dostałem %s %d %s"
 
-#: fetch-pack.c:451
+#: fetch-pack.c:467
 #, c-format
 msgid "invalid commit %s"
 msgstr "nieprawidłowy zapis %s"
 
-#: fetch-pack.c:482
+#: fetch-pack.c:498
 msgid "giving up"
 msgstr "poddajÄ™ siÄ™"
 
-#: fetch-pack.c:495 progress.c:339
+#: fetch-pack.c:511 progress.c:339
 msgid "done"
 msgstr "gotowe"
 
-#: fetch-pack.c:507
+#: fetch-pack.c:523
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "dostałem %s (%d) %s"
 
-#: fetch-pack.c:543
+#: fetch-pack.c:559
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Oznaczam %s jako gotowe"
 
-#: fetch-pack.c:758
+#: fetch-pack.c:774
 #, c-format
 msgid "already have %s (%s)"
 msgstr "już mam %s (%s)"
 
-#: fetch-pack.c:821
+#: fetch-pack.c:860
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: nie można uruchomić rozdzielania pasma bocznego"
 
-#: fetch-pack.c:829
+#: fetch-pack.c:868
 msgid "protocol error: bad pack header"
 msgstr "błąd protokołu: zły nagłówek paczki"
 
-#: fetch-pack.c:913
+#: fetch-pack.c:962
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: nie można uruchomić %s"
 
-#: fetch-pack.c:931
+#: fetch-pack.c:968
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: nieprawidłowe wyjście index-pack"
+
+#: fetch-pack.c:985
 #, c-format
 msgid "%s failed"
 msgstr "%s nie powiodło się"
 
-#: fetch-pack.c:933
+#: fetch-pack.c:987
 msgid "error in sideband demultiplexer"
 msgstr "błąd rozdzielania pasma bocznego"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:1030
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Wersja serwera to %.*s"
 
-#: fetch-pack.c:984 fetch-pack.c:990 fetch-pack.c:993 fetch-pack.c:999
-#: fetch-pack.c:1003 fetch-pack.c:1007 fetch-pack.c:1011 fetch-pack.c:1015
-#: fetch-pack.c:1019 fetch-pack.c:1023 fetch-pack.c:1027 fetch-pack.c:1031
-#: fetch-pack.c:1037 fetch-pack.c:1043 fetch-pack.c:1048 fetch-pack.c:1053
+#: 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
 #, c-format
 msgid "Server supports %s"
 msgstr "Serwer wspiera %s"
 
-#: fetch-pack.c:986
+#: fetch-pack.c:1040
 msgid "Server does not support shallow clients"
 msgstr "Serwer nie wspiera płytkich klientów"
 
-#: fetch-pack.c:1046
+#: fetch-pack.c:1100
 msgid "Server does not support --shallow-since"
 msgstr "Serwer nie wspiera --shallow-since"
 
-#: fetch-pack.c:1051
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-exclude"
 msgstr "Serwer nie wspiera --shallow-exclude"
 
-#: fetch-pack.c:1055
+#: fetch-pack.c:1109
 msgid "Server does not support --deepen"
 msgstr "Serwer nie wspiera --deepen"
 
-#: fetch-pack.c:1057
+#: fetch-pack.c:1111
 msgid "Server does not support this repository's object format"
 msgstr "Serwer nie wspiera formatu obiektów z tego repozytorium"
 
-#: fetch-pack.c:1070
+#: fetch-pack.c:1124
 msgid "no common commits"
 msgstr "brak wspólnych zapisów"
 
-#: fetch-pack.c:1082 fetch-pack.c:1622
+#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+msgid "source repository is shallow, reject to clone."
+msgstr "źródłowe repozytorium jest płytkie, odmowa klonowania."
+
+#: fetch-pack.c:1139 fetch-pack.c:1671
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: pobieranie nie powiodło się."
 
-#: fetch-pack.c:1208
+#: fetch-pack.c:1253
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "niezgodne algorytmy: klient %s; serwer %s"
 
-#: fetch-pack.c:1212
+#: fetch-pack.c:1257
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "serwer nie wspiera algorytmu „%s�"
 
-#: fetch-pack.c:1232
+#: fetch-pack.c:1290
 msgid "Server does not support shallow requests"
 msgstr "Serwer nie wspiera płytkich żądań"
 
-#: fetch-pack.c:1239
+#: fetch-pack.c:1297
 msgid "Server supports filter"
 msgstr "Serwer wspiera filtrowanie"
 
-#: fetch-pack.c:1278
+#: fetch-pack.c:1340 fetch-pack.c:2053
 msgid "unable to write request to remote"
 msgstr "nie można pisać żądania do zdalnej maszyny"
 
-#: fetch-pack.c:1296
+#: fetch-pack.c:1358
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "błąd odczytu nagłówka rozdziału „%s�"
 
-#: fetch-pack.c:1302
+#: fetch-pack.c:1364
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "oczekiwano „%s�, odebrano „%s�"
 
-#: fetch-pack.c:1363
+#: fetch-pack.c:1398
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "nieoczekiwany wiersz potwierdzenia: „%s�"
 
-#: fetch-pack.c:1368
+#: fetch-pack.c:1403
 #, c-format
 msgid "error processing acks: %d"
 msgstr "błąd przetwarzania potwierdzeń: %d"
 
-#: fetch-pack.c:1378
+#: fetch-pack.c:1413
 msgid "expected packfile to be sent after 'ready'"
 msgstr "oczekiwano pliku paczki wysłanego po „ready�"
 
-#: fetch-pack.c:1380
+#: fetch-pack.c:1415
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "nie oczekiwano innych rozdziałów wysłanych po braku „ready�"
 
-#: fetch-pack.c:1422
+#: fetch-pack.c:1456
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "błąd przetwarzania płytkich informacji: %d"
 
-#: fetch-pack.c:1469
+#: fetch-pack.c:1505
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "oczekiwano wanted-ref, otrzymano %s"
 
-#: fetch-pack.c:1474
+#: fetch-pack.c:1510
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "nieoczekiwana wanted-ref: „%s�"
 
-#: fetch-pack.c:1479
+#: fetch-pack.c:1515
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "błąd przetwarzania chcianych referencji: %d"
 
-#: fetch-pack.c:1509
+#: fetch-pack.c:1545
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack: oczekiwano pakietu końca odpowiedzi"
 
-#: fetch-pack.c:1891
+#: fetch-pack.c:1949
 msgid "no matching remote head"
 msgstr "brak pasującego zdalnego czoła"
 
-#: fetch-pack.c:1914 builtin/clone.c:693
+#: fetch-pack.c:1972 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
 msgstr "zdalna maszyna nie przysłała wszystkich potrzebnych obiektów"
 
-#: fetch-pack.c:1941
+#: fetch-pack.c:2075
+msgid "unexpected 'ready' from remote"
+msgstr "nieoczekiwane „ready� od zdalnej maszyny"
+
+#: fetch-pack.c:2098
 #, c-format
 msgid "no such remote ref %s"
 msgstr "nie ma takiej zdalnej referencji %s"
 
-#: fetch-pack.c:1944
+#: fetch-pack.c:2101
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Serwer nie pozwala na żądanie o nieogłoszony obiekt %s"
 
-#: gpg-interface.c:273
+#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
+#: gpg-interface.c:918
 msgid "could not create temporary file"
 msgstr "nie można utworzyć pliku tymczasowego"
 
-#: gpg-interface.c:276
+#: gpg-interface.c:332 gpg-interface.c:454
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "nie można zapisać oddzielonego podpisu do „%s�"
 
-#: gpg-interface.c:470
+#: gpg-interface.c:445
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile musi być ustawiony i istnieć, aby sprawdzać "
+"podpisy ssh"
+
+#: gpg-interface.c:469
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"potrzeba ssh-keygen -Y find-principals/verify, aby sprawdzać podpisy ssh "
+"(dostępne w wersji openssh 8.2p1+)"
+
+#: gpg-interface.c:523
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "ustawiono plik odwołania podpisów ssh, ale go nie znaleziono: %s"
+
+#: gpg-interface.c:576
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "zły/niekompatybilny podpis „%s�"
+
+#: gpg-interface.c:735 gpg-interface.c:740
+#, c-format
+msgid "failed to get the ssh fingerprint for key '%s'"
+msgstr "nie można zdobyć odcisku klucza ssh „%s�"
+
+#: gpg-interface.c:762
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "należy ustawić user.signingkey lub gpg.ssh.defaultKeyCommand"
+
+#: gpg-interface.c:780
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
+msgstr ""
+"gpg.ssh.defaultKeyCommand powiodło się, ale nie zwróciło żadnych kluczy: %s "
+"%s"
+
+#: gpg-interface.c:786
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand zawiodło: %s %s"
+
+#: gpg-interface.c:874
 msgid "gpg failed to sign the data"
 msgstr "gpg nie może podpisać danych"
 
+#: gpg-interface.c:895
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "do podpisywania ssh potrzeba user.signingkey"
+
+#: gpg-interface.c:906
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "nie można zapisać klucza podpisującego ssh do „%s�"
+
+#: gpg-interface.c:924
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "nie można zapisać buforu klucza podpisującego ssh do „%s�"
+
+#: gpg-interface.c:942
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"do podpisywania ssh wymagany jest podpis ssh-keygen -Y (dostępne od wersji "
+"openssh 8.2p1+)"
+
+#: gpg-interface.c:954
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "nie można odczytać bufora danych podpisu ssh z „%s�"
+
 #: graph.c:98
 #, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr "ignoruj nieprawidłowy kolor „%.*s� w log.graphColors"
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "pominięto nieprawidłowy kolor „%.*s� w log.graphColors"
 
-#: grep.c:543
+#: grep.c:533
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
@@ -4327,110 +4458,110 @@ msgstr ""
 "podany wzorzec zawiera znak NUL (przez -f <plik>). To jest wspierane tylko z "
 "-P pod PCRE v2"
 
-#: grep.c:1906
+#: grep.c:1928
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "„%s�: nie można przeczytać %s"
 
-#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
-#: builtin/rm.c:135
+#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: builtin/rm.c:136
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "nie można wykonać stat na „%s�'"
 
-#: grep.c:1934
+#: grep.c:1956
 #, c-format
 msgid "'%s': short read"
 msgstr "„%s�: przeczytano mniej niż powinno być"
 
-#: help.c:23
+#: help.c:24
 msgid "start a working area (see also: git help tutorial)"
 msgstr "przyszykuj obszar do pracy (zobacz też: git help tutorial)"
 
-#: help.c:24
+#: help.c:25
 msgid "work on the current change (see also: git help everyday)"
 msgstr "pracuj nad bieżącą zmianą (zobacz też: git help everyday)"
 
-#: help.c:25
+#: help.c:26
 msgid "examine the history and state (see also: git help revisions)"
 msgstr "badaj historię i stan (zobacz też: git help revisions)"
 
-#: help.c:26
+#: help.c:27
 msgid "grow, mark and tweak your common history"
 msgstr "poszerzaj, oznaczaj i dostosowuj wspólną historię"
 
-#: help.c:27
+#: help.c:28
 msgid "collaborate (see also: git help workflows)"
 msgstr "współpracuj (zobacz też: git help workflows)"
 
-#: help.c:31
+#: help.c:32
 msgid "Main Porcelain Commands"
 msgstr "Główne porcelanowe polecenia"
 
-#: help.c:32
+#: help.c:33
 msgid "Ancillary Commands / Manipulators"
 msgstr "Polecenia pomocnicze / manipulatory"
 
-#: help.c:33
+#: help.c:34
 msgid "Ancillary Commands / Interrogators"
 msgstr "Polecenia pomocnicze / odpytywanie"
 
-#: help.c:34
+#: help.c:35
 msgid "Interacting with Others"
 msgstr "Interakcje z innymi"
 
-#: help.c:35
+#: help.c:36
 msgid "Low-level Commands / Manipulators"
 msgstr "Polecenia niskopoziomowe / manipulatory"
 
-#: help.c:36
+#: help.c:37
 msgid "Low-level Commands / Interrogators"
 msgstr "Polecenia niskopoziomowe / odpytywanie"
 
-#: help.c:37
+#: help.c:38
 msgid "Low-level Commands / Syncing Repositories"
 msgstr "Polecenia niskopoziomowe / synchronizacja repozytoriów"
 
-#: help.c:38
+#: help.c:39
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Polecenia niskopoziomowe / wewnętrzne pomocniki"
 
-#: help.c:300
+#: help.c:313
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "dostępne polecenia gita w „%s�"
 
-#: help.c:307
+#: help.c:320
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "polecenia gita dostępne gdzie indziej w ścieżce $PATH"
 
-#: help.c:316
+#: help.c:329
 msgid "These are common Git commands used in various situations:"
 msgstr "Oto częste polecenia Gita używane w różnych sytuacjach:"
 
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "nieobsługiwany rodzaj spisu poleceń „%s�"
 
-#: help.c:405
+#: help.c:418
 msgid "The Git concept guides are:"
 msgstr "Podręczniki pojęć Gita to:"
 
-#: help.c:429
+#: help.c:442
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr ""
 "Zobacz „git help <polecenie>�, aby przeczytać o konkretnym pod-poleceniu"
 
-#: help.c:434
+#: help.c:447
 msgid "External commands"
 msgstr "Zewnętrzne polecenia"
 
-#: help.c:449
+#: help.c:462
 msgid "Command aliases"
 msgstr "Skróty poleceń"
 
-#: help.c:527
+#: help.c:543
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -4439,31 +4570,36 @@ msgstr ""
 "„%s� wydaje się być poleceniem gita, ale nie udało się\n"
 "go wykonać. Może git-%s się zepsuł?"
 
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git: „%s� nie jest poleceniem gita. Zobacz „git --help�."
 
-#: help.c:591
+#: help.c:613
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "O jejciu. Twój system w ogóle nie zgłasza żadnych poleceń gita."
 
-#: help.c:613
+#: help.c:635
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr "Ostrzeżenie: Wywołano polecenie Gita „%s�, które nie istnieje."
 
-#: help.c:618
+#: help.c:640
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "Zakładam dalej, że chodziło o „%s�."
 
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead? (y/N)"
+msgstr "Wykonać zamiast tego „%s�? (y/N)"
+
+#: help.c:654
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr "Kontynuowanie za %0.1f sekundy, zakładam, że chodziło o „%s�."
 
-#: help.c:635
+#: help.c:666
 msgid ""
 "\n"
 "The most similar command is"
@@ -4480,16 +4616,16 @@ msgstr[2] ""
 "\n"
 "Najpodobniejsze polecenia to"
 
-#: help.c:675
+#: help.c:706
 msgid "git version [<options>]"
 msgstr "git version [<opcje>]"
 
-#: help.c:730
+#: help.c:761
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s — %s"
 
-#: help.c:734
+#: help.c:765
 msgid ""
 "\n"
 "Did you mean this?"
@@ -4506,6 +4642,15 @@ msgstr[2] ""
 "\n"
 "Czy chodziło o któreś z tych?"
 
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Skrypt repozytorium „%s� został zignorowany, bo nie jest wykonywalny.\n"
+"Możesz wyłączyć to ostrzeżenie przez „git config advice.ignoredHook false�."
+
 #: ident.c:353
 msgid "Author identity unknown\n"
 msgstr "Nieznana tożsamość autora\n"
@@ -4568,47 +4713,52 @@ msgstr "puste nazwisko (do <%s>) niedozwolone"
 msgid "name consists only of disallowed characters: %s"
 msgstr "nazwisko składa się wyłącznie z niedozwolonych znaków: %s"
 
-#: ident.c:454 builtin/commit.c:634
+#: ident.c:454 builtin/commit.c:648
 #, c-format
 msgid "invalid date format: %s"
 msgstr "nieprawidłowy format daty: %s"
 
-#: list-objects-filter-options.c:81
+#: list-objects-filter-options.c:83
 msgid "expected 'tree:<depth>'"
 msgstr "oczekiwano „tree:<głębokość>�"
 
-#: list-objects-filter-options.c:96
+#: list-objects-filter-options.c:98
 msgid "sparse:path filters support has been dropped"
 msgstr "wsparcie filtrów sparse:path zostało porzucone"
 
-#: list-objects-filter-options.c:109
+#: list-objects-filter-options.c:105
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "„%s� do „object:type=<typ>� nie jest prawidłowym typem obiektu"
+
+#: list-objects-filter-options.c:124
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "nieprawidłowy filtr: %s"
 
-#: list-objects-filter-options.c:125
+#: list-objects-filter-options.c:140
 #, c-format
 msgid "must escape char in sub-filter-spec: '%c'"
 msgstr "trzeba zacytować znak w podfiltrze: „%c�"
 
-#: list-objects-filter-options.c:167
+#: list-objects-filter-options.c:182
 msgid "expected something after combine:"
 msgstr "oczekiwano czegoÅ› po combine:"
 
-#: list-objects-filter-options.c:249
+#: list-objects-filter-options.c:264
 msgid "multiple filter-specs cannot be combined"
 msgstr "nie można łączyć podania wielu filtrów"
 
-#: list-objects-filter-options.c:361
+#: list-objects-filter-options.c:376
 msgid "unable to upgrade repository format to support partial clone"
 msgstr "nie można podnieść formatu repozytorium, aby wspierać częściowy klon"
 
-#: list-objects-filter.c:492
+#: list-objects-filter.c:532
 #, c-format
 msgid "unable to access sparse blob in '%s'"
 msgstr "brak dostępu do rzadkiego bloba w „%s�"
 
-#: list-objects-filter.c:495
+#: list-objects-filter.c:535
 #, c-format
 msgid "unable to parse sparse filter data in %s"
 msgstr "nie można przetworzyć danych rzadkiego filtra w %s"
@@ -4623,7 +4773,7 @@ msgstr "element „%s� drzewa %s ma tryb drzewa, ale nie jest drzewem"
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "element „%s� drzewa %s ma tryb blobu, ale nie jest blobem"
 
-#: list-objects.c:375
+#: list-objects.c:398
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "nie można wczytać drzewa korzenia dla zapisu %s"
@@ -4657,45 +4807,59 @@ msgstr "Nie można utworzyć „%s.lock�: %s"
 msgid "invalid value '%s' for lsrefs.unborn"
 msgstr "nieprawidłowa wartość „%s� lsrefs.unborn"
 
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "nieoczekiwany wiersz: „%s�"
+
+#: ls-refs.c:178
 msgid "expected flush after ls-refs arguments"
 msgstr "oczekiwano wypróżnienia po argumentach ls-refs"
 
-#: merge-ort.c:855 merge-recursive.c:1191
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
+msgstr "wykryto zacytowany CRLF"
+
+#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "złe działanie „%s� w „%s�"
+
+#: merge-ort.c:1584 merge-recursive.c:1211
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Nie można scalić pod-modułu %s (nie wybrano)"
+msgstr "Nie można scalić podmodułu %s (nie wybrano)"
 
-#: merge-ort.c:864 merge-recursive.c:1198
+#: merge-ort.c:1593 merge-recursive.c:1218
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Nie można scalić pod-modułu %s (brak zapisów)"
+msgstr "Nie można scalić podmodułu %s (brak zapisów)"
 
-#: merge-ort.c:873 merge-recursive.c:1205
+#: merge-ort.c:1602 merge-recursive.c:1225
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr "Nie można scalić pod-modułu %s (zapisy nie śledzą podstawy scalania)"
+msgstr "Nie można scalić podmodułu %s (zapisy nie śledzą podstawy scalania)"
 
-#: merge-ort.c:883 merge-ort.c:890
+#: merge-ort.c:1612 merge-ort.c:1620
 #, c-format
 msgid "Note: Fast-forwarding submodule %s to %s"
-msgstr "Uwaga: Przewinięcie pod-modułu %s do %s"
+msgstr "Uwaga: Przewinięcie podmodułu %s do %s"
 
-#: merge-ort.c:911
+#: merge-ort.c:1642
 #, c-format
 msgid "Failed to merge submodule %s"
-msgstr "Nie można scalić pod-modułu %s"
+msgstr "Nie można scalić podmodułu %s"
 
-#: merge-ort.c:918
+#: merge-ort.c:1649
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
 "%s\n"
 msgstr ""
-"Nie można scalić pod-modułu %s, ale istnieje możliwe rozwiązanie:\n"
+"Nie można scalić podmodułu %s, ale istnieje możliwe rozwiązanie:\n"
 "%s\n"
 
-#: merge-ort.c:922 merge-recursive.c:1259
+#: merge-ort.c:1653 merge-recursive.c:1281
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -4712,30 +4876,30 @@ msgstr ""
 "\n"
 "które przyjmie tylko tę sugestię.\n"
 
-#: merge-ort.c:935
+#: merge-ort.c:1666
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but multiple possible merges exist:\n"
 "%s"
 msgstr ""
-"Nie można scalić pod-modułu %s, ale istnieją możliwe scalenia:\n"
+"Nie można scalić podmodułu %s, ale istnieją możliwe scalenia:\n"
 "%s"
 
-#: merge-ort.c:1094 merge-recursive.c:1341
+#: merge-ort.c:1887 merge-recursive.c:1372
 msgid "Failed to execute internal merge"
 msgstr "Nie można wykonać wewnętrznego scalenia"
 
-#: merge-ort.c:1099 merge-recursive.c:1346
+#: merge-ort.c:1892 merge-recursive.c:1377
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Nie można dodać %s do bazy danych"
 
-#: merge-ort.c:1106 merge-recursive.c:1378
+#: merge-ort.c:1899 merge-recursive.c:1410
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Auto-scalanie %s"
 
-#: merge-ort.c:1245 merge-recursive.c:2100
+#: merge-ort.c:2038 merge-recursive.c:2132
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4744,7 +4908,7 @@ msgstr ""
 "KONFLIKT (domyślna zmiana nazwy katalogu): Istniejący plik/katalog %s "
 "zawadza domyślnej zmianie nazwy wstawiając tam następujące ścieżki: %s."
 
-#: merge-ort.c:1255 merge-recursive.c:2110
+#: merge-ort.c:2048 merge-recursive.c:2142
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4754,7 +4918,7 @@ msgstr ""
 "jednej ścieżki do %s; domyślna zmiana nazwy próbowała wstawić tam "
 "następujące ścieżki: %s"
 
-#: merge-ort.c:1438
+#: merge-ort.c:2106
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4762,10 +4926,10 @@ msgid ""
 "majority of the files."
 msgstr ""
 "KONFLIKT (podział zmiany nazwy katalogu): Nie ma pewności, jak zmienić nazwę "
-"%s; jego nazwa została zmieniona na wiele innych katalogów, a "
-"żaden z celów nie dostał większości plików."
+"%s; jego nazwa została zmieniona na wiele innych katalogów, a żaden z celów "
+"nie dostał większości plików."
 
-#: merge-ort.c:1604 merge-recursive.c:2447
+#: merge-ort.c:2260 merge-recursive.c:2478
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4774,7 +4938,7 @@ msgstr ""
 "Ostrzeżenie: unikam zastosowania zmiany nazwy %s -> %s na %s, bo %s sam "
 "zmienił nazwę."
 
-#: merge-ort.c:1748 merge-recursive.c:3215
+#: merge-ort.c:2400 merge-recursive.c:3261
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4783,7 +4947,7 @@ msgstr ""
 "Zaktualizowano ścieżkę: %s dodano w %s w katalogu, którego nazwa została "
 "zmieniona w %s; przenoszenie go do %s."
 
-#: merge-ort.c:1755 merge-recursive.c:3222
+#: merge-ort.c:2407 merge-recursive.c:3268
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4792,7 +4956,7 @@ msgstr ""
 "Zaktualizowano ścieżkę: zmieniono nazwę %s na %s w %s w katalogu, którego "
 "nazwa została zmieniona w %s; przenoszenie go do %s."
 
-#: merge-ort.c:1768 merge-recursive.c:3218
+#: merge-ort.c:2420 merge-recursive.c:3264
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4801,7 +4965,7 @@ msgstr ""
 "KONFLIKT (położenie pliku): %s dodano w %s w katalogu, którego nazwa została "
 "zmieniona w %s, co sugeruje, że być może powinien trafić do %s."
 
-#: merge-ort.c:1776 merge-recursive.c:3225
+#: merge-ort.c:2428 merge-recursive.c:3271
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4811,14 +4975,14 @@ msgstr ""
 "którego nazwa została zmieniona w %s, co sugeruje, że być może powinien "
 "trafić do %s."
 
-#: merge-ort.c:1919
+#: merge-ort.c:2584
 #, c-format
 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
 msgstr ""
-"KONFLIKT (zmiana nazwy/zmiana nazwy): zmieniono nazwÄ™ %s na %s w %s, a na %s"
-" w %s."
+"KONFLIKT (zmiana nazwy/zmiana nazwy): zmieniono nazwÄ™ %s na %s w %s, a na %s "
+"w %s."
 
-#: merge-ort.c:2014
+#: merge-ort.c:2679
 #, c-format
 msgid ""
 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4826,18 +4990,27 @@ msgid ""
 "markers."
 msgstr ""
 "KONFLIKT (zmiana nazwy związana z kolizją): zmiana nazwy %s -> %s miała "
-"konflikty zawartości A TAKŻE koliduje z inną ścieżką; może to skutkować"
-" zagnieżdżonymi "
-"znacznikami konfliktu."
+"konflikty zawartości A TAKŻE koliduje z inną ścieżką; może to skutkować "
+"zagnieżdżonymi znacznikami konfliktu."
 
-#: merge-ort.c:2033 merge-ort.c:2057
+#: merge-ort.c:2698 merge-ort.c:2722
 #, c-format
 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr ""
-"KONFLIKT (zmiana nazwy/usunięcie): zmieniono nazwę %s na %s w %s, ale"
-" skasowano w %s."
+"KONFLIKT (zmiana nazwy/usunięcie): zmieniono nazwę %s na %s w %s, ale "
+"skasowano w %s."
+
+#: merge-ort.c:3212 merge-recursive.c:3022
+#, c-format
+msgid "cannot read object %s"
+msgstr "nie można odczytać obiektu %s"
 
-#: merge-ort.c:2683
+#: merge-ort.c:3215 merge-recursive.c:3025
+#, c-format
+msgid "object %s is not a blob"
+msgstr "obiekt %s nie jest blobem"
+
+#: merge-ort.c:3644
 #, c-format
 msgid ""
 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4846,42 +5019,42 @@ msgstr ""
 "KONFLIKT (plik/katalog): katalog zawadza %s z %s; zamiast tego przenoszenie "
 "do %s."
 
-#: merge-ort.c:2756
+#: merge-ort.c:3721
 #, c-format
 msgid ""
-"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
 "of them so each can be recorded somewhere."
 msgstr ""
 "KONFLIKT (różne typy): %s był różnego typu z każdej strony; zmieniono nazwę "
-"%s "
-"z nich, więc każdy może być gdzieś odnotowany."
+"obu, by każdy mógł być gdzieś odnotowany."
 
-#: merge-ort.c:2760
-msgid "both"
-msgstr "obu"
-
-#: merge-ort.c:2760
-msgid "one"
-msgstr "jednej"
+#: merge-ort.c:3728
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
+msgstr ""
+"KONFLIKT (różne typy): %s był różnego typu z każdej strony; zmieniono nazwę "
+"jednego, by każdy mógł być gdzieś odnotowany."
 
-#: merge-ort.c:2855 merge-recursive.c:3052
+#: merge-ort.c:3819 merge-recursive.c:3101
 msgid "content"
 msgstr "zawartość"
 
-#: merge-ort.c:2857 merge-recursive.c:3056
+#: merge-ort.c:3821 merge-recursive.c:3105
 msgid "add/add"
 msgstr "dodano/dodano"
 
-#: merge-ort.c:2859 merge-recursive.c:3101
+#: merge-ort.c:3823 merge-recursive.c:3150
 msgid "submodule"
-msgstr "pod-moduł"
+msgstr "podmoduł"
 
-#: merge-ort.c:2861 merge-recursive.c:3102
+#: merge-ort.c:3825 merge-recursive.c:3151
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "KONFLIKT (%s): Konflikt scalania w %s"
 
-#: merge-ort.c:2886
+#: merge-ort.c:3856
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -4890,15 +5063,24 @@ msgstr ""
 "KONFLIKT (zmiana/usunięcie): %s usunięto w %s a zmieniono w %s. Wersja %s "
 "pliku %s pozostaje w drzewie."
 
+#: merge-ort.c:4152
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr ""
+"Uwaga: %s nieaktualne i zawadza wybraniu skonfliktowanej wersji; nazwa "
+"starej kopii zmieniona na %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:3354
+#: merge-ort.c:4521
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr "nie można zebrać informacji o scaleniu w drzewach %s, %s, %s"
 
-#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4908,107 +5090,106 @@ msgstr ""
 "scalenie:\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3436
-#, c-format
-msgid "Already up to date!"
-msgstr "Już aktualne!"
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+msgid "Already up to date."
+msgstr "Już aktualne."
 
-#: merge-recursive.c:356
+#: merge-recursive.c:353
 msgid "(bad commit)\n"
 msgstr "(zły zapis)\n"
 
-#: merge-recursive.c:379
+#: merge-recursive.c:381
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "add_cacheinfo nie powiodło się na ścieżce „%s�; przerywanie scalania."
 
-#: merge-recursive.c:388
+#: merge-recursive.c:390
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 "add_cacheinfo nie udało się odświeżyć na ścieżce „%s�; przerywanie scalania."
 
-#: merge-recursive.c:874
+#: merge-recursive.c:881
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "nie można utworzyć ścieżki „%s�%s"
 
-#: merge-recursive.c:885
+#: merge-recursive.c:892
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Usuwanie %s, aby zrobić miejsce na podkatalog\n"
 
-#: merge-recursive.c:899 merge-recursive.c:918
+#: merge-recursive.c:906 merge-recursive.c:925
 msgid ": perhaps a D/F conflict?"
 msgstr ": Może konflikt plik/katalog?"
 
-#: merge-recursive.c:908
+#: merge-recursive.c:915
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "Odmawiam utraty nieśledzonego pliku w „%s�"
 
-#: merge-recursive.c:949 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "nie można odczytać obiektu %s „%s�"
 
-#: merge-recursive.c:954
+#: merge-recursive.c:961
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "oczekiwano blobu w %s „%s�"
 
-#: merge-recursive.c:979
+#: merge-recursive.c:986
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "nie można otworzyć „%s�: %s"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:997
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "nie można dowiązać „%s�: „%s�"
 
-#: merge-recursive.c:995
+#: merge-recursive.c:1002
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "nie wiem, co zrobić z %06o %s „%s�"
 
-#: merge-recursive.c:1213 merge-recursive.c:1225
+#: merge-recursive.c:1233 merge-recursive.c:1246
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "Przewinięcie pod-modułu %s do następującego zapisu:"
+msgstr "Przewinięcie podmodułu %s do następującego zapisu:"
 
-#: merge-recursive.c:1216 merge-recursive.c:1228
+#: merge-recursive.c:1236 merge-recursive.c:1249
 #, c-format
 msgid "Fast-forwarding submodule %s"
-msgstr "Przewinięcie pod-modułu %s"
+msgstr "Przewinięcie podmodułu %s"
 
-#: merge-recursive.c:1251
+#: merge-recursive.c:1273
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
-msgstr "Nie można scalić pod-modułu %s (nie znaleziono scalenia po zapisie)"
+msgstr "Nie można scalić podmodułu %s (nie znaleziono scalenia po zapisie)"
 
-#: merge-recursive.c:1255
+#: merge-recursive.c:1277
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "Nie można scalić pod-modułu %s (nie przewija się)"
+msgstr "Nie można scalić podmodułu %s (nie przewija się)"
 
-#: merge-recursive.c:1256
+#: merge-recursive.c:1278
 msgid "Found a possible merge resolution for the submodule:\n"
-msgstr "Znaleziono możliwe rozwiązanie scalenia dla pod-modułu:\n"
+msgstr "Znaleziono możliwe rozwiązanie scalenia dla podmodułu:\n"
 
-#: merge-recursive.c:1268
+#: merge-recursive.c:1290
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
-msgstr "Nie można scalić pod-modułu %s (znaleziono wiele scaleń)"
+msgstr "Nie można scalić podmodułu %s (znaleziono wiele scaleń)"
 
-#: merge-recursive.c:1402
+#: merge-recursive.c:1434
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 "Błąd: Odmawiam utraty nieśledzonego pliku w %s; zamiast tego zapisywanie do "
 "%s."
 
-#: merge-recursive.c:1474
+#: merge-recursive.c:1506
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5017,7 +5198,7 @@ msgstr ""
 "KONFLIKT (%s/usunięcie): %s usunięto w %s a %s w %s. Wersja %s pliku %s "
 "pozostaje w drzewie."
 
-#: merge-recursive.c:1479
+#: merge-recursive.c:1511
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5026,7 +5207,7 @@ msgstr ""
 "KONFLIKT (%s/usunięcie): %s usunięto w %s a %s do %s w %s. Wersja %s pliku "
 "%s pozostaje w drzewie."
 
-#: merge-recursive.c:1486
+#: merge-recursive.c:1518
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5035,7 +5216,7 @@ msgstr ""
 "KONFLIKT (%s/usunięcie): %s usunięto w %s a %s w %s. Wersja %s pliku %s "
 "pozostaje w drzewie na %s."
 
-#: merge-recursive.c:1491
+#: merge-recursive.c:1523
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5044,42 +5225,42 @@ msgstr ""
 "KONFLIKT (%s/usunięcie): %s usunięto w %s a %s do %s w %s. Wersja %s pliku "
 "%s pozostaje w drzewie na %s."
 
-#: merge-recursive.c:1526
+#: merge-recursive.c:1558
 msgid "rename"
 msgstr "zmiana nazwy"
 
-#: merge-recursive.c:1526
+#: merge-recursive.c:1558
 msgid "renamed"
 msgstr "zmieniono nazwÄ™"
 
-#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Odmawiam utraty brudnego pliku w %s"
 
-#: merge-recursive.c:1587
+#: merge-recursive.c:1619
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr "Odmawiam utraty nieśledzonego pliku w %s, mimo że nie zawadza."
 
-#: merge-recursive.c:1645
+#: merge-recursive.c:1677
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "KONFLIKT (zmiana nazwy/dodanie): Zmiana nazwy %s->%s w %s. Dodano %s w %s"
 
-#: merge-recursive.c:1676
+#: merge-recursive.c:1708
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s jest katalogiem w %s dodawanie zamiast tego jako %s"
 
-#: merge-recursive.c:1681
+#: merge-recursive.c:1713
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 "Odmawiam utraty nieśledzonego pliku w %s; dodawanie zamiast tego jako %s"
 
-#: merge-recursive.c:1708
+#: merge-recursive.c:1740
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5088,18 +5269,18 @@ msgstr ""
 "KONFLIKT (zmiana nazwy/zmiana nazwy): Zmiana nazwy „%s�->„%s� w gałęzi „%s� "
 "zmiana nazwy „%s�->„%s� w „%s�%s"
 
-#: merge-recursive.c:1713
+#: merge-recursive.c:1745
 msgid " (left unresolved)"
 msgstr " (nierozwiÄ…zane)"
 
-#: merge-recursive.c:1805
+#: merge-recursive.c:1837
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "KONFLIKT (zmiana nazwy/zmiana nazwy): Zmiana nazwy %s->%s w %s. Zmiana nazwy "
 "%s->%s w %s"
 
-#: merge-recursive.c:2068
+#: merge-recursive.c:2100
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5110,7 +5291,7 @@ msgstr ""
 "%s, bo nazwa katalogu %s została zmieniona na wiele innych katalogów, a "
 "żaden z celów nie dostał większości plików."
 
-#: merge-recursive.c:2202
+#: merge-recursive.c:2234
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5119,72 +5300,62 @@ msgstr ""
 "KONFLIKT (zmiana nazwy/zmiana nazwy): Zmiana nazwy katalogu %s->%s w %s. "
 "Zmiana nazwy katalogu %s->%s w %s"
 
-#: merge-recursive.c:2973
-#, c-format
-msgid "cannot read object %s"
-msgstr "nie można odczytać obiektu %s"
-
-#: merge-recursive.c:2976
-#, c-format
-msgid "object %s is not a blob"
-msgstr "obiekt %s nie jest blobem"
-
-#: merge-recursive.c:3040
+#: merge-recursive.c:3089
 msgid "modify"
 msgstr "zmiana"
 
-#: merge-recursive.c:3040
+#: merge-recursive.c:3089
 msgid "modified"
 msgstr "zmieniono"
 
-#: merge-recursive.c:3079
+#: merge-recursive.c:3128
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Pominięto %s (scalono tak samo jak istniejące)"
 
-#: merge-recursive.c:3132
+#: merge-recursive.c:3181
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Dodawanie zamiast tego jako %s"
 
-#: merge-recursive.c:3339
+#: merge-recursive.c:3385
 #, c-format
 msgid "Removing %s"
 msgstr "Usuwanie %s"
 
-#: merge-recursive.c:3362
+#: merge-recursive.c:3408
 msgid "file/directory"
 msgstr "plik/katalog"
 
-#: merge-recursive.c:3367
+#: merge-recursive.c:3413
 msgid "directory/file"
 msgstr "katalog/plik"
 
-#: merge-recursive.c:3374
+#: merge-recursive.c:3420
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr "KONFLIKT (%s): Jest już katalog o nazwie %s w %s. Dodawanie %s jako %s"
 
-#: merge-recursive.c:3383
+#: merge-recursive.c:3429
 #, c-format
 msgid "Adding %s"
 msgstr "Dodawanie %s"
 
-#: merge-recursive.c:3392
+#: merge-recursive.c:3438
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "KONFLIKT (dodanie/dodanie): Konflikt scalania w %s"
 
-#: merge-recursive.c:3445
+#: merge-recursive.c:3491
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "nie można scalić drzew %s i %s"
 
-#: merge-recursive.c:3539
+#: merge-recursive.c:3585
 msgid "Merging:"
 msgstr "Scalanie:"
 
-#: merge-recursive.c:3552
+#: merge-recursive.c:3598
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
@@ -5192,17 +5363,17 @@ msgstr[0] "znaleziono %u wspólnego przodka:"
 msgstr[1] "znaleziono %u wspólnych przodków:"
 msgstr[2] "znaleziono %u wspólnych przodków:"
 
-#: merge-recursive.c:3602
+#: merge-recursive.c:3648
 msgid "merge returned no commit"
 msgstr "scalenie nie zwróciło żadnych zapisów"
 
-#: merge-recursive.c:3758
+#: merge-recursive.c:3816
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Nie można przetworzyć obiektu „%s�"
 
-#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
-#: builtin/stash.c:471
+#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr "Nie można zapisać indeksu."
 
@@ -5210,189 +5381,240 @@ msgstr "Nie można zapisać indeksu."
 msgid "failed to read the cache"
 msgstr "nie można odczytać pamięci podręcznej"
 
-#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
-#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
-#: builtin/stash.c:265
+#: 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
+#: builtin/stash.c:269
 msgid "unable to write new index file"
 msgstr "nie można zapisać nowego pliku indeksu"
 
-#: midx.c:80
+#: midx.c:78
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "fanout OID indeksu wielu paczek ma nieprawidłowy rozmiar"
+
+#: midx.c:109
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "plik indeksu wielu paczek %s jest za mały"
 
-#: midx.c:96
+#: midx.c:125
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "podpis indeksu wielu paczek 0x%08x nie zgadza siÄ™ z podpisem 0x%08x"
 
-#: midx.c:101
+#: midx.c:130
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "nie rozpoznano wersji %d indeksu wielu paczek"
 
-#: midx.c:106
+#: midx.c:135
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr "wersja skrótu indeksu wielu paczek %u nie zgadza się z wersją %u"
 
-#: midx.c:123
-msgid "invalid chunk offset (too large)"
-msgstr "nieprawidłowe przesunięcie kawałka (za duże)"
-
-#: midx.c:147
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr "kończący identyfikator indeksu wielu paczek występuje przedwcześnie"
-
-#: midx.c:160
+#: midx.c:152
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr ""
 "w indeksie wielu paczek brakuje wymaganego kawałka nazwy paczki (pack-name)"
 
-#: midx.c:162
+#: midx.c:154
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "w indeksie wielu paczek brakuje wymaganego kawałka fanout OID"
 
-#: midx.c:164
+#: midx.c:156
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "w indeksie wielu paczek brakuje wymaganego kawałka odnajdywania OID"
 
-#: midx.c:166
+#: midx.c:158
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "w indeksie wielu paczek brakuje wymaganego kawałka przesunięć obiektów"
 
-#: midx.c:180
+#: midx.c:174
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "nazwy paczek indeksu wielu paczek poza kolejnością: „%s� przed „%s�"
 
-#: midx.c:223
+#: midx.c:221
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "złe pack-int-id: %u (razem %u paczek)"
 
-#: midx.c:273
+#: midx.c:271
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 "indeks wielu paczek przechowuje 64-bitowe przesunięcie, ale off_t jest za "
 "małe"
 
-#: midx.c:480
+#: midx.c:502
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "nie można dodać pliku paczki „%s�"
 
-#: midx.c:486
+#: midx.c:508
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "nie można otworzyć indeksu paczki „%s�"
 
-#: midx.c:546
+#: midx.c:576
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "nie można odnaleźć obiektu %d w pliku paczki"
 
-#: midx.c:846
+#: midx.c:892
+msgid "cannot store reverse index file"
+msgstr "nie można zapisać pliku odwrotnego indeksu"
+
+#: midx.c:990
+#, c-format
+msgid "could not parse line: %s"
+msgstr "nie można przetworzyć wiersza: %s"
+
+#: midx.c:992
+#, c-format
+msgid "malformed line: %s"
+msgstr "uszkodzony wiersz: %s"
+
+#: midx.c:1159
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "pomijanie istniejącego multi-pack-index; niezgodność sum kontrolnych"
+
+#: midx.c:1184
+msgid "could not load pack"
+msgstr "nie można załadować paczki"
+
+#: midx.c:1190
+#, c-format
+msgid "could not open index for %s"
+msgstr "nie można otworzyć indeksu dla %s"
+
+#: midx.c:1201
 msgid "Adding packfiles to multi-pack-index"
 msgstr "Dodawanie plików paczek do indeksu wielu paczek"
 
-#: midx.c:879
+#: midx.c:1244
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "nieznana paczka preferowana: %s"
+
+#: midx.c:1289
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "nie można wybierać preferowanej paczki %s bez obiektów"
+
+#: midx.c:1321
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "nie widać pliku paczki %s do porzucenia"
 
-#: midx.c:931
+#: midx.c:1367
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "paczka preferowana „%s� wygasła"
+
+#: midx.c:1380
 msgid "no pack files to index."
 msgstr "brak plików paczek do zaindeksowania."
 
-#: midx.c:982
-msgid "Writing chunks to multi-pack-index"
-msgstr "Zapisywanie kawałków do indeksu wielu paczek"
+#: midx.c:1417
+msgid "could not write multi-pack bitmap"
+msgstr "nie można zapisać bitmapy wielu paczek"
+
+#: midx.c:1427
+msgid "could not write multi-pack-index"
+msgstr "nie można zapisać indeksu wielu paczek"
+
+#: midx.c:1486 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "nie można usunąć %s"
 
-#: midx.c:1060
+#: midx.c:1517
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "nie można wyczyścić indeksu wielu paczek w %s"
 
-#: midx.c:1116
+#: midx.c:1577
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr "plik indeksu wielu paczek istnieje, ale nie udało się go przetworzyć"
 
-#: midx.c:1124
+#: midx.c:1585
+msgid "incorrect checksum"
+msgstr "nieprawidłowa suma kontrolna"
+
+#: midx.c:1588
 msgid "Looking for referenced packfiles"
 msgstr "Szukanie wskazywanych plików paczek"
 
-#: midx.c:1139
+#: midx.c:1603
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 "fanout oid poza kolejnością: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1144
+#: midx.c:1608
 msgid "the midx contains no oid"
 msgstr "midx nie zawiera oid"
 
-#: midx.c:1153
+#: midx.c:1617
 msgid "Verifying OID order in multi-pack-index"
 msgstr "Weryfikowanie zamówienia OID w indeksie wielu paczek"
 
-#: midx.c:1162
+#: midx.c:1626
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "odnajdywanie oid poza kolejnością: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1182
+#: midx.c:1646
 msgid "Sorting objects by packfile"
 msgstr "Sortowanie obiektów według plików paczek"
 
-#: midx.c:1189
+#: midx.c:1653
 msgid "Verifying object offsets"
 msgstr "Weryfikowanie przesunięć obiektów"
 
-#: midx.c:1205
+#: midx.c:1669
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "nie można wczytać elementu paczki w oid[%d] = %s"
 
-#: midx.c:1211
+#: midx.c:1675
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "nie można wczytać indeksu paczki z pliku paczki %s"
 
-#: midx.c:1220
+#: midx.c:1684
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr ""
 "nieprawidłowe przesunięcie obiektu w oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1245
+#: midx.c:1709
 msgid "Counting referenced objects"
 msgstr "Zliczanie osiągalnych obiektów"
 
-#: midx.c:1255
+#: midx.c:1719
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "Znajdywanie i usuwanie niewskazywanych plików paczek"
 
-#: midx.c:1446
+#: midx.c:1911
 msgid "could not start pack-objects"
 msgstr "nie można uruchomić pack-objects"
 
-#: midx.c:1466
+#: midx.c:1931
 msgid "could not finish pack-objects"
 msgstr "nie można zakończyć pack-objects"
 
-#: name-hash.c:538
+#: name-hash.c:542
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "nie można utworzyć wątku lazy_dir: %s"
 
-#: name-hash.c:560
+#: name-hash.c:564
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "nie można utworzyć wątku lazy_name: %s"
 
-#: name-hash.c:566
+#: name-hash.c:570
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "nie można dołączyć do wątku lazy_name: %s"
@@ -5436,274 +5658,275 @@ msgstr "Odmawiam przepisania uwag w %s (poza refs/notes/)"
 msgid "Bad %s value: '%s'"
 msgstr "Zła wartość %s: „%s�"
 
-#: object-file.c:480
+#: object-file.c:459
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr "katalog obiektów %s nie istnieje; sprawdź .git/objects/info/alternates"
 
-#: object-file.c:531
+#: object-file.c:517
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "nie można znormalizować ścieżki alternatywnego obiektu: %s"
 
-#: object-file.c:603
+#: object-file.c:591
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 "%s: ignorowanie alternatywnych magazynów obiektów, zagnieżdżenie za głębokie"
 
-#: object-file.c:610
+#: object-file.c:598
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "nie można znormalizować katalogu obiektu: %s"
 
-#: object-file.c:653
+#: object-file.c:641
 msgid "unable to fdopen alternates lockfile"
 msgstr "nie można wykonać fdopen na pliku blokady alternatywnych obiektów"
 
-#: object-file.c:671
+#: object-file.c:659
 msgid "unable to read alternates file"
 msgstr "nie można odczytać pliku alternatywnych obiektów"
 
-#: object-file.c:678
+#: object-file.c:666
 msgid "unable to move new alternates file into place"
 msgstr "nie można przenieść na miejsce nowego pliku alternatywnych obiektów"
 
-#: object-file.c:713
+#: object-file.c:701
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "ścieżka „%s� nie istnieje"
 
-#: object-file.c:734
+#: object-file.c:722
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "repozytorium odniesienia „%s� jako łączone wybranie nie jest jeszcze "
 "wspierane."
 
-#: object-file.c:740
+#: object-file.c:728
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "repozytorium odniesienia „%s� nie jest lokalnym repozytorium."
 
-#: object-file.c:746
+#: object-file.c:734
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "repozytorium odniesienia „%s� jest płytkie"
 
-#: object-file.c:754
+#: object-file.c:742
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "repozytorium odniesienia „%s� jest szczepione"
 
-#: object-file.c:814
+#: object-file.c:773
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "nie znaleziono katalogu obiektów pasującego do „%s�"
+
+#: object-file.c:823
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "błędny wiersz przy przetwarzaniu alternatywnych referencji: %s"
 
-#: object-file.c:964
+#: object-file.c:973
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "próba mmap %<PRIuMAX> ponad ograniczeniem %<PRIuMAX>"
 
-#: object-file.c:985
-msgid "mmap failed"
-msgstr "mmap nie powiodło się"
+#: object-file.c:1008
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap nie powiodło się%s"
 
-#: object-file.c:1149
+#: object-file.c:1174
 #, c-format
 msgid "object file %s is empty"
 msgstr "plik obiektu %s jest pusty"
 
-#: object-file.c:1284 object-file.c:2477
+#: object-file.c:1293 object-file.c:2499
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "uszkodzony wolny obiekt „%s�"
 
-#: object-file.c:1286 object-file.c:2481
+#: object-file.c:1295 object-file.c:2503
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "śmieci na końcu wolnego obiektu „%s�"
 
-#: object-file.c:1328
+#: object-file.c:1417
+#, c-format
+msgid "unable to parse %s header"
+msgstr "nie można przetworzyć nagłówka %s"
+
+#: object-file.c:1419
 msgid "invalid object type"
 msgstr "zły rodzaj obiektu"
 
-#: object-file.c:1412
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "nie można rozpakować nagłówka %s z --allow-unknown-type"
-
-#: object-file.c:1415
+#: object-file.c:1430
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "nie można rozpakować nagłówka %s"
 
-#: object-file.c:1421
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "nie można przetworzyć nagłówka %s z --allow-unknown-type"
-
-#: object-file.c:1424
+#: object-file.c:1434
 #, c-format
-msgid "unable to parse %s header"
-msgstr "nie można przetworzyć nagłówka %s"
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "nagłówek %s za długi, przekracza %d bajtów"
 
-#: object-file.c:1651
+#: object-file.c:1664
 #, c-format
 msgid "failed to read object %s"
 msgstr "nie można odczytać obiektu %s"
 
-#: object-file.c:1655
+#: object-file.c:1668
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "nie znaleziono zastępstwa %s dla %s"
 
-#: object-file.c:1659
+#: object-file.c:1672
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "wolny obiekt %s (przechowywany w %s) jest uszkodzony"
 
-#: object-file.c:1663
+#: object-file.c:1676
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "spakowany obiekt %s (przechowywany w %s) jest uszkodzony"
 
-#: object-file.c:1768
+#: object-file.c:1781
 #, c-format
 msgid "unable to write file %s"
 msgstr "nie można zapisać pliku %s"
 
-#: object-file.c:1775
+#: object-file.c:1788
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "nie można ustawić uprawnień na „%s�"
 
-#: object-file.c:1782
+#: object-file.c:1795
 msgid "file write error"
 msgstr "błąd zapisu pliku"
 
-#: object-file.c:1802
+#: object-file.c:1815
 msgid "error when closing loose object file"
 msgstr "błąd podczas zamykania pliku wolnego obiektu"
 
-#: object-file.c:1867
+#: object-file.c:1882
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "niewystarczające uprawnienia, aby dodać obiekt do bazy danych repozytorium %s"
 
-#: object-file.c:1869
+#: object-file.c:1884
 msgid "unable to create temporary file"
 msgstr "nie można utworzyć tymczasowego pliku"
 
-#: object-file.c:1893
+#: object-file.c:1908
 msgid "unable to write loose object file"
 msgstr "nie można zapisać pliku wolnego obiektu"
 
-#: object-file.c:1899
+#: object-file.c:1914
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "nie można skompresować nowego obiektu %s (%d)"
 
-#: object-file.c:1903
+#: object-file.c:1918
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "deflateEnd w obiekcie %s nie powiodło się (%d)"
 
-#: object-file.c:1907
+#: object-file.c:1922
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "zamieszanie przez dane źródłowe niestabilnego obiektu dla %s"
 
-#: object-file.c:1917 builtin/pack-objects.c:1097
+#: object-file.c:1933 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr "nie można wykonać utime() na %s"
 
-#: object-file.c:1994
+#: object-file.c:2011
 #, c-format
 msgid "cannot read object for %s"
 msgstr "nie można odczytać obiektu do %s"
 
-#: object-file.c:2045
+#: object-file.c:2062
 msgid "corrupt commit"
 msgstr "uszkodzony zapis"
 
-#: object-file.c:2053
+#: object-file.c:2070
 msgid "corrupt tag"
 msgstr "uszkodzony tag"
 
-#: object-file.c:2153
+#: object-file.c:2170
 #, c-format
 msgid "read error while indexing %s"
 msgstr "błąd odczytu podczas indeksowania %s"
 
-#: object-file.c:2156
+#: object-file.c:2173
 #, c-format
 msgid "short read while indexing %s"
 msgstr "przeczytano mniej niż oczekiwano przy indeksowaniu %s"
 
-#: object-file.c:2229 object-file.c:2239
+#: object-file.c:2246 object-file.c:2256
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s: nie można wstawić do bazy danych"
 
-#: object-file.c:2245
+#: object-file.c:2262
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: niewspierany typ pliku"
 
-#: object-file.c:2269
+#: object-file.c:2286 builtin/fetch.c:1445
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s nie jest prawidłowym obiektem"
 
-#: object-file.c:2271
+#: object-file.c:2288
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s nie jest prawidłowym obiektem „%s�"
 
-#: object-file.c:2298 builtin/index-pack.c:192
+#: object-file.c:2315
 #, c-format
 msgid "unable to open %s"
 msgstr "nie można otworzyć %s"
 
-#: object-file.c:2488 object-file.c:2541
+#: object-file.c:2510
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "niezgodne skróty %s (oczekiwano %s)"
 
-#: object-file.c:2512
+#: object-file.c:2533
 #, c-format
 msgid "unable to mmap %s"
 msgstr "nie można wykonać mmap %s"
 
-#: object-file.c:2517
+#: object-file.c:2539
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "nie można rozpakować nagłówka %s"
 
-#: object-file.c:2523
+#: object-file.c:2544
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "nie można przetworzyć nagłówka %s"
 
-#: object-file.c:2534
+#: object-file.c:2555
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "nie można rozpakować zawartości %s"
 
-#: object-name.c:486
+#: object-name.c:480
 #, c-format
 msgid "short object ID %s is ambiguous"
 msgstr "krótki identyfikator %s jest niejednoznaczny"
 
-#: object-name.c:497
+#: object-name.c:491
 msgid "The candidates are:"
 msgstr "Kandydaci to:"
 
-#: object-name.c:796
+#: object-name.c:790
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5727,22 +5950,22 @@ msgstr ""
 "Sprawdź te referencje i może je usuń. Wyłącz ten komunikat za pomocą\n"
 "„git config advice.objectNameWarning false�"
 
-#: object-name.c:916
+#: object-name.c:910
 #, c-format
 msgid "log for '%.*s' only goes back to %s"
 msgstr "dziennik „%.*s� sięga tylko %s"
 
-#: object-name.c:924
+#: object-name.c:918
 #, c-format
 msgid "log for '%.*s' only has %d entries"
 msgstr "dziennik „%.*s� ma tylko %d wpisów"
 
-#: object-name.c:1702
+#: object-name.c:1696
 #, c-format
 msgid "path '%s' exists on disk, but not in '%.*s'"
 msgstr "ścieżka „%s� istnieje na dysku, ale nie w „%.*s�"
 
-#: object-name.c:1708
+#: object-name.c:1702
 #, c-format
 msgid ""
 "path '%s' exists, but not '%s'\n"
@@ -5751,12 +5974,12 @@ msgstr ""
 "ścieżka „%s� istnieje, ale nie „%s�\n"
 "wskazówka: Czy chodziło o „%.*s:%s� czyli „%.*s:./%s�?"
 
-#: object-name.c:1717
+#: object-name.c:1711
 #, c-format
 msgid "path '%s' does not exist in '%.*s'"
 msgstr "ścieżka „%s� nie istnieje w „%.*s�"
 
-#: object-name.c:1745
+#: object-name.c:1739
 #, c-format
 msgid ""
 "path '%s' is in the index, but not at stage %d\n"
@@ -5765,7 +5988,7 @@ msgstr ""
 "ścieżka „%s� jest w indeksie, ale nie na etapie %d\n"
 "wskazówka: Czy chodziło o „:%d:%s�?"
 
-#: object-name.c:1761
+#: object-name.c:1755
 #, c-format
 msgid ""
 "path '%s' is in the index, but not '%s'\n"
@@ -5774,21 +5997,21 @@ msgstr ""
 "ścieżka „%s� jest w indeksie, ale nie „%s�\n"
 "wskazówka: Czy chodziło o „:%d:%s� czyli „:%d:./%s�?"
 
-#: object-name.c:1769
+#: object-name.c:1763
 #, c-format
 msgid "path '%s' exists on disk, but not in the index"
 msgstr "ścieżka „%s� istnieje na dysku, ale nie w indeksie"
 
-#: object-name.c:1771
+#: object-name.c:1765
 #, c-format
 msgid "path '%s' does not exist (neither on disk nor in the index)"
 msgstr "ścieżka „%s� nie istnieje (ani na dysku, ani w indeksie)"
 
-#: object-name.c:1784
+#: object-name.c:1778
 msgid "relative path syntax can't be used outside working tree"
-msgstr "składnia ścieżki względnej nie może być użyta poza drzewem roboczym"
+msgstr "składni ścieżki względnej nie można użyć poza drzewem roboczym"
 
-#: object-name.c:1922
+#: object-name.c:1916
 #, c-format
 msgid "invalid object name '%.*s'."
 msgstr "nieprawidłowa nazwa obiektu: „%.*s�."
@@ -5803,91 +6026,109 @@ msgstr "nieprawidłowy rodzaj obiektu „%s�"
 msgid "object %s is a %s, not a %s"
 msgstr "obiekt %s to %s, nie %s"
 
-#: object.c:233
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "obiekt %s ma nieznany identyfikator rodzaju %d"
 
-#: object.c:246
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "nie można przetworzyć obiektu: %s"
 
-#: object.c:266 object.c:278
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "niezgodne skróty %s"
 
-#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#: pack-bitmap.c:348
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "w bitmapie wielu paczek brakuje wymaganego odwrotnego indeksu"
+
+#: pack-bitmap.c:424
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: nie można otworzyć paczki"
+
+#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
 #, c-format
 msgid "unable to get size of %s"
 msgstr "nie można uzyskać rozmiaru %s"
 
-#: pack-bitmap.c:1489 builtin/rev-list.c:92
+#: pack-bitmap.c:1916
+#, c-format
+msgid "could not find %s in pack %s at offset %<PRIuMAX>"
+msgstr "nie znaleziono %s w paczce %s na pozycji %<PRIuMAX>"
+
+#: pack-bitmap.c:1952 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "nie można uzyskać użycia dysku %s"
 
-#: pack-revindex.c:220
+#: pack-revindex.c:221
 #, c-format
 msgid "reverse-index file %s is too small"
 msgstr "plik odwrotnego indeksu %s jest za mały"
 
-#: pack-revindex.c:225
+#: pack-revindex.c:226
 #, c-format
 msgid "reverse-index file %s is corrupt"
 msgstr "plik odwrotnego indeksu %s jest uszkodzony"
 
-#: pack-revindex.c:233
+#: pack-revindex.c:234
 #, c-format
 msgid "reverse-index file %s has unknown signature"
 msgstr "plik odwrotnego indeksu %s ma nieznanÄ… sygnaturÄ™"
 
-#: pack-revindex.c:237
+#: pack-revindex.c:238
 #, c-format
 msgid "reverse-index file %s has unsupported version %<PRIu32>"
 msgstr "plik odwrotnego indeksu %s ma niewspieranÄ… wersjÄ™ %<PRIu32>"
 
-#: pack-revindex.c:242
+#: pack-revindex.c:243
 #, c-format
 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
 msgstr ""
 "plik odwrotnego indeksu %s ma niewspierany identyfikator skrótu %<PRIu32>"
 
-#: pack-write.c:236
+#: pack-write.c:251
 msgid "cannot both write and verify reverse index"
 msgstr "nie można i zapisać, i sprawdzić odwrotnego indeksu"
 
-#: pack-write.c:257
+#: pack-write.c:270
 #, c-format
 msgid "could not stat: %s"
 msgstr "nie można wykonać stat: %s"
 
-#: pack-write.c:269
+#: pack-write.c:282
 #, c-format
 msgid "failed to make %s readable"
 msgstr "nie można dodać praw do odczytu %s"
 
-#: pack-write.c:502
+#: pack-write.c:520
 #, c-format
 msgid "could not write '%s' promisor file"
 msgstr "nie można pisać do obiecującego pliku „%s�"
 
-#: packfile.c:625
+#: packfile.c:626
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "pozycja przed końcem pliku paczki (zepsuty .idx?)"
 
-#: packfile.c:1934
+#: packfile.c:656
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "nie można wykonać mapowania pliku paczki %s%s"
+
+#: packfile.c:1923
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "pozycja przed poczÄ…tkiem indeksu paczki dla %s (uszkodzony indeks?)"
 
-#: packfile.c:1938
+#: packfile.c:1927
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "pozycja za końcem indeksu paczki dla %s (ucięty indeks?)"
 
-#: parse-options-cb.c:20 parse-options-cb.c:24
+#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
 #, c-format
 msgid "option `%s' expects a numerical value"
 msgstr "opcja „%s� oczekuje wartości liczbowej"
@@ -5907,72 +6148,72 @@ msgstr "opcja „%s� oczekuje „always�, „auto� lub „never�"
 msgid "malformed object name '%s'"
 msgstr "nieprawidłowa nazwa obiektu „%s�"
 
-#: parse-options.c:38
+#: parse-options.c:58
 #, c-format
 msgid "%s requires a value"
 msgstr "%s wymaga wartości"
 
-#: parse-options.c:73
+#: parse-options.c:93
 #, c-format
 msgid "%s is incompatible with %s"
 msgstr "%s i %s siÄ™ wykluczajÄ…"
 
-#: parse-options.c:78
+#: parse-options.c:98
 #, c-format
 msgid "%s : incompatible with something else"
 msgstr "%s : wyklucza siÄ™ z czymÅ› innym"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
 #, c-format
 msgid "%s takes no value"
 msgstr "%s nie przyjmuje wartości"
 
-#: parse-options.c:94
+#: parse-options.c:114
 #, c-format
 msgid "%s isn't available"
 msgstr "%s niedostępny"
 
-#: parse-options.c:217
+#: parse-options.c:237
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr ""
 "%s oczekuje nieujemnej wartości całkowitej z nieobowiązkowym sufiksem k/m/g"
 
-#: parse-options.c:386
+#: parse-options.c:393
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "niejednoznaczna opcja: %s (może być --%s%s or --%s%s)"
 
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:427 parse-options.c:435
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr "czy chodziło o „--%s� (z dwoma myślnikami)?"
 
-#: parse-options.c:666 parse-options.c:971
+#: parse-options.c:677 parse-options.c:1053
 #, c-format
 msgid "alias of --%s"
 msgstr "synonim do --%s"
 
-#: parse-options.c:862
+#: parse-options.c:891
 #, c-format
 msgid "unknown option `%s'"
 msgstr "nieznana opcja „%s�"
 
-#: parse-options.c:864
+#: parse-options.c:893
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "nieznany przełącznik „%c�"
 
-#: parse-options.c:866
+#: parse-options.c:895
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "nieznana opcja spoza zakresu ASCII w łańcuchu: „%s�"
 
-#: parse-options.c:890
+#: parse-options.c:919
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:909
+#: parse-options.c:933
 #, c-format
 msgid "usage: %s"
 msgstr "użycie: %s"
@@ -5980,47 +6221,71 @@ msgstr "użycie: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:915
+#: parse-options.c:948
 #, c-format
 msgid "   or: %s"
 msgstr "   lub: %s"
 
-#: parse-options.c:918
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. 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
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:992
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:957
+#: parse-options.c:1039
 msgid "-NUM"
 msgstr "-ILE"
 
-#: path.c:915
+#: path.c:922
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Nie można pozwolić grupie zapisywać do %s"
 
-#: pathspec.c:130
+#: pathspec.c:150
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "Znak ucieczki „\\� niedozwolony jako ostatni znak w wartości atrybutu"
 
-#: pathspec.c:148
+#: pathspec.c:168
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Wolno użyć tylko jednego „attr:�."
 
-#: pathspec.c:151
+#: pathspec.c:171
 msgid "attr spec must not be empty"
 msgstr "atrybut nie może być pusty"
 
-#: pathspec.c:194
+#: pathspec.c:214
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "błędna nazwa atrybutu %s"
 
-#: pathspec.c:259
+#: pathspec.c:279
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr "globalne ustawienia ścieżek „glob� i „noglob� się wykluczają"
 
-#: pathspec.c:266
+#: pathspec.c:286
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -6028,51 +6293,51 @@ msgstr ""
 "globalne ustawienia ścieżek „literal� i wszystkie inne globalne wykluczają "
 "siÄ™"
 
-#: pathspec.c:306
+#: pathspec.c:326
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "nieprawidłowy parametr magicznej ścieżki „prefix:�"
 
-#: pathspec.c:327
+#: pathspec.c:347
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Nieprawidłowy magiczny numer ścieżki „%.*s� w „%s�"
 
-#: pathspec.c:332
+#: pathspec.c:352
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "Brakujący „)� pod koniec magicznej ścieżki w „%s�"
 
-#: pathspec.c:370
+#: pathspec.c:390
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Niezaimplementowany magiczny numer ścieżki „%c� w „%s�"
 
-#: pathspec.c:429
+#: pathspec.c:449
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: „literal� i „glob� się wykluczają"
 
-#: pathspec.c:445
+#: pathspec.c:465
 #, c-format
 msgid "%s: '%s' is outside repository at '%s'"
 msgstr "%s: „%s� jest poza repozytorium w „%s�"
 
-#: pathspec.c:521
+#: pathspec.c:541
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (skrót: '%c')"
 
-#: pathspec.c:531
+#: pathspec.c:551
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: magiczna ścieżka niewspierana przez to polecenie: %s"
 
-#: pathspec.c:598
+#: pathspec.c:618
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "ścieżka „%s� przechodzi przez dowiązanie"
 
-#: pathspec.c:643
+#: pathspec.c:663
 #, c-format
 msgid "line is badly quoted: %s"
 msgstr "wiersz jest źle zacytowany: %s"
@@ -6086,14 +6351,14 @@ msgid "unable to write delim packet"
 msgstr "nie można zapisać pakietu oddzielającego"
 
 #: pkt-line.c:106
-msgid "unable to write stateless separator packet"
-msgstr "nie można zapisać bezstanowego pakietu separatora"
+msgid "unable to write response end packet"
+msgstr "nie można zapisać pakietu końca odpowiedzi"
 
 #: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr "nie można zapisać pakietu wypróżnienia"
 
-#: pkt-line.c:153 pkt-line.c:239
+#: pkt-line.c:153
 msgid "protocol error: impossibly long line"
 msgstr "błąd protokołu: niemożliwie długi wiersz"
 
@@ -6101,88 +6366,93 @@ msgstr "błąd protokołu: niemożliwie długi wiersz"
 msgid "packet write with format failed"
 msgstr "nie można zapisać pakietu z formatem"
 
-#: pkt-line.c:203
+#: pkt-line.c:204 pkt-line.c:252
 msgid "packet write failed - data exceeds max packet size"
 msgstr ""
 "zapis pakietu nie powiódł się — dane przekraczają maksymalny rozmiar pakietu"
 
-#: pkt-line.c:210 pkt-line.c:217
-msgid "packet write failed"
-msgstr "nie można zapisać pakietu"
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
+msgstr "nie można zapisać pakietu: %s"
 
-#: pkt-line.c:302
+#: pkt-line.c:349 pkt-line.c:350
 msgid "read error"
 msgstr "błąd odczytu"
 
-#: pkt-line.c:310
+#: pkt-line.c:360 pkt-line.c:361
 msgid "the remote end hung up unexpectedly"
 msgstr "zdalna maszyna nieoczekiwanie się rozłączyła"
 
-#: pkt-line.c:338
+#: pkt-line.c:390 pkt-line.c:392
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "błąd protokołu: zły znak długości wiersza: %.4s"
 
-#: pkt-line.c:352 pkt-line.c:357
+#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "błąd protokołu: zła długość wiersza %d"
 
-#: pkt-line.c:373 sideband.c:165
+#: pkt-line.c:434 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "błąd serwera: %s"
 
-#: preload-index.c:119
+#: preload-index.c:125
 msgid "Refreshing index"
 msgstr "Odświeżanie indeksu"
 
-#: preload-index.c:138
+#: preload-index.c:144
 #, c-format
 msgid "unable to create threaded lstat: %s"
 msgstr "nie można utworzyć wątkowanego lstat: %s"
 
-#: pretty.c:984
+#: pretty.c:1051
 msgid "unable to parse --pretty format"
 msgstr "nie można przetworzyć formatu --pretty"
 
-#: promisor-remote.c:30
+#: promisor-remote.c:31
 msgid "promisor-remote: unable to fork off fetch subprocess"
 msgstr "promisor-remote: nie można oddzielić pod-procesu pobierania"
 
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
 msgid "promisor-remote: could not write to fetch subprocess"
 msgstr "promisor-remote: nie można zapisać do pod-procesu pobierania"
 
-#: promisor-remote.c:41
+#: promisor-remote.c:44
 msgid "promisor-remote: could not close stdin to fetch subprocess"
 msgstr ""
 "promisor-remote: nie można zamknąć standardowego wejścia do pod-procesu "
 "pobierania"
 
-#: promisor-remote.c:53
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "obiecująca zdalna nazwa nie może zaczynać się od „/�: %s"
 
+#: protocol-caps.c:103
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: oczekiwano wypróżnienia po argumentach"
+
 #: prune-packed.c:35
 msgid "Removing duplicate objects"
 msgstr "Usuwanie zduplikowanych obiektów"
 
-#: range-diff.c:78
+#: range-diff.c:67
 msgid "could not start `log`"
 msgstr "nie można uruchomić „log�"
 
-#: range-diff.c:80
+#: range-diff.c:69
 msgid "could not read `log` output"
 msgstr "nie można odczytać wyjścia „log�"
 
-#: range-diff.c:101 sequencer.c:5318
+#: range-diff.c:97 sequencer.c:5605
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "nie można przetworzyć zapisu „%s�"
 
-#: range-diff.c:115
+#: range-diff.c:111
 #, c-format
 msgid ""
 "could not parse first line of `log` output: did not start with 'commit ': "
@@ -6191,68 +6461,68 @@ msgstr ""
 "nie można przetworzyć pierwszego wiersza wyjścia „log�: nie zaczynał się od "
 "„zapis�: „%s�"
 
-#: range-diff.c:140
+#: range-diff.c:137
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "nie można przetworzyć nagłówka gita „%.*s�"
 
-#: range-diff.c:306
+#: range-diff.c:304
 msgid "failed to generate diff"
 msgstr "nie można wygenerować różnic"
 
-#: range-diff.c:558
+#: range-diff.c:559
 msgid "--left-only and --right-only are mutually exclusive"
 msgstr "--left-only i --right-only siÄ™ wykluczajÄ…"
 
-#: range-diff.c:561 range-diff.c:563
+#: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "nie można przetworzyć dziennika do „%s�"
 
-#: read-cache.c:682
+#: read-cache.c:710
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "nie dodam skrótu pliku „%s� („%s� już widnieje w indeksie)"
 
-#: read-cache.c:698
+#: read-cache.c:726
 msgid "cannot create an empty blob in the object database"
 msgstr "nie można utworzyć pustego blobu w bazie danych obiektów"
 
-#: read-cache.c:720
+#: read-cache.c:748
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr "%s: można dodać tylko zwykłe pliki, dowiązania i katalogi gita"
 
-#: read-cache.c:725
+#: read-cache.c:753 builtin/submodule--helper.c:3241
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "„%s� nie ma wybranego zapisu"
 
-#: read-cache.c:777
+#: read-cache.c:805
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "nie można zaindeksować pliku „%s�"
 
-#: read-cache.c:796
+#: read-cache.c:824
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "nie można dodać „%s� do indeksu"
 
-#: read-cache.c:807
+#: read-cache.c:835
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "nie można wykonać stat na „%s�"
 
-#: read-cache.c:1318
+#: read-cache.c:1373
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "„%s� widnieje jako i plik, i katalog"
 
-#: read-cache.c:1524
+#: read-cache.c:1588
 msgid "Refresh index"
 msgstr "Odśwież indeks"
 
-#: read-cache.c:1639
+#: read-cache.c:1720
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6261,7 +6531,7 @@ msgstr ""
 "ustawiono index.version, ale wartość jest nieprawidłowa.\n"
 "Używanie wersji %i"
 
-#: read-cache.c:1649
+#: read-cache.c:1730
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6270,139 +6540,143 @@ msgstr ""
 "ustawiono GIT_INDEX_VERSION, ale wartość jest nieprawidłowa.\n"
 "Używanie wersji %i"
 
-#: read-cache.c:1705
+#: read-cache.c:1786
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "zły podpis 0x%08x"
 
-#: read-cache.c:1708
+#: read-cache.c:1789
 #, c-format
 msgid "bad index version %d"
 msgstr "zła wersja indeksu %d"
 
-#: read-cache.c:1717
+#: read-cache.c:1798
 msgid "bad index file sha1 signature"
 msgstr "zły skrót SHA-1 pliku indeksu"
 
-#: read-cache.c:1747
+#: read-cache.c:1832
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "indeks używa rozszerzenia %.4s, którego nie rozumiemy"
 
-#: read-cache.c:1749
+#: read-cache.c:1834
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "pomijanie rozszerzenia %.4s"
 
-#: read-cache.c:1786
+#: read-cache.c:1871
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "nieznany format elementu indeksu 0x%08x"
 
-#: read-cache.c:1802
+#: read-cache.c:1887
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "nieprawidłowe pole nazwy w indeksie, blisko ścieżki „%s�"
 
-#: read-cache.c:1859
+#: read-cache.c:1944
 msgid "unordered stage entries in index"
 msgstr "nieuporzÄ…dkowane elementy przygotowane w indeksie"
 
-#: read-cache.c:1862
+#: read-cache.c:1947
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "wiele elementów w przygotowaniu dla scalonego pliku „%s�"
 
-#: read-cache.c:1865
+#: read-cache.c:1950
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "nieuporządkowane elementy przygotowane w „%s�"
 
-#: read-cache.c:1971 read-cache.c:2262 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
-#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
-#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290
-#: builtin/submodule--helper.c:332
+#: 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
+#: 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
 msgid "index file corrupt"
 msgstr "uszkodzony plik indeksu"
 
-#: read-cache.c:2115
+#: read-cache.c:2209
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "nie można utworzyć wątku load_cache_entries: %s"
 
-#: read-cache.c:2128
+#: read-cache.c:2222
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "nie można dołączyć do wątku load_cache_entries: %s"
 
-#: read-cache.c:2161
+#: read-cache.c:2255
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: nie można otworzyć pliku indeksu"
 
-#: read-cache.c:2165
+#: read-cache.c:2259
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: nie można wykonać stat na otwartym indeksie"
 
-#: read-cache.c:2169
+#: read-cache.c:2263
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: plik indeksu mniejszy niż oczekiwano"
 
-#: read-cache.c:2173
+#: read-cache.c:2267
 #, c-format
-msgid "%s: unable to map index file"
-msgstr "%s: nie można wykonać mapowania pliku indeksu"
+msgid "%s: unable to map index file%s"
+msgstr "%s: nie można wykonać mapowania pliku indeksu%s"
 
-#: read-cache.c:2215
+#: read-cache.c:2310
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "nie można utworzyć wątku load_index_extensions: %s"
 
-#: read-cache.c:2242
+#: read-cache.c:2337
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "nie można złączyć wątku load_index_extensions: %s"
 
-#: read-cache.c:2274
+#: read-cache.c:2375
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "nie można odświeżyć wspólnego indeksu „%s�"
 
-#: read-cache.c:2321
+#: read-cache.c:2434
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "zepsuty indeks, oczekiwano %s w %s, otrzymano %s"
 
-#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
+#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
 #, c-format
 msgid "could not close '%s'"
 msgstr "nie można zamknąć „%s�"
 
-#: read-cache.c:3120 sequencer.c:2487 sequencer.c:4239
+#: read-cache.c:3108
+msgid "failed to convert to a sparse-index"
+msgstr "nie można przekształcić w rzadki indeks"
+
+#: read-cache.c:3179
 #, c-format
 msgid "could not stat '%s'"
 msgstr "nie można wykonać stat na „%s�"
 
-#: read-cache.c:3133
+#: read-cache.c:3192
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "nie można otworzyć katalogu gita: %s"
 
-#: read-cache.c:3145
+#: read-cache.c:3204
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "nie można wykonać unlink: „%s�"
 
-#: read-cache.c:3170
+#: read-cache.c:3233
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "nie można naprawić bitów uprawnień w „%s�"
 
-#: read-cache.c:3319
+#: read-cache.c:3390
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: nie można zrzucić do etapu nr 0"
@@ -6431,7 +6705,10 @@ msgid ""
 "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"
+"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n"
+"                   commit's log message, unless -C is used, in which case\n"
+"                   keep only this commit's message; -c is same as -C but\n"
+"                   opens the editor\n"
 "x, exec <command> = run command (the rest of the line) using shell\n"
 "b, break = stop here (continue rebase later with 'git rebase --continue')\n"
 "d, drop <commit> = remove commit\n"
@@ -6440,7 +6717,7 @@ msgid ""
 "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"
+".       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 ""
@@ -6450,7 +6727,11 @@ msgstr ""
 "r, reword <zapis> = użyj zapisu, ale przeredaguj jego komunikat\n"
 "e, edit <zapis> = użyj zapisu, ale zatrzymaj się, żeby go poprawić\n"
 "s, squash <zapis> = użyj zapisu, ale połącz go z poprzednim (spłaszcz)\n"
-"f, fixup <zapis> = jak „squash�, ale odrzuć komunikat tego zapisu\n"
+"f, fixup [-C | -c] <zapis> = jak „squash�, ale odrzuć komunikat tego "
+"zapisu,\n"
+"                   chyba że użyto -C, wtedy zachowaj tylko komunikat tego "
+"zapisu;\n"
+"                   -c jest jak -C ale otwiera edytor\n"
 "x, exec <polecenie> = wykonaj polecenie (resztę wiersza) w powłoce\n"
 "b, break = zatrzymaj się tu (kontynuuj przestawianie przez „git rebase --"
 "continue�)\n"
@@ -6458,12 +6739,14 @@ msgstr ""
 "l, label <etykietka> = nazwij bieżące HEAD\n"
 "t, reset <etykietka> = zresetuj HEAD do etykietki\n"
 "m, merge [-C <zapis> | -c <zapis>] <etykietka> [# <wiersz>]\n"
-".       utwórz zapis scalenia używając pierwotnego komunikatu scalenia\n"
-".       (albo <wiersza>, jeśli nie podano pierwotnego zapisu scalenia.\n"
-".       Użyj -c <zapis>, aby przeredagować komunikat zapisu.\n"
+".       utwórz zapis scalenia używając pierwotnego komunikatu <zapisu> "
+"scalenia\n"
+".       (albo <wiersza>, jeśli nie podano pierwotnego zapisu scalenia);\n"
+".       użyj -c <zapis>, aby przeredagować komunikat zapisu\n"
+"\n"
 "Kolejność wierszy może być zmieniona; są wykonywane z góry na dół.\n"
 
-#: rebase-interactive.c:63
+#: rebase-interactive.c:66
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
@@ -6471,7 +6754,7 @@ msgstr[0] "Przestawianie %s na %s (%d polecenie)"
 msgstr[1] "Przestawianie %s na %s (%d polecenia)"
 msgstr[2] "Przestawianie %s na %s (%d poleceń)"
 
-#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6479,7 +6762,7 @@ msgstr ""
 "\n"
 "Nie usuwaj żadnego wiersza. Użyj jawnie „drop�, żeby usunąć wpis.\n"
 
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6487,7 +6770,7 @@ msgstr ""
 "\n"
 "Jeśli usuniesz tutaj wiersz, TEN ZAPIS BĘDZIE STRACONY.\n"
 
-#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6501,7 +6784,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -6511,19 +6794,19 @@ msgstr ""
 "Jeśli jednak usuniesz wszystko, przestawianie zostanie przerwane.\n"
 "\n"
 
-#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615
-#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
+#: 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
+#: builtin/rebase.c:190
 #, c-format
 msgid "could not write '%s'"
 msgstr "nie można pisać do „%s�"
 
-#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
-#: builtin/rebase.c:254
+#: rebase-interactive.c:119
 #, c-format
 msgid "could not write '%s'."
 msgstr "nie można pisać do „%s�."
 
-#: rebase-interactive.c:193
+#: rebase-interactive.c:196
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -6532,7 +6815,7 @@ msgstr ""
 "Ostrzeżenie: niektóre zapisy mogły zostać omyłkowo porzucone.\n"
 "Porzucone zapisy (od najnowszych do najstarszych):\n"
 
-#: rebase-interactive.c:200
+#: rebase-interactive.c:203
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -6548,14 +6831,12 @@ msgstr ""
 "Możliwe zachowania to: ignore, warn, error.\n"
 "\n"
 
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
-#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
-#: builtin/rebase.c:266
+#: rebase.c:29
 #, c-format
-msgid "could not read '%s'."
-msgstr "nie można odczytać „%s�."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: „preserve� zostało uogólnione do „merges�"
 
-#: ref-filter.c:42 wt-status.c:1975
+#: ref-filter.c:42 wt-status.c:2036
 msgid "gone"
 msgstr "nie ma"
 
@@ -6574,127 +6855,142 @@ msgstr "w tyle %d"
 msgid "ahead %d, behind %d"
 msgstr "do przodu %d, w tyle %d"
 
-#: ref-filter.c:169
+#: ref-filter.c:235
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "oczekiwany format: %%(color:<kolor>)"
 
-#: ref-filter.c:171
+#: ref-filter.c:237
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
-msgstr "nierozpoznany kolor: %%(kolor:%s)"
+msgstr "nierozpoznany kolor: %%(color:%s)"
 
-#: ref-filter.c:193
+#: ref-filter.c:259
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Oczekiwano wartości całkowitej refname:lstrip=%s"
 
-#: ref-filter.c:197
+#: ref-filter.c:263
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Oczekiwano wartości całkowitej refname:rstrip=%s"
 
-#: ref-filter.c:199
+#: ref-filter.c:265
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "nierozpoznany argument %%(%s): %s"
 
-#: ref-filter.c:254
+#: ref-filter.c:320
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) nie przyjmuje argumentów"
 
-#: ref-filter.c:276
+#: ref-filter.c:344
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "nierozpoznany argument %%(objectsize): %s"
 
-#: ref-filter.c:284
+#: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) nie przyjmuje argumentów"
 
-#: ref-filter.c:296
+#: ref-filter.c:364
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) nie przyjmuje argumentów"
 
-#: ref-filter.c:309
+#: ref-filter.c:377
 #, c-format
 msgid "unrecognized %%(subject) argument: %s"
 msgstr "nierozpoznany argument %%(subject): %s"
 
-#: ref-filter.c:330
+#: ref-filter.c:396
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "oczekiwano %%(trailers:key=<wartość>)"
+
+#: ref-filter.c:398
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "nieznany argument %%(trailers): %s"
 
-#: ref-filter.c:363
+#: ref-filter.c:429
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "oczekiwano wartości dodatniej contents:lines=%s"
 
-#: ref-filter.c:365
+#: ref-filter.c:431
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "nierozpoznany argument %%(contents): %s"
 
-#: ref-filter.c:380
+#: ref-filter.c:443
+#, c-format
+msgid "unrecognized %%(raw) argument: %s"
+msgstr "nierozpoznany argument %%(raw): %s"
+
+#: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "oczekiwano wartości dodatniej „%s� w %%(%s)"
 
-#: ref-filter.c:384
+#: ref-filter.c:462
 #, c-format
 msgid "unrecognized argument '%s' in %%(%s)"
 msgstr "nierozpoznany argument „%s� w %%(%s)"
 
-#: ref-filter.c:398
+#: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
 msgstr "nierozpoznawana opcja e-mail: %s"
 
-#: ref-filter.c:428
+#: ref-filter.c:506
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "oczekiwany format: %%(align:<szerokość>,<pozycja>)"
 
-#: ref-filter.c:440
+#: ref-filter.c:518
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "nierozpoznawana pozycja:%s"
 
-#: ref-filter.c:447
+#: ref-filter.c:525
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "nierozpoznawana szerokość:%s"
 
-#: ref-filter.c:456
+#: ref-filter.c:534
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "nierozpoznany argument %%(align): %s"
 
-#: ref-filter.c:464
+#: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "oczekiwano dodatniej szerokości z atomem %%(align)"
 
-#: ref-filter.c:482
+#: ref-filter.c:560
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "nierozpoznany argument %%(if): %s"
 
-#: ref-filter.c:584
+#: ref-filter.c:568
+#, c-format
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) nie przyjmuje argumentów"
+
+#: ref-filter.c:680
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nieprawidłowa nazwa pola %.*s"
 
-#: ref-filter.c:611
+#: ref-filter.c:707
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nieznana nazwa pola: %.*s"
 
-#: ref-filter.c:615
+#: ref-filter.c:711
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
@@ -6702,126 +6998,136 @@ msgstr ""
 "to nie jest repozytorium gita, ale pole „%.*s� wymaga dostępu do danych "
 "obiektów"
 
-#: ref-filter.c:739
+#: ref-filter.c:844
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format: atom %%(if) użyty bez atomu %%(then)"
 
-#: ref-filter.c:802
+#: ref-filter.c:910
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "format: atom %%(then) użyty bez atomu %%(if)"
 
-#: ref-filter.c:804
+#: ref-filter.c:912
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format: atom %%(then) użyty więcej niż raz"
 
-#: ref-filter.c:806
+#: ref-filter.c:914
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: atom %%(then) użyty po %%(else)"
 
-#: ref-filter.c:834
+#: ref-filter.c:946
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "format: atom %%(else) użyty bez atomu %%(if)"
 
-#: ref-filter.c:836
+#: ref-filter.c:948
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "format: atom %%(else) użyty bez atomu %%(then)"
 
-#: ref-filter.c:838
+#: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "format: atom %%(else) użyty więcej niż raz"
 
-#: ref-filter.c:853
+#: ref-filter.c:965
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "format: atom %%(end) użyty bez odpowiadającego atomu"
 
-#: ref-filter.c:910
+#: ref-filter.c:1027
 #, c-format
 msgid "malformed format string %s"
 msgstr "nieprawidłowy format %s"
 
-#: ref-filter.c:1551
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "to polecenie odrzuca atom %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s, --python, --shell i --tcl siÄ™ wykluczajÄ…"
+
+#: ref-filter.c:1706
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(brak gałęzi, przestawianie %s)"
 
-#: ref-filter.c:1554
+#: ref-filter.c:1709
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr "(brak gałęzi, przestawianie odłączonego HEAD %s)"
 
-#: ref-filter.c:1557
+#: ref-filter.c:1712
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(brak gałęzi, przeszukiwanie rozpoczęte od %s)"
 
-#: ref-filter.c:1561
+#: ref-filter.c:1716
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD odłączone na %s)"
 
-#: ref-filter.c:1564
+#: ref-filter.c:1719
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD odłączone od %s)"
 
-#: ref-filter.c:1567
+#: ref-filter.c:1722
 msgid "(no branch)"
 msgstr "(brak gałęzi)"
 
-#: ref-filter.c:1599 ref-filter.c:1808
+#: ref-filter.c:1754 ref-filter.c:1972
 #, c-format
 msgid "missing object %s for %s"
 msgstr "brakujÄ…cy obiekt %s do %s"
 
-#: ref-filter.c:1609
+#: ref-filter.c:1764
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer nie powiodło się na %s do %s"
 
-#: ref-filter.c:1992
+#: ref-filter.c:2155
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "uszkodzony obiekt w „%s�"
 
-#: ref-filter.c:2081
+#: ref-filter.c:2245
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ignorowanie referencji z zepsutÄ… nazwÄ… %s"
 
-#: ref-filter.c:2086 refs.c:676
+#: ref-filter.c:2250 refs.c:673
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ignorowanie zepsutej referencji %s"
 
-#: ref-filter.c:2426
+#: ref-filter.c:2623
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: brakuje atomu %%(end)"
 
-#: ref-filter.c:2525
+#: ref-filter.c:2726
 #, c-format
 msgid "malformed object name %s"
 msgstr "nieprawidłowa nazwa obiektu %s"
 
-#: ref-filter.c:2530
+#: ref-filter.c:2731
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "opcja „%s� musi wskazywać na zapis"
 
-#: refs.c:264
+#: refs.c:261
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr "%s nie wskazuje na prawidłowy obiekt!"
 
-#: refs.c:566
+#: refs.c:563
 #, c-format
 msgid ""
 "Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6847,81 +7153,81 @@ msgstr ""
 "\n"
 "\tgit branch -m <nazwa>\n"
 
-#: refs.c:588
+#: refs.c:585
 #, c-format
 msgid "could not retrieve `%s`"
 msgstr "nie można odebrać „%s�"
 
-#: refs.c:598
+#: refs.c:595
 #, c-format
 msgid "invalid branch name: %s = %s"
 msgstr "nieprawidłowa nazwa gałęzi: %s = %s"
 
-#: refs.c:674
+#: refs.c:671
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr "ignorowanie wiszÄ…cej referencji symbolicznej %s"
 
-#: refs.c:922
+#: refs.c:920
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "dziennik referencji %s ma lukÄ™ po %s"
 
-#: refs.c:929
+#: refs.c:927
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "dziennik referencji %s nieoczekiwanie się skończył na %s"
 
-#: refs.c:994
+#: refs.c:992
 #, c-format
 msgid "log for %s is empty"
 msgstr "dziennik dla %s jest pusty"
 
-#: refs.c:1086
+#: refs.c:1084
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "odmawiam zaktualizowania referencji ze złą nazwą „%s�"
 
-#: refs.c:1157
+#: refs.c:1155
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "update_ref nie powiodło się dla referencji „%s�: %s"
 
-#: refs.c:2051
+#: refs.c:2062
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "wiele aktualizacji referencji „%s� niedozwolone"
 
-#: refs.c:2131
+#: refs.c:2142
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "aktualizacje referencji zabronione w środowisku kwarantanny"
 
-#: refs.c:2142
+#: refs.c:2153
 msgid "ref updates aborted by hook"
 msgstr "aktualizacje referencji przerwane przez skrypt repozytorium"
 
-#: refs.c:2242 refs.c:2272
+#: refs.c:2253 refs.c:2283
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "„%s� istnieje; nie można utworzyć „%s�"
 
-#: refs.c:2248 refs.c:2283
+#: refs.c:2259 refs.c:2294
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "nie można przetworzyć jednocześnie „%s� i „%s�"
 
-#: refs/files-backend.c:1228
+#: refs/files-backend.c:1271
 #, c-format
 msgid "could not remove reference %s"
 msgstr "nie można usunąć referencji %s"
 
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/packed-backend.c:1559
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "nie można usunąć referencji %s: %s"
 
-#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1288 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr "nie można usunąć referencji: %s"
@@ -7229,7 +7535,7 @@ msgstr "nie można zapisać wpisu rerere"
 msgid "there were errors while writing '%s' (%s)"
 msgstr "wystąpiły błędy przy zapisywaniu „%s� (%s)"
 
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "nie można wypróżnić „%s�'"
@@ -7274,8 +7580,8 @@ msgstr "nie można usunąć bezpańskiego „%s�"
 msgid "Recorded preimage for '%s'"
 msgstr "Zapamiętano wstępny obraz „%s�"
 
-#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
+#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "nie można utworzyć katalogu „%s�"
@@ -7313,122 +7619,126 @@ msgstr "nie można otworzyć katalogu pamięci podręcznej rr-cache"
 msgid "could not determine HEAD revision"
 msgstr "nie można ustalić rewizji HEAD"
 
-#: reset.c:70 reset.c:76 sequencer.c:3468
+#: reset.c:70 reset.c:76 sequencer.c:3705
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "nie znaleziono drzewa %s"
 
-#: revision.c:2338
+#: revision.c:2259
+msgid "--unsorted-input is incompatible with --no-walk"
+msgstr "--unsorted-input i --no-walk siÄ™ wykluczajÄ…"
+
+#: revision.c:2346
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "--unpacked=<plik-paczki> nie jest już wspierany"
 
-#: revision.c:2668
+#: revision.c:2655 revision.c:2659
+msgid "--no-walk is incompatible with --unsorted-input"
+msgstr "--no-walk i --unsorted-input siÄ™ wykluczajÄ…"
+
+#: revision.c:2690
 msgid "your current branch appears to be broken"
 msgstr "twoja obecna gałąź wydaje się być uszkodzona"
 
-#: revision.c:2671
+#: revision.c:2693
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "twoja obecna gałąź „%s� nie ma jeszcze żadnych zapisów"
 
-#: revision.c:2877
+#: revision.c:2895
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L nie wspiera jeszcze formatów różnic oprócz -p i -s"
 
-#: run-command.c:767
-msgid "open /dev/null failed"
-msgstr "otwarcie /dev/null nie powiodło się"
-
-#: run-command.c:1274
+#: run-command.c:1278
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "nie można utworzyć asynchronicznego wątku: %s"
 
-#: run-command.c:1338
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Skrypt repozytorium „%s� został zignorowany, bo nie jest wykonywalny.\n"
-"Możesz wyłączyć to ostrzeżenie przez „git config advice.ignoredHook false�."
-
-#: send-pack.c:146
+#: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 "nieoczekiwany pakiet wypróżnienia podczas odczytu stanu zdalnego rozpakowania"
 
-#: send-pack.c:148
+#: send-pack.c:152
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "nie można przetworzyć zdalnego stanu rozpakowania: %s"
 
-#: send-pack.c:150
+#: send-pack.c:154
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "zdalne rozpakowanie nie powiodło się: %s"
 
-#: send-pack.c:374
+#: send-pack.c:378
 msgid "failed to sign the push certificate"
 msgstr "nie można podpisać certyfikatu wypychania"
 
-#: send-pack.c:467
+#: send-pack.c:435
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: nie można oddzielić pod-procesu pobierania"
+
+#: send-pack.c:457
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "negocjacja przekazania nie powiodła się; przekazywanie mimo to"
+
+#: send-pack.c:528
 msgid "the receiving end does not support this repository's hash algorithm"
 msgstr "odbierający koniec nie wspiera algorytmu skrótu tego repozytorium"
 
-#: send-pack.c:476
+#: send-pack.c:537
 msgid "the receiving end does not support --signed push"
-msgstr "odbierający koniec nie wspiera podpisanych wypchnięć"
+msgstr "odbierający koniec nie wspiera wypchnięć --signed"
 
-#: send-pack.c:478
+#: send-pack.c:539
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr ""
 "nie wysyłanie certyfikatu wypchnięcia, bo odbierający koniec nie wspiera "
-"podpisanego wypychania"
+"wypychnięć --signed"
 
-#: send-pack.c:490
+#: send-pack.c:546
 msgid "the receiving end does not support --atomic push"
-msgstr "odbierający koniec nie wspiera atomowych wypchnięć"
+msgstr "odbierający koniec nie wspiera wypchnięć --atomic"
 
-#: send-pack.c:495
+#: send-pack.c:551
 msgid "the receiving end does not support push options"
 msgstr "odbierajÄ…cy koniec nie wspiera opcji wypychania"
 
-#: sequencer.c:195
+#: sequencer.c:197
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "nieprawidłowy tryb czyszczenia komunikatu zapisu „%s�"
 
-#: sequencer.c:323
+#: sequencer.c:325
 #, c-format
 msgid "could not delete '%s'"
 msgstr "nie można usunąć „%s�"
 
-#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
+#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:408
 #, c-format
 msgid "could not remove '%s'"
 msgstr "nie można usunąć „%s�"
 
-#: sequencer.c:353
+#: sequencer.c:355
 msgid "revert"
 msgstr "odwracanie"
 
-#: sequencer.c:355
+#: sequencer.c:357
 msgid "cherry-pick"
 msgstr "dobieranie"
 
-#: sequencer.c:357
+#: sequencer.c:359
 msgid "rebase"
 msgstr "przestawianie"
 
-#: sequencer.c:359
+#: sequencer.c:361
 #, c-format
 msgid "unknown action: %d"
 msgstr "nieznane działanie: %d"
 
-#: sequencer.c:418
+#: sequencer.c:420
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -7436,53 +7746,75 @@ msgstr ""
 "po rozwiązaniu konfliktów oznacz poprawione ścieżki\n"
 "z „git add <ścieżki>� lub „git rm <ścieżki>�"
 
-#: sequencer.c:421
+#: sequencer.c:423
 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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
 msgstr ""
-"po rozwiązaniu konfliktów oznacz poprawione ścieżki\n"
-"z „git add <ścieżki>� lub „git rm <ścieżki>�\n"
-"i złóż wynik za pomocą „git commit�"
+"Po rozwiązaniu konfliktów, oznacz je przez\n"
+"„git add/rm <ścieżki>� i wykonaj\n"
+"„git cherry-pick --continue�.\n"
+"Możesz zamiast tego pominąć ten zapis przez „git cherry-pick --skip�.\n"
+"Aby przerwać i powrócić do stanu sprzed „git cherry-pick�,\n"
+"wykonaj „git cherry-pick --abort�."
+
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Po rozwiązaniu konfliktów, oznacz je przez\n"
+"„git add/rm <ścieżki>� i wykonaj\n"
+"„git revert --continue�.\n"
+"Możesz zamiast tego pominąć ten zapis przez „git revert --skip�.\n"
+"Aby przerwać i powrócić do stanu sprzed „git revert�,\n"
+"wykonaj „git revert --abort�."
 
-#: sequencer.c:434 sequencer.c:3070
+#: sequencer.c:448 sequencer.c:3290
 #, c-format
 msgid "could not lock '%s'"
 msgstr "nie można zablokować „%s�"
 
-#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
-#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
+#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
 #, c-format
 msgid "could not write to '%s'"
 msgstr "nie można pisać do „%s�"
 
-#: sequencer.c:441
+#: sequencer.c:455
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "nie można pisać końca wiersza do „%s�"
 
-#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
-#: sequencer.c:3353
+#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3574
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "nie można sfinalizować „%s�"
 
-#: sequencer.c:485
+#: sequencer.c:499
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "twoje lokalne zmiany zostanÄ… nadpisane przez %s."
 
-#: sequencer.c:489
+#: sequencer.c:503
 msgid "commit your changes or stash them to proceed."
 msgstr "złóż swoje zmiany lub dodaj do schowka, aby kontynuować."
 
-#: sequencer.c:521
+#: sequencer.c:535
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: przewijanie"
 
-#: sequencer.c:560 builtin/tag.c:598
+#: sequencer.c:574 builtin/tag.c:610
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Nieprawidłowy tryb czyszczenia %s"
@@ -7490,65 +7822,65 @@ msgstr "Nieprawidłowy tryb czyszczenia %s"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
 #.
-#: sequencer.c:670
+#: sequencer.c:685
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Nie można zapisać nowego pliku indeksu"
 
-#: sequencer.c:684
+#: sequencer.c:699
 msgid "unable to update cache tree"
 msgstr "nie można zaktualizować drzewa pamięci podręcznej"
 
-#: sequencer.c:698
+#: sequencer.c:713
 msgid "could not resolve HEAD commit"
 msgstr "nie można rozwiązać zapisu HEAD"
 
-#: sequencer.c:778
+#: sequencer.c:793
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "nie ma żadnego klucza w „%.*s�"
 
-#: sequencer.c:789
+#: sequencer.c:804
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "nie można odcytować wartości „%s�"
 
-#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
+#: builtin/am.c:822 builtin/rebase.c:694
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "nie można otworzyć „%s� do odczytu"
 
-#: sequencer.c:836
+#: sequencer.c:851
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "już podano „GIT_AUTHOR_NAME�"
 
-#: sequencer.c:841
+#: sequencer.c:856
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "już podano „GIT_AUTHOR_EMAIL�"
 
-#: sequencer.c:846
+#: sequencer.c:861
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "już podano „GIT_AUTHOR_DATE�"
 
-#: sequencer.c:850
+#: sequencer.c:865
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "nieznana zmienna „%s�"
 
-#: sequencer.c:855
+#: sequencer.c:870
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "brak „GIT_AUTHOR_NAME�"
 
-#: sequencer.c:857
+#: sequencer.c:872
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "brak „GIT_AUTHOR_EMAIL�"
 
-#: sequencer.c:859
+#: sequencer.c:874
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "brak „GIT_AUTHOR_DATE�"
 
-#: sequencer.c:924
+#: sequencer.c:939
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -7577,11 +7909,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1211
+#: sequencer.c:1229
 msgid "'prepare-commit-msg' hook failed"
 msgstr "skrypt „prepare-commit-msg� się nie powiódł"
 
-#: sequencer.c:1217
+#: sequencer.c:1235
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7609,7 +7941,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1230
+#: sequencer.c:1248
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7634,340 +7966,350 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1272
+#: sequencer.c:1290
 msgid "couldn't look up newly created commit"
 msgstr "nie odnaleziono nowo utworzonego zapisu"
 
-#: sequencer.c:1274
+#: sequencer.c:1292
 msgid "could not parse newly created commit"
 msgstr "nie można przetworzyć nowo utworzonego zapisu"
 
-#: sequencer.c:1320
+#: sequencer.c:1338
 msgid "unable to resolve HEAD after creating commit"
 msgstr "nie można rozwiązać HEAD po utworzeniu zapisu"
 
-#: sequencer.c:1322
+#: sequencer.c:1340
 msgid "detached HEAD"
 msgstr "oddzielone HEAD"
 
-#: sequencer.c:1326
+#: sequencer.c:1344
 msgid " (root-commit)"
 msgstr " (zapis-korzeń)"
 
-#: sequencer.c:1347
+#: sequencer.c:1365
 msgid "could not parse HEAD"
 msgstr "nie można przetworzyć HEAD"
 
-#: sequencer.c:1349
+#: sequencer.c:1367
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s nie jest zapisem!"
 
-#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577
+#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
 msgid "could not parse HEAD commit"
 msgstr "nie można przetworzyć zapisu HEAD"
 
-#: sequencer.c:1409 sequencer.c:2108
+#: sequencer.c:1427 sequencer.c:2312
 msgid "unable to parse commit author"
 msgstr "nie można przetworzyć autora zapisu %s"
 
-#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
+#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree nie może zapisać drzewa"
 
-#: sequencer.c:1453 sequencer.c:1573
+#: sequencer.c:1471 sequencer.c:1591
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "nie można odczytać komunikatu zapisu z „%s�"
 
-#: sequencer.c:1484 sequencer.c:1516
+#: sequencer.c:1502 sequencer.c:1534
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "nieprawidłowa tożsamość autora „%s�"
 
-#: sequencer.c:1490
+#: sequencer.c:1508
 msgid "corrupt author: missing date information"
 msgstr "uszkodzony autor: brakuje informacji o dacie"
 
-#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
-#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
+#: 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
 msgid "failed to write commit object"
 msgstr "nie można zapisać obiektu zapisu"
 
-#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: t/helper/test-fast-rebase.c:217
 #, c-format
 msgid "could not update %s"
 msgstr "nie można zaktualizować „%s�"
 
-#: sequencer.c:1605
+#: sequencer.c:1623
 #, c-format
 msgid "could not parse commit %s"
 msgstr "nie można przetworzyć zapisu %s"
 
-#: sequencer.c:1610
+#: sequencer.c:1628
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "nie można przetworzyć zapisu rodzica %s"
 
-#: sequencer.c:1693 sequencer.c:1804
+#: sequencer.c:1711 sequencer.c:1992
 #, c-format
 msgid "unknown command: %d"
 msgstr "nieznane pod-polecenie: %d"
 
-#: sequencer.c:1751 sequencer.c:1776
+#: sequencer.c:1753
+msgid "This is the 1st commit message:"
+msgstr "To jest komunikat pierwszego zapisu:"
+
+#: sequencer.c:1754
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "To jest komunikat zapisu nr %d:"
+
+#: sequencer.c:1755
+msgid "The 1st commit message will be skipped:"
+msgstr "Komunikat pierwszego zapisu zostanie pominięty:"
+
+#: sequencer.c:1756
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Komunikat zapisu nr %d zostanie pominięty:"
+
+#: sequencer.c:1757
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "To jest połączenie %d zapisów."
 
-#: sequencer.c:1761
+#: sequencer.c:1904 sequencer.c:1961
+#, c-format
+msgid "cannot write '%s'"
+msgstr "nie można pisać do „%s�"
+
+#: sequencer.c:1951
 msgid "need a HEAD to fixup"
 msgstr "potrzeba HEAD do naprawienia"
 
-#: sequencer.c:1763 sequencer.c:3380
+#: sequencer.c:1953 sequencer.c:3601
 msgid "could not read HEAD"
 msgstr "nie można odczytać HEAD"
 
-#: sequencer.c:1765
+#: sequencer.c:1955
 msgid "could not read HEAD's commit message"
 msgstr "nie można odczytać komunikatu zapisu czoła HEAD"
 
-#: sequencer.c:1771
-#, c-format
-msgid "cannot write '%s'"
-msgstr "nie można pisać do „%s�"
-
-#: sequencer.c:1778 git-rebase--preserve-merges.sh:486
-msgid "This is the 1st commit message:"
-msgstr "To jest komunikat pierwszego zapisu:"
-
-#: sequencer.c:1786
+#: sequencer.c:1979
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "nie można odczytać komunikatu zapisu %s"
 
-#: sequencer.c:1793
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "To jest komunikat zapisu nr %d:"
-
-#: sequencer.c:1799
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "Komunikat zapisu nr %d zostanie pominięty:"
-
-#: sequencer.c:1887
+#: sequencer.c:2089
 msgid "your index file is unmerged."
 msgstr "plik indeksu jest niescalony."
 
-#: sequencer.c:1894
+#: sequencer.c:2096
 msgid "cannot fixup root commit"
 msgstr "nie można poprawić zapisu korzenia"
 
-#: sequencer.c:1913
+#: sequencer.c:2115
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "zapis %s jest scaleniem, a nie podano opcji -m."
 
-#: sequencer.c:1921 sequencer.c:1929
+#: sequencer.c:2123 sequencer.c:2131
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "zapis %s nie ma rodzica %d"
 
-#: sequencer.c:1935
+#: sequencer.c:2137
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "nie można uzyskać komunikatu zapisu dla %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1954
+#: sequencer.c:2156
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: nie można przetworzyć rodzica zapisu %s"
 
-#: sequencer.c:2019
+#: sequencer.c:2222
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "nie można zmienić nazwy „%s� na „%s�"
 
-#: sequencer.c:2079
+#: sequencer.c:2282
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "nie można odwrócić %s... %s"
 
-#: sequencer.c:2080
+#: sequencer.c:2283
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "nie można zastosować %s... %s"
 
-#: sequencer.c:2100
+#: sequencer.c:2304
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr "gubienie %s %s — zawartość łatki już wcielona w głównym nurcie\n"
 
-#: sequencer.c:2158
+#: sequencer.c:2362
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: nie można odczytać indeksu"
 
-#: sequencer.c:2165
+#: sequencer.c:2370
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: nie można odświeżyć indeksu"
 
-#: sequencer.c:2242
+#: sequencer.c:2450
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s nie przyjmuje argumentów: „%s�"
 
-#: sequencer.c:2251
+#: sequencer.c:2459
 #, c-format
 msgid "missing arguments for %s"
 msgstr "brakujÄ…ce argumenty dla %s"
 
-#: sequencer.c:2282
+#: sequencer.c:2502
 #, c-format
 msgid "could not parse '%s'"
 msgstr "nie można przetworzyć „%s�"
 
-#: sequencer.c:2343
+#: sequencer.c:2563
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "nieprawidłowy wiersz %d: %.*s"
 
-#: sequencer.c:2354
+#: sequencer.c:2574
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "nie można użyć „%s� bez poprzedniego zapisu"
 
-#: sequencer.c:2440
+#: sequencer.c:2622 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "nie można odczytać „%s�."
+
+#: sequencer.c:2660
 msgid "cancelling a cherry picking in progress"
 msgstr "przerywanie trwajÄ…cego dobierania"
 
-#: sequencer.c:2449
+#: sequencer.c:2669
 msgid "cancelling a revert in progress"
 msgstr "przerywanie trwajÄ…cego odwracania"
 
-#: sequencer.c:2493
+#: sequencer.c:2709
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "napraw to używając „git rebase --edit-todo�."
 
-#: sequencer.c:2495
+#: sequencer.c:2711
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "plik z instrukcjami się nie nadaje: „%s�"
 
-#: sequencer.c:2500
+#: sequencer.c:2716
 msgid "no commits parsed."
 msgstr "nie przetworzono żadnego zapisu."
 
-#: sequencer.c:2511
+#: sequencer.c:2727
 msgid "cannot cherry-pick during a revert."
 msgstr "nie można dobierać w czasie odwracania."
 
-#: sequencer.c:2513
+#: sequencer.c:2729
 msgid "cannot revert during a cherry-pick."
 msgstr "nie można odwrócić w czasie dobierania."
 
-#: sequencer.c:2591
+#: sequencer.c:2807
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "nieprawidłowa wartość %s: %s"
 
-#: sequencer.c:2698
+#: sequencer.c:2916
 msgid "unusable squash-onto"
 msgstr "spłaszcz-na się nie nadaje"
 
-#: sequencer.c:2718
+#: sequencer.c:2936
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "nieprawidłowy plik opcji: „%s�"
 
-#: sequencer.c:2811 sequencer.c:4644
+#: sequencer.c:3031 sequencer.c:4905
 msgid "empty commit set passed"
 msgstr "podano pusty zbiór zapisów"
 
-#: sequencer.c:2828
+#: sequencer.c:3048
 msgid "revert is already in progress"
 msgstr "już trwa dobieranie"
 
-#: sequencer.c:2830
+#: sequencer.c:3050
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "spróbuj „git revert (--continue | %s--abort | --quit)�"
 
-#: sequencer.c:2833
+#: sequencer.c:3053
 msgid "cherry-pick is already in progress"
 msgstr "już trwa dobieranie"
 
-#: sequencer.c:2835
+#: sequencer.c:3055
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "spróbuj „git cherry-pick (--continue | %s--abort | --quit)�"
 
-#: sequencer.c:2849
+#: sequencer.c:3069
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "nie można utworzyć katalogu sekwencjonowania „%s�"
 
-#: sequencer.c:2864
+#: sequencer.c:3084
 msgid "could not lock HEAD"
 msgstr "nie można zablokować HEAD"
 
-#: sequencer.c:2924 sequencer.c:4379
+#: sequencer.c:3144 sequencer.c:4615
 msgid "no cherry-pick or revert in progress"
 msgstr "nie trwa dobieranie ani odwracanie"
 
-#: sequencer.c:2926 sequencer.c:2937
+#: sequencer.c:3146 sequencer.c:3157
 msgid "cannot resolve HEAD"
 msgstr "nie można rozwiązać HEAD"
 
-#: sequencer.c:2928 sequencer.c:2972
+#: sequencer.c:3148 sequencer.c:3192
 msgid "cannot abort from a branch yet to be born"
 msgstr "nie można przerwać z gałęzi, która dopiero ma powstać"
 
-#: sequencer.c:2958 builtin/grep.c:757
+#: sequencer.c:3178 builtin/grep.c:772
 #, c-format
 msgid "cannot open '%s'"
 msgstr "nie można otworzyć „%s�"
 
-#: sequencer.c:2960
+#: sequencer.c:3180
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "nie można odczytać „%s�: %s"
 
-#: sequencer.c:2961
+#: sequencer.c:3181
 msgid "unexpected end of file"
 msgstr "nieoczekiwany koniec pliku"
 
-#: sequencer.c:2967
+#: sequencer.c:3187
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "zapisany plik HEAD sprzed dobierania „%s� jest uszkodzony"
 
-#: sequencer.c:2978
+#: sequencer.c:3198
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Wydaje się, że czoło HEAD się przesunęło.\n"
 "Nie cofam, sprawdź swoje HEAD!"
 
-#: sequencer.c:3019
+#: sequencer.c:3239
 msgid "no revert in progress"
 msgstr "nie trwa żadne odwracanie"
 
-#: sequencer.c:3028
+#: sequencer.c:3248
 msgid "no cherry-pick in progress"
 msgstr "nie trwa żadne dobieranie"
 
-#: sequencer.c:3038
+#: sequencer.c:3258
 msgid "failed to skip the commit"
 msgstr "nie udało się pominąć zapisu"
 
-#: sequencer.c:3045
+#: sequencer.c:3265
 msgid "there is nothing to skip"
 msgstr "nie ma nic do pominięcia"
 
-#: sequencer.c:3048
+#: sequencer.c:3268
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -7976,16 +8318,16 @@ msgstr ""
 "zapis już złożony?\n"
 "spróbuj „git %s --continue�"
 
-#: sequencer.c:3210 sequencer.c:4271
+#: sequencer.c:3430 sequencer.c:4506
 msgid "cannot read HEAD"
 msgstr "nie można odczytać HEAD"
 
-#: sequencer.c:3227
+#: sequencer.c:3447
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "nie można skopiować „%s� do „%s�"
 
-#: sequencer.c:3235
+#: sequencer.c:3455
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8004,27 +8346,27 @@ msgstr ""
 "\n"
 "\tgit rebase --continue\n"
 
-#: sequencer.c:3245
+#: sequencer.c:3465
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Nie można zastosować %s... %.*s"
 
-#: sequencer.c:3252
+#: sequencer.c:3472
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Nie można scalić %.*s"
 
-#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
+#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "nie można skopiować „%s� do „%s�"
 
-#: sequencer.c:3282
+#: sequencer.c:3502
 #, c-format
 msgid "Executing: %s\n"
 msgstr "Wykonywanie: %s\n"
 
-#: sequencer.c:3297
+#: sequencer.c:3517
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8039,11 +8381,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3303
+#: sequencer.c:3523
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "i pozostały zmiany w indeksie i/lub drzewie roboczym\n"
 
-#: sequencer.c:3309
+#: sequencer.c:3529
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8060,90 +8402,90 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3370
+#: sequencer.c:3591
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nieprawidłowa nazwa etykietki „%.*s�"
 
-#: sequencer.c:3424
+#: sequencer.c:3664
 msgid "writing fake root commit"
 msgstr "zapisywanie fałszywego zapisu korzenia"
 
-#: sequencer.c:3429
+#: sequencer.c:3669
 msgid "writing squash-onto"
 msgstr "zapisywanie spłaszcz-na"
 
-#: sequencer.c:3513
+#: sequencer.c:3748
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "nie można rozwiązać „%s�"
 
-#: sequencer.c:3546
+#: sequencer.c:3780
 msgid "cannot merge without a current revision"
 msgstr "nie można scalić bez bieżącej rewizji"
 
-#: sequencer.c:3568
+#: sequencer.c:3802
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "nie można przetworzyć „%.*s�"
 
-#: sequencer.c:3577
+#: sequencer.c:3811
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "nic do scalenia: „%.*s�"
 
-#: sequencer.c:3589
+#: sequencer.c:3823
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "nie można wykonać ośmiorniczego scalenia na szczycie [nowego korzenia]"
 
-#: sequencer.c:3605
+#: sequencer.c:3878
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "nie można uzyskać komunikatu zapisu „%s�"
 
-#: sequencer.c:3788
+#: sequencer.c:4024
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "nie można nawet spróbować scalić „%.*s�"
 
-#: sequencer.c:3804
+#: sequencer.c:4040
 msgid "merge: Unable to write new index file"
 msgstr "scalanie: Nie można zapisać nowego pliku indeksu"
 
-#: sequencer.c:3878
+#: sequencer.c:4121
 msgid "Cannot autostash"
 msgstr "Nie można automatycznie dodać do schowka"
 
-#: sequencer.c:3881
+#: sequencer.c:4124
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Nieoczekiwana odpowiedź schowka: „%s�"
 
-#: sequencer.c:3887
+#: sequencer.c:4130
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Nie można utworzyć katalogu dla „%s�"
 
-#: sequencer.c:3890
+#: sequencer.c:4133
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Automatycznie zapisano w schowku: %s\n"
 
-#: sequencer.c:3894
+#: sequencer.c:4137
 msgid "could not reset --hard"
 msgstr "nie można zresetować --hard"
 
-#: sequencer.c:3919
+#: sequencer.c:4162
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Zastosowano zmiany z automatycznego schowka.\n"
 
-#: sequencer.c:3931
+#: sequencer.c:4174
 #, c-format
 msgid "cannot store %s"
 msgstr "nie można zapisać %s"
 
-#: sequencer.c:3934
+#: sequencer.c:4177
 #, c-format
 msgid ""
 "%s\n"
@@ -8154,30 +8496,30 @@ msgstr ""
 "Twoje zmiany sÄ… bezpieczne w schowku.\n"
 "Możesz w każdej chwili wykonać „git stash pop� lub „git stash drop�.\n"
 
-#: sequencer.c:3939
+#: sequencer.c:4182
 msgid "Applying autostash resulted in conflicts."
 msgstr "Stosowanie zmian z automatycznego schowka spowodowało konflikty."
 
-#: sequencer.c:3940
+#: sequencer.c:4183
 msgid "Autostash exists; creating a new stash entry."
 msgstr ""
 "W schowku istnieje automatyczny wpis; tworzenie nowego wpisu w schowku."
 
-#: sequencer.c:4033 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4255
 msgid "could not detach HEAD"
 msgstr "nie można odłączyć HEAD"
 
-#: sequencer.c:4048
+#: sequencer.c:4270
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Zatrzymano przy HEAD\n"
 
-#: sequencer.c:4050
+#: sequencer.c:4272
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Zatrzymano przy %s\n"
 
-#: sequencer.c:4058
+#: sequencer.c:4304
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8198,58 +8540,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4104
+#: sequencer.c:4350
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "Przestawianie (%d/%d)%s"
 
-#: sequencer.c:4149
+#: sequencer.c:4396
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Zatrzymano na %s... %.*s\n"
 
-#: sequencer.c:4220
+#: sequencer.c:4466
 #, c-format
 msgid "unknown command %d"
 msgstr "nieznane polecenie %d"
 
-#: sequencer.c:4279
+#: sequencer.c:4514
 msgid "could not read orig-head"
 msgstr "nie można odczytać pierwotnego czoła"
 
-#: sequencer.c:4284
+#: sequencer.c:4519
 msgid "could not read 'onto'"
 msgstr "nie można odczytać „onto�"
 
-#: sequencer.c:4298
+#: sequencer.c:4533
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "nie można zapisać HEAD do %s"
 
-#: sequencer.c:4358
+#: sequencer.c:4593
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "Pomyślnie przestawiono i zaktualizowano %s.\n"
 
-#: sequencer.c:4391
+#: sequencer.c:4645
 msgid "cannot rebase: You have unstaged changes."
 msgstr "nie można przestawić: Masz nieprzygotowane zmiany."
 
-#: sequencer.c:4400
+#: sequencer.c:4654
 msgid "cannot amend non-existing commit"
 msgstr "nie można poprawić nieistniejącego obiektu"
 
-#: sequencer.c:4402
+#: sequencer.c:4656
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "nieprawidłowy plik: „%s�"
 
-#: sequencer.c:4404
+#: sequencer.c:4658
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "nieprawidłowa zawartość: „%s�"
 
-#: sequencer.c:4407
+#: sequencer.c:4661
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8259,50 +8601,59 @@ msgstr ""
 "Masz niezłożone zmiany w drzewie roboczym. Najpierw je złóż\n"
 "i wtedy ponownie wykonaj „git rebase --continue�."
 
-#: sequencer.c:4443 sequencer.c:4482
+#: sequencer.c:4697 sequencer.c:4736
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "nie można zapisać pliku: „%s�"
 
-#: sequencer.c:4498
+#: sequencer.c:4752
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "nie można usunąć CHERRY_PICK_HEAD"
 
-#: sequencer.c:4505
+#: sequencer.c:4762
 msgid "could not commit staged changes."
 msgstr "nie udało się złożyć zmian ze schowka."
 
-#: sequencer.c:4621
+#: sequencer.c:4882
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: nie można dobrać %s"
 
-#: sequencer.c:4625
+#: sequencer.c:4886
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: zła rewizja"
 
-#: sequencer.c:4660
+#: sequencer.c:4921
 msgid "can't revert as initial commit"
 msgstr "nie można odwrócić jako pierwszy zapis"
 
-#: sequencer.c:5137
+#: sequencer.c:5192 sequencer.c:5421
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "pominięto uprzednio zastosowany zapis %s"
+
+#: sequencer.c:5262 sequencer.c:5437
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "użyj --reapply-cherry-picks, by uwzględnić pominięte zapisy"
+
+#: sequencer.c:5408
 msgid "make_script: unhandled options"
 msgstr "make_script: nieobsłużone opcje"
 
-#: sequencer.c:5140
+#: sequencer.c:5411
 msgid "make_script: error preparing revisions"
 msgstr "make_script: błąd przygotowania rewizji"
 
-#: sequencer.c:5382 sequencer.c:5399
+#: sequencer.c:5669 sequencer.c:5686
 msgid "nothing to do"
 msgstr "nic do zrobienia"
 
-#: sequencer.c:5418
+#: sequencer.c:5705
 msgid "could not skip unnecessary pick commands"
 msgstr "nie można pominąć niepotrzebnych poleceń pick"
 
-#: sequencer.c:5512
+#: sequencer.c:5805
 msgid "the script was already rearranged."
 msgstr "kolejność skryptu została już zmieniona."
 
@@ -8353,92 +8704,98 @@ msgid "unable to set up work tree using invalid config"
 msgstr ""
 "nie można ustawić drzewa roboczego przy użyciu nieprawidłowej konfiguracji"
 
-#: setup.c:423
+#: setup.c:423 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "to działanie musi być wykonane w drzewie roboczym"
 
-#: setup.c:661
+#: setup.c:658
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Oczekiwano wersji repozytorium gita <= %d, znaleziono %d"
 
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr "znaleziono nieznane rozszerzenia repozytorium:"
+#: setup.c:666
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "znaleziono nieznane rozszerzenie repozytorium:"
+msgstr[1] "znaleziono nieznane rozszerzenia repozytorium:"
+msgstr[2] "znaleziono nieznane rozszerzenia repozytorium:"
 
-#: setup.c:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "wersja repozytorium to 0, ale znaleziono rozszerzenia typowe dla v1"
+#: setup.c:680
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "wersja repozytorium to 0, ale znaleziono rozszerzenie typowe dla v1"
+msgstr[1] "wersja repozytorium to 0, ale znaleziono rozszerzenia typowe dla v1"
+msgstr[2] "wersja repozytorium to 0, ale znaleziono rozszerzenia typowe dla v1"
 
-#: setup.c:700
+#: setup.c:701
 #, c-format
 msgid "error opening '%s'"
 msgstr "nie można otworzyć „%s�"
 
-#: setup.c:702
+#: setup.c:703
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "za duży jak na plik .git: „%s�"
 
-#: setup.c:704
+#: setup.c:705
 #, c-format
 msgid "error reading %s"
 msgstr "błąd odczytu %s"
 
-#: setup.c:706
+#: setup.c:707
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "nieprawidłowy format pliku gitfile: %s"
 
-#: setup.c:708
+#: setup.c:709
 #, c-format
 msgid "no path in gitfile: %s"
-msgstr "brak ścieżki w pliku gitfile %s"
+msgstr "brak ścieżki w pliku gitfile: %s"
 
-#: setup.c:710
+#: setup.c:711
 #, c-format
 msgid "not a git repository: %s"
 msgstr "to nie jest repozytorium gita: %s"
 
-#: setup.c:812
+#: setup.c:813
 #, c-format
 msgid "'$%s' too big"
 msgstr "„$%s� za duże"
 
-#: setup.c:826
+#: setup.c:827
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "to nie jest repozytorium gita: „%s�"
 
-#: setup.c:855 setup.c:857 setup.c:888
+#: setup.c:856 setup.c:858 setup.c:889
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "nie można wejść do „%s�"
 
-#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
 msgid "cannot come back to cwd"
 msgstr "nie można wrócić do cwd"
 
-#: setup.c:987
+#: setup.c:988
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "nie można wykonać stat na „%*s%s%s�"
 
-#: setup.c:1225
+#: setup.c:1231
 msgid "Unable to read current working directory"
 msgstr "Nie można odczytać obecnego katalogu roboczego"
 
-#: setup.c:1234 setup.c:1240
+#: setup.c:1240 setup.c:1246
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "nie można zmienić na „%s�"
 
-#: setup.c:1245
+#: setup.c:1251
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "to nie jest repozytorium gita (ani żaden z katalogów nadrzędnych): %s"
 
-#: setup.c:1251
+#: setup.c:1257
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8449,7 +8806,7 @@ msgstr ""
 "Zatrzymano na granicy systemu plików (nie ustawiono "
 "GIT_DISCOVERY_ACROSS_FILESYSTEM)."
 
-#: setup.c:1362
+#: setup.c:1381
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8458,56 +8815,57 @@ msgstr ""
 "problem z wartością trybu pliku core.sharedRepository (0%.3o).\n"
 "Właściciel plików musi zawsze mieć prawa do odczytu i zapisu."
 
-#: setup.c:1409
-msgid "open /dev/null or dup failed"
-msgstr "otwarcie /dev/null lub dup() nie powiodło się"
-
-#: setup.c:1424
+#: setup.c:1443
 msgid "fork failed"
 msgstr "fork nie powiódł się"
 
-#: setup.c:1429
+#: setup.c:1448
 msgid "setsid failed"
 msgstr "setsid nie powiodło się"
 
+#: sparse-index.c:273
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "element indeksu jest katalogiem, ale nie rzadkim (%08x)"
+
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:848
+#: strbuf.c:850
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:850
+#: strbuf.c:852
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr "%u.%2.2u GiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:858
+#: strbuf.c:860
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:860
+#: strbuf.c:862
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr "%u.%2.2u MiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:867
+#: strbuf.c:869
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:869
+#: strbuf.c:871
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr "%u.%2.2u KiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:875
+#: strbuf.c:877
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -8516,7 +8874,7 @@ msgstr[1] "%u bajty"
 msgstr[2] "%u bajtów"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:877
+#: strbuf.c:879
 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
@@ -8524,13 +8882,13 @@ msgstr[0] "%u bajt/s"
 msgstr[1] "%u bajty/s"
 msgstr[2] "%u bajtów/s"
 
-#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
-#: builtin/rebase.c:866
+#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: builtin/rebase.c:650
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "nie można otworzyć „%s� do zapisywania"
 
-#: strbuf.c:1175
+#: strbuf.c:1183
 #, c-format
 msgid "could not edit '%s'"
 msgstr "nie można edytować „%s�"
@@ -8538,7 +8896,7 @@ msgstr "nie można edytować „%s�"
 #: submodule-config.c:237
 #, c-format
 msgid "ignoring suspicious submodule name: %s"
-msgstr "ignorowanie podejrzanej nazwy pod-modułu: %s"
+msgstr "ignorowanie podejrzanej nazwy podmodułu: %s"
 
 #: submodule-config.c:304
 msgid "negative values not allowed for submodule.fetchjobs"
@@ -8555,7 +8913,7 @@ msgstr ""
 msgid "invalid value for %s"
 msgstr "nieprawidłowa wartość %s"
 
-#: submodule-config.c:766
+#: submodule-config.c:767
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Nie można zaktualizować wpisu .gitmodules %s"
@@ -8578,155 +8936,155 @@ msgstr "Nie można usunąć wpisu .gitmodules dla %s"
 msgid "staging updated .gitmodules failed"
 msgstr "przygotowanie zaktualizowanego .gitmodules nie powiodło się"
 
-#: submodule.c:327
+#: submodule.c:358
 #, c-format
 msgid "in unpopulated submodule '%s'"
-msgstr "w niezapełnionym pod-module „%s�"
+msgstr "w niezapełnionym podmodule „%s�"
 
-#: submodule.c:358
+#: submodule.c:389
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "Ścieżka „%s� jest w pod-module „%.*s�"
+msgstr "Ścieżka „%s� jest w podmodule „%.*s�"
 
-#: submodule.c:435
+#: submodule.c:466
 #, c-format
 msgid "bad --ignore-submodules argument: %s"
 msgstr "zły argument --ignore-submodules: %s"
 
-#: submodule.c:817
+#: submodule.c:844
 #, c-format
 msgid ""
 "Submodule in commit %s at path: '%s' collides with a submodule named the "
 "same. Skipping it."
 msgstr ""
-"Pod-moduł w zapisie %s w ścieżce „%s� zderzył się z pod-modułem o tej samej "
+"Pod-moduł w zapisie %s w ścieżce „%s� zderzył się z podmodułem o tej samej "
 "nazwie. Pomijanie."
 
-#: submodule.c:920
+#: submodule.c:954
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr "element pod-modułu „%s� (%s) nie jest zapisem, jest rodzaju %s"
+msgstr "element podmodułu „%s� (%s) nie jest zapisem, jest rodzaju %s"
 
-#: submodule.c:1005
+#: submodule.c:1042
 #, c-format
 msgid ""
 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
 "submodule %s"
 msgstr ""
 "Nie można wykonać polecenia „git rev-list <zapisy> --not --remotes -n 1� w "
-"pod-module %s"
+"podmodule %s"
 
-#: submodule.c:1128
+#: submodule.c:1165
 #, c-format
 msgid "process for submodule '%s' failed"
-msgstr "proces dla pod-modułu „%s� nie powiódł się"
+msgstr "proces dla podmodułu „%s� nie powiódł się"
 
-#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469
+#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Nie można rozwiązać HEAD jako prawidłowej referencji."
 
-#: submodule.c:1168
+#: submodule.c:1205
 #, c-format
 msgid "Pushing submodule '%s'\n"
-msgstr "Wypychanie pod-modułu „%s�\n"
+msgstr "Wypychanie podmodułu „%s�\n"
 
-#: submodule.c:1171
+#: submodule.c:1208
 #, c-format
 msgid "Unable to push submodule '%s'\n"
-msgstr "Nie można wypchnąć pod-modułu „%s�\n"
+msgstr "Nie można wypchnąć podmodułu „%s�\n"
 
-#: submodule.c:1463
+#: submodule.c:1491
 #, c-format
 msgid "Fetching submodule %s%s\n"
-msgstr "Pobieranie pod-modułu %s%s\n"
+msgstr "Pobieranie podmodułu %s%s\n"
 
-#: submodule.c:1497
+#: submodule.c:1525
 #, c-format
 msgid "Could not access submodule '%s'\n"
-msgstr "Nie można się dostać do pod-modułu „%s�\n"
+msgstr "Nie można się dostać do podmodułu „%s�\n"
 
-#: submodule.c:1652
+#: submodule.c:1680
 #, c-format
 msgid ""
 "Errors during submodule fetch:\n"
 "%s"
 msgstr ""
-"Błędy podczas pobierania pod-modułów:\n"
+"Błędy podczas pobierania podmodułów:\n"
 "%s"
 
-#: submodule.c:1677
+#: submodule.c:1705
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "nie rozpoznano „%s� jako repozytorium gita"
 
-#: submodule.c:1694
+#: submodule.c:1722
 #, c-format
 msgid "Could not run 'git status --porcelain=2' in submodule %s"
-msgstr "Nie można wykonać „git status --porcelain=2� w pod-module %s"
+msgstr "Nie można wykonać „git status --porcelain=2� w podmodule %s"
 
-#: submodule.c:1735
+#: submodule.c:1763
 #, c-format
 msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr "„git status --porcelain=2� nie powiódł się w pod-module %s"
+msgstr "„git status --porcelain=2� nie powiódł się w podmodule %s"
 
-#: submodule.c:1810
+#: submodule.c:1838
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
-msgstr "nie można uruchomić „git status� w pod-module „%s�"
+msgstr "nie można uruchomić „git status� w podmodule „%s�"
 
-#: submodule.c:1823
+#: submodule.c:1851
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
-msgstr "nie można wykonać „git status� w pod-module „%s�"
+msgstr "nie można wykonać „git status� w podmodule „%s�"
 
-#: submodule.c:1838
+#: submodule.c:1868
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr "Nie można usunąć ustawienia core.worktree w pod-module „%s�"
+msgstr "Nie można usunąć ustawienia core.worktree w podmodule „%s�"
 
-#: submodule.c:1865 submodule.c:2175
+#: submodule.c:1895 submodule.c:2210
 #, c-format
 msgid "could not recurse into submodule '%s'"
-msgstr "nie można zejść do pod-modułu „%s�"
+msgstr "nie można zejść do podmodułu „%s�"
 
-#: submodule.c:1886
+#: submodule.c:1917
 msgid "could not reset submodule index"
-msgstr "nie można zresetować indeksu pod-modułu"
+msgstr "nie można zresetować indeksu podmodułu"
 
-#: submodule.c:1928
+#: submodule.c:1959
 #, c-format
 msgid "submodule '%s' has dirty index"
-msgstr "pod-moduł „%s� ma brudny indeks"
+msgstr "podmoduł „%s� ma brudny indeks"
 
-#: submodule.c:1980
+#: submodule.c:2013
 #, c-format
 msgid "Submodule '%s' could not be updated."
-msgstr "Nie można zaktualizować pod-modułu „%s�."
+msgstr "Nie można zaktualizować podmodułu „%s�."
 
-#: submodule.c:2048
+#: submodule.c:2081
 #, c-format
 msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr "katalog gita pod-modułu „%s� jest w katalogu gita „%.*s�"
+msgstr "katalog gita podmodułu „%s� jest w katalogu gita „%.*s�"
 
-#: submodule.c:2069
+#: submodule.c:2102
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr ""
-"relocate_gitdir dla pod-modułu „%s� z ponad jednym drzewem roboczym "
+"relocate_gitdir dla podmodułu „%s� z ponad jednym drzewem roboczym "
 "niewspierane"
 
-#: submodule.c:2081 submodule.c:2140
+#: submodule.c:2114 submodule.c:2174
 #, c-format
 msgid "could not lookup name for submodule '%s'"
-msgstr "nie odnaleziono nazwy pod-modułu „%s�"
+msgstr "nie odnaleziono nazwy podmodułu „%s�"
 
-#: submodule.c:2085
+#: submodule.c:2118
 #, c-format
 msgid "refusing to move '%s' into an existing git dir"
 msgstr "odmawiam przeniesienia „%s� do istniejącego katalogu gita"
 
-#: submodule.c:2092
+#: submodule.c:2124
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -8737,65 +9095,71 @@ msgstr ""
 "„%s� do\n"
 "„%s�\n"
 
-#: submodule.c:2220
+#: submodule.c:2255
 msgid "could not start ls-files in .."
 msgstr "nie można uruchomić ls-files w .."
 
-#: submodule.c:2260
+#: submodule.c:2295
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree zwróciło nieoczekiwany kod wyjścia %d"
 
-#: trailer.c:236
+#: symlinks.c:244
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "nie można wykonać lstat na „%s�'"
+
+#: trailer.c:244
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "wykonanie polecenia końcówki „%s� nie powiodło się"
 
-#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551
-#: trailer.c:555
+#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566
+#: trailer.c:570
 #, c-format
 msgid "unknown value '%s' for key '%s'"
 msgstr "nierozpoznana wartość „%s� klucza „%s�"
 
-#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
+#: builtin/remote.c:327
 #, c-format
 msgid "more than one %s"
 msgstr "więcej niż jeden %s"
 
-#: trailer.c:728
+#: trailer.c:743
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "pusty klucz w końcówce „%.*s�"
 
-#: trailer.c:748
+#: trailer.c:763
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "nie można odczytać pliku „%s�"
 
-#: trailer.c:751 builtin/mktag.c:91
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
 msgid "could not read from stdin"
 msgstr "nie można czytać ze standardowego wejścia"
 
-#: trailer.c:1009 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
 #, c-format
 msgid "could not stat %s"
 msgstr "nie można wykonać stat na %s"
 
-#: trailer.c:1011
+#: trailer.c:1026
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "plik %s nie jest zwykłym plikiem"
 
-#: trailer.c:1013
+#: trailer.c:1028
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "plik %s nie może być zapisany przez użytkownika"
 
-#: trailer.c:1025
+#: trailer.c:1040
 msgid "could not open temporary file"
 msgstr "nie można otworzyć pliku tymczasowego"
 
-#: trailer.c:1065
+#: trailer.c:1080
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "nie można zmienić nazwy pliku tymczasowego na %s"
@@ -8845,7 +9209,7 @@ msgstr "nie można wykonać fast-import"
 msgid "error while running fast-import"
 msgstr "błąd wykonywania fast-import"
 
-#: transport-helper.c:549 transport-helper.c:1237
+#: transport-helper.c:549 transport-helper.c:1251
 #, c-format
 msgid "could not read ref %s"
 msgstr "nie można odczytać referencji %s"
@@ -8863,7 +9227,7 @@ msgstr "ustawianie ścieżki zdalnej usługi niewspierane przez protokół"
 msgid "invalid remote service path"
 msgstr "nieprawidłowa ścieżka zdalnej usługi"
 
-#: transport-helper.c:661 transport.c:1447
+#: transport-helper.c:661 transport.c:1475
 msgid "operation not supported by protocol"
 msgstr "operacja niewspierana przez protokół"
 
@@ -8872,68 +9236,72 @@ msgstr "operacja niewspierana przez protokół"
 msgid "can't connect to subservice %s"
 msgstr "nie można połączyć z pod-usługą %s"
 
-#: transport-helper.c:745
+#: transport-helper.c:693 transport.c:404
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only wymaga protokołu v2"
+
+#: transport-helper.c:755
 msgid "'option' without a matching 'ok/error' directive"
 msgstr "„option� bez pasującej dyrektywy „ok/error�"
 
-#: transport-helper.c:788
+#: transport-helper.c:798
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "oczekiwano ok/error pomocnik powiedział „%s�"
 
-#: transport-helper.c:845
+#: transport-helper.c:859
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "pomocnik zwrócił nieoczekiwany stan %s"
 
-#: transport-helper.c:928
+#: transport-helper.c:942
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "pomocnik %s nie wspiera wykonania na sucho (dry-run)"
 
-#: transport-helper.c:931
+#: transport-helper.c:945
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "pomocnik %s nie wspiera --signed"
 
-#: transport-helper.c:934
+#: transport-helper.c:948
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "pomocnik %s nie wspiera --signed=if-asked"
 
-#: transport-helper.c:939
+#: transport-helper.c:953
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "pomocnik %s nie wspiera --atomic"
 
-#: transport-helper.c:943
+#: transport-helper.c:957
 #, c-format
 msgid "helper %s does not support --%s"
 msgstr "pomocnik %s nie wspiera --%s"
 
-#: transport-helper.c:950
+#: transport-helper.c:964
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "pomocnik %s nie wspiera „push-option�"
 
-#: transport-helper.c:1050
+#: transport-helper.c:1064
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "zdalny pomocnik nie wspiera wypychania; potrzeba referencji"
 
-#: transport-helper.c:1055
+#: transport-helper.c:1069
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "pomocnik %s nie wspiera „force�"
 
-#: transport-helper.c:1102
+#: transport-helper.c:1116
 msgid "couldn't run fast-export"
 msgstr "nie można wykonać fast-export"
 
-#: transport-helper.c:1107
+#: transport-helper.c:1121
 msgid "error while running fast-export"
 msgstr "błąd wykonywania fast-export"
 
-#: transport-helper.c:1132
+#: transport-helper.c:1146
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -8942,52 +9310,52 @@ msgstr ""
 "Brak wspólnych referencji lub żadnych nie podano; brak działania.\n"
 "Pewnie należy podać jakąś gałąź.\n"
 
-#: transport-helper.c:1214
+#: transport-helper.c:1228
 #, c-format
 msgid "unsupported object format '%s'"
 msgstr "niewspierany format obiektu „%s�"
 
-#: transport-helper.c:1223
+#: transport-helper.c:1237
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "nieprawidłowa odpowiedź na liście referencji: %s"
 
-#: transport-helper.c:1375
+#: transport-helper.c:1389
 #, c-format
 msgid "read(%s) failed"
 msgstr "read(%s) nie powiodło się"
 
-#: transport-helper.c:1402
+#: transport-helper.c:1416
 #, c-format
 msgid "write(%s) failed"
 msgstr "write(%s) nie powiodło się"
 
-#: transport-helper.c:1451
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed"
 msgstr "wątek %s nie powiódł się"
 
-#: transport-helper.c:1455
+#: transport-helper.c:1469
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "wątek %s nie może się złączyć: %s"
 
-#: transport-helper.c:1474 transport-helper.c:1478
+#: transport-helper.c:1488 transport-helper.c:1492
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "nie można uruchomić wątku do kopiowania danych: %s"
 
-#: transport-helper.c:1515
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed to wait"
 msgstr "procesowi %s nie udało się zaczekać"
 
-#: transport-helper.c:1519
+#: transport-helper.c:1533
 #, c-format
 msgid "%s process failed"
 msgstr "proces %s nie powiódł się"
 
-#: transport-helper.c:1537 transport-helper.c:1546
+#: transport-helper.c:1551 transport-helper.c:1560
 msgid "can't start thread for copying data"
 msgstr "nie można uruchomić wątku do kopiowania danych"
 
@@ -9001,51 +9369,55 @@ msgstr "Ustawiłoby gałąź nadrzędną „%s� na „%s� z „%s�\n"
 msgid "could not read bundle '%s'"
 msgstr "nie można odczytać wiązki „%s�"
 
-#: transport.c:220
+#: transport.c:227
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: nieprawidłowa opcja głębokości „%s�"
 
-#: transport.c:269
+#: transport.c:279
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "więcej szczegółów pod protocol.version w „git help config�"
 
-#: transport.c:270
+#: transport.c:280
 msgid "server options require protocol version 2 or later"
 msgstr "opcje serwera wymagają wersji protokołu 2 lub późniejszej"
 
-#: transport.c:727
+#: transport.c:407
+msgid "server does not support wait-for-done"
+msgstr "serwer nie wspiera wait-for-done"
+
+#: transport.c:759
 msgid "could not parse transport.color.* config"
 msgstr "nie można przetworzyć ustawienia transport.color.*"
 
-#: transport.c:802
+#: transport.c:834
 msgid "support for protocol v2 not implemented yet"
 msgstr "wsparcie dla protokołu v2 jeszcze niezaimplementowane"
 
-#: transport.c:936
+#: transport.c:967
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "nierozpoznana wartość klucza „%s�: %s"
 
-#: transport.c:1002
+#: transport.c:1033
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "transport „%s� niedozwolony"
 
-#: transport.c:1055
+#: transport.c:1082
 msgid "git-over-rsync is no longer supported"
 msgstr "git-over-rsync nie jest już wspierany"
 
-#: transport.c:1157
+#: transport.c:1185
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr ""
-"Następujące ścieżki pod-modułów zawierają zmiany, których nie można\n"
+"Następujące ścieżki podmodułów zawierają zmiany, których nie można\n"
 "znaleźć w żadnym zdalnym repozytorium:\n"
 
-#: transport.c:1161
+#: transport.c:1189
 #, c-format
 msgid ""
 "\n"
@@ -9072,13 +9444,13 @@ msgstr ""
 "żeby wypchnąć je do zdalnego repozytorium.\n"
 "\n"
 
-#: transport.c:1169
+#: transport.c:1197
 msgid "Aborting."
 msgstr "Przerywanie."
 
-#: transport.c:1316
+#: transport.c:1344
 msgid "failed to push all needed submodules"
-msgstr "nie można wypchnąć wszystkich potrzebnych zagnieżdżonych pod-modułów"
+msgstr "nie można wypchnąć wszystkich potrzebnych zagnieżdżonych podmodułów"
 
 #: tree-walk.c:33
 msgid "too-short tree object"
@@ -9096,7 +9468,7 @@ msgstr "pusta nazwa pliku w elemencie drzewa"
 msgid "too-short tree file"
 msgstr "za krótki plik drzewa"
 
-#: unpack-trees.c:113
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9105,7 +9477,7 @@ msgstr ""
 "Wybranie gałęzi nadpisałoby lokalne zmiany w następujących plikach:\n"
 "%%sZłóż swoje zmiany lub dodaj do schowka zanim zmienisz gałąź."
 
-#: unpack-trees.c:115
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9114,7 +9486,7 @@ msgstr ""
 "Wybranie nadpisałoby lokalne zmiany w następujących plikach:\n"
 "%%s"
 
-#: unpack-trees.c:118
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9123,7 +9495,7 @@ msgstr ""
 "Scalenie nadpisałoby zmiany w następujących plikach:\n"
 "%%sZłóż swoje zmiany lub dodaj do schowka zanim je scalisz."
 
-#: unpack-trees.c:120
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9133,7 +9505,7 @@ msgstr ""
 "scalenie:\n"
 "%%s"
 
-#: unpack-trees.c:123
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9142,7 +9514,7 @@ msgstr ""
 "%s nadpisałoby zmiany w następujących plikach:\n"
 "%%sZłóż swoje zmiany lub dodaj do schowka zanim wykonasz %s."
 
-#: unpack-trees.c:125
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9151,7 +9523,7 @@ msgstr ""
 "Twoje lokalne zmiany do następujących plików zostaną zastąpione przez %s:\n"
 "%%s"
 
-#: unpack-trees.c:130
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -9160,7 +9532,7 @@ msgstr ""
 "Aktualizowanie następujących katalogów postradałoby nieśledzone pliki:\n"
 "%s"
 
-#: unpack-trees.c:134
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9169,7 +9541,7 @@ msgstr ""
 "Wybranie usunęłoby następujące nieśledzone pliki drzewa roboczego:\n"
 "%%sPrzenieś je lub usuń przed przełączeniem gałęzi."
 
-#: unpack-trees.c:136
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9179,7 +9551,7 @@ msgstr ""
 "wybranie:\n"
 "%%s"
 
-#: unpack-trees.c:139
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9188,7 +9560,7 @@ msgstr ""
 "Scalenie usunęłoby następujące nieśledzone pliki drzewa roboczego:\n"
 "%%sPrzenieś je lub usuń przed scalaniem."
 
-#: unpack-trees.c:141
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9198,7 +9570,7 @@ msgstr ""
 "scalenie:\n"
 "%%s"
 
-#: unpack-trees.c:144
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9207,7 +9579,7 @@ msgstr ""
 "%s usunęłoby następujące nieśledzone pliki drzewa roboczego:\n"
 "%%sPrzenieś je lub usuń przed %s."
 
-#: unpack-trees.c:146
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9216,7 +9588,7 @@ msgstr ""
 "Następujące nieśledzone pliki drzewa roboczego zostałyby usunięte przez %s:\n"
 "%%s"
 
-#: unpack-trees.c:152
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9226,7 +9598,7 @@ msgstr ""
 "Wybranie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
 "%%sPrzenieś je lub usuń przed przełączeniem gałęzi."
 
-#: unpack-trees.c:154
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9236,7 +9608,7 @@ msgstr ""
 "Wybranie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
 "%%s"
 
-#: unpack-trees.c:157
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9245,7 +9617,7 @@ msgstr ""
 "Scalenie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
 "%%sPrzenieś je lub usuń przed scalaniem."
 
-#: unpack-trees.c:159
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9254,7 +9626,7 @@ msgstr ""
 "Scalenie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
 "%%s"
 
-#: unpack-trees.c:162
+#: unpack-trees.c:164
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9263,7 +9635,7 @@ msgstr ""
 "%s nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
 "%%sPrzenieś je lub usuń przed %s."
 
-#: unpack-trees.c:164
+#: unpack-trees.c:166
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9272,21 +9644,21 @@ msgstr ""
 "%s nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
 "%%s"
 
-#: unpack-trees.c:172
+#: unpack-trees.c:174
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Element „%s� pokrywa się z „%s�. Nie można związać."
 
-#: unpack-trees.c:175
+#: unpack-trees.c:177
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 "%s"
 msgstr ""
-"Nie można zaktualizować pod-modułu:\n"
+"Nie można zaktualizować podmodułu:\n"
 "%s"
 
-#: unpack-trees.c:178
+#: unpack-trees.c:180
 #, c-format
 msgid ""
 "The following paths are not up to date and were left despite sparse "
@@ -9296,7 +9668,7 @@ msgstr ""
 "Następujące ścieżki nie są aktualne i zostały mimo rzadkich wzorców:\n"
 "%s"
 
-#: unpack-trees.c:180
+#: unpack-trees.c:182
 #, c-format
 msgid ""
 "The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9305,7 +9677,7 @@ msgstr ""
 "Następujące ścieżki są niescalone i zostały mimo rzadkich wzorców:\n"
 "%s"
 
-#: unpack-trees.c:182
+#: unpack-trees.c:184
 #, c-format
 msgid ""
 "The following paths were already present and thus not updated despite sparse "
@@ -9316,12 +9688,12 @@ msgstr ""
 "wzorców:\n"
 "%s"
 
-#: unpack-trees.c:262
+#: unpack-trees.c:264
 #, c-format
 msgid "Aborting\n"
 msgstr "Przerywanie\n"
 
-#: unpack-trees.c:289
+#: unpack-trees.c:291
 #, c-format
 msgid ""
 "After fixing the above paths, you may want to run `git sparse-checkout "
@@ -9330,11 +9702,11 @@ msgstr ""
 "Po naprawieniu powyższych ścieżek możesz chcieć wykonać „git sparse-checkout "
 "reapply�.\n"
 
-#: unpack-trees.c:350
+#: unpack-trees.c:352
 msgid "Updating files"
 msgstr "Aktualizowanie plików"
 
-#: unpack-trees.c:382
+#: unpack-trees.c:384
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -9344,11 +9716,16 @@ msgstr ""
 "liter w systemie plików, który wielkości nie rozróżnia) i tylko jedna\n"
 "z grupy jest w drzewie roboczym:\n"
 
-#: unpack-trees.c:1498
+#: unpack-trees.c:1620
 msgid "Updating index flags"
 msgstr "Aktualizowanie flag indeksu"
 
-#: upload-pack.c:1543
+#: unpack-trees.c:2772
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr "drzewo robocze i nieśledzony zapis mają podwójne elementy: %s"
+
+#: upload-pack.c:1561
 msgid "expected flush after fetch arguments"
 msgstr "oczekiwano wypróżnienia po argumentach pobrania"
 
@@ -9385,114 +9762,124 @@ msgstr "nieprawidłowy segment ścieżki „..�"
 msgid "Fetching objects"
 msgstr "Pobieranie obiektów"
 
-#: worktree.c:238 builtin/am.c:2103
+#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr "nie można odczytać „%s�"
 
-#: worktree.c:304
+#: worktree.c:303
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "„%s� w głównym drzewie roboczym nie jest katalogiem repozytorium"
 
-#: worktree.c:315
+#: worktree.c:314
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 "plik „%s� nie zawiera ścieżki bezwzględnej do położenia drzewa roboczego"
 
-#: worktree.c:327
+#: worktree.c:326
 #, c-format
 msgid "'%s' does not exist"
 msgstr "„%s� nie istnieje"
 
-#: worktree.c:333
+#: worktree.c:332
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "„%s� nie jest plikiem .git, kod błędu %d"
 
-#: worktree.c:342
+#: worktree.c:341
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "„%s� nie wskazuje z powrotem na „%s�"
 
-#: worktree.c:608
+#: worktree.c:603
 msgid "not a directory"
 msgstr "nie jest katalogiem"
 
-#: worktree.c:617
+#: worktree.c:612
 msgid ".git is not a file"
 msgstr ".git nie jest plikiem"
 
-#: worktree.c:619
+#: worktree.c:614
 msgid ".git file broken"
 msgstr "plik .git zepsuty"
 
-#: worktree.c:621
+#: worktree.c:616
 msgid ".git file incorrect"
 msgstr "plik .git nieprawidłowy"
 
-#: worktree.c:727
+#: worktree.c:722
 msgid "not a valid path"
 msgstr "nieprawidłowa ścieżka"
 
-#: worktree.c:733
+#: worktree.c:728
 msgid "unable to locate repository; .git is not a file"
 msgstr "nie odnaleziono repozytorium; .git nie jest plikiem"
 
-#: worktree.c:737
+#: worktree.c:732
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr "nie odnaleziono repozytorium; plik .git nie odnosi siÄ™ do repozytorium"
 
-#: worktree.c:741
+#: worktree.c:736
 msgid "unable to locate repository; .git file broken"
 msgstr "nie odnaleziono repozytorium; plik .git zepsuty"
 
-#: worktree.c:747
+#: worktree.c:742
 msgid "gitdir unreadable"
 msgstr "katalog gita nie do odczytania"
 
-#: worktree.c:751
+#: worktree.c:746
 msgid "gitdir incorrect"
 msgstr "katalog gita nieprawidłowy"
 
-#: worktree.c:776
+#: worktree.c:771
 msgid "not a valid directory"
 msgstr "nie jest prawidłowym katalogiem"
 
-#: worktree.c:782
+#: worktree.c:777
 msgid "gitdir file does not exist"
 msgstr "plik gitdir nie istnieje"
 
-#: worktree.c:787 worktree.c:796
+#: worktree.c:782 worktree.c:791
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "nie można odczytać pliku gitdir (%s)"
 
-#: worktree.c:806
+#: worktree.c:801
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "przykrótki odczyt (oczekiwano %<PRIuMAX> bajtów, odczytano %<PRIuMAX>)"
 
-#: worktree.c:814
+#: worktree.c:809
 msgid "invalid gitdir file"
 msgstr "nieprawidłowy plik gitdir"
 
-#: worktree.c:822
+#: worktree.c:817
 msgid "gitdir file points to non-existent location"
 msgstr "plik gitdir wskazuje nieistniejące położenie"
 
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "nie można ustawić setenv „%s�"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "nie można utworzyć „%s�"
+
+#: wrapper.c:205 wrapper.c:375
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "nie można otworzyć „%s� do odczytu i zapisu"
 
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
 #, c-format
 msgid "unable to access '%s'"
 msgstr "brak dostępu do „%s�"
 
-#: wrapper.c:607
+#: wrapper.c:615
 msgid "unable to get current working directory"
 msgstr "Nie można uzyskać obecnego katalogu roboczego"
 
@@ -9525,11 +9912,11 @@ msgstr "  (użyj odpowiednio „git add/rm <plik>...� aby zaznaczyć rozwiąza
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (użyj „git rm <plik>...� aby zaznaczyć rozwiązanie)"
 
-#: wt-status.c:211 wt-status.c:1072
+#: wt-status.c:211 wt-status.c:1125
 msgid "Changes to be committed:"
 msgstr "Zmiany do złożenia:"
 
-#: wt-status.c:234 wt-status.c:1081
+#: wt-status.c:234 wt-status.c:1134
 msgid "Changes not staged for commit:"
 msgstr "Zmiany nie przygotowane do złożenia:"
 
@@ -9549,7 +9936,7 @@ msgstr ""
 
 #: wt-status.c:243
 msgid "  (commit or discard the untracked or modified content in submodules)"
-msgstr "  (złóż lub odrzuć nieśledzoną lub zmienioną zawartość pod-modułów)"
+msgstr "  (złóż lub odrzuć nieśledzoną lub zmienioną zawartość podmodułów)"
 
 #: wt-status.c:254
 #, c-format
@@ -9628,7 +10015,7 @@ msgstr "zmieniona zawartość, "
 msgid "untracked content, "
 msgstr "nieśledzona zawartość, "
 
-#: wt-status.c:905
+#: wt-status.c:958
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
@@ -9636,15 +10023,15 @@ msgstr[0] "W schowku jest obecnie %d element"
 msgstr[1] "W schowku sÄ… obecnie %d elementy"
 msgstr[2] "W schowku jest obecnie %d elementów"
 
-#: wt-status.c:936
+#: wt-status.c:989
 msgid "Submodules changed but not updated:"
 msgstr "Pod-moduły zmienione, ale nie zaktualizowane:"
 
-#: wt-status.c:938
+#: wt-status.c:991
 msgid "Submodule changes to be committed:"
-msgstr "Zmiany w pod-modułach do złożenia:"
+msgstr "Zmiany w podmodułach do złożenia:"
 
-#: wt-status.c:1020
+#: wt-status.c:1073
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -9652,7 +10039,7 @@ msgstr ""
 "Nie zmieniaj ani nie usuwaj wiersza powyżej.\n"
 "Wszystko po nim będzie pominięte."
 
-#: wt-status.c:1112
+#: wt-status.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -9663,55 +10050,55 @@ msgstr ""
 "Obliczenie wartości gałęzi przed/w tyle zajęło %.2f sekund.\n"
 "Możesz użyć „--no-ahead-behind�, aby tego uniknąć.\n"
 
-#: wt-status.c:1142
+#: wt-status.c:1195
 msgid "You have unmerged paths."
 msgstr "Masz niescalone ścieżki."
 
-#: wt-status.c:1145
+#: wt-status.c:1198
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (napraw konflikty i wykonaj „git commit�)"
 
-#: wt-status.c:1147
+#: wt-status.c:1200
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (użyj „git merge --abort�, aby przerwać scalanie)"
 
-#: wt-status.c:1151
+#: wt-status.c:1204
 msgid "All conflicts fixed but you are still merging."
 msgstr "Wszystkie konflikty naprawione, ale wciąż trwa scalanie."
 
-#: wt-status.c:1154
+#: wt-status.c:1207
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (użyj „git commit�, żeby zwieńczyć scalanie)"
 
-#: wt-status.c:1163
+#: wt-status.c:1216
 msgid "You are in the middle of an am session."
 msgstr "JesteÅ› w trakcie sesji am."
 
-#: wt-status.c:1166
+#: wt-status.c:1219
 msgid "The current patch is empty."
 msgstr "Obecna ścieżka jest pusta."
 
-#: wt-status.c:1170
+#: wt-status.c:1223
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (napraw konflikty i wykonaj „git am --continue�)"
 
-#: wt-status.c:1172
+#: wt-status.c:1225
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (użyj „git am --skip� aby pominąć tę łatkę)"
 
-#: wt-status.c:1174
+#: wt-status.c:1227
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (użyj „git am --abort�, aby przywrócić pierwotną gałąź)"
 
-#: wt-status.c:1307
+#: wt-status.c:1360
 msgid "git-rebase-todo is missing."
 msgstr "brakuje git-rebase-todo."
 
-#: wt-status.c:1309
+#: wt-status.c:1362
 msgid "No commands done."
 msgstr "Nie wykonano żadnych poleceń."
 
-#: wt-status.c:1312
+#: wt-status.c:1365
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
@@ -9719,16 +10106,16 @@ msgstr[0] "Ostatnie polecenie wykonane (wykonano %d polecenie):"
 msgstr[1] "Ostatnie polecenia wykonane (wykonano %d polecenia):"
 msgstr[2] "Ostatnie polecenia wykonane (wykonano %d poleceń):"
 
-#: wt-status.c:1323
+#: wt-status.c:1376
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (zobacz więcej w pliku %s)"
 
-#: wt-status.c:1328
+#: wt-status.c:1381
 msgid "No commands remaining."
 msgstr "Brak pozostałych poleceń."
 
-#: wt-status.c:1331
+#: wt-status.c:1384
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
@@ -9736,186 +10123,190 @@ msgstr[0] "Następne polecenie do wykonania (pozostało %d polecenie):"
 msgstr[1] "Następne polecenia do wykonania (pozostały %d polecenia):"
 msgstr[2] "Następne polecenia do wykonania (pozostało %d poleceń):"
 
-#: wt-status.c:1339
+#: wt-status.c:1392
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (użyj „git rebase --edit-todo�, aby wyświetlić i edytować)"
 
-#: wt-status.c:1351
+#: wt-status.c:1404
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Przestawiasz właśnie gałąź „%s� na „%s�."
 
-#: wt-status.c:1356
+#: wt-status.c:1409
 msgid "You are currently rebasing."
 msgstr "JesteÅ› w trakcie przestawiania."
 
-#: wt-status.c:1369
+#: wt-status.c:1422
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (napraw konflikty i wykonaj „git rebase --continue�)"
 
-#: wt-status.c:1371
+#: wt-status.c:1424
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (użyj „git rebase --skip� aby pominąć tę łatkę)"
 
-#: wt-status.c:1373
+#: wt-status.c:1426
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (użyj „git rebase --abort�, aby wybrać pierwotną gałąź)"
 
-#: wt-status.c:1380
+#: wt-status.c:1433
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (wszystkie konflikty naprawione: wykonaj „git rebase --continue�)"
 
-#: wt-status.c:1384
+#: wt-status.c:1437
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr "Dzielisz właśnie zapis podczas przestawiania gałęzi „%s� na „%s�."
 
-#: wt-status.c:1389
+#: wt-status.c:1442
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Dzielisz właśnie zapis podczas przestawiania."
 
-#: wt-status.c:1392
+#: wt-status.c:1445
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Kiedy katalog roboczy będzie czysty, wykonaj „git rebase --continue�)"
 
-#: wt-status.c:1396
+#: wt-status.c:1449
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr "Edytujesz właśnie zapis podczas przestawiania gałęzi „%s� na „%s�."
 
-#: wt-status.c:1401
+#: wt-status.c:1454
 msgid "You are currently editing a commit during a rebase."
 msgstr "Edytujesz właśnie zapis podczas przestawiania."
 
-#: wt-status.c:1404
+#: wt-status.c:1457
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (użyj „git commit --amend�, aby poprawić bieżący zapis)"
 
-#: wt-status.c:1406
+#: wt-status.c:1459
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  (użyj „git rebase --continue�, kiedy zadowolisz się swoimi zmianami)"
 
-#: wt-status.c:1417
+#: wt-status.c:1470
 msgid "Cherry-pick currently in progress."
 msgstr "Trwa właśnie dobieranie."
 
-#: wt-status.c:1420
+#: wt-status.c:1473
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Dobierasz właśnie zapis %s."
 
-#: wt-status.c:1427
+#: wt-status.c:1480
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (napraw konflikty i wykonaj „git cherry-pick --continue�)"
 
-#: wt-status.c:1430
+#: wt-status.c:1483
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (wykonaj „git cherry-pick --continue�, aby kontynuować)"
 
-#: wt-status.c:1433
+#: wt-status.c:1486
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (wszystkie konflikty naprawione: wykonaj „git cherry-pick --continue�)"
 
-#: wt-status.c:1435
+#: wt-status.c:1488
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  (użyj „git cherry-pick --skip�, aby pominąć tę łatkę)"
 
-#: wt-status.c:1437
+#: wt-status.c:1490
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  (użyj „git cherry-pick --abort�, aby przerwać dobieranie)"
 
-#: wt-status.c:1447
+#: wt-status.c:1500
 msgid "Revert currently in progress."
 msgstr "Trwa właśnie odwracanie."
 
-#: wt-status.c:1450
+#: wt-status.c:1503
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Odwracasz właśnie zapis %s."
 
-#: wt-status.c:1456
+#: wt-status.c:1509
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (napraw konflikty i wykonaj „git revert --continue�)"
 
-#: wt-status.c:1459
+#: wt-status.c:1512
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (wykonaj „git revert --continue�, aby kontynuować)"
 
-#: wt-status.c:1462
+#: wt-status.c:1515
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (wszystkie konflikty naprawione: wykonaj „git revert --continue�)"
 
-#: wt-status.c:1464
+#: wt-status.c:1517
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (użyj „git revert --skip� aby pominąć tę łatkę)"
 
-#: wt-status.c:1466
+#: wt-status.c:1519
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (użyj „git revert --abort�, aby przerwać odwracanie)"
 
-#: wt-status.c:1476
+#: wt-status.c:1529
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Jesteś w trakcie przeszukiwania, począwszy od gałęzi „%s�."
 
-#: wt-status.c:1480
+#: wt-status.c:1533
 msgid "You are currently bisecting."
 msgstr "JesteÅ› w trakcie przeszukiwania."
 
-#: wt-status.c:1483
+#: wt-status.c:1536
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (użyj „git bisect reset�, aby powrócić na pierwotną gałąź)"
 
-#: wt-status.c:1494
+#: wt-status.c:1547
+msgid "You are in a sparse checkout."
+msgstr "JesteÅ› w rzadkim wybraniu."
+
+#: wt-status.c:1550
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr "Jesteś w rzadkim wybraniu z obecnym %d%% śledzonych plików."
 
-#: wt-status.c:1733
+#: wt-status.c:1794
 msgid "On branch "
 msgstr "Na gałęzi "
 
-#: wt-status.c:1740
+#: wt-status.c:1801
 msgid "interactive rebase in progress; onto "
 msgstr "trwa interaktywne przestawianie na "
 
-#: wt-status.c:1742
+#: wt-status.c:1803
 msgid "rebase in progress; onto "
 msgstr "trwa przestawianie na "
 
-#: wt-status.c:1747
+#: wt-status.c:1808
 msgid "HEAD detached at "
 msgstr "HEAD odłączone na "
 
-#: wt-status.c:1749
+#: wt-status.c:1810
 msgid "HEAD detached from "
 msgstr "HEAD odłączone od "
 
-#: wt-status.c:1752
+#: wt-status.c:1813
 msgid "Not currently on any branch."
 msgstr "Nie jesteś na żadnej gałęzi."
 
-#: wt-status.c:1769
+#: wt-status.c:1830
 msgid "Initial commit"
 msgstr "Pierwszy zapis"
 
-#: wt-status.c:1770
+#: wt-status.c:1831
 msgid "No commits yet"
 msgstr "Jeszcze nie ma zapisów"
 
-#: wt-status.c:1784
+#: wt-status.c:1845
 msgid "Untracked files"
 msgstr "Nieśledzone pliki"
 
-#: wt-status.c:1786
+#: wt-status.c:1847
 msgid "Ignored files"
 msgstr "Ignorowane pliki"
 
-#: wt-status.c:1790
+#: wt-status.c:1851
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9926,30 +10317,30 @@ msgstr ""
 "może to przyspieszyć, ale musisz wtedy pilnować dodawania\n"
 "nowych plików (zobacz „git help status�)."
 
-#: wt-status.c:1796
+#: wt-status.c:1857
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Nie wypisano nieśledzonych plików%s"
 
-#: wt-status.c:1798
+#: wt-status.c:1859
 msgid " (use -u option to show untracked files)"
 msgstr " (użyj opcji -u, aby pokazać nieśledzone pliki)"
 
-#: wt-status.c:1804
+#: wt-status.c:1865
 msgid "No changes"
 msgstr "Brak zmian"
 
-#: wt-status.c:1809
+#: wt-status.c:1870
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr "brak zmian dodanych do zapisu (użyj „git add� i/lub „git commit -a�)\n"
 
-#: wt-status.c:1813
+#: wt-status.c:1874
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "brak zmian dodanych do zapisu\n"
 
-#: wt-status.c:1817
+#: wt-status.c:1878
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -9958,67 +10349,85 @@ msgstr ""
 "nie dodano nic do złożenia, ale są nieśledzone pliki (użyj „git add�, aby "
 "śledzić)\n"
 
-#: wt-status.c:1821
+#: wt-status.c:1882
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "nie dodano nic do złożenia, ale są nieśledzone pliki\n"
 
-#: wt-status.c:1825
+#: wt-status.c:1886
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "nic do złożenia (utwórz/wkopiuj pliki i użyj „git add�, aby śledzić)\n"
 
-#: wt-status.c:1829 wt-status.c:1835
+#: wt-status.c:1890 wt-status.c:1896
 #, c-format
 msgid "nothing to commit\n"
 msgstr "nic do złożenia\n"
 
-#: wt-status.c:1832
+#: wt-status.c:1893
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "nic do złożenia (użyj -u, aby pokazać nieśledzone pliki)\n"
 
-#: wt-status.c:1837
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "nic do złożenia, drzewo robocze czyste\n"
 
-#: wt-status.c:1942
+#: wt-status.c:2003
 msgid "No commits yet on "
 msgstr "Jeszcze nie ma zapisów na "
 
-#: wt-status.c:1946
+#: wt-status.c:2007
 msgid "HEAD (no branch)"
 msgstr "HEAD (brak gałęzi)"
 
-#: wt-status.c:1977
+#: wt-status.c:2038
 msgid "different"
 msgstr "różne"
 
-#: wt-status.c:1979 wt-status.c:1987
+#: wt-status.c:2040 wt-status.c:2048
 msgid "behind "
 msgstr "wstecz "
 
-#: wt-status.c:1982 wt-status.c:1985
+#: wt-status.c:2043 wt-status.c:2046
 msgid "ahead "
 msgstr "do przodu "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2507
+#: wt-status.c:2569
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "nie można wykonać %s: masz nieprzygotowane zmiany."
 
-#: wt-status.c:2513
+#: wt-status.c:2575
 msgid "additionally, your index contains uncommitted changes."
 msgstr "dodatkowo, twój indeks zawiera nieoddane zmiany."
 
-#: wt-status.c:2515
+#: wt-status.c:2577
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "nie można wykonać %s: Twój indeks zawiera niezłożone zmiany."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:457
+#: compat/simple-ipc/ipc-unix-socket.c:183
+msgid "could not send IPC command"
+msgstr "nie można wysłać polecenia IPC"
+
+#: compat/simple-ipc/ipc-unix-socket.c:190
+msgid "could not read IPC response"
+msgstr "nie można odczytać odpowiedzi IPC"
+
+#: compat/simple-ipc/ipc-unix-socket.c:870
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "nie można uruchomić accept_thread „%s�"
+
+#: compat/simple-ipc/ipc-unix-socket.c:882
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "nie można uruchomić worker[0] do „%s�"
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "nie można wykonać unlink na „%s�"
@@ -10027,131 +10436,130 @@ msgstr "nie można wykonać unlink na „%s�"
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opcje>] [--] <ścieżka>..."
 
-#: builtin/add.c:58
+#: builtin/add.c:64
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "nie można wykonać chmod %cx „%s�"
 
-#: builtin/add.c:96
+#: builtin/add.c:106
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "niespodziewany stan diff %c"
 
-#: builtin/add.c:101 builtin/commit.c:285
+#: builtin/add.c:111 builtin/commit.c:298
 msgid "updating files failed"
 msgstr "aktualizacja plików nie powiodła się"
 
-#: builtin/add.c:111
+#: builtin/add.c:121
 #, c-format
 msgid "remove '%s'\n"
 msgstr "usuń „%s�\n"
 
-#: builtin/add.c:186
+#: builtin/add.c:205
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Wycofane zmiany po odświeżeniu indeksu:"
 
-#: builtin/add.c:280 builtin/rev-parse.c:991
+#: builtin/add.c:317 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Nie można odczytać indeksu"
 
-#: builtin/add.c:291
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Nie można otworzyć „%s� do zapisywania."
-
-#: builtin/add.c:295
+#: builtin/add.c:330
 msgid "Could not write patch"
 msgstr "Nie można zapisać łatki"
 
-#: builtin/add.c:298
+#: builtin/add.c:333
 msgid "editing patch failed"
 msgstr "edycja łatki nie powiodła się"
 
-#: builtin/add.c:301
+#: builtin/add.c:336
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Nie można wykonać stat na „%s�"
 
-#: builtin/add.c:303
+#: builtin/add.c:338
 msgid "Empty patch. Aborted."
 msgstr "Pusta Å‚atka. Przerwano."
 
-#: builtin/add.c:308
+#: builtin/add.c:343
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Nie można zastosować „%s�"
 
-#: builtin/add.c:316
+#: builtin/add.c:351
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "Poniższe ścieżki są ignorowane przez jeden z plików .gitignore:\n"
 
-#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
+#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 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 "na sucho"
 
-#: builtin/add.c:339
+#: builtin/add.c:374
 msgid "interactive picking"
 msgstr "interaktywne wybieranie"
 
-#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
+#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
 msgid "select hunks interactively"
 msgstr "wybierz skrawki interaktywnie"
 
-#: builtin/add.c:341
+#: builtin/add.c:376
 msgid "edit current diff and apply"
 msgstr "zmień bieżące różnice i zastosuj"
 
-#: builtin/add.c:342
+#: builtin/add.c:377
 msgid "allow adding otherwise ignored files"
 msgstr "pozwól na dodawanie inaczej ignorowanych plików"
 
-#: builtin/add.c:343
+#: builtin/add.c:378
 msgid "update tracked files"
 msgstr "aktualizuj śledzone pliki"
 
-#: builtin/add.c:344
+#: builtin/add.c:379
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "znormalizuj ponownie końce wierszy w śledzonych plikach (zakłada -u)"
 
-#: builtin/add.c:345
+#: builtin/add.c:380
 msgid "record only the fact that the path will be added later"
 msgstr "zapisz tylko, że ścieżka zostanie dodana później"
 
-#: builtin/add.c:346
+#: builtin/add.c:381
 msgid "add changes from all tracked and untracked files"
 msgstr "dodaj zmiany z plików śledzonych i nieśledzonych"
 
-#: builtin/add.c:349
+#: builtin/add.c:384
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "pomiń ścieżki usunięte w drzewie roboczym (to samo, co --no-all)"
 
-#: builtin/add.c:351
+#: builtin/add.c:386
 msgid "don't add, only refresh the index"
 msgstr "nie dodawaj, tylko odśwież indeks"
 
-#: builtin/add.c:352
+#: builtin/add.c:387
 msgid "just skip files which cannot be added because of errors"
 msgstr "po prostu pomiń pliki, których nie można dodać z powodu błędów"
 
-#: builtin/add.c:353
+#: builtin/add.c:388
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "sprawdź na sucho, czy pliki o takich ścieżkach byłyby ignorowane"
 
-#: builtin/add.c:355 builtin/update-index.c:1004
+#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+msgid "allow updating entries outside of the sparse-checkout cone"
+msgstr "pozwól aktualizować elementy poza stożkiem rzadkiego wybrania"
+
+#: builtin/add.c:391 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "wymuś bit wykonywalności podanych plików"
 
-#: builtin/add.c:357
+#: builtin/add.c:393
 msgid "warn when adding an embedded repository"
 msgstr "ostrzegaj przed dodawaniem wbudowanego repozytorium"
 
-#: builtin/add.c:359
+#: builtin/add.c:395
 msgid "backend for `git stash -p`"
 msgstr "silnik do „git stash -p�"
 
-#: builtin/add.c:377
+#: builtin/add.c:413
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10171,7 +10579,7 @@ msgstr ""
 "Dodano inne repozytorium wewnątrz bieżącego repozytorium.\n"
 "Klony zewnętrznego repozytorium nie będą zawierać zawartości\n"
 "zawartego repozytorium i nie będą wiedziały, jak ją uzyskać.\n"
-"Jeśli chodziło o dodanie pod-modułu, użyj:\n"
+"Jeśli chodziło o dodanie podmodułu, użyj:\n"
 "\n"
 "\tgit submodule add <url> %s\n"
 "\n"
@@ -10182,12 +10590,12 @@ msgstr ""
 "\n"
 "Więcej informacji w „git help submodule�."
 
-#: builtin/add.c:405
+#: builtin/add.c:442
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "dodawanie wbudowanego repozytorium gita: %s"
 
-#: builtin/add.c:424
+#: builtin/add.c:462
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10197,47 +10605,51 @@ msgstr ""
 "Wyłącz ten komunikat wykonując\n"
 "„git config advice.addIgnoredFile false�"
 
-#: builtin/add.c:433
+#: builtin/add.c:477
 msgid "adding files failed"
 msgstr "dodawanie plików nie powiodło się"
 
-#: builtin/add.c:461 builtin/commit.c:345
+#: builtin/add.c:513
+msgid "--dry-run is incompatible with --interactive/--patch"
+msgstr "--dry-run i --interactive/--patch siÄ™ wykluczajÄ…"
+
+#: builtin/add.c:515 builtin/commit.c:358
 msgid "--pathspec-from-file is incompatible with --interactive/--patch"
 msgstr "--pathspec-from-file i --interactive/--patch siÄ™ wykluczajÄ…"
 
-#: builtin/add.c:478
+#: builtin/add.c:532
 msgid "--pathspec-from-file is incompatible with --edit"
 msgstr "--pathspec-from-file i --edit siÄ™ wykluczajÄ…"
 
-#: builtin/add.c:490
+#: builtin/add.c:544
 msgid "-A and -u are mutually incompatible"
 msgstr "-A i -u siÄ™ wykluczajÄ…"
 
-#: builtin/add.c:493
+#: builtin/add.c:547
 msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "Opcja --ignore-missing może być użyta tylko z --dry-run"
+msgstr "Opcji --ignore-missing można użyć tylko z --dry-run"
 
-#: builtin/add.c:497
+#: builtin/add.c:551
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "parametr --chmod „%s� musi być „-x� albo „+x�"
 
-#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
-#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
+#: 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 i argumenty ze ścieżkami się wykluczają"
 
-#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
-#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
+#: 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 wymaga --pathspec-from-file"
 
-#: builtin/add.c:526
+#: builtin/add.c:583
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nic nie podano, nic nie dodano.\n"
 
-#: builtin/add.c:528
+#: builtin/add.c:585
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10247,110 +10659,110 @@ msgstr ""
 "Wyłącz ten komunikat wykonując\n"
 "„git config advice.addEmptyPathspec false�"
 
-#: builtin/am.c:352
+#: builtin/am.c:366
 msgid "could not parse author script"
 msgstr "nie można przetworzyć skryptu autorstwa"
 
-#: builtin/am.c:436
+#: builtin/am.c:456
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "skrypt applypatch-msg usunął „%s�"
 
-#: builtin/am.c:478
+#: builtin/am.c:498
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Uszkodzony wiersz wejścia: „%s�."
 
-#: builtin/am.c:516
+#: builtin/am.c:536
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Nie można skopiować uwag z „%s� do „%s�"
 
-#: builtin/am.c:542
+#: builtin/am.c:562
 msgid "fseek failed"
 msgstr "fseek nie powiodło się"
 
-#: builtin/am.c:730
+#: builtin/am.c:750
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "nie można przetworzyć łatki „%s�"
 
-#: builtin/am.c:795
+#: builtin/am.c:815
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Tylko jedna seria łatek StGIT może być nałożona jednocześnie"
 
-#: builtin/am.c:843
+#: builtin/am.c:863
 msgid "invalid timestamp"
 msgstr "nieprawidłowy znacznik czasu"
 
-#: builtin/am.c:848 builtin/am.c:860
+#: builtin/am.c:868 builtin/am.c:880
 msgid "invalid Date line"
 msgstr "nieprawidłowy wiersz Date"
 
-#: builtin/am.c:855
+#: builtin/am.c:875
 msgid "invalid timezone offset"
 msgstr "nieprawidłowe przesunięcie strefy czasowej"
 
-#: builtin/am.c:948
+#: builtin/am.c:968
 msgid "Patch format detection failed."
 msgstr "Nie można wykryć formatu łatki."
 
-#: builtin/am.c:953 builtin/clone.c:410
+#: builtin/am.c:973 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "nie można utworzyć katalogu „%s�"
 
-#: builtin/am.c:958
+#: builtin/am.c:978
 msgid "Failed to split patches."
 msgstr "Nie można rozdzielić łatek."
 
-#: builtin/am.c:1089
+#: builtin/am.c:1127
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Kiedy rozwiążesz problem, wykonaj „%s --continue�."
 
-#: builtin/am.c:1090
+#: builtin/am.c:1128
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Jeśli wolisz pominąć tę łatkę, wykonaj zamiast tego „%s --skip�."
 
-#: builtin/am.c:1091
+#: builtin/am.c:1129
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Aby przywrócić pierwotną gałąź i przerwać łatanie, uruchom „%s --abort�."
 
-#: builtin/am.c:1174
+#: builtin/am.c:1224
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Wysłano łatkę z formatem=flowed; odstępy na końcach wierszy mogą zostać "
 "stracone."
 
-#: builtin/am.c:1202
+#: builtin/am.c:1252
 msgid "Patch is empty."
 msgstr "�atka jest pusta."
 
-#: builtin/am.c:1267
+#: builtin/am.c:1317
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "brakuje wiersza autorstwa w zapisie %s"
 
-#: builtin/am.c:1270
+#: builtin/am.c:1320
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "błędny wiersz tożsamości: %.*s"
 
-#: builtin/am.c:1489
+#: builtin/am.c:1539
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "W repozytorium brakuje blobów, potrzebnych żeby uciec się do trójstronnego "
 "scalania."
 
-#: builtin/am.c:1491
+#: builtin/am.c:1541
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Używanie informacji z indeksu do odtworzenia drzewa podstawy..."
 
-#: builtin/am.c:1510
+#: builtin/am.c:1560
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10358,24 +10770,24 @@ msgstr ""
 "Czy łatka była zmieniana ręcznie?\n"
 "Nie stosuje się do plików zapisanych w swoim indeksie."
 
-#: builtin/am.c:1516
+#: builtin/am.c:1566
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Uciekanie się do podstawy łatania i trójstronnego scalania..."
 
-#: builtin/am.c:1542
+#: builtin/am.c:1592
 msgid "Failed to merge in the changes."
 msgstr "Nie można scalić zmian."
 
-#: builtin/am.c:1574
+#: builtin/am.c:1624
 msgid "applying to an empty history"
 msgstr "stosowanie na pustej historii"
 
-#: builtin/am.c:1626 builtin/am.c:1630
+#: builtin/am.c:1676 builtin/am.c:1680
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "nie można wznowić: %s nie istnieje."
 
-#: builtin/am.c:1648
+#: builtin/am.c:1698
 msgid "Commit Body is:"
 msgstr "Zawartość zapisu to:"
 
@@ -10383,41 +10795,41 @@ msgstr "Zawartość zapisu to:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1658
+#: builtin/am.c:1708
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 "Zastosować? tak [y]/[n]ie/[e]dycja/wyświetl łatkę [v]/za[a]kceptuj "
 "wszystkie: "
 
-#: builtin/am.c:1704 builtin/commit.c:395
+#: builtin/am.c:1754 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "nie można zapisać pliku indeksu"
 
-#: builtin/am.c:1708
+#: builtin/am.c:1758
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Brudny indeks: nie można zastosować łatek (brudny: %s)"
 
-#: builtin/am.c:1748 builtin/am.c:1816
+#: builtin/am.c:1798 builtin/am.c:1865
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Stosowanie: %.*s"
 
-#: builtin/am.c:1765
+#: builtin/am.c:1815
 msgid "No changes -- Patch already applied."
 msgstr "Brak zmian -- łatka już zastosowana."
 
-#: builtin/am.c:1771
+#: builtin/am.c:1821
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "�atanie nie powiodło się przy %s %.*s"
 
-#: builtin/am.c:1775
+#: builtin/am.c:1825
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr "Użyj „git am --show-current-patch=diff�, aby zobaczyć zawodną łatkę"
 
-#: builtin/am.c:1819
+#: builtin/am.c:1868
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -10427,7 +10839,7 @@ msgstr ""
 "Jeśli nic nie zostało do przygotowania, jest szansa, że coś innego\n"
 "już wprowadziło te same zmiany; możesz chcieć pominąć tę łatkę."
 
-#: builtin/am.c:1826
+#: builtin/am.c:1875
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -10440,17 +10852,17 @@ msgstr ""
 "Możesz chcieć wykonać „git rm� na pliku, aby zaakceptować na nim „usunięcie "
 "przez nich�."
 
-#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
-#: builtin/reset.c:355
+#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
+#: builtin/reset.c:361
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Nie można przetworzyć obiektu „%s�."
 
-#: builtin/am.c:1985
+#: builtin/am.c:2035 builtin/am.c:2111
 msgid "failed to clean index"
 msgstr "nie można wyczyścić indeksu"
 
-#: builtin/am.c:2029
+#: builtin/am.c:2079
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10458,156 +10870,160 @@ msgstr ""
 "Wydaje się, że HEAD się przesunęło od ostatniego niepowodzenia „am�.\n"
 "Nie cofanie do ORIG_HEAD"
 
-#: builtin/am.c:2136
+#: builtin/am.c:2187
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Nieprawidłowa wartość --patch-format: %s"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2229
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr "Nieprawidłowa wartość --show-current-patch: %s"
 
-#: builtin/am.c:2182
+#: builtin/am.c:2233
 #, c-format
 msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
 msgstr "--show-current-patch=%s i --show-current-patch=%s siÄ™ wykluczajÄ…"
 
-#: builtin/am.c:2213
+#: builtin/am.c:2264
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opcje>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2214
+#: builtin/am.c:2265
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opcje>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2220
+#: builtin/am.c:2271
 msgid "run interactively"
 msgstr "uruchom interaktywnie"
 
-#: builtin/am.c:2222
+#: builtin/am.c:2273
 msgid "historical option -- no-op"
 msgstr "opcja historyczna — nic nie robi"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2275
 msgid "allow fall back on 3way merging if needed"
 msgstr "zezwól na uciekanie się do trójstronnego scalania, jeśli potrzebne"
 
-#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
-#: builtin/repack.c:334 builtin/stash.c:882
+#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:640 builtin/stash.c:961
 msgid "be quiet"
 msgstr "mniej komunikatów"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2278
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "dodaj końcówkę Signed-off-by do komunikatu zapisu"
 
-#: builtin/am.c:2230
+#: builtin/am.c:2281
 msgid "recode into utf8 (default)"
 msgstr "przekoduj na utf8 (domyślnie)"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2283
 msgid "pass -k flag to git-mailinfo"
 msgstr "przekaż flagę -k do git-mailinfo"
 
-#: builtin/am.c:2234
+#: builtin/am.c:2285
 msgid "pass -b flag to git-mailinfo"
 msgstr "przekaż flagę -b do git-mailinfo"
 
-#: builtin/am.c:2236
+#: builtin/am.c:2287
 msgid "pass -m flag to git-mailinfo"
 msgstr "przekaż flagę -m do git-mailinfo"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2289
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "przekaż flagę --keep-cr do git-mailsplit przy formacie mbox"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2292
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "nie przekazuj flagi --keep-cr do git-mailsplit, niezależnie od am.keepcr"
 
-#: builtin/am.c:2244
+#: builtin/am.c:2295
 msgid "strip everything before a scissors line"
 msgstr "odetnij wszystko przed wierszem nożyczek"
 
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2297
+msgid "pass it through git-mailinfo"
+msgstr "przepuść przez 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
 msgid "pass it through git-apply"
 msgstr "przepuść przez git-apply"
 
-#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
-#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
-#: parse-options.h:316
+#: 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: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/tag.c:445 parse-options.h:154 parse-options.h:175
+#: parse-options.h:315
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
-#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: 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/verify-tag.c:38
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2324
 msgid "format the patch(es) are in"
 msgstr "format, w którym są łatki"
 
-#: builtin/am.c:2276
+#: builtin/am.c:2330
 msgid "override error message when patch failure occurs"
 msgstr "zastąp komunikat błędu, kiedy wystąpi błąd łatania"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2332
 msgid "continue applying patches after resolving a conflict"
 msgstr "kontynuuj stosowanie Å‚atek po rozwiÄ…zaniu konfliktu"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2335
 msgid "synonyms for --continue"
 msgstr "zamienniki dla --continue"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2338
 msgid "skip the current patch"
 msgstr "pomiń obecną ścieżkę"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2341
 msgid "restore the original branch and abort the patching operation"
 msgstr "przywróć pierwotną gałąź i przerwij łatanie"
 
-#: builtin/am.c:2290
+#: builtin/am.c:2344
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "przerwij operacjÄ™ Å‚atania, ale zostaw HEAD, gdzie jest"
 
-#: builtin/am.c:2294
+#: builtin/am.c:2348
 msgid "show the patch being applied"
 msgstr "pokaż właśnie stosowaną łatkę"
 
-#: builtin/am.c:2299
+#: builtin/am.c:2353
 msgid "lie about committer date"
 msgstr "zmyśl datę zapisu"
 
-#: builtin/am.c:2301
+#: builtin/am.c:2355
 msgid "use current timestamp for author date"
 msgstr "użyj bieżącego znacznika czasu jako daty utworzenia"
 
-#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
-#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
+#: 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/revert.c:117 builtin/tag.c:460
 msgid "key-id"
 msgstr "id-klucza"
 
-#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
+#: builtin/am.c:2358 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "podpisuj zapisy GPG"
 
-#: builtin/am.c:2307
+#: builtin/am.c:2361
 msgid "(internal use for git-rebase)"
 msgstr "(użycie wewnętrzne w git-rebase)"
 
-#: builtin/am.c:2325
+#: builtin/am.c:2379
 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."
@@ -10615,17 +11031,17 @@ msgstr ""
 "Opcja -b/--binary nic nie robi od dłuższego czasu i zostanie\n"
 "usunięta. Nie używaj jej już."
 
-#: builtin/am.c:2332
+#: builtin/am.c:2386
 msgid "failed to read the index"
 msgstr "nie można odczytać indeksu"
 
-#: builtin/am.c:2347
+#: builtin/am.c:2401
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "poprzedni katalog przestawiania %s nadal istnieje, ale podano skrzynkÄ™ mbox."
 
-#: builtin/am.c:2371
+#: builtin/am.c:2425
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -10634,11 +11050,11 @@ msgstr ""
 "Znaleziono bezpański katalog %s.\n"
 "Użyj „git am --abort� aby go usunąć."
 
-#: builtin/am.c:2377
+#: builtin/am.c:2431
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Nie trwa operacja rozwiÄ…zywania, nie wznawiamy."
 
-#: builtin/am.c:2387
+#: builtin/am.c:2441
 msgid "interactive mode requires patches on the command line"
 msgstr "tryb interaktywny wymaga łatek w wierszu poleceń"
 
@@ -10646,46 +11062,35 @@ msgstr "tryb interaktywny wymaga łatek w wierszu poleceń"
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<opcje>] [<Å‚atka>...]"
 
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "nie można utworzyć pliku archiwum „%s�"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "nie można przekierować wyjścia"
 
-#: builtin/archive.c:37
+#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Zdalne repozytorium bez adresu"
 
-#: builtin/archive.c:61
+#: builtin/archive.c:59
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive: oczekiwano ACK/NAK, otrzymano pakiet wypróżnienia"
 
-#: builtin/archive.c:64
+#: builtin/archive.c:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: NACK %s"
 
-#: builtin/archive.c:65
+#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive: błąd protokołu"
 
-#: builtin/archive.c:69
+#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive: oczekiwano wypróżnienia"
 
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<zapis>]"
 
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <dobre_określenie> <złe_określenie> "
-"[<określenie>]"
-
 #: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10724,73 +11129,86 @@ msgstr "git bisect--helper --bisect-replay <nazwa-pliku>"
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<rewizja>|<zakres>)...]"
 
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <polecenie>..."
+
+#: builtin/bisect--helper.c:109
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr "nie można otworzyć pliku „%s� w trybie „%s�"
 
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "nie można pisać do pliku „%s�"
 
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "nie można otworzyć pliku „%s� do czytania"
+
+#: builtin/bisect--helper.c:170
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "„%s� nie jest prawidłowym sformułowaniem"
 
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "nie można użyć wbudowanego polecenia „%s� jako sformułowania"
 
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "nie można zmienić znaczenia sformułowania „%s�"
 
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
 msgid "please use two different terms"
 msgstr "użyj dwóch różnych sformułowań"
 
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "Teraz nie przeszukujemy.\n"
 
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "„%s� nie jest prawidłowym zapisem"
 
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr ""
 "nie można wybrać pierwotnego HEAD „%s�. Spróbuj „git bisect reset <zapis>�."
 
-#: builtin/bisect--helper.c:254
+#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Błędny argument bisect_write: %s"
 
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "nie można uzyskać oid rewizji „%s�"
 
-#: builtin/bisect--helper.c:271
+#: builtin/bisect--helper.c:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "nie można otworzyć pliku „%s�"
 
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:314
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "Nieprawidłowe polecenie: przeszukujesz teraz %s/%s"
 
-#: builtin/bisect--helper.c:324
+#: builtin/bisect--helper.c:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -10799,7 +11217,7 @@ msgstr ""
 "Wtedy podaj przynajmniej jednÄ… rewizjÄ™ %s i jednÄ… %s.\n"
 "Możesz użyć do tego „git bisect %s� i „git bisect %s�."
 
-#: builtin/bisect--helper.c:328
+#: builtin/bisect--helper.c:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -10810,7 +11228,7 @@ msgstr ""
 "Wtedy podaj przynajmniej jednÄ… rewizjÄ™ %s i jednÄ… %s.\n"
 "Możesz użyć do tego „git bisect %s� i „git bisect %s�."
 
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "przeszukiwanie tylko z zapisem %s"
@@ -10819,15 +11237,15 @@ msgstr "przeszukiwanie tylko z zapisem %s"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "Czy na pewno [Y/n]? "
 
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
 msgid "no terms defined"
 msgstr "nie zdefiniowano sformułowań"
 
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -10836,7 +11254,7 @@ msgstr ""
 "Bieżące sformułowania to %s na stary stan\n"
 "i %s na nowy stan.\n"
 
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -10845,54 +11263,54 @@ msgstr ""
 "nieprawidłowy argument %s do „git bisect terms�.\n"
 "Wspierane opcje to: --term-good | --term-old i --term-bad | --term-new."
 
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
 msgstr "nie udało się przygotować przejścia rewizji\n"
 
-#: builtin/bisect--helper.c:519
+#: builtin/bisect--helper.c:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "nie można otworzyć „%s� do dopisywania"
 
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
 msgstr "„� nie jest prawidłowym sformułowaniem"
 
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "nierozpoznana opcja: „%s�"
 
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "„%s� nie wydaje się być prawidłową rewizją"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "złe HEAD — potrzeba HEAD"
 
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 "wybieranie „%s� nie powiodło się. Spróbuj „git bisect start <prawidłowa-"
 "gałąź>�."
 
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "nie przeszukam na drzewie cg-seek'owanym"
 
-#: builtin/bisect--helper.c:735
+#: builtin/bisect--helper.c:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "złe HEAD — dziwna referencja symboliczna"
 
-#: builtin/bisect--helper.c:755
+#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "nieprawidłowa referencja: „%s�"
 
-#: builtin/bisect--helper.c:813
+#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "Musisz rozpocząć przez „git bisect start�\n"
 
@@ -10900,99 +11318,151 @@ msgstr "Musisz rozpocząć przez „git bisect start�\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "Chcesz, żeby to teraz zrobić [Y/n]? "
 
-#: builtin/bisect--helper.c:842
+#: builtin/bisect--helper.c:859
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr "Wywołaj „--bisect-state� z przynajmniej jednym argumentem"
 
-#: builtin/bisect--helper.c:855
+#: builtin/bisect--helper.c:872
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "„git bisect %s� przyjmuje tylko jeden argument."
 
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "Błędne wejście rev: %s"
 
-#: builtin/bisect--helper.c:912
+#: builtin/bisect--helper.c:904
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "Błędne wejście rev (nie jest zapisem): %s"
+
+#: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
 msgstr "Teraz nie przeszukujemy."
 
-#: builtin/bisect--helper.c:962
+#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "„%s�?? o czym ty w ogóle mówisz?"
 
-#: builtin/bisect--helper.c:974
+#: builtin/bisect--helper.c:998
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr "nie można odczytać „%s� do odtwarzania"
 
-#: builtin/bisect--helper.c:1047
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "przeszukanie nie powiodło się: nie podano polecenia."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "wykonywanie %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+"przeszukanie nie powiodło się: kod wyjścia %d z „%s� jest < 0 lub >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "nie można otworzyć pliku „%s� do zapisywania"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "przeszukanie nie może już kontynuować"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "przeszukanie pomyślne"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "przeszukiwanie znalazło pierwszy zły zapis"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"przeszukanie nie powiodło się: „git bisect--helper --bisect-state %s� "
+"zakończył się z kodem błędu %d"
+
+#: builtin/bisect--helper.c:1192
 msgid "reset the bisection state"
 msgstr "zresetuj stan przeszukiwania"
 
-#: builtin/bisect--helper.c:1049
+#: builtin/bisect--helper.c:1194
 msgid "check whether bad or good terms exist"
 msgstr "sprawdź, czy istnieją złe lub dobre określenia"
 
-#: builtin/bisect--helper.c:1051
+#: builtin/bisect--helper.c:1196
 msgid "print out the bisect terms"
 msgstr "wypisz tylko określenia przeszukiwania"
 
-#: builtin/bisect--helper.c:1053
+#: builtin/bisect--helper.c:1198
 msgid "start the bisect session"
 msgstr "rozpocznij sesjÄ™ przeszukiwania"
 
-#: builtin/bisect--helper.c:1055
+#: builtin/bisect--helper.c:1200
 msgid "find the next bisection commit"
 msgstr "znajdź kolejny zapis do przeszukiwania"
 
-#: builtin/bisect--helper.c:1057
+#: builtin/bisect--helper.c:1202
 msgid "mark the state of ref (or refs)"
 msgstr "oznacz stan referencji"
 
-#: builtin/bisect--helper.c:1059
+#: builtin/bisect--helper.c:1204
 msgid "list the bisection steps so far"
 msgstr "wypisz dotychczasowe kroki przeszukiwania"
 
-#: builtin/bisect--helper.c:1061
+#: builtin/bisect--helper.c:1206
 msgid "replay the bisection process from the given file"
 msgstr "odtwórz proces przeszukiwania z podanego pliku"
 
-#: builtin/bisect--helper.c:1063
+#: builtin/bisect--helper.c:1208
 msgid "skip some commits for checkout"
 msgstr "pomiń niektóre zapisy do wybrania"
 
-#: builtin/bisect--helper.c:1065
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "wizualizuj przeszukiwanie"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "użyj <polecenia>... do automatycznego przeszukiwania."
+
+#: builtin/bisect--helper.c:1214
 msgid "no log for BISECT_WRITE"
 msgstr "brak dziennika do BISECT_WRITE"
 
-#: builtin/bisect--helper.c:1080
+#: builtin/bisect--helper.c:1229
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset wymaga jako argumentu albo niczego albo zapisu"
 
-#: builtin/bisect--helper.c:1085
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check wymaga 2 albo 3 argumentów"
-
-#: builtin/bisect--helper.c:1091
+#: builtin/bisect--helper.c:1234
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms wymaga maksymalnie jednego argumentu"
 
-#: builtin/bisect--helper.c:1100
+#: builtin/bisect--helper.c:1243
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next wymaga braku argumentów"
 
-#: builtin/bisect--helper.c:1111
+#: builtin/bisect--helper.c:1254
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log wymaga braku argumentów"
 
-#: builtin/bisect--helper.c:1116
+#: builtin/bisect--helper.c:1259
 msgid "no logfile given"
 msgstr "nie podano pliku dziennika"
 
@@ -11004,149 +11474,151 @@ msgstr "git blame [<opcje>] [<opcje-rewizji>] [<rewizja>] [--] <plik>"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<opcje-rewizji> sÄ… opisane w git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "oczekiwano koloru: %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "musi się kończyć kolorem"
 
-#: builtin/blame.c:728
+#: builtin/blame.c:724
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "błędny kolor „%s� w color.blame.repeatedLines"
 
-#: builtin/blame.c:746
+#: builtin/blame.c:742
 msgid "invalid value for blame.coloring"
 msgstr "nieprawidłowa wartość blame.coloring"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:841
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "nie znaleziono rewizji %s do pominięcia"
 
-#: builtin/blame.c:867
+#: builtin/blame.c:863
 msgid "show blame entries as we find them, incrementally"
 msgstr "pokaż elementy oskarżenia w miarę znajdywania, przyrostowo"
 
-#: builtin/blame.c:868
+#: builtin/blame.c:864
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr "nie pokazuj nazw obiektów w brzegowych zapisach (domyślnie wyłączone)"
 
-#: builtin/blame.c:869
+#: builtin/blame.c:865
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "nie traktuj zapisów-korzeni jako granic (domyślnie wyłączone)"
 
-#: builtin/blame.c:870
+#: builtin/blame.c:866
 msgid "show work cost statistics"
 msgstr "pokaż statystyki kosztu pracy"
 
-#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
-#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: 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/send-pack.c:202
 msgid "force progress reporting"
 msgstr "wymuś zgłaszanie postępu"
 
-#: builtin/blame.c:872
+#: builtin/blame.c:868
 msgid "show output score for blame entries"
 msgstr "pokaż wynik wyjściowy elementów oskarżenia"
 
-#: builtin/blame.c:873
+#: builtin/blame.c:869
 msgid "show original filename (Default: auto)"
 msgstr "pokazuj pierwotną nazwę pliku (Domyślnie: automatycznie)"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:870
 msgid "show original linenumber (Default: off)"
 msgstr "pokaż pierwotny numer wiersza (domyślnie wyłączone)"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:871
 msgid "show in a format designed for machine consumption"
 msgstr "pokaż w formacie zaprojektowanym do przetwarzania maszynowego"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:872
 msgid "show porcelain format with per-line commit information"
 msgstr "pokaż w porcelanowym formacie z informacją o zapisie w każdym wierszu"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:873
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr "użyj tego samego trybu wyjścia, co git-annotate (domyślnie wyłączone)"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:874
 msgid "show raw timestamp (Default: off)"
 msgstr "pokaż surowy znacznik czasu (domyślnie wyłączone)"
 
-#: builtin/blame.c:879
+#: builtin/blame.c:875
 msgid "show long commit SHA1 (Default: off)"
 msgstr "pokaż długie SHA-1 zapisu (domyślnie wyłączone)"
 
-#: builtin/blame.c:880
+#: builtin/blame.c:876
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "nie wypisuj nazwiska autora i znacznika czasu (domyślnie wyłączone)"
 
-#: builtin/blame.c:881
+#: builtin/blame.c:877
 msgid "show author email instead of name (Default: off)"
 msgstr "pokaż adres e-mail autora zamiast nazwiska (domyślnie wyłączone)"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:878
 msgid "ignore whitespace differences"
 msgstr "ignoruj różnice w białych znakach"
 
-#: builtin/blame.c:883 builtin/log.c:1812
+#: builtin/blame.c:879 builtin/log.c:1823
 msgid "rev"
 msgstr "rewizja"
 
-#: builtin/blame.c:883
+#: builtin/blame.c:879
 msgid "ignore <rev> when blaming"
 msgstr "pomiń <rewizję> przy obwinianiu"
 
-#: builtin/blame.c:884
+#: builtin/blame.c:880
 msgid "ignore revisions from <file>"
 msgstr "pomiń rewizje z <pliku>"
 
-#: builtin/blame.c:885
+#: builtin/blame.c:881
 msgid "color redundant metadata from previous line differently"
 msgstr "koloruj inaczej zbędne metadane z poprzedniego wiersza"
 
-#: builtin/blame.c:886
+#: builtin/blame.c:882
 msgid "color lines by age"
 msgstr "koloruj wiersze według wieku"
 
-#: builtin/blame.c:887
+#: builtin/blame.c:883
 msgid "spend extra cycles to find better match"
 msgstr "poświęć dodatkowe cykle, aby znaleźć lepsze dopasowanie"
 
-#: builtin/blame.c:888
+#: builtin/blame.c:884
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "użyj rewizji z <pliku> zamiast wołać git-rev-list"
 
-#: builtin/blame.c:889
+#: builtin/blame.c:885
 msgid "use <file>'s contents as the final image"
 msgstr "użyj zawartości <pliku> jako ostatecznego obrazu"
 
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
 msgid "score"
 msgstr "wynik"
 
-#: builtin/blame.c:890
+#: builtin/blame.c:886
 msgid "find line copies within and across files"
 msgstr "znajdź kopie wierszy w plikach i pomiędzy nimi"
 
-#: builtin/blame.c:891
+#: builtin/blame.c:887
 msgid "find line movements within and across files"
 msgstr "znajdź ruchy wierszy w plikach i pomiędzy nimi"
 
-#: builtin/blame.c:892
+#: builtin/blame.c:888
 msgid "range"
 msgstr "zakres"
 
-#: builtin/blame.c:893
+#: builtin/blame.c:889
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr "przetwórz tylko zakres <start>,<end> lub funkcję :<nazwa-funkcji>"
 
-#: builtin/blame.c:945
+#: builtin/blame.c:944
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "nie można użyć --progress z --incremental ani formatami porcelanowymi"
 
@@ -11158,11 +11630,11 @@ msgstr "nie można użyć --progress z --incremental ani formatami porcelanowymi
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:996
+#: builtin/blame.c:995
 msgid "4 years, 11 months ago"
 msgstr "4 lata, 11 miesięcy temu"
 
-#: builtin/blame.c:1112
+#: builtin/blame.c:1111
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
@@ -11170,7 +11642,7 @@ msgstr[0] "plik %s ma tylko %lu wiersz"
 msgstr[1] "plik %s ma tylko %lu wiersze"
 msgstr[2] "plik %s ma tylko %lu wierszy"
 
-#: builtin/blame.c:1157
+#: builtin/blame.c:1156
 msgid "Blaming lines"
 msgstr "Obwinianie wierszy"
 
@@ -11271,77 +11743,77 @@ msgstr "Usunięto gałąź śledzącą %s (wskazywała %s).\n"
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Usunięto gałąź %s (wskazywała %s).\n"
 
-#: builtin/branch.c:438 builtin/tag.c:61
+#: builtin/branch.c:441 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "nie można przetworzyć łańcucha formatu"
 
-#: builtin/branch.c:469
+#: builtin/branch.c:472
 msgid "could not resolve HEAD"
 msgstr "nie można rozwiązać HEAD"
 
-#: builtin/branch.c:475
+#: builtin/branch.c:478
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) wskazuje poza refs/heads/"
 
-#: builtin/branch.c:490
+#: builtin/branch.c:493
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Gałąź %s jest przestawiana na %s"
 
-#: builtin/branch.c:494
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Gałąź %s jest przeszukiwana w %s"
 
-#: builtin/branch.c:511
+#: builtin/branch.c:514
 msgid "cannot copy the current branch while not on any."
 msgstr "nie można skopiować bieżącej gałęzi, gdy nie ma żadnej bieżącej."
 
-#: builtin/branch.c:513
+#: builtin/branch.c:516
 msgid "cannot rename the current branch while not on any."
 msgstr "nie można zmienić nazwy bieżącej gałęzi, gdy nie ma żadnej bieżącej."
 
-#: builtin/branch.c:524
+#: builtin/branch.c:527
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nieprawidłowa nazwa gałęzi: „%s�"
 
-#: builtin/branch.c:553
+#: builtin/branch.c:556
 msgid "Branch rename failed"
 msgstr "Zmiana nazwy gałęzi nie powiodła się"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:558
 msgid "Branch copy failed"
 msgstr "Kopiowanie gałęzi nie powiodło się"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:562
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Skopiowano źle nazwaną gałąź „%s�"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:565
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Poprawiono nazwę gałęzi „%s�"
 
-#: builtin/branch.c:568
+#: builtin/branch.c:571
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Nazwa gałęzi zmieniona na %s, ale czoło HEAD nie jest zaktualizowane!"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:580
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "Zmieniono nazwę gałęzi, ale aktualizacja pliku konfiguracyjnego nie powiodła "
 "siÄ™"
 
-#: builtin/branch.c:579
+#: builtin/branch.c:582
 msgid "Branch is copied, but update of config-file failed"
 msgstr ""
 "Skopiowano gałąź, ale aktualizacja pliku konfiguracyjnego nie powiodła się"
 
-#: builtin/branch.c:595
+#: builtin/branch.c:598
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11352,180 +11824,180 @@ msgstr ""
 "  %s\n"
 "Wiersze zaczynające się od „%c� zostaną wycięte.\n"
 
-#: builtin/branch.c:629
+#: builtin/branch.c:632
 msgid "Generic options"
 msgstr "Opcje ogólne"
 
-#: builtin/branch.c:631
+#: builtin/branch.c:634
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "pokaż skrót i temat; podaj dwukrotnie, aby wypisać gałąź nadrzędną"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:635
 msgid "suppress informational messages"
 msgstr "pomiń komunikaty informacyjne"
 
-#: builtin/branch.c:633
+#: builtin/branch.c:636
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "ustaw tryb śledzenia (zobacz git-pull(1))"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:638
 msgid "do not use"
 msgstr "nie używaj"
 
-#: builtin/branch.c:637 builtin/rebase.c:534
+#: builtin/branch.c:640
 msgid "upstream"
 msgstr "zdalne-repozytorium"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:640
 msgid "change the upstream info"
 msgstr "zmień gałąź nadrzędną"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:641
 msgid "unset the upstream info"
 msgstr "usuń informacje o gałęzi nadrzędnej"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:642
 msgid "use colored output"
 msgstr "użyj kolorowego wyjścia"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:643
 msgid "act on remote-tracking branches"
 msgstr "działaj na gałęziach śledzących"
 
-#: builtin/branch.c:642 builtin/branch.c:644
+#: builtin/branch.c:645 builtin/branch.c:647
 msgid "print only branches that contain the commit"
 msgstr "wypisz tylko gałęzie zawierające ten zapis"
 
-#: builtin/branch.c:643 builtin/branch.c:645
+#: builtin/branch.c:646 builtin/branch.c:648
 msgid "print only branches that don't contain the commit"
 msgstr "wypisz tylko gałęzie nie zawierające tego zapisu"
 
-#: builtin/branch.c:648
+#: builtin/branch.c:651
 msgid "Specific git-branch actions:"
 msgstr "Działania typowe dla git-branch:"
 
-#: builtin/branch.c:649
+#: builtin/branch.c:652
 msgid "list both remote-tracking and local branches"
 msgstr "wypisz i śledzące i lokalne gałęzie"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:654
 msgid "delete fully merged branch"
 msgstr "usuń całkowicie scaloną gałąź"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:655
 msgid "delete branch (even if not merged)"
 msgstr "usuń gałąź (nawet niescaloną)"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:656
 msgid "move/rename a branch and its reflog"
 msgstr "przenieś gałąź i jej dziennik referencji / zmień ich nazwę"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:657
 msgid "move/rename a branch, even if target exists"
 msgstr "przenieś gałąź / zmień jej nazwę, nawet jeśli cel istnieje"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:658
 msgid "copy a branch and its reflog"
 msgstr "skopiuj gałąź i jej dziennik referencji"
 
-#: builtin/branch.c:656
+#: builtin/branch.c:659
 msgid "copy a branch, even if target exists"
 msgstr "skopiuj gałąź, nawet jeśli cel istnieje"
 
-#: builtin/branch.c:657
+#: builtin/branch.c:660
 msgid "list branch names"
 msgstr "wypisz nazwy gałęzi"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:661
 msgid "show current branch name"
 msgstr "pokaż nazwę bieżącej gałęzi"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:662
 msgid "create the branch's reflog"
 msgstr "utwórz dziennik referencji gałęzi"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:664
 msgid "edit the description for the branch"
 msgstr "edytuj opis gałęzi"
 
-#: builtin/branch.c:662
+#: builtin/branch.c:665
 msgid "force creation, move/rename, deletion"
 msgstr "wymuś utworzenie, przeniesienie/zmianę nazwy, usunięcie"
 
-#: builtin/branch.c:663
+#: builtin/branch.c:666
 msgid "print only branches that are merged"
 msgstr "wypisz tylko scalone gałęzie"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:667
 msgid "print only branches that are not merged"
 msgstr "wypisz tylko niescalone gałęzie"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:668
 msgid "list branches in columns"
 msgstr "wypisz gałęzie w kolumnach"
 
-#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:466
+#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
+#: builtin/tag.c:475
 msgid "object"
 msgstr "obiekt"
 
-#: builtin/branch.c:668
+#: builtin/branch.c:671
 msgid "print only branches of the object"
 msgstr "wypisz tylko gałęzie obiektu"
 
-#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473
+#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
 msgid "sorting and filtering are case insensitive"
 msgstr "sortowanie i filtrowanie nie uwzględniają wielkości liter"
 
-#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471
+#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "format do użycia na wyjściu"
 
-#: builtin/branch.c:693 builtin/clone.c:790
+#: builtin/branch.c:696 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr "nie znaleziono HEAD w refs/heads!"
 
-#: builtin/branch.c:717
+#: builtin/branch.c:720
 msgid "--column and --verbose are incompatible"
 msgstr "--column i --verbose siÄ™ wykluczajÄ…"
 
-#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797
+#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
 msgid "branch name required"
 msgstr "wymagana nazwa gałęzi"
 
-#: builtin/branch.c:764
+#: builtin/branch.c:768
 msgid "Cannot give description to detached HEAD"
 msgstr "Nie można nadać opisu odłączonemu HEAD"
 
-#: builtin/branch.c:769
+#: builtin/branch.c:773
 msgid "cannot edit description of more than one branch"
 msgstr "nie można edytować opisu więcej niż jednej gałęzi"
 
-#: builtin/branch.c:776
+#: builtin/branch.c:780
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Jeszcze nie ma zapisów na gałęzi „%s�."
 
-#: builtin/branch.c:779
+#: builtin/branch.c:783
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Nie ma gałęzi „%s�."
 
-#: builtin/branch.c:794
+#: builtin/branch.c:798
 msgid "too many branches for a copy operation"
 msgstr "za dużo gałęzi do operacji kopiowania"
 
-#: builtin/branch.c:803
+#: builtin/branch.c:807
 msgid "too many arguments for a rename operation"
 msgstr "za dużo argumentów do operacji zmiany nazwy"
 
-#: builtin/branch.c:808
+#: builtin/branch.c:812
 msgid "too many arguments to set new upstream"
 msgstr "za dużo argumentów do ustawienia nadrzędnej gałęzi"
 
-#: builtin/branch.c:812
+#: builtin/branch.c:816
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11533,32 +12005,32 @@ msgstr ""
 "nie można ustawić gałęzi nadrzędnej HEAD na %s, kiedy nie wskazuje ono na "
 "gałąź."
 
-#: builtin/branch.c:815 builtin/branch.c:838
+#: builtin/branch.c:819 builtin/branch.c:842
 #, c-format
 msgid "no such branch '%s'"
 msgstr "nie ma takiej gałęzi „%s�"
 
-#: builtin/branch.c:819
+#: builtin/branch.c:823
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "gałąź „%s� nie istnieje"
 
-#: builtin/branch.c:832
+#: builtin/branch.c:836
 msgid "too many arguments to unset upstream"
 msgstr "za dużo argumentów do usunięcia nadrzędnej gałęzi"
 
-#: builtin/branch.c:836
+#: builtin/branch.c:840
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "nie można usunąć ustawienia gałęzi nadrzędnej HEAD, kiedy nie wskazuje ono "
 "żadnej gałęzi."
 
-#: builtin/branch.c:842
+#: builtin/branch.c:846
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Gałąź „%s� nie ma informacji o gałęzi nadrzędnej"
 
-#: builtin/branch.c:852
+#: builtin/branch.c:856
 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>?"
@@ -11566,7 +12038,7 @@ msgstr ""
 "Opcje -a i -r do „git branch� nie przyjmują nazwy gałęzi.\n"
 "Czy chodziło o: -a | -r --list <wzorzec>?"
 
-#: builtin/branch.c:856
+#: builtin/branch.c:860
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -11574,32 +12046,32 @@ msgstr ""
 "opcja „--set-upstream� jest przestarzała i nie jest już wspierana. Użyj "
 "zamiast tego „--track� lub �--set-upstream-to�."
 
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "wersja gita:\n"
 
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "uname() zawiodło z błędem „%s� (%d)\n"
 
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
 msgid "compiler info: "
 msgstr "informacje o kompilacji: "
 
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "informacje o bibliotece libc: "
 
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
 msgid "not run from a git repository - no hooks to show\n"
 msgstr "nie uruchomiono z repozytorium gita — brak skryptów do pokazania\n"
 
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory <plik>] [-s|--suffix <format>]"
 
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -11633,38 +12105,33 @@ msgstr ""
 "Przejrzyj resztę zgłoszenia błędu poniżej.\n"
 "Możesz usunąć wiersze, którymi nie chcesz się dzielić.\n"
 
-#: builtin/bugreport.c:135
+#: builtin/bugreport.c:108
 msgid "specify a destination for the bugreport file"
 msgstr "podaj cel pliku ze zgłoszeniem błędu"
 
-#: builtin/bugreport.c:137
+#: builtin/bugreport.c:110
 msgid "specify a strftime format suffix for the filename"
 msgstr "podaj sufiks w formacie strftime do nazwy pliku"
 
-#: builtin/bugreport.c:159
+#: builtin/bugreport.c:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "nie można utworzyć wiodących katalogów „%s�"
 
-#: builtin/bugreport.c:166
+#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "Informacje o systemie"
 
-#: builtin/bugreport.c:169
+#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "WÅ‚Ä…czone skrypty Gita"
 
-#: builtin/bugreport.c:176
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "nie można utworzyć nowego pliku w „%s�"
-
-#: builtin/bugreport.c:179
+#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "nie można pisać do %s"
 
-#: builtin/bugreport.c:189
+#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "Utworzono nowe zgłoszenie w „%s�.\n"
@@ -11685,27 +12152,27 @@ msgstr "git bundle list-heads <plik> [<referencja>...]"
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <plik> [<referencja>...]"
 
-#: builtin/bundle.c:67 builtin/pack-objects.c:3495
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
 msgid "do not show progress meter"
 msgstr "nie pokazuj wskaźnika postępu"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3497
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
 msgid "show progress meter"
 msgstr "pokazuj wskaźnik postępu"
 
-#: builtin/bundle.c:71 builtin/pack-objects.c:3499
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
 msgid "show progress meter during object writing phase"
 msgstr "pokaż miernik postępu podczas fazy zapisywania obiektów"
 
-#: builtin/bundle.c:74 builtin/pack-objects.c:3502
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "podobne do --all-progress, kiedy pokazany jest wskaźnik postępu"
 
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
 msgid "specify bundle format version"
 msgstr "podaj wersjÄ™ formatu wiÄ…zki"
 
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
 msgstr "Należy podać repozytorium, aby utworzyć wiązkę."
 
@@ -11713,25 +12180,25 @@ msgstr "Należy podać repozytorium, aby utworzyć wiązkę."
 msgid "do not show bundle details"
 msgstr "nie pokazuj szczegółów wiązki"
 
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s jest w porzÄ…dku\n"
 
-#: builtin/bundle.c:163
+#: builtin/bundle.c:182
 msgid "Need a repository to unbundle."
 msgstr "Potrzebne repozytorium do podzielenia."
 
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "więcej komunikatów; musi być umieszczone przed pod-poleceniem"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Rozpakowywanie obiektów"
 
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Nieznane pod-polecenie: %s"
 
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:622
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11739,7 +12206,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <rodzaj> | --textconv | --filters) [--path=<ścieżka>] <obiekt>"
 
-#: builtin/cat-file.c:599
+#: builtin/cat-file.c:623
 msgid ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
@@ -11747,73 +12214,73 @@ msgstr ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:644
 msgid "only one batch option may be specified"
 msgstr "można podać tylko jedną opcję wsadową „batch�"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<rodzaj> może być jednym z: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
 msgid "show object type"
 msgstr "pokaż typ obiektu"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
 msgid "show object size"
 msgstr "pokaż rozmiar obiektu"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
 msgid "exit with zero when there's no error"
 msgstr "zwróć zero, kiedy nie ma błędu"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
 msgid "pretty-print object's content"
 msgstr "ładnie wypisz zawartość obiektu"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
 msgid "for blob objects, run textconv on object's content"
 msgstr "dla obiektów blob, wykonaj textconv na zawartości obiektu"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
 msgid "for blob objects, run filters on object's content"
 msgstr "dla obiektów blob, wykonaj filtry na zawartości obiektu"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
 msgid "use a specific path for --textconv/--filters"
 msgstr "użyj podanej ścieżki do --textconv/--filters"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "zezwól, aby -s i -t działały z uszkodzonymi obiektami"
 
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
 msgid "buffer --batch output"
 msgstr "buforuj wyjście --batch"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "pokaż informacje i zawartość obiektów pobranych ze standardowego wejścia"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
 msgid "show info about objects fed from the standard input"
 msgstr "pokaż informacje o obiektach pobranych ze standardowego wejścia"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "podążaj za dowiązaniami w drzewie (do użycia z --batch lub --batch-check)"
 
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
 msgid "show all objects with --batch or --batch-check"
 msgstr "pokaż wszystkie obiekty z --batch lub --batch-check"
 
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:690
 msgid "do not order --batch-all-objects output"
 msgstr "nie porządkuj wyjścia --batch-all-objects"
 
@@ -11833,7 +12300,7 @@ msgstr "zgłaszaj wszystkie atrybuty ustawione na pliku"
 msgid "use .gitattributes only from the index"
 msgstr "użyj .gitattributes tylko z indeksu"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "wczytaj nazwy plików ze standardowego wejścia"
 
@@ -11841,8 +12308,8 @@ msgstr "wczytaj nazwy plików ze standardowego wejścia"
 msgid "terminate input and output records by a NUL character"
 msgstr "zakończ wpisy wejścia i wyjścia znakiem NUL"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
-#: builtin/worktree.c:489
+#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
+#: builtin/worktree.c:494
 msgid "suppress progress reporting"
 msgstr "nie zgłaszaj postępu"
 
@@ -11854,27 +12321,27 @@ msgstr "pokaż niepasujące ścieżki wejściowe"
 msgid "ignore index when checking"
 msgstr "pomiń indeks przy sprawdzaniu"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "nie można podać ścieżek z --stdin"
 
-#: builtin/check-ignore.c:166
+#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "-z ma sens tylko z --stdin"
 
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "nie podano ścieżki"
 
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet ma sens tylko z pojedynczą ścieżką"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "--quiet i --verbose siÄ™ wykluczajÄ…"
 
-#: builtin/check-ignore.c:177
+#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching ma sens tylko z --verbose"
 
@@ -11895,6 +12362,22 @@ msgstr "nie można przetworzyć kontaktu: %s"
 msgid "no contacts specified"
 msgstr "nie podano kontaktów"
 
+#: builtin/checkout--worker.c:110
+msgid "git checkout--worker [<options>]"
+msgstr "git checkout--worker [<opcje>]"
+
+#: 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
+msgid "string"
+msgstr "łańcuch"
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr "przy tworzeniu plików, dodaj <łańcuch> z przodu"
+
 #: builtin/checkout-index.c:152
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<opcje>] [--] [<plik>...]"
@@ -11903,96 +12386,85 @@ msgstr "git checkout-index [<opcje>] [--] [<plik>...]"
 msgid "stage should be between 1 and 3 or all"
 msgstr "przygotowanie powinno być pomiędzy 1 a 3 lub „all�"
 
-#: builtin/checkout-index.c:186
+#: builtin/checkout-index.c:187
 msgid "check out all files in the index"
 msgstr "wybierz wszystkie pliki z indeksu"
 
-#: builtin/checkout-index.c:187
+#: builtin/checkout-index.c:188
 msgid "force overwrite of existing files"
 msgstr "wymuś nadpisanie istniejących plików"
 
-#: builtin/checkout-index.c:189
+#: builtin/checkout-index.c:190
 msgid "no warning for existing files and files not in index"
 msgstr "nie ostrzegaj przed istniejÄ…cymi plikami i plikami nie w indeksie"
 
-#: builtin/checkout-index.c:191
+#: builtin/checkout-index.c:192
 msgid "don't checkout new files"
 msgstr "nie wybieraj nowych plików"
 
-#: builtin/checkout-index.c:193
+#: builtin/checkout-index.c:194
 msgid "update stat information in the index file"
 msgstr "zaktualizuj informacje stat w pliku indeksu"
 
-#: builtin/checkout-index.c:197
+#: builtin/checkout-index.c:198
 msgid "read list of paths from the standard input"
 msgstr "odczytaj listę ścieżek ze standardowego wejścia"
 
-#: builtin/checkout-index.c:199
+#: builtin/checkout-index.c:200
 msgid "write the content to temporary files"
 msgstr "zapisz zawartość do plików tymczasowych"
 
-#: builtin/checkout-index.c:200 builtin/column.c:31
-#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827
-#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333
-#: builtin/worktree.c:717
-msgid "string"
-msgstr "ciąg znaków"
-
-#: builtin/checkout-index.c:201
-msgid "when creating files, prepend <string>"
-msgstr "przy tworzeniu plików, dodaj <łańcuch> z przodu"
-
-#: builtin/checkout-index.c:203
+#: builtin/checkout-index.c:204
 msgid "copy out the files from named stage"
 msgstr "wykopiuj pliki z nazwanego przygotowania"
 
-#: builtin/checkout.c:31
+#: builtin/checkout.c:33
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<opcje>] <gałąź>"
 
-#: builtin/checkout.c:32
+#: builtin/checkout.c:34
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<opcje>] [<gałąź>] -- <plik>..."
 
-#: builtin/checkout.c:37
+#: builtin/checkout.c:39
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<opcje>] <gałąź>"
 
-#: builtin/checkout.c:42
+#: builtin/checkout.c:44
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<opcje>] [--source=<gałąź>] <plik>..."
 
-#: builtin/checkout.c:188 builtin/checkout.c:227
+#: builtin/checkout.c:190 builtin/checkout.c:229
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "ścieżka „%s� nie ma „naszej� wersji"
 
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:192 builtin/checkout.c:231
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "ścieżka „%s� nie ma „ich� wersji"
 
-#: builtin/checkout.c:206
+#: builtin/checkout.c:208
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "ścieżka „%s� nie ma wszystkich potrzebnych wersji"
 
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "ścieżka „%s� nie ma potrzebnych wersji"
 
-#: builtin/checkout.c:275
+#: builtin/checkout.c:278
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "ścieżka „%s�: nie można scalić"
 
-#: builtin/checkout.c:291
+#: builtin/checkout.c:294
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Nie można dodać wyniku scalenia dla „%s�"
 
-#: builtin/checkout.c:396
+#: builtin/checkout.c:411
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
@@ -12000,7 +12472,7 @@ msgstr[0] "Odtworzono %d konflikt scalenia"
 msgstr[1] "Odtworzono %d konflikty scalenia"
 msgstr[2] "Odtworzono %d konfliktów scalenia"
 
-#: builtin/checkout.c:401
+#: builtin/checkout.c:416
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
@@ -12008,7 +12480,7 @@ msgstr[0] "Zaktualizowano %d ścieżkę z %s"
 msgstr[1] "Zaktualizowano %d ścieżki z %s"
 msgstr[2] "Zaktualizowano %d ścieżek z %s"
 
-#: builtin/checkout.c:408
+#: builtin/checkout.c:423
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
@@ -12016,48 +12488,48 @@ msgstr[0] "Zaktualizowano %d ścieżkę z indeksu"
 msgstr[1] "Zaktualizowano %d ścieżki z indeksu"
 msgstr[2] "Zaktualizowano %d ścieżek z indeksu"
 
-#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437
-#: builtin/checkout.c:441
+#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
+#: builtin/checkout.c:456
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "Nie można użyć „%s� przy aktualizowaniu ścieżek"
 
-#: builtin/checkout.c:444 builtin/checkout.c:447
+#: builtin/checkout.c:459 builtin/checkout.c:462
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "„%s� i %s wykluczają się"
 
-#: builtin/checkout.c:451
+#: builtin/checkout.c:466
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Nie można jednocześnie zaktualizować ścieżek i przełączyć na gałąź „%s�."
 
-#: builtin/checkout.c:455
+#: builtin/checkout.c:470
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "nie podano ani „%s� ani „%s�"
 
-#: builtin/checkout.c:459
+#: builtin/checkout.c:474
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "należy użyć „%s�, jeśli nie podano „%s�"
 
-#: builtin/checkout.c:464 builtin/checkout.c:469
+#: builtin/checkout.c:479 builtin/checkout.c:484
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "nie można użyć „%s� ani „%s� z %s"
 
-#: builtin/checkout.c:543 builtin/checkout.c:550
+#: builtin/checkout.c:558 builtin/checkout.c:565
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "ścieżka „%s� jest niescalona"
 
-#: builtin/checkout.c:718
+#: builtin/checkout.c:736
 msgid "you need to resolve your current index first"
 msgstr "musisz najpierw rozwiązać bieżący indeks"
 
-#: builtin/checkout.c:772
+#: builtin/checkout.c:786
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12066,50 +12538,50 @@ msgstr ""
 "nie można kontynuować z przygotowanymi zmianami w następujących plikach:\n"
 "%s"
 
-#: builtin/checkout.c:865
+#: builtin/checkout.c:879
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "nie można wykonać reflog na „%s�: %s\n"
 
-#: builtin/checkout.c:907
+#: builtin/checkout.c:921
 msgid "HEAD is now at"
 msgstr "HEAD wskazuje teraz na"
 
-#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
+#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "nie można zaktualizować HEAD"
 
-#: builtin/checkout.c:915
+#: builtin/checkout.c:929
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Zresetuj gałąź „%s�\n"
 
-#: builtin/checkout.c:918
+#: builtin/checkout.c:932
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Już jesteś na „%s�\n"
 
-#: builtin/checkout.c:922
+#: builtin/checkout.c:936
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Przełączono na gałąź „%s� i zresetowano ją\n"
 
-#: builtin/checkout.c:924 builtin/checkout.c:1355
+#: builtin/checkout.c:938 builtin/checkout.c:1369
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Przełączono na nową gałąź „%s�\n"
 
-#: builtin/checkout.c:926
+#: builtin/checkout.c:940
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Przełączono na gałąź „%s�\n"
 
-#: builtin/checkout.c:977
+#: builtin/checkout.c:991
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... i %d innych.\n"
 
-#: builtin/checkout.c:983
+#: builtin/checkout.c:997
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12137,7 +12609,7 @@ msgstr[2] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1002
+#: builtin/checkout.c:1016
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12170,19 +12642,19 @@ msgstr[2] ""
 " git branch <nazwa-nowej-gałęzi> %s\n"
 "\n"
 
-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1051
 msgid "internal error in revision walk"
 msgstr "wewnętrzny błąd w przechodzeniu rewizji"
 
-#: builtin/checkout.c:1041
+#: builtin/checkout.c:1055
 msgid "Previous HEAD position was"
 msgstr "Poprzednim wskazaniem HEAD było"
 
-#: builtin/checkout.c:1081 builtin/checkout.c:1350
+#: builtin/checkout.c:1095 builtin/checkout.c:1364
 msgid "You are on a branch yet to be born"
 msgstr "Jesteś na gałęzi, która dopiero ma powstać"
 
-#: builtin/checkout.c:1163
+#: builtin/checkout.c:1177
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12191,7 +12663,7 @@ msgstr ""
 "„%s� może być jednocześnie lokalnym plikiem i gałęzią śledzącą.\n"
 "Użyj -- (i opcjonalnie --no-guess), żeby ujednoznacznić"
 
-#: builtin/checkout.c:1170
+#: builtin/checkout.c:1184
 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"
@@ -12211,51 +12683,51 @@ msgstr ""
 "<nazw> preferowały jedno zdalne repozytorium, rozważ ustawienie\n"
 "checkout.defaultRemote=origin w swoich ustawieniach."
 
-#: builtin/checkout.c:1180
+#: builtin/checkout.c:1194
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "„%s� pasuje do wielu (%d) gałęzi śledzących"
 
-#: builtin/checkout.c:1246
+#: builtin/checkout.c:1260
 msgid "only one reference expected"
 msgstr "oczekiwano tylko jednej referencji"
 
-#: builtin/checkout.c:1263
+#: builtin/checkout.c:1277
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "oczekiwano tylko jednej referencji, podano %d."
 
-#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
+#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
 #, c-format
 msgid "invalid reference: %s"
 msgstr "nieprawidłowa referencja: %s"
 
-#: builtin/checkout.c:1322 builtin/checkout.c:1688
+#: builtin/checkout.c:1336 builtin/checkout.c:1705
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "referencja nie jest drzewem: %s"
 
-#: builtin/checkout.c:1369
+#: builtin/checkout.c:1383
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "oczekiwano gałęzi, otrzymano tag „%s�"
 
-#: builtin/checkout.c:1371
+#: builtin/checkout.c:1385
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "oczekiwano gałęzi, otrzymano zdalną gałąź „%s�"
 
-#: builtin/checkout.c:1372 builtin/checkout.c:1380
+#: builtin/checkout.c:1386 builtin/checkout.c:1394
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "oczekiwano gałęzi, otrzymano „%s�"
 
-#: builtin/checkout.c:1375
+#: builtin/checkout.c:1389
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "oczekiwano gałęzi, otrzymano zapis „%s�"
 
-#: builtin/checkout.c:1391
+#: builtin/checkout.c:1405
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12263,7 +12735,7 @@ msgstr ""
 "Nie można przełączyć gałęzi w trakcie scalania\n"
 "Rozważ „git merge --quit� lub „git worktree add�."
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1409
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12271,7 +12743,7 @@ msgstr ""
 "Nie można przełączyć gałęzi w trakcie sesji am\n"
 "Rozważ „git am --quit� lub „git worktree add�."
 
-#: builtin/checkout.c:1399
+#: builtin/checkout.c:1413
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12279,7 +12751,7 @@ msgstr ""
 "Nie można przełączyć gałęzi w trakcie przestawiania\n"
 "Rozważ „git rebase --quit� lub „git worktree add�."
 
-#: builtin/checkout.c:1403
+#: builtin/checkout.c:1417
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12287,7 +12759,7 @@ msgstr ""
 "Nie można przełączyć gałęzi w trakcie dobierania\n"
 "Rozważ „git cherry-pick --quit� lub „git worktree add�."
 
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1421
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12295,137 +12767,137 @@ msgstr ""
 "Nie można przełączyć gałęzi w trakcie odwracania\n"
 "Rozważ „git revert --quit� lub „git worktree add�."
 
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1425
 msgid "you are switching branch while bisecting"
 msgstr "zmiana gałęzi w trakcie przeszukiwania"
 
-#: builtin/checkout.c:1418
+#: builtin/checkout.c:1432
 msgid "paths cannot be used with switching branches"
 msgstr "ścieżki nie mogą być podane z przełączaniem gałęzi"
 
-#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
+#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
 #, c-format
 msgid "'%s' cannot be used with switching branches"
-msgstr "„%s� nie może być użyte z przełączaniem gałęzi"
+msgstr "„%s� nie można użyć z przełączaniem gałęzi"
 
-#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
-#: builtin/checkout.c:1444 builtin/checkout.c:1449
+#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
+#: builtin/checkout.c:1458 builtin/checkout.c:1463
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "„%s� i „%s� wykluczają się"
 
-#: builtin/checkout.c:1446
+#: builtin/checkout.c:1460
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "„%s� nie może przyjąć <punktu-startowego>"
 
-#: builtin/checkout.c:1454
+#: builtin/checkout.c:1468
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Nie można przełączyć gałęzi na nie-zapis „%s�"
 
-#: builtin/checkout.c:1461
+#: builtin/checkout.c:1475
 msgid "missing branch or commit argument"
 msgstr "brakuje argumentu gałęzi lub zapisu"
 
-#: builtin/checkout.c:1504
+#: builtin/checkout.c:1518
 msgid "perform a 3-way merge with the new branch"
 msgstr "dokonaj trójstronnego scalenia z nową gałęzią"
 
-#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
+#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
 msgid "style"
 msgstr "styl"
 
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1520
 msgid "conflict style (merge or diff3)"
 msgstr "styl konfliktów (merge lub diff3)"
 
-#: builtin/checkout.c:1518 builtin/worktree.c:486
+#: builtin/checkout.c:1532 builtin/worktree.c:489
 msgid "detach HEAD at named commit"
 msgstr "odłącz HEAD na podanym zapisie"
 
-#: builtin/checkout.c:1519
+#: builtin/checkout.c:1533
 msgid "set upstream info for new branch"
 msgstr "ustaw gałąź nadrzędną nowej gałęzi"
 
-#: builtin/checkout.c:1521
+#: builtin/checkout.c:1535
 msgid "force checkout (throw away local modifications)"
 msgstr "wymuś wybranie (wyrzuć lokalne zmiany)"
 
-#: builtin/checkout.c:1523
+#: builtin/checkout.c:1537
 msgid "new-branch"
 msgstr "nowa-gałąź"
 
-#: builtin/checkout.c:1523
+#: builtin/checkout.c:1537
 msgid "new unparented branch"
 msgstr "nowa gałąź bez rodzica"
 
-#: builtin/checkout.c:1525 builtin/merge.c:301
+#: builtin/checkout.c:1539 builtin/merge.c:302
 msgid "update ignored files (default)"
 msgstr "aktualizuj ignorowane pliki (domyślnie)"
 
-#: builtin/checkout.c:1528
+#: builtin/checkout.c:1542
 msgid "do not check if another worktree is holding the given ref"
 msgstr "nie sprawdzaj, czy inne drzewo robocze trzyma podanÄ… referencjÄ™"
 
-#: builtin/checkout.c:1541
+#: builtin/checkout.c:1555
 msgid "checkout our version for unmerged files"
 msgstr "wybierz „naszą� wersję niescalonych plików"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "checkout their version for unmerged files"
 msgstr "wybierz „ich� wersję niescalonych plików"
 
-#: builtin/checkout.c:1548
+#: builtin/checkout.c:1562
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "nie ograniczaj ścieżek tylko do rzadkich elementów"
 
-#: builtin/checkout.c:1603
+#: builtin/checkout.c:1620
 #, c-format
 msgid "-%c, -%c and --orphan are mutually exclusive"
 msgstr "-%c, -%c i --orphan siÄ™ wykluczajÄ…"
 
-#: builtin/checkout.c:1607
+#: builtin/checkout.c:1624
 msgid "-p and --overlay are mutually exclusive"
 msgstr "-p i --overlay siÄ™ wykluczajÄ…"
 
-#: builtin/checkout.c:1644
+#: builtin/checkout.c:1661
 msgid "--track needs a branch name"
 msgstr "--track potrzebuje nazwy gałęzi"
 
-#: builtin/checkout.c:1649
+#: builtin/checkout.c:1666
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "brakuje nazwy gałęzi; spróbuj -%c"
 
-#: builtin/checkout.c:1681
+#: builtin/checkout.c:1698
 #, c-format
 msgid "could not resolve %s"
 msgstr "nie można rozwiązać %s"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1714
 msgid "invalid path specification"
 msgstr "nieprawidłowa ścieżka"
 
-#: builtin/checkout.c:1704
+#: builtin/checkout.c:1721
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "„%s� nie jest zapisem, a nie można z niego utworzyć gałęzi „%s�"
 
-#: builtin/checkout.c:1708
+#: builtin/checkout.c:1725
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach nie przyjmuje argumentu ścieżki „%s�"
 
-#: builtin/checkout.c:1717
+#: builtin/checkout.c:1734
 msgid "--pathspec-from-file is incompatible with --detach"
 msgstr "--pathspec-from-file i --detach siÄ™ wykluczajÄ…"
 
-#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
+#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
 msgid "--pathspec-from-file is incompatible with --patch"
 msgstr "--pathspec-from-file i --patch siÄ™ wykluczajÄ…"
 
-#: builtin/checkout.c:1733
+#: builtin/checkout.c:1750
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -12433,70 +12905,71 @@ msgstr ""
 "git checkout: --ours/--theirs, --force i --merge siÄ™ wykluczajÄ…, gdy\n"
 "wybieranie z indeksu."
 
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1755
 msgid "you must specify path(s) to restore"
 msgstr "musisz podać ścieżkę (ścieżki) do przywrócenia"
 
-#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
-#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
-#: builtin/worktree.c:484
+#: 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
 msgid "branch"
 msgstr "gałąź"
 
-#: builtin/checkout.c:1765
+#: builtin/checkout.c:1782
 msgid "create and checkout a new branch"
 msgstr "utwórz i wybierz nową gałąź"
 
-#: builtin/checkout.c:1767
+#: builtin/checkout.c:1784
 msgid "create/reset and checkout a branch"
 msgstr "utwórz/zresetuj i wybierz gałąź"
 
-#: builtin/checkout.c:1768
+#: builtin/checkout.c:1785
 msgid "create reflog for new branch"
 msgstr "utwórz dziennik referencji nowej gałęzi"
 
-#: builtin/checkout.c:1770
+#: builtin/checkout.c:1787
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "spróbuj zgadnąć „git checkout <nieistniejąca-gałąź>� (domyślnie)"
 
-#: builtin/checkout.c:1771
+#: builtin/checkout.c:1788
 msgid "use overlay mode (default)"
 msgstr "użyj trybu nakładki (domyślnie)"
 
-#: builtin/checkout.c:1816
+#: builtin/checkout.c:1833
 msgid "create and switch to a new branch"
 msgstr "utwórz i przełącz na nową gałąź"
 
-#: builtin/checkout.c:1818
+#: builtin/checkout.c:1835
 msgid "create/reset and switch to a branch"
 msgstr "utwórz/zresetuj i przełącz na gałąź"
 
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1837
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "spróbuj zgadnąć „git switch <nieistniejąca-gałąź>�"
 
-#: builtin/checkout.c:1822
+#: builtin/checkout.c:1839
 msgid "throw away local modifications"
 msgstr "wyrzuć lokalne zmiany"
 
-#: builtin/checkout.c:1856
+#: builtin/checkout.c:1873
 msgid "which tree-ish to checkout from"
 msgstr "z którego drzewa wybrać"
 
-#: builtin/checkout.c:1858
+#: builtin/checkout.c:1875
 msgid "restore the index"
 msgstr "przywróć indeks"
 
-#: builtin/checkout.c:1860
+#: builtin/checkout.c:1877
 msgid "restore the working tree (default)"
 msgstr "przywróć drzewo robocze (domyślnie)"
 
-#: builtin/checkout.c:1862
+#: builtin/checkout.c:1879
 msgid "ignore unmerged entries"
 msgstr "pomiń niescalone elementy"
 
-#: builtin/checkout.c:1863
+#: builtin/checkout.c:1880
 msgid "use overlay mode"
 msgstr "użyj trybu nakładki"
 
@@ -12526,17 +12999,12 @@ msgstr "Pomijanie repozytorium %s\n"
 msgid "Would skip repository %s\n"
 msgstr "Pominięto by repozytorium %s\n"
 
-#: builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr "nie można usunąć %s"
-
 #: builtin/clean.c:38
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "nie można wykonać lstat na %s\n"
 
-#: builtin/clean.c:302 git-add--interactive.perl:593
+#: builtin/clean.c:300 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12549,7 +13017,7 @@ msgstr ""
 "foo        - wybierz element po unikatowym poczÄ…tku\n"
 "           - (puste) nic nie wybiera\n"
 
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:304 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12570,33 +13038,33 @@ msgstr ""
 "*          - wybierz wszystko\n"
 "           - (puste) zakończ zaznaczanie\n"
 
-#: builtin/clean.c:521 git-add--interactive.perl:568
+#: builtin/clean.c:519 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:661
+#: builtin/clean.c:659
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Wprowadź wzorce ignorowania>> "
 
-#: builtin/clean.c:696
+#: builtin/clean.c:693
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "Ostrzeżenie: Nie znaleziono elementów pasujących do: %s"
 
-#: builtin/clean.c:717
+#: builtin/clean.c:714
 msgid "Select items to delete"
 msgstr "Wybierz elementy do skasowania"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:755
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Usunąć %s [y/N]? "
 
-#: builtin/clean.c:789
+#: builtin/clean.c:786
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12614,53 +13082,53 @@ msgstr ""
 "help                - ten ekran\n"
 "?                   - pomoc do zachęty wyboru"
 
-#: builtin/clean.c:825
+#: builtin/clean.c:822
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Usunięto by następujący element:"
 msgstr[1] "Usunięto by następujące elementy:"
 msgstr[2] "Usunięto by następujące elementy:"
 
-#: builtin/clean.c:841
+#: builtin/clean.c:838
 msgid "No more files to clean, exiting."
 msgstr "Brak plików do wyczyszczenia, wyjście."
 
-#: builtin/clean.c:903
+#: builtin/clean.c:900
 msgid "do not print names of files removed"
 msgstr "nie wypisuj nazw usuwanym plików"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:902
 msgid "force"
 msgstr "wymuÅ›"
 
-#: builtin/clean.c:906
+#: builtin/clean.c:903
 msgid "interactive cleaning"
 msgstr "interaktywne czyszczenie"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:905
 msgid "remove whole directories"
 msgstr "usuwaj całe katalogi"
 
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:906 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/show-ref.c:179
 msgid "pattern"
 msgstr "wzorzec"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:907
 msgid "add <pattern> to ignore rules"
 msgstr "dodaj <wzorzec> do reguł ignorowania"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:908
 msgid "remove ignored files, too"
 msgstr "usuń też ignorowane pliki"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:910
 msgid "remove only ignored files"
 msgstr "usuń tylko ignorowane pliki"
 
-#: builtin/clean.c:929
+#: builtin/clean.c:925
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -12668,7 +13136,7 @@ msgstr ""
 "clean.requireForce ustawione na true, a nie podano -i, -n ani -f; odmawiam "
 "czyszczenia"
 
-#: builtin/clean.c:932
+#: builtin/clean.c:928
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -12676,7 +13144,7 @@ msgstr ""
 "clean.requireForce to domyślnie true, a nie podano -i, -n ani -f; odmawiam "
 "czyszczenia"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:940
 msgid "-x and -X cannot be used together"
 msgstr "-x i -X wykluczajÄ… siÄ™"
 
@@ -12684,208 +13152,206 @@ msgstr "-x i -X wykluczajÄ… siÄ™"
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opcje>] [--] <repozytorium> [<katalog>]"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr "nie klonuj płytkiego repozytorium"
+
+#: builtin/clone.c:98
 msgid "don't create a checkout"
 msgstr "nie wybieraj plików"
 
-#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "utwórz suche repozytorium"
 
-#: builtin/clone.c:99
+#: builtin/clone.c:103
 msgid "create a mirror repository (implies bare)"
 msgstr "utwórz lustrzane repozytorium (zakłada suche)"
 
-#: builtin/clone.c:101
+#: builtin/clone.c:105
 msgid "to clone from a local repository"
 msgstr "aby sklonować z lokalnego repozytorium"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:107
 msgid "don't use local hardlinks, always copy"
 msgstr "nie używaj twardych dowiązań, zawsze kopiuj"
 
-#: builtin/clone.c:105
+#: builtin/clone.c:109
 msgid "setup as shared repository"
 msgstr "ustaw jako repozytorium dzielone"
 
-#: builtin/clone.c:107
+#: builtin/clone.c:111
 msgid "pathspec"
 msgstr "ścieżka"
 
-#: builtin/clone.c:107
+#: builtin/clone.c:111
 msgid "initialize submodules in the clone"
-msgstr "zainicjuj pod-moduły w klonie"
+msgstr "zainicjuj podmoduły w klonie"
 
-#: builtin/clone.c:111
+#: builtin/clone.c:115
 msgid "number of submodules cloned in parallel"
-msgstr "liczba pod-modułów klonowanych równolegle"
+msgstr "liczba podmodułów klonowanych równolegle"
 
-#: builtin/clone.c:112 builtin/init-db.c:552
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "katalog-szablonów"
 
-#: builtin/clone.c:113 builtin/init-db.c:553
+#: builtin/clone.c:117 builtin/init-db.c:540
 msgid "directory from which templates will be used"
 msgstr "katalog, z którego zostaną użyte szablony"
 
-#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
-#: builtin/submodule--helper.c:2336
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
 msgid "reference repository"
 msgstr "repozytorium odniesienia"
 
-#: builtin/clone.c:119 builtin/submodule--helper.c:1833
-#: builtin/submodule--helper.c:2338
+#: builtin/clone.c:123 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:2515
 msgid "use --reference only while cloning"
 msgstr "użyj --reference tylko podczas klonowania"
 
-#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
+#: 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
+#: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "nazwa"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:125
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "użyj <nazwy> zamiast „origin�, żeby śledzić zdalne repozytorium"
 
-#: builtin/clone.c:123
+#: builtin/clone.c:127
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "wybierz <gałąź> zamiast zdalnego HEAD"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:129
 msgid "path to git-upload-pack on the remote"
 msgstr "ścieżka do git-upload-pack na zdalnej maszynie"
 
-#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/pull.c:212
 msgid "depth"
 msgstr "głębokość"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:131
 msgid "create a shallow clone of that depth"
 msgstr "utwórz płytki klon o tej głębokości"
 
-#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
 msgid "time"
 msgstr "czas"
 
-#: builtin/clone.c:129
+#: builtin/clone.c:133
 msgid "create a shallow clone since a specific time"
 msgstr "utwórz płytki klon od podanego czasu"
 
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
+#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
 msgid "revision"
 msgstr "rewizja"
 
-#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "pogłęb historię płytkiego klonu pomijając rewizję"
 
-#: builtin/clone.c:133 builtin/submodule--helper.c:1843
-#: builtin/submodule--helper.c:2352
+#: builtin/clone.c:137 builtin/submodule--helper.c:1882
+#: builtin/submodule--helper.c:2529
 msgid "clone only one branch, HEAD or --branch"
 msgstr "sklonuj tylko jedną gałąź, HEAD lub --branch"
 
-#: builtin/clone.c:135
+#: builtin/clone.c:139
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 "nie klonuj żadnych tagów, i spraw, by późniejsze pobrania za nimi nie "
 "podążały"
 
-#: builtin/clone.c:137
+#: builtin/clone.c:141
 msgid "any cloned submodules will be shallow"
-msgstr "wszystkie sklonowane pod-moduły będą płytkie"
+msgstr "wszystkie sklonowane podmoduły będą płytkie"
 
-#: builtin/clone.c:138 builtin/init-db.c:561
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "katalog-gita"
 
-#: builtin/clone.c:139 builtin/init-db.c:562
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "oddziel katalog gita od drzewa roboczego"
 
-#: builtin/clone.c:140
+#: builtin/clone.c:144
 msgid "key=value"
 msgstr "klucz=wartość"
 
-#: builtin/clone.c:141
+#: builtin/clone.c:145
 msgid "set config inside the new repository"
 msgstr "ustaw konfiguracjÄ™ w nowym repozytorium"
 
-#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "zależne-od-serwera"
 
-#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr "nadaj opcjÄ™"
 
-#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
-#: builtin/push.c:585
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "używaj tylko adresów IPv4"
 
-#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
-#: builtin/push.c:587
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "używaj tylko adresów IPv6"
 
-#: builtin/clone.c:150
+#: builtin/clone.c:154
 msgid "any cloned submodules will use their remote-tracking branch"
-msgstr "wszystkie sklonowane pod-moduły będą używały swoich gałęzi śledzących"
+msgstr "wszystkie sklonowane podmoduły będą używały swoich gałęzi śledzących"
 
-#: builtin/clone.c:152
+#: builtin/clone.c:156
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr ""
 "zainicjuj plik rzadkiego wybrania, żeby zawierał tylko pliki w korzeniu"
 
-#: builtin/clone.c:288
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Nie można zgadnąć nazwy katalogu.\n"
-"Podaj katalog w wierszu poleceń"
-
-#: builtin/clone.c:341
+#: builtin/clone.c:231
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: Nie można dodać alternatywnego obiektu do „%s�: %s\n"
 
-#: builtin/clone.c:414
+#: builtin/clone.c:304
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s istnieje i nie jest katalogiem"
 
-#: builtin/clone.c:432
+#: builtin/clone.c:322
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "nie można rozpocząć iteracji po „%s�"
 
-#: builtin/clone.c:463
+#: builtin/clone.c:353
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "nie można utworzyć dowiązania „%s�"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "nie można skopiować pliku do „%s�"
 
-#: builtin/clone.c:472
+#: builtin/clone.c:362
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "nie można iterować po „%s�"
 
-#: builtin/clone.c:499
+#: builtin/clone.c:389
 #, c-format
 msgid "done.\n"
 msgstr "gotowe.\n"
 
-#: builtin/clone.c:513
+#: builtin/clone.c:403
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -12895,149 +13361,153 @@ msgstr ""
 "Możesz zobaczyć, co zostało wybrane w „git status�\n"
 "i ponowić przez „git restore --source=HEAD :/�\n"
 
-#: builtin/clone.c:590
+#: builtin/clone.c:480
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Nie znaleziono zdalnej gałęzi %s do sklonowania."
 
-#: builtin/clone.c:709
+#: builtin/clone.c:597
 #, c-format
 msgid "unable to update %s"
 msgstr "nie można zaktualizować %s"
 
-#: builtin/clone.c:757
+#: builtin/clone.c:645
 msgid "failed to initialize sparse-checkout"
 msgstr "nie można zainicjować rzadkiego wybrania"
 
-#: builtin/clone.c:780
+#: builtin/clone.c:668
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "zdalne HEAD wskazuje nieistniejącą referencję, nie można wybrać.\n"
 
-#: builtin/clone.c:812
+#: builtin/clone.c:701
 msgid "unable to checkout working tree"
 msgstr "nie można wybrać drzewa roboczego"
 
-#: builtin/clone.c:887
+#: builtin/clone.c:779
 msgid "unable to write parameters to config file"
 msgstr "nie można zapisać parametrów do pliku konfiguracyjnego"
 
-#: builtin/clone.c:950
+#: builtin/clone.c:842
 msgid "cannot repack to clean up"
 msgstr "nie można przepakować, żeby posprzątać"
 
-#: builtin/clone.c:952
+#: builtin/clone.c:844
 msgid "cannot unlink temporary alternates file"
 msgstr "nie można wykonać unlink na tymczasowym pliku alternatywnych położeń"
 
-#: builtin/clone.c:993 builtin/receive-pack.c:2493
+#: builtin/clone.c:886 builtin/receive-pack.c:2493
 msgid "Too many arguments."
 msgstr "Zbyt dużo argumentów."
 
-#: builtin/clone.c:997
+#: builtin/clone.c:890
 msgid "You must specify a repository to clone."
 msgstr "Musisz określić repozytorium do sklonowania."
 
-#: builtin/clone.c:1010
+#: builtin/clone.c:903
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "opcje --bare i --origin %s wykluczajÄ… siÄ™."
 
-#: builtin/clone.c:1013
+#: builtin/clone.c:906
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare i --separate-git-dir siÄ™ wykluczajÄ…."
 
-#: builtin/clone.c:1026
+#: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "repozytorium „%s� nie istnieje"
 
-#: builtin/clone.c:1030 builtin/fetch.c:1951
+#: builtin/clone.c:924 builtin/fetch.c:2029
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "głębokość %s nie jest liczbą dodatnią"
 
-#: builtin/clone.c:1040
+#: builtin/clone.c:934
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "docelowa ścieżka „%s� już istnieje i nie jest pustym katalogiem."
 
-#: builtin/clone.c:1046
+#: builtin/clone.c:940
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr "ścieżka repozytorium „%s� już istnieje i nie jest pustym katalogiem."
 
-#: builtin/clone.c:1060
+#: builtin/clone.c:954
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "drzewo robocze „%s� już istnieje."
 
-#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
-#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
+#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "nie można utworzyć wiodących katalogów „%s�"
 
-#: builtin/clone.c:1080
+#: builtin/clone.c:974
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "nie można utworzyć katalogu drzewa roboczego „%s�"
 
-#: builtin/clone.c:1100
+#: builtin/clone.c:994
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klonowanie do suchego repozytorium „%s�...\n"
 
-#: builtin/clone.c:1102
+#: builtin/clone.c:996
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klonowanie do „%s�...\n"
 
-#: builtin/clone.c:1126
+#: builtin/clone.c:1025
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr "clone --recursive nie pasuje do --reference ani do --reference-if-able"
 
-#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "„%s� nie jest prawidłową nazwą zdalnego repozytorium"
 
-#: builtin/clone.c:1211
+#: builtin/clone.c:1121
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth jest ignorowana w lokalnych klonach; użyj zamiast tego file://"
 
-#: builtin/clone.c:1213
+#: builtin/clone.c:1123
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since jest ignorowana w lokalnych klonach; użyj zamiast tego "
 "file://"
 
-#: builtin/clone.c:1215
+#: builtin/clone.c:1125
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude jest ignorowane w lokalnych klonach; użyj zamiast tego "
 "file://"
 
-#: builtin/clone.c:1217
+#: builtin/clone.c:1127
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 "--filter jest ignorowany w lokalnych klonach; użyj zamiast tego file://"
 
-#: builtin/clone.c:1220
+#: builtin/clone.c:1132
 msgid "source repository is shallow, ignoring --local"
 msgstr "źródłowe repozytorium jest płytkie, ignorowanie --local"
 
-#: builtin/clone.c:1225
+#: builtin/clone.c:1137
 msgid "--local is ignored"
 msgstr "--local jest ignorowane"
 
-#: builtin/clone.c:1315 builtin/clone.c:1323
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr "zdalny transport zgłosił błąd"
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Nie znaleziono zdalnej gałęzi %s w repozytorium %s"
 
-#: builtin/clone.c:1326
+#: builtin/clone.c:1242
 msgid "You appear to have cloned an empty repository."
 msgstr "Wygląda na to, że sklonowano puste repozytorium."
 
@@ -13054,33 +13524,33 @@ msgid "layout to use"
 msgstr "układ do użycia"
 
 #: builtin/column.c:30
-msgid "Maximum width"
-msgstr "Maksymalna szerokość"
+msgid "maximum width"
+msgstr "maksymalna szerokość"
 
 #: builtin/column.c:31
-msgid "Padding space on left border"
-msgstr "Wyrównawczy odstęp przy lewej krawędzi"
+msgid "padding space on left border"
+msgstr "wyrównawczy odstęp przy lewej krawędzi"
 
 #: builtin/column.c:32
-msgid "Padding space on right border"
-msgstr "Wyrównawczy odstęp przy prawej krawędzi"
+msgid "padding space on right border"
+msgstr "wyrównawczy odstęp przy prawej krawędzi"
 
 #: builtin/column.c:33
-msgid "Padding space between columns"
-msgstr "Wyrównawczy odstęp między kolumnami"
+msgid "padding space between columns"
+msgstr "wyrównawczy odstęp między kolumnami"
 
 #: builtin/column.c:51
 msgid "--command must be the first argument"
 msgstr "--command musi być pierwszym argumentem"
 
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
 msgid ""
 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 "git commit-graph verify [--object-dir <katalog-obiektów>] [--shallow] [--"
 "[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13090,94 +13560,92 @@ msgstr ""
 "split[=<strategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <opcje podziału>"
 
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "nie znaleziono katalogu obiektów pasującego do „%s�"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768
+#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
 msgid "dir"
 msgstr "katalog"
 
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr "katalog obiektów do przechowania grafu"
 
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr "jeśli graf zapisów jest podzielony, zweryfikuj tylko plik czubka"
 
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Nie można otworzyć grafu zapisów „%s�"
 
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "nierozpoznany argument --split, %s"
 
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr "nieoczekiwany nieszesnastkowy identyfikator obiektu: %s"
 
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "nieprawidłowy obiekt: %s"
 
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
 msgid "start walk at all refs"
 msgstr "zacznij przechodzenie po wszystkich referencjach"
 
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "przeskanuj indeksy paczek wymienione na wejściu dla zapisów"
 
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
 msgid "start walk at commits listed by stdin"
 msgstr "zacznij przechodzenie od zapisów wypisanych na standardowym wejściu"
 
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
 msgstr "uwzględnij wszystkie zapisy już w pliku grafu zapisów"
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
 msgid "enable computation for changed paths"
 msgstr "włącz obliczanie zmienionych ścieżek"
 
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
 msgid "allow writing an incremental commit-graph file"
 msgstr "pozwól zapisać przyrostowy plik grafu zapisów"
 
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr "maksymalna liczba zapisów w niepodstawowym rozdzieleniu grafu zapisów"
 
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr ""
 "maksymalny stosunek pomiędzy dwoma poziomami rozdzielonego grafu zapisów"
 
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
 msgid "only expire files older than a given date-time"
 msgstr "wygaś tylko obiekty starsze niż podany czas"
 
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr "maksymalna liczba filtrów Blooma zmienionych ścieżek do obliczenia"
 
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "--reachable, --stdin-commits i --stdin-packs wykluczajÄ… siÄ™"
 
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
 msgid "Collecting commits from input"
 msgstr "Zbieranie zapisów z wejścia"
 
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "nieznane pod-polecenie: %s"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13191,70 +13659,65 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "zignorowano powtórzonego rodzica %s"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
 #, c-format
 msgid "not a valid object name %s"
 msgstr "nieprawidłowa nazwa obiektu %s"
 
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: nie można otworzyć „%s�"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree: nie można odczytać „%s�"
 
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree: nie można zamknąć „%s�"
 
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr "rodzic"
 
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "identyfikator obiektu zapisu rodzica"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
-#: builtin/tag.c:445
+#: 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/tag.c:454
 msgid "message"
 msgstr "komunikat"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1504
+#: builtin/commit-tree.c:113 builtin/commit.c:1626
 msgid "commit message"
 msgstr "komunikat zapisu"
 
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
 msgstr "odczytaj komunikat dziennika zapisu z pliku"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "podpisz zapis GPG"
 
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "należy podać tylko jedno drzewo"
 
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: nie można odczytać"
 
-#: builtin/commit.c:41
+#: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<opcje>] [--] <ścieżka>..."
 
-#: builtin/commit.c:46
+#: builtin/commit.c:47
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<opcje>] [--] <ścieżka>..."
 
-#: builtin/commit.c:51
+#: builtin/commit.c:52
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13264,7 +13727,7 @@ msgstr ""
 "Możesz powtórzyć polecenie z --allow-empty, lub usunąć ten zapis\n"
 "całkowicie przez „git reset HEAD^�.\n"
 
-#: builtin/commit.c:56
+#: builtin/commit.c:57
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -13279,15 +13742,15 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:63
+#: builtin/commit.c:64
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "W przeciwnym wypadku użyj „git rebase --skip�\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:67
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "W przeciwnym wypadku użyj „git cherry-pick --skip�\n"
 
-#: builtin/commit.c:69
+#: builtin/commit.c:70
 msgid ""
 "and then use:\n"
 "\n"
@@ -13309,73 +13772,73 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:312
+#: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
 msgstr "nie można rozpakować obiektu drzewa HEAD"
 
-#: builtin/commit.c:348
+#: builtin/commit.c:361
 msgid "--pathspec-from-file with -a does not make sense"
 msgstr "--pathspec-from-file i -a wykluczajÄ… siÄ™"
 
-#: builtin/commit.c:361
+#: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "Brak ścieżek z --include/--only nie ma sensu."
 
-#: builtin/commit.c:373
+#: builtin/commit.c:387
 msgid "unable to create temporary index"
 msgstr "nie można utworzyć tymczasowego indeksu"
 
-#: builtin/commit.c:382
+#: builtin/commit.c:396
 msgid "interactive add failed"
 msgstr "interaktywne dodawanie nie powiodło się"
 
-#: builtin/commit.c:397
+#: builtin/commit.c:411
 msgid "unable to update temporary index"
 msgstr "nie można zaktualizować tymczasowego indeksu"
 
-#: builtin/commit.c:399
+#: builtin/commit.c:413
 msgid "Failed to update main cache tree"
 msgstr "Nie można zaktualizować głównego drzewa pamięci podręcznej"
 
-#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
 msgid "unable to write new_index file"
 msgstr "nie można zapisać pliku new_index"
 
-#: builtin/commit.c:476
+#: builtin/commit.c:490
 msgid "cannot do a partial commit during a merge."
 msgstr "nie można złożyć częściowego zapisu w czasie scalania."
 
-#: builtin/commit.c:478
+#: builtin/commit.c:492
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "nie można złożyć częściowego zapisu w czasie dobierania."
 
-#: builtin/commit.c:480
+#: builtin/commit.c:494
 msgid "cannot do a partial commit during a rebase."
 msgstr "nie można złożyć częściowego zapisu w czasie przestawiania."
 
-#: builtin/commit.c:488
+#: builtin/commit.c:502
 msgid "cannot read the index"
 msgstr "nie można odczytać indeksu"
 
-#: builtin/commit.c:507
+#: builtin/commit.c:521
 msgid "unable to write temporary index file"
 msgstr "nie można zapisać tymczasowego pliku indeksu"
 
-#: builtin/commit.c:605
+#: builtin/commit.c:619
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "zapis „%s� nie ma nagłówka autora"
 
-#: builtin/commit.c:607
+#: builtin/commit.c:621
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "zapis „%s� ma nieprawidłowy wiersz autorstwa"
 
-#: builtin/commit.c:626
+#: builtin/commit.c:640
 msgid "malformed --author parameter"
 msgstr "nieprawidłowy parametr --author"
 
-#: builtin/commit.c:679
+#: builtin/commit.c:693
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -13383,38 +13846,81 @@ msgstr ""
 "nie można wybrać znaku komentarza, który nie jest użyty\n"
 "w bieżącym komunikacie zapisu"
 
-#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "nie odnaleziono zapisu %s"
 
-#: builtin/commit.c:729 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(czytanie komunikatu dziennika ze standardowego wejścia)\n"
 
-#: builtin/commit.c:731
+#: builtin/commit.c:761
 msgid "could not read log from standard input"
 msgstr "nie można odczytać dziennika ze standardowego wejścia"
 
-#: builtin/commit.c:735
+#: builtin/commit.c:765
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "nie można odczytać pliku dziennika „%s�"
 
-#: builtin/commit.c:766 builtin/commit.c:782
+#: builtin/commit.c:802
+#, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr "-m i --fixup siÄ™ wykluczajÄ…:%s"
+
+#: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
 msgstr "nie można odczytać SQUASH_MSG"
 
-#: builtin/commit.c:773
+#: builtin/commit.c:821
 msgid "could not read MERGE_MSG"
 msgstr "nie czytaj MERGE_MSG"
 
-#: builtin/commit.c:833
+#: builtin/commit.c:881
 msgid "could not write commit template"
 msgstr "nie można zapisać szablonu zapisu"
 
-#: builtin/commit.c:853
+#: builtin/commit.c:894
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr ""
+"Podaj komunikat zapisu swoich zmian. Wiersze zaczynajÄ…ce siÄ™\n"
+"od „%c� będą ignorowane.\n"
+
+#: builtin/commit.c:896
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Podaj komunikat zapisu swoich zmian. Wiersze zaczynajÄ…ce siÄ™\n"
+"od „%c� będą ignorowane, a pusty komunikat przerwie zapis.\n"
+
+#: builtin/commit.c:900
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Podaj komunikat zapisu swoich zmian. Wiersze zaczynajÄ…ce siÄ™\n"
+"od „%c� będą zachowane; możesz je sam(a) usunąć, jeśli chcesz.\n"
+
+#: builtin/commit.c:904
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Podaj komunikat zapisu swoich zmian. Wiersze zaczynajÄ…ce siÄ™\n"
+"od „%c� będą zachowane; możesz je sam(a) usunąć, jeśli chcesz.\n"
+"Pusty komunikat przerwie zapis.\n"
+
+#: builtin/commit.c:916
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -13428,7 +13934,7 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "i spróbuj ponownie.\n"
 
-#: builtin/commit.c:858
+#: builtin/commit.c:921
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -13442,165 +13948,175 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "i spróbuj ponownie.\n"
 
-#: builtin/commit.c:868
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"Podaj komunikat zapisu swoich zmian. Wiersze zaczynajÄ…ce siÄ™\n"
-"od „%c� będą ignorowane, a pusty komunikat przerwie zapis.\n"
-
-#: builtin/commit.c:876
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"Podaj komunikat zapisu swoich zmian. Wiersze zaczynajÄ…ce siÄ™\n"
-"od „%c� będą zachowane; możesz je sam(a) usunąć, jeśli chcesz.\n"
-"Pusty komunikat przerwie zapis.\n"
-
-#: builtin/commit.c:893
+#: builtin/commit.c:948
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:      %.*s <%.*s>"
 
-#: builtin/commit.c:901
+#: builtin/commit.c:956
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sData:      %s"
 
-#: builtin/commit.c:908
+#: builtin/commit.c:963
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sSkładający: %.*s <%.*s>"
 
-#: builtin/commit.c:926
+#: builtin/commit.c:981
 msgid "Cannot read index"
 msgstr "Nie można odczytać indeksu"
 
-#: builtin/commit.c:997
+#: builtin/commit.c:1026
+msgid "unable to pass trailers to --trailers"
+msgstr "nie można przekazać końcówek do --trailers"
+
+#: builtin/commit.c:1066
 msgid "Error building trees"
 msgstr "BÅ‚Ä…d budowania drzew"
 
-#: builtin/commit.c:1011 builtin/tag.c:308
+#: builtin/commit.c:1080 builtin/tag.c:317
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Należy podać komunikat przy użyciu opcji -m lub -F.\n"
 
-#: builtin/commit.c:1055
+#: builtin/commit.c:1124
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author „%s� nie jest postaci „Nazwa <e-mail>� i nie pasuje do istniejących "
 "twórców"
 
-#: builtin/commit.c:1069
+#: builtin/commit.c:1138
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Nieprawidłowy tryb pomijanych plików „%s�"
 
-#: builtin/commit.c:1087 builtin/commit.c:1331
+#: builtin/commit.c:1156 builtin/commit.c:1450
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Nieprawidłowy tryb nieśledzonych plików „%s�"
 
-#: builtin/commit.c:1127
+#: builtin/commit.c:1196
 msgid "--long and -z are incompatible"
 msgstr "--long i -z siÄ™ wykluczajÄ…"
 
-#: builtin/commit.c:1171
+#: builtin/commit.c:1227
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr "Jesteś w trakcie scalania — nie można przeredagować."
+
+#: builtin/commit.c:1229
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr "Jesteś w trakcie dobierania — nie można przeredagować."
+
+#: builtin/commit.c:1232
+#, c-format
+msgid "cannot combine reword option of --fixup with path '%s'"
+msgstr "nie można łączyć opcji przeredagowania w --fixup ze ścieżką „%s�"
+
+#: builtin/commit.c:1234
+msgid ""
+"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
+"all/--include/--only"
+msgstr ""
+"opcja przeredagowania w --fixup i --patch/--interactive/--all/--include/--"
+"only siÄ™ wykluczajÄ…"
+
+#: builtin/commit.c:1253
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Użycie jednoczenie --reset-author i --author nie ma sensu"
 
-#: builtin/commit.c:1180
+#: builtin/commit.c:1260
 msgid "You have nothing to amend."
 msgstr "Nie masz nic do poprawienia."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1263
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Jesteś w trakcie scalania — nie można poprawiać."
 
-#: builtin/commit.c:1185
+#: builtin/commit.c:1265
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Jesteś w trakcie dobierania — nie można poprawiać."
 
-#: builtin/commit.c:1187
+#: builtin/commit.c:1267
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "Jesteś w trakcie przestawiania — nie można poprawiać."
 
-#: builtin/commit.c:1190
+#: builtin/commit.c:1270
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Opcje --squash i --fixup siÄ™ wykluczajÄ…"
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1280
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "-c, -C, -F i --fixup siÄ™ wykluczajÄ…."
 
-#: builtin/commit.c:1202
+#: builtin/commit.c:1282
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "Opcje -m, -c, -C i -F siÄ™ wykluczajÄ…."
 
-#: builtin/commit.c:1211
+#: builtin/commit.c:1291
 msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr "--reset-author może być użyte tylko z -C, -c lub --amend."
+msgstr "--reset-author można użyć tylko z -C, -c lub --amend."
 
-#: builtin/commit.c:1229
+#: builtin/commit.c:1309
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "--include, --only, --all, --interactive i --patch siÄ™ wykluczajÄ…."
 
-#: builtin/commit.c:1235
+#: builtin/commit.c:1337
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "nieznana opcja: --fixup=%s:%s"
+
+#: builtin/commit.c:1354
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "ścieżki „%s ...� z -a nie mają sensu"
 
-#: builtin/commit.c:1366 builtin/commit.c:1527
+#: builtin/commit.c:1485 builtin/commit.c:1654
 msgid "show status concisely"
 msgstr "pokaż stan zwięźle"
 
-#: builtin/commit.c:1368 builtin/commit.c:1529
+#: builtin/commit.c:1487 builtin/commit.c:1656
 msgid "show branch information"
 msgstr "pokaż informacje o gałęzi"
 
-#: builtin/commit.c:1370
+#: builtin/commit.c:1489
 msgid "show stash information"
 msgstr "pokaż informacje o schowku"
 
-#: builtin/commit.c:1372 builtin/commit.c:1531
+#: builtin/commit.c:1491 builtin/commit.c:1658
 msgid "compute full ahead/behind values"
 msgstr "oblicz pełne wartości przed/w tyle"
 
-#: builtin/commit.c:1374
+#: builtin/commit.c:1493
 msgid "version"
 msgstr "wersja"
 
-#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
-#: builtin/worktree.c:679
+#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
+#: builtin/worktree.c:691
 msgid "machine-readable output"
 msgstr "wyjście czytelne dla maszyny"
 
-#: builtin/commit.c:1377 builtin/commit.c:1535
+#: builtin/commit.c:1496 builtin/commit.c:1662
 msgid "show status in long format (default)"
 msgstr "pokazuj stan w długim formacie (domyślnie)"
 
-#: builtin/commit.c:1380 builtin/commit.c:1538
+#: builtin/commit.c:1499 builtin/commit.c:1665
 msgid "terminate entries with NUL"
 msgstr "rozdziel elementy znakiem NUL"
 
-#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336
+#: 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
 msgid "mode"
 msgstr "tryb"
 
-#: builtin/commit.c:1383 builtin/commit.c:1541
+#: builtin/commit.c:1502 builtin/commit.c:1668
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "pokaż nieśledzone pliki, dodatkowe tryby: all, normal, no. (domyślnie all)"
 
-#: builtin/commit.c:1387
+#: builtin/commit.c:1506
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -13608,186 +14124,207 @@ msgstr ""
 "pokaż pomijane pliki, dodatkowe tryby: traditional, matching, no. (domyślnie "
 "traditional)"
 
-#: builtin/commit.c:1389 parse-options.h:192
+#: builtin/commit.c:1508 parse-options.h:192
 msgid "when"
 msgstr "kiedy"
 
-#: builtin/commit.c:1390
+#: builtin/commit.c:1509
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
-"pomiń zmiany w pod-modułach, możliwe <kiedy>: all, dirty, untracked. "
+"pomiń zmiany w podmodułach, możliwe <kiedy>: all, dirty, untracked. "
 "(domyślnie all)"
 
-#: builtin/commit.c:1392
+#: builtin/commit.c:1511
 msgid "list untracked files in columns"
 msgstr "wypisz nieśledzone pliki w kolumnach"
 
-#: builtin/commit.c:1393
+#: builtin/commit.c:1512
 msgid "do not detect renames"
 msgstr "nie wykrywaj zmian nazw"
 
-#: builtin/commit.c:1395
+#: builtin/commit.c:1514
 msgid "detect renames, optionally set similarity index"
 msgstr "wykryj zmiany nazw, opcjonalnie ustaw wskaźnik podobieństwa"
 
-#: builtin/commit.c:1415
+#: builtin/commit.c:1537
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Niewspierane połączenie argumentów o plikach nieśledzonych i pomijanych"
 
-#: builtin/commit.c:1497
+#: builtin/commit.c:1619
 msgid "suppress summary after successful commit"
 msgstr "pomiń podsumowanie po udanym zapisie"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1620
 msgid "show diff in commit message template"
 msgstr "pokaż różnice w szablonie komunikatu zapisu"
 
-#: builtin/commit.c:1500
+#: builtin/commit.c:1622
 msgid "Commit message options"
 msgstr "Opcje komunikatu zapisu"
 
-#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447
+#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
 msgid "read message from file"
 msgstr "odczytaj komunikat z pliku"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1624
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1624
 msgid "override author for commit"
 msgstr "nadpisz autora w zapisie"
 
-#: builtin/commit.c:1503 builtin/gc.c:550
+#: builtin/commit.c:1625 builtin/gc.c:550
 msgid "date"
 msgstr "data"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1625
 msgid "override date for commit"
 msgstr "nadpisz datÄ™ zapisu"
 
-#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
-#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90
+#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
+#: parse-options.h:327 ref-filter.h:92
 msgid "commit"
 msgstr "zapis"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1627
 msgid "reuse and edit message from specified commit"
 msgstr "użyj komunikatu jak w podanym zapisie i edytuj go"
 
-#: builtin/commit.c:1506
+#: builtin/commit.c:1628
 msgid "reuse message from specified commit"
 msgstr "użyj komunikatu jak w podanym zapisie"
 
-#: builtin/commit.c:1507
-msgid "use autosquash formatted message to fixup specified commit"
+#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
+#. and only translate <commit>.
+#.
+#: builtin/commit.c:1633
+msgid "[(amend|reword):]commit"
+msgstr "[(amend|reword):]zapis"
+
+#: builtin/commit.c:1633
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
-"użyj komunikatu automatycznego spłaszczania, mówiącego, aby naprawić podany "
-"zapis"
+"użyj komunikatu automatycznego spłaszczania, mówiącego, aby poprawić/"
+"przeredagować podany zapis"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1634
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "użyj komunikatu automatycznego spłaszczania, mówiącego, aby spłaszczyć "
 "podany zapis"
 
-#: builtin/commit.c:1509
+#: builtin/commit.c:1635
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "ten zapis jest teraz mojego autorstwa (do użycia z -C/-c/--amend)"
 
-#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "końcówka"
+
+#: builtin/commit.c:1636
+msgid "add custom trailer(s)"
+msgstr "dodaj niestandardowe końcówki"
+
+#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/pull.c:146 builtin/revert.c:110
 msgid "add a Signed-off-by trailer"
 msgstr "dodaj końcówkę Signed-off-by"
 
-#: builtin/commit.c:1511
+#: builtin/commit.c:1638
 msgid "use specified template file"
 msgstr "użyj określonego pliku szablonu"
 
-#: builtin/commit.c:1512
+#: builtin/commit.c:1639
 msgid "force edit of commit"
 msgstr "wymuÅ› edycjÄ™ zapisu"
 
-#: builtin/commit.c:1514
+#: builtin/commit.c:1641
 msgid "include status in commit message template"
 msgstr "uwzględnij status w szablonie komunikatu zapisu"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1646
 msgid "Commit contents options"
 msgstr "Opcje zawartości zapisu"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1647
 msgid "commit all changed files"
 msgstr "złóż wszystkie zmienione pliki"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1648
 msgid "add specified files to index for commit"
 msgstr "dodaj podane pliki do indeksu do złożenia"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1649
 msgid "interactively add files"
 msgstr "interaktywnie dodaj pliki"
 
-#: builtin/commit.c:1523
+#: builtin/commit.c:1650
 msgid "interactively add changes"
 msgstr "interaktywnie dodaj zmiany"
 
-#: builtin/commit.c:1524
+#: builtin/commit.c:1651
 msgid "commit only specified files"
 msgstr "złóż tylko podane pliki"
 
-#: builtin/commit.c:1525
+#: builtin/commit.c:1652
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "omiń skrypty pre-commit i commit-msg"
 
-#: builtin/commit.c:1526
+#: builtin/commit.c:1653
 msgid "show what would be committed"
 msgstr "pokaż, co byłoby złożone"
 
-#: builtin/commit.c:1539
+#: builtin/commit.c:1666
 msgid "amend previous commit"
 msgstr "popraw poprzedni zapis"
 
-#: builtin/commit.c:1540
+#: builtin/commit.c:1667
 msgid "bypass post-rewrite hook"
 msgstr "omiń skrypt post-rewrite"
 
-#: builtin/commit.c:1547
+#: builtin/commit.c:1674
 msgid "ok to record an empty change"
 msgstr "pozwól złożyć pustą zmianę"
 
-#: builtin/commit.c:1549
+#: builtin/commit.c:1676
 msgid "ok to record a change with an empty message"
 msgstr "pozwól złożyć zmianę z pustym komunikatem"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1752
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Uszkodzony plik MERGE_HEAD (%s)"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1759
 msgid "could not read MERGE_MODE"
 msgstr "nie można odczytać MERGE_MODE"
 
-#: builtin/commit.c:1650
+#: builtin/commit.c:1780
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "nie można odczytać komunikatu zapisu: %s"
 
-#: builtin/commit.c:1657
+#: builtin/commit.c:1787
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Przerwano składanie z powodu pustego komunikatu zapisu.\n"
 
-#: builtin/commit.c:1662
+#: builtin/commit.c:1792
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Przerywanie zapisu; nie wpisano komunikatu.\n"
 
-#: builtin/commit.c:1696
+#: builtin/commit.c:1803
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr "Przerwano składanie z powodu pustej treści komunikatu zapisu.\n"
+
+#: builtin/commit.c:1839
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -14039,15 +14576,15 @@ msgstr "tylko jeden plik konfiguracyjny na raz"
 
 #: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
-msgstr "--local może być użyty tylko w repozytorium gita"
+msgstr "--local można użyć tylko w repozytorium gita"
 
 #: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
-msgstr "--blob może być użyty tylko w repozytorium gita"
+msgstr "--blob można użyć tylko w repozytorium gita"
 
 #: builtin/config.c:662
 msgid "--worktree can only be used inside a git repository"
-msgstr "--worktree może być użyte tylko w repozytorium gita"
+msgstr "--worktree można użyć tylko w repozytorium gita"
 
 #: builtin/config.c:684
 msgid "$HOME not set"
@@ -14134,7 +14671,7 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "wypisz rozmiary w formacie czytelnym dla człowieka"
 
-#: builtin/credential-cache--daemon.c:226
+#: builtin/credential-cache--daemon.c:227
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -14147,15 +14684,15 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: builtin/credential-cache--daemon.c:275
+#: builtin/credential-cache--daemon.c:276
 msgid "print debugging messages to stderr"
 msgstr "wypisuj informacje diagnostyczne na stderr"
 
-#: builtin/credential-cache--daemon.c:315
+#: builtin/credential-cache--daemon.c:316
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr "credential-cache--daemon niedostępny; brak wsparcia dla gniazd uniksa"
 
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "credential-cache niedostępna; brak wsparcia dla gniazd uniksa"
 
@@ -14356,7 +14893,7 @@ msgstr "%s...%s: brak podstawy scalenia"
 msgid "Not a git repository"
 msgstr "To nie jest repozytorium gita"
 
-#: builtin/diff.c:532 builtin/grep.c:682
+#: builtin/diff.c:532 builtin/grep.c:698
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "podano nieprawidłowy obiekt „%s�."
@@ -14376,56 +14913,56 @@ msgstr "otrzymano nieobsługiwany obiekt „%s�."
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s: wiele podstaw scalenia, używanie %s"
 
-#: builtin/difftool.c:30
+#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opcje>] [<zapis> [<zapis>]] [--] [<ścieżka>...]"
 
-#: builtin/difftool.c:260
-#, c-format
-msgid "failed: %d"
-msgstr "nie powiodło się: %d"
-
-#: builtin/difftool.c:302
+#: builtin/difftool.c:293
 #, c-format
 msgid "could not read symlink %s"
 msgstr "nie można odczytać dowiązania symbolicznego %s"
 
-#: builtin/difftool.c:304
+#: builtin/difftool.c:295
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "nie można odczytać pliku dowiązania symbolicznego %s"
 
-#: builtin/difftool.c:312
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "nie można odczytać obiektu %s dowiązania symbolicznego %s"
 
-#: builtin/difftool.c:412
+#: builtin/difftool.c:427
 msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
 msgstr ""
 "złączone formaty różnic („-c� i „--cc�) nie są wspierane w\n"
 "trybie różnic katalogu („-d� i „--dir-diff�)."
 
-#: builtin/difftool.c:633
+#: builtin/difftool.c:632
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "oba pliki zmienione: „%s� i „%s�."
 
-#: builtin/difftool.c:635
+#: builtin/difftool.c:634
 msgid "working tree file has been left."
 msgstr "plik z drzewem roboczym został opuszczony."
 
-#: builtin/difftool.c:646
+#: builtin/difftool.c:645
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "istnieją tymczasowe pliki w „%s�."
 
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
 msgid "you may want to cleanup or recover these."
 msgstr "możesz chcieć je wyczyścić lub odzyskać."
 
+#: builtin/difftool.c:651
+#, c-format
+msgid "failed: %d"
+msgstr "nie powiodło się: %d"
+
 #: builtin/difftool.c:696
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "użyj „diff.guitool� zamiast „diff.tool�"
@@ -14456,7 +14993,7 @@ msgstr "wypisz listę narzędzi różnic możliwych do użycia z „--tool�"
 
 #: builtin/difftool.c:712
 msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr ""
 "niech „git-difftool� wyjdzie, kiedy wywołane narzędzie różnic zwróci "
@@ -14470,23 +15007,23 @@ msgstr "podaj niestandardowe polecenie do wyświetlania różnic"
 msgid "passed to `diff`"
 msgstr "przekazywane do „diff�"
 
-#: builtin/difftool.c:731
+#: builtin/difftool.c:732
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool wymaga drzewa roboczego lub --no-index"
 
-#: builtin/difftool.c:738
+#: builtin/difftool.c:739
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "--dir-diff i --no-index siÄ™ wykluczajÄ…"
 
-#: builtin/difftool.c:741
+#: builtin/difftool.c:742
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "--gui, --tool i --extcmd siÄ™ wykluczajÄ…"
 
-#: builtin/difftool.c:749
+#: builtin/difftool.c:750
 msgid "no <tool> given for --tool=<tool>"
 msgstr "nie podano <narzędzia> do --tool=<narzędzie>"
 
-#: builtin/difftool.c:756
+#: builtin/difftool.c:757
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "nie podano <polecenia> do --extcmd=<polecenie>"
 
@@ -14494,7 +15031,7 @@ msgstr "nie podano <polecenia> do --extcmd=<polecenie>"
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <opcje> <zmienna-środ>"
 
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
 msgid "type"
 msgstr "rodzaj"
 
@@ -14525,111 +15062,111 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [opcje-listy-rewizji]"
 
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:869
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 "Błąd: Nie można wyeksportować zagnieżdżonych tagów, jeśli nie podano --mark-"
 "tags."
 
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1178
 msgid "--anonymize-map token cannot be empty"
 msgstr "żeton --anonymize-map nie może być pusty"
 
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1198
 msgid "show progress after <n> objects"
 msgstr "pokaż wskaźnik postępu po <n> obiektach"
 
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1200
 msgid "select handling of signed tags"
 msgstr "wybierz traktowanie podpisanych tagów"
 
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1203
 msgid "select handling of tags that tag filtered objects"
 msgstr "wybierz traktowanie tagów przypisanych do filtrowanych obiektów"
 
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1206
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "wybierz traktowanie komunikatów zapisów w alternatywnym kodowaniu"
 
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1209
 msgid "dump marks to this file"
 msgstr "zrzuć znaczniki to tego pliku"
 
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1211
 msgid "import marks from this file"
 msgstr "wczytaj znaczniki z tego pliku"
 
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1215
 msgid "import marks from this file if it exists"
 msgstr "wczytaj znaczniki z tego pliku, jeśli istnieje"
 
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1217
 msgid "fake a tagger when tags lack one"
 msgstr "zmyśl tagującego w tagach, które go nie mają"
 
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1219
 msgid "output full tree for each commit"
 msgstr "wypisz pełne drzewo dla każdego zapisu"
 
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1221
 msgid "use the done feature to terminate the stream"
 msgstr "użyj funkcji done, żeby zakończyć strumień"
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1222
 msgid "skip output of blob data"
 msgstr "pomiń wypisywanie danych binarnych"
 
-#: builtin/fast-export.c:1222 builtin/log.c:1815
+#: builtin/fast-export.c:1223 builtin/log.c:1826
 msgid "refspec"
 msgstr "referencja"
 
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1224
 msgid "apply refspec to exported refs"
 msgstr "zastosuj referencjÄ™ do wyeksportowanych referencji"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1225
 msgid "anonymize output"
 msgstr "anonimizuj wyjście"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1226
 msgid "from:to"
 msgstr "od:do"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1227
 msgid "convert <from> to <to> in anonymized output"
 msgstr "zamień <z> na <na> w zanonimizowanym wyjściu"
 
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1230
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
 "odwołaj się do rodziców, którzy nie są w strumieniu szybkiego eksportu, "
 "według identyfikatora obiektu"
 
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1232
 msgid "show original object ids of blobs/commits"
 msgstr "pokaż pierwotne identyfikatory obiektów blobów/zapisów"
 
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1234
 msgid "label tags with mark ids"
 msgstr "oznacz tagi identyfikatorami znaczników"
 
-#: builtin/fast-export.c:1256
+#: builtin/fast-export.c:1257
 msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize nie ma sensu bez --anonymize"
+msgstr "--anonymize-map nie ma sensu bez --anonymize"
 
-#: builtin/fast-export.c:1271
+#: builtin/fast-export.c:1272
 msgid "Cannot pass both --import-marks and --import-marks-if-exists"
 msgstr "Nie można przekazać i --import-marks i --import-marks-if-exists"
 
 #: builtin/fast-import.c:3088
 #, c-format
 msgid "Missing from marks for submodule '%s'"
-msgstr "Brakujące znaczniki od z pod-modułu „%s�"
+msgstr "Brakujące znaczniki od z podmodułu „%s�"
 
 #: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing to marks for submodule '%s'"
-msgstr "Brakujące znaczniki do z pod-modułu „%s�"
+msgstr "Brakujące znaczniki do z podmodułu „%s�"
 
 #: builtin/fast-import.c:3225
 #, c-format
@@ -14643,8 +15180,7 @@ msgstr "Oczekiwano polecenia „do�, otrzymano %s"
 
 #: builtin/fast-import.c:3322
 msgid "Expected format name:filename for submodule rewrite option"
-msgstr ""
-"W opcji przeredagowania pod-modułu oczekiwano formatu nazwa:nazwa-pliku"
+msgstr "W opcji przeredagowania podmodułu oczekiwano formatu nazwa:nazwa-pliku"
 
 #: builtin/fast-import.c:3377
 #, c-format
@@ -14672,199 +15208,209 @@ msgstr "git fetch --multiple [<opcje>] [(<repozytorium> | <grupa>)...]"
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opcje>]"
 
-#: builtin/fetch.c:120
+#: builtin/fetch.c:122
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel nie może być ujemne"
 
-#: builtin/fetch.c:143 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "pobierz ze wszystkich zdalnych repozytoriów"
 
-#: builtin/fetch.c:145 builtin/pull.c:245
+#: builtin/fetch.c:147 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "ustaw gałąź nadrzędną do git pull/fetch"
 
-#: builtin/fetch.c:147 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:192
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "dopisz do .git/FETCH_HEAD zamiast nadpisywać"
 
-#: builtin/fetch.c:149
+#: builtin/fetch.c:151
 msgid "use atomic transaction to update references"
 msgstr "zażądaj atomowej transakcji do aktualizacji referencji"
 
-#: builtin/fetch.c:151 builtin/pull.c:191
+#: builtin/fetch.c:153 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr "ścieżka do wysyłania paczki po zdalnej stronie"
 
-#: builtin/fetch.c:152
+#: builtin/fetch.c:154
 msgid "force overwrite of local reference"
 msgstr "wymuÅ› nadpisanie lokalnej referencji"
 
-#: builtin/fetch.c:154
+#: builtin/fetch.c:156
 msgid "fetch from multiple remotes"
 msgstr "pobierz z wielu zdalnych repozytoriów"
 
-#: builtin/fetch.c:156 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "pobierz wszystkie tagi i powiÄ…zane obiekty"
 
-#: builtin/fetch.c:158
+#: builtin/fetch.c:160
 msgid "do not fetch all tags (--no-tags)"
 msgstr "nie pobieraj wszystkich tagów (--no-tags)"
 
-#: builtin/fetch.c:160
+#: builtin/fetch.c:162
 msgid "number of submodules fetched in parallel"
-msgstr "liczba pod-modułów pobieranych równolegle"
+msgstr "liczba podmodułów pobieranych równolegle"
+
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr ""
+"zmień podaną referencję, aby umieścić wszystkie referencje w refs/prefetch/"
 
-#: builtin/fetch.c:162 builtin/pull.c:198
+#: builtin/fetch.c:166 builtin/pull.c:202
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "przytnij gałęzie śledzące usunięte ze zdalnego repozytorium"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:168
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "przytnij lokalne tagi, których już nie ma w zdalnym repozytorium, i nadpisz "
 "zmienione tagi"
 
-#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:166
+#: builtin/fetch.c:170
 msgid "control recursive fetching of submodules"
-msgstr "steruj rekurencyjnym pobieraniem pod-modułów"
+msgstr "steruj rekurencyjnym pobieraniem podmodułów"
 
-#: builtin/fetch.c:171
+#: builtin/fetch.c:175
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "zapisz pobrane referencje do pliku FETCH_HEAD"
 
-#: builtin/fetch.c:172 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "zachowaj pobranÄ… paczkÄ™"
 
-#: builtin/fetch.c:174
+#: builtin/fetch.c:178
 msgid "allow updating of HEAD ref"
 msgstr "zezwól na aktualizację referencji HEAD"
 
-#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/pull.c:222
 msgid "deepen history of shallow clone"
 msgstr "pogłęb historię płytkiego klonu"
 
-#: builtin/fetch.c:179 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:216
 msgid "deepen history of shallow repository based on time"
 msgstr "pogłęb historię płytkiego repozytorium według czasu"
 
-#: builtin/fetch.c:185 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "przekształć w pełne repozytorium"
 
-#: builtin/fetch.c:188
+#: builtin/fetch.c:192
 msgid "prepend this to submodule path output"
-msgstr "dodaj to przed wyjściem ścieżki pod-modułu"
+msgstr "dodaj to przed wyjściem ścieżki podmodułu"
 
-#: builtin/fetch.c:191
+#: builtin/fetch.c:195
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr ""
-"domyślnie w rekurencyjnym pobieraniu pod-modułów (niższy priorytet niż pliki "
+"domyślnie w rekurencyjnym pobieraniu podmodułów (niższy priorytet niż pliki "
 "konfiguracji)"
 
-#: builtin/fetch.c:195 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr "przyjmuj referencje, które aktualizują .git/shallow"
 
-#: builtin/fetch.c:196 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:230
 msgid "refmap"
 msgstr "mapowanie"
 
-#: builtin/fetch.c:197 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "podaj mapÄ™ referencji do pobrania"
 
-#: builtin/fetch.c:204 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:244
 msgid "report that we have only objects reachable from this object"
 msgstr "zgłaszaj, że mamy tylko obiekty osiągalne z tego obiektu"
 
-#: builtin/fetch.c:207 builtin/fetch.c:209
+#: builtin/fetch.c:210
+msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
+msgstr ""
+"nie pobieraj pliku paczki; zamiast tego wypisz przodków czubków negocjacji"
+
+#: builtin/fetch.c:213 builtin/fetch.c:215
 msgid "run 'maintenance --auto' after fetching"
 msgstr "wykonaj „maintenance --auto� po pobraniu"
 
-#: builtin/fetch.c:211 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:247
 msgid "check for forced-updates on all updated branches"
 msgstr ""
 "sprawdź na wszystkich zaktualizowanych gałęziach, czy wystąpiły wymuszone "
 "aktualizacje"
 
-#: builtin/fetch.c:213
+#: builtin/fetch.c:219
 msgid "write the commit-graph after fetching"
 msgstr "wypisz graf zapisów po pobraniu"
 
-#: builtin/fetch.c:215
+#: builtin/fetch.c:221
 msgid "accept refspecs from stdin"
 msgstr "przyjmuj referencje ze standardowego wejścia"
 
-#: builtin/fetch.c:526
+#: builtin/fetch.c:586
 msgid "Couldn't find remote ref HEAD"
 msgstr "Nie znaleziono zdalnej referencji HEAD"
 
-#: builtin/fetch.c:697
+#: builtin/fetch.c:760
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "ustawienie fetch.output zawiera nieprawidłową wartość %s"
 
-#: builtin/fetch.c:796
+#: builtin/fetch.c:862
 #, c-format
 msgid "object %s not found"
 msgstr "nie znaleziono obiektu %s"
 
-#: builtin/fetch.c:800
+#: builtin/fetch.c:866
 msgid "[up to date]"
 msgstr "[aktualne]"
 
-#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
+#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
 msgid "[rejected]"
 msgstr "[odrzucono]"
 
-#: builtin/fetch.c:814
+#: builtin/fetch.c:880
 msgid "can't fetch in current branch"
 msgstr "nie można pobrać na bieżącej gałęzi"
 
-#: builtin/fetch.c:824
+#: builtin/fetch.c:890
 msgid "[tag update]"
 msgstr "[aktualizacja tagu]"
 
-#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
-#: builtin/fetch.c:896
+#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
+#: builtin/fetch.c:962
 msgid "unable to update local ref"
 msgstr "nie można zaktualizować lokalnej referencji"
 
-#: builtin/fetch.c:829
+#: builtin/fetch.c:895
 msgid "would clobber existing tag"
 msgstr "nadpisałoby istniejący tag"
 
-#: builtin/fetch.c:851
+#: builtin/fetch.c:917
 msgid "[new tag]"
 msgstr "[nowy tag]"
 
-#: builtin/fetch.c:854
+#: builtin/fetch.c:920
 msgid "[new branch]"
 msgstr "[nowa gałąź]"
 
-#: builtin/fetch.c:857
+#: builtin/fetch.c:923
 msgid "[new ref]"
 msgstr "[nowa referencja]"
 
-#: builtin/fetch.c:896
+#: builtin/fetch.c:962
 msgid "forced update"
 msgstr "wymuszona aktualizacja"
 
-#: builtin/fetch.c:901
+#: builtin/fetch.c:967
 msgid "non-fast-forward"
 msgstr "nieprzewinięte"
 
-#: builtin/fetch.c:1005
+#: builtin/fetch.c:1070
 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"
@@ -14875,7 +15421,7 @@ msgstr ""
 "użyj flagi „--show-forced-updates� lub wykonaj\n"
 "„git fetch.showForcedUpdates true�."
 
-#: builtin/fetch.c:1009
+#: builtin/fetch.c:1074
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -14888,22 +15434,22 @@ msgstr ""
 "false�\n"
 " aby uniknąć tego sprawdzenia.\n"
 
-#: builtin/fetch.c:1041
+#: builtin/fetch.c:1105
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s nie wysłał wszystkich potrzebnych obiektów\n"
 
-#: builtin/fetch.c:1069
+#: builtin/fetch.c:1134
 #, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr "odrzucanie %s, bo nie można aktualizować płytkich korzeni"
+msgid "rejected %s because shallow roots are not allowed to be updated"
+msgstr "odrzucanie %s, bo nie dozwolono aktualizowania płytkich korzeni"
 
-#: builtin/fetch.c:1146 builtin/fetch.c:1297
+#: builtin/fetch.c:1223 builtin/fetch.c:1371
 #, c-format
 msgid "From %.*s\n"
 msgstr "Z %.*s\n"
 
-#: builtin/fetch.c:1168
+#: builtin/fetch.c:1244
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -14912,56 +15458,61 @@ msgstr ""
 "nie można zaktualizować niektórych lokalnych referencji;\n"
 " spróbuj wykonać „git remote prune %s�, aby usunąć stare niepasujące gałęzie"
 
-#: builtin/fetch.c:1267
+#: builtin/fetch.c:1341
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s będzie wiszący)"
 
-#: builtin/fetch.c:1268
+#: builtin/fetch.c:1342
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s stał się wiszący)"
 
-#: builtin/fetch.c:1300
+#: builtin/fetch.c:1374
 msgid "[deleted]"
 msgstr "[usunięto]"
 
-#: builtin/fetch.c:1301 builtin/remote.c:1118
+#: builtin/fetch.c:1375 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(brak)"
 
-#: builtin/fetch.c:1324
+#: builtin/fetch.c:1398
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "Odmawiam pobrania na bieżącą gałąź %s nie-suchego repozytorium"
 
-#: builtin/fetch.c:1343
+#: builtin/fetch.c:1417
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "W opcji „%s� wartość „%s� jest nieprawidłowa przy %s"
 
-#: builtin/fetch.c:1346
+#: builtin/fetch.c:1420
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Opcja „%s� jest ignorowana przez %s\n"
 
-#: builtin/fetch.c:1558
+#: builtin/fetch.c:1447
+#, c-format
+msgid "the object %s does not exist"
+msgstr "obiekt „%s� nie istnieje"
+
+#: builtin/fetch.c:1633
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "wykryto wiele gałęzi, wyklucza się to z --set-upstream"
 
-#: builtin/fetch.c:1573
+#: builtin/fetch.c:1648
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "nie ustawiam gałęzi nadrzędnej w gałęzi śledzącej"
 
-#: builtin/fetch.c:1575
+#: builtin/fetch.c:1650
 msgid "not setting upstream for a remote tag"
 msgstr "nie ustawiam głównego nurtu w zdalnym tagu"
 
-#: builtin/fetch.c:1577
+#: builtin/fetch.c:1652
 msgid "unknown branch type"
 msgstr "nieznany rodzaj gałęzi"
 
-#: builtin/fetch.c:1579
+#: builtin/fetch.c:1654
 msgid ""
 "no source branch found.\n"
 "you need to specify exactly one branch with the --set-upstream option."
@@ -14969,22 +15520,22 @@ msgstr ""
 "nie znaleziono gałęzi źródłowej.\n"
 "należy podać dokładnie jedną gałąź z opcją --set-upstream."
 
-#: builtin/fetch.c:1708 builtin/fetch.c:1771
+#: builtin/fetch.c:1783 builtin/fetch.c:1846
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Pobieranie %s\n"
 
-#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
+#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Nie można pobrać %s"
 
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1805
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "nie można pobrać „%s� (kod wyjścia: %d)\n"
 
-#: builtin/fetch.c:1834
+#: builtin/fetch.c:1909
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -14992,44 +15543,56 @@ msgstr ""
 "Nie ustawiono zdalnego repozytorium.  Podaj adres URL lub\n"
 "nazwę zdalnego repozytorium, z którego mają być pobrane nowe rewizje."
 
-#: builtin/fetch.c:1870
+#: builtin/fetch.c:1945
 msgid "You need to specify a tag name."
 msgstr "Musisz określić nazwę tagu."
 
-#: builtin/fetch.c:1935
+#: builtin/fetch.c:2009
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr "--negotiate-only wymaga jednego lub wielu --negotiate-tip=*"
+
+#: builtin/fetch.c:2013
 msgid "Negative depth in --deepen is not supported"
 msgstr "ujemna głębokość w --deepen nie jest wspierana"
 
-#: builtin/fetch.c:1937
+#: builtin/fetch.c:2015
 msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepend i --depth siÄ™ wykluczajÄ…"
+msgstr "--deepen i --depth siÄ™ wykluczajÄ…"
 
-#: builtin/fetch.c:1942
+#: builtin/fetch.c:2020
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth i --unshallow wykluczajÄ… siÄ™"
 
-#: builtin/fetch.c:1944
+#: builtin/fetch.c:2022
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow w pełnym repozytorium nie ma sensu"
 
-#: builtin/fetch.c:1961
+#: builtin/fetch.c:2039
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all nie przyjmuje argumentów z repozytoriów"
 
-#: builtin/fetch.c:1963
+#: builtin/fetch.c:2041
 msgid "fetch --all does not make sense with refspecs"
 msgstr "--all i referencje siÄ™ wykluczajÄ…"
 
-#: builtin/fetch.c:1972
+#: builtin/fetch.c:2050
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "Nie ma takiego zdalnego repozytorium ani ich grupy: %s"
 
-#: builtin/fetch.c:1979
+#: builtin/fetch.c:2057
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "pobieranie grupy i podanie referencji nie ma sensu"
 
-#: builtin/fetch.c:1997
+#: builtin/fetch.c:2073
+msgid "must supply remote when using --negotiate-only"
+msgstr "należy podać zdalne repozytorium przy --negotiate-only"
+
+#: builtin/fetch.c:2078
+msgid "Protocol does not support --negotiate-only, exiting."
+msgstr "Protokół nie wspiera --negotiate-only, wyjście."
+
+#: builtin/fetch.c:2097
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15037,12 +15600,12 @@ msgstr ""
 "można użyć --filter tylko ze zdalnym repozytorium ustawionym w extensions."
 "partialclone"
 
-#: builtin/fetch.c:2001
+#: builtin/fetch.c:2101
 msgid "--atomic can only be used when fetching from one remote"
 msgstr ""
 "można użyć --atomic tylko przy pobieraniu z jednego zdalnego repozytorium"
 
-#: builtin/fetch.c:2005
+#: builtin/fetch.c:2105
 msgid "--stdin can only be used when fetching from one remote"
 msgstr ""
 "można użyć --stdin tylko przy pobieraniu z jednego zdalnego repozytorium"
@@ -15089,47 +15652,47 @@ msgstr "git for-each-ref [--merged [<zapis>]] [--no-merged [<zapis>]]"
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<zapis>]] [--no-contains [<zapis>]]"
 
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for shells"
 msgstr "użyj cytowania jak w powłokach"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for perl"
 msgstr "użyj cytowania jak w perlu"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for python"
 msgstr "użyj cytowania jak w pythonie"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:36
 msgid "quote placeholders suitably for Tcl"
 msgstr "użyj cytowania jak w Tclu"
 
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c:39
 msgid "show only <n> matched refs"
 msgstr "pokazuj tylko <n> pasujÄ…cych referencji"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:472
+#: builtin/for-each-ref.c:41 builtin/tag.c:481
 msgid "respect format colors"
 msgstr "uszanuj kolory formatu"
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:44
 msgid "print only refs which points at the given object"
 msgstr "wypisz tylko referencje wskazujÄ…ce ten obiekt"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are merged"
 msgstr "wypisz tylko scalone referencje"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are not merged"
 msgstr "wypisz tylko niescalone referencje"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:48
 msgid "print only refs which contain the commit"
 msgstr "wypisz tylko referencje zawierajÄ…ce ten zapis"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:49
 msgid "print only refs which don't contain the commit"
 msgstr "wypisz tylko referencje nie zawierajÄ…ce tego zapisu"
 
@@ -15137,44 +15700,44 @@ msgstr "wypisz tylko referencje nie zawierajÄ…ce tego zapisu"
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<konfiguracja> <argumenty-polecenia>"
 
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "konfiguracja"
 
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "klucz konfiguracji przechowujący listę ścieżek repozytoriów"
 
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "brakuje --config=<konfiguracja>"
 
-#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "nieznane"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:83 builtin/fsck.c:103
+#: builtin/fsck.c:78 builtin/fsck.c:100
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "błąd w %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:97
+#: builtin/fsck.c:94
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "ostrzeżenie w %s %s:%s"
 
-#: builtin/fsck.c:126 builtin/fsck.c:129
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "zepsute Å‚Ä…cze z %7s %s"
 
-#: builtin/fsck.c:138
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "zły rodzaj obiektu w łączu"
 
-#: builtin/fsck.c:154
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -15183,211 +15746,221 @@ msgstr ""
 "zepsute Å‚Ä…cze z %7s %s\n"
 "             do %7s %s"
 
-#: builtin/fsck.c:265
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "brakujÄ…cy %s %s"
 
-#: builtin/fsck.c:292
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "nieosiÄ…galny %s %s"
 
-#: builtin/fsck.c:312
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "wiszÄ…ce %s %s"
 
-#: builtin/fsck.c:322
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "nie można utworzyć biura obiektów znalezionych"
 
-#: builtin/fsck.c:333
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "nie można zakończyć „%s�"
 
-#: builtin/fsck.c:350
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Sprawdzanie %s"
 
-#: builtin/fsck.c:388
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Sprawdzanie spójności (%d obiektów)"
 
-#: builtin/fsck.c:407
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Sprawdzanie %s %s"
 
-#: builtin/fsck.c:412
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "zepsute Å‚Ä…cza"
 
-#: builtin/fsck.c:421
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "korzeń %s"
 
-#: builtin/fsck.c:429
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "otagowano %s %s (%s) w %s"
 
-#: builtin/fsck.c:458
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: brakujÄ…cy lub uszkodzony obiekt"
 
-#: builtin/fsck.c:483
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: nieprawidłowy element dziennika referencji %s"
 
-#: builtin/fsck.c:497
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Sprawdzanie dziennika referencji %s->%s"
 
-#: builtin/fsck.c:531
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: nieprawidłowy wskaźnik SHA-1 %s"
 
-#: builtin/fsck.c:538
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: nie jest zapisem"
 
-#: builtin/fsck.c:592
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "uwaga: Brak domyślnych referencji"
 
-#: builtin/fsck.c:607
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: konflikt skrótów ścieżek, znaleziono w: %s"
+
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: brakujÄ…cy lub uszkodzony obiekt: %s"
 
-#: builtin/fsck.c:620
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: obiekt jest nieznanego rodzaju „%s�: %s"
+
+#: builtin/fsck.c:644
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: nie można przetworzyć obiektu: %s"
 
-#: builtin/fsck.c:640
+#: builtin/fsck.c:664
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "zły plik SHA-1: %s"
 
-#: builtin/fsck.c:655
+#: builtin/fsck.c:685
 msgid "Checking object directory"
 msgstr "Sprawdzanie katalogu obiektów"
 
-#: builtin/fsck.c:658
+#: builtin/fsck.c:688
 msgid "Checking object directories"
 msgstr "Sprawdzanie katalogów obiektów"
 
-#: builtin/fsck.c:673
+#: builtin/fsck.c:704
 #, c-format
 msgid "Checking %s link"
 msgstr "Sprawdzanie połączenia %s"
 
-#: builtin/fsck.c:678 builtin/index-pack.c:865
+#: builtin/fsck.c:709 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "błędny %s"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:716
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s wskazuje na coÅ› dziwnego (%s)"
 
-#: builtin/fsck.c:691
+#: builtin/fsck.c:722
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: oddzielone HEAD niczego nie wskazuje"
 
-#: builtin/fsck.c:695
+#: builtin/fsck.c:726
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "uwaga: %s wskazuje nienarodzoną gałąź (%s)"
 
-#: builtin/fsck.c:707
+#: builtin/fsck.c:738
 msgid "Checking cache tree"
 msgstr "Sprawdzanie drzewa pamięci podręcznej"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:743
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: nieprawidłowy wskaźnik SHA-1 w drzewie pamięci podręcznej"
 
-#: builtin/fsck.c:721
+#: builtin/fsck.c:752
 msgid "non-tree in cache-tree"
 msgstr "nie-drzewo w drzewie pamięci podręcznej"
 
-#: builtin/fsck.c:752
+#: builtin/fsck.c:783
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opcje>] [<obiekt>...]"
 
-#: builtin/fsck.c:758
+#: builtin/fsck.c:789
 msgid "show unreachable objects"
 msgstr "pokazuj nieosiÄ…galne obiekty"
 
-#: builtin/fsck.c:759
+#: builtin/fsck.c:790
 msgid "show dangling objects"
 msgstr "pokaż wiszące obiekty"
 
-#: builtin/fsck.c:760
+#: builtin/fsck.c:791
 msgid "report tags"
 msgstr "zgłaszaj tagi"
 
-#: builtin/fsck.c:761
+#: builtin/fsck.c:792
 msgid "report root nodes"
 msgstr "zgłaszaj węzły korzenia"
 
-#: builtin/fsck.c:762
+#: builtin/fsck.c:793
 msgid "make index objects head nodes"
 msgstr "dodaj obiekty indeksu do naczelnych węzłów"
 
-#: builtin/fsck.c:763
+#: builtin/fsck.c:794
 msgid "make reflogs head nodes (default)"
 msgstr "dodaj dzienniki referencji do węzłów naczelnych (domyślnie)"
 
-#: builtin/fsck.c:764
+#: builtin/fsck.c:795
 msgid "also consider packs and alternate objects"
 msgstr "przejrzyj też paczki i obiekty alternatywne"
 
-#: builtin/fsck.c:765
+#: builtin/fsck.c:796
 msgid "check only connectivity"
 msgstr "sprawdź tylko spójność"
 
-#: builtin/fsck.c:766 builtin/mktag.c:78
+#: builtin/fsck.c:797 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "włącz ściślejsze sprawdzanie"
 
-#: builtin/fsck.c:768
+#: builtin/fsck.c:799
 msgid "write dangling objects in .git/lost-found"
 msgstr "zapisz wiszÄ…ce obiekty w .git/lost-found"
 
-#: builtin/fsck.c:769 builtin/prune.c:134
+#: builtin/fsck.c:800 builtin/prune.c:134
 msgid "show progress"
 msgstr "pokazuj postęp"
 
-#: builtin/fsck.c:770
+#: builtin/fsck.c:801
 msgid "show verbose names for reachable objects"
 msgstr "pokaż rozwlekłe nazwy osiągalnych obiektów"
 
-#: builtin/fsck.c:829 builtin/index-pack.c:261
+#: builtin/fsck.c:861 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Sprawdzanie obiektów"
 
-#: builtin/fsck.c:857
+#: builtin/fsck.c:889
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: brakujÄ…cy obiekt"
 
-#: builtin/fsck.c:868
+#: builtin/fsck.c:900
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "nieprawidłowy parametr: oczekiwano SHA-1, otrzymano „%s�"
@@ -15406,12 +15979,12 @@ msgstr "Nie można wykonać fstat na %s: %s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "nie można przetworzyć wartości „%s� „%s�"
 
-#: builtin/gc.c:487 builtin/init-db.c:58
+#: builtin/gc.c:487 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "nie można wykonać stat na „%s�"
 
-#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
+#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
 #, c-format
 msgid "cannot read '%s'"
 msgstr "nie można odczytać „%s�"
@@ -15420,13 +15993,13 @@ msgstr "nie można odczytać „%s�"
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
-"and remove %s.\n"
+"and remove %s\n"
 "Automatic cleanup will not be performed until the file is removed.\n"
 "\n"
 "%s"
 msgstr ""
 "Ostatnie wykonanie gc zgłosiło, co następuje. Napraw główną przyczynę\n"
-"i usuń %s.\n"
+"i usuń %s\n"
 "Automatyczne czyszczenie nie zostanie przeprowadzone, póki ten plik nie "
 "zniknie.\n"
 "\n"
@@ -15506,151 +16079,191 @@ msgstr "--no-schedule nie jest dozwolone"
 msgid "unrecognized --schedule argument '%s'"
 msgstr "nierozpoznany argument --schedule „%s�"
 
-#: builtin/gc.c:869
+#: builtin/gc.c:868
 msgid "failed to write commit-graph"
 msgstr "nie można wypisać grafu zapisów"
 
-#: builtin/gc.c:914
-msgid "failed to fill remotes"
-msgstr "nie można wypełnić zdalnych repozytoriów"
+#: builtin/gc.c:904
+msgid "failed to prefetch remotes"
+msgstr "nie można pobrać zdalnych repozytoriów z wyprzedzeniem"
 
-#: builtin/gc.c:1037
+#: builtin/gc.c:1020
 msgid "failed to start 'git pack-objects' process"
 msgstr "nie można uruchomić procesu „git pack-objects�"
 
-#: builtin/gc.c:1054
+#: builtin/gc.c:1037
 msgid "failed to finish 'git pack-objects' process"
 msgstr "nie można ukończyć procesu „git pack-objects�"
 
-#: builtin/gc.c:1106
+#: builtin/gc.c:1088
 msgid "failed to write multi-pack-index"
 msgstr "nie można zapisać indeksu wielu paczek"
 
-#: builtin/gc.c:1124
+#: builtin/gc.c:1104
 msgid "'git multi-pack-index expire' failed"
 msgstr "„git multi-pack-index expire� nie powiodło się"
 
-#: builtin/gc.c:1185
+#: builtin/gc.c:1163
 msgid "'git multi-pack-index repack' failed"
 msgstr "„git multi-pack-index repack� nie powiodło się"
 
-#: builtin/gc.c:1194
+#: builtin/gc.c:1172
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 "pomijanie zadania przyrostowego przepakowania, bo core.multiPackIndex jest "
 "wyłączone"
 
-#: builtin/gc.c:1298
+#: builtin/gc.c:1276
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "istnieje plik blokady „%s�, pomijanie porządków"
 
-#: builtin/gc.c:1328
+#: builtin/gc.c:1306
 #, c-format
 msgid "task '%s' failed"
 msgstr "zadanie „%s� nie powiodło się"
 
-#: builtin/gc.c:1410
+#: builtin/gc.c:1388
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "„%s� nie jest prawidłowym zadaniem"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1393
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "nie można wybrać wiele razy zadania „%s�"
 
-#: builtin/gc.c:1430
+#: builtin/gc.c:1408
 msgid "run tasks based on the state of the repository"
 msgstr "uruchamiaj zadania w oparciu o stan repozytorium"
 
-#: builtin/gc.c:1431
+#: builtin/gc.c:1409
 msgid "frequency"
 msgstr "częstotliwość"
 
-#: builtin/gc.c:1432
+#: builtin/gc.c:1410
 msgid "run tasks based on frequency"
 msgstr "uruchamiaj zadania w oparciu o częstotliwość"
 
-#: builtin/gc.c:1435
+#: builtin/gc.c:1413
 msgid "do not report progress or other information over stderr"
 msgstr ""
 "nie zgłaszaj postępu ani innych informacji na standardowe wyjście "
 "diagnostyczne"
 
-#: builtin/gc.c:1436
+#: builtin/gc.c:1414
 msgid "task"
 msgstr "zadanie"
 
-#: builtin/gc.c:1437
+#: builtin/gc.c:1415
 msgid "run a specific task"
 msgstr "uruchom konkretne zadanie"
 
-#: builtin/gc.c:1454
+#: builtin/gc.c:1432
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "--auto i --schedule=<frequency> siÄ™ wykluczajÄ…"
 
-#: builtin/gc.c:1497
+#: builtin/gc.c:1475
 msgid "failed to run 'git config'"
 msgstr "nie można wykonać „git config�"
 
-#: builtin/gc.c:1562
+#: builtin/gc.c:1627
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "nie można rozwinąć ścieżki „%s�"
 
-#: builtin/gc.c:1591
+#: builtin/gc.c:1654 builtin/gc.c:1692
 msgid "failed to start launchctl"
 msgstr "nie można uruchomić launchctl"
 
-#: builtin/gc.c:1628
+#: builtin/gc.c:1767 builtin/gc.c:2220
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "nie można utworzyć katalogów na „%s�"
 
-#: builtin/gc.c:1689
+#: builtin/gc.c:1794
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "nie można wydostać usługi %s"
 
-#: builtin/gc.c:1760
+#: builtin/gc.c:1887
 msgid "failed to create temp xml file"
 msgstr "nie można utworzyć tymczasowego pliku XML"
 
-#: builtin/gc.c:1850
+#: builtin/gc.c:1977
 msgid "failed to start schtasks"
 msgstr "nie można uruchomić schtasks"
 
-#: builtin/gc.c:1894
+#: builtin/gc.c:2046
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr "nie można wykonać „crontab -l�; ten system może nie wspierać crona"
 
-#: builtin/gc.c:1911
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr "nie można wykonać „crontab�; ten system może nie wspierać crona"
 
-#: builtin/gc.c:1915
+#: builtin/gc.c:2067
 msgid "failed to open stdin of 'crontab'"
 msgstr "nie można otworzyć standardowego wejścia „crontab�"
 
-#: builtin/gc.c:1956
+#: builtin/gc.c:2109
 msgid "'crontab' died"
 msgstr "„crontab� padł"
 
-#: builtin/gc.c:1990
+#: builtin/gc.c:2174
+msgid "failed to start systemctl"
+msgstr "nie można uruchomić systemctl"
+
+#: builtin/gc.c:2184
+msgid "failed to run systemctl"
+msgstr "nie można wykonać systemctl"
+
+#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
+#: builtin/worktree.c:945
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "nie można skasować „%s�"
+
+#: builtin/gc.c:2378
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "nierozpoznany argument --scheduler „%s�"
+
+#: builtin/gc.c:2403
+msgid "neither systemd timers nor crontab are available"
+msgstr "nie jest dostępny ani crontab, ani wyzwalacze systemd"
+
+#: builtin/gc.c:2418
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "planista %s nie jest dostępny"
+
+#: builtin/gc.c:2432
 msgid "another process is scheduling background maintenance"
 msgstr "inny proces planuje porzÄ…dki w tle"
 
-#: builtin/gc.c:2009
+#: builtin/gc.c:2454
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<planista>]"
+
+#: builtin/gc.c:2463
+msgid "scheduler"
+msgstr "planista"
+
+#: builtin/gc.c:2464
+msgid "scheduler to trigger git maintenance run"
+msgstr "planista do wyzwolenia sprzÄ…tania repozytorium"
+
+#: builtin/gc.c:2478
 msgid "failed to add repo to global config"
 msgstr "nie można dodać repozytorium do globalnej konfiguracji"
 
-#: builtin/gc.c:2019
+#: builtin/gc.c:2487
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <pod-polecenie> [<opcje>]"
 
-#: builtin/gc.c:2038
+#: builtin/gc.c:2506
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "nieprawidłowe pod-polecenie: %s"
@@ -15659,12 +16272,12 @@ msgstr "nieprawidłowe pod-polecenie: %s"
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opcje>] [-e] <wzorzec> [<rewizja>...] [[--] <ścieżka>...]"
 
-#: builtin/grep.c:223
+#: builtin/grep.c:239
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: nie można utworzyć wątku: %s"
 
-#: builtin/grep.c:277
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "podano nieprawidłową liczbę wątków (%d) do %s"
@@ -15673,262 +16286,262 @@ msgstr "podano nieprawidłową liczbę wątków (%d) do %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1792
-#: builtin/pack-objects.c:2944
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "brak obsługi wątków, ignorowanie %s"
 
-#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "nie można odczytać drzewa (%s)"
 
-#: builtin/grep.c:656
+#: builtin/grep.c:672
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "nie można przeprowadzić grep z obiektu rodzaju %s"
 
-#: builtin/grep.c:737
+#: builtin/grep.c:752
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "przełącznik „%c� oczekuje wartości liczbowej"
 
-#: builtin/grep.c:836
+#: builtin/grep.c:851
 msgid "search in index instead of in the work tree"
 msgstr "wyszukaj w indeksie zamiast w drzewie roboczym"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:853
 msgid "find in contents not managed by git"
 msgstr "znajdź w zawartości nie zarządzanej przez gita"
 
-#: builtin/grep.c:840
+#: builtin/grep.c:855
 msgid "search in both tracked and untracked files"
 msgstr "szukaj i w plikach śledzonych i nieśledzonych"
 
-#: builtin/grep.c:842
+#: builtin/grep.c:857
 msgid "ignore files specified via '.gitignore'"
 msgstr "pomiń pliki wymienione w „.gitignore�"
 
-#: builtin/grep.c:844
+#: builtin/grep.c:859
 msgid "recursively search in each submodule"
-msgstr "wyszukaj rekurencyjnie w każdym pod-module"
+msgstr "wyszukaj rekurencyjnie w każdym podmodule"
 
-#: builtin/grep.c:847
+#: builtin/grep.c:862
 msgid "show non-matching lines"
 msgstr "pokaż niepasujące wiersze"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:864
 msgid "case insensitive matching"
 msgstr "ignorowanie wielkości liter przy dopasowaniu"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:866
 msgid "match patterns only at word boundaries"
 msgstr "dopasuj wzorce tylko na brzegach słów"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:868
 msgid "process binary files as text"
 msgstr "przetwarzaj pliki binarne jako tekst"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:870
 msgid "don't match patterns in binary files"
 msgstr "nie dopasowuj wzorców w plikach binarnych"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:873
 msgid "process binary files with textconv filters"
 msgstr "przetwarzaj pliki binarne filtrami textconv"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:875
 msgid "search in subdirectories (default)"
 msgstr "wyszukaj w pod-katalogach (domyślnie)"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:877
 msgid "descend at most <depth> levels"
 msgstr "zejdź o co najwyżej <głębokość> poziomów"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:881
 msgid "use extended POSIX regular expressions"
 msgstr "użyj rozszerzonych wyrażeń regularnych POSIX"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:884
 msgid "use basic POSIX regular expressions (default)"
 msgstr "użyj podstawowych wyrażeń regularnych POSIX (domyślnie)"
 
-#: builtin/grep.c:872
+#: builtin/grep.c:887
 msgid "interpret patterns as fixed strings"
 msgstr "interpretuj wzorce jako stałe łańcuchy"
 
-#: builtin/grep.c:875
+#: builtin/grep.c:890
 msgid "use Perl-compatible regular expressions"
 msgstr "użyj wyrażeń regularnych kompatybilnych z Perlem"
 
-#: builtin/grep.c:878
+#: builtin/grep.c:893
 msgid "show line numbers"
 msgstr "pokaż numery wierszy"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:894
 msgid "show column number of first match"
 msgstr "pokaż numer kolumny pierwszego dopasowania"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:895
 msgid "don't show filenames"
 msgstr "nie pokazuj nazw plików"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:896
 msgid "show filenames"
 msgstr "pokaż nazwy plików"
 
-#: builtin/grep.c:883
+#: builtin/grep.c:898
 msgid "show filenames relative to top directory"
 msgstr "pokaż nazwy plików względem głównego katalogu"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:900
 msgid "show only filenames instead of matching lines"
 msgstr "pokazuj tylko nazwy plików zamiast pasujących wierszy"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:902
 msgid "synonym for --files-with-matches"
 msgstr "zamiennik na --files-with-matches"
 
-#: builtin/grep.c:890
+#: builtin/grep.c:905
 msgid "show only the names of files without match"
 msgstr "pokazuj tylko nazwy plików bez trafień"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:907
 msgid "print NUL after filenames"
 msgstr "wypisuj NUL po nazwach plików"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:910
 msgid "show only matching parts of a line"
 msgstr "pokaż tylko pasujące fragmenty wiersza"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:912
 msgid "show the number of matches instead of matching lines"
 msgstr "pokaż liczbę dopasowań zamiast pasujących wierszy"
 
-#: builtin/grep.c:898
+#: builtin/grep.c:913
 msgid "highlight matches"
 msgstr "podświetl dopasowania"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:915
 msgid "print empty line between matches from different files"
 msgstr "wypisz pusty wiersz pomiędzy dopasowaniami z różnych plików"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:917
 msgid "show filename only once above matches from same file"
 msgstr "pokaż nazwę pliku tylko raz nad dopasowaniami z jednego pliku"
 
-#: builtin/grep.c:905
+#: builtin/grep.c:920
 msgid "show <n> context lines before and after matches"
 msgstr "pokaż <n> wierszy kontekstu przed dopasowaniami i po nich"
 
-#: builtin/grep.c:908
+#: builtin/grep.c:923
 msgid "show <n> context lines before matches"
 msgstr "pokaż <n> wierszy kontekstu przed dopasowaniami"
 
-#: builtin/grep.c:910
+#: builtin/grep.c:925
 msgid "show <n> context lines after matches"
 msgstr "pokaż <n> wierszy kontekstu po dopasowaniach"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:927
 msgid "use <n> worker threads"
 msgstr "użyj <n> wątków roboczych"
 
-#: builtin/grep.c:913
+#: builtin/grep.c:928
 msgid "shortcut for -C NUM"
 msgstr "skrót na -C ILE"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:931
 msgid "show a line with the function name before matches"
 msgstr "pokaż wiersz z nazwą funkcji przed dopasowaniami"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:933
 msgid "show the surrounding function"
 msgstr "pokaż okalającą funkcję"
 
-#: builtin/grep.c:921
+#: builtin/grep.c:936
 msgid "read patterns from file"
 msgstr "wczytaj wzorce z pliku"
 
-#: builtin/grep.c:923
+#: builtin/grep.c:938
 msgid "match <pattern>"
 msgstr "dopasuj <wzorzec>"
 
-#: builtin/grep.c:925
+#: builtin/grep.c:940
 msgid "combine patterns specified with -e"
 msgstr "Å‚Ä…cz wzorce podane przez -e"
 
-#: builtin/grep.c:937
+#: builtin/grep.c:952
 msgid "indicate hit with exit status without output"
 msgstr "zgłoś trafienie kodem wyjścia bez wypisywania"
 
-#: builtin/grep.c:939
+#: builtin/grep.c:954
 msgid "show only matches from files that match all patterns"
 msgstr "pokaż tylko dopasowania z plików, które pasują do wszystkich wzorców"
 
-#: builtin/grep.c:942
+#: builtin/grep.c:957
 msgid "pager"
 msgstr "czytnik"
 
-#: builtin/grep.c:942
+#: builtin/grep.c:957
 msgid "show matching files in the pager"
 msgstr "pokaż pasujące pliki w czytniku"
 
-#: builtin/grep.c:946
+#: builtin/grep.c:961
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "pozwól wykonać grep(1) (ignorowane w tej wersji)"
 
-#: builtin/grep.c:1012
+#: builtin/grep.c:1027
 msgid "no pattern given"
 msgstr "nie podano wzorca"
 
-#: builtin/grep.c:1048
+#: builtin/grep.c:1063
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index i --untracked wykluczajÄ… siÄ™ z rewizjami"
 
-#: builtin/grep.c:1056
+#: builtin/grep.c:1071
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "nie można rozwiązać rewizji: %s"
 
-#: builtin/grep.c:1086
+#: builtin/grep.c:1101
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked niewspierane z --recurse-submodules"
 
-#: builtin/grep.c:1090
+#: builtin/grep.c:1105
 msgid "invalid option combination, ignoring --threads"
 msgstr "nieprawidłowe połączenie opcji, pomijanie --threads"
 
-#: builtin/grep.c:1093 builtin/pack-objects.c:3672
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
 msgid "no threads support, ignoring --threads"
 msgstr "brak obsługi wątków, ignorowanie --threads"
 
-#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "podano nieprawidłową liczbę wątków (%d)"
 
-#: builtin/grep.c:1130
+#: builtin/grep.c:1145
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager działa tylko w drzewie roboczym"
 
-#: builtin/grep.c:1156
+#: builtin/grep.c:1171
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached i --untracked wykluczajÄ… siÄ™ z --no-index"
 
-#: builtin/grep.c:1159
+#: builtin/grep.c:1174
 msgid "--untracked cannot be used with --cached"
 msgstr "--untracked i --cached siÄ™ wykluczajÄ…"
 
-#: builtin/grep.c:1165
+#: builtin/grep.c:1180
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "Nie można użyć --[no-]exclude-standard do śledzonej zawartości"
 
-#: builtin/grep.c:1173
+#: builtin/grep.c:1188
 msgid "both --cached and trees are given"
 msgstr "podano jednocześnie --cached i drzewa"
 
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -15936,97 +16549,109 @@ msgstr ""
 "git hash-object [-t <rodzaj>] [-w] [--path=<ścieżka> | --no-filters] [--"
 "stdin] [--] <plik>..."
 
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "rodzaj obiektu"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "zapisz obiekt do bazy danych obiektu"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "wczytaj obiekt ze standardowego wejścia"
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "przechowaj plik jak jest, bez filtrów"
 
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "skróć po prostu jakieś losowe śmieci, żeby utworzyć uszkodzone obiekty do "
 "odpluskwiania Gita"
 
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "przetwórz plik, jakby był z tej ścieżki"
 
-#: builtin/help.c:47
+#: builtin/help.c:55
 msgid "print all available commands"
 msgstr "wypisz wszystkie dostępne polecenia"
 
-#: builtin/help.c:48
+#: builtin/help.c:57
 msgid "exclude guides"
 msgstr "pomiń przewodniki"
 
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "wypisz listę przydatnych podręczników"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "wypisz wszystkie nazwy zmiennych konfiguracji"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
 msgid "show man page"
 msgstr "pokaż podręcznik użytkowania"
 
-#: builtin/help.c:53
+#: builtin/help.c:59
 msgid "show manual in web browser"
 msgstr "pokaż podręcznik w przeglądarce"
 
-#: builtin/help.c:55
+#: builtin/help.c:61
 msgid "show info page"
 msgstr "pokaż stronę podręcznika info"
 
-#: builtin/help.c:57
+#: builtin/help.c:63
 msgid "print command description"
 msgstr "wypisz opis polecenia"
 
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<polecenie>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "wypisz listę przydatnych podręczników"
 
-#: builtin/help.c:163
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "wypisz wszystkie nazwy zmiennych konfiguracji"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<polecenie>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "nierozpoznany format pomocy „%s�"
 
-#: builtin/help.c:190
+#: builtin/help.c:223
 msgid "Failed to start emacsclient."
 msgstr "Nie można uruchomić emacsclient."
 
-#: builtin/help.c:203
+#: builtin/help.c:236
 msgid "Failed to parse emacsclient version."
 msgstr "Nie można przetworzyć wersji emacsclienta."
 
-#: builtin/help.c:211
+#: builtin/help.c:244
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "wersja emacsclienta „%d� za stara (< 22)."
 
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "nie można wykonać „%s�"
 
-#: builtin/help.c:307
+#: builtin/help.c:340
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16035,7 +16660,7 @@ msgstr ""
 "„%s�: ścieżka do niewspieranego czytnika podręcznika.\n"
 "Rozważ zamiast tego użycie „man.<narzędzie>.cmd�."
 
-#: builtin/help.c:319
+#: builtin/help.c:352
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16044,35 +16669,39 @@ msgstr ""
 "„%s�: polecenie niewspieranego czytnika podręcznika.\n"
 "Rozważ zamiast tego użycie „man.<narzędzie>.path�."
 
-#: builtin/help.c:436
+#: builtin/help.c:467
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "„%s�: nieznany czytnik podręcznika."
 
-#: builtin/help.c:453
+#: builtin/help.c:483
 msgid "no man viewer handled the request"
 msgstr "żaden czytnik podręcznika nie obsłużył żądania"
 
-#: builtin/help.c:461
+#: builtin/help.c:490
 msgid "no info viewer handled the request"
 msgstr "żaden czytnik podręcznika info nie obsłużył żądania"
 
-#: builtin/help.c:520 builtin/help.c:531 git.c:340
+#: builtin/help.c:551 builtin/help.c:562 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "„%s� jest skrótem na „%s�"
 
-#: builtin/help.c:534 git.c:372
+#: builtin/help.c:565 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "zły łańcuch alias.%s: %s"
 
-#: builtin/help.c:563 builtin/help.c:593
+#: builtin/help.c:581
+msgid "this option doesn't take any other arguments"
+msgstr "ta opcja nie przyjmuje innych argumentów"
+
+#: builtin/help.c:602 builtin/help.c:629
 #, c-format
 msgid "usage: %s%s"
 msgstr "użycie: %s%s"
 
-#: builtin/help.c:577
+#: builtin/help.c:624
 msgid "'git help config' for more information"
 msgstr "więcej informacji w „git help config�"
 
@@ -16111,7 +16740,7 @@ msgstr "błąd odczytu na wejściu"
 msgid "used more bytes than were available"
 msgstr "użyto więcej bajtów niż było dostępnych"
 
-#: builtin/index-pack.c:324 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr "paczka za duża na obecną definicję off_t"
 
@@ -16119,53 +16748,43 @@ msgstr "paczka za duża na obecną definicję off_t"
 msgid "pack exceeds maximum allowed size"
 msgstr "paczka przekracza maksymalny dozwolony rozmiar"
 
-#: builtin/index-pack.c:342
-#, c-format
-msgid "unable to create '%s'"
-msgstr "nie można utworzyć „%s�"
-
-#: builtin/index-pack.c:348
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "nie można otworzyć pliku paczki „%s�"
-
-#: builtin/index-pack.c:362
+#: builtin/index-pack.c:358
 msgid "pack signature mismatch"
 msgstr "niezgodność podpisu paczki"
 
-#: builtin/index-pack.c:364
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "wersja paczki %<PRIu32> niewspierana"
 
-#: builtin/index-pack.c:382
+#: builtin/index-pack.c:376
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "paczka ma zły obiekt na pozycji %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:488
+#: builtin/index-pack.c:482
 #, c-format
 msgid "inflate returned %d"
 msgstr "dekompresja zwróciła %d"
 
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:531
 msgid "offset value overflow for delta base object"
 msgstr "przepełnienie wartości przesunięcia dla obiektu podstawowego delty"
 
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:539
 msgid "delta base offset is out of bound"
 msgstr "podstawowe przesunięcie delty jest poza zakresem"
 
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:547
 #, c-format
 msgid "unknown object type %d"
 msgstr "nieznany typ obiektu %d"
 
-#: builtin/index-pack.c:584
+#: builtin/index-pack.c:578
 msgid "cannot pread pack file"
 msgstr "nie można wykonać pread na pliku paczki"
 
-#: builtin/index-pack.c:586
+#: builtin/index-pack.c:580
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -16173,88 +16792,88 @@ msgstr[0] "przedwczesny koniec pliku paczki, brakuje %<PRIuMAX> bajtu"
 msgstr[1] "przedwczesny koniec pliku paczki, brakuje %<PRIuMAX> bajtów"
 msgstr[2] "przedwczesny koniec pliku paczki, brakuje %<PRIuMAX> bajtów"
 
-#: builtin/index-pack.c:612
+#: builtin/index-pack.c:606
 msgid "serious inflate inconsistency"
 msgstr "poważna niespójność dekompresji"
 
-#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787
-#: builtin/index-pack.c:826 builtin/index-pack.c:835
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "ZNALEZIONO KOLIZJĘ SHA1 Z %s !"
 
-#: builtin/index-pack.c:760 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
 #, c-format
 msgid "unable to read %s"
 msgstr "nie można odczytać %s"
 
-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:818
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "nie można odczytać informacji istniejącego obiektu %s"
 
-#: builtin/index-pack.c:832
+#: builtin/index-pack.c:826
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "nie można odczytać istniejącego obiektu %s"
 
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:840
 #, c-format
 msgid "invalid blob object %s"
 msgstr "nieprawidłowy obiekt blob %s"
 
-#: builtin/index-pack.c:849 builtin/index-pack.c:868
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
 msgid "fsck error in packed object"
 msgstr "błąd fsck w spakowanym obiekcie"
 
-#: builtin/index-pack.c:870
+#: builtin/index-pack.c:864
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Nie wszystkie obiekty potomne %s sÄ… osiÄ…galne"
 
-#: builtin/index-pack.c:931 builtin/index-pack.c:978
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
 msgstr "nie można zastosować delty"
 
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c:1156
 msgid "Receiving objects"
 msgstr "Pobieranie obiektów"
 
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c:1156
 msgid "Indexing objects"
 msgstr "Indeksowanie obiektów"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1190
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paczka jest uszkodzona (różnica w SHA1)"
 
-#: builtin/index-pack.c:1200
+#: builtin/index-pack.c:1195
 msgid "cannot fstat packfile"
 msgstr "nie można wykonać fstat na pliku paczki"
 
-#: builtin/index-pack.c:1203
+#: builtin/index-pack.c:1198
 msgid "pack has junk at the end"
 msgstr "paczka ma śmieci na końcu"
 
-#: builtin/index-pack.c:1215
+#: builtin/index-pack.c:1210
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "dezorientacja ponad szaleństwo w parse_pack_objects()"
 
-#: builtin/index-pack.c:1238
+#: builtin/index-pack.c:1233
 msgid "Resolving deltas"
 msgstr "RozwiÄ…zywanie delt"
 
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "nie można utworzyć wątku: %s"
 
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1277
 msgid "confusion beyond insanity"
 msgstr "dezorientacja ponad szaleństwo"
 
-#: builtin/index-pack.c:1288
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
@@ -16262,12 +16881,12 @@ msgstr[0] "wykonano z %d lokalnym obiektem"
 msgstr[1] "wykonano z %d lokalnymi obiektami"
 msgstr[2] "wykonano z %d lokalnymi obiektami"
 
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Nieoczekiwana końcowa suma kontrolna %s (uszkodzenie dysku?)"
 
-#: builtin/index-pack.c:1304
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
@@ -16275,63 +16894,56 @@ msgstr[0] "paczka ma %d nierozwiÄ…zanÄ… deltÄ™"
 msgstr[1] "paczka ma %d nierozwiÄ…zane delty"
 msgstr[2] "paczka ma %d nierozwiÄ…zanych delt"
 
-#: builtin/index-pack.c:1328
+#: builtin/index-pack.c:1323
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "nie można skompresować dodanego obiektu (%d)"
 
-#: builtin/index-pack.c:1424
+#: builtin/index-pack.c:1419
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "lokalny obiekt %s jest uszkodzony"
 
-#: builtin/index-pack.c:1445
+#: builtin/index-pack.c:1440
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "nazwa pliku paczki „%s� nie kończy się na „.%s�"
 
-#: builtin/index-pack.c:1469
+#: builtin/index-pack.c:1464
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "nie można zapisać pliku %s „%s�"
 
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1472
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "nie można zamknąć zapisanego pliku %s „%s�"
 
-#: builtin/index-pack.c:1503
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "nie można zmienić nazwy pliku tymczasowego „*.%s� na „%s�"
+
+#: builtin/index-pack.c:1514
 msgid "error while closing pack file"
 msgstr "błąd podczas zamykania pliku paczki"
 
-#: builtin/index-pack.c:1517
-msgid "cannot store pack file"
-msgstr "nie można zapisać pliku paczki"
-
-#: builtin/index-pack.c:1525
-msgid "cannot store index file"
-msgstr "nie można zapisać pliku indeksu"
-
-#: builtin/index-pack.c:1534
-msgid "cannot store reverse index file"
-msgstr "nie można zapisać pliku odwrotnego indeksu"
-
-#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "zła wartość pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1643
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Nie można otworzyć istniejącego pliku paczki „%s�"
 
-#: builtin/index-pack.c:1652
+#: builtin/index-pack.c:1645
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Nie można otworzyć istniejącego pliku idx paczki dla „%s�"
 
-#: builtin/index-pack.c:1700
+#: builtin/index-pack.c:1693
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
@@ -16339,7 +16951,7 @@ msgstr[0] "nie delta: %d obiekt"
 msgstr[1] "nie delta: %d obiekty"
 msgstr[2] "nie delta: %d obiektów"
 
-#: builtin/index-pack.c:1707
+#: builtin/index-pack.c:1700
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
@@ -16347,131 +16959,131 @@ msgstr[0] "długość łańcucha = %d: %lu obiekt"
 msgstr[1] "długość łańcucha = %d: %lu obiekty"
 msgstr[2] "długość łańcucha = %d: %lu obiektów"
 
-#: builtin/index-pack.c:1749
+#: builtin/index-pack.c:1742
 msgid "Cannot come back to cwd"
 msgstr "Nie można wrócić do cwd"
 
-#: builtin/index-pack.c:1803 builtin/index-pack.c:1806
-#: builtin/index-pack.c:1822 builtin/index-pack.c:1826
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
 #, c-format
 msgid "bad %s"
 msgstr "błędny %s"
 
-#: builtin/index-pack.c:1832 builtin/init-db.c:392 builtin/init-db.c:625
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "nieznany algorytm skrótu „%s�"
 
-#: builtin/index-pack.c:1851
+#: builtin/index-pack.c:1848
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin i --stdin wykluczajÄ… siÄ™"
 
-#: builtin/index-pack.c:1853
+#: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin wymaga repozytorium gita"
 
-#: builtin/index-pack.c:1855
+#: builtin/index-pack.c:1852
 msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format i --stdin wykluczajÄ… siÄ™"
+msgstr "--object-format i --stdin siÄ™ wykluczajÄ…"
 
-#: builtin/index-pack.c:1870
+#: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify bez podanej nazwy pliku paczki"
 
-#: builtin/index-pack.c:1936 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "błąd fsck w obiektach paczek"
 
-#: builtin/init-db.c:64
+#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "nie można wykonać stat na szablonie „%s�"
 
-#: builtin/init-db.c:69
+#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "nie można otworzyć katalogu „%s�"
 
-#: builtin/init-db.c:81
+#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "nie można wykonać readlink na „%s�"
 
-#: builtin/init-db.c:83
+#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "nie można wykonać symlink na „%s� „%s�"
 
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "nie można skopiować „%s� do „%s�"
 
-#: builtin/init-db.c:93
+#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "pomijanie szablonu %s"
 
-#: builtin/init-db.c:124
+#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "nie znaleziono szablonów w %s"
 
-#: builtin/init-db.c:139
+#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "nie kopiowanie szablonów z „%s�: %s"
 
-#: builtin/init-db.c:275
+#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "nieprawidłowa początkowa nazwa gałęzi: „%s�"
 
-#: builtin/init-db.c:367
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "nie można obsłużyć typu pliku %d"
 
-#: builtin/init-db.c:370
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "nie można przenieść %s do %s"
 
-#: builtin/init-db.c:386
+#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr "próba ponownego zainicjowania repozytorium innym skrótem"
 
-#: builtin/init-db.c:410 builtin/init-db.c:413
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s już istnieje"
 
-#: builtin/init-db.c:445
+#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: pominięto --initial-branch=%s"
 
-#: builtin/init-db.c:476
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Przeinicjowano istniejące współdzielone repozytorium Gita w %s%s\n"
 
-#: builtin/init-db.c:477
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Przeinicjowano istniejÄ…ce repozytorium Gita w %s%s\n"
 
-#: builtin/init-db.c:481
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Zainicjowano puste współdzielone repozytorium Gita w %s%s\n"
 
-#: builtin/init-db.c:482
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Zainicjowano puste repozytorium Gita w %s%s\n"
 
-#: builtin/init-db.c:531
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -16479,42 +17091,42 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<katalog-szablonu>] [--"
 "shared[=<uprawnienia>]] [<katalog>]"
 
-#: builtin/init-db.c:557
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "uprawnienia"
 
-#: builtin/init-db.c:558
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 "podaj, że repozytorium gita ma być współdzielone pomiędzy użytkownikami"
 
-#: builtin/init-db.c:564
+#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "wymuś nazwę początkowej gałęzi"
 
-#: builtin/init-db.c:565 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "skrót"
 
-#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "podaj algorytm skrótu do użycia"
 
-#: builtin/init-db.c:573
+#: builtin/init-db.c:560
 msgid "--separate-git-dir and --bare are mutually exclusive"
 msgstr "--separate-git-dir i --bare siÄ™ wykluczajÄ…"
 
-#: builtin/init-db.c:602 builtin/init-db.c:607
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "nie można utworzyć katalogu %s"
 
-#: builtin/init-db.c:611 builtin/init-db.c:666
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "nie można wejść do %s"
 
-#: builtin/init-db.c:638
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -16523,12 +17135,12 @@ msgstr ""
 "%s (lub --work-tree=<katalog>) niedozwolone bez podania %s (lub --git-"
 "dir=<katalog>)"
 
-#: builtin/init-db.c:690
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Nie można dostać się do drzewa roboczego „%s�"
 
-#: builtin/init-db.c:695
+#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir i suche repozytorium siÄ™ wykluczajÄ…"
 
@@ -16580,17 +17192,13 @@ msgstr "ustaw opcje przetwarzania"
 msgid "do not treat --- specially"
 msgstr "nie traktuj specjalnie ---"
 
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr "końcówka"
-
 #: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "końcówka(-i) do dodania"
 
 #: builtin/interpret-trailers.c:123
 msgid "--trailer with --only-input does not make sense"
-msgstr "--trailer i --only-input wykluczajÄ… siÄ™"
+msgstr "--trailer i --only-input siÄ™ wykluczajÄ…"
 
 #: builtin/interpret-trailers.c:133
 msgid "no input file given for in-place editing"
@@ -16641,85 +17249,85 @@ msgstr ""
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<zakres>:<plik> i ścieżki się wykluczają"
 
-#: builtin/log.c:303
+#: builtin/log.c:306
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Ostateczne wyjście: %d %s\n"
 
-#: builtin/log.c:566
+#: builtin/log.c:571
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: zły plik"
 
-#: builtin/log.c:581 builtin/log.c:671
+#: builtin/log.c:586 builtin/log.c:676
 #, c-format
 msgid "could not read object %s"
 msgstr "nie można odczytać obiektu %s"
 
-#: builtin/log.c:696
+#: builtin/log.c:701
 #, c-format
 msgid "unknown type: %d"
 msgstr "nieznany rodzaj: %d"
 
-#: builtin/log.c:841
+#: builtin/log.c:846
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: nieprawidłowy tryb listu motywacyjnego z opisu"
 
-#: builtin/log.c:848
+#: builtin/log.c:853
 msgid "format.headers without value"
 msgstr "format.headers bez wartości"
 
-#: builtin/log.c:977
+#: builtin/log.c:982
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "nie można otworzyć pliku łatki %s"
 
-#: builtin/log.c:994
+#: builtin/log.c:999
 msgid "need exactly one range"
 msgstr "potrzeba dokładnie jednego zakresu"
 
-#: builtin/log.c:1004
+#: builtin/log.c:1009
 msgid "not a range"
 msgstr "to nie jest zakres"
 
-#: builtin/log.c:1168
+#: builtin/log.c:1173
 msgid "cover letter needs email format"
 msgstr "list motywacyjny wymaga formatu e-mail"
 
-#: builtin/log.c:1174
+#: builtin/log.c:1179
 msgid "failed to create cover-letter file"
 msgstr "nie można utworzyć pliku z listem motywacyjnym"
 
-#: builtin/log.c:1261
+#: builtin/log.c:1266
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "szalone in-reply-to: %s"
 
-#: builtin/log.c:1288
+#: builtin/log.c:1293
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opcje>] [<od-kiedy> | <zakres-rewizji>]"
 
-#: builtin/log.c:1346
+#: builtin/log.c:1351
 msgid "two output directories?"
 msgstr "dwa katalogi wyjściowe?"
 
-#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
 #, c-format
 msgid "unknown commit %s"
 msgstr "nieznany zapis %s"
 
-#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "nie można rozwiązać „%s� jako prawidłowej referencji"
 
-#: builtin/log.c:1517
+#: builtin/log.c:1522
 msgid "could not find exact merge base"
 msgstr "nie znaleziono dokładnej podstawy scalania"
 
-#: builtin/log.c:1527
+#: builtin/log.c:1532
 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"
@@ -16730,288 +17338,292 @@ msgstr ""
 "zdalną gałąź.\n"
 "Albo możesz podać zapis podstawy ręcznie przez --base=<id-zapisu-podstawy>"
 
-#: builtin/log.c:1550
+#: builtin/log.c:1555
 msgid "failed to find exact merge base"
 msgstr "nie znaleziono dokładnej podstawy scalania"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1572
 msgid "base commit should be the ancestor of revision list"
 msgstr "podstawowy zapis powinien być przodkiem listy rewizji"
 
-#: builtin/log.c:1577
+#: builtin/log.c:1582
 msgid "base commit shouldn't be in revision list"
 msgstr "podstawowy zapis nie powinien być na liście rewizji"
 
-#: builtin/log.c:1635
+#: builtin/log.c:1640
 msgid "cannot get patch id"
 msgstr "nie można uzyskać identyfikatora łatki"
 
-#: builtin/log.c:1692
+#: builtin/log.c:1703
 msgid "failed to infer range-diff origin of current series"
 msgstr "nie można wywnioskować źródła różnic zakresów z bieżącej serii"
 
-#: builtin/log.c:1694
+#: builtin/log.c:1705
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "użycie „%s� jako źródła różnic zakresów z bieżącej serii"
 
-#: builtin/log.c:1738
+#: builtin/log.c:1749
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "użyj [PATCH n/m] nawet przy pojedynczej łatce"
 
-#: builtin/log.c:1741
+#: builtin/log.c:1752
 msgid "use [PATCH] even with multiple patches"
 msgstr "użyj [PATCH] nawet przy wielu łatkach"
 
-#: builtin/log.c:1745
+#: builtin/log.c:1756
 msgid "print patches to standard out"
 msgstr "wypisz łatki na standardowe wyjście"
 
-#: builtin/log.c:1747
+#: builtin/log.c:1758
 msgid "generate a cover letter"
 msgstr "wygeneruj list motywacyjny"
 
-#: builtin/log.c:1749
+#: builtin/log.c:1760
 msgid "use simple number sequence for output file names"
 msgstr "użyj tylko numerów w nazwach wynikowych plików"
 
-#: builtin/log.c:1750
+#: builtin/log.c:1761
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1751
+#: builtin/log.c:1762
 msgid "use <sfx> instead of '.patch'"
 msgstr "użyj <sfx> zamiast „.patch�"
 
-#: builtin/log.c:1753
+#: builtin/log.c:1764
 msgid "start numbering patches at <n> instead of 1"
 msgstr "zacznij numerować łatki od <n> zamiast od 1"
 
-#: builtin/log.c:1755
+#: builtin/log.c:1765
+msgid "reroll-count"
+msgstr "liczba-podejść"
+
+#: builtin/log.c:1766
 msgid "mark the series as Nth re-roll"
 msgstr "oznacz serię jako N-te podejście"
 
-#: builtin/log.c:1757
+#: builtin/log.c:1768
 msgid "max length of output filename"
 msgstr "maksymalna długość nazwy wynikowego pliku"
 
-#: builtin/log.c:1759
+#: builtin/log.c:1770
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "użyj [RFC PATCH] zamiast [PATCH]"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1773
 msgid "cover-from-description-mode"
 msgstr "tryb-listu-z-opisu"
 
-#: builtin/log.c:1763
+#: builtin/log.c:1774
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "wygeneruj części listu motywacyjnego w oparciu o opis gałęzi"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1776
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "użyj [<prefiksu>] zamiast [PATCH]"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1779
 msgid "store resulting files in <dir>"
 msgstr "zachowaj wynikowe pliki w <katalogu>"
 
-#: builtin/log.c:1771
+#: builtin/log.c:1782
 msgid "don't strip/add [PATCH]"
 msgstr "nie usuwaj/nie dodawaj [PATCH]"
 
-#: builtin/log.c:1774
+#: builtin/log.c:1785
 msgid "don't output binary diffs"
 msgstr "nie wypisuj binarnych różnic"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1787
 msgid "output all-zero hash in From header"
 msgstr "wypisz skrót z samych zer w nagłówku Od"
 
-#: builtin/log.c:1778
+#: builtin/log.c:1789
 msgid "don't include a patch matching a commit upstream"
 msgstr "nie uwzględniaj łatki pasującej do już istniejącego zapisu"
 
-#: builtin/log.c:1780
+#: builtin/log.c:1791
 msgid "show patch format instead of default (patch + stat)"
 msgstr "pokaż format łatki zamiast domyślnego (łatka + statystyki)"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1793
 msgid "Messaging"
 msgstr "Wiadomości"
 
-#: builtin/log.c:1783
+#: builtin/log.c:1794
 msgid "header"
 msgstr "nagłówek"
 
-#: builtin/log.c:1784
+#: builtin/log.c:1795
 msgid "add email header"
 msgstr "dodaj nagłówek e-maila"
 
-#: builtin/log.c:1785 builtin/log.c:1786
+#: builtin/log.c:1796 builtin/log.c:1797
 msgid "email"
 msgstr "e-mail"
 
-#: builtin/log.c:1785
+#: builtin/log.c:1796
 msgid "add To: header"
 msgstr "dodaj pole Do:"
 
-#: builtin/log.c:1786
+#: builtin/log.c:1797
 msgid "add Cc: header"
 msgstr "dodaj pole DW:"
 
-#: builtin/log.c:1787
+#: builtin/log.c:1798
 msgid "ident"
 msgstr "tożsamość"
 
-#: builtin/log.c:1788
+#: builtin/log.c:1799
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "ustaw adres Od na <tożsamość> (lub tożsamość składającego, jeśli nie podano)"
 
-#: builtin/log.c:1790
+#: builtin/log.c:1801
 msgid "message-id"
 msgstr "id-wiadomości"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1802
 msgid "make first mail a reply to <message-id>"
 msgstr "niech pierwszy list będzie odpowiedzią na <id-wiadomości>"
 
-#: builtin/log.c:1792 builtin/log.c:1795
+#: builtin/log.c:1803 builtin/log.c:1806
 msgid "boundary"
 msgstr "granica/boundary"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1804
 msgid "attach the patch"
 msgstr "załącz łatkę"
 
-#: builtin/log.c:1796
+#: builtin/log.c:1807
 msgid "inline the patch"
 msgstr "umieść łatkę w treści"
 
-#: builtin/log.c:1800
+#: builtin/log.c:1811
 msgid "enable message threading, styles: shallow, deep"
 msgstr "zezwól na wątkowanie komunikatów, style: shallow, deep"
 
-#: builtin/log.c:1802
+#: builtin/log.c:1813
 msgid "signature"
 msgstr "podpis"
 
-#: builtin/log.c:1803
+#: builtin/log.c:1814
 msgid "add a signature"
 msgstr "dodaj podpis"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1815
 msgid "base-commit"
 msgstr "zapis-podstawy"
 
-#: builtin/log.c:1805
+#: builtin/log.c:1816
 msgid "add prerequisite tree info to the patch series"
 msgstr "dodaj informacje o wymaganym poczÄ…tkowym drzewie do serii Å‚atek"
 
-#: builtin/log.c:1808
+#: builtin/log.c:1819
 msgid "add a signature from a file"
 msgstr "dodaj podpis z pliku"
 
-#: builtin/log.c:1809
+#: builtin/log.c:1820
 msgid "don't print the patch filenames"
 msgstr "nie wypisuj nazw plików łatek"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1822
 msgid "show progress while generating patches"
 msgstr "pokaż postęp podczas generowania łatek"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1824
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "pokaż zmiany względem <rewizji> w liście motywacyjnym lub pojedynczej łatce"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1827
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "pokaż zmiany względem <referencji> w liście motywacyjnym lub pojedynczej "
 "Å‚atce"
 
-#: builtin/log.c:1818
+#: builtin/log.c:1829 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "procent, według jakiego ważone jest tworzenie"
 
-#: builtin/log.c:1904
+#: builtin/log.c:1916
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "błędny wiersz tożsamości: %s"
 
-#: builtin/log.c:1919
+#: builtin/log.c:1931
 msgid "-n and -k are mutually exclusive"
 msgstr "-n i -k siÄ™ wykluczajÄ…"
 
-#: builtin/log.c:1921
+#: builtin/log.c:1933
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc i -k siÄ™ wykluczajÄ…"
 
-#: builtin/log.c:1929
+#: builtin/log.c:1941
 msgid "--name-only does not make sense"
 msgstr "--name-only nie ma sensu"
 
-#: builtin/log.c:1931
+#: builtin/log.c:1943
 msgid "--name-status does not make sense"
 msgstr "--name-status nie ma sensu"
 
-#: builtin/log.c:1933
+#: builtin/log.c:1945
 msgid "--check does not make sense"
 msgstr "--check nie ma sensu"
 
-#: builtin/log.c:1955
+#: builtin/log.c:1967
 msgid "--stdout, --output, and --output-directory are mutually exclusive"
 msgstr "--stdout, --output i --output-directory siÄ™ wykluczajÄ…"
 
-#: builtin/log.c:2078
+#: builtin/log.c:2089
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff wymaga --cover-letter lub pojedynczej Å‚atki"
 
-#: builtin/log.c:2082
+#: builtin/log.c:2093
 msgid "Interdiff:"
 msgstr "Różnice w różnicach:"
 
-#: builtin/log.c:2083
+#: builtin/log.c:2094
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Różnice w różnicach względem v%d:"
 
-#: builtin/log.c:2089
+#: builtin/log.c:2100
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor wymaga --range-diff"
 
-#: builtin/log.c:2093
+#: builtin/log.c:2104
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff wymaga --cover-letter lub pojedynczej Å‚atki"
 
-#: builtin/log.c:2101
+#: builtin/log.c:2112
 msgid "Range-diff:"
 msgstr "Różnice zakresów:"
 
-#: builtin/log.c:2102
+#: builtin/log.c:2113
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Różnice zakresów względem v%d:"
 
-#: builtin/log.c:2113
+#: builtin/log.c:2124
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "nie można odczytać pliku podpisu „%s�"
 
-#: builtin/log.c:2149
+#: builtin/log.c:2160
 msgid "Generating patches"
 msgstr "Generowanie Å‚atek"
 
-#: builtin/log.c:2193
+#: builtin/log.c:2204
 msgid "failed to create output files"
 msgstr "nie można utworzyć plików wyjściowych"
 
-#: builtin/log.c:2252
+#: builtin/log.c:2263
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<nadrzędna> [<czoło> [<limit>]]]"
 
-#: builtin/log.c:2306
+#: builtin/log.c:2317
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17019,130 +17631,134 @@ msgstr ""
 "Nie znaleziono śledzonej zdalnej gałęzi, podaj ręcznie <zdalne-"
 "repozytorium>.\n"
 
-#: builtin/ls-files.c:486
+#: builtin/ls-files.c:561
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opcje>] [<plik>...]"
 
-#: builtin/ls-files.c:542
+#: builtin/ls-files.c:615
+msgid "separate paths with the NUL character"
+msgstr "rozdziel ścieżki znakiem NUL"
+
+#: builtin/ls-files.c:617
 msgid "identify the file status with tags"
 msgstr "opisz stan pliku tagami"
 
-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:619
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "użyj małych liter do plików o „założonej niezmienności�"
 
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:621
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "użyj małych liter do plików „prawidłowo monitorowanych�"
 
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:623
 msgid "show cached files in the output (default)"
 msgstr "pokaż w wyjściu zapamiętane pliki (domyślnie)"
 
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:625
 msgid "show deleted files in the output"
 msgstr "pokaż w wyjściu usunięte pliki"
 
-#: builtin/ls-files.c:552
+#: builtin/ls-files.c:627
 msgid "show modified files in the output"
 msgstr "pokaż w wyjściu zmienione pliki"
 
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:629
 msgid "show other files in the output"
 msgstr "pokazuj pliki innego typu w wyjściu"
 
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:631
 msgid "show ignored files in the output"
 msgstr "pokaż w wyjściu ignorowane pliki"
 
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:634
 msgid "show staged contents' object name in the output"
 msgstr "pokaż w wyjściu nazwę obiektu przygotowanej zawartości"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:636
 msgid "show files on the filesystem that need to be removed"
 msgstr "pokaż pliki w systemie plików, które należy skasować"
 
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:638
 msgid "show 'other' directories' names only"
 msgstr "pokaż tylko nazwy nieśledzonych katalogów"
 
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:640
 msgid "show line endings of files"
 msgstr "pokaż zakończenia wierszy w plikach"
 
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:642
 msgid "don't show empty directories"
 msgstr "nie pokazuj pustych katalogów"
 
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:645
 msgid "show unmerged files in the output"
 msgstr "pokaż niescalone pliki w wyjściu"
 
-#: builtin/ls-files.c:572
+#: builtin/ls-files.c:647
 msgid "show resolve-undo information"
 msgstr "pokaż informacje o resolve-undo"
 
-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:649
 msgid "skip files matching pattern"
 msgstr "pomiń pliki spełniające kryteria"
 
-#: builtin/ls-files.c:577
-msgid "exclude patterns are read from <file>"
-msgstr "wzorce wyłączające czytane są z <pliku>"
+#: builtin/ls-files.c:652
+msgid "read exclude patterns from <file>"
+msgstr "wczytaj wzorce wyłączeń z <pliku>"
 
-#: builtin/ls-files.c:580
+#: builtin/ls-files.c:655
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 "odczytaj dodatkowe wzorce wyłączające z poszczególnych katalogów w <pliku>"
 
-#: builtin/ls-files.c:582
+#: builtin/ls-files.c:657
 msgid "add the standard git exclusions"
 msgstr "dodaj standardowe wyjÄ…tki gita"
 
-#: builtin/ls-files.c:586
+#: builtin/ls-files.c:661
 msgid "make the output relative to the project top directory"
 msgstr "podawaj wyjście względem głównego katalogu projektu"
 
-#: builtin/ls-files.c:589
+#: builtin/ls-files.c:664
 msgid "recurse through submodules"
-msgstr "schodź do pod-modułów"
+msgstr "schodź do podmodułów"
 
-#: builtin/ls-files.c:591
+#: builtin/ls-files.c:666
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "jeśli którykolwiek <plik> nie jest w indeksie, potraktuj to jako błąd"
 
-#: builtin/ls-files.c:592
+#: builtin/ls-files.c:667
 msgid "tree-ish"
 msgstr "drzewo"
 
-#: builtin/ls-files.c:593
+#: builtin/ls-files.c:668
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "udawaj, że ścieżki usunięte po <drzewie> są nadal obecne"
 
-#: builtin/ls-files.c:595
+#: builtin/ls-files.c:670
 msgid "show debugging data"
 msgstr "pokaż dane diagnostyczne"
 
-#: builtin/ls-files.c:597
+#: builtin/ls-files.c:672
 msgid "suppress duplicate entries"
 msgstr "ukryj podwójne wpisy"
 
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<repository> [<refs>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repository> [<refs>...]]"
 msgstr ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<program>]\n"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<repozytorium> [<referencje>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repozytorium> [<referencje>...]]"
 
 #: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "nie wyświetlaj adresu repozytorium"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
 msgid "exec"
 msgstr "program"
 
@@ -17184,7 +17800,7 @@ msgstr "pokaż tylko drzewa"
 
 #: builtin/ls-tree.c:130
 msgid "recurse into subtrees"
-msgstr "schodź do pod-modułów"
+msgstr "schodź do podmodułów"
 
 #: builtin/ls-tree.c:132
 msgid "show trees when recursing"
@@ -17210,7 +17826,56 @@ msgstr "użyj pełnych nazw ścieżek"
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr "wypisz całe drzewo; nie tylko bieżący katalog (zakłada --full-name)"
 
-#: builtin/mailsplit.c:241
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git mailinfo [<opcje>] <komunikat> <Å‚atka> < list >info"
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr "zachowaj temat"
+
+#: builtin/mailinfo.c:60
+msgid "keep non patch brackets in subject"
+msgstr "zachowaj w temacie nawiasy oprócz PATCH"
+
+#: builtin/mailinfo.c:62
+msgid "copy Message-ID to the end of commit message"
+msgstr "skopiuj ID listu (Message-ID) z końcówki komunikatu zapisu"
+
+#: builtin/mailinfo.c:64
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr "przekoduj metadane na i18n.commitEncoding"
+
+#: builtin/mailinfo.c:67
+msgid "disable charset re-coding of metadata"
+msgstr "wyłącz przekodowywanie zestawów znaków w metadanych"
+
+#: builtin/mailinfo.c:69
+msgid "encoding"
+msgstr "kodowanie"
+
+#: builtin/mailinfo.c:70
+msgid "re-code metadata to this encoding"
+msgstr "przekoduj metadane na to kodowanie"
+
+#: builtin/mailinfo.c:72
+msgid "use scissors"
+msgstr "użyj nożyczek"
+
+#: builtin/mailinfo.c:73
+msgid "<action>"
+msgstr "<działanie>"
+
+#: builtin/mailinfo.c:74
+msgid "action when quoted CR is found"
+msgstr "działanie po znalezieniu cytowanego powrotu karetki (CRa)"
+
+#: builtin/mailinfo.c:77
+msgid "use headers in message's body"
+msgstr "użyj nagłówków w treści listu"
+
+#: builtin/mailsplit.c:239
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "pusta skrzynka mbox: „%s�"
@@ -17327,191 +17992,183 @@ msgstr "nie można rozwiązać referencji „%s�"
 msgid "Merging %s with %s\n"
 msgstr "Scalanie %s z %s\n"
 
-#: builtin/merge.c:58
+#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opcje>] [<zapis>...]"
 
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: builtin/merge.c:124
 msgid "switch `m' requires a value"
 msgstr "przełącznik „m� wymaga wartości"
 
-#: builtin/merge.c:146
+#: builtin/merge.c:147
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "opcja „%s� wymaga wartości"
 
-#: builtin/merge.c:199
+#: builtin/merge.c:200
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Nie znaleziono strategii scalania „%s�.\n"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:201
 #, c-format
 msgid "Available strategies are:"
 msgstr "Dostępne strategie:"
 
-#: builtin/merge.c:205
+#: builtin/merge.c:206
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Dostępne niestandardowe strategie:"
 
-#: builtin/merge.c:256 builtin/pull.c:133
+#: builtin/merge.c:257 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "nie pokazuj statystyk różnic pod koniec scalenia"
 
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:260 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "pokaż statystyki różnic pod koniec scalenia"
 
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:261 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(synonim do --stat)"
 
-#: builtin/merge.c:262 builtin/pull.c:142
+#: builtin/merge.c:263 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "dodaj (co najwyżej <n>) wpisy z krótkiego dziennika do komunikatu zapisu "
 "scalenia"
 
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:266 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr "utwórz pojedynczy zapis zamiast scalać"
 
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:268 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "złóż zapis, jeśli scalenie się powiedzie (domyślnie)"
 
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:270 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "edytuj komunikat przed złożeniem"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:272
 msgid "allow fast-forward (default)"
 msgstr "zezwól na przewijanie (domyślne)"
 
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:274 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "przerwij, jeśli przewinięcie nie jest możliwe"
 
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:278 builtin/pull.c:168
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "zweryfikuj, czy podany zapis ma prawidłowy podpis GPG"
 
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/rebase.c:1117 builtin/revert.c:114
 msgid "strategy"
 msgstr "strategia"
 
-#: builtin/merge.c:279 builtin/pull.c:169
+#: builtin/merge.c:280 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "strategia scalania"
 
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:281 builtin/pull.c:176
 msgid "option=value"
 msgstr "opcja=wartość"
 
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:282 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "opcja wybranej strategii scalania"
 
-#: builtin/merge.c:283
+#: builtin/merge.c:284
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "komunikat zapisu scalenia (do nieprzewiniętego scalenia)"
 
-#: builtin/merge.c:290
+#: builtin/merge.c:291
 msgid "abort the current in-progress merge"
 msgstr "przerwij bieżące trwające scalanie"
 
-#: builtin/merge.c:292
+#: builtin/merge.c:293
 msgid "--abort but leave index and working tree alone"
 msgstr "jak --abort, ale zostaw w spokoju indeks i drzewo robocze"
 
-#: builtin/merge.c:294
+#: builtin/merge.c:295
 msgid "continue the current in-progress merge"
 msgstr "kontynuuj bieżące trwające scalanie"
 
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:297 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "zezwól na scalenie niepowiązanych historii"
 
-#: builtin/merge.c:303
+#: builtin/merge.c:304
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "omiń skrypty pre-merge-commit i commit-msg"
 
-#: builtin/merge.c:320
+#: builtin/merge.c:321
 msgid "could not run stash."
 msgstr "nie można wykonać dodania do schowka."
 
-#: builtin/merge.c:325
+#: builtin/merge.c:326
 msgid "stash failed"
 msgstr "dodanie zmian do schowka nie powiodło się"
 
-#: builtin/merge.c:330
+#: builtin/merge.c:331
 #, c-format
 msgid "not a valid object: %s"
 msgstr "nieprawidłowy obiekt: %s"
 
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:353 builtin/merge.c:370
 msgid "read-tree failed"
 msgstr "read-tree nie powiodło się"
 
-#: builtin/merge.c:399
-msgid " (nothing to squash)"
-msgstr " (nic do spłaszczenia)"
+#: builtin/merge.c:401
+msgid "Already up to date. (nothing to squash)"
+msgstr "Już aktualne. (nic do spłaszczenia)"
 
-#: builtin/merge.c:410
+#: builtin/merge.c:415
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Spłaszczony zapis — nie aktualizowanie HEAD\n"
 
-#: builtin/merge.c:460
+#: builtin/merge.c:465
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Brak komunikatu scalenia — nie aktualizowanie HEAD\n"
 
-#: builtin/merge.c:511
+#: builtin/merge.c:515
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "„%s� nie wskazuje na zapis"
 
-#: builtin/merge.c:598
+#: builtin/merge.c:603
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Zły łańcuch branch.%s.mergeoptions: %s"
 
-#: builtin/merge.c:724
+#: builtin/merge.c:730
 msgid "Not handling anything other than two heads merge."
 msgstr "Nie rozpatrywanie niczego poza scalaniem dwóch czół."
 
-#: builtin/merge.c:737
+#: builtin/merge.c:743
 #, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Nieznana opcja merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "nieznana opcja strategii: -X%s"
 
-#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "nie można zapisać %s"
 
-#: builtin/merge.c:808
+#: builtin/merge.c:814
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Nie można odczytać „%s�"
 
-#: builtin/merge.c:817
+#: builtin/merge.c:823
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "Nie składanie scalenia; użyj „git commit�, aby ukończyć scalanie.\n"
 
-#: builtin/merge.c:823
+#: builtin/merge.c:829
 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"
@@ -17521,11 +18178,11 @@ msgstr ""
 "zwłaszcza jeśli scala zaktualizowaną gałąź nadrzędną z gałęzią tematyczną.\n"
 "\n"
 
-#: builtin/merge.c:828
+#: builtin/merge.c:834
 msgid "An empty message aborts the commit.\n"
 msgstr "Pusty komunikat przerywa zapis.\n"
 
-#: builtin/merge.c:831
+#: builtin/merge.c:837
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17534,73 +18191,73 @@ msgstr ""
 "Wiersze zaczynające się od „%c� będą ignorowane, a pusty komunikat\n"
 "przerwie zapis.\n"
 
-#: builtin/merge.c:884
+#: builtin/merge.c:892
 msgid "Empty commit message."
 msgstr "Pusty komunikat zapisu."
 
-#: builtin/merge.c:899
+#: builtin/merge.c:907
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Wspaniale.\n"
 
-#: builtin/merge.c:960
+#: builtin/merge.c:968
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Automatyczne scalanie nie powiodło się; napraw konflikty i złóż wynik.\n"
 
-#: builtin/merge.c:999
+#: builtin/merge.c:1007
 msgid "No current branch."
 msgstr "Nie ma bieżącej gałęzi."
 
-#: builtin/merge.c:1001
+#: builtin/merge.c:1009
 msgid "No remote for the current branch."
 msgstr "Bieżąca gałąź nie ma zdalnego repozytorium."
 
-#: builtin/merge.c:1003
+#: builtin/merge.c:1011
 msgid "No default upstream defined for the current branch."
 msgstr "Nie zdefiniowano gałęzi nadrzędnej wobec bieżącej."
 
-#: builtin/merge.c:1008
+#: builtin/merge.c:1016
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Brak gałęzi śledzącej dla %s z %s"
 
-#: builtin/merge.c:1065
+#: builtin/merge.c:1073
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Błędna wartość „%s� w środowisku „%s�"
 
-#: builtin/merge.c:1168
+#: builtin/merge.c:1174
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "to nie jest coś, co można scalić w %s: %s"
 
-#: builtin/merge.c:1202
+#: builtin/merge.c:1208
 msgid "not something we can merge"
 msgstr "to nie jest coś, co można scalić"
 
-#: builtin/merge.c:1312
+#: builtin/merge.c:1321
 msgid "--abort expects no arguments"
 msgstr "--abort nie przyjmuje argumentów"
 
-#: builtin/merge.c:1316
+#: builtin/merge.c:1325
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Nie ma scalenia, które można by przerwać (brak MERGE_HEAD)."
 
-#: builtin/merge.c:1334
+#: builtin/merge.c:1343
 msgid "--quit expects no arguments"
 msgstr "--quit nie przyjmuje argumentów"
 
-#: builtin/merge.c:1347
+#: builtin/merge.c:1356
 msgid "--continue expects no arguments"
 msgstr "--continue nie przyjmuje argumentów"
 
-#: builtin/merge.c:1351
+#: builtin/merge.c:1360
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Nie trwa żadne scalenie (brak MERGE_HEAD)."
 
-#: builtin/merge.c:1367
+#: builtin/merge.c:1376
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17608,7 +18265,7 @@ msgstr ""
 "Nie zwieńczono scalania (MERGE_HEAD istnieje).\n"
 "Złóż swoje zmiany przed scaleniem."
 
-#: builtin/merge.c:1374
+#: builtin/merge.c:1383
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17616,96 +18273,84 @@ msgstr ""
 "Nie zwieńczono dobierania (CHERRY_PICK_HEAD istnieje).\n"
 "Złóż swoje zmiany przed scaleniem."
 
-#: builtin/merge.c:1377
+#: builtin/merge.c:1386
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Nie zwieńczono dobierania (CHERRY_PICK_HEAD istnieje)."
 
-#: builtin/merge.c:1391
+#: builtin/merge.c:1400
 msgid "You cannot combine --squash with --no-ff."
 msgstr "--squash i --no-ff siÄ™ wykluczajÄ…."
 
-#: builtin/merge.c:1393
+#: builtin/merge.c:1402
 msgid "You cannot combine --squash with --commit."
 msgstr "--squash i --commit siÄ™ wykluczajÄ…."
 
-#: builtin/merge.c:1409
+#: builtin/merge.c:1418
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Nie podano zapisu, a nie ustawiono merge.defaultToUpstream."
 
-#: builtin/merge.c:1426
+#: builtin/merge.c:1435
 msgid "Squash commit into empty head not supported yet"
 msgstr "Spłaszczenie zapisu w puste czoło nie jest jeszcze wspierane"
 
-#: builtin/merge.c:1428
+#: builtin/merge.c:1437
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Nieprzewinięty zapis nie ma sensu przy pustym czele (HEAD) gałęzi"
 
-#: builtin/merge.c:1433
+#: builtin/merge.c:1442
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s — nie jest czymś, co możemy scalić"
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1444
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Można scalić tylko dokładnie jeden zapis w puste czoło"
 
-#: builtin/merge.c:1516
+#: builtin/merge.c:1531
 msgid "refusing to merge unrelated histories"
 msgstr "odmawiam scalenia niepowiÄ…zanych historii"
 
-#: builtin/merge.c:1525
-msgid "Already up to date."
-msgstr "Już aktualne."
-
-#: builtin/merge.c:1535
+#: builtin/merge.c:1550
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Aktualizowanie %s..%s\n"
 
-#: builtin/merge.c:1581
+#: builtin/merge.c:1598
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Próba naprawdę trywialnego scalenia w indeksie...\n"
 
-#: builtin/merge.c:1588
+#: builtin/merge.c:1605
 #, c-format
 msgid "Nope.\n"
 msgstr "O nie.\n"
 
-#: builtin/merge.c:1613
-msgid "Already up to date. Yeeah!"
-msgstr "Już aktualne. Hurra!"
-
-#: builtin/merge.c:1619
-msgid "Not possible to fast-forward, aborting."
-msgstr "Nie da się przewinąć, przerywanie."
-
-#: builtin/merge.c:1647 builtin/merge.c:1712
+#: builtin/merge.c:1664 builtin/merge.c:1730
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Cofanie drzewa do nieskalanego stanu...\n"
 
-#: builtin/merge.c:1651
+#: builtin/merge.c:1668
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Próba strategii scalania %s...\n"
 
-#: builtin/merge.c:1703
+#: builtin/merge.c:1720
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Żadna strategia scalania nie podołała temu scalaniu.\n"
 
-#: builtin/merge.c:1705
+#: builtin/merge.c:1722
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Scalanie ze strategią %s nie powiodło się.\n"
 
-#: builtin/merge.c:1714
+#: builtin/merge.c:1732
 #, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Użycie %s, żeby przygotować ręczne rozwiązywanie.\n"
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr "Użycie strategii %s, żeby przygotować ręczne rozwiązywanie.\n"
 
-#: builtin/merge.c:1728
+#: builtin/merge.c:1746
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -17716,41 +18361,41 @@ msgstr ""
 msgid "git mktag"
 msgstr "git mktag"
 
-#: builtin/mktag.c:30
+#: builtin/mktag.c:27
 #, c-format
 msgid "warning: tag input does not pass fsck: %s"
 msgstr "ostrzeżenie: wejście tagu nie przechodzi sprawdzenia fsck: %s"
 
-#: builtin/mktag.c:41
+#: builtin/mktag.c:38
 #, c-format
 msgid "error: tag input does not pass fsck: %s"
 msgstr "błąd: wejście tagu nie przechodzi sprawdzenia fsck: %s"
 
-#: builtin/mktag.c:44
+#: builtin/mktag.c:41
 #, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
 msgstr "%d (FSCK_IGNORE?) nie powinno nigdy wyzwolić tej funkcji zwrotnej"
 
-#: builtin/mktag.c:59
+#: builtin/mktag.c:56
 #, c-format
 msgid "could not read tagged object '%s'"
 msgstr "nie można odczytać otagowanego obiektu „%s�"
 
-#: builtin/mktag.c:62
+#: builtin/mktag.c:59
 #, c-format
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr "obiekt „%s� otagowany jako „%s�, ale jest rodzaju „%s�"
 
-#: builtin/mktag.c:99
+#: builtin/mktag.c:98
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr ""
 "tag na standardowym wejściu nie przeszedł naszego ścisłego sprawdzenia fsck"
 
-#: builtin/mktag.c:102
+#: builtin/mktag.c:101
 msgid "tag on stdin did not refer to a valid object"
 msgstr "tag na standardowym wejściu nie odnosił się do prawidłowego obiektu"
 
-#: builtin/mktag.c:105 builtin/tag.c:232
+#: builtin/mktag.c:104 builtin/tag.c:243
 msgid "unable to write tag file"
 msgstr "nie można zapisać pliku tagu"
 
@@ -17770,19 +18415,51 @@ msgstr "zezwól na brakujące obiekty"
 msgid "allow creation of more than one tree"
 msgstr "pozwól na tworzenie więcej niż jednego drzewa"
 
-#: builtin/multi-pack-index.c:9
+#: builtin/multi-pack-index.c:10
 msgid ""
-"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
-"size=<size>)"
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
 msgstr ""
-"git multi-pack-index [<opcje>] (write|verify|expire|repack --batch-"
-"size=<rozmiar>)"
+"git multi-pack-index [<opcje>] write [--preferred-pack=<paczka>][--refs-"
+"snapshot=<ścieżka>]"
+
+#: builtin/multi-pack-index.c:14
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git multi-pack-index [<opcje>] verify"
+
+#: builtin/multi-pack-index.c:17
+msgid "git multi-pack-index [<options>] expire"
+msgstr "git multi-pack-index [<opcje>] expire"
+
+#: builtin/multi-pack-index.c:20
+msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
+msgstr "git multi-pack-index [<opcje>] repack [--batch-size=<rozmiar>]"
 
-#: builtin/multi-pack-index.c:26
+#: builtin/multi-pack-index.c:57
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr "katalog obiektu ze zbiorem par pliku paczki i indeksu paczki"
 
-#: builtin/multi-pack-index.c:29
+#: builtin/multi-pack-index.c:98
+msgid "preferred-pack"
+msgstr "preferowana-paczka"
+
+#: builtin/multi-pack-index.c:99
+msgid "pack for reuse when computing a multi-pack bitmap"
+msgstr "paczka do ponownego użycia przy obliczaniu bitmapy wielu paczek"
+
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "zapisz bitmapÄ™ wielu paczek"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "zapisz indeks wielu paczek tylko z podanymi indeksami"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "obraz referencji do zaznaczania zapisów bitmapy"
+
+#: builtin/multi-pack-index.c:202
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -17790,22 +18467,6 @@ msgstr ""
 "podczas przepakowania zbierz pliki paczek mniejszego rozmiaru w porcjÄ™ "
 "większą niż ten rozmiar"
 
-#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431
-#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598
-#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963
-#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575
-msgid "too many arguments"
-msgstr "za dużo argumentów"
-
-#: builtin/multi-pack-index.c:60
-msgid "--batch-size option is only for 'repack' subcommand"
-msgstr "opcja --batch-size jest tylko do pod-polecenia „repack�"
-
-#: builtin/multi-pack-index.c:69
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "nieznane pod-polecenie: %s"
-
 #: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<opcje>] <źródło>... <cel>"
@@ -17813,7 +18474,7 @@ msgstr "git mv [<opcje>] <źródło>... <cel>"
 #: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
-msgstr "Katalog %s jest w indeksie i brak pod-modułu?"
+msgstr "Katalog %s jest w indeksie i brak podmodułu?"
 
 #: builtin/mv.c:85
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
@@ -17833,72 +18494,72 @@ msgstr "wymuś przeniesienie/zmianę nazwy nawet jeśli cel istnieje"
 msgid "skip move/rename errors"
 msgstr "pomiń błędy przenoszenia/zmiany nazwy"
 
-#: builtin/mv.c:170
+#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "cel „%s� nie jest katalogiem"
 
-#: builtin/mv.c:181
+#: builtin/mv.c:184
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Sprawdzanie zmiany nazwy „%s� na „%s�\n"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:190
 msgid "bad source"
 msgstr "złe źródło"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "nie można przenieść katalogu do niego samego"
 
-#: builtin/mv.c:191
+#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "nie można przesunąć katalogu na plik"
 
-#: builtin/mv.c:200
+#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "katalog źródłowy jest pusty"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "nie podlega kontroli wersji"
 
-#: builtin/mv.c:227
+#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "skonfliktowane"
 
-#: builtin/mv.c:230
+#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "cel istnieje"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "nadpisywanie „%s�"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "Nie można nadpisać"
 
-#: builtin/mv.c:244
+#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "wiele źródeł do tego samego celu"
 
-#: builtin/mv.c:246
+#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "katalog docelowy nie istnieje"
 
-#: builtin/mv.c:253
+#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, źródło=%s, cel=%s"
 
-#: builtin/mv.c:274
+#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Zmiana nazwy z %s na %s\n"
 
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "nie można zmienić nazwy „%s�"
@@ -18076,47 +18737,47 @@ msgstr "nie można odczytać wyjścia „show�"
 msgid "failed to finish 'show' for object '%s'"
 msgstr "nie można ukończyć „show� na obiekcie „%s�"
 
-#: builtin/notes.c:197
+#: builtin/notes.c:195
 msgid "please supply the note contents using either -m or -F option"
 msgstr "należy podać zawartość notatki przy użyciu opcji -m lub -F"
 
-#: builtin/notes.c:206
+#: builtin/notes.c:204
 msgid "unable to write note object"
 msgstr "nie można zapisać obiektu uwagi"
 
-#: builtin/notes.c:208
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "pozostawiono zawartość uwagi w %s"
 
-#: builtin/notes.c:242 builtin/tag.c:565
+#: builtin/notes.c:240 builtin/tag.c:577
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "nie można otworzyć lub odczytać „%s�"
 
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "nie można rozwiązać „%s� jako prawidłowej referencji."
 
-#: builtin/notes.c:265
+#: builtin/notes.c:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "nie można odczytać obiektu „%s�."
 
-#: builtin/notes.c:268
+#: builtin/notes.c:266
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "nie można odczytać danych uwagi z obiektu „%s� niebędącego blobem."
 
-#: builtin/notes.c:309
+#: builtin/notes.c:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "uszkodzony wiersz wejścia: „%s�."
 
-#: builtin/notes.c:324
+#: builtin/notes.c:322
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "nie można skopiować uwag z „%s� do „%s�"
@@ -18124,41 +18785,48 @@ msgstr "nie można skopiować uwag z „%s� do „%s�"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "notes %s: odmawiam wykonania w %s (poza refs/notes/)"
 
-#: builtin/notes.c:389 builtin/notes.c:678
+#: 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
+msgid "too many arguments"
+msgstr "za dużo argumentów"
+
+#: builtin/notes.c:387 builtin/notes.c:676
 #, c-format
 msgid "no note found for object %s."
 msgstr "brak uwag do obiektu %s."
 
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "zawartość uwagi jako łańcuch"
 
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "zawartość uwag w pliku"
 
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
 msgid "reuse and edit specified note object"
 msgstr "użyj ponownie i edytuj podany obiekt uwagi"
 
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "odrzuć podany obiekt węzła"
 
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "pozwól zachować pustą uwagę"
 
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "zastÄ…p istniejÄ…ce uwagi"
 
-#: builtin/notes.c:448
+#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18167,29 +18835,29 @@ msgstr ""
 "Nie można dodać uwag. Znaleziono istniejące uwagi do obiektu %s. Użyj „-f�, "
 "aby nadpisać istniejące uwagi"
 
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Nadpisywanie istniejÄ…cych uwag do obiektu %s\n"
 
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Usuwanie uwagi do obiektu %s\n"
 
-#: builtin/notes.c:497
+#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "wczytaj obiekty ze standardowego wejścia"
 
-#: builtin/notes.c:499
+#: builtin/notes.c:497
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "wczytaj ustawienia przepisywania dla <polecenia> (zakłada --stdin)"
 
-#: builtin/notes.c:517
+#: builtin/notes.c:515
 msgid "too few arguments"
 msgstr "za mało argumentów"
 
-#: builtin/notes.c:538
+#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18198,12 +18866,12 @@ msgstr ""
 "Nie można skopiować uwag. Znaleziono istniejące uwagi do obiektu %s. Użyj „-"
 "f�, aby nadpisać istniejące uwagi"
 
-#: builtin/notes.c:550
+#: builtin/notes.c:548
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "brakuje uwag do obiektu źródłowego %s. Nie można skopiować."
 
-#: builtin/notes.c:603
+#: builtin/notes.c:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18212,52 +18880,52 @@ msgstr ""
 "Opcje -m/-F/-c/-C są przestarzałe w pod-poleceniu „edit�.\n"
 "użyj zamiast tego „git notes add -f -m/-F/-c/-C�.\n"
 
-#: builtin/notes.c:698
+#: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "nie można usunąć referencji NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:700
+#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "nie można usunąć referencji NOTES_MERGE_REF"
 
-#: builtin/notes.c:702
+#: builtin/notes.c:700
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "nie można usunąć drzewa roboczego „git notes merge�"
 
-#: builtin/notes.c:722
+#: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "nie można odczytać referencji NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:724
+#: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "nie znaleziono zapisu z NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:726
+#: builtin/notes.c:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "nie można przetworzyć zapisu z NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:739
+#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "nie można rozwiązać NOTES_MERGE_REF"
 
-#: builtin/notes.c:742
+#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "nie można zwieńczyć scalenia uwag"
 
-#: builtin/notes.c:768
+#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "nieznana strategia scalenia uwag %s"
 
-#: builtin/notes.c:784
+#: builtin/notes.c:782
 msgid "General options"
 msgstr "Opcje ogólne"
 
-#: builtin/notes.c:786
+#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Opcje scalania"
 
-#: builtin/notes.c:788
+#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -18265,46 +18933,46 @@ msgstr ""
 "rozwiąż konflikty uwag używając podanej strategii (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 
-#: builtin/notes.c:790
+#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "Składanie niescalonych uwag"
 
-#: builtin/notes.c:792
+#: builtin/notes.c:790
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "zwieńcz scalenie uwag składając niescalone uwagi"
 
-#: builtin/notes.c:794
+#: builtin/notes.c:792
 msgid "Aborting notes merge resolution"
 msgstr "Przerywanie rozwiÄ…zania scalenia uwag"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "przerwij scalanie uwag"
 
-#: builtin/notes.c:807
+#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "--commit, --abort i -s/--strategy wykluczajÄ… siÄ™"
 
-#: builtin/notes.c:812
+#: builtin/notes.c:810
 msgid "must specify a notes ref to merge"
 msgstr "należy podać referencję uwag do scalenia"
 
-#: builtin/notes.c:836
+#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "nieznana wartość -s/--strategy: %s"
 
-#: builtin/notes.c:873
+#: builtin/notes.c:871
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "scalenie uwag do %s już trwa w %s"
 
-#: builtin/notes.c:876
+#: builtin/notes.c:874
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "nie można zapisać dowiązania do bieżącej referencji uwag (%s)"
 
-#: builtin/notes.c:878
+#: builtin/notes.c:876
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18315,60 +18983,60 @@ msgstr ""
 "wynik przez „git notes merge --commit�, lub przerwij scalanie przez „git "
 "notes merge --abort�.\n"
 
-#: builtin/notes.c:897 builtin/tag.c:578
+#: builtin/notes.c:895 builtin/tag.c:590
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Nie można rozwiązać „%s� jako prawidłowej referencji."
 
-#: builtin/notes.c:900
+#: builtin/notes.c:898
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "Obiekt %s nie ma uwag\n"
 
-#: builtin/notes.c:912
+#: builtin/notes.c:910
 msgid "attempt to remove non-existent note is not an error"
 msgstr "próba usunięcia nieistniejącej uwagi nie jest błędem"
 
-#: builtin/notes.c:915
+#: builtin/notes.c:913
 msgid "read object names from the standard input"
 msgstr "odczytaj nazwy obiektów ze standardowego wejścia"
 
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
+#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr "nie usuwaj, tylko pokaż"
 
-#: builtin/notes.c:955
+#: builtin/notes.c:953
 msgid "report pruned notes"
 msgstr "zgłaszaj przycięte uwagi"
 
-#: builtin/notes.c:998
+#: builtin/notes.c:996
 msgid "notes-ref"
 msgstr "ref-uwagi"
 
-#: builtin/notes.c:999
+#: builtin/notes.c:997
 msgid "use notes from <notes-ref>"
 msgstr "użyj uwag z <referencja-uwagi>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1671
+#: builtin/notes.c:1032 builtin/stash.c:1752
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "nieznana podkomenda: %s"
 
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<opcje>...] [< <lista-referencji> | < <lista-"
 "obiektów>]"
 
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<opcje>...] <baza> [< <lista-referencji> | < <lista-"
 "obiektów>]"
 
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18377,107 +19045,111 @@ msgstr ""
 "write_reuse_object: nie odnaleziono %s, oczekiwano na pozycji %<PRIuMAX> w "
 "paczce %s"
 
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "zły CRC spakowanego obiektu dla %s"
 
-#: builtin/pack-objects.c:459
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "uszkodzony spakowany obiekt dla %s"
 
-#: builtin/pack-objects.c:590
+#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "wykryto rekurencyjnÄ… deltÄ™ dla obiektu %s"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "zamówiono %u obiektów, oczekiwano %<PRIu32>"
 
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "oczekiwano obiektu na pozycji %<PRIuMAX> w paczce %s"
 
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1160
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "wyłączone zapisywanie bitmapy, paczki są dzielone według pack.packSizeLimit"
 
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
 msgid "Writing objects"
 msgstr "Zapisywanie obiektów"
 
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "nie można wykonać stat na „%s�"
 
-#: builtin/pack-objects.c:1141
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "nie można zapisać indeksu bitmapy"
+
+#: builtin/pack-objects.c:1294
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "wypisano %<PRIu32> obiektów, a oczekiwano %<PRIu32>"
 
-#: builtin/pack-objects.c:1358
+#: builtin/pack-objects.c:1536
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "wyłączanie zapisywania bitmapy, niektóre obiekty nie są pakowane"
 
-#: builtin/pack-objects.c:1806
+#: builtin/pack-objects.c:1984
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "przepełnienie podstawowego przesunięcia delty w paczce w %s"
 
-#: builtin/pack-objects.c:1815
+#: builtin/pack-objects.c:1993
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "podstawowe przesunięcie delty poza zakresem w %s"
 
-#: builtin/pack-objects.c:2096
+#: builtin/pack-objects.c:2274
 msgid "Counting objects"
 msgstr "Zliczanie obiektów"
 
-#: builtin/pack-objects.c:2241
+#: builtin/pack-objects.c:2439
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "nie można przetworzyć nagłówka obiektu %s"
 
-#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
-#: builtin/pack-objects.c:2337
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
 #, c-format
 msgid "object %s cannot be read"
 msgstr "nie można odczytać obiektu %s"
 
-#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "niespójna długość obiektu %s (%<PRIuMAX> vs %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2351
+#: builtin/pack-objects.c:2549
 msgid "suboptimal pack - out of memory"
 msgstr "nieoptymalna paczka — brak pamięci"
 
-#: builtin/pack-objects.c:2666
+#: builtin/pack-objects.c:2864
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Kompresja delt z użyciem do %d wątków"
 
-#: builtin/pack-objects.c:2805
+#: builtin/pack-objects.c:3003
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "nie można spakować obiektów osiągalnych z tagu %s"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:3089
 msgid "Compressing objects"
 msgstr "Kompresowanie obiektów"
 
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:3095
 msgid "inconsistency with delta count"
 msgstr "niespójność z liczbą delt"
 
-#: builtin/pack-objects.c:2976
+#: builtin/pack-objects.c:3174
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18486,14 +19158,25 @@ msgstr ""
 "wartość uploadpack.blobpackfileuri musi być postaci „<skrót-obiektu> <skrót-"
 "paczki> <uri>� (otrzymano „%s�)"
 
-#: builtin/pack-objects.c:2979
+#: builtin/pack-objects.c:3177
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
 msgstr ""
 "już ustawiono obiekt w innym uploadpack.blobpackfileuri (otrzymano „%s�)"
 
-#: builtin/pack-objects.c:3008
+#: builtin/pack-objects.c:3212
+#, c-format
+msgid "could not get type of object %s in pack %s"
+msgstr "nie można uzyskać rodzaju obiektu %s w paczce %s"
+
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
+#, c-format
+msgid "could not find pack '%s'"
+msgstr "nie znaleziono paczki „%s�"
+
+#: builtin/pack-objects.c:3408
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -18502,7 +19185,7 @@ msgstr ""
 "oczekiwano identyfikatora obiektu krawędzi, otrzymano śmieci:\n"
 "%s"
 
-#: builtin/pack-objects.c:3014
+#: builtin/pack-objects.c:3414
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -18511,235 +19194,247 @@ msgstr ""
 "oczekiwano identyfikatora obiektu, otrzymano śmieci:\n"
 "%s"
 
-#: builtin/pack-objects.c:3112
+#: builtin/pack-objects.c:3507
 msgid "invalid value for --missing"
 msgstr "nieprawidłowa wartość --missing"
 
-#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
 msgid "cannot open pack index"
 msgstr "nie można otworzyć indeksu paczki"
 
-#: builtin/pack-objects.c:3202
+#: builtin/pack-objects.c:3541
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "nie można przebadać wolnego obiektu w %s"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3627
 msgid "unable to force loose object"
 msgstr "nie można wymusić wolnego obiektu"
 
-#: builtin/pack-objects.c:3380
+#: builtin/pack-objects.c:3757
 #, c-format
 msgid "not a rev '%s'"
 msgstr "nie jest rewizją „%s�"
 
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "zła rewizja „%s�"
 
-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3788
 msgid "unable to add recent objects"
 msgstr "nie można dodać ostatnich obiektów"
 
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3841
 #, c-format
 msgid "unsupported index version %s"
 msgstr "nieobsługiwana wersja indeksu %s"
 
-#: builtin/pack-objects.c:3465
+#: builtin/pack-objects.c:3845
 #, c-format
 msgid "bad index version '%s'"
 msgstr "zła wersja indeksu „%s�"
 
-#: builtin/pack-objects.c:3503
+#: builtin/pack-objects.c:3884
 msgid "<version>[,<offset>]"
 msgstr "<wersja>[,<pozycja>]"
 
-#: builtin/pack-objects.c:3504
+#: builtin/pack-objects.c:3885
 msgid "write the pack index file in the specified idx format version"
 msgstr "zapisz plik indeksu paczek w podanej wersji formatu indeksu"
 
-#: builtin/pack-objects.c:3507
+#: builtin/pack-objects.c:3888
 msgid "maximum size of each output pack file"
 msgstr "maksymalny rozmiar pojedynczego wyjściowego pliku paczki"
 
-#: builtin/pack-objects.c:3509
+#: builtin/pack-objects.c:3890
 msgid "ignore borrowed objects from alternate object store"
 msgstr "pomiń pożyczone obiekty z alternatywnych zbiorów obiektów"
 
-#: builtin/pack-objects.c:3511
+#: builtin/pack-objects.c:3892
 msgid "ignore packed objects"
 msgstr "ignoruj spakowane obiekty"
 
-#: builtin/pack-objects.c:3513
+#: builtin/pack-objects.c:3894
 msgid "limit pack window by objects"
 msgstr "ogranicz okno paczki w obiektach"
 
-#: builtin/pack-objects.c:3515
+#: builtin/pack-objects.c:3896
 msgid "limit pack window by memory in addition to object limit"
 msgstr "ogranicz okno paczki w pamięci oprócz limitu w obiektach"
 
-#: builtin/pack-objects.c:3517
+#: builtin/pack-objects.c:3898
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "maksymalna długość łańcucha delt dopuszczona w wynikowej paczce"
 
-#: builtin/pack-objects.c:3519
+#: builtin/pack-objects.c:3900
 msgid "reuse existing deltas"
 msgstr "użyj ponownie istniejących delt"
 
-#: builtin/pack-objects.c:3521
+#: builtin/pack-objects.c:3902
 msgid "reuse existing objects"
 msgstr "użyj ponownie istniejących obiektów"
 
-#: builtin/pack-objects.c:3523
+#: builtin/pack-objects.c:3904
 msgid "use OFS_DELTA objects"
 msgstr "użyj obiektów OFS_DELTA"
 
-#: builtin/pack-objects.c:3525
+#: builtin/pack-objects.c:3906
 msgid "use threads when searching for best delta matches"
 msgstr "użyj wątków przy wyszukiwaniu najlepiej dopasowanych delt"
 
-#: builtin/pack-objects.c:3527
+#: builtin/pack-objects.c:3908
 msgid "do not create an empty pack output"
 msgstr "nie można utworzyć pustej paczki na wyjściu"
 
-#: builtin/pack-objects.c:3529
+#: builtin/pack-objects.c:3910
 msgid "read revision arguments from standard input"
 msgstr "odczytaj argumenty rewizji ze standardowego wejścia"
 
-#: builtin/pack-objects.c:3531
+#: builtin/pack-objects.c:3912
 msgid "limit the objects to those that are not yet packed"
 msgstr "ogranicz obiekty do jeszcze nie spakowanych"
 
-#: builtin/pack-objects.c:3534
+#: builtin/pack-objects.c:3915
 msgid "include objects reachable from any reference"
 msgstr "uwzględnij obiekty osiągalne z dowolnej referencji"
 
-#: builtin/pack-objects.c:3537
+#: builtin/pack-objects.c:3918
 msgid "include objects referred by reflog entries"
 msgstr "uwzględnij obiekty z odniesieniami z wpisów dziennika referencji"
 
-#: builtin/pack-objects.c:3540
+#: builtin/pack-objects.c:3921
 msgid "include objects referred to by the index"
 msgstr "uwzględnij obiekty z odniesieniami z indeksu"
 
-#: builtin/pack-objects.c:3543
+#: builtin/pack-objects.c:3924
+msgid "read packs from stdin"
+msgstr "wczytaj paczki ze standardowego wejścia"
+
+#: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
 msgstr "wypisz paczkę na standardowe wyjście"
 
-#: builtin/pack-objects.c:3545
+#: builtin/pack-objects.c:3928
 msgid "include tag objects that refer to objects to be packed"
 msgstr "uwzględnij obiekty tagów odnoszące się do pakowanych obiektów"
 
-#: builtin/pack-objects.c:3547
+#: builtin/pack-objects.c:3930
 msgid "keep unreachable objects"
 msgstr "zachowaj nieosiÄ…galne obiekty"
 
-#: builtin/pack-objects.c:3549
+#: builtin/pack-objects.c:3932
 msgid "pack loose unreachable objects"
 msgstr "spakuj luźnie nieosiągalne obiekty"
 
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3934
 msgid "unpack unreachable objects newer than <time>"
 msgstr "rozpakuj nieosiągalne obiekty nowsze niż <czas>"
 
-#: builtin/pack-objects.c:3554
+#: builtin/pack-objects.c:3937
 msgid "use the sparse reachability algorithm"
 msgstr "użyj rzadkiego algorytmu osiągalności"
 
-#: builtin/pack-objects.c:3556
+#: builtin/pack-objects.c:3939
 msgid "create thin packs"
 msgstr "twórz wąskie paczki"
 
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3941
 msgid "create packs suitable for shallow fetches"
 msgstr "utwórz paczki odpowiednie do płytkich pobrań"
 
-#: builtin/pack-objects.c:3560
+#: builtin/pack-objects.c:3943
 msgid "ignore packs that have companion .keep file"
 msgstr "pomiń paczki, którym towarzyszy plik .keep"
 
-#: builtin/pack-objects.c:3562
+#: builtin/pack-objects.c:3945
 msgid "ignore this pack"
 msgstr "pomiń tę paczkę"
 
-#: builtin/pack-objects.c:3564
+#: builtin/pack-objects.c:3947
 msgid "pack compression level"
 msgstr "stopień kompresji paczki"
 
-#: builtin/pack-objects.c:3566
+#: builtin/pack-objects.c:3949
 msgid "do not hide commits by grafts"
 msgstr "nie ukrywaj przeszczepionych zapisów"
 
-#: builtin/pack-objects.c:3568
+#: builtin/pack-objects.c:3951
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "użyj indeksu bitmapy, jeśli dostępny, żeby przyspieszyć zliczanie obiektów"
 
-#: builtin/pack-objects.c:3570
+#: builtin/pack-objects.c:3953
 msgid "write a bitmap index together with the pack index"
 msgstr "zapisz indeks bitmapy razem z indeksem paczek"
 
-#: builtin/pack-objects.c:3574
+#: builtin/pack-objects.c:3957
 msgid "write a bitmap index if possible"
 msgstr "zapisz indeks bitmapy jeśli możliwe"
 
-#: builtin/pack-objects.c:3578
+#: builtin/pack-objects.c:3961
 msgid "handling for missing objects"
 msgstr "traktowanie brakujących obiektów"
 
-#: builtin/pack-objects.c:3581
+#: builtin/pack-objects.c:3964
 msgid "do not pack objects in promisor packfiles"
 msgstr "nie pakuj obiektów w obiecujące pliki paczek"
 
-#: builtin/pack-objects.c:3583
+#: builtin/pack-objects.c:3966
 msgid "respect islands during delta compression"
 msgstr "uszanuj wyspy podczas kompresji delt"
 
-#: builtin/pack-objects.c:3585
+#: builtin/pack-objects.c:3968
 msgid "protocol"
 msgstr "protokół"
 
-#: builtin/pack-objects.c:3586
+#: builtin/pack-objects.c:3969
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr "wyłącz w tym protokole wszystkie ustawione uploadpack.blobpackfileuri"
 
-#: builtin/pack-objects.c:3617
+#: builtin/pack-objects.c:4002
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "łańcuch delt za głęboki: %d, wymuszanie %d"
 
-#: builtin/pack-objects.c:3622
+#: builtin/pack-objects.c:4007
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit za wysoki, wymuszanie %d"
 
-#: builtin/pack-objects.c:3676
+#: builtin/pack-objects.c:4063
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr "nie można użyć --max-pack-size do budowania paczki do przesyłu"
 
-#: builtin/pack-objects.c:3678
+#: builtin/pack-objects.c:4065
 msgid "minimum pack size limit is 1 MiB"
 msgstr "minimalna granica rozmiaru paczki to 1 MiB"
 
-#: builtin/pack-objects.c:3683
+#: builtin/pack-objects.c:4070
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "nie można użyć --thin, aby zbudować indeksowalną paczkę"
 
-#: builtin/pack-objects.c:3686
+#: builtin/pack-objects.c:4073
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable i --unpack-unreachable siÄ™ wykluczajÄ…"
 
-#: builtin/pack-objects.c:3692
+#: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "nie można użyć --filter bez --stdout"
 
-#: builtin/pack-objects.c:3752
+#: builtin/pack-objects.c:4081
+msgid "cannot use --filter with --stdin-packs"
+msgstr "--filter i --stdin-packs siÄ™ wykluczajÄ…"
+
+#: builtin/pack-objects.c:4085
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr "nie można użyć listy wewnętrznych rewizji z --stdin-packs"
+
+#: builtin/pack-objects.c:4144
 msgid "Enumerating objects"
 msgstr "Wymienianie obiektów"
 
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:4181
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -18794,7 +19489,7 @@ msgstr "wygaś obiekty starsze niż <czas>"
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "ogranicz przejście do obiektów poza obiecującymi plikami paczek"
 
-#: builtin/prune.c:152
+#: builtin/prune.c:151
 msgid "cannot prune in a precious-objects repo"
 msgstr "nie można przyciąć repozytorium o cennych obiektach"
 
@@ -18807,55 +19502,59 @@ msgstr "Nieprawidłowa wartość %s: %s"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<opcje>] [<repozytorium> [<referencja>...]]"
 
-#: builtin/pull.c:123
+#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
-msgstr "sterowanie rekurencyjnym pobieraniem pod-modułów"
+msgstr "sterowanie rekurencyjnym pobieraniem podmodułów"
 
-#: builtin/pull.c:127
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Opcje zwiÄ…zane ze scalaniem"
 
-#: builtin/pull.c:130
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "wciel zmiany przez przestawienie, a nie scalanie"
 
-#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "zezwól na przewijanie"
 
-#: builtin/pull.c:167 parse-options.h:339
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "steruj użyciem skryptów pre-merge-commit i commit-msg"
+
+#: builtin/pull.c:171 parse-options.h:338
 msgid "automatically stash/stash pop before and after"
 msgstr "automatycznie dodaj zmiany do schowka przed i przywróć je po"
 
-#: builtin/pull.c:183
+#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "Opcje zwiÄ…zane z pobieraniem"
 
-#: builtin/pull.c:193
+#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "wymuś nadpisanie lokalnej gałęzi"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
-msgstr "liczba pod-modułów zaciąganych równolegle"
+msgstr "liczba podmodułów zaciąganych równolegle"
 
-#: builtin/pull.c:317
+#: builtin/pull.c:321
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Nieprawidłowa wartość 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."
 msgstr "Wśród właśnie pobranych referencji nie ma kandydata na przestawianie."
 
-#: builtin/pull.c:447
+#: builtin/pull.c:451
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "Wśród właśnie pobranych referencji nie ma kandydatów na scalanie."
 
-#: 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."
@@ -18863,7 +19562,7 @@ msgstr ""
 "Zwykle oznacza to, że podano referencję z globem bez dopasowań\n"
 "po zdalnej stronie."
 
-#: builtin/pull.c:451
+#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -18874,43 +19573,43 @@ msgstr ""
 "gałęzi.  Ponieważ nie jest to domyślne ustawione repozytorium zdalne\n"
 "dla bieżącej gałęzi, musisz podać gałąź w wierszu poleceń."
 
-#: builtin/pull.c:456 builtin/rebase.c:1253
+#: builtin/pull.c:460 builtin/rebase.c:951
 msgid "You are not currently on a branch."
 msgstr "Nie jesteś obecnie w gałęzi."
 
-#: 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 "Podaj, względem jakiej gałęzi przestawić."
 
-#: 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 "Podaj, z jaką gałęzią scalić."
 
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "Więcej szczegółów w git-pull(1)."
 
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1259
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
 msgid "<remote>"
 msgstr "<zdalne-repozytorium>"
 
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
 msgid "<branch>"
 msgstr "<gałąź>"
 
-#: builtin/pull.c:471 builtin/rebase.c:1251
+#: builtin/pull.c:475 builtin/rebase.c:949
 msgid "There is no tracking information for the current branch."
 msgstr "Bieżąca gałąź nie ma informacji o śledzeniu."
 
-#: 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 ""
 "Jeśli chcesz ustawić informacje o śledzeniu w tej gałęzi, możesz to zrobić "
 "przez:"
 
-#: builtin/pull.c:485
+#: builtin/pull.c:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -18919,20 +19618,20 @@ msgstr ""
 "Konfiguracja podaje, żeby scalić z referencją „%s�\n"
 "ze zdalnego repozytorium, ale nie pobrano stamtąd żadnej takiej."
 
-#: builtin/pull.c:596
+#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "brak dostępu do zapisu %s"
 
-#: builtin/pull.c:902
+#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "pomijanie --verify-signatures przy przestawianiu"
 
-#: builtin/pull.c:930
+#: builtin/pull.c:942
 msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"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 true   # rebase\n"
@@ -18944,9 +19643,9 @@ msgid ""
 "or --ff-only on the command line to override the configured default per\n"
 "invocation.\n"
 msgstr ""
-"Odradza się zaciągania bez podania, jak pogodzić rozbieżne gałęzie.\n"
-"Można uciszyć ten komunikat wykonując jedno z poniższych\n"
-"poleceń kiedyś przed następnym zaciągnięciem:\n"
+"Gałęzie są rozbieżne i należy podać, jak je pogodzić.\n"
+"Można to zrobić wykonując jedno z poniższych poleceń kiedyś przed\n"
+"następnym zaciągnięciem:\n"
 "\n"
 "  git config pull.rebase false  # scalenie (domyślna strategia)\n"
 "  git config pull.rebase true   # przestawienie\n"
@@ -18957,19 +19656,19 @@ msgstr ""
 "lub --ff-only w wierszu poleceń, aby zmienić ustawione zachowanie\n"
 "w jednym wywołaniu.\n"
 
-#: builtin/pull.c:991
+#: builtin/pull.c:1016
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Aktualizowanie nienarodzonej gałęzi o zmiany dodane do indeksu."
 
-#: builtin/pull.c:995
+#: builtin/pull.c:1020
 msgid "pull with rebase"
 msgstr "zaciÄ…gnij z przestawieniem"
 
-#: builtin/pull.c:996
+#: builtin/pull.c:1021
 msgid "please commit or stash them."
 msgstr "złóż je lub dodaj do schowka."
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1046
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -18980,7 +19679,7 @@ msgstr ""
 "przewijanie drzewa roboczego\n"
 "z zapisu %s."
 
-#: builtin/pull.c:1027
+#: builtin/pull.c:1052
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -18997,17 +19696,25 @@ msgstr ""
 "$ git reset --hard\n"
 "by się pozbierać."
 
-#: builtin/pull.c:1042
+#: builtin/pull.c:1067
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Nie można scalić wielu gałęzi w puste czoło."
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1072
 msgid "Cannot rebase onto multiple branches."
 msgstr "Nie można przestawić na wiele gałęzi."
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1074
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Nie można przewinąć na wiele gałęzi."
+
+#: builtin/pull.c:1088
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "Należy podać, jak godzić rozbieżne gałęzie."
+
+#: builtin/pull.c:1102
 msgid "cannot rebase with locally recorded submodule modifications"
-msgstr "nie można przestawić z lokalnie zapisanymi zmianami pod-modułów"
+msgstr "nie można przestawić z lokalnie zapisanymi zmianami podmodułów"
 
 #: builtin/push.c:19
 msgid "git push [<options>] [<repository> [<refspec>...]]"
@@ -19068,7 +19775,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nazwa-zdalnej-gałęzi>\n"
 
-#: builtin/push.c:194
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -19082,12 +19789,19 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:202
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "Bieżąca gałąź %s ma wiele gałęzi nadrzędnych, odmawiam wypchnięcia."
 
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Nie podano żadnych referencji do wypchnięcia, a push.default ma wartość "
+"„nothing�."
+
+#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -19098,14 +19812,7 @@ msgstr ""
 "bieżącej gałęzi „%s�, bez podania, co wypchnąć i na jaką\n"
 "zdalną gałąź."
 
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"Nie podano żadnych referencji do wypchnięcia, a push.default ma wartość "
-"„nothing�."
-
-#: builtin/push.c:267
+#: builtin/push.c:258
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19117,7 +19824,7 @@ msgstr ""
 "„git pull ...�) przed kolejnym wypchnięciem.\n"
 "Zobacz szczegóły w „Uwadze o przewijaniu� w „git push --help�."
 
-#: builtin/push.c:273
+#: builtin/push.c:264
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -19129,7 +19836,7 @@ msgstr ""
 "zdalne zmiany (np. „git pull ...�) przed kolejnym wypchnięciem.\n"
 "Zobacz szczegóły w „Uwadze o przewijaniu� w „git push --help�."
 
-#: builtin/push.c:279
+#: builtin/push.c:270
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -19143,12 +19850,12 @@ msgstr ""
 "zintegrować zdalne zmiany (np. „git pull ...�) przed kolejnym wypchnięciem.\n"
 "Zobacz szczegóły w „Uwadze o przewijaniu� w „git push --help�."
 
-#: builtin/push.c:286
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Aktualizacje zostały odrzucone, bo tag już istnieje w zdalnym repozytorium."
 
-#: builtin/push.c:289
+#: builtin/push.c:280
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -19158,7 +19865,7 @@ msgstr ""
 "nie będący zapisem, ani sprawić, żeby wskazywała na taki obiekt,\n"
 "chyba że użyjesz opcji „--force�.\n"
 
-#: builtin/push.c:294
+#: builtin/push.c:285
 msgid ""
 "Updates were rejected because the tip of the remote-tracking\n"
 "branch has been updated since the last checkout. You may want\n"
@@ -19170,103 +19877,103 @@ msgstr ""
 "zintegrować te zmiany lokalnie (np. „git pull ...�)\n"
 "przed wymuszeniem wypchnięcia.\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Wypychanie do %s\n"
 
-#: builtin/push.c:371
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "nie można wypchnąć niektórych referencji do „%s�"
 
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3258
 msgid "repository"
 msgstr "repozytorium"
 
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
 msgstr "wypchnij wszystkie referencje"
 
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr "odwzoruj wszystkie referencje"
 
-#: builtin/push.c:557
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "usuń referencje"
 
-#: builtin/push.c:558
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
-msgstr "wypchnij tagi (nie może być użyte z --all ani --mirror)"
+msgstr "wypchnij tagi (nie można użyć z --all ani --mirror)"
 
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "wymuszone aktualizacje"
 
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "<referencja>:<oczekiwana>"
 
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
 msgid "require old value of ref to be at this value"
 msgstr "wymagaj, żeby stara wartość referencji wskazywała tę wartość"
 
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
 msgid "require remote updates to be integrated locally"
 msgstr "wymagaj, by zdalne aktualizacje były wcielone lokalnie"
 
-#: builtin/push.c:569
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
-msgstr "steruj rekurencyjnym wypychaniem pod-modułów"
+msgstr "steruj rekurencyjnym wypychaniem podmodułów"
 
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
 msgid "use thin pack"
 msgstr "użyj wąskiej paczki"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "program do odbierania paczek"
 
-#: builtin/push.c:573
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "ustaw gałąź nadrzędną do git pull/status"
 
-#: builtin/push.c:576
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "przytnij lokalnie usunięte referencje"
 
-#: builtin/push.c:578
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "omiń skrypt pre-push"
 
-#: builtin/push.c:579
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "wypchnij brakujÄ…ce, ale majÄ…ce zwiÄ…zek tagi"
 
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
 msgstr "podpisz wypchnięcie GPG"
 
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
 msgid "request atomic transaction on remote side"
 msgstr "zażądaj atomowej transakcji po stronie zdalnej"
 
-#: builtin/push.c:601
+#: builtin/push.c:592
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete wyklucza siÄ™ z --all, --mirror i --tags"
 
-#: builtin/push.c:603
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete nie ma sensu bez żadnych referencji"
 
-#: builtin/push.c:623
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "złe repozytorium „%s�"
 
-#: builtin/push.c:624
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -19288,27 +19995,27 @@ msgstr ""
 "\n"
 "    git push <nazwa>\n"
 
-#: builtin/push.c:639
+#: builtin/push.c:630
 msgid "--all and --tags are incompatible"
 msgstr "--all i --tags siÄ™ wykluczajÄ…"
 
-#: builtin/push.c:641
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
-msgstr "--all i referencje wykluczajÄ… siÄ™"
+msgstr "--all i referencje siÄ™ wykluczajÄ…"
 
-#: builtin/push.c:645
+#: builtin/push.c:636
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror i --tags siÄ™ wykluczajÄ…"
 
-#: builtin/push.c:647
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
-msgstr "--mirror i referencje wykluczajÄ… siÄ™"
+msgstr "--mirror i referencje siÄ™ wykluczajÄ…"
 
-#: builtin/push.c:650
+#: builtin/push.c:641
 msgid "--all and --mirror are incompatible"
 msgstr "--all i --mirror siÄ™ wykluczajÄ…"
 
-#: builtin/push.c:657
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "opcje wypychania nie mogą zawierać znaków końca wiersza"
 
@@ -19326,10 +20033,6 @@ msgstr "git range-diff [<opcje>] <stary-czubek>...<nowy-czubek>"
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<opcje>] <podstawa> <stary-czubek> <nowy-czubek>"
 
-#: builtin/range-diff.c:28
-msgid "Percentage by which creation is weighted"
-msgstr "Procent, według jakiego ważone jest tworzenie"
-
 #: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "użyj prostych kolorów zmian"
@@ -19366,82 +20069,82 @@ msgstr "potrzeba dwóch zakresów zapisów"
 #: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-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=<plik>] (--empty | <drzewo1> [<drzewo2> [<drzewo3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<prefiks>) [-u | -i]] [--no-sparse-checkout] [--index-output=<plik>] "
+"(--empty | <drzewo1> [<drzewo2> [<drzewo3>]])"
 
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "zapisz wynikowy indeks w <pliku>"
 
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "tylko opróżnij indeks"
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "Scalanie"
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
 msgid "perform a merge in addition to a read"
 msgstr "dokonaj scalenia oprócz odczytu"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
 msgid "3-way merge if no file level merging required"
 msgstr "trójstronne scalanie jeśli nie trzeba scalać na poziomie plików"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
 msgid "3-way merge in presence of adds and removes"
 msgstr "trójstronne scalanie w obecności dodań i usunięć"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "to samo, co -m, ale odrzuć niescalone elementy"
 
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<podkatalog>/"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "wczytaj drzewo do indeksu w <podkatalogu>/"
 
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
 msgid "update working tree with merge result"
 msgstr "zaktualizuj drzewo robocze wynikiem scalenia"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "zezwól na nadpisywanie jawnie ignorowanych plików"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
 msgid "don't check the working tree after merging"
 msgstr "nie sprawdzaj drzewa roboczego po scaleniu"
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
 msgid "don't update the index or the work tree"
 msgstr "nie aktualizuj indeksu ani drzewa roboczego"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
 msgid "skip applying sparse checkout filter"
 msgstr "pomiń stosowanie filtru rzadkiego wybrania"
 
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "odpluskwianie unpack-trees"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "pomiń komunikaty zwrotne"
 
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
 msgid "You need to resolve your current index first"
 msgstr "Musisz najpierw rozwiązać bieżący indeks"
 
@@ -19464,193 +20167,44 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "lista zadań do zrobienia się nie nadaje: „%s�"
-
-#: builtin/rebase.c:312
+#: builtin/rebase.c:230
 #, c-format
 msgid "could not create temporary %s"
 msgstr "nie można utworzyć tymczasowego %s"
 
-#: builtin/rebase.c:318
+#: builtin/rebase.c:236
 msgid "could not mark as interactive"
 msgstr "nie można oznaczyć jako interaktywne"
 
-#: builtin/rebase.c:371
+#: builtin/rebase.c:289
 msgid "could not generate todo list"
 msgstr "nie można wygenerować listy zadań do zrobienia"
 
-#: builtin/rebase.c:413
+#: builtin/rebase.c:331
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "zapis podstawy należy podać z --upstream lub --onto"
 
-#: builtin/rebase.c:482
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<opcje>]"
-
-#: builtin/rebase.c:495 builtin/rebase.c:1394
-msgid "keep commits which start empty"
-msgstr "zachowaj zapisy, które zaczynają puste"
-
-#: builtin/rebase.c:499 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "pozwól na zapisy z pustymi komunikatami"
-
-#: builtin/rebase.c:501
-msgid "rebase merge commits"
-msgstr "przestawiaj zapisy scaleń"
-
-#: builtin/rebase.c:503
-msgid "keep original branch points of cousins"
-msgstr "zachowaj pierwotne rozgałęzienia kuzynów"
-
-#: builtin/rebase.c:505
-msgid "move commits that begin with squash!/fixup!"
-msgstr "przenieś zapisy, które zaczynają się od squash!/fixup!"
-
-#: builtin/rebase.c:506
-msgid "sign commits"
-msgstr "podpisuj zapisy"
-
-#: builtin/rebase.c:508 builtin/rebase.c:1333
-msgid "display a diffstat of what changed upstream"
-msgstr "wyświetl statystyki zmian nadrzędnych"
-
-#: builtin/rebase.c:510
-msgid "continue rebase"
-msgstr "kontynuuj przestawianie"
-
-#: builtin/rebase.c:512
-msgid "skip commit"
-msgstr "pomiń zapis"
-
-#: builtin/rebase.c:513
-msgid "edit the todo list"
-msgstr "edytuj listę zadań do zrobienia"
-
-#: builtin/rebase.c:515
-msgid "show the current patch"
-msgstr "pokaż bieżącą łatkę"
-
-#: builtin/rebase.c:518
-msgid "shorten commit ids in the todo list"
-msgstr "skróć identyfikatory zapisów na liście zadań do zrobienia"
-
-#: builtin/rebase.c:520
-msgid "expand commit ids in the todo list"
-msgstr "rozwiń identyfikatory zapisów na liście zadań do zrobienia"
-
-#: builtin/rebase.c:522
-msgid "check the todo list"
-msgstr "sprawdź listę zadań do zrobienia"
-
-#: builtin/rebase.c:524
-msgid "rearrange fixup/squash lines"
-msgstr "zmień kolejność wierszy fixup/squash"
-
-#: builtin/rebase.c:526
-msgid "insert exec commands in todo list"
-msgstr "wstaw polecenia exec na listę zadań do zrobienia"
-
-#: builtin/rebase.c:527
-msgid "onto"
-msgstr "na"
-
-#: builtin/rebase.c:530
-msgid "restrict-revision"
-msgstr "ogranicz-rewizjÄ™"
-
-#: builtin/rebase.c:530
-msgid "restrict revision"
-msgstr "ogranicz rewizjÄ™"
-
-#: builtin/rebase.c:532
-msgid "squash-onto"
-msgstr "spłaszcz-na"
-
-#: builtin/rebase.c:533
-msgid "squash onto"
-msgstr "spłaszcz na"
-
-#: builtin/rebase.c:535
-msgid "the upstream commit"
-msgstr "zapis głównego nurtu"
-
-#: builtin/rebase.c:537
-msgid "head-name"
-msgstr "nazwa-czoła"
-
-#: builtin/rebase.c:537
-msgid "head name"
-msgstr "nazwa czoła"
-
-#: builtin/rebase.c:542
-msgid "rebase strategy"
-msgstr "strategia przestawiania"
-
-#: builtin/rebase.c:543
-msgid "strategy-opts"
-msgstr "opcje-strategii"
-
-#: builtin/rebase.c:544
-msgid "strategy options"
-msgstr "opcje strategii"
-
-#: builtin/rebase.c:545
-msgid "switch-to"
-msgstr "przełącz-na"
-
-#: builtin/rebase.c:546
-msgid "the branch or commit to checkout"
-msgstr "gałąź lub zapis do wybrania"
-
-#: builtin/rebase.c:547
-msgid "onto-name"
-msgstr "nazwa-na"
-
-#: builtin/rebase.c:547
-msgid "onto name"
-msgstr "nazwa rewizji „na�"
-
-#: builtin/rebase.c:548
-msgid "cmd"
-msgstr "polecenie"
-
-#: builtin/rebase.c:548
-msgid "the command to run"
-msgstr "polecenie do wykonania"
-
-#: builtin/rebase.c:551 builtin/rebase.c:1427
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "automatycznie przeplanuj każdy nieudany „exec�"
-
-#: builtin/rebase.c:567
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins nic nie robi bez --rebase-merges"
-
-#: builtin/rebase.c:583
+#: builtin/rebase.c:390
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s wymaga silnika scalenia"
 
-#: builtin/rebase.c:626
+#: builtin/rebase.c:432
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "nie można uzyskać „onto�: „%s�"
 
-#: builtin/rebase.c:643
+#: builtin/rebase.c:449
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "nieprawidłowe pierwotne czoło: „%s�"
 
-#: builtin/rebase.c:668
+#: builtin/rebase.c:474
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "pomijanie błędnego allow_rerere_autoupdate: „%s�"
 
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19664,7 +20218,7 @@ msgstr ""
 "Aby przerwać i powrócić do stanu sprzed „git rebase�, wykonaj „git rebase --"
 "abort�."
 
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
 #, c-format
 msgid ""
 "\n"
@@ -19683,7 +20237,7 @@ msgstr ""
 "\n"
 "Z tego powodu git nie może ich przestawić."
 
-#: builtin/rebase.c:1227
+#: builtin/rebase.c:925
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -19692,7 +20246,7 @@ msgstr ""
 "nierozpoznany pusty rodzaj „%s�; prawidłowe wartości to „drop�, „keep� i "
 "„ask�."
 
-#: builtin/rebase.c:1245
+#: builtin/rebase.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -19709,7 +20263,7 @@ msgstr ""
 "    git rebase '<gałąź>'\n"
 "\n"
 
-#: builtin/rebase.c:1261
+#: builtin/rebase.c:959
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -19722,191 +20276,192 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<gałąź> %s\n"
 "\n"
 
-#: builtin/rebase.c:1291
+#: builtin/rebase.c:989
 msgid "exec commands cannot contain newlines"
 msgstr "polecenia exec nie mogą zawierać znaków nowego wiersza"
 
-#: builtin/rebase.c:1295
+#: builtin/rebase.c:993
 msgid "empty exec command"
 msgstr "puste polecenie exec"
 
-#: builtin/rebase.c:1324
+#: builtin/rebase.c:1023
 msgid "rebase onto given branch instead of upstream"
 msgstr "przestaw na podaną gałąź zamiast na główny nurt"
 
-#: builtin/rebase.c:1326
+#: builtin/rebase.c:1025
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "użyj podstawy scalania głównego nurtu i gałęzi jako bieżącej podstawy"
 
-#: builtin/rebase.c:1328
+#: builtin/rebase.c:1027
 msgid "allow pre-rebase hook to run"
 msgstr "pozwól wykonać skrypt pre-rebase"
 
-#: builtin/rebase.c:1330
+#: builtin/rebase.c:1029
 msgid "be quiet. implies --no-stat"
 msgstr "bądź cicho. zakłada --no-stat"
 
-#: builtin/rebase.c:1336
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "wyświetl statystyki zmian nadrzędnych"
+
+#: builtin/rebase.c:1035
 msgid "do not show diffstat of what changed upstream"
 msgstr "nie pokazuj statystyk różnic ze zmian głównego nurtu"
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1038
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "dodaj końcówkę Signed-off-by do każdego zapisu"
 
-#: builtin/rebase.c:1342
+#: builtin/rebase.c:1041
 msgid "make committer date match author date"
 msgstr "ustaw datę złożenia na datę utworzenia"
 
-#: builtin/rebase.c:1344
+#: builtin/rebase.c:1043
 msgid "ignore author date and use current date"
 msgstr "pomiń datę utworzenia i użyj bieżącej"
 
-#: builtin/rebase.c:1346
+#: builtin/rebase.c:1045
 msgid "synonym of --reset-author-date"
 msgstr "zamiennik na --reset-author-date"
 
-#: builtin/rebase.c:1348 builtin/rebase.c:1352
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
 msgid "passed to 'git apply'"
 msgstr "przekaż do „git apply�"
 
-#: builtin/rebase.c:1350
+#: builtin/rebase.c:1049
 msgid "ignore changes in whitespace"
 msgstr "ignoruj zmiany w białych znakach"
 
-#: builtin/rebase.c:1354 builtin/rebase.c:1357
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "dobierz wszystkie zapisy, nawet jeśli niezmienione"
 
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1058
 msgid "continue"
 msgstr "kontynuuj"
 
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1061
 msgid "skip current patch and continue"
 msgstr "pomiń obecną łatkę i kontynuuj"
 
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1063
 msgid "abort and check out the original branch"
 msgstr "przerwij i wybierz pierwotną gałąź"
 
-#: builtin/rebase.c:1367
+#: builtin/rebase.c:1066
 msgid "abort but keep HEAD where it is"
 msgstr "przerwij, ale zostaw HEAD, gdzie jest"
 
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1067
 msgid "edit the todo list during an interactive rebase"
 msgstr "edytuj listę zadań do zrobienia podczas interaktywnego przestawiania"
 
-#: builtin/rebase.c:1371
+#: builtin/rebase.c:1070
 msgid "show the patch file being applied or merged"
 msgstr "pokaż plik łatki właśnie stosowanej lub scalanej"
 
-#: builtin/rebase.c:1374
+#: builtin/rebase.c:1073
 msgid "use apply strategies to rebase"
 msgstr "użyj strategii stosowania do przestawiania"
 
-#: builtin/rebase.c:1378
+#: builtin/rebase.c:1077
 msgid "use merging strategies to rebase"
 msgstr "użyj strategii scalania do przestawiania"
 
-#: builtin/rebase.c:1382
+#: builtin/rebase.c:1081
 msgid "let the user edit the list of commits to rebase"
 msgstr "pozwól użytkownikowi edytować listę zapisów do przestawienia"
 
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1085
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "(PRZESTARZA�E) spróbuj odtworzyć scalenia zamiast je pomijać"
 
-#: builtin/rebase.c:1391
+#: builtin/rebase.c:1090
 msgid "how to handle commits that become empty"
 msgstr "jak traktować zapisy, które staną się puste"
 
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "zachowaj zapisy, które zaczynają puste"
+
+#: builtin/rebase.c:1097
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "przenieś zapisy, które zaczynają się od squash!/fixup! pod -i"
 
-#: builtin/rebase.c:1405
+#: builtin/rebase.c:1104
 msgid "add exec lines after each commit of the editable list"
 msgstr "dodaj wiersz exec po każdym zapisie z edytowalnej listy"
 
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1108
 msgid "allow rebasing commits with empty messages"
 msgstr "pozwól przestawiać zapisy z pustymi komunikatami"
 
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1112
 msgid "try to rebase merges instead of skipping them"
 msgstr "spróbuj przestawić scalenia zamiast je pomijać"
 
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1115
 msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr "użyj „git merge-base --fork-point�, aby poprawić gałąź nadrzędną"
+msgstr "użyj „merge-base --fork-point�, aby poprawić gałąź nadrzędną"
 
-#: builtin/rebase.c:1418
+#: builtin/rebase.c:1117
 msgid "use the given merge strategy"
 msgstr "użyj podanej strategii scalania"
 
-#: builtin/rebase.c:1420 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
 msgid "option"
 msgstr "opcja"
 
-#: builtin/rebase.c:1421
+#: builtin/rebase.c:1120
 msgid "pass the argument through to the merge strategy"
 msgstr "przekaż argument do strategii scalania"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1123
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "przestaw wszystkie osiągalne zapisy aż do korzenia"
 
-#: builtin/rebase.c:1429
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "automatycznie przeplanuj każdy nieudany „exec�"
+
+#: builtin/rebase.c:1128
 msgid "apply all changes, even those already present upstream"
 msgstr "zastosuj wszystkie zmiany, nawet te już obecne w głównym nurcie"
 
-#: builtin/rebase.c:1446
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"wsparcie rebase.useBuiltin zostało usunięte!\n"
-"Zobacz szczegóły pod jego opisem w „git help config�."
-
-#: builtin/rebase.c:1452
+#: builtin/rebase.c:1149
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Wygląda, że trwa „git am�. Nie można przestawić."
 
-#: builtin/rebase.c:1493
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges jest przestarzałe. Użyj zamiast tego --rebase-"
-"merges."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges zostało zastąpione --rebase-merges"
 
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1193
 msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "„--keep-base� i „--onto� się wykluczają."
+msgstr "„--keep-base� i „--onto� się wykluczają"
 
-#: builtin/rebase.c:1500
+#: builtin/rebase.c:1195
 msgid "cannot combine '--keep-base' with '--root'"
-msgstr "„--keep-base� i „--root� się wykluczają."
+msgstr "„--keep-base� i „--root� się wykluczają"
 
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1199
 msgid "cannot combine '--root' with '--fork-point'"
-msgstr "„--keep-base� i „--fork-point� się wykluczają."
+msgstr "„--root� i „--fork-point� się wykluczają"
 
-#: builtin/rebase.c:1507
+#: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Nie trwa żadne przestawianie?"
 
-#: builtin/rebase.c:1511
+#: builtin/rebase.c:1206
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
-"Akcja --edit-todo może być użyta tylko podczas interaktywnego przestawiania."
+"Działania --edit-todo można użyć tylko podczas interaktywnego przestawiania."
 
-#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Nie można odczytać HEAD"
 
-#: builtin/rebase.c:1546
+#: builtin/rebase.c:1241
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -19914,16 +20469,16 @@ msgstr ""
 "Musisz edytować wszystkie konflikty scalania\n"
 "i oznaczyć je jako rozwiązane przy pomocy git add"
 
-#: builtin/rebase.c:1565
+#: builtin/rebase.c:1260
 msgid "could not discard worktree changes"
 msgstr "nie można odrzucić zmian w drzewie roboczym"
 
-#: builtin/rebase.c:1584
+#: builtin/rebase.c:1279
 #, c-format
 msgid "could not move back to %s"
 msgstr "nie można cofnąć do %s"
 
-#: builtin/rebase.c:1630
+#: builtin/rebase.c:1325
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -19944,140 +20499,131 @@ msgstr ""
 "i wykonaj mnie ponownie. Przerywam na wypadek, gdyby było tam\n"
 "coÅ› cennego.\n"
 
-#: builtin/rebase.c:1658
+#: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
 msgstr "przełącznik „C� oczekuje wartości liczbowej"
 
-#: builtin/rebase.c:1700
+#: builtin/rebase.c:1395
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Nieznany tryb: %s"
 
-#: builtin/rebase.c:1739
+#: builtin/rebase.c:1434
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy wymaga --merge lub --interactive"
 
-#: builtin/rebase.c:1769
+#: builtin/rebase.c:1463
 msgid "cannot combine apply options with merge options"
 msgstr "nie można łączyć opcji stosowania z opcjami scalania"
 
-#: builtin/rebase.c:1782
+#: builtin/rebase.c:1476
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Nieznany silnik przestawiania: %s"
 
-#: builtin/rebase.c:1812
+#: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
-msgstr "--reschedule-failed wymaga --exec lub --interactive"
-
-#: builtin/rebase.c:1832
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "„--preserve-merges� i „--rebase-merges� się wykluczają"
-
-#: builtin/rebase.c:1836
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr "błąd: „--preserve-merges� i „--reschedule-failed-exec� się wykluczają"
+msgstr "--reschedule-failed-exec wymaga --exec lub --interactive"
 
-#: builtin/rebase.c:1860
+#: builtin/rebase.c:1536
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "nieprawidłowa gałąź nadrzędna „%s�"
 
-#: builtin/rebase.c:1866
+#: builtin/rebase.c:1542
 msgid "Could not create new root commit"
 msgstr "Nie można utworzyć nowego zapisu korzenia"
 
-#: builtin/rebase.c:1892
+#: builtin/rebase.c:1568
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "„%s�: potrzeba dokładnie jednej podstawy scalania z gałęzią"
 
-#: builtin/rebase.c:1895
+#: builtin/rebase.c:1571
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "„%s�: potrzeba dokładnie jednej podstawy scalania"
 
-#: builtin/rebase.c:1903
+#: builtin/rebase.c:1580
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "Nie wskazuje na prawidłowy zapis „%s�"
 
-#: builtin/rebase.c:1931
+#: builtin/rebase.c:1607
 #, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "błąd krytyczny: brak gałęzi/zapisu „%s�"
+msgid "no such branch/commit '%s'"
+msgstr "brak gałęzi/zapisu „%s�"
 
-#: builtin/rebase.c:1939 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2414
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2658
 #, c-format
 msgid "No such ref: %s"
 msgstr "Nie ma takiej referencji: %s"
 
-#: builtin/rebase.c:1950
+#: builtin/rebase.c:1629
 msgid "Could not resolve HEAD to a revision"
 msgstr "Nie można rozwiązać HEAD do rewizji"
 
-#: builtin/rebase.c:1971
+#: builtin/rebase.c:1650
 msgid "Please commit or stash them."
 msgstr "Złóż je lub dodaj do schowka."
 
-#: builtin/rebase.c:2007
+#: builtin/rebase.c:1686
 #, c-format
 msgid "could not switch to %s"
 msgstr "nie można przełączyć na %s"
 
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1697
 msgid "HEAD is up to date."
 msgstr "HEAD jest aktualne."
 
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1699
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Obecna gałąź %s jest aktualna.\n"
 
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1707
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD jest aktualne, wymuszono przestawianie."
 
-#: builtin/rebase.c:2030
+#: builtin/rebase.c:1709
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Bieżąca gałąź %s jest aktualna, wymuszono przestawianie.\n"
 
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1717
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Skrypt pre-rebase odmówił przestawiania."
 
-#: builtin/rebase.c:2045
+#: builtin/rebase.c:1724
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Zmiany w %s:\n"
 
-#: builtin/rebase.c:2048
+#: builtin/rebase.c:1727
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Zmiany z %s na %s:\n"
 
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1752
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr "Najpierw cofanie czoła gałęzi, aby odtworzyć na nim pracę...\n"
 
-#: builtin/rebase.c:2082
+#: builtin/rebase.c:1761
 msgid "Could not detach HEAD"
 msgstr "Nie można odłączyć HEAD"
 
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:1770
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Przewinięto %s do %s.\n"
 
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <katalog-gita>"
 
-#: builtin/receive-pack.c:1276
+#: builtin/receive-pack.c:1280
 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"
@@ -20107,7 +20653,7 @@ msgstr ""
 "Aby wyciszyć tę wiadomość i utrzymać domyślne zachowanie, ustaw\n"
 "wartość konfiguracji „receive.denyCurrentBranch� na „refuse�."
 
-#: builtin/receive-pack.c:1296
+#: builtin/receive-pack.c:1300
 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"
@@ -20127,7 +20673,7 @@ msgstr ""
 "\n"
 "Żeby wyciszyć ten komunikat, możesz ustawić ją na „refuse�."
 
-#: builtin/receive-pack.c:2481
+#: builtin/receive-pack.c:2480
 msgid "quiet"
 msgstr "cicho"
 
@@ -20172,7 +20718,7 @@ msgstr "Oznaczanie osiągalnych obiektów..."
 msgid "%s points nowhere!"
 msgstr "%s nigdzie nie wskazuje!"
 
-#: builtin/reflog.c:699
+#: builtin/reflog.c:700
 msgid "no reflog specified to delete"
 msgstr "nie podano dziennika referencji do skasowania"
 
@@ -20328,7 +20874,7 @@ msgstr "podanie głównej gałęzi nie ma sensu z --mirror"
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "podanie gałęzi do śledzenia ma sens tylko ze zwierciadłami pobierania"
 
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
 #, c-format
 msgid "remote %s already exists."
 msgstr "zdalne repozytorium %s już istnieje."
@@ -20338,25 +20884,30 @@ msgstr "zdalne repozytorium %s już istnieje."
 msgid "Could not setup master '%s'"
 msgstr "Nie można ustawić głównej gałęzi „%s�"
 
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "nierozpoznane branch.%s.rebase=%s; zakładam „true�"
+
+#: builtin/remote.c:366
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Nie można pobrać mapy do referencji %s"
 
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
 msgid "(matching)"
 msgstr "(pasujÄ…ce)"
 
-#: builtin/remote.c:466
+#: builtin/remote.c:472
 msgid "(delete)"
 msgstr "(usunięcie)"
 
-#: builtin/remote.c:655
+#: builtin/remote.c:660
 #, c-format
 msgid "could not set '%s'"
 msgstr "nie można ustawić „%s�"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:665
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -20367,17 +20918,17 @@ msgstr ""
 "\t%s:%d\n"
 "wskazuje teraz nieistniejące zdalne repozytorium „%s�"
 
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Nie ma takiego zdalnego repozytorium: „%s�"
 
-#: builtin/remote.c:710
+#: builtin/remote.c:715
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Nie można zmienić nazwy rozdziału konfiguracji „%s� na „%s�"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:735
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -20388,17 +20939,17 @@ msgstr ""
 "\t%s\n"
 "\tJeśli to konieczne, zaktualizuj ustawienia ręcznie."
 
-#: builtin/remote.c:770
+#: builtin/remote.c:775
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "nie można usunąć „%s�"
 
-#: builtin/remote.c:804
+#: builtin/remote.c:809
 #, c-format
 msgid "creating '%s' failed"
 msgstr "nie można utworzyć „%s�"
 
-#: builtin/remote.c:882
+#: builtin/remote.c:887
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -20415,118 +20966,118 @@ msgstr[2] ""
 "Uwaga: nie usuwam gałęzi poza hierarchią refs/remotes/;\n"
 "aby je usunąć, użyj:"
 
-#: builtin/remote.c:896
+#: builtin/remote.c:901
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Nie można usunąć rozdziału konfiguracji „%s�"
 
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nowe (następne pobranie zapisze w remotes/%s)"
 
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
 msgid " tracked"
 msgstr " śledzone"
 
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " zastała (użyj „git remote prune�, aby usunąć)"
 
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "złe branch.%s.merge; nie można przestawiać na > 1 gałąź"
 
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "przestawia interaktywnie na zdalne repozytorium %s"
 
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "przestawia interaktywnie (ze scaleniami) na zdalne repozytorium %s"
 
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "przestawia siÄ™ na zdalne repozytorium %s"
 
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
 #, c-format
 msgid " merges with remote %s"
 msgstr " scala siÄ™ ze zdalnym repozytorium %s"
 
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
 #, c-format
 msgid "merges with remote %s"
 msgstr "scala siÄ™ ze zdalnym repozytorium %s"
 
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    i ze zdalnym repozytorium %s\n"
 
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
 msgid "create"
 msgstr "utwórz"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
 msgid "delete"
 msgstr "usuń"
 
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
 msgid "up to date"
 msgstr "aktualne"
 
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
 msgid "fast-forwardable"
 msgstr "przewijalne"
 
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
 msgid "local out of date"
 msgstr "lokalna nieaktualna"
 
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s wymusza na %-*s (%s)"
 
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s wypycha na %-*s (%s)"
 
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s wymusza na %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s wypycha na %s"
 
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
 msgid "do not query remotes"
 msgstr "nie odpytuj zdalnych repozytoriów"
 
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
 msgstr "* zdalne repozytorium %s"
 
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  Adres do pobierania: %s"
 
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
 msgid "(no URL)"
 msgstr "(brak adresu URL)"
 
@@ -20534,25 +21085,25 @@ msgstr "(brak adresu URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  Adres do wypychania: %s"
 
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  gałąź HEAD: %s"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
 msgid "(not queried)"
 msgstr "(nie odpytano)"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
 msgid "(unknown)"
 msgstr "(nieznane)"
 
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -20560,7 +21111,7 @@ msgstr ""
 "  gałąź HEAD (zdalne HEAD jest niejednoznaczne, może być jednym z "
 "następujących):\n"
 
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
@@ -20568,22 +21119,22 @@ msgstr[0] "  Zdalna gałąź:%s"
 msgstr[1] "  Zdalne gałęzie:%s"
 msgstr[2] "  Zdalne gałęzie:%s"
 
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
 msgid " (status not queried)"
 msgstr " (nie odpytano stanu)"
 
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Lokalna gałąź ustawiona do „git pull�:"
 msgstr[1] "  Lokalne gałęzie ustawione do „git pull�:"
 msgstr[2] "  Lokalne gałęzie ustawione do „git pull�:"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Lokalne referencje będą odzwierciedlane przez „git push�"
 
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
@@ -20591,132 +21142,136 @@ msgstr[0] "  Lokalna referencja ustawiona do „git push�%s:"
 msgstr[1] "  Lokalne referencje ustawione do „git push�%s:"
 msgstr[2] "  Lokalne referencje ustawione do „git push�%s:"
 
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "ustaw refs/remotes/<nazwa>/HEAD według zdalnego repozytorium"
 
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "usuń refs/remotes/<nazwa>/HEAD"
 
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
 msgid "Cannot determine remote HEAD"
 msgstr "Nie można ustalić zdalnego HEAD"
 
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Wiele gałęzi HEAD. Wybierz jedną jawnie przez:"
 
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
 #, c-format
 msgid "Could not delete %s"
 msgstr "Nie można usunąć %s"
 
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Nieprawidłowa referencja: %s"
 
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
 #, c-format
 msgid "Could not setup %s"
 msgstr "Nie można ustawić %s"
 
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s będzie wiszący!"
 
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s stał się wiszący!"
 
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
 #, c-format
 msgid "Pruning %s"
 msgstr "Przycinanie %s"
 
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
 #, c-format
 msgid "URL: %s"
 msgstr "Adres URL: %s"
 
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [przycięto by] %s"
 
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [przycięto] %s"
 
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
 msgid "prune remotes after fetching"
 msgstr "przytnij zdalne repozytoria po pobraniu"
 
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Nie ma takiego zdalnego repozytorium „%s�"
 
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
 msgid "add branch"
 msgstr "dodaj gałąź"
 
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
 msgid "no remote specified"
 msgstr "nie podano zdalnego repozytorium"
 
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
 msgid "query push URLs rather than fetch URLs"
 msgstr "operuj na adresach wypychania zamiast pobierania"
 
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
 msgid "return all URLs"
 msgstr "zwróć wszystkie adresy URL"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "zdalne repozytorium „%s� nie ma skonfigurowanych adresów"
 
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
 msgid "manipulate push URLs"
 msgstr "operuj na adresach wypychania"
 
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
 msgid "add URL"
 msgstr "dodaj adres URL"
 
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
 msgid "delete URLs"
 msgstr "usuń adresy URL"
 
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete nie ma sensu"
 
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Nieprawidłowy stary wzorzec adresu: %s"
 
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Nie znaleziono takiego adresu URL: %s"
 
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
 msgid "Will not delete all non-push URLs"
 msgstr "Nie skasuje wszystkich adresów nie do wypychania"
 
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "więcej komunikatów; musi być umieszczone przed pod-poleceniem"
+
+#: builtin/repack.c:28
 msgid "git repack [<options>]"
 msgstr "git repack [<opcje>]"
 
-#: builtin/repack.c:31
+#: builtin/repack.c:33
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -20724,118 +21279,154 @@ msgstr ""
 "Przyrostowe przepakowania są niekompatybilne z indeksami bitmap.  Użyj\n"
 "--no-write-bitmap-index lub wyłącz konfigurację pack.writebitmaps."
 
-#: builtin/repack.c:198
+#: builtin/repack.c:201
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "nie można uruchomić pack-objects, żeby przepakować obiecujące obiekty"
 
-#: builtin/repack.c:270 builtin/repack.c:446
+#: builtin/repack.c:273 builtin/repack.c:816
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 "repack: Oczekiwano tylko wierszy z pełnych szesnastkowych identyfikatorów "
 "obiektów z pack-objects."
 
-#: builtin/repack.c:294
+#: builtin/repack.c:297
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "nie można ukończyć pack-objects, żeby przepakować obiecujące obiekty"
 
-#: builtin/repack.c:322
+#: builtin/repack.c:312
+#, c-format
+msgid "cannot open index for %s"
+msgstr "nie można otworzyć indeksu dla %s"
+
+#: builtin/repack.c:371
+#, c-format
+msgid "pack %s too large to consider in geometric progression"
+msgstr "paczka %s za duża do rozważania w postępie geometrycznym"
+
+#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr "paczka %s za duża do zwiększenia"
+
+#: builtin/repack.c:496
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "nie można otworzyć tymczasowego pliku %s do zapisywania"
+
+#: builtin/repack.c:514
+msgid "could not close refs snapshot tempfile"
+msgstr "nie można zamknąć pliku tymczasowego obrazu referencji"
+
+#: builtin/repack.c:628
 msgid "pack everything in a single pack"
 msgstr "spakuj wszystko w jednÄ… paczkÄ™"
 
-#: builtin/repack.c:324
+#: builtin/repack.c:630
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "to samo, co -a, i zamień nieosiągalne obiekty w luźne"
 
-#: builtin/repack.c:327
+#: builtin/repack.c:633
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "usuń zbędne paczki i wykonaj git-prune-packed"
 
-#: builtin/repack.c:329
+#: builtin/repack.c:635
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "przekaż --no-reuse-delta do git-pack-objects"
 
-#: builtin/repack.c:331
+#: builtin/repack.c:637
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "przekaż --no-reuse-object do git-pack-objects"
 
-#: builtin/repack.c:333
+#: builtin/repack.c:639
 msgid "do not run git-update-server-info"
 msgstr "nie wykonuj git-update-server-info"
 
-#: builtin/repack.c:336
+#: builtin/repack.c:642
 msgid "pass --local to git-pack-objects"
 msgstr "przekaż --local do git-pack-objects"
 
-#: builtin/repack.c:338
+#: builtin/repack.c:644
 msgid "write bitmap index"
 msgstr "zapisz indeks bitmapy"
 
-#: builtin/repack.c:340
+#: builtin/repack.c:646
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "przekaż --delta-islands do git-pack-objects"
 
-#: builtin/repack.c:341
+#: builtin/repack.c:647
 msgid "approxidate"
 msgstr "przybliżona-data"
 
-#: builtin/repack.c:342
+#: builtin/repack.c:648
 msgid "with -A, do not loosen objects older than this"
 msgstr "z -A, nie luzuj obiektów starszych niż podana data"
 
-#: builtin/repack.c:344
+#: builtin/repack.c:650
 msgid "with -a, repack unreachable objects"
 msgstr "z -a przepakuj wszystkie nieosiÄ…galne obiekty"
 
-#: builtin/repack.c:346
+#: builtin/repack.c:652
 msgid "size of the window used for delta compression"
 msgstr "rozmiar okna użytego do kompresji delt"
 
-#: builtin/repack.c:347 builtin/repack.c:353
+#: builtin/repack.c:653 builtin/repack.c:659
 msgid "bytes"
 msgstr "bajty"
 
-#: builtin/repack.c:348
+#: builtin/repack.c:654
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "jak wyżej, ale ogranicz rozmiar pamięci zamiast liczby elementów"
 
-#: builtin/repack.c:350
+#: builtin/repack.c:656
 msgid "limits the maximum delta depth"
 msgstr "ogranicza maksymalną głębokość delty"
 
-#: builtin/repack.c:352
+#: builtin/repack.c:658
 msgid "limits the maximum number of threads"
 msgstr "ogranicza maksymalną liczbę wątków"
 
-#: builtin/repack.c:354
+#: builtin/repack.c:660
 msgid "maximum size of each packfile"
 msgstr "maksymalny rozmiar pojedynczego pliku paczki"
 
-#: builtin/repack.c:356
+#: builtin/repack.c:662
 msgid "repack objects in packs marked with .keep"
 msgstr "przepakuj obiekty w paczki oznaczone przez .keep"
 
-#: builtin/repack.c:358
+#: builtin/repack.c:664
 msgid "do not repack this pack"
 msgstr "nie przepakowuj tej paczki"
 
-#: builtin/repack.c:368
+#: builtin/repack.c:666
+msgid "find a geometric progression with factor <N>"
+msgstr "znajdź postęp geometryczny z czynnikiem <N>"
+
+#: builtin/repack.c:668
+msgid "write a multi-pack index of the resulting packs"
+msgstr "zapisz indeks wielu paczek wynikowych paczek"
+
+#: builtin/repack.c:678
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "nie można usuwać paczek w repozytorium o cennych obiektach"
 
-#: builtin/repack.c:372
+#: builtin/repack.c:682
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable i -A siÄ™ wykluczajÄ…"
 
-#: builtin/repack.c:455
+#: builtin/repack.c:713
+msgid "--geometric is incompatible with -A, -a"
+msgstr "--geometric i -A, -a siÄ™ wykluczajÄ…"
+
+#: builtin/repack.c:825
 msgid "Nothing new to pack."
 msgstr "Nic nowego do spakowania."
 
-#: builtin/repack.c:485
+#: builtin/repack.c:855
 #, c-format
 msgid "missing required file: %s"
 msgstr "brakuje wymaganego pliku: %s"
 
-#: builtin/repack.c:487
+#: builtin/repack.c:857
 #, c-format
 msgid "could not unlink: %s"
 msgstr "nie można usunąć przez unlink: %s"
@@ -21093,15 +21684,15 @@ msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr ""
 "git rerere [clear | forget <ścieżka>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "zarejestruj gładkie rozwiązania w indeksie"
 
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "„git rerere forget� bez ścieżek jest przestarzałe"
 
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
 #, c-format
 msgid "unable to generate diff for '%s'"
 msgstr "nie można wygenerować różnic dla „%s�"
@@ -21145,93 +21736,93 @@ msgstr "scalenie"
 msgid "keep"
 msgstr "zachowaj"
 
-#: builtin/reset.c:83
+#: builtin/reset.c:89
 msgid "You do not have a valid HEAD."
 msgstr "HEAD jest nieprawidłowe."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:91
 msgid "Failed to find tree of HEAD."
 msgstr "Nie znaleziono drzewa HEAD."
 
-#: builtin/reset.c:91
+#: builtin/reset.c:97
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Nie znaleziono drzewa %s."
 
-#: builtin/reset.c:116
+#: builtin/reset.c:122
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD wskazuje teraz %s"
 
-#: builtin/reset.c:195
+#: builtin/reset.c:201
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Nie można wykonać resetu %s podczas scalania."
 
-#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
-#: builtin/stash.c:685
+#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
+#: builtin/stash.c:703
 msgid "be quiet, only report errors"
 msgstr "mniej komunikatów, wypisuj tylko błędy"
 
-#: builtin/reset.c:297
+#: builtin/reset.c:303
 msgid "reset HEAD and index"
 msgstr "zresetuj HEAD i indeks"
 
-#: builtin/reset.c:298
+#: builtin/reset.c:304
 msgid "reset only HEAD"
 msgstr "zresetuj tylko HEAD"
 
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:306 builtin/reset.c:308
 msgid "reset HEAD, index and working tree"
 msgstr "zresetuj HEAD, indeks i drzewo robocze"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:310
 msgid "reset HEAD but keep local changes"
 msgstr "zresetuj HEAD, ale zachowaj lokalne zmiany"
 
-#: builtin/reset.c:310
+#: builtin/reset.c:316
 msgid "record only the fact that removed paths will be added later"
 msgstr "zapisz tylko, że usunięte ścieżki zostaną dodane później"
 
-#: builtin/reset.c:344
+#: builtin/reset.c:350
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Nie można rozwiązać „%s� jako prawidłowej rewizji."
 
-#: builtin/reset.c:352
+#: builtin/reset.c:358
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Nie można rozwiązać „%s� jako prawidłowego drzewa."
 
-#: builtin/reset.c:361
+#: builtin/reset.c:367
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch i --{hard,mixed,soft} siÄ™ wykluczajÄ…"
 
-#: builtin/reset.c:371
+#: builtin/reset.c:377
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed ze ścieżkami jest przestarzałe; użyj zamiast tego „git reset -- "
 "<ścieżki>�."
 
-#: builtin/reset.c:373
+#: builtin/reset.c:379
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Nie można wykonać resetu %s ze ścieżkami."
 
-#: builtin/reset.c:388
+#: builtin/reset.c:394
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "resetowanie %s nie jest dozwolone w suchym repozytorium"
 
-#: builtin/reset.c:392
+#: builtin/reset.c:398
 msgid "-N can only be used with --mixed"
-msgstr "-N może być użyte tylko z --mixed"
+msgstr "-N można użyć tylko z --mixed"
 
-#: builtin/reset.c:413
+#: builtin/reset.c:419
 msgid "Unstaged changes after reset:"
 msgstr "Nieprzygotowane zmiany po resecie:"
 
-#: builtin/reset.c:416
+#: builtin/reset.c:422
 #, c-format
 msgid ""
 "\n"
@@ -21244,28 +21835,28 @@ msgstr ""
 "Możesz użyć „--quiet�, żeby tego uniknąć.  Ustaw konfigurację reset.quiet\n"
 "na true, aby było to domyślne.\n"
 
-#: builtin/reset.c:434
+#: builtin/reset.c:440
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Nie można zresetować pliku indeksu do rewizji „%s�."
 
-#: builtin/reset.c:439
+#: builtin/reset.c:445
 msgid "Could not write new index file."
 msgstr "Nie można zapisać nowego pliku indeksu."
 
-#: builtin/rev-list.c:534
+#: builtin/rev-list.c:541
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "--exclude-promisor-objects i --missing siÄ™ wykluczajÄ…"
 
-#: builtin/rev-list.c:595
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "filtrowanie obiektów wymaga --objects"
 
-#: builtin/rev-list.c:651
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr "rev-list nie wspiera wyświetlania uwag"
 
-#: builtin/rev-list.c:656
+#: builtin/rev-list.c:679
 msgid "marked counting is incompatible with --objects"
 msgstr "znaczone zliczanie i --objects siÄ™ wykluczajÄ…"
 
@@ -21285,6 +21876,18 @@ msgstr "przerwij przetwarzanie po pierwszym argumencie, który nie jest opcją"
 msgid "output in stuck long form"
 msgstr "wypisz w zbitej długiej postaci"
 
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "przedwczesny koniec wejścia"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr "brak opisu użycia przed separatorem „--�"
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "Potrzeba pojedynczej rewizji"
+
 #: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -21300,6 +21903,50 @@ msgstr ""
 "Wykonaj „git rev-parse --parseopt -h�, aby uzyskać więcej informacji o "
 "pierwszym użyciu."
 
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir wymaga argumentu"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "nie jest katalogiem gita „%s�"
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "--git-path wymaga argumentu"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "-n wymaga argumentu"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "--path-format wymaga argumentu"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "nieznany argument do --path-format: %s"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "--default wymaga argumentu"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "--prefix wymaga argumentu"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "nieznany tryb do --abbrev-ref: %s"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "nieznany tryb do --show-object-format: %s"
+
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<opcje>] <zmiana>..."
@@ -21324,7 +21971,7 @@ msgstr "opcja „%s� oczekuje liczby większej niż zero"
 #: builtin/revert.c:92
 #, c-format
 msgid "%s: %s cannot be used with %s"
-msgstr "%s: %s i %s wykluczajÄ… siÄ™"
+msgstr "%s: %s i %s siÄ™ wykluczajÄ…"
 
 #: builtin/revert.c:102
 msgid "end revert or cherry-pick sequence"
@@ -21374,23 +22021,27 @@ msgstr "dodaj nazwÄ™ zapisu"
 msgid "preserve initially empty commits"
 msgstr "zachowaj poczÄ…tkowo puste zapisy"
 
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "pozwól na zapisy z pustymi komunikatami"
+
 #: builtin/revert.c:129
 msgid "keep redundant, empty commits"
 msgstr "zachowaj zbędne puste zapisy"
 
-#: builtin/revert.c:239
+#: builtin/revert.c:241
 msgid "revert failed"
 msgstr "odwrócenie nie powiodło się"
 
-#: builtin/revert.c:252
+#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "dobieranie nie powiodło się"
 
-#: builtin/rm.c:19
+#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<opcje>] [--] <plik>..."
 
-#: builtin/rm.c:207
+#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -21407,7 +22058,7 @@ msgstr[2] ""
 "następujące pliki ma przygotowaną zawartość różną i od pliku\n"
 "i od HEAD:"
 
-#: builtin/rm.c:212
+#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -21415,14 +22066,14 @@ msgstr ""
 "\n"
 "(użyj -f, by wymusić usunięcie)"
 
-#: builtin/rm.c:216
+#: builtin/rm.c:217
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] "następujący plik ma zmiany przygotowane w indeksie:"
 msgstr[1] "następujące pliki mają zmiany przygotowane w indeksie:"
 msgstr[2] "następujące pliki mają zmiany przygotowane w indeksie:"
 
-#: builtin/rm.c:220 builtin/rm.c:229
+#: builtin/rm.c:221 builtin/rm.c:230
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -21430,77 +22081,77 @@ msgstr ""
 "\n"
 "(użyj --cached, aby zachować plik, lub -f, by wymusić usunięcie)"
 
-#: builtin/rm.c:226
+#: builtin/rm.c:227
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "następujący plik ma lokalne zmiany:"
 msgstr[1] "następujące pliki mają lokalne zmiany:"
 msgstr[2] "następujące pliki mają lokalne zmiany:"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "nie wypisuj usuniętych plików"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "tylko usuń z indeksu"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "wyłącz sprawdzenie aktualności"
 
-#: builtin/rm.c:246
+#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "zezwól na usuwanie rekurencyjne"
 
-#: builtin/rm.c:248
+#: builtin/rm.c:250
 msgid "exit with a zero status even if nothing matched"
 msgstr "zwróć zero, nawet jeśli nic nie dopasowano"
 
-#: builtin/rm.c:282
+#: builtin/rm.c:285
 msgid "No pathspec was given. Which files should I remove?"
 msgstr "Nie podano żadnych ścieżek. Które pliki usunąć?"
 
-#: builtin/rm.c:305
+#: builtin/rm.c:315
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "przygotuj swoje zmiany w .gitmodules lub dodaj do schowka, aby kontynuować"
 
-#: builtin/rm.c:323
+#: builtin/rm.c:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "nie usuwanie „%s� rekurencyjne bez -r"
 
-#: builtin/rm.c:362
+#: builtin/rm.c:385
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: nie można usunąć %s"
 
 #: builtin/send-pack.c:20
 msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-"  --all and explicit <ref> specification are mutually exclusive."
+"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=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<katalog> "
-"[<referencja>...]\n"
-"  --all i podanie konkretnych <referencji> wykluczajÄ… siÄ™."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [<host>:]<katalog> (--all | <referencja>...)"
 
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "nazwa zdalnego repozytorium"
 
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "użyj bezstanowego protokołu RPC"
 
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "wczytaj referencje ze standardowego wejścia"
 
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "wypisuj stan zdalnego pomocnika"
 
@@ -21557,21 +22208,22 @@ msgstr "pole"
 msgid "group by field"
 msgstr "grupuj według pola"
 
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
 msgid "too many arguments given outside repository"
 msgstr "podano zbyt wiele argumentów poza repozytorium"
 
 #: builtin/show-branch.c:13
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<kiedy>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rewizja> | <glob>)...]"
+"                [--current] [--color[=<kiedy>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rewizja> | "
+"<glob>)...]"
 
 #: builtin/show-branch.c:17
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -21586,91 +22238,91 @@ msgstr[0] "pomijanie %s; nie można obsłużyć więcej niż %d referencji"
 msgstr[1] "pomijanie %s; nie można obsłużyć więcej niż %d referencji"
 msgstr[2] "pomijanie %s; nie można obsłużyć więcej niż %d referencji"
 
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
 #, c-format
 msgid "no matching refs with %s"
 msgstr "brak pasujÄ…cych referencji z %s"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
 msgid "show remote-tracking and local branches"
 msgstr "pokaż śledzące i lokalne gałęzie"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
 msgid "show remote-tracking branches"
 msgstr "wypisz gałęzie śledzące"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
 msgid "color '*!+-' corresponding to the branch"
 msgstr "koloruj „*!+-� odpowiednio do gałęzi"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
 msgid "show <n> more commits after the common ancestor"
 msgstr "pokaż <n> dodatkowych zapisów po wspólnym przodku"
 
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
 msgid "synonym to more=-1"
 msgstr "zamiennik na more=-1"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
 msgid "suppress naming strings"
 msgstr "ukryj nazwy"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
 msgid "include the current branch"
 msgstr "uwzględnij bieżącą gałąź"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
 msgid "name commits with their object names"
 msgstr "nazwij zapisy ich nazwami obiektów"
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
 msgid "show possible merge bases"
 msgstr "pokaż możliwe podstawy scalenia"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
 msgid "show refs unreachable from any other ref"
 msgstr "pokaż referencje nieosiągalne z żadnej innej"
 
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
 msgid "show commits in topological order"
 msgstr "pokaż zapisy w kolejności topologicznej"
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
 msgid "show only commits not on the first branch"
 msgstr "pokaż tylko zapisy spoza pierwszej gałęzi"
 
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
 msgid "show merges reachable from only one tip"
 msgstr "pokaż scalenia osiągalne z tylko jednego czubka"
 
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
 msgid "topologically sort, maintaining date order where possible"
 msgstr "posortuj topologicznie, zachowując kolejność dat, gdzie się da"
 
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
 msgid "<n>[,<base>]"
 msgstr "<n>[,<podstawa>]"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr ""
 "pokaż <n> najświeższych elementów dziennika referencji poczynając od podstawy"
 
-#: builtin/show-branch.c:711
+#: builtin/show-branch.c:710
 msgid ""
 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
 msgstr ""
 "--reflog wyklucza siÄ™ z --all, --remotes, --independent lub --merge-base"
 
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "nie podano gałęzi, a HEAD jest nieprawidłowe"
 
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
 msgid "--reflog option needs one branch name"
 msgstr "opcja --reflog potrzebuje nazwy gałęzi"
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
@@ -21678,12 +22330,12 @@ msgstr[0] "można pokazać tylko %d element na raz."
 msgstr[1] "można pokazać tylko %d elementy na raz."
 msgstr[2] "można pokazać tylko %d elementów na raz."
 
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
 #, c-format
 msgid "no such ref %s"
 msgstr "nie ma takiej referencji %s"
 
-#: builtin/show-branch.c:831
+#: builtin/show-branch.c:828
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
@@ -21691,12 +22343,12 @@ msgstr[0] "nie można obsłużyć więcej niż %d rewizji."
 msgstr[1] "nie można obsłużyć więcej niż %d rewizji."
 msgstr[2] "nie można obsłużyć więcej niż %d rewizji."
 
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:832
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "„%s� nie jest prawidłową referencją."
 
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:835
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "nie odnaleziono zapisu %s (%s)"
@@ -21756,103 +22408,121 @@ msgstr ""
 "pokaż referencje ze standardowego wejścia, których nie ma w lokalnym "
 "repozytorium"
 
-#: builtin/sparse-checkout.c:21
+#: builtin/sparse-checkout.c:22
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
 msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opcje>"
 
-#: builtin/sparse-checkout.c:45
+#: builtin/sparse-checkout.c:46
 msgid "git sparse-checkout list"
 msgstr "git sparse-checkout list"
 
-#: builtin/sparse-checkout.c:71
+#: builtin/sparse-checkout.c:72
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 "to drzewo robocze nie jest rzadkie (plik rzadkiego wybrania może nie istnieć)"
 
-#: builtin/sparse-checkout.c:223
+#: builtin/sparse-checkout.c:173
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"katalog „%s� zawiera nieśledzone pliki, ale jest poza stożkiem rzadkiego "
+"wybrania"
+
+#: builtin/sparse-checkout.c:181
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "nie można usunąć katalogu „%s�"
+
+#: builtin/sparse-checkout.c:321
 msgid "failed to create directory for sparse-checkout file"
 msgstr "nie można utworzyć katalogu dla pliku rzadkiego wybrania"
 
-#: builtin/sparse-checkout.c:264
+#: builtin/sparse-checkout.c:362
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr "nie można podnieść formatu repozytorium, aby włączyć worktreeConfig"
 
-#: builtin/sparse-checkout.c:266
+#: builtin/sparse-checkout.c:364
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "nie można ustawić konfiguracji extensions.worktreeConfig"
 
-#: builtin/sparse-checkout.c:283
-msgid "git sparse-checkout init [--cone]"
-msgstr "git sparse-checkout init [--cone]"
+#: builtin/sparse-checkout.c:384
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:302
+#: builtin/sparse-checkout.c:404
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "zainicjuj rzadkie wybranie w trybie stożka"
 
-#: builtin/sparse-checkout.c:339
+#: builtin/sparse-checkout.c:406
+msgid "toggle the use of a sparse index"
+msgstr "przełącz użycie rzadkiego indeksu"
+
+#: builtin/sparse-checkout.c:434
+msgid "failed to modify sparse-index config"
+msgstr "nie można zmienić ustawień rzadkiego indeksu"
+
+#: builtin/sparse-checkout.c:455
 #, c-format
 msgid "failed to open '%s'"
 msgstr "nie można otworzyć „%s�"
 
-#: builtin/sparse-checkout.c:396
+#: builtin/sparse-checkout.c:507
 #, c-format
 msgid "could not normalize path %s"
 msgstr "nie można unormować ścieżki %s"
 
-#: builtin/sparse-checkout.c:408
+#: builtin/sparse-checkout.c:519
 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
 msgstr "git sparse-checkout (set|add) (--stdin | <wzorce>)"
 
-#: builtin/sparse-checkout.c:433
+#: builtin/sparse-checkout.c:544
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "nie można odcytować łańcucha w stylu C „%s�"
 
-#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
+#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "nie można załadować istniejących wzorców rzadkiego wybrania"
 
-#: builtin/sparse-checkout.c:556
+#: builtin/sparse-checkout.c:667
 msgid "read patterns from standard in"
 msgstr "wczytaj wzorce ze standardowego wejścia"
 
-#: builtin/sparse-checkout.c:571
+#: builtin/sparse-checkout.c:682
 msgid "git sparse-checkout reapply"
 msgstr "git sparse-checkout reapply"
 
-#: builtin/sparse-checkout.c:590
+#: builtin/sparse-checkout.c:701
 msgid "git sparse-checkout disable"
 msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:618
+#: builtin/sparse-checkout.c:732
 msgid "error while refreshing working directory"
 msgstr "błąd podczas odświeżania katalogu roboczego"
 
-#: builtin/stash.c:22 builtin/stash.c:38
+#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [<opcje>]"
 
-#: builtin/stash.c:23 builtin/stash.c:43
+#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<opcje>] [<schowek>]"
 
-#: builtin/stash.c:24 builtin/stash.c:48
+#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<schowek>]"
 
-#: builtin/stash.c:25
+#: builtin/stash.c:27
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<schowek>]"
 
-#: builtin/stash.c:26 builtin/stash.c:63
+#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <gałąź> [<schowek>]"
 
-#: builtin/stash.c:27 builtin/stash.c:68
-msgid "git stash clear"
-msgstr "git stash clear"
-
-#: builtin/stash.c:28
+#: builtin/stash.c:30
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
@@ -21864,7 +22534,7 @@ msgstr ""
 "          [--pathspec-from-file=<plik> [--pathspec-file-nul]]\n"
 "          [--] [<ścieżka>...]]"
 
-#: builtin/stash.c:32 builtin/stash.c:85
+#: builtin/stash.c:34
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
@@ -21872,19 +22542,19 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<komunikat>]"
 
-#: builtin/stash.c:53
+#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<schowek>]"
 
-#: builtin/stash.c:58
+#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<schowek>]"
 
-#: builtin/stash.c:73
+#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <komunikat>] [-q|--quiet] <zapis>"
 
-#: builtin/stash.c:78
+#: builtin/stash.c:80
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
@@ -21894,30 +22564,38 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <komunikat>]\n"
 "          [--] [<ścieżka>...]]"
 
-#: builtin/stash.c:128
+#: builtin/stash.c:87
+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] [<komunikat>]"
+
+#: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "„%s� nie jest zapisem ze zmianami ze schowka"
 
-#: builtin/stash.c:148
+#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Podano za dużo rewizji: %s"
 
-#: builtin/stash.c:162
+#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "Brak zmian w schowku."
 
-#: builtin/stash.c:176
+#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s nie jest prawidłową referencją."
 
-#: builtin/stash.c:225
+#: builtin/stash.c:227
 msgid "git stash clear with arguments is unimplemented"
 msgstr "nie zaimplementowano parametrów w git stash clear"
 
-#: builtin/stash.c:429
+#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -21928,150 +22606,166 @@ msgstr ""
 "            %s -> %s\n"
 "         aby zwolnić miejsce.\n"
 
-#: builtin/stash.c:490
+#: builtin/stash.c:508
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "nie można zastosować zmian ze schowka podczas scalania"
 
-#: builtin/stash.c:501
+#: builtin/stash.c:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "nie można wygenerować zmian %s^!."
 
-#: builtin/stash.c:508
+#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr "konflikty w indeksie. Spróbuj bez --index."
 
-#: builtin/stash.c:514
+#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "nie można zapisać drzewa indeksu"
 
-#: builtin/stash.c:523
-msgid "could not restore untracked files from stash"
-msgstr "nie można przywrócić nieśledzonych plików ze schowka"
-
-#: builtin/stash.c:537
+#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Scalanie %s z %s"
 
-#: builtin/stash.c:547
+#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "Indeks nie został wyjęty ze schowka."
 
-#: builtin/stash.c:589 builtin/stash.c:687
+#: builtin/stash.c:575
+msgid "could not restore untracked files from stash"
+msgstr "nie można przywrócić nieśledzonych plików ze schowka"
+
+#: builtin/stash.c:607 builtin/stash.c:705
 msgid "attempt to recreate the index"
 msgstr "spróbuj odtworzyć indeks"
 
-#: builtin/stash.c:633
+#: builtin/stash.c:651
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Porzucono %s (%s)"
 
-#: builtin/stash.c:636
+#: builtin/stash.c:654
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Nie można porzucić wpisu ze schowka"
 
-#: builtin/stash.c:649
+#: builtin/stash.c:667
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "„%s� nie wskazuje na zmiany ze schowka"
 
-#: builtin/stash.c:699
+#: builtin/stash.c:717
 msgid "The stash entry is kept in case you need it again."
 msgstr "Wpis pozostaje w schowku w razie, gdyby miał być znów potrzebny."
 
-#: builtin/stash.c:722
+#: builtin/stash.c:740
 msgid "No branch name specified"
 msgstr "Nie określono nazwy gałęzi"
 
-#: builtin/stash.c:866 builtin/stash.c:903
+#: builtin/stash.c:824
+msgid "failed to parse tree"
+msgstr "nie można przetworzyć drzewa"
+
+#: builtin/stash.c:835
+msgid "failed to unpack trees"
+msgstr "nie można rozpakować drzew"
+
+#: builtin/stash.c:855
+msgid "include untracked files in the stash"
+msgstr "uwzględnij nieśledzone pliki w schowku"
+
+#: builtin/stash.c:858
+msgid "only show untracked files in the stash"
+msgstr "pokaż tylko nieśledzone pliki w schowku"
+
+#: builtin/stash.c:945 builtin/stash.c:982
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Nie można zaktualizować %s o %s"
 
-#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
+#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
 msgid "stash message"
 msgstr "komunikat skrytki"
 
-#: builtin/stash.c:894
+#: builtin/stash.c:973
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "„git stash store� wymaga jednego argumentu z <zapisem>"
 
-#: builtin/stash.c:1109
+#: builtin/stash.c:1187
 msgid "No changes selected"
 msgstr "Nie wybrano zmian"
 
-#: builtin/stash.c:1209
+#: builtin/stash.c:1287
 msgid "You do not have the initial commit yet"
 msgstr "Nie masz jeszcze poczÄ…tkowego zapisu"
 
-#: builtin/stash.c:1236
+#: builtin/stash.c:1314
 msgid "Cannot save the current index state"
 msgstr "Nie można zapisać bieżącego stanu indeksu"
 
-#: builtin/stash.c:1245
+#: builtin/stash.c:1323
 msgid "Cannot save the untracked files"
 msgstr "Nie można zapisać nieśledzonych plików"
 
-#: builtin/stash.c:1256 builtin/stash.c:1265
+#: builtin/stash.c:1334 builtin/stash.c:1343
 msgid "Cannot save the current worktree state"
 msgstr "Nie można zapisać bieżącego stanu drzewa roboczego"
 
-#: builtin/stash.c:1293
+#: builtin/stash.c:1371
 msgid "Cannot record working tree state"
 msgstr "Nie można zapisać stanu drzewa roboczego"
 
-#: builtin/stash.c:1342
+#: builtin/stash.c:1420
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "Nie można jednocześnie użyć --patch i --include-untracked lub --all"
 
-#: builtin/stash.c:1358
+#: builtin/stash.c:1438
 msgid "Did you forget to 'git add'?"
 msgstr "Czyżby zabrakło „git add�?"
 
-#: builtin/stash.c:1373
+#: builtin/stash.c:1453
 msgid "No local changes to save"
 msgstr "Brak lokalnych zmian do zapisania"
 
-#: builtin/stash.c:1380
+#: builtin/stash.c:1460
 msgid "Cannot initialize stash"
 msgstr "Nie można zainicjować schowka"
 
-#: builtin/stash.c:1395
+#: builtin/stash.c:1475
 msgid "Cannot save the current status"
 msgstr "Nie można zachować bieżącego stanu"
 
-#: builtin/stash.c:1400
+#: builtin/stash.c:1480
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Zapisano katalog roboczy i stan indeksu %s"
 
-#: builtin/stash.c:1490
+#: builtin/stash.c:1571
 msgid "Cannot remove worktree changes"
 msgstr "Nie można usunąć zmian w drzewie roboczym"
 
-#: builtin/stash.c:1529 builtin/stash.c:1594
+#: builtin/stash.c:1610 builtin/stash.c:1675
 msgid "keep index"
 msgstr "zachowaj indeks"
 
-#: builtin/stash.c:1531 builtin/stash.c:1596
+#: builtin/stash.c:1612 builtin/stash.c:1677
 msgid "stash in patch mode"
 msgstr "dodaj do schowka w trybie Å‚atki"
 
-#: builtin/stash.c:1532 builtin/stash.c:1597
+#: builtin/stash.c:1613 builtin/stash.c:1678
 msgid "quiet mode"
 msgstr "tryb cichy"
 
-#: builtin/stash.c:1534 builtin/stash.c:1599
+#: builtin/stash.c:1615 builtin/stash.c:1680
 msgid "include untracked files in stash"
 msgstr "uwzględnij nieśledzone pliki w schowku"
 
-#: builtin/stash.c:1536 builtin/stash.c:1601
+#: builtin/stash.c:1617 builtin/stash.c:1682
 msgid "include ignore files"
 msgstr "uwzględnij pomijane pliki"
 
-#: builtin/stash.c:1636
+#: builtin/stash.c:1717
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -22095,40 +22789,49 @@ msgstr "pomiń i usuń wszystkie wiersze rozpoczynające się znakiem komentarza
 msgid "prepend comment character and space to each line"
 msgstr "dodaj znak komentarza i odstęp przed każdym wierszem"
 
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Oczekiwano pełnej nazwy referencji, otrzymano %s"
 
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper print-default-remote nie przyjmuje argumentów"
 
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "nie można odciąć jednego komponentu z adresu „%s�"
 
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"nie odnaleziono konfiguracji „%s�. Zakładam, że to repozytorium jest samo "
+"sobie nadrzędnym."
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
 msgid "alternative anchor for relative paths"
 msgstr "alternatywne zakotwiczenie ścieżek względnych"
 
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:410
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<ścieżka>] [<ścieżka>...]"
 
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:652
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr "Nie znaleziono adresu dla ścieżki pod-modułu „%s� w .gitmodules"
+msgstr "Nie znaleziono adresu dla ścieżki podmodułu „%s� w .gitmodules"
 
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:520
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Otwieranie „%s�\n"
 
-#: builtin/submodule--helper.c:527
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -22137,7 +22840,7 @@ msgstr ""
 "run_command zwróciło niezerowy kod wyjścia z %s\n"
 "."
 
-#: builtin/submodule--helper.c:549
+#: builtin/submodule--helper.c:545
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -22145,232 +22848,223 @@ msgid ""
 "."
 msgstr ""
 "run_command zwróciło niezerowy kod wyjścia podczas przechodzenia "
-"zagnieżdżonych pod-modułów %s\n"
+"zagnieżdżonych podmodułów %s\n"
 "."
 
-#: builtin/submodule--helper.c:565
+#: builtin/submodule--helper.c:561
 msgid "suppress output of entering each submodule command"
-msgstr "powstrzymaj wyjście przy podawaniu każdego polecenia pod-modułu"
+msgstr "powstrzymaj wyjście przy podawaniu każdego polecenia podmodułu"
 
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
 msgid "recurse into nested submodules"
-msgstr "schodź do zagnieżdżonych pod-modułów"
+msgstr "schodź do zagnieżdżonych podmodułów"
 
-#: builtin/submodule--helper.c:572
+#: builtin/submodule--helper.c:568
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <polecenie>"
 
-#: builtin/submodule--helper.c:599
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"nie odnaleziono konfiguracji „%s�. Zakładam, że to repozytorium jest samo "
-"sobie nadrzędnym."
-
-#: builtin/submodule--helper.c:666
+#: builtin/submodule--helper.c:642
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
-msgstr "Nie można zarejestrować adresu do ścieżki pod-modułu „%s�"
+msgstr "Nie można zarejestrować adresu do ścieżki podmodułu „%s�"
 
-#: builtin/submodule--helper.c:670
+#: builtin/submodule--helper.c:646
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
-msgstr "Zarejestrowano pod-moduł „%s� (%s) w „%s�\n"
+msgstr "Zarejestrowano podmoduł „%s� (%s) w „%s�\n"
 
-#: builtin/submodule--helper.c:680
+#: builtin/submodule--helper.c:656
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
-"ostrzeżenie: zaproponowano tryb aktualizowania polecenia w pod-module „%s�\n"
+"ostrzeżenie: zaproponowano tryb aktualizowania polecenia w podmodule „%s�\n"
 
-#: builtin/submodule--helper.c:687
+#: builtin/submodule--helper.c:663
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
-msgstr "Nie można zarejestrować trybu aktualizacji do ścieżki pod-modułu „%s�"
+msgstr "Nie można zarejestrować trybu aktualizacji do ścieżki podmodułu „%s�"
 
-#: builtin/submodule--helper.c:709
+#: builtin/submodule--helper.c:685
 msgid "suppress output for initializing a submodule"
-msgstr "powstrzymaj wyjście przy inicjalizacji pod-modułu"
+msgstr "powstrzymaj wyjście przy inicjalizacji podmodułu"
 
-#: builtin/submodule--helper.c:714
+#: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<opcje>] [<ścieżka>]"
 
-#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
-msgstr "nie znaleziono w .gitmodules przypisania pod-modułów dla ścieżki „%s�"
+msgstr "nie znaleziono w .gitmodules przypisania podmodułów dla ścieżki „%s�"
 
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:811
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
-msgstr "nie można rozwiązać referencji HEAD w pod-module „%s�"
+msgstr "nie można rozwiązać referencji HEAD w podmodule „%s�"
 
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
 #, c-format
 msgid "failed to recurse into submodule '%s'"
-msgstr "Nie można zejść do pod-modułu „%s�"
+msgstr "Nie można zejść do podmodułu „%s�"
 
-#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
 msgid "suppress submodule status output"
-msgstr "powstrzymaj wyjście stanu pod-modułów"
+msgstr "powstrzymaj wyjście stanu podmodułów"
 
-#: builtin/submodule--helper.c:887
+#: builtin/submodule--helper.c:863
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
-msgstr "użyj zapisu z indeksu zamiast tego z HEAD pod-modułu"
+msgstr "użyj zapisu z indeksu zamiast tego z HEAD podmodułu"
 
-#: builtin/submodule--helper.c:893
+#: builtin/submodule--helper.c:869
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ścieżka>...]"
 
-#: builtin/submodule--helper.c:917
+#: builtin/submodule--helper.c:893
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <ścieżka>"
 
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:965
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
-msgstr "* %s %s(blob)->%s(pod-moduł)"
+msgstr "* %s %s(blob)->%s(podmoduł)"
 
-#: builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:968
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
-msgstr "* %s %s(pod-moduł)->%s(blob)"
+msgstr "* %s %s(podmoduł)->%s(blob)"
 
-#: builtin/submodule--helper.c:1005
+#: builtin/submodule--helper.c:981
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1031
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "nie można skrócić obiektu z „%s�"
 
-#: builtin/submodule--helper.c:1059
+#: builtin/submodule--helper.c:1035
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "nieoczekiwany tryb %o\n"
 
-#: builtin/submodule--helper.c:1300
+#: builtin/submodule--helper.c:1276
 msgid "use the commit stored in the index instead of the submodule HEAD"
-msgstr "użyj zapisu z indeksu zamiast z HEAD pod-modułu"
+msgstr "użyj zapisu z indeksu zamiast z HEAD podmodułu"
 
-#: builtin/submodule--helper.c:1302
-msgid "to compare the commit in the index with that in the submodule HEAD"
-msgstr "aby porównać zapis w indeksie z tym z HEAD pod-modułu"
+#: builtin/submodule--helper.c:1278
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "porównaj zapis w indeksie z tym z HEAD podmodułu"
 
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1280
 msgid "skip submodules with 'ignore_config' value set to 'all'"
-msgstr "pomiń pod-moduły z wartością „ignore_config� ustawioną na „all�"
+msgstr "pomiń podmoduły z wartością „ignore_config� ustawioną na „all�"
 
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1282
 msgid "limit the summary size"
 msgstr "ogranicz rozmiar podsumowania"
 
-#: builtin/submodule--helper.c:1311
+#: builtin/submodule--helper.c:1287
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [<opcje>] [<zapis>] [--] [<ścieżka>]"
 
-#: builtin/submodule--helper.c:1335
+#: builtin/submodule--helper.c:1311
 msgid "could not fetch a revision for HEAD"
 msgstr "nie można pobrać rewizji dla HEAD"
 
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1316
 msgid "--cached and --files are mutually exclusive"
 msgstr "--cached i --files siÄ™ wykluczajÄ…"
 
-#: builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
-msgstr "Synchronizowanie adresu URL pod-modułu w „%s�\n"
+msgstr "Synchronizowanie adresu URL podmodułu w „%s�\n"
 
-#: builtin/submodule--helper.c:1413
+#: builtin/submodule--helper.c:1379
 #, c-format
 msgid "failed to register url for submodule path '%s'"
-msgstr "nie można zarejestrować adresu do ścieżki pod-modułu „%s�"
+msgstr "nie można zarejestrować adresu do ścieżki podmodułu „%s�"
 
-#: builtin/submodule--helper.c:1427
+#: builtin/submodule--helper.c:1393
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
-msgstr "nie można uzyskać domyślnego zdalnego repozytorium pod-modułu „%s�"
+msgstr "nie można uzyskać domyślnego zdalnego repozytorium podmodułu „%s�"
 
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1404
 #, c-format
 msgid "failed to update remote for submodule '%s'"
-msgstr "nie można zaktualizować zdalnego repozytorium pod-modułu „%s�"
+msgstr "nie można zaktualizować zdalnego repozytorium podmodułu „%s�"
 
-#: builtin/submodule--helper.c:1485
+#: builtin/submodule--helper.c:1451
 msgid "suppress output of synchronizing submodule url"
-msgstr "powstrzymaj wyjście przy synchronizacji adresu pod-modułu"
+msgstr "powstrzymaj wyjście przy synchronizacji adresu podmodułu"
 
-#: builtin/submodule--helper.c:1492
+#: builtin/submodule--helper.c:1458
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<ścieżka>]"
 
-#: builtin/submodule--helper.c:1546
+#: builtin/submodule--helper.c:1512
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
 "really want to remove it including all of its history)"
 msgstr ""
-"Drzewo robocze pod-modułu „%s� zawiera katalog .git (użyj „rm -rf� jeśli na "
+"Drzewo robocze podmodułu „%s� zawiera katalog .git (użyj „rm -rf� jeśli na "
 "pewno chcesz je usunąć wraz z całą jego historią)"
 
-#: builtin/submodule--helper.c:1558
+#: builtin/submodule--helper.c:1524
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
-"Drzewo robocze pod-modułu „%s� zawiera lokalne zmiany; użyj „-f�, aby je "
+"Drzewo robocze podmodułu „%s� zawiera lokalne zmiany; użyj „-f�, aby je "
 "odrzucić"
 
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1532
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Wyczyszczono katalog „%s�\n"
 
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1534
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
-msgstr "Nie można usunąć drzewa roboczego pod-modułu „%s�\n"
+msgstr "Nie można usunąć drzewa roboczego podmodułu „%s�\n"
 
-#: builtin/submodule--helper.c:1579
+#: builtin/submodule--helper.c:1545
 #, c-format
 msgid "could not create empty submodule directory %s"
-msgstr "nie można utworzyć pustego katalogu pod-modułu „%s�"
+msgstr "nie można utworzyć pustego katalogu podmodułu „%s�"
 
-#: builtin/submodule--helper.c:1595
+#: builtin/submodule--helper.c:1561
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
-msgstr "Wyrejestrowano pod-moduł „%s� (%s) ze ścieżki „%s�\n"
+msgstr "Wyrejestrowano podmoduł „%s� (%s) ze ścieżki „%s�\n"
 
-#: builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:1590
 msgid "remove submodule working trees even if they contain local changes"
-msgstr "usuń drzewa robocze pod-modułów, nawet jeśli zawierają lokalne zmiany"
+msgstr "usuń drzewa robocze podmodułów, nawet jeśli zawierają lokalne zmiany"
 
-#: builtin/submodule--helper.c:1625
+#: builtin/submodule--helper.c:1591
 msgid "unregister all submodules"
-msgstr "wyrejestruj wszystkie pod-moduły"
+msgstr "wyrejestruj wszystkie podmoduły"
 
-#: builtin/submodule--helper.c:1630
+#: builtin/submodule--helper.c:1596
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ścieżka>...]]"
 
-#: builtin/submodule--helper.c:1644
+#: builtin/submodule--helper.c:1610
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 "Użyj „--all� jeśli na pewno chcesz odinicjalizować wszystkie podmoduły."
 
-#: builtin/submodule--helper.c:1713
+#: builtin/submodule--helper.c:1655
 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"
@@ -22382,47 +23076,68 @@ msgstr ""
 "submodule.alternateErrorStrategy na „info� lub, równoważnie, sklonuj\n"
 "z „--reference-if-able� zamiast „--reference�."
 
-#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
+#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
-msgstr "pod-moduł „%s� nie może dodać alternatywnego położenia: %s"
+msgstr "podmoduł „%s� nie może dodać alternatywnego położenia: %s"
 
-#: builtin/submodule--helper.c:1791
+#: builtin/submodule--helper.c:1739
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 "Wartość „%s� dla submodule.alternateErrorStrategy nie jest rozpoznawana"
 
-#: builtin/submodule--helper.c:1798
+#: builtin/submodule--helper.c:1746
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Wartość „%s� dla submodule.alternateLocation nie jest rozpoznawana"
 
-#: builtin/submodule--helper.c:1822
+#: builtin/submodule--helper.c:1771
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "odmawiam utworzenia/użyj „%s� w katalogu gita innego podmodułu"
+
+#: builtin/submodule--helper.c:1812
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "klonowanie „%s� do ścieżki podmodułu „%s� nie powiodło się"
+
+#: builtin/submodule--helper.c:1817
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "katalog nie jest pusty: „%s�"
+
+#: builtin/submodule--helper.c:1829
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "nie można uzyskać katalogu podmodułu dla „%s�"
+
+#: builtin/submodule--helper.c:1861
 msgid "where the new submodule will be cloned to"
-msgstr "dokąd zostanie sklonowany nowy pod-moduł"
+msgstr "dokąd zostanie sklonowany nowy podmoduł"
 
-#: builtin/submodule--helper.c:1825
+#: builtin/submodule--helper.c:1864
 msgid "name of the new submodule"
-msgstr "nazwa nowego pod-modułu"
+msgstr "nazwa nowego podmodułu"
 
-#: builtin/submodule--helper.c:1828
+#: builtin/submodule--helper.c:1867
 msgid "url where to clone the submodule from"
-msgstr "adres, skąd sklonować pod-moduł"
+msgstr "adres, skąd sklonować podmoduł"
 
-#: builtin/submodule--helper.c:1836
+#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
 msgid "depth for shallow clones"
 msgstr "głębokość płytkich klonów"
 
-#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
+#: builtin/submodule--helper.c:3257
 msgid "force cloning progress"
 msgstr "wymuś postęp klonowania"
 
-#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
+#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
 msgid "disallow cloning into non-empty directory"
 msgstr "nie pozwól sklonować do niepustego katalogu"
 
-#: builtin/submodule--helper.c:1848
+#: builtin/submodule--helper.c:1887
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22432,189 +23147,373 @@ msgstr ""
 "<repozytorium>] [--name <nazwa>] [--depth <głębokość>] [--single-branch] --"
 "url <adres> --path <ścieżka>"
 
-#: builtin/submodule--helper.c:1873
-#, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr "odmawiam utworzenia/użyj „%s� w katalogu gita innego pod-modułu"
-
-#: builtin/submodule--helper.c:1884
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "klonowanie „%s� do ścieżki pod-modułu „%s� nie powiodło się"
-
-#: builtin/submodule--helper.c:1888
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "katalog nie jest pusty: „%s�"
-
-#: builtin/submodule--helper.c:1900
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "nie można uzyskać katalogu pod-modułu dla „%s�"
-
-#: builtin/submodule--helper.c:1936
+#: builtin/submodule--helper.c:1924
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
-msgstr "Nieprawidłowy tryb aktualizacji „%s� do ścieżki pod-modułu „%s�"
+msgstr "Nieprawidłowy tryb aktualizacji „%s� do ścieżki podmodułu „%s�"
 
-#: builtin/submodule--helper.c:1940
+#: builtin/submodule--helper.c:1928
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
-"Nieprawidłowy tryb aktualizacji „%s� ustawiony w ścieżce pod-modułu „%s�"
+"Nieprawidłowy tryb aktualizacji „%s� ustawiony w ścieżce podmodułu „%s�"
 
-#: builtin/submodule--helper.c:2041
+#: builtin/submodule--helper.c:2043
 #, c-format
 msgid "Submodule path '%s' not initialized"
-msgstr "Ścieżka pod-modułu „%s� niezainicjowana"
+msgstr "Ścieżka podmodułu „%s� niezainicjowana"
 
-#: builtin/submodule--helper.c:2045
+#: builtin/submodule--helper.c:2047
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Może chcesz użyć „update --init�?"
 
-#: builtin/submodule--helper.c:2075
+#: builtin/submodule--helper.c:2077
 #, c-format
 msgid "Skipping unmerged submodule %s"
-msgstr "Pomijanie niescalonego pod-modułu %s"
+msgstr "Pomijanie niescalonego podmodułu %s"
 
-#: builtin/submodule--helper.c:2104
+#: builtin/submodule--helper.c:2106
 #, c-format
 msgid "Skipping submodule '%s'"
-msgstr "Pomijanie pod-modułu „%s�"
+msgstr "Pomijanie podmodułu „%s�"
 
-#: builtin/submodule--helper.c:2254
+#: builtin/submodule--helper.c:2256
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Nie można sklonować „%s�. Zaplanowano ponowienie"
 
-#: builtin/submodule--helper.c:2265
+#: builtin/submodule--helper.c:2267
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Nie można sklonować „%s� drugi raz, przerywanie"
 
-#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2372
+#, c-format
+msgid "Unable to checkout '%s' in submodule path '%s'"
+msgstr "Nie można wybrać „%s� w ścieżce podmodułu „%s�"
+
+#: builtin/submodule--helper.c:2376
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "Nie można przestawić „%s� w ścieżce podmodułu „%s�"
+
+#: builtin/submodule--helper.c:2380
+#, c-format
+msgid "Unable to merge '%s' in submodule path '%s'"
+msgstr "Nie można scalić „%s� w ścieżce podmodułu „%s�"
+
+#: builtin/submodule--helper.c:2384
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "Wykonanie „%s %s� nie powiodło się w ścieżce podmodułu „%s�"
+
+#: builtin/submodule--helper.c:2408
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Ścieżka podmodułu „%s�: wybrano „%s�\n"
+
+#: builtin/submodule--helper.c:2412
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "Ścieżka podmodułu „%s�: przestawiono na „%s�\n"
+
+#: builtin/submodule--helper.c:2416
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Ścieżka podmodułu „%s�: scalono w „%s�\n"
+
+#: builtin/submodule--helper.c:2420
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Ścieżka podmodułu „%s�: „%s %s�\n"
+
+#: builtin/submodule--helper.c:2444
+#, c-format
+msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
+msgstr ""
+"Nie można pobrać w ścieżce podmodułu „%s�; próba bezpośredniego pobrania %s:"
+
+#: builtin/submodule--helper.c:2453
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Pobrano w ścieżce podmodułu „%s�, ale nie zawierał on %s. Bezpośrednie "
+"pobieranie tego zapisu nie powiodło się."
+
+#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2812
 msgid "path into the working tree"
 msgstr "ścieżka w drzewie roboczym"
 
-#: builtin/submodule--helper.c:2330
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
 msgid "path into the working tree, across nested submodule boundaries"
-msgstr "ścieżka w drzewie roboczym, przez granice zagnieżdżonych pod-modułów"
+msgstr "ścieżka w drzewie roboczym, przez granice zagnieżdżonych podmodułów"
 
-#: builtin/submodule--helper.c:2334
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout lub none"
 
-#: builtin/submodule--helper.c:2340
+#: builtin/submodule--helper.c:2517
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr "utwórz płytki klon ucięty do podanej liczby rewizji"
 
-#: builtin/submodule--helper.c:2343
+#: builtin/submodule--helper.c:2520
 msgid "parallel jobs"
 msgstr "równoległe zadania"
 
-#: builtin/submodule--helper.c:2345
+#: builtin/submodule--helper.c:2522
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "czy początkowy klon powinien zgadzać się z zaleceniem płytkości"
 
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2523
 msgid "don't print cloning progress"
 msgstr "nie wypisuj postępu klonowania"
 
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2534
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update-clone [--prefix=<ścieżka>] [<ścieżka>...]"
 
-#: builtin/submodule--helper.c:2370
+#: builtin/submodule--helper.c:2547
 msgid "bad value for update parameter"
 msgstr "zła wartość parametru aktualizacji"
 
-#: builtin/submodule--helper.c:2418
+#: builtin/submodule--helper.c:2565
+msgid "suppress output for update by rebase or merge"
+msgstr "powstrzymaj wyjście przy aktualizacje przez przestawienie lub scalenie"
+
+#: builtin/submodule--helper.c:2566
+msgid "force checkout updates"
+msgstr "wymuÅ› aktualizacje wybrania"
+
+#: builtin/submodule--helper.c:2568
+msgid "don't fetch new objects from the remote site"
+msgstr "nie pobieraj nowych obiektów ze zdalnego miejsca"
+
+#: builtin/submodule--helper.c:2570
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr "wymusza tryb aktualizacji, jeśli repozytorium jest świeżym klonem"
+
+#: builtin/submodule--helper.c:2571
+msgid "depth for shallow fetch"
+msgstr "głębokość płytkiego pobrania"
+
+#: builtin/submodule--helper.c:2581
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2582
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 oczekiwane przez projekt nadrzędny"
+
+#: builtin/submodule--helper.c:2584
+msgid "subsha1"
+msgstr "pod-sha1"
+
+#: builtin/submodule--helper.c:2585
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 czoła (HEAD) podmodułu"
+
+#: builtin/submodule--helper.c:2591
+msgid "git submodule--helper run-update-procedure [<options>] <path>"
+msgstr "git submodule--helper run-update-procedure [<opcje>] <ścieżka>"
+
+#: builtin/submodule--helper.c:2662
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
 "the superproject is not on any branch"
 msgstr ""
-"Gałąź pod-modułu (%s) ustawiono, by dziedziczyła gałąź z nad-projektu, ale "
+"Gałąź podmodułu (%s) ustawiono, by dziedziczyła gałąź z nad-projektu, ale "
 "nad-projekt nie jest na żadnej gałęzi"
 
-#: builtin/submodule--helper.c:2541
+#: builtin/submodule--helper.c:2780
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
-msgstr "nie można uzyskać uchwytu repozytorium pod-modułu dla „%s�"
+msgstr "nie można uzyskać uchwytu repozytorium podmodułu dla „%s�"
 
-#: builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2813
 msgid "recurse into submodules"
-msgstr "schodź do pod-modułów"
+msgstr "schodź do podmodułów"
 
-#: builtin/submodule--helper.c:2580
+#: builtin/submodule--helper.c:2819
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<opcje>] [<ścieżka>...]"
 
-#: builtin/submodule--helper.c:2636
+#: builtin/submodule--helper.c:2875
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "sprawdź, czy bezpiecznie jest zapisać plik .gitmodules"
 
-#: builtin/submodule--helper.c:2639
+#: builtin/submodule--helper.c:2878
 msgid "unset the config in the .gitmodules file"
 msgstr "usuń konfigurację z pliku .gitmodules"
 
-#: builtin/submodule--helper.c:2644
+#: builtin/submodule--helper.c:2883
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <nazwa> [<wartość>]"
 
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nazwa>"
 
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2665 git-submodule.sh:150
-#, sh-format
+#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
+#: builtin/submodule--helper.c:3276
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "upewnij się, że plik .gitmodules jest w drzewie roboczym"
 
-#: builtin/submodule--helper.c:2681
+#: builtin/submodule--helper.c:2920
 msgid "suppress output for setting url of a submodule"
-msgstr "powstrzymaj wyjście przy ustawianiu adresu pod-modułu"
+msgstr "powstrzymaj wyjście przy ustawianiu adresu podmodułu"
 
-#: builtin/submodule--helper.c:2685
+#: builtin/submodule--helper.c:2924
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <ścieżka> <nowy-adres>"
 
-#: builtin/submodule--helper.c:2718
+#: builtin/submodule--helper.c:2957
 msgid "set the default tracking branch to master"
 msgstr "ustaw domyślną gałąź śledzącą na master"
 
-#: builtin/submodule--helper.c:2720
+#: builtin/submodule--helper.c:2959
 msgid "set the default tracking branch"
 msgstr "ustaw domyślną gałąź śledzącą"
 
-#: builtin/submodule--helper.c:2724
+#: builtin/submodule--helper.c:2963
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <ścieżka>"
 
-#: builtin/submodule--helper.c:2725
+#: builtin/submodule--helper.c:2964
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 msgstr ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <gałąź> <ścieżka>"
 
-#: builtin/submodule--helper.c:2732
+#: builtin/submodule--helper.c:2971
 msgid "--branch or --default required"
 msgstr "wymagane --branch lub --default"
 
-#: builtin/submodule--helper.c:2735
+#: builtin/submodule--helper.c:2974
 msgid "--branch and --default are mutually exclusive"
 msgstr "--branch i --default siÄ™ wykluczajÄ…"
 
-#: builtin/submodule--helper.c:2792 git.c:441 git.c:714
+#: builtin/submodule--helper.c:3037
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "Dodawanie istniejącego repozytorium z „%s� do indeksu\n"
+
+#: builtin/submodule--helper.c:3040
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr "„%s� już istnieje i nie jest prawidłowym repozytorium gita"
+
+#: builtin/submodule--helper.c:3053
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr ""
+"Katalog gita podmodułu „%s� znaleziono lokalnie na zdalnych repozytoriach:\n"
+
+#: builtin/submodule--helper.c:3060
+#, 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 ""
+"Jeśli chcesz ponownie użyć tego lokalnego katalogu gita zamiast ponownie "
+"klonować z\n"
+"  %s\n"
+"użyj opcji „--force�. Jeśli lokalny katalog gita nie leży w prawidłowym "
+"repozytorium\n"
+"lub nie jesteś pewien, co to znaczy, wybierz inną nazwę za pomocą opcji „--"
+"name�."
+
+#: builtin/submodule--helper.c:3072
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "Reaktywacja lokalnego katalogu gita w podmodule „%s�\n"
+
+#: builtin/submodule--helper.c:3109
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "nie można wybrać podmodułu „%s�"
+
+#: builtin/submodule--helper.c:3148
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Nie można dodać podmodułu „%s�"
+
+#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
+#: builtin/submodule--helper.c:3165
+#, c-format
+msgid "Failed to register submodule '%s'"
+msgstr "Nie można zarejestrować podmodułu „%s�"
+
+#: builtin/submodule--helper.c:3221
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "„%s� już widnieje w indeksie"
+
+#: builtin/submodule--helper.c:3224
+#, c-format
+msgid "'%s' already exists in the index and is not a submodule"
+msgstr "„%s� już widnieje w indeksie i nie jest podmodułem"
+
+#: builtin/submodule--helper.c:3253
+msgid "branch of repository to add as submodule"
+msgstr "gałąź repozytorium do dodania jako podmoduł"
+
+#: builtin/submodule--helper.c:3254
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "pozwól dodać normalnie ignorowaną ścieżkę podmodułu"
+
+#: builtin/submodule--helper.c:3256
+msgid "print only error messages"
+msgstr "wypisz tylko komunikaty błędów"
+
+#: builtin/submodule--helper.c:3260
+msgid "borrow the objects from reference repositories"
+msgstr "pożycz obiekty z repozytoriów odniesienia"
+
+#: builtin/submodule--helper.c:3262
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"ustawia nazwę podmodułu na podany ciąg zamiast używać domyślnie jego ścieżki"
+
+#: builtin/submodule--helper.c:3269
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<opcje>] [--] <repozytorium> [<ścieżka>]"
+
+#: builtin/submodule--helper.c:3297
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "Ścieżki względnej można użyć tylko ze szczytu drzewa roboczego"
+
+#: builtin/submodule--helper.c:3305
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr ""
+"URL repozytorium: „%s� musi być ścieżką bezwzględną lub zaczynać się "
+"od ./|../"
+
+#: builtin/submodule--helper.c:3340
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "„%s� nie jest prawidłową nazwą podmodułu"
+
+#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s nie wspiera --super-prefix"
 
-#: builtin/submodule--helper.c:2798
+#: builtin/submodule--helper.c:3410
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "„%s� nie jest prawidłowym pod-poleceniem submodule--helper"
@@ -22627,33 +23526,33 @@ msgstr "git symbolic-ref [<opcje>] <nazwa> [<referencja>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <nazwa>"
 
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "nie wypisuj błędów przy nie-symbolicznych (odłączonych) referencjach"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "usuń referencję symboliczną"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "skróć wyjściową referencję"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "powód"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr "powód aktualizacji"
 
 #: builtin/tag.c:25
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+"        <tagname> [<head>]"
 msgstr ""
 "git tag [-a | -s | -u <id-klucza>] [-f] [-m <komunikat> | -F <plik>]\n"
-"\t\t<tag> [<czoło>]"
+"        <tag> [<czoło>]"
 
 #: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
@@ -22663,29 +23562,29 @@ msgstr "git tag -d <nazwa-tagu>..."
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
 "[<pattern>...]"
 msgstr ""
 "git tag -l [-n[<num>]] [--contains <zapis>] [--no-contains <zapis>] [--"
 "points-at <obiekt>]\n"
-"\t\t[--format=<format>] [--merged <zapis>] [--no-merged <zapis>] "
+"        [--format=<format>] [--merged <zapis>] [--no-merged <zapis>] "
 "[<wzorzec>...]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<format>] <nazwa-tagu>..."
 
-#: builtin/tag.c:89
+#: builtin/tag.c:100
 #, c-format
 msgid "tag '%s' not found."
 msgstr "nie znaleziono tagu „%s�."
 
-#: builtin/tag.c:124
+#: builtin/tag.c:135
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Usunięto tag „%s� (wskazywał %s)\n"
 
-#: builtin/tag.c:159
+#: builtin/tag.c:170
 #, c-format
 msgid ""
 "\n"
@@ -22698,7 +23597,7 @@ msgstr ""
 "  %s\n"
 "Wiersze zaczynające się od „%c� zostaną zignorowane.\n"
 
-#: builtin/tag.c:163
+#: builtin/tag.c:174
 #, c-format
 msgid ""
 "\n"
@@ -22713,11 +23612,11 @@ msgstr ""
 "Wiersze zaczynające się od „%c� będą zachowane; możesz je sam(a) usunąć, "
 "jeśli chcesz.\n"
 
-#: builtin/tag.c:230
+#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr "nie można podpisać tagu"
 
-#: builtin/tag.c:248
+#: builtin/tag.c:259
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -22730,139 +23629,139 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:264
+#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "zły rodzaj obiektu."
 
-#: builtin/tag.c:317
+#: builtin/tag.c:326
 msgid "no tag message?"
 msgstr "brak komunikatu tagu?"
 
-#: builtin/tag.c:324
+#: builtin/tag.c:333
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Pozostawiono komunikat tagu w %s\n"
 
-#: builtin/tag.c:435
+#: builtin/tag.c:444
 msgid "list tag names"
 msgstr "wypisz nazwy tagów"
 
-#: builtin/tag.c:437
+#: builtin/tag.c:446
 msgid "print <n> lines of each tag message"
 msgstr "wypisz <n> wierszy każdego komunikatu tagu"
 
-#: builtin/tag.c:439
+#: builtin/tag.c:448
 msgid "delete tags"
 msgstr "usuń tagi"
 
-#: builtin/tag.c:440
+#: builtin/tag.c:449
 msgid "verify tags"
 msgstr "weryfikuj tagi"
 
-#: builtin/tag.c:442
+#: builtin/tag.c:451
 msgid "Tag creation options"
 msgstr "Opcje tworzenia tagów"
 
-#: builtin/tag.c:444
+#: builtin/tag.c:453
 msgid "annotated tag, needs a message"
 msgstr "opisz tag, potrzebuje komunikatu"
 
-#: builtin/tag.c:446
+#: builtin/tag.c:455
 msgid "tag message"
 msgstr "wiadomość tagu"
 
-#: builtin/tag.c:448
+#: builtin/tag.c:457
 msgid "force edit of tag message"
 msgstr "wymuÅ› edycjÄ™ komunikatu tagu"
 
-#: builtin/tag.c:449
+#: builtin/tag.c:458
 msgid "annotated and GPG-signed tag"
 msgstr "tag opisany i podpisany GPG"
 
-#: builtin/tag.c:452
+#: builtin/tag.c:461
 msgid "use another key to sign the tag"
 msgstr "użyj innego klucza do podpisania tagu"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:462
 msgid "replace the tag if exists"
 msgstr "zamień tag, jeśli istnieje"
 
-#: builtin/tag.c:454 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "utwórz dziennik referencji"
 
-#: builtin/tag.c:456
+#: builtin/tag.c:465
 msgid "Tag listing options"
 msgstr "Opcje wypisywania tagów"
 
-#: builtin/tag.c:457
+#: builtin/tag.c:466
 msgid "show tag list in columns"
 msgstr "pokaż listę tagów w kolumnach"
 
-#: builtin/tag.c:458 builtin/tag.c:460
+#: builtin/tag.c:467 builtin/tag.c:469
 msgid "print only tags that contain the commit"
 msgstr "wypisz tylko tagi zawierajÄ…ce ten zapis"
 
-#: builtin/tag.c:459 builtin/tag.c:461
+#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that don't contain the commit"
 msgstr "wypisz tylko tagi nie zawierajÄ…ce tego zapisu"
 
-#: builtin/tag.c:462
+#: builtin/tag.c:471
 msgid "print only tags that are merged"
 msgstr "wypisz tylko scalone tagi"
 
-#: builtin/tag.c:463
+#: builtin/tag.c:472
 msgid "print only tags that are not merged"
 msgstr "wypisz tylko niescalone tagi"
 
-#: builtin/tag.c:467
+#: builtin/tag.c:476
 msgid "print only tags of the object"
 msgstr "wypisz tylko tagi tego obiektu"
 
-#: builtin/tag.c:515
+#: builtin/tag.c:525
 msgid "--column and -n are incompatible"
 msgstr "--column i -n siÄ™ wykluczajÄ…"
 
-#: builtin/tag.c:537
+#: builtin/tag.c:546
 msgid "-n option is only allowed in list mode"
-msgstr "opcja -n może być użyta tylko w trybie wymieniania"
+msgstr "opcji -n można użyć tylko w trybie wymieniania"
 
-#: builtin/tag.c:539
+#: builtin/tag.c:548
 msgid "--contains option is only allowed in list mode"
-msgstr "opcja --contains może być użyta tylko w trybie wymieniania"
+msgstr "opcji --contains można użyć tylko w trybie wymieniania"
 
-#: builtin/tag.c:541
+#: builtin/tag.c:550
 msgid "--no-contains option is only allowed in list mode"
-msgstr "opcja --no-contains może być użyta tylko w trybie wymieniania"
+msgstr "opcji --no-contains można użyć tylko w trybie wymieniania"
 
-#: builtin/tag.c:543
+#: builtin/tag.c:552
 msgid "--points-at option is only allowed in list mode"
-msgstr "opcja --points-at może być użyta tylko w trybie wymieniania"
+msgstr "opcji --points-at można użyć tylko w trybie wymieniania"
 
-#: builtin/tag.c:545
+#: builtin/tag.c:554
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "opcje --merged i --no-merged mogą być użyte tylko w trybie wymieniania"
 
-#: builtin/tag.c:556
+#: builtin/tag.c:568
 msgid "only one -F or -m option is allowed."
 msgstr "-F i -m siÄ™ wykluczajÄ…."
 
-#: builtin/tag.c:581
+#: builtin/tag.c:593
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "„%s� nie jest prawidłową nazwą tagu."
 
-#: builtin/tag.c:586
+#: builtin/tag.c:598
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "tag „%s� już istnieje"
 
-#: builtin/tag.c:617
+#: builtin/tag.c:629
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Zaktualizowano tag „%s� (wskazywał %s)\n"
 
-#: builtin/unpack-objects.c:502
+#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr "Rozpakowywanie obiektów"
 
@@ -22871,56 +23770,51 @@ msgstr "Rozpakowywanie obiektów"
 msgid "failed to create directory %s"
 msgstr "nie można utworzyć katalogu %s"
 
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "nie można utworzyć pliku %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "nie można usunąć pliku %s"
 
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "nie można usunąć katalogu %s"
 
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Sprawdzanie czasu modyfikacji „%s� "
 
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
 msgstr "informacje stat katalogu nie zmieniajÄ… siÄ™ po dodaniu nowego pliku"
 
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
 msgid "directory stat info does not change after adding a new directory"
 msgstr "informacje stat katalogu nie zmieniajÄ… siÄ™ po dodaniu nowego katalogu"
 
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
 msgid "directory stat info changes after updating a file"
 msgstr "informacje stat katalogu zmieniajÄ… siÄ™ po zaktualizowaniu pliku"
 
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "informacje stat katalogu zmieniają się po usunięciu pliku w podkatalogu"
 
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
 msgid "directory stat info does not change after deleting a file"
 msgstr "informacje stat katalogu nie zmieniają się po usunięciu pliku"
 
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
 msgid "directory stat info does not change after deleting a directory"
 msgstr "informacje stat katalogu nie zmieniają się po usunięciu katalogu"
 
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opcje>] [--] [<plik>...]"
 
@@ -22930,7 +23824,7 @@ msgstr "kontynuuj odświeżanie, nawet jeśli indeks potrzebuje aktualizacji"
 
 #: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
-msgstr "odświeżanie: ignoruj pod-moduły"
+msgstr "odświeżanie: ignoruj podmoduły"
 
 #: builtin/update-index.c:980
 msgid "do not ignore new files"
@@ -23135,19 +24029,19 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<opcje>] --stdin [-z]"
 
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "usuń referencję"
 
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
 msgstr "zaktualizuj <referencję>, a nie tę, na którą wskazuje"
 
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "wejście ma argumenty rozdzielone NULami"
 
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "wczytaj aktualizacje ze standardowego wejścia"
 
@@ -23163,19 +24057,19 @@ msgstr "zaktualizuj pliki informacji od zera"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<opcje>] <katalog>"
 
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
 msgid "quit after a single request/response exchange"
 msgstr "wyjdź po pojedynczej wymianie żądania/odpowiedzi"
 
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "wyjdź natychmiast po początkowym ogłoszeniu referencji"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "zaserwuj informacje/referencje do git-http-backend"
 
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "nie sprawdzaj <katalog>/.git/ jeśli <katalog> nie jest katalogiem Gita"
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "przerwij przesyłanie po <n> sekundach nieaktywności"
 
@@ -23211,63 +24105,58 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgid "print tag contents"
 msgstr "wypisz zawartość tagu"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<opcje>] <ścieżka> [<zapis>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opcje>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opcje>] <ścieżka>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <drzewo-robocze> <nowa-ścieżka>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opcje>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<opcje>] <drzewo-robocze>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <ścieżka>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:933
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "nie można skasować „%s�"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "Usuwanie %s/%s: %s"
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
 msgid "report pruned working trees"
 msgstr "zgłaszaj przycięte drzewa robocze"
 
-#: builtin/worktree.c:151
+#: builtin/worktree.c:150
 msgid "expire working trees older than <time>"
 msgstr "wygaś drzewa robocze starsze niż <czas>"
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c:220
 #, c-format
 msgid "'%s' already exists"
 msgstr "„%s� już istnieje"
 
-#: builtin/worktree.c:230
+#: builtin/worktree.c:229
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "cel drzewa roboczego „%s� nie nadaje się do użytku"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -23277,7 +24166,7 @@ msgstr ""
 "użyj „%s -f -f�, aby wymusić, lub „unlock� i „prune� lub „remove�, aby "
 "wyczyścić"
 
-#: builtin/worktree.c:237
+#: builtin/worktree.c:236
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -23286,129 +24175,140 @@ msgstr ""
 "„%s� jest brakującym, ale już zarejestrowanym drzewem roboczym;\n"
 "użyj „%s -f�, aby wymusić, bądź „prune� lub „remove�, aby wyczyścić"
 
-#: builtin/worktree.c:288
+#: builtin/worktree.c:287
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "nie można utworzyć katalogu „%s�"
 
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+msgid "initializing"
+msgstr "inicjowanie"
+
+#: builtin/worktree.c:421 builtin/worktree.c:427
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Przygotowywanie drzewa roboczego (nowa gałąź „%s�)"
 
-#: builtin/worktree.c:424
+#: builtin/worktree.c:423
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "Przygotowywanie drzewa roboczego (resetowanie gałęzi „%s�; była na %s)"
 
-#: builtin/worktree.c:433
+#: builtin/worktree.c:432
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Przygotowywanie drzewa roboczego (wybieranie „%s�)"
 
-#: builtin/worktree.c:439
+#: builtin/worktree.c:438
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Przygotowywanie drzewa roboczego (oddzielone HEAD %s)"
 
-#: builtin/worktree.c:480
+#: builtin/worktree.c:483
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "wybierz <gałąź> nawet jeśli już jest wybrana w innym drzewie roboczym"
 
-#: builtin/worktree.c:483
+#: builtin/worktree.c:486
 msgid "create a new branch"
 msgstr "utwórz nową gałąź"
 
-#: builtin/worktree.c:485
+#: builtin/worktree.c:488
 msgid "create or reset a branch"
 msgstr "utwórz lub zresetuj gałąź"
 
-#: builtin/worktree.c:487
+#: builtin/worktree.c:490
 msgid "populate the new working tree"
 msgstr "wypełnij nowe drzewo robocze"
 
-#: builtin/worktree.c:488
+#: builtin/worktree.c:491
 msgid "keep the new working tree locked"
 msgstr "pozostaw nowe drzewo robocze zablokowane"
 
-#: builtin/worktree.c:491
+#: builtin/worktree.c:493 builtin/worktree.c:730
+msgid "reason for locking"
+msgstr "powód blokady"
+
+#: builtin/worktree.c:496
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "ustaw tryb śledzenia (zobacz git-branch(1))"
 
-#: builtin/worktree.c:494
+#: builtin/worktree.c:499
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "spróbuj dopasować nazwę nowej gałęzi do gałęzi śledzącej"
 
-#: builtin/worktree.c:502
+#: builtin/worktree.c:507
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B i --detach siÄ™ wykluczajÄ…"
 
-#: builtin/worktree.c:563
+#: builtin/worktree.c:509
+msgid "--reason requires --lock"
+msgstr "--reason wymaga --lock"
+
+#: builtin/worktree.c:513
+msgid "added with --lock"
+msgstr "dodane przez --lock"
+
+#: builtin/worktree.c:575
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track można użyć tylko przy tworzeniu nowej gałęzi"
 
-#: builtin/worktree.c:680
+#: builtin/worktree.c:692
 msgid "show extended annotations and reasons, if available"
 msgstr "pokaż rozszerzone adnotacje i powody, jeśli dostępne"
 
-#: builtin/worktree.c:682
+#: builtin/worktree.c:694
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr "oznacz drzewa robocze starsze niż <czas> jako „do przycięcia�"
 
-#: builtin/worktree.c:691
+#: builtin/worktree.c:703
 msgid "--verbose and --porcelain are mutually exclusive"
 msgstr "--verbose i --porcelain siÄ™ wykluczajÄ…"
 
-#: builtin/worktree.c:718
-msgid "reason for locking"
-msgstr "powód blokady"
-
-#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
-#: builtin/worktree.c:961
+#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
+#: builtin/worktree.c:973
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "„%s� nie jest drzewem roboczym"
 
-#: builtin/worktree.c:732 builtin/worktree.c:765
+#: builtin/worktree.c:744 builtin/worktree.c:777
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Główne drzewo robocze nie może być blokowane ani odblokowywane"
 
-#: builtin/worktree.c:737
+#: builtin/worktree.c:749
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "„%s� już jest zablokowany, powód: %s"
 
-#: builtin/worktree.c:739
+#: builtin/worktree.c:751
 #, c-format
 msgid "'%s' is already locked"
 msgstr "„%s� już jest zablokowany"
 
-#: builtin/worktree.c:767
+#: builtin/worktree.c:779
 #, c-format
 msgid "'%s' is not locked"
 msgstr "„%s� nie jest zablokowany"
 
-#: builtin/worktree.c:808
+#: builtin/worktree.c:820
 msgid "working trees containing submodules cannot be moved or removed"
-msgstr ""
-"nie można przenosić ani usuwać drzew roboczych zawierających pod-moduły"
+msgstr "nie można przenosić ani usuwać drzew roboczych zawierających podmoduły"
 
-#: builtin/worktree.c:816
+#: builtin/worktree.c:828
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 "wymuś przeniesienie, nawet jeśli drzewo robocze jest brudne lub zablokowane"
 
-#: builtin/worktree.c:839 builtin/worktree.c:963
+#: builtin/worktree.c:851 builtin/worktree.c:975
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "„%s� jest głównym drzewem roboczym"
 
-#: builtin/worktree.c:844
+#: builtin/worktree.c:856
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "nie można uzyskać nazwy celu z „%s�"
 
-#: builtin/worktree.c:857
+#: builtin/worktree.c:869
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -23417,7 +24317,7 @@ msgstr ""
 "nie można przenieść zablokowanego drzewa roboczego, powód blokady: %s\n"
 "użyj „move -f -f�, żeby to wymusić lub najpierw odblokować"
 
-#: builtin/worktree.c:859
+#: builtin/worktree.c:871
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -23425,38 +24325,38 @@ msgstr ""
 "nie można przenieść zablokowanego drzewa roboczego;\n"
 "użyj „move -f -f�, żeby to wymusić lub najpierw odblokować"
 
-#: builtin/worktree.c:862
+#: builtin/worktree.c:874
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "sprawdzenie nie powiodło się, nie można przenieść drzewa roboczego: %s"
 
-#: builtin/worktree.c:867
+#: builtin/worktree.c:879
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "nie można przenieść „%s� do „%s�"
 
-#: builtin/worktree.c:913
+#: builtin/worktree.c:925
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "nie można wykonać „git status� na „%s�"
 
-#: builtin/worktree.c:917
+#: builtin/worktree.c:929
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 "„%s� zawiera zmienione lub nieśledzone pliki, użyj --force, aby skasować"
 
-#: builtin/worktree.c:922
+#: builtin/worktree.c:934
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "nie można wykonać „git status� na „%s�, kod %d"
 
-#: builtin/worktree.c:945
+#: builtin/worktree.c:957
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 "wymuś usunięcie, nawet jeśli drzewo robocze jest brudne lub zablokowane"
 
-#: builtin/worktree.c:968
+#: builtin/worktree.c:980
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -23465,7 +24365,7 @@ msgstr ""
 "nie można usunąć zablokowanego drzewa roboczego, powód blokady: %s\n"
 "użyj „remove -f -f�, żeby to wymusić lub najpierw odblokować"
 
-#: builtin/worktree.c:970
+#: builtin/worktree.c:982
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -23473,17 +24373,17 @@ msgstr ""
 "nie można usunąć zablokowanego drzewa roboczego;\n"
 "użyj „remove -f -f�, żeby to wymusić lub najpierw odblokować"
 
-#: builtin/worktree.c:973
+#: builtin/worktree.c:985
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "sprawdzenie nie powiodło się, nie można usunąć drzewa roboczego: %s"
 
-#: builtin/worktree.c:997
+#: builtin/worktree.c:1009
 #, c-format
 msgid "repair: %s: %s"
 msgstr "naprawa: %s: %s"
 
-#: builtin/worktree.c:1000
+#: builtin/worktree.c:1012
 #, c-format
 msgid "error: %s: %s"
 msgstr "błąd: %s: %s"
@@ -23504,40 +24404,6 @@ msgstr "zapisz obiekt drzewa katalogu <prefiks>"
 msgid "only useful for debugging"
 msgstr "przydatne tylko do odpluskwiania"
 
-#: http-fetch.c:114
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr "argument --packfile musi być prawidłowym skrótem (otrzymano „%s�)"
-
-#: http-fetch.c:122
-msgid "not a git repository"
-msgstr "to nie jest repozytorium gita"
-
-#: t/helper/test-fast-rebase.c:141
-msgid "unhandled options"
-msgstr "nieprzetworzone opcje"
-
-#: t/helper/test-fast-rebase.c:146
-msgid "error preparing revisions"
-msgstr "błąd w przygotowywaniu rewizji"
-
-#: t/helper/test-reach.c:154
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "zapis %s nie jest oznaczony jako osiÄ…galny"
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr "za dużo zapisów oznaczono jako osiągalne"
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<opcje>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "wyjdź natychmiast po początkowym ogłoszeniu możliwości"
-
 #: git.c:28
 msgid ""
 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
@@ -23549,12 +24415,12 @@ msgid ""
 "           <command> [<args>]"
 msgstr ""
 "git [--version] [--help] [-C <ścieżka>] [-c <nazwa>=<wartość>]\n"
-"           [--exec-path[=<ścieżka>]] [--html-path] [--man-path]"
-" [--info-path]\n"
+"           [--exec-path[=<ścieżka>]] [--html-path] [--man-path] [--info-"
+"path]\n"
 "           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
 "bare]\n"
-"           [--git-dir=<ścieżka>] [--work-tree=<ścieżka>] [--namespace=<nazwa"
-">]\n"
+"           [--git-dir=<ścieżka>] [--work-tree=<ścieżka>] [--"
+"namespace=<nazwa>]\n"
 "           [--super-prefix=<ścieżka>] [--config-env=<nazwa>=<zmśrod>]\n"
 "           <polecenie> [<argumenty>]"
 
@@ -23597,22 +24463,27 @@ msgstr "nie podano prefiksu do --super-prefix\n"
 msgid "-c expects a configuration string\n"
 msgstr "-c oczekuje łańcucha konfiguracji\n"
 
-#: git.c:292
+#: git.c:260
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "nie podano klucza ustawień do --config-env\n"
+
+#: git.c:300
 #, c-format
 msgid "no directory given for -C\n"
 msgstr "nie podano katalogu do -C\n"
 
-#: git.c:318
+#: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
 msgstr "nieznana opcja: %s\n"
 
-#: git.c:367
+#: git.c:375
 #, c-format
 msgid "while expanding alias '%s': '%s'"
 msgstr "podczas rozszerzania skrótu „%s�: „%s�"
 
-#: git.c:376
+#: git.c:384
 #, c-format
 msgid ""
 "alias '%s' changes environment variables.\n"
@@ -23621,39 +24492,39 @@ msgstr ""
 "skrót „%s� zmienia zmienne środowiska.\n"
 "Aby to zrobić, możesz użyć w skrócie „!git�"
 
-#: git.c:383
+#: git.c:391
 #, c-format
 msgid "empty alias for %s"
 msgstr "pusty skrót dla %s"
 
-#: git.c:386
+#: git.c:394
 #, c-format
 msgid "recursive alias: %s"
 msgstr "rekurencyjny skrót: %s"
 
-#: git.c:468
+#: git.c:476
 msgid "write failure on standard output"
 msgstr "błąd wypisywania na standardowe wyjście"
 
-#: git.c:470
+#: git.c:478
 msgid "unknown write failure on standard output"
 msgstr "nieznany błąd wypisywania na standardowe wyjście"
 
-#: git.c:472
+#: git.c:480
 msgid "close failed on standard output"
 msgstr "nie można zamknąć standardowego wyjścia"
 
-#: git.c:823
+#: git.c:832
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "wykryto pętlę skrótów: rozwijanie „%s� nie kończy się: %s"
 
-#: git.c:873
+#: git.c:882
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "nie można obsłużyć %s jako polecenia wbudowanego"
 
-#: git.c:886
+#: git.c:895
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -23662,54 +24533,166 @@ msgstr ""
 "użycie: %s\n"
 "\n"
 
-#: git.c:906
+#: git.c:915
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 "rozwinięcie skrótu „%s� nie powiodło się; „%s� nie jest poleceniem gita\n"
 
-#: git.c:918
+#: git.c:927
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "nie można wykonać polecenia „%s�: %s\n"
 
-#: http.c:399
+#: http-fetch.c:118
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "argument --packfile musi być prawidłowym skrótem (otrzymano „%s�)"
+
+#: http-fetch.c:128
+msgid "not a git repository"
+msgstr "to nie jest repozytorium gita"
+
+#: http-fetch.c:134
+msgid "--packfile requires --index-pack-args"
+msgstr "--packfile wymaga --index-pack-args"
+
+#: http-fetch.c:143
+msgid "--index-pack-args can only be used with --packfile"
+msgstr "--index-pack-args można użyć tylko z --packfile"
+
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr "nieprzetworzone opcje"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "błąd w przygotowywaniu rewizji"
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "zapis %s nie jest oznaczony jako osiÄ…galny"
+
+#: t/helper/test-reach.c:164
+msgid "too many commits marked reachable"
+msgstr "za dużo zapisów oznaczono jako osiągalne"
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<opcje>]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "wyjdź natychmiast po początkowym ogłoszeniu możliwości"
+
+#: t/helper/test-simple-ipc.c:581
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active    [<nazwa>] [<opcje>]"
+
+#: t/helper/test-simple-ipc.c:582
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [<nazwa>] [<wÄ…tki>]"
+
+#: t/helper/test-simple-ipc.c:583
+msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+msgstr ""
+"test-helper simple-ipc start-daemon [<nazwa>] [<wÄ…tki>] [<maks-czekanie>]"
+
+#: t/helper/test-simple-ipc.c:584
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [<nazwa>] [<maks-czekanie>]"
+
+#: t/helper/test-simple-ipc.c:585
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<nazwa>] [<polecenie>]"
+
+#: t/helper/test-simple-ipc.c:586
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr ""
+"test-helper simple-ipc sendbytes    [<nazwa>] [<liczba-bajtów>] [<bajt>]"
+
+#: t/helper/test-simple-ipc.c:587
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<nazwa>] [<wątki>] [<liczba-bajtów>] "
+"[<rozmiar-wsadu>]"
+
+#: t/helper/test-simple-ipc.c:595
+msgid "name or pathname of unix domain socket"
+msgstr "nazwa lub ścieżka do gniazda domeny uniksowej"
+
+#: t/helper/test-simple-ipc.c:597
+msgid "named-pipe name"
+msgstr "nazwa nazwanego potoku"
+
+#: t/helper/test-simple-ipc.c:599
+msgid "number of threads in server thread pool"
+msgstr "liczba wątków w poletku wątków serwera"
+
+#: t/helper/test-simple-ipc.c:600
+msgid "seconds to wait for daemon to start or stop"
+msgstr "sekundy do odczekania przy włączaniu lub wyłączaniu demona"
+
+#: t/helper/test-simple-ipc.c:602
+msgid "number of bytes"
+msgstr "liczba bajtów"
+
+#: t/helper/test-simple-ipc.c:603
+msgid "number of requests per thread"
+msgstr "liczba żądań na wątek"
+
+#: t/helper/test-simple-ipc.c:605
+msgid "byte"
+msgstr "bajt"
+
+#: t/helper/test-simple-ipc.c:605
+msgid "ballast character"
+msgstr "znak balastowy"
+
+#: t/helper/test-simple-ipc.c:606
+msgid "token"
+msgstr "polecenie"
+
+#: t/helper/test-simple-ipc.c:606
+msgid "command token to send to the server"
+msgstr "polecenie do wysłania na serwer"
+
+#: http.c:350
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "ujemna wartość http.postbuffer; użycie domyślnej %d"
 
-#: http.c:420
+#: http.c:371
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Kontrola powierzania niewspierana z cURLem < 7.22.0"
 
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Klucz publiczny niewspierany z cURLem < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Przypinanie kluczy publicznych niewspierane z cURLem < 7.39.0"
 
-#: http.c:910
+#: http.c:812
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "CURLSSLOPT_NO_REVOKE niewspierane z cURLem < 7.44.0"
 
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Ograniczenia protokołów niewspierane z cURLem < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "Niewspierany silnik SSL „%s�. Wspierane silniki SSL:"
 
-#: http.c:1139
+#: http.c:1023
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr "Nie można ustawić silnika SSL na „%s�: cURL zbudowano bez silników SSL"
 
-#: http.c:1143
+#: http.c:1027
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "Nie można ustawić silnika SSL na „%s�: już ustawiono"
 
-#: http.c:2025
+#: http.c:1876
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -23725,133 +24708,138 @@ msgstr ""
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "nieprawidłowe cytowanie w wartości opcji wypchnięcia: „%s�"
 
-#: remote-curl.c:307
+#: remote-curl.c:304
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs nieprawidłowe: czy to jest repozytorium gita?"
 
-#: remote-curl.c:408
+#: remote-curl.c:405
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 "nieprawidłowa odpowiedź serwera; oczekiwano usługi, otrzymano pakiet "
 "wypróżnienia"
 
-#: remote-curl.c:439
+#: remote-curl.c:436
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "nieprawidłowa odpowiedź serwera; otrzymano „%s�"
 
-#: remote-curl.c:499
+#: remote-curl.c:496
 #, c-format
 msgid "repository '%s' not found"
 msgstr "nie znaleziono repozytorium „%s�"
 
-#: remote-curl.c:503
+#: remote-curl.c:500
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Uwierzytelnienie nie powiodło się dla „%s�"
 
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "nie można dostać się do „%s� z ustawieniem http.pinnedPubkey: %s"
+
+#: remote-curl.c:508
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "brak dostępu do „%s�: %s"
 
-#: remote-curl.c:513
+#: remote-curl.c:514
 #, c-format
 msgid "redirecting to %s"
 msgstr "przekierowanie do %s"
 
-#: remote-curl.c:642
+#: remote-curl.c:645
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr ""
 "nie powinno być końca pliku, kiedy koniec pliku nie jest gładko obsługiwany"
 
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr "zdalna maszyna wysłała bezstanowy separator"
+#: remote-curl.c:657
+msgid "remote server sent unexpected response end packet"
+msgstr "zdalny serwer wysłał nieoczekiwany pakiet końca odpowiedzi"
 
-#: remote-curl.c:724
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 "nie można cofnąć danych formularza rpc — spróbuj zwiększyć http.postBuffer"
 
-#: remote-curl.c:754
+#: remote-curl.c:755
 #, c-format
 msgid "remote-curl: bad line length character: %.4s"
 msgstr "remote-curl: zły znak długości wiersza: %.4s"
 
-#: remote-curl.c:756
+#: remote-curl.c:757
 msgid "remote-curl: unexpected response end packet"
 msgstr "remote-curl: nieoczekiwany pakiet końca odpowiedzi"
 
-#: remote-curl.c:832
+#: remote-curl.c:833
 #, c-format
 msgid "RPC failed; %s"
 msgstr "wywołanie RPC nie powiodło się; %s"
 
-#: remote-curl.c:872
+#: remote-curl.c:873
 msgid "cannot handle pushes this big"
 msgstr "nie można obsłużyć tak dużych wypchnięć"
 
-#: remote-curl.c:987
+#: remote-curl.c:986
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "nie można skompresować żądania; błąd deflate zlib %d"
 
-#: remote-curl.c:991
+#: remote-curl.c:990
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "nie można skompresować żądania; błąd end zlib %d"
 
-#: remote-curl.c:1041
+#: remote-curl.c:1040
 #, c-format
 msgid "%d bytes of length header were received"
 msgstr "otrzymano nagłówek długości %d bajtów"
 
-#: remote-curl.c:1043
+#: remote-curl.c:1042
 #, c-format
 msgid "%d bytes of body are still expected"
 msgstr "nadal oczekuję na %d bajtów ciała"
 
-#: remote-curl.c:1132
+#: remote-curl.c:1131
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "tępy transport http nie wspiera płytkich możliwości"
 
-#: remote-curl.c:1147
+#: remote-curl.c:1146
 msgid "fetch failed."
 msgstr "pobieranie nie powiodło się."
 
-#: remote-curl.c:1193
+#: remote-curl.c:1192
 msgid "cannot fetch by sha1 over smart http"
 msgstr "nie można pobrać SHA-1 przez inteligentne http"
 
-#: remote-curl.c:1237 remote-curl.c:1243
+#: remote-curl.c:1236 remote-curl.c:1242
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "błąd protokołu: oczekiwano SHA/referencji, otrzymano „%s�"
 
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1254 remote-curl.c:1372
 #, c-format
 msgid "http transport does not support %s"
 msgstr "transport http nie wspiera %s"
 
-#: remote-curl.c:1291
+#: remote-curl.c:1290
 msgid "git-http-push failed"
 msgstr "git-http-push nie powiodło się"
 
-#: remote-curl.c:1479
+#: remote-curl.c:1478
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: użycie: git remote-curl <zdalne-repozytorium> [<adres>]"
 
-#: remote-curl.c:1511
+#: remote-curl.c:1510
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl: błąd odczytu strumienia poleceń od gita"
 
-#: remote-curl.c:1518
+#: remote-curl.c:1517
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: próba pobrania bez lokalnego repozytorium"
 
-#: remote-curl.c:1559
+#: remote-curl.c:1558
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: nieznane polecenie „%s� z gita"
@@ -23864,11 +24852,11 @@ msgstr "brak dostępnych informacji o kompilatorze\n"
 msgid "no libc information available\n"
 msgstr "brak dostępnych informacji o bibliotece standardowej\n"
 
-#: list-objects-filter-options.h:91
+#: list-objects-filter-options.h:94
 msgid "args"
 msgstr "argumenty"
 
-#: list-objects-filter-options.h:92
+#: list-objects-filter-options.h:95
 msgid "object filtering"
 msgstr "filtrowanie obiektów"
 
@@ -23880,36 +24868,36 @@ msgstr "data wygaśnięcia"
 msgid "no-op (backward compatibility)"
 msgstr "nic nie robi (kompatybilność wsteczna)"
 
-#: parse-options.h:309
+#: parse-options.h:308
 msgid "be more verbose"
 msgstr "więcej komunikatów"
 
-#: parse-options.h:311
+#: parse-options.h:310
 msgid "be more quiet"
 msgstr "mniej komunikatów"
 
-#: parse-options.h:317
+#: parse-options.h:316
 msgid "use <n> digits to display object names"
 msgstr "użyj <n> cyfr, aby wyświetlić nazwy obiektów"
 
-#: parse-options.h:336
+#: parse-options.h:335
 msgid "how to strip spaces and #comments from message"
 msgstr "jak usuwać odstępy i #komentarze z komunikatu"
 
-#: parse-options.h:337
+#: parse-options.h:336
 msgid "read pathspec from file"
 msgstr "wczytaj ścieżki z pliku"
 
-#: parse-options.h:338
+#: parse-options.h:337
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr "przy --pathspec-from-file ścieżki są rozdzielone znakiem NUL"
 
-#: ref-filter.h:99
+#: ref-filter.h:101
 msgid "key"
 msgstr "klucz"
 
-#: ref-filter.h:99
+#: ref-filter.h:101
 msgid "field name to sort on"
 msgstr "nazwa pola, według którego należy posortować"
 
@@ -24441,7 +25429,7 @@ msgstr "Usuń niepotrzebne białe znaki"
 
 #: command-list.h:178
 msgid "Initialize, update or inspect submodules"
-msgstr "Zainicjuj, zaktualizuj lub zbadaj pod-moduły"
+msgstr "Zainicjuj, zaktualizuj lub zbadaj podmoduły"
 
 #: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
@@ -24570,7 +25558,7 @@ msgstr ""
 
 #: command-list.h:210
 msgid "Defining submodule properties"
-msgstr "Definiowanie właściwości pod-modułów"
+msgstr "Definiowanie właściwości podmodułów"
 
 #: command-list.h:211
 msgid "Git namespaces"
@@ -24604,41 +25592,6 @@ msgstr "Samouczek wprowadzenia do Gita"
 msgid "An overview of recommended workflows with Git"
 msgstr "Przegląd zalecanych przepływów pracy z Gitem"
 
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "przeszukanie nie powiodło się: nie podano polecenia."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "wykonywanie $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"przeszukanie nie powiodło się:\n"
-"kod wyjścia $res z „$command� jest <0 lub >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "przeszukanie nie może już kontynuować"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"przeszukanie nie powiodło się:\n"
-"„bisect-state $state� zakończyło się z kodem błędu $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "przeszukanie pomyślne"
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -24677,98 +25630,17 @@ msgstr "Próba prostego scalenia z $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Proste scalenie nie zadziałało, próba automatycznego scalenia."
 
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr "Ścieżka względna może być użyta tylko ze szczytu drzewa roboczego"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr ""
-"URL repozytorium: „$repo� musi być ścieżką bezwzględną lub zaczynać się "
-"od ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "„$sm_path� już widnieje w indeksie"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "„$sm_path� już widnieje w indeksie i nie jest pod-modułem"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "„$sm_path� nie ma wybranego zapisu"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "Dodawanie istniejącego repozytorium z „$sm_path� do indeksu"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "„$sm_path� już istnieje i nie jest prawidłowym repozytorium gita"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-"Katalog gita podmodułu „$sm_name� znaleziono lokalnie na zdalnych "
-"repozytoriach:"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-"  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"Jeśli chcesz ponownie użyć tego lokalnego katalogu gita zamiast ponownie "
-"klonować z\n"
-"  $realrepo\n"
-"użyj opcji „--force�. Jeśli lokalny katalog gita nie leży w prawidłowym "
-"repozytorium\n"
-"lub nie jesteś pewien, co to znaczy, wybierz inną nazwę za pomocą opcji „--"
-"name�."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "Reaktywacja lokalnego katalogu gita w podmodule „$sm_name�."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Nie można wybrać podmodułu „$sm_path�"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Nie można dodać podmodułu „$sm_path�"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Nie można zarejestrować podmodułu „$sm_path�"
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Nie znaleziono aktualnej rewizji w ścieżce podmodułu „$displaypath�"
 
-#: git-submodule.sh:578
+#: git-submodule.sh:411
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Nie można pobrać w ścieżce podmodułu „$sm_path�"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:416
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -24777,395 +25649,10 @@ msgstr ""
 "Nie znaleziono aktualnej rewizji ${remote_name}/${branch} w ścieżce pod-"
 "modułu „$sm_path�"
 
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Nie można pobrać w ścieżce podmodułu „$displaypath�; próba bezpośredniego "
-"pobrania $sha1:"
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Pobrano w ścieżce podmodułu „$displaypath�, ale nie zawierał $sha1. "
-"Bezpośrednie pobieranie tego zapisu nie powiodło się."
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Nie można wybrać „$sha1� w ścieżce podmodułu „$displaypath�"
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Ścieżka podmodułu „$displaypath�: wybrano „$sha1�"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "Nie można przestawić „$sha1� w ścieżce podmodułu „$displaypath�"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Ścieżka podmodułu „$displaypath�: przestawiono na „$sha1�"
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Nie można scalić „$sha1� w ścieżce podmodułu „$displaypath�"
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Ścieżka podmodułu „$displaypath�: scalono w „$sha1�"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Wykonanie „$command $sha1� nie powiodło się w ścieżce podmodułu "
-"„$displaypath�"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Ścieżka podmodułu „$displaypath�: „$command $sha1�"
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
-msgstr "Nie można zejść do ścieżki pod-modułu „$displaypath�"
-
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Zastosowano zmiany z automatycznego schowka."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Nie można zachować $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"Stosowanie zmian z automatycznej skrytki spowodowało konflikty.\n"
-"Twoje zmiany sÄ… bezpieczne w schowku.\n"
-"Możesz w każdej chwili wykonać „git stash pop� lub „git stash drop�.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Przestawianie ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-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"
-"Polecenia:\n"
-"p, pick <zapis> = dobierz zapis\n"
-"r, reword <zapis> = użyj zapisu, ale przeredaguj jego komunikat\n"
-"e, edit <zapis> = użyj zapisu, ale zatrzymaj się, żeby go poprawić\n"
-"s, squash <zapis> = użyj zapisu, ale połącz go z poprzednim (spłaszcz)\n"
-"f, fixup <zapis> = jak „squash�, ale odrzuć komunikat tego zapisu\n"
-"x, exec <polecenie> = wykonaj polecenie (resztę wiersza) w powłoce\n"
-"d, drop <zapis> = usuń zapis\n"
-"l, label <etykietka> = nazwij bieżące HEAD\n"
-"t, reset <etykietka> = zresetuj HEAD do etykietki\n"
-"m, merge [-C <zapis> | -c <zapis>] <etykietka> [# <wiersz>]\n"
-".       utwórz zapis scalenia używając pierwotnego komunikatu scalenia\n"
-".       (albo <wiersza>, jeśli nie podano pierwotnego zapisu scalenia.\n"
-".       Użyj -c <zapis>, aby przeredagować komunikat zapisu.\n"
-"Kolejność wierszy może być zmieniona; są wykonywane z góry na dół.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, 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 ""
-"Możesz teraz poprawić zapis przez\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Kiedy zadowolisz siÄ™ swoimi zmianami, wykonaj\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: nie jest to zapis, który można dobrać"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Nieprawidłowa nazwa zapisu: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Nie można wpisać zamiennego sha1 bieżącego zapisu"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Przewinięcie do $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Nie można przewinąć do $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Nie można przesunąć HEAD na $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Odmawiam spłaszczenia scalenia: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "BÅ‚Ä…d ponowienia scalenia $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Nie można dobrać $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "To jest komunikat zapisu nr ${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Komunikat zapisu nr ${n} zostanie pominięty:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "To jest połączenie $count zapisu."
-msgstr[1] "To jest połączenie $count zapisów."
-msgstr[2] "To jest połączenie $count zapisów."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Nie można zapisać $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "To jest połączenie dwóch zapisów."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Nie można zastosować $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, 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 ""
-"Nie udało się poprawić zapisu po pomyślnym dobraniu $sha1... $rest\n"
-"Jest to najpewniej spowodowane pustym komunikatem zapisu, albo "
-"niepowodzeniem\n"
-"skryptu pre-commit. Jeśli to on zawiódł, być może trzeba naprawić ten "
-"problem zanim\n"
-"uda się przeredagować zapis."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Zatrzymano na $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Nie można użyć „$squash_style� bez poprzedniego zapisu"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Wykonywanie: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Wykonywanie nie powiodło się: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "i pozostały zmiany w indeksie i/lub drzewie roboczym"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Możesz naprawić problem i uruchomić\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, 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 ""
-"Wykonanie powiodło się: $rest\n"
-"ale pozostały zmiany w indeksie i/lub drzewie roboczym.\n"
-"Złóż swoje zmiany lub dodaj do schowka, i wtedy wykonaj:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Nieznane polecenie: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Napraw to używając „git rebase --edit-todo�."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Pomyślnie przestawiono i zaktualizowano $head_name."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Nie można usunąć CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, 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 ""
-"W drzewie roboczym sÄ… przygotowane zmiany.\n"
-"Jeśli mają być one spłaszczone\n"
-"z poprzednim zapisem, wykonaj:\n"
-"\n"
-"  git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Jeśli mają się znaleźć w nowym zapisie, wykonaj:\n"
-"  git commit $gpg_sign_opt_quoted\n"
-"\n"
-"W obu przypadkach po zakończeniu, kontynuuj przez:\n"
-"\n"
-"  git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "Błąd podczas próby znalezienia tożsamości autora w poprawionym zapisie"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Masz niezłożone zmiany w drzewie roboczym. Najpierw je złóż\n"
-"i wtedy ponownie wykonaj „git rebase --continue�."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Nie udało się złożyć zmian ze schowka."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Nie można uruchomić edytora"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Nie można wybrać $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Brak HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Nie można utworzyć tymczasowego $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Nie można oznaczyć jako interaktywne"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Przestawianie $shortrevisions na $shortonto ($todocount polecenie)"
-msgstr[1] "Przestawianie $shortrevisions na $shortonto ($todocount polecenia)"
-msgstr[2] "Przestawianie $shortrevisions na $shortonto ($todocount poleceń)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Zważ, że puste zapisy są wykomentowane"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Nie można zainicjować przerobionych zapisów"
+msgstr "Nie można zejść do ścieżki podmodułu „$displaypath�"
 
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
@@ -25180,48 +25667,31 @@ msgstr "Nie można przejść chdir do $cdup, szczytu drzewa roboczego"
 #: git-sh-setup.sh:200 git-sh-setup.sh:207
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "krytyczny błąd: nie można użyć $program_name bez drzewa roboczego."
+msgstr "błąd krytyczny: nie można użyć $program_name bez drzewa roboczego."
 
 #: git-sh-setup.sh:221
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Nie można przestawić: Masz nieprzygotowane zmiany."
-
-#: git-sh-setup.sh:224
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr "Nie można przerobić gałęzi: Masz nieprzygotowane zmiany."
 
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "Nie można zaciągnąć z przestawieniem: Masz nieprzygotowane zmiany."
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:224
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "Nie można wykonać $action: Masz nieprzygotowane zmiany."
 
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "Nie można przestawić: Twój indeks zawiera niezłożone zmiany."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Nie można zaciągnąć z przestawieniem: Twój indeks zawiera niezłożone zmiany."
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:235
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr "Nie można wykonać $action: Twój indeks zawiera niezłożone zmiany."
 
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:237
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "Dodatkowo, twój indeks zawiera niezłożone zmiany."
 
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:357
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr "Musisz uruchomić to polecenie ze szczytu drzewa roboczego."
 
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:362
 msgid "Unable to determine absolute path of git directory"
 msgstr "Nie można określić bezwzględnej ścieżki katalogu gita"
 
@@ -25561,34 +26031,39 @@ msgstr "nieznany tryb --patch: %s"
 msgid "invalid argument %s, expecting --"
 msgstr "nieprawidłowy argument %s, oczekiwano --"
 
-#: git-send-email.perl:138
+#: git-send-email.perl:129
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "lokalna strefa różni się od GMT o odstęp niepodzielny przez minutę\n"
 
-#: git-send-email.perl:145 git-send-email.perl:151
+#: git-send-email.perl:136 git-send-email.perl:142
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "przesunięcie czasu lokalnego większe lub równe 24 godzin\n"
 
-#: git-send-email.perl:223 git-send-email.perl:229
+#: git-send-email.perl:214
+#, perl-format
+msgid "fatal: command '%s' died with exit code %d"
+msgstr "błąd krytyczny: polecenie „%s� zakończyło się z kodem wyjścia %d"
+
+#: git-send-email.perl:227
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "edytor nie wyszedł gładko, przerywanie wszystkiego"
 
-#: git-send-email.perl:312
+#: git-send-email.perl:316
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "„%s� zawiera pośrednią wersję listu e-mail, który pisałeś/-aś.\n"
 
-#: git-send-email.perl:317
+#: git-send-email.perl:321
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "„%s.final� zawiera napisany list e-mail.\n"
 
-#: git-send-email.perl:410
+#: git-send-email.perl:450
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases i inne opcje siÄ™ wykluczajÄ…\n"
 
-#: git-send-email.perl:484
+#: git-send-email.perl:525
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -25599,11 +26074,11 @@ msgstr ""
 "Ustaw sendemail.forbidSendmailVariables na false, aby wyłączyć to "
 "sprawdzenie.\n"
 
-#: git-send-email.perl:489 git-send-email.perl:691
+#: git-send-email.perl:530 git-send-email.perl:746
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Nie można wykonać git format-patch poza repozytorium\n"
 
-#: git-send-email.perl:492
+#: git-send-email.perl:533
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -25611,37 +26086,37 @@ msgstr ""
 "„batch-size� i „relogin� muszą być podane razem (z wiersza poleceń lub opcji "
 "konfiguracji)\n"
 
-#: git-send-email.perl:505
+#: git-send-email.perl:546
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Nieznane pole --suppress-cc: „%s�\n"
 
-#: git-send-email.perl:536
+#: git-send-email.perl:577
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Nieznane ustawienie --confirm: „%s�\n"
 
-#: git-send-email.perl:564
+#: git-send-email.perl:617
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "ostrzeżenie: skrót sendmaila z cudzysłowami niewspierany: %s\n"
 
-#: git-send-email.perl:566
+#: git-send-email.perl:619
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "ostrzeżenie: „:include:� niewspierane: %s\n"
 
-#: git-send-email.perl:568
+#: git-send-email.perl:621
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "ostrzeżenie: przekierowania „/plik� i „|potok� niewspierane: %s\n"
 
-#: git-send-email.perl:573
+#: git-send-email.perl:626
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "ostrzeżenie: nie rozpoznano wiersza sendmaila: %s\n"
 
-#: git-send-email.perl:657
+#: git-send-email.perl:711
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -25656,21 +26131,12 @@ msgstr ""
 "    * mówiąc „./%s� jeśli masz na myśli plik; lub\n"
 "    * podając opcję --format-patch jeśli masz na myśli zakres.\n"
 
-#: git-send-email.perl:678
+#: git-send-email.perl:732
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Nie można wykonać opendir na %s: %s"
 
-#: git-send-email.perl:702
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr ""
-"błąd krytyczny: %s: %s\n"
-"ostrzeżenie: nie wysłano żadnych łatek\n"
-
-#: git-send-email.perl:713
+#: git-send-email.perl:767
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -25680,17 +26146,17 @@ msgstr ""
 "Nie podano plików łatek!\n"
 "\n"
 
-#: git-send-email.perl:726
+#: git-send-email.perl:780
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Brak wiersza tematu w %s?"
 
-#: git-send-email.perl:736
+#: git-send-email.perl:791
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Nie można otworzyć %s do zapisu: %s"
 
-#: git-send-email.perl:747
+#: git-send-email.perl:802
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -25704,27 +26170,27 @@ msgstr ""
 "\n"
 "Wyczyść zawartość treści, jeśli chcesz wysłać podsumowanie.\n"
 
-#: git-send-email.perl:771
+#: git-send-email.perl:826
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Nie można otworzyć %s: %s"
 
-#: git-send-email.perl:788
+#: git-send-email.perl:843
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Nie można otworzyć %s.final: %s"
 
-#: git-send-email.perl:831
+#: git-send-email.perl:886
 msgid "Summary email is empty, skipping it\n"
 msgstr "Podsumowanie listu e-mail jest puste, pomijanie\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:866
+#: git-send-email.perl:935
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Czy na pewno użyć <%s> [y/N]? "
 
-#: git-send-email.perl:921
+#: git-send-email.perl:990
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -25732,11 +26198,11 @@ msgstr ""
 "Następujące pliki są ośmiobitowe, ale nie deklarują kodowania Content-"
 "Transfer-Encoding.\n"
 
-#: git-send-email.perl:926
+#: git-send-email.perl:995
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Jakie ośmiobitowe kodowanie zadeklarować [UTF-8]? "
 
-#: git-send-email.perl:934
+#: git-send-email.perl:1003
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -25749,22 +26215,22 @@ msgstr ""
 "ma temat z szablonu „*** SUBJECT HERE ***�. Przekaż --force, jeśli naprawdę "
 "chcesz to wysłać.\n"
 
-#: git-send-email.perl:953
+#: git-send-email.perl:1022
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "Do kogo mają być wysłane listy e-mail (jeśli w ogóle)?"
 
-#: git-send-email.perl:971
+#: git-send-email.perl:1040
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "błąd krytyczny: skrót „%s� rozwija się do siebie samego\n"
 
-#: git-send-email.perl:983
+#: git-send-email.perl:1052
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "Message-ID do użycia w In-Reply-To w pierwszym liście e-mail (jeśli w "
 "ogóle)? "
 
-#: git-send-email.perl:1041 git-send-email.perl:1049
+#: git-send-email.perl:1114 git-send-email.perl:1122
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "błąd: nie można wydobyć prawidłowego adresu z: %s\n"
@@ -25772,16 +26238,16 @@ msgstr "błąd: nie można wydobyć prawidłowego adresu z: %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:1053
+#: git-send-email.perl:1126
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Co zrobić z tym adresem? (wyjdź [q] | porzuć [d] | [e]dytuj): "
 
-#: git-send-email.perl:1370
+#: git-send-email.perl:1446
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "ścieżka CA „%s� nie istnieje"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1529
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -25808,135 +26274,773 @@ 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:1468
+#: git-send-email.perl:1544
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 "Wysłać ten list e-mail? (tak [y]|[n]ie|[e]dytuj|wyjdź [q]|wszystkie [a]):"
 
-#: git-send-email.perl:1471
+#: git-send-email.perl:1547
 msgid "Send this email reply required"
 msgstr "Wyślij ten list e-mail z wymaganą odpowiedzią"
 
-#: git-send-email.perl:1499
+#: git-send-email.perl:1581
 msgid "The required SMTP server is not properly defined."
 msgstr "Wymagany serwer SMTP nie jest prawidłowo zdefiniowany."
 
-#: git-send-email.perl:1546
+#: git-send-email.perl:1628
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Serwer nie wspiera STARTTLS! %s"
 
-#: git-send-email.perl:1551 git-send-email.perl:1555
+#: git-send-email.perl:1633 git-send-email.perl:1637
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "nie można wykonać STARTTLS! %s"
 
-#: git-send-email.perl:1564
+#: git-send-email.perl:1646
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Nie można prawidłowo zainicjować SMTP. Sprawdź konfigurację i użyj --smtp-"
 "debug."
 
-#: git-send-email.perl:1582
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Nie można wysłać %s\n"
 
-#: git-send-email.perl:1585
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Wysłano na sucho %s\n"
 
-#: git-send-email.perl:1585
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Wysłano %s\n"
 
-#: git-send-email.perl:1587
+#: git-send-email.perl:1669
 msgid "Dry-OK. Log says:\n"
 msgstr "OK na sucho. Dziennik mówi:\n"
 
-#: git-send-email.perl:1587
+#: git-send-email.perl:1669
 msgid "OK. Log says:\n"
 msgstr "OK. Dziennik mówi:\n"
 
-#: git-send-email.perl:1599
+#: git-send-email.perl:1688
 msgid "Result: "
 msgstr "Wynik:"
 
-#: git-send-email.perl:1602
+#: git-send-email.perl:1691
 msgid "Result: OK\n"
 msgstr "Wynik: OK\n"
 
-#: git-send-email.perl:1620
+#: git-send-email.perl:1708
 #, perl-format
 msgid "can't open file %s"
 msgstr "nie można otworzyć pliku %s"
 
-#: git-send-email.perl:1667 git-send-email.perl:1687
+#: git-send-email.perl:1756 git-send-email.perl:1776
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Dodawanie DW: %s z wiersza „%s�\n"
 
-#: git-send-email.perl:1673
+#: git-send-email.perl:1762
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Dodawanie Do: %s z wiersza „%s�\n"
 
-#: git-send-email.perl:1730
+#: git-send-email.perl:1819
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(nie mbox) Dodawanie DW: %s z wiersza „%s�\n"
 
-#: git-send-email.perl:1765
+#: git-send-email.perl:1854
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(treść) Dodawanie DW: %s z wiersza „%s�\n"
 
-#: git-send-email.perl:1876
+#: git-send-email.perl:1973
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Nie można wykonać „%s�"
 
-#: git-send-email.perl:1883
+#: git-send-email.perl:1980
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Dodawanie %s: %s z: „%s�\n"
 
-#: git-send-email.perl:1887
+#: git-send-email.perl:1984
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) nie można zamknąć potoku do „%s�"
 
-#: git-send-email.perl:1917
+#: git-send-email.perl:2014
 msgid "cannot send message as 7bit"
 msgstr "nie można wysłać wiadomości jako siedmiobitowej"
 
-#: git-send-email.perl:1925
+#: git-send-email.perl:2022
 msgid "invalid transfer encoding"
 msgstr "nieprawidłowe kodowanie przesyłu"
 
-#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028
+#: git-send-email.perl:2059
+#, perl-format
+msgid ""
+"fatal: %s: rejected by sendemail-validate hook\n"
+"%s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"błąd krytyczny: %s: odrzucone przez skrypt sendemail-validate\n"
+"%s\n"
+"ostrzeżenie: nie wysłano żadnych łatek\n"
+
+#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "nie można otworzyć %s: %s\n"
 
-#: git-send-email.perl:1969
+#: git-send-email.perl:2072
 #, perl-format
-msgid "%s: patch contains a line longer than 998 characters"
-msgstr "%s: łatka zawiera wiersz dłuższy niż 998 znaków"
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"błąd krytyczny: %s:%d ma więcej niż 998 znaków\n"
+"ostrzeżenie: nie wysłano żadnych łatek\n"
 
-#: git-send-email.perl:1986
+#: git-send-email.perl:2090
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "Pomijanie %s z zapasowym sufiksem „%s�.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1990
+#: git-send-email.perl:2094
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Czy na pewno wysłać %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 ""
+#~ "Następujące ścieżki nie pasują do żadnej nadającej się ścieżki, ale "
+#~ "pasują do elementów\n"
+#~ "indeksu spoza bieżącego rzadkiego wybrania:\n"
+
+#~ msgid ""
+#~ "Disable or modify the sparsity rules if you intend to update such entries."
+#~ msgstr ""
+#~ "Wyłącz lub zmień zasady rzadkości jeśli zamierzasz zmieniać takie "
+#~ "elementy."
+
+#, c-format
+#~ msgid "could not set GIT_DIR to '%s'"
+#~ msgstr "nie można ustawić GIT_DIR na „%s�"
+
+#, c-format
+#~ msgid "unable to unpack %s header with --allow-unknown-type"
+#~ msgstr "nie można rozpakować nagłówka %s z --allow-unknown-type"
+
+#, c-format
+#~ msgid "unable to parse %s header with --allow-unknown-type"
+#~ msgstr "nie można przetworzyć nagłówka %s z --allow-unknown-type"
+
+#~ msgid "open /dev/null failed"
+#~ msgstr "otwarcie /dev/null nie powiodło się"
+
+#~ 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 ""
+#~ "po rozwiązaniu konfliktów oznacz poprawione ścieżki\n"
+#~ "z „git add <ścieżki>� lub „git rm <ścieżki>�\n"
+#~ "i złóż wynik za pomocą „git commit�"
+
+#~ msgid "open /dev/null or dup failed"
+#~ msgstr "otwarcie /dev/null lub dup() nie powiodło się"
+
+#~ msgid "attempting to use sparse-index without cone mode"
+#~ msgstr "próba użycia rzadkiego indeksu bez trybu stożka"
+
+#~ msgid "unable to update cache-tree, staying full"
+#~ msgstr "nie można zaktualizować drzewa pamięci podręcznej, pozostaje pełne"
+
+#, c-format
+#~ msgid "Could not open '%s' for writing."
+#~ msgstr "Nie można otworzyć „%s� do zapisywania."
+
+#, c-format
+#~ msgid "could not create archive file '%s'"
+#~ msgstr "nie można utworzyć pliku archiwum „%s�"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-next-check <dobre_określenie> "
+#~ "<złe_określenie> [<określenie>]"
+
+#~ msgid "--bisect-next-check requires 2 or 3 arguments"
+#~ msgstr "--bisect-next-check wymaga 2 albo 3 argumentów"
+
+#, c-format
+#~ msgid "couldn't create a new file at '%s'"
+#~ msgstr "nie można utworzyć nowego pliku w „%s�"
+
+#, c-format
+#~ msgid "git commit-tree: failed to open '%s'"
+#~ msgstr "git commit-tree: nie można otworzyć „%s�"
+
+#, c-format
+#~ msgid "cannot open packfile '%s'"
+#~ msgstr "nie można otworzyć pliku paczki „%s�"
+
+#~ msgid "cannot store pack file"
+#~ msgstr "nie można zapisać pliku paczki"
+
+#~ msgid "cannot store index file"
+#~ msgstr "nie można zapisać pliku indeksu"
+
+#~ msgid "exclude patterns are read from <file>"
+#~ msgstr "wzorce wyłączające czytane są z <pliku>"
+
+#, c-format
+#~ msgid "Unknown option for merge-recursive: -X%s"
+#~ msgstr "Nieznana opcja merge-recursive: -X%s"
+
+#, c-format
+#~ msgid "unusable todo list: '%s'"
+#~ msgstr "lista zadań do zrobienia się nie nadaje: „%s�"
+
+#~ msgid "git rebase--interactive [<options>]"
+#~ msgstr "git rebase--interactive [<opcje>]"
+
+#~ msgid "rebase merge commits"
+#~ msgstr "przestawiaj zapisy scaleń"
+
+#~ msgid "keep original branch points of cousins"
+#~ msgstr "zachowaj pierwotne rozgałęzienia kuzynów"
+
+#~ msgid "move commits that begin with squash!/fixup!"
+#~ msgstr "przenieś zapisy, które zaczynają się od squash!/fixup!"
+
+#~ msgid "sign commits"
+#~ msgstr "podpisuj zapisy"
+
+#~ msgid "continue rebase"
+#~ msgstr "kontynuuj przestawianie"
+
+#~ msgid "skip commit"
+#~ msgstr "pomiń zapis"
+
+#~ msgid "edit the todo list"
+#~ msgstr "edytuj listę zadań do zrobienia"
+
+#~ msgid "show the current patch"
+#~ msgstr "pokaż bieżącą łatkę"
+
+#~ msgid "shorten commit ids in the todo list"
+#~ msgstr "skróć identyfikatory zapisów na liście zadań do zrobienia"
+
+#~ msgid "expand commit ids in the todo list"
+#~ msgstr "rozwiń identyfikatory zapisów na liście zadań do zrobienia"
+
+#~ msgid "check the todo list"
+#~ msgstr "sprawdź listę zadań do zrobienia"
+
+#~ msgid "rearrange fixup/squash lines"
+#~ msgstr "zmień kolejność wierszy fixup/squash"
+
+#~ msgid "insert exec commands in todo list"
+#~ msgstr "wstaw polecenia exec na listę zadań do zrobienia"
+
+#~ msgid "onto"
+#~ msgstr "na"
+
+#~ msgid "restrict-revision"
+#~ msgstr "ogranicz-rewizjÄ™"
+
+#~ msgid "restrict revision"
+#~ msgstr "ogranicz rewizjÄ™"
+
+#~ msgid "squash-onto"
+#~ msgstr "spłaszcz-na"
+
+#~ msgid "squash onto"
+#~ msgstr "spłaszcz na"
+
+#~ msgid "the upstream commit"
+#~ msgstr "zapis głównego nurtu"
+
+#~ msgid "head-name"
+#~ msgstr "nazwa-czoła"
+
+#~ msgid "head name"
+#~ msgstr "nazwa czoła"
+
+#~ msgid "rebase strategy"
+#~ msgstr "strategia przestawiania"
+
+#~ msgid "strategy-opts"
+#~ msgstr "opcje-strategii"
+
+#~ msgid "strategy options"
+#~ msgstr "opcje strategii"
+
+#~ msgid "switch-to"
+#~ msgstr "przełącz-na"
+
+#~ msgid "the branch or commit to checkout"
+#~ msgstr "gałąź lub zapis do wybrania"
+
+#~ msgid "onto-name"
+#~ msgstr "nazwa-na"
+
+#~ msgid "onto name"
+#~ msgstr "nazwa rewizji „na�"
+
+#~ msgid "cmd"
+#~ msgstr "polecenie"
+
+#~ msgid "the command to run"
+#~ msgstr "polecenie do wykonania"
+
+#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#~ msgstr "--[no-]rebase-cousins nic nie robi bez --rebase-merges"
+
+#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "„--preserve-merges� i „--rebase-merges� się wykluczają"
+
+#~ msgid ""
+#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+#~ msgstr ""
+#~ "błąd: „--preserve-merges� i „--reschedule-failed-exec� się wykluczają"
+
+#~ msgid ""
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
+#~ "--name <name>"
+#~ msgstr ""
+#~ "git submodule--helper add-clone [<opcje>...] --url <url> --path <ścieżka> "
+#~ "--name <nazwa>"
+
+#, c-format
+#~ msgid "failed to create file %s"
+#~ msgstr "nie można utworzyć pliku %s"
+
+#~ msgid "exit immediately after initial ref advertisement"
+#~ msgstr "wyjdź natychmiast po początkowym ogłoszeniu referencji"
+
+#, c-format
+#~ msgid "socket/pipe already in use: '%s'"
+#~ msgstr "gniazdo/potok już w użyciu: „%s�"
+
+#, c-format
+#~ msgid "could not start server on: '%s'"
+#~ msgstr "nie można włączyć serwera na: „%s�"
+
+#~ msgid "could not spawn daemon in the background"
+#~ msgstr "nie można uruchomić demona w tle"
+
+#~ msgid "waitpid failed"
+#~ msgstr "waitpid nie powiodło się"
+
+#~ msgid "daemon not online yet"
+#~ msgstr "demon jeszcze nie odpowiada"
+
+#~ msgid "daemon failed to start"
+#~ msgstr "demon się nie włączył"
+
+#~ msgid "waitpid is confused"
+#~ msgstr "waitpid jest w szoku"
+
+#~ msgid "daemon has not shutdown yet"
+#~ msgstr "demon jeszcze się nie wyłączył"
+
+#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
+#~ msgstr "Ograniczenia protokołów niewspierane z cURLem < 7.19.4"
+
+#, sh-format
+#~ msgid "running $command"
+#~ msgstr "wykonywanie $command"
+
+#, sh-format
+#~ msgid "'$sm_path' does not have a commit checked out"
+#~ msgstr "„$sm_path� nie ma wybranego zapisu"
+
+#, sh-format
+#~ msgid "Submodule path '$displaypath': '$command $sha1'"
+#~ msgstr "Ścieżka podmodułu „$displaypath�: „$command $sha1�"
+
+#~ msgid "Applied autostash."
+#~ msgstr "Zastosowano zmiany z automatycznego schowka."
+
+#, sh-format
+#~ msgid "Cannot store $stash_sha1"
+#~ msgstr "Nie można zachować $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 ""
+#~ "Stosowanie zmian z automatycznej skrytki spowodowało konflikty.\n"
+#~ "Twoje zmiany sÄ… bezpieczne w schowku.\n"
+#~ "Możesz w każdej chwili wykonać „git stash pop� lub „git stash drop�.\n"
+
+#, sh-format
+#~ msgid "Rebasing ($new_count/$total)"
+#~ msgstr "Przestawianie ($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"
+#~ "Polecenia:\n"
+#~ "p, pick <zapis> = dobierz zapis\n"
+#~ "r, reword <zapis> = użyj zapisu, ale przeredaguj jego komunikat\n"
+#~ "e, edit <zapis> = użyj zapisu, ale zatrzymaj się, żeby go poprawić\n"
+#~ "s, squash <zapis> = użyj zapisu, ale połącz go z poprzednim (spłaszcz)\n"
+#~ "f, fixup <zapis> = jak „squash�, ale odrzuć komunikat tego zapisu\n"
+#~ "x, exec <polecenie> = wykonaj polecenie (resztę wiersza) w powłoce\n"
+#~ "d, drop <zapis> = usuń zapis\n"
+#~ "l, label <etykietka> = nazwij bieżące HEAD\n"
+#~ "t, reset <etykietka> = zresetuj HEAD do etykietki\n"
+#~ "m, merge [-C <zapis> | -c <zapis>] <etykietka> [# <wiersz>]\n"
+#~ ".       utwórz zapis scalenia używając pierwotnego komunikatu scalenia\n"
+#~ ".       (albo <wiersza>, jeśli nie podano pierwotnego zapisu scalenia.\n"
+#~ ".       Użyj -c <zapis>, aby przeredagować komunikat zapisu.\n"
+#~ "Kolejność wierszy może być zmieniona; są wykonywane z góry na dół.\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 ""
+#~ "Możesz teraz poprawić zapis przez\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Kiedy zadowolisz siÄ™ swoimi zmianami, wykonaj\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid "$sha1: not a commit that can be picked"
+#~ msgstr "$sha1: nie jest to zapis, który można dobrać"
+
+#, sh-format
+#~ msgid "Invalid commit name: $sha1"
+#~ msgstr "Nieprawidłowa nazwa zapisu: $sha1"
+
+#~ msgid "Cannot write current commit's replacement sha1"
+#~ msgstr "Nie można wpisać zamiennego sha1 bieżącego zapisu"
+
+#, sh-format
+#~ msgid "Fast-forward to $sha1"
+#~ msgstr "Przewinięcie do $sha1"
+
+#, sh-format
+#~ msgid "Cannot fast-forward to $sha1"
+#~ msgstr "Nie można przewinąć do $sha1"
+
+#, sh-format
+#~ msgid "Cannot move HEAD to $first_parent"
+#~ msgstr "Nie można przesunąć HEAD na $first_parent"
+
+#, sh-format
+#~ msgid "Refusing to squash a merge: $sha1"
+#~ msgstr "Odmawiam spłaszczenia scalenia: $sha1"
+
+#, sh-format
+#~ msgid "Error redoing merge $sha1"
+#~ msgstr "BÅ‚Ä…d ponowienia scalenia $sha1"
+
+#, sh-format
+#~ msgid "Could not pick $sha1"
+#~ msgstr "Nie można dobrać $sha1"
+
+#, sh-format
+#~ msgid "This is the commit message #${n}:"
+#~ msgstr "To jest komunikat zapisu nr ${n}:"
+
+#, sh-format
+#~ msgid "The commit message #${n} will be skipped:"
+#~ msgstr "Komunikat zapisu nr ${n} zostanie pominięty:"
+
+#, sh-format
+#~ msgid "This is a combination of $count commit."
+#~ msgid_plural "This is a combination of $count commits."
+#~ msgstr[0] "To jest połączenie $count zapisu."
+#~ msgstr[1] "To jest połączenie $count zapisów."
+#~ msgstr[2] "To jest połączenie $count zapisów."
+
+#, sh-format
+#~ msgid "Cannot write $fixup_msg"
+#~ msgstr "Nie można zapisać $fixup_msg"
+
+#~ msgid "This is a combination of 2 commits."
+#~ msgstr "To jest połączenie dwóch zapisów."
+
+#, sh-format
+#~ msgid "Could not apply $sha1... $rest"
+#~ msgstr "Nie można zastosować $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 ""
+#~ "Nie udało się poprawić zapisu po pomyślnym dobraniu $sha1... $rest\n"
+#~ "Jest to najpewniej spowodowane pustym komunikatem zapisu, albo "
+#~ "niepowodzeniem\n"
+#~ "skryptu pre-commit. Jeśli to on zawiódł, być może trzeba naprawić ten "
+#~ "problem zanim\n"
+#~ "uda się przeredagować zapis."
+
+#, sh-format
+#~ msgid "Stopped at $sha1_abbrev... $rest"
+#~ msgstr "Zatrzymano na $sha1_abbrev... $rest"
+
+#, sh-format
+#~ msgid "Cannot '$squash_style' without a previous commit"
+#~ msgstr "Nie można użyć „$squash_style� bez poprzedniego zapisu"
+
+#, sh-format
+#~ msgid "Executing: $rest"
+#~ msgstr "Wykonywanie: $rest"
+
+#, sh-format
+#~ msgid "Execution failed: $rest"
+#~ msgstr "Wykonywanie nie powiodło się: $rest"
+
+#~ msgid "and made changes to the index and/or the working tree"
+#~ msgstr "i pozostały zmiany w indeksie i/lub drzewie roboczym"
+
+#~ msgid ""
+#~ "You can fix the problem, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Możesz naprawić problem i uruchomić\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 ""
+#~ "Wykonanie powiodło się: $rest\n"
+#~ "ale pozostały zmiany w indeksie i/lub drzewie roboczym.\n"
+#~ "Złóż swoje zmiany lub dodaj do schowka, i wtedy wykonaj:\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#, sh-format
+#~ msgid "Unknown command: $command $sha1 $rest"
+#~ msgstr "Nieznane polecenie: $command $sha1 $rest"
+
+#~ msgid "Please fix this using 'git rebase --edit-todo'."
+#~ msgstr "Napraw to używając „git rebase --edit-todo�."
+
+#, sh-format
+#~ msgid "Successfully rebased and updated $head_name."
+#~ msgstr "Pomyślnie przestawiono i zaktualizowano $head_name."
+
+#~ msgid "Could not remove CHERRY_PICK_HEAD"
+#~ msgstr "Nie można usunąć 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 ""
+#~ "W drzewie roboczym sÄ… przygotowane zmiany.\n"
+#~ "Jeśli mają być one spłaszczone\n"
+#~ "z poprzednim zapisem, wykonaj:\n"
+#~ "\n"
+#~ "  git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Jeśli mają się znaleźć w nowym zapisie, wykonaj:\n"
+#~ "  git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "W obu przypadkach po zakończeniu, kontynuuj przez:\n"
+#~ "\n"
+#~ "  git rebase --continue\n"
+
+#~ msgid "Error trying to find the author identity to amend commit"
+#~ msgstr ""
+#~ "Błąd podczas próby znalezienia tożsamości autora w poprawionym zapisie"
+
+#~ msgid ""
+#~ "You have uncommitted changes in your working tree. Please commit them\n"
+#~ "first and then run 'git rebase --continue' again."
+#~ msgstr ""
+#~ "Masz niezłożone zmiany w drzewie roboczym. Najpierw je złóż\n"
+#~ "i wtedy ponownie wykonaj „git rebase --continue�."
+
+#~ msgid "Could not commit staged changes."
+#~ msgstr "Nie udało się złożyć zmian ze schowka."
+
+#~ msgid "Could not execute editor"
+#~ msgstr "Nie można uruchomić edytora"
+
+#, sh-format
+#~ msgid "Could not checkout $switch_to"
+#~ msgstr "Nie można wybrać $switch_to"
+
+#~ msgid "No HEAD?"
+#~ msgstr "Brak HEAD?"
+
+#, sh-format
+#~ msgid "Could not create temporary $state_dir"
+#~ msgstr "Nie można utworzyć tymczasowego $state_dir"
+
+#~ msgid "Could not mark as interactive"
+#~ msgstr "Nie można oznaczyć jako interaktywne"
+
+#, sh-format
+#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+#~ msgstr[0] ""
+#~ "Przestawianie $shortrevisions na $shortonto ($todocount polecenie)"
+#~ msgstr[1] ""
+#~ "Przestawianie $shortrevisions na $shortonto ($todocount polecenia)"
+#~ msgstr[2] "Przestawianie $shortrevisions na $shortonto ($todocount poleceń)"
+
+#~ msgid "Note that empty commits are commented out"
+#~ msgstr "Zważ, że puste zapisy są wykomentowane"
+
+#~ msgid "Could not init rewritten commits"
+#~ msgstr "Nie można zainicjować przerobionych zapisów"
+
+#~ msgid "Cannot rebase: You have unstaged changes."
+#~ msgstr "Nie można przestawić: Masz nieprzygotowane zmiany."
+
+#~ msgid "Cannot pull with rebase: You have unstaged changes."
+#~ msgstr "Nie można zaciągnąć z przestawieniem: Masz nieprzygotowane zmiany."
+
+#~ msgid "Cannot rebase: Your index contains uncommitted changes."
+#~ msgstr "Nie można przestawić: Twój indeks zawiera niezłożone zmiany."
+
+#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "Nie można zaciągnąć z przestawieniem: Twój indeks zawiera niezłożone "
+#~ "zmiany."
+
+#~ msgid "--cached and --3way cannot be used together."
+#~ msgstr "--cached i --3way wykluczajÄ… siÄ™."
+
+#~ msgid "repository contains replace objects; skipping commit-graph"
+#~ msgstr "repozytorium zawiera obiekty zamienne; pomijanie grafu zapisów"
+
+#~ msgid "repository contains (deprecated) grafts; skipping commit-graph"
+#~ msgstr ""
+#~ "repozytorium zawiera (przestarzałe) szczepki; pomijanie grafu zapisów"
+
+#~ msgid "repository is shallow; skipping commit-graph"
+#~ msgstr "źródłowe repozytorium jest płytkie, pomijanie grafu zapisów"
+
+#, c-format
+#~ msgid "commit-graph improper chunk offset %08x%08x"
+#~ msgstr "nieprawidłowe przesunięcie kawałka grafu zapisów %08x%08x"
+
+#, c-format
+#~ msgid "commit-graph chunk id %08x appears multiple times"
+#~ msgstr "identyfikator kawałka grafu zapisów %08x pojawia się wiele razy"
+
+#~ msgid "both"
+#~ msgstr "obu"
+
+#~ msgid "one"
+#~ msgstr "jednej"
+
+#, c-format
+#~ msgid "Already up to date!"
+#~ msgstr "Już aktualne!"
+
+#~ msgid "invalid chunk offset (too large)"
+#~ msgstr "nieprawidłowe przesunięcie kawałka (za duże)"
+
+#~ msgid "Writing chunks to multi-pack-index"
+#~ msgstr "Zapisywanie kawałków do indeksu wielu paczek"
+
+#~ msgid "unable to write stateless separator packet"
+#~ msgstr "nie można zapisać bezstanowego pakietu separatora"
+
+#~ msgid "git merge --abort"
+#~ msgstr "git merge --abort"
+
+#~ msgid "git merge --continue"
+#~ msgstr "git merge --continue"
+
+#~ msgid "Already up to date. Yeeah!"
+#~ msgstr "Już aktualne. Hurra!"
+
+#~ msgid "--batch-size option is only for 'repack' subcommand"
+#~ msgstr "opcja --batch-size jest tylko do pod-polecenia „repack�"
+
+#~ msgid "Percentage by which creation is weighted"
+#~ msgstr "Procent, według jakiego ważone jest tworzenie"
+
+#~ msgid ""
+#~ "the rebase.useBuiltin support has been removed!\n"
+#~ "See its entry in 'git help config' for details."
+#~ msgstr ""
+#~ "wsparcie rebase.useBuiltin zostało usunięte!\n"
+#~ "Zobacz szczegóły pod jego opisem w „git help config�."
+
+#~ msgid "git stash clear"
+#~ msgstr "git stash clear"
+
+#~ msgid "remote server sent stateless separator"
+#~ msgstr "zdalna maszyna wysłała bezstanowy separator"
+
+#, perl-format
+#~ msgid "%s: patch contains a line longer than 998 characters"
+#~ msgstr "%s: łatka zawiera wiersz dłuższy niż 998 znaków"
+
 #~ msgid "rev-list died"
 #~ msgstr "rev-list padło"
 
@@ -25999,7 +27103,7 @@ msgstr "Czy na pewno wysłać %s? [y | N]: "
 #~ msgstr "zbyt mało argumentów"
 
 #~ msgid "Recurse into nested submodules"
-#~ msgstr "Schodź do zagnieżdżonych pod-modułów"
+#~ msgstr "Schodź do zagnieżdżonych podmodułów"
 
 #~ msgid "too many params"
 #~ msgstr "zbyt wiele parametrów"
@@ -26153,13 +27257,13 @@ msgstr "Czy na pewno wysłać %s? [y | N]: "
 #~ "the following submodules (or one of their nested submodules)\n"
 #~ "use a .git directory:"
 #~ msgstr[0] ""
-#~ "następujący pod-moduł (lub jeden z jego zagnieżdżonych pod-modułów)\n"
+#~ "następujący podmoduł (lub jeden z jego zagnieżdżonych podmodułów)\n"
 #~ "używa katalogu .git:"
 #~ msgstr[1] ""
-#~ "następujące pod-moduły (lub jeden z jego zagnieżdżonych pod-modułów)\n"
+#~ "następujące podmoduły (lub jeden z jego zagnieżdżonych podmodułów)\n"
 #~ "używają katalogu .git:"
 #~ msgstr[2] ""
-#~ "następujące pod-moduły (lub jeden z jego zagnieżdżonych pod-modułów)\n"
+#~ "następujące podmoduły (lub jeden z jego zagnieżdżonych podmodułów)\n"
 #~ "używają katalogu .git:"
 
 #~ msgid "push|fetch"
@@ -26171,9 +27275,6 @@ msgstr "Czy na pewno wysłać %s? [y | N]: "
 #~ msgid "print only names (no SHA-1)"
 #~ msgstr "wypisz same nazwy (bez SHA-1)"
 
-#~ msgid "git merge [<options>] <msg> HEAD <commit>"
-#~ msgstr "git merge [<opcje>] <komunikat> HEAD <zapis>"
-
 #~ msgid "standard output, or directory, which one?"
 #~ msgstr "standardowe wyjście, lub katalog — które?"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index f068d0e0ba..70e5c6d9c1 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,8 +1,8 @@
-# Portugual's Portuguese translations for Git package.
-# Copyright (C) 2020 Daniel Santos <hello@brighterdan.com> 
+# Portugal's Portuguese translations for Git package.
+# Copyright (C) 2021 Daniel Santos <daniel@brilhante.top>
 # This file is distributed under the same license as the Git package.
 # Contributors:
-#   - Daniel Santos <hello@brighterdan.com>
+#   - Daniel Santos <daniel@brilhante.top>
 # Past Contributors:
 #   - Marco Sousa <marcomsousa AT gmail.com>
 #   - Vasco Almeida <vascomalmeida@sapo.pt>, 2016, 2017.
@@ -12,129 +12,212 @@
 #   English                          |  Portuguese
 #   ---------------------------------+--------------------------------------
 #   3-way merge                      |  tri-junção
-#   abbreviate                       |  
-#   alternate object database        |  
-#   amend                            |  
-#   ancestor                         |  
-#   annotated tag                    |  
+#   abbreviate                       |  abreviar
+#   alternate object database        |  base dados de objetos alternativa
+#   amend                            |  emendar
+#   ancestor                         |  antepassado
+#   annotated tag                    |  etiqueta anotada
+#   archive                          |  arquivo
+#   backing store                    |  armazenamento-backup
+#   backward compatibility           |  retrocompatibilidade
 #   bare repository                  |  repositório nú
-#   bisect                           |  
-#   blob object                      |  
-#   bloom filter                     |  
+#   bisect                           |  bisetar
+#   blame                            |  blame
+#   blob object                      |  objeto-blob
 #   branch                           |  ramo 
-#   bundle                           |  
-#   bypass                           |  
-#   cache                            |  cache
-#   chain                            |  
-#   changeset                        |  
-#   checkout                         |  
-#   checksum                         |  
+#   bug                              |  bug
+#   bundle                           |  conjunto
+#   bypass                           |  desviar
+#   cache                            |  cenário
+#   chain                            |  corrente
+#   changeset                        |  memória
+#   checkout                         |  observar
+#   checksum                         |  checksum
 #   cherry-picking                   |  apanhar
-#   clean                            |  
-#   clone                            |  
+#   chunk                            |  fragmento
+#   clean                            |  limpa
+#   clone                            |  clone
 #   commit                           |  memorizar
 #   commit message                   |  mensagem de memória
-#   commit object                    |  objeto da memória
+#   commit object                    |  objeto de memória
 #   commit-ish (also committish)     |  mnemónica
+#   committer                        |  memorizador
 #   conflict                         |  conflito
-#   core Git                         |  
-#   cover letter                     |  
+#   core Git                         |  núcleo-Git
+#   cover letter                     |  carta de apresentação
 #   DAG                              |  DAG
-#   dangling object                  |  objeto DAG
-#   detached HEAD                    |  HEAD solta
+#   dangling object                  |  objeto perdido
+#   detached HEAD                    |  HEAD desanexada
 #   directory                        |  pasta
-#   dirty                            |  
-#   dumb HTTP protocol               |  
-#   evil merge                       |  
-#   fast-forward                     |  
+#   dirty                            |  suja
+#   dumb HTTP protocol               |  protocolo HTTP burro
+#   fanout                           |  fanout
+#   fast-forward                     |  avanço
 #   fetch                            |  buscar
-#   file system                      |  
-#   fork                             |  aforquilhar
-#   Git archive                      |  
-#   gitfile                          |  
-#   grafts                           |  
-#   hash                             |  
+#   file system                      |  sistema de ficheiro
+#   fixup                            |  consertar
+#   fork                             |  fork
+#   Git archive                      |  repositório
+#   gitfile                          |  ficheiro-git
+#   grafts                           |  enxertos
+#   hash                             |  hash
 #   HEAD                             |  HEAD
-#   head                             |  
-#   head ref                         |  
+#   head                             |  cabeça
 #   header                           |  cabeçalho
-#   hook                             |  
+#   hook                             |  gancho
 #   hunk                             |  pedaço
-#   index                            |  
-#   index entry                      |  
-#   loose object                     |  
-#   loose refs                       |  
-#   master                           |  
+#   index                            |  cenário
+#   index entry                      |  entrada do cenário
+#   init                             |  inicializar
+#   label                            |  rótulo
+#   loose object                     |  objeto solto
+#   loose refs                       |  refs soltas
+#   mark                             |  marca
+#   master                           |  master
 #   merge                            |  junção 
-#   object                           |  
-#   object database                  |  
-#   object identifier                |  
-#   object name                      |  
-#   object type                      |  
-#   octopus                          |  
-#   origin                           |  
-#   pack                             |  
-#   pack index                       |  
-#   packfile                         |  
-#   parent                           |  
-#   patch                            |  
-#   pathspec                         |  
-#   pattern                          |  pattern
-#   pickaxe                          |  
-#   plumbing                         |  
-#   porcelain                        |  
-#   precious-objects repo            |  
-#   prune                            |  
+#   mergetag                         |  etiqueta-junção
+#   object                           |  objeto
+#   object database                  |  base dados de objeto
+#   object name                      |  nome de objeto
+#   object type                      |  tipo de objeto
+#   octopus                          |  polvinho
+#   origin                           |  origin
+#   overlay mode                     |  modo overlay
+#   pack                             |  pacote
+#   pack index                       |  índice de pacote
+#   packfile                         |  ficheiro-pacote
+#   parent                           |  parente
+#   patch                            |  remendo
+#   pathspec                         |  espetro-caminho
+#   pattern                          |  padrão
+#   pickaxe                          |  picareta
+#   plumbing                         |  nuclear
+#   porcelain                        |  porcelana
+#   precious-objects repo            |  repo de objetos preciosos
+#   promisor                         |  promissor
+#   prune                            |  podar
 #   pull                             |  agarrar
 #   push                             |  atirar
-#   reachable                        |  
-#   rebase                           |  
-#   ref                              |  
-#   reflog                           |  
-#   refspec                          |  
-#   remote                           |  
-#   remote-tracking branch           |  
-#   replay                           |  
+#   range                            |  intervalo
+#   reachable                        |  alcançável
+#   rebase                           |  rebasear
+#   record                           |  registo
+#   ref                              |  ref
+#   reflog                           |  registo-ref
+#   refspec                          |  espetro-ref
+#   remote                           |  remoto
+#   remote-tracking branch           |  ramo remoto de monitorização
+#   replace object                   |  objeto-substituto
+#   replace ref                      |  ref-substituto
+#   replay                           |  replay
 #   repo                             |  repo
 #   repository                       |  repositório
-#   reset                            |  reposição
-#   resolve                          |  
+#   reset                            |  restabelecer
+#   resolve                          |  resolver
 #   revert                           |  reverter
 #   revision                         |  revisão
-#   rewind                           |  
-#   SCM                              |  
+#   rewind                           |  rebobinar
+#   root commit                      |  memória-raiz
+#   SCM                              |  SCM
 #   SHA-1                            |  SHA-1
-#   shallow repository               |  
-#   signed tag                       |  
-#   smart HTTP protocol              |  
-#   squash                           |  
-#   squelch                          |  suprimir
-#   stage                            |  preparar
-#   stash                            |  arrumos
-#   submodule                        |  
-#   symref                           |  
-#   tag                              |  
-#   tag object                       |  
-#   tagger                           |  
-#   topic branch                     |  
-#   track                            |  seguir
-#   trailer                          |  
-#   tree                             |  
-#   tree object                      |  
-#   tree-ish (also treeish)          |  
-#   unmerged index                   |  
-#   unpack                           |  
-#   unreachable object               |  
-#   unstage                          |  despreparar
+#   shallow repository               |  repositório superficial
+#   signed tag                       |  etiqueta assinada
+#   smart HTTP protocol              |  protocolo HTTP esperto
+#   smudge filter                    |  filtro-mancha
+#   squash                           |  esmagar
+#   squelch                          |  silenciar
+#   stage                            |  cenário
+#   stash                            |  esconderijo
+#   submodule                        |  submódulo
+#   superproject                     |  super-projeto
+#   symref                           |  ref-simbólica
+#   tag                              |  etiqueta
+#   tag object                       |  objeto-etiqueta
+#   tagger                           |  etiquetador
+#   thin pack                        |  pacote-fino
+#   thread                           |  fio
+#   tip                              |  ponta
+#   topic branch                     |  ramo-tópico
+#   track                            |  monitorizar
+#   trailer                          |  atribuições
+#   tree                             |  árvore
+#   tree object                      |  objeto-árvore
+#   tree-ish (also treeish)          |  arvoredo
+#   unmerged                         |  por juntar
+#   unpack                           |  desempacotar
+#   unreachable object               |  objeto inalcançável
+#   unstage                          |  desencenar
 #   upstream                         |  upstream
-#   upstream branch                  |  ramo upstream
-#   working tree                     |  
+#   upstream branch                  |  ramo-upstream
+#   viewer                           |  visualizador
+#   wanted-ref                       |  wanted-ref
+#   working directory                |  pasta-trabalho
+#   working tree / worktree          |  árvore-trabalho
+#
+#
+#  Other translation table helper
+#
+#   English                          |  Portuguese
+#   ---------------------------------+--------------------------------------
+#   apply                            |  submeter
+#   ahead                            |  à frente
+#   bind                             |  vincular
+#   broken                           |  quebrado
+#   call                             |  chamar
+#   chain                            |  série
+#   change                           |  alteração
+#   clobber                          |  encobrir
+#   config file                      |  ficheiro config
+#   compress                         |  comprimir
+#   corrupt                          |  rompido
+#   corrupted                        |  roto
+#   debug                            |  depurar
+#   default                          |  predefinido
+#   deflate                          |  esvaziar
+#   delete                           |  apagar
+#   deprecated                       |  obsoleto
+#   dry-run                          |  dry-run
+#   edit                             |  modificação
+#   embedded                         |  embutido
+#   feature                          |  feição
+#   fix                              |  corrigir
+#   given                            |  fornecido
+#   handle                           |  pega
+#   in progress                      |  em curso
+#   inflate                          |  insuflar
+#   named                            |  denominado
+#   nested                           |  encaixado
+#   not supported                    |  insustentado
+#   mainline                         |  principal
+#   mismatch                         |  sem correspondência
+#   overflow                         |  transbordo
+#   parse                            |  processar
+#   path                             |  caminho
+#   register                         |  registar
+#   regular expression               |  expressão comum
+#   repack                           |  reempacotar
+#   require                          |  exige
+#   save                             |  guardar
+#   set                              |  definir
+#   shell                            |  shell
+#   sparse                           |  disperso
+#   stat                             |  stat
+#   stream                           |  stream
+#   subdirectory                     |  subpasta
+#   support                          |  sustenta
+#   symlink                          |  ligação-simbólica
+#   template                         |  modelo
+#   timestamp                        |  carimbo cronológico
+#   token                            |  token
+#   unset                            |  desdefinir
+#   untrack                          |  desmonitorizar
+#   
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-12-15 16:27+0800\n"
+"POT-Creation-Date: 2021-08-14 07:56+0800\n"
 "PO-Revision-Date: 2020-10-14 11:43+0100\n"
 "Last-Translator: Daniel Santos <hello@brighterdan.com>\n"
 "Language-Team: Git L10N Português <https://github.com/git-l10n-pt-PT/>\n"
@@ -145,13 +228,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: add-interactive.c:376
-#, fuzzy, c-format
+#, c-format
 msgid "Huh (%s)?"
 msgstr "O quê (%s)?"
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284
-#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532
-#: builtin/rebase.c:1955
+#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
+#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
+#: builtin/rebase.c:1953
 msgid "could not read index"
 msgstr "incapaz de ler index"
 
@@ -175,12 +258,11 @@ msgid "Update"
 msgstr "Atualizar"
 
 #: add-interactive.c:697 add-interactive.c:885
-#, fuzzy, c-format
+#, c-format
 msgid "could not stage '%s'"
-msgstr "inacapaz de stage '%s'"
+msgstr "incapaz de stage '%s'"
 
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478
-#, fuzzy
+#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
 msgid "could not write index"
 msgstr "incapaz de escrever index"
 
@@ -196,7 +278,7 @@ msgstr[1] "actualizou %d paths\n"
 msgid "note: %s is untracked now.\n"
 msgstr "nota: %s agora está por seguir.\n"
 
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:295
+#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
 #: builtin/reset.c:145
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
@@ -207,7 +289,6 @@ msgid "Revert"
 msgstr "Reverter"
 
 #: add-interactive.c:775
-#, fuzzy
 msgid "Could not parse HEAD^{tree}"
 msgstr "Incapaz de parse HEAD^{tree}"
 
@@ -235,16 +316,16 @@ msgstr[0] "adicionei %d path\n"
 msgstr[1] "adicionei %d paths\n"
 
 #: add-interactive.c:925
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring unmerged: %s"
 msgstr "ignorando unmerged: %s"
 
-#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
+#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Apenas ficheiros binários mudaram.\n"
 
-#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
+#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
 #, c-format
 msgid "No changes.\n"
 msgstr "Sem modificação.\n"
@@ -258,7 +339,6 @@ msgid "Review diff"
 msgstr "Rever diff"
 
 #: add-interactive.c:1010
-#, fuzzy
 msgid "show paths with changes"
 msgstr "mostrar paths modificados"
 
@@ -271,12 +351,10 @@ msgid "revert staged set of changes back to the HEAD version"
 msgstr "reverter conjunto das modificações staged de volta para a versão HEAD"
 
 #: add-interactive.c:1016
-#, fuzzy
 msgid "pick hunks and update selectively"
-msgstr "apanha os pedaços e atualiza selectivamente"
+msgstr "apanha os pedaços e atualiza seletivamente"
 
 #: add-interactive.c:1018
-#, fuzzy
 msgid "view diff between HEAD and index"
 msgstr "ver diff entre HEAD e índex"
 
@@ -291,17 +369,14 @@ msgid "Prompt help:"
 msgstr "Prompt ajuda:"
 
 #: add-interactive.c:1030
-#, fuzzy
 msgid "select a single item"
 msgstr "seleciona um único item"
 
 #: add-interactive.c:1032
-#, fuzzy
 msgid "select a range of items"
 msgstr "seleciona um conjunto de items"
 
 #: add-interactive.c:1034
-#, fuzzy
 msgid "select multiple ranges"
 msgstr "seleciona múltiplos conjuntos"
 
@@ -310,7 +385,6 @@ msgid "select item based on unique prefix"
 msgstr "seleciona item tendo base o prefixo único"
 
 #: add-interactive.c:1038
-#, fuzzy
 msgid "unselect specified items"
 msgstr "tira a seleção de items especificados"
 
@@ -330,11 +404,11 @@ msgstr "seleciona item numerado"
 msgid "(empty) select nothing"
 msgstr "(vazio) seleciona nada"
 
-#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
 msgid "*** Commands ***"
 msgstr "*** Comandos ***"
 
-#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
 msgid "What now"
 msgstr "E agora"
 
@@ -346,48 +420,47 @@ msgstr "staged"
 msgid "unstaged"
 msgstr "unstaged"
 
-#: add-interactive.c:1144 apply.c:4989 apply.c:4992 builtin/am.c:2257
-#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
-#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818
-#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
-#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
+#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
+#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
+#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
+#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
+#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
 #: git-add--interactive.perl:213
 msgid "path"
-msgstr "path"
+msgstr "caminho"
 
 #: add-interactive.c:1151
-#, fuzzy
 msgid "could not refresh index"
 msgstr "incapaz de reactualizar o index"
 
-#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
+#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
 #, c-format
 msgid "Bye.\n"
 msgstr "Adeus.\n"
 
 #: add-patch.c:34 git-add--interactive.perl:1431
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Stage modo de modificação [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:35 git-add--interactive.perl:1432
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Eliminação stage [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:36 git-add--interactive.perl:1433
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Adição stage [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:37 git-add--interactive.perl:1434
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Stage este pedaço [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:39
-#, fuzzy
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "staging."
@@ -396,7 +469,6 @@ msgstr ""
 "imediatamente."
 
 #: add-patch.c:42
-#, fuzzy
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -411,27 +483,26 @@ msgstr ""
 "d - retirar o stage deste pedaço e qualquer próximo pedaço neste ficheiro\n"
 
 #: add-patch.c:56 git-add--interactive.perl:1437
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Esconder modo de modificação [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:57 git-add--interactive.perl:1438
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Eliminação da arrumação [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:58 git-add--interactive.perl:1439
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Adição da arrumação [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:59 git-add--interactive.perl:1440
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Esconde este pedaço [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:61
-#, fuzzy
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "stashing."
@@ -440,7 +511,6 @@ msgstr ""
 "arrumação imediatamente."
 
 #: add-patch.c:64
-#, fuzzy
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -455,27 +525,26 @@ msgstr ""
 "d - mostrar este pedaço e qualquer próximo deste ficheiro\n"
 
 #: add-patch.c:80 git-add--interactive.perl:1443
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Unstage modo de modificação [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:81 git-add--interactive.perl:1444
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Eliminação do unstage [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:82 git-add--interactive.perl:1445
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Adição do unstage [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:83 git-add--interactive.perl:1446
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Unstage este pedaço [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:85
-#, fuzzy
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "unstaging."
@@ -484,7 +553,6 @@ msgstr ""
 "marcado para unstage."
 
 #: add-patch.c:88
-#, fuzzy
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -500,27 +568,26 @@ msgstr ""
 "ficheiro\n"
 
 #: add-patch.c:103 git-add--interactive.perl:1449
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Submeter modo de modificação para index [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:104 git-add--interactive.perl:1450
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Submeter eliminação para index [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:105 git-add--interactive.perl:1451
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Submeter adição para index [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:106 git-add--interactive.perl:1452
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Submeter este pedaço para index [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:108 add-patch.c:176 add-patch.c:221
-#, fuzzy
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "applying."
@@ -529,7 +596,6 @@ msgstr ""
 "submissão imediatamente."
 
 #: add-patch.c:111
-#, fuzzy
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -545,30 +611,29 @@ msgstr ""
 
 #: add-patch.c:126 git-add--interactive.perl:1455
 #: git-add--interactive.perl:1473
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar modo de modificação da worktree [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:127 git-add--interactive.perl:1456
 #: git-add--interactive.perl:1474
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar eliminação da worktree [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:128 git-add--interactive.perl:1457
 #: git-add--interactive.perl:1475
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar adição da worktree [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:129 git-add--interactive.perl:1458
 #: git-add--interactive.perl:1476
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar este pedaço da worktree [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:131 add-patch.c:154 add-patch.c:199
-#, fuzzy
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for "
 "discarding."
@@ -577,7 +642,6 @@ msgstr ""
 "descartado imediatamente."
 
 #: add-patch.c:134 add-patch.c:202
-#, fuzzy
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -592,27 +656,26 @@ msgstr ""
 "d - aceitar este pedaço e qualquer próximo deste ficheiro\n"
 
 #: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Descartar modo de modficação de index e worktree [y,n,q,a,d%s,?]?"
+msgstr "Descartar modo de modificação de index e worktree [y,n,q,a,d%s,?]?"
 
 #: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar eliminação de index e worktree [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar adição de index e worktree [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Descartar este pedaço de index e worktree [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:157
-#, fuzzy
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -627,27 +690,26 @@ msgstr ""
 "d - aceitar este pedaço e qualquer próximo deste ficheiro\n"
 
 #: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Submeter modo de modificação para index e worktree [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Submeter eliminação para index e worktree [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Submeter adição para index e worktree [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
-#, fuzzy, c-format, perl-format
+#, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Submeter este pedaço para index e worktree [y,n,q,a,d%s,?]? "
 
 #: add-patch.c:179
-#, fuzzy
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -662,7 +724,6 @@ msgstr ""
 "d - declinar este pedaço e qualquer próximo deste ficheiro\n"
 
 #: add-patch.c:224
-#, fuzzy
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -676,36 +737,34 @@ msgstr ""
 "a - submeter este pedaço e qualquer próximo deste ficheiro\n"
 "d - declinar este pedaço e qualquer próximo deste ficheiro\n"
 
-#: add-patch.c:342
-#, fuzzy, c-format
+#: add-patch.c:343
+#, c-format
 msgid "could not parse hunk header '%.*s'"
-msgstr "incapaz de analisar ínicio de pedaço '%s'"
+msgstr "incapaz de processar início de pedaço '%.*s'"
 
-#: add-patch.c:361 add-patch.c:365
-#, fuzzy, c-format
+#: add-patch.c:362 add-patch.c:366
+#, c-format
 msgid "could not parse colored hunk header '%.*s'"
-msgstr "incapaz de analizar início de pedaço colorido '%.*s'"
+msgstr "incapaz de analisar início de pedaço colorido '%.*s'"
 
-#: add-patch.c:419
-#, fuzzy
+#: add-patch.c:420
 msgid "could not parse diff"
 msgstr "incapaz de analisar diff"
 
-#: add-patch.c:438
-#, fuzzy
+#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr "incapaz de analisar diff colorido"
 
-#: add-patch.c:452
-#, fuzzy, c-format
+#: add-patch.c:453
+#, c-format
 msgid "failed to run '%s'"
-msgstr "falha ao executar '%s'"
+msgstr "falhou executar '%s'"
 
-#: add-patch.c:611
+#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
 msgstr "sem match de output de interactive.diffFilter"
 
-#: add-patch.c:612
+#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -713,8 +772,8 @@ msgstr ""
 "O teu filtro tem de manter uma correspondência exata\n"
 "entre seu input e linhas output."
 
-#: add-patch.c:790
-#, fuzzy, c-format
+#: add-patch.c:791
+#, c-format
 msgid ""
 "expected context line #%d in\n"
 "%.*s"
@@ -722,7 +781,7 @@ msgstr ""
 "linha de contexto esperada #%d em\n"
 "%.*s"
 
-#: add-patch.c:805
+#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -735,12 +794,12 @@ msgstr ""
 "\ttermina sem:\n"
 "%.*s"
 
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Modo de edição manual de pedaço -- ver final para guia rápido.\n"
 
-#: add-patch.c:1085
-#, fuzzy, c-format
+#: add-patch.c:1086
+#, c-format
 msgid ""
 "---\n"
 "To remove '%c' lines, make them ' ' lines (context).\n"
@@ -753,7 +812,7 @@ msgstr ""
 "Linhas começadas com %c serão removidas.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -763,12 +822,11 @@ msgstr ""
 "editar. Se todas as linhas deste pedaço forem removidas, então a edição\n"
 "é abortada e este pedaço é deixado inalterado.\n"
 
-#: add-patch.c:1132
-#, fuzzy
+#: add-patch.c:1133
 msgid "could not parse hunk header"
 msgstr "incapaz interpretar início de pedaço"
 
-#: add-patch.c:1177
+#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr "'git apply --cached' falhou"
 
@@ -784,28 +842,26 @@ msgstr "'git apply --cached' falhou"
 #. 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:1246 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1242
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
-"Problema na submissão de pedaço editado. Editar de novo (responder "
-"\"n\" para \"não\" descarta!) [y/n]? "
+"Problema na submissão de pedaço editado. Editar de novo (responder \"n\" "
+"para \"não\" descarta!) [y/n]? "
 
-#: add-patch.c:1289
-#, fuzzy
+#: add-patch.c:1290
 msgid "The selected hunks do not apply to the index!"
 msgstr "Submissão incorreta de pedaços selecionados para index!"
 
-#: add-patch.c:1290 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1346
 msgid "Apply them to the worktree anyway? "
 msgstr "Submetê-los para worktree mesmo assim? "
 
-#: add-patch.c:1297 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1349
 msgid "Nothing was applied.\n"
 msgstr "Nada foi submetido.\n"
 
-#: add-patch.c:1354
-#, fuzzy
+#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -827,77 +883,73 @@ msgstr ""
 "e - editar manualmente o pedaço atual\n"
 "? - mostrar ajuda\n"
 
-#: add-patch.c:1516 add-patch.c:1526
-#, fuzzy
+#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
 msgstr "Sem pedaço anterior"
 
-#: add-patch.c:1521 add-patch.c:1531
-#, fuzzy
+#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
 msgstr "Sem próximo pedaço"
 
-#: add-patch.c:1537
+#: add-patch.c:1538
 msgid "No other hunks to goto"
 msgstr "Sem qualquer outro pedaço"
 
-#: add-patch.c:1548 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1606
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "ir para qual pedaço (<ret> para ver mais)? "
 
-#: add-patch.c:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1608
 msgid "go to which hunk? "
 msgstr "ir para qual pedaço? "
 
-#: add-patch.c:1560
-#, fuzzy, c-format
+#: add-patch.c:1561
+#, c-format
 msgid "Invalid number: '%s'"
 msgstr "Número inválido: '%s'"
 
-#: add-patch.c:1565
-#, fuzzy, c-format
+#: add-patch.c:1566
+#, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Lamento, apenas %d pedaço disponível."
 msgstr[1] "Lamento, apenas %d pedaços disponíveis."
 
-#: add-patch.c:1574
+#: add-patch.c:1575
 msgid "No other hunks to search"
 msgstr "Sem outro pedaço a procurar"
 
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1661
 msgid "search for regex? "
 msgstr "procurar por regex? "
 
-#: add-patch.c:1595
-#, fuzzy, c-format
+#: add-patch.c:1596
+#, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Pesquisa regexp deformada %s: %s"
 
-#: add-patch.c:1612
-#, fuzzy
+#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
 msgstr "Sem pedaço correspondente ao padrão fornecido"
 
-#: add-patch.c:1619
+#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
 msgstr "Lamento, incapaz de dividir este pedaço"
 
-#: add-patch.c:1623
-#, fuzzy, c-format
+#: add-patch.c:1624
+#, c-format
 msgid "Split into %d hunks."
 msgstr "Dividir em %d pedaços."
 
-#: add-patch.c:1627
+#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
 msgstr "Lamento, incapaz de editar este pedaço"
 
-#: add-patch.c:1679
-#, fuzzy
+#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr "'git apply' falhou"
 
-#: advice.c:143
+#: advice.c:145
 #, c-format
 msgid ""
 "\n"
@@ -906,37 +958,37 @@ msgstr ""
 "\n"
 "Desative este mensagem com \"git config advice.%s false\""
 
-#: advice.c:159
-#, fuzzy, c-format
+#: advice.c:161
+#, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sdica: %.*s%s\n"
 
-#: advice.c:250
+#: advice.c:252
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "Cherry-picking é impossível porque tem ficheiros em separado."
 
-#: advice.c:252
+#: advice.c:254
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Cometer é impossível porque tem ficheiros em separado."
 
-#: advice.c:254
+#: advice.c:256
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Juntar é impossível porque tem ficheiros em separado."
 
-#: advice.c:256
+#: advice.c:258
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Puxar é impossível porque tem ficheiros em separado."
 
-#: advice.c:258
+#: advice.c:260
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Reverter é impossível porque tem ficheiros em separado."
 
-#: advice.c:260
+#: advice.c:262
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "É impossível fazer %s porque tem ficheiros em separado."
 
-#: advice.c:268
+#: advice.c:270
 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."
@@ -944,24 +996,37 @@ msgstr ""
 "Corrija-os em worktree, e use 'git add/rm <ficheiro>' apropriadamente\n"
 "para marcar resolução e fazer uma memória."
 
-#: advice.c:276
+#: advice.c:278
 msgid "Exiting because of an unresolved conflict."
 msgstr "Saindo devido a conflito por resolver."
 
-#: advice.c:281 builtin/merge.c:1369
+#: advice.c:283 builtin/merge.c:1375
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
-msgstr "O teu juntar ficou por concluír (MERGE_HEAD presente)."
+msgstr "O teu juntar ficou por concluir (MERGE_HEAD presente)."
 
-#: advice.c:283
+#: advice.c:285
 msgid "Please, commit your changes before merging."
 msgstr "Por favor, memoriza as tuas modificações antes de juntar."
 
-#: advice.c:284
+#: advice.c:286
 msgid "Exiting because of unfinished merge."
 msgstr "Saindo devido a juntar inacabado."
 
-#: advice.c:290
-#, fuzzy, c-format
+#: advice.c:296
+#, 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 ""
+
+#: advice.c:303
+msgid ""
+"Disable or modify the sparsity rules if you intend to update such entries."
+msgstr ""
+
+#: advice.c:310
+#, c-format
 msgid ""
 "Note: switching to '%s'.\n"
 "\n"
@@ -997,12 +1062,11 @@ msgstr ""
 "\n"
 "  git switch -\n"
 "\n"
-"Desliga este conselho pondo a variável de config advice.detachedHead em"
+"Desliga este conselho pondo a variável de config advice.detachedHead em "
 "false\n"
 "\n"
 
 #: alias.c:50
-#, fuzzy
 msgid "cmdline ends with \\"
 msgstr "cmdline termina com \\"
 
@@ -1010,85 +1074,82 @@ msgstr "cmdline termina com \\"
 msgid "unclosed quote"
 msgstr "aspa aberta"
 
-#: apply.c:69
+#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "opção de whitespace desconhecida '%s'"
 
-#: apply.c:85
+#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "opção de ignorar whitespace desconhecida '%s'"
 
-#: apply.c:135
+#: apply.c:136
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject e --3way só podem ser usados separadamente."
 
-#: apply.c:137
-msgid "--cached and --3way cannot be used together."
-msgstr "--cached e --3way só podem ser usados separadamente."
-
-#: apply.c:140
+#: apply.c:139
 msgid "--3way outside a repository"
 msgstr "--3way fora de um repositório"
 
-#: apply.c:151
+#: apply.c:150
 msgid "--index outside a repository"
 msgstr "--index fora de um repositório"
 
-#: apply.c:154
+#: apply.c:153
 msgid "--cached outside a repository"
-msgstr "--cached fora de um repositório"
+msgstr "--cached fora de repositório"
 
-#: apply.c:801
+#: apply.c:800
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Incapaz preparar timestamp de regexp %s"
 
-#: apply.c:810
+#: apply.c:809
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec devolveu %d para input: %s"
 
-#: apply.c:884
+#: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "incapaz de encontrar o nome do ficheiro no patch da linha %d"
 
-#: apply.c:922
+#: apply.c:921
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
-msgstr "git apply: git-diff incorreto - esperava /dev/null, tive %s na linha "
-"%d"
+msgstr "git apply: git-diff incorreto - esperava /dev/null, tive %s na linha %d"
 
-#: apply.c:928
+#: apply.c:927
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
-msgstr "git apply: git-diff incorreto - novo nome de ficheiro inconsistente "
-"na linha %d"
+msgstr ""
+"git apply: git-diff incorreto - novo nome de ficheiro inconsistente na linha "
+"%d"
 
-#: apply.c:929
+#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
-msgstr "git apply: git-diff incorreto - antigo nome de ficheiro inconsistente "
-"na linha %d"
+msgstr ""
+"git apply: git-diff incorreto - antigo nome de ficheiro inconsistente na "
+"linha %d"
 
-#: apply.c:934
+#: apply.c:933
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: git-diff incorreto - esperava /dev/null na linha %d"
 
-#: apply.c:963
-#, fuzzy, c-format
+#: apply.c:962
+#, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "modo inválido na linha %d: %s"
 
-#: apply.c:1282
+#: apply.c:1281
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "linhas de cabeçalho %d e %d inconsistentes"
 
-#: apply.c:1372
+#: apply.c:1371
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -1103,92 +1164,92 @@ msgstr[1] ""
 "cabeçalho do git diff falta informação de nome de ficheiro quando removendo "
 "%d componentes do pathname (linha %d)"
 
-#: apply.c:1385
+#: apply.c:1384
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "cabeçalho do git diff falta informação de nome de ficheiro (linha %d)"
 
-#: apply.c:1481
+#: apply.c:1480
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recontagem: linha inesperada: %.*s"
 
-#: apply.c:1550
+#: apply.c:1549
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "fragmento de patch sem cabeçalho na linha %d: %.*s"
 
-#: apply.c:1753
+#: apply.c:1752
 msgid "new file depends on old contents"
 msgstr "novo ficheiro depende de conteúdos antigos"
 
-#: apply.c:1755
+#: apply.c:1754
 msgid "deleted file still has contents"
 msgstr "ficheiro eliminado ainda tem conteúdos"
 
-#: apply.c:1789
+#: apply.c:1788
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "patch roto na linha %d"
 
-#: apply.c:1826
+#: apply.c:1825
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "novo ficheiro %s depende de conteúdos antigos"
 
-#: apply.c:1828
+#: apply.c:1827
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "ficheiro apagado %s ainda tem conteúdos"
 
-#: apply.c:1831
+#: apply.c:1830
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** aviso: ficheiro %s fica vazio e mantêm-se"
 
-#: apply.c:1978
+#: apply.c:1977
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "patch binário roto na linha %d: %.*s"
 
-#: apply.c:2015
+#: apply.c:2014
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "patch binário irreconhecível na linha %d"
 
-#: apply.c:2177
+#: apply.c:2176
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch com apenas lixo na linha %d"
 
-#: apply.c:2263
+#: apply.c:2262
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "incapaz de ler ligação simbólica %s"
 
-#: apply.c:2267
+#: apply.c:2266
 #, c-format
 msgid "unable to open or read %s"
 msgstr "incapaz de abrir ou ler %s"
 
-#: apply.c:2936
+#: apply.c:2935
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "início de linha inválido: '%c'"
 
-#: apply.c:3057
+#: apply.c:3056
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Pedaço #%d apareceu em %d (%d offset de linha)."
 msgstr[1] "Pedaço #%d apareceu em %d (%d offset de linhas)."
 
-#: apply.c:3069
+#: apply.c:3068
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Contexto reduzido a (%ld/%ld) para submeter fragmento em %d"
 
-#: apply.c:3075
+#: apply.c:3074
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1197,143 +1258,148 @@ msgstr ""
 "procurando por:\n"
 "%.*s"
 
-#: apply.c:3097
+#: apply.c:3096
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "faltando patch binário para '%s'"
 
-#: apply.c:3105
+#: apply.c:3104
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
-msgstr "incapaz submeter-inversamente patch binário sem pedaço "
-"inverso a '%s'"
+msgstr "incapaz submeter-inversamente patch binário sem pedaço inverso a '%s'"
 
-#: apply.c:3152
+#: apply.c:3151
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "incapaz submeter patch binário a '%s' sem a linha completa de index"
 
-#: apply.c:3163
+#: apply.c:3162
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
 "o patch submete-se a '%s' (%s), que corresponde a conteúdo actual nenhum."
 
-#: apply.c:3171
+#: apply.c:3170
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "o patch submete-se a um '%s' vazio mas tem conteúdo"
 
-#: apply.c:3189
+#: apply.c:3188
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "incapaz ler a postimage necessária %s para '%s'"
 
-#: apply.c:3202
+#: apply.c:3201
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "path binário submete-se a '%s' de maneira nenhuma"
 
-#: apply.c:3209
+#: apply.c:3208
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
-msgstr "patch binário para '%s' cria resultado incorreto (esperei %s, "
-"recebi %s)"
+msgstr ""
+"patch binário para '%s' cria resultado incorreto (esperei %s, recebi %s)"
 
-#: apply.c:3230
+#: apply.c:3229
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "patch falhou: %s:%ld"
 
-#: apply.c:3353
+#: apply.c:3352
 #, c-format
 msgid "cannot checkout %s"
 msgstr "incapaz de checkout %s"
 
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308
+#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
+#: setup.c:308
 #, c-format
 msgid "failed to read %s"
 msgstr "falha a ler %s"
 
-#: apply.c:3413
+#: apply.c:3412
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "lendo '%s' além de uma ligação simbólica"
 
-#: apply.c:3442 apply.c:3685
+#: apply.c:3441 apply.c:3687
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "path %s mudou de nome ou foi eliminado"
 
-#: apply.c:3528 apply.c:3700
+#: apply.c:3527 apply.c:3702
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: tem inexistência no index"
 
-#: apply.c:3537 apply.c:3708 apply.c:3953
+#: apply.c:3536 apply.c:3710 apply.c:3954
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: no index há correspondência nenhuma"
 
-#: apply.c:3572
-msgid "repository lacks the necessary blob to fall back on 3-way merge."
+#: apply.c:3571
+msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr "repositório falta o blob necessário para recorrer à tri-junção."
 
-#: apply.c:3575
+#: apply.c:3574
 #, c-format
-msgid "Falling back to three-way merge...\n"
-msgstr "A recorrer a integração com 3 pontos...\n"
+msgid "Performing three-way merge...\n"
+msgstr "Realizando tri-junção...\n"
 
-#: apply.c:3591 apply.c:3595
+#: apply.c:3590 apply.c:3594
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "incapaz ler conteúdo atual de '%s'"
 
-#: apply.c:3607
+#: apply.c:3606
 #, c-format
-msgid "Failed to fall back on three-way merge...\n"
+msgid "Failed to perform three-way merge...\n"
 msgstr "Falha a recorrer a integração com 3 pontos...\n"
 
-#: apply.c:3621
+#: apply.c:3620
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch aplicado a '%s' com conflitos.\n"
 
-#: apply.c:3626
+#: apply.c:3625
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch aplicado a '%s' com sucesso.\n"
 
-#: apply.c:3652
+#: apply.c:3642
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "Recorrendo a aplicação direta...\n"
+
+#: apply.c:3654
 msgid "removal patch leaves file contents"
 msgstr "patch de remoção deixa conteúdos no ficheiro"
 
-#: apply.c:3725
+#: apply.c:3727
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipo errado"
 
-#: apply.c:3727
+#: apply.c:3729
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s é do tipo %o, esperado %o"
 
-#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
-#: read-cache.c:1313
+#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892
+#: read-cache.c:1353
 #, c-format
 msgid "invalid path '%s'"
 msgstr "caminho inválido '%s'"
 
-#: apply.c:3950
+#: apply.c:3952
 #, c-format
 msgid "%s: already exists in index"
-msgstr "%s: já existe no índice"
+msgstr "%s: já existe no cenário"
 
 #: apply.c:3956
 #, c-format
 msgid "%s: already exists in working directory"
-msgstr "%s: já existe no diretório de trabalho"
+msgstr "%s: já existe na pasta-trabalho"
 
 #: apply.c:3976
 #, c-format
@@ -1358,7 +1424,7 @@ msgstr "%s: patch submete-se de maneira nenhuma"
 #: apply.c:4020
 #, c-format
 msgid "Checking patch %s..."
-msgstr "A verificar o patch %s..."
+msgstr ""
 
 #: apply.c:4112
 #, c-format
@@ -1410,7 +1476,7 @@ msgstr "incapaz criar armazenamento de backup para ficheiro recém-criado %s"
 msgid "unable to add cache entry for %s"
 msgstr "incapaz adicionar entrada de cache para %s"
 
-#: apply.c:4376 builtin/bisect--helper.c:524
+#: apply.c:4376 builtin/bisect--helper.c:525
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "falha a escrever para '%s'"
@@ -1446,7 +1512,7 @@ msgstr[1] "A aplicar patch %%s com %d rejeições..."
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "a truncar o nome do ficheiro .rej em %.*s.rej"
 
-#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228
+#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
 #, c-format
 msgid "cannot open %s"
 msgstr "incapaz abrir %s"
@@ -1461,192 +1527,193 @@ msgstr "Excerto nº%d aplicado com sucesso."
 msgid "Rejected hunk #%d."
 msgstr "Excerto nº%d rejeitado."
 
-#: apply.c:4720
+#: apply.c:4725
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Patch '%s' ignorado."
 
-#: apply.c:4728
+#: apply.c:4733
 msgid "unrecognized input"
 msgstr "input desconhecido"
 
-#: apply.c:4748
+#: apply.c:4753
 msgid "unable to read index file"
 msgstr "incapaz ler ficheiro index"
 
-#: apply.c:4905
+#: apply.c:4910
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "incapaz abrir patch '%s': %s"
 
-#: apply.c:4932
+#: apply.c:4937
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "%d erro de espaço em branco reprimido"
 msgstr[1] "%d erros de espaço em branco reprimidos"
 
-#: apply.c:4938 apply.c:4953
+#: apply.c:4943 apply.c:4958
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d linha adiciona erros de espaço em branco."
 msgstr[1] "%d linhas adicionam erros de espaço em branco."
 
-#: apply.c:4946
+#: apply.c:4951
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "%d linha aplicada depois de corrigir erros de espaço em branco."
 msgstr[1] "%d linhas aplicadas depois de corrigir erros de espaço em branco."
 
-#: apply.c:4962 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406
+#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
 msgid "Unable to write new index file"
 msgstr "Incapaz de escrever novo ficheiro index"
 
-#: apply.c:4990
+#: apply.c:4995
 msgid "don't apply changes matching the given path"
-msgstr "submeter de maneira nenhuma alterações correspondentes a path fornecido"
+msgstr ""
+"submeter de maneira nenhuma alterações correspondentes a path fornecido"
 
-#: apply.c:4993
+#: apply.c:4998
 msgid "apply changes matching the given path"
 msgstr "submeter alterações correspondentes a path fornecido"
 
-#: apply.c:4995 builtin/am.c:2266
+#: apply.c:5000 builtin/am.c:2318
 msgid "num"
 msgstr "num"
 
-#: apply.c:4996
+#: apply.c:5001
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional"
 
-#: apply.c:4999
+#: apply.c:5004
 msgid "ignore additions made by the patch"
 msgstr "ignorar adições feitas pelo patch"
 
-#: apply.c:5001
+#: apply.c:5006
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "invés aplicada patch, output diffstat para "
 
-#: apply.c:5005
+#: apply.c:5010
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "mostrar número de linhas adicionadas e removidas em notação decimal"
 
-#: apply.c:5007
+#: apply.c:5012
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "em vez de aplicar o patch, mostrar um resumo da entrada"
 
-#: apply.c:5009
+#: apply.c:5014
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado"
 
-#: apply.c:5011
+#: apply.c:5016
 msgid "make sure the patch is applicable to the current index"
 msgstr "garantir que o patch pode ser aplicado ao índice atual"
 
-#: apply.c:5013
+#: apply.c:5018
 msgid "mark new files with `git add --intent-to-add`"
 msgstr ""
 
-#: apply.c:5015
+#: apply.c:5020
 msgid "apply a patch without touching the working tree"
 msgstr "aplicar um patch sem tocar na árvore de trabalho"
 
-#: apply.c:5017
+#: apply.c:5022
 msgid "accept a patch that touches outside the working area"
 msgstr "aceitar patches que alteram ficheiros fora da área de trabalho"
 
-#: apply.c:5020
+#: apply.c:5025
 msgid "also apply the patch (use with --stat/--summary/--check)"
-msgstr "aplicar o patch também (use com --stat/--summary/--check)"
+msgstr "submeter o remendo também (usa com --stat/--summary/--check)"
 
-#: apply.c:5022
-msgid "attempt three-way merge if a patch does not apply"
+#: apply.c:5027
+msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr "tentar tri-junção se um patch submete-se de maneira nenhuma"
 
-#: apply.c:5024
+#: apply.c:5029
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "construir um índice temporário baseado na informação incorporada do índice"
 
-#: apply.c:5027 builtin/checkout-index.c:182 builtin/ls-files.c:525
+#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
 msgid "paths are separated with NUL character"
-msgstr "os caminhos estão separados por caracteres NUL"
+msgstr "caminhos estão separados por caractere NUL"
 
-#: apply.c:5029
+#: apply.c:5034
 msgid "ensure at least <n> lines of context match"
-msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
+msgstr "garantir que pelo menos <n> linhas de contexto correspondam"
 
-#: apply.c:5030 builtin/am.c:2245 builtin/interpret-trailers.c:98
-#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3562 builtin/rebase.c:1346
+#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297
+#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991
+#: builtin/rebase.c:1347
 msgid "action"
 msgstr "ação"
 
-#: apply.c:5031
+#: apply.c:5036
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "detetar linhas novas ou modificadas que tenham espaços em branco"
 
-#: apply.c:5034 apply.c:5037
+#: apply.c:5039 apply.c:5042
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorar alterações de espaço em branco ao procurar contexto"
 
-#: apply.c:5040
+#: apply.c:5045
 msgid "apply the patch in reverse"
 msgstr "aplicar o patch em reverso"
 
-#: apply.c:5042
+#: apply.c:5047
 msgid "don't expect at least one line of context"
 msgstr "conta com linha de contexto nenhuma"
 
-#: apply.c:5044
+#: apply.c:5049
 msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej"
+msgstr "deixar os pedaços rejeitados nos respetivos ficheiros *.rej"
 
-#: apply.c:5046
+#: apply.c:5051
 msgid "allow overlapping hunks"
-msgstr "permitir a sobreposição de excertos"
+msgstr "permitir a sobreposição de pedaços"
 
-#: apply.c:5047 builtin/add.c:329 builtin/check-ignore.c:22
-#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775
-#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
+#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756
+#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128
 msgid "be verbose"
 msgstr "ser verboso"
 
-#: apply.c:5049
+#: apply.c:5054
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "tolerar deteções incorretas de falta de nova linha no final do ficheiro"
 
-#: apply.c:5052
+#: apply.c:5057
 msgid "do not trust the line counts in the hunk headers"
 msgstr "desconfia da contagem de linhas nos headers de pedaços"
 
-#: apply.c:5054 builtin/am.c:2254
+#: apply.c:5059 builtin/am.c:2306
 msgid "root"
 msgstr "raiz"
 
-#: apply.c:5055
+#: apply.c:5060
 msgid "prepend <root> to all filenames"
 msgstr "preceder <root> a todos os nomes de ficheiro"
 
 #: archive-tar.c:125 archive-zip.c:345
-#, fuzzy, c-format
+#, c-format
 msgid "cannot stream blob %s"
 msgstr "incapaz streamar blob %s"
 
 #: archive-tar.c:265 archive-zip.c:358
-#, fuzzy, c-format
+#, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "modo de ficheiro fora de suporte: 0%o (SHA1: %s)"
 
 #: archive-tar.c:450
-#, fuzzy, c-format
+#, c-format
 msgid "unable to start '%s' filter"
 msgstr "incapaz iniciar filtro '%s'"
 
 #: archive-tar.c:453
-#, fuzzy
 msgid "unable to redirect descriptor"
 msgstr "incapaz redirecionar descritor"
 
@@ -1665,7 +1732,7 @@ msgstr ""
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr ""
 
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
 msgstr "erro ao compactar (%d)"
@@ -1677,7 +1744,7 @@ msgstr ""
 
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<opções>] <árvore-etc> [<caminho>...]"
+msgstr "git archive [<opções>] <arvoredo> [<caminho>...]"
 
 #: archive.c:15
 msgid "git archive --list"
@@ -1694,145 +1761,142 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repo> [--exec <cmd>] --list"
 
-#: archive.c:192
-#, fuzzy, c-format
+#: archive.c:188
+#, c-format
 msgid "cannot read %s"
-msgstr "incapaz ler '%s'"
+msgstr "incapaz ler %s"
 
-#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886
-#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786
-#: builtin/merge.c:1138
+#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
+#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
+#: builtin/merge.c:1144
 #, c-format
 msgid "could not read '%s'"
 msgstr "incapaz ler '%s'"
 
-#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315
+#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "especificador de path '%s' correspondeu a ficheiro nenhum"
 
-#: archive.c:454
-#, fuzzy, c-format
+#: archive.c:451
+#, c-format
 msgid "no such ref: %.*s"
-msgstr "referência inexistente %s"
+msgstr "ref inexistente: %.*s"
 
-#: archive.c:460
-#, fuzzy, c-format
+#: archive.c:457
+#, c-format
 msgid "not a valid object name: %s"
 msgstr "nome de objeto inválido: %s"
 
-#: archive.c:473
-#, fuzzy, c-format
+#: archive.c:470
+#, c-format
 msgid "not a tree object: %s"
 msgstr "é objeto árvore nenhum: %s"
 
-#: archive.c:485
-#, fuzzy
+#: archive.c:482
 msgid "current working directory is untracked"
 msgstr "pasta de trabalho atual está por seguir"
 
-#: archive.c:526
-#, fuzzy, c-format
+#: archive.c:523
+#, c-format
 msgid "File not found: %s"
 msgstr "ficheiro por encontrar: %s"
 
-#: archive.c:528
-#, fuzzy, c-format
+#: archive.c:525
+#, c-format
 msgid "Not a regular file: %s"
 msgstr "É ficheiro normal nenhum: %s"
 
-#: archive.c:555
+#: archive.c:552
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:555
+#: archive.c:552
 msgid "archive format"
 msgstr "formato do arquivo"
 
-#: archive.c:556 builtin/log.c:1765
+#: archive.c:553 builtin/log.c:1775
 msgid "prefix"
 msgstr "prefixo"
 
-#: archive.c:557
+#: archive.c:554
 msgid "prepend prefix to each pathname in the archive"
 msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo"
 
-#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890
-#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:919 builtin/hash-object.c:105
-#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
+#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105
+#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
 msgid "file"
 msgstr "ficheiro"
 
-#: archive.c:559
-#, fuzzy
+#: archive.c:556
 msgid "add untracked file to archive"
 msgstr "adiciona ficheiro por seguir a arquivo"
 
-#: archive.c:562 builtin/archive.c:90
+#: archive.c:559 builtin/archive.c:90
 msgid "write the archive to this file"
 msgstr "escreve arquivo para este ficheiro"
 
-#: archive.c:564
+#: archive.c:561
 msgid "read .gitattributes in working directory"
-msgstr "ler .gitattributes do diretório de trabalho"
+msgstr "ler .gitattributes da pasta-trabalho"
 
-#: archive.c:565
+#: archive.c:562
 msgid "report archived files on stderr"
-msgstr "listar ficheiros arquivados para stderr"
+msgstr "reportar, na saída de erro padrão, ficheiro arquivados"
 
-#: archive.c:567
-#, fuzzy
+#: archive.c:564
 msgid "set compression level"
-msgstr "nível de compactação do pacote"
+msgstr "definir nível de compressão"
 
-#: archive.c:570
+#: archive.c:567
 msgid "list supported archive formats"
 msgstr "listar formatos de arquivo suportados"
 
-#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
-#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
+#: builtin/submodule--helper.c:2902
 msgid "repo"
 msgstr "repo"
 
-#: archive.c:573 builtin/archive.c:92
+#: archive.c:570 builtin/archive.c:92
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "obter o arquivo a partir do repositório remoto <repo>"
 
-#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
 #: builtin/notes.c:498
 msgid "command"
 msgstr "comando"
 
-#: archive.c:575 builtin/archive.c:94
+#: archive.c:572 builtin/archive.c:94
 msgid "path to the remote git-upload-archive command"
 msgstr "caminho para o comando git-upload-archive no remoto"
 
-#: archive.c:582
+#: archive.c:579
 msgid "Unexpected option --remote"
 msgstr "Opção inesperada --remote"
 
-#: archive.c:584
+#: archive.c:581
 msgid "Option --exec can only be used together with --remote"
-msgstr "A opção --exec só pode ser usada em conjunto com --remote"
+msgstr "Opção --exec apenas pode ser usada com --remote"
 
-#: archive.c:586
+#: archive.c:583
 msgid "Unexpected option --output"
 msgstr "Opção inesperada --output"
 
-#: archive.c:588
-#, fuzzy
+#: archive.c:585
 msgid "Options --add-file and --remote cannot be used together"
 msgstr "Opções --add-file e --remote podem nada ser usadas juntas"
 
-#: archive.c:610
+#: archive.c:607
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Formato de arquivo desconhecido '%s'"
 
-#: archive.c:619
+#: archive.c:616
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argumento por ser suportado para formato '%s': -%d"
@@ -1842,12 +1906,12 @@ msgstr "Argumento por ser suportado para formato '%s': -%d"
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s é nome de atributo inválido"
 
-#: attr.c:359
-#, fuzzy, c-format
+#: attr.c:363
+#, c-format
 msgid "%s not allowed: %s:%d"
-msgstr "falha ao aplicar o patch: %s:%ld"
+msgstr "%s proibido: %s:%d"
 
-#: attr.c:399
+#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1929,19 +1993,19 @@ msgstr "A bissetar: uma base de integração tem de ser testada\n"
 msgid "a %s revision is needed"
 msgstr "precisa-se de uma revisão %s"
 
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
 #, c-format
 msgid "could not create file '%s'"
 msgstr "incapaz criar ficheiro '%s'"
 
-#: bisect.c:987 builtin/merge.c:152
+#: bisect.c:987 builtin/merge.c:153
 #, c-format
 msgid "could not read file '%s'"
 msgstr "incapaz ler ficheiro '%s'"
 
 #: bisect.c:1027
 msgid "reading bisect refs failed"
-msgstr "falha ao ler referências bissetadas"
+msgstr "falhou ler refs de bisseção"
 
 #: bisect.c:1057
 #, c-format
@@ -1952,7 +2016,7 @@ msgstr "%s era %s e %s em simultâneo\n"
 #, c-format
 msgid ""
 "No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
+"Maybe you started with bad path arguments?\n"
 msgstr ""
 "Nenhum commit testável encontrado.\n"
 "Talvez tenha começado com parâmetros de caminho incorretos?\n"
@@ -1974,39 +2038,38 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "A bissetar: falta %d revisão para testar depois desta %s\n"
 msgstr[1] "A bissetar: faltam %d revisões para testar depois desta %s\n"
 
-#: blame.c:2777
+#: blame.c:2776
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents e --reverse são imiscíveis."
 
-#: blame.c:2791
+#: blame.c:2790
 msgid "cannot use --contents with final commit object name"
 msgstr "usar --contents com nome de objeto commit final é impossível"
 
-#: blame.c:2812
+#: blame.c:2811
 msgid "--reverse and --first-parent together require specified latest commit"
-msgstr ""
-"--reverse e --first-parent juntos requer que se especifique o último commit"
+msgstr "--reverse e --first-parent juntos exige que se especifique a última memória"
 
-#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138
-#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409
-#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336
-#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395
-#: builtin/shortlog.c:267
+#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
+#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
+#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
+#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
+#: builtin/pack-objects.c:3821 builtin/shortlog.c:255
 msgid "revision walk setup failed"
 msgstr "falha ao configurar percurso de revisões"
 
-#: blame.c:2839
+#: blame.c:2838
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent juntos requer intervalo ao longo do primeiro-pai"
 
-#: blame.c:2850
+#: blame.c:2849
 #, c-format
 msgid "no such path %s in %s"
 msgstr "path %s inexistente em %s"
 
-#: blame.c:2861
+#: blame.c:2860
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "incapaz ler blob %s para path %s"
@@ -2030,42 +2093,42 @@ msgid "Not setting branch %s as its own upstream."
 msgstr "Indefinindo ramo %s como seu próprio upstream."
 
 #: branch.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
 msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s por rebase."
 
 #: branch.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s."
+msgstr "Ramo '%s' definido para monitorizar ramo remoto '%s' de '%s'."
 
 #: branch.c:98
-#, fuzzy, c-format
+#, c-format
 msgid "Branch '%s' set up to track local branch '%s' by rebasing."
 msgstr "Ramo %s configurado para seguir o ramo local %s por rebase."
 
 #: branch.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "Branch '%s' set up to track local branch '%s'."
 msgstr "Ramo %s configurado para seguir o ramo local %s."
 
 #: branch.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
 msgstr "Ramo %s configurado para seguir a referência remota %s por rebase."
 
 #: branch.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Branch '%s' set up to track remote ref '%s'."
 msgstr "Ramo %s configurado para seguir a referência remota %s."
 
 #: branch.c:109
-#, fuzzy, c-format
+#, c-format
 msgid "Branch '%s' set up to track local ref '%s' by rebasing."
 msgstr "Ramo %s configurado para seguir a referência local %s por rebase."
 
 #: branch.c:110
-#, fuzzy, c-format
+#, c-format
 msgid "Branch '%s' set up to track local ref '%s'."
 msgstr "Ramo %s configurado para seguir a referência local %s."
 
@@ -2095,7 +2158,9 @@ msgstr "Incapaz de forçar a atualização do ramo atual."
 #: branch.c:233
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "Impossível configurar informação sobre seguir; o ponto inicial '%s' é ramo nenhum."
+msgstr ""
+"Impossível configurar informação sobre seguir; o ponto inicial '%s' é ramo "
+"nenhum."
 
 #: branch.c:235
 #, c-format
@@ -2137,390 +2202,383 @@ msgstr "Nome de objeto ambíguo: '%s'."
 msgid "Not a valid branch point: '%s'."
 msgstr "Ponto no ramo inválido: '%s'."
 
-#: branch.c:365
+#: branch.c:366
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' foi já extraído em '%s'"
 
-#: branch.c:388
+#: branch.c:389
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD da working tree %s está desatualizada"
 
-#: bundle.c:41
-#, fuzzy, c-format
+#: bundle.c:44
+#, c-format
 msgid "unrecognized bundle hash algorithm: %s"
 msgstr "algoritmo hash de bundle irreconhecível: %s"
 
-#: bundle.c:45
-#, fuzzy, c-format
+#: bundle.c:48
+#, c-format
 msgid "unknown capability '%s'"
 msgstr "capacidade desconhecida '%s'"
 
-#: bundle.c:71
-#, fuzzy, c-format
+#: bundle.c:74
+#, c-format
 msgid "'%s' does not look like a v2 or v3 bundle file"
 msgstr "'%s' parece-se com ficheiro bundle v2 ou v3 nenhum"
 
-#: bundle.c:110
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "cabeçalho irreconhecível: %s%s (%d)"
 
-#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176
-#: builtin/commit.c:814
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
+#: builtin/commit.c:861
 #, c-format
 msgid "could not open '%s'"
 msgstr "incapaz abrir '%s'"
 
-#: bundle.c:189
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Falta ao repositório estes pré-requisitos de commits:"
 
-#: bundle.c:192
-#, fuzzy
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
 msgstr "é preciso repositório para verificar um bundle."
 
-#: bundle.c:243
+#: bundle.c:257
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "O bundle contém esta referência:"
 msgstr[1] "O bundle contém estas %d referências:"
 
-#: bundle.c:250
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "O pacote regista um histórico completo."
 
-#: bundle.c:252
+#: bundle.c:266
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "O bundle requer esta referência:"
 msgstr[1] "O bundle requer estas %d referências:"
 
-#: bundle.c:319
-#, fuzzy
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "incapaz de dup descritor de bundle"
 
-#: bundle.c:326
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "Impossível gerar pack-objects"
 
-#: bundle.c:337
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "pack-objects terminaram inesperadamente"
 
-#: bundle.c:379
-msgid "rev-list died"
-msgstr "rev-list terminou inesperadamente"
-
-#: bundle.c:428
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "a referência '%s' é excluída pelas opções de rev-list"
 
-#: bundle.c:498
-#, fuzzy, c-format
+#: bundle.c:504
+#, c-format
 msgid "unsupported bundle version %d"
 msgstr "fora de suporte versão bundle %d"
 
-#: bundle.c:500
+#: bundle.c:506
 #, c-format
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr ""
 
-#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argumento irreconhecível: %s"
 
-#: bundle.c:530
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "Criação de bundle vazio recusada."
 
-#: bundle.c:540
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "incapaz criar '%s'"
 
-#: bundle.c:565
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "index-pack terminou inesperadamente"
 
+#: chunk-format.c:117
+msgid "terminating chunk id appears earlier than expected"
+msgstr ""
+
+#: chunk-format.c:126
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr ""
+
+#: chunk-format.c:133
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr ""
+
+#: chunk-format.c:147
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr ""
+
 #: color.c:329
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "valor de cor inválido: %.*s"
 
-#: commit-graph.c:188 midx.c:47
-#, fuzzy
+#: commit-graph.c:204 midx.c:47
 msgid "invalid hash version"
-msgstr "especificação de caminho inválida"
+msgstr "versão de hash inválida"
 
-#: commit-graph.c:246
+#: commit-graph.c:262
 msgid "commit-graph file is too small"
 msgstr ""
 
-#: commit-graph.c:311
-#, fuzzy, c-format
+#: commit-graph.c:355
+#, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "assinatura commit-graph %X corresponde a assinatura %X nenhuma"
 
-#: commit-graph.c:318
-#, fuzzy, c-format
+#: commit-graph.c:362
+#, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "commit-graph versão %X corresponde a versão %X nenhuma"
 
-#: commit-graph.c:325
+#: commit-graph.c:369
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr ""
 
-#: commit-graph.c:342
+#: commit-graph.c:386
 #, c-format
 msgid "commit-graph file is too small to hold %u chunks"
 msgstr ""
 
-#: commit-graph.c:361
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr ""
-
-#: commit-graph.c:433
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr ""
-
-#: commit-graph.c:499
+#: commit-graph.c:482
 msgid "commit-graph has no base graphs chunk"
 msgstr ""
 
-#: commit-graph.c:509
+#: commit-graph.c:492
 msgid "commit-graph chain does not match"
 msgstr ""
 
-#: commit-graph.c:557
+#: commit-graph.c:540
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr ""
 
-#: commit-graph.c:581
-#, fuzzy
+#: commit-graph.c:564
 msgid "unable to find all commit-graph files"
 msgstr "incapaz de encontrar todos ficheiros commit-graph"
 
-#: commit-graph.c:721 commit-graph.c:785
+#: commit-graph.c:745 commit-graph.c:782
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 
-#: commit-graph.c:742
-#, fuzzy, c-format
+#: commit-graph.c:766
+#, c-format
 msgid "could not find commit %s"
-msgstr "incapaz encontrar commit %s"
+msgstr "incapaz encontrar memória %s"
 
-#: commit-graph.c:1042 builtin/am.c:1292
+#: commit-graph.c:799
+msgid "commit-graph requires overflow generation data but has none"
+msgstr ""
+
+#: commit-graph.c:1075 builtin/am.c:1341
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "incapaz analisar commit %s"
 
-#: commit-graph.c:1265 builtin/pack-objects.c:2864
-#, fuzzy, c-format
+#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#, c-format
 msgid "unable to get type of object %s"
 msgstr "incapaz obter tipo de objeto %s"
 
-#: commit-graph.c:1301
+#: commit-graph.c:1368
 msgid "Loading known commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:1318
+#: commit-graph.c:1385
 msgid "Expanding reachable commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:1338
+#: commit-graph.c:1405
 msgid "Clearing commit marks in commit graph"
 msgstr ""
 
-#: commit-graph.c:1357
+#: commit-graph.c:1424
+msgid "Computing commit graph topological levels"
+msgstr ""
+
+#: commit-graph.c:1477
 msgid "Computing commit graph generation numbers"
 msgstr ""
 
-#: commit-graph.c:1424
+#: commit-graph.c:1558
 msgid "Computing commit changed paths Bloom filters"
 msgstr ""
 
-#: commit-graph.c:1501
-#, fuzzy
+#: commit-graph.c:1635
 msgid "Collecting referenced commits"
 msgstr "Recolhendo commits referênciados"
 
-#: commit-graph.c:1526
+#: commit-graph.c:1660
 #, 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:1539
-#, fuzzy, c-format
+#: commit-graph.c:1673
+#, c-format
 msgid "error adding pack %s"
-msgstr "Erro ao rematar %s."
+msgstr "error adicionando pacote %s"
 
-#: commit-graph.c:1543
+#: commit-graph.c:1677
 #, c-format
 msgid "error opening index for %s"
 msgstr ""
 
-#: commit-graph.c:1582
+#: commit-graph.c:1714
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
 
-#: commit-graph.c:1597
-msgid "Counting distinct commits in commit graph"
-msgstr ""
-
-#: commit-graph.c:1629
+#: commit-graph.c:1732
 msgid "Finding extra edges in commit graph"
 msgstr ""
 
-#: commit-graph.c:1678
+#: commit-graph.c:1781
 msgid "failed to write correct number of base graph ids"
 msgstr ""
 
-#: commit-graph.c:1720 midx.c:819
-#, fuzzy, c-format
+#: commit-graph.c:1812 midx.c:911
+#, c-format
 msgid "unable to create leading directories of %s"
 msgstr "incapaz criar as pastas superiores a %s"
 
-#: commit-graph.c:1733
-#, fuzzy
+#: commit-graph.c:1825
 msgid "unable to create temporary graph layer"
 msgstr "incapaz criar camada de grafo temporária"
 
-#: commit-graph.c:1738
-#, fuzzy, c-format
+#: commit-graph.c:1830
+#, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "incapaz de ajustar permissão partilhada para '%s'"
 
-#: commit-graph.c:1808
+#: commit-graph.c:1887
 #, 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:1853
-#, fuzzy
+#: commit-graph.c:1923
 msgid "unable to open commit-graph chain file"
 msgstr "incapaz abrir ficheiro commit-graph chain"
 
-#: commit-graph.c:1869
-#, fuzzy
+#: commit-graph.c:1939
 msgid "failed to rename base commit-graph file"
-msgstr "Falha ao criar os ficheiros de saída"
+msgstr ""
 
-#: commit-graph.c:1889
-#, fuzzy
+#: commit-graph.c:1959
 msgid "failed to rename temporary commit-graph file"
 msgstr "falha a renomear ficheiro commit-graph temporário"
 
-#: commit-graph.c:2015
-#, fuzzy
+#: commit-graph.c:2092
 msgid "Scanning merged commits"
 msgstr "A adicionar %s integrado"
 
-#: commit-graph.c:2059
+#: commit-graph.c:2136
 msgid "Merging commit-graph"
 msgstr ""
 
-#: commit-graph.c:2165
+#: commit-graph.c:2244
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
 
-#: commit-graph.c:2274
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr ""
-
-#: commit-graph.c:2285
-#, fuzzy
+#: commit-graph.c:2351
 msgid "too many commits to write graph"
 msgstr "demasiados commits para escrever grafo"
 
-#: commit-graph.c:2378
+#: commit-graph.c:2449
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 
-#: commit-graph.c:2388
+#: commit-graph.c:2459
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr ""
 
-#: commit-graph.c:2398 commit-graph.c:2413
+#: commit-graph.c:2469 commit-graph.c:2484
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 
-#: commit-graph.c:2405
-#, fuzzy, c-format
+#: commit-graph.c:2476
+#, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "incapaz analisar commit %s de commit-graph"
 
-#: commit-graph.c:2423
+#: commit-graph.c:2494
 msgid "Verifying commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:2438
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 
-#: commit-graph.c:2445
+#: commit-graph.c:2516
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2455
+#: commit-graph.c:2526
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr ""
 
-#: commit-graph.c:2464
+#: commit-graph.c:2535
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2478
+#: commit-graph.c:2549
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 
-#: commit-graph.c:2483
+#: commit-graph.c:2554
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2487
+#: commit-graph.c:2558
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2503
+#: commit-graph.c:2575
 #, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr ""
 
-#: commit-graph.c:2509
+#: commit-graph.c:2581
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 
-#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
+#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417
+#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457
 #, c-format
 msgid "could not parse %s"
 msgstr "incapaz analisar %s"
@@ -2542,27 +2600,27 @@ msgid ""
 "\"git config advice.graftFileDeprecated false\""
 msgstr ""
 
-#: commit.c:1172
+#: commit.c:1237
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "Commit %s tem assinatura GPG desconfiada, alegadamente por %s."
 
-#: commit.c:1176
+#: commit.c:1241
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "Commit %s tem assinatura GPG incorreta, alegadamente por %s."
 
-#: commit.c:1179
+#: commit.c:1244
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Commit %s tem assinatura GPG nenhuma."
 
-#: commit.c:1182
+#: commit.c:1247
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Commit %s tem assinatura correta, por %s\n"
 
-#: commit.c:1436
+#: commit.c:1501
 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"
@@ -2577,7 +2635,7 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "memória esgotada"
 
-#: config.c:125
+#: config.c:126
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -2587,305 +2645,347 @@ msgid ""
 "This might be due to circular includes."
 msgstr ""
 
-#: config.c:141
-#, fuzzy, c-format
+#: config.c:142
+#, c-format
 msgid "could not expand include path '%s'"
 msgstr "incapaz de expandir include path '%s'"
 
-#: config.c:152
-#, fuzzy
+#: config.c:153
 msgid "relative config includes must come from files"
 msgstr ""
 "configuração relativa com inclusão condicional deve provir de ficheiros"
 
-#: config.c:198
+#: config.c:199
 msgid "relative config include conditionals must come from files"
 msgstr ""
 "configuração relativa com inclusão condicional deve provir de ficheiros"
 
-#: config.c:378
-#, fuzzy, c-format
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "formato de config inválido: %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr ""
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr ""
+
+#: config.c:442
+#, c-format
 msgid "key does not contain a section: %s"
 msgstr "chave contém secção nenhuma: %s"
 
-#: config.c:384
+#: config.c:448
 #, c-format
 msgid "key does not contain variable name: %s"
 msgstr ""
 
-#: config.c:408 sequencer.c:2580
+#: config.c:472 sequencer.c:2785
 #, c-format
 msgid "invalid key: %s"
 msgstr "chave inválida: %s"
 
-#: config.c:414
-#, fuzzy, c-format
+#: config.c:478
+#, c-format
 msgid "invalid key (newline): %s"
-msgstr "linha de identidade inválida: %s"
+msgstr ""
+
+#: config.c:511
+msgid "empty config key"
+msgstr ""
 
-#: config.c:450 config.c:462
-#, fuzzy, c-format
+#: config.c:529 config.c:541
+#, c-format
 msgid "bogus config parameter: %s"
-msgstr "parâmetros insuficientes"
+msgstr "parâmetro config falso: %s"
 
-#: config.c:497
-#, fuzzy, c-format
+#: config.c:555 config.c:572 config.c:579 config.c:588
+#, c-format
 msgid "bogus format in %s"
-msgstr "cadeia malformada %s"
+msgstr "formato falso em %s"
+
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "contagem falsa em %s"
 
-#: config.c:836
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "demasiadas entradas em %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "faltando chave config %s"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "faltando valor config %s"
+
+#: config.c:995
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "linha de configuração %d incorreta no blob %s"
 
-#: config.c:840
+#: config.c:999
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "linha de configuração %d incorreta no ficheiro %s"
 
-#: config.c:844
+#: config.c:1003
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "linha de configuração %d incorreta na entrada padrão"
 
-#: config.c:848
+#: config.c:1007
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "linha de configuração %d incorreta no submódulo-blob %s"
 
-#: config.c:852
+#: config.c:1011
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "linha de configuração %d incorreta na linha de comandos %s"
 
-#: config.c:856
+#: config.c:1015
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "linha de configuração %d incorreta em %s"
 
-#: config.c:993
+#: config.c:1152
 msgid "out of range"
 msgstr "fora de intervalo"
 
-#: config.c:993
+#: config.c:1152
 msgid "invalid unit"
 msgstr "unidade inválida"
 
-#: config.c:994
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "valor numérico '%s' da configuração '%s' incorreto: %s"
+msgstr "valor numérico de config '%s' inválido para '%s': %s"
 
-#: config.c:1013
+#: config.c:1163
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "valor numérico '%s' da configuração '%s' incorreto no blob %s: %s"
 
-#: config.c:1016
+#: config.c:1166
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "valor numérico '%s' da configuração '%s' incorreto no ficheiro %s: %s"
 
-#: config.c:1019
+#: config.c:1169
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "valor numérico '%s' da configuração '%s' incorreto na entrada padrão: %s"
 
-#: config.c:1022
+#: config.c:1172
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "valor numérico '%s' da configuração '%s' incorreto no submódulo-blob %s: %s"
 
-#: config.c:1025
+#: config.c:1175
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "valor numérico '%s' da configuração '%s' incorreto na linha de comandos %s: "
 "%s"
 
-#: config.c:1028
+#: config.c:1178
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "valor numérico '%s' da configuração '%s' incorreto em %s: %s"
 
-#: config.c:1123
+#: config.c:1257
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "valor booleano de config '%s' inválido para '%s'"
+
+#: config.c:1275
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "falha ao expandir diretório de utilizador em: '%s'"
 
-#: config.c:1132
+#: config.c:1284
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%s' em '%s' é carimbo de data/hora inválido"
 
-#: config.c:1223
+#: config.c:1377
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr ""
 
-#: config.c:1237 config.c:1248
+#: config.c:1391 config.c:1402
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "nível de compressão zlib %d incorreto"
 
-#: config.c:1340
+#: config.c:1494
 msgid "core.commentChar should only be one character"
 msgstr ""
 
-#: config.c:1373
+#: config.c:1527
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "modo inválido para criação de objeto: %s"
 
-#: config.c:1445
-#, fuzzy, c-format
+#: config.c:1599
+#, c-format
 msgid "malformed value for %s"
-msgstr "valor desformado para %s"
+msgstr "valor malformado para %s"
 
-#: config.c:1471
-#, fuzzy, c-format
+#: config.c:1625
+#, c-format
 msgid "malformed value for %s: %s"
-msgstr "valor inválido de %s: %s"
+msgstr "valor malformado para %s: %s"
 
-#: config.c:1472
+#: config.c:1626
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 
-#: config.c:1533 builtin/pack-objects.c:3649
+#: config.c:1687 builtin/pack-objects.c:4084
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "nível de compactação do pacote %d incorreto"
 
-#: config.c:1655
-#, fuzzy, c-format
+#: config.c:1809
+#, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "incapaz carregar objeto blob config '%s'"
 
-#: config.c:1658
-#, fuzzy, c-format
+#: config.c:1812
+#, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "referência '%s' aponta para blob nenhum"
 
-#: config.c:1675
-#, fuzzy, c-format
+#: config.c:1829
+#, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "incapaz resolver blog config '%s'"
 
-#: config.c:1705
-#, fuzzy, c-format
+#: config.c:1874
+#, c-format
 msgid "failed to parse %s"
-msgstr "falha a analisar %s"
+msgstr "falhou processar %s"
 
-#: config.c:1759
+#: config.c:1930
 msgid "unable to parse command-line config"
 msgstr "incapaz analisar config de linha de comandos"
 
-#: config.c:2122
+#: config.c:2294
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração"
 
-#: config.c:2296
+#: config.c:2468
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Inválido %s: '%s'"
 
-#: config.c:2341
+#: config.c:2513
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "o valor '%d' de splitIndex.maxPercentChange deve estar entre 0 e 100"
 
-#: config.c:2387
+#: config.c:2559
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "incapaz analisar '%s' da configuração de linha de comandos"
 
-#: config.c:2389
+#: config.c:2561
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d"
 
-#: config.c:2473
-#, fuzzy, c-format
+#: config.c:2645
+#, c-format
 msgid "invalid section name '%s'"
-msgstr "conteúdo inválido: '%s'"
+msgstr "nome de seção '%s' inválido"
 
-#: config.c:2505
+#: config.c:2677
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s tem múltiplos valores"
 
-#: config.c:2534
-#, fuzzy, c-format
+#: config.c:2706
+#, c-format
 msgid "failed to write new configuration file %s"
 msgstr "falha a escrever novo ficheiro configuração %s"
 
-#: config.c:2786 config.c:3112
-#, fuzzy, c-format
+#: config.c:2958 config.c:3285
+#, c-format
 msgid "could not lock config file %s"
 msgstr "incapaz trancar ficheiro config %s"
 
-#: config.c:2797
-#, fuzzy, c-format
+#: config.c:2969
+#, c-format
 msgid "opening %s"
 msgstr "abrindo %s"
 
-#: config.c:2834 builtin/config.c:361
-#, fuzzy, c-format
+#: config.c:3006 builtin/config.c:361
+#, c-format
 msgid "invalid pattern: %s"
 msgstr "padrão inválido: %s"
 
-#: config.c:2859
-#, fuzzy, c-format
+#: config.c:3031
+#, c-format
 msgid "invalid config file %s"
 msgstr "ficheiro config inválido %s"
 
-#: config.c:2872 config.c:3125
+#: config.c:3044 config.c:3298
 #, c-format
 msgid "fstat on %s failed"
-msgstr "falha de fstat de %s"
+msgstr "fstat em %s falhou"
 
-#: config.c:2883
-#, fuzzy, c-format
-msgid "unable to mmap '%s'"
-msgstr "incapaz mmap '%s'"
+#: config.c:3055
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "incapaz mmap '%s'%s"
 
-#: config.c:2892 config.c:3130
-#, fuzzy, c-format
+#: config.c:3065 config.c:3303
+#, c-format
 msgid "chmod on %s failed"
-msgstr "falha de fstat de %s"
+msgstr "chmod em %s falhou"
 
-#: config.c:2977 config.c:3227
-#, fuzzy, c-format
+#: config.c:3150 config.c:3400
+#, c-format
 msgid "could not write config file %s"
 msgstr "incapaz escrever ficheiro config %s"
 
-#: config.c:3011
+#: config.c:3184
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "incapaz definir '%s' como '%s'"
 
-#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
 #, c-format
 msgid "could not unset '%s'"
 msgstr "incapaz desdefinir '%s'"
 
-#: config.c:3103
-#, fuzzy, c-format
+#: config.c:3276
+#, c-format
 msgid "invalid section name: %s"
-msgstr "opção inválida: %s"
+msgstr ""
 
-#: config.c:3270
-#, fuzzy, c-format
+#: config.c:3443
+#, c-format
 msgid "missing value for '%s'"
-msgstr "valor inválido de %s"
+msgstr ""
 
 #: connect.c:61
-#, fuzzy
 msgid "the remote end hung up upon initial contact"
-msgstr "O remoto desligou após contacto inicial"
+msgstr "o lado remoto desligou após contacto inicial"
 
 #: connect.c:63
 msgid ""
@@ -2900,12 +3000,12 @@ msgstr ""
 "e que o repositório existe."
 
 #: connect.c:81
-#, fuzzy, c-format
+#, c-format
 msgid "server doesn't support '%s'"
 msgstr "servidor tem fora de suporte '%s'"
 
 #: connect.c:118
-#, fuzzy, c-format
+#, c-format
 msgid "server doesn't support feature '%s'"
 msgstr "servidor tem fora suporte a característica '%s'"
 
@@ -2923,71 +3023,70 @@ msgid "protocol error: unexpected capabilities^{}"
 msgstr ""
 
 #: connect.c:306
-#, fuzzy, c-format
+#, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
-msgstr "esperava-se raso/aprofundar, obteve-se %s"
+msgstr ""
 
 #: connect.c:308
 msgid "repository on the other end cannot be shallow"
 msgstr ""
 
 #: connect.c:347
-#, fuzzy
 msgid "invalid packet"
-msgstr "caminho inválido '%s'"
+msgstr ""
 
 #: connect.c:367
-#, fuzzy, c-format
+#, c-format
 msgid "protocol error: unexpected '%s'"
-msgstr "erro de protocolo: cabeçalho de pacote incorreto"
+msgstr ""
 
-#: connect.c:473
+#: connect.c:497
 #, c-format
 msgid "unknown object format '%s' specified by server"
 msgstr "objeto desconhecido '%s' pelo formato em servidor."
 
-#: connect.c:500
-#, fuzzy, c-format
+#: connect.c:526
+#, c-format
 msgid "invalid ls-refs response: %s"
-msgstr "referência inválida: %s"
+msgstr ""
 
-#: connect.c:504
+#: connect.c:530
 msgid "expected flush after ref listing"
 msgstr ""
 
-#: connect.c:507
+#: connect.c:533
 msgid "expected response end packet after ref listing"
 msgstr ""
 
-#: connect.c:640
-#, fuzzy, c-format
+#: connect.c:666
+#, c-format
 msgid "protocol '%s' is not supported"
 msgstr "protocolo '%s' é insustentado"
 
-#: connect.c:691
+#: connect.c:717
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr ""
 
-#: connect.c:731 connect.c:794
-#, fuzzy, c-format
+#: connect.c:757 connect.c:820
+#, c-format
 msgid "Looking up %s ... "
-msgstr "A verificar o patch %s..."
+msgstr ""
 
-#: connect.c:735
-#, fuzzy, c-format
+#: connect.c:761
+#, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "incapaz procurar %s (porta %s) (%s)"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:739 connect.c:810
+#: connect.c:765 connect.c:836
 #, c-format
 msgid ""
 "done.\n"
 "Connecting to %s (port %s) ... "
 msgstr ""
 
-#: connect.c:761 connect.c:838
-#, fuzzy, c-format
+#: connect.c:787 connect.c:864
+#, c-format
 msgid ""
 "unable to connect to %s:\n"
 "%s"
@@ -2996,64 +3095,65 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:767 connect.c:844
-#, fuzzy
+#: connect.c:793 connect.c:870
 msgid "done."
 msgstr "concluído."
 
-#: connect.c:798
-#, fuzzy, c-format
+#: connect.c:824
+#, c-format
 msgid "unable to look up %s (%s)"
 msgstr "incapaz procurar %s (%s)"
 
-#: connect.c:804
-#, fuzzy, c-format
+#: connect.c:830
+#, c-format
 msgid "unknown port %s"
-msgstr "opção desconhecido %s"
+msgstr ""
 
-#: connect.c:941 connect.c:1271
+#: connect.c:967 connect.c:1299
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr ""
 
-#: connect.c:943
+#: connect.c:969
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr ""
 
-#: connect.c:953
-#, fuzzy, c-format
+#: connect.c:979
+#, c-format
 msgid "cannot start proxy %s"
 msgstr "incapaz começar proxy %s"
 
-#: connect.c:1024
+#: connect.c:1050
 msgid "no path specified; see 'git help pull' for valid url syntax"
-msgstr ""
+msgstr "caminho nenhum especificado; vê 'git help pull' para sintaxe de url válida"
 
-#: connect.c:1219
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "parágrafo é proibido em hosts git:// e caminhos repo"
+
+#: connect.c:1247
 msgid "ssh variant 'simple' does not support -4"
 msgstr ""
 
-#: connect.c:1231
+#: connect.c:1259
 msgid "ssh variant 'simple' does not support -6"
 msgstr ""
 
-#: connect.c:1248
-#, fuzzy
+#: connect.c:1276
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "ssh variant 'simple' insustenta definir porta"
 
-#: connect.c:1360
+#: connect.c:1388
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr ""
 
-#: connect.c:1408
-#, fuzzy
+#: connect.c:1436
 msgid "unable to fork"
 msgstr "incapaz de aforquilhar"
 
-#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45
+#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr "A verificar conectividade"
 
@@ -3063,24 +3163,24 @@ msgstr "Impossível executar 'git rev-list'"
 
 #: connected.c:144
 msgid "failed write to rev-list"
-msgstr "falha ao escrever para rev-list"
+msgstr "falhou escrever para rev-list"
 
 #: connected.c:149
 msgid "failed to close rev-list's stdin"
 msgstr "falha ao fechar entrada padrão de rev-list"
 
-#: convert.c:194
+#: convert.c:183
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr ""
 
-#: convert.c:207
-#, fuzzy, c-format
+#: convert.c:196
+#, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "CRLF será substituído por LF em %s."
 
-#: convert.c:209
-#, fuzzy, c-format
+#: convert.c:198
+#, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory"
@@ -3088,13 +3188,13 @@ msgstr ""
 "CRLF será substituído por LF em %s.\n"
 "O final de linha original será mantido no ficheiro da sua árvore de trabalho."
 
-#: convert.c:217
+#: convert.c:206
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LF será substituído por CRLF em %s."
 
-#: convert.c:219
-#, fuzzy, c-format
+#: convert.c:208
+#, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
 "The file will have its original line endings in your working directory"
@@ -3102,94 +3202,93 @@ msgstr ""
 "LF será substituído por CRLF em %s.\n"
 "O final de linha original será mantido no ficheiro da sua árvore de trabalho."
 
-#: convert.c:284
+#: convert.c:273
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr ""
 
-#: convert.c:291
+#: convert.c:280
 #, c-format
 msgid ""
 "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
 "working-tree-encoding."
 msgstr ""
 
-#: convert.c:304
+#: convert.c:293
 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
 msgstr ""
 
-#: convert.c:306
+#: convert.c:295
 #, c-format
 msgid ""
 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
 "%sLE (depending on the byte order) as working-tree-encoding."
 msgstr ""
 
-#: convert.c:419 convert.c:490
-#, fuzzy, c-format
+#: convert.c:408 convert.c:479
+#, c-format
 msgid "failed to encode '%s' from %s to %s"
-msgstr "falha ao copiar notas de '%s' para '%s'"
+msgstr "falhou codificar '%s' de %s para %s"
 
-#: convert.c:462
+#: convert.c:451
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr ""
 
-#: convert.c:665
-#, fuzzy, c-format
+#: convert.c:654
+#, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "incapaz aforquilhar para correr filtro externo '%s'"
 
-#: convert.c:685
-#, fuzzy, c-format
+#: convert.c:674
+#, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "incapaz introduzir input para filtro externo '%s'"
 
-#: convert.c:692
-#, fuzzy, c-format
+#: convert.c:681
+#, c-format
 msgid "external filter '%s' failed %d"
 msgstr "filtro externo '%s' falhou %d"
 
-#: convert.c:727 convert.c:730
+#: convert.c:716 convert.c:719
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr ""
 
-#: convert.c:733 convert.c:788
-#, fuzzy, c-format
+#: convert.c:722 convert.c:777
+#, c-format
 msgid "external filter '%s' failed"
-msgstr "falha ao mudar o nome de '%s'"
+msgstr "filtro externo '%s' falhou"
 
-#: convert.c:837
-#, fuzzy
+#: convert.c:826
 msgid "unexpected filter type"
-msgstr "fim de ficheiro inesperado"
+msgstr ""
 
-#: convert.c:848
+#: convert.c:837
 msgid "path name too long for external filter"
 msgstr ""
 
-#: convert.c:940
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
 "been filtered"
 msgstr ""
 
-#: convert.c:1240
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr ""
 
-#: convert.c:1428 convert.c:1462
-#, fuzzy, c-format
+#: convert.c:1416 convert.c:1449
+#, c-format
 msgid "%s: clean filter '%s' failed"
-msgstr "falha ao criar '%s'"
+msgstr ""
 
-#: convert.c:1508
-#, fuzzy, c-format
+#: convert.c:1492
+#, c-format
 msgid "%s: smudge filter %s failed"
-msgstr "falha ao atualizar os ficheiros"
+msgstr "%s: filtro mancha %s falhou"
 
 #: credential.c:96
 #, c-format
@@ -3210,12 +3309,12 @@ msgid "url contains a newline in its %s component: %s"
 msgstr ""
 
 #: credential.c:438
-#, fuzzy, c-format
+#, c-format
 msgid "url has no scheme: %s"
 msgstr "Remoto inexistente: %s"
 
 #: credential.c:511
-#, fuzzy, c-format
+#, c-format
 msgid "credential url cannot be parsed: %s"
 msgstr "incapaz analisar url credencial: %s"
 
@@ -3224,82 +3323,82 @@ msgid "in the future"
 msgstr "no futuro"
 
 #: date.c:144
-#, fuzzy, c-format
+#, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
-msgstr[0] "há %lu segundo"
-msgstr[1] "há %lu segundos"
+msgstr[0] "à %<PRIuMAX> segundo"
+msgstr[1] "à %<PRIuMAX> segundos"
 
 #: date.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
-msgstr[0] "há %lu minuto"
-msgstr[1] "há %lu minutos"
+msgstr[0] "à %<PRIuMAX> minuto"
+msgstr[1] "à %<PRIuMAX> minutos"
 
 #: date.c:158
-#, fuzzy, c-format
+#, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
-msgstr[0] "há %lu hora"
-msgstr[1] "há %lu horas"
+msgstr[0] "à %<PRIuMAX> hora"
+msgstr[1] "à %<PRIuMAX> horas"
 
 #: date.c:165
-#, fuzzy, c-format
+#, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
-msgstr[0] "há %lu dia"
-msgstr[1] "há %lu dias"
+msgstr[0] "à %<PRIuMAX> dia"
+msgstr[1] "à %<PRIuMAX> dias"
 
 #: date.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
-msgstr[0] "há %lu semana"
-msgstr[1] "há %lu semanas"
+msgstr[0] "à %<PRIuMAX> semana"
+msgstr[1] "à %<PRIuMAX> semanas"
 
 #: date.c:178
-#, fuzzy, c-format
+#, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
-msgstr[0] "há %lu mês"
-msgstr[1] "há %lu meses"
+msgstr[0] "à %<PRIuMAX> mês"
+msgstr[1] "à %<PRIuMAX> meses"
 
 #: date.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
-msgstr[0] "%lu ano"
-msgstr[1] "%lu anos"
+msgstr[0] "%<PRIuMAX> ano"
+msgstr[1] "%<PRIuMAX> anos"
 
 #. TRANSLATORS: "%s" is "<n> years"
 #: date.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
-msgstr[0] "há %s e %lu mês"
-msgstr[1] "há %s e %lu meses"
+msgstr[0] "à %s, %<PRIuMAX> mês"
+msgstr[1] "à %s, %<PRIuMAX> meses"
 
 #: date.c:197 date.c:202
-#, fuzzy, c-format
+#, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
-msgstr[0] "há %lu ano"
-msgstr[1] "há %lu anos"
+msgstr[0] "à %<PRIuMAX> ano"
+msgstr[1] "à %<PRIuMAX> anos"
 
 #: delta-islands.c:272
 msgid "Propagating island marks"
 msgstr ""
 
 #: delta-islands.c:290
-#, fuzzy, c-format
+#, c-format
 msgid "bad tree object %s"
-msgstr "objeto árvore"
+msgstr "objeto de árvore %s inválido"
 
 #: delta-islands.c:334
-#, fuzzy, c-format
+#, c-format
 msgid "failed to load island regex for '%s': %s"
-msgstr "falha ao abrir '%s': %s"
+msgstr ""
 
 #: delta-islands.c:390
 #, c-format
@@ -3311,33 +3410,36 @@ msgstr ""
 msgid "Marked %d islands, done.\n"
 msgstr ""
 
-#: diff-lib.c:534
+#: diff-merges.c:70
+#, c-format
+msgid "unknown value for --diff-merges: %s"
+msgstr "valor desconhecido para --diff-merges: %s"
+
+#: diff-lib.c:557
 msgid "--merge-base does not work with ranges"
-msgstr ""
+msgstr "--merge-base é incompatível com intervalos"
 
-#: diff-lib.c:536
+#: diff-lib.c:559
 msgid "--merge-base only works with commits"
-msgstr ""
+msgstr "--merge-base apenas trabalho com memórias"
 
-#: diff-lib.c:553
-#, fuzzy
+#: diff-lib.c:576
 msgid "unable to get HEAD"
 msgstr "incapaz obter HEAD"
 
-#: diff-lib.c:560
+#: diff-lib.c:583
 msgid "no merge base found"
 msgstr ""
 
-#: diff-lib.c:562
+#: diff-lib.c:585
 msgid "multiple merge bases found"
 msgstr ""
 
-#: diff-no-index.c:238
-#, fuzzy
+#: diff-no-index.c:237
 msgid "git diff --no-index [<options>] <path> <path>"
-msgstr "git worktree add [<opções>] <caminho> [<ramo>]"
+msgstr "git diff --no-index [<opções>] <caminho> <caminho>"
 
-#: diff-no-index.c:263
+#: diff-no-index.c:262
 msgid ""
 "Not a git repository. Use --no-index to compare two paths outside a working "
 "tree"
@@ -3386,36 +3488,46 @@ msgstr ""
 "Erros encontrados na variável de configuração 'diff.dirstat':\n"
 "%s"
 
-#: diff.c:4276
+#: diff.c:4282
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "o diff externo terminou inesperadamente, interrompido em %s"
 
-#: diff.c:4625
+#: diff.c:4634
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check e -s são mutuamente exclusivos"
 
-#: diff.c:4628
-#, fuzzy
+#: diff.c:4637
 msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-b, -B e --detach são mutuamente exclusivos"
+msgstr "-G, -S e --find-object são mutuamente exclusivos"
+
+#: diff.c:4640
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr ""
+
+#: diff.c:4643
+msgid ""
+"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+"with -G and -S"
+msgstr ""
 
-#: diff.c:4706
+#: diff.c:4722
 msgid "--follow requires exactly one pathspec"
-msgstr "--follow requer exatamente um único especificador de caminho"
+msgstr "--follow exige exatamente um espetro-caminho"
 
-#: diff.c:4754
-#, fuzzy, c-format
+#: diff.c:4770
+#, c-format
 msgid "invalid --stat value: %s"
-msgstr "valor de cor inválido: %.*s"
+msgstr "valor --stat inválido: %s"
 
-#: diff.c:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302
+#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "%s expects a numerical value"
-msgstr "a opção '%c' espera um valor numérico"
+msgstr ""
 
-#: diff.c:4791
+#: diff.c:4807
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3424,539 +3536,515 @@ msgstr ""
 "Falha ao analisar parâmetro da opção --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4876
+#: diff.c:4892
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr ""
+msgstr "classe de mudança '%c' desconhecida em --diff-filter=%s"
 
-#: diff.c:4900
+#: diff.c:4916
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr ""
 
-#: diff.c:4914
-#, fuzzy, c-format
+#: diff.c:4930
+#, c-format
 msgid "unable to resolve '%s'"
 msgstr "incapaz resolver '%s'"
 
-#: diff.c:4964 diff.c:4970
+#: diff.c:4980 diff.c:4986
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr ""
 
-#: diff.c:4982
+#: diff.c:4998
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr ""
 
-#: diff.c:5003
-#, fuzzy, c-format
+#: diff.c:5019
+#, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "argumento incorreto --color-moved: %s"
 
-#: diff.c:5022
-#, fuzzy, c-format
+#: diff.c:5038
+#, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "objeto inválido '%s' fornecido."
+msgstr "modo inválido '%s' em --color-moved-ws"
 
-#: diff.c:5062
+#: diff.c:5078
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
 
-#: diff.c:5098 diff.c:5118
-#, fuzzy, c-format
+#: diff.c:5114 diff.c:5134
+#, c-format
 msgid "invalid argument to %s"
-msgstr "valor inválido de %s"
+msgstr ""
 
-#: diff.c:5222
-#, fuzzy, c-format
+#: diff.c:5238
+#, c-format
 msgid "invalid regex given to -I: '%s'"
-msgstr "valor inválido de %s"
+msgstr ""
 
-#: diff.c:5271
-#, fuzzy, c-format
+#: diff.c:5287
+#, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
-msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
+msgstr "Falha a processar parâmetro da opção --submodule: '%s'"
 
-#: diff.c:5327
+#: diff.c:5343
 #, c-format
 msgid "bad --word-diff argument: %s"
-msgstr ""
+msgstr "argumento --word-diff incorrecto: %s"
 
-#: diff.c:5350
+#: diff.c:5379
 msgid "Diff output format options"
 msgstr ""
 
-#: diff.c:5352 diff.c:5358
-#, fuzzy
+#: diff.c:5381 diff.c:5387
 msgid "generate patch"
-msgstr "incorporar o patch"
+msgstr "gerar remendo"
 
-#: diff.c:5355 builtin/log.c:178
+#: diff.c:5384 builtin/log.c:179
 msgid "suppress diff output"
-msgstr "suprimir saída do diff"
+msgstr "suprimir saída de diff"
 
-#: diff.c:5360 diff.c:5474 diff.c:5481
+#: diff.c:5389 diff.c:5503 diff.c:5510
 msgid "<n>"
-msgstr ""
+msgstr "<n>"
 
-#: diff.c:5361 diff.c:5364
-#, fuzzy
+#: diff.c:5390 diff.c:5393
 msgid "generate diffs with <n> lines context"
-msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
+msgstr "gerar diffs com <n> linhas de contexto"
 
-#: diff.c:5366
+#: diff.c:5395
 msgid "generate the diff in raw format"
 msgstr ""
 
-#: diff.c:5369
-#, fuzzy
+#: diff.c:5398
 msgid "synonym for '-p --raw'"
-msgstr "(sinónimo de --stat)"
+msgstr "sinónimo de '-p --raw'"
 
-#: diff.c:5373
-#, fuzzy
+#: diff.c:5402
 msgid "synonym for '-p --stat'"
-msgstr "(sinónimo de --stat)"
+msgstr "sinónimo de '-p --stat'"
 
-#: diff.c:5377
-#, fuzzy
+#: diff.c:5406
 msgid "machine friendly --stat"
-msgstr "saída inteligível por máquina"
+msgstr "--stat amigável à máquina"
 
-#: diff.c:5380
+#: diff.c:5409
 msgid "output only the last line of --stat"
 msgstr ""
 
-#: diff.c:5382 diff.c:5390
+#: diff.c:5411 diff.c:5419
 msgid "<param1,param2>..."
 msgstr ""
 
-#: diff.c:5383
+#: diff.c:5412
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 
-#: diff.c:5387
-#, fuzzy
+#: diff.c:5416
 msgid "synonym for --dirstat=cumulative"
-msgstr "sinónimo de --files-with-matches"
+msgstr "sinónimo de --dirstat=cumulative"
 
-#: diff.c:5391
+#: diff.c:5420
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr ""
 
-#: diff.c:5395
+#: diff.c:5424
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 
-#: diff.c:5398
+#: diff.c:5427
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 
-#: diff.c:5401
-#, fuzzy
+#: diff.c:5430
 msgid "show only names of changed files"
-msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
+msgstr ""
 
-#: diff.c:5404
-#, fuzzy
+#: diff.c:5433
 msgid "show only names and status of changed files"
-msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
+msgstr ""
 
-#: diff.c:5406
+#: diff.c:5435
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr ""
 
-#: diff.c:5407
-#, fuzzy
+#: diff.c:5436
 msgid "generate diffstat"
-msgstr "diff status inesperado %c"
+msgstr "gerar diffstat"
 
-#: diff.c:5409 diff.c:5412 diff.c:5415
+#: diff.c:5438 diff.c:5441 diff.c:5444
 msgid "<width>"
 msgstr ""
 
-#: diff.c:5410
+#: diff.c:5439
 msgid "generate diffstat with a given width"
 msgstr ""
 
-#: diff.c:5413
+#: diff.c:5442
 msgid "generate diffstat with a given name width"
 msgstr ""
 
-#: diff.c:5416
+#: diff.c:5445
 msgid "generate diffstat with a given graph width"
 msgstr ""
 
-#: diff.c:5418
+#: diff.c:5447
 msgid "<count>"
 msgstr ""
 
-#: diff.c:5419
+#: diff.c:5448
 msgid "generate diffstat with limited lines"
 msgstr ""
 
-#: diff.c:5422
+#: diff.c:5451
 msgid "generate compact summary in diffstat"
 msgstr ""
 
-#: diff.c:5425
+#: diff.c:5454
 msgid "output a binary diff that can be applied"
 msgstr ""
 
-#: diff.c:5428
+#: diff.c:5457
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 
-#: diff.c:5430
-#, fuzzy
+#: diff.c:5459
 msgid "show colored diff"
-msgstr "mostrar ficheiros ignorados"
+msgstr "mostrar diff colorida"
 
-#: diff.c:5431
+#: diff.c:5460
 msgid "<kind>"
 msgstr ""
 
-#: diff.c:5432
+#: diff.c:5461
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr ""
 
-#: diff.c:5435
+#: diff.c:5464
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
 msgstr ""
 
-#: diff.c:5438 diff.c:5441 diff.c:5444 diff.c:5553
-#, fuzzy
+#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
 msgid "<prefix>"
-msgstr "<prefixo>/"
+msgstr "<prefixo>"
 
-#: diff.c:5439
+#: diff.c:5468
 msgid "show the given source prefix instead of \"a/\""
 msgstr ""
 
-#: diff.c:5442
+#: diff.c:5471
 msgid "show the given destination prefix instead of \"b/\""
 msgstr ""
 
-#: diff.c:5445
-#, fuzzy
+#: diff.c:5474
 msgid "prepend an additional prefix to every line of output"
 msgstr "preceder o nomebase do projeto pai na saída"
 
-#: diff.c:5448
+#: diff.c:5477
 msgid "do not show any source or destination prefix"
 msgstr ""
 
-#: diff.c:5451
-#, fuzzy
+#: diff.c:5480
 msgid "show context between diff hunks up to the specified number of lines"
-msgstr "criar um clone raso, truncado ao número especificado de revisões"
+msgstr "mostrar contexto entre diff de pedaços até ao número de linhas especificado"
 
-#: diff.c:5455 diff.c:5460 diff.c:5465
+#: diff.c:5484 diff.c:5489 diff.c:5494
 msgid "<char>"
-msgstr ""
+msgstr "<caractere>"
 
-#: diff.c:5456
+#: diff.c:5485
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr ""
 
-#: diff.c:5461
+#: diff.c:5490
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr ""
 
-#: diff.c:5466
+#: diff.c:5495
 msgid "specify the character to indicate a context instead of ' '"
 msgstr ""
 
-#: diff.c:5469
-#, fuzzy
+#: diff.c:5498
 msgid "Diff rename options"
-msgstr "Opções genéricas"
+msgstr ""
 
-#: diff.c:5470
-#, fuzzy
+#: diff.c:5499
 msgid "<n>[/<m>]"
-msgstr "<n>[,<base>]"
+msgstr "<n>[/<m>]"
 
-#: diff.c:5471
+#: diff.c:5500
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 
-#: diff.c:5475
-#, fuzzy
+#: diff.c:5504
 msgid "detect renames"
-msgstr "nome do remoto"
+msgstr "detetar renomeações"
 
-#: diff.c:5479
+#: diff.c:5508
 msgid "omit the preimage for deletes"
 msgstr ""
 
-#: diff.c:5482
+#: diff.c:5511
 msgid "detect copies"
 msgstr ""
 
-#: diff.c:5486
+#: diff.c:5515
 msgid "use unmodified files as source to find copies"
 msgstr ""
 
-#: diff.c:5488
-#, fuzzy
+#: diff.c:5517
 msgid "disable rename detection"
-msgstr "Deteção de mudança de nome inexata em curso"
+msgstr "desativar detecção de renomeação"
 
-#: diff.c:5491
+#: diff.c:5520
 msgid "use empty blobs as rename source"
 msgstr ""
 
-#: diff.c:5493
+#: diff.c:5522
 msgid "continue listing the history of a file beyond renames"
 msgstr ""
 
-#: diff.c:5496
+#: diff.c:5525
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr ""
 
-#: diff.c:5498
-#, fuzzy
+#: diff.c:5527
 msgid "Diff algorithm options"
-msgstr "opção inválida: %s"
+msgstr ""
 
-#: diff.c:5500
+#: diff.c:5529
 msgid "produce the smallest possible diff"
 msgstr ""
 
-#: diff.c:5503
-#, fuzzy
+#: diff.c:5532
 msgid "ignore whitespace when comparing lines"
-msgstr "ignorar alterações de espaço em branco ao procurar contexto"
+msgstr ""
 
-#: diff.c:5506
-#, fuzzy
+#: diff.c:5535
 msgid "ignore changes in amount of whitespace"
-msgstr "ignorar alterações de espaço em branco ao procurar contexto"
+msgstr ""
 
-#: diff.c:5509
-#, fuzzy
+#: diff.c:5538
 msgid "ignore changes in whitespace at EOL"
-msgstr "ignorar alterações de espaço em branco ao procurar contexto"
+msgstr ""
 
-#: diff.c:5512
+#: diff.c:5541
 msgid "ignore carrier-return at the end of line"
 msgstr ""
 
-#: diff.c:5515
+#: diff.c:5544
 msgid "ignore changes whose lines are all blank"
 msgstr ""
 
-#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587
+#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
 msgid "<regex>"
 msgstr ""
 
-#: diff.c:5518
-#, fuzzy
+#: diff.c:5547
 msgid "ignore changes whose all lines match <regex>"
-msgstr "ignorar alterações de espaço em branco ao procurar contexto"
+msgstr ""
 
-#: diff.c:5521
+#: diff.c:5550
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 
-#: diff.c:5524
+#: diff.c:5553
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr ""
 
-#: diff.c:5528
+#: diff.c:5557
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr ""
 
-#: diff.c:5530
+#: diff.c:5559
 msgid "<algorithm>"
 msgstr ""
 
-#: diff.c:5531
+#: diff.c:5560
 msgid "choose a diff algorithm"
 msgstr ""
 
-#: diff.c:5533
-#, fuzzy
+#: diff.c:5562
 msgid "<text>"
-msgstr "texto"
+msgstr "<texto>"
 
-#: diff.c:5534
+#: diff.c:5563
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr ""
 
-#: diff.c:5536 diff.c:5545 diff.c:5548
-#, fuzzy
+#: diff.c:5565 diff.c:5574 diff.c:5577
 msgid "<mode>"
-msgstr "modo"
+msgstr "<modo>"
 
-#: diff.c:5537
+#: diff.c:5566
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 
-#: diff.c:5540
+#: diff.c:5569
 msgid "use <regex> to decide what a word is"
 msgstr ""
 
-#: diff.c:5543
+#: diff.c:5572
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr ""
 
-#: diff.c:5546
+#: diff.c:5575
 msgid "moved lines of code are colored differently"
 msgstr ""
 
-#: diff.c:5549
+#: diff.c:5578
 msgid "how white spaces are ignored in --color-moved"
 msgstr ""
 
-#: diff.c:5552
-#, fuzzy
+#: diff.c:5581
 msgid "Other diff options"
-msgstr "Opções genéricas"
+msgstr ""
 
-#: diff.c:5554
+#: diff.c:5583
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 
-#: diff.c:5558
-#, fuzzy
+#: diff.c:5587
 msgid "treat all files as text"
-msgstr "processar ficheiros binários como texto"
+msgstr "tratar todos ficheiros como texto"
 
-#: diff.c:5560
+#: diff.c:5589
 msgid "swap two inputs, reverse the diff"
 msgstr ""
 
-#: diff.c:5562
+#: diff.c:5591
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr ""
 
-#: diff.c:5564
+#: diff.c:5593
 msgid "disable all output of the program"
 msgstr ""
 
-#: diff.c:5566
+#: diff.c:5595
 msgid "allow an external diff helper to be executed"
 msgstr ""
 
-#: diff.c:5568
+#: diff.c:5597
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 
-#: diff.c:5570
-#, fuzzy
+#: diff.c:5599
 msgid "<when>"
-msgstr "quando"
+msgstr "<quando>"
 
-#: diff.c:5571
-#, fuzzy
+#: diff.c:5600
 msgid "ignore changes to submodules in the diff generation"
 msgstr ""
 "ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "
 "(Predefinição: all)"
 
-#: diff.c:5574
-#, fuzzy
+#: diff.c:5603
 msgid "<format>"
-msgstr "formato"
+msgstr "<formato>"
 
-#: diff.c:5575
+#: diff.c:5604
 msgid "specify how differences in submodules are shown"
 msgstr ""
 
-#: diff.c:5579
-#, fuzzy
+#: diff.c:5608
 msgid "hide 'git add -N' entries from the index"
-msgstr "usar .gitattributes apenas a partir do índice"
+msgstr ""
 
-#: diff.c:5582
+#: diff.c:5611
 msgid "treat 'git add -N' entries as real in the index"
 msgstr ""
 
-#: diff.c:5584
-#, fuzzy
+#: diff.c:5613
 msgid "<string>"
-msgstr "cadeia"
+msgstr "<string>"
 
-#: diff.c:5585
+#: diff.c:5614
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr ""
 
-#: diff.c:5588
+#: diff.c:5617
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr ""
 
-#: diff.c:5591
-#, fuzzy
+#: diff.c:5620
 msgid "show all changes in the changeset with -S or -G"
-msgstr "mostrar ficheiros com correspondências no paginador"
+msgstr "mostrar todos as alterações em memória com -S ou -G"
 
-#: diff.c:5594
-#, fuzzy
+#: diff.c:5623
 msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr "usar expressões regulares estendidas do POSIX"
+msgstr "tratar <string> em -S como expressão comum estendida de POSIX"
 
-#: diff.c:5597
-#, fuzzy
+#: diff.c:5626
 msgid "control the order in which files appear in the output"
-msgstr "mostrar outros ficheiros na saída"
+msgstr "controlar a ordem em que os ficheiro aparecem na saída"
+
+#: diff.c:5627 diff.c:5630
+msgid "<path>"
+msgstr "<caminho>"
+
+#: diff.c:5628
+msgid "show the change in the specified path first"
+msgstr ""
+"escrever o ficheiro de índice do pacote na versão de formato especificada"
 
-#: diff.c:5598
-#, fuzzy
+#: diff.c:5631
+msgid "skip the output to the specified path"
+msgstr "ignorar saída para caminho especificado"
+
+#: diff.c:5633
 msgid "<object-id>"
-msgstr "objeto"
+msgstr "<id-objeto>"
 
-#: diff.c:5599
+#: diff.c:5634
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr ""
 
-#: diff.c:5601
+#: diff.c:5636
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr ""
 
-#: diff.c:5602
+#: diff.c:5637
 msgid "select files by diff type"
 msgstr ""
 
-#: diff.c:5604
-#, fuzzy
+#: diff.c:5639
 msgid "<file>"
-msgstr "ficheiro"
+msgstr "<ficheiro>"
 
-#: diff.c:5605
-#, fuzzy
+#: diff.c:5640
 msgid "Output to a specific file"
-msgstr "submeter somente os ficheiros especificados"
+msgstr "Sair para ficheiro específico"
 
-#: diff.c:6262
-msgid "inexact rename detection was skipped due to too many files."
+#: diff.c:6298
+msgid "exhaustive rename detection was skipped due to too many files."
 msgstr ""
-"a deteção mudança de nome inexata foi omitida devido a demasiados ficheiros."
+"detecção de renomeação exaustiva foi ignorada devido a demasiados ficheiros."
 
-#: diff.c:6265
+#: diff.c:6301
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "só foram encontradas cópias de caminhos modificados devido a demasiados "
 "ficheiros."
 
-#: diff.c:6268
+#: diff.c:6304
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3966,67 +4054,70 @@ msgstr ""
 #: diffcore-order.c:24
 #, c-format
 msgid "failed to read orderfile '%s'"
-msgstr "falha ao ler o ficheiro de comando '%s'"
+msgstr "falha ao ler ficheiro de comando '%s'"
 
-#: diffcore-rename.c:592
+#: diffcore-rename.c:1514
 msgid "Performing inexact rename detection"
-msgstr "Deteção de mudança de nome inexata em curso"
+msgstr "Realizando detecção de renomeação inexata"
 
-#: dir.c:578
-#, fuzzy, c-format
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "path %s inexistente em diff"
+
+#: dir.c:593
+#, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
-msgstr "especificador de path '%s' correspondeu a ficheiro nenhum "
-"conhecido pelo git"
+msgstr "espetro-caminho '%s' correspondeu a ficheiro(s) nenhum(s) conhecido pelo git"
 
-#: dir.c:718 dir.c:747 dir.c:760
-#, fuzzy, c-format
+#: dir.c:733 dir.c:762 dir.c:775
+#, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr "padrão irreconhecível: '%s'"
 
-#: dir.c:777 dir.c:791
-#, fuzzy, c-format
+#: dir.c:790 dir.c:804
+#, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "por reconhecer padrão negativo: '%s'"
 
-#: dir.c:809
+#: dir.c:820
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr ""
 
-#: dir.c:819
+#: dir.c:830
 msgid "disabling cone pattern matching"
-msgstr ""
+msgstr "desativando correspondência de padrão em cone"
 
-#: dir.c:1198
-#, fuzzy, c-format
+#: dir.c:1214
+#, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "incapaz usar %s como ficheiro de exclusão"
 
-#: dir.c:2305
-#, fuzzy, c-format
+#: dir.c:2351
+#, c-format
 msgid "could not open directory '%s'"
 msgstr "incapaz abrir pasta '%s'"
 
-#: dir.c:2605
+#: dir.c:2653
 msgid "failed to get kernel name and information"
 msgstr "falha ao obter nome e informação do kernel"
 
-#: dir.c:2729
-#, fuzzy
+#: dir.c:2777
 msgid "untracked cache is disabled on this system or location"
 msgstr "cache untracked está desativada neste sistema ou localização."
 
-#: dir.c:3520
-#, fuzzy, c-format
+#: dir.c:3610
+#, c-format
 msgid "index file corrupt in repo %s"
-msgstr "ficheiro de índice corrompido"
+msgstr ""
 
-#: dir.c:3565 dir.c:3570
+#: dir.c:3657 dir.c:3662
 #, c-format
 msgid "could not create directories for %s"
 msgstr "incapaz criar pasta para %s"
 
-#: dir.c:3599
+#: dir.c:3691
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "incapaz migrar pasta git de '%s' para '%s'"
@@ -4036,333 +4127,336 @@ msgstr "incapaz migrar pasta git de '%s' para '%s'"
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr ""
 
-#: entry.c:177
-#, fuzzy
+#: entry.c:176
 msgid "Filtering content"
-msgstr "imprimir conteúdo da tag"
+msgstr "Filtrando conteúdo"
 
-#: entry.c:478
+#: entry.c:497
 #, c-format
 msgid "could not stat file '%s'"
-msgstr "incapaz obter estatutário de ficheiro '%s'"
+msgstr "incapaz de stat o ficheiro '%s'"
 
-#: environment.c:150
+#: environment.c:152
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr ""
 
-#: environment.c:337
-#, fuzzy, c-format
+#: environment.c:334
+#, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "incapaz definir GIT_DIR para '%s'"
 
 #: exec-cmd.c:363
-#, fuzzy, c-format
+#, c-format
 msgid "too many args to run %s"
-msgstr "Demasiados argumentos."
+msgstr ""
 
-#: fetch-pack.c:177
+#: fetch-pack.c:182
 msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: esperava-se lista rasa"
+msgstr "git fetch-pack: esperado lista superficial"
 
-#: fetch-pack.c:180
-#, fuzzy
+#: fetch-pack.c:185
 msgid "git fetch-pack: expected a flush packet after shallow list"
-msgstr "git fetch-pack: esperava-se lista rasa"
+msgstr "git fetch-pack: esperado pacote flush após lista superficial"
 
-#: fetch-pack.c:191
-#, fuzzy
+#: fetch-pack.c:196
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'"
+msgstr "git fetch-pack: esperado ACK/NAK, obtive um pacote flush"
 
-#: fetch-pack.c:211
+#: fetch-pack.c:216
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'"
+msgstr "git fetch-pack: esperado ACK/NAK, obtive '%s'"
 
-#: fetch-pack.c:222
-#, fuzzy
+#: fetch-pack.c:227
 msgid "unable to write to remote"
 msgstr "incapaz escrever para remoto"
 
-#: fetch-pack.c:283
+#: fetch-pack.c:288
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc requer multi_ack_detailed"
 
-#: fetch-pack.c:378 fetch-pack.c:1406
+#: fetch-pack.c:383 fetch-pack.c:1423
 #, c-format
 msgid "invalid shallow line: %s"
-msgstr "linha rasa inválida: %s"
+msgstr "linha superficial inválida: %s"
 
-#: fetch-pack.c:384 fetch-pack.c:1412
+#: fetch-pack.c:389 fetch-pack.c:1429
 #, c-format
 msgid "invalid unshallow line: %s"
-msgstr "linha para aprofundar inválida: %s"
+msgstr "linha por aprofundar inválida: %s"
 
-#: fetch-pack.c:386 fetch-pack.c:1414
+#: fetch-pack.c:391 fetch-pack.c:1431
 #, c-format
 msgid "object not found: %s"
 msgstr "objeto perdido: %s"
 
-#: fetch-pack.c:389 fetch-pack.c:1417
+#: fetch-pack.c:394 fetch-pack.c:1434
 #, c-format
 msgid "error in object: %s"
 msgstr "erro no objeto: %s"
 
-#: fetch-pack.c:391 fetch-pack.c:1419
+#: fetch-pack.c:396 fetch-pack.c:1436
 #, c-format
 msgid "no shallow found: %s"
-msgstr "shallow perdido: %s"
+msgstr "shallow por encontrar: %s"
 
-#: fetch-pack.c:394 fetch-pack.c:1423
+#: fetch-pack.c:399 fetch-pack.c:1440
 #, c-format
 msgid "expected shallow/unshallow, got %s"
-msgstr "esperava-se raso/aprofundar, obteve-se %s"
+msgstr "esperado shallow/unshallow, recebi %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:439
 #, c-format
 msgid "got %s %d %s"
 msgstr "obteve-se %s %d %s"
 
-#: fetch-pack.c:451
+#: fetch-pack.c:456
 #, c-format
 msgid "invalid commit %s"
-msgstr "commit inválido %s"
+msgstr "memória inválida %s"
 
-#: fetch-pack.c:482
+#: fetch-pack.c:487
 msgid "giving up"
-msgstr "desistência"
+msgstr "a desistir"
 
-#: fetch-pack.c:495 progress.c:339
+#: fetch-pack.c:500 progress.c:339
 msgid "done"
 msgstr "concluído"
 
-#: fetch-pack.c:507
+#: fetch-pack.c:512
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "obteve-se %s (%d) %s"
 
-#: fetch-pack.c:543
+#: fetch-pack.c:548
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Marcado %s como completo"
 
-#: fetch-pack.c:758
+#: fetch-pack.c:763
 #, c-format
 msgid "already have %s (%s)"
 msgstr "já se tem %s (%s)"
 
-#: fetch-pack.c:827
+#: fetch-pack.c:849
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: incapaz de aforquilhar demultiplexer sideband"
 
-#: fetch-pack.c:835
+#: fetch-pack.c:857
 msgid "protocol error: bad pack header"
-msgstr "erro de protocolo: cabeçalho de pacote incorreto"
+msgstr ""
 
-#: fetch-pack.c:919
+#: fetch-pack.c:951
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack: incapaz de aforquilhar %s"
+msgstr "fetch-pack: incapaz de fazer fork a %s"
+
+#: fetch-pack.c:957
+msgid "fetch-pack: invalid index-pack output"
+msgstr ""
 
-#: fetch-pack.c:937
+#: fetch-pack.c:974
 #, c-format
 msgid "%s failed"
 msgstr "%s falhou"
 
-#: fetch-pack.c:939
+#: fetch-pack.c:976
 msgid "error in sideband demultiplexer"
 msgstr "erro em demultiplexer sideband"
 
-#: fetch-pack.c:982
+#: fetch-pack.c:1019
 #, c-format
 msgid "Server version is %.*s"
 msgstr "A versão do servidor é %.*s"
 
-#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005
-#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021
-#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037
-#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059
-#, fuzzy, c-format
+#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
+#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#, c-format
 msgid "Server supports %s"
-msgstr "O servidor suporta side-band"
+msgstr "Servidor sustenta %s"
 
-#: fetch-pack.c:992
+#: fetch-pack.c:1029
 msgid "Server does not support shallow clients"
 msgstr "Servidor insustenta clientes shallow"
 
-#: fetch-pack.c:1052
+#: fetch-pack.c:1089
 msgid "Server does not support --shallow-since"
 msgstr "Servidor insustenta --shallow-since"
 
-#: fetch-pack.c:1057
+#: fetch-pack.c:1094
 msgid "Server does not support --shallow-exclude"
 msgstr "Servidor insustenta --shallow-exclude"
 
-#: fetch-pack.c:1061
+#: fetch-pack.c:1098
 msgid "Server does not support --deepen"
 msgstr "Servidor insustenta --deepen"
 
-#: fetch-pack.c:1063
-#, fuzzy
+#: fetch-pack.c:1100
 msgid "Server does not support this repository's object format"
 msgstr "Servidor insustenta formato de objeto deste repositório"
 
-#: fetch-pack.c:1076
+#: fetch-pack.c:1113
 msgid "no common commits"
 msgstr "commits comuns nenhuns"
 
-#: fetch-pack.c:1088 fetch-pack.c:1628
+#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+msgid "source repository is shallow, reject to clone."
+msgstr "repositório de origem é raso, rejeita para clonar."
+
+#: fetch-pack.c:1128 fetch-pack.c:1660
 msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: falha ao obter."
+msgstr "git fetch-pack: buscar falhou."
 
-#: fetch-pack.c:1214
+#: fetch-pack.c:1242
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr ""
 
-#: fetch-pack.c:1218
-#, fuzzy, c-format
+#: fetch-pack.c:1246
+#, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "o servidor insustenta algoritmo '%s'"
 
-#: fetch-pack.c:1238
-#, fuzzy
+#: fetch-pack.c:1279
 msgid "Server does not support shallow requests"
 msgstr "Servidor insustenta pedidos shallow"
 
-#: fetch-pack.c:1245
-#, fuzzy
+#: fetch-pack.c:1286
 msgid "Server supports filter"
 msgstr "Servidor sustenta filtro"
 
-#: fetch-pack.c:1284
-#, fuzzy
+#: fetch-pack.c:1329 fetch-pack.c:2043
 msgid "unable to write request to remote"
 msgstr "incapaz escrever pedidos para remoto"
 
-#: fetch-pack.c:1302
+#: fetch-pack.c:1347
 #, c-format
 msgid "error reading section header '%s'"
 msgstr ""
 
-#: fetch-pack.c:1308
-#, fuzzy, c-format
+#: fetch-pack.c:1353
+#, c-format
 msgid "expected '%s', received '%s'"
-msgstr "blob para %s '%s' esperado"
+msgstr ""
 
-#: fetch-pack.c:1369
+#: fetch-pack.c:1387
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr ""
 
-#: fetch-pack.c:1374
+#: fetch-pack.c:1392
 #, c-format
 msgid "error processing acks: %d"
 msgstr ""
 
-#: fetch-pack.c:1384
+#: fetch-pack.c:1402
 msgid "expected packfile to be sent after 'ready'"
 msgstr ""
 
-#: fetch-pack.c:1386
+#: fetch-pack.c:1404
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 
-#: fetch-pack.c:1428
+#: fetch-pack.c:1445
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr ""
 
-#: fetch-pack.c:1475
-#, fuzzy, c-format
+#: fetch-pack.c:1494
+#, c-format
 msgid "expected wanted-ref, got '%s'"
-msgstr "esperava-se raso/aprofundar, obteve-se %s"
+msgstr ""
 
-#: fetch-pack.c:1480
-#, fuzzy, c-format
+#: fetch-pack.c:1499
+#, c-format
 msgid "unexpected wanted-ref: '%s'"
-msgstr "fim de ficheiro inesperado"
+msgstr ""
 
-#: fetch-pack.c:1485
+#: fetch-pack.c:1504
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr ""
 
-#: fetch-pack.c:1515
-#, fuzzy
+#: fetch-pack.c:1534
 msgid "git fetch-pack: expected response end packet"
-msgstr "git fetch-pack: esperava-se lista rasa"
+msgstr "git fetch-pack: esperado pacote fim de resposta"
 
-#: fetch-pack.c:1897
+#: fetch-pack.c:1939
 msgid "no matching remote head"
 msgstr "corresponde a remote head nenhuma"
 
-#: fetch-pack.c:1920 builtin/clone.c:693
+#: fetch-pack.c:1962 builtin/clone.c:697
 msgid "remote did not send all necessary objects"
 msgstr "remoto faltou enviar todos objetos necessários"
 
-#: fetch-pack.c:1947
+#: fetch-pack.c:2065
+msgid "unexpected 'ready' from remote"
+msgstr ""
+
+#: fetch-pack.c:2088
 #, c-format
 msgid "no such remote ref %s"
 msgstr "referência remota %s inexistente"
 
-#: fetch-pack.c:1950
+#: fetch-pack.c:2091
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Servidor proíbe pedido de objeto por anunciar %s"
 
-#: gpg-interface.c:272
+#: gpg-interface.c:273
 msgid "could not create temporary file"
 msgstr "incapaz criar ficheiro temporário"
 
-#: gpg-interface.c:275
+#: gpg-interface.c:276
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "falha ao escrever assinatura destacada em '%s'"
 
-#: gpg-interface.c:457
+#: gpg-interface.c:470
 msgid "gpg failed to sign the data"
 msgstr "gpg falhou assinar os dados"
 
 #: graph.c:98
 #, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
+msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "ignorar cor inválida '%.*s' em log.graphColors"
 
-#: grep.c:640
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
 msgstr ""
 
-#: grep.c:2100
+#: grep.c:1895
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': incapaz ler %s"
 
-#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89
-#: builtin/rm.c:135
+#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90
+#: builtin/rm.c:136
 #, c-format
 msgid "failed to stat '%s'"
-msgstr "falha ao invocar stat de '%s'"
+msgstr ""
 
-#: grep.c:2128
+#: grep.c:1923
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': leitura truncada"
 
 #: help.c:23
 msgid "start a working area (see also: git help tutorial)"
-msgstr "iniciar uma área de trabalho (consulte também: git help tutorial)"
+msgstr "iniciar uma área de trabalho (vê também: git help tutorial)"
 
 #: help.c:24
 msgid "work on the current change (see also: git help everyday)"
-msgstr "trabalhar na alteração atual (consulte também: git help everyday)"
+msgstr "trabalhar na alteração atual (vê também: git help everyday)"
 
 #: help.c:25
 msgid "examine the history and state (see also: git help revisions)"
-msgstr "examinar o histórico e estado (consulte também: git help revisions)"
+msgstr "examinar o histórico e estado (vê também: git help revisions)"
 
 #: help.c:26
 msgid "grow, mark and tweak your common history"
@@ -4370,7 +4464,7 @@ msgstr "aumentar, marcar e ajustar o seu histórico comum"
 
 #: help.c:27
 msgid "collaborate (see also: git help workflows)"
-msgstr "colaborar (consulte também: git help workflows)"
+msgstr "colaborar (vê também: git help workflows)"
 
 #: help.c:31
 msgid "Main Porcelain Commands"
@@ -4407,7 +4501,7 @@ msgstr ""
 #: help.c:300
 #, c-format
 msgid "available git commands in '%s'"
-msgstr "comandos do git disponível em '%s'"
+msgstr "comandos de git disponíveis em '%s'"
 
 #: help.c:307
 msgid "git commands available from elsewhere on your $PATH"
@@ -4417,13 +4511,12 @@ msgstr "comandos do git disponíveis noutras localizações em $PATH"
 msgid "These are common Git commands used in various situations:"
 msgstr "Estes são comandos do Git comuns usados em diversas situações:"
 
-#: help.c:365 git.c:99
-#, fuzzy, c-format
+#: help.c:365 git.c:100
+#, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "insustento para listagem tipo comandos '%s'"
 
 #: help.c:405
-#, fuzzy
 msgid "The Git concept guides are:"
 msgstr "Os guias comuns do Git:"
 
@@ -4432,13 +4525,12 @@ msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr ""
 
 #: help.c:434
-#, fuzzy
 msgid "External commands"
-msgstr "a executar $command"
+msgstr "Comandos externos"
 
 #: help.c:449
 msgid "Command aliases"
-msgstr ""
+msgstr "Aliases de comando"
 
 #: help.c:527
 #, c-format
@@ -4459,7 +4551,7 @@ msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Carago. Teu sistema reporta comandos Git nenhuns."
 
 #: help.c:613
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr "AVISO: Chamou comando Git designado '%s', que é inexistente."
 
@@ -4484,9 +4576,8 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: help.c:675
-#, fuzzy
 msgid "git version [<options>]"
-msgstr "git column [<opções>]"
+msgstr "git version [<opções>]"
 
 #: help.c:730
 #, c-format
@@ -4569,48 +4660,53 @@ msgstr "nome de identação vazio (para <%s>) proíbido"
 msgid "name consists only of disallowed characters: %s"
 msgstr "nome consiste apenas de caracteres proíbidos: %s"
 
-#: ident.c:454 builtin/commit.c:634
+#: ident.c:454 builtin/commit.c:647
 #, c-format
 msgid "invalid date format: %s"
 msgstr "formato de data inválido: %s"
 
-#: list-objects-filter-options.c:81
+#: list-objects-filter-options.c:83
 msgid "expected 'tree:<depth>'"
 msgstr ""
 
-#: list-objects-filter-options.c:96
+#: list-objects-filter-options.c:98
 msgid "sparse:path filters support has been dropped"
 msgstr ""
 
-#: list-objects-filter-options.c:109
-#, fuzzy, c-format
+#: list-objects-filter-options.c:105
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "'%s' para 'object:type=<type>' é um tipo de objecto inválido"
+
+#: list-objects-filter-options.c:124
+#, c-format
 msgid "invalid filter-spec '%s'"
-msgstr "ficheiro inválido: '%s'"
+msgstr ""
 
-#: list-objects-filter-options.c:125
+#: list-objects-filter-options.c:140
 #, c-format
 msgid "must escape char in sub-filter-spec: '%c'"
 msgstr ""
 
-#: list-objects-filter-options.c:167
+#: list-objects-filter-options.c:182
 msgid "expected something after combine:"
 msgstr ""
 
-#: list-objects-filter-options.c:249
+#: list-objects-filter-options.c:264
 msgid "multiple filter-specs cannot be combined"
 msgstr ""
 
-#: list-objects-filter-options.c:361
+#: list-objects-filter-options.c:376
 msgid "unable to upgrade repository format to support partial clone"
 msgstr ""
 
-#: list-objects-filter.c:492
-#, fuzzy, c-format
+#: list-objects-filter.c:532
+#, c-format
 msgid "unable to access sparse blob in '%s'"
 msgstr "incapaz acessar blob sparse em '%s'"
 
-#: list-objects-filter.c:495
-#, fuzzy, c-format
+#: list-objects-filter.c:535
+#, c-format
 msgid "unable to parse sparse filter data in %s"
 msgstr "incapaz analisar dados de filtro sparse em %s"
 
@@ -4624,8 +4720,8 @@ msgstr ""
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr ""
 
-#: list-objects.c:375
-#, fuzzy, c-format
+#: list-objects.c:398
+#, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "incapaz carregar raiz de árvore para commit %s"
 
@@ -4653,159 +4749,343 @@ msgstr ""
 msgid "Unable to create '%s.lock': %s"
 msgstr "Incapaz de criar '%s.lock': %s"
 
-#: ls-refs.c:109
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr ""
+
+#: ls-refs.c:167
 msgid "expected flush after ls-refs arguments"
 msgstr ""
 
-#: merge-ort-wrappers.c:13 merge-recursive.c:3672
-#, fuzzy, c-format
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
+msgstr ""
+
+#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "ação inválida '%s' para '%s'"
+
+#: merge-ort.c:1569 merge-recursive.c:1201
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr ""
+
+#: merge-ort.c:1578 merge-recursive.c:1208
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr ""
+
+#: merge-ort.c:1587 merge-recursive.c:1215
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+
+#: merge-ort.c:1597 merge-ort.c:1604
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr ""
+
+#: merge-ort.c:1625
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Juntar submódulo %s falhou"
+
+#: merge-ort.c:1632
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+
+#: merge-ort.c:1636 merge-recursive.c:1269
+#, c-format
+msgid ""
+"If this is correct simply add it to the index for example\n"
+"by using:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"which will accept this suggestion.\n"
+msgstr ""
+
+#: merge-ort.c:1649
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+
+#: merge-ort.c:1868 merge-recursive.c:1358
+msgid "Failed to execute internal merge"
+msgstr "Falha ao executar integração interna"
+
+#: merge-ort.c:1873 merge-recursive.c:1363
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Incapaz de adicionar %s à base de dados"
+
+#: merge-ort.c:1880 merge-recursive.c:1396
+#, c-format
+msgid "Auto-merging %s"
+msgstr "A integrar automaticamente %s"
+
+#: merge-ort.c:2019 merge-recursive.c:2118
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
+"implicit directory rename(s) putting the following path(s) there: %s."
+msgstr ""
+
+#: merge-ort.c:2029 merge-recursive.c:2128
+#, c-format
+msgid ""
+"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
+"implicit directory renames tried to put these paths there: %s"
+msgstr ""
+
+#: merge-ort.c:2087
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+
+#: merge-ort.c:2241 merge-recursive.c:2464
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+
+#: merge-ort.c:2385 merge-recursive.c:3247
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+
+#: merge-ort.c:2392 merge-recursive.c:3254
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+
+#: merge-ort.c:2405 merge-recursive.c:3250
+#, c-format
+msgid ""
+"CONFLICT (file location): %s added in %s inside a directory that was renamed "
+"in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+
+#: merge-ort.c:2413 merge-recursive.c:3257
+#, c-format
+msgid ""
+"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
+"was renamed in %s, suggesting it should perhaps be moved to %s."
+msgstr ""
+
+#: merge-ort.c:2569
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr "CONFLITO (renomear/renomear): %s renomeado para %s em %s e para %s em %s."
+
+#: merge-ort.c:2664
+#, c-format
+msgid ""
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
+msgstr ""
+
+#: merge-ort.c:2683 merge-ort.c:2707
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr "CONFLITO (renomear/apagar): %s renomeado para %s em %s, mas apagado em %s."
+
+#: merge-ort.c:3182 merge-recursive.c:3008
+#, c-format
+msgid "cannot read object %s"
+msgstr "incapaz ler objeto %s"
+
+#: merge-ort.c:3185 merge-recursive.c:3011
+#, c-format
+msgid "object %s is not a blob"
+msgstr "objeto %s é blob nenhum"
+
+#: merge-ort.c:3613
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+
+#: merge-ort.c:3689
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
+msgstr ""
+
+#: merge-ort.c:3696
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed one "
+"of them so each can be recorded somewhere."
+msgstr ""
+
+#: merge-ort.c:3796 merge-recursive.c:3087
+msgid "content"
+msgstr "conteúdo"
+
+#: merge-ort.c:3798 merge-recursive.c:3091
+msgid "add/add"
+msgstr "adicionar/adicionar"
+
+#: merge-ort.c:3800 merge-recursive.c:3136
+msgid "submodule"
+msgstr "submódulo"
+
+#: merge-ort.c:3802 merge-recursive.c:3137
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLITO (%s): Conflito de junção em %s"
+
+#: merge-ort.c:3833
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"CONFLITO (modificar/apagar): %s apagado em %s e modificado em %s. Versão %s de %s "
+"deixada na árvore."
+
+#: merge-ort.c:4120
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+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:4487
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr ""
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3702
+#, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "  %s"
 msgstr ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas ao "
-"integrar:\n"
-"%%s"
+"Tuas alterações locais para os seguintes ficheiros seriam sobrescritas ao "
+"juntar:\n"
+"  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3436
-#, fuzzy, c-format
-msgid "Already up to date!"
-msgstr "Já está atualizado!"
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+msgid "Already up to date."
+msgstr "Já está atualizado."
 
-#: merge-recursive.c:356
+#: merge-recursive.c:352
 msgid "(bad commit)\n"
 msgstr "(commit incorreto)\n"
 
-#: merge-recursive.c:379
-#, fuzzy, c-format
+#: merge-recursive.c:375
+#, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "addinfo_cache falhou no caminho '%s'"
+msgstr "add_cacheinfo falhou para caminho '%s'; abortando junção."
 
-#: merge-recursive.c:388
-#, fuzzy, c-format
+#: merge-recursive.c:384
+#, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
-msgstr "addinfo_cache falhou no caminho '%s'"
+msgstr "add_cacheinfo falhou no refrescar para o caminho '%s'; abortando junção."
 
-#: merge-recursive.c:874
+#: merge-recursive.c:872
 #, c-format
 msgid "failed to create path '%s'%s"
-msgstr "falha ao criar o caminho '%s'%s"
+msgstr "falhou criar caminho '%s'%s"
 
-#: merge-recursive.c:885
+#: merge-recursive.c:883
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "A remover %s para criar espaço para o subdiretório\n"
 
-#: merge-recursive.c:899 merge-recursive.c:918
+#: merge-recursive.c:897 merge-recursive.c:916
 msgid ": perhaps a D/F conflict?"
 msgstr ": talvez um conflito D/F?"
 
-#: merge-recursive.c:908
+#: merge-recursive.c:906
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "recusando perder ficheiro untracked em '%s'"
 
-#: merge-recursive.c:949 builtin/cat-file.c:41
+#: merge-recursive.c:947 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "incapaz ler objeto %s '%s'"
 
-#: merge-recursive.c:954
+#: merge-recursive.c:952
 #, c-format
 msgid "blob expected for %s '%s'"
-msgstr "blob para %s '%s' esperado"
+msgstr ""
 
-#: merge-recursive.c:979
+#: merge-recursive.c:977
 #, c-format
 msgid "failed to open '%s': %s"
-msgstr "falha ao abrir '%s': %s"
+msgstr "falhou ao abrir '%s': %s"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:988
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "falha ao criar a ligação simbólica '%s': %s"
 
-#: merge-recursive.c:995
+#: merge-recursive.c:993
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "desconheço que fazer com %06o %s '%s'"
 
-#: merge-recursive.c:1191
-#, fuzzy, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Falha ao registar o submódulo '$sm_path'"
-
-#: merge-recursive.c:1198
-#, fuzzy, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Falha ao registar o submódulo '$sm_path'"
-
-#: merge-recursive.c:1205
-#, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr ""
-
-#: merge-recursive.c:1213 merge-recursive.c:1225
+#: merge-recursive.c:1223 merge-recursive.c:1235
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr ""
 
-#: merge-recursive.c:1216 merge-recursive.c:1228
-#, fuzzy, c-format
+#: merge-recursive.c:1226 merge-recursive.c:1238
+#, c-format
 msgid "Fast-forwarding submodule %s"
-msgstr "Avanço-rápido para $sha1"
+msgstr "Avançando submódulo %s"
 
-#: merge-recursive.c:1251
+#: merge-recursive.c:1261
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 
-#: merge-recursive.c:1255
-#, fuzzy, c-format
+#: merge-recursive.c:1265
+#, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
-msgstr "Falha ao registar o submódulo '$sm_path'"
-
-#: merge-recursive.c:1256
-msgid "Found a possible merge resolution for the submodule:\n"
 msgstr ""
 
-#: merge-recursive.c:1259
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
+#: merge-recursive.c:1266
+msgid "Found a possible merge resolution for the submodule:\n"
 msgstr ""
 
-#: merge-recursive.c:1268
+#: merge-recursive.c:1278
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr ""
 
-#: merge-recursive.c:1341
-msgid "Failed to execute internal merge"
-msgstr "Falha ao executar integração interna"
-
-#: merge-recursive.c:1346
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "Incapaz de adicionar %s à base de dados"
-
-#: merge-recursive.c:1378
+#: merge-recursive.c:1420
 #, c-format
-msgid "Auto-merging %s"
-msgstr "A integrar automaticamente %s"
-
-#: merge-recursive.c:1402
-#, fuzzy, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
-msgstr "Erro: Recusando perder ficheiro untracked de '%s'; escrevendo "
-"invés para %s"
+msgstr ""
+"Erro: Recusando perder ficheiro untracked de '%s'; escrevendo invés para %s"
 
-#: merge-recursive.c:1474
+#: merge-recursive.c:1492
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4814,7 +5094,7 @@ msgstr ""
 "CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
 "deixada na árvore."
 
-#: merge-recursive.c:1479
+#: merge-recursive.c:1497
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4823,7 +5103,7 @@ msgstr ""
 "CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s "
 "de %s deixada na árvore."
 
-#: merge-recursive.c:1486
+#: merge-recursive.c:1504
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4832,7 +5112,7 @@ msgstr ""
 "CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
 "deixada na árvore em %s."
 
-#: merge-recursive.c:1491
+#: merge-recursive.c:1509
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4841,44 +5121,43 @@ msgstr ""
 "CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s "
 "de %s deixada na árvore em %s."
 
-#: merge-recursive.c:1526
+#: merge-recursive.c:1544
 msgid "rename"
-msgstr "mudar nome"
+msgstr "renomear"
 
-#: merge-recursive.c:1526
+#: merge-recursive.c:1544
 msgid "renamed"
 msgstr "nome mudado"
 
-#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
-#, fuzzy, c-format
+#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Recusando perder ficheiro sujo de %s"
 
-#: merge-recursive.c:1587
-#, fuzzy, c-format
+#: merge-recursive.c:1605
+#, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
-msgstr "Recusando perder ficheiro untracked de %s, apesar de este estar "
-"no caminho."
+msgstr ""
+"Recusando perder ficheiro untracked de %s, apesar de este estar no caminho."
 
-#: merge-recursive.c:1645
-#, fuzzy, c-format
+#: merge-recursive.c:1663
+#, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
 "%s"
 
-#: merge-recursive.c:1676
+#: merge-recursive.c:1694
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s é um diretório em %s adicionando %s no seu lugar"
 
-#: merge-recursive.c:1681
-#, fuzzy, c-format
+#: merge-recursive.c:1699
+#, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
-msgstr "Recusando perder ficheiro untracked de %s; adicionado-o como %s "
-"invés"
+msgstr "Recusando perder ficheiro untracked de %s; adicionado-o como %s invés"
 
-#: merge-recursive.c:1708
+#: merge-recursive.c:1726
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -4887,18 +5166,18 @@ msgstr ""
 "CONFLITO (mudar nome/mudar nome): Mudar o nome \"%s\"->\"%s\" no ramo \"%s\" "
 "mudar o nome \"%s\"->\"%s\" em \"%s\"%s"
 
-#: merge-recursive.c:1713
+#: merge-recursive.c:1731
 msgid " (left unresolved)"
 msgstr " (por resolver)"
 
-#: merge-recursive.c:1805
+#: merge-recursive.c:1823
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
 "%s->%s em %s"
 
-#: merge-recursive.c:2068
+#: merge-recursive.c:2086
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4906,164 +5185,89 @@ msgid ""
 "getting a majority of the files."
 msgstr ""
 
-#: merge-recursive.c:2100
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
-"implicit directory rename(s) putting the following path(s) there: %s."
-msgstr ""
-
-#: merge-recursive.c:2110
+#: merge-recursive.c:2220
 #, c-format
 msgid ""
-"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
-"implicit directory renames tried to put these paths there: %s"
-msgstr ""
-
-#: merge-recursive.c:2202
-#, fuzzy, c-format
-msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
 ">%s in %s"
 msgstr ""
 "CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
 "%s->%s em %s"
 
-#: merge-recursive.c:2447
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-
-#: merge-recursive.c:2973
-#, c-format
-msgid "cannot read object %s"
-msgstr "incapaz ler objeto %s"
-
-#: merge-recursive.c:2976
-#, c-format
-msgid "object %s is not a blob"
-msgstr "objeto %s é blob nenhum"
-
-#: merge-recursive.c:3040
+#: merge-recursive.c:3075
 msgid "modify"
 msgstr "modificar"
 
-#: merge-recursive.c:3040
+#: merge-recursive.c:3075
 msgid "modified"
 msgstr "modificado"
 
-#: merge-recursive.c:3052
-msgid "content"
-msgstr "conteúdo"
-
-#: merge-recursive.c:3056
-msgid "add/add"
-msgstr "adicionar/adicionar"
-
-#: merge-recursive.c:3079
+#: merge-recursive.c:3114
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "%s ignorado (integrado é igual ao existente)"
 
-#: merge-recursive.c:3101
-msgid "submodule"
-msgstr "submódulo"
-
-#: merge-recursive.c:3102
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLITO (%s): conflito de integração em %s"
-
-#: merge-recursive.c:3132
+#: merge-recursive.c:3167
 #, c-format
 msgid "Adding as %s instead"
 msgstr "A adicionar como %s, em alternativa."
 
-#: merge-recursive.c:3215
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-
-#: merge-recursive.c:3218
-#, c-format
-msgid ""
-"CONFLICT (file location): %s added in %s inside a directory that was renamed "
-"in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-
-#: merge-recursive.c:3222
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-
-#: merge-recursive.c:3225
-#, c-format
-msgid ""
-"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
-"was renamed in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-
-#: merge-recursive.c:3339
+#: merge-recursive.c:3371
 #, c-format
 msgid "Removing %s"
-msgstr "A remover %s"
+msgstr "Removendo %s"
 
-#: merge-recursive.c:3362
+#: merge-recursive.c:3394
 msgid "file/directory"
 msgstr "ficheiro/diretório"
 
-#: merge-recursive.c:3367
+#: merge-recursive.c:3399
 msgid "directory/file"
 msgstr "diretório/ficheiro"
 
-#: merge-recursive.c:3374
+#: merge-recursive.c:3406
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "CONFLITO (%s): Há um diretório designado %s em %s. A adicionar %s como %s"
 
-#: merge-recursive.c:3383
+#: merge-recursive.c:3415
 #, c-format
 msgid "Adding %s"
 msgstr "A adicionar %s"
 
-#: merge-recursive.c:3392
-#, fuzzy, c-format
+#: merge-recursive.c:3424
+#, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
-msgstr "CONFLITO (%s): conflito de integração em %s"
+msgstr "CONFLITO (add/add): Conflito de junção em %s"
 
-#: merge-recursive.c:3445
+#: merge-recursive.c:3477
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "falha ao integrar as árvores %s e %s"
 
-#: merge-recursive.c:3550
+#: merge-recursive.c:3571
 msgid "Merging:"
 msgstr "A integrar:"
 
-#: merge-recursive.c:3563
+#: merge-recursive.c:3584
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "%u antecessor comum encontrado:"
 msgstr[1] "%u antecessores comuns encontrados:"
 
-#: merge-recursive.c:3613
+#: merge-recursive.c:3634
 msgid "merge returned no commit"
 msgstr "junção retornou commit nenhum"
 
-#: merge-recursive.c:3769
+#: merge-recursive.c:3799
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Incapaz de analisar objeto '%s'"
 
-#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895
+#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
+#: builtin/stash.c:473
 msgid "Unable to write index."
 msgstr "Incapaz de escrever no index."
 
@@ -5071,191 +5275,204 @@ msgstr "Incapaz de escrever no index."
 msgid "failed to read the cache"
 msgstr "falha ao ler a cache"
 
-#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917
-#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817
-#: builtin/stash.c:265
+#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
+#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
+#: builtin/stash.c:267
 msgid "unable to write new index file"
 msgstr "incapaz escrever novo ficheiro index"
 
-#: midx.c:80
+#: midx.c:74
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr ""
+
+#: midx.c:105
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr ""
 
-#: midx.c:96
+#: midx.c:121
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
 
-#: midx.c:101
+#: midx.c:126
 #, c-format
 msgid "multi-pack-index version %d not recognized"
-msgstr ""
+msgstr "versão %d de multi-pack-index irreconhecível"
 
-#: midx.c:106
+#: midx.c:131
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr ""
 
-#: midx.c:123
-msgid "invalid chunk offset (too large)"
-msgstr ""
-
-#: midx.c:147
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr ""
-
-#: midx.c:160
+#: midx.c:148
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr ""
 
-#: midx.c:162
+#: midx.c:150
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr ""
 
-#: midx.c:164
+#: midx.c:152
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr ""
 
-#: midx.c:166
+#: midx.c:154
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr ""
 
-#: midx.c:180
+#: midx.c:170
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 
-#: midx.c:223
+#: midx.c:214
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr ""
 
-#: midx.c:273
+#: midx.c:264
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 
-#: midx.c:480
-#, fuzzy, c-format
+#: midx.c:490
+#, c-format
 msgid "failed to add packfile '%s'"
-msgstr "falha ao ler o ficheiro de comando '%s'"
+msgstr ""
 
-#: midx.c:486
-#, fuzzy, c-format
+#: midx.c:496
+#, c-format
 msgid "failed to open pack-index '%s'"
-msgstr "falha ao abrir '%s'"
+msgstr ""
 
-#: midx.c:546
-#, fuzzy, c-format
+#: midx.c:564
+#, c-format
 msgid "failed to locate object %d in packfile"
-msgstr "Falha ao criar os ficheiros de saída"
+msgstr ""
+
+#: midx.c:880 builtin/index-pack.c:1533
+msgid "cannot store reverse index file"
+msgstr "incapaz guardar ficheiro de cenário reverso"
 
-#: midx.c:846
+#: midx.c:920
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "ignorando multi-pack-index existente; checksum diferente"
+
+#: midx.c:943
 msgid "Adding packfiles to multi-pack-index"
 msgstr ""
 
-#: midx.c:879
+#: midx.c:989
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr ""
 
-#: midx.c:931
-#, fuzzy
+#: midx.c:1034
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr ""
+
+#: midx.c:1039
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "pacote preferencial '%s' expirou"
+
+#: midx.c:1055
 msgid "no pack files to index."
 msgstr "pack files nenhuns para index."
 
-#: midx.c:982
-msgid "Writing chunks to multi-pack-index"
-msgstr ""
+#: midx.c:1135 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "falha ao remover %s"
 
-#: midx.c:1060
-#, fuzzy, c-format
+#: midx.c:1166
+#, c-format
 msgid "failed to clear multi-pack-index at %s"
-msgstr "falha ao limpar o índice"
+msgstr ""
 
-#: midx.c:1116
+#: midx.c:1225
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr ""
 
-#: midx.c:1124
+#: midx.c:1233
+msgid "incorrect checksum"
+msgstr "checksum incorreto"
+
+#: midx.c:1236
 msgid "Looking for referenced packfiles"
 msgstr ""
 
-#: midx.c:1139
+#: midx.c:1251
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 
-#: midx.c:1144
+#: midx.c:1256
 msgid "the midx contains no oid"
 msgstr ""
 
-#: midx.c:1153
+#: midx.c:1265
 msgid "Verifying OID order in multi-pack-index"
 msgstr ""
 
-#: midx.c:1162
+#: midx.c:1274
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr ""
 
-#: midx.c:1182
-#, fuzzy
+#: midx.c:1294
 msgid "Sorting objects by packfile"
-msgstr "A escrever objetos"
+msgstr ""
 
-#: midx.c:1189
-#, fuzzy
+#: midx.c:1301
 msgid "Verifying object offsets"
-msgstr "A escrever objetos"
+msgstr ""
 
-#: midx.c:1205
-#, fuzzy, c-format
+#: midx.c:1317
+#, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "falhou carregar entrada pack para oid[%d] = %s"
 
-#: midx.c:1211
-#, fuzzy, c-format
+#: midx.c:1323
+#, c-format
 msgid "failed to load pack-index for packfile %s"
-msgstr "falha ao ler o ficheiro de comando '%s'"
+msgstr ""
 
-#: midx.c:1220
+#: midx.c:1332
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr ""
 
-#: midx.c:1245
-#, fuzzy
+#: midx.c:1357
 msgid "Counting referenced objects"
 msgstr "Contando objetos referenciados"
 
-#: midx.c:1255
+#: midx.c:1367
 msgid "Finding and deleting unreferenced packfiles"
 msgstr ""
 
-#: midx.c:1446
-#, fuzzy
+#: midx.c:1558
 msgid "could not start pack-objects"
 msgstr "incapaz de começar pack-objects"
 
-#: midx.c:1466
-#, fuzzy
+#: midx.c:1578
 msgid "could not finish pack-objects"
 msgstr "incapaz de terminar pack-objects"
 
-#: name-hash.c:537
-#, fuzzy, c-format
+#: name-hash.c:542
+#, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "incapaz criar thread lazy_dir: %s"
 
-#: name-hash.c:559
-#, fuzzy, c-format
+#: name-hash.c:564
+#, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "incapaz criar thread lazy_name: %s"
 
-#: name-hash.c:565
-#, fuzzy, c-format
+#: name-hash.c:570
+#, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "incapaz juntar a thread lazy_name: %s"
 
@@ -5268,7 +5485,8 @@ msgid ""
 msgstr ""
 "Ficou por concluír a anterior junção de notas (%s existe).\n"
 "Por favor, usa 'git notes merge --commit' ou 'git notes merge --abort' para "
-"commitar/abortar a junção anterior antes de começares uma nova junção de notas."
+"commitar/abortar a junção anterior antes de começares uma nova junção de "
+"notas."
 
 #: notes-merge.c:284
 #, c-format
@@ -5277,7 +5495,8 @@ msgstr "Ficou por concluír a tua junção de notas (%s existe)."
 
 #: notes-utils.c:46
 msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "Impossível commit notas de árvore que estejam por iniciar/por referênciar"
+msgstr ""
+"Impossível commit notas de árvore que estejam por iniciar/por referênciar"
 
 #: notes-utils.c:105
 #, c-format
@@ -5298,59 +5517,462 @@ msgstr "Reescrita de notas em %s (fora de refs/notes/) recusada"
 msgid "Bad %s value: '%s'"
 msgstr "Valor incorreto de %s: '%s'"
 
+#: object-file.c:526
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+
+#: object-file.c:584
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "incapaz normalizar path de objeto alternativo: %s"
+
+#: object-file.c:658
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+
+#: object-file.c:665
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "incapaz normalizar pasta de objeto: %s"
+
+#: object-file.c:708
+msgid "unable to fdopen alternates lockfile"
+msgstr "incapaz de fdopen lockfile alternativo"
+
+#: object-file.c:726
+msgid "unable to read alternates file"
+msgstr "incapaz ler ficheiro alternativo"
+
+#: object-file.c:733
+msgid "unable to move new alternates file into place"
+msgstr "incapaz mover novo ficheiro alternativo para o sítio"
+
+#: object-file.c:768
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "caminho '%s' é inexistente"
+
+#: object-file.c:789
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"repositório referência '%s' como uma checkout ligada ainda é insustentado."
+
+#: object-file.c:795
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "repositório referência '%s' é repositório local nenhum."
+
+#: object-file.c:801
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "o repositório de referência '%s' é raso"
+
+#: object-file.c:809
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "repositório de referência '%s' está enxertado"
+
+#: object-file.c:869
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr ""
+
+#: object-file.c:1019
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr ""
+
+#: object-file.c:1054
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap falhou%s"
+
+#: object-file.c:1218
+#, c-format
+msgid "object file %s is empty"
+msgstr ""
+
+#: object-file.c:1353 object-file.c:2548
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "objeto solto '%s' corrupto"
+
+#: object-file.c:1355 object-file.c:2552
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "lixo no fim de objeto solto '%s'"
+
+#: object-file.c:1397
+msgid "invalid object type"
+msgstr "tipo de objeto inválido"
+
+#: object-file.c:1481
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr ""
+
+#: object-file.c:1484
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "incapaz desempacotar cabeçalho %s"
+
+#: object-file.c:1490
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr ""
+
+#: object-file.c:1493
+#, c-format
+msgid "unable to parse %s header"
+msgstr "incapaz processar cabeçalho %s"
+
+#: object-file.c:1717
+#, c-format
+msgid "failed to read object %s"
+msgstr "falhou ler objeto %s"
+
+#: object-file.c:1721
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "%s substituto, por encontrar para %s"
+
+#: object-file.c:1725
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr ""
+
+#: object-file.c:1729
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr ""
+
+#: object-file.c:1834
+#, c-format
+msgid "unable to write file %s"
+msgstr "incapaz escrever ficheiro %s"
+
+#: object-file.c:1841
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "incapaz definir permissão para '%s'"
+
+#: object-file.c:1848
+msgid "file write error"
+msgstr ""
+
+#: object-file.c:1868
+msgid "error when closing loose object file"
+msgstr ""
+
+#: object-file.c:1933
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+
+#: object-file.c:1935
+msgid "unable to create temporary file"
+msgstr "incapaz criar ficheiro temporário"
+
+#: object-file.c:1959
+msgid "unable to write loose object file"
+msgstr "incapaz escrever ficheiro objeto solto"
+
+#: object-file.c:1965
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "incapaz esvaziar objeto novo %s (%d)"
+
+#: object-file.c:1969
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd em objeto %s falhou (%d)"
+
+#: object-file.c:1973
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr ""
+
+#: object-file.c:1983 builtin/pack-objects.c:1237
+#, c-format
+msgid "failed utime() on %s"
+msgstr ""
+
+#: object-file.c:2060
+#, c-format
+msgid "cannot read object for %s"
+msgstr "incapaz ler objeto para %s"
+
+#: object-file.c:2111
+msgid "corrupt commit"
+msgstr "memória de Git rota"
+
+#: object-file.c:2119
+msgid "corrupt tag"
+msgstr "etiqueta rota"
+
+#: object-file.c:2219
+#, c-format
+msgid "read error while indexing %s"
+msgstr ""
+
+#: object-file.c:2222
+#, c-format
+msgid "short read while indexing %s"
+msgstr "leitura curta enquanto indexando %s"
+
+#: object-file.c:2295 object-file.c:2305
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: falhou inserir na base de dados"
+
+#: object-file.c:2311
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: tipo ficheiro insustentado"
+
+#: object-file.c:2335
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s é objeto inválido"
+
+#: object-file.c:2337
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s é um objeto inválido '%s'"
+
+#: object-file.c:2364 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "incapaz abrir %s"
+
+#: object-file.c:2559 object-file.c:2612
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr ""
+
+#: object-file.c:2583
+#, c-format
+msgid "unable to mmap %s"
+msgstr "incapaz mmap %s"
+
+#: object-file.c:2588
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "incapaz desempacotar cabeçalho de %s"
+
+#: object-file.c:2594
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "incapaz processar cabeçalho de %s"
+
+#: object-file.c:2605
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "incapaz desempacotar conteúdo de %s"
+
+#: object-name.c:480
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "SHA1 curto %s é ambíguo"
+
+#: object-name.c:491
+msgid "The candidates are:"
+msgstr "Os candidatos são:"
+
+#: object-name.c:790
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Normalmente o Git nunca cria refs que terminem em 40 caracteres\n"
+"hexadecimais, porque será ignorada quando apenas se indica 40-hex.\n"
+"Poderam-se criar estas refs por engano. Como no exemplo,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"onde \"$br\" fica vazio e uma ref de 40-hex é criada. Por favor\n"
+"examine estas refs e talvez apague-as. Desative esta mensagem\n"
+"executando \"git config advice.objectNameWarning false\""
+
+#: object-name.c:910
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr ""
+
+#: object-name.c:918
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr ""
+
+#: object-name.c:1696
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "caminho '%s' existe em disco, mas é inexistente em '%.*s'"
+
+#: object-name.c:1702
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+
+#: object-name.c:1711
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "caminho '%s' é inexistente em '%.*s'"
+
+#: object-name.c:1739
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+
+#: object-name.c:1755
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+msgstr ""
+
+#: object-name.c:1763
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr ""
+
+#: object-name.c:1765
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "caminho '%s' é inexistente (quer no disco quer no index)"
+
+#: object-name.c:1778
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+"Os caminhos relativos só podem ser usados a partir do topo da árvore de "
+"trabalho"
+
+#: object-name.c:1916
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nome de objeto inválido: '%.*s'."
+
 #: object.c:53
-#, fuzzy, c-format
+#, c-format
 msgid "invalid object type \"%s\""
-msgstr "objeto blob inválido %s"
+msgstr "tipo de objeto inválido \"%s\""
 
 #: object.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "objeto %s é %s, é %s nenhum(a)"
 
-#: object.c:233
-#, fuzzy, c-format
+#: object.c:250
+#, c-format
 msgid "object %s has unknown type id %d"
-msgstr "objeto de tipo desconhecido"
+msgstr ""
 
-#: object.c:246
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "incapaz analisar objeto: %s"
 
-#: object.c:266 object.c:278
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr ""
 
-#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216
-#, fuzzy, c-format
+#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#, c-format
 msgid "unable to get size of %s"
 msgstr "incapaz obter tamanho de %s"
 
-#: packfile.c:615
+#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "incapaz obter utilização em disco de %s"
+
+#: pack-revindex.c:221
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr ""
+
+#: pack-revindex.c:226
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr ""
+
+#: pack-revindex.c:234
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr ""
+
+#: pack-revindex.c:238
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr ""
+
+#: pack-revindex.c:243
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr ""
+
+#: pack-write.c:250
+msgid "cannot both write and verify reverse index"
+msgstr "incapaz escrever e também verificar cenário reverso"
+
+#: pack-write.c:271
+#, c-format
+msgid "could not stat: %s"
+msgstr "incapaz stat: %s"
+
+#: pack-write.c:283
+#, c-format
+msgid "failed to make %s readable"
+msgstr "falhou fazer %s legível"
+
+#: pack-write.c:522
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "incapaz escrever ficheiro promissor '%s'"
+
+#: packfile.c:625
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)"
 
-#: packfile.c:1907
+#: packfile.c:655
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "ficheiro-pacote %s incapaz ser mapeado%s"
+
+#: packfile.c:1934
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "offset antes do início do índice do pacote %s (índice corrompido?)"
 
-#: packfile.c:1911
+#: packfile.c:1938
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "offset depois do fim do índice do pacote %s (índice truncado?)"
 
 #: parse-options-cb.c:20 parse-options-cb.c:24
-#, fuzzy, c-format
+#, c-format
 msgid "option `%s' expects a numerical value"
-msgstr "a opção '%c' espera um valor numérico"
+msgstr ""
 
 #: parse-options-cb.c:41
-#, fuzzy, c-format
+#, c-format
 msgid "malformed expiration date '%s'"
-msgstr "folha de opções malformada: '%s'"
+msgstr "data de prazo de validade malformada '%s'"
 
 #: parse-options-cb.c:54
 #, c-format
@@ -5363,27 +5985,27 @@ msgid "malformed object name '%s'"
 msgstr "nome do objeto malformado '%s'"
 
 #: parse-options.c:38
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires a value"
-msgstr "a opção '%s' requer um valor"
+msgstr "%s exige um valor"
 
 #: parse-options.c:73
-#, fuzzy, c-format
+#, c-format
 msgid "%s is incompatible with %s"
-msgstr "--long é incompatível com --abbrev=0"
+msgstr "%s é incompatível com %s"
 
 #: parse-options.c:78
-#, fuzzy, c-format
+#, c-format
 msgid "%s : incompatible with something else"
-msgstr "--dirty é incompatível com commits ou semelhantes"
+msgstr ""
 
 #: parse-options.c:92 parse-options.c:96 parse-options.c:317
-#, fuzzy, c-format
+#, c-format
 msgid "%s takes no value"
-msgstr "%s tem múltiplos valores"
+msgstr "%s leva valor nenhum"
 
 #: parse-options.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "%s isn't available"
 msgstr "%s está indisponível"
 
@@ -5402,31 +6024,31 @@ msgstr ""
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr ""
 
-#: parse-options.c:666 parse-options.c:971
+#: parse-options.c:668 parse-options.c:988
 #, c-format
 msgid "alias of --%s"
 msgstr ""
 
-#: parse-options.c:862
-#, fuzzy, c-format
+#: parse-options.c:879
+#, c-format
 msgid "unknown option `%s'"
-msgstr "opção desconhecido %s"
+msgstr ""
 
-#: parse-options.c:864
-#, fuzzy, c-format
+#: parse-options.c:881
+#, c-format
 msgid "unknown switch `%c'"
-msgstr "opção desconhecido %s"
+msgstr ""
 
-#: parse-options.c:866
-#, fuzzy, c-format
+#: parse-options.c:883
+#, c-format
 msgid "unknown non-ascii option in string: `%s'"
-msgstr "Definidição --confirm desconhecida: '%s'"
+msgstr "opção não-ascii desconhecida em string: `%s'"
 
-#: parse-options.c:890
+#: parse-options.c:907
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:909
+#: parse-options.c:926
 #, c-format
 msgid "usage: %s"
 msgstr "utilização: %s"
@@ -5434,17 +6056,17 @@ msgstr "utilização: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:915
+#: parse-options.c:932
 #, c-format
 msgid "   or: %s"
 msgstr "        ou: %s"
 
-#: parse-options.c:918
+#: parse-options.c:935
 #, c-format
 msgid "    %s"
 msgstr "         %s"
 
-#: parse-options.c:957
+#: parse-options.c:974
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -5453,30 +6075,30 @@ msgstr "-NUM"
 msgid "Could not make %s writable by group"
 msgstr "Incapaz de fazer %s escrevível ao grupo"
 
-#: pathspec.c:130
+#: pathspec.c:151
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "Carácter de escape '\\' é proíbido como último carácter no valor attr"
 
-#: pathspec.c:148
+#: pathspec.c:169
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Só se pode especificar um 'attr:'."
 
-#: pathspec.c:151
+#: pathspec.c:172
 msgid "attr spec must not be empty"
 msgstr "attr spec tem de ter algum conteúdo"
 
-#: pathspec.c:194
+#: pathspec.c:215
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nome de atributo inválido %s"
 
-#: pathspec.c:259
+#: pathspec.c:280
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "as definições globais 'glob' e 'noglob' de especificador de caminho "
 "(pathspec) são incompatíveis"
 
-#: pathspec.c:266
+#: pathspec.c:287
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -5484,236 +6106,231 @@ msgstr ""
 "a definição global de especificador de caminho 'literal' é incompatível com "
 "todas as outras definições globais de especificador de caminho (pathspec)"
 
-#: pathspec.c:306
+#: pathspec.c:327
 msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho"
+msgstr "parâmetro inválido para magia de espetro-caminho 'prefix'"
 
-#: pathspec.c:327
+#: pathspec.c:348
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Mágica do especificador de caminho '%.*s' inválida em '%s'"
 
-#: pathspec.c:332
+#: pathspec.c:353
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "Falta um ')' no final da mágica do especificador de caminho em '%s'"
 
-#: pathspec.c:370
+#: pathspec.c:391
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Por implementar, magic pathspec '%c' em '%s'"
 
-#: pathspec.c:429
+#: pathspec.c:450
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: 'literal' e 'glob' são incompatíveis"
 
-#: pathspec.c:445
-#, fuzzy, c-format
+#: pathspec.c:466
+#, c-format
 msgid "%s: '%s' is outside repository at '%s'"
-msgstr "%s: '%s' está fora do repositório"
+msgstr "%s: '%s' está fora do repositório em '%s'"
 
-#: pathspec.c:521
+#: pathspec.c:542
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (mnemónica: '%c')"
 
-#: pathspec.c:531
+#: pathspec.c:552
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: magic pathspec insustentado por este comando: %s"
 
-#: pathspec.c:598
+#: pathspec.c:619
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "o especificador de caminho '%s' é indicado por uma ligação simbólica"
 
-#: pathspec.c:643
+#: pathspec.c:664
 #, c-format
 msgid "line is badly quoted: %s"
 msgstr ""
 
 #: pkt-line.c:92
-#, fuzzy
 msgid "unable to write flush packet"
 msgstr "incapaz escrever pacote flush"
 
 #: pkt-line.c:99
-#, fuzzy
 msgid "unable to write delim packet"
 msgstr "incapaz escrever pacote delim"
 
 #: pkt-line.c:106
-#, fuzzy
-msgid "unable to write stateless separator packet"
-msgstr "incapaz escrever pacote de separador sem estado"
+msgid "unable to write response end packet"
+msgstr "incapaz escrever pacote fim de resposta"
 
 #: pkt-line.c:113
-#, fuzzy
 msgid "flush packet write failed"
 msgstr "escrita de pacote flush falhou"
 
-#: pkt-line.c:153 pkt-line.c:239
+#: pkt-line.c:153 pkt-line.c:265
 msgid "protocol error: impossibly long line"
 msgstr ""
 
 #: pkt-line.c:169 pkt-line.c:171
-#, fuzzy
 msgid "packet write with format failed"
 msgstr "escrita de pacote com formato falhou"
 
-#: pkt-line.c:203
+#: pkt-line.c:204
 msgid "packet write failed - data exceeds max packet size"
 msgstr ""
 
-#: pkt-line.c:210 pkt-line.c:217
-#, fuzzy
-msgid "packet write failed"
-msgstr "escrita de pacote falhou"
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
+msgstr "escrita de pacote falhou: %s"
 
-#: pkt-line.c:302
-#, fuzzy
+#: pkt-line.c:328 pkt-line.c:329
 msgid "read error"
-msgstr "erro do programa"
+msgstr "erro de leitura"
 
-#: pkt-line.c:310
-#, fuzzy
+#: pkt-line.c:339 pkt-line.c:340
 msgid "the remote end hung up unexpectedly"
-msgstr "O remoto desligou após contacto inicial"
+msgstr "o lado remoto desligou inesperadamente"
 
-#: pkt-line.c:338
-#, fuzzy, c-format
+#: pkt-line.c:369 pkt-line.c:371
+#, c-format
 msgid "protocol error: bad line length character: %.4s"
-msgstr "erro de protocolo: cabeçalho de pacote incorreto"
+msgstr ""
 
-#: pkt-line.c:352 pkt-line.c:357
-#, fuzzy, c-format
+#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#, c-format
 msgid "protocol error: bad line length %d"
-msgstr "erro de protocolo: cabeçalho de pacote incorreto"
+msgstr ""
 
-#: pkt-line.c:373 sideband.c:165
+#: pkt-line.c:413 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "erro remoto: %s"
 
-#: preload-index.c:119
-#, fuzzy
+#: preload-index.c:125
 msgid "Refreshing index"
 msgstr "Refrescando index"
 
-#: preload-index.c:138
-#, fuzzy, c-format
+#: preload-index.c:144
+#, c-format
 msgid "unable to create threaded lstat: %s"
 msgstr "incapaz criar thread de lstat: %s"
 
-#: pretty.c:983
+#: pretty.c:988
 msgid "unable to parse --pretty format"
-msgstr "incapaz analisar formato de --pretty"
+msgstr "incapaz processar formato de --pretty"
 
-#: promisor-remote.c:30
+#: promisor-remote.c:31
 msgid "promisor-remote: unable to fork off fetch subprocess"
 msgstr ""
 
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
 msgid "promisor-remote: could not write to fetch subprocess"
 msgstr ""
 
-#: promisor-remote.c:41
+#: promisor-remote.c:44
 msgid "promisor-remote: could not close stdin to fetch subprocess"
 msgstr ""
 
-#: promisor-remote.c:53
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr ""
 
+#: protocol-caps.c:103
+msgid "object-info: expected flush after arguments"
+msgstr ""
+
 #: prune-packed.c:35
 msgid "Removing duplicate objects"
 msgstr "A remover objetos duplicados"
 
-#: range-diff.c:77
-#, fuzzy
+#: range-diff.c:78
 msgid "could not start `log`"
 msgstr "incapaz começar `log`"
 
-#: range-diff.c:79
-#, fuzzy
+#: range-diff.c:80
 msgid "could not read `log` output"
 msgstr "incapaz ler output de `log`"
 
-#: range-diff.c:98 sequencer.c:5310
-#, fuzzy, c-format
+#: range-diff.c:101 sequencer.c:5550
+#, c-format
 msgid "could not parse commit '%s'"
 msgstr "incapaz analisar commit '%s'"
 
-#: range-diff.c:112
+#: range-diff.c:115
 #, c-format
 msgid ""
 "could not parse first line of `log` output: did not start with 'commit ': "
 "'%s'"
 msgstr ""
 
-#: range-diff.c:137
-#, fuzzy, c-format
+#: range-diff.c:140
+#, c-format
 msgid "could not parse git header '%.*s'"
-msgstr "incapaz analisar cabeçalho git '%.*s'"
+msgstr "incapaz processar cabeçalho git '%.*s'"
 
-#: range-diff.c:299
-#, fuzzy
+#: range-diff.c:307
 msgid "failed to generate diff"
-msgstr "falha ao criar o ficheiro %s"
+msgstr ""
 
-#: range-diff.c:532 range-diff.c:534
-#, fuzzy, c-format
+#: 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 "incapaz analisar log para '%s'"
+msgstr "incapaz processar registo para '%s'"
 
-#: read-cache.c:682
-#, fuzzy, c-format
+#: read-cache.c:710
+#, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
-msgstr "%s: já existe no índice"
+msgstr "Adicionarei nenhuma alias de ficheiro '%s' ('%s' já existe em cenário)"
 
-#: read-cache.c:698
-#, fuzzy
+#: read-cache.c:726
 msgid "cannot create an empty blob in the object database"
-msgstr "escrever o objeto na base de dados de objetos"
+msgstr ""
 
-#: read-cache.c:720
+#: read-cache.c:748
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 
-#: read-cache.c:725
-#, fuzzy, c-format
+#: read-cache.c:753
+#, c-format
 msgid "'%s' does not have a commit checked out"
-msgstr "'%s' tem commit checked out nenhum"
+msgstr "'%s' tem memória nenhuma em observação"
 
-#: read-cache.c:777
-#, fuzzy, c-format
+#: read-cache.c:805
+#, c-format
 msgid "unable to index file '%s'"
 msgstr "incapaz indexar ficheiro '%s'"
 
-#: read-cache.c:796
-#, fuzzy, c-format
+#: read-cache.c:824
+#, c-format
 msgid "unable to add '%s' to index"
 msgstr "incapaz adicionar %s a index"
 
-#: read-cache.c:807
-#, fuzzy, c-format
+#: read-cache.c:835
+#, c-format
 msgid "unable to stat '%s'"
 msgstr "incapaz obter estatutário de '%s'"
 
-#: read-cache.c:1318
-#, fuzzy, c-format
+#: read-cache.c:1358
+#, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' aparece ambo como ficheiro e como pasta"
 
-#: read-cache.c:1524
-#, fuzzy
+#: read-cache.c:1573
 msgid "Refresh index"
 msgstr "Refresca index"
 
-#: read-cache.c:1639
+#: read-cache.c:1705
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -5722,7 +6339,7 @@ msgstr ""
 "index.version definido, mas com valor inválido.\n"
 "A usar a versão %i"
 
-#: read-cache.c:1649
+#: read-cache.c:1715
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -5731,164 +6348,165 @@ msgstr ""
 "GIT_INDEX_VERSION definido, mas com valor inválido.\n"
 "A usar a versão %i"
 
-#: read-cache.c:1705
-#, fuzzy, c-format
+#: read-cache.c:1771
+#, c-format
 msgid "bad signature 0x%08x"
-msgstr "adicionar uma assinatura"
+msgstr ""
 
-#: read-cache.c:1708
-#, fuzzy, c-format
+#: read-cache.c:1774
+#, c-format
 msgid "bad index version %d"
-msgstr "versão de índice '%s' incorreta"
+msgstr "versão de cenário %d inválida"
 
-#: read-cache.c:1717
-#, fuzzy
+#: read-cache.c:1783
 msgid "bad index file sha1 signature"
-msgstr "adicionar uma assinatura"
+msgstr ""
 
-#: read-cache.c:1747
+#: read-cache.c:1817
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr ""
 
-#: read-cache.c:1749
-#, fuzzy, c-format
+#: read-cache.c:1819
+#, c-format
 msgid "ignoring %.4s extension"
-msgstr "modelo %s ignorado"
+msgstr "ignorando extensão %.4s"
 
-#: read-cache.c:1786
-#, fuzzy, c-format
+#: read-cache.c:1856
+#, c-format
 msgid "unknown index entry format 0x%08x"
-msgstr "formato de %.*s desconhecido %s"
+msgstr "formato de entrada de cenário desconhecido 0x%08x"
 
-#: read-cache.c:1802
+#: read-cache.c:1872
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr ""
 
-#: read-cache.c:1859
+#: read-cache.c:1929
 msgid "unordered stage entries in index"
 msgstr ""
 
-#: read-cache.c:1862
-#, fuzzy, c-format
+#: read-cache.c:1932
+#, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "multíplas entradas de estágio para ficheiro juntado '%s'"
 
-#: read-cache.c:1865
-#, fuzzy, c-format
+#: read-cache.c:1935
+#, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "entradas de estágio desordenadas para '%s'"
 
-#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111
-#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181
-#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991
-#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290
-#: builtin/submodule--helper.c:332
+#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
+#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
+#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
+#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
+#: builtin/submodule--helper.c:333
 msgid "index file corrupt"
-msgstr "ficheiro de índice corrompido"
+msgstr ""
 
-#: read-cache.c:2115
-#, fuzzy, c-format
+#: read-cache.c:2185
+#, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "incapaz criar thread load_cache_entries: %s"
 
-#: read-cache.c:2128
-#, fuzzy, c-format
+#: read-cache.c:2198
+#, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "incapaz juntar a thread load_cache_entries: %s"
 
-#: read-cache.c:2161
-#, fuzzy, c-format
+#: read-cache.c:2231
+#, c-format
 msgid "%s: index file open failed"
-msgstr "falha ao adicionar ficheiros"
+msgstr "%s: abertura de ficheiro de cenário falhou"
 
-#: read-cache.c:2165
-#, fuzzy, c-format
+#: read-cache.c:2235
+#, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: incapaz obter estatutário de index aberto"
 
-#: read-cache.c:2169
+#: read-cache.c:2239
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr ""
 
-#: read-cache.c:2173
-#, fuzzy, c-format
-msgid "%s: unable to map index file"
-msgstr "%s: incapaz mapear ficheiro index"
+#: read-cache.c:2243
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr "%s: incapaz mapear ficheiro index%s"
 
-#: read-cache.c:2215
-#, fuzzy, c-format
+#: read-cache.c:2286
+#, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "incapaz criar thread load_index_extensions: %s"
 
-#: read-cache.c:2242
-#, fuzzy, c-format
+#: read-cache.c:2313
+#, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "incapaz juntar a thread load_index_extensions: %s"
 
-#: read-cache.c:2274
-#, fuzzy, c-format
+#: read-cache.c:2351
+#, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "incapaz refrescar index partilhado '%s'"
 
-#: read-cache.c:2321
+#: read-cache.c:2398
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr ""
 
-#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140
+#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
 #, c-format
 msgid "could not close '%s'"
 msgstr "incapaz fechar '%s'"
 
-#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231
-#, fuzzy, c-format
+#: read-cache.c:3075
+msgid "failed to convert to a sparse-index"
+msgstr ""
+
+#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#, c-format
 msgid "could not stat '%s'"
 msgstr "incapaz obter estatutário '%s'"
 
-#: read-cache.c:3133
+#: read-cache.c:3159
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "incapaz abrir pasta git: %s"
 
-#: read-cache.c:3145
+#: read-cache.c:3171
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "incapaz deslinkar: %s"
 
-#: read-cache.c:3170
-#, fuzzy, c-format
+#: read-cache.c:3200
+#, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "incapaz arranjar bits de permissão em '%s'"
 
-#: read-cache.c:3319
-#, fuzzy, c-format
+#: read-cache.c:3349
+#, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: incapaz baixar para estágio #0"
 
 #: rebase-interactive.c:11
-#, fuzzy
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 "continue'.\n"
 "Or you can abort the rebase with 'git rebase --abort'.\n"
 msgstr ""
-"Pode corrí-lo com 'git rebase --edit-todo' e depois executar 'git rebase --"
-"continue'.\n"
+"Podes consertar isto com 'git rebase --edit-todo' e depois executar 'git "
+"rebase --continue'.\n"
+"Ou podes abortar o rebase com 'git rebase --abort'.\n"
 
 #: rebase-interactive.c:33
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
-"Definição $check_level desconhecida da opção rebase.missingCommitsCheck. "
-"Ignorado."
+"definição %s desconhecida da opção rebase.missingCommitsCheck. Ignorando."
 
 #: rebase-interactive.c:42
-#, fuzzy
 msgid ""
 "\n"
 "Commands:\n"
@@ -5896,7 +6514,10 @@ msgid ""
 "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"
+"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n"
+"                   commit's log message, unless -C is used, in which case\n"
+"                   keep only this commit's message; -c is same as -C but\n"
+"                   opens the editor\n"
 "x, exec <command> = run command (the rest of the line) using shell\n"
 "b, break = stop here (continue rebase later with 'git rebase --continue')\n"
 "d, drop <commit> = remove commit\n"
@@ -5905,30 +6526,41 @@ msgid ""
 "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"
+".       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"
 "Comandos:\n"
-" p, pick = usar commit\n"
-" r, reword = usar commit, mas editar a mensagem de commit\n"
-" e, edit = usar commit, mas parar para emendar\n"
-" s, squash = usar commit, mas fundir com o commit anterior\n"
-" f, fixup = como \"squash\", mas descartar a mensagem deste commit\n"
-" x, exec = executar o comando (o resto da linha) usando a shell\n"
-" d, drop = remover commit\n"
+"p, pick <memória> = usar memória\n"
+"r, reword <memória> = usar memória, mas editar a mensagem de memória\n"
+"e, edit <memória> = usar memória, mas parar para emendar\n"
+"s, squash <memória> = usar memória, mas fundir com a memória anterior\n"
+"f, fixup [-C | -c] <memória> = como \"squash\", mas mantém apenas the\n"
+"                   mensagem anterior de registo da memória, a menos que\n"
+"                   -C seja usada, em que neste caso mantém apenas a mensagem\n"
+"                   desta memória; -c é o mesmo que -C mas abre o editor\n"
+"x, exec <comando> = executar o comando (o resto da linha) usando a shell\n"
+"b, break = para aqui (continuar rebase mais tarde com 'git rebase --continue')"
+"d, drop <memória> = remover memória\n"
+"l, label <etiqueta> = etiquetar HEAD atual com um nome\n"
+"t, reset <etiqueta> = restabelecer HEAD a uma etiqueta\n"
+"n, merge [-C <memória> | -c <memória>] <etiqueta> [# <oneline>]\n"
+".       criar uma memória de junção usando a mensagem de memória\n"
+".       original (ou oneline, se nenhuma memória de junção foi\n"
+".       especificada); usa -c <memória> para refrasear a mensagem\n"
+".       de memória\n"
 "\n"
 "Estas linhas pode ser reordenadas; são executadas de cima para baixo.\n"
 
-#: rebase-interactive.c:63
-#, fuzzy, c-format
+#: rebase-interactive.c:66
+#, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
-msgstr[0] "Rebase $shortrevisions sobre $shortonto ($todocount comando)"
-msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)"
+msgstr[0] "Rebasear %s sobre %s (%d comando)"
+msgstr[1] "Rebasear %s sobre %s (%d comandos)"
 
-#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -5936,7 +6568,7 @@ msgstr ""
 "\n"
 "Remove linha nenhuma. Usa explicitamente 'drop' para remover um commit.\n"
 
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -5944,7 +6576,7 @@ msgstr ""
 "\n"
 "Se remover uma linha daqui AQUELE COMMIT SER� PERDIDO.\n"
 
-#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -5958,7 +6590,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -5968,20 +6600,20 @@ msgstr ""
 "No entanto, se remover tudo, o rebase será abortado.\n"
 "\n"
 
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607
-#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270
-#, fuzzy, c-format
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836
+#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#, c-format
 msgid "could not write '%s'"
 msgstr "incapaz escrever '%s'"
 
-#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228
-#: builtin/rebase.c:252
-#, fuzzy, c-format
+#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
+#: builtin/rebase.c:253
+#, c-format
 msgid "could not write '%s'."
 msgstr "incapaz escrever '%s'."
 
-#: rebase-interactive.c:193
-#, fuzzy, c-format
+#: rebase-interactive.c:196
+#, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):\n"
@@ -5989,8 +6621,8 @@ msgstr ""
 "Aviso: alguns commits podem ter sido descartados acidentalmente.\n"
 "Commits descartados (mais novo para o mais velho):\n"
 
-#: rebase-interactive.c:200
-#, fuzzy, c-format
+#: rebase-interactive.c:203
+#, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
 "\n"
@@ -6006,14 +6638,14 @@ msgstr ""
 "O comportamentos possíveis são: ignore, warn, error.\n"
 "\n"
 
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394
-#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239
-#: builtin/rebase.c:264
+#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
+#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
+#: builtin/rebase.c:265
 #, c-format
 msgid "could not read '%s'."
 msgstr "incapaz ler '%s'."
 
-#: ref-filter.c:42 wt-status.c:1973
+#: ref-filter.c:42 wt-status.c:2036
 msgid "gone"
 msgstr "desapareceu"
 
@@ -6032,302 +6664,331 @@ msgstr "atrás %d"
 msgid "ahead %d, behind %d"
 msgstr "à frente %d, atrás %d"
 
-#: ref-filter.c:169
+#: ref-filter.c:230
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "formato esperado: %%(color:<cor>)"
 
-#: ref-filter.c:171
+#: ref-filter.c:232
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "cor desconhecida: %%(color:%s)"
 
-#: ref-filter.c:193
+#: ref-filter.c:254
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "valor inteiro esperado refname:lstrip=%s"
 
-#: ref-filter.c:197
+#: ref-filter.c:258
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Valor inteiro esperado refname:rstrip=%s"
 
-#: ref-filter.c:199
+#: ref-filter.c:260
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "argumento %%(%s) desconhecido: %s"
 
-#: ref-filter.c:254
-#, fuzzy, c-format
+#: ref-filter.c:315
+#, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) leva argumentos nenhuns"
 
-#: ref-filter.c:276
-#, fuzzy, c-format
+#: ref-filter.c:339
+#, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "argumento %%(objectsize) desconhecido: %s"
 
-#: ref-filter.c:284
-#, fuzzy, c-format
+#: ref-filter.c:347
+#, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) leva argumentos nenhuns"
 
-#: ref-filter.c:296
+#: ref-filter.c:359
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) leva argumentos nenhuns"
 
-#: ref-filter.c:309
-#, fuzzy, c-format
+#: ref-filter.c:372
+#, c-format
 msgid "unrecognized %%(subject) argument: %s"
 msgstr "argumento %%(subject) desconhecido: %s"
 
-#: ref-filter.c:330
-#, fuzzy, c-format
+#: ref-filter.c:391
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr ""
+
+#: ref-filter.c:393
+#, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "argumento %%(trailers) desconhecido: %s"
 
-#: ref-filter.c:363
+#: ref-filter.c:424
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valor positivo esperado contents:lines=%s"
 
-#: ref-filter.c:365
+#: ref-filter.c:426
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "argumento %%(contents) desconhecido: %s"
 
-#: ref-filter.c:380
-#, fuzzy, c-format
+#: ref-filter.c:441
+#, c-format
 msgid "positive value expected '%s' in %%(%s)"
-msgstr "valor positivo esperado contents:lines=%s"
+msgstr "valor positivo esperado '%s' em %%(%s)"
 
-#: ref-filter.c:384
-#, fuzzy, c-format
+#: ref-filter.c:445
+#, c-format
 msgid "unrecognized argument '%s' in %%(%s)"
 msgstr "argumento '%s' desconhecido em %%(%s)"
 
-#: ref-filter.c:398
-#, fuzzy, c-format
+#: ref-filter.c:459
+#, c-format
 msgid "unrecognized email option: %s"
 msgstr "opção de email desconhecida: %s"
 
-#: ref-filter.c:428
+#: ref-filter.c:489
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "formato esperado: %%(align:<largura>,<posição>)"
 
-#: ref-filter.c:440
+#: ref-filter.c:501
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "posição desconhecida: %s"
 
-#: ref-filter.c:447
+#: ref-filter.c:508
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "largura desconhecida: %s"
 
-#: ref-filter.c:456
+#: ref-filter.c:517
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "argumento %%(align) desconhecido: %s"
 
-#: ref-filter.c:464
+#: ref-filter.c:525
 #, c-format
 msgid "positive width expected with the %%(align) atom"
-msgstr "largura positiva esperada com o átomo %%(algn)"
+msgstr "largura positiva esperada com o átomo %%(align)"
 
-#: ref-filter.c:482
+#: ref-filter.c:543
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "argumento %%(if) desconhecido: %s"
 
-#: ref-filter.c:584
+#: ref-filter.c:645
 #, c-format
 msgid "malformed field name: %.*s"
-msgstr "nome de ficheiro malformado: %.*s"
+msgstr "nome em campo malformado: %.*s"
 
-#: ref-filter.c:611
+#: ref-filter.c:672
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nome do campo desconhecido: %.*s"
 
-#: ref-filter.c:615
+#: ref-filter.c:676
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 
-#: ref-filter.c:739
+#: ref-filter.c:801
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "formato: átomo %%(if) utilizado sem átomo %%(then) correspondente"
 
-#: ref-filter.c:802
+#: ref-filter.c:865
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "formato: átomo %%(then) utilizado sem átomo %%(if) correspondente"
 
-#: ref-filter.c:804
+#: ref-filter.c:867
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "formato: átomo %%(then) utilizado mais que uma vez"
 
-#: ref-filter.c:806
+#: ref-filter.c:869
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "formato: átomo %%(then) utilizado depois de %%(else)"
 
-#: ref-filter.c:834
+#: ref-filter.c:897
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "formato: átomo %%(else) utilizado sem átomo %%(if) correspondente"
 
-#: ref-filter.c:836
+#: ref-filter.c:899
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "formato: átomo %%(else) utilizado sem átomo %%(then) correspondente"
 
-#: ref-filter.c:838
+#: ref-filter.c:901
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "formato: átomo %%(else) utilizado mais que uma vez"
 
-#: ref-filter.c:853
+#: ref-filter.c:916
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "formato: átomo %%(end) utilizado sem átomo correspondente"
 
-#: ref-filter.c:910
+#: ref-filter.c:973
 #, c-format
 msgid "malformed format string %s"
-msgstr "cadeia malformada %s"
+msgstr "formato de string %s malformado"
 
-#: ref-filter.c:1549
-#, fuzzy, c-format
-msgid "no branch, rebasing %s"
+#: ref-filter.c:1621
+#, c-format
+msgid "(no branch, rebasing %s)"
 msgstr "(ramo nenhum, rebaseando %s)"
 
-#: ref-filter.c:1552
-#, fuzzy, c-format
-msgid "no branch, rebasing detached HEAD %s"
+#: ref-filter.c:1624
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
 msgstr "(ramo nenhum, rebaseando HEAD solta %s)"
 
-#: ref-filter.c:1555
-#, fuzzy, c-format
-msgid "no branch, bisect started on %s"
+#: ref-filter.c:1627
+#, c-format
+msgid "(no branch, bisect started on %s)"
 msgstr "(ramo nenhum, bisseção iniciada em %s)"
 
-#: ref-filter.c:1565
-#, fuzzy
-msgid "no branch"
+#: ref-filter.c:1631
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD destacada em %s)"
+
+#: ref-filter.c:1634
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD destacada de %s)"
+
+#: ref-filter.c:1637
+msgid "(no branch)"
 msgstr "(ramo nenhum)"
 
-#: ref-filter.c:1599 ref-filter.c:1808
+#: ref-filter.c:1669 ref-filter.c:1880
 #, c-format
 msgid "missing object %s for %s"
-msgstr "falta o objeto %s de %s"
+msgstr ""
 
-#: ref-filter.c:1609
+#: ref-filter.c:1679
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "falha ao invocar parse_object_buffer sobre %s de %s"
 
-#: ref-filter.c:2062
+#: ref-filter.c:2064
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objeto malformado em '%s'"
 
-#: ref-filter.c:2151
+#: ref-filter.c:2153
 #, c-format
 msgid "ignoring ref with broken name %s"
-msgstr "a referência %s com nome danificado foi ignorada"
+msgstr "ignorando ref com nome quebrado %s"
 
-#: ref-filter.c:2156 refs.c:660
+#: ref-filter.c:2158 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
-msgstr "a referência %s danificada foi ignorada"
+msgstr "ref quebrada %s está a ser ignorada"
 
-#: ref-filter.c:2472
+#: ref-filter.c:2502
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "formato: falta átomo %%(end)"
 
-#: ref-filter.c:2571
+#: ref-filter.c:2596
 #, c-format
 msgid "malformed object name %s"
 msgstr "nome de objeto malformado %s"
 
-#: ref-filter.c:2576
-#, fuzzy, c-format
+#: ref-filter.c:2601
+#, c-format
 msgid "option `%s' must point to a commit"
 msgstr "opção '%s' tem apontar para um commit"
 
 #: refs.c:264
-#, fuzzy, c-format
+#, c-format
 msgid "%s does not point to a valid object!"
-msgstr "'%s' aponta para objeto válido nenhum!"
+msgstr "%s aponta para objeto inválido!"
 
-#: refs.c:575
-#, fuzzy, c-format
+#: refs.c:566
+#, 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"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+
+#: refs.c:588
+#, c-format
 msgid "could not retrieve `%s`"
-msgstr "incapaz recuperar '%s'"
+msgstr "incapaz resgatar `%s`"
 
-#: refs.c:582
-#, fuzzy, c-format
+#: refs.c:598
+#, c-format
 msgid "invalid branch name: %s = %s"
-msgstr "Nome de ramo inválido: '%s'"
+msgstr "Nome de ramo inválido: %s = %s"
 
-#: refs.c:658
-#, fuzzy, c-format
+#: refs.c:674
+#, c-format
 msgid "ignoring dangling symref %s"
-msgstr "a referência %s danificada foi ignorada"
+msgstr "ref-simbólica perdida %s está a ser ignorada"
 
-#: refs.c:895
+#: refs.c:922
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr ""
 
-#: refs.c:901
+#: refs.c:929
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr ""
 
-#: refs.c:960
+#: refs.c:994
 #, c-format
 msgid "log for %s is empty"
 msgstr ""
 
-#: refs.c:1052
-#, fuzzy, c-format
+#: refs.c:1086
+#, c-format
 msgid "refusing to update ref with bad name '%s'"
-msgstr "a referência %s com nome danificado foi ignorada"
+msgstr "recusando atualizar ref com nome inválido '%s'"
 
-#: refs.c:1123
-#, fuzzy, c-format
+#: refs.c:1157
+#, c-format
 msgid "update_ref failed for ref '%s': %s"
-msgstr "falha ao abrir '%s': %s"
+msgstr ""
 
-#: refs.c:1947
-#, fuzzy, c-format
+#: refs.c:2051
+#, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "atualizações múltiplas para ref '%s' proíbidas"
 
-#: refs.c:2027
+#: refs.c:2131
 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 
-#: refs.c:2038
+#: refs.c:2142
 msgid "ref updates aborted by hook"
 msgstr ""
 
-#: refs.c:2138 refs.c:2168
-#, fuzzy, c-format
+#: refs.c:2242 refs.c:2272
+#, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' existe; incapaz criar '%s'"
 
-#: refs.c:2144 refs.c:2179
-#, fuzzy, c-format
+#: refs.c:2248 refs.c:2283
+#, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "incapaz processar '%s' e '%s' ao mesmo tempo"
 
@@ -6348,9 +7009,9 @@ msgid "could not delete references: %s"
 msgstr "incapaz apagar referências: %s"
 
 #: refspec.c:170
-#, fuzzy, c-format
+#, c-format
 msgid "invalid refspec '%s'"
-msgstr "ficheiro inválido: '%s'"
+msgstr ""
 
 #: remote.c:351
 #, c-format
@@ -6390,12 +7051,12 @@ msgstr ""
 msgid "value '%s' of pattern has no '*'"
 msgstr ""
 
-#: remote.c:1073
-#, fuzzy, c-format
+#: remote.c:1083
+#, c-format
 msgid "src refspec %s does not match any"
 msgstr "src refspec %s corresponde a nenhum"
 
-#: remote.c:1078
+#: remote.c:1088
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr ""
@@ -6404,7 +7065,7 @@ msgstr ""
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1093
+#: remote.c:1103
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -6418,7 +7079,7 @@ msgid ""
 "Neither worked, so we gave up. You must fully qualify the ref."
 msgstr ""
 
-#: remote.c:1113
+#: remote.c:1123
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -6426,7 +7087,7 @@ msgid ""
 "'%s:refs/heads/%s'?"
 msgstr ""
 
-#: remote.c:1118
+#: remote.c:1128
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -6434,7 +7095,7 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1123
+#: remote.c:1133
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -6442,7 +7103,7 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1128
+#: remote.c:1138
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -6450,114 +7111,115 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1164
-#, fuzzy, c-format
+#: remote.c:1174
+#, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s incapaz ser resolvido para ramo"
 
-#: remote.c:1175
-#, fuzzy, c-format
+#: remote.c:1185
+#, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "incapaz apagar '%s': ref remoto é inexistente"
 
-#: remote.c:1187
+#: remote.c:1197
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr ""
 
-#: remote.c:1194
+#: remote.c:1204
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr ""
 
-#: remote.c:1714 remote.c:1815
+#: remote.c:1724 remote.c:1825
 msgid "HEAD does not point to a branch"
 msgstr "HEAD aponta para ramo nenhum"
 
-#: remote.c:1723
+#: remote.c:1733
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "ramo inexistente: '%s'"
 
-#: remote.c:1726
+#: remote.c:1736
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "configurado upstream nenhum para ramo '%s'"
 
-#: remote.c:1732
+#: remote.c:1742
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "incapaz gravar ramo upstream '%s' como ramo remote-tracking"
 
-#: remote.c:1747
+#: remote.c:1757
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "destino de atirar '%s' em remoto '%s' tem ramo de tracking local nenhum"
+msgstr ""
+"destino de atirar '%s' em remoto '%s' tem ramo de tracking local nenhum"
 
-#: remote.c:1759
+#: remote.c:1769
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "ramo '%s' tem remoto para atirar nenhum"
 
-#: remote.c:1769
+#: remote.c:1779
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "refspecs de atirar para '%s'incluí '%s' nenhum"
 
-#: remote.c:1782
+#: remote.c:1792
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "publicação sem destino (push.default é 'nothing')"
 
-#: remote.c:1804
+#: remote.c:1814
 msgid "cannot resolve 'simple' push to a single destination"
-msgstr "incapaz resolver atiranço 'simple' para destino único"
+msgstr "incapaz resolver atiro 'simple' para destino único"
 
-#: remote.c:1933
-#, fuzzy, c-format
+#: remote.c:1943
+#, c-format
 msgid "couldn't find remote ref %s"
 msgstr "incapaz encontrar ref remoto %s"
 
-#: remote.c:1946
+#: remote.c:1956
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr ""
 
-#: remote.c:2109
+#: remote.c:2119
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "A base do seu ramo é '%s', mas o ramo a montante desapareceu.\n"
 
-#: remote.c:2113
+#: remote.c:2123
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "  (use \"git branch --unset-upstream\" para corrigir)\n"
+msgstr "  (usa \"git branch --unset-upstream\" para corrigir)\n"
 
-#: remote.c:2116
-#, fuzzy, c-format
+#: remote.c:2126
+#, c-format
 msgid "Your branch is up to date with '%s'.\n"
-msgstr "O seu ramo está atualizado com '%s'.\n"
+msgstr "Teu ramo está atualizado com '%s'.\n"
 
-#: remote.c:2120
-#, fuzzy, c-format
+#: remote.c:2130
+#, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "O seu ramo está à frente de '%s' por %d commit.\n"
+msgstr "Teu ramo e '%s' referem-se a memórias diferentes.\n"
 
-#: remote.c:2123
+#: remote.c:2133
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr ""
 
-#: remote.c:2127
+#: remote.c:2137
 #, 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] "O seu ramo está à frente de '%s' por %d commit.\n"
 msgstr[1] "O seu ramo está à frente de '%s' por %d commits.\n"
 
-#: remote.c:2133
+#: remote.c:2143
 msgid "  (use \"git push\" to publish your local commits)\n"
-msgstr "  (use \"git push\" para publicar os commits locais)\n"
+msgstr "  (usa \"git push\" para publicar os commits locais)\n"
 
-#: remote.c:2136
+#: remote.c:2146
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -6569,11 +7231,11 @@ msgstr[1] ""
 "O seu ramo está atrás de '%s' por %d commits, podendo ser atualizado com "
 "avanço rápido.\n"
 
-#: remote.c:2144
+#: remote.c:2154
 msgid "  (use \"git pull\" to update your local branch)\n"
-msgstr "  (use \"git pull\" para atualizar o seu ramo local)\n"
+msgstr "  (usa \"git pull\" para atualizar teu ramo local)\n"
 
-#: remote.c:2147
+#: remote.c:2157
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -6588,251 +7250,248 @@ msgstr[1] ""
 "O seu ramo e '%s' divergiram,\n"
 "tendo cada um %d e %d commits diferentes, respetivamente.\n"
 
-#: remote.c:2157
+#: remote.c:2167
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr "  (use \"git pull\" para integrar o ramo remoto no seu ramo)\n"
+msgstr "  (usa \"git pull\" para juntar o ramo remoto no teu ramo)\n"
 
-#: remote.c:2348
-#, fuzzy, c-format
+#: remote.c:2359
+#, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "incapaz analisar nome de objeto esperado '%s'"
 
 #: replace-object.c:21
-#, fuzzy, c-format
+#, c-format
 msgid "bad replace ref name: %s"
-msgstr "eliminar referências substituídas"
+msgstr "substituição de nome de ref inválida: %s"
 
 #: replace-object.c:30
-#, fuzzy, c-format
+#, c-format
 msgid "duplicate replace ref: %s"
-msgstr "eliminar referências substituídas"
+msgstr "substituição duplicada de ref: %s"
 
 #: replace-object.c:82
-#, fuzzy, c-format
+#, c-format
 msgid "replace depth too high for object %s"
-msgstr "substituir a tag se esta existir"
+msgstr "substituir profundidade demasiado funda para objeto %s"
 
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
 msgid "corrupt MERGE_RR"
 msgstr ""
 
-#: rerere.c:264 rerere.c:269
-#, fuzzy
+#: rerere.c:248 rerere.c:253
 msgid "unable to write rerere record"
 msgstr "incapaz escrever registro rerere"
 
-#: rerere.c:495
+#: rerere.c:479
 #, c-format
 msgid "there were errors while writing '%s' (%s)"
 msgstr ""
 
-#: rerere.c:498
-#, fuzzy, c-format
+#: rerere.c:482
+#, c-format
 msgid "failed to flush '%s'"
-msgstr "falha ao invocar stat de '%s'"
+msgstr ""
 
-#: rerere.c:503 rerere.c:1039
-#, fuzzy, c-format
+#: rerere.c:487 rerere.c:1023
+#, c-format
 msgid "could not parse conflict hunks in '%s'"
 msgstr "incapaz analisar pedaços conflituosos em '%s'"
 
-#: rerere.c:684
-#, fuzzy, c-format
+#: rerere.c:668
+#, c-format
 msgid "failed utime() on '%s'"
-msgstr "falha ao abrir '%s'"
+msgstr ""
 
-#: rerere.c:694
-#, fuzzy, c-format
+#: rerere.c:678
+#, c-format
 msgid "writing '%s' failed"
-msgstr "falha ao criar '%s'"
+msgstr ""
 
-#: rerere.c:714
+#: rerere.c:698
 #, c-format
 msgid "Staged '%s' using previous resolution."
 msgstr ""
 
-#: rerere.c:753
+#: rerere.c:737
 #, c-format
 msgid "Recorded resolution for '%s'."
 msgstr ""
 
-#: rerere.c:788
+#: rerere.c:772
 #, c-format
 msgid "Resolved '%s' using previous resolution."
 msgstr ""
 
-#: rerere.c:803
-#, fuzzy, c-format
+#: rerere.c:787
+#, c-format
 msgid "cannot unlink stray '%s'"
 msgstr "incapaz deslinkar o perdido '%s'"
 
-#: rerere.c:807
+#: rerere.c:791
 #, c-format
 msgid "Recorded preimage for '%s'"
 msgstr ""
 
-#: rerere.c:881 submodule.c:2082 builtin/log.c:1992
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
+#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
+#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "incapaz criar pasta '%s'"
 
-#: rerere.c:1057
-#, fuzzy, c-format
+#: rerere.c:1041
+#, c-format
 msgid "failed to update conflicted state in '%s'"
-msgstr "falha ao criar a ligação '%s'"
+msgstr "falhou atualizar estado conflituoso em '%s'"
 
-#: rerere.c:1068 rerere.c:1075
-#, fuzzy, c-format
+#: rerere.c:1052 rerere.c:1059
+#, c-format
 msgid "no remembered resolution for '%s'"
 msgstr "a faltar a lembrança da solução para '%s'"
 
-#: rerere.c:1077
-#, fuzzy, c-format
+#: rerere.c:1061
+#, c-format
 msgid "cannot unlink '%s'"
 msgstr "incapaz de deslinkar '%s'"
 
-#: rerere.c:1087
+#: rerere.c:1071
 #, c-format
 msgid "Updated preimage for '%s'"
 msgstr ""
 
-#: rerere.c:1096
-#, fuzzy, c-format
+#: rerere.c:1080
+#, c-format
 msgid "Forgot resolution for '%s'\n"
 msgstr "Está esquecida resolução para '%s'\n"
 
-#: rerere.c:1199
-#, fuzzy
+#: rerere.c:1191
 msgid "unable to open rr-cache directory"
 msgstr "incapaz abrir pasta rr-cache"
 
 #: reset.c:42
-#, fuzzy
 msgid "could not determine HEAD revision"
 msgstr "incapaz determinar revisão de HEAD"
 
-#: reset.c:70 reset.c:76 sequencer.c:3460
-#, fuzzy, c-format
+#: reset.c:69 reset.c:75 sequencer.c:3689
+#, c-format
 msgid "failed to find tree of %s"
-msgstr "Falha ao procurar árvore de %s."
+msgstr "falhou encontrar árvore de %s"
 
-#: revision.c:2336
+#: revision.c:2344
 msgid "--unpacked=<packfile> no longer supported"
 msgstr ""
 
-#: revision.c:2356
-#, fuzzy, c-format
-msgid "unknown value for --diff-merges: %s"
-msgstr "valor desconhecido '%s' da chave '%s'"
-
-#: revision.c:2694
+#: revision.c:2684
 msgid "your current branch appears to be broken"
 msgstr "o ramo atual parece estar danificado"
 
-#: revision.c:2697
+#: revision.c:2687
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "teu ramo atual '%s' ainda contém commits nenhuns"
 
-#: revision.c:2907
+#: revision.c:2893
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr ""
 
-#: run-command.c:764
+#: run-command.c:766
 msgid "open /dev/null failed"
-msgstr "falha ao abrir /dev/null"
+msgstr "abrir /dev/null falhou"
 
-#: run-command.c:1271
-#, fuzzy, c-format
+#: run-command.c:1274
+#, c-format
 msgid "cannot create async thread: %s"
-msgstr "não foi possível criar thread: %s"
+msgstr "incapaz criar thread assíncrona: %s"
 
-#: run-command.c:1335
+#: run-command.c:1344
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
 "You can disable this warning with `git config advice.ignoredHook false`."
 msgstr ""
 
-#: send-pack.c:146
-#, fuzzy
+#: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
-msgstr "não é possível analisar status de descompactação remota: %s"
+msgstr "flush de pacotes inesperado enquanto lendo unpack status remoto"
 
-#: send-pack.c:148
+#: send-pack.c:152
 #, c-format
 msgid "unable to parse remote unpack status: %s"
-msgstr "não é possível analisar status de descompactação remota: %s"
+msgstr "incapaz analisar unpack status remota: %s"
 
-#: send-pack.c:150
+#: send-pack.c:154
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "descompactação remota falhou: %s"
 
-#: send-pack.c:374
+#: send-pack.c:378
 msgid "failed to sign the push certificate"
 msgstr "falha ao assinar o certificado de publicação"
 
-#: send-pack.c:467
-#, fuzzy
+#: send-pack.c:433
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: incapaz de fazer fork a subprocesso buscar"
+
+#: send-pack.c:455
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr ""
+
+#: send-pack.c:526
 msgid "the receiving end does not support this repository's hash algorithm"
-msgstr "o recetor não suporta opções de publicação"
+msgstr "o recetor insustenta algoritmo hash deste repositório"
 
-#: send-pack.c:476
+#: send-pack.c:535
 msgid "the receiving end does not support --signed push"
-msgstr "o recetor não suporta publicação com --signed"
+msgstr "o lado receptor insustenta atiro com --signed"
 
-#: send-pack.c:478
+#: send-pack.c:537
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr ""
-"certificado de publicação não enviado uma vez que o recetor não suporta "
-"publicação com --signed"
+"certificado de atiro por enviar uma vez que o recetor insustenta atirocom --"
+"signed"
 
-#: send-pack.c:490
+#: send-pack.c:544
 msgid "the receiving end does not support --atomic push"
-msgstr "o recetor não suporta publicação com --atomic"
+msgstr "o lado receptor insustenta atiro com --atomic"
 
-#: send-pack.c:495
+#: send-pack.c:549
 msgid "the receiving end does not support push options"
-msgstr "o recetor não suporta opções de publicação"
+msgstr "o recetor insustenta opções de atiro"
 
-#: sequencer.c:195
-#, fuzzy, c-format
+#: sequencer.c:196
+#, c-format
 msgid "invalid commit message cleanup mode '%s'"
-msgstr "Modo de limpeza inválido %s"
+msgstr "mensagem de memória de modo de limpeza inválida '%s'"
 
-#: sequencer.c:323
-#, fuzzy, c-format
+#: sequencer.c:324
+#, c-format
 msgid "could not delete '%s'"
 msgstr "incapaz de apagar '%s'"
 
-#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385
+#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
 #, c-format
 msgid "could not remove '%s'"
-msgstr "não foi possível remover '%s'"
+msgstr "incapaz remover '%s'"
 
-#: sequencer.c:353
+#: sequencer.c:354
 msgid "revert"
 msgstr "reverter"
 
-#: sequencer.c:355
+#: sequencer.c:356
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:357
-#, fuzzy
+#: sequencer.c:358
 msgid "rebase"
 msgstr "rebase -i"
 
-#: sequencer.c:359
-#, fuzzy, c-format
+#: sequencer.c:360
+#, c-format
 msgid "unknown action: %d"
 msgstr "Ação desconhecida: %d"
 
-#: sequencer.c:418
+#: sequencer.c:419
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -6840,7 +7499,7 @@ msgstr ""
 "depois de resolver os conflitos, marque os caminhos corrigidos\n"
 "com 'git add <caminhos>' ou 'git rm <caminhos>'"
 
-#: sequencer.c:421
+#: sequencer.c:422
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6850,43 +7509,43 @@ msgstr ""
 "com 'git add <caminhos>' ou 'git rm <caminhos>'\n"
 "e submeta o resultado com 'git commit'"
 
-#: sequencer.c:434 sequencer.c:3062
+#: sequencer.c:435 sequencer.c:3271
 #, c-format
 msgid "could not lock '%s'"
-msgstr "não foi possível bloquear '%s'"
+msgstr "incapaz bloquear '%s'"
 
-#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080
-#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631
+#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
+#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631
 #, c-format
 msgid "could not write to '%s'"
-msgstr "não foi possível escrever em '%s'"
+msgstr "incapaz escrever em '%s'"
 
-#: sequencer.c:441
+#: sequencer.c:442
 #, c-format
 msgid "could not write eol to '%s'"
-msgstr "não foi possível escrever fim de linha em '%s'"
+msgstr "incapaz escrever fim de linha em '%s'"
 
-#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082
-#: sequencer.c:3345
-#, fuzzy, c-format
+#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
+#: sequencer.c:3555
+#, c-format
 msgid "failed to finalize '%s'"
 msgstr "falha ao finalizar '%s'."
 
-#: sequencer.c:485
+#: sequencer.c:486
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "as suas alterações locais serão substituídas ao %s."
 
-#: sequencer.c:489
+#: sequencer.c:490
 msgid "commit your changes or stash them to proceed."
 msgstr "submeta ou esconda as suas alterações para continuar."
 
-#: sequencer.c:521
+#: sequencer.c:522
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avanço rápido"
 
-#: sequencer.c:560 builtin/tag.c:566
+#: sequencer.c:561 builtin/tag.c:609
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Modo de limpeza inválido %s"
@@ -6894,67 +7553,65 @@ msgstr "Modo de limpeza inválido %s"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
 #.
-#: sequencer.c:670
+#: sequencer.c:671
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Incapaz de escrever novo ficheiro index"
 
-#: sequencer.c:687
-#, fuzzy
+#: sequencer.c:685
 msgid "unable to update cache tree"
-msgstr "não foi possível atualizar a árvore de cache"
+msgstr "incapaz atualizar árvore de cenário"
 
-#: sequencer.c:701
-#, fuzzy
+#: sequencer.c:699
 msgid "could not resolve HEAD commit"
-msgstr "não foi possível resolver o commit HEAD"
+msgstr "incapaz resolver memória HEAD"
 
-#: sequencer.c:781
+#: sequencer.c:779
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr ""
 
-#: sequencer.c:792
-#, fuzzy, c-format
+#: sequencer.c:790
+#, c-format
 msgid "unable to dequote value of '%s'"
-msgstr "não é possível detetar automaticamente o nome (obteve-se '%s')"
+msgstr "incapaz retirar valor, da citação '%s'"
 
-#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908
+#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
+#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
 #, c-format
 msgid "could not open '%s' for reading"
-msgstr "não foi possível abrir '%s' para leitura"
+msgstr "incapaz abrir '%s' para leitura"
 
-#: sequencer.c:839
+#: sequencer.c:837
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr ""
 
-#: sequencer.c:844
+#: sequencer.c:842
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr ""
 
-#: sequencer.c:849
+#: sequencer.c:847
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr ""
 
-#: sequencer.c:853
-#, fuzzy, c-format
+#: sequencer.c:851
+#, c-format
 msgid "unknown variable '%s'"
-msgstr "Formato de arquivo desconhecido '%s'"
+msgstr ""
 
-#: sequencer.c:858
+#: sequencer.c:856
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr ""
 
-#: sequencer.c:860
+#: sequencer.c:858
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr ""
 
-#: sequencer.c:862
+#: sequencer.c:860
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr ""
 
-#: sequencer.c:927
+#: sequencer.c:925
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -6983,11 +7640,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1208
+#: sequencer.c:1212
 msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 
-#: sequencer.c:1214
+#: sequencer.c:1218
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7013,7 +7670,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1227
+#: 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"
@@ -7037,366 +7694,360 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1269
+#: sequencer.c:1273
 msgid "couldn't look up newly created commit"
-msgstr "não foi possível consultar o commit recém-criado"
+msgstr "incapaz consultar memória recém-criada"
 
-#: sequencer.c:1271
+#: sequencer.c:1275
 msgid "could not parse newly created commit"
-msgstr "não foi possível analisar o commit recém-criado"
+msgstr "incapaz analisar memória recém-criada"
 
-#: sequencer.c:1317
-#, fuzzy
+#: sequencer.c:1321
 msgid "unable to resolve HEAD after creating commit"
-msgstr "não foi possível resolver o commit HEAD"
+msgstr "incapaz resolver HEAD após criar memória"
 
-#: sequencer.c:1319
+#: sequencer.c:1323
 msgid "detached HEAD"
 msgstr "HEAD destacada"
 
-#: sequencer.c:1323
+#: sequencer.c:1327
 msgid " (root-commit)"
 msgstr " (commit-raiz)"
 
-#: sequencer.c:1344
-#, fuzzy
+#: sequencer.c:1348
 msgid "could not parse HEAD"
-msgstr "não foi possível ler HEAD"
+msgstr "incapaz processar HEAD"
 
-#: sequencer.c:1346
-#, fuzzy, c-format
+#: sequencer.c:1350
+#, c-format
 msgid "HEAD %s is not a commit!"
-msgstr "%s %s não é um commit!"
+msgstr "HEAD %s é commit nenhum!"
 
-#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
 msgid "could not parse HEAD commit"
-msgstr "não foi possível analisar o commit HEAD"
+msgstr "incapaz analisar commit HEAD"
 
-#: sequencer.c:1403 sequencer.c:2100
-#, fuzzy
+#: sequencer.c:1410 sequencer.c:2295
 msgid "unable to parse commit author"
-msgstr "não foi possível analisar o commit %s"
+msgstr "incapaz processar autor de commit"
 
-#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
 msgid "git write-tree failed to write a tree"
-msgstr "git write-tree falhou ao escrever uma árvore"
+msgstr ""
 
-#: sequencer.c:1447 sequencer.c:1565
-#, fuzzy, c-format
+#: sequencer.c:1454 sequencer.c:1574
+#, c-format
 msgid "unable to read commit message from '%s'"
-msgstr "não foi possível ler a mensagem de commit de %s"
+msgstr "incapaz ler mensagem de commit de '%s'"
 
-#: sequencer.c:1476 sequencer.c:1508
-#, fuzzy, c-format
+#: sequencer.c:1485 sequencer.c:1517
+#, c-format
 msgid "invalid author identity '%s'"
-msgstr "caminho inválido '%s'"
+msgstr ""
 
-#: sequencer.c:1482
+#: sequencer.c:1491
 msgid "corrupt author: missing date information"
 msgstr ""
 
-#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904
-#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
+#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
 msgid "failed to write commit object"
-msgstr "falha ao escrever objeto de commit"
+msgstr ""
 
-#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198
+#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199
+#: t/helper/test-fast-rebase.c:217
 #, c-format
 msgid "could not update %s"
-msgstr "não foi possível atualizar %s"
+msgstr "incapaz atualizar %s"
 
-#: sequencer.c:1597
-#, fuzzy, c-format
+#: sequencer.c:1606
+#, c-format
 msgid "could not parse commit %s"
-msgstr "não foi possível analisar o commit %s\n"
+msgstr "incapaz processar commit %s"
 
-#: sequencer.c:1602
-#, fuzzy, c-format
+#: sequencer.c:1611
+#, c-format
 msgid "could not parse parent commit %s"
-msgstr "não foi possível analisar o commit pai %s\n"
+msgstr "incapaz processar commit parente %s"
 
-#: sequencer.c:1685 sequencer.c:1796
+#: sequencer.c:1694 sequencer.c:1975
 #, c-format
 msgid "unknown command: %d"
 msgstr "comando desconhecido: %d"
 
-#: sequencer.c:1743 sequencer.c:1768
+#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr "Esta é a 1ª mensagem de commit:"
+
+#: sequencer.c:1737
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Esta é a mensagem de commit nº%d:"
+
+#: sequencer.c:1738
+msgid "The 1st commit message will be skipped:"
+msgstr "A 1ª mensagem de commit será ignorada:"
+
+#: sequencer.c:1739
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "A mensagem de commit #%d será ignorada:"
+
+#: sequencer.c:1740
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Isto é a combinação de %d commits."
 
-#: sequencer.c:1753
+#: sequencer.c:1887 sequencer.c:1944
+#, c-format
+msgid "cannot write '%s'"
+msgstr "incapaz escrever '%s'"
+
+#: sequencer.c:1934
 msgid "need a HEAD to fixup"
 msgstr "necessária uma HEAD para fixup"
 
-#: sequencer.c:1755 sequencer.c:3372
+#: sequencer.c:1936 sequencer.c:3582
 msgid "could not read HEAD"
-msgstr "não foi possível ler HEAD"
+msgstr "incapaz ler HEAD"
 
-#: sequencer.c:1757
+#: sequencer.c:1938
 msgid "could not read HEAD's commit message"
-msgstr "não foi possível ler a mensagem de commit de HEAD"
+msgstr "incapaz ler mensagem de commit de HEAD"
 
-#: sequencer.c:1763
-#, c-format
-msgid "cannot write '%s'"
-msgstr "não é possível escrever '%s'"
-
-#: sequencer.c:1770 git-rebase--preserve-merges.sh:486
-msgid "This is the 1st commit message:"
-msgstr "Esta é a 1ª mensagem de commit:"
-
-#: sequencer.c:1778
+#: sequencer.c:1962
 #, c-format
 msgid "could not read commit message of %s"
-msgstr "não foi possível ler a mensagem de commit de %s"
+msgstr "incapaz ler mensagem de commit de %s"
 
-#: sequencer.c:1785
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Esta é a mensagem de commit nº%d:"
-
-#: sequencer.c:1791
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "A mensagem de commit #%d será ignorada:"
-
-#: sequencer.c:1879
+#: sequencer.c:2072
 msgid "your index file is unmerged."
-msgstr "ficheiro de índice não integrado."
+msgstr "teu ficheiro índex está por juntar."
 
-#: sequencer.c:1886
-#, fuzzy
+#: sequencer.c:2079
 msgid "cannot fixup root commit"
-msgstr "não é possível encontrar o commit %s (%s)"
+msgstr "incapaz consertar commit raíz"
 
-#: sequencer.c:1905
+#: sequencer.c:2098
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
-msgstr "o commit %s é uma integração mas não foi fornecida a opção -m."
+msgstr "commit %s é uma junção mas foi fornecido opção -m nenhuma."
 
-#: sequencer.c:1913 sequencer.c:1921
+#: sequencer.c:2106 sequencer.c:2114
 #, c-format
 msgid "commit %s does not have parent %d"
-msgstr "o commit %s não tem o pai %d"
+msgstr "commit %s tem parente %d nenhum"
 
-#: sequencer.c:1927
+#: sequencer.c:2120
 #, c-format
 msgid "cannot get commit message for %s"
-msgstr "não é possível obter a mensagem de commit de %s"
+msgstr "incapaz obter mensagem de commit para %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1946
+#: sequencer.c:2139
 #, c-format
 msgid "%s: cannot parse parent commit %s"
-msgstr "%s: não foi possível analisar o commit pai %s"
+msgstr "%s: incapaz processar commit parente %s"
 
-#: sequencer.c:2011
+#: sequencer.c:2205
 #, c-format
 msgid "could not rename '%s' to '%s'"
-msgstr "não foi possível mudar o nome de '%s' para '%s'"
+msgstr "incapaz renomear '%s' para '%s'"
 
-#: sequencer.c:2071
+#: sequencer.c:2265
 #, c-format
 msgid "could not revert %s... %s"
-msgstr "não foi possível reverter %s... %s"
+msgstr "incapaz reverter %s... %s"
 
-#: sequencer.c:2072
+#: sequencer.c:2266
 #, c-format
 msgid "could not apply %s... %s"
-msgstr "não foi possível aplicar %s... %s"
+msgstr "incapaz aplicar %s... %s"
 
-#: sequencer.c:2092
+#: sequencer.c:2287
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr ""
 
-#: sequencer.c:2150
+#: sequencer.c:2345
 #, c-format
 msgid "git %s: failed to read the index"
-msgstr "git %s: falha ao ler o índice"
+msgstr "git %s: ler cenário falhou"
 
-#: sequencer.c:2157
+#: sequencer.c:2352
 #, c-format
 msgid "git %s: failed to refresh the index"
-msgstr "git %s: falha ao atualizar o índice"
+msgstr "git %s: falha ao atualizar o cenário"
 
-#: sequencer.c:2234
-#, fuzzy, c-format
+#: sequencer.c:2425
+#, c-format
 msgid "%s does not accept arguments: '%s'"
-msgstr "%%(body) não leva argumentos"
+msgstr "%s rejeita argumentos: '%s'"
 
-#: sequencer.c:2243
-#, fuzzy, c-format
+#: sequencer.c:2434
+#, c-format
 msgid "missing arguments for %s"
-msgstr "falta o objeto %s de %s"
+msgstr ""
 
-#: sequencer.c:2274
-#, fuzzy, c-format
+#: sequencer.c:2477
+#, c-format
 msgid "could not parse '%s'"
-msgstr "não foi possível analisar %s"
+msgstr "incapaz processar '%s'"
 
-#: sequencer.c:2335
+#: sequencer.c:2538
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "linha %d inválida: %.*s"
 
-#: sequencer.c:2346
+#: sequencer.c:2549
 #, c-format
 msgid "cannot '%s' without a previous commit"
-msgstr "não é possível efetuar '%s' sem um commit anterior"
+msgstr "incapaz '%s' sem um commit anterior"
 
-#: sequencer.c:2432
-#, fuzzy
+#: sequencer.c:2635
 msgid "cancelling a cherry picking in progress"
 msgstr "cancelando um cherry picking em curso"
 
-#: sequencer.c:2441
-#, fuzzy
+#: sequencer.c:2644
 msgid "cancelling a revert in progress"
 msgstr "cancelando uma reversão em curso"
 
-#: sequencer.c:2485
+#: sequencer.c:2690
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "corrija-o usando 'git rebase --edit-todo'."
 
-#: sequencer.c:2487
+#: sequencer.c:2692
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "folha de instruções inutilizável: '%s'"
 
-#: sequencer.c:2492
+#: sequencer.c:2697
 msgid "no commits parsed."
 msgstr "commits nenhuns analisados."
 
-#: sequencer.c:2503
+#: sequencer.c:2708
 msgid "cannot cherry-pick during a revert."
-msgstr "não é possível efetuar cherry-pick durante uma reversão."
+msgstr "incapaz apanhar durante uma reversão."
 
-#: sequencer.c:2505
+#: sequencer.c:2710
 msgid "cannot revert during a cherry-pick."
-msgstr "não é possível reverter durante um cherry-pick."
+msgstr "incapaz reverter durante uma apanha."
 
-#: sequencer.c:2583
+#: sequencer.c:2788
 #, c-format
 msgid "invalid value for %s: %s"
-msgstr "valor inválido de %s: %s"
+msgstr "valor inválido para %s: %s"
 
-#: sequencer.c:2690
+#: sequencer.c:2897
 msgid "unusable squash-onto"
 msgstr ""
 
-#: sequencer.c:2710
+#: sequencer.c:2917
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "folha de opções malformada: '%s'"
 
-#: sequencer.c:2803 sequencer.c:4636
+#: sequencer.c:3012 sequencer.c:4868
 msgid "empty commit set passed"
 msgstr "o conjunto de commits especificado está vazio"
 
-#: sequencer.c:2820
-#, fuzzy
+#: sequencer.c:3029
 msgid "revert is already in progress"
-msgstr "cherry-pick ou revert em curso"
+msgstr "reversão já está em curso"
 
-#: sequencer.c:2822
-#, fuzzy, c-format
+#: sequencer.c:3031
+#, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
+msgstr "tenta \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2825
-#, fuzzy
+#: sequencer.c:3034
 msgid "cherry-pick is already in progress"
-msgstr "cherry-pick ou revert em curso"
+msgstr "a apanha já está em curso"
 
-#: sequencer.c:2827
-#, fuzzy, c-format
+#: sequencer.c:3036
+#, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
+msgstr "tenta \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2841
+#: sequencer.c:3050
 #, c-format
 msgid "could not create sequencer directory '%s'"
-msgstr "não foi possível criar o diretório do sequenciador '%s'"
+msgstr "incapaz criar pasta do sequenciador '%s'"
 
-#: sequencer.c:2856
+#: sequencer.c:3065
 msgid "could not lock HEAD"
-msgstr "não foi possível bloquear HEAD"
+msgstr "incapaz bloquear HEAD"
 
-#: sequencer.c:2916 sequencer.c:4371
+#: sequencer.c:3125 sequencer.c:4581
 msgid "no cherry-pick or revert in progress"
 msgstr "sem cherry-pick ou revert em curso"
 
-#: sequencer.c:2918 sequencer.c:2929
+#: sequencer.c:3127 sequencer.c:3138
 msgid "cannot resolve HEAD"
-msgstr "não é possível resolver HEAD"
+msgstr "incapaz resolver HEAD"
 
-#: sequencer.c:2920 sequencer.c:2964
+#: sequencer.c:3129 sequencer.c:3173
 msgid "cannot abort from a branch yet to be born"
-msgstr "não é possível abortar um ramo ainda não criado"
+msgstr "incapaz abortar de um ramo ainda por nascer"
 
-#: sequencer.c:2950 builtin/grep.c:756
+#: sequencer.c:3159 builtin/grep.c:758
 #, c-format
 msgid "cannot open '%s'"
-msgstr "não é possível abrir '%s'"
+msgstr "incapaz abrir '%s'"
 
-#: sequencer.c:2952
+#: sequencer.c:3161
 #, c-format
 msgid "cannot read '%s': %s"
-msgstr "não é possível ler '%s': %s"
+msgstr "incapaz ler '%s': %s"
 
-#: sequencer.c:2953
+#: sequencer.c:3162
 msgid "unexpected end of file"
-msgstr "fim de ficheiro inesperado"
+msgstr ""
 
-#: sequencer.c:2959
+#: sequencer.c:3168
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "o ficheiro HEAD de pre-cherry-pick '%s' está corrompido"
 
-#: sequencer.c:2970
+#: sequencer.c:3179
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "Parece que moveste a HEAD. Recusando rebobinar, verifique a tua HEAD!"
 
-#: sequencer.c:3011
-#, fuzzy
+#: sequencer.c:3220
 msgid "no revert in progress"
-msgstr "Rebase não está em curso?"
+msgstr "em curso reversão nenhuma"
 
-#: sequencer.c:3020
-#, fuzzy
+#: sequencer.c:3229
 msgid "no cherry-pick in progress"
 msgstr "cherry-pick nenhum em curso"
 
-#: sequencer.c:3030
-#, fuzzy
+#: sequencer.c:3239
 msgid "failed to skip the commit"
-msgstr "falha ao escrever objeto de commit"
+msgstr ""
 
-#: sequencer.c:3037
+#: sequencer.c:3246
 msgid "there is nothing to skip"
 msgstr ""
 
-#: sequencer.c:3040
+#: sequencer.c:3249
 #, c-format
 msgid ""
 "have you committed already?\n"
 "try \"git %s --continue\""
 msgstr ""
 
-#: sequencer.c:3202 sequencer.c:4263
+#: sequencer.c:3411 sequencer.c:4472
 msgid "cannot read HEAD"
-msgstr "não é possível ler HEAD"
+msgstr "incapaz ler HEAD"
 
-#: sequencer.c:3219
-#, fuzzy, c-format
+#: sequencer.c:3428
+#, c-format
 msgid "unable to copy '%s' to '%s'"
-msgstr "não foi possível copiar '%s' para '%s'"
+msgstr "incapaz copiar '%s' para '%s'"
 
-#: sequencer.c:3227
-#, fuzzy, c-format
+#: sequencer.c:3436
+#, c-format
 msgid ""
 "You can amend the commit now, with\n"
 "\n"
@@ -7414,27 +8065,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3237
-#, fuzzy, c-format
+#: sequencer.c:3446
+#, c-format
 msgid "Could not apply %s... %.*s"
-msgstr "não foi possível aplicar %s... %s"
+msgstr "Incapaz aplicar %s... %.*s"
 
-#: sequencer.c:3244
-#, fuzzy, c-format
+#: sequencer.c:3453
+#, c-format
 msgid "Could not merge %.*s"
-msgstr "Incapaz de juntar %.*s"
+msgstr "Incapaz juntar %.*s"
 
-#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640
+#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
 #, c-format
 msgid "could not copy '%s' to '%s'"
-msgstr "não foi possível copiar '%s' para '%s'"
+msgstr "incapaz copiar '%s' para '%s'"
 
-#: sequencer.c:3274
-#, fuzzy, c-format
+#: sequencer.c:3483
+#, c-format
 msgid "Executing: %s\n"
 msgstr "A executar: %s\n"
 
-#: sequencer.c:3289
+#: sequencer.c:3498
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -7449,11 +8100,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3295
+#: sequencer.c:3504
 msgid "and made changes to the index and/or the working tree\n"
-msgstr "e fez alterações ao índice e/ou à árvore de trabalho\n"
+msgstr "e fiz alterações ao cenário e/ou à árvore-trabalho\n"
 
-#: sequencer.c:3301
+#: sequencer.c:3510
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -7470,95 +8121,91 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3362
-#, fuzzy, c-format
+#: sequencer.c:3572
+#, c-format
 msgid "illegal label name: '%.*s'"
-msgstr "nome de ficheiro malformado: %.*s"
+msgstr "nome de rótulo ilegal: '%.*s'"
 
-#: sequencer.c:3416
-#, fuzzy
+#: sequencer.c:3645
 msgid "writing fake root commit"
 msgstr "escrevendo commit de raíz falso"
 
-#: sequencer.c:3421
+#: sequencer.c:3650
 msgid "writing squash-onto"
 msgstr ""
 
-#: sequencer.c:3505
-#, fuzzy, c-format
+#: sequencer.c:3734
+#, c-format
 msgid "could not resolve '%s'"
-msgstr "não foi possível remover '%s'"
+msgstr "incapaz resolver '%s'"
 
-#: sequencer.c:3538
-#, fuzzy
+#: sequencer.c:3767
 msgid "cannot merge without a current revision"
-msgstr "não é possível efetuar '%s' sem um commit anterior"
+msgstr "incapaz juntar sem uma revisão currente"
 
-#: sequencer.c:3560
-#, fuzzy, c-format
+#: sequencer.c:3789
+#, c-format
 msgid "unable to parse '%.*s'"
-msgstr "não foi possível criar '%s'"
+msgstr "incapaz processar '%.*s'"
 
-#: sequencer.c:3569
-#, fuzzy, c-format
+#: sequencer.c:3798
+#, c-format
 msgid "nothing to merge: '%.*s'"
-msgstr "ignorado não integrado: '%.*s'"
+msgstr "nada a juntar: '%.*s'"
 
-#: sequencer.c:3581
+#: sequencer.c:3810
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
 
-#: sequencer.c:3597
-#, fuzzy, c-format
+#: sequencer.c:3826
+#, c-format
 msgid "could not get commit message of '%s'"
-msgstr "não foi possível ler a mensagem de commit de %s"
+msgstr "incapaz obter mensagem de commit de '%s'"
 
-#: sequencer.c:3780
-#, fuzzy, c-format
+#: sequencer.c:4009
+#, c-format
 msgid "could not even attempt to merge '%.*s'"
-msgstr "não foi possível validar a tag '%s'"
+msgstr "incapaz de tentar juntar '%.*s'"
 
-#: sequencer.c:3796
-#, fuzzy
+#: sequencer.c:4025
 msgid "merge: Unable to write new index file"
 msgstr "merge: Incapaz de escrever novo ficheiro index"
 
-#: sequencer.c:3870
+#: sequencer.c:4099
 msgid "Cannot autostash"
 msgstr "Incapaz de arrumar automaticamente (autostash)"
 
-#: sequencer.c:3873
-#, fuzzy, c-format
+#: sequencer.c:4102
+#, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Resposta de squash inexperada: '%s'"
 
-#: sequencer.c:3879
-#, fuzzy, c-format
+#: sequencer.c:4108
+#, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Incapaz de criar a pasta para '%s'"
 
-#: sequencer.c:3882
-#, fuzzy, c-format
+#: sequencer.c:4111
+#, c-format
 msgid "Created autostash: %s\n"
 msgstr "Criado autostash: %s\n"
 
-#: sequencer.c:3886
-#, fuzzy
+#: sequencer.c:4115
 msgid "could not reset --hard"
-msgstr "não foi possível ler orig-head"
+msgstr "incapaz restabelecer com --hard"
 
-#: sequencer.c:3911
-#, fuzzy, c-format
+#: sequencer.c:4140
+#, c-format
 msgid "Applied autostash.\n"
 msgstr "Autostash aplicado.\n"
 
-#: sequencer.c:3923
+#: sequencer.c:4152
 #, c-format
 msgid "cannot store %s"
-msgstr "não é possível guardar %s"
+msgstr "incapaz guardar %s"
 
-#: sequencer.c:3926
-#, fuzzy, c-format
+#: sequencer.c:4155
+#, c-format
 msgid ""
 "%s\n"
 "Your changes are safe in the stash.\n"
@@ -7568,30 +8215,29 @@ msgstr ""
 "As suas alterações estão guardadas na pilha.\n"
 "Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n"
 
-#: sequencer.c:3931
-#, fuzzy
+#: sequencer.c:4160
 msgid "Applying autostash resulted in conflicts."
 msgstr "Patch aplicado a '%s' com conflitos."
 
-#: sequencer.c:3932
+#: sequencer.c:4161
 msgid "Autostash exists; creating a new stash entry."
 msgstr ""
 
-#: sequencer.c:4025 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
 msgid "could not detach HEAD"
-msgstr "não foi possível destacar HEAD"
+msgstr "incapaz desanexar HEAD"
 
-#: sequencer.c:4040
-#, fuzzy, c-format
+#: sequencer.c:4248
+#, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Parou no HEAD\n"
 
-#: sequencer.c:4042
-#, fuzzy, c-format
+#: sequencer.c:4250
+#, c-format
 msgid "Stopped at %s\n"
-msgstr "Parou a %s...  %.*s\n"
+msgstr "Parou em %s\n"
 
-#: sequencer.c:4050
+#: sequencer.c:4258
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -7604,58 +8250,58 @@ msgid ""
 "    git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:4096
+#: sequencer.c:4304
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr ""
 
-#: sequencer.c:4141
+#: sequencer.c:4350
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Parou no %s...  %.*s\n"
 
-#: sequencer.c:4212
+#: sequencer.c:4421
 #, c-format
 msgid "unknown command %d"
 msgstr "comando desconhecido %d"
 
-#: sequencer.c:4271
+#: sequencer.c:4480
 msgid "could not read orig-head"
-msgstr "não foi possível ler orig-head"
+msgstr "incapaz ler orig-head"
 
-#: sequencer.c:4276
+#: sequencer.c:4485
 msgid "could not read 'onto'"
-msgstr "não foi possível ler 'onto'"
+msgstr "incapaz ler 'onto'"
 
-#: sequencer.c:4290
+#: sequencer.c:4499
 #, c-format
 msgid "could not update HEAD to %s"
-msgstr "não foi possível atualizar HEAD para %s"
+msgstr "incapaz atualizar HEAD para %s"
 
-#: sequencer.c:4350
-#, fuzzy, c-format
+#: sequencer.c:4559
+#, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "O %s foi rebaseado e atualizado com sucesso.\n"
 
-#: sequencer.c:4383
+#: sequencer.c:4611
 msgid "cannot rebase: You have unstaged changes."
-msgstr "não é possível rebasear: tem alterações não preparadas."
+msgstr "incapaz rebasear: tem alterações despreparadas."
 
-#: sequencer.c:4392
+#: sequencer.c:4620
 msgid "cannot amend non-existing commit"
-msgstr "não é possível emendar commit não-existente"
+msgstr "incapaz emendar commit inexistente"
 
-#: sequencer.c:4394
+#: sequencer.c:4622
 #, c-format
 msgid "invalid file: '%s'"
-msgstr "ficheiro inválido: '%s'"
+msgstr ""
 
-#: sequencer.c:4396
+#: sequencer.c:4624
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "conteúdo inválido: '%s'"
 
-#: sequencer.c:4399
+#: sequencer.c:4627
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7665,59 +8311,57 @@ msgstr ""
 "Tem alterações por submeter na árvore de trabalho. Submeta-as primeiro\n"
 "e execute 'git rebase --continue' de novo."
 
-#: sequencer.c:4435 sequencer.c:4474
-#, fuzzy, c-format
+#: sequencer.c:4663 sequencer.c:4702
+#, c-format
 msgid "could not write file: '%s'"
-msgstr "não foi possível criar o ficheiro '%s'"
+msgstr "incapaz escrever ficheiro: '%s'"
 
-#: sequencer.c:4490
+#: sequencer.c:4718
 msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "não foi possível remover CHERRY_PICK_HEAD"
+msgstr "incapaz remover CHERRY_PICK_HEAD"
 
-#: sequencer.c:4497
+#: sequencer.c:4725
 msgid "could not commit staged changes."
-msgstr "não foi possível submeter as alterações preparadas."
+msgstr "incapaz commit alterações preparadas."
 
-#: sequencer.c:4613
+#: sequencer.c:4845
 #, c-format
 msgid "%s: can't cherry-pick a %s"
-msgstr "%s: não é possível efetuar cherry-pick de %s"
+msgstr "%s: incapaz apanhar um %s"
 
-#: sequencer.c:4617
+#: sequencer.c:4849
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisão incorreta"
 
-#: sequencer.c:4652
+#: sequencer.c:4884
 msgid "can't revert as initial commit"
-msgstr "não é possível reverter como commit inicial"
+msgstr "incapaz reverter como commit inicial"
 
-#: sequencer.c:5129
+#: sequencer.c:5361
 msgid "make_script: unhandled options"
 msgstr ""
 
-#: sequencer.c:5132
+#: sequencer.c:5364
 msgid "make_script: error preparing revisions"
 msgstr ""
 
-#: sequencer.c:5374 sequencer.c:5391
-#, fuzzy
+#: sequencer.c:5614 sequencer.c:5631
 msgid "nothing to do"
 msgstr "nada a fazer"
 
-#: sequencer.c:5410
-#, fuzzy
+#: sequencer.c:5650
 msgid "could not skip unnecessary pick commands"
 msgstr "incapaz de saltar comandos pick desnecessários"
 
-#: sequencer.c:5504
+#: sequencer.c:5750
 msgid "the script was already rearranged."
 msgstr ""
 
 #: setup.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is outside repository at '%s'"
-msgstr "%s: '%s' está fora do repositório"
+msgstr "%s está fora do repositório em '%s'"
 
 #: setup.c:185
 #, c-format
@@ -7736,15 +8380,14 @@ msgid ""
 "Use '--' to separate paths from revisions, like this:\n"
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
-"argumento ambíguo '%s': revisão ou caminho desconhecidos não encontrado na "
-"árvore de trabalho.\n"
-"Use '--' para separar caminhos de revisões, assim:\n"
+"argumento ambíguo '%s': revisão desconhecida ou path fora da working tree.\n"
+"Usa '--' para separar paths de revisões, assim:\n"
 "'git <comando> [<revisão>...] -- [<ficheiro>...]'"
 
 #: setup.c:264
-#, fuzzy, c-format
+#, c-format
 msgid "option '%s' must come before non-option arguments"
-msgstr "parar de analisar depois do primeiro argumento que não seja uma opção"
+msgstr "opção '%s' tem de vir antes argumentos diferentes de opção"
 
 #: setup.c:283
 #, c-format
@@ -7758,109 +8401,110 @@ msgstr ""
 "'git <comando> [<revisão>...] -- [<ficheiro>...]'"
 
 #: setup.c:419
-#, fuzzy
 msgid "unable to set up work tree using invalid config"
-msgstr "não é possível de obter o diretório de trabalho atual"
+msgstr "incapaz preparar work tree usando config inválido"
 
-#: setup.c:423
+#: setup.c:423 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr ""
 
-#: setup.c:661
+#: setup.c:658
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
-msgstr "Esperava-se versão do repositório git <= %d, obteve-se %d"
+msgstr "Esperava versão do repositório git <= %d, encontrei %d"
 
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr "extensões de repositório desconhecidas encontradas:"
+#: setup.c:666
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "extensão de repositório desconhecida encontrada:"
+msgstr[1] "extensões de repositório desconhecidas encontradas:"
 
-#: setup.c:681
-#, fuzzy
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "extensões de repositório desconhecidas encontradas:"
+#: setup.c:680
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "versão de repo é 0, mas encontrou-se extensão vi-only:"
+msgstr[1] "versão de repo é 0, mas encontrou-se extensões vi-only:"
 
-#: setup.c:700
-#, fuzzy, c-format
+#: setup.c:701
+#, c-format
 msgid "error opening '%s'"
-msgstr "falha ao abrir '%s'"
+msgstr ""
 
-#: setup.c:702
-#, fuzzy, c-format
+#: setup.c:703
+#, c-format
 msgid "too large to be a .git file: '%s'"
-msgstr "não foi possível ler o ficheiro de entrada '%s'"
+msgstr "demasiado grande para ser um ficheiro .git: '%s'"
 
-#: setup.c:704
-#, fuzzy, c-format
+#: setup.c:705
+#, c-format
 msgid "error reading %s"
-msgstr "Erro ao rematar %s."
+msgstr "erro lendo %s"
 
-#: setup.c:706
-#, fuzzy, c-format
+#: setup.c:707
+#, c-format
 msgid "invalid gitfile format: %s"
-msgstr "formato de data inválido: %s"
+msgstr "formato de ficheiro-git inválido: %s"
 
-#: setup.c:708
-#, fuzzy, c-format
+#: setup.c:709
+#, c-format
 msgid "no path in gitfile: %s"
-msgstr "gitfile sem path: %s"
+msgstr "ficheiro-git sem caminho: %s"
 
-#: setup.c:710
-#, fuzzy, c-format
+#: setup.c:711
+#, c-format
 msgid "not a git repository: %s"
 msgstr "é repositório git nenhum: %s"
 
-#: setup.c:812
+#: setup.c:813
 #, c-format
 msgid "'$%s' too big"
 msgstr ""
 
-#: setup.c:826
-#, fuzzy, c-format
+#: setup.c:827
+#, c-format
 msgid "not a git repository: '%s'"
 msgstr "é repositório git nenhum: '%s'"
 
-#: setup.c:855 setup.c:857 setup.c:888
-#, fuzzy, c-format
+#: setup.c:856 setup.c:858 setup.c:889
+#, c-format
 msgid "cannot chdir to '%s'"
-msgstr "não é possível mudar para o diretório %s"
+msgstr "incapaz chdir para '%s'"
 
-#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
-#, fuzzy
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
 msgid "cannot come back to cwd"
 msgstr "incapaz de voltar para cwd"
 
-#: setup.c:987
-#, fuzzy, c-format
+#: setup.c:988
+#, c-format
 msgid "failed to stat '%*s%s%s'"
-msgstr "falha ao invocar stat de '%s'"
+msgstr ""
 
-#: setup.c:1225
+#: setup.c:1231
 msgid "Unable to read current working directory"
 msgstr "Incapaz de ler pasta atual de trabalho"
 
-#: setup.c:1234 setup.c:1240
-#, fuzzy, c-format
+#: setup.c:1240 setup.c:1246
+#, c-format
 msgid "cannot change to '%s'"
-msgstr "não é possível mudar para '%s'"
+msgstr "incapaz mudar para '%s'"
 
-#: setup.c:1245
-#, fuzzy, c-format
+#: setup.c:1251
+#, c-format
 msgid "not a git repository (or any of the parent directories): %s"
-msgstr "é repositório git nenhum (ou em pastas parente nenhuma): %s"
+msgstr "é repositório git nenhum (ou qualquer pastas parente): %s"
 
-#: setup.c:1251
-#, fuzzy, c-format
+#: setup.c:1257
+#, 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 ""
 "é repositório git nenhum (ou em pai nenhum até ao ponto de montagem %s)\n"
-"Parando na fronteira do sistema de ficheiros (GIT_DISCOVERY_ACROSS_FILESYSTEM "
-"indefinido)."
+"Parando na fronteira do sistema de ficheiros "
+"(GIT_DISCOVERY_ACROSS_FILESYSTEM indefinido)."
 
-#: setup.c:1362
-#, fuzzy, c-format
+#: setup.c:1381
+#, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
@@ -7868,455 +8512,102 @@ msgstr ""
 "Problema com o valor core.sharedRepository modo de ficheiro (0%.3o).\n"
 "O dono dos ficheiros tem de ter sempre permissões de leitura e escrita."
 
-#: setup.c:1409
-#, fuzzy
+#: setup.c:1430
 msgid "open /dev/null or dup failed"
-msgstr "falha ao abrir /dev/null"
+msgstr "abrir /dev/null ou dup falhou"
 
-#: setup.c:1424
-#, fuzzy
+#: setup.c:1445
 msgid "fork failed"
 msgstr "falha ao invocar fseek"
 
-#: setup.c:1429
-#, fuzzy
+#: setup.c:1450 t/helper/test-simple-ipc.c:285
 msgid "setsid failed"
-msgstr "falha ao executar o comando stash"
-
-#: sha1-file.c:480
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-
-#: sha1-file.c:531
-#, fuzzy, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "não foi possível analisar o objeto: %s"
-
-#: sha1-file.c:603
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr ""
-
-#: sha1-file.c:610
-#, fuzzy, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "não foi possível analisar o objeto: %s"
-
-#: sha1-file.c:653
-#, fuzzy
-msgid "unable to fdopen alternates lockfile"
-msgstr "não foi possível escrever os parâmetros no ficheiro de configuração"
-
-#: sha1-file.c:671
-#, fuzzy
-msgid "unable to read alternates file"
-msgstr "não foi possível ler o ficheiro de índice"
-
-#: sha1-file.c:678
-#, fuzzy
-msgid "unable to move new alternates file into place"
-msgstr "não foi possível escrever novo ficheiro de índice"
-
-#: sha1-file.c:713
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "o caminho '%s' não existe"
-
-#: sha1-file.c:734
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
-"ainda não é suportada a funcionalidade que permite ter o repositório de "
-"referência '%s' como uma extração ligada."
-
-#: sha1-file.c:740
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "o repositório de referência '%s' não é um repositório local."
-
-#: sha1-file.c:746
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "o repositório de referência '%s' é raso"
-
-#: sha1-file.c:754
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "o repositório de referência '%s' está enxertado"
 
-#: sha1-file.c:814
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
+#: sparse-index.c:162
+msgid "attempting to use sparse-index without cone mode"
 msgstr ""
 
-#: sha1-file.c:964
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr ""
-
-#: sha1-file.c:985
-#, fuzzy
-msgid "mmap failed"
-msgstr "%s falhou"
+#: sparse-index.c:176
+msgid "unable to update cache-tree, staying full"
+msgstr "incapaz atualizar árvore-cenário, mantendo-a cheia"
 
-#: sha1-file.c:1149
-#, fuzzy, c-format
-msgid "object file %s is empty"
-msgstr "objeto local %s corrompido"
-
-#: sha1-file.c:1284 sha1-file.c:2477
-#, fuzzy, c-format
-msgid "corrupt loose object '%s'"
-msgstr "não foi possível analisar o objeto '%s'"
-
-#: sha1-file.c:1286 sha1-file.c:2481
-#, fuzzy, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "não foi possível analisar o objeto: %s"
-
-#: sha1-file.c:1328
-#, fuzzy
-msgid "invalid object type"
-msgstr "tipo de objeto incorreto."
-
-#: sha1-file.c:1412
+#: sparse-index.c:263
 #, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
+msgid "index entry is a directory, but not sparse (%08x)"
 msgstr ""
 
-#: sha1-file.c:1415
-#, fuzzy, c-format
-msgid "unable to unpack %s header"
-msgstr "não foi possível atualizar %s"
-
-#: sha1-file.c:1421
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr ""
-
-#: sha1-file.c:1424
-#, fuzzy, c-format
-msgid "unable to parse %s header"
-msgstr "não foi possível atualizar %s"
-
-#: sha1-file.c:1651
-#, fuzzy, c-format
-msgid "failed to read object %s"
-msgstr "falha ao ler o objeto '%s'."
-
-#: sha1-file.c:1655
-#, fuzzy, c-format
-msgid "replacement %s not found for %s"
-msgstr "modelos não encontrados em %s"
-
-#: sha1-file.c:1659
-#, fuzzy, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "objeto local %s corrompido"
-
-#: sha1-file.c:1663
-#, fuzzy, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "objeto local %s corrompido"
-
-#: sha1-file.c:1768
-#, fuzzy, c-format
-msgid "unable to write file %s"
-msgstr "não foi possível escrever %s"
-
-#: sha1-file.c:1775
-#, fuzzy, c-format
-msgid "unable to set permission to '%s'"
-msgstr "não foi possível resolver revisão: %s"
-
-#: sha1-file.c:1782
-#, fuzzy
-msgid "file write error"
-msgstr "falha ao escrever para rev-list"
-
-#: sha1-file.c:1802
-#, fuzzy
-msgid "error when closing loose object file"
-msgstr "erro ao fechar ficheiro de pacote"
-
-#: sha1-file.c:1867
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-
-#: sha1-file.c:1869
-#, fuzzy
-msgid "unable to create temporary file"
-msgstr "não foi possível criar índice temporário"
-
-#: sha1-file.c:1893
-#, fuzzy
-msgid "unable to write loose object file"
-msgstr "não é possível escrever o objeto de nota"
-
-#: sha1-file.c:1899
-#, fuzzy, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "não é possível compactar objeto acrescentado (%d)"
-
-#: sha1-file.c:1903
-#, fuzzy, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "falha de fstat de %s"
-
-#: sha1-file.c:1907
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr ""
-
-#: sha1-file.c:1917 builtin/pack-objects.c:1086
-#, fuzzy, c-format
-msgid "failed utime() on %s"
-msgstr "falha ao abrir '%s'"
-
-#: sha1-file.c:1994
-#, fuzzy, c-format
-msgid "cannot read object for %s"
-msgstr "não foi possível ler o objeto %s"
-
-#: sha1-file.c:2045
-#, fuzzy
-msgid "corrupt commit"
-msgstr "substituir autor do commit"
-
-#: sha1-file.c:2053
-#, fuzzy
-msgid "corrupt tag"
-msgstr "mostrar tags"
-
-#: sha1-file.c:2153
-#, c-format
-msgid "read error while indexing %s"
-msgstr ""
-
-#: sha1-file.c:2156
-#, fuzzy, c-format
-msgid "short read while indexing %s"
-msgstr "não é possível ler o índice"
-
-#: sha1-file.c:2229 sha1-file.c:2239
-#, fuzzy, c-format
-msgid "%s: failed to insert into database"
-msgstr "gpg não assinou os dados"
-
-#: sha1-file.c:2245
-#, fuzzy, c-format
-msgid "%s: unsupported file type"
-msgstr "versão de índice %s não suportada"
-
-#: sha1-file.c:2269
-#, fuzzy, c-format
-msgid "%s is not a valid object"
-msgstr "%s não é um objeto '%s' válido"
-
-#: sha1-file.c:2271
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s não é um objeto '%s' válido"
-
-#: sha1-file.c:2298 builtin/index-pack.c:192
-#, c-format
-msgid "unable to open %s"
-msgstr "não foi possível abrir %s"
-
-#: sha1-file.c:2488 sha1-file.c:2541
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr ""
-
-#: sha1-file.c:2512
-#, fuzzy, c-format
-msgid "unable to mmap %s"
-msgstr "não foi possível abrir %s"
-
-#: sha1-file.c:2517
-#, fuzzy, c-format
-msgid "unable to unpack header of %s"
-msgstr "não foi possível atualizar %s"
-
-#: sha1-file.c:2523
-#, fuzzy, c-format
-msgid "unable to parse header of %s"
-msgstr "não foi possível ler %s"
-
-#: sha1-file.c:2534
-#, fuzzy, c-format
-msgid "unable to unpack contents of %s"
-msgstr "não é possível analisar o contacto: %s"
-
-#: sha1-name.c:486
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "SHA1 curto %s é ambíguo"
-
-#: sha1-name.c:497
-msgid "The candidates are:"
-msgstr "Os candidatos são:"
-
-#: sha1-name.c:796
-#, fuzzy
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Normalmente o Git nunca cria refs que terminem em 40 caracteres\n"
-"hexadecimais, porque será ignorada quando apenas se indica 40-hex.\n"
-"Poderam-se criar estas refs por engano. Como no exemplo,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"onde \"$br\" fica vazio e uma ref de 40-hex é criada. Por favor\n"
-"examine estas refs e talvez apague-as. Desative esta mensagem\n"
-"executando \"git config advice.objectNameWarning false\""
-
-#: sha1-name.c:916
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr ""
-
-#: sha1-name.c:924
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr ""
-
-#: sha1-name.c:1702
-#, fuzzy, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "O caminho '%s' está dentro do submódulo '%.*s'"
-
-#: sha1-name.c:1708
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-
-#: sha1-name.c:1717
-#, fuzzy, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "o caminho '%s' não existe"
-
-#: sha1-name.c:1745
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-
-#: sha1-name.c:1761
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-
-#: sha1-name.c:1769
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr ""
-
-#: sha1-name.c:1771
-#, fuzzy, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "o caminho '%s' não tem a versão deles"
-
-#: sha1-name.c:1784
-#, fuzzy
-msgid "relative path syntax can't be used outside working tree"
-msgstr ""
-"Os caminhos relativos só podem ser usados a partir do topo da árvore de "
-"trabalho"
-
-#: sha1-name.c:1922
-#, fuzzy, c-format
-msgid "invalid object name '%.*s'."
-msgstr "Nome de objeto inválido: '%s'."
-
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:848
+#: strbuf.c:850
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr ""
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:850
+#: strbuf.c:852
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr ""
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:858
+#: strbuf.c:860
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr ""
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:860
+#: strbuf.c:862
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr ""
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:867
+#: strbuf.c:869
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr ""
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:869
+#: strbuf.c:871
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr ""
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:875
-#, fuzzy, c-format
+#: strbuf.c:877
+#, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
-msgstr[0] "bytes"
-msgstr[1] "bytes"
+msgstr[0] "%u byte"
+msgstr[1] "%u bytes"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:877
-#, fuzzy, c-format
+#: strbuf.c:879
+#, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
-msgstr[0] "bytes"
-msgstr[1] "bytes"
+msgstr[0] "%u byte/s"
+msgstr[1] "%u bytes/s"
 
-#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
-#: builtin/rebase.c:864
+#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
+#: builtin/rebase.c:866
 #, c-format
 msgid "could not open '%s' for writing"
-msgstr "não foi possível abrir '%s' para escrita"
+msgstr "incapaz abrir '%s' para escrita"
 
-#: strbuf.c:1175
-#, fuzzy, c-format
+#: strbuf.c:1177
+#, c-format
 msgid "could not edit '%s'"
-msgstr "não foi possível ler '%s'"
+msgstr "incapaz editar '%s'"
 
 #: submodule-config.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring suspicious submodule name: %s"
-msgstr "a referência %s com nome danificado foi ignorada"
+msgstr "ignorando nome suspeito de submódulo: %s"
 
 #: submodule-config.c:304
-#, fuzzy
 msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "não é permitido valores negativos em submodule.fetchJobs"
+msgstr "é proíbido valores negativos para submodule.fetchjobs"
 
 #: submodule-config.c:402
 #, c-format
@@ -8326,97 +8617,99 @@ msgstr ""
 #: submodule-config.c:499
 #, c-format
 msgid "invalid value for %s"
-msgstr "valor inválido de %s"
+msgstr ""
 
 #: submodule-config.c:766
 #, c-format
 msgid "Could not update .gitmodules entry %s"
-msgstr "Incapaz de atualizar entrada de .gitmodules %s"
+msgstr "Incapaz de atualizar entrada %s de .gitmodules"
 
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
-msgstr "Incapaz de alterar .gitmodules por juntar, resolve os conflitos "
-"de junção primeiro"
+msgstr ""
+"Incapaz de alterar .gitmodules por juntar, resolve primeiro os conflitos de junção"
 
 #: submodule.c:118 submodule.c:147
 #, c-format
 msgid "Could not find section in .gitmodules where path=%s"
-msgstr "Secção de .gitmodules cujo path=%s não encontrada"
+msgstr "Secção de .gitmodules cujo path=%s por encontrar"
 
 #: submodule.c:154
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
-msgstr "Incapaz de remover a entrada de .gitmodules para %s"
+msgstr "Incapaz de remover a entrada %s de .gitmodules"
 
 #: submodule.c:165
 msgid "staging updated .gitmodules failed"
-msgstr "falha ao preparar .gitmodules atualizado"
+msgstr "encenação atualizada .gitmodules falhou"
 
-#: submodule.c:327
-#, fuzzy, c-format
+#: submodule.c:328
+#, c-format
 msgid "in unpopulated submodule '%s'"
-msgstr "A ignorar submódulo '%s'"
+msgstr "em submódulo despopulado '%s'"
 
-#: submodule.c:358
+#: submodule.c:359
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "O caminho '%s' está dentro do submódulo '%.*s'"
+msgstr "Espetro-caminho '%s' está no submódulo '%.*s'"
 
-#: submodule.c:434
-#, fuzzy, c-format
+#: submodule.c:436
+#, c-format
 msgid "bad --ignore-submodules argument: %s"
-msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
+msgstr ""
 
-#: submodule.c:816
+#: submodule.c:805
 #, c-format
 msgid ""
 "Submodule in commit %s at path: '%s' collides with a submodule named the "
 "same. Skipping it."
 msgstr ""
 
-#: submodule.c:919
-#, fuzzy, c-format
+#: submodule.c:908
+#, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr "%s %s não é um commit!"
+msgstr "entrada submódulo '%s' (%s) é um(a) %s, não um commit"
 
-#: submodule.c:1004
-#, fuzzy, c-format
+#: submodule.c:993
+#, c-format
 msgid ""
 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
 "submodule %s"
-msgstr "não foi possível executar 'git status' no submódulo '%s'"
+msgstr ""
+"Incapaz executar comando 'git rev-list <commits> --not --remotes -n 1' "
+"emsubmódulo %s"
 
-#: submodule.c:1127
-#, fuzzy, c-format
+#: submodule.c:1116
+#, c-format
 msgid "process for submodule '%s' failed"
-msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
+msgstr "processo para submódulo '%s' falhou"
 
-#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Falha ao resolver HEAD numa referência válida."
 
-#: submodule.c:1167
-#, fuzzy, c-format
+#: submodule.c:1156
+#, c-format
 msgid "Pushing submodule '%s'\n"
-msgstr "A ignorar submódulo '%s'\n"
+msgstr "Atirando submódulo '%s'\n"
 
-#: submodule.c:1170
-#, fuzzy, c-format
+#: submodule.c:1159
+#, c-format
 msgid "Unable to push submodule '%s'\n"
 msgstr "Impossível enviar submódulo '%s'\n"
 
-#: submodule.c:1462
-#, fuzzy, c-format
+#: submodule.c:1451
+#, c-format
 msgid "Fetching submodule %s%s\n"
 msgstr "Buscando submódulo %s%s\n"
 
-#: submodule.c:1492
-#, fuzzy, c-format
+#: submodule.c:1485
+#, c-format
 msgid "Could not access submodule '%s'\n"
 msgstr "Submódulo '%s' inacessível\n"
 
-#: submodule.c:1646
-#, fuzzy, c-format
+#: submodule.c:1640
+#, c-format
 msgid ""
 "Errors during submodule fetch:\n"
 "%s"
@@ -8424,80 +8717,78 @@ msgstr ""
 "Erros na busca do submódulo:\n"
 "%s"
 
-#: submodule.c:1671
+#: submodule.c:1665
 #, c-format
 msgid "'%s' not recognized as a git repository"
-msgstr "'%s' não é reconhecido como um repositório git"
+msgstr "'%s' é irreconhecível como um repositório git"
 
-#: submodule.c:1688
-#, fuzzy, c-format
+#: submodule.c:1682
+#, c-format
 msgid "Could not run 'git status --porcelain=2' in submodule %s"
-msgstr "não foi possível executar 'git status' no submódulo '%s'"
+msgstr "Incapaz executar 'git status --porcelain=2' no submódulo %s"
 
-#: submodule.c:1729
-#, fuzzy, c-format
+#: submodule.c:1723
+#, c-format
 msgid "'git status --porcelain=2' failed in submodule %s"
-msgstr "não foi possível executar 'git status' no submódulo '%s'"
+msgstr "'git status --porcelain=2' falhou no submódulo %s"
 
-#: submodule.c:1804
+#: submodule.c:1798
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
-msgstr "não foi possível iniciar 'git status' no submódulo '%s'"
+msgstr "incapaz iniciar 'git status' no submódulo '%s'"
 
-#: submodule.c:1817
+#: submodule.c:1811
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
-msgstr "não foi possível executar 'git status' no submódulo '%s'"
+msgstr "incapaz executar 'git status' no submódulo '%s'"
 
-#: submodule.c:1832
-#, fuzzy, c-format
+#: submodule.c:1826
+#, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "Incapaz de remover a definição core.worktree em submódulo '%s'"
 
-#: submodule.c:1859 submodule.c:2169
+#: submodule.c:1853 submodule.c:2163
 #, c-format
 msgid "could not recurse into submodule '%s'"
-msgstr "não foi possível percorrer recursivamente o submódulo '%s'"
+msgstr "incapaz percorrer recursivamente o submódulo '%s'"
 
-#: submodule.c:1880
-#, fuzzy
+#: submodule.c:1874
 msgid "could not reset submodule index"
-msgstr "não foi possível percorrer recursivamente o submódulo '%s'"
+msgstr "incapaz repor index de submódulo"
 
-#: submodule.c:1922
+#: submodule.c:1916
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "o submódulo '%s' tem índice sujo"
 
-#: submodule.c:1974
-#, fuzzy, c-format
+#: submodule.c:1968
+#, c-format
 msgid "Submodule '%s' could not be updated."
-msgstr "Submódulos alterados mas não atualizados:"
+msgstr "Submódulo '%s' incapaz de ser atualizado."
 
-#: submodule.c:2042
+#: submodule.c:2036
 #, c-format
 msgid "submodule git dir '%s' is inside git dir '%.*s'"
 msgstr ""
 
-#: submodule.c:2063
+#: submodule.c:2057
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr ""
-"relocate_gitdir para submodule '%s' com mais do que uma árvore de trabalho "
-"não suportado"
+"relocate_gitdir para submodúlo '%s' com mais que uma worktree é insustentado"
 
-#: submodule.c:2075 submodule.c:2134
+#: submodule.c:2069 submodule.c:2128
 #, c-format
 msgid "could not lookup name for submodule '%s'"
-msgstr "não foi possível procurar pelo submódulo '%s'"
+msgstr "incapaz procurar nome para submódulo '%s'"
 
-#: submodule.c:2079
+#: submodule.c:2073
 #, c-format
 msgid "refusing to move '%s' into an existing git dir"
 msgstr ""
 
-#: submodule.c:2086
+#: submodule.c:2080
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -8508,76 +8799,81 @@ msgstr ""
 "'%s' para\n"
 "'%s'\n"
 
-#: submodule.c:2214
+#: submodule.c:2208
 msgid "could not start ls-files in .."
-msgstr "não foi possível iniciar ls-files em .."
+msgstr "incapaz iniciar ls-files em .."
 
-#: submodule.c:2254
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree retornou código de retorno inesperado %d"
 
-#: trailer.c:236
+#: symlinks.c:244
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr ""
+
+#: trailer.c:244
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "falha ao executar o comando trailer '%s'"
 
-#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551
-#: trailer.c:555
+#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566
+#: trailer.c:570
 #, c-format
 msgid "unknown value '%s' for key '%s'"
-msgstr "valor desconhecido '%s' da chave '%s'"
+msgstr "valor desconhecido '%s' para chave '%s'"
 
-#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
+#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
+#: builtin/remote.c:324
 #, c-format
 msgid "more than one %s"
 msgstr "mais do que um %s"
 
-#: trailer.c:728
+#: trailer.c:743
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "token terminador vazio no terminador '%.*s'"
 
-#: trailer.c:748
+#: trailer.c:763
 #, c-format
 msgid "could not read input file '%s'"
-msgstr "não foi possível ler o ficheiro de entrada '%s'"
+msgstr "incapaz ler ficheiro de entrada '%s'"
 
-#: trailer.c:751
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
 msgid "could not read from stdin"
-msgstr "não foi possível ler da entrada padrão"
+msgstr "incapaz ler da entrada padrão"
 
-#: trailer.c:1009 wrapper.c:676
+#: trailer.c:1024 wrapper.c:676
 #, c-format
 msgid "could not stat %s"
-msgstr "não foi possível obter stat de %s"
+msgstr "incapaz stat %s"
 
-#: trailer.c:1011
+#: trailer.c:1026
 #, c-format
 msgid "file %s is not a regular file"
-msgstr "o ficheiro %s não é um ficheiro regular"
+msgstr "ficheiro %s é ficheiro regular nenhum"
 
-#: trailer.c:1013
+#: trailer.c:1028
 #, c-format
 msgid "file %s is not writable by user"
-msgstr "o ficheiro %s não pode ser escrito pelo utilizador"
+msgstr "ficheiro %s é não-escrevível para utilizador"
 
-#: trailer.c:1025
+#: trailer.c:1040
 msgid "could not open temporary file"
-msgstr "não foi possível abrir ficheiro temporário"
+msgstr "incapaz abrir ficheiro temporário"
 
-#: trailer.c:1065
+#: trailer.c:1080
 #, c-format
 msgid "could not rename temporary file to %s"
-msgstr "não foi possível mudar o nome do ficheiro temporário para %s"
+msgstr "incapaz renomear ficheiro temporário para %s"
 
 #: transport-helper.c:62 transport-helper.c:91
-#, fuzzy
 msgid "full write to remote helper failed"
-msgstr "imprimir estado do programa auxiliar remoto"
+msgstr "escrita completa para ajudante remoto falhou"
 
 #: transport-helper.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "incapaz de encontrar helper remoto para '%s'"
 
@@ -8597,32 +8893,30 @@ msgid "this remote helper should implement refspec capability"
 msgstr ""
 
 #: transport-helper.c:287 transport-helper.c:429
-#, fuzzy, c-format
+#, c-format
 msgid "%s unexpectedly said: '%s'"
-msgstr "blob para %s '%s' esperado"
+msgstr ""
 
 #: transport-helper.c:417
-#, fuzzy, c-format
+#, c-format
 msgid "%s also locked %s"
-msgstr "'%s' não está trancada"
+msgstr "%s também trancou %s"
 
 #: transport-helper.c:497
-#, fuzzy
 msgid "couldn't run fast-import"
-msgstr "não foi possível executar o comando stash."
+msgstr "incapaz executar fast-import"
 
 #: transport-helper.c:520
-#, fuzzy
 msgid "error while running fast-import"
-msgstr "erro ao fechar ficheiro de pacote"
+msgstr ""
 
-#: transport-helper.c:549 transport-helper.c:1236
-#, fuzzy, c-format
+#: transport-helper.c:549 transport-helper.c:1247
+#, c-format
 msgid "could not read ref %s"
 msgstr "incapaz de ler ref %s"
 
 #: transport-helper.c:594
-#, fuzzy, c-format
+#, c-format
 msgid "unknown response to connect: %s"
 msgstr "resposta de conexão desconhecida: %s"
 
@@ -8631,136 +8925,136 @@ msgid "setting remote service path not supported by protocol"
 msgstr ""
 
 #: transport-helper.c:618
-#, fuzzy
 msgid "invalid remote service path"
-msgstr "referência inválida: %s"
+msgstr ""
 
-#: transport-helper.c:661 transport.c:1446
-#, fuzzy
+#: transport-helper.c:661 transport.c:1477
 msgid "operation not supported by protocol"
-msgstr "opção não suportada com --recurse-submodules."
+msgstr "opção insustentado pelo protocolo"
 
 #: transport-helper.c:664
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr ""
 
-#: transport-helper.c:745
+#: transport-helper.c:693 transport.c:400
+msgid "--negotiate-only requires protocol v2"
+msgstr ""
+
+#: transport-helper.c:755
 msgid "'option' without a matching 'ok/error' directive"
 msgstr ""
 
-#: transport-helper.c:788
-#, fuzzy, c-format
+#: transport-helper.c:798
+#, c-format
 msgid "expected ok/error, helper said '%s'"
-msgstr "blob para %s '%s' esperado"
+msgstr ""
 
-#: transport-helper.c:845
-#, fuzzy, c-format
+#: transport-helper.c:855
+#, c-format
 msgid "helper reported unexpected status of %s"
-msgstr "ls-tree retornou código de retorno inesperado %d"
+msgstr "helper reportou código de status inesperado de %s"
 
-#: transport-helper.c:928
-#, fuzzy, c-format
+#: transport-helper.c:938
+#, c-format
 msgid "helper %s does not support dry-run"
-msgstr "O servidor não suporta --deepen"
+msgstr "helper %s insustenta dry-run"
 
-#: transport-helper.c:931
-#, fuzzy, c-format
+#: transport-helper.c:941
+#, c-format
 msgid "helper %s does not support --signed"
-msgstr "O servidor não suporta --shallow-since"
+msgstr "helper %s insustenta --signed"
 
-#: transport-helper.c:934
-#, fuzzy, c-format
+#: transport-helper.c:944
+#, c-format
 msgid "helper %s does not support --signed=if-asked"
-msgstr "o recetor não suporta publicação com --signed"
+msgstr "helper %s insustenta --signed=if-asked"
 
-#: transport-helper.c:939
-#, fuzzy, c-format
+#: transport-helper.c:949
+#, c-format
 msgid "helper %s does not support --atomic"
-msgstr "O servidor não suporta --shallow-since"
+msgstr "helper %s insustenta --atomic"
 
-#: transport-helper.c:943
-#, fuzzy, c-format
+#: transport-helper.c:953
+#, c-format
 msgid "helper %s does not support --%s"
-msgstr "O servidor não suporta --shallow-since"
+msgstr "helper %s insustenta --%s"
 
-#: transport-helper.c:950
-#, fuzzy, c-format
+#: transport-helper.c:960
+#, c-format
 msgid "helper %s does not support 'push-option'"
-msgstr "o recetor não suporta opções de publicação"
+msgstr "helper %s insustenta 'push-option'"
 
-#: transport-helper.c:1050
+#: transport-helper.c:1060
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 
-#: transport-helper.c:1055
-#, fuzzy, c-format
+#: transport-helper.c:1065
+#, c-format
 msgid "helper %s does not support 'force'"
-msgstr "O servidor não suporta --deepen"
+msgstr "helper %s insustenta 'force'"
 
-#: transport-helper.c:1102
-#, fuzzy
+#: transport-helper.c:1112
 msgid "couldn't run fast-export"
-msgstr "não foi possível executar o comando stash."
+msgstr "incapaz executar fast-export"
 
-#: transport-helper.c:1107
-#, fuzzy
+#: transport-helper.c:1117
 msgid "error while running fast-export"
-msgstr "erro ao fechar ficheiro de pacote"
+msgstr ""
 
-#: transport-helper.c:1132
+#: transport-helper.c:1142
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
 "Perhaps you should specify a branch.\n"
 msgstr ""
 
-#: transport-helper.c:1213
-#, fuzzy, c-format
+#: transport-helper.c:1224
+#, c-format
 msgid "unsupported object format '%s'"
-msgstr "objeto malformado em '%s'"
+msgstr "formato de objeto '%s' insustentado"
 
-#: transport-helper.c:1222
-#, fuzzy, c-format
+#: transport-helper.c:1233
+#, c-format
 msgid "malformed response in ref list: %s"
-msgstr "folha de opções malformada: '%s'"
+msgstr "resposta em lista de ref malformada: %s"
 
-#: transport-helper.c:1374
-#, fuzzy, c-format
+#: transport-helper.c:1385
+#, c-format
 msgid "read(%s) failed"
-msgstr "%s falhou"
+msgstr ""
 
-#: transport-helper.c:1401
-#, fuzzy, c-format
+#: transport-helper.c:1412
+#, c-format
 msgid "write(%s) failed"
-msgstr "%s falhou"
+msgstr ""
 
-#: transport-helper.c:1450
-#, fuzzy, c-format
+#: transport-helper.c:1461
+#, c-format
 msgid "%s thread failed"
-msgstr "%s falhou"
+msgstr ""
 
-#: transport-helper.c:1454
-#, fuzzy, c-format
+#: transport-helper.c:1465
+#, c-format
 msgid "%s thread failed to join: %s"
-msgstr "falha ao abrir '%s'"
+msgstr ""
 
-#: transport-helper.c:1473 transport-helper.c:1477
+#: transport-helper.c:1484 transport-helper.c:1488
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr ""
 
-#: transport-helper.c:1514
+#: transport-helper.c:1525
 #, c-format
 msgid "%s process failed to wait"
 msgstr ""
 
-#: transport-helper.c:1518
-#, fuzzy, c-format
+#: transport-helper.c:1529
+#, c-format
 msgid "%s process failed"
-msgstr "%s falhou"
+msgstr ""
 
-#: transport-helper.c:1536 transport-helper.c:1545
+#: transport-helper.c:1547 transport-helper.c:1556
 msgid "can't start thread for copying data"
 msgstr ""
 
@@ -8770,47 +9064,50 @@ msgid "Would set upstream of '%s' to '%s' of '%s'\n"
 msgstr "Iria definir o ramo a montante de '%s' como '%s' de '%s'\n"
 
 #: transport.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "could not read bundle '%s'"
-msgstr "não foi possível ler o ficheiro '%s'"
+msgstr "incapaz ler conjunto '%s'"
 
-#: transport.c:220
+#: transport.c:223
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transporte: opção de profundidade '%s' inválida"
 
-#: transport.c:269
+#: transport.c:275
 msgid "see protocol.version in 'git help config' for more details"
 msgstr ""
 
-#: transport.c:270
+#: transport.c:276
 msgid "server options require protocol version 2 or later"
 msgstr ""
 
-#: transport.c:727
-#, fuzzy
+#: transport.c:403
+msgid "server does not support wait-for-done"
+msgstr "Servidor insustenta wait-for-done"
+
+#: transport.c:755
 msgid "could not parse transport.color.* config"
-msgstr "não foi possível analisar o autor do script"
+msgstr "incapaz processar config transport.color.*"
 
-#: transport.c:802
+#: transport.c:830
 msgid "support for protocol v2 not implemented yet"
 msgstr ""
 
-#: transport.c:936
-#, fuzzy, c-format
+#: transport.c:965
+#, c-format
 msgid "unknown value for config '%s': %s"
-msgstr "valor desconhecido '%s' da chave '%s'"
+msgstr "valor para config '%s' desconhecido: %s"
 
-#: transport.c:1002
-#, fuzzy, c-format
+#: transport.c:1031
+#, c-format
 msgid "transport '%s' not allowed"
-msgstr "ramo '%s' não encontrado."
+msgstr "transport '%s' proibido"
 
-#: transport.c:1055
+#: transport.c:1084
 msgid "git-over-rsync is no longer supported"
 msgstr ""
 
-#: transport.c:1157
+#: transport.c:1187
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -8819,7 +9116,7 @@ msgstr ""
 "Os seguintes paths de submódulo contêm alterações que\n"
 "puderam ser encontradas em remoto nenhum:\n"
 
-#: transport.c:1161
+#: transport.c:1191
 #, c-format
 msgid ""
 "\n"
@@ -8846,32 +9143,31 @@ msgstr ""
 "para publicá-las no remoto.\n"
 "\n"
 
-#: transport.c:1169
+#: transport.c:1199
 msgid "Aborting."
 msgstr "Abortado."
 
-#: transport.c:1315
-#, fuzzy
+#: transport.c:1346
 msgid "failed to push all needed submodules"
-msgstr "Falha ao adicionar o submódulo '$sm_path'"
+msgstr "falhou ao atirar todos os submódulos necessários"
 
-#: tree-walk.c:32
+#: tree-walk.c:33
 msgid "too-short tree object"
 msgstr "objeto árvore demasiado curto"
 
-#: tree-walk.c:38
+#: tree-walk.c:39
 msgid "malformed mode in tree entry"
 msgstr "modo na entrada de árvore malformado"
 
-#: tree-walk.c:42
+#: tree-walk.c:43
 msgid "empty filename in tree entry"
 msgstr "nome de ficheiro vazio na entrada de árvore"
 
-#: tree-walk.c:117
+#: tree-walk.c:118
 msgid "too-short tree file"
 msgstr "ficheiro de árvore demasiado curto"
 
-#: unpack-trees.c:113
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -8881,7 +9177,7 @@ msgstr ""
 "extrair:\n"
 "%%sSubmeta as suas alterações ou esconda-as antes de trocar de ramo."
 
-#: unpack-trees.c:115
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -8891,7 +9187,7 @@ msgstr ""
 "extrair:\n"
 "%%s"
 
-#: unpack-trees.c:118
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -8901,7 +9197,7 @@ msgstr ""
 "integrar:\n"
 "%%sSubmeta as suas alterações ou esconda-as antes de integrar."
 
-#: unpack-trees.c:120
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -8911,17 +9207,17 @@ msgstr ""
 "integrar:\n"
 "%%s"
 
-#: unpack-trees.c:123
+#: unpack-trees.c:125
 #, 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 ""
-"As suas alterações locais nos seguintes ficheiros seriam substituídas por "
+"As tuas alterações locais aos seguintes ficheiros seriam substituídas por "
 "%s:\n"
-"%%sSubmeta as suas alterações ou esconda-as antes de efetuar %s."
+"%%sPor favor, faz commit ou stash às alterações antes de fazer %s."
 
-#: unpack-trees.c:125
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -8931,144 +9227,137 @@ msgstr ""
 "%s:\n"
 "%%s"
 
-#: unpack-trees.c:130
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 "%s"
 msgstr ""
-"Atualizar os seguintes diretórios perde os ficheiros não controlos dentro "
-"deles:\n"
+"Atualizar as seguintes pastas fará perder os seus ficheiros por seguir:\n"
 "%s"
 
-#: unpack-trees.c:134
+#: unpack-trees.c:136
 #, 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 ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
-"removidos ao extrair:\n"
-"%%sMova ou remova-os antes de trocar de ramos."
+"Os seguintes ficheiros por seguir da worktree seriam removidos no checkout:\n"
+"%%sPor favor, move ou remove-os antes de trocar de ramos."
 
-#: unpack-trees.c:136
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
-"removidos ao extrair:\n"
+"Os seguintes ficheiros por seguir da worktree seriam removidos no checkout:\n"
 "%%s"
 
-#: unpack-trees.c:139
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
-"removidos ao integrar:\n"
-"%%sPor favor, mova ou remova-os antes de integrar."
+"Os seguintes ficheiros por seguir da worktree seriam removidos por uma "
+"junção:\n"
+"%%sPor favor, move ou remove-os antes da junção."
 
-#: unpack-trees.c:141
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
-"removidos ao integrar:\n"
+"Os seguintes ficheiros por seguir da worktree seriam removidos pela junção:\n"
 "%%s"
 
-#: unpack-trees.c:144
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
-"removidos por %s:\n"
-"%%sMova ou remova-os antes de efetuar %s."
+"Os seguintes ficheiros por seguir da worktree seriam removidos por %s:\n"
+"%%sPor favor, move ou remove-os antes de fazer %s."
 
-#: unpack-trees.c:146
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%s"
 msgstr ""
-"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
-"removidos por %s:\n"
+"Os seguintes ficheiros por seguir da árvore de trabalho seriam removidos por "
+"%s:\n"
 "%%s"
 
-#: unpack-trees.c:152
+#: unpack-trees.c:154
 #, 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 ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos ao extrair:\n"
-"%%sMova ou remova-os antes de trocar de ramos."
+"Os seguintes ficheiros por seguir da árvore de trabalho seriam substituídos "
+"por um checkout:\n"
+"%%sPor favor, move ou remove-os antes de trocar de ramos."
 
-#: unpack-trees.c:154
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
 "checkout:\n"
 "%%s"
 msgstr ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos ao extrair:\n"
+"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por "
+"checkout:\n"
 "%%s"
 
-#: unpack-trees.c:157
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos ao integrar:\n"
-"%%sMova ou remova-os antes de integrar."
+"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por "
+"junção:\n"
+"%%sPor favor, move ou remove-os antes de juntares."
 
-#: unpack-trees.c:159
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos ao integrar:\n"
+"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por "
+"junção:\n"
 "%%s"
 
-#: unpack-trees.c:162
+#: unpack-trees.c:164
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos por %s:\n"
-"%%sMova ou remova-os antes de efetuar %s."
+"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por %s:\n"
+"%%sPor favor, move ou remove-os antes de fazer %s."
 
-#: unpack-trees.c:164
+#: unpack-trees.c:166
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos por %s:\n"
+"Os seguintes ficheiros por seguir da worktree seriam sobrescritos por %s:\n"
 "%%s"
 
-#: unpack-trees.c:172
+#: unpack-trees.c:174
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Entrada '%s' sobrepõe-se a '%s'. Impossível vincular."
 
-#: unpack-trees.c:175
+#: unpack-trees.c:177
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -9077,7 +9366,7 @@ msgstr ""
 "Impossível atualizar submódulo:\n"
 "%s"
 
-#: unpack-trees.c:178
+#: unpack-trees.c:180
 #, c-format
 msgid ""
 "The following paths are not up to date and were left despite sparse "
@@ -9085,8 +9374,8 @@ msgid ""
 "%s"
 msgstr ""
 
-#: unpack-trees.c:180
-#, fuzzy, c-format
+#: unpack-trees.c:182
+#, c-format
 msgid ""
 "The following paths are unmerged and were left despite sparse patterns:\n"
 "%s"
@@ -9095,7 +9384,7 @@ msgstr ""
 "patterns:\n"
 "%s"
 
-#: unpack-trees.c:182
+#: unpack-trees.c:184
 #, c-format
 msgid ""
 "The following paths were already present and thus not updated despite sparse "
@@ -9103,36 +9392,39 @@ msgid ""
 "%s"
 msgstr ""
 
-#: unpack-trees.c:262
+#: unpack-trees.c:264
 #, c-format
 msgid "Aborting\n"
 msgstr "A abortar\n"
 
-#: unpack-trees.c:289
+#: unpack-trees.c:291
 #, c-format
 msgid ""
 "After fixing the above paths, you may want to run `git sparse-checkout "
 "reapply`.\n"
 msgstr ""
 
-#: unpack-trees.c:350
-#, fuzzy
+#: unpack-trees.c:352
 msgid "Updating files"
-msgstr "A atualizar %s"
+msgstr "Atualizando ficheiros"
 
-#: unpack-trees.c:382
+#: unpack-trees.c:384
 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:1498
-#, fuzzy
+#: unpack-trees.c:1618
 msgid "Updating index flags"
-msgstr "A atualizar %s"
+msgstr "Atualizando flags de cenário"
+
+#: unpack-trees.c:2718
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr ""
 
-#: upload-pack.c:1550
+#: upload-pack.c:1548
 msgid "expected flush after fetch arguments"
 msgstr ""
 
@@ -9147,11 +9439,11 @@ msgstr "sequencia de escape %XX inválida"
 
 #: urlmatch.c:215
 msgid "missing host and scheme is not 'file:'"
-msgstr "sistema anfitrião não indicado e o esquema não é do tipo 'file:'"
+msgstr "faltando host e o esquema é diferente de 'file:'"
 
 #: urlmatch.c:232
 msgid "a 'file:' URL may not have a port number"
-msgstr "um URL do tipo 'file:' não pode ter um número de porta"
+msgstr "um URL 'file:' tem de estar sem número de porta"
 
 #: urlmatch.c:247
 msgid "invalid characters in host name"
@@ -9166,163 +9458,181 @@ msgid "invalid '..' path segment"
 msgstr "segmento de caminho '..' inválido"
 
 #: walker.c:170
-#, fuzzy
 msgid "Fetching objects"
-msgstr "A verificar objetos"
+msgstr "Buscando objetos"
 
-#: worktree.c:236 builtin/am.c:2103
+#: worktree.c:236 builtin/am.c:2152
 #, c-format
 msgid "failed to read '%s'"
 msgstr "falha ao ler '%s'"
 
-#: worktree.c:283
+#: worktree.c:303
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 
-#: worktree.c:294
+#: worktree.c:314
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 
-#: worktree.c:306
-#, fuzzy, c-format
+#: worktree.c:326
+#, c-format
 msgid "'%s' does not exist"
-msgstr "o caminho '%s' não existe"
+msgstr "'%s' é inexistente"
 
-#: worktree.c:312
-#, fuzzy, c-format
+#: worktree.c:332
+#, c-format
 msgid "'%s' is not a .git file, error code %d"
-msgstr "'%s' não está trancada"
+msgstr "'%s' é ficheiro .git nenhum, código de erro %d"
 
-#: worktree.c:321
-#, fuzzy, c-format
+#: worktree.c:341
+#, c-format
 msgid "'%s' does not point back to '%s'"
-msgstr "'%s' não aponta para um commit"
+msgstr "'%s' aponta para algo diferente de '%s'"
 
-#: worktree.c:587
-#, fuzzy
+#: worktree.c:603
 msgid "not a directory"
 msgstr "é pasta nenhuma"
 
-#: worktree.c:596
-#, fuzzy
+#: worktree.c:612
 msgid ".git is not a file"
-msgstr "git show %s: ficheiro incorreto"
+msgstr ".git é ficheiro nenhum"
 
-#: worktree.c:598
+#: worktree.c:614
 msgid ".git file broken"
 msgstr ""
 
-#: worktree.c:600
-#, fuzzy
+#: worktree.c:616
 msgid ".git file incorrect"
-msgstr "ficheiro de índice corrompido"
+msgstr ""
 
-#: worktree.c:670
-#, fuzzy
+#: worktree.c:722
 msgid "not a valid path"
-msgstr "nome de objeto inválido: %s"
+msgstr ""
 
-#: worktree.c:676
-#, fuzzy
+#: worktree.c:728
 msgid "unable to locate repository; .git is not a file"
-msgstr "não é possível escrever ficheiro de índice temporário"
+msgstr "incapaz localizar repositório; .git é ficheiro nenhum"
 
-#: worktree.c:679
-#, fuzzy
+#: worktree.c:732
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "incapaz localizar repositório; ficheiro .git referência repositório nenhum"
+
+#: worktree.c:736
 msgid "unable to locate repository; .git file broken"
-msgstr "não é possível escrever ficheiro de índice temporário"
+msgstr "incapaz localizar repositório; ficheiro .git está quebrado"
 
-#: worktree.c:685
+#: worktree.c:742
 msgid "gitdir unreadable"
 msgstr ""
 
-#: worktree.c:689
+#: worktree.c:746
 msgid "gitdir incorrect"
 msgstr ""
 
+#: worktree.c:771
+msgid "not a valid directory"
+msgstr ""
+
+#: worktree.c:777
+msgid "gitdir file does not exist"
+msgstr "ficheiro gitdir é inexistente"
+
+#: worktree.c:782 worktree.c:791
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "incapaz ler ficheiro gitdir (%s)"
+
+#: worktree.c:801
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr ""
+
+#: worktree.c:809
+msgid "invalid gitdir file"
+msgstr "ficheiro gitdir inválido"
+
+#: worktree.c:817
+msgid "gitdir file points to non-existent location"
+msgstr "ficheiro gitdir aponta para localização inexistente"
+
 #: wrapper.c:197 wrapper.c:367
 #, c-format
 msgid "could not open '%s' for reading and writing"
-msgstr "não foi possível abrir '%s' para leitura e escrita"
+msgstr "incapaz abrir '%s' para leitura e escrita"
 
 #: wrapper.c:398 wrapper.c:599
 #, c-format
 msgid "unable to access '%s'"
-msgstr "não é possível aceder a '%s'"
+msgstr "incapaz aceder '%s'"
 
 #: wrapper.c:607
 msgid "unable to get current working directory"
-msgstr "não é possível de obter o diretório de trabalho atual"
+msgstr "incapaz obter pasta atual de trabalho"
 
 #: wt-status.c:158
 msgid "Unmerged paths:"
-msgstr "Caminhos não integrados:"
+msgstr "Paths por juntar:"
 
 #: wt-status.c:187 wt-status.c:219
-#, fuzzy
 msgid "  (use \"git restore --staged <file>...\" to unstage)"
-msgstr "  (use \"git reset %s <ficheiro>...\" para despreparar)"
+msgstr "  (usa \"git restore --staged <ficheiro>...\" para desencenar)"
 
 #: wt-status.c:190 wt-status.c:222
-#, fuzzy, c-format
+#, c-format
 msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
-msgstr "  (use \"git reset %s <ficheiro>...\" para despreparar)"
+msgstr "  (usa \"git restore --source=%s --staged <ficheiro>...\" para desencenar)"
 
 #: wt-status.c:193 wt-status.c:225
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
-msgstr "  (use \"git rm --cached <ficheiro>...\" para despreparar)"
+msgstr "  (usa \"git rm --cached <ficheiro>...\" para desencenar)"
 
 #: wt-status.c:197
 msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr "  (use \"git add <ficheiro>...\" para marcar como resolvido)"
+msgstr "  (usa \"git add <ficheiro>...\" para marcar como resolvido)"
 
 #: wt-status.c:199 wt-status.c:203
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
-"  (use \"git add/rm <ficheiro>...\" conforme apropriado para marcar como "
+"  (usa \"git add/rm <ficheiro>...\" conforme apropriado para marcar como "
 "resolvido)"
 
 #: wt-status.c:201
 msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr "  (use \"git rm <ficheiro>...\" para marcar como resolvido)"
+msgstr "  (usa \"git rm <ficheiro>...\" para marcar como resolvido)"
 
-#: wt-status.c:211 wt-status.c:1070
+#: wt-status.c:211 wt-status.c:1125
 msgid "Changes to be committed:"
 msgstr "Alterações para serem submetidas:"
 
-#: wt-status.c:234 wt-status.c:1079
+#: wt-status.c:234 wt-status.c:1134
 msgid "Changes not staged for commit:"
-msgstr "Alterações não preparadas para submeter:"
+msgstr "Alterações por preparar para commit:"
 
 #: wt-status.c:238
 msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr "  (use \"git add <ficheiro>...\" para atualizar o que será submetido)"
+msgstr "  (usa \"git add <ficheiro>...\" para atualizar o que será memorizado)"
 
 #: wt-status.c:240
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr ""
-"  (use \"git add/rm <ficheiro>...\" para atualizar o que será submetido)"
+msgstr "  (usa \"git add/rm <ficheiro>...\" para atualizar o que será memorizado)"
 
 #: wt-status.c:241
-#, fuzzy
 msgid ""
 "  (use \"git restore <file>...\" to discard changes in working directory)"
 msgstr ""
-"  (use \"git checkout -- <ficheiro>...\" para descartar alterações no "
-"diretório de trabalho)"
+"  (usa \"git restore <ficheiro>...\" para descartar alterações da pasta-trabalho)"
 
 #: wt-status.c:243
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr ""
-"  (submeta ou descarte o conteúdo modificado ou não controlado nos "
-"submódulos)"
+"  (memoriza ou descarta os desmonitorizados ou o conteúdo modificado de submódulos)"
 
 #: wt-status.c:254
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr "  (use \"git %s <ficheiro>...\" para incluir no que será submetido)"
+msgstr "  (usa \"git %s <ficheiro>...\" para incluir o que será memorizado)"
 
 #: wt-status.c:266
 msgid "both deleted:"
@@ -9382,7 +9692,7 @@ msgstr "desconhecido:"
 
 #: wt-status.c:302
 msgid "unmerged:"
-msgstr "não integrado:"
+msgstr "por juntar:"
 
 #: wt-status.c:382
 msgid "new commits, "
@@ -9394,25 +9704,24 @@ msgstr "conteúdo modificado, "
 
 #: wt-status.c:386
 msgid "untracked content, "
-msgstr "conteúdo não controlado, "
+msgstr "conteúdo por seguir, "
 
-#: wt-status.c:903
-#, fuzzy, c-format
+#: wt-status.c:958
+#, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
-msgstr[0] "Está a rebasear neste momento."
-msgstr[1] "Está a rebasear neste momento."
+msgstr[0] "Teu esconderijo neste momento tem %d entrada"
+msgstr[1] "Teu esconderijo neste momento tem %d entradas"
 
-#: wt-status.c:934
+#: wt-status.c:989
 msgid "Submodules changed but not updated:"
-msgstr "Submódulos alterados mas não atualizados:"
+msgstr "Submódulos alterados mas desatualizados:"
 
-#: wt-status.c:936
+#: wt-status.c:991
 msgid "Submodule changes to be committed:"
 msgstr "Alterações em submódulos para serem submetidas:"
 
-#: wt-status.c:1018
-#, fuzzy
+#: wt-status.c:1073
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -9420,7 +9729,7 @@ msgstr ""
 "Deixe estar a linha acima.\n"
 "Tudo abaixo será ignorado."
 
-#: wt-status.c:1110
+#: wt-status.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -9428,108 +9737,107 @@ msgid ""
 "You can use '--no-ahead-behind' to avoid this.\n"
 msgstr ""
 
-#: wt-status.c:1140
+#: wt-status.c:1195
 msgid "You have unmerged paths."
-msgstr "Há caminhos não integrados."
+msgstr "Tens paths por juntar."
 
-#: wt-status.c:1143
+#: wt-status.c:1198
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (corrija os conflitos e execute \"git commit\")"
 
-#: wt-status.c:1145
+#: wt-status.c:1200
 msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr "  (use \"git am --abort\" para abortar a integração)"
+msgstr "  (usa \"git merge --abort\" para abortar a junção)"
 
-#: wt-status.c:1149
+#: wt-status.c:1204
 msgid "All conflicts fixed but you are still merging."
 msgstr "Todos os conflitos foram corrigidos mas ainda está a integrar."
 
-#: wt-status.c:1152
+#: wt-status.c:1207
 msgid "  (use \"git commit\" to conclude merge)"
-msgstr "  (use \"git commit\" para concluir a integração)"
+msgstr "  (usa \"git commit\" para concluir a junção)"
 
-#: wt-status.c:1161
+#: wt-status.c:1216
 msgid "You are in the middle of an am session."
 msgstr "Sessão am em curso."
 
-#: wt-status.c:1164
+#: wt-status.c:1219
 msgid "The current patch is empty."
-msgstr "O patch atual está vazio."
+msgstr "O remendo atual está vazio."
 
-#: wt-status.c:1168
+#: wt-status.c:1223
 msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr "  (corrija os conflitos e execute \"git am --continue\")"
+msgstr "  (corrige os conflitos e executa \"git am --continue\")"
 
-#: wt-status.c:1170
+#: wt-status.c:1225
 msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr "  (use \"git am --skip\" para ignorar este patch)"
+msgstr "  (usa \"git am --skip\" para ignorar este remendo)"
 
-#: wt-status.c:1172
+#: wt-status.c:1227
 msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr "  (use \"git am --abort\" para restaurar o ramo original)"
+msgstr "  (usa \"git am --abort\" para restaurar o ramo original)"
 
-#: wt-status.c:1305
+#: wt-status.c:1360
 msgid "git-rebase-todo is missing."
-msgstr "git-rebase-todo não existe."
+msgstr "git-rebase-todo está faltando."
 
-#: wt-status.c:1307
+#: wt-status.c:1362
 msgid "No commands done."
-msgstr "Nenhum comando concluído."
+msgstr "Comando nenhum concluído."
 
-#: wt-status.c:1310
+#: wt-status.c:1365
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Último comando concluído (%d comando concluído):"
 msgstr[1] "Últimos comandos concluídos (%d comandos concluídos):"
 
-#: wt-status.c:1321
+#: wt-status.c:1376
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (veja mais no ficheiro %s)"
 
-#: wt-status.c:1326
+#: wt-status.c:1381
 msgid "No commands remaining."
 msgstr "Nenhum comando por concluir."
 
-#: wt-status.c:1329
+#: wt-status.c:1384
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Próximo comando a executar (%d comando restante):"
 msgstr[1] "Próximos comandos a executar (%d comandos restantes):"
 
-#: wt-status.c:1337
+#: wt-status.c:1392
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr "  (use \"git rebase --edit-todo\" para visualizar e editar)"
+msgstr "  (usa \"git rebase --edit-todo\" para visualizar e editar)"
 
-#: wt-status.c:1349
+#: wt-status.c:1404
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Está a realizar rebase do ramo '%s' sobre '%s'."
 
-#: wt-status.c:1354
+#: wt-status.c:1409
 msgid "You are currently rebasing."
 msgstr "Está a rebasear neste momento."
 
-#: wt-status.c:1367
+#: wt-status.c:1422
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
-msgstr "  (corrija os conflitos e execute \"git rebase --continue\")"
+msgstr "  (corrige os conflitos e executa \"git rebase --continue\")"
 
-#: wt-status.c:1369
+#: wt-status.c:1424
 msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr "  (use \"git rebase --skip\" para ignorar este patch)"
+msgstr "  (usa \"git rebase --skip\" para ignorar este remendo)"
 
-#: wt-status.c:1371
+#: wt-status.c:1426
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr "  (use \"git rebase --abort\" para restaurar o ramo original)"
+msgstr "  (usa \"git rebase --abort\" para observar o ramo original)"
 
-#: wt-status.c:1378
+#: wt-status.c:1433
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
-msgstr ""
-"  (todos os conflitos foram corrigidos: execute \"git rebase --continue\")"
+msgstr "  (todos os conflitos corrigidos: executa \"git rebase --continue\")"
 
-#: wt-status.c:1382
+#: wt-status.c:1437
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9537,395 +9845,417 @@ msgstr ""
 "Está a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' "
 "sobre '%s'."
 
-#: wt-status.c:1387
+#: wt-status.c:1442
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Está a dividir um commit durante um rebase."
 
-#: wt-status.c:1390
+#: wt-status.c:1445
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
-"  (Assim que o diretório de trabalho estiver limpo, execute \"git rebase --"
-"continue\")"
+"  (Assim que a pasta-trabalho estiver limpa, executa \"git rebase --continue\")"
 
-#: wt-status.c:1394
+#: wt-status.c:1449
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Está a editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre "
 "'%s'."
 
-#: wt-status.c:1399
+#: wt-status.c:1454
 msgid "You are currently editing a commit during a rebase."
 msgstr "Está a editar um commit durante um rebase."
 
-#: wt-status.c:1402
+#: wt-status.c:1457
 msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr "  (use \"git commit --amend\" para emendar o commit atual)"
+msgstr "  (usa \"git commit --amend\" para emendar a memória atual)"
 
-#: wt-status.c:1404
+#: wt-status.c:1459
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (use \"git rebase --continue\" assim que estiver satisfeito com as "
 "alterações)"
 
-#: wt-status.c:1415
-#, fuzzy
+#: wt-status.c:1470
 msgid "Cherry-pick currently in progress."
 msgstr "Cherry-pick atualmente em curso"
 
-#: wt-status.c:1418
+#: wt-status.c:1473
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Está a realizar cherry-pick do commit %s."
 
-#: wt-status.c:1425
+#: wt-status.c:1480
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr "  (corrija os conflitos e execute \"git cherry-pick --continue\")"
+msgstr "  (corrige conflitos e executa \"git cherry-pick --continue\")"
 
-#: wt-status.c:1428
-#, fuzzy
+#: wt-status.c:1483
 msgid "  (run \"git cherry-pick --continue\" to continue)"
-msgstr "  (corrija os conflitos e execute \"git cherry-pick --continue\")"
+msgstr "  (executa \"git cherry-pick --continue\" para continuar)"
 
-#: wt-status.c:1431
+#: wt-status.c:1486
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
-"  (todos os conflitos foram corrigidos: execute \"git cherry-pick --continue"
-"\")"
+"  (todos conflitos corrigidos: executa \"git cherry-pick --continue\")"
 
-#: wt-status.c:1433
-#, fuzzy
+#: wt-status.c:1488
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
-msgstr "  (use \"git am --skip\" para ignorar este patch)"
+msgstr "  (usa \"git cherry-pick --skip\" para ignorar este remendo)"
 
-#: wt-status.c:1435
+#: wt-status.c:1490
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
-"  (use \"git cherry-pick --abort\" para cancelar a operação de cherry-pick)"
+"  (usa \"git cherry-pick --abort\" para cancelar a operação cherry-pick)"
 
-#: wt-status.c:1445
-#, fuzzy
+#: wt-status.c:1500
 msgid "Revert currently in progress."
-msgstr "abortar integração em curso"
+msgstr "Reversão atualmente em curso."
 
-#: wt-status.c:1448
+#: wt-status.c:1503
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Está a reverter o commit %s neste comento."
 
-#: wt-status.c:1454
+#: wt-status.c:1509
 msgid "  (fix conflicts and run \"git revert --continue\")"
-msgstr "  (corrija dos conflitos e execute \"git revert --continue\")"
+msgstr "  (corrige os conflitos e executa \"git revert --continue\")"
 
-#: wt-status.c:1457
-#, fuzzy
+#: wt-status.c:1512
 msgid "  (run \"git revert --continue\" to continue)"
-msgstr "  (corrija dos conflitos e execute \"git revert --continue\")"
+msgstr "  (executa \"git revert --continue\" para continuar)"
 
-#: wt-status.c:1460
+#: wt-status.c:1515
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
-msgstr ""
-"  (todos os conflitos foram corrigidos: execute \"git revert --continue\")"
+msgstr "  (todos conflitos corrigidos: executa \"git revert --continue\")"
 
-#: wt-status.c:1462
-#, fuzzy
+#: wt-status.c:1517
 msgid "  (use \"git revert --skip\" to skip this patch)"
-msgstr "  (use \"git rebase --skip\" para ignorar este patch)"
+msgstr "  (usa \"git revert --skip\" para ignorar este remendo)"
 
-#: wt-status.c:1464
+#: wt-status.c:1519
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr "  (use \"git rever --abort\" para cancelar a operação de reversão)"
+msgstr "  (usa \"git revert --abort\" para cancelar a operação de reversão)"
 
-#: wt-status.c:1474
+#: wt-status.c:1529
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Está a bissetar, iniciado a partir do ramo '%s'."
 
-#: wt-status.c:1478
+#: wt-status.c:1533
 msgid "You are currently bisecting."
-msgstr "Está a bissetar neste momento."
+msgstr "Estás a bissetar neste momento."
 
-#: wt-status.c:1481
+#: wt-status.c:1536
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr "  (use \"git bisect reset\" para voltar ao ramo original)"
+msgstr "  (usa \"git bisect reset\" para voltar ao ramo original)"
+
+#: wt-status.c:1547
+msgid "You are in a sparse checkout."
+msgstr "Estás numa observação dispersa."
 
-#: wt-status.c:1492
+#: wt-status.c:1550
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr ""
 
-#: wt-status.c:1731
+#: wt-status.c:1794
 msgid "On branch "
-msgstr "No ramo "
+msgstr "Em ramo "
 
-#: wt-status.c:1738
+#: wt-status.c:1801
 msgid "interactive rebase in progress; onto "
 msgstr "rebase interativo em curso; sobre "
 
-#: wt-status.c:1740
+#: wt-status.c:1803
 msgid "rebase in progress; onto "
 msgstr "rebase em curso; sobre "
 
-#: wt-status.c:1750
+#: wt-status.c:1808
+msgid "HEAD detached at "
+msgstr "HEAD destacada em "
+
+#: wt-status.c:1810
+msgid "HEAD detached from "
+msgstr "HEAD destacada de "
+
+#: wt-status.c:1813
 msgid "Not currently on any branch."
 msgstr "Atualmente em ramo nenhum."
 
-#: wt-status.c:1767
+#: wt-status.c:1830
 msgid "Initial commit"
 msgstr "Memória inicial"
 
-#: wt-status.c:1768
-#, fuzzy
+#: wt-status.c:1831
 msgid "No commits yet"
 msgstr "Ainda commits nenhuns"
 
-#: wt-status.c:1782
+#: wt-status.c:1845
 msgid "Untracked files"
-msgstr "Ficheiros não controlados"
+msgstr "Ficheiros por seguir"
 
-#: wt-status.c:1784
+#: wt-status.c:1847
 msgid "Ignored files"
 msgstr "Ficheiros ignorados"
 
-#: wt-status.c:1788
+#: wt-status.c:1851
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
 "may speed it up, but you have to be careful not to forget to add\n"
 "new files yourself (see 'git help status')."
 msgstr ""
-"A enumeração dos ficheiros não controlados demorou %.2f segundos\n"
-"a concluir. 'status -uno' pode acelerar o processo, mas deve ter\n"
-"cuidado de não se esquecer de adicionar novos ficheiros\n"
-"(consulte 'git help status')."
+"A enumeração dos ficheiros por controlar  demorou %.2f segundos.\n"
+"'status -uno' pode-o acelerar, mas tens de te lembrar de adicionares\n"
+"os novos ficheiros (vê 'git help status')."
 
-#: wt-status.c:1794
+#: wt-status.c:1857
 #, c-format
 msgid "Untracked files not listed%s"
-msgstr "Ficheiros não controlados não listados%s"
+msgstr "Ficheiros por seguir fora da listagem%s"
 
-#: wt-status.c:1796
+#: wt-status.c:1859
 msgid " (use -u option to show untracked files)"
-msgstr " (use a opção -u para mostrar os ficheiros não controlados)"
+msgstr " (usa opção -u para mostrar ficheiros por seguir)"
 
-#: wt-status.c:1802
+#: wt-status.c:1865
 msgid "No changes"
 msgstr "Sem alterações"
 
-#: wt-status.c:1807
+#: wt-status.c:1870
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr "foi adicionado a commit alteração nenhuma (usa \"git add\" e/ou \"git "
-"commit -a\")\n"
+msgstr ""
+"foi adicionado a memória alteração nenhuma (usa \"git add\" e/ou \"git commit "
+"-a\")\n"
 
-#: wt-status.c:1811
+#: wt-status.c:1874
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "foi adicionado a commit alteração nenhuma\n"
 
-#: wt-status.c:1815
+#: wt-status.c:1878
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr ""
-"nada adicionado para commit mas há ficheiros por seguir presentes (usa"
-"(\"git add\" para seguir)\n"
+"nada adicionado para commit mas há ficheiros por seguir presentes (usa(\"git "
+"add\" para seguir)\n"
 
-#: wt-status.c:1819
+#: wt-status.c:1882
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "nada adicionado para commit mas ficheiros por seguir presentes\n"
 
-#: wt-status.c:1823
+#: wt-status.c:1886
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "nada a commit (cria/copia ficheiros e usa \"git add\" para seguir)\n"
 
-#: wt-status.c:1827 wt-status.c:1833
+#: wt-status.c:1890 wt-status.c:1896
 #, c-format
 msgid "nothing to commit\n"
 msgstr "nada a commit\n"
 
-#: wt-status.c:1830
+#: wt-status.c:1893
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "nada a commit (use -u para mostrar ficheiros por seguir)\n"
 
-#: wt-status.c:1835
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "nada a commitar, worktree limpa\n"
 
-#: wt-status.c:1940
-#, fuzzy
+#: wt-status.c:2003
 msgid "No commits yet on "
-msgstr "Nenhum comando concluído."
+msgstr "Memórias nenhumas em "
 
-#: wt-status.c:1944
+#: wt-status.c:2007
 msgid "HEAD (no branch)"
 msgstr "HEAD (ramo nenhum)"
 
-#: wt-status.c:1975
+#: wt-status.c:2038
 msgid "different"
 msgstr "diferente"
 
-#: wt-status.c:1977 wt-status.c:1985
+#: wt-status.c:2040 wt-status.c:2048
 msgid "behind "
 msgstr "atrás "
 
-#: wt-status.c:1980 wt-status.c:1983
+#: wt-status.c:2043 wt-status.c:2046
 msgid "ahead "
 msgstr "à frente "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2505
+#: wt-status.c:2569
 #, c-format
 msgid "cannot %s: You have unstaged changes."
-msgstr "não é possível efetuar %s: tem alterações não preparadas."
+msgstr "incapaz efetuar %s: Tens alterações despreparadas."
 
-#: wt-status.c:2511
+#: wt-status.c:2575
 msgid "additionally, your index contains uncommitted changes."
-msgstr "além disso, o índice contém alterações não submetidas."
+msgstr "além disso, teu index contém alterações por memorizar."
 
-#: wt-status.c:2513
+#: wt-status.c:2577
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
-msgstr "não é possível efetuar %s: o índice contém alterações não submetidas."
+msgstr "incapaz efetuar %s: teu index contém alterações por memorizar."
+
+#: compat/simple-ipc/ipc-unix-socket.c:182
+msgid "could not send IPC command"
+msgstr "incapaz enviar comando IPC"
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:457
+#: compat/simple-ipc/ipc-unix-socket.c:189
+msgid "could not read IPC response"
+msgstr "incapaz de ler resposta IPC"
+
+#: compat/simple-ipc/ipc-unix-socket.c:866
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr ""
+
+#: compat/simple-ipc/ipc-unix-socket.c:878
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "incapaz começar worker[0] para '%s'"
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:461
 #, c-format
 msgid "failed to unlink '%s'"
-msgstr "falha ao invocar unlink de '%s'"
+msgstr "falha ao unlink '%s'"
 
 #: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<opções>] [--] <caminho>..."
+msgstr "git add [<opções>] [--] <espetro-caminho>..."
+
+#: builtin/add.c:61
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "incapaz chmod %cx '%s'"
 
-#: builtin/add.c:88
+#: builtin/add.c:99
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "diff status inesperado %c"
 
-#: builtin/add.c:93 builtin/commit.c:285
+#: builtin/add.c:104 builtin/commit.c:297
 msgid "updating files failed"
-msgstr "falha ao atualizar os ficheiros"
+msgstr "falhou ao atualizar ficheiros"
 
-#: builtin/add.c:103
+#: builtin/add.c:114
 #, c-format
 msgid "remove '%s'\n"
 msgstr "remove '%s'\n"
 
-#: builtin/add.c:178
+#: builtin/add.c:198
 msgid "Unstaged changes after refreshing the index:"
-msgstr "Alterações não preparadas depois de atualizar o índice:"
+msgstr "Alterações despreparadas após refrescar index:"
 
-#: builtin/add.c:272 builtin/rev-parse.c:908
+#: builtin/add.c:307 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Incapaz ler o index"
 
-#: builtin/add.c:283
+#: builtin/add.c:318
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Incapaz de abrir '%s' para escrita."
 
-#: builtin/add.c:287
+#: builtin/add.c:322
 msgid "Could not write patch"
 msgstr "Incapaz de escrever patch"
 
-#: builtin/add.c:290
+#: builtin/add.c:325
 msgid "editing patch failed"
 msgstr "edição de patch falhou"
 
-#: builtin/add.c:293
+#: builtin/add.c:328
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Impossível fazer stat de '%s'"
 
-#: builtin/add.c:295
+#: builtin/add.c:330
 msgid "Empty patch. Aborted."
 msgstr "Patch vazio. Abortado."
 
-#: builtin/add.c:300
+#: builtin/add.c:335
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Impossível submeter '%s'"
 
-#: builtin/add.c:308
+#: builtin/add.c:343
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "Os seguintes caminhos estão ignorados por algum ficheiro .gitignore:\n"
 
-#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
+#: builtin/add.c:363 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/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
 msgid "dry run"
 msgstr "simular ação"
 
-#: builtin/add.c:331
+#: builtin/add.c:366
 msgid "interactive picking"
 msgstr "seleção interativa"
 
-#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308
+#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
 msgid "select hunks interactively"
 msgstr "selecionar blocos interativamente"
 
-#: builtin/add.c:333
+#: builtin/add.c:368
 msgid "edit current diff and apply"
 msgstr "editar o diff atual e aplicá-lo"
 
-#: builtin/add.c:334
+#: builtin/add.c:369
 msgid "allow adding otherwise ignored files"
 msgstr "permitir adicionar ficheiros ignorados"
 
-#: builtin/add.c:335
+#: builtin/add.c:370
 msgid "update tracked files"
 msgstr "atualizar ficheiros controlados"
 
-#: builtin/add.c:336
+#: builtin/add.c:371
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 
-#: builtin/add.c:337
+#: builtin/add.c:372
 msgid "record only the fact that the path will be added later"
 msgstr "registar apenas o facto de que o caminho será adicionado mais tarde"
 
-#: builtin/add.c:338
+#: builtin/add.c:373
 msgid "add changes from all tracked and untracked files"
 msgstr ""
-"adicionar alterações de todos os ficheiros controlados ou não controlados"
+"adicionar alterações de todos ficheiros seguidos e ficheiros por seguir"
 
-#: builtin/add.c:341
+#: builtin/add.c:376
 msgid "ignore paths removed in the working tree (same as --no-all)"
-msgstr ""
-"ignorar caminhos removidos na árvore de trabalho (o mesmo que --no-all)"
+msgstr "ignorar paths removidos na árvore-trabalho (o mesmo que --no-all)"
 
-#: builtin/add.c:343
+#: builtin/add.c:378
 msgid "don't add, only refresh the index"
-msgstr "não adicionar, apenas atualizar o índice"
+msgstr "deixa de adicionar, apenas atualiza o index"
 
-#: builtin/add.c:344
+#: builtin/add.c:379
 msgid "just skip files which cannot be added because of errors"
-msgstr "ignorar ficheiros que não podem ser adicionados por causa de erros"
+msgstr "apenas ignora ficheiros que, por causa de erros, ficam por adicionar"
 
-#: builtin/add.c:345
+#: builtin/add.c:380
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "verificar quais os ficheiros ignorados na simulação"
 
-#: builtin/add.c:347 builtin/update-index.c:1004
+#: builtin/add.c:382 builtin/update-index.c:1006
 msgid "override the executable bit of the listed files"
-msgstr "substituir o bit executável dos ficheiros listados"
+msgstr "sobrepor o bit executável dos ficheiros listados"
 
-#: builtin/add.c:349
-#, fuzzy
+#: builtin/add.c:384
 msgid "warn when adding an embedded repository"
-msgstr "criar um repositório nu"
+msgstr ""
 
-#: builtin/add.c:351
+#: builtin/add.c:386
 msgid "backend for `git stash -p`"
 msgstr ""
 
-#: builtin/add.c:369
+#: builtin/add.c:404
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -9943,172 +10273,170 @@ msgid ""
 "See \"git help submodule\" for more information."
 msgstr ""
 
-#: builtin/add.c:397
-#, fuzzy, c-format
+#: builtin/add.c:432
+#, c-format
 msgid "adding embedded git repository: %s"
-msgstr "--stdin requer um repositório git"
+msgstr ""
 
-#: builtin/add.c:416
+#: builtin/add.c:451
 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:425
+#: builtin/add.c:460
 msgid "adding files failed"
-msgstr "falha ao adicionar ficheiros"
+msgstr "falhou adicionar ficheiros"
+
+#: builtin/add.c:488
+msgid "--dry-run is incompatible with --interactive/--patch"
+msgstr ""
 
-#: builtin/add.c:453 builtin/commit.c:345
-#, fuzzy
+#: builtin/add.c:490 builtin/commit.c:357
 msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--first-parent é incompatível com --bisect"
+msgstr ""
 
-#: builtin/add.c:470
-#, fuzzy
+#: builtin/add.c:507
 msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--first-parent é incompatível com --bisect"
+msgstr ""
 
-#: builtin/add.c:482
+#: builtin/add.c:519
 msgid "-A and -u are mutually incompatible"
 msgstr "-A e -u são mutuamente incompatíveis"
 
-#: builtin/add.c:485
+#: builtin/add.c:522
 msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "A opção --ignore-missing só pode ser usada em conjunto com --dry-run"
+msgstr "Opção --ignore-missing só pode ser usada em conjunto com --dry-run"
 
-#: builtin/add.c:489
+#: builtin/add.c:526
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
-msgstr "o parâmetro '%s' de --chmod tem de ser -x ou +x"
+msgstr "parâmetro '%s' de --chmod tem de ser -x ou +x"
 
-#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351
-#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502
-#, fuzzy
+#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
+#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
 msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--patch é incompatível com --{hard,mixed,soft}"
+msgstr ""
 
-#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357
-#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508
+#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
+#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
 msgid "--pathspec-file-nul requires --pathspec-from-file"
 msgstr ""
 
-#: builtin/add.c:518
+#: builtin/add.c:555
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr ".\n"
 
-#: builtin/add.c:520
+#: builtin/add.c:557
 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:352
+#: builtin/am.c:365
 msgid "could not parse author script"
-msgstr "não foi possível analisar o autor do script"
+msgstr "incapaz processar script de autor"
 
-#: builtin/am.c:436
+#: builtin/am.c:455
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' foi eliminado pelo hook applypatch-msg"
 
-#: builtin/am.c:478
+#: builtin/am.c:497
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Linha de entrada malformada: '%s'."
 
-#: builtin/am.c:516
+#: builtin/am.c:535
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Falha ao copiar notas de '%s' para '%s'"
 
-#: builtin/am.c:542
+#: builtin/am.c:561
 msgid "fseek failed"
-msgstr "falha ao invocar fseek"
+msgstr "falha de fseek"
 
-#: builtin/am.c:730
+#: builtin/am.c:749
 #, c-format
 msgid "could not parse patch '%s'"
-msgstr "não foi possível analisar o patch '%s'"
+msgstr "incapaz processar patch '%s'"
 
-#: builtin/am.c:795
+#: builtin/am.c:814
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Só pode ser aplicada uma série de patches StGIT duma só vez"
 
-#: builtin/am.c:843
+#: builtin/am.c:862
 msgid "invalid timestamp"
 msgstr "carimbo de data/hora inválido"
 
-#: builtin/am.c:848 builtin/am.c:860
+#: builtin/am.c:867 builtin/am.c:879
 msgid "invalid Date line"
 msgstr "linha de Data inválida"
 
-#: builtin/am.c:855
+#: builtin/am.c:874
 msgid "invalid timezone offset"
 msgstr "mudança de fuso horário inválida"
 
-#: builtin/am.c:948
+#: builtin/am.c:967
 msgid "Patch format detection failed."
 msgstr "Falha ao detetar o formato do patch."
 
-#: builtin/am.c:953 builtin/clone.c:410
+#: builtin/am.c:972 builtin/clone.c:414
 #, c-format
 msgid "failed to create directory '%s'"
-msgstr "falha ao criar o diretório '%s'"
+msgstr "falhou criar pasta '%s'"
 
-#: builtin/am.c:958
+#: builtin/am.c:977
 msgid "Failed to split patches."
 msgstr "Falha ao dividir patches."
 
-#: builtin/am.c:1089
+#: builtin/am.c:1126
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "Após resolver este problema, execute \"%s --continue\"."
+msgstr "Após resolver este problema, executa \"%s --continue\"."
 
-#: builtin/am.c:1090
+#: builtin/am.c:1127
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr "Se preferir ignorar este patch, execute \"%s --skip\"."
+msgstr "Se preferes ignorar este remendo, executa \"%s --skip\" invés."
 
-#: builtin/am.c:1091
+#: builtin/am.c:1128
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
-"Para restaurar o ramo original e interromper a aplicação dos patches, "
-"execute \"%s --abort\"."
+"Para restaurar o ramo original e interromper a aplicação de remendos, "
+"executa \"%s --abort\"."
 
-#: builtin/am.c:1174
+#: builtin/am.c:1223
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 
-#: builtin/am.c:1202
-#, fuzzy
+#: builtin/am.c:1251
 msgid "Patch is empty."
-msgstr "O patch atual está vazio."
+msgstr "Remendo está vazio."
 
-#: builtin/am.c:1267
-#, fuzzy, c-format
+#: builtin/am.c:1316
+#, c-format
 msgid "missing author line in commit %s"
 msgstr "Autor em falta: %s"
 
-#: builtin/am.c:1270
-#, fuzzy, c-format
+#: builtin/am.c:1319
+#, c-format
 msgid "invalid ident line: %.*s"
-msgstr "linha de identidade inválida: %s"
+msgstr "linha de indentação inválida: %.*s"
 
-#: builtin/am.c:1489
+#: builtin/am.c:1538
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr ""
-"O repositório não tem os blobs necessários para recorrer a integração com 3 "
-"pontos."
+msgstr "Repositório falta blobs necessários para recorrer à tri-junção."
 
-#: builtin/am.c:1491
+#: builtin/am.c:1540
 msgid "Using index info to reconstruct a base tree..."
 msgstr "A usar informação do índice para reconstruir uma árvore de base..."
 
-#: builtin/am.c:1510
+#: builtin/am.c:1559
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10116,26 +10444,26 @@ msgstr ""
 "Editaste o patch manualmente?\n"
 "No registo de index, aplica-se a blobs nenhuns."
 
-#: builtin/am.c:1516
+#: builtin/am.c:1565
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 "A recorrer a uma de base para aplicação de patches e integração com 3 "
 "pontos..."
 
-#: builtin/am.c:1542
+#: builtin/am.c:1591
 msgid "Failed to merge in the changes."
 msgstr "Falha ao integrar as alterações."
 
-#: builtin/am.c:1574
+#: builtin/am.c:1623
 msgid "applying to an empty history"
-msgstr "a aplicar a um histórico vazio"
+msgstr "submetendo para um histórico vazio"
 
-#: builtin/am.c:1626 builtin/am.c:1630
+#: builtin/am.c:1675 builtin/am.c:1679
 #, c-format
 msgid "cannot resume: %s does not exist."
-msgstr "não é possível continuar: %s não existe."
+msgstr "incapaz continuar: %s é inexistente."
 
-#: builtin/am.c:1648
+#: builtin/am.c:1697
 msgid "Commit Body is:"
 msgstr "Corpo do commit:"
 
@@ -10143,39 +10471,39 @@ msgstr "Corpo do commit:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1658
+#: builtin/am.c:1707
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "Aplicar? [y]sim/[n]ão/[e]ditar/[v]er patch/[a]ceitar todos: "
 
-#: builtin/am.c:1704 builtin/commit.c:395
+#: builtin/am.c:1753 builtin/commit.c:408
 msgid "unable to write index file"
-msgstr "não é possível escrever o ficheiro de índice"
+msgstr "incapaz escrever ficheiro de index"
 
-#: builtin/am.c:1708
+#: builtin/am.c:1757
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
-msgstr "�ndice modificado: não é possível aplicar patches (modificado: %s)"
+msgstr "Index sujo: incapaz aplicar patches (sujo: %s)"
 
-#: builtin/am.c:1748 builtin/am.c:1816
+#: builtin/am.c:1797 builtin/am.c:1865
 #, c-format
 msgid "Applying: %.*s"
 msgstr "A aplicar: %.*s"
 
-#: builtin/am.c:1765
+#: builtin/am.c:1814
 msgid "No changes -- Patch already applied."
-msgstr "Nenhuma alteração -- Já foi aplicado o patch."
+msgstr "Nenhuma alteração -- Remendo já foi aplicado."
 
-#: builtin/am.c:1771
+#: builtin/am.c:1820
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Falha ao aplicar o patch em %s %.*s"
 
-#: builtin/am.c:1775
+#: builtin/am.c:1824
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
 
-#: builtin/am.c:1819
+#: builtin/am.c:1868
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -10185,7 +10513,7 @@ msgstr ""
 "Se há mais nada por preparar, provavelmente essas mesmas alterações\n"
 "já foram introduzidas; poderás querer saltar este patch."
 
-#: builtin/am.c:1826
+#: builtin/am.c:1875
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -10193,17 +10521,17 @@ msgid ""
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 
-#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
+#: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347
 #: builtin/reset.c:355
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Incapaz analisar objeto '%s'."
 
-#: builtin/am.c:1985
+#: builtin/am.c:2034
 msgid "failed to clean index"
-msgstr "falha ao limpar o índice"
+msgstr ""
 
-#: builtin/am.c:2029
+#: builtin/am.c:2078
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10211,176 +10539,178 @@ msgstr ""
 "Parece que moveste HEAD desde a última falha de 'am'.\n"
 "Recusando rebobinar até ORIG_HEAD"
 
-#: builtin/am.c:2136
+#: builtin/am.c:2185
 #, c-format
 msgid "Invalid value for --patch-format: %s"
-msgstr "Valor inválido de --patch-format: %s"
+msgstr "Valor inválido para --patch-format: %s"
 
-#: builtin/am.c:2178
-#, fuzzy, c-format
+#: builtin/am.c:2227
+#, c-format
 msgid "Invalid value for --show-current-patch: %s"
-msgstr "Valor inválido de --patch-format: %s"
+msgstr "Valor inválido para --show-current-patch: %s"
 
-#: builtin/am.c:2182
-#, fuzzy, c-format
+#: builtin/am.c:2231
+#, c-format
 msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--first-parent é incompatível com --bisect"
+msgstr ""
 
-#: builtin/am.c:2213
+#: builtin/am.c:2262
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opções>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2214
+#: builtin/am.c:2263
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opções>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2220
+#: builtin/am.c:2269
 msgid "run interactively"
 msgstr "executar interativamente"
 
-#: builtin/am.c:2222
+#: builtin/am.c:2271
 msgid "historical option -- no-op"
 msgstr "opção histórica -- sem-ação"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2273
 msgid "allow fall back on 3way merging if needed"
 msgstr "permitir recorrer a integração com 3 pontos se necessário"
 
-#: builtin/am.c:2225 builtin/init-db.c:558 builtin/prune-packed.c:16
-#: builtin/repack.c:335 builtin/stash.c:815
+#: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:472 builtin/stash.c:945
 msgid "be quiet"
-msgstr "silencioso"
+msgstr "ficar silencioso"
 
-#: builtin/am.c:2227
-#, fuzzy
+#: builtin/am.c:2276
 msgid "add a Signed-off-by trailer to the commit message"
-msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit"
+msgstr "adicionar atribuição  Signed-off-by para a mensagem de memória"
 
-#: builtin/am.c:2230
+#: builtin/am.c:2279
 msgid "recode into utf8 (default)"
 msgstr "recodificar em utf8 (predefinição)"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2281
 msgid "pass -k flag to git-mailinfo"
 msgstr "passar a opção -k ao git-mailinfo"
 
-#: builtin/am.c:2234
+#: builtin/am.c:2283
 msgid "pass -b flag to git-mailinfo"
 msgstr "passar a opção -b ao git-mailinfo"
 
-#: builtin/am.c:2236
+#: builtin/am.c:2285
 msgid "pass -m flag to git-mailinfo"
 msgstr "passar a opção -m ao git-mailinfo"
 
-#: builtin/am.c:2238
+#: builtin/am.c:2287
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "passar a opção --keep-cr ao gitmailsplit para formato de mbox"
+msgstr "passar a opção --keep-cr a git-mailsplit para formato mbox"
 
-#: builtin/am.c:2241
+#: builtin/am.c:2290
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
-"não passar a opção --keep-cr ao git-mailsplit independentemente de am.keepcr"
+"proibido passares --keep-cr a git-mailsplit independentemente de am.keepcr"
 
-#: builtin/am.c:2244
+#: builtin/am.c:2293
 msgid "strip everything before a scissors line"
 msgstr "retirar todo o conteúdo antes da linha de tesoura"
 
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2295
+msgid "pass it through git-mailinfo"
+msgstr "passa-o pelo git-mailinfo"
+
+#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307
+#: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319
+#: builtin/am.c:2325
 msgid "pass it through git-apply"
-msgstr "transmitir ao git-apply"
+msgstr "passa-o pelo git-apply"
 
-#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260
+#: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261
 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350
-#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
-#: parse-options.h:316
+#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
+#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
+#: parse-options.h:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2269 builtin/branch.c:659 builtin/bugreport.c:136
-#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438
+#: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137
+#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
 #: builtin/verify-tag.c:38
 msgid "format"
 msgstr "formato"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2322
 msgid "format the patch(es) are in"
-msgstr "formato de apresentação de patches"
+msgstr "formato em que o(s) remendo(s) estão"
 
-#: builtin/am.c:2276
+#: builtin/am.c:2328
 msgid "override error message when patch failure occurs"
-msgstr "substituir a mensagem de erro quando a aplicação do patch falha"
+msgstr "sobrepor mensagem de erro quando falha na aplicação de remendo ocorrer"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2330
 msgid "continue applying patches after resolving a conflict"
-msgstr "continuar a aplicar os patches depois de resolver os conflitos"
+msgstr "continuar submetendo remendos depois de resolver um conflito"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2333
 msgid "synonyms for --continue"
 msgstr "sinónimo de --continue"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2336
 msgid "skip the current patch"
-msgstr "ignorar o patch atual"
+msgstr "ignorar remendo atual"
 
-#: builtin/am.c:2287
-msgid "restore the original branch and abort the patching operation."
-msgstr "restaurar o ramo original e abortar a operação de patch."
+#: builtin/am.c:2339
+msgid "restore the original branch and abort the patching operation"
+msgstr "restaurar o ramo original e abortar a operação de remendar"
 
-#: builtin/am.c:2290
-msgid "abort the patching operation but keep HEAD where it is."
+#: builtin/am.c:2342
+msgid "abort the patching operation but keep HEAD where it is"
 msgstr ""
 
-#: builtin/am.c:2294
-#, fuzzy
+#: builtin/am.c:2346
 msgid "show the patch being applied"
-msgstr "mostrar linhas não correspondidas"
+msgstr "mostrar linhas sendo submetidas"
 
-#: builtin/am.c:2299
+#: builtin/am.c:2351
 msgid "lie about committer date"
 msgstr "mentir sobre a data de commit"
 
-#: builtin/am.c:2301
+#: builtin/am.c:2353
 msgid "use current timestamp for author date"
 msgstr "usar a data e hora atual como data de autor"
 
-#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
-#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536
-#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419
+#: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640
+#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
+#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
 msgid "key-id"
 msgstr "id-chave"
 
-#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395
+#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
 msgid "GPG-sign commits"
-msgstr "assinar os commits com GPG"
+msgstr "assinar memórias com GPG"
 
-#: builtin/am.c:2307
+#: builtin/am.c:2359
 msgid "(internal use for git-rebase)"
-msgstr "(uso interno de git-rebase)"
+msgstr "(uso interno para git-rebase)"
 
-#: builtin/am.c:2325
+#: builtin/am.c:2377
 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 ""
-"A opção -b/--binary há muito que é ignorada e será\n"
-"futuramente removida. Por favor não a use."
+"A opção -b/--binary há muito que é ignorada e será removida.\n"
+"Por favor deixa de usá-la."
 
-#: builtin/am.c:2332
+#: builtin/am.c:2384
 msgid "failed to read the index"
-msgstr "falha ao ler o índice"
+msgstr "falhou ler cenário"
 
-#: builtin/am.c:2347
+#: builtin/am.c:2399
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "o diretório de rebesa anterior %s ainda existe, mas foi fornecida uma mbox."
 
-#: builtin/am.c:2371
+#: builtin/am.c:2423
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -10389,35 +10719,34 @@ msgstr ""
 "Diretório abandonado %s encontrado.\n"
 "Use \"git am --abort\" para o remover."
 
-#: builtin/am.c:2377
+#: builtin/am.c:2429
 msgid "Resolve operation not in progress, we are not resuming."
-msgstr "A operação de resolução não está em curso, não retomando."
+msgstr "A operação de resolução está parada, continuará parada."
 
-#: builtin/am.c:2387
+#: builtin/am.c:2439
 msgid "interactive mode requires patches on the command line"
 msgstr ""
 
 #: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<opções>] [<patch>...]"
+msgstr "git apply [<opções>] [<remendo>...]"
 
 #: builtin/archive.c:17
 #, c-format
 msgid "could not create archive file '%s'"
-msgstr "não foi possível criar o ficheiro de arquivo '%s'"
+msgstr "incapaz criar ficheiro de arquivo '%s'"
 
 #: builtin/archive.c:20
 msgid "could not redirect output"
-msgstr "não foi possível redirecionar a saída"
+msgstr "incapaz redirecionar a saída"
 
 #: builtin/archive.c:37
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Remoto sem URL"
 
 #: builtin/archive.c:61
-#, fuzzy
 msgid "git archive: expected ACK/NAK, got a flush packet"
-msgstr "git archive: esperava-se ACK/NAK, obteve-se EOF"
+msgstr "git archive: esperado ACK/NAK, recebi pacote flush"
 
 #: builtin/archive.c:64
 #, c-format
@@ -10430,31 +10759,17 @@ msgstr "git archive: erro de protocolo"
 
 #: builtin/archive.c:69
 msgid "git archive: expected a flush"
-msgstr "git archive: esvaziamento de cache (flush) esperado"
+msgstr "git archive: esperado um flush"
 
 #: builtin/bisect--helper.c:23
-#, fuzzy
 msgid "git bisect--helper --bisect-reset [<commit>]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
-#: builtin/bisect--helper.c:24
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
 msgstr ""
 
-#: builtin/bisect--helper.c:25
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-
-#: builtin/bisect--helper.c:26
+#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
 msgstr ""
 
-#: builtin/bisect--helper.c:27
-#, fuzzy
+#: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
@@ -10462,466 +10777,461 @@ msgstr ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
 
-#: builtin/bisect--helper.c:28
+#: builtin/bisect--helper.c:26
 msgid ""
 "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
 "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
 "[<paths>...]"
 msgstr ""
 
-#: builtin/bisect--helper.c:30
-#, fuzzy
+#: builtin/bisect--helper.c:28
 msgid "git bisect--helper --bisect-next"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
-#: builtin/bisect--helper.c:31
-#, fuzzy
-msgid "git bisect--helper --bisect-auto-next"
-msgstr "git bisect--helper --next-all [--no-checkout]"
+msgstr ""
 
-#: builtin/bisect--helper.c:32
-#, fuzzy
+#: builtin/bisect--helper.c:29
 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
+msgstr ""
 
-#: builtin/bisect--helper.c:33
-#, fuzzy
+#: builtin/bisect--helper.c:30
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
+msgstr ""
 
-#: builtin/bisect--helper.c:108
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr ""
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr ""
+
+#: builtin/bisect--helper.c:107
+#, c-format
 msgid "cannot open file '%s' in mode '%s'"
-msgstr "não é possível abrir o ficheiro '%s'"
+msgstr "incapaz abrir ficheiro '%s' em modo '%s'"
 
-#: builtin/bisect--helper.c:115
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:114
+#, c-format
 msgid "could not write to file '%s'"
-msgstr "não foi possível escrever em '%s'"
+msgstr "incapaz escrever para ficheiro '%s'"
 
-#: builtin/bisect--helper.c:154
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:155
+#, c-format
 msgid "'%s' is not a valid term"
-msgstr "'%s' não é uma referência válida."
+msgstr "'%s' é um termo inválido."
 
-#: builtin/bisect--helper.c:158
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:159
+#, c-format
 msgid "can't use the builtin command '%s' as a term"
-msgstr "não é possível usar o comando '$term' como um termo"
+msgstr "incapaz usar comando embutido '%s' como um termo"
 
-#: builtin/bisect--helper.c:168
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:169
+#, c-format
 msgid "can't change the meaning of the term '%s'"
-msgstr "não é possível alterar o significado do termo '$term'"
+msgstr "incapaz alterar o significado do termo '%s'"
 
-#: builtin/bisect--helper.c:178
+#: builtin/bisect--helper.c:179
 msgid "please use two different terms"
 msgstr "por favor, usa dois termos diferentes"
 
-#: builtin/bisect--helper.c:194
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:195
+#, c-format
 msgid "We are not bisecting.\n"
 msgstr "Estamos bissetando nada.\n"
 
-#: builtin/bisect--helper.c:202
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:203
+#, c-format
 msgid "'%s' is not a valid commit"
-msgstr "'%s' não é um commit"
+msgstr "'%s' é um commit inválido"
 
-#: builtin/bisect--helper.c:211
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:212
+#, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr ""
 "pude check out HEAD original '%s' nenhuma. Tenta 'git bisect reset <commit>'."
 
-#: builtin/bisect--helper.c:255
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:256
+#, c-format
 msgid "Bad bisect_write argument: %s"
-msgstr "Argumento de bisect_write incorreto: $state"
+msgstr "Argumento bisect_write incorreto: %s"
 
-#: builtin/bisect--helper.c:260
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:261
+#, c-format
 msgid "couldn't get the oid of the rev '%s'"
-msgstr "não foi possível criar o diretório de árvore de trabalho '%s'"
+msgstr "incapaz obter oid da rev '%s'"
 
-#: builtin/bisect--helper.c:272
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:273
+#, c-format
 msgid "couldn't open the file '%s'"
 msgstr "incapaz abrir o ficheiro '%s'"
 
-#: builtin/bisect--helper.c:298
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:299
+#, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
-msgstr ""
-"Comando inválido: está-se a bissetar usando os termos $TERM_BAD/$TERM_GOOD."
+msgstr "Comando inválido: estás atualmente a bissetar %s/%s"
 
-#: builtin/bisect--helper.c:325
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:326
+#, 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 ""
-"Deve indicar pelo menos uma revisão $bad_syn e uma revisão $good_syn.\n"
-"(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)"
+"Precisas de dar pelo menos uma revisão %s e %s.\n"
+"Podes usar \"git bisect %s\" e \"git bisect %s\" para esse fim."
 
-#: builtin/bisect--helper.c:329
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:330
+#, 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 ""
-"Deve começar por executar \"git bisect start\".\n"
-"Indique pelo menos uma revisão $good_syn e uma revisão $bad_syn.\n"
-"(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)"
+"Precisas de começar com \"git bisect start\".\n"
+"Depois precisas de dar-me pelo menos uma revisão %s e %s.\n"
+"Podes usar \"git bisect %s\" e \"git bisect %s\" para esse fim."
 
-#: builtin/bisect--helper.c:349
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:350
+#, c-format
 msgid "bisecting only with a %s commit"
-msgstr "Aviso: a bissetar só com um commit $TERM_BAD."
+msgstr "bissetando apenas com uma memória %s"
 
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:357
+#: builtin/bisect--helper.c:358
 msgid "Are you sure [Y/n]? "
 msgstr "Tem a certeza [Y/n]? "
 
-#: builtin/bisect--helper.c:418
+#: builtin/bisect--helper.c:419
 msgid "no terms defined"
 msgstr "termo nenhum definido"
 
-#: builtin/bisect--helper.c:421
+#: builtin/bisect--helper.c:422
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
 "and %s for the new state.\n"
 msgstr ""
 
-#: builtin/bisect--helper.c:431
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:432
+#, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
 msgstr ""
 "argumento inválido %s para 'git bisect terms'.\n"
-"Opções suportadas: --term-good|--term-old e --term-bad|--term-new."
+"Opções sustentadas: --term-good|--term-old e --term-bad|--term-new."
 
-#: builtin/bisect--helper.c:498
-#, fuzzy
+#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
 msgid "revision walk setup failed\n"
-msgstr "falha ao configurar percurso de revisões\n"
+msgstr "falhou configuração de percurso de revisões\n"
 
-#: builtin/bisect--helper.c:520
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:521
+#, c-format
 msgid "could not open '%s' for appending"
-msgstr "não foi possível abrir '%s' para leitura"
+msgstr "incapaz abrir '%s' para acrescentar"
 
-#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652
-#, fuzzy
+#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
 msgid "'' is not a valid term"
-msgstr "'$term' não é um termo válido"
+msgstr "'' é um termo inválido"
 
-#: builtin/bisect--helper.c:662
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:663
+#, c-format
 msgid "unrecognized option: '%s'"
-msgstr "posição não reconhecida:%s"
+msgstr "opção desconhecida: '%s'"
 
-#: builtin/bisect--helper.c:666
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:667
+#, c-format
 msgid "'%s' does not appear to be a valid revision"
-msgstr "'$arg' não parecer ser uma revisão válida"
+msgstr "'%s' parece ser uma revisão inválida"
 
-#: builtin/bisect--helper.c:697
-#, fuzzy
+#: builtin/bisect--helper.c:698
 msgid "bad HEAD - I need a HEAD"
 msgstr "HEAD incorreta - é necessário uma HEAD"
 
-#: builtin/bisect--helper.c:712
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:713
+#, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
-msgstr ""
-"Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'."
+msgstr "falhou observar '%s'. Tenta 'git bisect start <ramo-válido>'."
 
-#: builtin/bisect--helper.c:733
+#: builtin/bisect--helper.c:734
 msgid "won't bisect on cg-seek'ed tree"
-msgstr "não é possível bissetar numa árvore \"cg-seek'ed\""
+msgstr "incapaz bissetar numa árvore \"cg-seek'ada\""
 
-#: builtin/bisect--helper.c:736
-#, fuzzy
+#: builtin/bisect--helper.c:737
 msgid "bad HEAD - strange symbolic ref"
 msgstr "HEAD incorreta - referência simbólica desconhecida"
 
-#: builtin/bisect--helper.c:756
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:757
+#, c-format
 msgid "invalid ref: '%s'"
-msgstr "ficheiro inválido: '%s'"
+msgstr ""
 
-#: builtin/bisect--helper.c:814
-#, fuzzy
+#: builtin/bisect--helper.c:815
 msgid "You need to start by \"git bisect start\"\n"
-msgstr "Deve começar por executar \"git bisect start\"\n"
+msgstr "Deves começar com \"git bisect start\"\n"
 
 #. TRANSLATORS: Make sure to include [Y] and [n] in your
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:825
+#: builtin/bisect--helper.c:826
 msgid "Do you want me to do it for you [Y/n]? "
-msgstr "Quer que o Git o faça por si [Y/n]? "
+msgstr "Quer que seja eu a fazer isso [Y/n]? "
 
-#: builtin/bisect--helper.c:843
-#, fuzzy
+#: builtin/bisect--helper.c:844
 msgid "Please call `--bisect-state` with at least one argument"
-msgstr "Invoque 'bisect_state' com pelo menos um argumento."
+msgstr "Por favor, chama `--bisect-state` com pelo menos um argumento"
 
-#: builtin/bisect--helper.c:856
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:857
+#, c-format
 msgid "'git bisect %s' can take only one argument."
-msgstr "'git bisect $TERM_BAD' só leva um argumento."
+msgstr "'git bisect %s' só leva um argumento."
 
-#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#, c-format
 msgid "Bad rev input: %s"
-msgstr "Revisão incorreta na entrada: $arg"
+msgstr "Entrada de rev inválida: %s"
 
-#: builtin/bisect--helper.c:924
-#, fuzzy
-msgid "reset the bisection state"
-msgstr "remover uma secção: nome"
+#: builtin/bisect--helper.c:889
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "Entrada de rev inválida (é memória nenhuma): %s"
 
-#: builtin/bisect--helper.c:926
-msgid "write out the bisection state in BISECT_LOG"
-msgstr ""
+#: builtin/bisect--helper.c:921
+msgid "We are not bisecting."
+msgstr "Estamos bissetando nada."
+
+#: builtin/bisect--helper.c:971
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "'%s'?? estás a falar de quê?"
+
+#: builtin/bisect--helper.c:983
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "incapaz ler ficheiro '%s' para reprodução"
 
-#: builtin/bisect--helper.c:928
-msgid "check and set terms in a bisection state"
+#: builtin/bisect--helper.c:1056
+msgid "reset the bisection state"
 msgstr ""
 
-#: builtin/bisect--helper.c:930
+#: builtin/bisect--helper.c:1058
 msgid "check whether bad or good terms exist"
 msgstr ""
 
-#: builtin/bisect--helper.c:932
-#, fuzzy
+#: builtin/bisect--helper.c:1060
 msgid "print out the bisect terms"
-msgstr "imprimir apenas as tags do objeto"
+msgstr "imprimir termos de bifurcação"
 
-#: builtin/bisect--helper.c:934
+#: builtin/bisect--helper.c:1062
 msgid "start the bisect session"
 msgstr ""
 
-#: builtin/bisect--helper.c:936
-#, fuzzy
+#: builtin/bisect--helper.c:1064
 msgid "find the next bisection commit"
-msgstr "não é possível emendar commit não-existente"
-
-#: builtin/bisect--helper.c:938
-msgid "verify the next bisection state then checkout the next bisection commit"
-msgstr ""
+msgstr "encontra próximo commit de bisecção"
 
-#: builtin/bisect--helper.c:940
+#: builtin/bisect--helper.c:1066
 msgid "mark the state of ref (or refs)"
 msgstr ""
 
-#: builtin/bisect--helper.c:942
-msgid "no log for BISECT_WRITE"
+#: builtin/bisect--helper.c:1068
+msgid "list the bisection steps so far"
 msgstr ""
 
-#: builtin/bisect--helper.c:957
-msgid "--bisect-reset requires either no argument or a commit"
+#: builtin/bisect--helper.c:1070
+msgid "replay the bisection process from the given file"
 msgstr ""
 
-#: builtin/bisect--helper.c:961
-#, fuzzy
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr ":strip= requer um inteiro positivo como argumento"
+#: builtin/bisect--helper.c:1072
+msgid "skip some commits for checkout"
+msgstr "ignorar algumas memórias para observação"
 
-#: builtin/bisect--helper.c:967
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr ""
+#: builtin/bisect--helper.c:1074
+msgid "no log for BISECT_WRITE"
+msgstr "nenhum registo para BISECT_WRITE"
 
-#: builtin/bisect--helper.c:973
+#: builtin/bisect--helper.c:1089
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset exige quer argumento nenhum ou uma memória"
+
+#: builtin/bisect--helper.c:1094
 msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr ""
+msgstr "--bisect-next-check exige 2 ou 3 argumentos"
 
-#: builtin/bisect--helper.c:979
-#, fuzzy
+#: builtin/bisect--helper.c:1100
 msgid "--bisect-terms requires 0 or 1 argument"
-msgstr ":strip= requer um inteiro positivo como argumento"
+msgstr "--bisect-terms exige 0 ou 1 argumento"
 
-#: builtin/bisect--helper.c:988
-#, fuzzy
+#: builtin/bisect--helper.c:1109
 msgid "--bisect-next requires 0 arguments"
-msgstr "--continue não leva argumentos"
+msgstr "--bisect-next exige 0 argumentos"
 
-#: builtin/bisect--helper.c:994
-#, fuzzy
-msgid "--bisect-auto-next requires 0 arguments"
-msgstr "--continue não leva argumentos"
+#: builtin/bisect--helper.c:1120
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log exige 0 argumentos"
+
+#: builtin/bisect--helper.c:1125
+msgid "no logfile given"
+msgstr "nenhum ficheiro-registo fornecido"
 
 #: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr "git blame [<opções>] [<rev-opções>] [<rev>] [--] <ficheiro>"
+msgstr "git blame [<opções>] [<rev-opts>] [<rev>] [--] <ficheiro>"
 
 #: builtin/blame.c:37
 msgid "<rev-opts> are documented in git-rev-list(1)"
-msgstr "<rev-opções> estão documentadas em git-rev-list(1)"
+msgstr "<rev-opts> estão documentadas em git-rev-list(1)"
 
 #: builtin/blame.c:410
-#, fuzzy, c-format
+#, c-format
 msgid "expecting a color: %s"
-msgstr "a redirecionar para %s "
+msgstr "esperando cor: %s"
 
 #: builtin/blame.c:417
 msgid "must end with a color"
 msgstr ""
 
-#: builtin/blame.c:730
-#, fuzzy, c-format
+#: builtin/blame.c:728
+#, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "ignorar cor inválida '%.*s' em log.graphColors"
+msgstr "cor inválida '%s' em color.blame.repeatedLines"
 
-#: builtin/blame.c:748
-#, fuzzy
+#: builtin/blame.c:746
 msgid "invalid value for blame.coloring"
-msgstr "valor inválido de %s"
+msgstr ""
 
-#: builtin/blame.c:847
+#: builtin/blame.c:845
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr ""
 
-#: builtin/blame.c:869
-msgid "Show blame entries as we find them, incrementally"
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
 msgstr ""
 "Mostrar entradas de culpa à medida que forem encontradas, incrementalmente"
 
-#: builtin/blame.c:870
-#, fuzzy
-msgid "Do not show object names of boundary commits (Default: off)"
+#: builtin/blame.c:868
+msgid "do not show object names of boundary commits (Default: off)"
 msgstr "Mostar SHA-1 dos commits limite em branco (Predefinição: desativado)"
 
-#: builtin/blame.c:871
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: builtin/blame.c:869
+msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "Tratar commits raiz como limite nenhum (Predefinição: desativado)"
 
-#: builtin/blame.c:872
-msgid "Show work cost statistics"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
 msgstr "Mostrar estatísticas de custo de atividade"
 
+#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
+#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
+#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
+#: builtin/push.c:566 builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr "forçar informação de progresso"
+
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr "Mostrar a pontuação das entradas de culpa"
+
 #: builtin/blame.c:873
-msgid "Force progress reporting"
-msgstr "Forçar informação de progresso"
+msgid "show original filename (Default: auto)"
+msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)"
 
 #: builtin/blame.c:874
-msgid "Show output score for blame entries"
-msgstr "Mostrar a pontuação das entradas de culpa"
+msgid "show original linenumber (Default: off)"
+msgstr "mostrar números de linha originais (Predefinição: desligado)"
 
 #: builtin/blame.c:875
-msgid "Show original filename (Default: auto)"
-msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)"
+msgid "show in a format designed for machine consumption"
+msgstr "mostrar em formato próprio para consumo por máquina"
 
 #: builtin/blame.c:876
-msgid "Show original linenumber (Default: off)"
-msgstr "Mostrar números de linha originais (Predefinição: desativado)"
+msgid "show porcelain format with per-line commit information"
+msgstr "mostrar em formato de porcelana com informações de memória por linha"
 
 #: builtin/blame.c:877
-msgid "Show in a format designed for machine consumption"
-msgstr "Mostrar em formato próprio para ser consumo por uma máquina"
+msgid "use the same output mode as git-annotate (Default: off)"
+msgstr "usar o mesmo modo de saída que git-annotate (Predefinição: desativado)"
 
 #: builtin/blame.c:878
-msgid "Show porcelain format with per-line commit information"
-msgstr "Mostrar em formato de porcelana com informações de commit por linha"
-
-#: builtin/blame.c:879
-msgid "Use the same output mode as git-annotate (Default: off)"
-msgstr "Usar o mesmo modo de saída que git-annotate (Predefinição: desativado)"
-
-#: builtin/blame.c:880
-msgid "Show raw timestamp (Default: off)"
+msgid "show raw timestamp (Default: off)"
 msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)"
 
-#: builtin/blame.c:881
-msgid "Show long commit SHA1 (Default: off)"
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
 msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)"
 
-#: builtin/blame.c:882
-msgid "Suppress author name and timestamp (Default: off)"
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
 msgstr ""
 "Suprimir nome de autor e carimbo de data/hora (Predefinição: desativado)"
 
-#: builtin/blame.c:883
-msgid "Show author email instead of name (Default: off)"
+#: builtin/blame.c:881
+msgid "show author email instead of name (Default: off)"
 msgstr "Mostrar o email do autor em vez do nome (Predefinição: desativado)"
 
-#: builtin/blame.c:884
-msgid "Ignore whitespace differences"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
 msgstr "Ignorar as diferenças de espaço em branco"
 
-#: builtin/blame.c:885 builtin/log.c:1813
-#, fuzzy
+#: builtin/blame.c:883 builtin/log.c:1823
 msgid "rev"
-msgstr "reverter"
+msgstr "rev"
 
-#: builtin/blame.c:885
-#, fuzzy
-msgid "Ignore <rev> when blaming"
-msgstr "ignorar o índice ao verificar"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "ignorar <rev> ao blaming"
 
-#: builtin/blame.c:886
-#, fuzzy
-msgid "Ignore revisions from <file>"
-msgstr "ler mensagem de um ficheiro"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr ""
 
-#: builtin/blame.c:887
+#: builtin/blame.c:885
 msgid "color redundant metadata from previous line differently"
 msgstr ""
 
-#: builtin/blame.c:888
+#: builtin/blame.c:886
 msgid "color lines by age"
 msgstr ""
 
-#: builtin/blame.c:889
-msgid "Spend extra cycles to find better match"
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
 msgstr "Despender ciclos extra para encontrar uma melhor correspondência"
 
-#: builtin/blame.c:890
-msgid "Use revisions from <file> instead of calling git-rev-list"
-msgstr "Usar revisões do <ficheiro> em vez de invocar git-rev-list"
+#: builtin/blame.c:888
+msgid "use revisions from <file> instead of calling git-rev-list"
+msgstr "usar revisões do <ficheiro> em vez de invocar git-rev-list"
 
-#: builtin/blame.c:891
-msgid "Use <file>'s contents as the final image"
+#: builtin/blame.c:889
+msgid "use <file>'s contents as the final image"
 msgstr "Usar o conteúdo do <ficheiro> como imagem final"
 
-#: builtin/blame.c:892 builtin/blame.c:893
+#: builtin/blame.c:890 builtin/blame.c:891
 msgid "score"
 msgstr "pontuação"
 
-#: builtin/blame.c:892
-msgid "Find line copies within and across files"
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
 msgstr "Localizar linhas copiadas dentro e entre ficheiros"
 
-#: builtin/blame.c:893
-msgid "Find line movements within and across files"
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
 msgstr "Localizar linhas movidas dentro e entre ficheiros"
 
-#: builtin/blame.c:894
-#, fuzzy
+#: builtin/blame.c:892
 msgid "range"
 msgstr "intervalo"
 
-#: builtin/blame.c:895
-#, fuzzy
-msgid "Process only line range <start>,<end> or function :<funcname>"
-msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr "processar apenas intervalo de linhas <início>,<fim> ou função :<nome-função>"
 
-#: builtin/blame.c:947
+#: builtin/blame.c:945
 msgid "--progress can't be used with --incremental or porcelain formats"
-msgstr ""
-"--progress não pode ser usado com --incremental ou formatos de porcelana"
+msgstr "proibido usar --progress com --incremental ou formatos porcelana"
 
 #. TRANSLATORS: This string is used to tell us the
 #. maximum display width for a relative timestamp in
@@ -10931,25 +11241,24 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:998
+#: builtin/blame.c:996
 msgid "4 years, 11 months ago"
 msgstr "há 4 anos e 11 meses atrás"
 
-#: builtin/blame.c:1114
+#: builtin/blame.c:1112
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "o ficheiro %s só tem %lu linha"
 msgstr[1] "o ficheiro %s só tem %lu linhas"
 
-#: builtin/blame.c:1159
+#: builtin/blame.c:1157
 msgid "Blaming lines"
 msgstr "Linhas de culpa"
 
 #: builtin/branch.c:29
-#, fuzzy
 msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
-msgstr "git branch [<opções>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<opções>] [-r | -a] [--merged] [--no-merged]"
 
 #: builtin/branch.c:30
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
@@ -10957,16 +11266,15 @@ msgstr "git branch [<opções>] [-l] [-f] <nome-ramo> [<ponto-de-partida>]"
 
 #: builtin/branch.c:31
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
-msgstr "git branch [<opções>] [-r] (-d | -D) <nome-do-ramo>..."
+msgstr "git branch [<opções>] [-r] (-d | -D) <nome-ramo>..."
 
 #: builtin/branch.c:32
 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
 msgstr "git branch [<opções>] (-m | -M) [<ramo-antigo>] <novo-ramo>"
 
 #: builtin/branch.c:33
-#, fuzzy
 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
-msgstr "git branch [<opções>] (-m | -M) [<ramo-antigo>] <novo-ramo>"
+msgstr "git branch [<opções>] (-c | -C) [<ramo-antigo>] <novo-ramo>"
 
 #: builtin/branch.c:34
 msgid "git branch [<options>] [-r | -a] [--points-at]"
@@ -10982,8 +11290,8 @@ msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD."
 msgstr ""
-"a eliminar o ramo '%s' integrado em\n"
-"         '%s', mas ainda não integrado em HEAD."
+"eliminando ramo '%s' que foi juntado a\n"
+"         '%s', mas ainda está por juntar a HEAD."
 
 #: builtin/branch.c:158
 #, c-format
@@ -10991,8 +11299,8 @@ msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD."
 msgstr ""
-"ramo '%s' não eliminado, visto que ainda não foi integrado em\n"
-"         '%s', apesar de já ter sido integrado em HEAD."
+"mantendo ramo '%s' que ainda está por juntar a\n"
+"         '%s', apesar de já estar junto a HEAD."
 
 #: builtin/branch.c:172
 #, c-format
@@ -11005,133 +11313,116 @@ msgid ""
 "The branch '%s' is not fully merged.\n"
 "If you are sure you want to delete it, run 'git branch -D %s'."
 msgstr ""
-"O ramo '%s' não foi totalmente integrado.\n"
-"Se tem a certeza que o quer eliminar, execute 'git branch -D %s'."
+"O ramo '%s' está por juntar na totalidade.\n"
+"Se tens a certeza que queres eliminá-lo, executa 'git branch -D %s'."
 
 #: builtin/branch.c:189
 msgid "Update of config-file failed"
 msgstr "Falha ao atualizar o ficheiro de configuração"
 
-#: builtin/branch.c:220
+#: builtin/branch.c:223
 msgid "cannot use -a with -d"
-msgstr "não é possível usar -a com -d"
+msgstr "incapaz usar -a com -d"
 
-#: builtin/branch.c:226
+#: builtin/branch.c:230
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Incapaz de pesquisar objeto commit para HEAD"
 
-#: builtin/branch.c:240
+#: builtin/branch.c:244
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Impossível apagar ramo '%s' checked out em '%s'"
 
-#: builtin/branch.c:255
+#: builtin/branch.c:259
 #, c-format
 msgid "remote-tracking branch '%s' not found."
-msgstr "ramo de monitorização remoto '%s' não encontrado."
+msgstr "ramo de monitorização remoto '%s' por encontrar."
 
-#: builtin/branch.c:256
+#: builtin/branch.c:260
 #, c-format
 msgid "branch '%s' not found."
-msgstr "ramo '%s' não encontrado."
-
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Erro a eliminar o ramo de monitorização remoto '%s'"
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Erro a eliminar ramo '%s'"
+msgstr "ramo '%s' por encontrar."
 
-#: builtin/branch.c:279
+#: builtin/branch.c:291
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Ramo de monitorização remoto %s eliminado (era %s).\n"
 
-#: builtin/branch.c:280
+#: builtin/branch.c:292
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Ramo %s eliminado (era %s).\n"
 
-#: builtin/branch.c:429 builtin/tag.c:61
-#, fuzzy
+#: builtin/branch.c:440 builtin/tag.c:63
 msgid "unable to parse format string"
-msgstr "não foi possível analisar o formato"
+msgstr "incapaz processar o formato string"
 
-#: builtin/branch.c:460
-#, fuzzy
+#: builtin/branch.c:471
 msgid "could not resolve HEAD"
-msgstr "não foi possível resolver o commit HEAD"
+msgstr "incapaz resolver HEAD"
 
-#: builtin/branch.c:466
-#, fuzzy, c-format
+#: builtin/branch.c:477
+#, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
-msgstr "HEAD não encontrada em refs/heads!"
+msgstr "HEAD (%s) aponta para fora de refs/heads/"
 
-#: builtin/branch.c:481
+#: builtin/branch.c:492
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "O ramo %s está a ser rebaseado em %s"
 
-#: builtin/branch.c:485
+#: builtin/branch.c:496
 #, c-format
 msgid "Branch %s is being bisected at %s"
-msgstr "O ramo %s está a ser bissetado em %s"
+msgstr "Ramo %s está sendo bissetado em %s"
 
-#: builtin/branch.c:502
-#, fuzzy
+#: builtin/branch.c:513
 msgid "cannot copy the current branch while not on any."
-msgstr ""
-"não é possível mudar o nome do ramo atual vista que não se encontra num ramo."
+msgstr "apenas podes copiar o ramo corrente enquanto estás num."
 
-#: builtin/branch.c:504
+#: builtin/branch.c:515
 msgid "cannot rename the current branch while not on any."
-msgstr ""
-"não é possível mudar o nome do ramo atual vista que não se encontra num ramo."
+msgstr "apenas podes renomear o ramo corrente enquanto estás num."
 
-#: builtin/branch.c:515
+#: builtin/branch.c:526
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nome de ramo inválido: '%s'"
 
-#: builtin/branch.c:542
+#: builtin/branch.c:555
 msgid "Branch rename failed"
-msgstr "Falha ao mudar o nome do ramo"
+msgstr "Renomear ramo falhou"
 
-#: builtin/branch.c:544
-#, fuzzy
+#: builtin/branch.c:557
 msgid "Branch copy failed"
-msgstr "Falha ao mudar o nome do ramo"
+msgstr "Copiar ramo falhou"
 
-#: builtin/branch.c:548
-#, fuzzy, c-format
+#: builtin/branch.c:561
+#, c-format
 msgid "Created a copy of a misnamed branch '%s'"
-msgstr "O ramo incorretamente denominado '%s' mudou de nome"
+msgstr "Criei uma cópia de ramo incorretamente denominado '%s'"
 
-#: builtin/branch.c:551
+#: builtin/branch.c:564
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
-msgstr "O ramo incorretamente denominado '%s' mudou de nome"
+msgstr "Renomeei o ramo incorretamente denominado '%s'"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:570
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
-msgstr "O nome do ramo mudou para %s, mas a HEAD não está atualizada!"
+msgstr "Ramo renomeado para %s, mas HEAD está desatualizada!"
 
-#: builtin/branch.c:566
+#: builtin/branch.c:579
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou"
 
-#: builtin/branch.c:568
-#, fuzzy
+#: builtin/branch.c:581
 msgid "Branch is copied, but update of config-file failed"
 msgstr ""
 "O ramo mudou de nome, mas a atualização do ficheiro de configuração falhou"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:597
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11142,223 +11433,212 @@ msgstr ""
 "  %s\n"
 "Linha começadas com '%c' serão ignoradas.\n"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:631
 msgid "Generic options"
 msgstr "Opções genéricas"
 
-#: builtin/branch.c:620
+#: builtin/branch.c:633
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "apresentar hash e assunto, duplique para ramos a montante"
 
-#: builtin/branch.c:621
+#: builtin/branch.c:634
 msgid "suppress informational messages"
 msgstr "suprimir mensagens informativas"
 
-#: builtin/branch.c:622
+#: builtin/branch.c:635
 msgid "set up tracking mode (see git-pull(1))"
-msgstr "configurar modo de seguimento (consulte git-pull(1))"
+msgstr "configurar modo de monitorização (vê git-pull(1))"
 
-#: builtin/branch.c:624
-#, fuzzy
+#: builtin/branch.c:637
 msgid "do not use"
-msgstr "esquema a usar"
+msgstr "deixar de usar"
 
-#: builtin/branch.c:626 builtin/rebase.c:532
+#: builtin/branch.c:639 builtin/rebase.c:533
 msgid "upstream"
 msgstr "a montante"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:639
 msgid "change the upstream info"
 msgstr "alterar a informação do ramo a montante"
 
-#: builtin/branch.c:627
-#, fuzzy
+#: builtin/branch.c:640
 msgid "unset the upstream info"
-msgstr "Remover a informação do ramo a montante"
+msgstr "desdefinir info de upstream"
 
-#: builtin/branch.c:628
+#: builtin/branch.c:641
 msgid "use colored output"
 msgstr "usar saída colorida"
 
-#: builtin/branch.c:629
+#: builtin/branch.c:642
 msgid "act on remote-tracking branches"
-msgstr "atuar sobre ramos de monitorização remotos"
+msgstr "atuar sobre ramos remoto de monitorização"
 
-#: builtin/branch.c:631 builtin/branch.c:633
+#: builtin/branch.c:644 builtin/branch.c:646
 msgid "print only branches that contain the commit"
-msgstr "imprimir apenas ramos que contenham o commit"
+msgstr "imprimir apenas ramos que contenham a memória"
 
-#: builtin/branch.c:632 builtin/branch.c:634
+#: builtin/branch.c:645 builtin/branch.c:647
 msgid "print only branches that don't contain the commit"
-msgstr "imprimir apenas ramos que não contenham o commit"
+msgstr "imprimir apenas ramos que contenham outro commit"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:650
 msgid "Specific git-branch actions:"
-msgstr "Ações específicas do git-branch:"
+msgstr "Ações específicas de git-branch:"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:651
 msgid "list both remote-tracking and local branches"
 msgstr "listar ramos de monitorização remotos e ramos locais"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:653
 msgid "delete fully merged branch"
 msgstr "eliminar um ramo totalmente integrado"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:654
 msgid "delete branch (even if not merged)"
-msgstr "eliminar um ramo (mesmo que não tenha sido integrado)"
+msgstr "elimina ramo (mesmo que esteja por juntar)"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:655
 msgid "move/rename a branch and its reflog"
-msgstr "mover ou mudar o nome de um ramo e o seu reflog"
+msgstr "mover/renomear ramo e seu reflog"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:656
 msgid "move/rename a branch, even if target exists"
-msgstr "mover ou mudar o nome de um ramo, mesmo que o destino já exista"
+msgstr "mover/renomear um ramo, mesmo se alvo exista"
 
-#: builtin/branch.c:644
-#, fuzzy
+#: builtin/branch.c:657
 msgid "copy a branch and its reflog"
-msgstr "mover ou mudar o nome de um ramo e o seu reflog"
+msgstr "copiar ramo e seu reflog"
 
-#: builtin/branch.c:645
-#, fuzzy
+#: builtin/branch.c:658
 msgid "copy a branch, even if target exists"
-msgstr "mover ou mudar o nome de um ramo, mesmo que o destino já exista"
+msgstr "copiar um ramo, mesmo se alvo exista"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:659
 msgid "list branch names"
 msgstr "listar os nomes dos ramos"
 
-#: builtin/branch.c:647
-#, fuzzy
+#: builtin/branch.c:660
 msgid "show current branch name"
-msgstr "Nenhum ramo atual."
+msgstr "mostrar nome de ramo atual"
 
-#: builtin/branch.c:648
+#: builtin/branch.c:661
 msgid "create the branch's reflog"
 msgstr "criar reflog do ramo"
 
-#: builtin/branch.c:650
+#: builtin/branch.c:663
 msgid "edit the description for the branch"
 msgstr "editar a descrição do ramo"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:664
 msgid "force creation, move/rename, deletion"
 msgstr "forçar criação, mover/mudar o nome ou exclusão"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:665
 msgid "print only branches that are merged"
 msgstr "imprimir apenas os ramos que foram integrados"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:666
 msgid "print only branches that are not merged"
-msgstr "imprimir apenas os ramos que não foram integrados"
+msgstr "imprimir apenas ramos que estão por juntar"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:667
 msgid "list branches in columns"
-msgstr "listar os ramos em colunas"
+msgstr "listar ramos em colunas"
 
-#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:434
+#: builtin/tag.c:477
 msgid "object"
 msgstr "objeto"
 
-#: builtin/branch.c:657
+#: builtin/branch.c:670
 msgid "print only branches of the object"
-msgstr "imprimir apenas os ramos do objeto"
+msgstr "imprimir apenas ramos de objeto"
 
-#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441
+#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
 msgid "sorting and filtering are case insensitive"
 msgstr "ordenar e filtrar são insensíveis a maiúsculas"
 
-#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439
+#: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "formato a usar na saída"
 
-#: builtin/branch.c:682 builtin/clone.c:790
+#: builtin/branch.c:695 builtin/clone.c:794
 msgid "HEAD not found below refs/heads!"
-msgstr "HEAD não encontrada em refs/heads!"
+msgstr "HEAD por encontrar em refs/heads!"
 
-#: builtin/branch.c:706
+#: builtin/branch.c:719
 msgid "--column and --verbose are incompatible"
 msgstr "--column e --verbose são incompatíveis"
 
-#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784
+#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
 msgid "branch name required"
 msgstr "nome do ramo é obrigatório"
 
-#: builtin/branch.c:751
+#: builtin/branch.c:766
 msgid "Cannot give description to detached HEAD"
 msgstr "Impossível dar descrição a HEAD solta"
 
-#: builtin/branch.c:756
+#: builtin/branch.c:771
 msgid "cannot edit description of more than one branch"
-msgstr "não é possível editar a descrição de mais do que um ramo"
+msgstr "incapaz editar descrição de mais do que um ramo"
 
-#: builtin/branch.c:763
+#: builtin/branch.c:778
 #, c-format
 msgid "No commit on branch '%s' yet."
-msgstr "Ainda não há commits no ramo '%s'."
+msgstr "Ramo '%s' ainda tem commit nenhum."
 
-#: builtin/branch.c:766
+#: builtin/branch.c:781
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Ramo nenhum denominado '%s'."
 
-#: builtin/branch.c:781
-#, fuzzy
+#: builtin/branch.c:796
 msgid "too many branches for a copy operation"
-msgstr "demasiados ramos para uma operação de mudança de nome"
+msgstr "demasiados ramos para operação de cópia"
 
-#: builtin/branch.c:790
-#, fuzzy
+#: builtin/branch.c:805
 msgid "too many arguments for a rename operation"
-msgstr "demasiados ramos para uma operação de mudança de nome"
+msgstr "demasiados ramos para operação de renomeação"
 
-#: builtin/branch.c:795
-#, fuzzy
+#: builtin/branch.c:810
 msgid "too many arguments to set new upstream"
 msgstr "demasiados ramos para definir novo ramo a montante"
 
-#: builtin/branch.c:799
+#: builtin/branch.c:814
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
-"não foi possível definir %s como ramo a montante de HEAD visto que esta não "
-"aponta para um ramo."
+"apenas pode definir upstream de HEAD para %s quando aponta para qualquer "
+"ramo."
 
-#: builtin/branch.c:802 builtin/branch.c:825
+#: builtin/branch.c:817 builtin/branch.c:840
 #, c-format
 msgid "no such branch '%s'"
-msgstr "o ramo '%s' não existe"
+msgstr "esse ramo '%s' é inexistente"
 
-#: builtin/branch.c:806
+#: builtin/branch.c:821
 #, c-format
 msgid "branch '%s' does not exist"
-msgstr "o ramo '%s' não existe"
+msgstr "ramo '%s' é inexistente"
 
-#: builtin/branch.c:819
-#, fuzzy
+#: builtin/branch.c:834
 msgid "too many arguments to unset upstream"
-msgstr "demasiados ramos para remover a definição de ramo a montante"
+msgstr "demasiados argumentos para desdefinir upstream"
 
-#: builtin/branch.c:823
+#: builtin/branch.c:838
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
-"não foi possível remover a definição de ramo a montante de HEAD visto que "
-"esta não aponta para um ramo."
+"apenas posso desdefinir upstream de HEAD quando aponta para qualquer ramo."
 
-#: builtin/branch.c:829
+#: builtin/branch.c:844
 #, c-format
 msgid "Branch '%s' has no upstream information"
-msgstr "O ramo '%s' não tem informação sobre o ramo a montante"
+msgstr "Ramo '%s' tem informação de upstream nenhuma"
 
-#: builtin/branch.c:839
-#, fuzzy
+#: builtin/branch.c:854
 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>?"
@@ -11366,8 +11646,7 @@ msgstr ""
 "As opções -a, e -r, em 'git branch' levam nome de branch nenhum.\n"
 "Quiseste utilizar: -a|-r --list <pattern>? "
 
-#: builtin/branch.c:843
-#, fuzzy
+#: builtin/branch.c:858
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -11376,7 +11655,6 @@ msgstr ""
 "upstream-to' invés."
 
 #: builtin/bugreport.c:15
-#, fuzzy
 msgid "git version:\n"
 msgstr "versão git:\n"
 
@@ -11420,52 +11698,49 @@ msgid ""
 "You can delete any lines you don't wish to share.\n"
 msgstr ""
 
-#: builtin/bugreport.c:135
+#: builtin/bugreport.c:136
 msgid "specify a destination for the bugreport file"
 msgstr ""
 
-#: builtin/bugreport.c:137
+#: builtin/bugreport.c:138
 msgid "specify a strftime format suffix for the filename"
 msgstr ""
 
-#: builtin/bugreport.c:159
-#, fuzzy, c-format
+#: builtin/bugreport.c:160
+#, c-format
 msgid "could not create leading directories for '%s'"
-msgstr "não foi possível criar os diretórios superiores de '%s'"
+msgstr "incapaz criar pastas superiores para '%s'"
 
-#: builtin/bugreport.c:166
+#: builtin/bugreport.c:167
 msgid "System Info"
 msgstr ""
 
-#: builtin/bugreport.c:169
-#, fuzzy
+#: builtin/bugreport.c:170
 msgid "Enabled Hooks"
-msgstr "não foi possível abrir %s"
+msgstr "Hooks Ativados"
 
-#: builtin/bugreport.c:176
-#, fuzzy, c-format
+#: builtin/bugreport.c:177
+#, c-format
 msgid "couldn't create a new file at '%s'"
-msgstr "não foi possível criar o ficheiro '%s'"
+msgstr "incapaz criar novo ficheiro em '%s'"
 
-#: builtin/bugreport.c:179
-#, fuzzy, c-format
+#: builtin/bugreport.c:180
+#, c-format
 msgid "unable to write to %s"
-msgstr "não foi possível escrever %s"
+msgstr "incapaz escrever para %s"
 
-#: builtin/bugreport.c:189
+#: builtin/bugreport.c:190
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr ""
 
 #: builtin/bundle.c:15 builtin/bundle.c:23
-#, fuzzy
 msgid "git bundle create [<options>] <file> <git-rev-list args>"
-msgstr "git remote add [<opções>] <nome> <url>"
+msgstr "git bundle create [<opções>] <ficheiro> <args lista-git-rev>"
 
 #: builtin/bundle.c:16 builtin/bundle.c:28
-#, fuzzy
 msgid "git bundle verify [<options>] <file>"
-msgstr "git rm [<opções>] [--] <ficheiro>..."
+msgstr "git bundle verify [<opções>] <ficheiro>"
 
 #: builtin/bundle.c:17 builtin/bundle.c:33
 msgid "git bundle list-heads <file> [<refname>...]"
@@ -11475,19 +11750,19 @@ msgstr ""
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr ""
 
-#: builtin/bundle.c:67 builtin/pack-objects.c:3480
+#: builtin/bundle.c:67 builtin/pack-objects.c:3907
 msgid "do not show progress meter"
-msgstr "não mostrar medidor de progresso"
+msgstr "mostrar medidor de progresso nenhum"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3482
+#: builtin/bundle.c:69 builtin/pack-objects.c:3909
 msgid "show progress meter"
 msgstr "mostrar medidor de progresso"
 
-#: builtin/bundle.c:71 builtin/pack-objects.c:3484
+#: builtin/bundle.c:71 builtin/pack-objects.c:3911
 msgid "show progress meter during object writing phase"
-msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
+msgstr "mostrar medidor de progresso durante fase de escrita de objetos"
 
-#: builtin/bundle.c:74 builtin/pack-objects.c:3487
+#: builtin/bundle.c:74 builtin/pack-objects.c:3914
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "semelhante a --all-progress quando o medidor de progresso é mostrado"
 
@@ -11499,30 +11774,29 @@ msgstr ""
 msgid "Need a repository to create a bundle."
 msgstr "É necessário um repositório para criar um bundle."
 
-#: builtin/bundle.c:107
-#, fuzzy
+#: builtin/bundle.c:109
 msgid "do not show bundle details"
-msgstr "não mostrar tags descascadas"
+msgstr "mostrar nenhuns detalhes de conjunto"
 
-#: builtin/bundle.c:122
+#: builtin/bundle.c:128
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s está ok\n"
 
-#: builtin/bundle.c:163
+#: builtin/bundle.c:179
 msgid "Need a repository to unbundle."
 msgstr "É preciso um repositório para desempacotar."
 
-#: builtin/bundle.c:171 builtin/remote.c:1700
+#: builtin/bundle.c:191 builtin/remote.c:1700
 msgid "be verbose; must be placed before a subcommand"
 msgstr "ser verboso; deve ser colocado antes de um subcomando"
 
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:213 builtin/remote.c:1731
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Subcomando desconhecido: %s"
 
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:596
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11530,8 +11804,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <tipo> | --textconv | --filters) [--path=<caminho>] <objeto>"
 
-#: builtin/cat-file.c:599
-#, fuzzy
+#: builtin/cat-file.c:597
 msgid ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
@@ -11539,74 +11812,72 @@ msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:620
-#, fuzzy
+#: builtin/cat-file.c:618
 msgid "only one batch option may be specified"
-msgstr "Nenhum nome de ramo especificado"
+msgstr "apenas uma opção batch pode ser especificada"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:636
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tipo> pode ser um de: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:637
 msgid "show object type"
-msgstr "mostrar tipo do objeto"
+msgstr "mostrar tipo de objeto"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:638
 msgid "show object size"
 msgstr "mostrar tamanho do objeto"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:640
 msgid "exit with zero when there's no error"
-msgstr "sair com retorno zero quando não houver erros"
+msgstr "sair com retorno zero quando há erro nenhum"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:641
 msgid "pretty-print object's content"
 msgstr "mostrar conteúdo do objeto com impressão bonita"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:643
 msgid "for blob objects, run textconv on object's content"
 msgstr "executar textconv no conteúdo de objetos blob"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:645
 msgid "for blob objects, run filters on object's content"
 msgstr "para objetos blob, correr filtros sobre o conteúdo do objeto"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:646
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:647
 msgid "use a specific path for --textconv/--filters"
 msgstr "usar um caminho específico para --textconv/--filters"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:649
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "permitir que -s e -t funcionem com objetos danificados/corrompidos"
 
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:650
 msgid "buffer --batch output"
 msgstr "carregar a saída de --batch"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:652
 msgid "show info and content of objects fed from the standard input"
 msgstr "mostrar informação e conteúdo dos objetos fornecidos na entrada padrão"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:656
 msgid "show info about objects fed from the standard input"
 msgstr "mostrar informação sobre os objetos fornecidos na entrada padrão"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:660
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
-"seguir ligações simbólica no interior da árvore (usado com --batch ou --"
-"batch-check)"
+"seguir ligações simbólica de dentro da árvore (usado com --batch ou --batch-check)"
 
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:662
 msgid "show all objects with --batch or --batch-check"
 msgstr "mostrar todos os objetos com --batch ou --batch-check"
 
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:664
 msgid "do not order --batch-all-objects output"
 msgstr ""
 
@@ -11624,7 +11895,7 @@ msgstr "apresentar todos os atributos definidos no ficheiro"
 
 #: builtin/check-attr.c:22
 msgid "use .gitattributes only from the index"
-msgstr "usar .gitattributes apenas a partir do índice"
+msgstr "usar .gitattributes apenas de cenário"
 
 #: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
 msgid "read file names from stdin"
@@ -11634,8 +11905,8 @@ msgstr "ler os nomes dos ficheiros da entrada padrão"
 msgid "terminate input and output records by a NUL character"
 msgstr "terminar registos da entrada e da saída com um carácter NUL"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541
-#: builtin/worktree.c:561
+#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "suprimir informação de progresso"
 
@@ -11645,29 +11916,29 @@ msgstr "mostrar caminhos de entrada sem correspondência"
 
 #: builtin/check-ignore.c:31
 msgid "ignore index when checking"
-msgstr "ignorar o índice ao verificar"
+msgstr "ignorar cenário ao verificar"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
-msgstr "não é possível especificar caminhos com --stdin"
+msgstr "incapaz especificar nomes de caminho com --stdin"
 
-#: builtin/check-ignore.c:166
+#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "-z só faz sentido com --stdin"
 
-#: builtin/check-ignore.c:168
+#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "path nenhum especificado"
 
-#: builtin/check-ignore.c:172
+#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet só é válido com um único caminho"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
-msgstr "não é possível usar --quiet e --verbose simultaneamente"
+msgstr "incapaz usar ambos --quiet e --verbose"
 
-#: builtin/check-ignore.c:177
+#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching só é válido com --verbose"
 
@@ -11682,225 +11953,228 @@ msgstr "também ler contactos da entrada padrão"
 #: builtin/check-mailmap.c:25
 #, c-format
 msgid "unable to parse contact: %s"
-msgstr "não é possível analisar o contacto: %s"
+msgstr "incapaz processar contato: %s"
 
 #: builtin/check-mailmap.c:48
 msgid "no contacts specified"
 msgstr "contato nenhum especificado"
 
-#: builtin/checkout-index.c:139
+#: builtin/checkout--worker.c:110
+msgid "git checkout--worker [<options>]"
+msgstr "git checkout--worker [<opções>]"
+
+#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
+#: builtin/column.c:31 builtin/submodule--helper.c:1892
+#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
+#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
+#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
+#: builtin/worktree.c:728
+msgid "string"
+msgstr "string"
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr "ao criar ficheiros, preceder com <string>"
+
+#: builtin/checkout-index.c:152
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<opções>] [--] [<ficheiro>...]"
 
-#: builtin/checkout-index.c:156
+#: builtin/checkout-index.c:169
 msgid "stage should be between 1 and 3 or all"
 msgstr "stage deve ser um número entre 1 e 3 ou o parâmetro all"
 
-#: builtin/checkout-index.c:173
+#: builtin/checkout-index.c:187
 msgid "check out all files in the index"
 msgstr "extrair todos os ficheiros presentes no índice"
 
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:188
 msgid "force overwrite of existing files"
-msgstr "forçar substituição dos ficheiros existentes"
+msgstr "forçar o sobrescrever de ficheiros existentes"
 
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:190
 msgid "no warning for existing files and files not in index"
 msgstr ""
-"não mostrar aviso para ficheiros existentes e ficheiros não presentes no "
-"índice"
+"mostrar aviso nenhum para ficheiros existentes e ficheiros fora do index"
 
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:192
 msgid "don't checkout new files"
-msgstr "não extrair novos ficheiros"
+msgstr "extrair ficheiros novos nenhuns"
 
-#: builtin/checkout-index.c:180
+#: builtin/checkout-index.c:194
 msgid "update stat information in the index file"
-msgstr "atualizar informação de stat no ficheiro de índice"
+msgstr "atualizar informação de stat de ficheiro de cenário"
 
-#: builtin/checkout-index.c:184
+#: builtin/checkout-index.c:198
 msgid "read list of paths from the standard input"
 msgstr "ler lista de caminhos da entrada padrão"
 
-#: builtin/checkout-index.c:186
+#: builtin/checkout-index.c:200
 msgid "write the content to temporary files"
 msgstr "escrever o conteúdo em ficheiros temporários"
 
-#: builtin/checkout-index.c:187 builtin/column.c:31
-#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827
-#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333
-#: builtin/worktree.c:757
-msgid "string"
-msgstr "cadeia"
-
-#: builtin/checkout-index.c:188
-msgid "when creating files, prepend <string>"
-msgstr "preceder <cadeia> ao criar ficheiros"
-
-#: builtin/checkout-index.c:190
+#: builtin/checkout-index.c:204
 msgid "copy out the files from named stage"
 msgstr "copiar os ficheiros do estágio indicado"
 
-#: builtin/checkout.c:31
+#: builtin/checkout.c:33
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<opções>] <ramo>"
 
-#: builtin/checkout.c:32
+#: builtin/checkout.c:34
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<opções>] [<ramo>] -- <ficheiro>..."
 
-#: builtin/checkout.c:37
-#, fuzzy
+#: builtin/checkout.c:39
 msgid "git switch [<options>] [<branch>]"
-msgstr "git checkout [<opções>] <ramo>"
+msgstr "git switch [<opções>] [<ramo>]"
 
-#: builtin/checkout.c:42
-#, fuzzy
+#: builtin/checkout.c:44
 msgid "git restore [<options>] [--source=<branch>] <file>..."
-msgstr "git checkout [<opções>] [<ramo>] -- <ficheiro>..."
+msgstr "git restore [<opções>] [--source=<ramo>] <ficheiro>..."
 
-#: builtin/checkout.c:188 builtin/checkout.c:227
+#: builtin/checkout.c:190 builtin/checkout.c:229
 #, c-format
 msgid "path '%s' does not have our version"
-msgstr "o caminho '%s' não tem a nossa versão"
+msgstr "path '%s' é diferente da nossa versão"
 
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:192 builtin/checkout.c:231
 #, c-format
 msgid "path '%s' does not have their version"
-msgstr "o caminho '%s' não tem a versão deles"
+msgstr "path '%s' é diferente da versão deles"
 
-#: builtin/checkout.c:206
+#: builtin/checkout.c:208
 #, c-format
 msgid "path '%s' does not have all necessary versions"
-msgstr "o caminho '%s' não tem todas as versões necessárias"
+msgstr "path '%s' falta todas as versões necessárias"
 
-#: builtin/checkout.c:258
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s' does not have necessary versions"
-msgstr "o caminho '%s' não tem as versões necessárias"
+msgstr "path '%s' falta as versões necessárias"
 
-#: builtin/checkout.c:275
+#: builtin/checkout.c:278
 #, c-format
 msgid "path '%s': cannot merge"
-msgstr "caminho '%s': não é possível integrar"
+msgstr "path '%s': incapaz juntar"
 
-#: builtin/checkout.c:291
+#: builtin/checkout.c:294
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Impossível adicionar o resultado da junção para '%s'"
 
-#: builtin/checkout.c:396
+#: builtin/checkout.c:411
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:401
-#, fuzzy, c-format
+#: builtin/checkout.c:416
+#, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
-msgstr[0] "%d caminho atualizado"
-msgstr[1] "%d caminhos atualizados"
+msgstr[0] "Atualizado %d caminho de %s"
+msgstr[1] "Atualizados %d caminhos de %s"
 
-#: builtin/checkout.c:408
-#, fuzzy, c-format
+#: builtin/checkout.c:423
+#, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
-msgstr[0] "falha ao ler o índice"
-msgstr[1] "falha ao ler o índice"
+msgstr[0] ""
+msgstr[1] ""
 
-#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437
-#: builtin/checkout.c:441
+#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
+#: builtin/checkout.c:456
 #, c-format
 msgid "'%s' cannot be used with updating paths"
-msgstr "'%s' não pode ser usado com caminhos em atualização"
+msgstr "'%s' incapaz ser usado com paths em atualização"
 
-#: builtin/checkout.c:444 builtin/checkout.c:447
+#: builtin/checkout.c:459 builtin/checkout.c:462
 #, c-format
 msgid "'%s' cannot be used with %s"
-msgstr "'%s' não pode ser usado com %s"
+msgstr "'%s' incapaz ser usado com %s"
 
-#: builtin/checkout.c:451
+#: builtin/checkout.c:466
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "Incapaz atualizar paths e mudar para ramo '%s' ao mesmo tempo."
 
-#: builtin/checkout.c:455
+#: builtin/checkout.c:470
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr ""
 
-#: builtin/checkout.c:459
-#, fuzzy, c-format
+#: builtin/checkout.c:474
+#, c-format
 msgid "'%s' must be used when '%s' is not specified"
-msgstr "'%s' não pode ser usado com '%s'"
+msgstr "'%s' tem de ser usado quando '%s' está por ser especificado"
 
-#: builtin/checkout.c:464 builtin/checkout.c:469
-#, fuzzy, c-format
+#: builtin/checkout.c:479 builtin/checkout.c:484
+#, c-format
 msgid "'%s' or '%s' cannot be used with %s"
-msgstr "%s: %s não pode ser usado com %s"
+msgstr "'%s' ou '%s'  impossível ser usado com %s"
 
-#: builtin/checkout.c:541 builtin/checkout.c:548
+#: builtin/checkout.c:558 builtin/checkout.c:565
 #, c-format
 msgid "path '%s' is unmerged"
-msgstr "o caminho '%s' não foi integrado"
+msgstr "path '%s' está por juntar"
 
-#: builtin/checkout.c:716
+#: builtin/checkout.c:734
 msgid "you need to resolve your current index first"
-msgstr "primeiro deve resolver o índice atual"
+msgstr "primeiro precisas resolver teu cenário atual"
 
-#: builtin/checkout.c:770
+#: builtin/checkout.c:788
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
 "%s"
 msgstr ""
 
-#: builtin/checkout.c:866
+#: builtin/checkout.c:881
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Incapaz fazer reflog para '%s': %s\n"
 
-#: builtin/checkout.c:908
+#: builtin/checkout.c:923
 msgid "HEAD is now at"
 msgstr "HEAD está agora em"
 
-#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
+#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
-msgstr "não foi possível atualizar HEAD"
+msgstr "incapaz atualizar HEAD"
 
-#: builtin/checkout.c:916
+#: builtin/checkout.c:931
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Repor ramo '%s'\n"
 
-#: builtin/checkout.c:919
+#: builtin/checkout.c:934
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Já em '%s'\n"
 
-#: builtin/checkout.c:923
+#: builtin/checkout.c:938
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Mudou para e repôs o ramo '%s'\n"
 
-#: builtin/checkout.c:925 builtin/checkout.c:1356
+#: builtin/checkout.c:940 builtin/checkout.c:1371
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Mudou para o novo ramo '%s'\n"
 
-#: builtin/checkout.c:927
+#: builtin/checkout.c:942
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Mudou para o ramo '%s'\n"
 
-#: builtin/checkout.c:978
+#: builtin/checkout.c:993
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... e mais %d.\n"
 
-#: builtin/checkout.c:984
+#: builtin/checkout.c:999
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -11913,17 +12187,17 @@ msgid_plural ""
 "\n"
 "%s\n"
 msgstr[0] ""
-"Aviso: estás deixando %d commit para trás, desconetado a qualquer dos "
-"teus ramos:\n"
+"Aviso: estás deixando %d commit para trás, desconetado a qualquer dos teus "
+"ramos:\n"
 "\n"
 "%s\n"
 msgstr[1] ""
-"Aviso: estás deixando %d commits para trás, desconetado a qualquer "
-"dos teus ramos:\n"
+"Aviso: estás deixando %d commits para trás, desconetado a qualquer dos teus "
+"ramos:\n"
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1003
+#: builtin/checkout.c:1018
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11950,26 +12224,26 @@ msgstr[1] ""
 " git branch <nome-do-novo-ramo> %s\n"
 "\n"
 
-#: builtin/checkout.c:1038
+#: builtin/checkout.c:1053
 msgid "internal error in revision walk"
 msgstr "erro interno durante o curso de revisões"
 
-#: builtin/checkout.c:1042
+#: builtin/checkout.c:1057
 msgid "Previous HEAD position was"
 msgstr "A posição anterior de HEAD era"
 
-#: builtin/checkout.c:1082 builtin/checkout.c:1351
+#: builtin/checkout.c:1097 builtin/checkout.c:1366
 msgid "You are on a branch yet to be born"
-msgstr "Está num ramo ainda não criado"
+msgstr "Está num ramo ainda por nascer"
 
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1179
 #, 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:1171
+#: builtin/checkout.c:1186
 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"
@@ -11981,225 +12255,211 @@ msgid ""
 "checkout.defaultRemote=origin in your config."
 msgstr ""
 
-#: builtin/checkout.c:1181
-#, fuzzy, c-format
+#: builtin/checkout.c:1196
+#, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
-msgstr "atuar sobre ramos de monitorização remotos"
+msgstr "'%s' correspondeu a múltiplos (%d) ramos remoto de monitorização"
 
-#: builtin/checkout.c:1247
-#, fuzzy
+#: builtin/checkout.c:1262
 msgid "only one reference expected"
-msgstr "esperava-se apenas uma referência, %d fornecidas."
+msgstr "apenas uma referência esperada"
 
-#: builtin/checkout.c:1264
+#: builtin/checkout.c:1279
 #, c-format
 msgid "only one reference expected, %d given."
-msgstr "esperava-se apenas uma referência, %d fornecidas."
+msgstr "esperava apenas uma referência, %d fornecidas."
 
-#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510
+#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referência inválida: %s"
 
-#: builtin/checkout.c:1323 builtin/checkout.c:1689
+#: builtin/checkout.c:1338 builtin/checkout.c:1707
 #, c-format
 msgid "reference is not a tree: %s"
-msgstr "a referência não é uma árvore: %s"
+msgstr "referência é árvore nenhuma: %s"
 
-#: builtin/checkout.c:1370
-#, fuzzy, c-format
+#: builtin/checkout.c:1385
+#, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "esperado um ramo, recebi tag '%s'"
 
-#: builtin/checkout.c:1372
-#, fuzzy, c-format
+#: builtin/checkout.c:1387
+#, c-format
 msgid "a branch is expected, got remote branch '%s'"
-msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s."
+msgstr "um ramo é esperado, recebi ramo remoto '%s'"
 
-#: builtin/checkout.c:1373 builtin/checkout.c:1381
-#, fuzzy, c-format
+#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#, c-format
 msgid "a branch is expected, got '%s'"
-msgstr "O ramo %s está a ser bissetado em %s"
+msgstr "esperado um ramo, recebi '%s'"
 
-#: builtin/checkout.c:1376
-#, fuzzy, c-format
+#: builtin/checkout.c:1391
+#, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "é suposto um branch, recebi um commit '%s'"
 
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1407
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1396
+#: builtin/checkout.c:1411
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1400
+#: builtin/checkout.c:1415
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1404
+#: builtin/checkout.c:1419
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1408
+#: builtin/checkout.c:1423
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1412
-#, fuzzy
+#: builtin/checkout.c:1427
 msgid "you are switching branch while bisecting"
-msgstr "Está a bissetar neste momento."
+msgstr "estás a trocar de ramo enquanto bissetas"
 
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1434
 msgid "paths cannot be used with switching branches"
-msgstr "não podem ser usados caminhos ao mudar de ramo"
+msgstr "incapaz mudar ramo com o uso de paths"
 
-#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430
+#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
 #, c-format
 msgid "'%s' cannot be used with switching branches"
-msgstr "'%s' não pode ser usado ao mudar de ramo"
+msgstr "incapaz de mudar ramo com o uso de '%s'"
 
-#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440
-#: builtin/checkout.c:1445 builtin/checkout.c:1450
+#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
+#: builtin/checkout.c:1460 builtin/checkout.c:1465
 #, c-format
 msgid "'%s' cannot be used with '%s'"
-msgstr "'%s' não pode ser usado com '%s'"
+msgstr "'%s' é incapaz de ser usado com '%s'"
 
-#: builtin/checkout.c:1447
-#, fuzzy, c-format
+#: builtin/checkout.c:1462
+#, c-format
 msgid "'%s' cannot take <start-point>"
-msgstr "'%s' não pode ser usado com caminhos em atualização"
+msgstr "'%s' incapaz receber <start-point>"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1470
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Incapaz mudar ramo para '%s', pois está fora de ser um commit"
 
-#: builtin/checkout.c:1462
-#, fuzzy
+#: builtin/checkout.c:1477
 msgid "missing branch or commit argument"
-msgstr "Falta um nome dum ramo; tente -b"
+msgstr "faltando argumento de ramo ou memória"
 
-#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84
-#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296
-#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575
-#: builtin/send-pack.c:198
-msgid "force progress reporting"
-msgstr "forçar informação de progresso"
-
-#: builtin/checkout.c:1505
+#: builtin/checkout.c:1520
 msgid "perform a 3-way merge with the new branch"
 msgstr "realizar uma integração com 3 pontos com o novo ramo"
 
-#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322
+#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
 msgid "style"
 msgstr "estilo"
 
-#: builtin/checkout.c:1507
+#: builtin/checkout.c:1522
 msgid "conflict style (merge or diff3)"
 msgstr "estilo de conflito (merge ou diff3)"
 
-#: builtin/checkout.c:1519 builtin/worktree.c:558
+#: builtin/checkout.c:1534 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "destacar HEAD no commit indicado"
 
-#: builtin/checkout.c:1520
+#: builtin/checkout.c:1535
 msgid "set upstream info for new branch"
 msgstr "definir a informação do ramo a montante do novo ramo"
 
-#: builtin/checkout.c:1522
+#: builtin/checkout.c:1537
 msgid "force checkout (throw away local modifications)"
-msgstr "forçar extração (descartar modificações locais)"
+msgstr "forçar observação (descartar modificações locais)"
 
-#: builtin/checkout.c:1524
+#: builtin/checkout.c:1539
 msgid "new-branch"
 msgstr "novo-ramo"
 
-#: builtin/checkout.c:1524
+#: builtin/checkout.c:1539
 msgid "new unparented branch"
 msgstr "novo ramo sem pai"
 
-#: builtin/checkout.c:1526 builtin/merge.c:300
+#: builtin/checkout.c:1541 builtin/merge.c:301
 msgid "update ignored files (default)"
 msgstr "atualizar ficheiros ignorados (predefinição)"
 
-#: builtin/checkout.c:1529
+#: builtin/checkout.c:1544
 msgid "do not check if another worktree is holding the given ref"
-msgstr ""
-"não verificar se outra árvore de trabalho contém a referência fornecida"
+msgstr "incapaz verificar se outra worktree contém referência dada"
 
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1557
 msgid "checkout our version for unmerged files"
-msgstr "extrair a nossa versão dos ficheiros não integrados"
+msgstr "checkout a nossa versão dos ficheiros por juntar"
 
-#: builtin/checkout.c:1545
+#: builtin/checkout.c:1560
 msgid "checkout their version for unmerged files"
-msgstr "extrair a versão deles dos ficheiros não integrados"
+msgstr "checkout a versão deles dos ficheiros por juntar"
 
-#: builtin/checkout.c:1549
+#: builtin/checkout.c:1564
 msgid "do not limit pathspecs to sparse entries only"
-msgstr "não restringir especificadores de caminho a entradas esparsas"
+msgstr "abrange especificadores de path além de entradas dispersas"
 
-#: builtin/checkout.c:1604
-#, fuzzy, c-format
+#: builtin/checkout.c:1622
+#, c-format
 msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-b, -B e --orphan são mutuamente exclusivos"
+msgstr ""
 
-#: builtin/checkout.c:1608
-#, fuzzy
+#: builtin/checkout.c:1626
 msgid "-p and --overlay are mutually exclusive"
-msgstr "-b, -B e --orphan são mutuamente exclusivos"
+msgstr ""
 
-#: builtin/checkout.c:1645
+#: builtin/checkout.c:1663
 msgid "--track needs a branch name"
-msgstr "--track requer um nome dum ramo"
+msgstr "--track precisa de nome dum ramo"
 
-#: builtin/checkout.c:1650
-#, fuzzy, c-format
+#: builtin/checkout.c:1668
+#, c-format
 msgid "missing branch name; try -%c"
-msgstr "Falta um nome dum ramo; tente -b"
+msgstr "faltando nome de ramo; tente -%c"
 
-#: builtin/checkout.c:1682
-#, fuzzy, c-format
+#: builtin/checkout.c:1700
+#, c-format
 msgid "could not resolve %s"
-msgstr "não foi possível remover '%s'"
+msgstr "incapaz resolver %s"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1716
 msgid "invalid path specification"
 msgstr "especificação de caminho inválida"
 
-#: builtin/checkout.c:1705
+#: builtin/checkout.c:1723
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 
-#: builtin/checkout.c:1709
+#: builtin/checkout.c:1727
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
-msgstr "git checkout: --detach não aceita um caminho como argumento '%s'"
+msgstr "git checkout: --detach recusa path '%s' como argumento"
 
-#: builtin/checkout.c:1718
-#, fuzzy
+#: builtin/checkout.c:1736
 msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--first-parent é incompatível com --bisect"
+msgstr ""
 
-#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499
-#, fuzzy
+#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
 msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--first-parent é incompatível com --bisect"
+msgstr ""
 
-#: builtin/checkout.c:1734
+#: builtin/checkout.c:1752
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -12207,82 +12467,73 @@ msgstr ""
 "git checkout: --ours/--theirs, --force e --merge são incompatíveis\n"
 "durante a extração do índice."
 
-#: builtin/checkout.c:1739
-#, fuzzy
+#: builtin/checkout.c:1757
 msgid "you must specify path(s) to restore"
-msgstr "Deve especificar um diretório."
+msgstr "deves especificar caminho(s) a restaurar"
 
-#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816
-#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554
-#: builtin/worktree.c:556
+#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
+#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2736
+#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
+#: builtin/worktree.c:486
 msgid "branch"
 msgstr "ramo"
 
-#: builtin/checkout.c:1766
+#: builtin/checkout.c:1784
 msgid "create and checkout a new branch"
 msgstr "criar e extrair um novo ramo"
 
-#: builtin/checkout.c:1768
+#: builtin/checkout.c:1786
 msgid "create/reset and checkout a branch"
-msgstr "criar/repor e extrair um ramo"
+msgstr "criar/restabelecer e observar um ramo"
 
-#: builtin/checkout.c:1769
+#: builtin/checkout.c:1787
 msgid "create reflog for new branch"
 msgstr "criar reflog do novo ramo"
 
-#: builtin/checkout.c:1771
-#, fuzzy
+#: builtin/checkout.c:1789
 msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
+msgstr "tentar adivinhar 'git checkout <ramo-inexistente>' (predefinido)"
 
-#: builtin/checkout.c:1772
-#, fuzzy
+#: builtin/checkout.c:1790
 msgid "use overlay mode (default)"
-msgstr "eliminar referências soltas (predefinição)"
+msgstr "usar modo overlay (predefinido)"
 
-#: builtin/checkout.c:1817
-#, fuzzy
+#: builtin/checkout.c:1835
 msgid "create and switch to a new branch"
-msgstr "criar e extrair um novo ramo"
+msgstr "criar e trocar para um novo ramo"
 
-#: builtin/checkout.c:1819
-#, fuzzy
+#: builtin/checkout.c:1837
 msgid "create/reset and switch to a branch"
-msgstr "criar/repor e extrair um ramo"
+msgstr "criar/restabelecer e trocar para um ramo"
 
-#: builtin/checkout.c:1821
-#, fuzzy
+#: builtin/checkout.c:1839
 msgid "second guess 'git switch <no-such-branch>'"
-msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
+msgstr "tentar adivinhar 'git switch <ramo-inexistente>'"
 
-#: builtin/checkout.c:1823
-#, fuzzy
+#: builtin/checkout.c:1841
 msgid "throw away local modifications"
-msgstr "forçar extração (descartar modificações locais)"
+msgstr "descartar modificações locais"
 
-#: builtin/checkout.c:1857
+#: builtin/checkout.c:1875
 msgid "which tree-ish to checkout from"
 msgstr ""
 
-#: builtin/checkout.c:1859
-#, fuzzy
+#: builtin/checkout.c:1877
 msgid "restore the index"
-msgstr "falha ao ler o índice"
+msgstr "restaurar o cenário"
 
-#: builtin/checkout.c:1861
-#, fuzzy
+#: builtin/checkout.c:1879
 msgid "restore the working tree (default)"
-msgstr "Mostrar o estado da árvores de trabalho"
+msgstr "restaurar a árvore-trabalho (predefinido)"
 
-#: builtin/checkout.c:1863
-#, fuzzy
+#: builtin/checkout.c:1881
 msgid "ignore unmerged entries"
-msgstr "ignora unmerged entries"
+msgstr "ignora entradas por juntar"
 
-#: builtin/checkout.c:1864
+#: builtin/checkout.c:1882
 msgid "use overlay mode"
-msgstr ""
+msgstr "usar modo overlay"
 
 #: builtin/clean.c:29
 msgid ""
@@ -12310,17 +12561,12 @@ msgstr "A ignorar o repositório %s\n"
 msgid "Would skip repository %s\n"
 msgstr "Ignoraria o repositório %s\n"
 
-#: builtin/clean.c:37
-#, c-format
-msgid "failed to remove %s"
-msgstr "falha ao remover %s"
-
 #: builtin/clean.c:38
-#, fuzzy, c-format
+#, c-format
 msgid "could not lstat %s\n"
-msgstr "não foi possível obter stat de %s\n"
+msgstr "incapaz lstat %s\n"
 
-#: builtin/clean.c:302 git-add--interactive.perl:593
+#: builtin/clean.c:300 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12333,7 +12579,7 @@ msgstr ""
 "foo        - selecionar item baseado no prefixo único\n"
 "           - (vazio) seleciona nada\n"
 
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:304 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12354,33 +12600,33 @@ msgstr ""
 "*          - escolher todos os itens\n"
 "           - (vazio) concluir seleção\n"
 
-#: builtin/clean.c:521 git-add--interactive.perl:568
+#: builtin/clean.c:519 git-add--interactive.perl:568
 #: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "O quê (%s)?\n"
 
-#: builtin/clean.c:661
+#: builtin/clean.c:659
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Introduza padrões a ignorar>> "
 
-#: builtin/clean.c:696
+#: builtin/clean.c:693
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
-msgstr "AVISO: não foram encontrados itens correspondentes a: %s"
+msgstr "AVISO: incapaz encontrar items correspondentes a: %s"
 
-#: builtin/clean.c:717
+#: builtin/clean.c:714
 msgid "Select items to delete"
 msgstr "Selecione itens para eliminar"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:755
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Remover %s [y/N]? "
 
-#: builtin/clean.c:789
+#: builtin/clean.c:786
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12398,52 +12644,52 @@ msgstr ""
 "help                - esta ajuda\n"
 "?                   - ajuda para seleção em linha de comandos"
 
-#: builtin/clean.c:825
+#: builtin/clean.c:822
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Removeria o seguinte item:"
 msgstr[1] "Removeria os seguintes itens:"
 
-#: builtin/clean.c:841
+#: builtin/clean.c:838
 msgid "No more files to clean, exiting."
 msgstr "Mais ficheiro por limpar nenhum, saindo."
 
-#: builtin/clean.c:903
+#: builtin/clean.c:900
 msgid "do not print names of files removed"
-msgstr "não imprimir os nomes dos ficheiros removidos"
+msgstr "incapaz imprimir nomes de ficheiros removidos"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:902
 msgid "force"
 msgstr "forçar"
 
-#: builtin/clean.c:906
+#: builtin/clean.c:903
 msgid "interactive cleaning"
 msgstr "limpeza interativa"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:905
 msgid "remove whole directories"
 msgstr "remover diretórios inteiros"
 
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185
-#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "padrão"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:907
 msgid "add <pattern> to ignore rules"
 msgstr "adicionar <padrão> às regras ignoradas"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:908
 msgid "remove ignored files, too"
 msgstr "também remover ficheiros ignorados"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:910
 msgid "remove only ignored files"
 msgstr "remover apenas ficheiros ignorados"
 
-#: builtin/clean.c:929
+#: builtin/clean.c:925
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -12451,7 +12697,7 @@ msgstr ""
 "clean.requireForce definido como true e nenhum -i, -n, ou -f fornecido; "
 "recusando limpar"
 
-#: builtin/clean.c:932
+#: builtin/clean.c:928
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -12459,171 +12705,175 @@ msgstr ""
 "clean.requireForce predefinido como true e nenhum -i, -n, ou -f fornecido; "
 "recusando limpar"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:940
 msgid "-x and -X cannot be used together"
-msgstr "-x e -X não pode ser usados juntos"
+msgstr "-x e -X incapazes de ser usados juntos"
 
 #: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opções>] [--] <repo> [<dir>]"
 
-#: builtin/clone.c:94
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr "clonar nenhum repositório superficial"
+
+#: builtin/clone.c:98
 msgid "don't create a checkout"
-msgstr "não criar uma extração"
+msgstr "cria checkout nenhum"
 
-#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:553
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "criar um repositório nu"
 
-#: builtin/clone.c:99
+#: builtin/clone.c:103
 msgid "create a mirror repository (implies bare)"
 msgstr "criar um repositório espelhado (implica repositório nu)"
 
-#: builtin/clone.c:101
+#: builtin/clone.c:105
 msgid "to clone from a local repository"
 msgstr "para clonar de um repositório local"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:107
 msgid "don't use local hardlinks, always copy"
-msgstr "não usar ligações fixas, copiar sempre"
+msgstr "usa hardlinks nenhuns, copia sempre"
 
-#: builtin/clone.c:105
+#: builtin/clone.c:109
 msgid "setup as shared repository"
 msgstr "configurar como repositório partilhado"
 
-#: builtin/clone.c:107
+#: builtin/clone.c:111
 msgid "pathspec"
 msgstr "pathspec"
 
-#: builtin/clone.c:107
+#: builtin/clone.c:111
 msgid "initialize submodules in the clone"
 msgstr "inicializar submódulos no clone"
 
-#: builtin/clone.c:111
+#: builtin/clone.c:115
 msgid "number of submodules cloned in parallel"
 msgstr "número de submódulos clonados em paralelo"
 
-#: builtin/clone.c:112 builtin/init-db.c:550
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "diretório-modelo"
 
-#: builtin/clone.c:113 builtin/init-db.c:551
+#: builtin/clone.c:117 builtin/init-db.c:540
 msgid "directory from which templates will be used"
 msgstr "diretório que contém os modelos usados"
 
-#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
-#: builtin/submodule--helper.c:2336
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
+#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
 msgid "reference repository"
 msgstr "repositório de referência"
 
-#: builtin/clone.c:119 builtin/submodule--helper.c:1833
-#: builtin/submodule--helper.c:2338
+#: builtin/clone.c:123 builtin/submodule--helper.c:1901
+#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
 msgid "use --reference only while cloning"
-msgstr "usar --reference apenas para clonar"
+msgstr "usar --reference apenas enquanto clonando"
 
-#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:561
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358
+#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
+#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
 msgid "name"
 msgstr "nome"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:125
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "usar <nome> em vez de 'origin' para seguir o ramo a montante"
 
-#: builtin/clone.c:123
+#: builtin/clone.c:127
 msgid "checkout <branch> instead of the remote's HEAD"
-msgstr "extrair <ramo> em vez da HEAD do remoto"
+msgstr "observar <ramo> em vez de HEAD de remoto"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:129
 msgid "path to git-upload-pack on the remote"
 msgstr "caminho para git-upload-pack no remoto"
 
-#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
 #: builtin/pull.c:208
 msgid "depth"
 msgstr "profundidade"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:131
 msgid "create a shallow clone of that depth"
 msgstr "criar um clone raso com essa profundidade"
 
-#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
 #: builtin/pull.c:211
 msgid "time"
 msgstr "hora"
 
-#: builtin/clone.c:129
+#: builtin/clone.c:133
 msgid "create a shallow clone since a specific time"
 msgstr "criar um clone raso desde uma data específica"
 
-#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317
+#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
 msgid "revision"
 msgstr "revisão"
 
-#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "aprofundar o histórico de um clone raso, excluindo a revisão"
 
-#: builtin/clone.c:133 builtin/submodule--helper.c:1843
-#: builtin/submodule--helper.c:2352
+#: builtin/clone.c:137 builtin/submodule--helper.c:1911
+#: builtin/submodule--helper.c:2369
 msgid "clone only one branch, HEAD or --branch"
 msgstr "clonar apenas um ramo, HEAD ou --branch"
 
-#: builtin/clone.c:135
+#: builtin/clone.c:139
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 
-#: builtin/clone.c:137
+#: builtin/clone.c:141
 msgid "any cloned submodules will be shallow"
-msgstr "qualquer submódulo clonado será raso"
+msgstr "qualquer submódulo clonado será superficial"
 
-#: builtin/clone.c:138 builtin/init-db.c:559
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:139 builtin/init-db.c:560
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
-msgstr "separar o repositório git da árvore de trabalho"
+msgstr "separar pasta git de árvore-trabalho"
 
-#: builtin/clone.c:140
+#: builtin/clone.c:144
 msgid "key=value"
 msgstr "chave=valor"
 
-#: builtin/clone.c:141
+#: builtin/clone.c:145
 msgid "set config inside the new repository"
 msgstr "definir configuração dentro do novo repositório"
 
-#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76
-#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: 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:196
 msgid "server-specific"
 msgstr "específico do servidor"
 
-#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76
-#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: 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:197
 msgid "option to transmit"
 msgstr "opção para transmitir"
 
-#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234
-#: builtin/push.c:585
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "usar apenas endereços IPv4"
 
-#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237
-#: builtin/push.c:587
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "usar apenas endereços IPv6"
 
-#: builtin/clone.c:150
-#, fuzzy
+#: builtin/clone.c:154
 msgid "any cloned submodules will use their remote-tracking branch"
-msgstr "qualquer submódulo clonado será raso"
+msgstr "qualquer submódulo clonado usará seu ramo remoto de monitorização"
 
-#: builtin/clone.c:152
+#: builtin/clone.c:156
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr ""
 
-#: builtin/clone.c:288
+#: builtin/clone.c:292
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -12631,196 +12881,195 @@ msgstr ""
 "Incapaz adivinhar nome de pasta.\n"
 "Por favor especifique uma pasta na linha de comandos"
 
-#: builtin/clone.c:341
+#: builtin/clone.c:345
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: Incapaz adicionar sobressalente para '%s': %s\n"
 
-#: builtin/clone.c:414
+#: builtin/clone.c:418
 #, c-format
 msgid "%s exists and is not a directory"
-msgstr "%s existe e não é um diretório"
+msgstr "%s existe e é pasta nenhuma"
 
-#: builtin/clone.c:432
-#, fuzzy, c-format
+#: builtin/clone.c:436
+#, c-format
 msgid "failed to start iterator over '%s'"
-msgstr "falha ao escrever para '%s'"
+msgstr "falhou começar iterador em '%s'"
 
-#: builtin/clone.c:463
+#: builtin/clone.c:467
 #, c-format
 msgid "failed to create link '%s'"
-msgstr "falha ao criar a ligação '%s'"
+msgstr "falhou criar a ligação '%s'"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:471
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "falha ao copiar o ficheiro para '%s'"
 
-#: builtin/clone.c:472
-#, fuzzy, c-format
+#: builtin/clone.c:476
+#, c-format
 msgid "failed to iterate over '%s'"
 msgstr "falha ao remover '%s'"
 
-#: builtin/clone.c:499
+#: builtin/clone.c:503
 #, c-format
 msgid "done.\n"
 msgstr "concluído.\n"
 
-#: builtin/clone.c:513
-#, fuzzy
+#: builtin/clone.c:517
 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 ""
-"Clonado com sucesso, mas a extração falhou.\n"
-"Pode inspecionar o que foi extraído com 'git status'\n"
-"e repetir a extração com 'git checkout -f HEAD'\n"
+"Clonagem com sucesso, mas a observação falhou.\n"
+"Podes inspecionar o que foi observado com 'git status'\n"
+"e repetir com 'git restore --source=HEAD :/'\n"
 
-#: builtin/clone.c:590
+#: builtin/clone.c:594
 #, c-format
 msgid "Could not find remote branch %s to clone."
-msgstr "Ramo remoto %s não encontrado para clonar."
+msgstr "Incapaz encontrar ramo remoto %s para clonar."
 
-#: builtin/clone.c:709
+#: builtin/clone.c:713
 #, c-format
 msgid "unable to update %s"
-msgstr "não foi possível atualizar %s"
+msgstr "incapaz atualizar %s"
 
-#: builtin/clone.c:757
-#, fuzzy
+#: builtin/clone.c:761
 msgid "failed to initialize sparse-checkout"
-msgstr "falha ao finalizar integração de notas"
+msgstr "falhou inicializar sparse-checkout"
 
-#: builtin/clone.c:780
+#: builtin/clone.c:784
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "remote HEAD refere-se a referência inexistente, impossível fazer checkout.\n"
 
-#: builtin/clone.c:812
+#: builtin/clone.c:816
 msgid "unable to checkout working tree"
-msgstr "não foi possível extrair a árvore de trabalho"
+msgstr "incapaz de checkout working tree"
 
-#: builtin/clone.c:887
+#: builtin/clone.c:894
 msgid "unable to write parameters to config file"
-msgstr "não foi possível escrever os parâmetros no ficheiro de configuração"
+msgstr "incapaz escrever parâmetros para ficheiro config"
 
-#: builtin/clone.c:950
+#: builtin/clone.c:957
 msgid "cannot repack to clean up"
-msgstr "não é possível reempacotar para limpar"
+msgstr "incapaz reempacotar para limpar"
 
-#: builtin/clone.c:952
+#: builtin/clone.c:959
 msgid "cannot unlink temporary alternates file"
-msgstr ""
-"não é possível invocar unlink sobre o ficheiro sobressalente temporário"
+msgstr "incapaz unlink ficheiro sobressalente temporário"
 
-#: builtin/clone.c:992 builtin/receive-pack.c:2493
+#: builtin/clone.c:1001 builtin/receive-pack.c:2490
 msgid "Too many arguments."
-msgstr "Demasiados argumentos."
+msgstr ""
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1005
 msgid "You must specify a repository to clone."
 msgstr "Deve especificar um repositório para clonar."
 
-#: builtin/clone.c:1009
+#: builtin/clone.c:1018
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
-msgstr "as opções --bare e --origin %s são incompatíveis."
+msgstr "opções --bare e --origin %s são incompatíveis."
 
-#: builtin/clone.c:1012
+#: builtin/clone.c:1021
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare e --separate-git-dir são incompatíveis."
 
-#: builtin/clone.c:1025
+#: builtin/clone.c:1035
 #, c-format
 msgid "repository '%s' does not exist"
-msgstr "o repositório '%s' não existe"
+msgstr "repositório '%s' é inexistente"
 
-#: builtin/clone.c:1029 builtin/fetch.c:1841
+#: builtin/clone.c:1039 builtin/fetch.c:2014
 #, c-format
 msgid "depth %s is not a positive number"
-msgstr "profundidade %s não é um número positivo"
+msgstr "profundidade %s é número positivo nenhum"
 
-#: builtin/clone.c:1039
+#: builtin/clone.c:1049
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
-msgstr "o caminho de destino '%s' já existe e não é um diretório vazio."
+msgstr "path de destino '%s' já existe e é pasta vazia nenhum."
 
-#: builtin/clone.c:1045
-#, fuzzy, c-format
+#: builtin/clone.c:1055
+#, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
-msgstr "o caminho de destino '%s' já existe e não é um diretório vazio."
+msgstr "path de repositório '%s' já existe e é diretório vazio nenhum."
 
-#: builtin/clone.c:1059
+#: builtin/clone.c:1069
 #, c-format
 msgid "working tree '%s' already exists."
-msgstr "a árvore de trabalho '%s' já existe."
+msgstr "árvore-trabalho '%s' já existe."
 
-#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271
-#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386
+#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
+#: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312
 #, c-format
 msgid "could not create leading directories of '%s'"
-msgstr "não foi possível criar os diretórios superiores de '%s'"
+msgstr "incapaz criar as pastas superiores de '%s'"
 
-#: builtin/clone.c:1079
+#: builtin/clone.c:1089
 #, c-format
 msgid "could not create work tree dir '%s'"
-msgstr "não foi possível criar o diretório de árvore de trabalho '%s'"
+msgstr "incapaz criar pasta de work tree '%s'"
 
-#: builtin/clone.c:1099
+#: builtin/clone.c:1109
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
-msgstr "A clonar no repositório nu '%s'...\n"
+msgstr "Clonando em repositório nú '%s'...\n"
 
-#: builtin/clone.c:1101
+#: builtin/clone.c:1111
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonando em '%s'...\n"
 
-#: builtin/clone.c:1125
+#: builtin/clone.c:1135
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr ""
-"clone --recursive não é compatível com ambos --reference e --reference-if-"
-"able"
+"clone --recursive é incompatível com ambos --reference e --reference-if-able"
 
-#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
 #, c-format
 msgid "'%s' is not a valid remote name"
-msgstr "'%s' não é um nome de remoto válido"
+msgstr "'%s' é nome de remoto inválido"
 
-#: builtin/clone.c:1210
+#: builtin/clone.c:1229
 msgid "--depth is ignored in local clones; use file:// instead."
-msgstr "--depth é ignorado em clones locais; use file:// ."
+msgstr "--depth é ignorado em clones locais; usa invés file:// ."
 
-#: builtin/clone.c:1212
+#: builtin/clone.c:1231
 msgid "--shallow-since is ignored in local clones; use file:// instead."
-msgstr "--shallow-since é ignorado em clones locais; use file:// ."
+msgstr "--shallow-since é ignorado em clones locais; usa invés file:// ."
 
-#: builtin/clone.c:1214
+#: builtin/clone.c:1233
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
-msgstr "--shallow-exclude é ignorado em clones locais; use file:// ."
+msgstr "--shallow-exclude é ignorado em clones locais; usa invés file:// ."
 
-#: builtin/clone.c:1216
-#, fuzzy
+#: builtin/clone.c:1235
 msgid "--filter is ignored in local clones; use file:// instead."
-msgstr "--depth é ignorado em clones locais; use file:// ."
+msgstr "--filter é ignorado em clones locais; usa invés file:// ."
 
-#: builtin/clone.c:1219
+#: builtin/clone.c:1240
 msgid "source repository is shallow, ignoring --local"
-msgstr "o repositório de origem é raso, --local ignorado"
+msgstr "repositório da fonte é superficial, ignorando --local"
 
-#: builtin/clone.c:1224
+#: builtin/clone.c:1245
 msgid "--local is ignored"
 msgstr "--local ignorado"
 
-#: builtin/clone.c:1308 builtin/clone.c:1316
+#: builtin/clone.c:1324 builtin/clone.c:1383
+msgid "remote transport reported error"
+msgstr "transporte remoto reportou erro"
+
+#: builtin/clone.c:1336 builtin/clone.c:1344
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
-msgstr "O ramo remoto %s não foi encontrado no repositório a montante %s"
+msgstr "Ramo remoto %s por encontrar em upstream %s"
 
-#: builtin/clone.c:1319
+#: builtin/clone.c:1347
 msgid "You appear to have cloned an empty repository."
 msgstr "Parece foi clonado um repositório vazio."
 
@@ -12830,26 +13079,26 @@ msgstr "git column [<opções>]"
 
 #: builtin/column.c:27
 msgid "lookup config vars"
-msgstr "pesquisar variáveis de configuração"
+msgstr "pesquisar vars de config"
 
 #: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "esquema a usar"
 
 #: builtin/column.c:30
-msgid "Maximum width"
+msgid "maximum width"
 msgstr "Largura máxima"
 
 #: builtin/column.c:31
-msgid "Padding space on left border"
+msgid "padding space on left border"
 msgstr "Espaço de preenchimento na borda esquerda"
 
 #: builtin/column.c:32
-msgid "Padding space on right border"
+msgid "padding space on right border"
 msgstr "Espaço de preenchimento na borda direita"
 
 #: builtin/column.c:33
-msgid "Padding space between columns"
+msgid "padding space between columns"
 msgstr "Espaço de preenchimento entre colunas"
 
 #: builtin/column.c:51
@@ -12869,18 +13118,18 @@ msgid ""
 msgstr ""
 
 #: builtin/commit-graph.c:64
-#, fuzzy, c-format
+#, c-format
 msgid "could not find object directory matching %s"
-msgstr "não foi possível ler o objeto %s da ligação simbólica %s"
+msgstr "incapaz encontrar pasta objeto correspondendo %s"
 
 #: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769
+#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
 msgid "dir"
 msgstr "dir"
 
 #: builtin/commit-graph.c:81 builtin/commit-graph.c:211
 #: builtin/commit-graph.c:317
-msgid "The object directory to store the graph"
+msgid "the object directory to store the graph"
 msgstr ""
 
 #: builtin/commit-graph.c:83
@@ -12888,24 +13137,24 @@ msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 
 #: builtin/commit-graph.c:106
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Incapaz abrir commit-graph '%s'"
 
 #: builtin/commit-graph.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "unrecognized --split argument, %s"
-msgstr "argumento não reconhecido: %s"
+msgstr "argumento --split desconhecido, %s"
 
 #: builtin/commit-graph.c:155
-#, fuzzy, c-format
+#, c-format
 msgid "unexpected non-hex object ID: %s"
-msgstr "reutilizar o objeto de nota especificado"
+msgstr "ID não-hex de objeto inesperado: %s"
 
 #: builtin/commit-graph.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "invalid object: %s"
-msgstr "nome de objeto inválido: %s"
+msgstr ""
 
 #: builtin/commit-graph.c:213
 msgid "start walk at all refs"
@@ -12940,9 +13189,8 @@ msgid "maximum ratio between two levels of a split commit-graph"
 msgstr ""
 
 #: builtin/commit-graph.c:232
-#, fuzzy
 msgid "only expire files older than a given date-time"
-msgstr "expirar objetos mais antigos que <tempo>"
+msgstr "apenas expirar ficheiros mais velhos que data-tempo fornecido"
 
 #: builtin/commit-graph.c:234
 msgid "maximum number of changed-path Bloom filters to compute"
@@ -12967,73 +13215,68 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr ""
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555
-#, fuzzy, c-format
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#, c-format
 msgid "not a valid object name %s"
-msgstr "%s não é um nome de objeto válido"
+msgstr "nome de objeto inválido %s"
 
 #: builtin/commit-tree.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "git commit-tree: failed to open '%s'"
-msgstr "falha ao abrir '%s'"
+msgstr ""
 
 #: builtin/commit-tree.c:96
-#, fuzzy, c-format
+#, c-format
 msgid "git commit-tree: failed to read '%s'"
-msgstr "git write-tree falhou ao escrever uma árvore"
+msgstr ""
 
 #: builtin/commit-tree.c:98
-#, fuzzy, c-format
+#, c-format
 msgid "git commit-tree: failed to close '%s'"
-msgstr "git write-tree falhou ao escrever uma árvore"
+msgstr ""
 
 #: builtin/commit-tree.c:111
-#, fuzzy
 msgid "parent"
-msgstr "número-pai"
+msgstr "parente"
 
 #: builtin/commit-tree.c:112
-#, fuzzy
 msgid "id of a parent commit object"
-msgstr "falha ao escrever objeto de commit"
+msgstr ""
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470
-#: builtin/tag.c:413
+#: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601
+#: builtin/tag.c:456
 msgid "message"
 msgstr "mensagem"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1504
+#: builtin/commit-tree.c:115 builtin/commit.c:1624
 msgid "commit message"
 msgstr "mensagem de commit"
 
 #: builtin/commit-tree.c:118
-#, fuzzy
 msgid "read commit log message from file"
-msgstr "ler mensagem de um ficheiro"
+msgstr ""
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298
+#: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299
 #: builtin/pull.c:176 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "assinar o commit com GPG"
 
 #: builtin/commit-tree.c:133
-#, fuzzy
 msgid "must give exactly one tree"
-msgstr "É necessário exatamente um intervalo."
+msgstr ""
 
 #: builtin/commit-tree.c:140
-#, fuzzy
 msgid "git commit-tree: failed to read"
-msgstr "git write-tree falhou ao escrever uma árvore"
+msgstr ""
 
 #: builtin/commit.c:41
 msgid "git commit [<options>] [--] <pathspec>..."
-msgstr "git commit [<opções>] [--] <especificador-de-caminho>..."
+msgstr "git commit [<opções>] [--] <espetro-caminho>..."
 
 #: builtin/commit.c:46
 msgid "git status [<options>] [--] <pathspec>..."
-msgstr "git status [<opções>] [--] <especificador-de-caminho>..."
+msgstr "git status [<opções>] [--] <espetro-caminho>..."
 
 #: builtin/commit.c:51
 msgid ""
@@ -13061,14 +13304,12 @@ msgstr ""
 "\n"
 
 #: builtin/commit.c:63
-#, fuzzy
 msgid "Otherwise, please use 'git rebase --skip'\n"
-msgstr "Caso contrário, use 'git reset'\n"
+msgstr "Caso contrário, por favor usa 'git rebase --skip'\n"
 
 #: builtin/commit.c:66
-#, fuzzy
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
-msgstr "Caso contrário, use 'git reset'\n"
+msgstr "Caso contrário, por favor usa 'git cherry-pick --skip'\n"
 
 #: builtin/commit.c:69
 msgid ""
@@ -13083,144 +13324,127 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/commit.c:312
+#: builtin/commit.c:324
 msgid "failed to unpack HEAD tree object"
-msgstr "falha ao descompactar o objeto árvore HEAD"
+msgstr "falhou desempacotar o objeto árvore HEAD"
 
-#: builtin/commit.c:348
-#, fuzzy
+#: builtin/commit.c:360
 msgid "--pathspec-from-file with -a does not make sense"
-msgstr "Indicar caminhos com -a não faz sentido."
+msgstr "--pathspec-from-file com -a faz sentido nenhum"
 
-#: builtin/commit.c:361
+#: builtin/commit.c:374
 msgid "No paths with --include/--only does not make sense."
-msgstr "As opções --include/--only não fazem sentido sem indicar caminhos."
+msgstr "--include/--only só fazem sentido, indicando caminhos."
 
-#: builtin/commit.c:373
+#: builtin/commit.c:386
 msgid "unable to create temporary index"
-msgstr "não foi possível criar índice temporário"
+msgstr "incapaz criar index temporário"
 
-#: builtin/commit.c:382
+#: builtin/commit.c:395
 msgid "interactive add failed"
 msgstr "falha ao adicionar interativamente"
 
-#: builtin/commit.c:397
+#: builtin/commit.c:410
 msgid "unable to update temporary index"
-msgstr "não é possível atualizar o índice temporário"
+msgstr "incapaz atualizar index temporário"
 
-#: builtin/commit.c:399
+#: builtin/commit.c:412
 msgid "Failed to update main cache tree"
-msgstr "Falha ao atualizar a árvore de cache principal"
+msgstr "Falhou atualizar a árvore de cenário principal"
 
-#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
+#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
 msgid "unable to write new_index file"
-msgstr "não é possível escrever o ficheiro new_index"
+msgstr "incapaz escrever ficheiro new_index"
 
-#: builtin/commit.c:476
+#: builtin/commit.c:489
 msgid "cannot do a partial commit during a merge."
-msgstr "não é possível fazer um commit parcial durante uma integração."
+msgstr "incapaz fazer commit parcial durante uma junção."
 
-#: builtin/commit.c:478
+#: builtin/commit.c:491
 msgid "cannot do a partial commit during a cherry-pick."
-msgstr "não é possível fazer um commit parcial durante um cherry-pick."
+msgstr "incapaz fazer commit parcial durante um cherry-pick."
 
-#: builtin/commit.c:480
-#, fuzzy
+#: builtin/commit.c:493
 msgid "cannot do a partial commit during a rebase."
-msgstr "não é possível fazer um commit parcial durante uma integração."
+msgstr "incapaz fazer commit parcial durante um rebase."
 
-#: builtin/commit.c:488
+#: builtin/commit.c:501
 msgid "cannot read the index"
-msgstr "não é possível ler o índice"
+msgstr "incapaz ler cenário"
 
-#: builtin/commit.c:507
+#: builtin/commit.c:520
 msgid "unable to write temporary index file"
-msgstr "não é possível escrever ficheiro de índice temporário"
+msgstr "incapaz escrever ficheiro de index temporário"
 
-#: builtin/commit.c:605
+#: builtin/commit.c:618
 #, c-format
 msgid "commit '%s' lacks author header"
-msgstr "o commit '%s' não tem cabeçalho de autor"
+msgstr "commit '%s' falta cabeçalho de autor"
 
-#: builtin/commit.c:607
+#: builtin/commit.c:620
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "o commit '%s' tem a linha de autor malformada"
 
-#: builtin/commit.c:626
+#: builtin/commit.c:639
 msgid "malformed --author parameter"
 msgstr "parâmetro --author malformado"
 
-#: builtin/commit.c:679
+#: builtin/commit.c:692
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr ""
-"não foi possível selecionar um carácter de comentário que\n"
-"não estivesse já a ser usado na mensagem de commit atual"
+"incapaz selecionar um carácter de comentário fica por usar\n"
+"na mensagem de commit atual"
 
-#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
+#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
 #, c-format
 msgid "could not lookup commit %s"
-msgstr "não foi possível consultar o commit %s"
+msgstr "incapaz consultar commit %s"
 
-#: builtin/commit.c:729 builtin/shortlog.c:425
+#: builtin/commit.c:758 builtin/shortlog.c:413
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(a ler mensagem de log da entrada padrão)\n"
 
-#: builtin/commit.c:731
+#: builtin/commit.c:760
 msgid "could not read log from standard input"
-msgstr "não foi possível ler o log da entrada padrão"
+msgstr "incapaz ler log da entrada padrão"
 
-#: builtin/commit.c:735
+#: builtin/commit.c:764
 #, c-format
 msgid "could not read log file '%s'"
-msgstr "não é possível ler o ficheiro de log '%s'"
+msgstr "incapaz ler ficheiro de log '%s'"
 
-#: builtin/commit.c:766 builtin/commit.c:782
+#: builtin/commit.c:801
+#, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr "incapaz de combinar -m com --fixup:%s"
+
+#: builtin/commit.c:813 builtin/commit.c:829
 msgid "could not read SQUASH_MSG"
-msgstr "não foi possível ler SQUASH_MSG"
+msgstr "incapaz ler SQUASH_MSG"
 
-#: builtin/commit.c:773
+#: builtin/commit.c:820
 msgid "could not read MERGE_MSG"
-msgstr "não foi possível ler MERGE_MSG"
+msgstr "incapaz ler MERGE_MSG"
 
-#: builtin/commit.c:833
+#: builtin/commit.c:880
 msgid "could not write commit template"
-msgstr "não foi possível escrever o modelo de commit"
-
-#: builtin/commit.c:853
-#, fuzzy
-msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please run\n"
-"\tgit update-ref -d MERGE_HEAD\n"
-"and try again.\n"
-msgstr ""
-"\n"
-"Parece que está a submeter uma integração.\n"
-"Se não for o caso, remova o ficheiro\n"
-"\tgit update-ref -d MERGE_HEAD\n"
-"e tenta de novo.\n"
+msgstr "incapaz escrever o modelo de commit"
 
-#: builtin/commit.c:858
-#, fuzzy
+#: builtin/commit.c:893
+#, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please run\n"
-"\tgit update-ref -d CHERRY_PICK_HEAD\n"
-"and try again.\n"
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
 msgstr ""
-"\n"
-"Parece que está a submeter um cherry-pick.\n"
-"Se não é o caso, remova o ficheiro\n"
-"\tgit update-ref -d CHERRY_PICK_HEAD\n"
-"e tenta de novo.\n"
+"Introduza a mensagem de commit das suas alterações.\n"
+"Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n"
+"aborta o commit.\n"
 
-#: builtin/commit.c:868
+#: builtin/commit.c:895
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -13230,7 +13454,17 @@ msgstr ""
 "Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n"
 "aborta o commit.\n"
 
-#: builtin/commit.c:876
+#: builtin/commit.c:899
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Introduzia a mensagem de commit das suas alterações.\n"
+"Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n"
+"Uma mensagem vazia aborta o commit.\n"
+
+#: builtin/commit.c:903
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -13241,163 +13475,213 @@ msgstr ""
 "Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n"
 "Uma mensagem vazia aborta o commit.\n"
 
-#: builtin/commit.c:893
+#: builtin/commit.c:915
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"Parece que estás a fazer commit a uma junção.\n"
+"Se isto é incorreto, remove o ficheiro\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"e tenta de novo.\n"
+
+#: builtin/commit.c:920
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"Parece que está a fazer commit a um cherry-pick.\n"
+"Se é incorreto, remove o ficheiro\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"e tenta de novo.\n"
+
+#: builtin/commit.c:947
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:    %.*s <%.*s>"
 
-#: builtin/commit.c:901
+#: builtin/commit.c:955
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sData:      %s"
 
-#: builtin/commit.c:908
+#: builtin/commit.c:962
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommitter: %.*s <%.*s>"
 
-#: builtin/commit.c:926
+#: builtin/commit.c:980
 msgid "Cannot read index"
 msgstr "Incapaz ler index"
 
-#: builtin/commit.c:997
+#: builtin/commit.c:1025
+msgid "unable to pass trailers to --trailers"
+msgstr "incapaz passar atribuições para --trailers"
+
+#: builtin/commit.c:1065
 msgid "Error building trees"
 msgstr "Erro ao construir árvores"
 
-#: builtin/commit.c:1011 builtin/tag.c:276
+#: builtin/commit.c:1079 builtin/tag.c:319
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Indique a mensagem usando apenas as opções -m ou -F.\n"
 
-#: builtin/commit.c:1055
+#: builtin/commit.c:1123
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
-msgstr ""
-"--author '%s' não é do tipo 'Nome <email>' e não corresponde a um autor "
-"existente"
+msgstr "--author '%s' é diferente de 'Nome <email>' e corresponde a autor inexistente"
 
-#: builtin/commit.c:1069
-#, fuzzy, c-format
+#: builtin/commit.c:1137
+#, c-format
 msgid "Invalid ignored mode '%s'"
-msgstr "Modo inválido de ficheiros não controlados '%s'"
+msgstr "Modo de ignorar inválido '%s'"
 
-#: builtin/commit.c:1087 builtin/commit.c:1331
+#: builtin/commit.c:1155 builtin/commit.c:1448
 #, c-format
 msgid "Invalid untracked files mode '%s'"
-msgstr "Modo inválido de ficheiros não controlados '%s'"
+msgstr "Modo inválido de ficheiros por seguir '%s'"
 
-#: builtin/commit.c:1127
+#: builtin/commit.c:1195
 msgid "--long and -z are incompatible"
 msgstr "--long e -z são incompatíveis"
 
-#: builtin/commit.c:1171
+#: builtin/commit.c:1226
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr "Estás no meio de junção -- incapaz refrasear."
+
+#: builtin/commit.c:1228
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr "Estás no meio de apanha -- incapaz refrasear."
+
+#: builtin/commit.c:1231
+#, c-format
+msgid "cannot combine reword option of --fixup with path '%s'"
+msgstr ""
+
+#: builtin/commit.c:1233
+msgid ""
+"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
+"all/--include/--only"
+msgstr ""
+
+#: builtin/commit.c:1252
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Usar ambos --reset-author e --author faz sentido nenhum"
 
-#: builtin/commit.c:1180
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "Tens nada para emendar."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
-msgstr "Integração em curso -- não é possível emendar."
+msgstr "Estás no meio de junção -- incapaz emendar."
 
-#: builtin/commit.c:1185
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr "Cherry-pick em curso -- não é possível emendar."
+msgstr "Estás no meio de apanha -- incapaz emendar."
 
-#: builtin/commit.c:1187
-#, fuzzy
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
-msgstr "Integração em curso -- não é possível emendar."
+msgstr "Estás no meio de rebase -- incapaz emendar."
 
-#: builtin/commit.c:1190
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
-msgstr "As opções --squash e --fixup não podem ser usadas juntas"
+msgstr "Opções --squash e --fixup incapaz serem usadas juntas"
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1281
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Apenas um entre -c/-C/-F/--fixup pode ser usado."
 
-#: builtin/commit.c:1202
-#, fuzzy
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr "A opção -m não pode ser combinada com -c/C/-F/--fixup."
+msgstr "Opção -m incapaz ser combinada com -c/C/-F."
 
-#: builtin/commit.c:1211
+#: builtin/commit.c:1292
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author só pode ser usado com -C, -c ou --amend."
 
-#: builtin/commit.c:1229
+#: builtin/commit.c:1310
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Apenas um entre --include/--only/--all/--interactive/--patch pode ser usado."
 
-#: builtin/commit.c:1235
-#, fuzzy, c-format
+#: builtin/commit.c:1338
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "opção desconhecida: --fixup=%s:%s"
+
+#: builtin/commit.c:1352
+#, c-format
 msgid "paths '%s ...' with -a does not make sense"
-msgstr "Indicar caminhos com -a não faz sentido."
+msgstr "paths '%s ...' com -a faz sentido nenhum"
 
-#: builtin/commit.c:1366 builtin/commit.c:1527
+#: builtin/commit.c:1483 builtin/commit.c:1652
 msgid "show status concisely"
 msgstr "mostrar status de forma concisa"
 
-#: builtin/commit.c:1368 builtin/commit.c:1529
+#: builtin/commit.c:1485 builtin/commit.c:1654
 msgid "show branch information"
-msgstr "mostrar informação do ramo"
+msgstr "mostrar informação de ramo"
 
-#: builtin/commit.c:1370
-#, fuzzy
+#: builtin/commit.c:1487
 msgid "show stash information"
-msgstr "mostrar informação do ramo"
+msgstr "mostrar informação de esconderijo"
 
-#: builtin/commit.c:1372 builtin/commit.c:1531
+#: builtin/commit.c:1489 builtin/commit.c:1656
 msgid "compute full ahead/behind values"
 msgstr ""
 
-#: builtin/commit.c:1374
+#: builtin/commit.c:1491
 msgid "version"
 msgstr "versão"
 
-#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
-#: builtin/worktree.c:725
+#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
-msgstr "saída inteligível por máquina"
+msgstr "saída inteligível a máquina"
 
-#: builtin/commit.c:1377 builtin/commit.c:1535
+#: builtin/commit.c:1494 builtin/commit.c:1660
 msgid "show status in long format (default)"
 msgstr "apresentar status em formato longo (predefinição)"
 
-#: builtin/commit.c:1380 builtin/commit.c:1538
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "terminate entries with NUL"
 msgstr "terminar entradas com NUL"
 
-#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1406 parse-options.h:336
+#: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
 msgid "mode"
 msgstr "modo"
 
-#: builtin/commit.c:1383 builtin/commit.c:1541
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
-"mostrar ficheiros não controlados, modo é opcional: all, normal, no. "
-"(Predefinição: all)"
+"mostrar ficheiros por seguir, modo opcional: all, normal, no. (Predefinição: "
+"all)"
 
-#: builtin/commit.c:1387
-#, fuzzy
+#: builtin/commit.c:1504
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
-"mostrar ficheiros não controlados, modo é opcional: all, normal, no. "
-"(Predefinição: all)"
+"mostrar ficheiros ignorados, modo opcional: traditional, matching, no. "
+"(Predefinição: tradicional)"
 
-#: builtin/commit.c:1389 parse-options.h:192
+#: builtin/commit.c:1506 parse-options.h:193
 msgid "when"
 msgstr "quando"
 
-#: builtin/commit.c:1390
+#: builtin/commit.c:1507
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -13405,196 +13689,213 @@ msgstr ""
 "ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "
 "(Predefinição: all)"
 
-#: builtin/commit.c:1392
+#: builtin/commit.c:1509
 msgid "list untracked files in columns"
-msgstr "listar ficheiros não controlados em colunas"
+msgstr "listar ficheiros por seguir em colunas"
 
-#: builtin/commit.c:1393
-#, fuzzy
+#: builtin/commit.c:1510
 msgid "do not detect renames"
-msgstr "não consultar remotos"
+msgstr "detecção renomeação nenhuma"
 
-#: builtin/commit.c:1395
+#: builtin/commit.c:1512
 msgid "detect renames, optionally set similarity index"
 msgstr ""
 
-#: builtin/commit.c:1415
+#: builtin/commit.c:1535
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 
-#: builtin/commit.c:1497
+#: builtin/commit.c:1617
 msgid "suppress summary after successful commit"
 msgstr "suprimir o resumo depois de submeter com sucesso"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1618
 msgid "show diff in commit message template"
 msgstr "mostrar diff no modelo da mensagem de commit"
 
-#: builtin/commit.c:1500
+#: builtin/commit.c:1620
 msgid "Commit message options"
 msgstr "Opções de mensagem de commit"
 
-#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415
+#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
 msgid "read message from file"
-msgstr "ler mensagem de um ficheiro"
+msgstr "ler mensagem de ficheiro"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1622
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1622
 msgid "override author for commit"
-msgstr "substituir autor do commit"
+msgstr "sobrepor autor de memória"
 
-#: builtin/commit.c:1503 builtin/gc.c:542
+#: builtin/commit.c:1623 builtin/gc.c:550
 msgid "date"
 msgstr "data"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1623
 msgid "override date for commit"
 msgstr "substituir data do commit"
 
-#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
-#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87
+#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
+#: parse-options.h:329 ref-filter.h:90
 msgid "commit"
-msgstr "commit"
+msgstr "memória"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1625
 msgid "reuse and edit message from specified commit"
 msgstr "reutilizar e editar a mensagem de um commit especificado"
 
-#: builtin/commit.c:1506
+#: builtin/commit.c:1626
 msgid "reuse message from specified commit"
 msgstr "reutilizar a mensagem de um commit especificado"
 
-#: builtin/commit.c:1507
-msgid "use autosquash formatted message to fixup specified commit"
+#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
+#. and only translate <commit>.
+#.
+#: builtin/commit.c:1631
+msgid "[(amend|reword):]commit"
+msgstr "[(amend|reword):]memória"
+
+#: builtin/commit.c:1631
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
 "usar mensagem com formato autosquash para corrigir o commit especificado"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1632
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "usar mensagem com formato autosquash para esmagar o commit especificado"
 
-#: builtin/commit.c:1509
+#: builtin/commit.c:1633
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
-msgstr "agora sou eu o autor do commit (usado com C/-c/--amend)"
+msgstr "agora sou eu o autor da memória (usado com -C/-c/--amend)"
 
-#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301
+#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "atribuição"
+
+#: builtin/commit.c:1634
+msgid "add custom trailer(s)"
+msgstr ""
+
+#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
 #: builtin/pull.c:145 builtin/revert.c:110
-#, fuzzy
 msgid "add a Signed-off-by trailer"
-msgstr "adicionar Signed-off-by:"
+msgstr "adicionar atribuição Signed-off-by"
 
-#: builtin/commit.c:1511
+#: builtin/commit.c:1636
 msgid "use specified template file"
 msgstr "usar ficheiro de modelo especificado"
 
-#: builtin/commit.c:1512
+#: builtin/commit.c:1637
 msgid "force edit of commit"
-msgstr "forçar edição do commit"
+msgstr "forçar edição de memória"
 
-#: builtin/commit.c:1514
+#: builtin/commit.c:1639
 msgid "include status in commit message template"
 msgstr "incluir status no modelo da mensagem de commit"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1644
 msgid "Commit contents options"
 msgstr "Opções de conteúdo do commit"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1645
 msgid "commit all changed files"
 msgstr "submeter todos os ficheiros alterados"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1646
 msgid "add specified files to index for commit"
 msgstr "adicionar ficheiros especificados ao índice para submeter"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1647
 msgid "interactively add files"
 msgstr "adicionar ficheiros interativamente"
 
-#: builtin/commit.c:1523
+#: builtin/commit.c:1648
 msgid "interactively add changes"
 msgstr "adicionar alterações interativamente"
 
-#: builtin/commit.c:1524
+#: builtin/commit.c:1649
 msgid "commit only specified files"
-msgstr "submeter somente os ficheiros especificados"
+msgstr "memorizar somente ficheiros especificados"
 
-#: builtin/commit.c:1525
+#: builtin/commit.c:1650
 msgid "bypass pre-commit and commit-msg hooks"
-msgstr "ignorar pre-commit e commit-msg hooks"
+msgstr "ignorar pre-commit e ganchos commit-msg"
 
-#: builtin/commit.c:1526
+#: builtin/commit.c:1651
 msgid "show what would be committed"
 msgstr "mostrar o que seria submetido"
 
-#: builtin/commit.c:1539
+#: builtin/commit.c:1664
 msgid "amend previous commit"
-msgstr "emendar o commit anterior"
+msgstr "emendar memória anterior"
 
-#: builtin/commit.c:1540
+#: builtin/commit.c:1665
 msgid "bypass post-rewrite hook"
 msgstr "ignorar post-rewrite hook"
 
-#: builtin/commit.c:1547
+#: builtin/commit.c:1672
 msgid "ok to record an empty change"
 msgstr "aceitar o registo duma alteração vazia"
 
-#: builtin/commit.c:1549
+#: builtin/commit.c:1674
 msgid "ok to record a change with an empty message"
 msgstr "aceitar o registo duma alteração com uma mensagem vazia"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1750
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
-msgstr "Ficheiro MERGE_HEAD corrompido (%s)"
+msgstr "Ficheiro MERGE_HEAD roto (%s)"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1757
 msgid "could not read MERGE_MODE"
-msgstr "não foi possível ler MERGE_MODE"
+msgstr "incapaz ler MERGE_MODE"
 
-#: builtin/commit.c:1650
+#: builtin/commit.c:1778
 #, c-format
 msgid "could not read commit message: %s"
-msgstr "não foi possível ler a mensagem de commit: %s"
+msgstr "incapaz ler mensagem de commit: %s"
 
-#: builtin/commit.c:1657
+#: builtin/commit.c:1785
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
-msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"
+msgstr "Abortando a memorização devido a mensagem de memória vazia.\n"
 
-#: builtin/commit.c:1662
+#: builtin/commit.c:1790
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
-msgstr "A abortar o commit; não editou a mensagem.\n"
+msgstr "Abortando memorização; mensagem ficou por editar.\n"
+
+#: builtin/commit.c:1801
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr "Abortando memorização devido a corpo de mensagem de memória vazia.\n"
 
-#: builtin/commit.c:1696
-#, fuzzy
+#: builtin/commit.c:1837
 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 ""
-"O repositório foi atualizado, mas não foi possível escrever\n"
-"o ficheiro new_index. Verifique se o disco não está cheio\n"
-"e que a quota não foi excedida e execute \"git reset HEAD\" para recuperar."
+"Repositório foi atualizado, mas incapaz escrever ficheiro new_index.\n"
+"Verifica se tens espaço em disco e que a quota está por preencher,\n"
+"e executa \"git restore --staged :/\" para recuperar."
 
 #: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<opções>]"
 
 #: builtin/config.c:109 builtin/env--helper.c:27
-#, fuzzy, c-format
+#, c-format
 msgid "unrecognized --type argument, %s"
-msgstr "argumento não reconhecido: %s"
+msgstr "argumento --type desconhecido, %s"
 
 #: builtin/config.c:121
-#, fuzzy
 msgid "only one type at a time"
-msgstr "imprimir apenas correspondências exatas"
+msgstr "apenas um tipo de cada vez"
 
 #: builtin/config.c:130
 msgid "Config file location"
@@ -13610,12 +13911,11 @@ msgstr "usar ficheiro de configuração do sistema"
 
 #: builtin/config.c:133
 msgid "use repository config file"
-msgstr "usar ficheiro de configuração do repositório"
+msgstr ""
 
 #: builtin/config.c:134
-#, fuzzy
 msgid "use per-worktree config file"
-msgstr "usar ficheiro de configuração do repositório"
+msgstr ""
 
 #: builtin/config.c:135
 msgid "use given config file"
@@ -13634,17 +13934,14 @@ msgid "Action"
 msgstr "Ação"
 
 #: builtin/config.c:138
-#, fuzzy
 msgid "get value: name [value-pattern]"
 msgstr "obter valor: nome [regex-do-valor]"
 
 #: builtin/config.c:139
-#, fuzzy
 msgid "get all values: key [value-pattern]"
 msgstr "obter todos os valores: chave [regex-do-valor]"
 
 #: builtin/config.c:140
-#, fuzzy
 msgid "get values for regexp: name-regex [value-pattern]"
 msgstr "obter valores para a regexp: regex-do-nome [regex-do-valor]"
 
@@ -13653,7 +13950,6 @@ msgid "get value specific for the URL: section[.var] URL"
 msgstr "obter valor do URL especificado: section[.var] URL"
 
 #: builtin/config.c:142
-#, fuzzy
 msgid "replace all matching variables: name value [value-pattern]"
 msgstr ""
 "substituir todos as variáveis correspondentes: nome valor [regex-do-valor]"
@@ -13663,12 +13959,10 @@ msgid "add a new variable: name value"
 msgstr "adicionar uma nova variável: nome valor"
 
 #: builtin/config.c:144
-#, fuzzy
 msgid "remove a variable: name [value-pattern]"
 msgstr "remover uma variável: nome [regex-do-valor]"
 
 #: builtin/config.c:145
-#, fuzzy
 msgid "remove all matches: name [value-pattern]"
 msgstr "remover todas as correspondências: nome [regex-do-valor]"
 
@@ -13678,7 +13972,7 @@ msgstr "mudar o nome da secção: nome-antigo novo-nome"
 
 #: builtin/config.c:147
 msgid "remove a section: name"
-msgstr "remover uma secção: nome"
+msgstr "remove secção: nome"
 
 #: builtin/config.c:148
 msgid "list all"
@@ -13718,12 +14012,11 @@ msgstr "o valor é um número decimal"
 
 #: builtin/config.c:157
 msgid "value is --bool or --int"
-msgstr "o valor é --bool ou --int"
+msgstr "valor é --bool ou --int"
 
 #: builtin/config.c:158
-#, fuzzy
 msgid "value is --bool or string"
-msgstr "o valor é --bool ou --int"
+msgstr "valor é --bool ou string"
 
 #: builtin/config.c:159
 msgid "value is a path (file or directory name)"
@@ -13760,9 +14053,8 @@ msgid "show scope of config (worktree, local, global, system, command)"
 msgstr ""
 
 #: builtin/config.c:167 builtin/env--helper.c:45
-#, fuzzy
 msgid "value"
-msgstr "chave=valor"
+msgstr "valor"
 
 #: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
@@ -13779,36 +14071,33 @@ msgid "wrong number of arguments, should be from %d to %d"
 msgstr ""
 
 #: builtin/config.c:339
-#, fuzzy, c-format
+#, c-format
 msgid "invalid key pattern: %s"
-msgstr "chave inválida: %s"
+msgstr "padrão de chave inválido: %s"
 
 #: builtin/config.c:377
-#, fuzzy, c-format
+#, c-format
 msgid "failed to format default config value: %s"
-msgstr "falha ao criar o ficheiro %s"
+msgstr ""
 
 #: builtin/config.c:441
-#, fuzzy, c-format
+#, c-format
 msgid "cannot parse color '%s'"
-msgstr "não é possível abrir o ficheiro '%s'"
+msgstr "incapaz processar cor '%s'"
 
 #: builtin/config.c:483
 msgid "unable to parse default color value"
-msgstr "não é possível analisar o valor de cor por omissão"
+msgstr "incapaz processar valor de cor padrão"
 
 #: builtin/config.c:536 builtin/config.c:833
-#, fuzzy
 msgid "not in a git directory"
 msgstr "está fora de pasta git"
 
 #: builtin/config.c:539
-#, fuzzy
 msgid "writing to stdin is not supported"
 msgstr "escrever para stdin tem suporte nenhum"
 
 #: builtin/config.c:542
-#, fuzzy
 msgid "writing config blobs is not supported"
 msgstr "escrever config blobs tem suporte nenhum"
 
@@ -13832,19 +14121,16 @@ msgid "only one config file at a time"
 msgstr ""
 
 #: builtin/config.c:658
-#, fuzzy
 msgid "--local can only be used inside a git repository"
-msgstr "--cached fora de um repositório"
+msgstr ""
 
 #: builtin/config.c:660
-#, fuzzy
 msgid "--blob can only be used inside a git repository"
-msgstr "--cached fora de um repositório"
+msgstr ""
 
 #: builtin/config.c:662
-#, fuzzy
 msgid "--worktree can only be used inside a git repository"
-msgstr "'%s' não é reconhecido como um repositório git"
+msgstr "--worktree apenas pode ser usado dentro repositório git"
 
 #: builtin/config.c:684
 msgid "$HOME not set"
@@ -13884,29 +14170,26 @@ msgid "--fixed-value only applies with 'value-pattern'"
 msgstr ""
 
 #: builtin/config.c:822
-#, fuzzy, c-format
+#, c-format
 msgid "unable to read config file '%s'"
-msgstr "não é possível ler o ficheiro de assinatura '%s'"
+msgstr "incapaz ler ficheiro config '%s'"
 
 #: builtin/config.c:825
-#, fuzzy
 msgid "error processing config file(s)"
-msgstr "usar ficheiro de configuração do repositório"
+msgstr ""
 
 #: builtin/config.c:835
-#, fuzzy
 msgid "editing stdin is not supported"
 msgstr "editar stdin tem suporte nenhum"
 
 #: builtin/config.c:837
-#, fuzzy
 msgid "editing blobs is not supported"
 msgstr "editar blobs tem suporte nenhum"
 
 #: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
-msgstr "não é possível criar o ficheiro de configuração %s"
+msgstr "incapaz criar ficheiro de configuração %s"
 
 #: builtin/config.c:864
 #, c-format
@@ -13914,13 +14197,13 @@ msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr ""
-"não é possível substituir múltiplos valores por um único valor\n"
+"incapaz sobrescrever múltiplos valores com um único valor\n"
 "       Usa uma regexp, --add ou --replace-all para alterar %s."
 
 #: builtin/config.c:943 builtin/config.c:954
-#, fuzzy, c-format
+#, c-format
 msgid "no such section: %s"
-msgstr "referência inexistente %s"
+msgstr "secção inexistente: %s"
 
 #: builtin/count-objects.c:90
 msgid "git count-objects [-v] [-H | --human-readable]"
@@ -13930,7 +14213,7 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "imprimir dimensões em formato inteligível por humanos"
 
-#: builtin/credential-cache--daemon.c:226
+#: builtin/credential-cache--daemon.c:227
 #, c-format
 msgid ""
 "The permissions on your socket directory are too loose; other\n"
@@ -13944,11 +14227,11 @@ msgstr ""
 "\n"
 "\tchmod 0700 %s"
 
-#: builtin/credential-cache--daemon.c:275
+#: builtin/credential-cache--daemon.c:276
 msgid "print debugging messages to stderr"
 msgstr "imprimir mensagens de depuração no stderr"
 
-#: builtin/credential-cache--daemon.c:315
+#: builtin/credential-cache--daemon.c:316
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr ""
 
@@ -13957,13 +14240,13 @@ msgid "credential-cache unavailable; no unix socket support"
 msgstr ""
 
 #: builtin/credential-store.c:66
-#, fuzzy, c-format
+#, c-format
 msgid "unable to get credential storage lock in %d ms"
-msgstr "não é possível de obter o diretório de trabalho atual"
+msgstr "incapaz obter bloqueio de armazenamento de credenciais em %d ms"
 
 #: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
-msgstr "git describe [<opções>] [<commit-etc>...]"
+msgstr "git describe [<opções>] [<mnemónica>...]"
 
 #: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
@@ -13984,10 +14267,10 @@ msgstr "anotado"
 #: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
-msgstr "a tag anotada %s não está disponível"
+msgstr "tag anotada %s está indisponível"
 
 #: builtin/describe.c:281
-#, fuzzy, c-format
+#, c-format
 msgid "tag '%s' is externally known as '%s'"
 msgstr "a tag '%s' está de facto em '%s'"
 
@@ -14039,19 +14322,19 @@ msgstr ""
 "pesquisa interrompida em %s\n"
 
 #: builtin/describe.c:529
-#, fuzzy, c-format
+#, c-format
 msgid "describe %s\n"
 msgstr "à procurar da descrição de %s\n"
 
 #: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
-msgstr "%s não é um nome de objeto válido"
+msgstr "%s é nome de objeto inválido"
 
 #: builtin/describe.c:540
-#, fuzzy, c-format
+#, c-format
 msgid "%s is neither a commit nor blob"
-msgstr "'%s' não é um commit"
+msgstr "'%s' é nem commit nem blob"
 
 #: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
@@ -14067,7 +14350,7 @@ msgstr "usar uma referência qualquer"
 
 #: builtin/describe.c:557
 msgid "use any tag, even unannotated"
-msgstr "usar uma tag qualquer, mesmo não anotada"
+msgstr "usa qualquer tag, mesmo uma por anotar"
 
 #: builtin/describe.c:558
 msgid "always use long format"
@@ -14079,7 +14362,7 @@ msgstr "seguir só o primeiro pai"
 
 #: builtin/describe.c:562
 msgid "only output exact matches"
-msgstr "imprimir apenas correspondências exatas"
+msgstr "sair apenas correspondências exatas"
 
 #: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
@@ -14091,7 +14374,7 @@ msgstr "apenas considerar tags que correspondam ao <padrão>"
 
 #: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
-msgstr "não considerar tags que correspondam ao <padrão>"
+msgstr "descarta tags que correspondam ao <padrão>"
 
 #: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
@@ -14119,179 +14402,175 @@ msgstr "--long é incompatível com --abbrev=0"
 
 #: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
-msgstr "Nenhum nome encontrado, não é possível descrever."
+msgstr "Nenhum nome encontrado, incapaz descrever qualquer coisa."
 
 #: builtin/describe.c:673
 msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty é incompatível com commits ou semelhantes"
+msgstr "--dirty é incompatível com mnemónicas"
 
 #: builtin/describe.c:675
 msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken é incompatível com commits ou semelhantes"
+msgstr "--broken é incompatível com mnemónicas"
 
 #: builtin/diff-tree.c:155
-#, fuzzy
 msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "-b, -B e --orphan são mutuamente exclusivos"
+msgstr ""
 
 #: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
 msgstr ""
 
-#: builtin/diff.c:91
+#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
-msgstr "'%s': não é um ficheiro regular nem uma ligação simbólica"
+msgstr "'%s': é ficheiro normal nenhum e é ligação simbólica nenhuma"
 
-#: builtin/diff.c:258
+#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
-msgstr "opção inválida: %s"
+msgstr ""
 
-#: builtin/diff.c:375
+#: builtin/diff.c:376
 #, c-format
 msgid "%s...%s: no merge base"
 msgstr ""
 
-#: builtin/diff.c:485
+#: builtin/diff.c:486
 msgid "Not a git repository"
 msgstr "É repositório git nenhum"
 
-#: builtin/diff.c:530 builtin/grep.c:681
+#: builtin/diff.c:532 builtin/grep.c:684
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objeto inválido '%s' fornecido."
 
-#: builtin/diff.c:541
+#: builtin/diff.c:543
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "mais do que dois blobs fornecidos: '%s'"
 
-#: builtin/diff.c:546
+#: builtin/diff.c:548
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "objeto sem tratamento '%s' fornecido."
 
-#: builtin/diff.c:580
+#: builtin/diff.c:582
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr ""
 
-#: builtin/difftool.c:30
+#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
-msgstr "git difftool [<opções>] [<commit> [<commit>]] [--] [<caminho>...]"
+msgstr "git difftool [<opções>] [<memória> [<memória>]] [--] [<caminho>...]"
 
-#: builtin/difftool.c:260
+#: builtin/difftool.c:261
 #, c-format
 msgid "failed: %d"
-msgstr "falha: %d"
+msgstr "falhou: %d"
 
-#: builtin/difftool.c:302
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink %s"
-msgstr "não foi possível ler a ligação simbólica %s"
+msgstr "incapaz ler ligação simbólica %s"
 
-#: builtin/difftool.c:304
+#: builtin/difftool.c:305
 #, c-format
 msgid "could not read symlink file %s"
-msgstr "não foi possível ler o ficheiro de ligação simbólica %s"
+msgstr "incapaz ler ficheiro de ligação simbólica %s"
 
-#: builtin/difftool.c:312
+#: builtin/difftool.c:313
 #, c-format
 msgid "could not read object %s for symlink %s"
-msgstr "não foi possível ler o objeto %s da ligação simbólica %s"
+msgstr "incapaz ler o objeto %s para ligação simbólica %s"
 
-#: builtin/difftool.c:412
+#: builtin/difftool.c:413
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
 msgstr ""
-"formatos diff combinado('-c' e '--cc') não são suportados em\n"
-"modo diff diretório ('-d' e '--dir-diff')."
+"formatos diff combinado('-c' e '--cc') são insustentados em\n"
+"modo diff pasta('-d' e '--dir-diff')."
 
-#: builtin/difftool.c:633
+#: builtin/difftool.c:637
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "ambos os ficheiros modificados: '%s' e '%s'."
 
-#: builtin/difftool.c:635
+#: builtin/difftool.c:639
 msgid "working tree file has been left."
 msgstr "ficheiro de árvore de trabalho foi deixado."
 
-#: builtin/difftool.c:646
+#: builtin/difftool.c:650
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "existem ficheiros temporários em '%s'."
 
-#: builtin/difftool.c:647
+#: builtin/difftool.c:651
 msgid "you may want to cleanup or recover these."
 msgstr "pode querer limpar ou recuperá-los."
 
-#: builtin/difftool.c:696
+#: builtin/difftool.c:699
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "use 'diff.guitool' em vez de 'diff.tool'"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:701
 msgid "perform a full-directory diff"
 msgstr "efetuar diff diretório completo"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:703
 msgid "do not prompt before launching a diff tool"
-msgstr "não perguntar antes de lançar uma ferramenta diff"
+msgstr "deixar de perguntar antes de lançar ferramenta diff"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:708
 msgid "use symlinks in dir-diff mode"
 msgstr "usar symlinks no modi dir-diff"
 
-#: builtin/difftool.c:706
-#, fuzzy
+#: builtin/difftool.c:709
 msgid "tool"
-msgstr "<ferramenta>"
+msgstr "ferramenta"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:710
 msgid "use the specified diff tool"
 msgstr "usar a ferramenta diff especificada"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:712
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
-"imprimir uma lista de ferramentas diff que podem ser usadas com '--tool'"
+"imprimir uma lista de ferramentas diff que podem ser usadas com `--tool`"
 
-#: builtin/difftool.c:712
+#: builtin/difftool.c:715
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
 msgstr ""
 "fazer com que 'git-difftool' termine quando uma ferramenta diff invocada "
-"retorna um código de saída não nulo"
+"retorna um código de saída diferente de zero"
 
-#: builtin/difftool.c:715
+#: builtin/difftool.c:718
 msgid "specify a custom command for viewing diffs"
 msgstr "especificar um comando personalizado para ver diffs"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:719
 msgid "passed to `diff`"
 msgstr ""
 
-#: builtin/difftool.c:731
+#: builtin/difftool.c:734
 msgid "difftool requires worktree or --no-index"
 msgstr ""
 
-#: builtin/difftool.c:738
-#, fuzzy
+#: builtin/difftool.c:741
 msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dirty é incompatível com commits ou semelhantes"
+msgstr "--dir-diff é incompatível com --no-index"
 
-#: builtin/difftool.c:741
-#, fuzzy
+#: builtin/difftool.c:744
 msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "-b, -B e --detach são mutuamente exclusivos"
+msgstr ""
 
-#: builtin/difftool.c:749
+#: builtin/difftool.c:752
 msgid "no <tool> given for --tool=<tool>"
 msgstr "<ferramenta> nenhuma dada a --tool=<ferramenta>"
 
-#: builtin/difftool.c:756
+#: builtin/difftool.c:759
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "<cmd> nenhum dado a --extcmd=<cmd>"
 
@@ -14325,112 +14604,109 @@ msgstr ""
 
 #: builtin/fast-export.c:29
 msgid "git fast-export [rev-list-opts]"
-msgstr "git fast-export [opções-de-rev-list]"
+msgstr "git fast-export [opts-lista-rev]"
 
 #: builtin/fast-export.c:868
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1177
 msgid "--anonymize-map token cannot be empty"
 msgstr ""
 
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1197
 msgid "show progress after <n> objects"
 msgstr "mostrar progresso depois de <n> objetos"
 
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1199
 msgid "select handling of signed tags"
-msgstr "selecionar o tratamento de tags assinadas"
+msgstr "selecionar como lidar as etiquetas assinadas"
 
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1202
 msgid "select handling of tags that tag filtered objects"
-msgstr "selecionar o tratamento de tags que apontem para objetos filtrados"
+msgstr "selecionar como lidar as etiquetas que marcam objetos filtrados"
 
-#: builtin/fast-export.c:1206
-#, fuzzy
+#: builtin/fast-export.c:1205
 msgid "select handling of commit messages in an alternate encoding"
-msgstr "selecionar o tratamento de tags que apontem para objetos filtrados"
+msgstr "selecionar como lidar as mensagens de memória com codificação alternativa"
 
-#: builtin/fast-export.c:1209
-msgid "Dump marks to this file"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
 msgstr "Capturar marcas neste ficheiro"
 
-#: builtin/fast-export.c:1211
-msgid "Import marks from this file"
-msgstr "Importar marcas deste ficheiro"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
+msgstr "importar marcas deste ficheiro"
 
-#: builtin/fast-export.c:1215
-#, fuzzy
-msgid "Import marks from this file if it exists"
-msgstr "Importar marcas deste ficheiro"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr "importar marcas deste ficheiro se existir"
 
-#: builtin/fast-export.c:1217
-msgid "Fake a tagger when tags lack one"
-msgstr "Inventar um autor de tag para tags que não tenham um"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr "Falsear um \"tageador\" para quando falte um às tags"
 
-#: builtin/fast-export.c:1219
-msgid "Output full tree for each commit"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
 msgstr "Mostrar a árvore completa para cada commit"
 
-#: builtin/fast-export.c:1221
-msgid "Use the done feature to terminate the stream"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
 msgstr "Usar a funcionalidade done para terminar o fluxo"
 
-#: builtin/fast-export.c:1222
-msgid "Skip output of blob data"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
 msgstr "Ignorar a exibição de dados de blob"
 
-#: builtin/fast-export.c:1223 builtin/log.c:1816
+#: builtin/fast-export.c:1222 builtin/log.c:1826
 msgid "refspec"
 msgstr "especificador de referência"
 
-#: builtin/fast-export.c:1224
-msgid "Apply refspec to exported refs"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
 msgstr "Aplicar o especificador de referência a referências exportadas"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1224
 msgid "anonymize output"
 msgstr "anonimizar saída"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1225
 msgid "from:to"
 msgstr ""
 
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1226
 msgid "convert <from> to <to> in anonymized output"
 msgstr ""
 
-#: builtin/fast-export.c:1230
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
 
-#: builtin/fast-export.c:1232
-msgid "Show original object ids of blobs/commits"
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
 msgstr ""
 
-#: builtin/fast-export.c:1234
-msgid "Label tags with mark ids"
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
 msgstr ""
 
-#: builtin/fast-export.c:1257
-#, fuzzy
+#: builtin/fast-export.c:1256
 msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--name-only não faz sentido"
+msgstr "--anonymize-map sem --anonymize faz sentido nenhum"
 
-#: builtin/fast-export.c:1272
+#: builtin/fast-export.c:1271
 msgid "Cannot pass both --import-marks and --import-marks-if-exists"
 msgstr ""
 
 #: builtin/fast-import.c:3088
-#, fuzzy, c-format
+#, c-format
 msgid "Missing from marks for submodule '%s'"
-msgstr "A ignorar submódulo '%s'"
+msgstr ""
 
 #: builtin/fast-import.c:3090
-#, fuzzy, c-format
+#, c-format
 msgid "Missing to marks for submodule '%s'"
-msgstr "A ignorar submódulo '%s'"
+msgstr ""
 
 #: builtin/fast-import.c:3225
 #, c-format
@@ -14451,15 +14727,14 @@ msgstr ""
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr ""
 
-#: builtin/fetch-pack.c:241
-#, fuzzy, c-format
+#: builtin/fetch-pack.c:242
+#, c-format
 msgid "Lockfile created but not reported: %s"
-msgstr "Submódulos alterados mas não atualizados:"
+msgstr "Ficheiro de bloqueio criado mas por reportar: %s"
 
 #: builtin/fetch.c:35
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr ""
-"git fetch [<opções>] [<repositório> [<especificador-de-referência>...]]"
+msgstr "git fetch [<opções>] [<repositório> [<espetro-ref>...]]"
 
 #: builtin/fetch.c:36
 msgid "git fetch [<options>] <group>"
@@ -14473,203 +14748,208 @@ msgstr "git fetch --multiple [<opções>] [(<repositório> | <grupo>)...]"
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opções>]"
 
-#: builtin/fetch.c:119
+#: builtin/fetch.c:122
 msgid "fetch.parallel cannot be negative"
 msgstr ""
 
-#: builtin/fetch.c:142 builtin/pull.c:185
+#: builtin/fetch.c:145 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr "obter de todos os remotos"
 
-#: builtin/fetch.c:144 builtin/pull.c:245
-#, fuzzy
+#: builtin/fetch.c:147 builtin/pull.c:245
 msgid "set upstream for git pull/fetch"
-msgstr "definir o ramo a montante usado com git pull/status"
+msgstr "definir upstream para git pull/fetch"
 
-#: builtin/fetch.c:146 builtin/pull.c:188
+#: builtin/fetch.c:149 builtin/pull.c:188
 msgid "append to .git/FETCH_HEAD instead of overwriting"
-msgstr "acrescentar a .git/FETCH_HEAD em vez de substituir"
+msgstr "acrescentar a .git/FETCH_HEAD em vez de sobrescrever"
+
+#: builtin/fetch.c:151
+msgid "use atomic transaction to update references"
+msgstr "usar transação atómica para atualizar referências"
 
-#: builtin/fetch.c:148 builtin/pull.c:191
+#: builtin/fetch.c:153 builtin/pull.c:191
 msgid "path to upload pack on remote end"
 msgstr "caminho para o comando upload pack no remoto"
 
-#: builtin/fetch.c:149
-#, fuzzy
+#: builtin/fetch.c:154
 msgid "force overwrite of local reference"
-msgstr "forçar a substituição do ramo local"
+msgstr "forçar sobrescrever referências locais"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:156
 msgid "fetch from multiple remotes"
 msgstr "obter de múltiplos remotos"
 
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:158 builtin/pull.c:195
 msgid "fetch all tags and associated objects"
 msgstr "obter todas as tags e objetos associados"
 
-#: builtin/fetch.c:155
+#: builtin/fetch.c:160
 msgid "do not fetch all tags (--no-tags)"
-msgstr "não obter todas as tags (--no-tags)"
+msgstr "buscar nada todas as etiquetas (--no-tags)"
 
-#: builtin/fetch.c:157
+#: builtin/fetch.c:162
 msgid "number of submodules fetched in parallel"
 msgstr "número de submódulos obtidos em paralelo"
 
-#: builtin/fetch.c:159 builtin/pull.c:198
-msgid "prune remote-tracking branches no longer on remote"
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
-"eliminar os ramos de monitorização remotos que já não existem no remoto"
 
-#: builtin/fetch.c:161
+#: builtin/fetch.c:166 builtin/pull.c:198
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "podar ramos de monitorização remotos que deixaram de estar no remoto"
+
+#: builtin/fetch.c:168
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 
-#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:163
+#: builtin/fetch.c:170
 msgid "control recursive fetching of submodules"
-msgstr "controlar a obtenção recursiva de submódulos"
+msgstr "controlar buscar recursivo de submódulos"
 
-#: builtin/fetch.c:168
-#, fuzzy
+#: builtin/fetch.c:175
 msgid "write fetched references to the FETCH_HEAD file"
-msgstr "escrever o arquivo para este ficheiro"
+msgstr "escrever referências buscadas para ficheiro FETCH_HEAD"
 
-#: builtin/fetch.c:169 builtin/pull.c:206
+#: builtin/fetch.c:176 builtin/pull.c:206
 msgid "keep downloaded pack"
 msgstr "manter o pacote transferido"
 
-#: builtin/fetch.c:171
+#: builtin/fetch.c:178
 msgid "allow updating of HEAD ref"
 msgstr "permitir a atualização da referência HEAD"
 
-#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
 #: builtin/pull.c:218
 msgid "deepen history of shallow clone"
 msgstr "aprofundar o histórico de um clone raso"
 
-#: builtin/fetch.c:176 builtin/pull.c:212
+#: builtin/fetch.c:183 builtin/pull.c:212
 msgid "deepen history of shallow repository based on time"
 msgstr "aprofundar o histórico de repositório raso com base na data"
 
-#: builtin/fetch.c:182 builtin/pull.c:221
+#: builtin/fetch.c:189 builtin/pull.c:221
 msgid "convert to a complete repository"
 msgstr "converter num repositório completo"
 
-#: builtin/fetch.c:185
+#: builtin/fetch.c:192
 msgid "prepend this to submodule path output"
-msgstr "preceder isto ao caminho do submódulo"
+msgstr "preceder isto à saída de caminho de submódulo"
 
-#: builtin/fetch.c:188
+#: builtin/fetch.c:195
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr ""
 
-#: builtin/fetch.c:192 builtin/pull.c:224
+#: builtin/fetch.c:199 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
-msgstr "aceitar referência que atualizem .git/shallow"
+msgstr "aceitar refs que atualizem .git/shallow"
 
-#: builtin/fetch.c:193 builtin/pull.c:226
+#: builtin/fetch.c:200 builtin/pull.c:226
 msgid "refmap"
-msgstr "mapa de referências"
+msgstr "mapa-ref"
 
-#: builtin/fetch.c:194 builtin/pull.c:227
+#: builtin/fetch.c:201 builtin/pull.c:227
 msgid "specify fetch refmap"
-msgstr "especificar mapa de referências"
+msgstr "especificar buscar mapa-ref"
 
-#: builtin/fetch.c:201 builtin/pull.c:240
+#: builtin/fetch.c:208 builtin/pull.c:240
 msgid "report that we have only objects reachable from this object"
 msgstr ""
 
-#: builtin/fetch.c:204 builtin/fetch.c:206
-#, fuzzy
+#: builtin/fetch.c:210
+msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
+msgstr ""
+
+#: builtin/fetch.c:213 builtin/fetch.c:215
 msgid "run 'maintenance --auto' after fetching"
-msgstr "eliminar remotos depois de obter"
+msgstr "executar 'maintenance --auto' após buscar"
 
-#: builtin/fetch.c:208 builtin/pull.c:243
+#: builtin/fetch.c:217 builtin/pull.c:243
 msgid "check for forced-updates on all updated branches"
 msgstr ""
 
-#: builtin/fetch.c:210
-#, fuzzy
+#: builtin/fetch.c:219
 msgid "write the commit-graph after fetching"
-msgstr "eliminar remotos depois de obter"
+msgstr "escrever commit-graph após buscar"
 
-#: builtin/fetch.c:212
-#, fuzzy
+#: builtin/fetch.c:221
 msgid "accept refspecs from stdin"
-msgstr "ler referências do stdin"
+msgstr "aceitar espetro-ref de entrada padrão"
 
-#: builtin/fetch.c:523
+#: builtin/fetch.c:586
 msgid "Couldn't find remote ref HEAD"
-msgstr "Referência remota HEAD não encontrada"
+msgstr "Incapaz de encontrar ref remota HEAD"
 
-#: builtin/fetch.c:677
+#: builtin/fetch.c:757
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
-msgstr "a configuração fetch.ouput contém o valor inválido %s"
+msgstr "configuração fetch.output contém valor inválido %s"
 
-#: builtin/fetch.c:775
+#: builtin/fetch.c:856
 #, c-format
 msgid "object %s not found"
-msgstr "objeto %s não encontrado"
+msgstr "objeto %s por encontrar"
 
-#: builtin/fetch.c:779
+#: builtin/fetch.c:860
 msgid "[up to date]"
 msgstr "[atualizado]"
 
-#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
 msgid "[rejected]"
 msgstr "[rejeitado]"
 
-#: builtin/fetch.c:793
+#: builtin/fetch.c:874
 msgid "can't fetch in current branch"
-msgstr "não é possível obter no ramo atual"
+msgstr "incapaz buscar no ramo atual"
 
-#: builtin/fetch.c:803
+#: builtin/fetch.c:884
 msgid "[tag update]"
 msgstr "[tag atualizada]"
 
-#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863
-#: builtin/fetch.c:875
+#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
+#: builtin/fetch.c:956
 msgid "unable to update local ref"
-msgstr "não é possível atualizar a referência local"
+msgstr "incapaz atualizar ref local"
 
-#: builtin/fetch.c:808
+#: builtin/fetch.c:889
 msgid "would clobber existing tag"
 msgstr ""
 
-#: builtin/fetch.c:830
+#: builtin/fetch.c:911
 msgid "[new tag]"
 msgstr "[nova tag]"
 
-#: builtin/fetch.c:833
+#: builtin/fetch.c:914
 msgid "[new branch]"
 msgstr "[novo ramo]"
 
-#: builtin/fetch.c:836
+#: builtin/fetch.c:917
 msgid "[new ref]"
 msgstr "[nova referência]"
 
-#: builtin/fetch.c:875
+#: builtin/fetch.c:956
 msgid "forced update"
 msgstr "atualização forçada"
 
-#: builtin/fetch.c:880
+#: builtin/fetch.c:961
 msgid "non-fast-forward"
 msgstr "sem avanço-rápido"
 
-#: builtin/fetch.c:901
+#: builtin/fetch.c:1065
 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'."
 msgstr ""
 
-#: builtin/fetch.c:905
+#: builtin/fetch.c:1069
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -14678,105 +14958,101 @@ msgid ""
 " to avoid this check.\n"
 msgstr ""
 
-#: builtin/fetch.c:939
+#: builtin/fetch.c:1101
 #, c-format
 msgid "%s did not send all necessary objects\n"
-msgstr "%s não enviou todos os objetos necessários\n"
+msgstr "%s ficou por enviar todos objetos necessários\n"
 
-#: builtin/fetch.c:960
+#: builtin/fetch.c:1129
 #, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr "%s rejeitado, porque as raízes rasas não podem ser atualizadas"
+msgid "rejected %s because shallow roots are not allowed to be updated"
+msgstr "%s rejeitada, porque raízes rasas são proibidas de ser atualizadas"
 
-#: builtin/fetch.c:1053 builtin/fetch.c:1191
+#: builtin/fetch.c:1206 builtin/fetch.c:1357
 #, c-format
 msgid "From %.*s\n"
 msgstr "De %.*s\n"
 
-#: builtin/fetch.c:1064
+#: builtin/fetch.c:1228
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
 " 'git remote prune %s' to remove any old, conflicting branches"
 msgstr ""
-"algumas referências locais não puderam ser atualizadas; tente executar\n"
-" 'git remote prune %s' para remover algum ramo antigo em conflito"
+"algumas refs locais ficaram desatualizadas; tenta executar\n"
+" 'git remote prune %s' para remover algum ramo antigo e conflituoso"
 
-#: builtin/fetch.c:1161
+#: builtin/fetch.c:1327
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s ficará suspenso)"
 
-#: builtin/fetch.c:1162
+#: builtin/fetch.c:1328
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s ficou suspenso)"
 
-#: builtin/fetch.c:1194
+#: builtin/fetch.c:1360
 msgid "[deleted]"
 msgstr "[eliminado]"
 
-#: builtin/fetch.c:1195 builtin/remote.c:1118
+#: builtin/fetch.c:1361 builtin/remote.c:1118
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: builtin/fetch.c:1218
+#: builtin/fetch.c:1384
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Obtenção de objetos no ramo atual %s de um repositório não nu recusada"
+msgstr "Recusando buscar para o ramo atual %s de repositório diferente de nu"
 
-#: builtin/fetch.c:1237
+#: builtin/fetch.c:1403
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "O valor \"%2$s\" da opção \"%1$s\" não é válido em %3$s"
+msgstr "Opção \"%s\" com valor \"%s\" é inválido para %s"
 
-#: builtin/fetch.c:1240
+#: builtin/fetch.c:1406
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Opção \"%s\" ignorada em %s\n"
 
-#: builtin/fetch.c:1448
+#: builtin/fetch.c:1618
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr ""
 
-#: builtin/fetch.c:1463
-#, fuzzy
+#: builtin/fetch.c:1633
 msgid "not setting upstream for a remote remote-tracking branch"
-msgstr ""
-"o ramo a montante '%s' não está guardado como um ramo de monitorização remoto"
+msgstr "desdefinindo upstream para remoto de ramo de monitorização remoto"
 
-#: builtin/fetch.c:1465
-#, fuzzy
+#: builtin/fetch.c:1635
 msgid "not setting upstream for a remote tag"
-msgstr "definir o ramo a montante usado com git pull/status"
+msgstr ""
 
-#: builtin/fetch.c:1467
-#, fuzzy
+#: builtin/fetch.c:1637
 msgid "unknown branch type"
-msgstr "objeto de tipo desconhecido %d"
+msgstr "tipo de ramo desconhecido"
 
-#: builtin/fetch.c:1469
+#: builtin/fetch.c:1639
 msgid ""
 "no source branch found.\n"
 "you need to specify exactly one branch with the --set-upstream option."
 msgstr ""
 
-#: builtin/fetch.c:1598 builtin/fetch.c:1661
+#: builtin/fetch.c:1768 builtin/fetch.c:1831
 #, c-format
 msgid "Fetching %s\n"
 msgstr "A obter de %s\n"
 
-#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Incapaz buscar %s"
 
-#: builtin/fetch.c:1620
-#, fuzzy, c-format
+#: builtin/fetch.c:1790
+#, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "fetch '%s' impossível (exit code: %d)\n"
 
-#: builtin/fetch.c:1724
+#: builtin/fetch.c:1894
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -14784,53 +15060,68 @@ msgstr ""
 "Nenhum repositório remoto especificado. Especifique um URL ou\n"
 "o nome remoto a partir do qual as novas revisões devem ser obtidas."
 
-#: builtin/fetch.c:1760
+#: builtin/fetch.c:1930
 msgid "You need to specify a tag name."
 msgstr "Deve especificar um nome para a tag."
 
-#: builtin/fetch.c:1825
+#: builtin/fetch.c:1994
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr "--negotiate-only precisa de um ou mais --negotiate-tip=*"
+
+#: builtin/fetch.c:1998
 msgid "Negative depth in --deepen is not supported"
-msgstr "Profundidade negativa em --deepen tem suporte nenhum"
+msgstr "Profundidade negativa em --deepen é insustentado"
 
-#: builtin/fetch.c:1827
+#: builtin/fetch.c:2000
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen e --depth são mutuamente exclusivos"
 
-#: builtin/fetch.c:1832
+#: builtin/fetch.c:2005
 msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth e --unshallow não podem ser usados juntos"
+msgstr "--depth e --unshallow incapazes serem usados juntos"
 
-#: builtin/fetch.c:1834
+#: builtin/fetch.c:2007
 msgid "--unshallow on a complete repository does not make sense"
-msgstr "usar --unshallow num repositório completo não faz sentido"
+msgstr "--unshallow num repositório completo faz sentido nenhum"
 
-#: builtin/fetch.c:1851
+#: builtin/fetch.c:2024
 msgid "fetch --all does not take a repository argument"
-msgstr "fetch --all não leva um repositório como argumento"
+msgstr "fetch --all leva como argumento repositório nenhum"
 
-#: builtin/fetch.c:1853
+#: builtin/fetch.c:2026
 msgid "fetch --all does not make sense with refspecs"
-msgstr "fetch --all não faz sentido com especificadores de referência"
+msgstr "fetch --all com espetros-ref, faz sentido nenhum"
 
-#: builtin/fetch.c:1862
+#: builtin/fetch.c:2035
 #, c-format
 msgid "No such remote or remote group: %s"
-msgstr "O remoto ou grupo remoto não existe: %s"
+msgstr "Remoto ou grupo remoto inexistente: %s"
 
-#: builtin/fetch.c:1869
+#: builtin/fetch.c:2042
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Buscar um grupo e especificar refspecs faz sentido nenhum"
 
-#: builtin/fetch.c:1887
+#: builtin/fetch.c:2058
+msgid "must supply remote when using --negotiate-only"
+msgstr ""
+
+#: builtin/fetch.c:2063
+msgid "Protocol does not support --negotiate-only, exiting."
+msgstr ""
+
+#: builtin/fetch.c:2082
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
 msgstr ""
 
-#: builtin/fetch.c:1891
-#, fuzzy
+#: builtin/fetch.c:2086
+msgid "--atomic can only be used when fetching from one remote"
+msgstr ""
+
+#: builtin/fetch.c:2090
 msgid "--stdin can only be used when fetching from one remote"
-msgstr "A opção --exec só pode ser usada em conjunto com --remote"
+msgstr ""
 
 #: builtin/fmt-merge-msg.c:7
 msgid ""
@@ -14868,350 +15159,342 @@ msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <objeto>]"
 
 #: 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) [<commit>]]"
+msgstr "git for-each-ref [--merged [<memória>]] [--no-merged [<memória>]]"
 
 #: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
-msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr "git for-each-ref [--contains [<memória>]] [--no-contains [<memória>]]"
 
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for shells"
 msgstr ""
 "envolver os marcadores de posição em aspas de forma adequada para "
 "interpretadores de comandos"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for perl"
 msgstr "envolver os marcadores de posição em aspas de forma adequada para perl"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for python"
 msgstr ""
 "envolver os marcadores de posição em aspas de forma adequada para python"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:36
 msgid "quote placeholders suitably for Tcl"
 msgstr "envolver os marcadores de posição em aspas de forma adequada para Tcl"
 
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c:39
 msgid "show only <n> matched refs"
 msgstr "mostrar apenas <n> referências correspondidas"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:440
-#, fuzzy
+#: builtin/for-each-ref.c:41 builtin/tag.c:483
 msgid "respect format colors"
-msgstr "formato esperado: %%(color:<cor>)"
+msgstr "respeitar cores de formatação"
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:44
 msgid "print only refs which points at the given object"
 msgstr "imprimir apenas referências que apontem para o objeto fornecido"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are merged"
 msgstr "imprimir apenas referenciadas integradas"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are not merged"
-msgstr "imprimir apenas referências não integrada"
+msgstr "imprimir apenas refs que estão por juntar"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:48
 msgid "print only refs which contain the commit"
-msgstr "imprimir apenas referências que contenham o commit"
+msgstr "imprimir apenas refs que contenham o commit"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:49
 msgid "print only refs which don't contain the commit"
-msgstr "imprimir apenas referências que não contenham o commit"
+msgstr "imprimir apenas refs que contenham outros commits"
 
 #: builtin/for-each-repo.c:9
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr ""
 
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr ""
 
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr ""
 
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr ""
 
-#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149
-#, fuzzy
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
-msgstr "desconhecido:"
+msgstr "desconhecido"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:101 builtin/fsck.c:121
-#, fuzzy, c-format
+#: builtin/fsck.c:78 builtin/fsck.c:100
+#, c-format
 msgid "error in %s %s: %s"
-msgstr "erro no objeto: %s"
+msgstr "erro em %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:115
-#, fuzzy, c-format
+#: builtin/fsck.c:94
+#, c-format
 msgid "warning in %s %s: %s"
-msgstr "não é possível abrir %s: %s"
+msgstr "aviso em %s %s: %s"
 
-#: builtin/fsck.c:144 builtin/fsck.c:147
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr ""
 
-#: builtin/fsck.c:156
-#, fuzzy
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
-msgstr "objeto de tipo desconhecido %d"
+msgstr "link com tipo de objeto errado"
 
-#: builtin/fsck.c:172
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
 "              to %7s %s"
 msgstr ""
 
-#: builtin/fsck.c:283
-#, fuzzy, c-format
+#: builtin/fsck.c:264
+#, c-format
 msgid "missing %s %s"
-msgstr "falta o objeto %s de %s"
+msgstr ""
 
-#: builtin/fsck.c:310
-#, fuzzy, c-format
+#: builtin/fsck.c:291
+#, c-format
 msgid "unreachable %s %s"
-msgstr "já se tem %s (%s)"
+msgstr "inacessível %s %s"
 
-#: builtin/fsck.c:330
-#, fuzzy, c-format
+#: builtin/fsck.c:311
+#, c-format
 msgid "dangling %s %s"
 msgstr "balanceando %s %s"
 
-#: builtin/fsck.c:340
-#, fuzzy
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
-msgstr "não foi possível criar o ficheiro '%s'"
+msgstr "incapaz criar lost-found"
 
-#: builtin/fsck.c:351
-#, fuzzy, c-format
+#: builtin/fsck.c:332
+#, c-format
 msgid "could not finish '%s'"
-msgstr "não foi possível reiniciar '%s'"
+msgstr "incapaz acabar '%s'"
 
-#: builtin/fsck.c:368
-#, fuzzy, c-format
+#: builtin/fsck.c:349
+#, c-format
 msgid "Checking %s"
-msgstr "A verificar objetos"
+msgstr "Verificando %s"
 
-#: builtin/fsck.c:406
-#, fuzzy, c-format
+#: builtin/fsck.c:387
+#, c-format
 msgid "Checking connectivity (%d objects)"
-msgstr "A verificar conectividade"
+msgstr "Verificando conectividade (%d objetos)"
 
-#: builtin/fsck.c:425
-#, fuzzy, c-format
+#: builtin/fsck.c:406
+#, c-format
 msgid "Checking %s %s"
-msgstr "A verificar o patch %s..."
+msgstr "Verificando %s %s"
 
-#: builtin/fsck.c:430
+#: builtin/fsck.c:411
 msgid "broken links"
-msgstr ""
+msgstr "links quebrados"
 
-#: builtin/fsck.c:439
-#, fuzzy, c-format
+#: builtin/fsck.c:420
+#, c-format
 msgid "root %s"
-msgstr "raiz"
+msgstr "raiz %s"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr ""
 
-#: builtin/fsck.c:476
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr ""
 
-#: builtin/fsck.c:501
-#, fuzzy, c-format
+#: builtin/fsck.c:482
+#, c-format
 msgid "%s: invalid reflog entry %s"
-msgstr "referência inválida: %s"
+msgstr ""
 
-#: builtin/fsck.c:515
-#, fuzzy, c-format
+#: builtin/fsck.c:496
+#, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Verificando reflog %s->%s"
 
-#: builtin/fsck.c:549
-#, fuzzy, c-format
+#: builtin/fsck.c:530
+#, c-format
 msgid "%s: invalid sha1 pointer %s"
-msgstr "linha rasa inválida: %s"
+msgstr "%s: ponteiro sha1 inválido %s"
 
-#: builtin/fsck.c:556
-#, fuzzy, c-format
+#: builtin/fsck.c:537
+#, c-format
 msgid "%s: not a commit"
-msgstr "'%s' não é um commit"
+msgstr "%s: é commit nenhum"
 
-#: builtin/fsck.c:610
-#, fuzzy
+#: builtin/fsck.c:591
 msgid "notice: No default references"
-msgstr "não foi possível eliminar as referências: %s"
+msgstr "notificação: Referências padrão nenhumas"
 
-#: builtin/fsck.c:625
-#, fuzzy, c-format
+#: builtin/fsck.c:606
+#, c-format
 msgid "%s: object corrupt or missing: %s"
-msgstr "objeto não encontrado: %s"
+msgstr "%s: objeto roto ou em falta: %s"
 
-#: builtin/fsck.c:638
-#, fuzzy, c-format
+#: builtin/fsck.c:619
+#, c-format
 msgid "%s: object could not be parsed: %s"
-msgstr "não foi possível analisar %s"
+msgstr "%s: objeto incapaz de ser processado: %s"
 
-#: builtin/fsck.c:658
-#, fuzzy, c-format
+#: builtin/fsck.c:639
+#, c-format
 msgid "bad sha1 file: %s"
-msgstr "linha rasa inválida: %s"
+msgstr "mau ficheiro sha1: %s"
 
-#: builtin/fsck.c:673
-#, fuzzy
+#: builtin/fsck.c:654
 msgid "Checking object directory"
-msgstr "A verificar diretórios de objetos"
+msgstr "Verificando pasta objeto"
 
-#: builtin/fsck.c:676
+#: builtin/fsck.c:657
 msgid "Checking object directories"
-msgstr "A verificar diretórios de objetos"
+msgstr "Verificando pastas objeto"
 
-#: builtin/fsck.c:691
-#, fuzzy, c-format
+#: builtin/fsck.c:672
+#, c-format
 msgid "Checking %s link"
-msgstr "A extrair ficheiros"
+msgstr "Verfificando ligação %s"
 
-#: builtin/fsck.c:696 builtin/index-pack.c:865
+#: builtin/fsck.c:677 builtin/index-pack.c:864
 #, c-format
 msgid "invalid %s"
-msgstr "inválido %s"
+msgstr "%s inválido"
 
-#: builtin/fsck.c:703
-#, fuzzy, c-format
+#: builtin/fsck.c:684
+#, c-format
 msgid "%s points to something strange (%s)"
-msgstr "%s - não é algo se possa integrar"
+msgstr "%s aponta para algo estranho (%s)"
 
-#: builtin/fsck.c:709
+#: builtin/fsck.c:690
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr ""
 
-#: builtin/fsck.c:713
+#: builtin/fsck.c:694
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr ""
 
-#: builtin/fsck.c:725
-#, fuzzy
+#: builtin/fsck.c:706
 msgid "Checking cache tree"
-msgstr "A verificar o patch %s..."
+msgstr "Verificando árvore-cenário"
 
-#: builtin/fsck.c:730
-#, fuzzy, c-format
+#: builtin/fsck.c:711
+#, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
-msgstr "Falha ao atualizar a árvore de cache principal"
+msgstr "%s: ponteiro sha1 inválido em árvore-cenário"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:720
 msgid "non-tree in cache-tree"
 msgstr ""
 
-#: builtin/fsck.c:770
+#: builtin/fsck.c:751
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opções>] [<objeto>...]"
 
-#: builtin/fsck.c:776
+#: builtin/fsck.c:757
 msgid "show unreachable objects"
 msgstr "mostrar objetos inalcançáveis"
 
-#: builtin/fsck.c:777
+#: builtin/fsck.c:758
 msgid "show dangling objects"
 msgstr "mostrar objetos suspensos"
 
-#: builtin/fsck.c:778
+#: builtin/fsck.c:759
 msgid "report tags"
 msgstr "mostrar tags"
 
-#: builtin/fsck.c:779
+#: builtin/fsck.c:760
 msgid "report root nodes"
 msgstr "mostrar nós raiz"
 
-#: builtin/fsck.c:780
+#: builtin/fsck.c:761
 msgid "make index objects head nodes"
 msgstr "considerar objetos do índice como nós cabeça"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:762
 msgid "make reflogs head nodes (default)"
 msgstr "considerar os reflogs como nós cabeça (predefinição)"
 
-#: builtin/fsck.c:782
+#: builtin/fsck.c:763
 msgid "also consider packs and alternate objects"
 msgstr "considerar também pacotes e objetos sobressalente"
 
-#: builtin/fsck.c:783
+#: builtin/fsck.c:764
 msgid "check only connectivity"
 msgstr "verificar só a conetividade"
 
-#: builtin/fsck.c:784
+#: builtin/fsck.c:765 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "ativar verificação mais rigorosa"
 
-#: builtin/fsck.c:786
+#: builtin/fsck.c:767
 msgid "write dangling objects in .git/lost-found"
-msgstr "escrever objetos suspensos em .git/lost-found"
+msgstr "escrever objetos perdidos em .git/lost-found"
 
-#: builtin/fsck.c:787 builtin/prune.c:134
+#: builtin/fsck.c:768 builtin/prune.c:134
 msgid "show progress"
 msgstr "mostrar progresso"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:769
 msgid "show verbose names for reachable objects"
 msgstr "mostrar nomes verbosos de objetos inalcançáveis"
 
-#: builtin/fsck.c:847 builtin/index-pack.c:261
+#: builtin/fsck.c:828 builtin/index-pack.c:262
 msgid "Checking objects"
-msgstr "A verificar objetos"
+msgstr "Verificando objetos"
 
-#: builtin/fsck.c:875
-#, fuzzy, c-format
+#: builtin/fsck.c:856
+#, c-format
 msgid "%s: object missing"
-msgstr "mostrar tamanho do objeto"
+msgstr "%s: faltando objeto"
 
-#: builtin/fsck.c:886
-#, fuzzy, c-format
+#: builtin/fsck.c:867
+#, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
-msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho"
+msgstr "parâmetro inválido: esperado sha1, recebi '%s'"
 
 #: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<opções>]"
 
-#: builtin/gc.c:94
+#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "falha ao invocar fstat sobre %s: %s"
 
-#: builtin/gc.c:130
-#, fuzzy, c-format
+#: builtin/gc.c:129
+#, c-format
 msgid "failed to parse '%s' value '%s'"
-msgstr "falha ao abrir '%s': %s"
+msgstr ""
 
-#: builtin/gc.c:479 builtin/init-db.c:58
+#: builtin/gc.c:487 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
-msgstr "não é possível invocar stat sobre '%s'"
+msgstr "incapaz estatutar '%s'"
 
-#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
 #, c-format
 msgid "cannot read '%s'"
-msgstr "não é possível ler '%s'"
+msgstr "incapaz ler '%s'"
 
-#: builtin/gc.c:495
+#: builtin/gc.c:503
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -15221,225 +15504,240 @@ msgid ""
 "%s"
 msgstr ""
 "A última execução do gc reportou o seguinte.\n"
-"Corrija a origem do problema e remova %s.\n"
-"A limpeza automática não será realizada enquanto o ficheiro existir.\n"
+"Corrije a origem do problema e remove %s.\n"
+"A limpeza automática apenas será realizada quando o ficheiro for removido.\n"
 "\n"
 "%s"
 
-#: builtin/gc.c:543
+#: builtin/gc.c:551
 msgid "prune unreferenced objects"
-msgstr "eliminar ficheiros não referenciados"
+msgstr "podar objetos por referênciar"
 
-#: builtin/gc.c:545
+#: builtin/gc.c:553
 msgid "be more thorough (increased runtime)"
 msgstr "ser mais minucioso (aumenta o tempo de execução)"
 
-#: builtin/gc.c:546
+#: builtin/gc.c:554
 msgid "enable auto-gc mode"
 msgstr "ativar modo auto-gc"
 
-#: builtin/gc.c:549
+#: builtin/gc.c:557
 msgid "force running gc even if there may be another gc running"
 msgstr "forçar a execução do gc mesmo que haja outro gc a executar"
 
-#: builtin/gc.c:552
+#: builtin/gc.c:560
 msgid "repack all other packs except the largest pack"
 msgstr ""
 
-#: builtin/gc.c:569
-#, fuzzy, c-format
+#: builtin/gc.c:576
+#, c-format
 msgid "failed to parse gc.logexpiry value %s"
-msgstr "falha ao analisar o valor %s de gc.logexpiry"
+msgstr "falhou processar o valor %s de gc.logexpiry"
 
-#: builtin/gc.c:580
-#, fuzzy, c-format
+#: builtin/gc.c:587
+#, c-format
 msgid "failed to parse prune expiry value %s"
-msgstr "falha ao analisar o valor %s de gc.logexpiry"
+msgstr "falhou processar o valor de expiração de poda %s"
 
-#: builtin/gc.c:600
+#: builtin/gc.c:607
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
-"Autocompactando o repositório para desempenho ótimizado, em segundo plano.\n"
+"Auto-empacotando repositório, em segundo plano, para desempenho otimizado.\n"
 
-#: builtin/gc.c:602
+#: builtin/gc.c:609
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
-msgstr "Autocompactando o repositório para desempenho ótimizado.\n"
+msgstr "Auto-empacotando repositório para desempenho otimizado.\n"
 
-#: builtin/gc.c:603
+#: builtin/gc.c:610
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Vê \"git help gc\" para manual de manutenção.\n"
 
-#: builtin/gc.c:643
+#: builtin/gc.c:650
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
-"gc já a executar na máquina '%s' pid %<PRIuMAX> (use --force se não for o "
-"caso)"
+"gc já a executar na máquina '%s' pid %<PRIuMAX> (usa --force caso contrário)"
 
-#: builtin/gc.c:698
+#: builtin/gc.c:705
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Existem demasiados objeto soltos inalcançáveis; execute 'git prune' para os "
 "remover."
 
-#: builtin/gc.c:708
+#: builtin/gc.c:715
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 
-#: builtin/gc.c:738
+#: builtin/gc.c:745
 msgid "--no-schedule is not allowed"
 msgstr ""
 
-#: builtin/gc.c:743
-#, fuzzy, c-format
+#: builtin/gc.c:750
+#, c-format
 msgid "unrecognized --schedule argument '%s'"
-msgstr "argumento não reconhecido: %s"
+msgstr "argumento --schedule desconhecido: '%s'"
 
-#: builtin/gc.c:862
-#, fuzzy
+#: builtin/gc.c:869
 msgid "failed to write commit-graph"
-msgstr "falha ao escrever objeto de commit"
+msgstr ""
 
-#: builtin/gc.c:901
-#, fuzzy
-msgid "failed to fill remotes"
-msgstr "falha ao remover %s"
+#: builtin/gc.c:905
+msgid "failed to prefetch remotes"
+msgstr ""
 
-#: builtin/gc.c:1024
-#, fuzzy
+#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "começar processo 'git pack-objects' falhou"
 
-#: builtin/gc.c:1041
-#, fuzzy
+#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "terminar processo 'git pack-objects' falhou"
 
-#: builtin/gc.c:1093
-#, fuzzy
+#: builtin/gc.c:1091
 msgid "failed to write multi-pack-index"
-msgstr "falha ao limpar o índice"
+msgstr ""
 
-#: builtin/gc.c:1111
+#: builtin/gc.c:1109
 msgid "'git multi-pack-index expire' failed"
 msgstr ""
 
-#: builtin/gc.c:1172
-#, fuzzy
+#: builtin/gc.c:1170
 msgid "'git multi-pack-index repack' failed"
-msgstr "falha ao ler o ficheiro de comando '%s'"
+msgstr ""
 
-#: builtin/gc.c:1181
+#: builtin/gc.c:1179
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 
-#: builtin/gc.c:1279
+#: builtin/gc.c:1283
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr ""
 
-#: builtin/gc.c:1309
-#, fuzzy, c-format
+#: builtin/gc.c:1313
+#, c-format
 msgid "task '%s' failed"
-msgstr "falha ao mudar o nome de '%s'"
+msgstr "tarefa '%s' falhou"
 
-#: builtin/gc.c:1389
-#, fuzzy, c-format
+#: builtin/gc.c:1395
+#, c-format
 msgid "'%s' is not a valid task"
-msgstr "'%s' não é uma referência válida."
+msgstr "'%s' é uma tarefa inválida"
 
-#: builtin/gc.c:1394
-#, fuzzy, c-format
+#: builtin/gc.c:1400
+#, c-format
 msgid "task '%s' cannot be selected multiple times"
-msgstr "'%s' não pode ser usado com %s"
+msgstr "tarefa '%s' apenas pode ser selecionada uma vez"
 
-#: builtin/gc.c:1409
+#: builtin/gc.c:1415
 msgid "run tasks based on the state of the repository"
 msgstr ""
 
-#: builtin/gc.c:1410
+#: builtin/gc.c:1416
 msgid "frequency"
 msgstr ""
 
-#: builtin/gc.c:1411
+#: builtin/gc.c:1417
 msgid "run tasks based on frequency"
 msgstr ""
 
-#: builtin/gc.c:1414
+#: builtin/gc.c:1420
 msgid "do not report progress or other information over stderr"
 msgstr ""
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1421
 msgid "task"
 msgstr ""
 
-#: builtin/gc.c:1416
-#, fuzzy
+#: builtin/gc.c:1422
 msgid "run a specific task"
 msgstr "corre uma tarefa específica"
 
-#: builtin/gc.c:1433
+#: builtin/gc.c:1439
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr ""
 
-#: builtin/gc.c:1467
-#, fuzzy
+#: builtin/gc.c:1482
 msgid "failed to run 'git config'"
-msgstr "falha ao escrever para '%s'"
+msgstr "falhou executar 'git config'"
 
-#: builtin/gc.c:1512
-msgid "another process is scheduling background maintenance"
+#: builtin/gc.c:1547
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "falhou expandir caminho '%s'"
+
+#: builtin/gc.c:1576
+msgid "failed to start launchctl"
+msgstr "iniciar launchctl falhou"
+
+#: builtin/gc.c:1613
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "falhou criar pastas para '%s'"
+
+#: builtin/gc.c:1674
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "bootstrap serviços %s falhou"
+
+#: builtin/gc.c:1745
+msgid "failed to create temp xml file"
 msgstr ""
 
-#: builtin/gc.c:1525
+#: builtin/gc.c:1835
+msgid "failed to start schtasks"
+msgstr ""
+
+#: builtin/gc.c:1879
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr ""
 
-#: builtin/gc.c:1544
+#: builtin/gc.c:1896
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr ""
 
-#: builtin/gc.c:1550
-#, fuzzy
+#: builtin/gc.c:1900
 msgid "failed to open stdin of 'crontab'"
-msgstr "falha ao abrir '%s'"
+msgstr ""
 
-#: builtin/gc.c:1592
+#: builtin/gc.c:1942
 msgid "'crontab' died"
 msgstr ""
 
-#: builtin/gc.c:1605
-#, fuzzy
+#: builtin/gc.c:1976
+msgid "another process is scheduling background maintenance"
+msgstr ""
+
+#: builtin/gc.c:2000
 msgid "failed to add repo to global config"
-msgstr "falha ao ler o ficheiro de comando '%s'"
+msgstr ""
 
-#: builtin/gc.c:1615
-#, fuzzy
+#: builtin/gc.c:2010
 msgid "git maintenance <subcommand> [<options>]"
-msgstr "git notes prune [<opções>]"
+msgstr "git maintenance <subcomando> [<opções>]"
 
-#: builtin/gc.c:1634
-#, fuzzy, c-format
+#: builtin/gc.c:2029
+#, c-format
 msgid "invalid subcommand: %s"
-msgstr "commit inválido %s"
+msgstr "subcomando inválido: %s"
 
 #: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opções>] [-e] <padrão> [<rev>...] [[--] <caminho>...]"
 
-#: builtin/grep.c:225
+#: builtin/grep.c:223
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: falha ao criar thread: %s"
 
-#: builtin/grep.c:279
+#: builtin/grep.c:277
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "o número de threads especificado em %2$s é inválido (%1$d)"
@@ -15448,274 +15746,265 @@ msgstr "o número de threads especificado em %2$s é inválido (%1$d)"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766
-#: builtin/pack-objects.c:2936
+#: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791
+#: builtin/pack-objects.c:3129
 #, c-format
 msgid "no threads support, ignoring %s"
-msgstr "sem suporte de threads, %s ignorado"
+msgstr "fios insustentado, ignorando %s"
 
-#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640
+#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
 #, c-format
 msgid "unable to read tree (%s)"
-msgstr "não foi possível ler a árvore (%s)"
+msgstr "incapaz ler árvore (%s)"
 
-#: builtin/grep.c:655
+#: builtin/grep.c:658
 #, c-format
 msgid "unable to grep from object of type %s"
-msgstr "não foi possível efetuar grep de objetos do tipo %s"
+msgstr "incapaz efetuar grep a objetos do tipo %s"
 
-#: builtin/grep.c:736
+#: builtin/grep.c:738
 #, c-format
 msgid "switch `%c' expects a numerical value"
-msgstr "a opção '%c' espera um valor numérico"
+msgstr ""
 
-#: builtin/grep.c:835
+#: builtin/grep.c:837
 msgid "search in index instead of in the work tree"
 msgstr "procurar no índice em vez de procurar na árvore de trabalho"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:839
 msgid "find in contents not managed by git"
-msgstr "procurar em conteúdos não geridos pelo git"
+msgstr "procurar em conteúdos fora da gestão de git"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:841
 msgid "search in both tracked and untracked files"
-msgstr "procurar em ficheiros controlados e não controlados"
+msgstr "procurar em ficheiros monitorizados e por monitorizar"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:843
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorar ficheiros especificados via '.gitignore'"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:845
 msgid "recursively search in each submodule"
 msgstr "procurar recursivamente em cada submódulo"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:848
 msgid "show non-matching lines"
-msgstr "mostrar linhas não correspondidas"
+msgstr "mostrar linhas por corresponder"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:850
 msgid "case insensitive matching"
-msgstr "não diferenciar maiúsculas de minúsculas"
+msgstr "correspondência insensível a maiúsculas e minúsculas"
 
-#: builtin/grep.c:850
+#: builtin/grep.c:852
 msgid "match patterns only at word boundaries"
 msgstr "corresponder padrões apenas a palavras"
 
-#: builtin/grep.c:852
+#: builtin/grep.c:854
 msgid "process binary files as text"
 msgstr "processar ficheiros binários como texto"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:856
 msgid "don't match patterns in binary files"
 msgstr "ignorar ficheiros binários"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:859
 msgid "process binary files with textconv filters"
 msgstr "processar ficheiros binários com filtros textconv"
 
-#: builtin/grep.c:859
-#, fuzzy
+#: builtin/grep.c:861
 msgid "search in subdirectories (default)"
-msgstr "eliminar referências soltas (predefinição)"
+msgstr ""
 
-#: builtin/grep.c:861
+#: builtin/grep.c:863
 msgid "descend at most <depth> levels"
 msgstr "descer no máximo até <profundidade>"
 
-#: builtin/grep.c:865
+#: builtin/grep.c:867
 msgid "use extended POSIX regular expressions"
-msgstr "usar expressões regulares estendidas do POSIX"
+msgstr "usar expressões comum estendidas de POSIX"
 
-#: builtin/grep.c:868
+#: builtin/grep.c:870
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usar expressões regulares básicas do POSIX (predefinição)"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:873
 msgid "interpret patterns as fixed strings"
 msgstr "interpretar padrões como cadeias de caracteres fixas"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:876
 msgid "use Perl-compatible regular expressions"
 msgstr "usar expressões regulares compatíveis com Perl"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:879
 msgid "show line numbers"
 msgstr "mostrar números de linha"
 
-#: builtin/grep.c:878
-#, fuzzy
+#: builtin/grep.c:880
 msgid "show column number of first match"
-msgstr "mostrar apenas nomes de ficheiro sem correspondência"
+msgstr "mostrar número de coluna da primeira correspondência"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:881
 msgid "don't show filenames"
-msgstr "não mostrar nomes de ficheiro"
+msgstr "esconder nomes de ficheiro"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:882
 msgid "show filenames"
 msgstr "mostrar nomes de ficheiro"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:884
 msgid "show filenames relative to top directory"
 msgstr "mostrar nomes de ficheiro relativamente ao diretório superior"
 
-#: builtin/grep.c:884
+#: builtin/grep.c:886
 msgid "show only filenames instead of matching lines"
 msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
 
-#: builtin/grep.c:886
+#: builtin/grep.c:888
 msgid "synonym for --files-with-matches"
 msgstr "sinónimo de --files-with-matches"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:891
 msgid "show only the names of files without match"
 msgstr "mostrar apenas nomes de ficheiro sem correspondência"
 
-#: builtin/grep.c:891
+#: builtin/grep.c:893
 msgid "print NUL after filenames"
 msgstr "imprimir NUL depois dos nomes de ficheiro"
 
-#: builtin/grep.c:894
-#, fuzzy
+#: builtin/grep.c:896
 msgid "show only matching parts of a line"
-msgstr "mostrar linhas não correspondidas"
+msgstr "mostrar apenas partes da linha correspondentes"
 
-#: builtin/grep.c:896
+#: builtin/grep.c:898
 msgid "show the number of matches instead of matching lines"
 msgstr "mostrar o número de correspondências em vez das linha correspondidas"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:899
 msgid "highlight matches"
 msgstr "realçar correspondências"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:901
 msgid "print empty line between matches from different files"
 msgstr ""
 "imprimir uma linha em branco entre correspondências de diferentes ficheiros"
 
-#: builtin/grep.c:901
+#: builtin/grep.c:903
 msgid "show filename only once above matches from same file"
 msgstr ""
 "mostrar só uma vez o nome do ficheiro acima das correspondências dentro do "
 "mesmo ficheiro"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:906
 msgid "show <n> context lines before and after matches"
 msgstr "mostrar <n> linhas de contexto antes e depois das correspondências"
 
-#: builtin/grep.c:907
+#: builtin/grep.c:909
 msgid "show <n> context lines before matches"
 msgstr "mostrar <n> linhas de contexto antes das correspondências"
 
-#: builtin/grep.c:909
+#: builtin/grep.c:911
 msgid "show <n> context lines after matches"
 msgstr "mostrar <n> linhas de contexto depois das correspondências"
 
-#: builtin/grep.c:911
+#: builtin/grep.c:913
 msgid "use <n> worker threads"
 msgstr "usar <n> threads de trabalho"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:914
 msgid "shortcut for -C NUM"
 msgstr "atalho para -C NUM"
 
-#: builtin/grep.c:915
+#: builtin/grep.c:917
 msgid "show a line with the function name before matches"
 msgstr "mostrar uma linha com o nome da função antes das correspondências"
 
-#: builtin/grep.c:917
+#: builtin/grep.c:919
 msgid "show the surrounding function"
 msgstr "mostrar a função circundante"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:922
 msgid "read patterns from file"
-msgstr "ler padrões do ficheiro"
+msgstr "ler padrões de ficheiro"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:924
 msgid "match <pattern>"
 msgstr "procurar <padrão>"
 
-#: builtin/grep.c:924
+#: builtin/grep.c:926
 msgid "combine patterns specified with -e"
 msgstr "combinar padrões especificados com -e"
 
-#: builtin/grep.c:936
+#: builtin/grep.c:938
 msgid "indicate hit with exit status without output"
-msgstr "indicar padrão encontrado no valor de saída, mas não imprimir"
+msgstr "indicar correspondência, sem output, com status de saída"
 
-#: builtin/grep.c:938
+#: builtin/grep.c:940
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "mostrar apenas correspondências de ficheiro que tenham todos os padrões"
 
-#: builtin/grep.c:940
-msgid "show parse tree for grep expression"
-msgstr "mostrar árvore de analise da expressões grep"
-
-#: builtin/grep.c:944
+#: builtin/grep.c:943
 msgid "pager"
 msgstr "paginador"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:943
 msgid "show matching files in the pager"
-msgstr "mostrar ficheiros com correspondências no paginador"
+msgstr "mostrar ficheiros correspondentes no paginador"
 
-#: builtin/grep.c:948
+#: builtin/grep.c:947
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permitir invocar grep(1) (ignorado nesta compilação)"
 
-#: builtin/grep.c:1014
-#, fuzzy
+#: builtin/grep.c:1013
 msgid "no pattern given"
 msgstr "fornecido pattern nenhum"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:1049
 msgid "--no-index or --untracked cannot be used with revs"
-msgstr "--no-index ou --untracked não podem ser usados em revisões"
+msgstr "--no-index ou --untracked incapazes serem usados em revs"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:1057
 #, c-format
 msgid "unable to resolve revision: %s"
-msgstr "não foi possível resolver revisão: %s"
+msgstr "incapaz resolver revisão: %s"
 
-#: builtin/grep.c:1088
-#, fuzzy
+#: builtin/grep.c:1087
 msgid "--untracked not supported with --recurse-submodules"
-msgstr "opção não suportada com --recurse-submodules."
+msgstr "--untracked insustentada com --recurse-submodules"
 
-#: builtin/grep.c:1092
+#: builtin/grep.c:1091
 msgid "invalid option combination, ignoring --threads"
 msgstr ""
 
-#: builtin/grep.c:1095 builtin/pack-objects.c:3655
-#, fuzzy
+#: builtin/grep.c:1094 builtin/pack-objects.c:4090
 msgid "no threads support, ignoring --threads"
-msgstr "sem suporte de threads, %s ignorado"
+msgstr "fios insustentado, ignorando --threads"
 
-#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933
+#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "número de threads especificado inválido (%d)"
 
-#: builtin/grep.c:1132
+#: builtin/grep.c:1131
 msgid "--open-files-in-pager only works on the worktree"
-msgstr "--open-files-in-pager só funciona na árvore de trabalho"
+msgstr "--open-files-in-pager só funciona na árvore-trabalho"
 
-#: builtin/grep.c:1158
-#, fuzzy
+#: builtin/grep.c:1157
 msgid "--cached or --untracked cannot be used with --no-index"
-msgstr "--cached ou --untracked não podem ser usados com --no-index."
+msgstr "--cached ou --untracked proibidos serem usados com --no-index"
 
-#: builtin/grep.c:1164
-#, fuzzy
+#: builtin/grep.c:1160
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked proibido ser usado com --cached"
+
+#: builtin/grep.c:1166
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
-"--[no-]exclude-standard não podem ser usados em conteúdos não controlados."
+"--[no-]exclude-standard proibidos serem usados para conteúdos monitorizados"
 
-#: builtin/grep.c:1172
-#, fuzzy
+#: builtin/grep.c:1174
 msgid "both --cached and trees are given"
-msgstr "--cached e árvores foram fornecidos simultaneamente."
+msgstr "--cached e árvores foram ambos fornecidos"
 
 #: builtin/hash-object.c:85
 msgid ""
@@ -15731,11 +16020,11 @@ msgstr "git hash-object  --stdin-paths"
 
 #: builtin/hash-object.c:98
 msgid "object type"
-msgstr "tipo do objeto"
+msgstr "tipo de objeto"
 
 #: builtin/hash-object.c:99
 msgid "write the object into the object database"
-msgstr "escrever o objeto na base de dados de objetos"
+msgstr ""
 
 #: builtin/hash-object.c:101
 msgid "read the object from stdin"
@@ -15769,26 +16058,24 @@ msgid "print list of useful guides"
 msgstr "imprimir lista de guias úteis"
 
 #: builtin/help.c:50
-#, fuzzy
 msgid "print all configuration variable names"
-msgstr "não é possível criar o ficheiro de configuração %s"
+msgstr "imprimir todas nomes variáveis de configuração"
 
 #: builtin/help.c:52
 msgid "show man page"
-msgstr "mostrar página do manual"
+msgstr "mostrar página man"
 
 #: builtin/help.c:53
 msgid "show manual in web browser"
-msgstr "mostrar o manual no navegador web"
+msgstr "mostrar manual no navegador web"
 
 #: builtin/help.c:55
 msgid "show info page"
 msgstr "mostrar página info"
 
 #: builtin/help.c:57
-#, fuzzy
 msgid "print command description"
-msgstr "imprimir conteúdo do commit"
+msgstr "imprimir descrição de comando"
 
 #: builtin/help.c:62
 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
@@ -15797,11 +16084,11 @@ msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]"
 #: builtin/help.c:163
 #, c-format
 msgid "unrecognized help format '%s'"
-msgstr "formato de ajuda não reconhecido '%s'"
+msgstr "formato de ajuda '%s' desconhecido"
 
 #: builtin/help.c:190
 msgid "Failed to start emacsclient."
-msgstr "Falha ao iniciar emacsclient."
+msgstr "Iniciar emacsclient falhou."
 
 #: builtin/help.c:203
 msgid "Failed to parse emacsclient version."
@@ -15815,7 +16102,7 @@ msgstr "a versão do emacsclient '%d' é demasiado antiga (< 22)."
 #: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
 #, c-format
 msgid "failed to exec '%s'"
-msgstr "falha ao executar '%s'"
+msgstr "falhou exec a '%s'"
 
 #: builtin/help.c:307
 #, c-format
@@ -15823,8 +16110,8 @@ msgid ""
 "'%s': path for unsupported man viewer.\n"
 "Please consider using 'man.<tool>.cmd' instead."
 msgstr ""
-"'%s': caminho para visualizador de manual não suportado.\n"
-"Considere usar 'man.<ferramenta>.cmd'."
+"'%s': path para visualizador man insustentado.\n"
+"Por favor, considera usar 'man.<ferramenta>.cmd' invés."
 
 #: builtin/help.c:319
 #, c-format
@@ -15840,422 +16127,419 @@ msgstr ""
 msgid "'%s': unknown man viewer."
 msgstr "'%s': visualizador de manual desconhecido."
 
-#: builtin/help.c:453
+#: builtin/help.c:452
 msgid "no man viewer handled the request"
 msgstr "atendeu ao pedido visualizador de man nenhum"
 
-#: builtin/help.c:461
+#: builtin/help.c:459
 msgid "no info viewer handled the request"
 msgstr "atendeu ao pedido visualizador de info nenhum"
 
-#: builtin/help.c:520 builtin/help.c:531 git.c:337
-#, fuzzy, c-format
+#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'git %s' é um alias de '%s'"
 
-#: builtin/help.c:534 git.c:369
-#, fuzzy, c-format
+#: builtin/help.c:531 git.c:380
+#, c-format
 msgid "bad alias.%s string: %s"
-msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
+msgstr ""
 
-#: builtin/help.c:563 builtin/help.c:593
+#: builtin/help.c:561 builtin/help.c:591
 #, c-format
 msgid "usage: %s%s"
 msgstr "utilização: %s%s"
 
-#: builtin/help.c:577
+#: builtin/help.c:575
 msgid "'git help config' for more information"
 msgstr ""
 
-#: builtin/index-pack.c:221
+#: builtin/index-pack.c:222
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "incompatibilidade de tipo de objeto em %s"
 
-#: builtin/index-pack.c:241
+#: builtin/index-pack.c:242
 #, c-format
 msgid "did not receive expected object %s"
-msgstr "o objeto esperado %s não foi recebido"
+msgstr "objeto esperado %s ficou por ser recebido"
 
-#: builtin/index-pack.c:244
+#: builtin/index-pack.c:245
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objeto %s: tipo esperado %s, obtido %s"
 
-#: builtin/index-pack.c:294
+#: builtin/index-pack.c:295
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
-msgstr[0] "não é possível preencher %d byte"
-msgstr[1] "não é possível preencher %d bytes"
+msgstr[0] "incapaz preencher %d byte"
+msgstr[1] "incapaz preencher %d bytes"
 
-#: builtin/index-pack.c:304
+#: builtin/index-pack.c:305
 msgid "early EOF"
-msgstr "fim de ficheiro (EOF) prematuro"
+msgstr "EOF prematuro"
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:306
 msgid "read error on input"
 msgstr "erro de leitura da entrada"
 
-#: builtin/index-pack.c:317
+#: builtin/index-pack.c:318
 msgid "used more bytes than were available"
 msgstr "foram usados mais bytes dos que estavam disponíveis"
 
-#: builtin/index-pack.c:324 builtin/pack-objects.c:619
+#: builtin/index-pack.c:325 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr "pacote demasiado grande para a definição atual de off_t"
 
-#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "o pacote excede o tamanho máximo permitido"
 
-#: builtin/index-pack.c:342 builtin/repack.c:286
+#: builtin/index-pack.c:343
 #, c-format
 msgid "unable to create '%s'"
-msgstr "não foi possível criar '%s'"
+msgstr "incapaz criar '%s'"
 
-#: builtin/index-pack.c:348
+#: builtin/index-pack.c:349
 #, c-format
 msgid "cannot open packfile '%s'"
-msgstr "não é possível abrir o ficheiro de pacote '%s'"
+msgstr "incapaz abrir ficheiro de pacote '%s'"
 
-#: builtin/index-pack.c:362
+#: builtin/index-pack.c:363
 msgid "pack signature mismatch"
-msgstr "a assinatura do pacote não corresponde"
+msgstr "assinatura de pacote faz correspondência nenhuma"
 
-#: builtin/index-pack.c:364
+#: builtin/index-pack.c:365
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
-msgstr "versão de pacote %<PRIu32> não suportada"
+msgstr "versão de pacote %<PRIu32> insustentada"
 
-#: builtin/index-pack.c:382
+#: builtin/index-pack.c:381
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
-msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s"
+msgstr "pacote tem objeto inválido em offset %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:488
+#: builtin/index-pack.c:487
 #, c-format
 msgid "inflate returned %d"
 msgstr "a descompactação retornou %d"
 
-#: builtin/index-pack.c:537
+#: builtin/index-pack.c:536
 msgid "offset value overflow for delta base object"
 msgstr "delta de objeto base com capacidade excedida no valor de offset"
 
-#: builtin/index-pack.c:545
+#: builtin/index-pack.c:544
 msgid "delta base offset is out of bound"
-msgstr "offset da base delta está fora do limite"
+msgstr "offset de base delta está fora de limite"
 
-#: builtin/index-pack.c:553
+#: builtin/index-pack.c:552
 #, c-format
 msgid "unknown object type %d"
-msgstr "objeto de tipo desconhecido %d"
+msgstr "tipo de objeto %d desconhecido"
 
-#: builtin/index-pack.c:584
+#: builtin/index-pack.c:583
 msgid "cannot pread pack file"
-msgstr "não é possível invocar pread sobre o ficheiro de pacote"
+msgstr "incapaz invocar pread sobre ficheiro de pacote"
 
-#: builtin/index-pack.c:586
+#: builtin/index-pack.c:585
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "fim prematuro de ficheiro de pacote, falta %<PRIuMAX> byte"
 msgstr[1] "fim prematuro de ficheiro de pacote, faltam %<PRIuMAX> bytes"
 
-#: builtin/index-pack.c:612
+#: builtin/index-pack.c:611
 msgid "serious inflate inconsistency"
 msgstr "inconsistência de descompactação grave"
 
-#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787
-#: builtin/index-pack.c:826 builtin/index-pack.c:835
+#: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786
+#: builtin/index-pack.c:825 builtin/index-pack.c:834
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "COLISÃO DE SHA1 COM %s ENCONTRADA!"
 
-#: builtin/index-pack.c:760 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:759 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
 #, c-format
 msgid "unable to read %s"
-msgstr "não foi possível ler %s"
+msgstr "incapaz ler %s"
 
-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object info %s"
-msgstr "não é possível ler informação de objeto existente %s"
+msgstr "incapaz ler informação existente de objeto %s"
 
-#: builtin/index-pack.c:832
+#: builtin/index-pack.c:831
 #, c-format
 msgid "cannot read existing object %s"
-msgstr "não é possível ler o objeto existente %s"
+msgstr "incapaz ler objeto existente %s"
 
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:845
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objeto blob inválido %s"
 
-#: builtin/index-pack.c:849 builtin/index-pack.c:868
-#, fuzzy
+#: builtin/index-pack.c:848 builtin/index-pack.c:867
 msgid "fsck error in packed object"
-msgstr "ignorar objetos compactados"
+msgstr ""
 
-#: builtin/index-pack.c:870
+#: builtin/index-pack.c:869
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Nem todos os objetos filhos de %s são alcançáveis"
 
-#: builtin/index-pack.c:931 builtin/index-pack.c:978
+#: builtin/index-pack.c:930 builtin/index-pack.c:977
 msgid "failed to apply delta"
 msgstr "falha ao aplicar delta"
 
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c:1160
 msgid "Receiving objects"
 msgstr "A receber objetos"
 
-#: builtin/index-pack.c:1161
+#: builtin/index-pack.c:1160
 msgid "Indexing objects"
 msgstr "A indexar objetos"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1194
 msgid "pack is corrupted (SHA1 mismatch)"
-msgstr "pacote corrompido (SHA1 não corresponde)"
+msgstr "pacote roto (SHA1 sem correspondência)"
 
-#: builtin/index-pack.c:1200
+#: builtin/index-pack.c:1199
 msgid "cannot fstat packfile"
-msgstr "não é possível invocar fstat sobre o ficheiro de pacote"
+msgstr "incapaz fstat ficheiro de pacote"
 
-#: builtin/index-pack.c:1203
+#: builtin/index-pack.c:1202
 msgid "pack has junk at the end"
 msgstr "pacote com lixo no final"
 
-#: builtin/index-pack.c:1215
+#: builtin/index-pack.c:1214
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "extrema confusão em parse_pack_objects()"
 
-#: builtin/index-pack.c:1238
+#: builtin/index-pack.c:1237
 msgid "Resolving deltas"
 msgstr "A resolver deltas"
 
-#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697
+#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
 #, c-format
 msgid "unable to create thread: %s"
-msgstr "não foi possível criar thread: %s"
+msgstr "incapaz criar fio: %s"
 
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1281
 msgid "confusion beyond insanity"
 msgstr "extrema confusão"
 
-#: builtin/index-pack.c:1288
+#: builtin/index-pack.c:1287
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "concluído com %d objeto local"
 msgstr[1] "concluído com %d objetos locais"
 
-#: builtin/index-pack.c:1300
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Soma de verificação inesperada no final de %s (corrupção no disco?)"
 
-#: builtin/index-pack.c:1304
+#: builtin/index-pack.c:1303
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
-msgstr[0] "pacote com %d delta não resolvido"
-msgstr[1] "pacote com %d deltas não resolvidos"
+msgstr[0] "pacote tem %d delta por resolver"
+msgstr[1] "pacote tem %d deltas por resolver"
 
-#: builtin/index-pack.c:1328
+#: builtin/index-pack.c:1327
 #, c-format
 msgid "unable to deflate appended object (%d)"
-msgstr "não é possível compactar objeto acrescentado (%d)"
+msgstr "incapaz descompactar objeto acrescentado (%d)"
 
-#: builtin/index-pack.c:1424
+#: builtin/index-pack.c:1423
 #, c-format
 msgid "local object %s is corrupt"
-msgstr "objeto local %s corrompido"
+msgstr ""
 
 #: builtin/index-pack.c:1444
 #, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "o nome do ficheiro de pacote '%s' não termina em '.pack'"
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "fim de nome de ficheiro-pacote '%s' é diferente de '.%s'"
 
-#: builtin/index-pack.c:1469
-#, fuzzy, c-format
+#: builtin/index-pack.c:1468
+#, c-format
 msgid "cannot write %s file '%s'"
-msgstr "não é possível escrever o ficheiro de conservação '%s'"
+msgstr "incapaz escrever ficheiro %s '%s'"
 
-#: builtin/index-pack.c:1477
-#, fuzzy, c-format
+#: builtin/index-pack.c:1476
+#, c-format
 msgid "cannot close written %s file '%s'"
-msgstr "não é possível fechar o ficheiro de conservação '%s' escrito"
+msgstr "incapaz fechar ficheiro %s gravado '%s'"
 
-#: builtin/index-pack.c:1501
+#: builtin/index-pack.c:1502
 msgid "error while closing pack file"
-msgstr "erro ao fechar ficheiro de pacote"
+msgstr ""
 
-#: builtin/index-pack.c:1515
+#: builtin/index-pack.c:1516
 msgid "cannot store pack file"
-msgstr "não é possível guardar ficheiro de pacote"
+msgstr "incapaz guardar ficheiro de pacote"
 
-#: builtin/index-pack.c:1523
+#: builtin/index-pack.c:1524
 msgid "cannot store index file"
-msgstr "não é possível guardar o ficheiro índice"
+msgstr "incapaz guardar ficheiro de cenário"
 
-#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944
+#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "pack.indexversion=%<PRIu32> incorreto"
 
-#: builtin/index-pack.c:1631
+#: builtin/index-pack.c:1649
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Incapaz abrir ficheiro pack existente '%s'"
 
-#: builtin/index-pack.c:1633
+#: builtin/index-pack.c:1651
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Incapaz abrir ficheiro idx existente para '%s'"
 
-#: builtin/index-pack.c:1681
+#: builtin/index-pack.c:1699
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
-msgstr[0] "%d objeto não delta"
-msgstr[1] "%d objetos não delta"
+msgstr[0] "não-delta: %d objeto"
+msgstr[1] "não-delta: %d objetos"
 
-#: builtin/index-pack.c:1688
+#: builtin/index-pack.c:1706
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "comprimento de cadeia = %d: %lu objeto"
 msgstr[1] "comprimento de cadeia = %d: %lu objetos"
 
-#: builtin/index-pack.c:1728
+#: builtin/index-pack.c:1748
 msgid "Cannot come back to cwd"
 msgstr "Incapaz voltar a cwd"
 
-#: builtin/index-pack.c:1777 builtin/index-pack.c:1780
-#: builtin/index-pack.c:1796 builtin/index-pack.c:1800
+#: builtin/index-pack.c:1802 builtin/index-pack.c:1805
+#: builtin/index-pack.c:1821 builtin/index-pack.c:1825
 #, c-format
 msgid "bad %s"
-msgstr "mau %s"
+msgstr "%s incorreto"
 
-#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623
-#, fuzzy, c-format
+#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#, c-format
 msgid "unknown hash algorithm '%s'"
-msgstr "Formato de arquivo desconhecido '%s'"
+msgstr ""
 
-#: builtin/index-pack.c:1821
+#: builtin/index-pack.c:1850
 msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin não pode ser usado sem --stdin"
+msgstr "--fix-thin exige ser usado com --stdin"
 
-#: builtin/index-pack.c:1823
+#: builtin/index-pack.c:1852
 msgid "--stdin requires a git repository"
-msgstr "--stdin requer um repositório git"
+msgstr "--stdin exige um repositório git"
 
-#: builtin/index-pack.c:1825
-#, fuzzy
+#: builtin/index-pack.c:1854
 msgid "--object-format cannot be used with --stdin"
-msgstr "--fix-thin não pode ser usado sem --stdin"
+msgstr "--object-format incapaz ser usado com --stdin"
 
-#: builtin/index-pack.c:1831
+#: builtin/index-pack.c:1869
 msgid "--verify with no packfile name given"
 msgstr "--verify sem nome do ficheiro de pacote indicado"
 
-#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582
-#, fuzzy
+#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
-msgstr "erro no objeto: %s"
+msgstr "erro fsck em objetos pacote"
 
-#: builtin/init-db.c:64
+#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
-msgstr "não é possível invocar stat sobre o modelo '%s'"
+msgstr "incapaz obter estatutário a modelo '%s'"
 
-#: builtin/init-db.c:69
+#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
-msgstr "não é possível abrir (opendir) '%s'"
+msgstr "incapaz opendir '%s'"
 
-#: builtin/init-db.c:81
+#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
-msgstr "não é possível ler (readlink) '%s'"
+msgstr "incapaz readlink '%s'"
 
-#: builtin/init-db.c:83
+#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
-msgstr "não é possível criar a ligação simbólica '%s' '%s'"
+msgstr "incapaz symlink '%s' '%s'"
 
-#: builtin/init-db.c:89
+#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
-msgstr "não é possível copiar '%s' para '%s'"
+msgstr "incapaz copiar '%s' para '%s'"
 
-#: builtin/init-db.c:93
+#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
-msgstr "modelo %s ignorado"
+msgstr "ignorando modelo %s"
 
-#: builtin/init-db.c:124
-#, fuzzy, c-format
+#: builtin/init-db.c:123
+#, c-format
 msgid "templates not found in %s"
-msgstr "modelos não encontrados em %s"
+msgstr "modelos em %s por encontrar"
 
-#: builtin/init-db.c:139
+#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
-msgstr "modelos não copiados de '%s': %s"
+msgstr "deixando de copiar modelos de '%s': %s"
 
-#: builtin/init-db.c:274
-#, fuzzy, c-format
+#: builtin/init-db.c:263
+#, c-format
 msgid "invalid initial branch name: '%s'"
-msgstr "Nome de ramo inválido: '%s'"
+msgstr "Nome de ramo inicial inválido: '%s'"
 
-#: builtin/init-db.c:366
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
-msgstr "não foi possível processar o tipo de ficheiro %d"
+msgstr "incapaz lidar com tipo de ficheiro %d"
 
-#: builtin/init-db.c:369
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
-msgstr "não foi possível mover %s para %s"
+msgstr "incapaz mover %s para %s"
 
-#: builtin/init-db.c:385
+#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr ""
 
-#: builtin/init-db.c:409 builtin/init-db.c:412
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s já existe"
 
-#: builtin/init-db.c:443
+#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr ""
 
-#: builtin/init-db.c:474
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Reiniciei respositório partilhado existente de Git em %s%s\n"
 
-#: builtin/init-db.c:475
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Reiniciei repositório existente de Git em %s%s\n"
 
-#: builtin/init-db.c:479
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Iniciei repositório vazio partilhado de Git em %s%s\n"
 
-#: builtin/init-db.c:480
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Iniciei repositório vazio de Git em %s%s\n"
 
-#: builtin/init-db.c:529
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -16263,59 +16547,56 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] [--"
 "shared[=<permissões>]] [<diretório>]"
 
-#: builtin/init-db.c:555
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "permissões"
 
-#: builtin/init-db.c:556
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 "especificar que o repositório git será partilhado por vários utilizadores"
 
-#: builtin/init-db.c:562
-#, fuzzy
+#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
-msgstr "substituir o bit executável dos ficheiros listados"
+msgstr "sobrepor o nome do ramo inicial"
 
-#: builtin/init-db.c:563 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr ""
 
-#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr ""
 
-#: builtin/init-db.c:571
-#, fuzzy
+#: builtin/init-db.c:560
 msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--deepen e --depth são mutuamente exclusivos"
+msgstr ""
 
-#: builtin/init-db.c:600 builtin/init-db.c:605
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
-msgstr "não é possível criar o diretório %s"
+msgstr "incapaz mkdir %s"
 
-#: builtin/init-db.c:609 builtin/init-db.c:664
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
-msgstr "não é possível mudar para o diretório %s"
+msgstr "incapaz chdir para %s"
 
-#: builtin/init-db.c:636
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr ""
-"%s (ou --work-tree=<diretório>) não é permitido sem especificar %s (ou --git-"
+"%s (ou --work-tree=<diretório>) só é permitido se especificar %s (ou --git-"
 "dir=<diretório>)"
 
-#: builtin/init-db.c:688
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Incapaz aceder work tree '%s'"
 
-#: builtin/init-db.c:693
-#, fuzzy
+#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir incompatível com repositório nú"
 
@@ -16333,193 +16614,175 @@ msgstr "editar ficheiros no local"
 
 #: builtin/interpret-trailers.c:96
 msgid "trim empty trailers"
-msgstr "cortar terminadores vazios"
+msgstr "cortar atribuições vazias"
 
 #: builtin/interpret-trailers.c:99
 msgid "where to place the new trailer"
 msgstr ""
 
 #: builtin/interpret-trailers.c:101
-#, fuzzy
 msgid "action if trailer already exists"
-msgstr "a árvore de trabalho '%s' já existe."
+msgstr "ação se atribuição já exista"
 
 #: builtin/interpret-trailers.c:103
 msgid "action if trailer is missing"
-msgstr ""
+msgstr "ação se atribuição está faltando"
 
 #: builtin/interpret-trailers.c:105
-#, fuzzy
 msgid "output only the trailers"
-msgstr "cortar terminadores vazios"
+msgstr "mostrar apenas atribuições"
 
 #: builtin/interpret-trailers.c:106
-#, fuzzy
 msgid "do not apply config rules"
-msgstr "pesquisar variáveis de configuração"
+msgstr "aplicar regras de config nenhumas"
 
 #: builtin/interpret-trailers.c:107
 msgid "join whitespace-continued values"
 msgstr ""
 
 #: builtin/interpret-trailers.c:108
-#, fuzzy
 msgid "set parsing options"
-msgstr "Opções de integração"
+msgstr "definir opções de processamento"
 
 #: builtin/interpret-trailers.c:110
 msgid "do not treat --- specially"
 msgstr ""
 
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr "terminador"
-
 #: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "terminadores a adicionar"
 
 #: builtin/interpret-trailers.c:123
-#, fuzzy
 msgid "--trailer with --only-input does not make sense"
-msgstr "--name-only não faz sentido"
+msgstr "--trailer com --only-input faz sentido nenhum"
 
 #: builtin/interpret-trailers.c:133
 msgid "no input file given for in-place editing"
 msgstr "fornecido para edição in-place, ficheiro de entrada nenhum"
 
-#: builtin/log.c:58
+#: builtin/log.c:59
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opções>] [<intervalo-de-revisões>] [[--] <caminho>...]"
 
-#: builtin/log.c:59
+#: builtin/log.c:60
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opções>] <objeto>..."
 
-#: builtin/log.c:112
+#: builtin/log.c:113
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opção --decorate inválida: %s"
 
-#: builtin/log.c:179
+#: builtin/log.c:180
 msgid "show source"
 msgstr "mostrar origem"
 
-#: builtin/log.c:180
-msgid "Use mail map file"
+#: builtin/log.c:181
+msgid "use mail map file"
 msgstr "usar ficheiro de mapeamento de correio"
 
-#: builtin/log.c:183
-#, fuzzy
+#: builtin/log.c:184
 msgid "only decorate refs that match <pattern>"
-msgstr "usar apenas referência que correspondam ao <padrão>"
+msgstr "apenas decorar refs que correspondam ao <padrão>"
 
-#: builtin/log.c:185
-#, fuzzy
+#: builtin/log.c:186
 msgid "do not decorate refs that match <pattern>"
-msgstr "não considerar tags que correspondam ao <padrão>"
+msgstr "deixar por decorar refs correspondentes a <padrão>"
 
-#: builtin/log.c:186
+#: builtin/log.c:187
 msgid "decorate options"
 msgstr "opções de decoração"
 
-#: builtin/log.c:189
+#: builtin/log.c:190
 msgid ""
-"Trace the evolution of line range <start>,<end> or function :<funcname> in "
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
-msgstr ""
+msgstr "localizar a evolução de intervalo de linhas <início>,<fim> ou "
+"função :<nome-função> em <ficheiro>"
 
-#: builtin/log.c:212
-#, fuzzy
+#: builtin/log.c:213
 msgid "-L<range>:<file> cannot be used with pathspec"
-msgstr "%s: %s não pode ser usado com %s"
+msgstr "-L<alcance>:<ficheiro>incapaz ser usado com especificador de path"
 
-#: builtin/log.c:302
+#: builtin/log.c:306
 #, c-format
 msgid "Final output: %d %s\n"
-msgstr "Resultado final: %d %s\n"
+msgstr "Output final: %d %s\n"
 
-#: builtin/log.c:564
+#: builtin/log.c:571
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ficheiro incorreto"
 
-#: builtin/log.c:579 builtin/log.c:674
-#, fuzzy, c-format
+#: builtin/log.c:586 builtin/log.c:676
+#, c-format
 msgid "could not read object %s"
 msgstr "incapaz ler objeto %s"
 
-#: builtin/log.c:699
-#, fuzzy, c-format
+#: builtin/log.c:701
+#, c-format
 msgid "unknown type: %d"
-msgstr "Tipo desconhecido: %d"
+msgstr "tipo desconhecido: %d"
 
-#: builtin/log.c:848
+#: builtin/log.c:846
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr ""
 
-#: builtin/log.c:855
+#: builtin/log.c:853
 msgid "format.headers without value"
 msgstr "format.headers sem valor"
 
-#: builtin/log.c:984
-#, fuzzy, c-format
+#: builtin/log.c:982
+#, c-format
 msgid "cannot open patch file %s"
 msgstr "incapaz abrir ficheiro patch %s"
 
-#: builtin/log.c:1001
-#, fuzzy
+#: builtin/log.c:999
 msgid "need exactly one range"
-msgstr "É necessário exatamente um intervalo."
+msgstr ""
 
-#: builtin/log.c:1011
-#, fuzzy
+#: builtin/log.c:1009
 msgid "not a range"
 msgstr "é intervalo nenhum"
 
-#: builtin/log.c:1175
-#, fuzzy
+#: builtin/log.c:1173
 msgid "cover letter needs email format"
 msgstr "A carta de apresentação precisa de um formato de e-mail"
 
-#: builtin/log.c:1181
-#, fuzzy
+#: builtin/log.c:1179
 msgid "failed to create cover-letter file"
-msgstr "Falha ao criar os ficheiros de saída"
+msgstr ""
 
-#: builtin/log.c:1262
+#: builtin/log.c:1266
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to incorreto: %s"
 
-#: builtin/log.c:1289
+#: builtin/log.c:1293
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opções>] [<desde> | <intervalo-de-revisões>]"
 
-#: builtin/log.c:1347
-#, fuzzy
+#: builtin/log.c:1351
 msgid "two output directories?"
 msgstr "Dois diretórios de saída?"
 
-#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332
-#, fuzzy, c-format
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#, c-format
 msgid "unknown commit %s"
 msgstr "Commit desconhecido %s"
 
-#: builtin/log.c:1509 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
-#, fuzzy, c-format
+#, c-format
 msgid "failed to resolve '%s' as a valid ref"
-msgstr "falha ao resolver '%s' como uma referência válida."
+msgstr "falhou resolver '%s' como uma ref válida"
 
-#: builtin/log.c:1518
-#, fuzzy
+#: builtin/log.c:1522
 msgid "could not find exact merge base"
 msgstr "incapaz encontrar a exata base de junção."
 
-#: builtin/log.c:1528
-#, fuzzy
+#: builtin/log.c:1532
 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"
@@ -16530,415 +16793,409 @@ msgstr ""
 "use branch --set-upstream-to para seguir um ramo remoto.\n"
 "Ou pode especificar o commit base com --base=<base-commit-id> manualmente."
 
-#: builtin/log.c:1551
-#, fuzzy
+#: builtin/log.c:1555
 msgid "failed to find exact merge base"
 msgstr "Falha ao procurar base exata de integração"
 
-#: builtin/log.c:1568
+#: builtin/log.c:1572
 msgid "base commit should be the ancestor of revision list"
 msgstr "o commit base deve ser o antecessor da lista de revisões"
 
-#: builtin/log.c:1578
+#: builtin/log.c:1582
 msgid "base commit shouldn't be in revision list"
-msgstr "o commit base não deve fazer parte da lista de revisões"
+msgstr "commit base devia estar fora da lista de revisões"
 
-#: builtin/log.c:1636
+#: builtin/log.c:1640
 msgid "cannot get patch id"
-msgstr "não é possível obter o id do patch"
+msgstr "incapaz obter id de patch"
 
-#: builtin/log.c:1693
-#, fuzzy
+#: builtin/log.c:1703
 msgid "failed to infer range-diff origin of current series"
-msgstr "falha ao guardar ligação à referência de notas atual (%s)"
+msgstr "falhou ao inferir origem intervalo-diff da série atual"
 
-#: builtin/log.c:1695
+#: builtin/log.c:1705
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr ""
 
-#: builtin/log.c:1739
+#: builtin/log.c:1749
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "usar [PATCH n/m] mesmo com um único patch"
 
-#: builtin/log.c:1742
+#: builtin/log.c:1752
 msgid "use [PATCH] even with multiple patches"
 msgstr "usar [PATCH] mesmo com múltiplos patches"
 
-#: builtin/log.c:1746
+#: builtin/log.c:1756
 msgid "print patches to standard out"
 msgstr "imprimir patches para a saída padrão"
 
-#: builtin/log.c:1748
+#: builtin/log.c:1758
 msgid "generate a cover letter"
 msgstr "gerar uma carta de apresentação"
 
-#: builtin/log.c:1750
+#: builtin/log.c:1760
 msgid "use simple number sequence for output file names"
 msgstr ""
 "usar uma sequência de números simples para denominar os ficheiros gerados"
 
-#: builtin/log.c:1751
+#: builtin/log.c:1761
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1752
+#: builtin/log.c:1762
 msgid "use <sfx> instead of '.patch'"
 msgstr "usar <sfx> em vez de '.patch'"
 
-#: builtin/log.c:1754
+#: builtin/log.c:1764
 msgid "start numbering patches at <n> instead of 1"
 msgstr "começar a numerar os patches em <n> em vez de 1"
 
-#: builtin/log.c:1756
+#: builtin/log.c:1765
+msgid "reroll-count"
+msgstr ""
+
+#: builtin/log.c:1766
 msgid "mark the series as Nth re-roll"
 msgstr "marcar a série como a n-ésima reiteração"
 
-#: builtin/log.c:1758
-#, fuzzy
+#: builtin/log.c:1768
 msgid "max length of output filename"
-msgstr "tamanho máximo de cada ficheiro de pacote gerado"
+msgstr "comprimento máximo de saída de nome de ficheiro"
 
-#: builtin/log.c:1760
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/log.c:1770
+msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "Usar [RFC PATCH] em vez de [PATCH]"
 
-#: builtin/log.c:1763
+#: builtin/log.c:1773
 msgid "cover-from-description-mode"
 msgstr ""
 
-#: builtin/log.c:1764
+#: builtin/log.c:1774
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr ""
 
-#: builtin/log.c:1766
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/log.c:1776
+msgid "use [<prefix>] instead of [PATCH]"
 msgstr "usar [<prefixo>] em vez de [PATCH]"
 
-#: builtin/log.c:1769
+#: builtin/log.c:1779
 msgid "store resulting files in <dir>"
 msgstr "guardar os ficheiros resultantes em <dir>"
 
-#: builtin/log.c:1772
+#: builtin/log.c:1782
 msgid "don't strip/add [PATCH]"
-msgstr "não tirar/inserir [PATCH]"
+msgstr "deixar de despir/adicionar [PATCH]"
 
-#: builtin/log.c:1775
+#: builtin/log.c:1785
 msgid "don't output binary diffs"
-msgstr "não gerar diffs binários"
+msgstr "deixar de gerar diffs binários"
 
-#: builtin/log.c:1777
+#: builtin/log.c:1787
 msgid "output all-zero hash in From header"
 msgstr "preencher o cabeçalho From com hash de zeros"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1789
 msgid "don't include a patch matching a commit upstream"
-msgstr "não incluir um patch que coincida com um commit a montante"
+msgstr "incluir nenhum patch correspondente commit upstream"
 
-#: builtin/log.c:1781
+#: builtin/log.c:1791
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 "mostrar no formato de patch em vez de no formato por omissão (patch + stat)"
 
-#: builtin/log.c:1783
+#: builtin/log.c:1793
 msgid "Messaging"
 msgstr "Mensagem"
 
-#: builtin/log.c:1784
+#: builtin/log.c:1794
 msgid "header"
 msgstr "cabeçalho"
 
-#: builtin/log.c:1785
+#: builtin/log.c:1795
 msgid "add email header"
 msgstr "adicionar cabeçalho de e-mail"
 
-#: builtin/log.c:1786 builtin/log.c:1787
+#: builtin/log.c:1796 builtin/log.c:1797
 msgid "email"
 msgstr "e-mail"
 
-#: builtin/log.c:1786
+#: builtin/log.c:1796
 msgid "add To: header"
 msgstr "adicionar cabeçalho To:"
 
-#: builtin/log.c:1787
+#: builtin/log.c:1797
 msgid "add Cc: header"
 msgstr "adicionar cabeçalho Cc:"
 
-#: builtin/log.c:1788
+#: builtin/log.c:1798
 msgid "ident"
 msgstr "identidade"
 
-#: builtin/log.c:1789
+#: builtin/log.c:1799
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
-"definir o endereço From como <identidade> (ou como identidade do committer "
-"se não indicado)"
+"definir endereço From para <identidade> (ou, identidade do committer, caso "
+"contrário)"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1801
 msgid "message-id"
 msgstr "id-mensagem"
 
-#: builtin/log.c:1792
+#: builtin/log.c:1802
 msgid "make first mail a reply to <message-id>"
 msgstr "usar o primeiro email para responder a <id-mensagem>"
 
-#: builtin/log.c:1793 builtin/log.c:1796
+#: builtin/log.c:1803 builtin/log.c:1806
 msgid "boundary"
 msgstr "limite"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1804
 msgid "attach the patch"
-msgstr "anexar o patch"
+msgstr "anexar remendo"
 
-#: builtin/log.c:1797
+#: builtin/log.c:1807
 msgid "inline the patch"
-msgstr "incorporar o patch"
+msgstr "incorporar remendo"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1811
 msgid "enable message threading, styles: shallow, deep"
-msgstr "ativar mensagens por tópicos, estilos: shallow (raso), deep (profundo)"
+msgstr "ativar mensagens por tópicos, estilos: shallow (superficial), deep (profundo)"
 
-#: builtin/log.c:1803
+#: builtin/log.c:1813
 msgid "signature"
 msgstr "assinatura"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1814
 msgid "add a signature"
 msgstr "adicionar uma assinatura"
 
-#: builtin/log.c:1805
+#: builtin/log.c:1815
 msgid "base-commit"
-msgstr "commit-base"
+msgstr "memória-base"
 
-#: builtin/log.c:1806
+#: builtin/log.c:1816
 msgid "add prerequisite tree info to the patch series"
 msgstr "adicionar informação pré-requisito da árvore à série de patches"
 
-#: builtin/log.c:1809
+#: builtin/log.c:1819
 msgid "add a signature from a file"
 msgstr "adicionar uma assinatura de um ficheiro"
 
-#: builtin/log.c:1810
+#: builtin/log.c:1820
 msgid "don't print the patch filenames"
-msgstr "não imprimir os nomes dos ficheiros de patch"
+msgstr "imprimir nomes de ficheiros de patch nenhuns"
 
-#: builtin/log.c:1812
-#, fuzzy
+#: builtin/log.c:1822
 msgid "show progress while generating patches"
-msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
+msgstr "mostrar progresso enquanto se gera remendos"
 
-#: builtin/log.c:1814
+#: builtin/log.c:1824
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1817
+#: builtin/log.c:1827
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1819
+#: builtin/log.c:1829 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr ""
 
-#: builtin/log.c:1905
+#: builtin/log.c:1916
 #, c-format
 msgid "invalid ident line: %s"
-msgstr "linha de identidade inválida: %s"
+msgstr "linha de indentação inválida: %s"
 
-#: builtin/log.c:1920
-#, fuzzy
+#: builtin/log.c:1931
 msgid "-n and -k are mutually exclusive"
 msgstr "-n e -k são mutuamente exclusivos."
 
-#: builtin/log.c:1922
-#, fuzzy
+#: builtin/log.c:1933
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc e -k são mutuamente exclusivos."
 
-#: builtin/log.c:1930
+#: builtin/log.c:1941
 msgid "--name-only does not make sense"
-msgstr "--name-only não faz sentido"
+msgstr "--name-only faz sentido nenhum"
 
-#: builtin/log.c:1932
+#: builtin/log.c:1943
 msgid "--name-status does not make sense"
-msgstr "--name-status não faz sentido"
+msgstr "--name-status faz sentido nenhum"
 
-#: builtin/log.c:1934
+#: builtin/log.c:1945
 msgid "--check does not make sense"
-msgstr "--check não faz sentido"
+msgstr "--check faz sentido nenhum"
 
-#: builtin/log.c:1956
-#, fuzzy
+#: builtin/log.c:1967
 msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "-b, -B e --detach são mutuamente exclusivos"
+msgstr ""
 
-#: builtin/log.c:2079
+#: builtin/log.c:2089
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:2083
+#: builtin/log.c:2093
 msgid "Interdiff:"
 msgstr ""
 
-#: builtin/log.c:2084
+#: builtin/log.c:2094
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr ""
 
-#: builtin/log.c:2090
+#: builtin/log.c:2100
 msgid "--creation-factor requires --range-diff"
 msgstr ""
 
-#: builtin/log.c:2094
+#: builtin/log.c:2104
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:2102
+#: builtin/log.c:2112
 msgid "Range-diff:"
 msgstr ""
 
-#: builtin/log.c:2103
+#: builtin/log.c:2113
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr ""
 
-#: builtin/log.c:2114
+#: builtin/log.c:2124
 #, c-format
 msgid "unable to read signature file '%s'"
-msgstr "não é possível ler o ficheiro de assinatura '%s'"
+msgstr "incapaz ler ficheiro de assinatura '%s'"
 
-#: builtin/log.c:2150
-#, fuzzy
+#: builtin/log.c:2160
 msgid "Generating patches"
 msgstr "falha ao editar patch"
 
-#: builtin/log.c:2194
-#, fuzzy
+#: builtin/log.c:2204
 msgid "failed to create output files"
-msgstr "Falha ao criar os ficheiros de saída"
+msgstr ""
 
-#: builtin/log.c:2253
+#: builtin/log.c:2263
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
-msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]"
+msgstr "git cherry [-v] [<upstream> [<head> [<limite>]]]"
 
-#: builtin/log.c:2307
+#: builtin/log.c:2317
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr ""
-"O ramo remoto seguido não foi encontrado, especifique <ramo-a-montante> "
+"Incapaz encontrar ramo monitorizado remoto, por favor especifica <upstream> "
 "manualmente.\n"
 
-#: builtin/ls-files.c:471
+#: builtin/ls-files.c:563
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opções>] [<ficheiro>...]"
 
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:619
 msgid "identify the file status with tags"
 msgstr "identificar o estado do ficheiro com tags"
 
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:621
 msgid "use lowercase letters for 'assume unchanged' files"
-msgstr ""
-"usar letras minúsculas para ficheiros 'assumido não alterado' ('assume "
-"unchanged')"
+msgstr "usar letras minúsculas para ficheiros 'assume unchanged'"
 
-#: builtin/ls-files.c:531
-#, fuzzy
+#: builtin/ls-files.c:623
 msgid "use lowercase letters for 'fsmonitor clean' files"
-msgstr ""
-"usar letras minúsculas para ficheiros 'assumido não alterado' ('assume "
-"unchanged')"
+msgstr "usar letras minúsculas para ficheiros 'fsmonitor clean'"
 
-#: builtin/ls-files.c:533
+#: builtin/ls-files.c:625
 msgid "show cached files in the output (default)"
 msgstr "mostrar ficheiros em cache na saída (predefinição)"
 
-#: builtin/ls-files.c:535
+#: builtin/ls-files.c:627
 msgid "show deleted files in the output"
 msgstr "mostrar ficheiros eliminados na saída"
 
-#: builtin/ls-files.c:537
+#: builtin/ls-files.c:629
 msgid "show modified files in the output"
 msgstr "mostrar ficheiros modificados na saída"
 
-#: builtin/ls-files.c:539
+#: builtin/ls-files.c:631
 msgid "show other files in the output"
 msgstr "mostrar outros ficheiros na saída"
 
-#: builtin/ls-files.c:541
+#: builtin/ls-files.c:633
 msgid "show ignored files in the output"
 msgstr "mostrar ficheiros ignorados na saída"
 
-#: builtin/ls-files.c:544
+#: builtin/ls-files.c:636
 msgid "show staged contents' object name in the output"
 msgstr "mostrar nome de objetos com conteúdo preparado, na saída"
 
-#: builtin/ls-files.c:546
+#: builtin/ls-files.c:638
 msgid "show files on the filesystem that need to be removed"
 msgstr ""
 "mostrar ficheiros no sistema de ficheiros que precisam de ser removidos"
 
-#: builtin/ls-files.c:548
+#: builtin/ls-files.c:640
 msgid "show 'other' directories' names only"
 msgstr "mostrar nomes de diretórios 'other' (outro)"
 
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:642
 msgid "show line endings of files"
 msgstr "mostrar finais de linha dos ficheiros"
 
-#: builtin/ls-files.c:552
+#: builtin/ls-files.c:644
 msgid "don't show empty directories"
-msgstr "não mostrar diretórios vazios"
+msgstr "mostrar pastas vazias nenhumas"
 
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:647
 msgid "show unmerged files in the output"
-msgstr "mostrar ficheiros não integrados na saída"
+msgstr "mostrar ficheiros por juntar no output"
 
-#: builtin/ls-files.c:557
+#: builtin/ls-files.c:649
 msgid "show resolve-undo information"
 msgstr "mostrar informação de resolver-desfazer"
 
-#: builtin/ls-files.c:559
+#: builtin/ls-files.c:651
 msgid "skip files matching pattern"
 msgstr "ignorar ficheiros que correspondam ao padrão"
 
-#: builtin/ls-files.c:562
+#: builtin/ls-files.c:654
 msgid "exclude patterns are read from <file>"
 msgstr "ler padrões de exclusão do <ficheiro>"
 
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:657
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "ler padrões de exclusão por diretório do <ficheiro>"
 
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:659
 msgid "add the standard git exclusions"
-msgstr "incluir as exclusões standard do git"
+msgstr "incluir as exclusões standard de git"
 
-#: builtin/ls-files.c:571
+#: builtin/ls-files.c:663
 msgid "make the output relative to the project top directory"
-msgstr "mostrar os caminhos relativamente ao diretório superior do projeto"
+msgstr "fazer a saída relativa à pasta de topo de projeto"
 
-#: builtin/ls-files.c:574
+#: builtin/ls-files.c:666
 msgid "recurse through submodules"
-msgstr "percorrer submódulos recursivamente"
+msgstr "percorrer recursivamente pelos submódulos"
 
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:668
 msgid "if any <file> is not in the index, treat this as an error"
-msgstr "se um <ficheiro> não estiver no índice, tratar como erro"
+msgstr "se estiver no index <ficheiro> nenhum, tratar como erro"
 
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:669
 msgid "tree-ish"
 msgstr "árvore-etc"
 
-#: builtin/ls-files.c:578
+#: builtin/ls-files.c:670
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 "fingir que os caminhos removidos desde <árvore-etc> ainda estão presentes"
 
-#: builtin/ls-files.c:580
+#: builtin/ls-files.c:672
 msgid "show debugging data"
 msgstr "mostrar dados de depuração"
 
+#: builtin/ls-files.c:674
+msgid "suppress duplicate entries"
+msgstr "suprimir entradas duplicadas"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -16949,45 +17206,45 @@ msgstr ""
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"
 "                     [--symref] [<repositório> [<referências>...]]"
 
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
 msgid "do not print remote URL"
-msgstr "não imprimir URL remoto"
+msgstr "imprimir URL remoto nenhum"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
 msgid "exec"
 msgstr "exec"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
 msgid "path of git-upload-pack on the remote host"
-msgstr "caminho para git-upload-pack no servidor remoto"
+msgstr "caminho para git-upload-pack no host remoto"
 
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
 msgid "limit to tags"
-msgstr "restringir-se a tags"
+msgstr "restringir-se a etiquetas"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "limit to heads"
-msgstr "restringir-se a cabeças"
+msgstr "limitar-se a cabeças"
 
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
-msgstr "não mostrar tags descascadas"
+msgstr "mostrar nenhumas etiquetas descascadas"
 
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "ter url.<base>.insteadOf em conta"
 
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
-msgstr "terminar com código de saída 2 se não forem encontradas referências"
+msgstr "terminar com código de saída 2 se forem encontradas refs nenhumas"
 
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "mostrar a referência subjacente em adição ao objeto por ela apontado"
 
 #: builtin/ls-tree.c:30
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr "git ls-tree [<opções>] <árvore-etc> [<caminho>...]"
+msgstr "git ls-tree [<opções>] <arvoredo> [<caminho>...]"
 
 #: builtin/ls-tree.c:128
 msgid "only show trees"
@@ -17020,7 +17277,56 @@ msgstr "usar nomes de caminho completos"
 #: builtin/ls-tree.c:145
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
-"mostrar a árvore completa; não apenas o diretório atual (implica --full-name)"
+"listar toda árvore; para além do diretório atual (implica --full-name)"
+
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git mailinfo [<opções>] <msg> <remendo> < mail >info"
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr "manter assunto"
+
+#: builtin/mailinfo.c:60
+msgid "keep non patch brackets in subject"
+msgstr ""
+
+#: builtin/mailinfo.c:62
+msgid "copy Message-ID to the end of commit message"
+msgstr "Esta é a 2ª mensagem de commit:"
+
+#: builtin/mailinfo.c:64
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr ""
+
+#: builtin/mailinfo.c:67
+msgid "disable charset re-coding of metadata"
+msgstr ""
+
+#: builtin/mailinfo.c:69
+msgid "encoding"
+msgstr ""
+
+#: builtin/mailinfo.c:70
+msgid "re-code metadata to this encoding"
+msgstr ""
+
+#: builtin/mailinfo.c:72
+msgid "use scissors"
+msgstr ""
+
+#: builtin/mailinfo.c:73
+msgid "<action>"
+msgstr "<ação>"
+
+#: builtin/mailinfo.c:74
+msgid "action when quoted CR is found"
+msgstr ""
+
+#: builtin/mailinfo.c:77
+msgid "use headers in message's body"
+msgstr ""
 
 #: builtin/mailsplit.c:241
 #, c-format
@@ -17029,23 +17335,23 @@ msgstr ""
 
 #: builtin/merge-base.c:32
 msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <memória> <memória>..."
 
 #: builtin/merge-base.c:33
 msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <memória>..."
 
 #: builtin/merge-base.c:34
 msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <memória>..."
 
 #: builtin/merge-base.c:35
 msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <memória> <memória>"
 
 #: builtin/merge-base.c:36
 msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <referência> [<commit>]"
+msgstr "git merge-base --fork-point <ref> [<memória>]"
 
 #: builtin/merge-base.c:143
 msgid "output all common ancestors"
@@ -17053,15 +17359,15 @@ msgstr "mostrar todos os antecessores"
 
 #: builtin/merge-base.c:145
 msgid "find ancestors for a single n-way merge"
-msgstr "encontrar antecessores de uma única integração com n pontos"
+msgstr "encontrar antecessores para uma única junção de n pontos"
 
 #: builtin/merge-base.c:147
 msgid "list revs not reachable from others"
-msgstr "listar revisões não alcançáveis a partir de outras"
+msgstr "listar revs apenas alcançáveis pelos nossos"
 
 #: builtin/merge-base.c:149
 msgid "is the first one ancestor of the other?"
-msgstr "o primeiro é antecessor do segundo?"
+msgstr "é o primeiro antecessor do outro?"
 
 #: builtin/merge-base.c:151
 msgid "find where <commit> forked from reflog of <ref>"
@@ -17102,7 +17408,7 @@ msgstr "usar este comprimento de marcador para os conflitos"
 
 #: builtin/merge-file.c:45
 msgid "do not warn about conflicts"
-msgstr "não alertar sobre conflitos"
+msgstr "deixar de alertar sobre conflitos"
 
 #: builtin/merge-file.c:47
 msgid "set labels for file1/orig-file/file2"
@@ -17111,222 +17417,211 @@ msgstr "definir identificares para ficheiro1/ficheiro-orig/ficheiro2"
 #: builtin/merge-recursive.c:47
 #, c-format
 msgid "unknown option %s"
-msgstr "opção desconhecido %s"
+msgstr ""
 
 #: builtin/merge-recursive.c:53
 #, c-format
 msgid "could not parse object '%s'"
-msgstr "não foi possível analisar o objeto '%s'"
+msgstr "incapaz processar objeto '%s'"
 
 #: builtin/merge-recursive.c:57
 #, c-format
 msgid "cannot handle more than %d base. Ignoring %s."
 msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "não é possível processar mais do que %d base. Ignorar %s."
-msgstr[1] "não é possível processar mais do que %d bases. Ignorar %s."
+msgstr[0] "incapaz lidar mais do que %d base. Ignorando %s."
+msgstr[1] "incapaz lidar mais do que %d bases. Ignorando %s."
 
 #: builtin/merge-recursive.c:65
 msgid "not handling anything other than two heads merge."
-msgstr "não se pode processar outra coisa senão integração de duas cabeças."
+msgstr "apenas lidando com junção de duas heads"
 
 #: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
 #, c-format
 msgid "could not resolve ref '%s'"
-msgstr "não foi possível resolver a referência %s"
+msgstr "incapaz resolver ref '%s'"
 
 #: builtin/merge-recursive.c:82
 #, c-format
 msgid "Merging %s with %s\n"
-msgstr "A integrar %s com %s\n"
-
-#: builtin/merge.c:57
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<opções>] [<commit>...]"
+msgstr "Juntando %s com %s\n"
 
 #: builtin/merge.c:58
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:59
-msgid "git merge --continue"
-msgstr "git merge --continue"
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<opções>] [<memória>...]"
 
-#: builtin/merge.c:122
+#: builtin/merge.c:123
 msgid "switch `m' requires a value"
 msgstr "a opção 'm' requer um valor"
 
-#: builtin/merge.c:145
-#, fuzzy, c-format
+#: builtin/merge.c:146
+#, c-format
 msgid "option `%s' requires a value"
-msgstr "a opção '%s' requer um valor"
+msgstr "opção `%s' exige um valor"
 
-#: builtin/merge.c:198
+#: builtin/merge.c:199
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
-msgstr "Estratégia de integração '%s' não encontrada.\n"
+msgstr "Incapaz encontrar estratégia de junção '%s'.\n"
 
-#: builtin/merge.c:199
+#: builtin/merge.c:200
 #, c-format
 msgid "Available strategies are:"
 msgstr "Estratégias disponíveis:"
 
-#: builtin/merge.c:204
+#: builtin/merge.c:205
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Estratégias personalizadas disponíveis:"
 
-#: builtin/merge.c:255 builtin/pull.c:133
+#: builtin/merge.c:256 builtin/pull.c:133
 msgid "do not show a diffstat at the end of the merge"
-msgstr "não apresentar um diffstat ao fim da integração"
+msgstr "mostrar diffstat nenhuma ao fim da junção"
 
-#: builtin/merge.c:258 builtin/pull.c:136
+#: builtin/merge.c:259 builtin/pull.c:136
 msgid "show a diffstat at the end of the merge"
-msgstr "mostrar um diffstat ao fim da integração"
+msgstr "mostrar um diffstat ao fim da junção"
 
-#: builtin/merge.c:259 builtin/pull.c:139
+#: builtin/merge.c:260 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "(sinónimo de --stat)"
 
-#: builtin/merge.c:261 builtin/pull.c:142
+#: builtin/merge.c:262 builtin/pull.c:142
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "adicionar (no máximo <n>) entradas do shortlog à mensagem de commit da "
 "integração"
 
-#: builtin/merge.c:264 builtin/pull.c:148
+#: builtin/merge.c:265 builtin/pull.c:148
 msgid "create a single commit instead of doing a merge"
 msgstr "criar um único commit em vez de realizar uma integração"
 
-#: builtin/merge.c:266 builtin/pull.c:151
+#: builtin/merge.c:267 builtin/pull.c:151
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "realizar um commit se a integração for bem sucedida (predefinição)"
 
-#: builtin/merge.c:268 builtin/pull.c:154
+#: builtin/merge.c:269 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "editar a mensagem antes de submeter"
 
-#: builtin/merge.c:270
+#: builtin/merge.c:271
 msgid "allow fast-forward (default)"
 msgstr "permitir avanço rápido (predefinição)"
 
-#: builtin/merge.c:272 builtin/pull.c:161
+#: builtin/merge.c:273 builtin/pull.c:161
 msgid "abort if fast-forward is not possible"
-msgstr "abortar se não é possível efetuar avanço rápido"
+msgstr "abortar se fast-forward é impossível"
 
-#: builtin/merge.c:276 builtin/pull.c:164
+#: builtin/merge.c:277 builtin/pull.c:164
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "verificar se o commit tem uma assinatura GPG válida"
 
-#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114
+#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
 msgid "strategy"
 msgstr "estratégia"
 
-#: builtin/merge.c:278 builtin/pull.c:169
+#: builtin/merge.c:279 builtin/pull.c:169
 msgid "merge strategy to use"
-msgstr "estratégia de integração a usar"
+msgstr "estratégia de junção a usar"
 
-#: builtin/merge.c:279 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/pull.c:172
 msgid "option=value"
 msgstr "opção=valor"
 
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "option for selected merge strategy"
-msgstr "opções da estratégia de integração selecionada"
+msgstr "opção para estratégia de junção selecionada"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:283
 msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "mensagem de commit (de integração não suscetível a avanço rápido)"
+msgstr "mensagem de commit de junção (para junções non-fast-forward)"
 
-#: builtin/merge.c:289
+#: builtin/merge.c:290
 msgid "abort the current in-progress merge"
-msgstr "abortar integração em curso"
+msgstr "abortar a junção atualmente em curso"
 
-#: builtin/merge.c:291
-#, fuzzy
+#: builtin/merge.c:292
 msgid "--abort but leave index and working tree alone"
-msgstr "repor HEAD, índice e árvore de trabalho"
+msgstr "--abort mas deixar o cenário e a árvore-trabalho quietas"
 
-#: builtin/merge.c:293
+#: builtin/merge.c:294
 msgid "continue the current in-progress merge"
 msgstr "continuar a integração em curso"
 
-#: builtin/merge.c:295 builtin/pull.c:180
+#: builtin/merge.c:296 builtin/pull.c:180
 msgid "allow merging unrelated histories"
-msgstr "permitir integração de históricos não relacionados"
+msgstr "permitir junção de históricos diferentes"
 
-#: builtin/merge.c:302
-#, fuzzy
+#: builtin/merge.c:303
 msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "ignorar pre-commit e commit-msg hooks"
+msgstr "ignorar pre-merge-commit e ganchos commit-msg"
 
-#: builtin/merge.c:319
+#: builtin/merge.c:320
 msgid "could not run stash."
-msgstr "não foi possível executar o comando stash."
+msgstr "incapaz executar stash."
 
-#: builtin/merge.c:324
+#: builtin/merge.c:325
 msgid "stash failed"
-msgstr "falha ao executar o comando stash"
+msgstr ""
 
-#: builtin/merge.c:329
+#: builtin/merge.c:330
 #, c-format
 msgid "not a valid object: %s"
-msgstr "nome de objeto inválido: %s"
+msgstr ""
 
-#: builtin/merge.c:351 builtin/merge.c:368
+#: builtin/merge.c:352 builtin/merge.c:369
 msgid "read-tree failed"
 msgstr "falha ao executar o comando read-tree"
 
-#: builtin/merge.c:398
-msgid " (nothing to squash)"
+#: builtin/merge.c:400
+msgid "Already up to date. (nothing to squash)"
 msgstr " (nada para esmagar)"
 
-#: builtin/merge.c:409
+#: builtin/merge.c:414
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
-msgstr "Commit esmagado -- HEAD não atualizada\n"
+msgstr "Squash commit -- deixando HEAD por atualizar\n"
 
-#: builtin/merge.c:459
+#: builtin/merge.c:464
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
-msgstr "Nenhuma mensagem de integração -- HEAD não atualizada\n"
+msgstr "Mensagem de junção nenhuma -- deixando HEAD por atualizar\n"
 
-#: builtin/merge.c:510
+#: builtin/merge.c:515
 #, c-format
 msgid "'%s' does not point to a commit"
-msgstr "'%s' não aponta para um commit"
+msgstr "'%s' aponta para commit nenhum"
 
-#: builtin/merge.c:597
+#: builtin/merge.c:603
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
 
-#: builtin/merge.c:723
+#: builtin/merge.c:729
 msgid "Not handling anything other than two heads merge."
 msgstr "Lidando nada além da junção de duas heads."
 
-#: builtin/merge.c:736
+#: builtin/merge.c:742
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Opção desconhecida de merge-recursive: -X%s"
 
-#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209
+#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
-msgstr "não foi possível escrever %s"
+msgstr "incapaz escrever %s"
 
-#: builtin/merge.c:807
+#: builtin/merge.c:813
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Incapaz ler de '%s'"
 
-#: builtin/merge.c:816
+#: builtin/merge.c:822
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr "Usa 'git commit' para completar a junção. Committando junção nenhuma.\n"
+msgstr "Memorizando junção nenhuma; usa 'git commit' para completar a junção.\n"
 
-#: builtin/merge.c:822
-#, fuzzy
+#: builtin/merge.c:828
 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"
@@ -17337,13 +17632,12 @@ msgstr ""
 "branch.\n"
 "\n"
 
-#: builtin/merge.c:827
-#, fuzzy
+#: builtin/merge.c:833
 msgid "An empty message aborts the commit.\n"
 msgstr "Uma mensagem vazia aborta o commit.\n"
 
-#: builtin/merge.c:830
-#, fuzzy, c-format
+#: builtin/merge.c:836
+#, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
 "the commit.\n"
@@ -17351,75 +17645,74 @@ msgstr ""
 "Linhas começadas com '%c' são ignoradas, e uma messagem vazia aborta\n"
 "o commit.\n"
 
-#: builtin/merge.c:883
+#: builtin/merge.c:889
 msgid "Empty commit message."
 msgstr "Mensagem commit vazia."
 
-#: builtin/merge.c:898
+#: builtin/merge.c:904
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilhoso.\n"
 
-#: builtin/merge.c:959
+#: builtin/merge.c:965
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Merge automático falhou; resolve os conflitos e depois podes commitar o "
 "resultado.\n"
 
-#: builtin/merge.c:998
+#: builtin/merge.c:1004
 msgid "No current branch."
 msgstr "Nenhum ramo atual."
 
-#: builtin/merge.c:1000
+#: builtin/merge.c:1006
 msgid "No remote for the current branch."
 msgstr "Ŕamo atual de remoto nenhum."
 
-#: builtin/merge.c:1002
+#: builtin/merge.c:1008
 msgid "No default upstream defined for the current branch."
 msgstr "Ramo atual sem upstream default definido."
 
-#: builtin/merge.c:1007
+#: builtin/merge.c:1013
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Nenhum ramo de monitorização remoto seguido por %s de %s"
 
-#: builtin/merge.c:1064
+#: builtin/merge.c:1070
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valor '%s' incorreto no ambiente '%s'"
 
-#: builtin/merge.c:1167
+#: builtin/merge.c:1173
 #, c-format
 msgid "not something we can merge in %s: %s"
-msgstr "não se pode integrar em %s: %s"
+msgstr "podemos juntar em %s nenhum(a): %s"
 
-#: builtin/merge.c:1201
+#: builtin/merge.c:1207
 msgid "not something we can merge"
-msgstr "não se pode integrar"
+msgstr "podemos juntar nada"
 
-#: builtin/merge.c:1311
+#: builtin/merge.c:1317
 msgid "--abort expects no arguments"
-msgstr "--abort não leva argumentos"
+msgstr "--abort espera argumento nenhum"
 
-#: builtin/merge.c:1315
+#: builtin/merge.c:1321
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Há junção nenhuma para abortar (MERGE_HEAD faltando)."
 
-#: builtin/merge.c:1333
-#, fuzzy
+#: builtin/merge.c:1339
 msgid "--quit expects no arguments"
-msgstr "--abort não leva argumentos"
+msgstr "--quit espera argumento nenhum"
 
-#: builtin/merge.c:1346
+#: builtin/merge.c:1352
 msgid "--continue expects no arguments"
-msgstr "--continue não leva argumentos"
+msgstr "--continue espera argumento nenhum"
 
-#: builtin/merge.c:1350
+#: builtin/merge.c:1356
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Há junção nenhuma em curso (MERGE_HEAD faltando)."
 
-#: builtin/merge.c:1366
+#: builtin/merge.c:1372
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17427,111 +17720,141 @@ msgstr ""
 "Junção está por concluir (MERGE_HEAD existe).\n"
 "Por favor, faz commit das tuas alterações antes de juntar."
 
-#: builtin/merge.c:1373
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
-"Cherry-pick não concluído (CHERRY_PICK_HEAD presente).\n"
-"Submeta as suas alterações antes de integrar."
+"Cherry-pick por concluir (existe CHERRY_PICK_HEAD).\n"
+"Por favor, memorize suas alterações antes de juntar."
 
-#: builtin/merge.c:1376
+#: builtin/merge.c:1382
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "Cherry-pick não concluído (CHERRY_PICK_HEAD presente)."
+msgstr "Cherry-pick por concluir (existe CHERRY_PICK_HEAD)."
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1396
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Impossível combinar --squash com --no-ff."
 
-#: builtin/merge.c:1392
-#, fuzzy
+#: builtin/merge.c:1398
 msgid "You cannot combine --squash with --commit."
 msgstr "Impossível combinar --squash com --commit."
 
-#: builtin/merge.c:1408
+#: builtin/merge.c:1414
 msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "Nenhum commit especificado e merge.defaultToUpstream não definido."
+msgstr "Especificado commit nenhum e merge.defaultToUpstream indefinido."
 
-#: builtin/merge.c:1425
+#: builtin/merge.c:1431
 msgid "Squash commit into empty head not supported yet"
 msgstr "Esmagar commit para uma cabeça vazia por enquanto tem suporte nenhum"
 
-#: builtin/merge.c:1427
+#: builtin/merge.c:1433
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Non-fast-forward commit para uma cabeça vazia faz sentido nenhum"
 
-#: builtin/merge.c:1432
+#: builtin/merge.c:1438
 #, c-format
 msgid "%s - not something we can merge"
-msgstr "%s - não é algo se possa integrar"
+msgstr "%s - nada que se pode juntar"
 
-#: builtin/merge.c:1434
+#: builtin/merge.c:1440
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Só se pode integrar exatamente um commit numa cabeça vazia"
 
-#: builtin/merge.c:1515
+#: builtin/merge.c:1521
 msgid "refusing to merge unrelated histories"
-msgstr "integração de históricos não relacionados recusada"
+msgstr "recusando juntar históricos diferentes"
 
-#: builtin/merge.c:1524
-#, fuzzy
-msgid "Already up to date."
-msgstr "Já está atualizado."
-
-#: builtin/merge.c:1534
+#: builtin/merge.c:1540
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Atualizando %s..%s\n"
 
-#: builtin/merge.c:1580
+#: builtin/merge.c:1587
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "A tentar integração mesmo trivial no interior do índice...\n"
 
-#: builtin/merge.c:1587
+#: builtin/merge.c:1594
 #, c-format
 msgid "Nope.\n"
 msgstr "Nada.\n"
 
-#: builtin/merge.c:1612
-#, fuzzy
-msgid "Already up to date. Yeeah!"
-msgstr "Já está atualizado. Sim!"
-
-#: builtin/merge.c:1618
+#: builtin/merge.c:1625
 msgid "Not possible to fast-forward, aborting."
 msgstr "Impossível fazer fast-forward, abortando."
 
-#: builtin/merge.c:1646 builtin/merge.c:1711
+#: builtin/merge.c:1653 builtin/merge.c:1719
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Recuando a árvore para estado pristino...\n"
 
-#: builtin/merge.c:1650
+#: builtin/merge.c:1657
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Tentando estratégia merge %s...\n"
 
-#: builtin/merge.c:1702
+#: builtin/merge.c:1709
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "A junção lidou com estratégia de junção nenhuma.\n"
 
-#: builtin/merge.c:1704
+#: builtin/merge.c:1711
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Falha ao integrar com a estratégia %s.\n"
 
-#: builtin/merge.c:1713
+#: builtin/merge.c:1721
 #, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "A usar %s para preparar resolução manual.\n"
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr "Usando estratégia %s para preparar resolução manual.\n"
 
-#: builtin/merge.c:1727
+#: builtin/merge.c:1735
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "Merge automática correu bem; parei antes de commitar como pedido\n"
 
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr ""
+
+#: builtin/mktag.c:27
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "aviso: input de etiqueta falha na verificação fsck: %s"
+
+#: builtin/mktag.c:38
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr ""
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr ""
+
+#: builtin/mktag.c:56
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "incapaz ler objeto %s"
+
+#: builtin/mktag.c:59
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "objeto '%s' etiquetado como '%s', mas é de tipo '%s'"
+
+#: builtin/mktag.c:97
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr ""
+
+#: builtin/mktag.c:100
+msgid "tag on stdin did not refer to a valid object"
+msgstr "etiqueta em entrada padrão referiu-se a objeto inválido"
+
+#: builtin/mktag.c:103 builtin/tag.c:243
+msgid "unable to write tag file"
+msgstr "incapaz escrever ficheiro de tag"
+
 #: builtin/mktree.c:66
 msgid "git mktree [-z] [--missing] [--batch]"
 msgstr "git mktree [-z] [--missing] [--batch]"
@@ -17542,39 +17865,48 @@ msgstr "a entrada termina com NUL"
 
 #: builtin/mktree.c:155 builtin/write-tree.c:26
 msgid "allow missing objects"
-msgstr "permitir objetos não presentes"
+msgstr "permitir objetos que faltam"
 
 #: builtin/mktree.c:156
 msgid "allow creation of more than one tree"
 msgstr "permitir a criação de mais do que uma árvore"
 
-#: builtin/multi-pack-index.c:9
-msgid ""
-"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
-"size=<size>)"
-msgstr ""
+#: builtin/multi-pack-index.c:10
+msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
+msgstr "git multi-pack-index [<opções>] write [--preferred-pack=<pacote>]"
+
+#: builtin/multi-pack-index.c:13
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git multi-pack-index [<opções>] verify"
+
+#: builtin/multi-pack-index.c:16
+msgid "git multi-pack-index [<options>] expire"
+msgstr "git multi-pack-index [<opções>] expire"
+
+#: builtin/multi-pack-index.c:19
+msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
+msgstr "git multi-pack-index [<opções>] repack [--batch-size=<tamanho>]"
 
-#: builtin/multi-pack-index.c:26
+#: builtin/multi-pack-index.c:54
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 
-#: builtin/multi-pack-index.c:29
-msgid ""
-"during repack, collect pack-files of smaller size into a batch that is "
-"larger than this size"
+#: builtin/multi-pack-index.c:69
+msgid "preferred-pack"
 msgstr ""
 
-#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25
-#, fuzzy
-msgid "too many arguments"
-msgstr "Demasiados argumentos."
+#: builtin/multi-pack-index.c:70
+msgid "pack for reuse when computing a multi-pack bitmap"
+msgstr ""
 
-#: builtin/multi-pack-index.c:60
-msgid "--batch-size option is only for 'repack' subcommand"
+#: builtin/multi-pack-index.c:128
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
 msgstr ""
 
-#: builtin/multi-pack-index.c:69
-#, fuzzy, c-format
+#: builtin/multi-pack-index.c:179
+#, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "subcomando desconhecido: %s"
 
@@ -17590,30 +17922,30 @@ msgstr "A pasta %s está no index porém submódulo nenhum?"
 #: builtin/mv.c:85
 msgid "Please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
-"Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"
+"Por favor encena tuas alterações em .gitmodules ou esconde-as para prosseguir"
 
 #: builtin/mv.c:103
 #, c-format
 msgid "%.*s is in index"
-msgstr "%.*s está no índice"
+msgstr "%.*s está no cenário"
 
 #: builtin/mv.c:125
 msgid "force move/rename even if target exists"
-msgstr "forçar mover/mudar o nome mesmo que o destino exista"
+msgstr "forçar mover/renomear mesmo se destino existir"
 
 #: builtin/mv.c:127
 msgid "skip move/rename errors"
-msgstr "ignorar erros ao mover/mudar o nome"
+msgstr "ignorar erros de mover/renomear"
 
 #: builtin/mv.c:170
 #, c-format
 msgid "destination '%s' is not a directory"
-msgstr "o destino '%s' não é um diretório"
+msgstr "destino '%s' é pasta nenhuma"
 
 #: builtin/mv.c:181
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
-msgstr "A verificar a mudança de nome de '%s' para '%s'\n"
+msgstr "Verificando renomeação de '%s' para '%s'\n"
 
 #: builtin/mv.c:185
 msgid "bad source"
@@ -17621,15 +17953,15 @@ msgstr "origem incorreta"
 
 #: builtin/mv.c:188
 msgid "can not move directory into itself"
-msgstr "não é possível mover um diretório para dentro de si próprio"
+msgstr "incapaz mover pasta para si mesma"
 
 #: builtin/mv.c:191
 msgid "cannot move directory over file"
-msgstr "não é possível mover um diretório para um ficheiro"
+msgstr "incapaz mover pasta para um ficheiro"
 
 #: builtin/mv.c:200
 msgid "source directory is empty"
-msgstr "o diretório de origem está vazio"
+msgstr "pasta de origem está vazia"
 
 #: builtin/mv.c:225
 msgid "not under version control"
@@ -17658,7 +17990,7 @@ msgstr "múltiplas origens para o mesmo destino"
 
 #: builtin/mv.c:246
 msgid "destination directory does not exist"
-msgstr "o diretório de destino não existe"
+msgstr "pasta de destino é inexistente"
 
 #: builtin/mv.c:253
 #, c-format
@@ -17670,10 +18002,10 @@ msgstr "%s, origem=%s, destino=%s"
 msgid "Renaming %s to %s\n"
 msgstr "A mudar de nome de %s para %s\n"
 
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
 #, c-format
 msgid "renaming '%s' failed"
-msgstr "falha ao mudar o nome de '%s'"
+msgstr "renomear '%s' falhou"
 
 #: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
@@ -17688,9 +18020,8 @@ msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<opções>] --stdin"
 
 #: builtin/name-rev.c:524
-#, fuzzy
 msgid "print only ref-based names (no object names)"
-msgstr "imprimir apenas os ramos do objeto"
+msgstr "imprimir apenas nomes baseados em ref (nomes de objeto nenhum)"
 
 #: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
@@ -17698,11 +18029,11 @@ msgstr "usar apenas tags para designar commits"
 
 #: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
-msgstr "usar apenas referência que correspondam ao <padrão>"
+msgstr "usar apenas refs que correspondam ao <padrão>"
 
 #: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
-msgstr "ignorar referências que correspondam ao <padrão>"
+msgstr "ignorar refs que correspondam ao <padrão>"
 
 #: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
@@ -17722,41 +18053,41 @@ msgstr "desreferenciar tags na entrada (uso interno)"
 
 #: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
-msgstr "git notes [--ref <notes-ref>] [list [<objeto>]]"
+msgstr "git notes [--ref <notas-ref>] [list [<objeto>]]"
 
 #: builtin/notes.c:29
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
 msgstr ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F "
+"git notes [--ref <notas-ref>] add [-f] [--allow-empty] [-m <msg> | -F "
 "<ficheiro> | (-c | -C) <objeto>] [<objeto>]"
 
 #: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr "git notes [--ref <notes-ref>] copy [-f] <de-objeto> <para-objeto>"
+msgstr "git notes [--ref <notas-ref>] copy [-f] <de-objeto> <para-objeto>"
 
 #: builtin/notes.c:31
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
 msgstr ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F "
+"git notes [--ref <notas-ref>] append [--allow-empty] [-m <msg> | -F "
 "<ficheiro> | (-c | -C) <objeto>] [<objeto>]"
 
 #: builtin/notes.c:32
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
-msgstr "git notes [--ref <notes-ref>] edit [--allow-empty] [<objeto>]"
+msgstr "git notes [--ref <notas-ref>] edit [--allow-empty] [<objeto>]"
 
 #: builtin/notes.c:33
 msgid "git notes [--ref <notes-ref>] show [<object>]"
-msgstr "git notes [--ref <notes-ref>] show [<objeto>]"
+msgstr "git notes [--ref <notas-ref>] show [<objeto>]"
 
 #: builtin/notes.c:34
 msgid ""
 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
 msgstr ""
-"git notes [--ref <notes-ref>] merge [-v | -q] [-s <estratégia>] <notes-ref>"
+"git notes [--ref <notas-ref>] merge [-v | -q] [-s <estratégia>] <notas-ref>"
 
 #: builtin/notes.c:35
 msgid "git notes merge --commit [-v | -q]"
@@ -17768,16 +18099,15 @@ msgstr "git notes merge --abort [-v | -q]"
 
 #: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
-msgstr "git notes [--ref <notes-ref>] remove [<objeto>...]"
+msgstr "git notes [--ref <notas-ref>] remove [<objeto>...]"
 
 #: builtin/notes.c:38
-#, fuzzy
 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
-msgstr "git notes [--ref <notes-ref>] prune [-n | -v]"
+msgstr "git notes [--ref <notas-ref>] prune [-n] [-v]"
 
 #: builtin/notes.c:39
 msgid "git notes [--ref <notes-ref>] get-ref"
-msgstr "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <notas-ref>] get-ref"
 
 #: builtin/notes.c:44
 msgid "git notes [list [<object>]]"
@@ -17809,7 +18139,7 @@ msgstr "git notes show [<objeto>]"
 
 #: builtin/notes.c:75
 msgid "git notes merge [<options>] <notes-ref>"
-msgstr "git notes merge [<opções>] <notes-ref>"
+msgstr "git notes merge [<opções>] <notas-ref>"
 
 #: builtin/notes.c:76
 msgid "git notes merge --commit [<options>]"
@@ -17838,11 +18168,11 @@ msgstr "Escreva/edite as notas do seguinte objeto:"
 #: builtin/notes.c:150
 #, c-format
 msgid "unable to start 'show' for object '%s'"
-msgstr "não foi possível iniciar o comando 'show' sobre o objeto '%s'"
+msgstr "incapaz iniciar 'show' para objeto '%s'"
 
 #: builtin/notes.c:154
 msgid "could not read 'show' output"
-msgstr "não foi possível ler a saída do comando 'show'"
+msgstr "incapaz ler output de 'show'"
 
 #: builtin/notes.c:162
 #, c-format
@@ -17855,34 +18185,34 @@ msgstr "forneça o conteúdo da nota usando a opção -m ou -F"
 
 #: builtin/notes.c:206
 msgid "unable to write note object"
-msgstr "não é possível escrever o objeto de nota"
+msgstr "incapaz escrever para objeto de nota"
 
 #: builtin/notes.c:208
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "o conteúdo da nota foi colocado em %s"
 
-#: builtin/notes.c:242 builtin/tag.c:533
+#: builtin/notes.c:242 builtin/tag.c:576
 #, c-format
 msgid "could not open or read '%s'"
-msgstr "não foi possível abrir ou ler '%s'"
+msgstr "incapaz abrir ou ler '%s'"
 
 #: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
 #: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
 #: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
-msgstr "falha ao resolver '%s' como uma referência válida."
+msgstr "falhou resolver '%s' como uma ref válida."
 
 #: builtin/notes.c:265
 #, c-format
 msgid "failed to read object '%s'."
-msgstr "falha ao ler o objeto '%s'."
+msgstr "falhou ler objeto '%s'."
 
 #: builtin/notes.c:268
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
-msgstr "não é possível ler os dados da nota de um objeto não-blob '%s'."
+msgstr "incapaz ler dados de nota, de objeto não-blob '%s'."
 
 #: builtin/notes.c:309
 #, c-format
@@ -17892,7 +18222,7 @@ msgstr "linha de entrada malformada: '%s'."
 #: builtin/notes.c:324
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
-msgstr "falha ao copiar notas de '%s' para '%s'"
+msgstr "falhou copiar notas de '%s' para '%s'"
 
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
@@ -17905,8 +18235,9 @@ msgstr "foi recusado efetuar %s de notas em %s (fora de refs/notes/)"
 #: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
 #: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
 #: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-msgid "too many parameters"
-msgstr "demasiados parâmetros"
+#: builtin/prune-packed.c:25 builtin/tag.c:586
+msgid "too many arguments"
+msgstr ""
 
 #: builtin/notes.c:389 builtin/notes.c:678
 #, c-format
@@ -17927,7 +18258,7 @@ msgstr "reutilizar e editar o objeto de nota especificado"
 
 #: builtin/notes.c:419 builtin/notes.c:585
 msgid "reuse specified note object"
-msgstr "reutilizar o objeto de nota especificado"
+msgstr "reutilizar objeto de nota especificado"
 
 #: builtin/notes.c:422 builtin/notes.c:588
 msgid "allow storing empty note"
@@ -17965,8 +18296,8 @@ msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "carregar configuração de reescrita do <comando> (implica --stdin)"
 
 #: builtin/notes.c:517
-msgid "too few parameters"
-msgstr "parâmetros insuficientes"
+msgid "too few arguments"
+msgstr ""
 
 #: builtin/notes.c:538
 #, c-format
@@ -17974,8 +18305,8 @@ msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
-"Incapaz copiar notas. Encontrei Notas existentes para objeto %s. Usa '-f' para "
-"subscrever notas existentes"
+"Incapaz copiar notas. Encontrei Notas existentes para objeto %s. Usa '-f' "
+"para subscrever notas existentes"
 
 #: builtin/notes.c:550
 #, c-format
@@ -18001,19 +18332,19 @@ msgstr "falha ao eliminar a referência NOTES_MERGE_REF"
 
 #: builtin/notes.c:702
 msgid "failed to remove 'git notes merge' worktree"
-msgstr "falha ao remover a árvore de trabalho de 'git notes merge'"
+msgstr "falha ao remover a árvore-trabalho de 'git notes merge'"
 
 #: builtin/notes.c:722
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
-msgstr "falha ao ler referência NOTES_MERGE_PARTIAL"
+msgstr "falha ao ler ref NOTES_MERGE_PARTIAL"
 
 #: builtin/notes.c:724
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
-msgstr "não foi possível encontrar o commit de NOTES_MERGE_PARTIAL."
+msgstr "incapaz encontrar memória a partir de NOTES_MERGE_PARTIAL."
 
 #: builtin/notes.c:726
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
-msgstr "não foi possível analisar o commit de NOTES_MERGE_PARTIAL."
+msgstr "incapaz processar memória a partir de NOTES_MERGE_PARTIAL."
 
 #: builtin/notes.c:739
 msgid "failed to resolve NOTES_MERGE_REF"
@@ -18021,7 +18352,7 @@ msgstr "falha ao resolver NOTES_MERGE_REF"
 
 #: builtin/notes.c:742
 msgid "failed to finalize notes merge"
-msgstr "falha ao finalizar integração de notas"
+msgstr "falhou finalizar junção de notas"
 
 #: builtin/notes.c:768
 #, c-format
@@ -18034,7 +18365,7 @@ msgstr "Opções gerais"
 
 #: builtin/notes.c:786
 msgid "Merge options"
-msgstr "Opções de integração"
+msgstr "Opções de junção"
 
 #: builtin/notes.c:788
 msgid ""
@@ -18046,11 +18377,11 @@ msgstr ""
 
 #: builtin/notes.c:790
 msgid "Committing unmerged notes"
-msgstr "A submeter notas não integradas"
+msgstr "Memorizando notas por juntar"
 
 #: builtin/notes.c:792
 msgid "finalize notes merge by committing unmerged notes"
-msgstr "concluir integração de notas, submetendo notas não integradas"
+msgstr "concluir junção de notas, memorizando notas por juntar"
 
 #: builtin/notes.c:794
 msgid "Aborting notes merge resolution"
@@ -18062,7 +18393,7 @@ msgstr "abortar integração das notas"
 
 #: builtin/notes.c:807
 msgid "cannot mix --commit, --abort or -s/--strategy"
-msgstr "não é possível misturar --commit, --abort ou -s/--strategy"
+msgstr "incapaz misturar --commit, --abort ou -s/--strategy"
 
 #: builtin/notes.c:812
 msgid "must specify a notes ref to merge"
@@ -18081,7 +18412,7 @@ msgstr "uma integração das notas em %s já está em curso em %s"
 #: builtin/notes.c:876
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
-msgstr "falha ao guardar ligação à referência de notas atual (%s)"
+msgstr "falhou ao guardar ligação à ref de notas atual (%s)"
 
 #: builtin/notes.c:878
 #, c-format
@@ -18094,7 +18425,7 @@ msgstr ""
 "submeta o resultado com 'git notes merge --commit' ou aborte a integração "
 "com 'git notes merge --abort'.\n"
 
-#: builtin/notes.c:897 builtin/tag.c:546
+#: builtin/notes.c:897 builtin/tag.c:589
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Falha ao resolver '%s' numa referência válida."
@@ -18106,15 +18437,15 @@ msgstr "O objeto %s tem nota nenhuma\n"
 
 #: builtin/notes.c:912
 msgid "attempt to remove non-existent note is not an error"
-msgstr "não considerar como erro a remoção de uma nota não existente"
+msgstr "apenas é erro se remover nota existente"
 
 #: builtin/notes.c:915
 msgid "read object names from the standard input"
 msgstr "ler nome dos objetos da entrada padrão"
 
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
 msgid "do not remove, show only"
-msgstr "não remover, mostrar apenas"
+msgstr "remover nada, apenas mostrar"
 
 #: builtin/notes.c:955
 msgid "report pruned notes"
@@ -18128,401 +18459,431 @@ msgstr "notes-ref"
 msgid "use notes from <notes-ref>"
 msgstr "usar notas de <notes-ref>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1604
+#: builtin/notes.c:1034 builtin/stash.c:1735
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subcomando desconhecido: %s"
 
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<opções>...] [< <lista-referências> | < <lista-"
 "objetos>]"
 
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<opções>...] <nome-base> [< <lista-referências> | < <lista-"
 "objetos>]"
 
-#: builtin/pack-objects.c:443
-#, fuzzy, c-format
+#: builtin/pack-objects.c:572
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+
+#: builtin/pack-objects.c:580
+#, c-format
 msgid "bad packed object CRC for %s"
-msgstr "ignorar objetos compactados"
+msgstr ""
 
-#: builtin/pack-objects.c:454
-#, fuzzy, c-format
+#: builtin/pack-objects.c:591
+#, c-format
 msgid "corrupt packed object for %s"
-msgstr "ignorar objetos compactados"
+msgstr ""
 
-#: builtin/pack-objects.c:585
-#, fuzzy, c-format
+#: builtin/pack-objects.c:722
+#, c-format
 msgid "recursive delta detected for object %s"
-msgstr "o objeto esperado %s não foi recebido"
+msgstr "delta recursivo detetado para objeto %s"
 
-#: builtin/pack-objects.c:796
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:1004
+#: builtin/pack-objects.c:1036
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "esperado objeto no offset %<PRIuMAX> em pacote %s"
+
+#: builtin/pack-objects.c:1155
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "a desativar escrita de mapa de bits, os pacotes são divididos devido a pack."
 "packSizeLimit"
 
-#: builtin/pack-objects.c:1017
+#: builtin/pack-objects.c:1168
 msgid "Writing objects"
-msgstr "A escrever objetos"
+msgstr ""
 
-#: builtin/pack-objects.c:1078 builtin/update-index.c:90
+#: builtin/pack-objects.c:1229 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
-msgstr "falha ao invocar stat de %s"
+msgstr "falhou stat a %s"
 
-#: builtin/pack-objects.c:1131
+#: builtin/pack-objects.c:1281
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:1348
+#: builtin/pack-objects.c:1523
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
-"a desativar escrita de mapa de bits, visto que alguns objetos não estão a "
-"ser compactados"
+"desativando escrita bitmap, visto a incapacidade de alguns objetos serem "
+"compactados"
 
-#: builtin/pack-objects.c:1796
-#, fuzzy, c-format
+#: builtin/pack-objects.c:1971
+#, c-format
 msgid "delta base offset overflow in pack for %s"
-msgstr "offset da base delta está fora do limite"
+msgstr ""
 
-#: builtin/pack-objects.c:1805
-#, fuzzy, c-format
+#: builtin/pack-objects.c:1980
+#, c-format
 msgid "delta base offset out of bound for %s"
-msgstr "offset da base delta está fora do limite"
+msgstr "offset de base delta está fora do limite para %s"
 
-#: builtin/pack-objects.c:2086
+#: builtin/pack-objects.c:2261
 msgid "Counting objects"
 msgstr "A contar objetos"
 
-#: builtin/pack-objects.c:2231
-#, fuzzy, c-format
+#: builtin/pack-objects.c:2426
+#, c-format
 msgid "unable to parse object header of %s"
-msgstr "não foi possível analisar o objeto: %s"
+msgstr "incapaz processar cabeçalho de objeto de %s"
 
-#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317
-#: builtin/pack-objects.c:2327
-#, fuzzy, c-format
+#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
+#: builtin/pack-objects.c:2522
+#, c-format
 msgid "object %s cannot be read"
-msgstr "objeto %s não encontrado"
+msgstr "objeto %s incapaz ser lido"
 
-#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331
+#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 
-#: builtin/pack-objects.c:2341
+#: builtin/pack-objects.c:2536
 msgid "suboptimal pack - out of memory"
 msgstr ""
 
-#: builtin/pack-objects.c:2656
+#: builtin/pack-objects.c:2851
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr ""
 
-#: builtin/pack-objects.c:2795
-#, fuzzy, c-format
+#: builtin/pack-objects.c:2990
+#, c-format
 msgid "unable to pack objects reachable from tag %s"
-msgstr "incluir objetos alcançáveis a partir de qualquer referência"
+msgstr "incapaz de empacotar objetos alcançáveis a partir de etiqueta %s"
 
-#: builtin/pack-objects.c:2883
+#: builtin/pack-objects.c:3076
 msgid "Compressing objects"
-msgstr "A comprimir objetos"
+msgstr "Comprimindo objetos"
 
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:3082
 msgid "inconsistency with delta count"
 msgstr ""
 
-#: builtin/pack-objects.c:2961
+#: builtin/pack-objects.c:3161
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
 "hash> <uri>' (got '%s')"
 msgstr ""
 
-#: builtin/pack-objects.c:2964
+#: builtin/pack-objects.c:3164
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
 msgstr ""
 
-#: builtin/pack-objects.c:2993
+#: builtin/pack-objects.c:3199
+#, c-format
+msgid "could not get type of object %s in pack %s"
+msgstr "incapaz obter tipo de objeto %s em pacote %s"
+
+#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#, c-format
+msgid "could not find pack '%s'"
+msgstr "incapaz encontrar pacote '%s'"
+
+#: builtin/pack-objects.c:3378
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2999
+#: builtin/pack-objects.c:3384
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:3097
-#, fuzzy
+#: builtin/pack-objects.c:3482
 msgid "invalid value for --missing"
-msgstr "valor inválido de %s"
+msgstr ""
 
-#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264
-#, fuzzy
+#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
 msgid "cannot open pack index"
-msgstr "não é possível invocar pread sobre o ficheiro de pacote"
+msgstr "incapaz abrir index pack"
 
-#: builtin/pack-objects.c:3187
+#: builtin/pack-objects.c:3572
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr ""
 
-#: builtin/pack-objects.c:3272
-#, fuzzy
+#: builtin/pack-objects.c:3658
 msgid "unable to force loose object"
-msgstr "não é possível escrever o objeto de nota"
+msgstr "incapaz forçar objeto solto"
 
-#: builtin/pack-objects.c:3365
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3788
+#, c-format
 msgid "not a rev '%s'"
-msgstr "não é possível ler '%s'"
+msgstr "rev '%s' nenhum"
 
-#: builtin/pack-objects.c:3368
-#, fuzzy, c-format
+#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#, c-format
 msgid "bad revision '%s'"
-msgstr "repositório '%s' incorreto"
+msgstr "revisão '%s' incorreto"
 
-#: builtin/pack-objects.c:3393
-#, fuzzy
+#: builtin/pack-objects.c:3819
 msgid "unable to add recent objects"
-msgstr "não foi possível analisar o objeto: %s"
+msgstr "incapaz adicionar objetos recentes"
 
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3872
 #, c-format
 msgid "unsupported index version %s"
-msgstr "versão de índice %s não suportada"
+msgstr "versão de index %s insustentada"
 
-#: builtin/pack-objects.c:3450
+#: builtin/pack-objects.c:3876
 #, c-format
 msgid "bad index version '%s'"
-msgstr "versão de índice '%s' incorreta"
+msgstr "versão de cenário '%s' inválida"
 
-#: builtin/pack-objects.c:3488
-#, fuzzy
+#: builtin/pack-objects.c:3915
 msgid "<version>[,<offset>]"
 msgstr "versão[,offset]"
 
-#: builtin/pack-objects.c:3489
+#: builtin/pack-objects.c:3916
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "escrever o ficheiro de índice do pacote na versão de formato especificada"
 
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3919
 msgid "maximum size of each output pack file"
-msgstr "tamanho máximo de cada ficheiro de pacote gerado"
+msgstr "tamanho máximo de cada saída de ficheiro-pacote"
 
-#: builtin/pack-objects.c:3494
+#: builtin/pack-objects.c:3921
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorar objetos emprestados do arquivo de objetos sobressalentes"
 
-#: builtin/pack-objects.c:3496
+#: builtin/pack-objects.c:3923
 msgid "ignore packed objects"
-msgstr "ignorar objetos compactados"
+msgstr ""
 
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3925
 msgid "limit pack window by objects"
 msgstr "limitar a janela de compactação por objetos"
 
-#: builtin/pack-objects.c:3500
+#: builtin/pack-objects.c:3927
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "limitar a janela de compactação por memória em adição ao limite por objetos"
 
-#: builtin/pack-objects.c:3502
+#: builtin/pack-objects.c:3929
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "tamanho máximo de cadeias delta permitidas no pacote resultante"
 
-#: builtin/pack-objects.c:3504
+#: builtin/pack-objects.c:3931
 msgid "reuse existing deltas"
 msgstr "reutilizar deltas existentes"
 
-#: builtin/pack-objects.c:3506
+#: builtin/pack-objects.c:3933
 msgid "reuse existing objects"
 msgstr "reutilizar objetos existentes"
 
-#: builtin/pack-objects.c:3508
+#: builtin/pack-objects.c:3935
 msgid "use OFS_DELTA objects"
 msgstr "usar objetos OFS_DELTA"
 
-#: builtin/pack-objects.c:3510
+#: builtin/pack-objects.c:3937
 msgid "use threads when searching for best delta matches"
 msgstr "usar threads ao procurar pela melhor correspondência delta"
 
-#: builtin/pack-objects.c:3512
+#: builtin/pack-objects.c:3939
 msgid "do not create an empty pack output"
-msgstr "não criar um pacote vazio"
+msgstr "criar output de pack vazio nenhum"
 
-#: builtin/pack-objects.c:3514
+#: builtin/pack-objects.c:3941
 msgid "read revision arguments from standard input"
 msgstr "ler argumentos de revisão da entrada padrão"
 
-#: builtin/pack-objects.c:3516
+#: builtin/pack-objects.c:3943
 msgid "limit the objects to those that are not yet packed"
-msgstr "restringir-se aos objetos que ainda não foram compactados"
+msgstr "restringir-se aos objetos que ainda estão por compactar"
 
-#: builtin/pack-objects.c:3519
+#: builtin/pack-objects.c:3946
 msgid "include objects reachable from any reference"
 msgstr "incluir objetos alcançáveis a partir de qualquer referência"
 
-#: builtin/pack-objects.c:3522
+#: builtin/pack-objects.c:3949
 msgid "include objects referred by reflog entries"
 msgstr "incluir objetos referenciados por entradas do reflog"
 
-#: builtin/pack-objects.c:3525
+#: builtin/pack-objects.c:3952
 msgid "include objects referred to by the index"
 msgstr "incluir objetos referenciados pelo índice"
 
-#: builtin/pack-objects.c:3528
+#: builtin/pack-objects.c:3955
+msgid "read packs from stdin"
+msgstr ""
+
+#: builtin/pack-objects.c:3957
 msgid "output pack to stdout"
 msgstr "gerar pacote para a saída padrão"
 
-#: builtin/pack-objects.c:3530
+#: builtin/pack-objects.c:3959
 msgid "include tag objects that refer to objects to be packed"
 msgstr "incluir objetos tag que refiram objetos a compactar"
 
-#: builtin/pack-objects.c:3532
+#: builtin/pack-objects.c:3961
 msgid "keep unreachable objects"
 msgstr "manter objetos inalcançáveis"
 
-#: builtin/pack-objects.c:3534
+#: builtin/pack-objects.c:3963
 msgid "pack loose unreachable objects"
 msgstr "empacotar objetos soltos inalcançáveis"
 
-#: builtin/pack-objects.c:3536
+#: builtin/pack-objects.c:3965
 msgid "unpack unreachable objects newer than <time>"
 msgstr "descompactar objetos inalcançáveis mais recentes que <tempo>"
 
-#: builtin/pack-objects.c:3539
+#: builtin/pack-objects.c:3968
 msgid "use the sparse reachability algorithm"
 msgstr ""
 
-#: builtin/pack-objects.c:3541
+#: builtin/pack-objects.c:3970
 msgid "create thin packs"
 msgstr "criar pacotes finos"
 
-#: builtin/pack-objects.c:3543
+#: builtin/pack-objects.c:3972
 msgid "create packs suitable for shallow fetches"
 msgstr "criar pacotes adequados para obter em repositórios pouco profundos"
 
-#: builtin/pack-objects.c:3545
+#: builtin/pack-objects.c:3974
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorar pacotes que tenham um ficheiro .keep"
 
-#: builtin/pack-objects.c:3547
-#, fuzzy
+#: builtin/pack-objects.c:3976
 msgid "ignore this pack"
-msgstr "usar pacote fino"
+msgstr "ignorar este pacote"
 
-#: builtin/pack-objects.c:3549
+#: builtin/pack-objects.c:3978
 msgid "pack compression level"
-msgstr "nível de compactação do pacote"
+msgstr "nível de compressão de pacote"
 
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3980
 msgid "do not hide commits by grafts"
-msgstr "não esconder commits introduzidos por enxertos"
+msgstr "esconder commits por enxertos nenhuns"
 
-#: builtin/pack-objects.c:3553
+#: builtin/pack-objects.c:3982
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "usar um índice de mapa de bits se disponível, para acelerar a contagem de "
 "objetos"
 
-#: builtin/pack-objects.c:3555
+#: builtin/pack-objects.c:3984
 msgid "write a bitmap index together with the pack index"
 msgstr "escrever um índice de mapa de bits juntamente com o índice do pacote"
 
-#: builtin/pack-objects.c:3559
-#, fuzzy
+#: builtin/pack-objects.c:3988
 msgid "write a bitmap index if possible"
-msgstr "escrever índice de mapa de bits"
+msgstr "escrever um index de bitmap se possível"
 
-#: builtin/pack-objects.c:3563
-#, fuzzy
+#: builtin/pack-objects.c:3992
 msgid "handling for missing objects"
-msgstr "permitir objetos não presentes"
+msgstr "lidando para objetos que faltem"
 
-#: builtin/pack-objects.c:3566
+#: builtin/pack-objects.c:3995
 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 
-#: builtin/pack-objects.c:3568
-#, fuzzy
+#: builtin/pack-objects.c:3997
 msgid "respect islands during delta compression"
-msgstr "dimensão da janela usada em compressão de deltas"
+msgstr "respeitar ilhas durante compressão de delta"
 
-#: builtin/pack-objects.c:3570
+#: builtin/pack-objects.c:3999
 msgid "protocol"
 msgstr ""
 
-#: builtin/pack-objects.c:3571
+#: builtin/pack-objects.c:4000
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr ""
 
-#: builtin/pack-objects.c:3600
+#: builtin/pack-objects.c:4033
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr ""
 
-#: builtin/pack-objects.c:3605
+#: builtin/pack-objects.c:4038
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr ""
 
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:4094
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 
-#: builtin/pack-objects.c:3661
+#: builtin/pack-objects.c:4096
 msgid "minimum pack size limit is 1 MiB"
 msgstr ""
 
-#: builtin/pack-objects.c:3666
-#, fuzzy
+#: builtin/pack-objects.c:4101
 msgid "--thin cannot be used to build an indexable pack"
-msgstr "--fix-thin não pode ser usado sem --stdin"
+msgstr "incapaz usar --thin para construir pacote indexável"
 
-#: builtin/pack-objects.c:3669
-#, fuzzy
+#: builtin/pack-objects.c:4104
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable e -A são incompatíveis"
+msgstr "--keep-unreachable e --unpack-unreachable são incompatíveis"
 
-#: builtin/pack-objects.c:3675
-#, fuzzy
+#: builtin/pack-objects.c:4110
 msgid "cannot use --filter without --stdout"
-msgstr "não é possível usar -a com -d"
+msgstr "apenas podes usar --filter com --stdout"
+
+#: builtin/pack-objects.c:4112
+msgid "cannot use --filter with --stdin-packs"
+msgstr "incapaz usar --filter com --stdin-packs"
+
+#: builtin/pack-objects.c:4116
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr ""
 
-#: builtin/pack-objects.c:3735
-#, fuzzy
+#: builtin/pack-objects.c:4175
 msgid "Enumerating objects"
-msgstr "A escrever objetos"
+msgstr ""
 
-#: builtin/pack-objects.c:3766
+#: builtin/pack-objects.c:4212
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
 "reused %<PRIu32>"
 msgstr ""
 
+#: builtin/pack-redundant.c:601
+msgid ""
+"'git pack-redundant' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>.  Thanks.\n"
+msgstr ""
+
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
 msgstr "git pack-refs [<opções>]"
@@ -18533,16 +18894,15 @@ msgstr "compactar tudo"
 
 #: builtin/pack-refs.c:17
 msgid "prune loose refs (default)"
-msgstr "eliminar referências soltas (predefinição)"
+msgstr "podar refs soltas (predefinição)"
 
 #: builtin/prune-packed.c:6
 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 
 #: builtin/prune.c:14
-#, fuzzy
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--expire <tempo>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <tempo>] [--] [<cabeça>...]"
 
 #: builtin/prune.c:133
 msgid "report pruned objects"
@@ -18550,7 +18910,7 @@ msgstr "apresentar objetos eliminados"
 
 #: builtin/prune.c:136
 msgid "expire objects older than <time>"
-msgstr "expirar objetos mais antigos que <tempo>"
+msgstr "expirar objetos mais velhos que <tempo>"
 
 #: builtin/prune.c:138
 msgid "limit traversal to objects outside promisor packfiles"
@@ -18558,7 +18918,7 @@ msgstr ""
 
 #: builtin/prune.c:152
 msgid "cannot prune in a precious-objects repo"
-msgstr "não é possível limpar num repositório de objetos-preciosos"
+msgstr "incapaz podar num repo de precious-objects"
 
 #: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
@@ -18567,12 +18927,11 @@ msgstr "Valor inválido de %s: %s"
 
 #: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
-msgstr "git pull [<opções>] [<repositório> [<especificador-de-referência>...]]"
+msgstr "git pull [<opções>] [<repositório> [<espetro-ref>...]]"
 
 #: builtin/pull.c:123
-#, fuzzy
 msgid "control for recursive fetching of submodules"
-msgstr "controlar a obtenção recursiva de submódulos"
+msgstr "controlo para buscar recursivo de submódulos"
 
 #: builtin/pull.c:127
 msgid "Options related to merging"
@@ -18582,12 +18941,11 @@ msgstr "Opções relativas a integração"
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporar alterações por rebase em vez de integrar"
 
-#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "permitir avanço rápido"
 
-#: builtin/pull.c:167 parse-options.h:339
-#, fuzzy
+#: builtin/pull.c:167 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr "empilhar/desempilhar automaticamente antes de depois de rebase"
 
@@ -18597,7 +18955,7 @@ msgstr "Opções relacionadas com obtenção de objetos"
 
 #: builtin/pull.c:193
 msgid "force overwrite of local branch"
-msgstr "forçar a substituição do ramo local"
+msgstr "forçar sobrescrever ramo local"
 
 #: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
@@ -18608,37 +18966,18 @@ msgstr "número de submódulos com pull em paralelo"
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valor inválido de pull.ff: %s"
 
-#: builtin/pull.c:348
-msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
-"\n"
-"  git config pull.rebase false  # merge (the default strategy)\n"
-"  git config pull.rebase true   # rebase\n"
-"  git config pull.ff only       # fast-forward only\n"
-"\n"
-"You can replace \"git config\" with \"git config --global\" to set a "
-"default\n"
-"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
-"or --ff-only on the command line to override the configured default per\n"
-"invocation.\n"
-msgstr ""
-
-#: builtin/pull.c:458
+#: builtin/pull.c:445
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
-msgstr ""
-"As refs que obteste tem candidato nenhum para onde rebasear."
+msgstr "As refs que obteste tem candidato nenhum para onde rebasear."
 
-#: builtin/pull.c:460
+#: builtin/pull.c:447
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
-msgstr ""
-"As refs que obteste tem candidato nenhum para junção."
+msgstr "As refs que obteste tem candidato nenhum para junção."
 
-#: builtin/pull.c:461
+#: builtin/pull.c:448
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -18646,86 +18985,101 @@ msgstr ""
 "Normalmente isto significa que forneceste um wildcard especificador de ref\n"
 "que tem correspondência nenhuma no lado do remoto."
 
-#: builtin/pull.c:464
+#: builtin/pull.c:451
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
 "a branch. Because this is not the default configured remote\n"
 "for your current branch, you must specify a branch on the command line."
 msgstr ""
-"Solicitou puxar o remoto '%s', mas não especificou um ramo.\n"
-"Uma vez que este não é o remoto configurado por predefinição\n"
-"do ramo atual, deve especificar um ramo na linha de comandos."
+"Pediste para agarrar remoto '%s', mas falta especificar um ramo.\n"
+"Visto que o remoto configurado como predefinido para o ramo atual é\n"
+"outro, deves de especificar um ramo na linha de comandos."
 
-#: builtin/pull.c:469 builtin/rebase.c:1246
+#: builtin/pull.c:456 builtin/rebase.c:1248
 msgid "You are not currently on a branch."
 msgstr "Atualmente estás em ramo nenhum."
 
-#: builtin/pull.c:471 builtin/pull.c:486
+#: builtin/pull.c:458 builtin/pull.c:473
 msgid "Please specify which branch you want to rebase against."
 msgstr "Especifique o ramo sobre o qual pretende realizar rebase."
 
-#: builtin/pull.c:473 builtin/pull.c:488
+#: builtin/pull.c:460 builtin/pull.c:475
 msgid "Please specify which branch you want to merge with."
 msgstr "Especifique o ramo com o qual pretende integrar."
 
-#: builtin/pull.c:474 builtin/pull.c:489
+#: builtin/pull.c:461 builtin/pull.c:476
 msgid "See git-pull(1) for details."
-msgstr "Consulte git-pull(1) para obter mais detalhes."
+msgstr "Vê git-pull(1) para detalhes."
 
-#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491
-#: builtin/rebase.c:1252
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1254
 msgid "<remote>"
 msgstr "<remoto>"
 
-#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
 msgid "<branch>"
 msgstr "<ramo>"
 
-#: builtin/pull.c:484 builtin/rebase.c:1244
+#: builtin/pull.c:471 builtin/rebase.c:1246
 msgid "There is no tracking information for the current branch."
 msgstr "O ramo atual tem informação de tracking nenhuma."
 
-#: builtin/pull.c:493
+#: builtin/pull.c:480
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 "Se deseja definir o ramo que deve ser seguido por este ramo, pode fazê-lo "
 "com:"
 
-#: builtin/pull.c:498
+#: builtin/pull.c:485
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr ""
-"A configuração indica para integrar com a referência '%s'\n"
-"do remoto, mas aquela referência não foi obtida."
+"Tua configuração indica para juntar com ref '%s'\n"
+"a partir do remoto, mas essa ref está por buscar."
 
-#: builtin/pull.c:609
-#, fuzzy, c-format
+#: builtin/pull.c:596
+#, c-format
 msgid "unable to access commit %s"
-msgstr "não foi possível analisar o commit %s"
+msgstr "incapaz acessar commit %s"
 
-#: builtin/pull.c:915
+#: builtin/pull.c:902
 msgid "ignoring --verify-signatures for rebase"
-msgstr "ignorado --verify-signatures para rebase"
+msgstr "ignorando --verify-signatures para rebase"
 
-#: builtin/pull.c:972
-msgid "Updating an unborn branch with changes added to the index."
+#: builtin/pull.c:930
+msgid ""
+"Pulling without specifying how to reconcile divergent branches is\n"
+"discouraged. You can squelch this message by running one of the following\n"
+"commands sometime before your next pull:\n"
+"\n"
+"  git config pull.rebase false  # merge (the default strategy)\n"
+"  git config pull.rebase true   # rebase\n"
+"  git config pull.ff only       # fast-forward only\n"
+"\n"
+"You can replace \"git config\" with \"git config --global\" to set a "
+"default\n"
+"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
+"or --ff-only on the command line to override the configured default per\n"
+"invocation.\n"
 msgstr ""
-"A atualizar um ramo que ainda não foi criado e com alterações adicionadas ao "
-"índice."
 
-#: builtin/pull.c:976
+#: builtin/pull.c:990
+msgid "Updating an unborn branch with changes added to the index."
+msgstr "Atualizando um ramo por nascer com alterações adicionadas ao índex."
+
+#: builtin/pull.c:994
 msgid "pull with rebase"
 msgstr "pull com rebase"
 
-#: builtin/pull.c:977
+#: builtin/pull.c:995
 msgid "please commit or stash them."
 msgstr "submeta ou esconda-as."
 
-#: builtin/pull.c:1002
+#: builtin/pull.c:1020
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -18736,7 +19090,7 @@ msgstr ""
 "a avançar a árvore de trabalho a partir do\n"
 "commit %s."
 
-#: builtin/pull.c:1008
+#: builtin/pull.c:1026
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -18753,29 +19107,29 @@ msgstr ""
 "$ git reset --hard\n"
 "para recuperar."
 
-#: builtin/pull.c:1023
+#: builtin/pull.c:1041
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Incapaz de juntar ramos múltiplos para head vazia."
 
-#: builtin/pull.c:1027
+#: builtin/pull.c:1045
 msgid "Cannot rebase onto multiple branches."
 msgstr "Incapaz de rebasear sobre ramos múltiplos."
 
-#: builtin/pull.c:1041
+#: builtin/pull.c:1065
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 
 #: builtin/push.c:19
 msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr "git push [<opções>] [<repositório> [<especificador-de-referência>...]]"
+msgstr "git push [<opções>] [<repositório> [<espetro-ref>...]]"
 
 #: builtin/push.c:111
 msgid "tag shorthand without <tag>"
-msgstr "forma abreviada de tag sem <tag>"
+msgstr "forma abreviada de etiqueta sem <etiqueta>"
 
 #: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
-msgstr "--delete só aceita nomes simples como referências de destino"
+msgstr "--delete só aceita nomes de ref simples como destino"
 
 #: builtin/push.c:164
 msgid ""
@@ -18787,7 +19141,7 @@ msgstr ""
 "config'."
 
 #: builtin/push.c:167
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
 "the name of your current branch.  To push to the upstream branch\n"
@@ -18800,14 +19154,14 @@ msgid ""
 "    git push %s HEAD\n"
 "%s"
 msgstr ""
-"O ramo a montante do ramo atual não coincide com o nome do ramo atual.\n"
-"Para publicar no ramo a montante no remoto, use\n"
+"Ramo upstream do ramo atual corresponde com nome ramo atual nenhum.\n"
+"Para atirar para ramo upstream do remoto, usa\n"
 "\n"
 "    git push %s HEAD:%s\n"
 "\n"
-"Para publicar no ramo com o mesmo nome no remoto, use\n"
+"Para atirar para ramo com o mesmo nome no remoto, usa\n"
 "\n"
-"    git push %s %s\n"
+"    git push %s HEAD\n"
 "%s"
 
 #: builtin/push.c:182
@@ -18824,7 +19178,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nome-de-ramo-remoto>\n"
 
-#: builtin/push.c:194
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -18837,29 +19191,28 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:202
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "O ramo atual %s tem múltiplos ramos a montante, publicação recusada."
 
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr "Indicou refspecs nenhum para atirar, e push.default é \"nothing\"."
+
+#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
 "your current branch '%s', without telling me what to push\n"
 "to update which remote branch."
 msgstr ""
-"O remoto '%s', no qual pretende publicar, não é o remoto a montante\n"
-"do ramo atual '%s'. Deve indicar o que pretende publicar e que ramo\n"
-"remoto atualizar."
+"Estás atirando para remoto '%s', que é nenhum upstream do teu\n"
+"ramo atual '%s', sem dizer-me o que atirar para atualizar\n"
+"um qualquer ramo remoto."
 
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"Indicou refspecs nenhum para atirar, e push.default é \"nothing\"."
-
-#: builtin/push.c:267
+#: builtin/push.c:258
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -18871,7 +19224,7 @@ msgstr ""
 "'git pull ...') antes de publicar de novo.\n"
 "Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes."
 
-#: builtin/push.c:273
+#: builtin/push.c:264
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -18883,7 +19236,7 @@ msgstr ""
 "as alterações remotas (e.g. 'git pull ...') antes de publicar de novo.\n"
 "Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes."
 
-#: builtin/push.c:279
+#: builtin/push.c:270
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -18897,11 +19250,11 @@ msgstr ""
 "de fazeres novo push.\n"
 "Vê a 'Note about fast-forwards' do 'git push --help' para detalhes."
 
-#: builtin/push.c:286
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "As atualizações foram rejeitadas porque a tag já existe no remoto."
 
-#: builtin/push.c:289
+#: builtin/push.c:280
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -18911,117 +19264,115 @@ msgstr ""
 "fora de commit, ou atualizar uma ref remota fazendo-a apontar para um\n"
 "objeto fora de commit, sem usar a opção '--force'.\n"
 
-#: builtin/push.c:294
-#, fuzzy
+#: builtin/push.c:285
 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 ""
-"As atualizações foram rejeitadas porque a ponta do ramo atual está atrasada\n"
-"em relação ao homólogo remoto. Integre as alterações remotas (e.g.\n"
-"'git pull ...') antes de publicar de novo.\n"
-"Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes."
+"Atualizações foram rejeitadas porque a ponta do ramo remoto de\n"
+"monitorização foi atualizado desde a última observação. Poderás querer\n"
+"integrar essas alterações localmente (e.g., 'git pull ...') antes de\n"
+"forçar uma atualização.\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
-msgstr "Fazendo push para %s\n"
+msgstr "Atirando para %s\n"
 
-#: builtin/push.c:371
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
-msgstr "falha ao publicar algumas referências em '%s'"
+msgstr "falha ao atirar algumas refs para '%s'"
 
-#: builtin/push.c:553
+#: builtin/push.c:544
 msgid "repository"
 msgstr "repositório"
 
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:189
 msgid "push all refs"
-msgstr "publicar todas as referências"
+msgstr "atirar todas as refs"
 
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:191
 msgid "mirror all refs"
-msgstr "replicar todas as referências"
+msgstr "replicar todas as refs"
 
-#: builtin/push.c:557
+#: builtin/push.c:548
 msgid "delete refs"
-msgstr "eliminar referências"
+msgstr "apagar refs"
 
-#: builtin/push.c:558
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
-msgstr "publicar tags (não pode ser usado com --all ou --mirror)"
+msgstr "atirar etiquetas (incapaz ser usado com --all ou --mirror)"
 
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:192
 msgid "force updates"
 msgstr "forçar atualização"
 
-#: builtin/push.c:562 builtin/send-pack.c:204
-#, fuzzy
+#: builtin/push.c:553 builtin/send-pack.c:204
 msgid "<refname>:<expect>"
-msgstr "nome da referência>:<esperado"
+msgstr "<nome-ref>:<esperado>"
 
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:205
 msgid "require old value of ref to be at this value"
-msgstr "exigir que o antigo valor da referência tenha este valor"
+msgstr "exigir que o antigo valor da ref tenha este valor"
 
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:208
 msgid "require remote updates to be integrated locally"
 msgstr ""
 
-#: builtin/push.c:569
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "controlar a publicação recursiva de submódulos"
 
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:199
 msgid "use thin pack"
 msgstr "usar pacote fino"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
 #: builtin/send-pack.c:187
 msgid "receive pack program"
 msgstr "programa receive pack"
 
-#: builtin/push.c:573
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
-msgstr "definir o ramo a montante usado com git pull/status"
+msgstr "definir upstream para git pull/status"
 
-#: builtin/push.c:576
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "eliminar referências removidas localmente"
 
-#: builtin/push.c:578
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "ignorar pre-push hook"
 
-#: builtin/push.c:579
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "publicar tags perdidas mas relevantes"
 
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:193
 msgid "GPG sign the push"
 msgstr "assinar publicação com GPG"
 
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:200
 msgid "request atomic transaction on remote side"
-msgstr "solicitar transação atómica no servidor remoto"
+msgstr "solicitar transação atómica do lado remoto"
 
-#: builtin/push.c:601
+#: builtin/push.c:592
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete é incompatível com --all, --mirror e --tags"
 
-#: builtin/push.c:603
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
-msgstr "--delete não faz sentido sem uma referência"
+msgstr "--delete apenas faz sentido com uma ref"
 
-#: builtin/push.c:623
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "repositório '%s' incorreto"
 
-#: builtin/push.c:624
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -19033,85 +19384,84 @@ msgid ""
 "\n"
 "    git push <name>\n"
 msgstr ""
-"Destino de publicação não definido.\n"
-"Indique um URL na linha de comandos ou configure um repositório remoto "
+"Destino de atirar indefinido.\n"
+"Indica um URL da linha de comandos ou configure um repositório remoto "
 "usando\n"
 "\n"
 "    git remote add <nome> <url>\n"
 "\n"
-"e publique usando o nome remoto\n"
+"e depois atire usando o nome remoto\n"
 "\n"
 "    git push <nome>\n"
 
-#: builtin/push.c:639
+#: builtin/push.c:630
 msgid "--all and --tags are incompatible"
 msgstr "--all e --tags são incompatíveis"
 
-#: builtin/push.c:641
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
-msgstr "--all não pode ser combinado com especificadores de referências"
+msgstr "incapaz combinar --all com espetros-ref"
 
-#: builtin/push.c:645
+#: builtin/push.c:636
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror e --tags são incompatíveis"
 
-#: builtin/push.c:647
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
-msgstr "--mirror não pode ser combinado com especificadores de referências"
+msgstr "incapaz combinar --mirror com espetros-ref"
 
-#: builtin/push.c:650
+#: builtin/push.c:641
 msgid "--all and --mirror are incompatible"
 msgstr "--all e --mirror são incompatíveis"
 
-#: builtin/push.c:657
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
-msgstr "as opções de publicação não podem ter carateres de nova linha"
+msgstr "opções de atirar podem ter caracteres de nova linha nenhuns"
 
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr ""
 
-#: builtin/range-diff.c:9
-#, fuzzy
+#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
-msgstr "git merge [<opções>] [<commit>...]"
+msgstr "git range-diff [<opções>] <ponta-antiga>...<ponta-nova>"
 
-#: builtin/range-diff.c:10
-#, fuzzy
+#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
-msgstr "git mv [<opções>] <origem>... <destino>"
-
-#: builtin/range-diff.c:22
-msgid "Percentage by which creation is weighted"
-msgstr ""
+msgstr "git range-diff [<opções>] <base> <ponta-antiga> <nova-ponta>"
 
-#: builtin/range-diff.c:24
-#, fuzzy
+#: builtin/range-diff.c:30
 msgid "use simple diff colors"
-msgstr "usar a ferramenta diff especificada"
+msgstr "usar cores diff simples"
 
-#: builtin/range-diff.c:26
-#, fuzzy
+#: builtin/range-diff.c:32
 msgid "notes"
-msgstr "notes-ref"
+msgstr "notas"
 
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
 msgid "passed to 'git log'"
 msgstr ""
 
-#: builtin/range-diff.c:50 builtin/range-diff.c:54
-#, fuzzy, c-format
-msgid "no .. in range: '%s'"
-msgstr "ramo inexistente: '%s'"
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr "apenas emitir saída relativa ao primeiro intervalo"
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "apenas emitir saída relativa ao segundo intervalo"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr "intervalo de memórias nenhum: '%s'"
 
-#: builtin/range-diff.c:64
+#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr ""
 
-#: builtin/range-diff.c:79
-#, fuzzy
+#: builtin/range-diff.c:89
 msgid "need two commit ranges"
-msgstr "editar a mensagem de commit"
+msgstr "preciso dois intervalos de memórias"
 
 #: builtin/read-tree.c:41
 msgid ""
@@ -19142,17 +19492,15 @@ msgstr "realizar uma integração em adição a uma leitura"
 
 #: builtin/read-tree.c:133
 msgid "3-way merge if no file level merging required"
-msgstr ""
-"integrar com 3 pontos se a integração ao nível de ficheiros não for "
-"necessária"
+msgstr "tri-junção se dispensar junção ao nível de ficheiros"
 
 #: builtin/read-tree.c:135
 msgid "3-way merge in presence of adds and removes"
-msgstr "integrar com 3 ponto na presença de adições e remoções"
+msgstr "tri-junção na presença de adições e remoções"
 
 #: builtin/read-tree.c:137
 msgid "same as -m, but discard unmerged entries"
-msgstr "o mesmo que -m, mas descartar entradas não integradas"
+msgstr "o mesmo que -m, mas descartar entradas por juntar"
 
 #: builtin/read-tree.c:138
 msgid "<subdirectory>/"
@@ -19176,29 +19524,27 @@ msgstr "permitir que os ficheiros explicitamente ignorados sejam substituídos"
 
 #: builtin/read-tree.c:148
 msgid "don't check the working tree after merging"
-msgstr "não verificar a árvore de trabalho depois de integrar"
+msgstr "verifica nenhuma worktree após junção"
 
 #: builtin/read-tree.c:149
 msgid "don't update the index or the work tree"
-msgstr "não atualizar o índice ou a árvore de trabalho"
+msgstr "atualizar index nenhum e worktree nenhuma"
 
 #: builtin/read-tree.c:151
 msgid "skip applying sparse checkout filter"
-msgstr "ignorar a aplicação do filtro de extração esparsa"
+msgstr "ignorar aplicar filtro de observação disperso"
 
 #: builtin/read-tree.c:153
 msgid "debug unpack-trees"
 msgstr "depurar unpack-trees"
 
 #: builtin/read-tree.c:157
-#, fuzzy
 msgid "suppress feedback messages"
-msgstr "suprimir mensagens informativas"
+msgstr "suprimir mensagens de feedback"
 
 #: builtin/read-tree.c:188
-#, fuzzy
 msgid "You need to resolve your current index first"
-msgstr "primeiro deve resolver o índice atual"
+msgstr "Primeiro precisas resolver teu cenário atual"
 
 #: builtin/rebase.c:35
 msgid ""
@@ -19212,218 +19558,196 @@ msgid ""
 msgstr ""
 
 #: builtin/rebase.c:39
-#, fuzzy
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
-msgstr "git am [<opções>] (--continue | --skip | --abort)"
+msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244
-#, fuzzy, c-format
+#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
+#, c-format
 msgid "unusable todo list: '%s'"
-msgstr "não é possível invocar unlink: %s"
+msgstr "lista de tarefas inutilizável: '%s'"
 
-#: builtin/rebase.c:310
-#, fuzzy, c-format
+#: builtin/rebase.c:311
+#, c-format
 msgid "could not create temporary %s"
-msgstr "não foi possível criar ficheiro temporário"
+msgstr "incapaz criar %s temporário"
 
-#: builtin/rebase.c:316
-#, fuzzy
+#: builtin/rebase.c:317
 msgid "could not mark as interactive"
 msgstr "incapaz marcar como interativo"
 
-#: builtin/rebase.c:369
-#, fuzzy
+#: builtin/rebase.c:370
 msgid "could not generate todo list"
-msgstr "não foi possível escrever para %s"
+msgstr "incapaz gerar lista de tarefas"
 
-#: builtin/rebase.c:411
+#: builtin/rebase.c:412
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr ""
 
-#: builtin/rebase.c:480
-#, fuzzy
+#: builtin/rebase.c:481
 msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--helper [<opções>]"
+msgstr "git rebase--interactive [<opções>]"
 
-#: builtin/rebase.c:493 builtin/rebase.c:1388
+#: builtin/rebase.c:494 builtin/rebase.c:1389
 msgid "keep commits which start empty"
 msgstr ""
 
-#: builtin/rebase.c:497 builtin/revert.c:128
+#: builtin/rebase.c:498 builtin/revert.c:128
 msgid "allow commits with empty messages"
-msgstr "permitir commits com mensagens vazias"
+msgstr "permitir memórias com mensagens vazias"
 
-#: builtin/rebase.c:499
-#, fuzzy
+#: builtin/rebase.c:500
 msgid "rebase merge commits"
-msgstr "mergetag incorreta no commit '%s'"
+msgstr "rebasear memórias de junção"
 
-#: builtin/rebase.c:501
+#: builtin/rebase.c:502
 msgid "keep original branch points of cousins"
 msgstr ""
 
-#: builtin/rebase.c:503
+#: builtin/rebase.c:504
 msgid "move commits that begin with squash!/fixup!"
 msgstr ""
 
-#: builtin/rebase.c:504
-#, fuzzy
+#: builtin/rebase.c:505
 msgid "sign commits"
-msgstr "assinar os commits com GPG"
+msgstr "assinar memórias"
 
-#: builtin/rebase.c:506 builtin/rebase.c:1327
+#: builtin/rebase.c:507 builtin/rebase.c:1328
 msgid "display a diffstat of what changed upstream"
 msgstr ""
 
-#: builtin/rebase.c:508
+#: builtin/rebase.c:509
 msgid "continue rebase"
 msgstr "continuar rebase"
 
-#: builtin/rebase.c:510
-#, fuzzy
+#: builtin/rebase.c:511
 msgid "skip commit"
-msgstr "commit"
+msgstr "ignorar memória"
 
-#: builtin/rebase.c:511
-#, fuzzy
+#: builtin/rebase.c:512
 msgid "edit the todo list"
-msgstr "falha ao escrever para rev-list"
+msgstr ""
 
-#: builtin/rebase.c:513
-#, fuzzy
+#: builtin/rebase.c:514
 msgid "show the current patch"
-msgstr "ignorar o patch atual"
+msgstr "mostrar remendo atual"
 
-#: builtin/rebase.c:516
+#: builtin/rebase.c:517
 msgid "shorten commit ids in the todo list"
 msgstr ""
 
-#: builtin/rebase.c:518
+#: builtin/rebase.c:519
 msgid "expand commit ids in the todo list"
 msgstr ""
 
-#: builtin/rebase.c:520
+#: builtin/rebase.c:521
 msgid "check the todo list"
 msgstr ""
 
-#: builtin/rebase.c:522
+#: builtin/rebase.c:523
 msgid "rearrange fixup/squash lines"
 msgstr ""
 
-#: builtin/rebase.c:524
+#: builtin/rebase.c:525
 msgid "insert exec commands in todo list"
 msgstr ""
 
-#: builtin/rebase.c:525
+#: builtin/rebase.c:526
 msgid "onto"
 msgstr ""
 
-#: builtin/rebase.c:528
-#, fuzzy
+#: builtin/rebase.c:529
 msgid "restrict-revision"
-msgstr "revisão"
+msgstr "revisão-restrita"
 
-#: builtin/rebase.c:528
-#, fuzzy
+#: builtin/rebase.c:529
 msgid "restrict revision"
-msgstr "revisão"
+msgstr "revisão restrita"
 
-#: builtin/rebase.c:530
+#: builtin/rebase.c:531
 msgid "squash-onto"
 msgstr ""
 
-#: builtin/rebase.c:531
+#: builtin/rebase.c:532
 msgid "squash onto"
 msgstr ""
 
-#: builtin/rebase.c:533
-#, fuzzy
+#: builtin/rebase.c:534
 msgid "the upstream commit"
-msgstr "Remover a informação do ramo a montante"
+msgstr "a memória de upstream"
 
-#: builtin/rebase.c:535
-#, fuzzy
+#: builtin/rebase.c:536
 msgid "head-name"
-msgstr "mudar nome"
+msgstr "nome-cabeça"
 
-#: builtin/rebase.c:535
-#, fuzzy
+#: builtin/rebase.c:536
 msgid "head name"
-msgstr "à frente "
+msgstr "nome de cabeça"
 
-#: builtin/rebase.c:540
-#, fuzzy
+#: builtin/rebase.c:541
 msgid "rebase strategy"
-msgstr "estratégia de integração"
+msgstr "estratégia de rebaseamento"
 
-#: builtin/rebase.c:541
-#, fuzzy
+#: builtin/rebase.c:542
 msgid "strategy-opts"
-msgstr "estratégia"
+msgstr "opções-estratégia"
 
-#: builtin/rebase.c:542
-#, fuzzy
+#: builtin/rebase.c:543
 msgid "strategy options"
-msgstr "opções de decoração"
+msgstr "opções de estratégia"
 
-#: builtin/rebase.c:543
+#: builtin/rebase.c:544
 msgid "switch-to"
 msgstr ""
 
-#: builtin/rebase.c:544
+#: builtin/rebase.c:545
 msgid "the branch or commit to checkout"
 msgstr ""
 
-#: builtin/rebase.c:545
-#, fuzzy
+#: builtin/rebase.c:546
 msgid "onto-name"
-msgstr "nome"
+msgstr "para-nome"
 
-#: builtin/rebase.c:545
-#, fuzzy
+#: builtin/rebase.c:546
 msgid "onto name"
-msgstr "nome do remoto"
+msgstr "para nome"
 
-#: builtin/rebase.c:546
-#, fuzzy
+#: builtin/rebase.c:547
 msgid "cmd"
-msgstr "comando"
+msgstr "cmd"
 
-#: builtin/rebase.c:546
-#, fuzzy
+#: builtin/rebase.c:547
 msgid "the command to run"
-msgstr "Nenhum comando concluído."
+msgstr ""
 
-#: builtin/rebase.c:549 builtin/rebase.c:1421
+#: builtin/rebase.c:550 builtin/rebase.c:1422
 msgid "automatically re-schedule any `exec` that fails"
 msgstr ""
 
-#: builtin/rebase.c:565
+#: builtin/rebase.c:566
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr ""
 
-#: builtin/rebase.c:581
+#: builtin/rebase.c:582
 #, c-format
 msgid "%s requires the merge backend"
 msgstr ""
 
-#: builtin/rebase.c:624
-#, fuzzy, c-format
+#: builtin/rebase.c:625
+#, c-format
 msgid "could not get 'onto': '%s'"
-msgstr "não foi possível definir '%s' como '%s'"
+msgstr "incapaz obter 'onto': '%s'"
 
-#: builtin/rebase.c:641
-#, fuzzy, c-format
+#: builtin/rebase.c:642
+#, c-format
 msgid "invalid orig-head: '%s'"
-msgstr "ficheiro inválido: '%s'"
+msgstr "orig-head inválida: '%s'"
 
-#: builtin/rebase.c:666
+#: builtin/rebase.c:667
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr ""
 
-#: builtin/rebase.c:811 git-rebase--preserve-merges.sh:81
-#, fuzzy
+#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19436,7 +19760,7 @@ msgstr ""
 "Para extrair o ramo original e interromper o rebase, execute \"git rebase --"
 "abort\"."
 
-#: builtin/rebase.c:894
+#: builtin/rebase.c:896
 #, c-format
 msgid ""
 "\n"
@@ -19448,15 +19772,15 @@ msgid ""
 "As a result, git cannot rebase them."
 msgstr ""
 
-#: builtin/rebase.c:1220
+#: builtin/rebase.c:1222
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
 "\"."
 msgstr ""
 
-#: builtin/rebase.c:1238
-#, fuzzy, c-format
+#: builtin/rebase.c:1240
+#, c-format
 msgid ""
 "%s\n"
 "Please specify which branch you want to rebase against.\n"
@@ -19472,8 +19796,8 @@ msgstr ""
 "    git rebase '<branch>'\n"
 "\n"
 
-#: builtin/rebase.c:1254
-#, fuzzy, c-format
+#: builtin/rebase.c:1256
+#, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
 "\n"
@@ -19485,209 +19809,180 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<branch> %s\n"
 "\n"
 
-#: builtin/rebase.c:1284
+#: builtin/rebase.c:1286
 msgid "exec commands cannot contain newlines"
 msgstr ""
 
-#: builtin/rebase.c:1288
+#: builtin/rebase.c:1290
 msgid "empty exec command"
 msgstr ""
 
-#: builtin/rebase.c:1318
-#, fuzzy
+#: builtin/rebase.c:1319
 msgid "rebase onto given branch instead of upstream"
-msgstr "demasiados ramos para remover a definição de ramo a montante"
+msgstr "rebasear sobre ramo dado invés de upstream"
 
-#: builtin/rebase.c:1320
-#, fuzzy
+#: builtin/rebase.c:1321
 msgid "use the merge-base of upstream and branch as the current base"
-msgstr "o ramo a montante solicitado '%s' não existe"
+msgstr "usar a base de junção de upstream e ramo como base atual"
 
-#: builtin/rebase.c:1322
-#, fuzzy
+#: builtin/rebase.c:1323
 msgid "allow pre-rebase hook to run"
-msgstr "Rebase recusado pelo hook pre-rebase."
+msgstr "permitir gancho pré-rebase correr"
 
-#: builtin/rebase.c:1324
+#: builtin/rebase.c:1325
 msgid "be quiet. implies --no-stat"
 msgstr ""
 
-#: builtin/rebase.c:1330
-#, fuzzy
+#: builtin/rebase.c:1331
 msgid "do not show diffstat of what changed upstream"
-msgstr "não apresentar um diffstat ao fim da integração"
+msgstr "esconder diffstat de o que alterou upstream"
 
-#: builtin/rebase.c:1333
-#, fuzzy
+#: builtin/rebase.c:1334
 msgid "add a Signed-off-by trailer to each commit"
-msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit"
+msgstr "adicionar a atribuição Signed-off-by para cada memória"
 
-#: builtin/rebase.c:1336
-#, fuzzy
+#: builtin/rebase.c:1337
 msgid "make committer date match author date"
-msgstr "agrupar por committer em vez de autor"
+msgstr "fazer data de memorizador corresponder à data de autor"
 
-#: builtin/rebase.c:1338
+#: builtin/rebase.c:1339
 msgid "ignore author date and use current date"
-msgstr ""
+msgstr "ignorar data de autor e usar data atual"
 
-#: builtin/rebase.c:1340
-#, fuzzy
+#: builtin/rebase.c:1341
 msgid "synonym of --reset-author-date"
-msgstr "sinónimo de --files-with-matches"
+msgstr "sinónimo de --reset-author-date"
 
-#: builtin/rebase.c:1342 builtin/rebase.c:1346
-#, fuzzy
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
 msgid "passed to 'git apply'"
-msgstr "transmitir ao git-apply"
+msgstr "passado para 'git apply'"
 
-#: builtin/rebase.c:1344
-#, fuzzy
+#: builtin/rebase.c:1345
 msgid "ignore changes in whitespace"
-msgstr "ignorar alterações de espaço em branco ao procurar contexto"
+msgstr ""
 
-#: builtin/rebase.c:1348 builtin/rebase.c:1351
+#: builtin/rebase.c:1349 builtin/rebase.c:1352
 msgid "cherry-pick all commits, even if unchanged"
 msgstr ""
 
-#: builtin/rebase.c:1353
-#, fuzzy
+#: builtin/rebase.c:1354
 msgid "continue"
-msgstr "continuar rebase"
+msgstr "continuar"
 
-#: builtin/rebase.c:1356
-#, fuzzy
+#: builtin/rebase.c:1357
 msgid "skip current patch and continue"
-msgstr "ignorar o patch atual"
+msgstr "ignorar remendo atual e continuar"
 
-#: builtin/rebase.c:1358
-#, fuzzy
+#: builtin/rebase.c:1359
 msgid "abort and check out the original branch"
-msgstr "  (use \"git rebase --abort\" para restaurar o ramo original)"
+msgstr ""
 
-#: builtin/rebase.c:1361
+#: builtin/rebase.c:1362
 msgid "abort but keep HEAD where it is"
 msgstr ""
 
-#: builtin/rebase.c:1362
-#, fuzzy
+#: builtin/rebase.c:1363
 msgid "edit the todo list during an interactive rebase"
-msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo."
+msgstr "editar a lista de afazeres durante rebase interativa"
 
-#: builtin/rebase.c:1365
+#: builtin/rebase.c:1366
 msgid "show the patch file being applied or merged"
 msgstr ""
 
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1369
 msgid "use apply strategies to rebase"
 msgstr ""
 
-#: builtin/rebase.c:1372
-#, fuzzy
+#: builtin/rebase.c:1373
 msgid "use merging strategies to rebase"
-msgstr "estratégia de integração a usar"
+msgstr "usar estratégias de junção para rebasear"
 
-#: builtin/rebase.c:1376
+#: builtin/rebase.c:1377
 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 
-#: builtin/rebase.c:1380
+#: builtin/rebase.c:1381
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr ""
 
-#: builtin/rebase.c:1385
+#: builtin/rebase.c:1386
 msgid "how to handle commits that become empty"
 msgstr ""
 
-#: builtin/rebase.c:1392
+#: builtin/rebase.c:1393
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr ""
 
-#: builtin/rebase.c:1399
+#: builtin/rebase.c:1400
 msgid "add exec lines after each commit of the editable list"
 msgstr ""
 
-#: builtin/rebase.c:1403
-#, fuzzy
+#: builtin/rebase.c:1404
 msgid "allow rebasing commits with empty messages"
-msgstr "permitir commits com mensagens vazias"
+msgstr "permitir rebasear memórias com mensagens vazias"
 
-#: builtin/rebase.c:1407
+#: builtin/rebase.c:1408
 msgid "try to rebase merges instead of skipping them"
 msgstr ""
 
-#: builtin/rebase.c:1410
-#, fuzzy
+#: builtin/rebase.c:1411
 msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr "git merge-base --fork-point <referência> [<commit>]"
+msgstr "usa 'merge-base --fork-point' para refinar upstream"
 
-#: builtin/rebase.c:1412
-#, fuzzy
+#: builtin/rebase.c:1413
 msgid "use the given merge strategy"
-msgstr "opção de estratégia de integração"
+msgstr "usar a estratégia de junção dada"
 
-#: builtin/rebase.c:1414 builtin/revert.c:115
+#: builtin/rebase.c:1415 builtin/revert.c:115
 msgid "option"
 msgstr "opção"
 
-#: builtin/rebase.c:1415
+#: builtin/rebase.c:1416
 msgid "pass the argument through to the merge strategy"
 msgstr ""
 
-#: builtin/rebase.c:1418
+#: builtin/rebase.c:1419
 msgid "rebase all reachable commits up to the root(s)"
 msgstr ""
 
-#: builtin/rebase.c:1423
+#: builtin/rebase.c:1424
 msgid "apply all changes, even those already present upstream"
 msgstr ""
 
-#: builtin/rebase.c:1440
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"o suporte a rebase.useBuiltin foi removido!\n"
-"Vê essa entry em 'git help config' para detalhes."
-
-#: builtin/rebase.c:1446
-#, fuzzy
+#: builtin/rebase.c:1442
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Parece que 'git am' está em curso. Incapaz de rebasear."
 
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1483
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
 msgstr ""
 
-#: builtin/rebase.c:1492
-#, fuzzy
+#: builtin/rebase.c:1488
 msgid "cannot combine '--keep-base' with '--onto'"
 msgstr "incapaz de combinar '--keep-base' com '--onto'"
 
-#: builtin/rebase.c:1494
-#, fuzzy
+#: builtin/rebase.c:1490
 msgid "cannot combine '--keep-base' with '--root'"
 msgstr "incapaz de combinar '--keep-base' com '--root'"
 
-#: builtin/rebase.c:1498
-#, fuzzy
+#: builtin/rebase.c:1494
 msgid "cannot combine '--root' with '--fork-point'"
 msgstr "incapaz de combinar '--root' com '--fork-point'"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1497
 msgid "No rebase in progress?"
-msgstr "Rebase não está em curso?"
+msgstr "Algum rebase em curso?"
 
-#: builtin/rebase.c:1505
+#: builtin/rebase.c:1501
 msgid "The --edit-todo action can only be used during interactive rebase."
-msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo."
+msgstr "A ação --edit-todo só pode ser usada durante uma rebase interativa."
 
-#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Incapaz ler HEAD"
 
-#: builtin/rebase.c:1540
+#: builtin/rebase.c:1536
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -19695,18 +19990,17 @@ msgstr ""
 "Deve editar todos os conflitos da integração\n"
 "e marcá-los como resolvidos usando git add"
 
-#: builtin/rebase.c:1559
-#, fuzzy
+#: builtin/rebase.c:1555
 msgid "could not discard worktree changes"
 msgstr "incapaz de descartar alterações de worktree"
 
-#: builtin/rebase.c:1578
-#, fuzzy, c-format
+#: builtin/rebase.c:1574
+#, c-format
 msgid "could not move back to %s"
 msgstr "incapaz de retroceder a %s"
 
-#: builtin/rebase.c:1624
-#, fuzzy, c-format
+#: builtin/rebase.c:1620
+#, 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"
@@ -19717,147 +20011,141 @@ msgid ""
 "and run me again.  I am stopping in case you still have something\n"
 "valuable there.\n"
 msgstr ""
-"Parece que já existe um diretório %s, e\n"
-"é possível que outro processo de rebase já esteja em curso.\n"
-"Se for o caso, tente\n"
+"Parece que já existe uma pasta %s, e\n"
+"pregunto-me se estás a meio de outro rebase. Se for o caso,\n"
+"por favor tenta\n"
 "\t%s\n"
-"Se não for o caso,\n"
+"Caso eu esteja errado, faz por favor\n"
 "\t%s\n"
-"e execute o comando de novo. A execução foi interrompida no caso de\n"
-"ainda ter algo importante nesse sítio.\n"
+"e execute-me novamente. Estou parando caso ainda tenhas algo\n"
+"de valor aí.\n"
 
-#: builtin/rebase.c:1652
-#, fuzzy
+#: builtin/rebase.c:1648
 msgid "switch `C' expects a numerical value"
-msgstr "a opção '%c' espera um valor numérico"
+msgstr ""
 
-#: builtin/rebase.c:1694
-#, fuzzy, c-format
+#: builtin/rebase.c:1690
+#, c-format
 msgid "Unknown mode: %s"
-msgstr "Mode de --patch desconhecido: %s"
+msgstr "Modo desconhecido: %s"
 
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1729
 msgid "--strategy requires --merge or --interactive"
 msgstr ""
 
-#: builtin/rebase.c:1763
+#: builtin/rebase.c:1759
 msgid "cannot combine apply options with merge options"
 msgstr ""
 
-#: builtin/rebase.c:1776
-#, fuzzy, c-format
+#: builtin/rebase.c:1772
+#, c-format
 msgid "Unknown rebase backend: %s"
-msgstr "Subcomando desconhecido: %s"
+msgstr ""
 
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1802
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr ""
 
-#: builtin/rebase.c:1826
+#: builtin/rebase.c:1822
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr ""
 
-#: builtin/rebase.c:1830
+#: builtin/rebase.c:1826
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr ""
 
-#: builtin/rebase.c:1854
-#, fuzzy, c-format
+#: builtin/rebase.c:1850
+#, c-format
 msgid "invalid upstream '%s'"
-msgstr "caminho inválido '%s'"
+msgstr ""
 
-#: builtin/rebase.c:1860
-#, fuzzy
+#: builtin/rebase.c:1856
 msgid "Could not create new root commit"
-msgstr "não foi possível analisar o commit recém-criado"
+msgstr "incapaz criar novo commit raiz"
 
-#: builtin/rebase.c:1886
+#: builtin/rebase.c:1882
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr ""
 
-#: builtin/rebase.c:1889
-#, fuzzy, c-format
+#: builtin/rebase.c:1885
+#, c-format
 msgid "'%s': need exactly one merge base"
-msgstr "É necessário exatamente um intervalo."
+msgstr ""
 
-#: builtin/rebase.c:1897
-#, fuzzy, c-format
+#: builtin/rebase.c:1893
+#, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "Aponta nada para commit válido '%s'"
 
-#: builtin/rebase.c:1923
-#, fuzzy, c-format
+#: builtin/rebase.c:1921
+#, c-format
 msgid "fatal: no such branch/commit '%s'"
-msgstr "o ramo '%s' não existe"
+msgstr "fatal: nenhum ramo/commit '%s'"
 
-#: builtin/rebase.c:1931 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2414
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2431
 #, c-format
 msgid "No such ref: %s"
 msgstr "Referência inexistente: %s"
 
-#: builtin/rebase.c:1942
-#, fuzzy
+#: builtin/rebase.c:1940
 msgid "Could not resolve HEAD to a revision"
 msgstr "Foi impossível resolver HEAD para uma revisão"
 
-#: builtin/rebase.c:1963
+#: builtin/rebase.c:1961
 msgid "Please commit or stash them."
 msgstr "Submeta ou esconda-as."
 
-#: builtin/rebase.c:1999
-#, fuzzy, c-format
+#: builtin/rebase.c:1997
+#, c-format
 msgid "could not switch to %s"
-msgstr "não foi possível escrever para %s"
+msgstr "incapaz alternar para %s"
 
-#: builtin/rebase.c:2010
-#, fuzzy
+#: builtin/rebase.c:2008
 msgid "HEAD is up to date."
-msgstr "HEAD está agora em"
+msgstr "HEAD está atualizada."
 
-#: builtin/rebase.c:2012
-#, fuzzy, c-format
+#: builtin/rebase.c:2010
+#, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Branch atual %s está atualizado.\n"
 
-#: builtin/rebase.c:2020
-#, fuzzy
+#: builtin/rebase.c:2018
 msgid "HEAD is up to date, rebase forced."
-msgstr "O ramo atual $branch_name está atualizado, rebase forçado."
+msgstr "HEAD está atualizada, rebase forçado."
 
-#: builtin/rebase.c:2022
-#, fuzzy, c-format
+#: builtin/rebase.c:2020
+#, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Branch actual %s está atualizado, rebase forçado.\n"
 
-#: builtin/rebase.c:2030
+#: builtin/rebase.c:2028
 msgid "The pre-rebase hook refused to rebase."
-msgstr "Rebase recusado pelo hook pre-rebase."
+msgstr "Gancho pré-rebase recusou rebasear."
 
-#: builtin/rebase.c:2037
-#, fuzzy, c-format
+#: builtin/rebase.c:2035
+#, c-format
 msgid "Changes to %s:\n"
 msgstr "Modificações para %s:\n"
 
-#: builtin/rebase.c:2040
-#, fuzzy, c-format
+#: builtin/rebase.c:2038
+#, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Modificações de %s para %s:\n"
 
-#: builtin/rebase.c:2065
-#, fuzzy, c-format
+#: builtin/rebase.c:2063
+#, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr "Primeiro, recuando head para refazer o teu trabalho em cima dela...\n"
 
-#: builtin/rebase.c:2074
-#, fuzzy
+#: builtin/rebase.c:2072
 msgid "Could not detach HEAD"
-msgstr "não foi possível destacar HEAD"
+msgstr "Incapaz desanexar HEAD"
 
-#: builtin/rebase.c:2083
-#, fuzzy, c-format
+#: builtin/rebase.c:2081
+#, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Avançei-rápido %s para %s.\n"
 
@@ -19865,7 +20153,7 @@ msgstr "Avançei-rápido %s para %s.\n"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:1276
+#: 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"
@@ -19882,20 +20170,20 @@ msgid ""
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
 "Por predefinição, atualizar o ramo atual num repositório não-nu\n"
-"é proibido, porque tornará o índice e a árvore de trabalho inconsistentes\n"
-"com o que publicou e requererá 'git reset --hard' para igualar a\n"
-"árvore de trabalho à HEAD.\n"
+"é proibido, porque tornará o index e a worktree inconsistentes\n"
+"com o que atiraste, e requererá 'git reset --hard' para igualar a\n"
+"worktree com HEAD.\n"
 "\n"
-"Pode definir a variável configuração 'receive.denyCurrentBranch'\n"
-"como 'ignore' ou 'warn' no repositório remoto para permitir publicar\n"
-"para o ramo atual dele; no entanto, não é recomendando a menos que\n"
-"consiga de outra forma atualizar a árvore de trabalho dele para\n"
-"refletir o que publicou.\n"
+"Podes definir variável configuração 'receive.denyCurrentBranch'\n"
+"como 'ignore' ou 'warn' no repositório remoto para permitir atirar\n"
+"para o ramo atual deste; no entanto, é recomendando nada disto a\n"
+"menos que consigas outra forma de atualizar a worktree dele para\n"
+"refletir o que atiraste.\n"
 "\n"
-"Para suprimir esta mensagem e manter o comportamento predefinido, defina\n"
+"Para suprimir esta mensagem e manter o comportamento predefinido, define\n"
 "a variável de configuração 'receive.denyCurrentBranch' como 'refuse'."
 
-#: builtin/receive-pack.c:1296
+#: 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"
@@ -19915,13 +20203,13 @@ msgstr ""
 "\n"
 "Para suprimir esta mensagem, podes definí-la como 'refuse'."
 
-#: builtin/receive-pack.c:2481
+#: builtin/receive-pack.c:2478
 msgid "quiet"
 msgstr "silencioso"
 
-#: builtin/receive-pack.c:2495
+#: builtin/receive-pack.c:2492
 msgid "You must specify a directory."
-msgstr "Deve especificar um diretório."
+msgstr "Deves especificar uma pasta."
 
 #: builtin/reflog.c:17
 msgid ""
@@ -19943,39 +20231,38 @@ msgstr ""
 #: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
-msgstr "'%s' não é um carimbo de data/hora válido"
+msgstr "'%s' é um carimbo de data/hora inválido"
 
-#: builtin/reflog.c:606
-#, fuzzy, c-format
+#: builtin/reflog.c:609
+#, c-format
 msgid "Marking reachable objects..."
-msgstr "manter objetos inalcançáveis"
+msgstr ""
 
-#: builtin/reflog.c:644
+#: builtin/reflog.c:647
 #, c-format
 msgid "%s points nowhere!"
 msgstr ""
 
-#: builtin/reflog.c:696
-#, fuzzy
+#: builtin/reflog.c:699
 msgid "no reflog specified to delete"
 msgstr "especificado reflog nenhum para apagar"
 
-#: builtin/reflog.c:705
-#, fuzzy, c-format
+#: builtin/reflog.c:708
+#, c-format
 msgid "not a reflog: %s"
 msgstr "reflog inválido: %s"
 
-#: builtin/reflog.c:710
-#, fuzzy, c-format
+#: builtin/reflog.c:713
+#, c-format
 msgid "no reflog for '%s'"
 msgstr "reflog nenhum para '%s'"
 
-#: builtin/reflog.c:756
-#, fuzzy, c-format
+#: builtin/reflog.c:759
+#, c-format
 msgid "invalid ref format: %s"
 msgstr "formato de ref inválido: %s"
 
-#: builtin/reflog.c:765
+#: builtin/reflog.c:768
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr ""
 
@@ -20064,7 +20351,7 @@ msgstr "git remote update [<opções>] [<grupo> | <remoto>]..."
 #: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
-msgstr "A atualizar %s"
+msgstr "Atualizando %s"
 
 #: builtin/remote.c:131
 msgid ""
@@ -20089,7 +20376,7 @@ msgstr "importar todas as tags e objetos associados ao obter"
 
 #: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
-msgstr "ou busca tag nenhuma (--no-tags)"
+msgstr "ou buscar etiqueta nenhuma (--no-tags)"
 
 #: builtin/remote.c:171
 msgid "branch(es) to track"
@@ -20105,7 +20392,7 @@ msgstr "configurar o remoto como um espelho para publicar ou obter"
 
 #: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
-msgstr "especificar um ramo mestre não faz sentido com --mirror"
+msgstr "especificar um ramo master com --mirror faz sentido nenhum"
 
 #: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
@@ -20135,9 +20422,9 @@ msgid "(delete)"
 msgstr "(apagar)"
 
 #: builtin/remote.c:655
-#, fuzzy, c-format
+#, c-format
 msgid "could not set '%s'"
-msgstr "não foi possível reiniciar '%s'"
+msgstr "incapaz definir '%s'"
 
 #: builtin/remote.c:660
 #, c-format
@@ -20147,10 +20434,10 @@ msgid ""
 "now names the non-existent remote '%s'"
 msgstr ""
 
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
-#, fuzzy, c-format
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#, c-format
 msgid "No such remote: '%s'"
-msgstr "Remoto inexistente '%s'"
+msgstr "Remoto inexistente: '%s'"
 
 #: builtin/remote.c:710
 #, c-format
@@ -20164,20 +20451,18 @@ msgid ""
 "\t%s\n"
 "\tPlease update the configuration manually if necessary."
 msgstr ""
-"O seguinte especificador de referência, não-predefinido e usado para obter "
-"objetos, não foi atualizado\n"
-"\t%s\n"
-"\tAtualize a configuração manualmente se necessário."
+"Deixando por atualizar refspec que é diferente de pré-definido\t%s\n"
+"\tPor favor, atualiza a configuração manualmente se necessário."
 
 #: builtin/remote.c:770
 #, c-format
 msgid "deleting '%s' failed"
-msgstr "falha ao eliminar '%s'"
+msgstr "falha ao apagar '%s'"
 
 #: builtin/remote.c:804
 #, c-format
 msgid "creating '%s' failed"
-msgstr "falha ao criar '%s'"
+msgstr "falhou criar '%s'"
 
 #: builtin/remote.c:882
 msgid ""
@@ -20187,11 +20472,12 @@ msgid_plural ""
 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
 "to delete them, use:"
 msgstr[0] ""
-"Nota: Um ramo fora da hierarquia refs/remotes/ não foi removido;\n"
-"para o remover, use:"
+"Nota: Um ramo fora da hierarquia refs/remotes/ está por remover;\n"
+"para apagá-lo, usa:"
 msgstr[1] ""
-"Nota: alguns ramos fora da hierarquia refs/remotes/ não foram removidos;\n"
-"para os remover, use:"
+"Nota: Alguns ramos fora da hierarquia refs/remotes/ estão por serem "
+"removidos;\n"
+"para os apagá-los, usa:"
 
 #: builtin/remote.c:896
 #, c-format
@@ -20218,18 +20504,17 @@ msgstr " ???"
 #: builtin/remote.c:1047
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
-msgstr ""
-"branch.%s.merge inválido; não é possível rebasear sobre mais do que um ramo"
+msgstr "branch.%s.merge inválido; incapaz rebasear sobre > 1 ramo"
 
 #: builtin/remote.c:1056
 #, c-format
 msgid "rebases interactively onto remote %s"
-msgstr "rebaseia interativamente sobre %s do remoto"
+msgstr "rebaseia interativamente sobre remoto %s"
 
 #: builtin/remote.c:1058
-#, fuzzy, c-format
+#, c-format
 msgid "rebases interactively (with merges) onto remote %s"
-msgstr "rebaseia interativamente sobre %s do remoto"
+msgstr "rebaseia interativamente (com junções) sobre remoto %s"
 
 #: builtin/remote.c:1061
 #, c-format
@@ -20293,7 +20578,7 @@ msgstr "    %-*s publica em %s"
 
 #: builtin/remote.c:1212
 msgid "do not query remotes"
-msgstr "não consultar remotos"
+msgstr "faz consulta a remotos nenhuns"
 
 #: builtin/remote.c:1239
 #, c-format
@@ -20303,7 +20588,7 @@ msgstr "* remoto %s"
 #: builtin/remote.c:1240
 #, c-format
 msgid "  Fetch URL: %s"
-msgstr "  Obter    do URL: %s"
+msgstr "  Buscar URL: %s"
 
 #: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
 msgid "(no URL)"
@@ -20316,7 +20601,7 @@ msgstr "(URL nenhum)"
 #: builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  Push  URL: %s"
-msgstr "  Publicar no URL: %s"
+msgstr "  Atirar URL: %s"
 
 #: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
 #, c-format
@@ -20325,7 +20610,7 @@ msgstr "  Ramo HEAD: %s"
 
 #: builtin/remote.c:1259
 msgid "(not queried)"
-msgstr "(não consultado)"
+msgstr "(nada consultado)"
 
 #: builtin/remote.c:1261
 msgid "(unknown)"
@@ -20346,7 +20631,7 @@ msgstr[1] "  Ramos remotos:%s"
 
 #: builtin/remote.c:1280 builtin/remote.c:1306
 msgid " (status not queried)"
-msgstr " (estado não consultado)"
+msgstr " (estado é nada consultado)"
 
 #: builtin/remote.c:1289
 msgid "  Local branch configured for 'git pull':"
@@ -20356,7 +20641,7 @@ msgstr[1] "  Ramos locais configurados para 'git pull':"
 
 #: builtin/remote.c:1297
 msgid "  Local refs will be mirrored by 'git push'"
-msgstr "  Referências locais serão refletidas (mirror) por 'git push'"
+msgstr "  Referências locais serão replicadas (mirror) por 'git push'"
 
 #: builtin/remote.c:1303
 #, c-format
@@ -20428,7 +20713,7 @@ msgstr " * [eliminado] %s"
 
 #: builtin/remote.c:1457
 msgid "prune remotes after fetching"
-msgstr "eliminar remotos depois de obter"
+msgstr "podar remotos após buscar"
 
 #: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
 #, c-format
@@ -20470,7 +20755,7 @@ msgstr "eliminar URLs"
 
 #: builtin/remote.c:1632
 msgid "--add --delete doesn't make sense"
-msgstr "--add --delete não faz sentido"
+msgstr "--add --delete faz sentido nenhum"
 
 #: builtin/remote.c:1673
 #, c-format
@@ -20480,146 +20765,166 @@ msgstr "Padrão de URL antigo inválido: %s"
 #: builtin/remote.c:1681
 #, c-format
 msgid "No such URL found: %s"
-msgstr "URL não encontrado: %s"
+msgstr "URL por encontrar: %s"
 
 #: builtin/remote.c:1683
 msgid "Will not delete all non-push URLs"
-msgstr "Eliminarei apenas alguns URLs de não-atirar"
+msgstr "Apagarei apenas alguns URLs de não-atirar"
 
-#: builtin/repack.c:25
+#: builtin/repack.c:26
 msgid "git repack [<options>]"
 msgstr "git repack [<opções>]"
 
-#: builtin/repack.c:30
+#: builtin/repack.c:31
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
-"Repacks incrementais são incompatíveis com bitmap indexes. Usa\n"
-"--no-write-bitmap-índex ou desative a configuração pack.writebitmaps."
+"Repacks incrementais são incompatíveis com indexes bitmap. Usa\n"
+"--no-write-bitmap-index ou desativa a configuração pack.writebitmaps ."
 
-#: builtin/repack.c:197
+#: builtin/repack.c:198
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:268 builtin/repack.c:447
+#: builtin/repack.c:270 builtin/repack.c:630
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 
-#: builtin/repack.c:295
+#: builtin/repack.c:294
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:323
+#: builtin/repack.c:309
+#, c-format
+msgid "cannot open index for %s"
+msgstr "incapaz abrir cenário para %s"
+
+#: builtin/repack.c:368
+#, c-format
+msgid "pack %s too large to consider in geometric progression"
+msgstr ""
+
+#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr ""
+
+#: builtin/repack.c:460
 msgid "pack everything in a single pack"
 msgstr "compactar tudo num único pacote"
 
-#: builtin/repack.c:325
+#: builtin/repack.c:462
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "o mesmo que -a, e soltar objetos inalcançáveis"
 
-#: builtin/repack.c:328
+#: builtin/repack.c:465
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "remover pacotes redundantes e executar git-prune-packed"
 
-#: builtin/repack.c:330
+#: builtin/repack.c:467
 msgid "pass --no-reuse-delta to git-pack-objects"
-msgstr "passar --no-reuse-delta ao git-pack-objects"
+msgstr "passar --no-reuse-delta para git-pack-objects"
 
-#: builtin/repack.c:332
+#: builtin/repack.c:469
 msgid "pass --no-reuse-object to git-pack-objects"
-msgstr "passar --no-reuse-object ao git-pack-objects"
+msgstr "passar --no-reuse-object para git-pack-objects"
 
-#: builtin/repack.c:334
+#: builtin/repack.c:471
 msgid "do not run git-update-server-info"
-msgstr "não executar git-update-server-info"
+msgstr "executar git-update-server-info nenhum"
 
-#: builtin/repack.c:337
+#: builtin/repack.c:474
 msgid "pass --local to git-pack-objects"
-msgstr "passar --local ao git-pack-objects"
+msgstr "passar --local para git-pack-objects"
 
-#: builtin/repack.c:339
+#: builtin/repack.c:476
 msgid "write bitmap index"
-msgstr "escrever índice de mapa de bits"
+msgstr "escrever index de bitmap"
 
-#: builtin/repack.c:341
-#, fuzzy
+#: builtin/repack.c:478
 msgid "pass --delta-islands to git-pack-objects"
-msgstr "passar --local ao git-pack-objects"
+msgstr "passar --delta-islands para git-pack-objects"
 
-#: builtin/repack.c:342
+#: builtin/repack.c:479
 msgid "approxidate"
 msgstr "aproximar"
 
-#: builtin/repack.c:343
+#: builtin/repack.c:480
 msgid "with -A, do not loosen objects older than this"
-msgstr "com -A, não soltar mais objetos além destes"
+msgstr "com -A, deixar de soltar objetos mais velhos que isto"
 
-#: builtin/repack.c:345
+#: builtin/repack.c:482
 msgid "with -a, repack unreachable objects"
 msgstr "com -a, reempacotar objetos inalcançáveis"
 
-#: builtin/repack.c:347
+#: builtin/repack.c:484
 msgid "size of the window used for delta compression"
-msgstr "dimensão da janela usada em compressão de deltas"
+msgstr "dimensão da janela usada para compressão de delta"
 
-#: builtin/repack.c:348 builtin/repack.c:354
+#: builtin/repack.c:485 builtin/repack.c:491
 msgid "bytes"
 msgstr "bytes"
 
-#: builtin/repack.c:349
+#: builtin/repack.c:486
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "o mesmo que o anterior, mas limitar a memória usada em vez do número de "
 "entradas"
 
-#: builtin/repack.c:351
+#: builtin/repack.c:488
 msgid "limits the maximum delta depth"
 msgstr "limitar a profundidade máxima de delta"
 
-#: builtin/repack.c:353
-#, fuzzy
+#: builtin/repack.c:490
 msgid "limits the maximum number of threads"
-msgstr "limitar a profundidade máxima de delta"
+msgstr "limitar máximo número de fios"
 
-#: builtin/repack.c:355
+#: builtin/repack.c:492
 msgid "maximum size of each packfile"
 msgstr "tamanho máximo de cada ficheiro de pacote"
 
-#: builtin/repack.c:357
+#: builtin/repack.c:494
 msgid "repack objects in packs marked with .keep"
 msgstr "reempacotar objetos em pacotes marcados com .keep"
 
-#: builtin/repack.c:359
-#, fuzzy
+#: builtin/repack.c:496
 msgid "do not repack this pack"
-msgstr "criar pacotes finos"
+msgstr "reempacotar nada deste pacote"
+
+#: builtin/repack.c:498
+msgid "find a geometric progression with factor <N>"
+msgstr ""
 
-#: builtin/repack.c:369
+#: builtin/repack.c:508
 msgid "cannot delete packs in a precious-objects repo"
-msgstr "não é possível eliminar pacotes num repositório de objetos-preciosos"
+msgstr "incapaz apagar pacotes num repo de precious-objects"
 
-#: builtin/repack.c:373
+#: builtin/repack.c:512
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable e -A são incompatíveis"
 
-#: builtin/repack.c:456
+#: builtin/repack.c:527
+msgid "--geometric is incompatible with -A, -a"
+msgstr "--geometric é incompatível com -A, -a"
+
+#: builtin/repack.c:639
 msgid "Nothing new to pack."
 msgstr ""
 
-#: builtin/repack.c:486
-#, fuzzy, c-format
+#: builtin/repack.c:669
+#, c-format
 msgid "missing required file: %s"
-msgstr "falta o objeto %s de %s"
+msgstr ""
 
-#: builtin/repack.c:488
-#, fuzzy, c-format
+#: builtin/repack.c:671
+#, c-format
 msgid "could not unlink: %s"
-msgstr "não foi possível bloquear '%s'"
+msgstr "incapaz unlink: %s"
 
 #: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
-msgstr "git replace [-f] <objeto> <substituição>"
+msgstr "git replace [-f] <objeto> <substituto>"
 
 #: builtin/replace.c:23
 msgid "git replace [-f] --edit <object>"
@@ -20627,12 +20932,11 @@ msgstr "git replace [-f] --edit <objeto>"
 
 #: builtin/replace.c:24
 msgid "git replace [-f] --graft <commit> [<parent>...]"
-msgstr "git replace [-f] --graft <commit> [<pai>...]"
+msgstr "git replace [-f] --graft <memória> [<parente>...]"
 
 #: builtin/replace.c:25
-#, fuzzy
 msgid "git replace [-f] --convert-graft-file"
-msgstr "git replace [-f] --edit <objeto>"
+msgstr "git replace [-f] --convert-graft-file"
 
 #: builtin/replace.c:26
 msgid "git replace -d <object>..."
@@ -20650,24 +20954,24 @@ msgid ""
 msgstr ""
 
 #: builtin/replace.c:125
-#, fuzzy, c-format
+#, c-format
 msgid "replace ref '%s' not found"
-msgstr "ramo '%s' não encontrado."
+msgstr "ref substituição '%s' por encontrar"
 
 #: builtin/replace.c:141
-#, fuzzy, c-format
+#, c-format
 msgid "Deleted replace ref '%s'"
-msgstr "eliminar referências substituídas"
+msgstr "Ref substituição '%s' apagada"
 
 #: builtin/replace.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid ref name"
-msgstr "'%s' não é um nome de remoto válido"
+msgstr "'%s' é nome de ref inválido"
 
 #: builtin/replace.c:158
-#, fuzzy, c-format
+#, c-format
 msgid "replace ref '%s' already exists"
-msgstr "a tag '%s' já existe"
+msgstr "ref substituição '%s' já existe"
 
 #: builtin/replace.c:178
 #, c-format
@@ -20678,64 +20982,58 @@ msgid ""
 msgstr ""
 
 #: builtin/replace.c:229
-#, fuzzy, c-format
+#, c-format
 msgid "unable to open %s for writing"
-msgstr "não foi possível abrir %s para escrita"
+msgstr "incapaz abrir %s para escrita"
 
 #: builtin/replace.c:242
 msgid "cat-file reported failure"
 msgstr ""
 
 #: builtin/replace.c:258
-#, fuzzy, c-format
+#, c-format
 msgid "unable to open %s for reading"
-msgstr "não é possível abrir ou ler %s"
+msgstr "incapaz abrir %s para ler"
 
 #: builtin/replace.c:272
-#, fuzzy
 msgid "unable to spawn mktree"
-msgstr "não foi possível ler a árvore (%s)"
+msgstr "incapaz lançar mktree"
 
 #: builtin/replace.c:276
-#, fuzzy
 msgid "unable to read from mktree"
-msgstr "não foi possível ler a árvore (%s)"
+msgstr "incapaz ler de mktree"
 
 #: builtin/replace.c:285
-#, fuzzy
 msgid "mktree reported failure"
-msgstr "falha ao reverter"
+msgstr "mktree reportou falha"
 
 #: builtin/replace.c:289
-#, fuzzy
 msgid "mktree did not return an object name"
-msgstr "o remoto não enviou todos os objetos necessários"
+msgstr "mktree retornou nome de objeto nenhum"
 
 #: builtin/replace.c:298
-#, fuzzy, c-format
+#, c-format
 msgid "unable to fstat %s"
-msgstr "não foi possível atualizar %s"
+msgstr "incapaz fstat %s"
 
 #: builtin/replace.c:303
-#, fuzzy
 msgid "unable to write object to database"
-msgstr "não é possível escrever o objeto de nota"
+msgstr "incapaz escrever objeto para base de dados"
 
 #: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
 #: builtin/replace.c:454
-#, fuzzy, c-format
+#, c-format
 msgid "not a valid object name: '%s'"
-msgstr "Nome de objeto inválido: '%s'"
+msgstr "nome de objeto inválido: '%s'"
 
 #: builtin/replace.c:326
-#, fuzzy, c-format
+#, c-format
 msgid "unable to get object type for %s"
-msgstr "não foi possível efetuar grep de objetos do tipo %s"
+msgstr "incapaz obter tipo de objetos para %s"
 
 #: builtin/replace.c:342
-#, fuzzy
 msgid "editing object file failed"
-msgstr "falha ao ler referências bissetadas"
+msgstr "falhou editar ficheiro-objeto"
 
 #: builtin/replace.c:351
 #, c-format
@@ -20743,14 +21041,14 @@ msgid "new object is the same as the old one: '%s'"
 msgstr ""
 
 #: builtin/replace.c:384
-#, fuzzy, c-format
+#, c-format
 msgid "could not parse %s as a commit"
-msgstr "não foi possível analisar o commit HEAD"
+msgstr "incapaz processar %s como commit"
 
 #: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
-msgstr "mergetag incorreta no commit '%s'"
+msgstr "mergetag inválida em memória '%s'"
 
 #: builtin/replace.c:418
 #, c-format
@@ -20767,7 +21065,7 @@ msgstr ""
 "em vez de --graft"
 
 #: builtin/replace.c:469
-#, fuzzy, c-format
+#, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "o commit original '%s' tem uma assinatura gpg."
 
@@ -20778,7 +21076,7 @@ msgstr "a assinatura será removida do commit suplente!"
 #: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
-msgstr "não foi possível escrever o commit suplente de: '%s'"
+msgstr "incapaz escrever o commit substituto para: '%s'"
 
 #: builtin/replace.c:488
 #, c-format
@@ -20791,7 +21089,7 @@ msgid "new commit is the same as the old one: '%s'"
 msgstr ""
 
 #: builtin/replace.c:527
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "could not convert the following graft(s):\n"
 "%s"
@@ -20805,7 +21103,7 @@ msgstr "listar referências substituídas"
 
 #: builtin/replace.c:549
 msgid "delete replace refs"
-msgstr "eliminar referências substituídas"
+msgstr "eliminar refs de substituição"
 
 #: builtin/replace.c:550
 msgid "edit existing object"
@@ -20816,9 +21114,8 @@ msgid "change a commit's parents"
 msgstr "mudar os pais de um commit"
 
 #: builtin/replace.c:552
-#, fuzzy
 msgid "convert existing graft file"
-msgstr "forçar substituição dos ficheiros existentes"
+msgstr "converter ficheiro excerto existente"
 
 #: builtin/replace.c:553
 msgid "replace the ref if it exists"
@@ -20826,71 +21123,64 @@ msgstr "substituir a referência se esta existir"
 
 #: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
-msgstr "não mostrar o conteúdo de --edit com impressão bonita"
+msgstr "incapaz pretty-print conteúdo para --edit"
 
 #: builtin/replace.c:556
 msgid "use this format"
 msgstr "usar este formato"
 
 #: builtin/replace.c:569
-#, fuzzy
 msgid "--format cannot be used when not listing"
-msgstr "--fix-thin não pode ser usado sem --stdin"
+msgstr "--format apenas pode ser usado quando fazes listagem"
 
 #: builtin/replace.c:577
-#, fuzzy
 msgid "-f only makes sense when writing a replacement"
-msgstr "-z só faz sentido com --stdin"
+msgstr "-f apenas faz sentido quando escreves um substituto"
 
 #: builtin/replace.c:581
-#, fuzzy
 msgid "--raw only makes sense with --edit"
-msgstr "-z só faz sentido com --stdin"
+msgstr "--raw apenas faz sentido com --edit"
 
 #: builtin/replace.c:587
 msgid "-d needs at least one argument"
-msgstr ""
+msgstr "-d precisa pelo menos um argumento"
 
 #: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr ""
 
 #: builtin/replace.c:599
-#, fuzzy
 msgid "-e needs exactly one argument"
-msgstr "É necessário exatamente um intervalo."
+msgstr ""
 
 #: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr ""
 
 #: builtin/replace.c:611
-#, fuzzy
 msgid "--convert-graft-file takes no argument"
-msgstr "--continue não leva argumentos"
+msgstr "--convert-graft-file leva argumento nenhum"
 
 #: builtin/replace.c:617
-#, fuzzy
 msgid "only one pattern can be given with -l"
-msgstr "combinar padrões especificados com -e"
+msgstr "com -l apenas pode ser dado um padrão"
 
 #: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
-msgstr ""
-"git rerere [clear | forget <caminho>... | status | remaining | diff | gc]"
+msgstr "git rerere [clear | forget <caminho>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "registar resoluções limpas no índice"
 
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
-msgstr ""
+msgstr "'git rerere forget' sem caminho é obsoleto"
 
-#: builtin/rerere.c:113
-#, fuzzy, c-format
+#: builtin/rerere.c:111
+#, c-format
 msgid "unable to generate diff for '%s'"
-msgstr "não foi possível criar '%s'"
+msgstr "incapaz gerar diff para '%s'"
 
 #: builtin/reset.c:32
 msgid ""
@@ -20899,9 +21189,8 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
 #: builtin/reset.c:33
-#, fuzzy
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
-msgstr "git reset [-q] [<árvore-etc>] [--] <caminhos>..."
+msgstr "git reset [-q] [<arvoredo>] [--] <espetro-caminho>..."
 
 #: builtin/reset.c:34
 msgid ""
@@ -20909,9 +21198,8 @@ msgid ""
 msgstr ""
 
 #: builtin/reset.c:35
-#, fuzzy
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
-msgstr "git reset --patch [<árvore-etc>] [--] [<caminhos>...]"
+msgstr "git reset --patch [<arvoredo>] [--] [<espetro-caminho>...]"
 
 #: builtin/reset.c:41
 msgid "mixed"
@@ -20944,7 +21232,7 @@ msgstr "Falha ao procurar árvore de HEAD."
 #: builtin/reset.c:91
 #, c-format
 msgid "Failed to find tree of %s."
-msgstr "Falha ao procurar árvore de %s."
+msgstr "Falhou encontrar árvore de %s."
 
 #: builtin/reset.c:116
 #, c-format
@@ -20956,10 +21244,10 @@ msgstr "HEAD está agora em %s"
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Incapaz de fazer uma reposição %s durante uma junção."
 
-#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594
-#: builtin/stash.c:618
+#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
+#: builtin/stash.c:687
 msgid "be quiet, only report errors"
-msgstr "silencioso, só reportar erros"
+msgstr "ficar silencioso, só reportar erros"
 
 #: builtin/reset.c:297
 msgid "reset HEAD and index"
@@ -20971,7 +21259,7 @@ msgstr "repor HEAD apenas"
 
 #: builtin/reset.c:300 builtin/reset.c:302
 msgid "reset HEAD, index and working tree"
-msgstr "repor HEAD, índice e árvore de trabalho"
+msgstr "restabelecer HEAD, cenário e árvore-trabalho"
 
 #: builtin/reset.c:304
 msgid "reset HEAD but keep local changes"
@@ -20997,8 +21285,7 @@ msgstr "--patch é incompatível com --{hard,mixed,soft}"
 
 #: builtin/reset.c:371
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
-msgstr ""
-"--mixed acompanhado com caminhos é obsoleto; use 'git reset -- <caminhos>'."
+msgstr "--mixed com caminhos é obsoleto; usa 'git reset -- <caminhos>' invés."
 
 #: builtin/reset.c:373
 #, c-format
@@ -21016,7 +21303,7 @@ msgstr "-N só pode ser usado com --mixed"
 
 #: builtin/reset.c:413
 msgid "Unstaged changes after reset:"
-msgstr "Alterações não preparadas depois de repor:"
+msgstr "Alterações despreparadas depois de reposição:"
 
 #: builtin/reset.c:416
 #, c-format
@@ -21036,22 +21323,21 @@ msgstr "Incapaz repor ficheiro index para a revisão '%s'."
 msgid "Could not write new index file."
 msgstr "Incapaz escrever novo ficheiro index."
 
-#: builtin/rev-list.c:499
+#: builtin/rev-list.c:541
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr ""
 
-#: builtin/rev-list.c:560
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr ""
 
-#: builtin/rev-list.c:610
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
-msgstr "rev-list não suporta apresentação de notas"
+msgstr "rev-list insustenta mostrar notas"
 
-#: builtin/rev-list.c:615
-#, fuzzy
+#: builtin/rev-list.c:679
 msgid "marked counting is incompatible with --objects"
-msgstr "--first-parent é incompatível com --bisect"
+msgstr ""
 
 #: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -21063,12 +21349,24 @@ msgstr "conservar '--' passado como argumento"
 
 #: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
-msgstr "parar de analisar depois do primeiro argumento que não seja uma opção"
+msgstr "parei de processar após o primeiro argumento diferente de opção"
 
 #: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "mostrar em formato fixo e longo"
 
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "fim de input prematuro"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr "antes do separador '--' foi dado string de utilização nenhuma"
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "Precisava uma única revisão"
+
 #: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -21084,9 +21382,53 @@ msgstr ""
 "Execute \"git rev-parse --parseopt -h\" para mais informação com a primeira "
 "utilização."
 
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir exige argumento"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "gitdir '%s' nenhuma"
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "--git-path exige argumento"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "-n exige argumento"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "--path-format exige argumento"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "argumento desconhecido para --path-format: %s"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "--default exige argumento"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "--prefix exige argumento"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "modo desconhecido para --abbrev-ref: %s"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "modo desconhecido para --show-object-format: %s"
+
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
-msgstr "git revert [<opções>] <commit-etc>..."
+msgstr "git revert [<opções>] <mnemónica>..."
 
 #: builtin/revert.c:25
 msgid "git revert <subcommand>"
@@ -21094,21 +21436,21 @@ msgstr "git revert <subcommando>"
 
 #: builtin/revert.c:30
 msgid "git cherry-pick [<options>] <commit-ish>..."
-msgstr "git cherry-pick [<opções>] <commit-etc>..."
+msgstr "git cherry-pick [<opções>] <mnemónica>..."
 
 #: builtin/revert.c:31
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <subcommando>"
 
 #: builtin/revert.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "option `%s' expects a number greater than zero"
-msgstr "a opção '%c' espera um valor numérico"
+msgstr ""
 
 #: builtin/revert.c:92
 #, c-format
 msgid "%s: %s cannot be used with %s"
-msgstr "%s: %s não pode ser usado com %s"
+msgstr "%s: %s incapaz ser usado com %s"
 
 #: builtin/revert.c:102
 msgid "end revert or cherry-pick sequence"
@@ -21123,21 +21465,20 @@ msgid "cancel revert or cherry-pick sequence"
 msgstr "cancelar reversão ou cherry-pick"
 
 #: builtin/revert.c:105
-#, fuzzy
 msgid "skip current commit and continue"
-msgstr "imprimir conteúdo do commit"
+msgstr ""
 
 #: builtin/revert.c:107
 msgid "don't automatically commit"
-msgstr "não submeter automaticamente"
+msgstr "memorizar automaticamente nada"
 
 #: builtin/revert.c:108
 msgid "edit the commit message"
-msgstr "editar a mensagem de commit"
+msgstr "editar mensagem de memória"
 
 #: builtin/revert.c:111
 msgid "parent-number"
-msgstr "número-pai"
+msgstr "número-parente"
 
 #: builtin/revert.c:112
 msgid "select mainline parent"
@@ -21145,11 +21486,11 @@ msgstr "selecionar pai principal"
 
 #: builtin/revert.c:114
 msgid "merge strategy"
-msgstr "estratégia de integração"
+msgstr "estratégia de junção"
 
 #: builtin/revert.c:116
 msgid "option for merge strategy"
-msgstr "opção de estratégia de integração"
+msgstr "opção para estratégia de junção"
 
 #: builtin/revert.c:125
 msgid "append commit name"
@@ -21163,19 +21504,19 @@ msgstr "preservar commits inicialmente vazios"
 msgid "keep redundant, empty commits"
 msgstr "manter commits redundantes e vazios"
 
-#: builtin/revert.c:239
+#: builtin/revert.c:237
 msgid "revert failed"
 msgstr "falha ao reverter"
 
-#: builtin/revert.c:252
+#: builtin/revert.c:250
 msgid "cherry-pick failed"
 msgstr "falha ao efetuar cherry-pick"
 
-#: builtin/rm.c:19
+#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<opções>] [--] <ficheiro>..."
 
-#: builtin/rm.c:207
+#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -21189,7 +21530,7 @@ msgstr[1] ""
 "os seguintes ficheiros têm staged content diferente quer no ficheiro\n"
 "quer em HEAD:"
 
-#: builtin/rm.c:212
+#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -21197,13 +21538,13 @@ msgstr ""
 "\n"
 "(usa -f para forçar remoção)"
 
-#: builtin/rm.c:216
+#: builtin/rm.c:217
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
 msgstr[0] "o seguinte ficheiro contém alterações preparadas no índice:"
 msgstr[1] "os seguintes ficheiros contêm alterações preparadas no índice:"
 
-#: builtin/rm.c:220 builtin/rm.c:229
+#: builtin/rm.c:221 builtin/rm.c:230
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -21211,51 +21552,50 @@ msgstr ""
 "\n"
 "(use --cached para manter o ficheiro, ou -f para forçar remoção)"
 
-#: builtin/rm.c:226
+#: builtin/rm.c:227
 msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "o seguinte ficheiro contém alterações locais:"
 msgstr[1] "os seguintes ficheiros contêm alterações locais:"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "do not list removed files"
-msgstr "não listar ficheiros removidos"
+msgstr "listar ficheiros removidos nenhuns"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "only remove from the index"
 msgstr "remover apenas do índice"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "override the up-to-date check"
 msgstr "ignorar verificação de atualização"
 
-#: builtin/rm.c:246
+#: builtin/rm.c:247
 msgid "allow recursive removal"
 msgstr "permitir remoção recursiva"
 
-#: builtin/rm.c:248
+#: builtin/rm.c:249
 msgid "exit with a zero status even if nothing matched"
-msgstr "sair com valor zero mesmo quando não há correspondência"
+msgstr "sair com valor zero mesmo se nada corresponder"
 
-#: builtin/rm.c:282
+#: builtin/rm.c:283
 msgid "No pathspec was given. Which files should I remove?"
 msgstr ""
 
-#: builtin/rm.c:305
-#, fuzzy
+#: builtin/rm.c:310
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
-"Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"
+"por favor encena tuas alterações em .gitmodules ou esconde-as para prosseguir"
 
-#: builtin/rm.c:323
+#: builtin/rm.c:331
 #, c-format
 msgid "not removing '%s' recursively without -r"
-msgstr "não remover '%s' recursivamente sem -r"
+msgstr "removendo '%s' recursivamente apenas com -r"
 
-#: builtin/rm.c:362
+#: builtin/rm.c:379
 #, c-format
 msgid "git rm: unable to remove %s"
-msgstr "git rm: não é possível remover %s"
+msgstr "git rm: incapaz remover %s"
 
 #: builtin/send-pack.c:20
 msgid ""
@@ -21271,7 +21611,7 @@ msgstr ""
 
 #: builtin/send-pack.c:188
 msgid "remote name"
-msgstr "nome do remoto"
+msgstr "nome de remoto"
 
 #: builtin/send-pack.c:201
 msgid "use stateless RPC protocol"
@@ -21279,72 +21619,68 @@ msgstr "use protocolo RPC sem estado"
 
 #: builtin/send-pack.c:202
 msgid "read refs from stdin"
-msgstr "ler referências do stdin"
+msgstr "ler refs de entrada padrão"
 
 #: builtin/send-pack.c:203
 msgid "print status from remote helper"
-msgstr "imprimir estado do programa auxiliar remoto"
+msgstr "imprimir status de ajudante remoto"
 
 #: builtin/shortlog.c:16
-#, fuzzy
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
-msgstr ""
-"git shortlog [<opções>] [<intervalo-de-revisões>] [[--] [<caminho>...]]"
+msgstr "git shortlog [<opções>] [<intervalo-revisões>] [[--] [<caminho>...]]"
 
 #: builtin/shortlog.c:17
-#, fuzzy
 msgid "git log --pretty=short | git shortlog [<options>]"
-msgstr "git worktree list [<opções>]"
+msgstr "git log --pretty=short | git shortlog [<opções>]"
 
-#: builtin/shortlog.c:135
+#: builtin/shortlog.c:123
 msgid "using multiple --group options with stdin is not supported"
 msgstr ""
 
-#: builtin/shortlog.c:145
+#: builtin/shortlog.c:133
 msgid "using --group=trailer with stdin is not supported"
 msgstr ""
 
-#: builtin/shortlog.c:335
-#, fuzzy, c-format
+#: builtin/shortlog.c:323
+#, c-format
 msgid "unknown group type: %s"
-msgstr "Tipo desconhecido: %d"
+msgstr "tipo de grupo desconhecido: %s"
 
-#: builtin/shortlog.c:363
-msgid "Group by committer rather than author"
-msgstr "agrupar por committer em vez de autor"
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "agrupar por memorizador em vez de autor"
 
-#: builtin/shortlog.c:366
+#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "ordenar saída de acordo com o número de commits por autor"
 
-#: builtin/shortlog.c:368
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
 msgstr "suprimir a descrição dos commits, fornecer apenas o número de commits"
 
-#: builtin/shortlog.c:370
-msgid "Show the email address of each author"
-msgstr "Mostrar o endereço de e-mail de cada autor"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "mostrar endereço de e-mail de cada autor"
 
-#: builtin/shortlog.c:371
+#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr ""
 
-#: builtin/shortlog.c:372
-msgid "Linewrap output"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
 msgstr "ajustar linhas"
 
-#: builtin/shortlog.c:374
+#: builtin/shortlog.c:362
 msgid "field"
 msgstr ""
 
-#: builtin/shortlog.c:375
-msgid "Group by field"
+#: builtin/shortlog.c:363
+msgid "group by field"
 msgstr ""
 
-#: builtin/shortlog.c:403
-#, fuzzy
+#: builtin/shortlog.c:391
 msgid "too many arguments given outside repository"
-msgstr "%s: '%s' está fora do repositório"
+msgstr ""
 
 #: builtin/show-branch.c:13
 msgid ""
@@ -21360,14 +21696,14 @@ msgstr ""
 
 #: builtin/show-branch.c:17
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
-msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referência>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
 
 #: builtin/show-branch.c:395
 #, c-format
 msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
-msgstr[0] "ignorar %s; não é possível processar mais do que %d referência"
-msgstr[1] "ingorar %s; não é possível processar mais do que %d referências"
+msgstr[0] "ignorando %s; incapaz lidar mais que %d ref"
+msgstr[1] "ignorando %s; incapaz lidar mais que %d refs"
 
 #: builtin/show-branch.c:548
 #, c-format
@@ -21380,7 +21716,7 @@ msgstr "mostrar os ramos de monitorização remotos e os ramos locais"
 
 #: builtin/show-branch.c:647
 msgid "show remote-tracking branches"
-msgstr "mostrar os ramos de monitorização remotos"
+msgstr ""
 
 #: builtin/show-branch.c:649
 msgid "color '*!+-' corresponding to the branch"
@@ -21396,7 +21732,7 @@ msgstr "sinónimo de more=-1"
 
 #: builtin/show-branch.c:654
 msgid "suppress naming strings"
-msgstr "suprimir a cadeias de caracteres de nomes"
+msgstr "suprimir nomes de strings"
 
 #: builtin/show-branch.c:656
 msgid "include the current branch"
@@ -21416,11 +21752,11 @@ msgstr "mostrar referências inalcançáveis a partir de outras referências"
 
 #: builtin/show-branch.c:664
 msgid "show commits in topological order"
-msgstr "mostrar commits em ordem topológica"
+msgstr "mostrar memórias em ordem topológica"
 
 #: builtin/show-branch.c:667
 msgid "show only commits not on the first branch"
-msgstr "mostrar apenas commits não presentes no primeiro ramo"
+msgstr "mostrar apenas memórias fora do primeiro ramo"
 
 #: builtin/show-branch.c:669
 msgid "show merges reachable from only one tip"
@@ -21451,7 +21787,7 @@ msgstr "fornecido ramo nenhum, e HEAD é inválida"
 
 #: builtin/show-branch.c:738
 msgid "--reflog option needs one branch name"
-msgstr "a opção --reflog precisa do nome de um ramo"
+msgstr "opção --reflog precisa de nome de ramo"
 
 #: builtin/show-branch.c:741
 #, c-format
@@ -21463,24 +21799,24 @@ msgstr[1] "apenas %d entradas podem ser mostradas neste momento."
 #: builtin/show-branch.c:745
 #, c-format
 msgid "no such ref %s"
-msgstr "referência inexistente %s"
+msgstr "ref inexistente %s"
 
 #: builtin/show-branch.c:831
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
-msgstr[0] "não é possível processar mais do que %d revisão."
-msgstr[1] "não é possível processar mais do que %d revisões."
+msgstr[0] "incapaz lidar mais que %d rev."
+msgstr[1] "incapaz lidar mais que %d revs."
 
 #: builtin/show-branch.c:835
 #, c-format
 msgid "'%s' is not a valid ref."
-msgstr "'%s' não é uma referência válida."
+msgstr "'%s' é uma ref inválida."
 
 #: builtin/show-branch.c:838
 #, c-format
 msgid "cannot find commit %s (%s)"
-msgstr "não é possível encontrar o commit %s (%s)"
+msgstr "incapaz encontrar commit %s (%s)"
 
 #: builtin/show-index.c:21
 msgid "hash-algorithm"
@@ -21530,116 +21866,112 @@ msgstr "mostrar hash SHA1 com <n> digitos"
 
 #: builtin/show-ref.c:177
 msgid "do not print results to stdout (useful with --verify)"
-msgstr "não imprimir resultados para o stdout (útil com --verify)"
+msgstr "imprimir resultados nenhuns para stdout (útil com --verify)"
 
 #: builtin/show-ref.c:179
 msgid "show refs from stdin that aren't in local repository"
-msgstr "mostrar referências do stdin que não estão no repositório local"
+msgstr "mostrar refs de stdin que estão fora do repositório local"
 
-#: builtin/sparse-checkout.c:21
+#: builtin/sparse-checkout.c:22
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
 msgstr ""
 
-#: builtin/sparse-checkout.c:50
-#, fuzzy
+#: builtin/sparse-checkout.c:46
 msgid "git sparse-checkout list"
-msgstr "git archive --list"
+msgstr "git sparse-checkout list"
 
-#: builtin/sparse-checkout.c:76
+#: builtin/sparse-checkout.c:72
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 
-#: builtin/sparse-checkout.c:228
-#, fuzzy
+#: builtin/sparse-checkout.c:227
 msgid "failed to create directory for sparse-checkout file"
-msgstr "falha ao criar o diretório %s"
+msgstr "falhou criar a pasta para ficheiro sparse-checkout"
 
-#: builtin/sparse-checkout.c:269
+#: builtin/sparse-checkout.c:268
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr ""
 
-#: builtin/sparse-checkout.c:271
+#: builtin/sparse-checkout.c:270
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr ""
 
-#: builtin/sparse-checkout.c:288
-msgid "git sparse-checkout init [--cone]"
+#: builtin/sparse-checkout.c:290
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 msgstr ""
 
-#: builtin/sparse-checkout.c:307
+#: builtin/sparse-checkout.c:310
 msgid "initialize the sparse-checkout in cone mode"
 msgstr ""
 
-#: builtin/sparse-checkout.c:344
+#: builtin/sparse-checkout.c:312
+msgid "toggle the use of a sparse index"
+msgstr ""
+
+#: builtin/sparse-checkout.c:340
+msgid "failed to modify sparse-index config"
+msgstr ""
+
+#: builtin/sparse-checkout.c:361
 #, c-format
 msgid "failed to open '%s'"
-msgstr "falha ao abrir '%s'"
+msgstr "falhou abrir '%s'"
 
-#: builtin/sparse-checkout.c:401
-#, fuzzy, c-format
+#: builtin/sparse-checkout.c:413
+#, c-format
 msgid "could not normalize path %s"
-msgstr "não foi possível analisar o patch '%s'"
+msgstr "incapaz normalizar patch %s"
 
-#: builtin/sparse-checkout.c:413
+#: builtin/sparse-checkout.c:425
 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
 msgstr ""
 
-#: builtin/sparse-checkout.c:438
-#, fuzzy, c-format
+#: builtin/sparse-checkout.c:450
+#, c-format
 msgid "unable to unquote C-style string '%s'"
-msgstr "não é possível ler a ligação simbólica %s"
+msgstr "incapaz de unquote string de C-style '%s'"
 
-#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516
+#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
 msgid "unable to load existing sparse-checkout patterns"
 msgstr ""
 
-#: builtin/sparse-checkout.c:561
-#, fuzzy
+#: builtin/sparse-checkout.c:573
 msgid "read patterns from standard in"
-msgstr "ler atualizações da entrada padrão"
+msgstr ""
 
-#: builtin/sparse-checkout.c:576
+#: builtin/sparse-checkout.c:588
 msgid "git sparse-checkout reapply"
-msgstr ""
+msgstr "git sparse-checkout reapply"
 
-#: builtin/sparse-checkout.c:595
-#, fuzzy
+#: builtin/sparse-checkout.c:607
 msgid "git sparse-checkout disable"
-msgstr "ignorar a aplicação do filtro de extração esparsa"
+msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:623
-#, fuzzy
+#: builtin/sparse-checkout.c:638
 msgid "error while refreshing working directory"
-msgstr "não é possível de obter o diretório de trabalho atual"
+msgstr "erro enquanto refrescava pasta de trabalho"
 
-#: builtin/stash.c:22 builtin/stash.c:38
-#, fuzzy
+#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
-msgstr "git worktree list [<opções>]"
+msgstr "git stash list [<opções>]"
 
-#: builtin/stash.c:23 builtin/stash.c:43
-#, fuzzy
+#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
-msgstr "git remote show [<opções>] <nome>"
+msgstr "git stash show [<opções>] [<esconderijo>]"
 
-#: builtin/stash.c:24 builtin/stash.c:48
+#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr ""
 
-#: builtin/stash.c:25
+#: builtin/stash.c:27
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
-#: builtin/stash.c:26 builtin/stash.c:63
-#, fuzzy
+#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
-msgstr "git branch [<opções>] [-l] [-f] <nome-ramo> [<ponto-de-partida>]"
-
-#: builtin/stash.c:27 builtin/stash.c:68
-msgid "git stash clear"
-msgstr ""
+msgstr "git stash branch <nome-de-ramo> [<esconderijo>]"
 
-#: builtin/stash.c:28
+#: builtin/stash.c:30
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
@@ -21647,210 +21979,222 @@ msgid ""
 "          [--] [<pathspec>...]]"
 msgstr ""
 
-#: builtin/stash.c:32 builtin/stash.c:85
+#: builtin/stash.c:34 builtin/stash.c:87
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
 
-#: builtin/stash.c:53
+#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
-#: builtin/stash.c:58
+#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
-#: builtin/stash.c:73
+#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr ""
 
-#: builtin/stash.c:78
+#: builtin/stash.c:80
 msgid ""
 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
 
-#: builtin/stash.c:128
-#, fuzzy, c-format
+#: builtin/stash.c:130
+#, c-format
 msgid "'%s' is not a stash-like commit"
-msgstr "'$args' não é um commit semelhante a pilha"
+msgstr "'%s' é commit tipo-arrumos nenhum"
 
-#: builtin/stash.c:148
-#, fuzzy, c-format
+#: builtin/stash.c:150
+#, c-format
 msgid "Too many revisions specified:%s"
-msgstr "Demasiadas revisões especificadas: $REV"
+msgstr "Demasiadas revisões especificadas:%s"
 
-#: builtin/stash.c:162
-#, fuzzy
+#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "Nenhuma pilha encontrada."
 
-#: builtin/stash.c:176
-#, fuzzy, c-format
+#: builtin/stash.c:178
+#, c-format
 msgid "%s is not a valid reference"
-msgstr "'%s' não é uma referência válida."
+msgstr "%s é referência inválida"
+
+#: builtin/stash.c:227
+msgid "git stash clear with arguments is unimplemented"
+msgstr "git stash clear com argumentos está por implementar"
 
-#: builtin/stash.c:225
-msgid "git stash clear with parameters is unimplemented"
-msgstr "não está implementado git stash clear com parâmetros"
+#: builtin/stash.c:431
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file!  Renaming\n"
+"            %s -> %s\n"
+"         to make room.\n"
+msgstr ""
 
-#: builtin/stash.c:404
-#, fuzzy
+#: builtin/stash.c:492
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "incapaz aplicar arrumação durante uma junção"
 
-#: builtin/stash.c:415
-#, fuzzy, c-format
+#: builtin/stash.c:503
+#, c-format
 msgid "could not generate diff %s^!."
-msgstr "não foi possível ler '%s'."
+msgstr "incapaz gerar diff %s^!."
 
-#: builtin/stash.c:422
-#, fuzzy
+#: builtin/stash.c:510
 msgid "conflicts in index. Try without --index."
-msgstr "Conflitos no índice. Tente sem --index."
+msgstr "conflitos no cenário. Tenta sem --index."
 
-#: builtin/stash.c:428
-#, fuzzy
+#: builtin/stash.c:516
 msgid "could not save index tree"
 msgstr "incapaz guardar árvore index"
 
-#: builtin/stash.c:437
-#, fuzzy
+#: builtin/stash.c:525
 msgid "could not restore untracked files from stash"
-msgstr "incapaz restaurar ficheiros por controlar de arrumos"
+msgstr "incapaz restaurar ficheiros por seguir de arrumos"
 
-#: builtin/stash.c:451
-#, fuzzy, c-format
+#: builtin/stash.c:539
+#, c-format
 msgid "Merging %s with %s"
 msgstr "Juntando %s com %s"
 
-#: builtin/stash.c:461
+#: builtin/stash.c:549
 msgid "Index was not unstashed."
-msgstr "O índice não foi reposto."
+msgstr "Index está por despreparar."
 
-#: builtin/stash.c:522 builtin/stash.c:620
-#, fuzzy
+#: builtin/stash.c:591 builtin/stash.c:689
 msgid "attempt to recreate the index"
-msgstr "falha ao ler o índice"
+msgstr ""
 
-#: builtin/stash.c:566
-#, fuzzy, c-format
+#: builtin/stash.c:635
+#, c-format
 msgid "Dropped %s (%s)"
-msgstr "A descartar ${REV} ($s)"
+msgstr "Descartei %s (%s)"
 
-#: builtin/stash.c:569
-#, fuzzy, c-format
+#: builtin/stash.c:638
+#, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Incapaz descartar entrada de arrumos"
 
-#: builtin/stash.c:582
-#, fuzzy, c-format
+#: builtin/stash.c:651
+#, c-format
 msgid "'%s' is not a stash reference"
-msgstr "'$args' não é uma referência de pilha"
+msgstr "'%s' é referência de arrumos nenhuma"
 
-#: builtin/stash.c:632
-#, fuzzy
+#: builtin/stash.c:701
 msgid "The stash entry is kept in case you need it again."
 msgstr "A pilha é guarda no caso de precisar dela de novo."
 
-#: builtin/stash.c:655
+#: builtin/stash.c:724
 msgid "No branch name specified"
 msgstr "Nenhum nome de ramo especificado"
 
-#: builtin/stash.c:799 builtin/stash.c:836
-#, fuzzy, c-format
+#: builtin/stash.c:808
+msgid "failed to parse tree"
+msgstr "falhou processar árvore"
+
+#: builtin/stash.c:819
+msgid "failed to unpack trees"
+msgstr "falhou desempacotar árvores"
+
+#: builtin/stash.c:839
+msgid "include untracked files in the stash"
+msgstr "incluir ficheiros desmonitorizados em esconderijo"
+
+#: builtin/stash.c:842
+msgid "only show untracked files in the stash"
+msgstr "mostrar apenas ficheiros desmonitorizados de esconderijo"
+
+#: builtin/stash.c:929 builtin/stash.c:966
+#, c-format
 msgid "Cannot update %s with %s"
 msgstr "Incapaz atualizar %s com %s"
 
-#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536
-#, fuzzy
+#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
 msgid "stash message"
-msgstr "mensagem da tag"
+msgstr "mensagem de esconderijo"
 
-#: builtin/stash.c:827
+#: builtin/stash.c:957
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr ""
 
-#: builtin/stash.c:1042
+#: builtin/stash.c:1171
 msgid "No changes selected"
 msgstr "Nenhuma alteração selecionada"
 
-#: builtin/stash.c:1142
+#: builtin/stash.c:1271
 msgid "You do not have the initial commit yet"
-msgstr "O commit inicial ainda não existe"
+msgstr "Commit inicial ainda é inexistente"
 
-#: builtin/stash.c:1169
+#: builtin/stash.c:1298
 msgid "Cannot save the current index state"
 msgstr "Incapaz guardar estado atual de index"
 
-#: builtin/stash.c:1178
+#: builtin/stash.c:1307
 msgid "Cannot save the untracked files"
-msgstr "Incapaz de guardar ficheiros por controlar"
+msgstr "Incapaz de guardar ficheiros por seguir"
 
-#: builtin/stash.c:1189 builtin/stash.c:1198
+#: builtin/stash.c:1318 builtin/stash.c:1327
 msgid "Cannot save the current worktree state"
 msgstr "Incapaz guardar o estado atual de worktree"
 
-#: builtin/stash.c:1226
+#: builtin/stash.c:1355
 msgid "Cannot record working tree state"
 msgstr "Incapaz gravar o estado de worktree"
 
-#: builtin/stash.c:1275
+#: builtin/stash.c:1404
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "Impossível usar --patch e --include-untracked ou --all ao mesmo tempo"
 
-#: builtin/stash.c:1291
-#, fuzzy
+#: builtin/stash.c:1422
 msgid "Did you forget to 'git add'?"
 msgstr "Será que falta 'git add'?"
 
-#: builtin/stash.c:1306
+#: builtin/stash.c:1437
 msgid "No local changes to save"
 msgstr "Com alterações locais para guardar nenhumas"
 
-#: builtin/stash.c:1313
+#: builtin/stash.c:1444
 msgid "Cannot initialize stash"
 msgstr "Incapaz inicializar arrumos"
 
-#: builtin/stash.c:1328
+#: builtin/stash.c:1459
 msgid "Cannot save the current status"
 msgstr "Incapaz guardar o estado atual"
 
-#: builtin/stash.c:1333
-#, fuzzy, c-format
+#: builtin/stash.c:1464
+#, c-format
 msgid "Saved working directory and index state %s"
-msgstr "Diretório de trabalho e estado do índice $stash_msg guardados"
+msgstr "Pasta-trabalho e estado de cenário %s guardados"
 
-#: builtin/stash.c:1423
+#: builtin/stash.c:1554
 msgid "Cannot remove worktree changes"
-msgstr "Incapaz remover alterações de worktree"
+msgstr "Incapaz remover alterações de árvore-trabalho"
 
-#: builtin/stash.c:1462 builtin/stash.c:1527
+#: builtin/stash.c:1593 builtin/stash.c:1658
 msgid "keep index"
 msgstr ""
 
-#: builtin/stash.c:1464 builtin/stash.c:1529
+#: builtin/stash.c:1595 builtin/stash.c:1660
 msgid "stash in patch mode"
 msgstr ""
 
-#: builtin/stash.c:1465 builtin/stash.c:1530
-#, fuzzy
+#: builtin/stash.c:1596 builtin/stash.c:1661
 msgid "quiet mode"
-msgstr "silencioso"
+msgstr "modo silencioso"
 
-#: builtin/stash.c:1467 builtin/stash.c:1532
-#, fuzzy
+#: builtin/stash.c:1598 builtin/stash.c:1663
 msgid "include untracked files in stash"
-msgstr "listar ficheiros não controlados em colunas"
+msgstr "incluir ficheiros desmonitorizados em esconderijo"
 
-#: builtin/stash.c:1469 builtin/stash.c:1534
-#, fuzzy
+#: builtin/stash.c:1600 builtin/stash.c:1665
 msgid "include ignore files"
-msgstr "mostrar ficheiros ignorados"
+msgstr "incluir ficheiros ignorados"
 
-#: builtin/stash.c:1569
+#: builtin/stash.c:1700
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -21873,47 +22217,48 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "preceder cada linha com um carácter de comentário e um espaço"
 
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Esperava-se um nome completo de uma referência, obteve-se %s"
 
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr ""
 
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
-msgstr "não é possível tirar um componente do URL '%s'"
+msgstr "incapaz despir um componente a partir do url '%s'"
 
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
+#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2891
 msgid "alternative anchor for relative paths"
 msgstr "âncora alternativa para caminhos relativos"
 
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:416
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
 
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:652
+#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:654
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Nenhum URL encontrado para o caminho de submódulo '%s' em .gitmodules"
 
-#: builtin/submodule--helper.c:524
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:526
+#, c-format
 msgid "Entering '%s'\n"
 msgstr "Entrando em '%s'\n"
 
-#: builtin/submodule--helper.c:527
+#: builtin/submodule--helper.c:529
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
 "."
 msgstr ""
 
-#: builtin/submodule--helper.c:549
+#: builtin/submodule--helper.c:551
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -21921,188 +22266,173 @@ msgid ""
 "."
 msgstr ""
 
-#: builtin/submodule--helper.c:565
-#, fuzzy
-msgid "Suppress output of entering each submodule command"
-msgstr "Suprimir a saída ao inicializar um submódulo"
+#: builtin/submodule--helper.c:567
+msgid "suppress output of entering each submodule command"
+msgstr ""
 
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487
-#, fuzzy
-msgid "Recurse into nested submodules"
-msgstr "percorrer submódulos recursivamente"
+#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
+#: builtin/submodule--helper.c:1489
+msgid "recurse into nested submodules"
+msgstr "percorrer recursivamente submódulos aninhados"
 
-#: builtin/submodule--helper.c:572
+#: builtin/submodule--helper.c:574
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr ""
 
-#: builtin/submodule--helper.c:599
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:601
+#, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr ""
-"não é possível encontrar configuração '%s'. Assumir que este repositório é o "
-"próprio repositório a montante autoritário."
+"incapaz encontrar configuração '%s'. Assumindo que este repositório é o "
+"próprio repositório upstream autoritário."
 
-#: builtin/submodule--helper.c:666
+#: builtin/submodule--helper.c:668
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
-msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
+msgstr "Falhou registar url para caminho de submódulo '%s'"
 
-#: builtin/submodule--helper.c:670
+#: builtin/submodule--helper.c:672
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Submódulo '%s' (%s) registado para path '%s'\n"
 
-#: builtin/submodule--helper.c:680
+#: builtin/submodule--helper.c:682
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "aviso: modo command update sugerido para submódulo '%s'\n"
 
-#: builtin/submodule--helper.c:687
+#: builtin/submodule--helper.c:689
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
-msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'"
+msgstr ""
 
-#: builtin/submodule--helper.c:709
-msgid "Suppress output for initializing a submodule"
-msgstr "Suprimir a saída ao inicializar um submódulo"
+#: builtin/submodule--helper.c:711
+msgid "suppress output for initializing a submodule"
+msgstr ""
 
-#: builtin/submodule--helper.c:714
-#, fuzzy
+#: builtin/submodule--helper.c:716
 msgid "git submodule--helper init [<options>] [<path>]"
-msgstr "git submodule--helper init [<caminho>]"
+msgstr ""
 
-#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
-msgstr "para path '%s' encontrei em .gitmodules, mapeamento de submódulo nenhum"
+msgstr ""
+"para path '%s' encontrei em .gitmodules, mapeamento de submódulo nenhum"
 
-#: builtin/submodule--helper.c:835
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:837
+#, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
-msgstr "não foi possível percorrer recursivamente o submódulo '%s'"
+msgstr "incapaz resolver ref HEAD dentro de submódulo '%s'"
 
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#, c-format
 msgid "failed to recurse into submodule '%s'"
-msgstr "não foi possível percorrer recursivamente o submódulo '%s'"
+msgstr "falhou percorrer recursivamente o submódulo '%s'"
 
-#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
-#, fuzzy
-msgid "Suppress submodule status output"
-msgstr "preceder isto ao caminho do submódulo"
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+msgid "suppress submodule status output"
+msgstr "suprimir saída de status de submódulo"
 
-#: builtin/submodule--helper.c:887
+#: builtin/submodule--helper.c:889
 msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
+"use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr ""
 
-#: builtin/submodule--helper.c:888
-#, fuzzy
-msgid "recurse into nested submodules"
-msgstr "percorrer submódulos recursivamente"
-
-#: builtin/submodule--helper.c:893
-#, fuzzy
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<caminho>...]"
 
-#: builtin/submodule--helper.c:917
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <caminho>"
 
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:991
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr ""
 
-#: builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:994
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr ""
 
-#: builtin/submodule--helper.c:1005
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1007
+#, c-format
 msgid "%s"
 msgstr "[%s]"
 
-#: builtin/submodule--helper.c:1055
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1057
+#, c-format
 msgid "couldn't hash object from '%s'"
-msgstr "não foi possível analisar o objeto '%s'"
+msgstr "incapaz fazer hash a objeto a partir de '%s'"
 
-#: builtin/submodule--helper.c:1059
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1061
+#, c-format
 msgid "unexpected mode %o\n"
-msgstr "estou à espera de um modo diferente de %o\n"
-
-#: builtin/submodule--helper.c:1300
-#, fuzzy
-msgid "use the commit stored in the index instead of the submodule HEAD"
-msgstr "extrair <ramo> em vez da HEAD do remoto"
+msgstr "modo inesperado %o\n"
 
 #: builtin/submodule--helper.c:1302
-msgid "to compare the commit in the index with that in the submodule HEAD"
+msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr ""
 
 #: builtin/submodule--helper.c:1304
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "compara a memória no arquivador com aquela no submódulo HEAD"
+
+#: builtin/submodule--helper.c:1306
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1306
-#, fuzzy
+#: builtin/submodule--helper.c:1308
 msgid "limit the summary size"
-msgstr "restringir-se a cabeças"
+msgstr "limitar tamanho de sumário"
 
-#: builtin/submodule--helper.c:1311
-#, fuzzy
+#: builtin/submodule--helper.c:1313
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
-msgstr "git submodule--helper init [<caminho>]"
+msgstr ""
 
-#: builtin/submodule--helper.c:1335
-#, fuzzy
+#: builtin/submodule--helper.c:1337
 msgid "could not fetch a revision for HEAD"
-msgstr "não foi possível destacar HEAD"
+msgstr "incapaz buscar uma revisão para HEAD"
 
-#: builtin/submodule--helper.c:1340
-#, fuzzy
+#: builtin/submodule--helper.c:1342
 msgid "--cached and --files are mutually exclusive"
-msgstr "--deepen e --depth são mutuamente exclusivos"
+msgstr ""
 
-#: builtin/submodule--helper.c:1407
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1409
+#, c-format
 msgid "Synchronizing submodule url for '%s'\n"
-msgstr "Sincronizando URL do submódule '%s'\n"
+msgstr "Sincronizando url de submódulo para '%s'\n"
 
-#: builtin/submodule--helper.c:1413
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1415
+#, c-format
 msgid "failed to register url for submodule path '%s'"
-msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
+msgstr "falhou registar url para caminho de submódulo '%s'"
 
-#: builtin/submodule--helper.c:1427
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1429
+#, c-format
 msgid "failed to get the default remote for submodule '%s'"
-msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'"
+msgstr ""
 
-#: builtin/submodule--helper.c:1438
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1440
+#, c-format
 msgid "failed to update remote for submodule '%s'"
-msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'"
+msgstr ""
 
-#: builtin/submodule--helper.c:1485
-#, fuzzy
-msgid "Suppress output of synchronizing submodule url"
-msgstr "Suprimir a saída ao inicializar um submódulo"
+#: builtin/submodule--helper.c:1487
+msgid "suppress output of synchronizing submodule url"
+msgstr ""
 
-#: builtin/submodule--helper.c:1492
-#, fuzzy
+#: builtin/submodule--helper.c:1494
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
-msgstr "git submodule--helper init [<caminho>]"
+msgstr ""
 
-#: builtin/submodule--helper.c:1546
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1548
+#, 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)"
@@ -22110,55 +22440,53 @@ msgstr ""
 "Submodule work tree '%s' tem uma pasta .git (usa 'rm -rf' se queres mesmo "
 "removê-la e remover toda a história)"
 
-#: builtin/submodule--helper.c:1558
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1560
+#, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
-"A árvore de trabalho do submódulo '$displaypath' contém alterações locais; "
-"use '-f' para as descartar"
+"�rvore-trabalho de submódulo '%s' contém alterações locais; "
+"usa '-f' para as descartar"
 
-#: builtin/submodule--helper.c:1566
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1568
+#, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Pasta '%s' limpa\n"
 
-#: builtin/submodule--helper.c:1568
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1570
+#, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "Impossível remover submodule work tree '%s'\n"
 
-#: builtin/submodule--helper.c:1579
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1581
+#, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "incapaz criar pasta vazio de submódulo %s"
 
-#: builtin/submodule--helper.c:1595
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1597
+#, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Submódulo '%s' (%s) unregistred para caminho '%s'\n"
 
-#: builtin/submodule--helper.c:1624
-msgid "Remove submodule working trees even if they contain local changes"
+#: builtin/submodule--helper.c:1626
+msgid "remove submodule working trees even if they contain local changes"
 msgstr ""
 
-#: builtin/submodule--helper.c:1625
-#, fuzzy
-msgid "Unregister all submodules"
-msgstr "percorrer submódulos recursivamente"
+#: builtin/submodule--helper.c:1627
+msgid "unregister all submodules"
+msgstr ""
 
-#: builtin/submodule--helper.c:1630
+#: builtin/submodule--helper.c:1632
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1644
+#: builtin/submodule--helper.c:1646
 msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr ""
-"Use '--all' se pretende mesmo anular a inicialização todos os submódulos"
+msgstr "Usa '--all' se queres mesmo anular a inicialização de todos submódulos"
 
-#: builtin/submodule--helper.c:1713
+#: builtin/submodule--helper.c:1690
 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"
@@ -22166,48 +22494,67 @@ msgid ""
 "'--reference-if-able' instead of '--reference'."
 msgstr ""
 
-#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
-msgstr "o submódulo '%s' não pode adicionar sobressalente: %s"
+msgstr "submódulo '%s' incapaz adicionar alternativo: %s"
 
-#: builtin/submodule--helper.c:1791
+#: builtin/submodule--helper.c:1768
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
-msgstr "O valor '%s' de submodule.alternateErrorStrategy não é reconhecido"
+msgstr "Valor '%s' de submodule.alternateErrorStrategy é irreconhecível"
 
-#: builtin/submodule--helper.c:1798
+#: builtin/submodule--helper.c:1775
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
-msgstr "O valor '%s' de submodule.alternateLocation não é reconhecido"
+msgstr "Valor '%s' de submodule.alternateLocation é irreconhecível"
+
+#: builtin/submodule--helper.c:1800
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "recusando criar/usar '%s' em outra pasta de submódulo git"
+
+#: builtin/submodule--helper.c:1841
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "clonar '%s' no caminho de submódulo '%s' falhou"
 
-#: builtin/submodule--helper.c:1822
+#: builtin/submodule--helper.c:1846
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "pasta com conteúdo: '%s'"
+
+#: builtin/submodule--helper.c:1858
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "incapaz obter pasta de submódulo para '%s'"
+
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
 msgid "where the new submodule will be cloned to"
 msgstr "sítio para aonde o novo submódulo será clonado"
 
-#: builtin/submodule--helper.c:1825
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
 msgid "name of the new submodule"
 msgstr "nome do novo submódulo"
 
-#: builtin/submodule--helper.c:1828
+#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
 msgid "url where to clone the submodule from"
 msgstr "url donde clonar o submódulos"
 
-#: builtin/submodule--helper.c:1836
+#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
 msgid "depth for shallow clones"
 msgstr "profundidade de clones rasos"
 
-#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
+#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
+#: builtin/submodule--helper.c:2909
 msgid "force cloning progress"
 msgstr "forçar progresso da clonagem"
 
-#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
-#, fuzzy
+#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
 msgid "disallow cloning into non-empty directory"
-msgstr "a aplicar a um histórico vazio"
+msgstr "proibindo clonar para uma pasta com conteúdo"
 
-#: builtin/submodule--helper.c:1848
-#, fuzzy
+#: builtin/submodule--helper.c:1916
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22216,105 +22563,84 @@ msgstr ""
 "git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference "
 "<repositório>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>"
 
-#: builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:1953
 #, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
+msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1884
+#: builtin/submodule--helper.c:1957
 #, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
-
-#: builtin/submodule--helper.c:1888
-#, fuzzy, c-format
-msgid "directory not empty: '%s'"
-msgstr "o diretório de origem está vazio"
-
-#: builtin/submodule--helper.c:1900
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "não foi possível obter o diretório do submódulo de '%s'"
-
-#: builtin/submodule--helper.c:1936
-#, fuzzy, c-format
-msgid "Invalid update mode '%s' for submodule path '%s'"
-msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'"
-
-#: builtin/submodule--helper.c:1940
-#, fuzzy, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
-msgstr "Falha ao registar o modo de atualização do caminho de submódulo '%s'"
+msgstr ""
 
-#: builtin/submodule--helper.c:2041
+#: builtin/submodule--helper.c:2058
 #, c-format
 msgid "Submodule path '%s' not initialized"
-msgstr "Caminho de submódulo '%s' não inicializado"
+msgstr "Path de submódulo '%s' por inicializar"
 
-#: builtin/submodule--helper.c:2045
+#: builtin/submodule--helper.c:2062
 msgid "Maybe you want to use 'update --init'?"
-msgstr "Pretendia usar 'update --init'?"
+msgstr "Pretendias usar 'update --init'?"
 
-#: builtin/submodule--helper.c:2075
+#: builtin/submodule--helper.c:2092
 #, c-format
 msgid "Skipping unmerged submodule %s"
-msgstr "A ignorar submódulo %s não integrado"
+msgstr "Passando à frente submódulo por juntar %s"
 
-#: builtin/submodule--helper.c:2104
+#: builtin/submodule--helper.c:2121
 #, c-format
 msgid "Skipping submodule '%s'"
-msgstr "A ignorar submódulo '%s'"
+msgstr "Passando à frente submódulo '%s'"
 
-#: builtin/submodule--helper.c:2254
+#: builtin/submodule--helper.c:2271
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Falha ao clonar '%s'. Nova tentativa agendada"
 
-#: builtin/submodule--helper.c:2265
+#: builtin/submodule--helper.c:2282
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Falha ao clonar '%s' pela segunda vez, abortado"
 
-#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
 msgid "path into the working tree"
-msgstr "caminho para a árvore de trabalho"
+msgstr "caminho para árvore de trabalho"
 
-#: builtin/submodule--helper.c:2330
+#: builtin/submodule--helper.c:2347
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 "caminho para a árvore de trabalho, atravessando limites de submódulos "
 "aninhados"
 
-#: builtin/submodule--helper.c:2334
+#: builtin/submodule--helper.c:2351
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout ou none"
 
-#: builtin/submodule--helper.c:2340
-msgid "Create a shallow clone truncated to the specified number of revisions"
-msgstr "criar um clone raso, truncado ao número especificado de revisões"
+#: builtin/submodule--helper.c:2357
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "criar um clone superficial, truncado ao número especificado de revisões"
 
-#: builtin/submodule--helper.c:2343
+#: builtin/submodule--helper.c:2360
 msgid "parallel jobs"
 msgstr "trabalhos em paralelo"
 
-#: builtin/submodule--helper.c:2345
+#: builtin/submodule--helper.c:2362
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "se o clone inicial deve seguir a recomendação rasa"
 
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2363
 msgid "don't print cloning progress"
-msgstr "não imprimir progresso da clonagem"
+msgstr "imprimir progresso da clonagem nenhum"
 
-#: builtin/submodule--helper.c:2357
-#, fuzzy
+#: builtin/submodule--helper.c:2374
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
+msgstr "git submodule--helper update-clone [--prefix=<caminho>] [<caminho>...]"
 
-#: builtin/submodule--helper.c:2370
+#: builtin/submodule--helper.c:2387
 msgid "bad value for update parameter"
 msgstr "valor incorreto no parâmetro update"
 
-#: builtin/submodule--helper.c:2418
+#: builtin/submodule--helper.c:2435
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22323,132 +22649,174 @@ msgstr ""
 "Ramo de submódulo (%s) foi configurado para herdar o ramo do superprojeto, "
 "mas o superprojeto está em ramo nenhum"
 
-#: builtin/submodule--helper.c:2541
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:2558
+#, c-format
 msgid "could not get a repository handle for submodule '%s'"
-msgstr "não foi possível procurar pelo submódulo '%s'"
+msgstr "incapaz obter pega de repositório para submódulo '%s'"
 
-#: builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2591
 msgid "recurse into submodules"
-msgstr "percorrer submódulos recursivamente"
+msgstr "entrar recursivamente nos submódulos"
 
-#: builtin/submodule--helper.c:2580
-#, fuzzy
+#: builtin/submodule--helper.c:2597
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
-msgstr "git submodule--helper embed-git-dir [<caminho>...]"
+msgstr "git submodule--helper absorb-git-dirs [<opções>] [<caminho>...]"
 
-#: builtin/submodule--helper.c:2636
+#: builtin/submodule--helper.c:2653
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr ""
 
-#: builtin/submodule--helper.c:2639
-#, fuzzy
+#: builtin/submodule--helper.c:2656
 msgid "unset the config in the .gitmodules file"
-msgstr "falha ao preparar .gitmodules atualizado"
+msgstr "desdefinir a config no ficheiro .gitmodules"
 
-#: builtin/submodule--helper.c:2644
-#, fuzzy
+#: builtin/submodule--helper.c:2661
 msgid "git submodule--helper config <name> [<value>]"
-msgstr "git submodule--helper name <caminho>"
+msgstr "git submodule--helper config <nome> [<valor>]"
 
-#: builtin/submodule--helper.c:2645
-#, fuzzy
+#: builtin/submodule--helper.c:2662
 msgid "git submodule--helper config --unset <name>"
-msgstr "git submodule--helper init [<caminho>]"
+msgstr ""
 
-#: builtin/submodule--helper.c:2646
-#, fuzzy
+#: builtin/submodule--helper.c:2663
 msgid "git submodule--helper config --check-writeable"
-msgstr "git submodule--helper init [<caminho>]"
+msgstr ""
 
-#: builtin/submodule--helper.c:2665 git-submodule.sh:150
-#, fuzzy, sh-format
+#: builtin/submodule--helper.c:2682 git-submodule.sh:150
+#, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
-msgstr ""
-"Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"
+msgstr "por favor certifica-te que ficheiro .gitmodules está na árvore-trabalho"
 
-#: builtin/submodule--helper.c:2681
-#, fuzzy
-msgid "Suppress output for setting url of a submodule"
-msgstr "Suprimir a saída ao inicializar um submódulo"
+#: builtin/submodule--helper.c:2698
+msgid "suppress output for setting url of a submodule"
+msgstr ""
 
-#: builtin/submodule--helper.c:2685
-#, fuzzy
+#: builtin/submodule--helper.c:2702
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
-msgstr "git submodule--helper init [<caminho>]"
+msgstr ""
 
-#: builtin/submodule--helper.c:2718
-#, fuzzy
+#: builtin/submodule--helper.c:2735
 msgid "set the default tracking branch to master"
-msgstr "mostrar os ramos de monitorização remotos"
+msgstr ""
 
-#: builtin/submodule--helper.c:2720
-#, fuzzy
+#: builtin/submodule--helper.c:2737
 msgid "set the default tracking branch"
-msgstr "mostrar os ramos de monitorização remotos"
+msgstr ""
 
-#: builtin/submodule--helper.c:2724
-#, fuzzy
+#: builtin/submodule--helper.c:2741
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
-msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
+msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <caminho>"
 
-#: builtin/submodule--helper.c:2725
-#, fuzzy
+#: builtin/submodule--helper.c:2742
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
-msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
+msgstr ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <ramo> <caminho>"
 
-#: builtin/submodule--helper.c:2732
-#, fuzzy
+#: builtin/submodule--helper.c:2749
 msgid "--branch or --default required"
-msgstr "nome do ramo é obrigatório"
+msgstr "--branch ou --default exigido"
 
-#: builtin/submodule--helper.c:2735
-#, fuzzy
+#: builtin/submodule--helper.c:2752
 msgid "--branch and --default are mutually exclusive"
-msgstr "--deepen e --depth são mutuamente exclusivos"
+msgstr ""
+
+#: builtin/submodule--helper.c:2815
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "Adicionando repo existente em '%s' ao cenário\n"
+
+#: builtin/submodule--helper.c:2818
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr "'%s' já existe e é repositório git inválido"
+
+#: builtin/submodule--helper.c:2828
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):"
+msgstr "Uma pasta git para '%s' foi encontrado localmente com remoto(s):"
+
+#: builtin/submodule--helper.c:2833
+#, 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 if you are unsure what this means, choose another name with the '--name' "
+"option.\n"
+msgstr ""
+"Se queres reutilizar esta pasta git local, em vez de voltares a clonar de\n"
+"  %s\n"
+"usa a opção '--force'. Se a pasta git local é o repo incorreto ou\n"
+"se tens pouca certeza sobre o que isto significa, podes mudar o nome com a "
+"opção '--name'.\n"
 
-#: builtin/submodule--helper.c:2792 git.c:438 git.c:711
+#: builtin/submodule--helper.c:2842
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "Reactivando pasta git local para submódulo '%s'\n"
+
+#: builtin/submodule--helper.c:2875
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "incapaz de observar submódulo '%s'"
+
+#: builtin/submodule--helper.c:2888
+msgid "branch of repository to checkout on cloning"
+msgstr "ramo de repositório para observar na clonagem"
+
+#: builtin/submodule--helper.c:2910
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "permitir adicionar os caminhos de submódulo ignorados"
+
+#: builtin/submodule--helper.c:2917
+msgid ""
+"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
+"name <name>"
+msgstr ""
+"git submodule--helper add-clone [<opções>...] --url <url> --path <caminho> "
+"--name <nome>"
+
+#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
 #, c-format
 msgid "%s doesn't support --super-prefix"
-msgstr "%s não suporta --super-prefix"
+msgstr "%s insustenta --super-prefix"
 
-#: builtin/submodule--helper.c:2798
+#: builtin/submodule--helper.c:2991
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
-msgstr "'%s' não é um subcomando válido de submodule--helper"
+msgstr "'%s' é subcomando de submodule--helper inválido"
 
 #: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
-msgstr "git symbolic-ref [<opções>] <nome> [<referência>]"
+msgstr "git symbolic-ref [<opções>] <nome> [<ref>]"
 
 #: builtin/symbolic-ref.c:9
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <nome>"
 
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
-msgstr ""
-"suprimir mensagens de erro sobre referências não-simbólicas (destacadas)"
+msgstr "suprimir mensagens de erro sobre refs não-simbólicas (destacadas)"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
-msgstr "eliminar referências simbólicas"
+msgstr "apagar ref simbólica"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
-msgstr "encurtar a apresentação de referências"
+msgstr "encurtar output de ref"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason"
 msgstr "razão"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason of the update"
 msgstr "razão da atualização"
 
 #: builtin/tag.c:25
-#, fuzzy
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
 "\t\t<tagname> [<head>]"
@@ -22458,10 +22826,9 @@ msgstr ""
 
 #: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
-msgstr "git tag -d <nome-da-tag>..."
+msgstr "git tag -d <nome-etiqueta>..."
 
 #: builtin/tag.c:28
-#, fuzzy
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
@@ -22475,19 +22842,19 @@ msgstr ""
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
-msgstr "git tag -v [--format=<formato>] <nometag>..."
+msgstr "git tag -v [--format=<formato>] <nome-etiqueta>..."
 
-#: builtin/tag.c:89
+#: builtin/tag.c:100
 #, c-format
 msgid "tag '%s' not found."
-msgstr "tag '%s' não encontrada."
+msgstr "tag '%s' por encontrar."
 
-#: builtin/tag.c:105
+#: builtin/tag.c:135
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Apaguei tag '%s' (era %s)\n"
 
-#: builtin/tag.c:135
+#: builtin/tag.c:170
 #, c-format
 msgid ""
 "\n"
@@ -22500,7 +22867,7 @@ msgstr ""
 "  %s\n"
 "Linha começadas com '%c' serão ignoradas.\n"
 
-#: builtin/tag.c:139
+#: builtin/tag.c:174
 #, c-format
 msgid ""
 "\n"
@@ -22514,15 +22881,11 @@ msgstr ""
 "  %s\n"
 "Linhas começadas com '%c' serão mantidas; se queres, podes apagá-las.\n"
 
-#: builtin/tag.c:198
+#: builtin/tag.c:241
 msgid "unable to sign the tag"
-msgstr "não foi possível assinar a tag"
+msgstr "incapaz assinar a tag"
 
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "não foi possível escrever o ficheiro da tag"
-
-#: builtin/tag.c:216
+#: builtin/tag.c:259
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -22531,156 +22894,151 @@ msgid ""
 "\tgit tag -f %s %s^{}"
 msgstr ""
 
-#: builtin/tag.c:232
+#: builtin/tag.c:275
 msgid "bad object type."
-msgstr "tipo de objeto incorreto."
+msgstr "tipo de objeto inválido."
 
-#: builtin/tag.c:285
+#: builtin/tag.c:328
 msgid "no tag message?"
 msgstr "sem mensagem de tag?"
 
-#: builtin/tag.c:292
+#: builtin/tag.c:335
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Deixei a mensagem da tag em %s\n"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:446
 msgid "list tag names"
 msgstr "listar os nomes das tag"
 
-#: builtin/tag.c:405
+#: builtin/tag.c:448
 msgid "print <n> lines of each tag message"
 msgstr "imprimir <n> linhas de cada mensagem de tag"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:450
 msgid "delete tags"
 msgstr "eliminar tags"
 
-#: builtin/tag.c:408
+#: builtin/tag.c:451
 msgid "verify tags"
 msgstr "verificar tags"
 
-#: builtin/tag.c:410
+#: builtin/tag.c:453
 msgid "Tag creation options"
 msgstr "Opções de criação de tags"
 
-#: builtin/tag.c:412
+#: builtin/tag.c:455
 msgid "annotated tag, needs a message"
 msgstr "tag anotada, é necessário uma mensagem"
 
-#: builtin/tag.c:414
+#: builtin/tag.c:457
 msgid "tag message"
-msgstr "mensagem da tag"
+msgstr "mensagem de etiqueta"
 
-#: builtin/tag.c:416
-#, fuzzy
+#: builtin/tag.c:459
 msgid "force edit of tag message"
-msgstr "forçar edição do commit"
+msgstr "forçar edição de mensagem de etiqueta"
 
-#: builtin/tag.c:417
+#: builtin/tag.c:460
 msgid "annotated and GPG-signed tag"
 msgstr "tag anotada e assinada com GPG"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:463
 msgid "use another key to sign the tag"
 msgstr "usar outra chave para assinar a tag"
 
-#: builtin/tag.c:421
+#: builtin/tag.c:464
 msgid "replace the tag if exists"
-msgstr "substituir a tag se esta existir"
+msgstr "substituir a tag se existir"
 
-#: builtin/tag.c:422 builtin/update-ref.c:505
+#: builtin/tag.c:465 builtin/update-ref.c:505
 msgid "create a reflog"
 msgstr "criar um reflog"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:467
 msgid "Tag listing options"
 msgstr "Opções de listagem de tags"
 
-#: builtin/tag.c:425
+#: builtin/tag.c:468
 msgid "show tag list in columns"
 msgstr "mostrar a lista de tags em colunas"
 
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:469 builtin/tag.c:471
 msgid "print only tags that contain the commit"
 msgstr "imprimir apenas tags que contenham o commit"
 
-#: builtin/tag.c:427 builtin/tag.c:429
+#: builtin/tag.c:470 builtin/tag.c:472
 msgid "print only tags that don't contain the commit"
-msgstr "imprimir apenas tags que não contenham o commit"
+msgstr "imprimir apenas tags a que falte o commit"
 
-#: builtin/tag.c:430
+#: builtin/tag.c:473
 msgid "print only tags that are merged"
 msgstr "imprimir apenas as tags que foram integradas"
 
-#: builtin/tag.c:431
+#: builtin/tag.c:474
 msgid "print only tags that are not merged"
-msgstr "imprimir apenas as tags que não foram integradas"
+msgstr "imprimir apenas as tags que estão por juntar"
 
-#: builtin/tag.c:435
+#: builtin/tag.c:478
 msgid "print only tags of the object"
-msgstr "imprimir apenas as tags do objeto"
+msgstr "imprimir apenas etiquetas do objeto"
 
-#: builtin/tag.c:483
+#: builtin/tag.c:526
 msgid "--column and -n are incompatible"
 msgstr "--column e -n são incompatíveis"
 
-#: builtin/tag.c:505
+#: builtin/tag.c:548
 msgid "-n option is only allowed in list mode"
-msgstr "a opção -n só é permitida no modo lista"
+msgstr "a opção -n só é permitida no modo listagem"
 
-#: builtin/tag.c:507
+#: builtin/tag.c:550
 msgid "--contains option is only allowed in list mode"
-msgstr "a opção --contains só é permitida no modo lista"
+msgstr "opção --contains só é permitida no modo listagem"
 
-#: builtin/tag.c:509
+#: builtin/tag.c:552
 msgid "--no-contains option is only allowed in list mode"
-msgstr "a opção --contains só é permitida no modo lista"
+msgstr "opção --no-contains só é permitida no modo listagem"
 
-#: builtin/tag.c:511
+#: builtin/tag.c:554
 msgid "--points-at option is only allowed in list mode"
-msgstr "a opção --points-at só é permitida no modo lista"
+msgstr "opção --points-at só é permitida no modo listagem"
 
-#: builtin/tag.c:513
+#: builtin/tag.c:556
 msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "as opções --merged e --no-merged só são permitidas no modo lista"
+msgstr "opções --merged e --no-merged só são permitidas no modo listagem"
 
-#: builtin/tag.c:524
+#: builtin/tag.c:567
 msgid "only one -F or -m option is allowed."
 msgstr "só é permitido um opção -F ou -m."
 
-#: builtin/tag.c:543
-msgid "too many params"
-msgstr "demasiado parâmetros"
-
-#: builtin/tag.c:549
+#: builtin/tag.c:592
 #, c-format
 msgid "'%s' is not a valid tag name."
-msgstr "'%s' não é um nome de tag válido."
+msgstr "'%s' é nome de etiqueta inválido."
 
-#: builtin/tag.c:554
+#: builtin/tag.c:597
 #, c-format
 msgid "tag '%s' already exists"
-msgstr "a tag '%s' já existe"
+msgstr "a etiqueta '%s' já existe"
 
-#: builtin/tag.c:585
+#: builtin/tag.c:628
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
-msgstr "Atualizei tag '%s' (era %s)\n"
+msgstr "Atualizei etiqueta '%s' (era %s)\n"
 
-#: builtin/unpack-objects.c:502
+#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
-msgstr "A descompactar objetos"
+msgstr "Desempacotando objetos"
 
 #: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
-msgstr "falha ao criar o diretório %s"
+msgstr "falhou criar pasta %s"
 
 #: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
-msgstr "falha ao criar o ficheiro %s"
+msgstr "falhou criar ficheiro %s"
 
 #: builtin/update-index.c:108
 #, c-format
@@ -22695,39 +23053,32 @@ msgstr "falha ao eliminar o diretório %s"
 #: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
-msgstr "A testar mtime em '%s' "
+msgstr "Testando mtime em '%s' "
 
 #: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
-"a informação de stat do diretório não mudou depois de adicionar um novo "
-"ficheiro"
+"info de stat da pasta mantêm-se inalterada após adicionar novo ficheiro"
 
 #: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
-msgstr ""
-"a informação de stat do diretório não mudou depois de adicionar um novo "
-"diretório"
+msgstr "info de stat da pasta mantêm-se inalterada após adicionar nova pasta"
 
 #: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
-msgstr "a informação de stat mudou depois de atualizar um ficheiro"
+msgstr "info de stat muda após atualizar ficheiro"
 
 #: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
-msgstr ""
-"a informação de stat do diretório mudou depois de adicionar um ficheiro "
-"dentro dum subdiretório"
+msgstr "info de stat da pasta muda após adicionar ficheiro dentro de subpasta"
 
 #: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
-msgstr ""
-"a informação de stat do diretório não mudou depois de eliminar um ficheiro"
+msgstr "info de stat da pasta mantêm-se inalterada após apagar ficheiro"
 
 #: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
-msgstr ""
-"a informação de stat do diretório não mudou depois de eliminar um diretório"
+msgstr "info de stat da pasta mantêm-se inalterada após apagar pasta"
 
 #: builtin/update-index.c:222
 msgid " OK"
@@ -22737,149 +23088,146 @@ msgstr " OK"
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opções>] [--] [<ficheiro>...]"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:976
 msgid "continue refresh even when index needs update"
 msgstr "continuar a refrescar mesmo quando o índice precise de ser atualizado"
 
-#: builtin/update-index.c:977
+#: builtin/update-index.c:979
 msgid "refresh: ignore submodules"
 msgstr "refrescar: ignorar submódulos"
 
-#: builtin/update-index.c:980
+#: builtin/update-index.c:982
 msgid "do not ignore new files"
-msgstr "não ignorar novos ficheiros"
+msgstr "considera novos ficheiros"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:984
 msgid "let files replace directories and vice-versa"
 msgstr "deixar que os ficheiros substituam os diretórios e vice-versa"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:986
 msgid "notice files missing from worktree"
 msgstr "avisar sobre ficheiros que faltem na árvore de trabalho"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:988
 msgid "refresh even if index contains unmerged entries"
-msgstr "refrescar mesmo que o índice contenha entradas não integradas"
+msgstr "refrescar mesmo se índex contenha entradas por juntar"
 
-#: builtin/update-index.c:989
+#: builtin/update-index.c:991
 msgid "refresh stat information"
 msgstr "refrescar informação de stat"
 
-#: builtin/update-index.c:993
+#: builtin/update-index.c:995
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "como --refresh, mas ignorar a definição assume-unchanged"
 
-#: builtin/update-index.c:997
+#: builtin/update-index.c:999
 msgid "<mode>,<object>,<path>"
 msgstr "<modo>,<objeto>,<caminho>"
 
-#: builtin/update-index.c:998
+#: builtin/update-index.c:1000
 msgid "add the specified entry to the index"
-msgstr "adicionar o elemento especificado ao índice"
+msgstr "adicionar entrada especificada ao cenário"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1010
 msgid "mark files as \"not changing\""
-msgstr "marcar ficheiros como \"não alterados\""
+msgstr "marcar ficheiros como \"não alterar\""
 
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1013
 msgid "clear assumed-unchanged bit"
 msgstr "limpar o bit assumed-unchanged"
 
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1016
 msgid "mark files as \"index-only\""
 msgstr "marcar ficheiros como \"únicos do índice\""
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1019
 msgid "clear skip-worktree bit"
 msgstr "limpar o bit ignorar-árvore-de-trabalho"
 
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1022
 msgid "do not touch index-only entries"
 msgstr ""
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1024
 msgid "add to index only; do not add content to object database"
 msgstr ""
-"só adicionar ao índice; não adicionar o conteúdo à base de dados de objetos"
+"adicionar apenas a index; não adicionar conteúdo à base de dados de objetos"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1026
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "remover os caminhos mencionado mesmo se estiverem presentes na árvore de "
 "trabalho"
 
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1028
 msgid "with --stdin: input lines are terminated by null bytes"
-msgstr "com --stdin: as linhas da entrada são terminadas com bytes nulos"
+msgstr "com --stdin: linhas da entrada são terminadas com bytes nulos"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1030
 msgid "read list of paths to be updated from standard input"
 msgstr "ler lista de caminho a atualizar da entrada padrão"
 
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1034
 msgid "add entries from standard input to the index"
 msgstr "adicionar elementos da entrada padrão ao índice"
 
-#: builtin/update-index.c:1036
+#: builtin/update-index.c:1038
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "repovoar as fases nº2 e nº3 dos caminhos listados"
 
-#: builtin/update-index.c:1040
+#: builtin/update-index.c:1042
 msgid "only update entries that differ from HEAD"
 msgstr "atualizar apenas elementos que difiram de HEAD"
 
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1046
 msgid "ignore files missing from worktree"
-msgstr "ignorar ficheiros não presentes na árvore de trabalho"
+msgstr "ignorar ficheiros ausentes da worktree"
 
-#: builtin/update-index.c:1047
+#: builtin/update-index.c:1049
 msgid "report actions to standard output"
-msgstr "mostrar ações na saída padrão"
+msgstr "reportar ações na saída padrão"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1051
 msgid "(for porcelains) forget saved unresolved conflicts"
-msgstr ""
-"(para porcelanas) esquecer conflitos guardados que não foram resolvidos"
+msgstr "(para porcelains) esquecer conflitos guardados que estão por resolver"
 
-#: builtin/update-index.c:1053
+#: builtin/update-index.c:1055
 msgid "write index in this format"
 msgstr "escrever o índice neste formato"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1057
 msgid "enable or disable split index"
-msgstr "ativar ou desativar a divisão do índice"
+msgstr "ativar ou desativar a divisão de cenário"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1059
 msgid "enable/disable untracked cache"
-msgstr "ativar ou desativar cache não controlada"
+msgstr "ativar/desativar cache por monitorizar"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1061
 msgid "test if the filesystem supports untracked cache"
-msgstr "testar se o sistema de ficheiros suporta cache não controlada"
+msgstr "testar se sistema de ficheiros sustenta cache por monitorizar"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1063
 msgid "enable untracked cache without testing the filesystem"
-msgstr "ativar cache não controlada sem testar o sistema de ficheiros"
+msgstr "ativar cache por monitorizar sem testar o sistema de ficheiros"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1065
 msgid "write out the index even if is not flagged as changed"
 msgstr ""
 
-#: builtin/update-index.c:1065
-#, fuzzy
+#: builtin/update-index.c:1067
 msgid "enable or disable file system monitor"
-msgstr "ativar ou desativar a divisão do índice"
+msgstr "ativar ou desativar monitorizador de sistema de ficheiros"
 
-#: builtin/update-index.c:1067
-#, fuzzy
+#: builtin/update-index.c:1069
 msgid "mark files as fsmonitor valid"
-msgstr "marcar ficheiros como \"não alterados\""
+msgstr "marcar ficheiros válidos para fsmonitor"
 
-#: builtin/update-index.c:1070
+#: builtin/update-index.c:1072
 msgid "clear fsmonitor valid bit"
-msgstr ""
+msgstr "limpar bit válido de fsmonitor"
 
-#: builtin/update-index.c:1173
+#: builtin/update-index.c:1175
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -22887,7 +23235,7 @@ msgstr ""
 "core.splitIndex está definida como false; remova ou altere-a se pretende "
 "mesmo ativar índice separado"
 
-#: builtin/update-index.c:1182
+#: builtin/update-index.c:1184
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -22895,63 +23243,57 @@ msgstr ""
 "core.splitIndex está definida como true; remova ou altere-a se pretende "
 "mesmo desativar índice separado"
 
-#: builtin/update-index.c:1194
+#: builtin/update-index.c:1196
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
 msgstr ""
-"core.untrackedCache está definida como true; remova ou altere-a se pretende "
-"mesmo desativar a cache não controlada"
+"core.untrackedCache está definida como true; remove ou altera-a, se queres "
+"mesmo desativar a cache por monitorizar"
 
-#: builtin/update-index.c:1198
+#: builtin/update-index.c:1200
 msgid "Untracked cache disabled"
-msgstr "A cache não controlada está desativada"
+msgstr "Cache por monitorizar está desativada"
 
-#: builtin/update-index.c:1206
+#: builtin/update-index.c:1208
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
 msgstr ""
-"core.untrackedCache está definida como false; remova ou altere-a se pretende "
-"mesmo ativar a cache não controlada"
+"core.untrackedCache está definida como false; remove ou altera-a, se queres "
+"mesmo ativar a cache por monitorizar"
 
-#: builtin/update-index.c:1210
+#: builtin/update-index.c:1212
 #, c-format
 msgid "Untracked cache enabled for '%s'"
-msgstr "A cache não controlada de '%s' foi ativada."
+msgstr "Cache por monitorizar ativada para '%s'"
 
-#: builtin/update-index.c:1218
-#, fuzzy
+#: builtin/update-index.c:1220
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
-msgstr ""
-"core.splitIndex está definida como false; remova ou altere-a se pretende "
-"mesmo ativar índice separado"
+msgstr "core.fsmonitor está desdefinida; define-a se queres mesmo ativar fsmonitor"
 
-#: builtin/update-index.c:1222
+#: builtin/update-index.c:1224
 msgid "fsmonitor enabled"
-msgstr ""
+msgstr "fsmonitor ativado"
 
-#: builtin/update-index.c:1225
-#, fuzzy
+#: builtin/update-index.c:1227
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
-"core.splitIndex está definida como true; remova ou altere-a se pretende "
-"mesmo desativar índice separado"
+"core.fsmonitor está definida; remove-a se queres mesmo desativar fsmonitor"
 
-#: builtin/update-index.c:1229
+#: builtin/update-index.c:1231
 msgid "fsmonitor disabled"
-msgstr ""
+msgstr "fsmonitor desativado"
 
 #: builtin/update-ref.c:10
 msgid "git update-ref [<options>] -d <refname> [<old-val>]"
-msgstr "git update-ref [<opções>] -d <nome-da-referência> [<valor-antigo>]"
+msgstr "git update-ref [<opções>] -d <nome-ref> [<valor-antigo>]"
 
 #: builtin/update-ref.c:11
 msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
 msgstr ""
-"git update-ref [<opções>]    <nome-da-referência> <novo-valor> [<valor-"
-"antigo>]"
+"git update-ref [<opções>]    <nome-ref> <novo-valor> [<valor-antigo>]"
 
 #: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
@@ -22959,20 +23301,19 @@ msgstr "git update-ref [<opções>] --stdin [-z]"
 
 #: builtin/update-ref.c:500
 msgid "delete the reference"
-msgstr "eliminar a referência"
+msgstr "apagar a referência"
 
 #: builtin/update-ref.c:502
 msgid "update <refname> not the one it points to"
-msgstr ""
-"atualizar a referência <nome-da-referência>, não a referência que esta aponta"
+msgstr "atualizar <nome-ref>, não à qual esta aponta"
 
 #: builtin/update-ref.c:503
 msgid "stdin has NUL-terminated arguments"
-msgstr "os argumentos da entrada padrão terminam em NUL"
+msgstr "a entrada padrão tem argumentos NUL-terminados"
 
 #: builtin/update-ref.c:504
 msgid "read updates from stdin"
-msgstr "ler atualizações da entrada padrão"
+msgstr "ler atualizações de entrada padrão"
 
 #: builtin/update-server-info.c:7
 msgid "git update-server-info [--force]"
@@ -22980,11 +23321,11 @@ msgstr "git update-server-info [--force]"
 
 #: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
-msgstr "atualizar os ficheiros de informação do zero"
+msgstr "atualizar os ficheiros de info do zero"
 
 #: builtin/upload-pack.c:11
 msgid "git upload-pack [<options>] <dir>"
-msgstr "git upload-pack [<opções>] <dir>"
+msgstr "git upload-pack [<opções>] <pasta>"
 
 #: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
 msgid "quit after a single request/response exchange"
@@ -22992,11 +23333,11 @@ msgstr "terminar depois de uma única troca de pedido/resposta"
 
 #: builtin/upload-pack.c:25
 msgid "exit immediately after initial ref advertisement"
-msgstr "sair imediatamente depois do anúncio inicial da referência"
+msgstr "sair imediatamente depois de anúncio inicial de ref"
 
 #: builtin/upload-pack.c:27
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr "não tentar <diretório>/.git/ se o <diretório> não for um diretório Git"
+msgstr "tentar <pasta>/.git/ apenas se <pasta> for pasta Git"
 
 #: builtin/upload-pack.c:29
 msgid "interrupt transfer after <n> seconds of inactivity"
@@ -23004,11 +23345,11 @@ msgstr "interromper transferência depois de <n> segundos de inatividade"
 
 #: builtin/verify-commit.c:19
 msgid "git verify-commit [-v | --verbose] <commit>..."
-msgstr "git verify-commit [-v | --verbose] <commit>..."
+msgstr "git verify-commit [-v | --verbose] <memória>..."
 
 #: builtin/verify-commit.c:68
 msgid "print commit contents"
-msgstr "imprimir conteúdo do commit"
+msgstr "imprimir conteúdo do memória"
 
 #: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
@@ -23016,7 +23357,7 @@ msgstr "imprimir informação do gpg em bruto"
 
 #: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
-msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pacote>..."
 
 #: builtin/verify-pack.c:70
 msgid "verbose"
@@ -23028,301 +23369,284 @@ msgstr "mostrar apenas estatísticas"
 
 #: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
-msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <etiqueta>..."
 
 #: builtin/verify-tag.c:36
 msgid "print tag contents"
-msgstr "imprimir conteúdo da tag"
+msgstr "imprimir conteúdo da etiqueta"
 
-#: builtin/worktree.c:17
-#, fuzzy
+#: builtin/worktree.c:18
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
-msgstr "git worktree add [<opções>] <caminho> [<ramo>]"
+msgstr "git worktree add [<opções>] <caminho> [<mnemónica>]"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opções>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opções>] <caminho>"
 
-#: builtin/worktree.c:20
-#, fuzzy
+#: builtin/worktree.c:21
 msgid "git worktree move <worktree> <new-path>"
-msgstr "git worktree lock [<opções>] <caminho>"
+msgstr "git worktree move <árvore-trabalho> <novo-caminho>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opções>]"
 
-#: builtin/worktree.c:22
-#, fuzzy
+#: builtin/worktree.c:23
 msgid "git worktree remove [<options>] <worktree>"
-msgstr "git worktree lock [<opções>] <caminho>"
+msgstr "git worktree remove [<opções>] <árvore-trabalho>"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <caminho>"
 
-#: builtin/worktree.c:60 builtin/worktree.c:973
-#, fuzzy, c-format
+#: builtin/worktree.c:61 builtin/worktree.c:944
+#, c-format
 msgid "failed to delete '%s'"
-msgstr "falha ao executar '%s'"
-
-#: builtin/worktree.c:85
-#, fuzzy
-msgid "not a valid directory"
-msgstr "nome de objeto inválido: %s"
+msgstr "falhou apagar '%s'"
 
-#: builtin/worktree.c:91
-#, fuzzy
-msgid "gitdir file does not exist"
-msgstr "A remover worktrees/%s: o ficheiro gitdir não existe"
-
-#: builtin/worktree.c:96 builtin/worktree.c:105
-#, fuzzy, c-format
-msgid "unable to read gitdir file (%s)"
-msgstr "não foi possível ler a árvore (%s)"
-
-#: builtin/worktree.c:115
+#: builtin/worktree.c:74
 #, c-format
-msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
-msgstr ""
-
-#: builtin/worktree.c:123
-#, fuzzy
-msgid "invalid gitdir file"
-msgstr "linha de Data inválida"
-
-#: builtin/worktree.c:131
-#, fuzzy
-msgid "gitdir file points to non-existent location"
-msgstr ""
-"A remover worktrees/%s: o ficheiro gitdir aponta para uma localização "
-"inexistente"
-
-#: builtin/worktree.c:146
-#, fuzzy, c-format
 msgid "Removing %s/%s: %s"
-msgstr "A remover %s"
+msgstr "Removendo %s/%s: %s"
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "reportar árvores de trabalho podadas"
 
-#: builtin/worktree.c:223
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
-msgstr "expirar árvores de trabalho mais antigos que <tempo>"
+msgstr "expirar árvores-trabalho mais velhas que <tempo>"
 
-#: builtin/worktree.c:293
+#: builtin/worktree.c:219
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' já existe"
 
-#: builtin/worktree.c:302
-#, fuzzy, c-format
+#: builtin/worktree.c:228
+#, c-format
 msgid "unusable worktree destination '%s'"
-msgstr "não é possível ler o ficheiro de assinatura '%s'"
+msgstr "destino '%s' de worktree inutilizável"
 
-#: builtin/worktree.c:307
+#: builtin/worktree.c:233
 #, 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 ""
 
-#: builtin/worktree.c:309
+#: builtin/worktree.c:235
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
 "use '%s -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 
-#: builtin/worktree.c:360
+#: builtin/worktree.c:286
 #, c-format
 msgid "could not create directory of '%s'"
-msgstr "não foi possível criar o diretório de '%s'"
+msgstr "incapaz criar diretório de '%s'"
 
-#: builtin/worktree.c:494 builtin/worktree.c:500
-#, fuzzy, c-format
+#: builtin/worktree.c:308
+msgid "initializing"
+msgstr "iniciando"
+
+#: builtin/worktree.c:420 builtin/worktree.c:426
+#, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Erro a eliminar ramo '%s'"
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr ""
 
-#: builtin/worktree.c:511
-#, fuzzy, c-format
+#: builtin/worktree.c:437
+#, c-format
 msgid "Preparing worktree (detached HEAD %s)"
-msgstr "A preparar %s (identificador %s)"
+msgstr "Preparando árvore-trabalho (HEAD desanexada %s)"
 
-#: builtin/worktree.c:552
+#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "extrair o <ramo> mesmo se já tenha sido extraído noutra árvore de trabalho"
 
-#: builtin/worktree.c:555
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "criar um novo ramo"
 
-#: builtin/worktree.c:557
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "criar ou repor um ramo"
 
-#: builtin/worktree.c:559
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
-msgstr "povoar a nova árvore de trabalho"
+msgstr "povoar nova árvore-trabalho"
 
-#: builtin/worktree.c:560
-#, fuzzy
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
-msgstr "povoar a nova árvore de trabalho"
+msgstr "manter nova árvore-trabalho trancada"
 
-#: builtin/worktree.c:563
-#, fuzzy
+#: builtin/worktree.c:492 builtin/worktree.c:729
+msgid "reason for locking"
+msgstr "razão para trancar"
+
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
-msgstr "configurar modo de seguimento (consulte git-pull(1))"
+msgstr "configurar modo de monitorização (vê git-branch(1))"
 
-#: builtin/worktree.c:566
-#, fuzzy
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
-msgstr ""
-"o ramo a montante '%s' não está guardado como um ramo de monitorização remoto"
+msgstr "tenta corresponder nome de novo ramo com ramo de monitorização remoto"
 
-#: builtin/worktree.c:574
+#: builtin/worktree.c:506
 msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B e --detach são mutuamente exclusivos"
+msgstr ""
+
+#: builtin/worktree.c:508
+msgid "--reason requires --lock"
+msgstr "--reason exige --lock"
 
-#: builtin/worktree.c:635
-#, fuzzy
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "adicionado com --lock"
+
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
-msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo."
+msgstr ""
 
-#: builtin/worktree.c:758
-msgid "reason for locking"
-msgstr "razão de trancar"
+#: builtin/worktree.c:691
+msgid "show extended annotations and reasons, if available"
+msgstr ""
 
-#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877
-#: builtin/worktree.c:1001
+#: builtin/worktree.c:693
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr "adicionar a anotação 'a podar' para árvores-trabalho mais velhas que <tempo>"
+
+#: builtin/worktree.c:702
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr ""
+
+#: 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ão é uma árvore de trabalho"
+msgstr "'%s' é working tree nenhuma"
 
-#: builtin/worktree.c:772 builtin/worktree.c:805
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
-msgstr "A árvore de trabalho principal não pode ser trancada nem destrancada"
+msgstr "Working tree principal incapaz de ser trancada ou destrancada"
 
-#: builtin/worktree.c:777
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' já está trancada, razão: %s"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' já está trancada"
 
-#: builtin/worktree.c:807
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
-msgstr "'%s' não está trancada"
+msgstr "'%s' está destrancada"
 
-#: builtin/worktree.c:848
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 
-#: builtin/worktree.c:856
-#, fuzzy
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
-msgstr "forçar mover/mudar o nome mesmo que o destino exista"
+msgstr "forçar mover mesmo que a árvore-trabalho esteja suja ou trancada"
 
-#: builtin/worktree.c:879 builtin/worktree.c:1003
-#, fuzzy, c-format
+#: builtin/worktree.c:850 builtin/worktree.c:974
+#, c-format
 msgid "'%s' is a main working tree"
-msgstr "'%s' não é uma árvore de trabalho"
+msgstr "'%s' é uma working tree principal"
 
-#: builtin/worktree.c:884
-#, fuzzy, c-format
+#: builtin/worktree.c:855
+#, c-format
 msgid "could not figure out destination name from '%s'"
-msgstr "não foi possível migrar o diretório git de '%s' para '%s'"
+msgstr "incapaz descobrir nome de destino a partir de '%s'"
 
-#: builtin/worktree.c:897
+#: 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:899
+#: 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:902
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 
-#: builtin/worktree.c:907
-#, fuzzy, c-format
+#: builtin/worktree.c:878
+#, c-format
 msgid "failed to move '%s' to '%s'"
-msgstr "falha ao abrir '%s': %s"
+msgstr ""
 
-#: builtin/worktree.c:953
-#, fuzzy, c-format
+#: builtin/worktree.c:924
+#, c-format
 msgid "failed to run 'git status' on '%s'"
-msgstr "falha ao escrever para '%s'"
+msgstr "falhou executar 'git status' em '%s'"
 
-#: builtin/worktree.c:957
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 
-#: builtin/worktree.c:962
-#, fuzzy, c-format
+#: builtin/worktree.c:933
+#, c-format
 msgid "failed to run 'git status' on '%s', code %d"
-msgstr "não foi possível executar 'git status' no submódulo '%s'"
+msgstr "falhou executar 'git status' em '%s', código %d"
 
-#: builtin/worktree.c:985
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:1008
+#: 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:1010
+#: 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:1013
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
 
-#: builtin/worktree.c:1037
-#, fuzzy, c-format
+#: builtin/worktree.c:1008
+#, c-format
 msgid "repair: %s: %s"
-msgstr "%s: %s"
+msgstr "reparar: %s: %s"
 
-#: builtin/worktree.c:1040
-#, fuzzy, c-format
+#: builtin/worktree.c:1011
+#, c-format
 msgid "error: %s: %s"
-msgstr "%s: %s"
+msgstr "erro: %s: %s"
 
 #: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
@@ -23340,45 +23664,6 @@ msgstr "escrever objeto árvore do subdiretório <prefixo>"
 msgid "only useful for debugging"
 msgstr "apenas útil para depuração"
 
-#: http-fetch.c:114
-#, c-format
-msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr ""
-
-#: http-fetch.c:122
-#, fuzzy
-msgid "not a git repository"
-msgstr "é repositório git nenhum"
-
-#: t/helper/test-fast-rebase.c:141
-#, fuzzy
-msgid "unhandled options"
-msgstr "Opções gerais"
-
-#: t/helper/test-fast-rebase.c:146
-#, fuzzy
-msgid "error preparing revisions"
-msgstr "Erro ao rematar %s."
-
-#: t/helper/test-reach.c:154
-#, fuzzy, c-format
-msgid "commit %s is not marked reachable"
-msgstr "o commit %s não tem o pai %d"
-
-#: t/helper/test-reach.c:164
-msgid "too many commits marked reachable"
-msgstr ""
-
-#: t/helper/test-serve-v2.c:7
-#, fuzzy
-msgid "test-tool serve-v2 [<options>]"
-msgstr "git rebase--helper [<opções>]"
-
-#: t/helper/test-serve-v2.c:19
-#, fuzzy
-msgid "exit immediately after advertising capabilities"
-msgstr "sair imediatamente depois do anúncio inicial da referência"
-
 #: git.c:28
 msgid ""
 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
@@ -23386,11 +23671,11 @@ msgid ""
 "           [-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>]"
 msgstr ""
 
-#: git.c:35
-#, fuzzy
+#: git.c:36
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
@@ -23402,90 +23687,92 @@ msgstr ""
 "para ler sobre um subcomando específico ou conceito específico.\n"
 "Vê 'git help git' para visão geral do sistema."
 
-#: git.c:187
+#: git.c:188
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr ""
 
-#: git.c:201
+#: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr ""
 
-#: git.c:215
+#: git.c:216
 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr ""
 
-#: git.c:229
-#, fuzzy, c-format
+#: git.c:230
+#, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr "--super-prefix recebeu prefixo nenhum\n"
 
-#: git.c:251
+#: git.c:252
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr ""
 
-#: git.c:289
+#: git.c:260
+#, c-format
+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:315
-#, fuzzy, c-format
+#: git.c:326
+#, c-format
 msgid "unknown option: %s\n"
 msgstr "desconheço opção: %s\n"
 
-#: git.c:364
+#: git.c:375
 #, c-format
 msgid "while expanding alias '%s': '%s'"
 msgstr ""
 
-#: git.c:373
+#: git.c:384
 #, c-format
 msgid ""
 "alias '%s' changes environment variables.\n"
 "You can use '!git' in the alias to do this"
 msgstr ""
 
-#: git.c:380
+#: git.c:391
 #, c-format
 msgid "empty alias for %s"
 msgstr ""
 
-#: git.c:383
+#: git.c:394
 #, c-format
 msgid "recursive alias: %s"
 msgstr ""
 
-#: git.c:465
-#, fuzzy
+#: git.c:476
 msgid "write failure on standard output"
-msgstr "mostrar ações na saída padrão"
+msgstr ""
 
-#: git.c:467
-#, fuzzy
+#: git.c:478
 msgid "unknown write failure on standard output"
-msgstr "mostrar ações na saída padrão"
+msgstr ""
 
-#: git.c:469
-#, fuzzy
+#: git.c:480
 msgid "close failed on standard output"
-msgstr "enviar resultados para a saída padrão"
+msgstr "fechar a saída padrão falhou"
 
-#: git.c:820
+#: git.c:833
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr ""
 
-#: git.c:870
-#, fuzzy, c-format
+#: git.c:883
+#, c-format
 msgid "cannot handle %s as a builtin"
-msgstr "não é possível enviar mensagem como 7bit"
+msgstr "incapaz lidar %s como um builtin"
 
-#: git.c:883
-#, fuzzy, c-format
+#: git.c:896
+#, c-format
 msgid ""
 "usage: %s\n"
 "\n"
@@ -23493,16 +23780,162 @@ msgstr ""
 "utilização: %s\n"
 "\n"
 
-#: git.c:903
+#: git.c:916
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 
-#: git.c:915
-#, fuzzy, c-format
+#: git.c:928
+#, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "incapaz de executar comando '%s': %s\n"
 
+#: http-fetch.c:118
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr ""
+
+#: http-fetch.c:128
+msgid "not a git repository"
+msgstr "é repositório git nenhum"
+
+#: 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 "opções largadas"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "erro preparando revisões"
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "commit %s está a ser tratado como inalcançável"
+
+#: t/helper/test-reach.c:164
+msgid "too many commits marked reachable"
+msgstr ""
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<opções>]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "sair imediatamente depois de anunciar capacidades"
+
+#: t/helper/test-simple-ipc.c:262
+#, c-format
+msgid "socket/pipe already in use: '%s'"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:264
+#, c-format
+msgid "could not start server on: '%s'"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
+msgid "could not spawn daemon in the background"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:356
+msgid "waitpid failed"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:376
+msgid "daemon not online yet"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:406
+msgid "daemon failed to start"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:410
+msgid "waitpid is confused"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:541
+msgid "daemon has not shutdown yet"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:682
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:683
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:684
+msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:685
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:686
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:687
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:688
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:696
+msgid "name or pathname of unix domain socket"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:698
+msgid "named-pipe name"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:700
+msgid "number of threads in server thread pool"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:701
+msgid "seconds to wait for daemon to start or stop"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:703
+msgid "number of bytes"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:704
+msgid "number of requests per thread"
+msgstr "número de pedidos por fio"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "byte"
+msgstr "byte"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "ballast character"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:707
+msgid "token"
+msgstr "token"
+
+#: t/helper/test-simple-ipc.c:707
+msgid "command token to send to the server"
+msgstr ""
+
 #: http.c:399
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
@@ -23517,12 +23950,10 @@ msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Afixar chaves públicas tem suporte nenhum com cURL < 7.44.0"
 
 #: http.c:910
-#, fuzzy
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "CURLSSLOPT_NO_REVOKE tem suporte nenhum com cURL < 7.44.0"
 
 #: http.c:989
-#, fuzzy
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "Restrição protocolar tem suporte nenhum com cURL < 7.44.0"
 
@@ -23537,11 +23968,11 @@ msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 
 #: http.c:1143
-#, fuzzy, c-format
+#, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "Incapaz de definir backend SSL para '%s': já definido"
 
-#: http.c:2025
+#: http.c:2034
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -23553,137 +23984,133 @@ msgstr ""
 "   redireção: %s"
 
 #: remote-curl.c:183
-#, fuzzy, c-format
+#, c-format
 msgid "invalid quoting in push-option value: '%s'"
-msgstr "opção inválida: %s"
+msgstr ""
 
 #: remote-curl.c:307
-#, fuzzy, c-format
+#, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
-msgstr "'%s' não é reconhecido como um repositório git"
+msgstr "%sinfo/refs é inválido; isto é um repositório git?"
 
 #: remote-curl.c:408
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 
 #: remote-curl.c:439
-#, fuzzy, c-format
+#, c-format
 msgid "invalid server response; got '%s'"
-msgstr "referência inválida: %s"
+msgstr ""
 
 #: remote-curl.c:499
-#, fuzzy, c-format
+#, c-format
 msgid "repository '%s' not found"
-msgstr "o repositório '%s' não existe"
+msgstr "repositório '%s' inexistente"
 
 #: remote-curl.c:503
-#, fuzzy, c-format
+#, c-format
 msgid "Authentication failed for '%s'"
-msgstr "Falha ao executar: $rest"
+msgstr "Autenticação falhou para '%s'"
 
 #: remote-curl.c:507
 #, c-format
 msgid "unable to access '%s': %s"
-msgstr "não é possível aceder a '%s': %s"
+msgstr "incapaz aceder '%s': %s"
 
 #: remote-curl.c:513
 #, c-format
 msgid "redirecting to %s"
-msgstr "a redirecionar para %s "
+msgstr "redirecionando para %s"
 
-#: remote-curl.c:642
+#: remote-curl.c:644
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr ""
 
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr ""
+#: remote-curl.c:656
+msgid "remote server sent unexpected response end packet"
+msgstr "servidor remoto enviou pacote fim de resposta inesperado"
 
-#: remote-curl.c:724
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 
-#: remote-curl.c:754
+#: remote-curl.c:756
 #, c-format
 msgid "remote-curl: bad line length character: %.4s"
 msgstr ""
 
-#: remote-curl.c:756
+#: remote-curl.c:758
 msgid "remote-curl: unexpected response end packet"
 msgstr ""
 
-#: remote-curl.c:832
-#, fuzzy, c-format
+#: remote-curl.c:834
+#, c-format
 msgid "RPC failed; %s"
-msgstr "falha: %d"
+msgstr "RPC falhou: %s"
 
-#: remote-curl.c:872
-#, fuzzy
+#: remote-curl.c:874
 msgid "cannot handle pushes this big"
-msgstr "não é possível processar mais do que %d revisão."
+msgstr "incapaz atirar algo tão grande"
 
-#: remote-curl.c:987
+#: remote-curl.c:989
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr ""
 
-#: remote-curl.c:991
+#: remote-curl.c:993
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr ""
 
-#: remote-curl.c:1041
+#: remote-curl.c:1043
 #, c-format
 msgid "%d bytes of length header were received"
 msgstr ""
 
-#: remote-curl.c:1043
+#: remote-curl.c:1045
 #, c-format
 msgid "%d bytes of body are still expected"
 msgstr ""
 
-#: remote-curl.c:1132
-#, fuzzy
+#: remote-curl.c:1134
 msgid "dumb http transport does not support shallow capabilities"
-msgstr "O servidor não suporta clientes rasos"
+msgstr "transporte http estúpido insustenta capacidades shallow"
 
-#: remote-curl.c:1147
-#, fuzzy
+#: remote-curl.c:1149
 msgid "fetch failed."
-msgstr "falha ao executar o comando stash"
+msgstr ""
 
-#: remote-curl.c:1193
+#: remote-curl.c:1195
 msgid "cannot fetch by sha1 over smart http"
 msgstr ""
 
-#: remote-curl.c:1237 remote-curl.c:1243
-#, fuzzy, c-format
+#: remote-curl.c:1239 remote-curl.c:1245
+#, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
-msgstr "erro de protocolo: cabeçalho de pacote incorreto"
+msgstr ""
 
-#: remote-curl.c:1255 remote-curl.c:1373
-#, fuzzy, c-format
+#: remote-curl.c:1257 remote-curl.c:1375
+#, c-format
 msgid "http transport does not support %s"
-msgstr "O servidor não suporta STARTTLS! %s"
+msgstr "transporte http insustenta %s"
 
-#: remote-curl.c:1291
-#, fuzzy
+#: remote-curl.c:1293
 msgid "git-http-push failed"
-msgstr "falha ao executar o comando stash"
+msgstr ""
 
-#: remote-curl.c:1479
+#: remote-curl.c:1481
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr ""
 
-#: remote-curl.c:1511
+#: remote-curl.c:1513
 msgid "remote-curl: error reading command stream from git"
 msgstr ""
 
-#: remote-curl.c:1518
+#: remote-curl.c:1520
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr ""
 
-#: remote-curl.c:1559
+#: remote-curl.c:1561
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr ""
@@ -23693,60 +24120,57 @@ msgid "no compiler information available\n"
 msgstr ""
 
 #: compat/compiler.h:38
-#, fuzzy
 msgid "no libc information available\n"
 msgstr "informação libc indisponível\n"
 
-#: list-objects-filter-options.h:91
+#: list-objects-filter-options.h:94
 msgid "args"
 msgstr ""
 
-#: list-objects-filter-options.h:92
-#, fuzzy
+#: list-objects-filter-options.h:95
 msgid "object filtering"
-msgstr "tipo do objeto"
+msgstr "filtração de objeto"
 
-#: parse-options.h:183
+#: parse-options.h:184
 msgid "expiry-date"
 msgstr "data-de-validade"
 
-#: parse-options.h:197
+#: parse-options.h:198
 msgid "no-op (backward compatibility)"
 msgstr "sem-ação (retrocompatibilidade)"
 
-#: parse-options.h:309
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "ser mais verboso"
 
-#: parse-options.h:311
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "ser mais silencioso"
 
-#: parse-options.h:317
-#, fuzzy
+#: parse-options.h:318
 msgid "use <n> digits to display object names"
-msgstr "usar <n> dígitos para mostrar SHA-1s"
+msgstr "usar <n> dígitos para mostrar nomes de objetos"
 
-#: parse-options.h:336
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr "como retirar espaços e #comentários da mensagem"
 
-#: parse-options.h:337
-#, fuzzy
+#: parse-options.h:338
 msgid "read pathspec from file"
-msgstr "ler padrões do ficheiro"
+msgstr "ler espetro-caminho de ficheiro"
 
-#: parse-options.h:338
-#, fuzzy
+#: parse-options.h:339
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
-msgstr "os caminhos estão separados por caracteres NUL"
+msgstr ""
+"com --pathspec-from-file, os elementos de espetro-caminho estão separados por "
+"caractere NUL"
 
-#: ref-filter.h:96
+#: ref-filter.h:99
 msgid "key"
 msgstr "chave"
 
-#: ref-filter.h:96
+#: ref-filter.h:99
 msgid "field name to sort on"
 msgstr "nome do campo pelo qual ordernar"
 
@@ -23755,40 +24179,29 @@ msgid "update the index with reused conflict resolution if possible"
 msgstr ""
 "atualizar o índice com resoluções de conflitos reutilizadas se possível"
 
-#: wt-status.h:80
-msgid "HEAD detached at "
-msgstr "HEAD destacada em "
-
-#: wt-status.h:81
-msgid "HEAD detached from "
-msgstr "HEAD destacada de "
-
 #: command-list.h:50
 msgid "Add file contents to the index"
-msgstr "Adicionar conteúdos de ficheiros ao índice"
+msgstr "Adicionar conteúdos de ficheiro ao cenário"
 
 #: command-list.h:51
 msgid "Apply a series of patches from a mailbox"
 msgstr ""
 
 #: command-list.h:52
-#, fuzzy
 msgid "Annotate file lines with commit information"
-msgstr "Mostrar em formato de porcelana com informações de commit por linha"
+msgstr "Anotar linha de ficheiro com informação de memória"
 
 #: command-list.h:53
-#, fuzzy
 msgid "Apply a patch to files and/or to the index"
-msgstr "adicionar o elemento especificado ao índice"
+msgstr "Submeter um remendo a ficheiros e/ou ao cenário"
 
 #: command-list.h:54
 msgid "Import a GNU Arch repository into Git"
 msgstr ""
 
 #: command-list.h:55
-#, fuzzy
 msgid "Create an archive of files from a named tree"
-msgstr "listar ficheiros arquivados para stderr"
+msgstr "Criar arquivo de ficheiros a partir de árvore nomeada"
 
 #: command-list.h:56
 msgid "Use binary search to find the commit that introduced a bug"
@@ -23815,27 +24228,24 @@ msgid "Provide content or type and size information for repository objects"
 msgstr ""
 
 #: command-list.h:62
-#, fuzzy
 msgid "Display gitattributes information"
-msgstr "usar .gitattributes apenas a partir do índice"
+msgstr ""
 
 #: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr ""
 
 #: command-list.h:64
-#, fuzzy
 msgid "Show canonical names and email addresses of contacts"
-msgstr "Mostrar o endereço de e-mail de cada autor"
+msgstr "Mostrar nomes canónicos e endereços de e-mail de contatos"
 
 #: command-list.h:65
 msgid "Switch branches or restore working tree files"
-msgstr "Mudar de ramos ou restaurar os ficheiros da árvore de trabalho"
+msgstr "Trocar ramos ou restaurar ficheiros de árvore-trabalho"
 
 #: command-list.h:66
-#, fuzzy
 msgid "Copy files from the index to the working tree"
-msgstr "caminho para a árvore de trabalho"
+msgstr ""
 
 #: command-list.h:67
 msgid "Ensures that a reference name is well formed"
@@ -23854,31 +24264,28 @@ msgid "Graphical alternative to git-commit"
 msgstr ""
 
 #: command-list.h:71
-#, fuzzy
 msgid "Remove untracked files from the working tree"
-msgstr "Remover ficheiros da árvore de trabalho e do índice"
+msgstr ""
 
 #: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Clonar um repositório num novo diretório"
 
 #: command-list.h:73
-#, fuzzy
 msgid "Display data in columns"
-msgstr "listar os ramos em colunas"
+msgstr "Mostrar informação em colunas"
 
 #: command-list.h:74
 msgid "Record changes to the repository"
-msgstr "Gravar alterações no repositório"
+msgstr "Gravar alterações para o repositório"
 
 #: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr ""
 
 #: command-list.h:76
-#, fuzzy
 msgid "Create a new commit object"
-msgstr "falha ao escrever objeto de commit"
+msgstr ""
 
 #: command-list.h:77
 msgid "Get and set repository or global options"
@@ -23926,14 +24333,12 @@ msgstr ""
 "Mostrar alterações entre commits, entre commit e árvore de trabalho, etc"
 
 #: command-list.h:88
-#, fuzzy
 msgid "Compares files in the working tree and the index"
-msgstr "Remover ficheiros da árvore de trabalho e do índice"
+msgstr ""
 
 #: command-list.h:89
-#, fuzzy
 msgid "Compare a tree to the working tree or index"
-msgstr "caminho para a árvore de trabalho"
+msgstr ""
 
 #: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
@@ -23953,27 +24358,23 @@ msgstr ""
 
 #: command-list.h:94
 msgid "Download objects and refs from another repository"
-msgstr "Transferir objetos e referências doutro repositório"
+msgstr "Download objectos e refs de outro repositório"
 
 #: command-list.h:95
-#, fuzzy
 msgid "Receive missing objects from another repository"
-msgstr "Transferir objetos e referências doutro repositório"
+msgstr ""
 
 #: command-list.h:96
-#, fuzzy
 msgid "Rewrite branches"
 msgstr "  Ramo remoto:%s"
 
 #: command-list.h:97
-#, fuzzy
 msgid "Produce a merge commit message"
-msgstr "editar a mensagem de commit"
+msgstr ""
 
 #: command-list.h:98
-#, fuzzy
 msgid "Output information on each ref"
-msgstr "atualizar informação de stat no ficheiro de índice"
+msgstr ""
 
 #: command-list.h:99
 msgid "Run a Git command on a list of repositories"
@@ -23984,9 +24385,8 @@ msgid "Prepare patches for e-mail submission"
 msgstr ""
 
 #: command-list.h:101
-#, fuzzy
 msgid "Verifies the connectivity and validity of the objects in the database"
-msgstr "escrever o objeto na base de dados de objetos"
+msgstr ""
 
 #: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
@@ -24017,14 +24417,12 @@ msgid "Server side implementation of Git over HTTP"
 msgstr ""
 
 #: command-list.h:109
-#, fuzzy
 msgid "Download from a remote Git repository via HTTP"
-msgstr "Transferir objetos e referências doutro repositório"
+msgstr ""
 
 #: command-list.h:110
-#, fuzzy
 msgid "Push objects over HTTP/DAV to another repository"
-msgstr "Transferir objetos e referências doutro repositório"
+msgstr ""
 
 #: command-list.h:111
 msgid "Send a collection of patches from stdin to an IMAP folder"
@@ -24047,7 +24445,6 @@ msgid "Add or parse structured information in commit messages"
 msgstr ""
 
 #: command-list.h:116
-#, fuzzy
 msgid "The Git repository browser"
 msgstr "O browser de repositórios Git"
 
@@ -24056,19 +24453,16 @@ msgid "Show commit logs"
 msgstr "Mostrar histórico de commits"
 
 #: command-list.h:118
-#, fuzzy
 msgid "Show information about files in the index and the working tree"
-msgstr "e fez alterações ao índice e/ou à árvore de trabalho"
+msgstr "Mostrar informação acerca de ficheiros no cenário e árvore-trabalho"
 
 #: command-list.h:119
-#, fuzzy
 msgid "List references in a remote repository"
-msgstr "repositório de referência"
+msgstr "Listar referências em um repositório remoto"
 
 #: command-list.h:120
-#, fuzzy
 msgid "List the contents of a tree object"
-msgstr "imprimir apenas as tags do objeto"
+msgstr ""
 
 #: command-list.h:121
 msgid "Extracts patch and authorship from a single e-mail message"
@@ -24087,17 +24481,14 @@ msgid "Join two or more development histories together"
 msgstr "Juntar duas ou mais histórias de desenvolvimento numa só"
 
 #: command-list.h:125
-#, fuzzy
 msgid "Find as good common ancestors as possible for a merge"
-msgstr "encontrar antecessores de uma única integração com n pontos"
+msgstr "Encontrar tantos quantos antecessores comuns bons para uma junção"
 
 #: command-list.h:126
-#, fuzzy
 msgid "Run a three-way file merge"
 msgstr "Faz uma junção por três de ficheiro"
 
 #: command-list.h:127
-#, fuzzy
 msgid "Run a merge for files needing merging"
 msgstr "Faz um merge de ficheiros precisando de merge"
 
@@ -24118,8 +24509,7 @@ msgid "Write and verify multi-pack-indexes"
 msgstr ""
 
 #: command-list.h:132
-#, fuzzy
-msgid "Creates a tag object"
+msgid "Creates a tag object with extra validation"
 msgstr "outro objeto tag"
 
 #: command-list.h:133
@@ -24135,23 +24525,20 @@ msgid "Find symbolic names for given revs"
 msgstr ""
 
 #: command-list.h:136
-#, fuzzy
 msgid "Add or inspect object notes"
-msgstr "o objeto esperado %s não foi recebido"
+msgstr "Adicionar ou inspecionar notas de objeto"
 
 #: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr ""
 
 #: command-list.h:138
-#, fuzzy
 msgid "Create a packed archive of objects"
-msgstr "ignorar objetos compactados"
+msgstr ""
 
 #: command-list.h:139
-#, fuzzy
 msgid "Find redundant pack files"
-msgstr "não é possível invocar pread sobre o ficheiro de pacote"
+msgstr "Encontrar ficheiros de pacote redundantes"
 
 #: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
@@ -24162,9 +24549,8 @@ msgid "Compute unique ID for a patch"
 msgstr ""
 
 #: command-list.h:142
-#, fuzzy
 msgid "Prune all unreachable objects from the object database"
-msgstr "escrever o objeto na base de dados de objetos"
+msgstr ""
 
 #: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
@@ -24179,7 +24565,6 @@ msgid "Update remote refs along with associated objects"
 msgstr "Atualizar referências remotas juntamente com objetos associados"
 
 #: command-list.h:146
-#, fuzzy
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Submete a mistura de patchset para o ramo atual."
 
@@ -24188,38 +24573,32 @@ msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
 #: command-list.h:148
-#, fuzzy
 msgid "Reads tree information into the index"
-msgstr "atualizar informação de stat no ficheiro de índice"
+msgstr ""
 
 #: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Reaplicar commits no topo de outra base"
 
 #: command-list.h:150
-#, fuzzy
 msgid "Receive what is pushed into the repository"
-msgstr "Gravar alterações no repositório"
+msgstr "Receber para o repositório, o que foi atirado"
 
 #: command-list.h:151
-#, fuzzy
 msgid "Manage reflog information"
-msgstr "mostrar informação de resolver-desfazer"
+msgstr "Gerir informação de registo-ref"
 
 #: command-list.h:152
-#, fuzzy
 msgid "Manage set of tracked repositories"
-msgstr "Gravar alterações no repositório"
+msgstr ""
 
 #: command-list.h:153
-#, fuzzy
 msgid "Pack unpacked objects in a repository"
-msgstr "--cached fora de um repositório"
+msgstr ""
 
 #: command-list.h:154
-#, fuzzy
 msgid "Create, list, delete refs to replace objects"
-msgstr "Criar, listar, eliminar ou verificar um objeto tag assinado com GPG"
+msgstr "Criar, listar, apagar refs para substituir objetos"
 
 #: command-list.h:155
 msgid "Generates a summary of pending changes"
@@ -24231,40 +24610,35 @@ msgstr ""
 
 #: command-list.h:157
 msgid "Reset current HEAD to the specified state"
-msgstr "Repor a HEAD atual no estado especificado"
+msgstr "Restabelecer a HEAD atual para estado especificado"
 
 #: command-list.h:158
-#, fuzzy
 msgid "Restore working tree files"
-msgstr "Mudar de ramos ou restaurar os ficheiros da árvore de trabalho"
+msgstr "Restaurar ficheiros de árvore-trabalho"
 
 #: command-list.h:159
-#, fuzzy
 msgid "Revert some existing commits"
-msgstr "não é possível emendar commit não-existente"
+msgstr "Reverter algumas memórias existentes"
 
 #: command-list.h:160
-#, fuzzy
 msgid "Lists commit objects in reverse chronological order"
-msgstr "mostrar commits em ordem topológica"
+msgstr ""
 
 #: command-list.h:161
-#, fuzzy
 msgid "Pick out and massage parameters"
 msgstr "demasiados parâmetros"
 
 #: command-list.h:162
 msgid "Remove files from the working tree and from the index"
-msgstr "Remover ficheiros da árvore de trabalho e do índice"
+msgstr ""
 
 #: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr ""
 
 #: command-list.h:164
-#, fuzzy
 msgid "Push objects over Git protocol to another repository"
-msgstr "Transferir objetos e referências doutro repositório"
+msgstr ""
 
 #: command-list.h:165
 msgid "Restricted login shell for Git-only SSH access"
@@ -24279,18 +24653,16 @@ msgid "Show various types of objects"
 msgstr "Mostrar vários tipos objetos"
 
 #: command-list.h:168
-#, fuzzy
 msgid "Show branches and their commits"
-msgstr "imprimir apenas ramos que contenham o commit"
+msgstr "Mostrar ramos e as suas memórias"
 
 #: command-list.h:169
 msgid "Show packed archive index"
 msgstr ""
 
 #: command-list.h:170
-#, fuzzy
 msgid "List references in a local repository"
-msgstr "o repositório de referência '%s' não é um repositório local."
+msgstr "Lista referências num repositório local"
 
 #: command-list.h:171
 msgid "Git's i18n setup code for shell scripts"
@@ -24305,18 +24677,16 @@ msgid "Initialize and modify the sparse-checkout"
 msgstr ""
 
 #: command-list.h:174
-#, fuzzy
 msgid "Stash the changes in a dirty working directory away"
-msgstr "%s: já existe no diretório de trabalho"
+msgstr "Esconde as alterações de pasta-trabalho suja"
 
 #: command-list.h:175
-#, fuzzy
 msgid "Add file contents to the staging area"
-msgstr "Adicionar conteúdos de ficheiros ao índice"
+msgstr "Adicionar conteúdos de ficheiro ao cenário"
 
 #: command-list.h:176
 msgid "Show the working tree status"
-msgstr "Mostrar o estado da árvores de trabalho"
+msgstr "Mostrar status de árvore-trabalho"
 
 #: command-list.h:177
 msgid "Remove unnecessary whitespace"
@@ -24331,18 +24701,16 @@ msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
 #: command-list.h:180
-#, fuzzy
 msgid "Switch branches"
 msgstr "Troca branches"
 
 #: command-list.h:181
-#, fuzzy
 msgid "Read, modify and delete symbolic refs"
 msgstr "eliminar referências simbólicas"
 
 #: command-list.h:182
 msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr "Criar, listar, eliminar ou verificar um objeto tag assinado com GPG"
+msgstr "Criar, listar, apagar ou verificar um objeto-etiqueta assinado com GPG"
 
 #: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
@@ -24353,9 +24721,8 @@ msgid "Unpack objects from a packed archive"
 msgstr ""
 
 #: command-list.h:185
-#, fuzzy
 msgid "Register file contents in the working tree to the index"
-msgstr "Remover ficheiros da árvore de trabalho e do índice"
+msgstr ""
 
 #: command-list.h:186
 msgid "Update the object name stored in a ref safely"
@@ -24378,40 +24745,36 @@ msgid "Show a Git logical variable"
 msgstr ""
 
 #: command-list.h:191
-#, fuzzy
 msgid "Check the GPG signature of commits"
-msgstr "assinar o commit com GPG"
+msgstr "Verifica assinatura GPG de memórias"
 
 #: command-list.h:192
-#, fuzzy
 msgid "Validate packed Git archive files"
-msgstr "não foi possível criar o ficheiro de arquivo '%s'"
+msgstr "Validar ficheiros pacote de arquivo Git"
 
 #: command-list.h:193
 msgid "Check the GPG signature of tags"
-msgstr ""
+msgstr "Verifica assinatura GPG de tags"
 
 #: command-list.h:194
 msgid "Git web interface (web frontend to Git repositories)"
-msgstr ""
+msgstr "Interface web de Git (frontend web para repositórios Git)"
 
 #: command-list.h:195
 msgid "Show logs with difference each commit introduces"
-msgstr ""
+msgstr "Mostrar logs com diferenças que cada memória introduz"
 
 #: command-list.h:196
-#, fuzzy
 msgid "Manage multiple working trees"
-msgstr "caminho para a árvore de trabalho"
+msgstr "Gerir múltiplas working trees"
 
 #: command-list.h:197
-#, fuzzy
 msgid "Create a tree object from the current index"
-msgstr "ler o objeto da entrada padrão"
+msgstr "Criar um objeto tree a partir de index atual"
 
 #: command-list.h:198
 msgid "Defining attributes per path"
-msgstr "Definir atributos por caminho"
+msgstr "Definir atributos por path"
 
 #: command-list.h:199
 msgid "Git command-line interface and conventions"
@@ -24430,9 +24793,8 @@ msgid "Git for CVS users"
 msgstr ""
 
 #: command-list.h:203
-#, fuzzy
 msgid "Tweaking diff output"
-msgstr "suprimir saída do diff"
+msgstr "Mexendo com saída de diff"
 
 #: command-list.h:204
 msgid "A useful minimum set of commands for Everyday Git"
@@ -24443,9 +24805,8 @@ msgid "Frequently asked questions about using Git"
 msgstr ""
 
 #: command-list.h:206
-#, fuzzy
 msgid "A Git Glossary"
-msgstr "Um Glossário do Git"
+msgstr "Um Glossário de Git"
 
 #: command-list.h:207
 msgid "Hooks used by Git"
@@ -24454,74 +24815,58 @@ msgstr ""
 #: command-list.h:208
 msgid "Specifies intentionally untracked files to ignore"
 msgstr ""
-"Especificar ficheiros não controlados para serem intencionalmente ignorados"
+"Especificar ficheiros por monitorizar intencionalmente, para serem ignorados"
 
 #: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr ""
+
+#: command-list.h:210
 msgid "Defining submodule properties"
 msgstr "Definir propriedades de submódulos"
 
-#: command-list.h:210
+#: command-list.h:211
 msgid "Git namespaces"
 msgstr ""
 
-#: command-list.h:211
+#: command-list.h:212
 msgid "Helper programs to interact with remote repositories"
 msgstr ""
 
-#: command-list.h:212
+#: command-list.h:213
 msgid "Git Repository Layout"
 msgstr ""
 
-#: command-list.h:213
+#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
 msgstr "Especificar revisões e intervalos do Git"
 
-#: command-list.h:214
+#: command-list.h:215
 msgid "Mounting one repository inside another"
 msgstr ""
 
-#: command-list.h:215
-#, fuzzy
+#: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
-msgstr "Uma introdução ao Git (versão 1.5.1 ou mais recente)"
+msgstr "Um tutorial de introdução a Git: parte dois"
 
-#: command-list.h:216
-#, fuzzy
+#: command-list.h:217
 msgid "A tutorial introduction to Git"
-msgstr "Uma introdução ao Git (versão 1.5.1 ou mais recente)"
+msgstr "Um tutorial de introdução a Git"
 
-#: command-list.h:217
+#: command-list.h:218
 msgid "An overview of recommended workflows with Git"
 msgstr "Uma descrição geral dos fluxos de trabalho recomendados para o Git"
 
-#: git-bisect.sh:48
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "Revisão incorreta na entrada: $arg"
-
-#: git-bisect.sh:82
-msgid "No logfile given"
-msgstr "Nenhum ficheiro de log fornecido"
-
-#: git-bisect.sh:83
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "não é possível ler $file para reproduzir"
-
-#: git-bisect.sh:105
-msgid "?? what are you talking about?"
-msgstr "?? do que é que está a falar?"
-
-#: git-bisect.sh:115
+#: git-bisect.sh:68
 msgid "bisect run failed: no command provided."
 msgstr ""
 
-#: git-bisect.sh:120
+#: git-bisect.sh:73
 #, sh-format
 msgid "running $command"
-msgstr "a executar $command"
+msgstr "executando $command"
 
-#: git-bisect.sh:127
+#: git-bisect.sh:80
 #, sh-format
 msgid ""
 "bisect run failed:\n"
@@ -24530,27 +24875,23 @@ msgstr ""
 "bissetar impossível:\n"
 "exit code $res de '$command' é < 0 ou >= 128"
 
-#: git-bisect.sh:152
+#: git-bisect.sh:105
 msgid "bisect run cannot continue any more"
-msgstr "não é possível continuar a bissetar"
+msgstr "bisseção incapaz de continuar"
 
-#: git-bisect.sh:158
-#, fuzzy, sh-format
+#: git-bisect.sh:111
+#, sh-format
 msgid ""
 "bisect run failed:\n"
 "'bisect-state $state' exited with error code $res"
 msgstr ""
 "bisseção impossível:\n"
-"'bisect_state $state' retornou código $res de erro"
+"'bisect-state $state' retornou código de erro $res"
 
-#: git-bisect.sh:165
+#: git-bisect.sh:118
 msgid "bisect run success"
 msgstr "bissecção concluída com sucesso"
 
-#: git-bisect.sh:173
-msgid "We are not bisecting."
-msgstr "Estamos bissetando nada."
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -24561,7 +24902,7 @@ msgstr ""
 
 #: git-merge-octopus.sh:61
 msgid "Automated merge did not work."
-msgstr "A integração automática não funcionou."
+msgstr "Junção automática falhou."
 
 #: git-merge-octopus.sh:62
 msgid "Should not be doing an octopus."
@@ -24573,7 +24914,7 @@ msgid "Unable to find common commit with $pretty_name"
 msgstr "Incapaz de encontrar commit comum com $pretty_name"
 
 #: git-merge-octopus.sh:77
-#, fuzzy, sh-format
+#, sh-format
 msgid "Already up to date with $pretty_name"
 msgstr "Já está atualizado com $pretty_name"
 
@@ -24589,7 +24930,7 @@ msgstr "A tentar integração simples com $pretty_name"
 
 #: git-merge-octopus.sh:102
 msgid "Simple merge did not work, trying automatic merge."
-msgstr "A integração simples não funcionou, a tentar integração automática."
+msgstr "Junção simples falhou, tentando junção automática."
 
 #: git-submodule.sh:179
 msgid "Relative path can only be used from the toplevel of the working tree"
@@ -24610,142 +24951,102 @@ msgstr "'$sm_path' já existe no índice"
 #: git-submodule.sh:211
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' já existe no índicee não é um submódulo"
+msgstr "'$sm_path' já existe no index e é submódulo nenhum"
 
 #: git-submodule.sh:218
-#, fuzzy, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "o caminho '%s' não tem a versão deles"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "A adicionar repositório existente em '$sm_path' ao índice"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "'$sm_path' já existe e não é uma repositório git válido"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-"Um diretório git de '$sm_name' foi encontrado localmente com os remotos:"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-"  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"Se queres reutilizar esta past git local, em vez de voltares a clonar\n"
-"  $realrepo\n"
-"usa a opção --force. Se a pasta git local é o repo incorreto ou\n"
-"se tens pouca certeza sobre o que isto significa, podes mudar o nome com a "
-"opção '--name'."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "A reativar o diretório git local do submódulo '$sm_name'."
-
-#: git-submodule.sh:279
 #, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Incapaz de checkout submódulo '$sm_path'"
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "'$sm_path' tem memória nenhuma checked out"
 
-#: git-submodule.sh:284
+#: git-submodule.sh:248
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
-msgstr "Falha ao adicionar o submódulo '$sm_path'"
+msgstr "Falhou ao adicionar submódulo '$sm_path'"
 
-#: git-submodule.sh:293
+#: git-submodule.sh:257
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
-msgstr "Falha ao registar o submódulo '$sm_path'"
+msgstr "Falha ao registar submódulo '$sm_path'"
 
-#: git-submodule.sh:568
+#: git-submodule.sh:532
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Incapaz encontrar revisão atual em path de submódulo '$displaypath'"
 
-#: git-submodule.sh:578
+#: git-submodule.sh:542
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Incapaz de buscar em path de submódulo '$sm_path'"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:547
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
-msgstr "Incapaz de encontrar revisão atual ${remote_name}/${branch} em path de "
+msgstr ""
+"Incapaz de encontrar revisão atual ${remote_name}/${branch} em path de "
 "submódulo '$sm_path'"
 
-#: git-submodule.sh:601
-#, fuzzy, sh-format
+#: git-submodule.sh:565
+#, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
 "$sha1:"
-msgstr "Incapaz de buscar em path de submódulo '$displaypath'; tentando "
-"buscar $sha1 directamente:"
+msgstr ""
+"Incapaz de buscar em path de submódulo '$displaypath'; tentando buscar $sha1 "
+"directamente:"
 
-#: git-submodule.sh:607
+#: git-submodule.sh:571
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
 "Direct fetching of that commit failed."
 msgstr ""
-"Obteve-se no caminho de submódulo '$displaypath', mas não continha $sha1. "
-"Falha ao obter aquele commit diretamente."
+"Buscado na path de submódulo '$displaypath', mas continha nenhum $sha1. "
+"Falha ao buscar aquela memória diretamente."
 
-#: git-submodule.sh:614
+#: git-submodule.sh:578
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "Incapaz de checkout '$sha1' no path de submódulo '$displaypath'"
 
-#: git-submodule.sh:615
+#: git-submodule.sh:579
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Caminho de submódulo '$displaypath': '$sha1' extraído"
+msgstr "Path de submódulo '$displaypath': '$sha1' checked out"
 
-#: git-submodule.sh:619
+#: git-submodule.sh:583
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "Incapaz de rebasear '$sha1' em path de submódulo '$displaypath'"
 
-#: git-submodule.sh:620
+#: git-submodule.sh:584
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Caminho de submódulo '$displaypath': rebase concluído em '$sha1'"
+msgstr "Path de submódulo '$displaypath': rebaseado em '$sha1'"
 
-#: git-submodule.sh:625
+#: git-submodule.sh:589
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "Incapaz juntar '$sha1' em path de submódulo '$displaypath'"
 
-#: git-submodule.sh:626
+#: git-submodule.sh:590
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Caminho de submódulo '$displaypath': integrado em '$sha1'"
 
-#: git-submodule.sh:631
+#: git-submodule.sh:595
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "Falha ao executar '$command $sha1' no caminho de submódulo '$displaypath'"
 
-#: git-submodule.sh:632
+#: git-submodule.sh:596
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Caminho de submódulo '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:663
+#: git-submodule.sh:627
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Falha ao percorrer o caminho de submódulo '$displaypath'"
@@ -24775,7 +25076,6 @@ msgid "Rebasing ($new_count/$total)"
 msgstr "A rebasear ($new_count/$total)"
 
 #: git-rebase--preserve-merges.sh:197
-#, fuzzy
 msgid ""
 "\n"
 "Commands:\n"
@@ -24835,7 +25135,7 @@ msgstr ""
 #: git-rebase--preserve-merges.sh:285
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: não é um commit que se possa apanhar"
+msgstr "$sha1: é memória nenhuma que possa ser escolhida"
 
 #: git-rebase--preserve-merges.sh:324
 #, sh-format
@@ -24844,12 +25144,12 @@ msgstr "Nome de commit inválido: $sha1"
 
 #: git-rebase--preserve-merges.sh:354
 msgid "Cannot write current commit's replacement sha1"
-msgstr "Incapaz escrever sha1 substituto de commit"
+msgstr "Incapaz escrever sha1 substituto atual de commit"
 
 #: git-rebase--preserve-merges.sh:405
 #, sh-format
 msgid "Fast-forward to $sha1"
-msgstr "Avanço-rápido para $sha1"
+msgstr "Avanço para $sha1"
 
 #: git-rebase--preserve-merges.sh:407
 #, sh-format
@@ -24879,12 +25179,12 @@ msgstr "Incapaz apanhar $sha1"
 #: git-rebase--preserve-merges.sh:457
 #, sh-format
 msgid "This is the commit message #${n}:"
-msgstr "Esta é a mensagem de commit nº${n}:"
+msgstr "Esta é a mensagem de memória #${n}:"
 
 #: git-rebase--preserve-merges.sh:462
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
-msgstr "A mensagem de commit nº${n} será ignorada:"
+msgstr "Mensagem de memória #${n} será ignorada:"
 
 #: git-rebase--preserve-merges.sh:473
 #, sh-format
@@ -24940,11 +25240,11 @@ msgstr "A executar: $rest"
 #: git-rebase--preserve-merges.sh:681
 #, sh-format
 msgid "Execution failed: $rest"
-msgstr "Falha ao executar: $rest"
+msgstr "Execução falhou: $rest"
 
 #: git-rebase--preserve-merges.sh:683
 msgid "and made changes to the index and/or the working tree"
-msgstr "e fez alterações ao índice e/ou à árvore de trabalho"
+msgstr "e fiz alterações ao cenário e/ou à árvore-trabalho"
 
 #: git-rebase--preserve-merges.sh:685
 msgid ""
@@ -24979,7 +25279,7 @@ msgstr "Comando desconhecido: $command $sha1 $rest"
 
 #: git-rebase--preserve-merges.sh:710
 msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Corrija-o usando 'git rebase --edit-todo'."
+msgstr "Por favor corrige isto usando 'git rebase --edit-todo'."
 
 #: git-rebase--preserve-merges.sh:745
 #, sh-format
@@ -25063,16 +25363,16 @@ msgstr "Incapaz marcar como interativo"
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Rebase $shortrevisions sobre $shortonto ($todocount comando)"
-msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)"
+msgstr[0] "Rebasear $shortrevisions sobre $shortonto ($todocount comando)"
+msgstr[1] "Rebasear $shortrevisions sobre $shortonto ($todocount comandos)"
 
 #: git-rebase--preserve-merges.sh:945
 msgid "Note that empty commits are commented out"
-msgstr "Note que commits vazios são comentados"
+msgstr "Note que memórias vazias são comentadas"
 
 #: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
 msgid "Could not init rewritten commits"
-msgstr "Incapaz inicializar commits reescritos"
+msgstr "Incapaz inicializar memórias reescritas"
 
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
@@ -25082,12 +25382,12 @@ msgstr "utilização: $dashless $USAGE"
 #: git-sh-setup.sh:191
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
-msgstr "Incapaz chdir para $cdup, o topo da working tree"
+msgstr "Incapaz chdir para $cdup, o topo da árvore de trabalho"
 
 #: git-sh-setup.sh:200 git-sh-setup.sh:207
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "fatal: $program_name não pode ser usado sem uma árvore de trabalho."
+msgstr "fatal: $program_name apenas pode ser usado com uma árvore de trabalho."
 
 #: git-sh-setup.sh:221
 msgid "Cannot rebase: You have unstaged changes."
@@ -25108,20 +25408,20 @@ msgstr "Incapaz $action: Tens alterações despreparadas."
 
 #: git-sh-setup.sh:243
 msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "Incapaz rebasear: Teu index contém alterações por commitar."
+msgstr "Incapaz rebasear: Teu index contém alterações por memorizar."
 
 #: git-sh-setup.sh:246
 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "Incapaz agarrar com rebase: Teu index contém alterações por commitar."
+msgstr "Incapaz agarrar com rebase: Teu index contém alterações por memorizar."
 
 #: git-sh-setup.sh:249
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
-msgstr "Incapaz $action: Teu index contém alterações por commitar."
+msgstr "Incapaz $action: Teu index contém alterações por memorizar."
 
 #: git-sh-setup.sh:253
 msgid "Additionally, your index contains uncommitted changes."
-msgstr "Além disso, o índice contém alterações não submetidas."
+msgstr "Além disso, teu index contém alterações por memorizar."
 
 #: git-sh-setup.sh:373
 msgid "You need to run this command from the toplevel of the working tree."
@@ -25184,14 +25484,13 @@ msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr ""
-"Se patch aplica-se corretamente, a edição do hunk será marcada\n"
-"imediatamente como descartada."
+"Se patch aplica-se corretamente, o pedaço editado será marcado\n"
+"imediatamente como descartado."
 
 #: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
-msgstr ""
-"não foi possível abrir o ficheiro de edição do excerto para escrita: %s"
+msgstr "falha a abrir ficheiro de edição do pedaço para escrita: %s"
 
 #: git-add--interactive.perl:1121
 #, perl-format
@@ -25209,8 +25508,7 @@ msgstr ""
 #: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
-msgstr ""
-"não foi possível abrir o ficheiro de edição do excerto para leitura: %s"
+msgstr "falha a abrir ficheiro de edição do pedaço para leitura: %s"
 
 #: git-add--interactive.perl:1251
 msgid ""
@@ -25220,11 +25518,11 @@ msgid ""
 "a - stage this hunk and all later hunks in the file\n"
 "d - do not stage this hunk or any of the later hunks in the file"
 msgstr ""
-"y - preparar este excerto\n"
-"n - não preparar este excerto\n"
-"q - sair; não preparar este excerto nem os restantes\n"
-"a - preparar este excerto e todos os excertos seguintes no ficheiro\n"
-"d - não preparar este excerto nem os excertos seguintes no ficheiro"
+"y - preparar este pedaço\n"
+"n - despreparar este pedaço\n"
+"q - sair; despreparar este pedaço e os restantes\n"
+"a - preparar este pedaço e os próximos deste ficheiro\n"
+"d - despreparar este pedaço e os próximos deste ficheiro"
 
 #: git-add--interactive.perl:1257
 msgid ""
@@ -25234,11 +25532,11 @@ msgid ""
 "a - stash this hunk and all later hunks in the file\n"
 "d - do not stash this hunk or any of the later hunks in the file"
 msgstr ""
-"y - esconder este excerto\n"
-"n - não esconder este excerto\n"
-"q - sair; não esconder este excerto nem os restantes\n"
-"a - esconder este excerto e todos os seguintes no ficheiro\n"
-"d - não esconder este excerto nem os excertos seguintes no ficheiro"
+"y - arrumar este pedaço\n"
+"n - deixar este pedaço fora dos arrumos\n"
+"q - sair; deixar este pedaço e os restantes fora dos arrumos\n"
+"a - arrumar este pedaço e os próximos deste ficheiro\n"
+"d - deixar este pedaço e os próximos deste ficheiro fora dos arrumos"
 
 #: git-add--interactive.perl:1263
 msgid ""
@@ -25248,11 +25546,11 @@ msgid ""
 "a - unstage this hunk and all later hunks in the file\n"
 "d - do not unstage this hunk or any of the later hunks in the file"
 msgstr ""
-"y - despreparar este excerto\n"
-"n - não despreparar este excerto\n"
-"q - sair; não despreparar este excerto nem outros restantes\n"
-"a - despreparar este excerto e todos os excertos seguintes no ficheiro\n"
-"d - não despreparar este excerto nem os excertos seguintes no ficheiro"
+"y - despreparar este pedaço\n"
+"n - preparar este pedaço\n"
+"q - sair; preparar este pedaço e os restantes\n"
+"a - despreparar este pedaço e os próximos deste ficheiro\n"
+"d - preparar este pedaço e os próximos deste ficheiro"
 
 #: git-add--interactive.perl:1269
 msgid ""
@@ -25262,11 +25560,11 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
-"y - aplicar este excerto ao índice\n"
-"n - não aplicar este excerto ao índice\n"
-"q - sair; não aplicar este excerto nem os restantes\n"
-"a - aplicar este excerto e todos os excertos seguintes no ficheiro\n"
-"d - não aplicar este excerto nem os excertos seguintes no ficheiro"
+"y - submeter este pedaço ao index\n"
+"n - deixar este pedaço de fora do index\n"
+"q - sair; deixar de fora este pedaço e os restantes\n"
+"a - submeter este pedaço e os próximos deste ficheiro\n"
+"d - deixar de fora este pedaço e os próximos deste ficheiro"
 
 #: git-add--interactive.perl:1275 git-add--interactive.perl:1293
 msgid ""
@@ -25276,11 +25574,11 @@ msgid ""
 "a - discard this hunk and all later hunks in the file\n"
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
-"y - descartar este excerto da árvore de trabalho\n"
-"n - não descartar este excerto da árvore de trabalho\n"
-"q - sair; não descartar este excerto nem os restantes\n"
-"a - descartar este excerto e todos os excertos seguintes no ficheiro\n"
-"d - não descartar este excerto nem os excertos seguintes no ficheiro"
+"y - descartar este pedaço da árvore de trabalho\n"
+"n - manter este pedaço na árvore de trabalho\n"
+"q - sair; considerar este pedaço e os restantes\n"
+"a - descartar este pedaço e os os próximos deste ficheiro\n"
+"d - manter este pedaço e os próximos deste ficheiro"
 
 #: git-add--interactive.perl:1281
 msgid ""
@@ -25290,11 +25588,11 @@ msgid ""
 "a - discard this hunk and all later hunks in the file\n"
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
-"y - descartar este pedaço de index e worktree\n"
-"n - manter este pedeço no index e worktree\n"
-"q - sair; manter este pedaço e qualquer outro restante\n"
-"a - descartar este pedaço e qualquer próximo deste ficheiro\n"
-"d - manter este pedaço e qualquer próximo deste ficheiro"
+"y - descartar este pedaço de index e árvore de trabalho\n"
+"n - manter este pedaço no index e árvore de trabalho\n"
+"q - sair; manter este pedaço e os restante\n"
+"a - descartar este pedaço e os próximos deste ficheiro\n"
+"d - manter este pedaço e os próximos deste ficheiro"
 
 #: git-add--interactive.perl:1287
 msgid ""
@@ -25304,14 +25602,13 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
-"y - aplicar este excerto ao índice e à árvore de trabalho\n"
-"n - não aplicar este excerto ao índice e à árvore de trabalho\n"
-"q - sair; não aplicar este excerto ou restantes\n"
-"a - aplicar este excerto e todos os excertos seguintes no ficheiro\n"
-"d - não aplicar este excerto nem os excertos seguintes no ficheiro"
+"y - submeter este pedaço ao index e à árvore de trabalho\n"
+"n - deixar este pedaço fora de índice e à árvore de trabalho\n"
+"q - sair; deixar de fora este pedaço e restantes\n"
+"a - submeter este pedaço e os próximos deste ficheiro\n"
+"d - deixar de fora este pedaço e os próximos deste ficheiro"
 
 #: git-add--interactive.perl:1299
-#, fuzzy
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -25319,11 +25616,11 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
-"y - aplicar este excerto ao índice e à árvore de trabalho\n"
-"n - não aplicar este excerto ao índice e à árvore de trabalho\n"
-"q - sair; não aplicar este excerto ou restantes\n"
-"a - aplicar este excerto e todos os excertos seguintes no ficheiro\n"
-"d - não aplicar este excerto nem os excertos seguintes no ficheiro"
+"y - submeter este pedaço à árvore de trabalho\n"
+"n - deixar este pedaço de fora da árvore de trabalho\n"
+"q - sair; deixar de fora este pedaço e restantes\n"
+"a - submeter este pedaço e os próximos deste ficheiro\n"
+"d - deixar de fora este pedaço e os próximos deste ficheiro"
 
 #: git-add--interactive.perl:1314
 msgid ""
@@ -25337,49 +25634,49 @@ msgid ""
 "e - manually edit the current hunk\n"
 "? - print help\n"
 msgstr ""
-"g - selecionar um excerto para ir\n"
-"/ - procurar por um excerto correspondendo à regex dada\n"
-"j - deixar este excerto indecidido, ver excerto seguinte indecidido\n"
-"J - deixar este excerto indecidido, ver excerto seguinte\n"
-"k - deixar este excerto indecidido, ver excerto anterior indecidido\n"
-"K - deixar este excerto indecidido, ver excerto anterior\n"
-"s - dividir o excerto atual em excertos mais pequenos\n"
-"e - editar manualmente o excerto atual\n"
+"g - selecionar um pedaço para ir\n"
+"/ - procurar por um pedaço correspondendo à regex dada\n"
+"j - deixar este pedaço indecidido, ver pedaço seguinte indecidido\n"
+"J - deixar este pedaço indecidido, ver pedaço seguinte\n"
+"k - deixar este pedaço indecidido, ver pedaço anterior indecidido\n"
+"K - deixar este pedaço indecidido, ver pedaço anterior\n"
+"s - dividir o pedaço atual em pedaços mais pequenos\n"
+"e - editar manualmente o pedaço atual\n"
 "? - imprimir ajuda\n"
 
 #: git-add--interactive.perl:1345
 msgid "The selected hunks do not apply to the index!\n"
-msgstr "Os excertos selecionados não aplicam ao índice!\n"
+msgstr "Os pedaços selecionados ficam de fora de index!\n"
 
 #: git-add--interactive.perl:1360
 #, perl-format
 msgid "ignoring unmerged: %s\n"
-msgstr "ignorado não integrado: %s\n"
+msgstr "ignorando por juntar: %s\n"
 
 #: git-add--interactive.perl:1479
-#, fuzzy, perl-format
+#, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Aplicar alteração de modo ao índice e à árvore de trabalho [y,n,q,a,d,/"
 "%s,?]? "
 
 #: git-add--interactive.perl:1480
-#, fuzzy, perl-format
+#, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Aplicar eliminação ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
 
 #: git-add--interactive.perl:1481
-#, fuzzy, perl-format
+#, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Aplicar eliminação ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
 
 #: git-add--interactive.perl:1482
-#, fuzzy, perl-format
+#, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
-"Aplicar este excerto ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
+"Aplicar este pedaço ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
 
 #: git-add--interactive.perl:1599
 msgid "No other hunks to goto\n"
@@ -25394,8 +25691,8 @@ msgstr "Número inválido: '%s'\n"
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
-msgstr[0] "Lamento, apenas %d excerto disponível.\n"
-msgstr[1] "Lamento, apenas %d excertos disponíveis.\n"
+msgstr[0] "Lamento, apenas %d pedaço disponível.\n"
+msgstr[1] "Lamento, apenas %d pedaços disponíveis.\n"
 
 #: git-add--interactive.perl:1657
 msgid "No other hunks to search\n"
@@ -25408,15 +25705,15 @@ msgstr "Regexp de pesquisa malformada %s: %s\n"
 
 #: git-add--interactive.perl:1684
 msgid "No hunk matches the given pattern\n"
-msgstr "Nenhum excerto corresponde ao padrão fornecido\n"
+msgstr "Nenhum pedaço corresponde ao padrão fornecido\n"
 
 #: git-add--interactive.perl:1696 git-add--interactive.perl:1718
 msgid "No previous hunk\n"
-msgstr "Nenhum excerto anterior\n"
+msgstr "Nenhum pedaço anterior\n"
 
 #: git-add--interactive.perl:1705 git-add--interactive.perl:1724
 msgid "No next hunk\n"
-msgstr "Nenhum excerto seguinte\n"
+msgstr "Nenhum pedaço seguinte\n"
 
 #: git-add--interactive.perl:1730
 msgid "Sorry, cannot split this hunk\n"
@@ -25426,8 +25723,8 @@ msgstr ""
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
-msgstr[0] "Dividir em %d excerto.\n"
-msgstr[1] "Dividir em %d excertos.\n"
+msgstr[0] "Dividir em %d pedaço.\n"
+msgstr[1] "Dividir em %d pedaços.\n"
 
 #: git-add--interactive.perl:1746
 msgid "Sorry, cannot edit this hunk\n"
@@ -25445,14 +25742,14 @@ msgid ""
 "add untracked - add contents of untracked files to the staged set of "
 "changes\n"
 msgstr ""
-"status        - mostrar caminhos com alterações\n"
+"status        - mostrar paths com alterações\n"
 "update        - adicionar o estado da árvore de trabalho ao conjunto de "
 "alterações preparadas\n"
 "revert        - reverter conjunto de alterações preparadas de volta à versão "
-"de HEAD\n"
-"patch         - escolher excertos e atualizar seletivamente\n"
-"diff          - ver diff entre HEAD e índice\n"
-"add untracked - adicionar conteúdos de ficheiros não controlados ao conjunto "
+"HEAD\n"
+"patch         - escolher pedaços e atualizar seletivamente\n"
+"diff          - ver diff entre HEAD e index\n"
+"add untracked - adicionar conteúdos de ficheiros por monitorizar ao conjunto "
 "de alterações preparadas\n"
 
 #: git-add--interactive.perl:1828 git-add--interactive.perl:1840
@@ -25465,88 +25762,93 @@ msgstr "falta --"
 #: git-add--interactive.perl:1866
 #, perl-format
 msgid "unknown --patch mode: %s"
-msgstr "Mode de --patch desconhecido: %s"
+msgstr "modo --patch desconhecido: %s"
 
 #: git-add--interactive.perl:1872 git-add--interactive.perl:1878
 #, perl-format
 msgid "invalid argument %s, expecting --"
-msgstr "argumento inválido %s, esperava-se --"
+msgstr "argumento inválido %s, esperando --"
 
-#: git-send-email.perl:138
+#: git-send-email.perl:129
 msgid "local zone differs from GMT by a non-minute interval\n"
-msgstr "a zona local difere de GMT por um intervalo não arrendado ao minuto\n"
+msgstr "zona local difere de GMT por um intervalo diferente de minuto\n"
 
-#: git-send-email.perl:145 git-send-email.perl:151
+#: git-send-email.perl:136 git-send-email.perl:142
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "a diferença de tempo local é maior ou igual a 24 horas\n"
 
-#: git-send-email.perl:223 git-send-email.perl:229
+#: git-send-email.perl:214
+#, perl-format
+msgid "fatal: command '%s' died with exit code %d"
+msgstr ""
+
+#: git-send-email.perl:227
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "o editor saiu com erros, abortar tudo"
 
-#: git-send-email.perl:312
+#: git-send-email.perl:316
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' contém uma versão intermédia do e-mail que esteve a compor.\n"
 
-#: git-send-email.perl:317
+#: git-send-email.perl:321
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' contém o e-mail composto.\n"
 
-#: git-send-email.perl:410
+#: git-send-email.perl:450
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases incompatível com outras opções\n"
 
-#: git-send-email.perl:484
+#: git-send-email.perl:525
 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:489 git-send-email.perl:691
+#: git-send-email.perl:530 git-send-email.perl:746
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Incapaz executar git format-patch fora de um repositório\n"
 
-#: git-send-email.perl:492
+#: git-send-email.perl:533
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
 msgstr ""
 
-#: git-send-email.perl:505
+#: git-send-email.perl:546
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Campo de --suppress-cc desconhecido: '%s'\n"
 
-#: git-send-email.perl:536
+#: git-send-email.perl:577
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Definidição --confirm desconhecida: '%s'\n"
 
-#: git-send-email.perl:564
+#: git-send-email.perl:617
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
-msgstr "aviso: sendmail alias com aspas não é suportado: %s\n"
+msgstr "aviso: alias sendmail com aspas é insustentado: %s\n"
 
-#: git-send-email.perl:566
+#: git-send-email.perl:619
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
-msgstr "aviso: `:include:` não suportado: %s\n"
+msgstr "aviso: `:include:` insustentado: %s\n"
 
-#: git-send-email.perl:568
+#: git-send-email.perl:621
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
-msgstr "aviso: `/file` ou redireção `|pipe` não suportado: %s\n"
+msgstr "aviso: `/file` ou redireção `|pipe` é insustentado: %s\n"
 
-#: git-send-email.perl:573
+#: git-send-email.perl:626
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
-msgstr "aviso: linha sendmail não é reconhecida: %s\n"
+msgstr "aviso: linha sendmail está por reconhecer: %s\n"
 
-#: git-send-email.perl:657
+#: git-send-email.perl:711
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -25561,21 +25863,12 @@ msgstr ""
 "    * Dizendo \"./%s\" se pretende um ficheiro; ou\n"
 "    * Passando a opção --format-patch se pretende um intervalo de commits.\n"
 
-#: git-send-email.perl:678
+#: git-send-email.perl:732
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Falha ao abrir diretório %s: %s"
 
-#: git-send-email.perl:702
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr ""
-"fatal: %s: %s\n"
-"aviso: enviado patch nenhum\n"
-
-#: git-send-email.perl:713
+#: git-send-email.perl:767
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -25585,17 +25878,17 @@ msgstr ""
 "Nenhum ficheiro patch especificado!\n"
 "\n"
 
-#: git-send-email.perl:726
+#: git-send-email.perl:780
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Nenhum linha de assunto em %s?"
 
-#: git-send-email.perl:736
+#: git-send-email.perl:791
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Falha ao abrir %s para escrita: %s"
 
-#: git-send-email.perl:747
+#: git-send-email.perl:802
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -25605,43 +25898,43 @@ msgid ""
 msgstr ""
 "Linhas começadas com \"GIT:\" serão removidos.\n"
 "Considere incluir um diffstat geral ou tabela de conteúdos\n"
-"do patch que está a escrever.\n"
+"para o patch que está a escrever.\n"
 "\n"
-"Apague o conteúdo do corpo se não deseja enviar um sumário.\n"
+"Apague o conteúdo do corpo se deseja enviar um sumário nenhum.\n"
 
-#: git-send-email.perl:771
+#: git-send-email.perl:826
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Falha ao abrir %s: %s"
 
-#: git-send-email.perl:788
+#: git-send-email.perl:843
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Falha ao abrir %s.final: %s"
 
-#: git-send-email.perl:831
+#: git-send-email.perl:886
 msgid "Summary email is empty, skipping it\n"
 msgstr "O e-mail de sumário está vazio, saltá-lo à frente\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:866
+#: git-send-email.perl:935
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Tem a certeza que quer usar <%s> [y/N]? "
 
-#: git-send-email.perl:921
+#: git-send-email.perl:990
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr ""
-"Os seguintes ficheiros são 8bit, mas não declaram um Content-Transfer-"
-"Encoding.\n"
+"Os seguintes ficheiros são 8bit, mas declaram Content-Transfer-Encoding "
+"nenhum.\n"
 
-#: git-send-email.perl:926
+#: git-send-email.perl:995
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Que codificação 8bit se deve declarar [UTF-8]? "
 
-#: git-send-email.perl:934
+#: git-send-email.perl:1003
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -25654,39 +25947,39 @@ msgstr ""
 "tem o assunto modelo '*** SUBJECT HERE ***'. Passe --force se pretende mesmo "
 "enviar.\n"
 
-#: git-send-email.perl:953
+#: git-send-email.perl:1022
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "Para quem devem ser enviados os e-mails (se alguém)?"
 
-#: git-send-email.perl:971
+#: git-send-email.perl:1040
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal: alias '%s' expande para si próprio\n"
 
-#: git-send-email.perl:983
+#: git-send-email.perl:1052
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "Message-ID para ser usado como In-Reply-To para o primeiro e-mail (se "
 "algum)? "
 
-#: git-send-email.perl:1041 git-send-email.perl:1049
+#: git-send-email.perl:1114 git-send-email.perl:1122
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
-msgstr "erro: não é possível extrair um endereço válido de: %s\n"
+msgstr "erro: incapaz extrair endereço válido 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:1053
+#: git-send-email.perl:1126
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "O que fazer com este endereço? ([q]uit|[d]rop|[e]dit): "
 
-#: git-send-email.perl:1370
+#: git-send-email.perl:1446
 #, perl-format
 msgid "CA path \"%s\" does not exist"
-msgstr "O caminho de CA '%s' não existe"
+msgstr "Path CA \"%s\" é inexistente"
 
-#: git-send-email.perl:1453
+#: git-send-email.perl:1529
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -25713,1058 +26006,142 @@ 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:1468
-#, fuzzy
+#: git-send-email.perl:1544
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr "Enviar este e-mail? ([y]es|[n]o|[q]uit|[a]ll): "
 
-#: git-send-email.perl:1471
+#: git-send-email.perl:1547
 msgid "Send this email reply required"
 msgstr "É necessária resposta se deseja enviar este e-mail"
 
-#: git-send-email.perl:1499
+#: git-send-email.perl:1581
 msgid "The required SMTP server is not properly defined."
-msgstr "O servidor SMTP necessário não está definido corretamente."
+msgstr "O servidor SMTP necessário está definido incorretamente."
 
-#: git-send-email.perl:1546
+#: git-send-email.perl:1628
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
-msgstr "O servidor não suporta STARTTLS! %s"
+msgstr "O servidor insustenta STARTTLS! %s"
 
-#: git-send-email.perl:1551 git-send-email.perl:1555
+#: git-send-email.perl:1633 git-send-email.perl:1637
 #, perl-format
 msgid "STARTTLS failed! %s"
-msgstr ""
+msgstr "Falhou STARTTLS! %s"
 
-#: git-send-email.perl:1564
+#: git-send-email.perl:1646
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
-msgstr "Incapaz inicializar SMTP devidamente. Verifica configuração e usa --smtp-debug."
+msgstr "Incapaz inicializar SMTP devidamente. Verifica config e usa --smtp-debug."
 
-#: git-send-email.perl:1582
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Falha ao enviar %s\n"
 
-#: git-send-email.perl:1585
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Simulado-Enviado %s\n"
 
-#: git-send-email.perl:1585
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviado %s\n"
 
-#: git-send-email.perl:1587
+#: git-send-email.perl:1669
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulado-OK. O registo diz:\n"
 
-#: git-send-email.perl:1587
+#: git-send-email.perl:1669
 msgid "OK. Log says:\n"
 msgstr "OK. O registo diz:\n"
 
-#: git-send-email.perl:1599
+#: git-send-email.perl:1688
 msgid "Result: "
 msgstr "Resultado: "
 
-#: git-send-email.perl:1602
+#: git-send-email.perl:1691
 msgid "Result: OK\n"
 msgstr "Resultado: OK\n"
 
-#: git-send-email.perl:1620
+#: git-send-email.perl:1709
 #, perl-format
 msgid "can't open file %s"
-msgstr "não é possível abrir o ficheiro %s"
+msgstr "incapaz abrir ficheiro %s"
 
-#: git-send-email.perl:1667 git-send-email.perl:1687
+#: git-send-email.perl:1756 git-send-email.perl:1776
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Adicionar cc: %s da linha '%s'\n"
 
-#: git-send-email.perl:1673
+#: git-send-email.perl:1762
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Adicionar para: %s da linha '%s'\n"
 
-#: git-send-email.perl:1730
+#: git-send-email.perl:1819
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Adicionar cc: %s da linha '%s'\n"
 
-#: git-send-email.perl:1765
+#: git-send-email.perl:1854
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Adicionar cc: %s da linha '%s'\n"
 
-#: git-send-email.perl:1876
+#: git-send-email.perl:1965
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Incapaz executar '%s'"
 
-#: git-send-email.perl:1883
+#: git-send-email.perl:1972
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Adicionar %s: %s de: '%s'\n"
 
-#: git-send-email.perl:1887
+#: git-send-email.perl:1976
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) falha ao fechar pipe para '%s'"
 
-#: git-send-email.perl:1917
+#: git-send-email.perl:2006
 msgid "cannot send message as 7bit"
-msgstr "não é possível enviar mensagem como 7bit"
+msgstr "incapaz enviar mensagem como 7bit"
 
-#: git-send-email.perl:1925
+#: git-send-email.perl:2014
 msgid "invalid transfer encoding"
 msgstr "codificação de transferência inválida"
 
-#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028
+#: git-send-email.perl:2051
+#, perl-format
+msgid ""
+"fatal: %s: rejected by sendemail-validate hook\n"
+"%s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"fatal: %s: %s\n"
+"aviso: enviado patch nenhum\n"
+
+#: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124
 #, perl-format
 msgid "unable to open %s: %s\n"
-msgstr "não é possível abrir %s: %s\n"
+msgstr "incapaz abrir %s: %s\n"
 
-#: git-send-email.perl:1969
+#: git-send-email.perl:2064
 #, perl-format
-msgid "%s: patch contains a line longer than 998 characters"
-msgstr "%s: o patch contém uma linha mais longa que 998 carateres"
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"fatal: %s:%d é mais longo que 998 caracteres\n"
+"aviso: enviado remendo nenhum\n"
 
-#: git-send-email.perl:1986
+#: git-send-email.perl:2082
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "Saltar %s com sufixo de backup '%s'.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1990
+#: git-send-email.perl:2086
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Deseja mesmo enviar %s? [y|N]: "
-
-#~ msgid "store only"
-#~ msgstr "armazenar apenas"
-
-#~ msgid "compress faster"
-#~ msgstr "compressão rápida"
-
-#~ msgid "compress better"
-#~ msgstr "compressão ótima"
-
-#, fuzzy, c-format
-#~ msgid "unexpected duplicate commit id %s"
-#~ msgstr "não foi possível analisar o commit %s"
-
-#, fuzzy, c-format
-#~ msgid "%s: not a valid OID"
-#~ msgstr "'%s' não é uma referência válida."
-
-#, fuzzy, c-format
-#~ msgid "invalid committer '%s'"
-#~ msgstr "commit inválido %s"
-
-#, fuzzy, c-format
-#~ msgid "invalid committer: %s"
-#~ msgstr "commit inválido %s"
-
-#, fuzzy
-#~ msgid "git bisect--helper --next-all"
-#~ msgstr "git bisect--helper --next-all [--no-checkout]"
-
-#, fuzzy
-#~ msgid "git bisect--helper --bisect-clean-state"
-#~ msgstr "git bisect--helper --next-all [--no-checkout]"
-
-#, fuzzy
-#~ msgid "git bisect--helper --bisect-autostart"
-#~ msgstr "git bisect--helper --next-all [--no-checkout]"
-
-#~ msgid "perform 'git bisect next'"
-#~ msgstr "executar 'git bisect next'"
-
-#, fuzzy
-#~ msgid "--write-terms requires two arguments"
-#~ msgstr "--abort não leva argumentos"
-
-#, fuzzy
-#~ msgid "--bisect-clean-state requires no arguments"
-#~ msgstr "--continue não leva argumentos"
-
-#, fuzzy
-#~ msgid "--bisect-autostart does not accept arguments"
-#~ msgstr "%%(subject) não leva argumentos"
-
-#~ msgid "n,m"
-#~ msgstr "n,m"
-
-#~ msgid "Process line range n,m in file, counting from 1"
-#~ msgstr "processar intervalo de linhas n,m, a contar a partir de 1"
-
-#~ msgid "name of output directory is too long"
-#~ msgstr "o nome do diretório de saída é demasiado longo"
-
-#~ msgid "standard output, or directory, which one?"
-#~ msgstr "saída padrão, ou diretório, qual deles?"
-
-#, c-format
-#~ msgid "failed to remove '%s'"
-#~ msgstr "falha ao remover '%s'"
-
-#, sh-format
-#~ msgid "Bad rev input: $bisected_head"
-#~ msgstr "Revisão incorreta na entrada: $bisected_head"
-
-#, sh-format
-#~ msgid "Bad rev input: $rev"
-#~ msgstr "Revisão incorreta na entrada: $rev"
-
-#, sh-format
-#~ msgid "See git-${cmd}(1) for details."
-#~ msgstr "Consulte git-${cmd}(1) para obter mais detalhes."
-
-#, c-format
-#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-#~ msgstr ""
-#~ "valor '%s' de core.untrackedCache desconhecido; usar 'keep' valor por "
-#~ "omissão"
-
-#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
-#~ msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se EOF"
-
-#~ msgid "Server supports multi_ack_detailed"
-#~ msgstr "O servidor suporta multi_ack_detailed"
-
-#~ msgid "Server supports no-done"
-#~ msgstr "O servidor suporta no-done"
-
-#~ msgid "Server supports multi_ack"
-#~ msgstr "O servidor suporta muilti_ack"
-
-#~ msgid "Server supports side-band-64k"
-#~ msgstr "O servidor suporta side-band-64k"
-
-#~ msgid "Server supports allow-tip-sha1-in-want"
-#~ msgstr "O servidor suporta allow-tip-sha1-in-want"
-
-#~ msgid "Server supports allow-reachable-sha1-in-want"
-#~ msgstr "O servidor suporta allow-reachable-sha1-in-want"
-
-#, c-format
-#~ msgid "in %0.1f seconds automatically..."
-#~ msgstr "automaticamente em %0.1f..."
-
-#~ msgid "error building trees"
-#~ msgstr "erro ao construir árvores"
-
-#, c-format
-#~ msgid "Renaming %s to %s and %s to %s instead"
-#~ msgstr "A mudar o nome de %s para %s e de %s para %s, em alternativa"
-
-#~ msgid ""
-#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
-#~ "please use . instead if you meant to match all paths"
-#~ msgstr ""
-#~ "cadeias de caracteres vazias como especificadores de caminho tornar-se-ão "
-#~ "inválidas nas próximas versões. Use . para corresponder a todos os "
-#~ "caminhos"
-
-#, c-format
-#~ msgid "Could not open '%s' for writing"
-#~ msgstr "Incapaz abrir '%s' para escrita"
-
-#, c-format
-#~ msgid "positive value expected objectname:short=%s"
-#~ msgstr "valor positivo esperado objectname:short=%s"
-
-#, c-format
-#~ msgid "(HEAD detached at %s)"
-#~ msgstr "(HEAD destacada em %s)"
-
-#, c-format
-#~ msgid "(HEAD detached from %s)"
-#~ msgstr "(HEAD destacada de %s)"
-
-#~ msgid "Internal error"
-#~ msgstr "Erro interno"
-
-#, c-format
-#~ msgid "dup2(%d,%d) failed"
-#~ msgstr "dup2(%d,%d) falhou"
-
-#, c-format
-#~ msgid ""
-#~ "invalid 1st line of squash message:\n"
-#~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "1ª linha inválida da mensagem de squash:\n"
-#~ "\n"
-#~ "\t%.*s"
-
-#, c-format
-#~ msgid "mainline was specified but commit %s is not a merge."
-#~ msgstr ""
-#~ "a linha principal foi especificada mas o commit %s não é uma integração."
-
-#~ msgid "BUG: returned path string doesn't match cwd?"
-#~ msgstr "BUG: returned path string doesn't match cwd?"
-
-#, c-format
-#~ msgid ""
-#~ "Cannot update sparse checkout: the following entries are not up-to-date:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Impossível actualizar sparse checkout: estas entradas estão "
-#~ "desactualizadas:\n"
-#~ "%s"
-
-#, c-format
-#~ msgid ""
-#~ "The following working tree files would be overwritten by sparse checkout "
-#~ "update:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Os seguintes ficheiros na árvore de trabalho seriam substituídos ao "
-#~ "atualizar a extração esparsa:\n"
-#~ "%s"
-
-#, c-format
-#~ msgid ""
-#~ "The following working tree files would be removed by sparse checkout "
-#~ "update:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Os seguintes ficheiros na árvore de trabalho seriam removidos ao "
-#~ "atualizar a extração esparsa:\n"
-#~ "%s"
-
-#, c-format
-#~ msgid "submodule update strategy not supported for submodule '%s'"
-#~ msgstr "não foi possível procurar pelo submódulo '%s'"
-
-#, c-format
-#~ msgid "could not close %s"
-#~ msgstr "não foi possível fechar %s"
-
-#~ msgid "Initial commit on "
-#~ msgstr "Commit inicial em "
-
-#~ msgid "(+/-)x"
-#~ msgstr "(+/-)x"
-
-#, c-format
-#~ msgid "Use -f if you really want to add them.\n"
-#~ msgstr "Use -f se deseja mesmo adicioná-los.\n"
-
-#~ msgid "Patch is empty. Was it split wrong?"
-#~ msgstr "O patch está vazio. Foi dividido incorretamente?"
-
-#~ msgid "cannot be interactive without stdin connected to a terminal."
-#~ msgstr ""
-#~ "não é possível entrar em modo interativo sem um entrada padrão conectada "
-#~ "a um terminal."
-
-#, c-format
-#~ msgid "The copy of the patch that failed is found in: %s"
-#~ msgstr "A cópia do patch que falhou encontra-se em: %s"
-
-#~ msgid ""
-#~ "You still have unmerged paths in your index.\n"
-#~ "Did you forget to use 'git add'?"
-#~ msgstr ""
-#~ "Ainda há caminhos não integrados no índice.\n"
-#~ "Esqueceu-se de usar 'git add'?"
-
-#~ msgid "update BISECT_HEAD instead of checking out the current commit"
-#~ msgstr "atualizar BISECT_HEAD em vez de extrair o commit atual"
-
-#~ msgid "Use an experimental heuristic to improve diffs"
-#~ msgstr "Usar um heurística experimental para melhorar diffs"
-
-#~ msgid "change upstream info"
-#~ msgstr "alterar a informação do ramo a montante"
-
-#~ msgid "it does not make sense to create 'HEAD' manually"
-#~ msgstr "não faz sentido criar 'HEAD' manualmente"
-
-#, c-format
-#~ msgid ""
-#~ "\n"
-#~ "If you wanted to make '%s' track '%s', do this:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Se quer que '%s' siga '%s', faça:\n"
-#~ "\n"
-
-#, c-format
-#~ 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 ""
-#~ " possível atualizar os caminho e mudar para o ramo '%s' ao mesmo tempo.\n"
-#~ "Pretendia extrair '%s' o qual não pode ser resolvido como commit?"
-
-#, c-format
-#~ msgid "failed to stat %s\n"
-#~ msgstr "falha ao invocar stat de %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 ""
-#~ "Se deseja ignorar este commit, use:\n"
-#~ "\n"
-#~ "    git reset\n"
-#~ "\n"
-#~ "Depois \"git cherry-pick --continue\" irá retomar o cherry-pick\n"
-#~ "dos restantes commits.\n"
-
-#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-#~ msgstr "Caminhos explícitos especificados sem -i ou -o; assumindo --only..."
-
-#~ msgid "default"
-#~ msgstr "predefinição"
-
-#, c-format
-#~ msgid "annotated tag %s has no embedded name"
-#~ msgstr "tag anotada %s falta o nome incorporado"
-
-#~ msgid "<command>"
-#~ msgstr "<comando>"
-
-#~ msgid "default mode for recursion"
-#~ msgstr "modo recursivo por omissão"
-
-#, c-format
-#~ msgid "Don't know how to fetch from %s"
-#~ msgstr "Desconheço como buscar de %s"
-
-#, c-format
-#~ msgid "Can't stat %s"
-#~ msgstr "não é possível invocar stat sobre %s"
-
-#~ msgid "basename"
-#~ msgstr "nomebase"
-
-#~ msgid "Everyday Git With 20 Commands Or So"
-#~ msgstr "Diário Git com mais ou menos 20 Comandos"
-
-#~ msgid "Error in object"
-#~ msgstr "Erro no objeto"
-
-#~ msgid "print only names (no SHA-1)"
-#~ msgstr "imprimir apenas nomes (sem SHA-1)"
-
-#~ msgid "--[no-]autostash option is only valid with --rebase."
-#~ msgstr "a opção --[no-]autostash só é válida com --rebase."
-
-#~ msgid "abort rebase"
-#~ msgstr "abortar rebase"
-
-#~ msgid "push|fetch"
-#~ msgstr "push|fetch"
-
-#~ msgid "w[,i1[,i2]]"
-#~ msgstr "w[,i1[,i2]]"
-
-#~ msgid "submodule--helper subcommand must be called with a subcommand"
-#~ msgstr "o subcomando submodule--helper deve ser invocado com um subcomando"
-
-#~ msgid "tag: tagging "
-#~ msgstr "tag: a colocar tag"
-
-#~ msgid "commit object"
-#~ msgstr "objeto commit"
-
-#~ msgid "blob object"
-#~ msgstr "objeto blob"
-
-#, c-format
-#~ msgid "Removing worktrees/%s: not a valid directory"
-#~ msgstr "A remover worktrees/%s: diretório inválido"
-
-#, c-format
-#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-#~ msgstr "A remover worktrees/%s: não é possível ler o ficheiro gitdir (%s)"
-
-#, c-format
-#~ msgid "Removing worktrees/%s: invalid gitdir file"
-#~ msgstr "A remover worktrees/%s: ficheiro gitdir inválido"
-
-#, sh-format
-#~ msgid "unrecognised option: '$arg'"
-#~ msgstr "opção não reconhecida: '$arg'"
-
-#, sh-format
-#~ msgid "'$invalid' is not a valid commit"
-#~ msgstr "'$invalid' não é um commit válido"
-
-#, sh-format
-#~ msgid "invalid upstream $upstream_name"
-#~ msgstr "$upstream_name a montante inválido"
-
-#, sh-format
-#~ msgid "$onto_name: there are more than one merge bases"
-#~ msgstr "$onto_name: há mais do que uma base de integração"
-
-#, sh-format
-#~ msgid "$onto_name: there is no merge base"
-#~ msgstr "$onto_name: há base de junção nenhuma"
-
-#, sh-format
-#~ msgid "fatal: no such branch: $branch_name"
-#~ msgstr "fatal: ramo inexistente: $branch_name"
-
-#, sh-format
-#~ msgid "Fast-forwarded $branch_name to $onto_name."
-#~ msgstr "$branch_name avançado rapidamente para $onto_name."
-
-#~ msgid "Cannot remove temporary index (can't happen)"
-#~ msgstr "Incapaz remover index temporário (pode acontecer de maneira nenhuma)"
-
-#, sh-format
-#~ msgid ""
-#~ "error: unknown option for 'stash save': $option\n"
-#~ "       To provide a message, use git stash save -- '$option'"
-#~ msgstr ""
-#~ "erro: desconheço opção de 'stash save': $option\n"
-#~ "       Fornecendo mensagem, usa git stash save -- '$option'"
-
-#, sh-format
-#~ msgid "unknown option: $opt"
-#~ msgstr "opção desconhecido: $opt"
-
-#, sh-format
-#~ msgid "$reference is not a valid reference"
-#~ msgstr "$reference não é uma referência válida"
-
-#~ msgid "Cannot unstage modified files"
-#~ msgstr "Incapaz despreparar ficheiros modificado"
-
-#~ msgid "(To restore them type \"git stash apply\")"
-#~ msgstr "(Para os restaurar execute \"git stash apply\")"
-
-#, sh-format
-#~ msgid ""
-#~ "The following path is ignored by one of your .gitignore files:\n"
-#~ "$sm_path\n"
-#~ "Use -f if you really want to add it."
-#~ msgstr ""
-#~ "O seguinte caminho foi ignorado por um ficheiro .gitignore:\n"
-#~ "$sm_path\n"
-#~ "Use -f se pretende mesmo adicioná-lo."
-
-#, sh-format
-#~ msgid "Entering '$displaypath'"
-#~ msgstr "A entrar em '$displaypath'"
-
-#, sh-format
-#~ msgid "Stopping at '$displaypath'; script returned non-zero status."
-#~ msgstr ""
-#~ "Interrompido em '$displaypath'; o script retornou um valor diferente de "
-#~ "zero."
-
-#, sh-format
-#~ msgid "pathspec and --all are incompatible"
-#~ msgstr "especificador de caminho e --all são incompatíveis"
-
-#, sh-format
-#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-#~ msgstr ""
-#~ "O registo do submódulo '$name' ($url) foi removido do caminho "
-#~ "'$displaypath'"
-
-#~ msgid "The --cached option cannot be used with the --files option"
-#~ msgstr "A opção --cached não pode ser usada com a opção --files"
-
-#, sh-format
-#~ msgid "  Warn: $display_name doesn't contain commit $sha1_src"
-#~ msgstr "  Aviso: $display_name não contém o commit $sha1_src"
-
-#, sh-format
-#~ msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
-#~ msgstr "  Warn: $display_name não contém o commit $sha1_dst"
-
-#, sh-format
-#~ msgid ""
-#~ "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-#~ msgstr "  Warn: $display_name contém os commits $sha1_src e $sha1_dst"
-
-#, sh-format
-#~ msgid "Failed to recurse into submodule path '$sm_path'"
-#~ msgstr "Falha ao percorrer recursivamente o caminho de submódulo '$sm_path'"
-
-#, sh-format
-#~ msgid ""
-#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Aviso: falta o SHA-1 ou a seguinte linha não tem um commit:\n"
-#~ " - $line"
-
-#, sh-format
-#~ msgid ""
-#~ "Warning: the command isn't recognized in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Aviso: o comando não é reconhecido na seguinte linha:\n"
-#~ " - $line"
-
-#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
-#~ msgstr "Ou pode abortar o rebase com 'git rebase --abort'."
-
-#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-#~ msgstr "Os campos To/Cc/Bcc não são interpretados ainda, foram ignorados\n"
-
-#~ msgid ""
-#~ "There is nothing to exclude from by :(exclude) patterns.\n"
-#~ "Perhaps you forgot to add either ':/' or '.' ?"
-#~ msgstr ""
-#~ "Há nada a excluir de acordo com a pattern :(exclude).\n"
-#~ "Talvez tenhas-te esquecido de acrescentar ':/' ou '.' ?"
-
-#~ msgid "unrecognized format: %%(%s)"
-#~ msgstr "formato não reconhecido: %%(%s)"
-
-#~ msgid "ref '%s' does not have %ld components to :strip"
-#~ msgstr "a referência '%s' não tem %ld componentes como se indica em :strip"
-
-#~ msgid "[%s: gone]"
-#~ msgstr "[%s: desaparecido]"
-
-#~ msgid "[%s: behind %d]"
-#~ msgstr "[%s: atrás %d]"
-
-#~ msgid "[%s: ahead %d]"
-#~ msgstr "[%s: à frente %d]"
-
-#~ msgid "[%s: ahead %d, behind %d]"
-#~ msgstr "[%s: à frente %d, atrás %d]"
-
-#~ msgid " **** invalid ref ****"
-#~ msgstr " **** referências inválida ****"
-
-#~ msgid "insanely long object directory %.*s"
-#~ msgstr "diretório de objetos demasiado longo %.*s"
-
-#~ msgid "git merge [<options>] <msg> HEAD <commit>"
-#~ msgstr "git merge [<opções>] <msg> HEAD <commit>"
-
-#~ msgid "tag name too long: %.*s..."
-#~ msgstr "o nome da tag é demasiado longo: %.*s..."
-
-#~ msgid "tag header too big."
-#~ msgstr "cabeçalho da tag demasiado longo."
-
-#~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for discarding"
-#~ msgstr ""
-#~ "Se o patch se aplicar corretamente, o excerto editado será marcado\n"
-#~ "para ser descartado imediatamente."
-
-#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
-#~ msgstr ""
-#~ "Usar uma heurística experimental baseada em linhas brancas para melhorar "
-#~ "diffs"
-
-#~ msgid "Clever... amending the last one with dirty index."
-#~ msgstr "Inteligente... a emendar o último commit com o índice sujo."
-
-#~ 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] ""
-#~ "o submódulo seguinte (ou um dos seus submódulos aninhados)\n"
-#~ "usa um diretório .git:"
-#~ msgstr[1] ""
-#~ "os submódulos seguintes (ou um dos seus submódulos)\n"
-#~ "usam um diretório .git:"
-
-#~ msgid ""
-#~ "\n"
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "\n"
-#~ "(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)"
-
-#~ msgid "Could not write to %s"
-#~ msgstr "Incapaz escrever em %s"
-
-#~ msgid "Error wrapping up %s."
-#~ msgstr "Erro ao rematar %s."
-
-#~ msgid "Your local changes would be overwritten by cherry-pick."
-#~ msgstr "As suas alterações locais serão substituídas por cherry-pick."
-
-#~ msgid "Cannot revert during another revert."
-#~ msgstr "Incapaz reverter durante outra reversão."
-
-#~ msgid "Cannot cherry-pick during another cherry-pick."
-#~ msgstr "Incapaz apanhar durante outra apanha."
-
-#~ msgid "Could not open %s"
-#~ msgstr "Incapaz abrir %s"
-
-#~ msgid "Could not format %s."
-#~ msgstr "Incapaz formatar %s."
-
-#~ msgid "You need to set your committer info first"
-#~ msgstr "Primeiro tem de definir a sua informação de committer"
-
-#~ msgid "bad numeric config value '%s' for '%s': invalid unit"
-#~ msgstr ""
-#~ "valor numérico '%s' da configuração '%s' incorreto: unidade inválida"
-
-#~ msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit"
-#~ msgstr ""
-#~ "valor numérico '%s' da configuração '%s' incorreto no blob %s: unidade "
-#~ "inválida"
-
-#~ msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit"
-#~ msgstr ""
-#~ "valor numérico '%s' da configuração '%s' incorreto no ficheiro %s: "
-#~ "unidade inválida"
-
-#~ msgid ""
-#~ "bad numeric config value '%s' for '%s' in standard input: invalid unit"
-#~ msgstr ""
-#~ "valor numérico '%s' da configuração '%s' incorreto na entrada padrão: "
-#~ "unidade inválida"
-
-#~ msgid ""
-#~ "bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit"
-#~ msgstr ""
-#~ "valor numérico '%s' da configuração '%s' incorreto no submódulo-blob %s: "
-#~ "unidade inválida"
-
-#~ msgid ""
-#~ "bad numeric config value '%s' for '%s' in command line %s: invalid unit"
-#~ msgstr ""
-#~ "valor numérico '%s' da configuração '%s' incorreto na linha de comandos "
-#~ "%s: unidade inválida"
-
-#~ msgid "bad numeric config value '%s' for '%s' in %s: invalid unit"
-#~ msgstr ""
-#~ "valor numérico '%s' da configuração '%s' incorreto em %s: unidade inválida"
-
-#~ msgid "This is the 2nd commit message:"
-#~ msgstr "Esta é a 2ª mensagem de commit:"
-
-#~ msgid "This is the 3rd commit message:"
-#~ msgstr "Esta é a 3ª mensagem de commit:"
-
-#~ msgid "This is the 4th commit message:"
-#~ msgstr "Esta é a 4ª mensagem de commit:"
-
-#~ msgid "This is the 5th commit message:"
-#~ msgstr "Esta é a 5ª mensagem de commit:"
-
-#~ msgid "This is the 6th commit message:"
-#~ msgstr "Esta é a 6ª mensagem de commit:"
-
-#~ msgid "This is the 7th commit message:"
-#~ msgstr "Esta é a 7ª mensagem de commit:"
-
-#~ msgid "This is the 8th commit message:"
-#~ msgstr "Esta é a 8ª mensagem de commit:"
-
-#~ msgid "This is the 9th commit message:"
-#~ msgstr "Esta é a 9ª mensagem de commit:"
-
-#~ msgid "This is the 10th commit message:"
-#~ msgstr "Esta é a 10ª mensagem de commit:"
-
-#~ msgid "This is the ${n}th commit message:"
-#~ msgstr "Esta é a ${n}ª mensagem de commit:"
-
-#~ msgid "This is the ${n}st commit message:"
-#~ msgstr "Está é a ${n}ª mensagem de commit:"
-
-#~ msgid "This is the ${n}nd commit message:"
-#~ msgstr "Esta é a ${n}ª mensagem de commit:"
-
-#~ msgid "This is the ${n}rd commit message:"
-#~ msgstr "Esta é a ${n}ª mensagem de commit:"
-
-#~ msgid "The 1st commit message will be skipped:"
-#~ msgstr "A 1ª mensagem de commit será ignorada:"
-
-#~ msgid "The 2nd commit message will be skipped:"
-#~ msgstr "A 2ª mensagem de commit será ignorada:"
-
-#~ msgid "The 3rd commit message will be skipped:"
-#~ msgstr "A 3ª mensagem de commit será ignorada:"
-
-#~ msgid "The 4th commit message will be skipped:"
-#~ msgstr "A 4ª mensagem de commit será ignorada:"
-
-#~ msgid "The 5th commit message will be skipped:"
-#~ msgstr "A 5ª mensagem de commit será ignorada:"
-
-#~ msgid "The 6th commit message will be skipped:"
-#~ msgstr "A 6ª mensagem de commit será ignorada:"
-
-#~ msgid "The 7th commit message will be skipped:"
-#~ msgstr "A 7ª mensagem de commit será ignorada:"
-
-#~ msgid "The 8th commit message will be skipped:"
-#~ msgstr "A 8ª mensagem de commit será ignorada:"
-
-#~ msgid "The 9th commit message will be skipped:"
-#~ msgstr "A 9ª mensagem de commit será ignorada:"
-
-#~ msgid "The 10th commit message will be skipped:"
-#~ msgstr "A 10ª mensagem de commit será ignorada:"
-
-#~ msgid "The ${n}th commit message will be skipped:"
-#~ msgstr "A ${n}ª mensagem de commit será ignorada:"
-
-#~ msgid "The ${n}st commit message will be skipped:"
-#~ msgstr "A ${n}ª mensagem de commit será ignorada:"
-
-#~ msgid "The ${n}nd commit message will be skipped:"
-#~ msgstr "A ${n}ª mensagem de commit será ignorada:"
-
-#~ msgid "The ${n}rd commit message will be skipped:"
-#~ msgstr "A ${n}ª mensagem de commit será ignorada:"
-
-#~ msgid "could not run gpg."
-#~ msgstr "não foi possível executar gpg."
-
-#~ msgid "gpg did not accept the data"
-#~ msgstr "gpg não aceitou os dados"
-
-#~ msgid "unsupported object type in the tree"
-#~ msgstr "tipo de objeto sem suporte encontrado na árvore"
-
-#~ msgid "Fatal merge failure, shouldn't happen."
-#~ msgstr "Falha de integração fatal, não devia acontecer."
-
-#~ msgid "Unprocessed path??? %s"
-#~ msgstr "Caminho não processado??? %s"
-
-#~ msgid "Cannot %s during a %s"
-#~ msgstr "Incapaz %s durante %s"
-
-#~ msgid "Can't cherry-pick into empty head"
-#~ msgstr "Incapaz apanhar para uma head vazia"
-
-#~ msgid "could not write branch description template"
-#~ msgstr "não foi possível escrever o modelo da descrição do ramo"
-
-#~ msgid "corrupt index file"
-#~ msgstr "ficheiro de índice corrompido"
-
-#~ msgid "detach the HEAD at named commit"
-#~ msgstr "destacar HEAD no commit indicado"
-
-#~ msgid "Checking connectivity... "
-#~ msgstr "A verificar a conectividade... "
-
-#~ msgid "  (unable to update local ref)"
-#~ msgstr "  (não é possível atualizar a referência local)"
-
-#~ msgid "Reinitialized existing"
-#~ msgstr "existente reinicializado"
-
-#~ msgid "Initialized empty"
-#~ msgstr "vazio inicializado"
-
-#~ msgid " shared"
-#~ msgstr " partilhado"
-
-#~ msgid "Verify that the named commit has a valid GPG signature"
-#~ msgstr "verificar se o commit tem uma assinatura GPG válida"
-
-#~ msgid "Writing SQUASH_MSG"
-#~ msgstr "A escrever SQUASH_MSG"
-
-#~ msgid "Finishing SQUASH_MSG"
-#~ msgstr "A concluir SQUASH_MSG"
-
-#~ msgid "   and with remote"
-#~ msgstr "   e com o remoto"
-
-#~ msgid "removing '%s' failed"
-#~ msgstr "falha ao remover '%s'"
-
-#~ msgid ""
-#~ "If you want to reuse this local git directory instead of cloning again "
-#~ "from"
-#~ msgstr ""
-#~ "Se deseja reutilizar este diretório git local em vez de clonar de novo de"
-
-#~ msgid ""
-#~ "use the '--force' option. If the local git directory is not the correct "
-#~ "repo"
-#~ msgstr ""
-#~ "use a opção '--force'. Se o diretório git local não é o repositório "
-#~ "correto"
-
-#~ msgid ""
-#~ "or you are unsure what this means choose another name with the '--name' "
-#~ "option."
-#~ msgstr ""
-#~ "ou se não tem a certeza do que isto significa, escolha outro nome com a "
-#~ "opção '--name'."
-
-#~ msgid "Submodule work tree '$displaypath' contains a .git directory"
-#~ msgstr ""
-#~ "A árvore de trabalho do submódulo '$displaypath' contém um diretório .git"
-
-#~ msgid ""
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)"
-
-#~ 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 "não é possível abrir %s: %s\n"
-
-#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-#~ msgstr ""
-#~ "Prepare as suas alterações em .gitmodules ou esconda-as (stash) para "
-#~ "prosseguir"
-
-#~ msgid "failed to remove: %s"
-#~ msgstr "falha ao remover: %s"
-
-#~ msgid "The --exec option must be used with the --interactive option"
-#~ msgstr "A opção --exec deve ser usada com a opção --interactive"
-
-#~ msgid ""
-#~ "Submodule path '$displaypath' not initialized\n"
-#~ "Maybe you want to use 'update --init'?"
-#~ msgstr ""
-#~ "Submódulo em '$displaypath' não inicializado\n"
-#~ "Talvez queira usar 'update --init'?"
-
-#~ msgid "improper format entered align:%s"
-#~ msgstr "formato impróprio introduzido align:%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 ""
-#~ "push.default não está definido; o seu valor implícito foi alterado\n"
-#~ "no Git 2.0 de 'matching' para 'simple'. Para suprimir esta mensagem\n"
-#~ "e manter o comportamento tradicional, use:\n"
-#~ "\n"
-#~ "  git config --global push.default matching\n"
-#~ "\n"
-#~ "Para suprimir esta mensagem e adotar o novo comportamento, use:\n"
-#~ "\n"
-#~ "  git config --global push.default simple\n"
-#~ "\n"
-#~ "Quando push.default está definido como 'matching', o Git publica\n"
-#~ "os ramos locais nos ramos remotos que já existam com o mesmo nome.\n"
-#~ "\n"
-#~ "Desde a versão 2.0, o Git assume o comportamento mais conservativo "
-#~ "'simple',\n"
-#~ "publicando só o ramo atual no ramo remoto correspondente, que é usado\n"
-#~ "para atualizar o ramo atual com 'git pull'.\n"
-#~ "Consulte 'git help config' e procure por 'push.default' para mais "
-#~ "informações.\n"
-#~ "(o modo 'simple' foi introduzido no Git 1.7.11. Use o modo semelhante\n"
-#~ "'current' em vez de 'simple' se por vezes usa versões anteriores do Git)"
-
-#~ msgid "check|on-demand|no"
-#~ msgstr "check|on-demand|no"
-
-#~ msgid "Could not append '%s'"
-#~ msgstr "Incapaz acrescentar '%s'"
-
-#~ msgid "Testing "
-#~ msgstr "A testar "
-
-#~ msgid "Forward-port local commits to the updated upstream head"
-#~ msgstr ""
-#~ "Migrar commits locais para a cabeça atualizada em relação ao ramo a "
-#~ "montante"
-
-#~ msgid " %d file changed"
-#~ msgid_plural " %d files changed"
-#~ msgstr[0] " %d ficheiro modificado"
-#~ msgstr[1] " %d ficheiros modificados"
-
-#~ msgid ", %d insertion(+)"
-#~ msgid_plural ", %d insertions(+)"
-#~ msgstr[0] ", %d adição(+)"
-#~ msgstr[1] ", %d adições(+)"
-
-#~ msgid ", %d deletion(-)"
-#~ msgid_plural ", %d deletions(-)"
-#~ msgstr[0] ", %d eliminado(-)"
-#~ msgstr[1] ", %d eliminados(-)"
-
-#~ msgid "You do not have a valid HEAD"
-#~ msgstr "Você não tem uma HEAD válida"
-
-#~ msgid "bug"
-#~ msgstr "erro"
-
-#~ msgid "copied:     %s -> %s"
-#~ msgstr "copiado:     %s -> %s"
-
-#~ msgid "modified:   %s"
-#~ msgstr "modificado:   %s"
-
-#~ msgid "renamed:    %s -> %s"
-#~ msgstr "mudado de nome:    %s -> %s"
-
-#~ msgid ", behind "
-#~ msgstr ", atrás "
-
-#~ msgid "no files added"
-#~ msgstr "adicionado ficheiro nenhum"
-
-#~ msgid "Could not extract email from committer identity."
-#~ msgstr "Incapaz extrair email apartir identidade committer."
-
-#~ msgid "option %s does not accept negative form"
-#~ msgstr "opção %s não aceita formato negativo"
-
-#~ msgid "Applying: $FIRSTLINE"
-#~ msgstr "Aplicando: $FIRSTLINE"
-
-#~ msgid "--"
-#~ msgstr "--"
-
-#~ msgid "Please enter the commit message for your changes."
-#~ msgstr "Por favor insira a mensagem de commit das suas alterações."
diff --git a/po/sv.po b/po/sv.po
index 4a9f2f3aca..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.32.0\n"
+"Project-Id-Version: git 2.34.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-05-17 16:02+0800\n"
-"PO-Revision-Date: 2021-05-20 13:31+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,234 +16,235 @@ 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:376
+#: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Vadå (%s)?"
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: 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"
 
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
 #: git-add--interactive.perl:294
 msgid "binary"
 msgstr "binär"
 
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
 #: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "ingenting"
 
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
 #: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "oändrad"
 
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Uppdatera"
 
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
 #, c-format
 msgid "could not stage '%s'"
 msgstr "kunde inte köa \"%s\""
 
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "kunde inte skriva indexet"
 
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
 #, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "uppdaterade %d sökväg\n"
 msgstr[1] "uppdaterade %d sökvägar\n"
 
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "observera: %s spåras inte längre.\n"
 
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: 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\""
 
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Återställ"
 
-#: add-interactive.c:775
+#: add-interactive.c:779
 msgid "Could not parse HEAD^{tree}"
 msgstr "kunde inte tolka HEAD^{tree}"
 
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
 #, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "återställde %d sökväg\n"
 msgstr[1] "återställde %d sökvägar\n"
 
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "Inga ospårade filer.\n"
 
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Lägg till ospårad"
 
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
 #, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "lade till %d sökväg\n"
 msgstr[1] "lade till %d sökvägar\n"
 
-#: add-interactive.c:925
+#: add-interactive.c:929
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "ignorerar ej sammanslagen: %s"
 
-#: add-interactive.c:937 add-patch.c:1751 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:939 add-patch.c:1749 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:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Uppdatera patch"
 
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Granska diff"
 
-#: add-interactive.c:1010
+#: add-interactive.c:1014
 msgid "show paths with changes"
 msgstr "visa sökvägar med ändringar"
 
-#: add-interactive.c:1012
+#: add-interactive.c:1016
 msgid "add working tree state to the staged set of changes"
 msgstr "lägg arbetskatalogens tillstånd till köade ändringar"
 
-#: add-interactive.c:1014
+#: add-interactive.c:1018
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "återställ köade ändringar tillbaka till HEAD-versionen"
 
-#: add-interactive.c:1016
+#: add-interactive.c:1020
 msgid "pick hunks and update selectively"
 msgstr "välj stycken och uppdatera selektivt"
 
-#: add-interactive.c:1018
+#: add-interactive.c:1022
 msgid "view diff between HEAD and index"
 msgstr "visa skillnad mellan HEAD och index"
 
-#: add-interactive.c:1020
+#: add-interactive.c:1024
 msgid "add contents of untracked files to the staged set of changes"
 msgstr "lägg innehåll i ospårade filer till köade ändringar"
 
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
 msgid "Prompt help:"
 msgstr "Kommandoradshjälp:"
 
-#: add-interactive.c:1030
+#: add-interactive.c:1034
 msgid "select a single item"
 msgstr "markera en post"
 
-#: add-interactive.c:1032
+#: add-interactive.c:1036
 msgid "select a range of items"
 msgstr "markera intervall av poster"
 
-#: add-interactive.c:1034
+#: add-interactive.c:1038
 msgid "select multiple ranges"
 msgstr "markera flera intervall"
 
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
 msgid "select item based on unique prefix"
 msgstr "markera post baserad på unikt prefix"
 
-#: add-interactive.c:1038
+#: add-interactive.c:1042
 msgid "unselect specified items"
 msgstr "avmarkera angivna poster"
 
-#: add-interactive.c:1040
+#: add-interactive.c:1044
 msgid "choose all items"
 msgstr "välj alla poster"
 
-#: add-interactive.c:1042
+#: add-interactive.c:1046
 msgid "(empty) finish selecting"
 msgstr "(tomt) avsluta markering"
 
-#: add-interactive.c:1079
+#: add-interactive.c:1083
 msgid "select a numbered item"
 msgstr "markera en numrerad post"
 
-#: add-interactive.c:1083
+#: add-interactive.c:1087
 msgid "(empty) select nothing"
 msgstr "(tomt) markera ingenting"
 
-#: add-interactive.c:1091 builtin/clean.c:816 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:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Vad nu"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "staged"
 msgstr "köad"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "ej köad"
 
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
-#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
-#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
-#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
+#: 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"
 
-#: add-interactive.c:1151
+#: add-interactive.c:1155
 msgid "could not refresh index"
 msgstr "kunde inte uppdatera indexet"
 
-#: add-interactive.c:1165 builtin/clean.c:781 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,?]? "
@@ -270,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,?]? "
@@ -312,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,?]? "
@@ -354,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,?]? "
@@ -396,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,?]? "
@@ -442,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,?]? "
@@ -476,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,?]? "
@@ -524,34 +525,34 @@ 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:342
+#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "kunde inte tolka styckehuvudet \"%.*s\""
 
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "kunde inte tolka färgat styckehuvud \"%.*s\""
 
-#: add-patch.c:419
+#: add-patch.c:420
 msgid "could not parse diff"
 msgstr "kunde inte tolka diff"
 
-#: add-patch.c:438
+#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr "kunde inte tolka färgad diff"
 
-#: add-patch.c:452
+#: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
 msgstr "misslyckades att köra \"%s\""
 
-#: add-patch.c:611
+#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
 msgstr "omaka utdata från interactive.diffFilter"
 
-#: add-patch.c:612
+#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -559,7 +560,7 @@ msgstr ""
 "Alla rader i indata måste ha en motsvarande rad i utdata från\n"
 "ditt filter."
 
-#: add-patch.c:790
+#: add-patch.c:791
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -568,7 +569,7 @@ msgstr ""
 "förväntade sammanhangsrad %d i\n"
 "%.*s"
 
-#: add-patch.c:805
+#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -581,11 +582,11 @@ msgstr ""
 "\tavslutas inte med:\n"
 "%.*s"
 
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"
 
-#: add-patch.c:1085
+#: add-patch.c:1086
 #, c-format
 msgid ""
 "---\n"
@@ -599,7 +600,7 @@ msgstr ""
 "Rader som börjar med %c kommer att tas bort.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -609,11 +610,11 @@ msgstr ""
 "redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"
 "redigeringen och stycket lämnas oförändrat.\n"
 
-#: add-patch.c:1132
+#: add-patch.c:1133
 msgid "could not parse hunk header"
 msgstr "kunde inte tolka styckehuvud"
 
-#: add-patch.c:1177
+#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr "\"git apply --cached\" misslyckades"
 
@@ -629,26 +630,26 @@ 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:1246 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 ""
 "Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
 "[y/n]? "
 
-#: add-patch.c:1289
+#: add-patch.c:1290
 msgid "The selected hunks do not apply to the index!"
 msgstr "Markerade stycken kan inte appliceras på indexet!"
 
-#: add-patch.c:1290 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:1297 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "Ingenting applicerades.\n"
 
-#: add-patch.c:1354
+#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -670,73 +671,73 @@ msgstr ""
 "e - redigera aktuellt stycke manuellt\n"
 "? - visa hjälp\n"
 
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
 msgstr "Inget föregående stycke"
 
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
 msgstr "Inget följande stycke"
 
-#: add-patch.c:1537
+#: add-patch.c:1538
 msgid "No other hunks to goto"
 msgstr "Inga andra stycken att gå till"
 
-#: add-patch.c:1548 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:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "gå till vilket stycke? "
 
-#: add-patch.c:1560
+#: add-patch.c:1561
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Ogiltigt siffervärde: \"%s\""
 
-#: add-patch.c:1565
+#: add-patch.c:1566
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Beklagar, det finns bara %d stycke."
 msgstr[1] "Beklagar, det finns bara %d stycken."
 
-#: add-patch.c:1574
+#: add-patch.c:1575
 msgid "No other hunks to search"
 msgstr "Inga andra stycken att söka efter"
 
-#: add-patch.c:1580 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? "
 
-#: add-patch.c:1595
+#: add-patch.c:1596
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Felaktigt format på reguljärt sökuttryck %s: %s"
 
-#: add-patch.c:1612
+#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
 msgstr "Inga stycken motsvarar givet mönster"
 
-#: add-patch.c:1619
+#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
 msgstr "Beklagar, kan inte dela stycket"
 
-#: add-patch.c:1623
+#: add-patch.c:1624
 #, c-format
 msgid "Split into %d hunks."
 msgstr "Dela i %d stycken."
 
-#: add-patch.c:1627
+#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
 msgstr "Beklagar, kan inte redigera stycket"
 
-#: add-patch.c:1679
+#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr "\"git apply\" misslyckades"
 
-#: advice.c:145
+#: advice.c:78
 #, c-format
 msgid ""
 "\n"
@@ -745,47 +746,47 @@ msgstr ""
 "\n"
 "Slå av meddelandet med \"git config advice.%s false\""
 
-#: advice.c:161
+#: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%stips: %.*s%s\n"
 
-#: advice.c:252
+#: advice.c:178
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 "Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "
 "samman."
 
-#: advice.c:254
+#: advice.c:180
 msgid "Committing is not possible because you have unmerged files."
 msgstr ""
 "Du kan inte utföra en incheckning eftersom du har filer som inte slagits "
 "samman."
 
-#: advice.c:256
+#: advice.c:182
 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
 "Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "
 "samman."
 
-#: advice.c:258
+#: advice.c:184
 msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
 "Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."
 
-#: advice.c:260
+#: advice.c:186
 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
 "Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "
 "samman."
 
-#: advice.c:262
+#: advice.c:188
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr ""
 "Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."
 
-#: advice.c:270
+#: 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."
@@ -793,41 +794,48 @@ msgstr ""
 "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
 "som lämpligt för att ange lösning och checka in."
 
-#: advice.c:278
+#: advice.c:204
 msgid "Exiting because of an unresolved conflict."
 msgstr "Avslutar på grund av olöst konflikgt."
 
-#: advice.c:283 builtin/merge.c:1374
+#: 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)."
 
-#: advice.c:285
+#: advice.c:211
 msgid "Please, commit your changes before merging."
 msgstr "Checka in dina ändringar innan du utför sammanslagningen."
 
-#: advice.c:286
+#: advice.c:212
 msgid "Exiting because of unfinished merge."
 msgstr "Avslutar på grund av ofullbordad sammanslagning."
 
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "Kan inte snabbspola, avbryter."
+
+#: advice.c:227
 #, 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"
+"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 ""
-"Följande sökvägsangivelser motsvarar inte någon kvalificerad sökväg, men "
-"motsvarar\n"
-"indexposter utanför den nuvarande glesa utcheckningen:\n"
+"Följande sökvägar och/eller ökvägsangivelser motsvarar sökvägar\n"
+"utanför din \"sparse-checkout\"-definition, så de kommer inte\n"
+"uppdateras i indexet:\n"
 
-#: advice.c:303
+#: advice.c:234
 msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"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 ""
-"Du måste ta bort eller ändra glesningsreglerna för att uppdatera sådana "
-"poster."
+"Om du har tänkt uppdatera sådana poster, försök något av följande:\n"
+"* Använd flaggan --sparse.\n"
+"* Inaktivera eller ändra reglerna för gles utcheckning."
 
-#: advice.c:310
+#: advice.c:242
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -888,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
@@ -1008,49 +1028,49 @@ msgstr "borttagna filen %s har fortfarande innehåll"
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** varning: filen %s blir tom men har inte tagits bort"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "trasig binärpatch på rad %d: %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "binärpatchen på rad %d känns inte igen"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch med bara skräp på rad %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "kunde inte läsa symboliska länken %s"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "kunde inte öppna eller läsa %s"
 
-#: apply.c:2935
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "felaktig inledning på rad: \"%c\""
 
-#: apply.c:3056
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."
 msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
 
-#: apply.c:3068
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
 
-#: apply.c:3074
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1059,25 +1079,25 @@ msgstr ""
 "vid sökning efter:\n"
 "%.*s"
 
-#: apply.c:3096
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "saknar binära patchdata för \"%s\""
 
-#: apply.c:3104
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s"
 "\""
 
-#: apply.c:3151
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden"
 
-#: apply.c:3162
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -1085,422 +1105,421 @@ msgstr ""
 "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "
 "innehållet."
 
-#: apply.c:3170
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "patchen appliceras på en tom \"%s\", men den är inte tom"
 
-#: apply.c:3188
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas"
 
-#: apply.c:3201
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "binärpatchen kan inte tillämpas på \"%s\""
 
-#: apply.c:3208
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
 
-#: apply.c:3229
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "patch misslyckades: %s:%ld"
 
-#: apply.c:3352
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "kan inte checka ut %s"
 
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 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"
 
-#: apply.c:3412
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
 
-#: apply.c:3441 apply.c:3687
+#: 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:3527 apply.c:3702
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: finns inte i indexet"
 
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: motsvarar inte indexet"
 
-#: apply.c:3571
+#: 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:3574
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Utför trevägssammanslagning...\n"
 
-#: apply.c:3590 apply.c:3594
+#: 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:3606
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "Misslyckades utföra trevägssammanslagning...\n"
 
-#: apply.c:3620
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
 
-#: apply.c:3625
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Tillämpade patchen på  \"%s\" rent.\n"
 
-#: apply.c:3642
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Faller tillbaka på direkt tillämpning...\n"
 
-#: apply.c:3654
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "patch för borttagning lämnar kvar filinnehåll"
 
-#: apply.c:3727
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: fel typ"
 
-#: apply.c:3729
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s har typen %o, förväntade %o"
 
-#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
-#: read-cache.c:1351
+#: 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:3952
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: finns redan i indexet"
 
-#: apply.c:3956
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: finns redan i arbetskatalogen"
 
-#: apply.c:3976
+#: 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:3981
+#: 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:4001
+#: 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:4005
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: patchen kan inte tillämpas"
 
-#: apply.c:4020
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Kontrollerar patchen %s..."
 
-#: apply.c:4112
+#: 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:4119
+#: 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:4122
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
 
-#: apply.c:4131
+#: 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:4141
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "kunde inte skriva temporärt index till %s"
 
-#: apply.c:4279
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "kan inte ta bort %s från indexet"
 
-#: apply.c:4313
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "trasig patch för undermodulen %s"
 
-#: apply.c:4319
+#: 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:4327
+#: 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:4333 apply.c:4478
+#: 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:4376 builtin/bisect--helper.c:523
+#: 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:4380
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "stänger filen \"%s\""
 
-#: apply.c:4450
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "kan inte skriva filen \"%s\" läge %o"
 
-#: apply.c:4548
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Tillämpade patchen %s rent."
 
-#: apply.c:4556
+#: apply.c:4580
 msgid "internal error"
 msgstr "internt fel"
 
-#: apply.c:4559
+#: 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:4570
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "trunkerar .rej-filnamnet till %.*s.rej"
 
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "kan inte öppna %s"
 
-#: apply.c:4592
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Stycke %d tillämpades rent."
 
-#: apply.c:4596
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Refuserar stycke %d."
 
-#: apply.c:4725
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Ignorerar patch \"%s\"."
 
-#: apply.c:4733
-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:4753
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "kan inte läsa indexfilen"
 
-#: apply.c:4910
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "kan inte öppna patchen \"%s\": %s"
 
-#: apply.c:4937
+#: 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:4943 apply.c:4958
+#: 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:4951
+#: 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:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
+#: 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:4995
+#: 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:4998
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "tillämpa ändringar som motsvarar given sökväg"
 
-#: apply.c:5000 builtin/am.c:2317
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "antal"
 
-#: apply.c:5001
+#: 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:5004
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "ignorera tillägg gjorda av patchen"
 
-#: apply.c:5006
+#: 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:5010
+#: apply.c:5036
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "visa antal tillagda och borttagna rader decimalt"
 
-#: apply.c:5012
+#: 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:5014
+#: 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:5016
+#: 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:5018
+#: 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:5020
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "tillämpa en patch utan att röra arbetskatalogen"
 
-#: apply.c:5022
+#: 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:5025
+#: 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:5027
+#: 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:5029
+#: 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:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: 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:5034
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr "se till att åtminstone <n> rader sammanhang är lika"
 
-#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296
+#: 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:3831
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
 msgid "action"
 msgstr "åtgärd"
 
-#: apply.c:5036
+#: 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:5039 apply.c:5042
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorera ändringar i blanktecken för sammanhang"
 
-#: apply.c:5045
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "tillämpa patchen baklänges"
 
-#: apply.c:5047
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "förvänta inte minst en rad sammanhang"
 
-#: apply.c:5049
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
 
-#: apply.c:5051
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "tillåt överlappande stycken"
 
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
-#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "var pratsam"
-
-#: apply.c:5054
+#: 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:5057
+#: apply.c:5083
 msgid "do not trust the line counts in the hunk headers"
 msgstr "lite inte på antalet linjer i styckehuvuden"
 
-#: apply.c:5059 builtin/am.c:2305
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "rot"
 
-#: apply.c:5060
+#: 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"
@@ -1511,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"
@@ -1535,7 +1554,7 @@ msgstr "sökvägen är inte giltig UTF-8: %s"
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s"
 
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
 msgstr "fel i deflate (%d)"
@@ -1564,156 +1583,152 @@ 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:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
-#: builtin/merge.c:1143
+#: 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:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
+#: 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"
 
-#: archive.c:451
+#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "ingen sådan referens: %.*s"
 
-#: archive.c:457
+#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "objektnamnet är inte giltigt: %s"
 
-#: archive.c:470
+#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "inte ett trädobjekt: %s"
 
-#: archive.c:482
+#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "aktuell arbetskatalog är inte spårad"
 
-#: archive.c:523
+#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Hittar inte filen: %s"
 
-#: archive.c:525
+#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "Inte en vanlig fil: %s"
 
-#: archive.c:552
+#: archive.c:551
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:552
+#: archive.c:551
 msgid "archive format"
 msgstr "arkivformat"
 
-#: archive.c:553 builtin/log.c:1772
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "prefix"
 
-#: archive.c:554
+#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
 msgstr "lägg till prefix till varje sökväg i arkivet"
 
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: 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: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"
 
-#: archive.c:556
+#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "ta med ospårade filer i arkivet"
 
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
 msgid "write the archive to this file"
 msgstr "skriv arkivet till filen"
 
-#: archive.c:561
+#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "läs .gitattributes i arbetskatalogen"
 
-#: archive.c:562
+#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "rapportera arkiverade filer på standard fel"
 
-#: archive.c:564
+#: archive.c:563
 msgid "set compression level"
 msgstr "välj komprimeringsgrad"
 
-#: archive.c:567
+#: archive.c:566
 msgid "list supported archive formats"
 msgstr "visa understödda arkivformat"
 
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "arkiv"
 
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "hämta arkivet från fjärrarkivet <arkiv>"
 
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
 msgid "command"
 msgstr "kommando"
 
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
 msgid "path to the remote git-upload-archive command"
 msgstr "sökväg till kommandot git-upload-archive på fjärren"
 
-#: archive.c:579
+#: archive.c:578
 msgid "Unexpected option --remote"
 msgstr "Oväntad flagga --remote"
 
-#: archive.c:581
-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:583
+#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Oväntad flagga --output"
 
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "Flaggorna --add-file och --remote kan inte användas samtidigt"
-
-#: archive.c:607
+#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Okänt arkivformat \"%s\""
 
-#: archive.c:616
+#: archive.c:615
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
 
-#: attr.c:202
+#: attr.c:203
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%-*s är inte ett giltigt namn på attribut"
 
-#: attr.c:363
+#: attr.c:364
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s inte tillåtet: %s:%d"
 
-#: attr.c:403
+#: attr.c:404
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1721,22 +1736,22 @@ msgstr ""
 "Negativa mönster ignoreras i git-attribut\n"
 "Använd '\\!' för att inleda med ett utropstecken."
 
-#: bisect.c:489
+#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
 
-#: bisect.c:699
+#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Det finns inte mer att göra \"bisect\" på!\n"
 
-#: bisect.c:766
+#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "Namnet på incheckningen är inte giltigt: %s"
 
-#: bisect.c:791
+#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1745,7 +1760,7 @@ msgstr ""
 "Sammanslagningsbasen %s är trasig.\n"
 "Det betyder att felet har rättats mellan %s och [%s].\n"
 
-#: bisect.c:796
+#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1754,7 +1769,7 @@ msgstr ""
 "Sammanslagningsbasen %s är ny.\n"
 "Egenskapen har ändrats mellan %s och [%s].\n"
 
-#: bisect.c:801
+#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1763,7 +1778,7 @@ msgstr ""
 "Sammanslagningsbasen %s är %s.\n"
 "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
 
-#: bisect.c:809
+#: bisect.c:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1774,7 +1789,7 @@ msgstr ""
 "git bisect kan inte fungera korrekt i detta fall.\n"
 "Kanske du skrev fel %s- och %s-revisioner?\n"
 
-#: bisect.c:822
+#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1786,36 +1801,36 @@ msgstr ""
 "%s.\n"
 "Vi fortsätter ändå."
 
-#: bisect.c:861
+#: bisect.c:859
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisect: en sammanslagningsbas måste testas\n"
 
-#: bisect.c:911
+#: bisect.c:909
 #, c-format
 msgid "a %s revision is needed"
 msgstr "en %s-revision behövs"
 
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
 #, c-format
 msgid "could not create file '%s'"
 msgstr "kunde inte skapa filen \"%s\""
 
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "kunde inte läsa filen \"%s\""
 
-#: bisect.c:1027
+#: bisect.c:1025
 msgid "reading bisect refs failed"
 msgstr "misslyckades läsa bisect-referenser"
 
-#: bisect.c:1057
+#: bisect.c:1055
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s var både %s och %s\n"
 
-#: bisect.c:1066
+#: bisect.c:1064
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1824,7 +1839,7 @@ msgstr ""
 "Ingen testbar incheckning hittades.\n"
 "Kanske du startade med felaktiga sökvägsargument?\n"
 
-#: bisect.c:1095
+#: bisect.c:1093
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1834,7 +1849,7 @@ msgstr[1] "(ungefär %d steg)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1101
+#: bisect.c:1099
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1855,11 +1870,12 @@ msgstr ""
 "--reverse och --first-parent tillsammans kräver att du anger senaste "
 "incheckningen"
 
-#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
-#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
-#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
-#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
+#: 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 "misslyckades skapa revisionstraversering"
 
@@ -1880,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"
@@ -1998,153 +2002,154 @@ 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"
 
-#: bundle.c:41
+#: bundle.c:44
 #, c-format
 msgid "unrecognized bundle hash algorithm: %s"
-msgstr "okänd hashningsalgoritm för paket (bundle): \"%s\""
+msgstr "okänd hashningsalgoritm för bunt: \"%s\""
 
-#: bundle.c:45
+#: bundle.c:48
 #, c-format
 msgid "unknown capability '%s'"
 msgstr "okänd kapabilitet \"%s\""
 
-#: bundle.c:71
+#: bundle.c:74
 #, c-format
 msgid "'%s' does not look like a v2 or v3 bundle file"
-msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)"
+msgstr "'%s' ser inte ut som en v2- eller v3-bunt-fil"
 
-#: bundle.c:110
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "okänt huvud: %s%s (%d)"
 
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: 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'"
 msgstr "kunde inte öppna \"%s\""
 
-#: bundle.c:189
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
 
-#: bundle.c:192
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
-msgstr "behöver ett arkiv för att verifiera ett paket (bundle)."
+msgstr "behöver ett arkiv för att bekräfta en bunt."
 
-#: bundle.c:243
+#: bundle.c:257
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "Paketet (bundlen) innehåller denna referens:"
-msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"
+msgstr[0] "Bunten innehåller denna referens:"
+msgstr[1] "Bunten innehåller dessa %d referenser:"
 
-#: bundle.c:250
+#: bundle.c:264
 msgid "The bundle records a complete history."
-msgstr "Paketet (bundlen) beskriver en komplett historik."
+msgstr "Bunten beskriver en komplett historik."
 
-#: bundle.c:252
+#: bundle.c:266
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "Paketet (bundlen) kräver denna referens:"
-msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"
+msgstr[0] "Bunten kräver denna referens:"
+msgstr[1] "Bunten kräver dessa %d referenser:"
 
-#: bundle.c:319
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
-msgstr "kan inte duplicera pakethandtag"
+msgstr "kan inte duplicera bunthandtag"
 
-#: bundle.c:326
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "Kunde inte starta pack-objects"
 
-#: bundle.c:337
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "pack-objects misslyckades"
 
-#: bundle.c:386
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
 
-#: bundle.c:490
+#: bundle.c:504
 #, c-format
 msgid "unsupported bundle version %d"
-msgstr "version %d för paket (bundle) stöds ej"
+msgstr "version %d för bunt stöds ej"
 
-#: bundle.c:492
+#: bundle.c:506
 #, c-format
 msgid "cannot write bundle version %d with algorithm %s"
-msgstr "kan inte skriva paket (bundle) med version %d med algoritmen %s"
+msgstr "kan inte skriva bunt med version %d med algoritmen %s"
 
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
+#: 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"
 
-#: bundle.c:539
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
-msgstr "Vägrar skapa ett tomt paket (bundle)."
+msgstr "Vägrar skapa en tom bunt."
 
-#: bundle.c:549
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "kan inte skapa \"%s\""
 
-#: bundle.c:574
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "index-pack dog"
 
-#: chunk-format.c:113
+#: chunk-format.c:117
 msgid "terminating chunk id appears earlier than expected"
 msgstr "avslutande stycke-id förekommer tidigare än förväntat"
 
-#: chunk-format.c:122
+#: chunk-format.c:126
 #, c-format
 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
 msgstr "felaktigt stycke-offset %<PRIx64> och %<PRIx64>"
 
-#: chunk-format.c:129
+#: chunk-format.c:133
 #, c-format
 msgid "duplicate chunk ID %<PRIx32> found"
 msgstr "dubblerat stycke-ID %<PRIx32> upptäckt"
 
-#: chunk-format.c:143
+#: chunk-format.c:147
 #, c-format
 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"
 
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
 msgid "invalid hash version"
 msgstr "felaktig hashnings-version"
 
@@ -2189,189 +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:745 commit-graph.c:782
+#: 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:766
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "kunde inte hitta incheckningen %s"
 
-#: commit-graph.c:799
+#: 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:1075 builtin/am.c:1340
+#: 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:1337 builtin/pack-objects.c:2897
+#: 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:1368
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "Läser in kända incheckningar i incheckningsgraf"
 
-#: commit-graph.c:1385
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
 
-#: commit-graph.c:1405
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr "Rensar incheckningsmärken i incheckningsgraf"
 
-#: commit-graph.c:1424
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "Beräknar topografiska nivåer för incheckningsgraf"
 
-#: commit-graph.c:1477
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr "Beräknar generationsvärden för incheckningsgraf"
 
-#: commit-graph.c:1558
+#: 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:1635
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "Samlar refererade incheckningar"
 
-#: commit-graph.c:1660
+#: 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:1673
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "fel vid tillägg av paketet %s"
 
-#: commit-graph.c:1677
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "fel vid öppning av indexet för %s"
 
-#: commit-graph.c:1714
+#: 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:1732
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr "Söker ytterligare kanter i incheckingsgraf"
 
-#: commit-graph.c:1781
+#: 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:1812 midx.c:906
+#: 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:1825
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "kan inte skapa temporärt graflager"
 
-#: commit-graph.c:1830
+#: 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:1887
+#: 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:1923
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
 
-#: commit-graph.c:1939
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
 
-#: commit-graph.c:1959
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr "kunde inte byta namn på temporär incheckningsgraffil"
 
-#: commit-graph.c:2092
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "Söker sammanslagna incheckningar"
 
-#: commit-graph.c:2136
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "Slår ihop incheckningsgraf"
 
-#: commit-graph.c:2244
+#: 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:2351
+#: 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:2450
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
-"filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig"
+"filen med incheckningsgraf har felaktig kontrollsumma och är troligtvis "
+"trasig"
 
-#: commit-graph.c:2460
+#: 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:2470 commit-graph.c:2485
+#: 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:2477
+#: 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:2495
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "Bekräftar incheckningar i incheckningsgrafen"
 
-#: commit-graph.c:2510
+#: 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:2517
+#: 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:2527
+#: 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:2536
+#: 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:2550
+#: 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:2555
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2379,7 +2385,7 @@ msgstr ""
 "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
 "noll på annan plats"
 
-#: commit-graph.c:2559
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2387,32 +2393,32 @@ msgstr ""
 "incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
 "%s, men noll på annan plats"
 
-#: commit-graph.c:2576
+#: 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:2582
+#: 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:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
-#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 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"
 
-#: commit.c:54
+#: commit.c:55
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s är inte en incheckning!"
 
-#: commit.c:194
+#: commit.c:196
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -2432,29 +2438,29 @@ msgstr ""
 "Slå av detta meddelande genom att skriva\n"
 "\"git config advice.graftFileDeprecated false\""
 
-#: commit.c:1237
+#: 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:1241
+#: 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:1244
+#: 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:1247
+#: 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:1501
+#: 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"
@@ -2468,7 +2474,7 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "minnet slut"
 
-#: config.c:126
+#: config.c:125
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -2483,35 +2489,35 @@ msgstr ""
 "\t%s\n"
 "Det kan bero på cirkulära inkluderingar."
 
-#: config.c:142
+#: config.c:141
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "kunde inte expandera inkluderingssökväg \"%s\""
 
-#: config.c:153
+#: config.c:152
 msgid "relative config includes must come from files"
 msgstr "relativa konfigureringsinkluderingar måste komma från filer"
 
-#: config.c:199
+#: config.c:201
 msgid "relative config include conditionals must come from files"
 msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
 
-#: config.c:396
+#: config.c:398
 #, c-format
 msgid "invalid config format: %s"
 msgstr "felaktigt konfigurationsformat: %s"
 
-#: config.c:400
+#: config.c:402
 #, c-format
 msgid "missing environment variable name for configuration '%.*s'"
 msgstr "miljövariabelnamn saknas för konfigurationen \"%.*s\""
 
-#: config.c:405
+#: config.c:407
 #, c-format
 msgid "missing environment variable '%s' for configuration '%.*s'"
 msgstr "miljövariabeln \"%s\" saknas för konfigurationen \"%.*s\""
 
-#: config.c:442
+#: config.c:443
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "nyckeln innehåller inte ett stycke: %s"
@@ -2521,302 +2527,303 @@ 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:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "felaktig nyckel: %s"
 
-#: config.c:478
+#: config.c:475
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "ogiltig nyckel (nyradstecken): %s"
 
-#: config.c:511
+#: config.c:495
 msgid "empty config key"
 msgstr "tom konfigurationsnyckel"
 
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "falsk konfigureringsparameter: %s"
 
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
 #, c-format
 msgid "bogus format in %s"
 msgstr "felaktigt format i %s"
 
-#: config.c:622
+#: config.c:606
 #, c-format
 msgid "bogus count in %s"
 msgstr "felaktigt antal i %s"
 
-#: config.c:626
+#: config.c:610
 #, c-format
 msgid "too many entries in %s"
 msgstr "för många poster i %s"
 
-#: config.c:636
+#: config.c:620
 #, c-format
 msgid "missing config key %s"
 msgstr "konfigurationsnyckel saknas för %s"
 
-#: config.c:644
+#: config.c:628
 #, c-format
 msgid "missing config value %s"
 msgstr "konfigurationsvärde saknas för %s"
 
-#: config.c:995
+#: config.c:979
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
 
-#: config.c:999
+#: config.c:983
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "felaktig konfigurationsfil rad %d i filen %s"
 
-#: config.c:1003
+#: config.c:987
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "felaktig konfigurationsfil rad %d i standard in"
 
-#: config.c:1007
+#: config.c:991
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
 
-#: config.c:1011
+#: config.c:995
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
 
-#: config.c:1015
+#: config.c:999
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "felaktig konfigurationsfil rad %d i %s"
 
-#: config.c:1152
+#: config.c:1136
 msgid "out of range"
 msgstr "utanför intervallet"
 
-#: config.c:1152
+#: config.c:1136
 msgid "invalid unit"
 msgstr "ogiltig enhet"
 
-#: config.c:1153
+#: config.c:1137
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
 
-#: config.c:1163
+#: config.c:1147
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr ""
 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
 
-#: config.c:1166
+#: config.c:1150
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
 
-#: config.c:1169
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
 
-#: config.c:1172
+#: config.c:1156
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
 "en %s: %s"
 
-#: config.c:1175
+#: config.c:1159
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
 "%s: %s"
 
-#: config.c:1178
+#: config.c:1162
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
 
-#: config.c:1257
+#: config.c:1241
 #, c-format
 msgid "bad boolean config value '%s' for '%s'"
 msgstr "felaktigt booleskt konfigurationsvärde \"%s\" för \"%s\""
 
-#: config.c:1275
+#: config.c:1259
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "misslyckades expandera användarkatalog i: \"%s\""
 
-#: config.c:1284
+#: config.c:1268
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
 
-#: config.c:1377
+#: config.c:1361
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "förkortningslängd utanför intervallet: %d"
 
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "felaktigt zlib-komprimeringsgrad %d"
 
-#: config.c:1494
+#: config.c:1476
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar kan bara vara ett tecken"
 
-#: config.c:1527
+#: config.c:1509
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "felaktigt läge för skapande av objekt: %s"
 
-#: config.c:1599
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "felformat värde för %s"
 
-#: config.c:1625
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "felformat värde för %s: %s"
 
-#: config.c:1626
+#: 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:1687 builtin/pack-objects.c:3924
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "felaktig paketkomprimeringsgrad %d"
 
-#: config.c:1809
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
 
-#: config.c:1812
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "referensen \"%s\" pekar inte på en blob"
 
-#: config.c:1829
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
 
-#: config.c:1873
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "kunde inte tolka %s"
 
-#: config.c:1929
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr "kan inte tolka kommandoradskonfiguration"
 
-#: config.c:2293
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
 
-#: config.c:2467
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Felaktigt %s: \"%s\""
 
-#: config.c:2512
+#: config.c:2504
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
-msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
+msgstr ""
+"värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100"
 
-#: config.c:2558
+#: 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:2560
+#: 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:2644
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "felaktigt sektionsnamn \"%s\""
 
-#: config.c:2676
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s har flera värden"
 
-#: config.c:2705
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
 
-#: config.c:2957 config.c:3283
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "kunde inte låsa konfigurationsfilen %s"
 
-#: config.c:2968
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "öppnar %s"
 
-#: config.c:3005 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "ogiltigt mönster: %s"
 
-#: config.c:3030
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "ogiltig konfigurationsfil: \"%s\""
 
-#: config.c:3043 config.c:3296
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat misslyckades på %s"
 
-#: config.c:3054
+#: config.c:3047
 #, c-format
-msgid "unable to mmap '%s'"
-msgstr "kunde inte utföra mmap på \"%s\""
+msgid "unable to mmap '%s'%s"
+msgstr "kunde inte utföra mmap på \"%s\"%s"
 
-#: config.c:3063 config.c:3301
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod misslyckades på %s"
 
-#: config.c:3148 config.c:3398
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "kunde inte skriva konfigurationsfilen %s"
 
-#: config.c:3182
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "kunde inte ställa in \"%s\" till \"%s\""
 
-#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: 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:3274
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "felaktigt namn på stycke: %s"
 
-#: config.c:3441
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "värde saknas för \"%s\""
@@ -2851,72 +2858,72 @@ msgstr "servern stöder inte funktionen \"%s\""
 msgid "expected flush after capabilities"
 msgstr "förväntade \"flush\" efter förmågor"
 
-#: connect.c:263
+#: connect.c:265
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "ignorerar förmågor efter första raden \"%s\""
 
-#: connect.c:284
+#: connect.c:286
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "protokollfel: förväntade inte capabilities^{}"
 
-#: connect.c:306
+#: connect.c:308
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "protokollfel: förväntade \"shallow sha-1\" fick \"%s\""
 
-#: connect.c:308
+#: connect.c:310
 msgid "repository on the other end cannot be shallow"
 msgstr "arkivet på andra sidan kan inte vara grunt"
 
-#: connect.c:347
+#: connect.c:349
 msgid "invalid packet"
 msgstr "ogiltigt paket"
 
-#: connect.c:367
+#: connect.c:369
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "protokollfel: förväntade inte \"%s\""
 
-#: connect.c:497
+#: connect.c:499
 #, c-format
 msgid "unknown object format '%s' specified by server"
 msgstr "okänt objektformat \"%s\" angavs av servern"
 
-#: connect.c:526
+#: connect.c:528
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "ogiltigt svar på ls-refs: %s"
 
-#: connect.c:530
+#: connect.c:532
 msgid "expected flush after ref listing"
 msgstr "förväntade \"flush\" efter ref-listan"
 
-#: connect.c:533
+#: connect.c:535
 msgid "expected response end packet after ref listing"
 msgstr "förväntade svarsavslutningspaket efter ref-listan"
 
-#: connect.c:666
+#: connect.c:670
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "protokollet \"%s\" stöds inte"
 
-#: connect.c:717
+#: connect.c:721
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "kunde inte sätta SO_KEEPALIVE på uttaget"
 
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
 #, c-format
 msgid "Looking up %s ... "
 msgstr "Slår upp %s..."
 
-#: connect.c:761
+#: connect.c:765
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "kan inte slå upp %s (port %s) (%s)"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
 #, c-format
 msgid ""
 "done.\n"
@@ -2925,7 +2932,7 @@ msgstr ""
 "klart.\n"
 "Ansluter till %s (port %s)..."
 
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2935,79 +2942,79 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
 msgid "done."
 msgstr "klart."
 
-#: connect.c:824
+#: connect.c:828
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "kunde inte slå upp %s (%s)"
 
-#: connect.c:830
+#: connect.c:834
 #, c-format
 msgid "unknown port %s"
 msgstr "okänd port %s"
 
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "konstigt värdnamn \"%s\" blockerat"
 
-#: connect.c:969
+#: connect.c:973
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "konstig port \"%s\" blockerad"
 
-#: connect.c:979
+#: connect.c:983
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "kan inte starta mellanserver (proxy) %s"
 
-#: connect.c:1050
+#: connect.c:1054
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr "ingen sökväg angavs; se \"git help pull\" för giltig URL-syntax"
 
-#: connect.c:1190
+#: connect.c:1194
 msgid "newline is forbidden in git:// hosts and repo paths"
 msgstr "radbrytningar är förbjudna i git://-värdnamn och arkivsökvägar"
 
-#: connect.c:1247
+#: connect.c:1251
 msgid "ssh variant 'simple' does not support -4"
 msgstr "ssh-varianten \"simple\" stöder inte -4"
 
-#: connect.c:1259
+#: connect.c:1263
 msgid "ssh variant 'simple' does not support -6"
 msgstr "ssh-varianten \"simple\" stöder inte -6"
 
-#: connect.c:1276
+#: connect.c:1280
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "ssh-varianten \"simple\" stöder inte val av port"
 
-#: connect.c:1388
+#: connect.c:1392
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "konstigt sökvägsnamn \"%s\" blockerat"
 
-#: connect.c:1436
+#: connect.c:1440
 msgid "unable to fork"
 msgstr "kunde inte grena (fork)"
 
 # Vague original, not networking-related, but rather related to the actual
 # objects in the database.
-#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "Kontrollerar konnektivitet"
 
-#: connected.c:120
+#: connected.c:122
 msgid "Could not run 'git rev-list'"
 msgstr "Kunde inte köra \"git rev-list\""
 
-#: connected.c:144
+#: connected.c:146
 msgid "failed write to rev-list"
 msgstr "kunde inte skriva till rev-list"
 
-#: connected.c:149
+#: connected.c:151
 msgid "failed to close rev-list's stdin"
 msgstr "kunde inte stänga rev-list:s standard in"
 
@@ -3116,7 +3123,7 @@ msgstr "oväntad filtertyp"
 msgid "path name too long for external filter"
 msgstr "sökvägen för lång för externt filter"
 
-#: convert.c:934
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -3125,16 +3132,16 @@ msgstr ""
 "externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar "
 "inte har filtrerats"
 
-#: convert.c:1234
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false är inte giltig teckenkodning för arbetskatalogen"
 
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: \"clean\"-filtret \"%s\" misslyckades"
 
-#: convert.c:1490
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades"
@@ -3152,17 +3159,17 @@ msgstr "vägrar arbeta med inloggningsuppgifter utan värdfält"
 msgid "refusing to work with credential missing protocol field"
 msgstr "vägrar arbeta med inloggningsuppgifter utan protokollfält"
 
-#: credential.c:394
+#: credential.c:395
 #, c-format
 msgid "url contains a newline in its %s component: %s"
 msgstr "url innehåller radbrytning i komponenten %s: %s"
 
-#: credential.c:438
+#: credential.c:439
 #, c-format
 msgid "url has no scheme: %s"
 msgstr "url saknar protokoll: %s"
 
-#: credential.c:511
+#: credential.c:512
 #, c-format
 msgid "credential url cannot be parsed: %s"
 msgstr "kan inte tolka url för inloggingsuppgifter: %s"
@@ -3259,36 +3266,36 @@ msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)"
 msgid "Marked %d islands, done.\n"
 msgstr "Markerade %d öar, klar.\n"
 
-#: diff-merges.c:80
+#: diff-merges.c:70
 #, c-format
 msgid "unknown value for --diff-merges: %s"
 msgstr "okänt värde för --diff-merges: %s"
 
-#: diff-lib.c:538
+#: diff-lib.c:561
 msgid "--merge-base does not work with ranges"
 msgstr "--merge-base fungerar inte med intervall"
 
-#: diff-lib.c:540
+#: diff-lib.c:563
 msgid "--merge-base only works with commits"
 msgstr "--merge-base fungerar bara med incheckningar"
 
-#: diff-lib.c:557
+#: diff-lib.c:580
 msgid "unable to get HEAD"
 msgstr "kan inte hämta HEAD"
 
-#: diff-lib.c:564
+#: diff-lib.c:587
 msgid "no merge base found"
 msgstr "ingen sammanslagningsbas hittades"
 
-#: diff-lib.c:566
+#: diff-lib.c:589
 msgid "multiple merge bases found"
 msgstr "flera sammanslagningsbaser hittades"
 
-#: diff-no-index.c:238
+#: diff-no-index.c:237
 msgid "git diff --no-index [<options>] <path> <path>"
 msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>"
 
-#: diff-no-index.c:263
+#: diff-no-index.c:262
 msgid ""
 "Not a git repository. Use --no-index to compare two paths outside a working "
 "tree"
@@ -3296,25 +3303,25 @@ 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:156
+#: 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:161
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Okänd dirstat-parameter \"%s\"\n"
 
-#: diff.c:297
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
 msgstr ""
 "färginställningen för flyttade block måste vara en av \"no\", \"default\", "
-"\"blocks\", \"zebra\", \"dimmed_zebra\", \"plain\""
+"\"blocks\", \"zebra\", \"dimmed-zebra\", \"plain\""
 
-#: diff.c:325
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3324,7 +3331,7 @@ msgstr ""
 "\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change"
 "\""
 
-#: diff.c:333
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3332,12 +3339,12 @@ msgstr ""
 "color-moved-ws: allow-indentation-change kan inte kombineras med andra "
 "blankstegslägen"
 
-#: diff.c:410
+#: 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:470
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3346,35 +3353,53 @@ msgstr ""
 "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
 "%s"
 
-#: diff.c:4278
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "extern diff dog, stannar vid %s"
 
-#: diff.c:4630
-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:4633
-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:4712
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr ""
+"flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med "
+"\"%s\""
+
+#: diff.c:4601
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"flaggorna \"%s\" och  \"%s\" kan inte användas samtidigt, använd \"%s\" med "
+"\"%s\" och \"%s\""
+
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow kräver exakt en sökvägsangivelse"
 
-#: diff.c:4760
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "ogiltigt värde för --stat: %s"
 
-#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: 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:4797
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3383,42 +3408,42 @@ msgstr ""
 "Misslyckades tolka argument till flaggan --dirstat/-X;\n"
 "%s"
 
-#: diff.c:4882
+#: 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:4906
+#: 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:4920
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "kunde inte slå upp \"%s\""
 
-#: diff.c:4970 diff.c:4976
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s förväntar formen <n>/<m>"
 
-#: diff.c:4988
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s förväntar ett tecken, fick \"%s\""
 
-#: diff.c:5009
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "felaktigt argument till --color-moved: %s"
 
-#: diff.c:5028
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "ogiltigt läge %s\" i --color-moved-ws"
 
-#: diff.c:5068
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -3426,154 +3451,154 @@ msgstr ""
 "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "
 "\"histogram\""
 
-#: diff.c:5104 diff.c:5124
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "ogiltigt argument för %s"
 
-#: diff.c:5228
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\""
 
-#: diff.c:5277
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""
 
-#: diff.c:5333
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "felaktigt argument --word-diff: %s"
 
-#: diff.c:5369
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "Formatflaggor för diff-utdata"
 
-#: diff.c:5371 diff.c:5377
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "skapar patch"
 
-#: diff.c:5374 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "undertryck diff-utdata"
 
-#: diff.c:5379 diff.c:5493 diff.c:5500
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5380 diff.c:5383
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "skapa diffar med <n> rader sammanhang"
 
-#: diff.c:5385
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "generera diff i råformat"
 
-#: diff.c:5388
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "synonym till \"-p --raw\""
 
-#: diff.c:5392
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "synonym till \"-p --stat\""
 
-#: diff.c:5396
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "maskinläsbar --stat"
 
-#: diff.c:5399
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "skriv bara ut den sista raden för --stat"
 
-#: diff.c:5401 diff.c:5409
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5402
+#: 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:5406
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "synonym för --dirstat=cumulative"
 
-#: diff.c:5410
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "synonym för --dirstat=filer,param1,param2..."
 
-#: diff.c:5414
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"
 
-#: diff.c:5417
+#: 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:5420
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "visa endast namnen på ändrade filer"
 
-#: diff.c:5423
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "visa endast namn och status för ändrade filer"
 
-#: diff.c:5425
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<bredd>[,<namn-bredd>[,<antal>]]"
 
-#: diff.c:5426
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "skapa diffstat"
 
-#: diff.c:5428 diff.c:5431 diff.c:5434
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<bredd>"
 
-#: diff.c:5429
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "generera en diffstat med given bredd"
 
-#: diff.c:5432
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "generera en diffstat med given namnbredd"
 
-#: diff.c:5435
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "generera en diffstat med given grafbredd"
 
-#: diff.c:5437
+#: diff.c:5406
 msgid "<count>"
 msgstr "<antal>"
 
-#: diff.c:5438
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "generera diffstat med begränsade rader"
 
-#: diff.c:5441
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "skapa kompakt översikt i diffstat"
 
-#: diff.c:5444
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "skapa en binärdiff som kan appliceras"
 
-#: diff.c:5447
+#: 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:5449
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "visa färgad diff"
 
-#: diff.c:5450
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<typ>"
 
-#: diff.c:5451
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -3581,7 +3606,7 @@ msgstr ""
 "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "
 "\"new\" (nya) rader i diffen"
 
-#: diff.c:5454
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3589,87 +3614,87 @@ msgstr ""
 "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "
 "eller --numstat"
 
-#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<prefix>"
 
-#: diff.c:5458
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "visa givet källprefix istället för \"a/\""
 
-#: diff.c:5461
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "visa givet målprefix istället för \"b/\""
 
-#: diff.c:5464
+#: 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:5467
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "visa inte käll- eller målprefix"
 
-#: diff.c:5470
+#: 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:5474 diff.c:5479 diff.c:5484
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<tecken>"
 
-#: diff.c:5475
+#: 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:5480
+#: 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:5485
+#: 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:5488
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "Diff-namnbytesflaggor"
 
-#: diff.c:5489
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5490
+#: 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:5494
+#: diff.c:5463
 msgid "detect renames"
 msgstr "detektera namnändringar"
 
-#: diff.c:5498
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "ta bort för-version för borttagningar"
 
-#: diff.c:5501
+#: diff.c:5470
 msgid "detect copies"
 msgstr "detektera kopior"
 
-#: diff.c:5505
+#: 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:5507
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "inaktivera detektering av namnbyten"
 
-#: diff.c:5510
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "använd tomma blob:ar som namnändringskälla"
 
-#: diff.c:5512
+#: 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:5515
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -3677,163 +3702,163 @@ msgstr ""
 "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "
 "given gräns"
 
-#: diff.c:5517
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Alternativ för diff-algoritm"
 
-#: diff.c:5519
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "skapa minsta möjliga diff"
 
-#: diff.c:5522
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "ignorera blanktecken vid radjämförelse"
 
-#: diff.c:5525
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"
 
-#: diff.c:5528
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignorera blanktecken vid radslut"
 
-#: diff.c:5531
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "ignorera CR-tecken vid radslut"
 
-#: diff.c:5534
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "ignorera ändringar i rader som är helt blanka"
 
-#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<reguttr>"
 
-#: diff.c:5537
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>"
 
-#: diff.c:5540
+#: 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:5543
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "skapa diffar med algoritmen \"patience diff\""
 
-#: diff.c:5547
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "skapa diffar med algoritmen \"histogram diff\""
 
-#: diff.c:5549
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<algoritm>"
 
-#: diff.c:5550
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "välj en diff-algoritm"
 
-#: diff.c:5552
+#: diff.c:5521
 msgid "<text>"
 msgstr "<text>"
 
-#: diff.c:5553
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "skapa diffar med algoritmen \"anchored diff\""
 
-#: diff.c:5555 diff.c:5564 diff.c:5567
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<läge>"
 
-#: diff.c:5556
+#: 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:5559
+#: 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:5562
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"
 
-#: diff.c:5565
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "flyttade kodrader färgas på annat sätt"
 
-#: diff.c:5568
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr "hur blanktecken ignoreras i --color-moved"
 
-#: diff.c:5571
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Andra diff-flaggor"
 
-#: diff.c:5573
+#: 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:5577
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "hantera alla filer som text"
 
-#: diff.c:5579
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "växla två indatafiler, vänd diffen"
 
-#: diff.c:5581
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "avsluta med 1 vid ändringar, annars 0"
 
-#: diff.c:5583
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "slå av alla utdata från programmet"
 
-#: diff.c:5585
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "tillåt köra en extern diff-hjälpare"
 
-#: diff.c:5587
+#: 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:5589
+#: diff.c:5558
 msgid "<when>"
 msgstr "<när>"
 
-#: diff.c:5590
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr "ignorera ändringar i undermoduler när diffen skapas"
 
-#: diff.c:5593
+#: diff.c:5562
 msgid "<format>"
 msgstr "<format>"
 
-#: diff.c:5594
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "ange hur ändringar i undermoduler visas"
 
-#: diff.c:5598
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "dölj \"git add -N\"-poster från indexet"
 
-#: diff.c:5601
+#: 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:5603
+#: diff.c:5572
 msgid "<string>"
 msgstr "<sträng>"
 
-#: diff.c:5604
+#: 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:5607
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3841,66 +3866,66 @@ msgstr ""
 "se efter ändringar som ändrar antalet förekomster av angivet reguljärt "
 "uttryck"
 
-#: diff.c:5610
+#: 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:5613
+#: 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:5616
+#: 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:5617 diff.c:5620
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<sökväg>"
 
-#: diff.c:5618
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "visa ändringen i angiven sökväg först"
 
-#: diff.c:5621
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "hoppa över utdata fram till angiven sökväg"
 
-#: diff.c:5623
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<objekt-id>"
 
-#: diff.c:5624
+#: 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:5626
+#: 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:5627
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "välj filter efter diff-typ"
 
-#: diff.c:5629
+#: diff.c:5598
 msgid "<file>"
 msgstr "<fil>"
 
-#: diff.c:5630
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "Skriv utdata till en specifik fil"
 
-#: diff.c:6287
-msgid "inexact rename detection was skipped due to too many files."
+#: diff.c:6257
+msgid "exhaustive rename detection was skipped due to too many files."
 msgstr ""
-"onöjaktig namnbytesdetektering utfördes inte på grund av för många filer."
+"uttömmande namnbytesdetektering hoppades över på grund av för många filer."
 
-#: diff.c:6290
+#: 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:6293
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3912,7 +3937,7 @@ msgstr ""
 msgid "failed to read orderfile '%s'"
 msgstr "kunde inte läsa orderfilen \"%s\""
 
-#: diffcore-rename.c:1418
+#: diffcore-rename.c:1564
 msgid "Performing inexact rename detection"
 msgstr "Utför onöjaktig namnbytesdetektering"
 
@@ -3921,61 +3946,69 @@ msgstr "Utför onöjaktig namnbytesdetektering"
 msgid "No such path '%s' in the diff"
 msgstr "Sökvägen \"%s\" finns inte i diffen"
 
-#: dir.c:578
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer"
 
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr "okänt mönster: %s"
 
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "okänt negativt mönster: %s"
 
-#: dir.c:809
+#: dir.c:820
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr ""
 "din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera "
 "gånger"
 
-#: dir.c:819
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "inaktiverar konmönstermatchning"
 
-#: dir.c:1206
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "kan inte använda %s som exkluderingsfil"
 
-#: dir.c:2314
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "kunde inte öppna katalogen \"%s\""
 
-#: dir.c:2614
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr "misslyckades hämta kärnans namn och information"
 
-#: dir.c:2738
+#: 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:3543
+#: dir.c:3112
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Kunde inte gissa katalognamn.\n"
+"Ange en katalog på kommandoraden"
+
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "indexfilen trasig i arkivet %s"
 
-#: dir.c:3590 dir.c:3595
+#: 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:3624
+#: 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\""
@@ -3994,294 +4027,360 @@ msgstr "Filtrerar innehåll"
 msgid "could not stat file '%s'"
 msgstr "kunde inte ta status på filen \"%s\""
 
-#: environment.c:152
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "felaktig git-namnrymdssökväg \"%s\""
 
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "kunde inte ställa in GIT_DIR till \"%s\""
-
 #: exec-cmd.c:363
 #, c-format
 msgid "too many args to run %s"
 msgstr "för många flaggor för att köra %s"
 
-#: fetch-pack.c:182
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: förväntade grund lista"
 
-#: fetch-pack.c:185
+#: 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:196
+#: 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:216
+#: 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:227
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "kunde inte skriva till fjärren"
 
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc kräver \"multi_ack_detailed\""
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ogiltig \"shallow\"-rad: %s"
 
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ogiltig \"unshallow\"-rad: %s"
 
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "objektet hittades inte: %s"
 
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "fel i objekt: %s"
 
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "ingen \"shallow\" hittades: %s"
 
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: 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:439
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "fick %s %d %s"
 
-#: fetch-pack.c:456
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "ogiltig incheckning %s"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "ger upp"
 
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "klart"
 
-#: fetch-pack.c:512
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "fick %s (%d) %s"
 
-#: fetch-pack.c:548
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Markerar %s som komplett"
 
-#: fetch-pack.c:763
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "har redan %s (%s)"
 
-#: fetch-pack.c:849
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "protokollfel: felaktigt packhuvud"
 
-#: fetch-pack.c:951
+#: 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:957
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-patch: ogiltig utdata från index-pack"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "%s misslyckades"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "fel i sidbands-avmultiplexare"
 
-#: fetch-pack.c:1019
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Serverversionen är %.*s"
 
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
+#: 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:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: 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:1029
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "Servern stöder inte klienter med grunda arkiv"
 
-#: fetch-pack.c:1089
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "Servern stöder inte --shallow-since"
 
-#: fetch-pack.c:1094
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "Servern stöder inte --shallow-exclude"
 
-#: fetch-pack.c:1098
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "Servern stöder inte --deepen"
 
-#: fetch-pack.c:1100
+#: 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:1113
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "inga gemensamma incheckningar"
 
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: 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:1128 fetch-pack.c:1651
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-patch: hämtning misslyckades."
+msgstr "git fetch-pack: hämtning misslyckades."
 
-#: fetch-pack.c:1242
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "omaka algoritmer: klient %s; server %s"
 
-#: fetch-pack.c:1246
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "servern stöder inte algoritmen \"%s\""
 
-#: fetch-pack.c:1279
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "Servern stöder inte grunda förfrågningar"
 
-#: fetch-pack.c:1286
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "Servern stöder filter"
 
-#: fetch-pack.c:1329 fetch-pack.c:2034
+#: 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:1347
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "fel vid läsning av styckehuvudet \"%s\""
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "förväntade \"%s\", tog emot \"%s\""
 
-#: fetch-pack.c:1387
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "oväntad bekräftelserad: \"%s\""
 
-#: fetch-pack.c:1392
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "fel vid hantering av bekräftelser: %d"
 
-#: fetch-pack.c:1402
+#: 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:1404
+#: 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:1445
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "fel vid hantering av grund (\"shallow\") info: %d"
 
-#: fetch-pack.c:1494
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "förväntade wanted-ref, fick %s"
 
-#: fetch-pack.c:1499
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "oväntad wanted-ref: \"%s\""
 
-#: fetch-pack.c:1504
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "fel vid hantering av önskade referenser: %d"
 
-#: fetch-pack.c:1534
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack: förväntade svarsavslutningspaket"
 
-#: fetch-pack.c:1930
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "inget motsvarande fjärrhuvud"
 
-#: fetch-pack.c:1953 builtin/clone.c:697
+#: 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:2056
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "oväntat \"ready\" från fjärr"
 
-#: fetch-pack.c:2079
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "ingen sådan fjärreferens: %s"
 
-#: fetch-pack.c:2082
+#: 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:273
+#: 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:276
+#: 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:470
+#: gpg-interface.c:451
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile måste ställas in och finnas för att bekräfta ssh-"
+"signaturer"
+
+#: gpg-interface.c:480
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+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: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:624
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "felaktig/inkompatibel signatur \"%s\""
+
+#: 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: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: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:857
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand misslyckades: %s %s"
+
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr "gpg misslyckades signera data"
 
+#: 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:978
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "misslyckades skriva ssh-signeringsnyckel till \"%s\""
+
+#: 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:1014
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"\"ssh-keygen -Y sign\" behövs för ssh-signering (tillgängligt i openssh "
+"version 8.2p1+)"
+
+#: gpg-interface.c:1026
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "misslyckades läsa ssh-signeringsdatabuffert från \"%s\""
+
 #: graph.c:98
 #, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "ignorerade felaktig färg \"%.*s\" i log.graphColors"
 
 #: grep.c:531
 msgid ""
@@ -4291,109 +4390,109 @@ msgstr ""
 "angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"
 "P under PCRE v2"
 
-#: grep.c:1893
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "\"%s\" kunde inte läsa %s"
 
-#: grep.c:1910 setup.c:176 builtin/clone.c:416 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:1921
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "\"%s\": kort läsning"
 
-#: help.c:23
+#: help.c:24
 msgid "start a working area (see also: git help tutorial)"
 msgstr "starta arbetskatalog (se också: git help tutorial)"
 
-#: help.c:24
+#: help.c:25
 msgid "work on the current change (see also: git help everyday)"
 msgstr "jobba med aktuell förändring (se också: git help everyday)"
 
-#: help.c:25
+#: help.c:26
 msgid "examine the history and state (see also: git help revisions)"
 msgstr "utforska historiken och tillståndet (se också: git help revisions)"
 
-#: help.c:26
+#: help.c:27
 msgid "grow, mark and tweak your common history"
 msgstr "utöka, markera och justera din gemensamma historik"
 
-#: help.c:27
+#: help.c:28
 msgid "collaborate (see also: git help workflows)"
 msgstr "samarbeta (se också: git help workflows)"
 
-#: help.c:31
+#: help.c:32
 msgid "Main Porcelain Commands"
 msgstr "Huvudsakliga porslinskommandon"
 
-#: help.c:32
+#: help.c:33
 msgid "Ancillary Commands / Manipulators"
 msgstr "Tilläggskommandon / manipulerare"
 
-#: help.c:33
+#: help.c:34
 msgid "Ancillary Commands / Interrogators"
 msgstr "Tilläggskommandon / frågare"
 
-#: help.c:34
+#: help.c:35
 msgid "Interacting with Others"
 msgstr "Interaktion med andra"
 
-#: help.c:35
+#: help.c:36
 msgid "Low-level Commands / Manipulators"
 msgstr "Lågnivåkommandon / maniupulerare"
 
-#: help.c:36
+#: help.c:37
 msgid "Low-level Commands / Interrogators"
 msgstr "Lågnivåkommandon / frågare"
 
-#: help.c:37
+#: help.c:38
 msgid "Low-level Commands / Syncing Repositories"
 msgstr "Lågnivåkommandon / synka arkiv"
 
-#: help.c:38
+#: help.c:39
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Lågnivåkommandon / interna hjälpare"
 
-#: help.c:300
+#: help.c:313
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "git-kommandon tillgängliga i \"%s\""
 
-#: help.c:307
+#: help.c:320
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "git-kommandon från andra platser i din $PATH"
 
-#: help.c:316
+#: help.c:329
 msgid "These are common Git commands used in various situations:"
 msgstr "Dessa vanliga Git-kommandon används i olika situationer:"
 
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "okänd kommandolisttyp \"%s\""
 
-#: help.c:405
+#: help.c:418
 msgid "The Git concept guides are:"
 msgstr "Vägledningar för Git-koncept:"
 
-#: help.c:429
+#: help.c:442
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando"
 
-#: help.c:434
+#: help.c:447
 msgid "External commands"
 msgstr "Externa kommandon"
 
-#: help.c:449
+#: help.c:462
 msgid "Command aliases"
 msgstr "Kommadoalias"
 
-#: help.c:527
+#: help.c:543
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -4402,32 +4501,37 @@ msgstr ""
 "\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
 "köra det. Kanske git-%s är trasigt?"
 
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."
 
-#: help.c:591
+#: help.c:613
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
 
-#: help.c:613
+#: help.c:635
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns."
 
-#: help.c:618
+#: help.c:640
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "Fortsätter under förutsättningen att du menade \"%s\"."
 
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Köra \"%s\" istället (j/N)?"
+
+#: help.c:654
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr ""
 "Fortsätter om %0.1f sekunder, under förutsättningen att du menade \"%s\"."
 
-#: help.c:635
+#: help.c:666
 msgid ""
 "\n"
 "The most similar command is"
@@ -4441,16 +4545,16 @@ msgstr[1] ""
 "\n"
 "Mest lika kommandon är"
 
-#: help.c:675
+#: help.c:706
 msgid "git version [<options>]"
 msgstr "git version [<flaggor>]"
 
-#: help.c:730
+#: help.c:761
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:734
+#: help.c:765
 msgid ""
 "\n"
 "Did you mean this?"
@@ -4464,6 +4568,15 @@ msgstr[1] ""
 "\n"
 "Menade du ett av dessa?"
 
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"
+"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."
+
 #: ident.c:353
 msgid "Author identity unknown\n"
 msgstr "Författar-identitet okänd\n"
@@ -4526,7 +4639,7 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet"
 msgid "name consists only of disallowed characters: %s"
 msgstr "namnet består enbart av ej tillåtna tecken: %s"
 
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
 #, c-format
 msgid "invalid date format: %s"
 msgstr "felaktigt datumformat: %s"
@@ -4541,7 +4654,7 @@ msgstr "sparse:sökväg-filter stöds inte längre"
 
 #: list-objects-filter-options.c:105
 #, c-format
-msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
 msgstr "\"%s\" för \"object:type=<typ>\" är inte en giltig objekttyp"
 
 #: list-objects-filter-options.c:124
@@ -4586,7 +4699,7 @@ msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd"
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob"
 
-#: list-objects.c:395
+#: list-objects.c:398
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "kunde inte läsa in rot-trädet för incheckningen %s"
@@ -4621,7 +4734,12 @@ msgstr "Kunde inte skapa \"%s.lock\": %s"
 msgid "invalid value '%s' for lsrefs.unborn"
 msgstr "ogiltigt värde \"%s\" för lsrefs.unborn"
 
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "oväntad rad: \"%s\""
+
+#: ls-refs.c:178
 msgid "expected flush after ls-refs arguments"
 msgstr "förväntade \"flush\" efter ls-refs-argument"
 
@@ -4629,39 +4747,39 @@ msgstr "förväntade \"flush\" efter ls-refs-argument"
 msgid "quoted CRLF detected"
 msgstr "citerad CRLF upptäcktes"
 
-#: mailinfo.c:1254 builtin/am.c:176 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\""
 
-#: merge-ort.c:1116 merge-recursive.c:1205
+#: merge-ort.c:1584 merge-recursive.c:1211
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
 
-#: merge-ort.c:1125 merge-recursive.c:1212
+#: merge-ort.c:1593 merge-recursive.c:1218
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
 
-#: merge-ort.c:1134 merge-recursive.c:1219
+#: merge-ort.c:1602 merge-recursive.c:1225
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 "Misslyckades slå ihop undermodulen %s (incheckningar följer inte "
 "sammanslagningsbasen)"
 
-#: merge-ort.c:1144 merge-ort.c:1151
+#: merge-ort.c:1612 merge-ort.c:1620
 #, c-format
 msgid "Note: Fast-forwarding submodule %s to %s"
 msgstr "Obs: Snabbspolar undermodulen %s till %s"
 
-#: merge-ort.c:1172
+#: merge-ort.c:1642
 #, c-format
 msgid "Failed to merge submodule %s"
 msgstr "Misslyckades slå ihop undermodulen %s"
 
-#: merge-ort.c:1179
+#: merge-ort.c:1649
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4670,7 +4788,7 @@ msgstr ""
 "Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n"
 "%s\n"
 
-#: merge-ort.c:1183 merge-recursive.c:1273
+#: merge-ort.c:1653 merge-recursive.c:1281
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -4687,7 +4805,7 @@ msgstr ""
 "\n"
 "vilket godtar lösningen.\n"
 
-#: merge-ort.c:1196
+#: merge-ort.c:1666
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4697,21 +4815,21 @@ msgstr ""
 "finns:\n"
 "%s"
 
-#: merge-ort.c:1415 merge-recursive.c:1362
+#: merge-ort.c:1887 merge-recursive.c:1372
 msgid "Failed to execute internal merge"
 msgstr "Misslyckades exekvera intern sammanslagning"
 
-#: merge-ort.c:1420 merge-recursive.c:1367
+#: merge-ort.c:1892 merge-recursive.c:1377
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Kunde inte lägga till %s till databasen"
 
-#: merge-ort.c:1427 merge-recursive.c:1400
+#: merge-ort.c:1899 merge-recursive.c:1410
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Slår ihop %s automatiskt"
 
-#: merge-ort.c:1566 merge-recursive.c:2122
+#: merge-ort.c:2038 merge-recursive.c:2132
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4720,7 +4838,7 @@ msgstr ""
 "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "
 "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."
 
-#: merge-ort.c:1576 merge-recursive.c:2132
+#: merge-ort.c:2048 merge-recursive.c:2142
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4729,7 +4847,7 @@ msgstr ""
 "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "
 "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"
 
-#: merge-ort.c:1634
+#: merge-ort.c:2106
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4740,7 +4858,7 @@ msgstr ""
 "den har namnbytts till flera andra kataloger, utan att någon destination "
 "fick en majoritet av filerna."
 
-#: merge-ort.c:1788 merge-recursive.c:2468
+#: merge-ort.c:2260 merge-recursive.c:2478
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4749,7 +4867,7 @@ msgstr ""
 "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
 "bytt namn."
 
-#: merge-ort.c:1932 merge-recursive.c:3244
+#: merge-ort.c:2400 merge-recursive.c:3261
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4758,7 +4876,7 @@ msgstr ""
 "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
 "flyttar den till %s."
 
-#: merge-ort.c:1939 merge-recursive.c:3251
+#: merge-ort.c:2407 merge-recursive.c:3268
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4767,7 +4885,7 @@ msgstr ""
 "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "
 "namn i %s; flyttar den till %s."
 
-#: merge-ort.c:1952 merge-recursive.c:3247
+#: merge-ort.c:2420 merge-recursive.c:3264
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4776,7 +4894,7 @@ msgstr ""
 "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "
 "%s, föreslår att den bör flyttas till%s."
 
-#: merge-ort.c:1960 merge-recursive.c:3254
+#: merge-ort.c:2428 merge-recursive.c:3271
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4785,13 +4903,13 @@ msgstr ""
 "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
 "bytte namn i %s; flyttar den till %s."
 
-#: merge-ort.c:2103
+#: merge-ort.c:2584
 #, c-format
 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
 msgstr ""
 "KONFLIKT (namnbyte/namnbyte): %s namnbytt till %s i %s och till %s i %s."
 
-#: merge-ort.c:2198
+#: merge-ort.c:2679
 #, c-format
 msgid ""
 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4802,23 +4920,23 @@ msgstr ""
 "innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till "
 "nästlade konfliktmarkörer."
 
-#: merge-ort.c:2217 merge-ort.c:2241
+#: merge-ort.c:2698 merge-ort.c:2722
 #, c-format
 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr ""
 "KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s."
 
-#: merge-ort.c:2550 merge-recursive.c:3002
+#: merge-ort.c:3212 merge-recursive.c:3022
 #, c-format
 msgid "cannot read object %s"
 msgstr "kan inte läsa objektet %s"
 
-#: merge-ort.c:2553 merge-recursive.c:3005
+#: merge-ort.c:3215 merge-recursive.c:3025
 #, c-format
 msgid "object %s is not a blob"
 msgstr "objektet %s är inte en blob"
 
-#: merge-ort.c:2981
+#: merge-ort.c:3644
 #, c-format
 msgid ""
 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4827,7 +4945,7 @@ msgstr ""
 "KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den "
 "till %s istället."
 
-#: merge-ort.c:3055
+#: merge-ort.c:3721
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4836,7 +4954,7 @@ msgstr ""
 "KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge "
 "så att de kan protokollföras någonstans."
 
-#: merge-ort.c:3062
+#: merge-ort.c:3728
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4845,24 +4963,24 @@ msgstr ""
 "KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte den ena "
 "så att de kan protokollföras någonstans."
 
-#: merge-ort.c:3162 merge-recursive.c:3081
+#: merge-ort.c:3819 merge-recursive.c:3101
 msgid "content"
 msgstr "innehåll"
 
-#: merge-ort.c:3164 merge-recursive.c:3085
+#: merge-ort.c:3821 merge-recursive.c:3105
 msgid "add/add"
 msgstr "tillägg/tillägg"
 
-#: merge-ort.c:3166 merge-recursive.c:3130
+#: merge-ort.c:3823 merge-recursive.c:3150
 msgid "submodule"
 msgstr "undermodul"
 
-#: merge-ort.c:3168 merge-recursive.c:3131
+#: merge-ort.c:3825 merge-recursive.c:3151
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
 
-#: merge-ort.c:3198
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -4871,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:3433
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4883,12 +5001,12 @@ 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:3730
+#: 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"
 
-#: merge-ort-wrappers.c:13 merge-recursive.c:3699
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4898,109 +5016,109 @@ msgstr ""
 "sammanslagning:\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "Redan à jour."
 
-#: merge-recursive.c:356
+#: merge-recursive.c:353
 msgid "(bad commit)\n"
 msgstr "(felaktig incheckning)\n"
 
-#: merge-recursive.c:379
+#: merge-recursive.c:381
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr ""
-"add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."
+"add_cacheinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."
 
-#: merge-recursive.c:388
+#: merge-recursive.c:390
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 "add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar "
 "sammanslagningen."
 
-#: merge-recursive.c:876
+#: merge-recursive.c:881
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "misslyckades skapa sökvägen \"%s\"%s"
 
-#: merge-recursive.c:887
+#: merge-recursive.c:892
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Tar bort %s för att göra plats för underkatalog\n"
 
-#: merge-recursive.c:901 merge-recursive.c:920
+#: merge-recursive.c:906 merge-recursive.c:925
 msgid ": perhaps a D/F conflict?"
 msgstr ": kanske en K/F-konflikt?"
 
-#: merge-recursive.c:910
+#: merge-recursive.c:915
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "vägrar förlora ospårad fil vid \"%s\""
 
-#: merge-recursive.c:951 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "kan inte läsa objektet %s: \"%s\""
 
-#: merge-recursive.c:956
+#: merge-recursive.c:961
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob förväntades för %s \"%s\""
 
-#: merge-recursive.c:981
+#: merge-recursive.c:986
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "misslyckades öppna \"%s\": %s"
 
-#: merge-recursive.c:992
+#: merge-recursive.c:997
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "misslyckades skapa symboliska länken \"%s\": %s"
 
-#: merge-recursive.c:997
+#: merge-recursive.c:1002
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "vet inte hur %06o %s \"%s\" ska hanteras"
 
-#: merge-recursive.c:1227 merge-recursive.c:1239
+#: merge-recursive.c:1233 merge-recursive.c:1246
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Snabbspolar undermodulen %s till följande incheckning:"
 
-#: merge-recursive.c:1230 merge-recursive.c:1242
+#: merge-recursive.c:1236 merge-recursive.c:1249
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Snabbspolar undermodulen %s"
 
-#: merge-recursive.c:1265
+#: merge-recursive.c:1273
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "
 "hittades inte)"
 
-#: merge-recursive.c:1269
+#: merge-recursive.c:1277
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"
 
-#: merge-recursive.c:1270
+#: merge-recursive.c:1278
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"
 
-#: merge-recursive.c:1282
+#: merge-recursive.c:1290
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr ""
 "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"
 
-#: merge-recursive.c:1424
+#: merge-recursive.c:1434
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."
 
-#: merge-recursive.c:1496
+#: merge-recursive.c:1506
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5009,7 +5127,7 @@ msgstr ""
 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
 "i trädet."
 
-#: merge-recursive.c:1501
+#: merge-recursive.c:1511
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5018,7 +5136,7 @@ msgstr ""
 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
 "%s lämnad i trädet."
 
-#: merge-recursive.c:1508
+#: merge-recursive.c:1518
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5027,7 +5145,7 @@ msgstr ""
 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
 "i trädet vid %s."
 
-#: merge-recursive.c:1513
+#: merge-recursive.c:1523
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5036,40 +5154,40 @@ msgstr ""
 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
 "%s lämnad i trädet vid %s."
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "rename"
 msgstr "namnbyte"
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "renamed"
 msgstr "namnbytt"
 
-#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Vägrar förlora lortig fil vid \"%s\""
 
-#: merge-recursive.c:1609
+#: merge-recursive.c:1619
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."
 
-#: merge-recursive.c:1667
+#: merge-recursive.c:1677
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s"
 
-#: merge-recursive.c:1698
+#: merge-recursive.c:1708
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s är en katalog i %s lägger till som %s istället"
 
-#: merge-recursive.c:1703
+#: merge-recursive.c:1713
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"
 
-#: merge-recursive.c:1730
+#: merge-recursive.c:1740
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5078,17 +5196,17 @@ msgstr ""
 "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
 "namnbyte \"%s\"->\"%s\" i \"%s\"%s"
 
-#: merge-recursive.c:1735
+#: merge-recursive.c:1745
 msgid " (left unresolved)"
 msgstr " (lämnad olöst)"
 
-#: merge-recursive.c:1827
+#: merge-recursive.c:1837
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
 
-#: merge-recursive.c:2090
+#: merge-recursive.c:2100
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5099,7 +5217,7 @@ msgstr ""
 "katalogen %s bytte namn till flera andra kataloger, utan att någon "
 "destination fick en majoritet av filerna."
 
-#: merge-recursive.c:2224
+#: merge-recursive.c:2234
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5108,80 +5226,80 @@ msgstr ""
 "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
 "%s->%s i %s"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modify"
 msgstr "ändra"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modified"
 msgstr "ändrad"
 
-#: merge-recursive.c:3108
+#: merge-recursive.c:3128
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
 
-#: merge-recursive.c:3161
+#: merge-recursive.c:3181
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Lägger till som %s istället"
 
-#: merge-recursive.c:3368
+#: merge-recursive.c:3385
 #, c-format
 msgid "Removing %s"
 msgstr "Tar bort %s"
 
-#: merge-recursive.c:3391
+#: merge-recursive.c:3408
 msgid "file/directory"
 msgstr "fil/katalog"
 
-#: merge-recursive.c:3396
+#: merge-recursive.c:3413
 msgid "directory/file"
 msgstr "katalog/fil"
 
-#: merge-recursive.c:3403
+#: merge-recursive.c:3420
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
 
-#: merge-recursive.c:3412
+#: merge-recursive.c:3429
 #, c-format
 msgid "Adding %s"
 msgstr "Lägger till %s"
 
-#: merge-recursive.c:3421
+#: merge-recursive.c:3438
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"
 
-#: merge-recursive.c:3474
+#: merge-recursive.c:3491
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "sammanslagning av träden %s och %s misslyckades"
 
-#: merge-recursive.c:3568
+#: merge-recursive.c:3585
 msgid "Merging:"
 msgstr "Slår ihop:"
 
-#: merge-recursive.c:3581
+#: merge-recursive.c:3598
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "hittade %u gemensam förfader:"
 msgstr[1] "hittade %u gemensamma förfäder:"
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3648
 msgid "merge returned no commit"
 msgstr "sammanslagningen returnerade ingen incheckning"
 
-#: merge-recursive.c:3796
+#: merge-recursive.c:3816
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Kunde inte tolka objektet \"%s\""
 
-#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
-#: builtin/stash.c:473
+#: 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."
 
@@ -5189,182 +5307,222 @@ msgstr "Kunde inte skriva indexet."
 msgid "failed to read the cache"
 msgstr "misslyckades läsa cachen"
 
-#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
-#: builtin/stash.c:267
+#: 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"
 
-#: midx.c:74
+#: midx.c:78
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "multi-pack-indexets OID-utbredning har fel storlek"
 
-#: midx.c:105
+#: 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:121
+#: 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:126
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-indexversionen %d stöds inte"
 
-#: midx.c:131
+#: 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:148
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "multi-pack-index saknar krävd paketnamn-stycke"
 
-#: midx.c:150
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"
 
-#: midx.c:152
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"
 
-#: midx.c:154
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "multi-pack-index saknar krävt objekt-offsetstycke"
 
-#: midx.c:170
+#: 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:214
+#: 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:264
+#: 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:490
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "misslyckades läsa paketfilen \"%s\""
 
-#: midx.c:496
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "misslyckades öppna paketindexet \"%s\""
 
-#: midx.c:564
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "misslyckades hitta objekt %d i paketfilen"
 
-#: midx.c:880 builtin/index-pack.c:1535
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "kan inte spara reverse-index-fil"
 
-#: midx.c:933
-msgid "Adding packfiles to multi-pack-index"
-msgstr "Lägger till paketfiler till multi-pack-index"
+#: midx.c:993
+#, c-format
+msgid "could not parse line: %s"
+msgstr "kunde inte tolka rad: %s"
 
-#: midx.c:979
+#: midx.c:995
 #, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "såg inte paketfilen %s som skulle kastas"
+msgid "malformed line: %s"
+msgstr "felaktig rad: %s"
+
+#: midx.c:1162
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma"
 
-#: midx.c:1024
+#: midx.c:1187
+msgid "could not load pack"
+msgstr "kunde inte läsa paket{"
+
+#: midx.c:1193
+#, c-format
+msgid "could not open index for %s"
+msgstr "kunde inte öppna indexet för %s"
+
+#: midx.c:1204
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Lägger till paketfiler till multi-pack-index"
+
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "okänt föredraget paket: %s"
 
-#: midx.c:1029
+#: 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:1324
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "såg inte paketfilen %s som skulle kastas"
+
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "föredraget paket \"%s\" har löpt ut"
 
-#: midx.c:1045
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "inga paketfiler att indexera."
 
-#: midx.c:1125 builtin/clean.c:37
+#: midx.c:1420
+msgid "could not write multi-pack bitmap"
+msgstr "kunde inte skriva fler-paketsbitkarta"
+
+#: midx.c:1430
+msgid "could not write multi-pack-index"
+msgstr "kunde inte skriva flerpakets-index"
+
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "misslyckades ta bort %s"
 
-#: midx.c:1156
+#: 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:1214
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr "multi-pack-indexfilen finns, men kunde inte tolkas"
 
-#: midx.c:1222
+#: midx.c:1593
+msgid "incorrect checksum"
+msgstr "felaktig kontrollsumma"
+
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "Ser efter refererade packfiler"
 
-#: midx.c:1237
+#: 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:1242
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "midx saknar oid"
 
-#: midx.c:1251
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr "Bekräftar OID-ordning i multi-pack-index"
 
-#: midx.c:1260
+#: 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:1280
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "Sorterar objekt efter packfil"
 
-#: midx.c:1287
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "Bekräftar offset för objekt"
 
-#: midx.c:1303
+#: 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:1309
+#: 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:1318
+#: 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:1343
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "Räknar refererade objekt"
 
-#: midx.c:1353
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "Ser efter och tar bort orefererade packfiler"
 
-#: midx.c:1544
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "kunde inte starta pack-objects"
 
-#: midx.c:1564
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "kunde inte avsluta pack-objects"
 
@@ -5423,271 +5581,272 @@ 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:526
+#: 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:577
+#: 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:649
+#: 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:656
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "kan inte normalisera objektkatalogen: %s"
 
-#: object-file.c:699
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"
 
-#: object-file.c:717
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "kan inte läsa \"alternates\"-filen"
 
-#: object-file.c:724
+#: 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:759
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "sökvägen \"%s\" finns inte"
 
-#: object-file.c:780
+#: 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:786
+#: 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:792
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "referensarkivet \"%s\" är grunt"
 
-#: object-file.c:800
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "referensarkivet \"%s\" är ympat"
 
-#: object-file.c:860
+#: 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:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "felaktig rad vid tolkning av supplerande referenser: %s"
 
-#: object-file.c:1010
+#: 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:1031
-msgid "mmap failed"
-msgstr "mmap misslyckades"
+#: object-file.c:1048
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap misslyckades%s"
 
-#: object-file.c:1195
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "objektfilen %s är tom"
 
-#: object-file.c:1330 object-file.c:2524
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "trasigt löst objekt \"%s\""
 
-#: object-file.c:1332 object-file.c:2528
+#: 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:1374
+#: object-file.c:1457
+#, c-format
+msgid "unable to parse %s header"
+msgstr "kan inte tolka %s-huvud"
+
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "felaktig objekttyp"
 
-#: object-file.c:1458
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
-
-#: object-file.c:1461
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "kan inte packa upp %s-huvudet"
 
-#: object-file.c:1467
+#: object-file.c:1474
 #, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
+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:1470
-#, c-format
-msgid "unable to parse %s header"
-msgstr "kan inte tolka %s-huvud"
-
-#: object-file.c:1697
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr "misslyckades läsa objektet %s"
 
-#: object-file.c:1701
+#: 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:1705
+#: 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:1709
+#: 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:1814
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "kunde inte skriva filen %s"
 
-#: object-file.c:1821
+#: 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:1828
+#: object-file.c:1835
 msgid "file write error"
 msgstr "fel vid skrivning av fil"
 
-#: object-file.c:1848
+#: 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:1913
+#: 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:1915
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "kan inte skapa temporär fil"
 
-#: object-file.c:1939
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "kunde inte skriva fil för löst objekt"
 
-#: object-file.c:1945
+#: 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:1949
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
 
-#: object-file.c:1953
+#: 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:1963 builtin/pack-objects.c:1097
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr "\"utime()\" misslyckades på %s"
 
-#: object-file.c:2040
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "kan inte läsa objekt för %s"
 
-#: object-file.c:2091
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "trasik incheckning"
 
-#: object-file.c:2099
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "trasig tagg"
 
-#: object-file.c:2199
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "läsfel vid indexering av %s"
 
-#: object-file.c:2202
+#: 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:2275 object-file.c:2285
+#: 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:2291
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: filtypen stöds ej"
 
-#: object-file.c:2315
+#: 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:2317
+#: 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:2344 builtin/index-pack.c:192
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "kan inte öppna %s"
 
-#: object-file.c:2535 object-file.c:2588
+#: 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:2559
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "kan inte utföra \"mmap\" för %s"
 
-#: object-file.c:2564
+#: 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:2570
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "kan inte tolka huvud för %s"
 
-#: object-file.c:2581
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "kan inte tolka innehåll i %s"
 
-#: object-name.c:486
+#: object-name.c:480
 #, c-format
 msgid "short object ID %s is ambiguous"
 msgstr "kort objekt-ID %s är tvetydigt"
 
-#: object-name.c:497
+#: object-name.c:491
 msgid "The candidates are:"
 msgstr "Kandidaterna är:"
 
-#: object-name.c:796
+#: object-name.c:790
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5709,22 +5868,22 @@ msgstr ""
 "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
 "genom att köra \"git config advice.objectNameWarning false\""
 
-#: object-name.c:916
+#: object-name.c:910
 #, c-format
 msgid "log for '%.*s' only goes back to %s"
 msgstr "loggen för \"%.*s\" räcker bara tillbaka till %s"
 
-#: object-name.c:924
+#: object-name.c:918
 #, c-format
 msgid "log for '%.*s' only has %d entries"
 msgstr "loggen för \"%.*s\" har bara %d poster"
 
-#: object-name.c:1702
+#: object-name.c:1696
 #, c-format
 msgid "path '%s' exists on disk, but not in '%.*s'"
 msgstr "Sökvägen \"%s\" finns på disken, men inte i \"%.*s\""
 
-#: object-name.c:1708
+#: object-name.c:1702
 #, c-format
 msgid ""
 "path '%s' exists, but not '%s'\n"
@@ -5733,12 +5892,12 @@ msgstr ""
 "sökvägen \"%s\" finns, men inte i \"%s\"\n"
 "tips: Menade du \"%.*s:%s\", även känd som \"%.*s:./%s\"?"
 
-#: object-name.c:1717
+#: object-name.c:1711
 #, c-format
 msgid "path '%s' does not exist in '%.*s'"
 msgstr "sökvägen \"%s\" finns inte i \"%.*s\""
 
-#: object-name.c:1745
+#: object-name.c:1739
 #, c-format
 msgid ""
 "path '%s' is in the index, but not at stage %d\n"
@@ -5747,7 +5906,7 @@ msgstr ""
 "sökvägen \"%s\" finns i indexet men inte i etapp %d\n"
 "tips: Menade du \":%d:%s\"?"
 
-#: object-name.c:1761
+#: object-name.c:1755
 #, c-format
 msgid ""
 "path '%s' is in the index, but not '%s'\n"
@@ -5756,21 +5915,21 @@ msgstr ""
 "sökvägen \"%s\" finns i indexet, men inte i \"%s\"\n"
 "tips: Menade du \":%d:%s\", även känd som \":%d:./%s\"?"
 
-#: object-name.c:1769
+#: object-name.c:1763
 #, c-format
 msgid "path '%s' exists on disk, but not in the index"
 msgstr "sökvägen \"%s\" finns på disk, men inte i indexet"
 
-#: object-name.c:1771
+#: object-name.c:1765
 #, c-format
 msgid "path '%s' does not exist (neither on disk nor in the index)"
 msgstr "sökvägen \"%s\" finns inte (varken i disken eller i indexet)"
 
-#: object-name.c:1784
+#: object-name.c:1778
 msgid "relative path syntax can't be used outside working tree"
 msgstr "relativ sökväg kan inte användas utanför arbetskatalogen"
 
-#: object-name.c:1922
+#: object-name.c:1916
 #, c-format
 msgid "invalid object name '%.*s'."
 msgstr "felaktigt objektnamn \"%.*s\"."
@@ -5785,27 +5944,40 @@ msgstr "ogiltig objekttyp \"%s\""
 msgid "object %s is a %s, not a %s"
 msgstr "objektet %s är en %s, inte en %s"
 
-#: object.c:232
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "objektet %s har okänd typ-id %d"
 
-#: object.c:245
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "kunde inte tolka objektet: %s"
 
-#: object.c:265 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "hashvärde stämmer inte överens %s"
 
-#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
+#: 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:429
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: kunde inte öppna paket"
+
+#: 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:1547 builtin/rev-list.c:92
+#: 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: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"
@@ -5835,125 +6007,135 @@ msgstr "reverse-index-filen %s har versionen %<PRIu32> som inte stöds"
 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
 msgstr "reverse-index-filen %s har hash-ID %<PRIu32> som inte stöds"
 
-#: pack-write.c:250
+#: pack-write.c:251
 msgid "cannot both write and verify reverse index"
 msgstr "kan inte både skriva och bekräfta reverse-index"
 
-#: pack-write.c:271
+#: pack-write.c:270
 #, c-format
 msgid "could not stat: %s"
 msgstr "kunde inte ta status: %s"
 
-#: pack-write.c:283
+#: pack-write.c:282
 #, c-format
 msgid "failed to make %s readable"
 msgstr "kunde inte göra %s läsbar"
 
-#: pack-write.c:522
+#: pack-write.c:520
 #, c-format
 msgid "could not write '%s' promisor file"
 msgstr "kunde inte skriva kontraktsfilen \"%s\""
 
-#: packfile.c:625
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset före slutet av packfilen (trasig .idx?)"
 
-#: packfile.c:1937
+#: packfile.c:657
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "paketfilen %s kunde inte kopplas%s"
+
+#: 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:1941
+#: 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
+#: 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.c:38
+#: 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"
 msgstr "%s behöver ett värde"
 
-#: parse-options.c:73
+#: parse-options.c:93
 #, c-format
 msgid "%s is incompatible with %s"
 msgstr "%s är inkompatibel med %s"
 
-#: parse-options.c:78
+#: parse-options.c:98
 #, c-format
 msgid "%s : incompatible with something else"
 msgstr "%s: inkompatibelt med något annat"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
 #, c-format
 msgid "%s takes no value"
 msgstr "%s tar inget värde"
 
-#: parse-options.c:94
+#: parse-options.c:114
 #, c-format
 msgid "%s isn't available"
 msgstr "%s är inte tillgängligt"
 
-#: parse-options.c:217
+#: parse-options.c:237
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix"
 
-#: parse-options.c:386
+#: parse-options.c:393
 #, c-format
 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:420 parse-options.c:428
+#: 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:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "alias för --%s"
 
-#: parse-options.c:879
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "okänd flagga \"%s\""
 
-#: parse-options.c:881
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "okänd flagga \"%c\""
 
-#: parse-options.c:883
+#: 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:907
+#: parse-options.c:920
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:926
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
@@ -5961,48 +6143,72 @@ msgstr "användning: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:932
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "     eller: %s"
 
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. 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:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:974
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-TAL"
 
-#: path.c:915
+#: path.c:922
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Kunde inte göra %s skrivbar för gruppen"
 
-#: pathspec.c:151
+#: pathspec.c:150
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde"
 
-#: pathspec.c:169
+#: pathspec.c:168
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Endast en \"attr:\"-angivelse tillåten."
 
-#: pathspec.c:172
+#: pathspec.c:171
 msgid "attr spec must not be empty"
 msgstr "attr-angivelse kan inte vara tom"
 
-#: pathspec.c:215
+#: pathspec.c:214
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "ogiltigt attributnamn %s"
 
-#: pathspec.c:280
+#: pathspec.c:279
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"
 
-#: pathspec.c:287
+#: pathspec.c:286
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -6010,51 +6216,51 @@ msgstr ""
 "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "
 "globala sökvägsinställningar"
 
-#: pathspec.c:327
+#: pathspec.c:326
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""
 
-#: pathspec.c:348
+#: pathspec.c:347
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\""
 
-#: pathspec.c:353
+#: pathspec.c:352
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""
 
-#: pathspec.c:391
+#: pathspec.c:390
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\""
 
-#: pathspec.c:450
+#: pathspec.c:449
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: \"literal\" och \"glob\" är inkompatibla"
 
-#: pathspec.c:466
+#: pathspec.c:465
 #, c-format
 msgid "%s: '%s' is outside repository at '%s'"
 msgstr "%s: \"%s\" är utanför arkivet på \"%s\""
 
-#: pathspec.c:542
+#: pathspec.c:541
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "\"%s\" (minnesstöd: \"%c\")"
 
-#: pathspec.c:552
+#: pathspec.c:551
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s"
 
-#: pathspec.c:619
+#: pathspec.c:618
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"
 
-#: pathspec.c:664
+#: pathspec.c:663
 #, c-format
 msgid "line is badly quoted: %s"
 msgstr "linjen er felaktigt citerad: %s"
@@ -6068,14 +6274,14 @@ msgid "unable to write delim packet"
 msgstr "kan inte skriva delim-paket"
 
 #: pkt-line.c:106
-msgid "unable to write stateless separator packet"
-msgstr "kan inte skriva tillståndslöst avdelarpaket"
+msgid "unable to write response end packet"
+msgstr "kunde inte skriva svarsavslutningspaket"
 
 #: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr "fel vid skrivning av \"flush\"-paket"
 
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
 msgid "protocol error: impossibly long line"
 msgstr "protokollfel: omöjligt lång rad"
 
@@ -6083,7 +6289,7 @@ msgstr "protokollfel: omöjligt lång rad"
 msgid "packet write with format failed"
 msgstr "paketskrivning med format misslyckades"
 
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
 msgid "packet write failed - data exceeds max packet size"
 msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek"
 
@@ -6092,25 +6298,25 @@ msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek"
 msgid "packet write failed: %s"
 msgstr "paketskrivning misslyckades: %s"
 
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
 msgid "read error"
 msgstr "läsfel"
 
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
 msgid "the remote end hung up unexpectedly"
 msgstr "fjärren lade på oväntat"
 
-#: pkt-line.c:369 pkt-line.c:371
+#: 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:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: 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:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "fjärrfel: %s"
@@ -6124,24 +6330,24 @@ msgstr "Uppdaterar indexet"
 msgid "unable to create threaded lstat: %s"
 msgstr "kunde inte skapa trådad lstat: %s"
 
-#: pretty.c:988
+#: pretty.c:1051
 msgid "unable to parse --pretty format"
 msgstr "kunde inte tolka format för --pretty"
 
-#: promisor-remote.c:30
+#: promisor-remote.c:31
 msgid "promisor-remote: unable to fork off fetch subprocess"
 msgstr "promisor-remote: kunde inte starta (fork) underprocessen för fetch"
 
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
 msgid "promisor-remote: could not write to fetch subprocess"
 msgstr "promisor-remote: kunde skriva till underprocessen för fetch"
 
-#: promisor-remote.c:41
+#: promisor-remote.c:44
 msgid "promisor-remote: could not close stdin to fetch subprocess"
 msgstr ""
 "promisor-remote: kunde inte stänga standard in för underprocessen för fetch"
 
-#: promisor-remote.c:53
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "kontraktsfjärr kan inte börja med \"/\": %s"
@@ -6154,20 +6360,20 @@ msgstr "object-info: förväntade \"flush\" efter argument"
 msgid "Removing duplicate objects"
 msgstr "Tar bort duplicerade objekt"
 
-#: range-diff.c:78
+#: range-diff.c:67
 msgid "could not start `log`"
 msgstr "kunde inte starta \"log\""
 
-#: range-diff.c:80
+#: range-diff.c:69
 msgid "could not read `log` output"
 msgstr "kunde inte läsa utdata från \"log\""
 
-#: range-diff.c:101 sequencer.c:5551
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "kunde inte tolka incheckningen \"%s\""
 
-#: range-diff.c:115
+#: range-diff.c:111
 #, c-format
 msgid ""
 "could not parse first line of `log` output: did not start with 'commit ': "
@@ -6176,69 +6382,65 @@ msgstr ""
 "kunde inte tolka första raden i \"log\"-updata: börjar inte med \"commit \": "
 "\"%s\""
 
-#: range-diff.c:140
+#: range-diff.c:137
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "kunde inte tolka git-huvudet \"%.*s\""
 
-#: range-diff.c:306
+#: range-diff.c:304
 msgid "failed to generate diff"
 msgstr "misslyckades skapa diff"
 
-#: range-diff.c:558
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only och --right-only är ömsesidigt uteslutande"
-
-#: range-diff.c:561 range-diff.c:563
+#: 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:708
+#: 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:724
+#: 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:746
+#: 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:751
+#: 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:803
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "kan inte indexera filen \"%s\""
 
-#: read-cache.c:822
+#: 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:833
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "kan inte ta status på \"%s\""
 
-#: read-cache.c:1356
+#: 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:1571
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "Uppdatera indexet"
 
-#: read-cache.c:1700
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6247,7 +6449,7 @@ msgstr ""
 "index.version satt, men värdet är ogiltigt.\n"
 "Använder version %i"
 
-#: read-cache.c:1710
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6256,143 +6458,143 @@ msgstr ""
 "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
 "Använder version %i"
 
-#: read-cache.c:1766
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "felaktig signatur 0x%08x"
 
-#: read-cache.c:1769
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "felaktig indexversion %d"
 
-#: read-cache.c:1778
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "felaktig sha1-signatur för indexfil"
 
-#: read-cache.c:1812
+#: 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:1814
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "ignorerar filtillägget %.4s"
 
-#: read-cache.c:1851
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "okänt format 0x%08x på indexpost"
 
-#: read-cache.c:1867
+#: 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:1924
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr "osorterade köposter i index"
 
-#: read-cache.c:1927
+#: 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:1930
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "osorterade köposter för \"%s\""
 
-#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:332
+#: 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: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:2180
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
-msgstr "kunde inte läsa in cache_entries-tråden: %s"
+msgstr "kunde inte skapa tråd för load_cache_entries: %s"
 
-#: read-cache.c:2193
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
-msgstr "kunde inte utföra join på cache_entries-tråden: %s"
+msgstr "kunde inte ansluta till tråden för load_cache_entries: %s"
 
-#: read-cache.c:2226
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: öppning av indexfilen misslyckades"
 
-#: read-cache.c:2230
+#: 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:2234
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: indexfilen mindre än förväntat"
 
-#: read-cache.c:2238
+#: read-cache.c:2280
 #, c-format
-msgid "%s: unable to map index file"
-msgstr "%s: kan inte koppla indexfilen"
+msgid "%s: unable to map index file%s"
+msgstr "%s: kan inte koppla indexfilen%s"
 
-#: read-cache.c:2280
+#: 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:2307
+#: 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:2345
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "kunde inte uppdatera delat index \"%s\""
 
-#: read-cache.c:2392
+#: 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:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: 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:3138
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr "misslyckades omvandla till glest index"
 
-#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "kunde inte ta status på \"%s\""
 
-#: read-cache.c:3222
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "kunde inte öppna git-katalog: %s"
 
-#: read-cache.c:3234
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "misslyckades ta bort länken: %s"
 
-#: read-cache.c:3263
+#: 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:3412
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: kan inte återgå till kö 0"
@@ -6475,7 +6677,7 @@ msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Ombasera %s på %s (%d kommando)"
 msgstr[1] "Ombasera %s på %s (%d kommandon)"
 
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6484,7 +6686,7 @@ msgstr ""
 "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "
 "incheckning.\n"
 
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6492,7 +6694,7 @@ msgstr ""
 "\n"
 "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"
 
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6506,7 +6708,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -6516,14 +6718,14 @@ 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:3816
-#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
+#: 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'"
 msgstr "kunde inte skriva \"%s\""
 
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
 #, c-format
 msgid "could not write '%s'."
 msgstr "kunde inte skriva \"%s\"."
@@ -6557,14 +6759,12 @@ msgstr ""
 "\" (fel).\n"
 "\n"
 
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
 #, c-format
-msgid "could not read '%s'."
-msgstr "kunde inte läsa \"%s\"."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: \"preserve\" har ersatts av \"merges\""
 
-#: ref-filter.c:42 wt-status.c:1978
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "försvunnen"
 
@@ -6583,258 +6783,229 @@ msgstr "bakom %d"
 msgid "ahead %d, behind %d"
 msgstr "före %d, bakom %d"
 
-#: ref-filter.c:175
+#: ref-filter.c:235
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "förväntat format: %%(color:<color>)"
 
-#: ref-filter.c:177
+#: ref-filter.c:237
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "okänd färg: %%(color:%s)"
 
-#: ref-filter.c:199
+#: ref-filter.c:259
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Heltalsvärde förväntades refname:lstrip=%s"
 
-#: ref-filter.c:203
+#: ref-filter.c:263
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Heltalsvärde förväntades refname:rstrip=%s"
 
-#: ref-filter.c:205
+#: 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"
 
-#: ref-filter.c:260
+#: ref-filter.c:320
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) tar inte argument"
 
-#: ref-filter.c:282
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "okänt %%(objectsize)-argument: %s"
-
-#: ref-filter.c:290
+#: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) tar inte argument"
 
-#: ref-filter.c:302
+#: ref-filter.c:364
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) tar inte argument"
 
-#: ref-filter.c:315
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "okänt %%(subject)-argument: %s"
-
-#: ref-filter.c:334
+#: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
-msgstr "förvändate %%(trailers:nyckel=<värde>)"
+msgstr "förväntade %%(trailers:key=<värde>)"
 
-#: ref-filter.c:336
+#: ref-filter.c:398
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "okänt %%(trailers)-argument: %s"
 
-#: ref-filter.c:367
+#: ref-filter.c:429
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "positivt värde förväntat contents:lines=%s"
 
-#: ref-filter.c:369
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "okänt %%(contents)-argument: %s"
-
-#: ref-filter.c:384
+#: 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:388
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "okänt argument \"%s\" i %%(%s)"
-
-#: ref-filter.c:402
+#: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
 msgstr "okänd e-postalternativ: %s"
 
-#: ref-filter.c:432
+#: ref-filter.c:506
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "förväntat format: %%(align:<bredd>,<position>)"
 
-#: ref-filter.c:444
+#: ref-filter.c:518
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "okänd position:%s"
 
-#: ref-filter.c:451
+#: ref-filter.c:525
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "okänd bredd:%s"
 
-#: ref-filter.c:460
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "okänt %%(align)-argument: %s"
-
-#: ref-filter.c:468
+#: 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:486
+#: ref-filter.c:568
 #, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "okänt %%(if)-argument: %s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) tar inte argument"
 
-#: ref-filter.c:588
+#: ref-filter.c:680
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "felformat fältnamn: %.*s"
 
-#: ref-filter.c:615
+#: ref-filter.c:707
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "okänt fältnamn: %.*s"
 
-#: ref-filter.c:619
+#: ref-filter.c:711
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 "inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"
 
-#: ref-filter.c:743
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
-
-#: ref-filter.c:807
+#: 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: 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:809
+#: ref-filter.c:912
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format: atomen %%(then) använd mer än en gång"
 
-#: ref-filter.c:811
+#: ref-filter.c:914
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: atomen %%(then) använd efter %%(else)"
 
-#: ref-filter.c:839
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
-
-#: ref-filter.c:841
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
-
-#: ref-filter.c:843
+#: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "format: atomen %%(else) använd mer än en gång"
 
-#: ref-filter.c:858
+#: ref-filter.c:965
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "format: atomen %%(end) använd utan motsvarande atom"
 
-#: ref-filter.c:915
+#: ref-filter.c:1027
 #, c-format
 msgid "malformed format string %s"
 msgstr "felformad formatsträng %s"
 
-#: ref-filter.c:1556
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "kommandot förkastar atom %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s kan inte användas med --python, --shell, --tcl"
+
+#: ref-filter.c:1706
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(ingen gren, ombaserar %s)"
 
-#: ref-filter.c:1559
+#: ref-filter.c:1709
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"
 
-#: ref-filter.c:1562
+#: ref-filter.c:1712
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(ingen gren, \"bisect\" startad på %s)"
 
-#: ref-filter.c:1566
+#: ref-filter.c:1716
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD frånkopplat vid %s)"
 
-#: ref-filter.c:1569
+#: ref-filter.c:1719
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD frånkopplat från %s)"
 
-#: ref-filter.c:1572
+#: ref-filter.c:1722
 msgid "(no branch)"
 msgstr "(ingen gren)"
 
-#: ref-filter.c:1604 ref-filter.c:1813
+#: ref-filter.c:1754 ref-filter.c:1972
 #, c-format
 msgid "missing object %s for %s"
 msgstr "objektet %s saknas för %s"
 
-#: ref-filter.c:1614
+#: ref-filter.c:1764
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer misslyckades på %s för %s"
 
-#: ref-filter.c:1997
+#: ref-filter.c:2155
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "felformat objekt vid \"%s\""
 
-#: ref-filter.c:2086
+#: ref-filter.c:2245
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ignorerar referens med trasigt namn %s"
 
-#: ref-filter.c:2091 refs.c:676
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ignorerar trasig referens %s"
 
-#: ref-filter.c:2431
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: atomen %%(end) saknas"
 
-#: ref-filter.c:2525
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "felformat objektnamn %s"
 
-#: ref-filter.c:2530
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "flaggan \"%s\" måste peka på en incheckning"
 
-#: refs.c:264
+#: refs.c:261
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr "\"%s\" pekar inte på ett giltigt objekt!"
 
-#: refs.c:566
+#: refs.c:563
 #, c-format
 msgid ""
 "Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6854,17 +7025,17 @@ msgstr ""
 "\n"
 "\tgit config --global init.defaultBranch <namn>\n"
 "\n"
-"Namn som ofta används instället för \"master\" är \"main\", \"trunk\" och\n"
+"Namn som ofta används istället för \"master\" är \"main\", \"trunk\" och\n"
 "\"development\". Den nyskapade grenen kan ges nytt namn med kommandot:\n"
 "\n"
 "\tgit branch -m <namn>\n"
 
-#: refs.c:588
+#: refs.c:585
 #, c-format
 msgid "could not retrieve `%s`"
 msgstr "kunde inte hämta \"%s\""
 
-#: refs.c:598
+#: refs.c:595
 #, c-format
 msgid "invalid branch name: %s = %s"
 msgstr "felaktigt namn på gren: %s = %s"
@@ -6874,66 +7045,66 @@ msgstr "felaktigt namn på gren: %s = %s"
 msgid "ignoring dangling symref %s"
 msgstr "ignorerar dinglande symbolisk referens %s"
 
-#: refs.c:922
+#: 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:929
+#: 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:994
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "loggen för %s är tom"
 
-#: refs.c:1086
+#: 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:1157
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "update_ref misslyckades för referensen \"%s\": %s"
 
-#: refs.c:2051
+#: 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:2131
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "referensuppdateringar förbjudna i karantänmiljö"
 
-#: refs.c:2142
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "referensuppdateringar avbrutna av krok"
 
-#: refs.c:2242 refs.c:2272
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "\"%s\" finns; kan inte skapa \"%s\""
 
-#: refs.c:2248 refs.c:2283
+#: 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:1228
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr "kunde inte ta bort referensen %s"
 
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: 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:1245 refs/packed-backend.c:1555
+#: 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"
@@ -6943,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"
@@ -6995,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"
@@ -7018,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"
@@ -7029,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"
@@ -7040,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"
@@ -7051,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"
@@ -7062,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 ""
@@ -7179,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"
@@ -7198,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\""
@@ -7235,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
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "misslyckades spola \"%s\""
@@ -7280,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:2089 builtin/log.c:2000
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
+#: 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\""
@@ -7319,46 +7490,33 @@ 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:3669
+#: 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:2343
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "--unpacked=<paketfil> stöds inte längre"
 
-#: revision.c:2683
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr "din nuvarande gren verkar vara trasig"
 
-#: revision.c:2686
+#: 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:2892
+#: 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:767
-msgid "open /dev/null failed"
-msgstr "misslyckades öppna /dev/null"
-
-#: run-command.c:1275
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "kan inte skapa asynkron tråd: %s"
 
-#: run-command.c:1345
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"
-"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."
-
 #: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"
@@ -7377,23 +7535,23 @@ msgstr "fjärruppackning misslyckades: %s"
 msgid "failed to sign the push certificate"
 msgstr "misslyckades underteckna push-certifikatet"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "send-pack: unable to fork off fetch subprocess"
 msgstr "send-pack: kunde inte starta (fork) underprocessen för fetch"
 
-#: send-pack.c:455
+#: send-pack.c:457
 msgid "push negotiation failed; proceeding anyway with push"
 msgstr "sänd-förhandling misslyckades; fortsätter ändå med sändningen"
 
-#: send-pack.c:520
+#: send-pack.c:528
 msgid "the receiving end does not support this repository's hash algorithm"
 msgstr "mottagarsidan stöder inte arkivets hashningsalgoritm"
 
-#: send-pack.c:529
+#: send-pack.c:537
 msgid "the receiving end does not support --signed push"
 msgstr "mottagarsidan stöder inte push med --signed"
 
-#: send-pack.c:531
+#: send-pack.c:539
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -7401,47 +7559,48 @@ msgstr ""
 "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
 "signed"
 
-#: send-pack.c:543
+#: send-pack.c:546
 msgid "the receiving end does not support --atomic push"
 msgstr "mottagarsidan stöder inte push med --atomic"
 
-#: send-pack.c:548
+#: send-pack.c:551
 msgid "the receiving end does not support push options"
 msgstr "mottagarsidan stöder inte push-flaggor"
 
-#: sequencer.c:196
+#: sequencer.c:197
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
 
-#: sequencer.c:324
+#: sequencer.c:325
 #, c-format
 msgid "could not delete '%s'"
 msgstr "kunde inte ta bort \"%s\""
 
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: 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\""
 
-#: sequencer.c:354
+#: sequencer.c:355
 msgid "revert"
 msgstr "revert"
 
-#: sequencer.c:356
+#: sequencer.c:357
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:358
+#: sequencer.c:359
 msgid "rebase"
 msgstr "rebase"
 
-#: sequencer.c:360
+#: sequencer.c:361
 #, c-format
 msgid "unknown action: %d"
 msgstr "okänd funktion: %d"
 
-#: sequencer.c:419
+#: sequencer.c:420
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -7449,53 +7608,81 @@ msgstr ""
 "efter att ha löst konflikterna, markera de rättade sökvägarna\n"
 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""
 
-#: sequencer.c:422
+#: sequencer.c:423
 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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
 msgstr ""
-"efter att ha löst konflikterna, markera de rättade sökvägarna\n"
-"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
-"och checka in resultatet med \"git commit\""
+"Efter att ha löst konflikterna, märk dem med\n"
+"\"git add/rm <sökvägsangivelse>\" och kör sedan\n"
+"\"git cherry-pick --continue\".\n"
+"Du kan hoppa över incheckningen istället med \"git cherry-pick --skip\"\n"
+"För att avbryta och återgå till där du var före \"git cherry-pick\",\n"
+"kör \"git cherry-pick --abort\"."
 
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Efter att ha löst konflikterna, märk dem med\n"
+"\"git add/rm <sökvägsangivelse>\" och kör sedan\n"
+"\"git revert --continue\".\n"
+"Du kan hoppa över incheckningen istället med \"git revert --skip\"\n"
+"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:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "kunde inte låsa \"%s\""
 
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#: 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\""
 
-#: sequencer.c:442
+#: sequencer.c:455
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "kunde inte skriva radslut till \"%s\""
 
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3554
+#: 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:486
+#: 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."
 msgstr "dina lokala ändringar skulle skrivas över av %s."
 
-#: sequencer.c:490
+#: sequencer.c:503
 msgid "commit your changes or stash them to proceed."
 msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."
 
-#: sequencer.c:522
+#: sequencer.c:535
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: snabbspola"
 
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Felaktigt städningsläge %s"
@@ -7503,65 +7690,65 @@ msgstr "Felaktigt städningsläge %s"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
 #.
-#: sequencer.c:671
+#: sequencer.c:685
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Kunde inte skriva ny indexfil"
 
-#: sequencer.c:685
+#: sequencer.c:699
 msgid "unable to update cache tree"
 msgstr "kan inte uppdatera cacheträd"
 
-#: sequencer.c:699
+#: sequencer.c:713
 msgid "could not resolve HEAD commit"
 msgstr "kunde inte bestämma HEAD:s incheckning"
 
-#: sequencer.c:779
+#: sequencer.c:793
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "ingen nyckel i  \"%.*s\""
 
-#: sequencer.c:790
+#: sequencer.c:804
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "kan inte ta bort citering av värdet \"%s\""
 
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
-#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
+#: 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"
 
-#: sequencer.c:837
+#: sequencer.c:851
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"
 
-#: sequencer.c:842
+#: sequencer.c:856
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"
 
-#: sequencer.c:847
+#: sequencer.c:861
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"
 
-#: sequencer.c:851
+#: sequencer.c:865
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "okänd variabel \"%s\""
 
-#: sequencer.c:856
+#: sequencer.c:870
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "\"GIT_AUTHOR_NAME\" saknas"
 
-#: sequencer.c:858
+#: sequencer.c:872
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "\"GIT_AUTHOR_EMAIL\" saknas"
 
-#: sequencer.c:860
+#: sequencer.c:874
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "\"GIT_AUTHOR_DATE\" saknas"
 
-#: sequencer.c:925
+#: sequencer.c:939
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -7590,11 +7777,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1212
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "kroken \"prepare-commit-msg\" misslyckades"
 
-#: sequencer.c:1218
+#: 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"
@@ -7621,7 +7808,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1231
+#: 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"
@@ -7646,344 +7833,351 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1273
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "kunde inte slå upp en precis skapad incheckning"
 
-#: sequencer.c:1275
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr "kunde inte tolka en precis skapad incheckning"
 
-#: sequencer.c:1321
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
 
-#: sequencer.c:1323
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "frånkopplad HEAD"
 
-#: sequencer.c:1327
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (rotincheckning)"
 
-#: sequencer.c:1348
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "kunde inte tolka HEAD"
 
-#: sequencer.c:1350
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s är inte en incheckning!"
 
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
+#: 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:1410 sequencer.c:2295
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "kunde inte tolka incheckningens författare"
 
-#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
+#: 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:1454 sequencer.c:1574
+#: 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:1485 sequencer.c:1517
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "ogiltig författar-identitet \"%s\""
 
-#: sequencer.c:1491
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "trasig författare: saknar datuminformation"
 
-#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
-#: builtin/merge.c:934 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:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#: 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:1606
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "kunde inte tolka incheckningen %s"
 
-#: sequencer.c:1611
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "kunde inte tolka föräldraincheckningen %s"
 
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "okänt kommando: %d"
 
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "Det här är 1:a incheckningsmeddelandet:"
 
-#: sequencer.c:1737
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Det här är incheckningsmeddelande %d:"
 
-#: sequencer.c:1738
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "1:a incheckningsmeddelandet kommer hoppas över:"
 
-#: sequencer.c:1739
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Incheckningsmeddelande %d kommer hoppas över:"
 
-#: sequencer.c:1740
+#: 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:1887 sequencer.c:1944
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "kan inte skriva \"%s\""
 
-#: sequencer.c:1934
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "behöver en HEAD-incheckning att rätta"
 
-#: sequencer.c:1936 sequencer.c:3581
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "kunde inte läsa HEAD"
 
-#: sequencer.c:1938
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
 
-#: sequencer.c:1962
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "kunde inte läsa incheckningsmeddelande för %s"
 
-#: sequencer.c:2072
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "din indexfil har inte slagits ihop."
 
-#: sequencer.c:2079
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "kan inte göra \"fixup\" på rotincheckning"
 
-#: sequencer.c:2098
+#: 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:2106 sequencer.c:2114
+#: 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:2120
+#: 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:2139
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: kan inte tolka föräldraincheckningen %s"
 
-#: sequencer.c:2205
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "kunde inte byta namn på \"%s\" till \"%s\""
 
-#: sequencer.c:2265
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "kunde inte ångra %s... %s"
 
-#: sequencer.c:2266
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "kunde inte tillämpa %s... %s"
 
-#: sequencer.c:2287
+#: 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:2345
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: misslyckades läsa indexet"
 
-#: sequencer.c:2352
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: misslyckades uppdatera indexet"
 
-#: sequencer.c:2425
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s tar inte argument: \"%s\""
 
-#: sequencer.c:2434
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "argument saknas för %s"
 
-#: sequencer.c:2477
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "kunde inte tolka \"%s\""
 
-#: sequencer.c:2538
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ogiltig rad %d: %.*s"
 
-#: sequencer.c:2549
+#: 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:2635
+#: sequencer.c:2624 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "kunde inte läsa \"%s\"."
+
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "avbryter pågående \"cherry-pick\""
 
-#: sequencer.c:2644
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "avbryter pågående \"revert\""
 
-#: sequencer.c:2690
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "rätta det med \"git rebase --edit-todo\"."
 
-#: sequencer.c:2692
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "oanvändbart manus: \"%s\""
 
-#: sequencer.c:2697
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "inga incheckningar lästes."
 
-#: sequencer.c:2708
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
 
-#: sequencer.c:2710
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
 
-#: sequencer.c:2788
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "felaktigt värde för %s: %s"
 
-#: sequencer.c:2897
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "oanvändbar squash-onto"
 
-#: sequencer.c:2917
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "trasigt manus: \"%s\""
 
-#: sequencer.c:3012 sequencer.c:4869
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "den angivna uppsättningen incheckningar är tom"
 
-#: sequencer.c:3029
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "en \"revert\" pågår redan"
 
-#: sequencer.c:3031
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "testa \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3034
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "en \"cherry-pick\" pågår redan"
 
-#: sequencer.c:3036
+#: 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:3050
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
 
-#: sequencer.c:3065
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "kunde inte låsa HEAD"
 
-#: sequencer.c:3125 sequencer.c:4582
+#: 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:3127 sequencer.c:3138
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "kan inte bestämma HEAD"
 
-#: sequencer.c:3129 sequencer.c:3173
+#: 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:3159 builtin/grep.c:759
+#: 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:3161
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "kan inte läsa \"%s\": %s"
 
-#: sequencer.c:3162
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "oväntat filslut"
 
-#: sequencer.c:3168
+#: 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:3179
+#: 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:3220
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "ingen \"revers\" pågår"
 
-#: sequencer.c:3229
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "ingen \"cherry-pick\" pågår"
 
-#: sequencer.c:3239
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "kunde inte hoppa över incheckningen"
 
-#: sequencer.c:3246
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "ingenting att hoppa över"
 
-#: sequencer.c:3249
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -7992,16 +8186,16 @@ msgstr ""
 "har du redan checkat in?\n"
 "testa \"git %s --continue\""
 
-#: sequencer.c:3411 sequencer.c:4473
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "kan inte läsa HEAD"
 
-#: sequencer.c:3428
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "kan inte kopiera in \"%s\" till \"%s\""
 
-#: sequencer.c:3436
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8020,27 +8214,27 @@ msgstr ""
 "\n"
 "\tgit rebase --continue\n"
 
-#: sequencer.c:3446
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Kunde inte tillämpa %s... %.*s"
 
-#: sequencer.c:3453
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Kunde inte slå ihop %.*s"
 
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: 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:3483
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "Kör: %s\n"
 
-#: sequencer.c:3498
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8055,11 +8249,11 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:3504
+#: 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:3510
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8076,90 +8270,90 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:3571
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "ogiltigt etikettnamn: \"%.*s\""
 
-#: sequencer.c:3625
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "skriver fejkad rotincheckning"
 
-#: sequencer.c:3630
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "skriver squash-onto"
 
-#: sequencer.c:3714
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "kunde inte upplösa \"%s\""
 
-#: sequencer.c:3747
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "kan inte slå ihop utan en aktuell incheckning"
 
-#: sequencer.c:3769
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "kan inte tolka \"%.*s\""
 
-#: sequencer.c:3778
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "inget att slå samman: \"%.*s\""
 
-#: sequencer.c:3790
+#: 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:3806
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""
 
-#: sequencer.c:3989
+#: 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:4005
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "sammanslagning: Kunde inte skriva ny indexfil"
 
-#: sequencer.c:4079
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr "Kan inte utföra \"autostash\""
 
-#: sequencer.c:4082
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Oväntat svar från stash: \"%s\""
 
-#: sequencer.c:4088
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Kunde inte skapa katalog för \"%s\""
 
-#: sequencer.c:4091
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Skapade autostash: %s\n"
 
-#: sequencer.c:4095
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "kunde inte utföra \"reset --hard\""
 
-#: sequencer.c:4120
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Tillämpade autostash.\n"
 
-#: sequencer.c:4132
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "kan inte spara %s"
 
-#: sequencer.c:4135
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8170,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:4140
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "Tillämpning av autostash gav konflikter."
 
-#: sequencer.c:4141
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr "Autostash finns; skapar ny stash-post."
 
-#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "kunde inte koppla från HEAD"
 
-#: sequencer.c:4249
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Stoppade på HEAD\n"
 
-#: sequencer.c:4251
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Stoppade på %s\n"
 
-#: sequencer.c:4259
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8213,58 +8407,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4305
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "Ombaserar (%d/%d)%s"
 
-#: sequencer.c:4351
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Stoppade på %s... %.*s\n"
 
-#: sequencer.c:4422
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "okänt kommando %d"
 
-#: sequencer.c:4481
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "kunde inte läsa orig-head"
 
-#: sequencer.c:4486
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "kunde inte läsa \"onto\""
 
-#: sequencer.c:4500
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "kunde inte uppdatera HEAD till %s"
 
-#: sequencer.c:4560
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "Lyckades ombasera och uppdatera %s.\n"
 
-#: sequencer.c:4612
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
 msgstr "kan inte ombasera: Du har oköade ändringar."
 
-#: sequencer.c:4621
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "kan inte lägga till incheckning som inte finns"
 
-#: sequencer.c:4623
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "ogiltig fil: \"%s\""
 
-#: sequencer.c:4625
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "ogiltigt innehåll: \"%s\""
 
-#: sequencer.c:4628
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8274,59 +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:4664 sequencer.c:4703
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "kunde inte skriva fil: \"%s\""
 
-#: sequencer.c:4719
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
 
-#: sequencer.c:4726
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "kunde inte checka in köade ändringar."
 
-#: sequencer.c:4846
+#: 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:4850
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: felaktig revision"
 
-#: sequencer.c:4885
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "kan inte ångra som första incheckning"
 
-#: sequencer.c:5362
+#: sequencer.c:5189 sequencer.c:5418
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "hoppade över tidigare applicerad incheckning %s"
+
+#: 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:5405
 msgid "make_script: unhandled options"
 msgstr "make_script: flaggor som inte stöds"
 
-#: sequencer.c:5365
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script: fel när revisioner skulle förberedas"
 
-#: sequencer.c:5615 sequencer.c:5632
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "inget att göra"
 
-#: sequencer.c:5651
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"
 
-#: sequencer.c:5751
+#: 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"
@@ -8336,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"
@@ -8348,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"
@@ -8364,96 +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
+#: 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:661
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Förväntade git-arkivversion <= %d, hittade %d"
 
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr "okända arkivutökningar hittades:"
+#: 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:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "arkivversionen är 0, men utökningar som bara finns i v1 upptäcktes:"
+#: 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:700
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "fel vid öppning av \"%s\""
 
-#: setup.c:702
+#: 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:704
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "fel vid läsning av %s"
 
-#: setup.c:706
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "ogiltigt gitfilformat: %s"
 
-#: setup.c:708
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "ingen sökväg i gitfil: %s"
 
-#: setup.c:710
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "inte ett git-arkiv: %s"
 
-#: setup.c:812
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "\"$%s\" för stor"
 
-#: setup.c:826
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "inte ett git-arkiv: \"%s\""
 
-#: setup.c:855 setup.c:857 setup.c:888
+#: 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:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: 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:987
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "misslyckades ta status på \"%*ss%s%s\""
 
-#: setup.c:1225
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "Kan inte läsa aktuell arbetskatalog"
 
-#: setup.c:1234 setup.c:1240
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "kan inte byta till \"%s\""
 
-#: setup.c:1245
+#: 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:1251
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8463,7 +8670,7 @@ msgstr ""
 "monteringspunkten %s)\n"
 "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
 
-#: setup.c:1370
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8472,27 +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:1417
-msgid "open /dev/null or dup failed"
-msgstr "misslyckades öppna /dev/null eller \"dup\""
-
-#: setup.c:1432
+#: setup.c:1508
 msgid "fork failed"
 msgstr "\"fork\" misslyckades"
 
-#: setup.c:1437 t/helper/test-simple-ipc.c:285
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "\"setsid\" misslyckades"
 
-#: sparse-index.c:151
-msgid "attempting to use sparse-index without cone mode"
-msgstr "försöker använda glest index utan \"cone\"-läge"
-
-#: sparse-index.c:156
-msgid "unable to update cache-tree, staying full"
-msgstr "kan inte uppdatera cacheträd, behåller fullt läge"
-
-#: sparse-index.c:239
+#: 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)"
@@ -8549,13 +8744,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] "%u byte/s"
 msgstr[1] "%u bytes/s"
 
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
-#: builtin/rebase.c:866
+#: 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:1177
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "kunde inte redigera \"%s\""
@@ -8579,7 +8774,7 @@ msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s"
 msgid "invalid value for %s"
 msgstr "ogiltigt värde för %s"
 
-#: submodule-config.c:766
+#: submodule-config.c:767
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Kunde inte uppdatera .gitmodules-posten %s"
@@ -8604,22 +8799,22 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s"
 msgid "staging updated .gitmodules failed"
 msgstr "misslyckades köa uppdaterad .gitmodules"
 
-#: submodule.c:328
+#: submodule.c:358
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "i ej utcheckad undermodul \"%s\""
 
-#: submodule.c:359
+#: submodule.c:389
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
 
-#: submodule.c:436
+#: submodule.c:466
 #, c-format
 msgid "bad --ignore-submodules argument: %s"
 msgstr "felaktigt argument till --ignore-submodules: %s"
 
-#: submodule.c:818
+#: submodule.c:844
 #, c-format
 msgid ""
 "Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8628,12 +8823,12 @@ msgstr ""
 "Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul "
 "med samma namn. Hoppar över den."
 
-#: submodule.c:921
+#: submodule.c:954
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"
 
-#: submodule.c:1006
+#: submodule.c:1042
 #, c-format
 msgid ""
 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8642,36 +8837,36 @@ msgstr ""
 "kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i "
 "undermodulen \"%s\""
 
-#: submodule.c:1129
+#: submodule.c:1165
 #, c-format
 msgid "process for submodule '%s' failed"
 msgstr "process för undermodulen \"%s\" misslyckades"
 
-#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
+#: 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."
 
-#: submodule.c:1169
+#: submodule.c:1205
 #, c-format
 msgid "Pushing submodule '%s'\n"
 msgstr "Sänder undermodulen \"%s\"\n"
 
-#: submodule.c:1172
+#: submodule.c:1208
 #, c-format
 msgid "Unable to push submodule '%s'\n"
 msgstr "Kunde inte sända undermodulen \"%s\"\n"
 
-#: submodule.c:1464
+#: submodule.c:1491
 #, c-format
 msgid "Fetching submodule %s%s\n"
 msgstr "Hämtar undermodulen %s%s\n"
 
-#: submodule.c:1498
+#: submodule.c:1525
 #, c-format
 msgid "Could not access submodule '%s'\n"
 msgstr "Kunde inte komma åt undermodulen \"%s\"\n"
 
-#: submodule.c:1653
+#: submodule.c:1680
 #, c-format
 msgid ""
 "Errors during submodule fetch:\n"
@@ -8680,61 +8875,61 @@ msgstr ""
 "Fel vid hämtning av undermodul:\n"
 "%s"
 
-#: submodule.c:1678
+#: submodule.c:1705
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "\"%s\" känns inte igen som ett git-arkiv"
 
-#: submodule.c:1695
+#: submodule.c:1722
 #, c-format
 msgid "Could not run 'git status --porcelain=2' in submodule %s"
 msgstr "Kunde inte köra \"git status --porcelain=2\" i undermodulen \"%s\""
 
-#: submodule.c:1736
+#: submodule.c:1763
 #, c-format
 msgid "'git status --porcelain=2' failed in submodule %s"
 msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\""
 
-#: submodule.c:1811
+#: submodule.c:1838
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
 
-#: submodule.c:1824
+#: submodule.c:1851
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
 
-#: submodule.c:1839
+#: submodule.c:1868
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\""
 
-#: submodule.c:1866 submodule.c:2176
+#: submodule.c:1895 submodule.c:2210
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "kunde inte rekursera in i undermodulen \"%s\""
 
-#: submodule.c:1887
+#: submodule.c:1917
 msgid "could not reset submodule index"
 msgstr "kunde inte återställa indexet i undermodul"
 
-#: submodule.c:1929
+#: submodule.c:1959
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "undermodulen \"%s\" har ett smutsigt index"
 
-#: submodule.c:1981
+#: submodule.c:2013
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Undermoduler \"%s\" kunde inte uppdateras."
 
-#: submodule.c:2049
+#: submodule.c:2081
 #, c-format
 msgid "submodule git dir '%s' is inside git dir '%.*s'"
 msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\""
 
-#: submodule.c:2070
+#: submodule.c:2102
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8742,17 +8937,17 @@ msgstr ""
 "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
 "stöds ej"
 
-#: submodule.c:2082 submodule.c:2141
+#: submodule.c:2114 submodule.c:2174
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
 
-#: submodule.c:2086
+#: submodule.c:2118
 #, c-format
 msgid "refusing to move '%s' into an existing git dir"
 msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog"
 
-#: submodule.c:2093
+#: submodule.c:2124
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -8763,11 +8958,11 @@ msgstr ""
 "\"%s\" till\n"
 "\"%s\"\n"
 
-#: submodule.c:2221
+#: submodule.c:2255
 msgid "could not start ls-files in .."
 msgstr "kunde inte starta ls-files i .."
 
-#: submodule.c:2261
+#: submodule.c:2295
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree returnerade en oväntad returkod %d"
@@ -8789,7 +8984,7 @@ msgid "unknown value '%s' for key '%s'"
 msgstr "okänt värde \"%s\" för nyckeln \"%s\""
 
 #: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
 #, c-format
 msgid "more than one %s"
 msgstr "mer än en %s"
@@ -8804,11 +8999,11 @@ msgstr "tom släpradssymbol i släpraden \"%.*s\""
 msgid "could not read input file '%s'"
 msgstr "kunde inte läsa indatafilen \"%s\""
 
-#: trailer.c:766 builtin/mktag.c:88
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
 msgid "could not read from stdin"
 msgstr "kunde inte läsa från standard in"
 
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
 #, c-format
 msgid "could not stat %s"
 msgstr "kunde inte ta status på %s"
@@ -8878,7 +9073,7 @@ msgstr "kunde inte köra fast-import"
 msgid "error while running fast-import"
 msgstr "fel när fast-import kördes"
 
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
 #, c-format
 msgid "could not read ref %s"
 msgstr "kunde inte läsa referensen %s"
@@ -8896,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:1471
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "funktionen stöds inte av protokollet"
 
@@ -8905,7 +9100,7 @@ msgstr "funktionen stöds inte av protokollet"
 msgid "can't connect to subservice %s"
 msgstr "kan inte ansluta till undertjänsten %s"
 
-#: transport-helper.c:693 transport.c:397
+#: transport-helper.c:693 transport.c:404
 msgid "--negotiate-only requires protocol v2"
 msgstr "--negotiate-only kräver protokoll v2"
 
@@ -8918,59 +9113,59 @@ msgstr "\"option\" utan mostsvarande \"ok/error\"-direktiv"
 msgid "expected ok/error, helper said '%s'"
 msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\""
 
-#: transport-helper.c:855
+#: transport-helper.c:859
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "hjälparen returnerade oväntad status %s"
 
-#: transport-helper.c:938
+#: transport-helper.c:942
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "hjälparen %s stöder inte dry-run"
 
-#: transport-helper.c:941
+#: transport-helper.c:945
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "hjälparen %s stöder inte --signed"
 
-#: transport-helper.c:944
+#: transport-helper.c:948
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "hjälparen %s stöder inte --signed=if-asked"
 
-#: transport-helper.c:949
+#: transport-helper.c:953
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "hjälparen %s stöder inte --atomic"
 
-#: transport-helper.c:953
+#: transport-helper.c:957
 #, c-format
 msgid "helper %s does not support --%s"
 msgstr "hjälparen %s stöder inte --%s"
 
-#: transport-helper.c:960
+#: transport-helper.c:964
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "hjälparen %s stöder inte \"push-option\""
 
-#: transport-helper.c:1060
+#: transport-helper.c:1064
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs"
 
-#: transport-helper.c:1065
+#: transport-helper.c:1069
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "hjälparen %s stöder inte \"force\""
 
-#: transport-helper.c:1112
+#: transport-helper.c:1116
 msgid "couldn't run fast-export"
 msgstr "kunde inte köra fast-export"
 
-#: transport-helper.c:1117
+#: transport-helper.c:1121
 msgid "error while running fast-export"
 msgstr "fel vid körning av fast-export"
 
-#: transport-helper.c:1142
+#: transport-helper.c:1146
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -8979,52 +9174,52 @@ msgstr ""
 "Inga gemensamma referenser och inga angavs; gör inget.\n"
 "Du kanske borde ange en gren.\n"
 
-#: transport-helper.c:1224
+#: transport-helper.c:1228
 #, c-format
 msgid "unsupported object format '%s'"
 msgstr "objektformatet \"%s\" stöds ej"
 
-#: transport-helper.c:1233
+#: transport-helper.c:1237
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "felformat svar i referenslistan: %s"
 
-#: transport-helper.c:1385
+#: transport-helper.c:1389
 #, c-format
 msgid "read(%s) failed"
 msgstr "läs(%s) misslyckades"
 
-#: transport-helper.c:1412
+#: transport-helper.c:1416
 #, c-format
 msgid "write(%s) failed"
 msgstr "skriv(%s) misslyckades"
 
-#: transport-helper.c:1461
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed"
 msgstr "%s-tråden misslyckades"
 
-#: transport-helper.c:1465
+#: transport-helper.c:1469
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "%s-tråden misslyckades ansluta: %s"
 
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "kan inte starta tråd för kopiering av data: %s"
 
-#: transport-helper.c:1525
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed to wait"
 msgstr "processen %s misslyckades vänta"
 
-#: transport-helper.c:1529
+#: transport-helper.c:1533
 #, c-format
 msgid "%s process failed"
 msgstr "processen %s misslyckades"
 
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
 msgid "can't start thread for copying data"
 msgstr "kan inte skapa tråd för kopiering av data"
 
@@ -9036,48 +9231,48 @@ msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"
 #: transport.c:145
 #, c-format
 msgid "could not read bundle '%s'"
-msgstr "kunde inte läsa paketet (bundlen) \"%s\""
+msgstr "kunde inte läsa bunten \"%s\""
 
-#: transport.c:220
+#: transport.c:227
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: ogiltig flagga för depth: \"%s\""
 
-#: transport.c:272
+#: transport.c:279
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "se protocol.version i \"git help config\" för mer information"
 
-#: transport.c:273
+#: transport.c:280
 msgid "server options require protocol version 2 or later"
 msgstr "serverflaggor kräver protokollversion 2 eller senare"
 
-#: transport.c:400
+#: transport.c:407
 msgid "server does not support wait-for-done"
 msgstr "servern stöder inte wait-for-done"
 
-#: transport.c:751
+#: transport.c:759
 msgid "could not parse transport.color.* config"
 msgstr "kunde inte tolka inställningen för transport.color.*"
 
-#: transport.c:826
+#: transport.c:834
 msgid "support for protocol v2 not implemented yet"
 msgstr "stöd för protokoll v2 ännu ej implementerat"
 
-#: transport.c:960
+#: transport.c:967
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "okänt värde för inställningen \"%s\": %s"
 
-#: transport.c:1026
+#: transport.c:1033
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "transporten \"%s\" tillåts inte"
 
-#: transport.c:1079
+#: transport.c:1082
 msgid "git-over-rsync is no longer supported"
 msgstr "git-over-rsync stöds inte längre"
 
-#: transport.c:1181
+#: transport.c:1185
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -9086,7 +9281,7 @@ msgstr ""
 "Följande undermodulsökvägar innehåller ändringar som\n"
 "inte kan hittas av fjärrarna:\n"
 
-#: transport.c:1185
+#: transport.c:1189
 #, c-format
 msgid ""
 "\n"
@@ -9113,11 +9308,11 @@ msgstr ""
 "för att sända dem till fjärren.\n"
 "\n"
 
-#: transport.c:1193
+#: transport.c:1197
 msgid "Aborting."
 msgstr "Avbryter."
 
-#: transport.c:1340
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr "kunde inte sända alla nödvändiga undermoduler"
 
@@ -9137,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"
@@ -9146,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"
@@ -9155,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"
@@ -9165,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"
@@ -9175,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"
@@ -9184,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"
@@ -9193,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"
@@ -9203,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"
@@ -9212,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"
@@ -9221,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"
@@ -9231,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"
@@ -9241,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"
@@ -9250,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"
@@ -9259,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 "
@@ -9270,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 "
@@ -9281,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"
@@ -9291,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"
@@ -9301,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"
@@ -9310,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"
@@ -9319,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"
@@ -9333,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 "
@@ -9343,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"
@@ -9353,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 "
@@ -9364,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 "
@@ -9378,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"
@@ -9392,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:1519
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "Uppdaterar indexflaggor"
 
-#: unpack-trees.c:2608
+#: 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:1548
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "förväntade \"flush\" efter \"fetch\"-argument"
 
@@ -9438,113 +9642,123 @@ msgstr "felaktigt \"..\"-sökvägssegment"
 msgid "Fetching objects"
 msgstr "Hämtar objekt"
 
-#: worktree.c:238 builtin/am.c:2151
+#: 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:304
+#: 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:315
+#: 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:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "\"%s\" finns inte"
 
-#: worktree.c:333
+#: 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:342
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "\"%s\" pekar inte tillbaka till \"%s\""
 
-#: worktree.c:608
+#: worktree.c:604
 msgid "not a directory"
 msgstr "inte en katalog"
 
-#: worktree.c:617
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git är inte en fil"
 
-#: worktree.c:619
+#: worktree.c:615
 msgid ".git file broken"
 msgstr ".git-filen är trasig"
 
-#: worktree.c:621
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr ".git-filen är felaktig"
 
-#: worktree.c:727
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "inte en giltig sökväg"
 
-#: worktree.c:733
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr "hittar inte arkivet; .git är inte en fil"
 
-#: worktree.c:737
+#: 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:741
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "hittar inte arkivet; .git-filen är trasig"
 
-#: worktree.c:747
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "gitdir är oläsbar"
 
-#: worktree.c:751
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "gitdir är felaktig"
 
-#: worktree.c:776
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "inte i en giltig katalog"
 
-#: worktree.c:782
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "gitdir-filen existerar inte"
 
-#: worktree.c:787 worktree.c:796
+#: 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:806
+#: 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:814
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "ogiltig gitdir-fil"
 
-#: worktree.c:822
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "gitdir-filen pekar på en ickeexisterande plats"
 
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "kunde inte lagra miljövariabeln \"%s\""
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "kunde inte skapa \"%s\""
+
+#: wrapper.c:205 wrapper.c:375
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
 
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
 #, c-format
 msgid "unable to access '%s'"
 msgstr "kan inte komma åt \"%s\""
 
-#: wrapper.c:607
+#: wrapper.c:615
 msgid "unable to get current working directory"
 msgstr "kan inte hämta aktuell arbetskatalog"
 
@@ -9579,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:1075
+#: 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:1084
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "Ändringar ej i incheckningskön:"
 
@@ -9686,22 +9900,22 @@ msgstr "ändrat innehåll, "
 msgid "untracked content, "
 msgstr "ospårat innehåll, "
 
-#: wt-status.c:908
+#: 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:939
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "Undermoduler ändrade men inte uppdaterade:"
 
-#: wt-status.c:941
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "Undermodulers ändringar att checka in:"
 
-#: wt-status.c:1023
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -9709,7 +9923,7 @@ msgstr ""
 "Raden ovan får inte ändras eller tas bort.\n"
 "Allt under den kommer tas bort."
 
-#: wt-status.c:1115
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -9720,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:1145
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "Du har ej sammanslagna sökvägar."
 
-#: wt-status.c:1148
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (rätta konflikter och kör \"git commit\")"
 
-#: wt-status.c:1150
+#: 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:1154
+#: 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:1157
+#: 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:1166
+#: 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:1169
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "Aktuell patch är tom."
 
-#: wt-status.c:1173
+#: 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:1175
+#: 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:1177
+#: 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:1310
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo saknas."
 
-#: wt-status.c:1312
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "Inga kommandon utförda."
 
-#: wt-status.c:1315
+#: 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:1326
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (se fler i filen %s)"
 
-#: wt-status.c:1331
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "Inga kommandon återstår."
 
-#: wt-status.c:1334
+#: 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:1342
+#: 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:1354
+#: 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:1359
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "Du håller på med en ombasering."
 
-#: wt-status.c:1372
+#: 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:1374
+#: 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:1376
+#: 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:1383
+#: 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:1387
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9828,155 +10049,159 @@ msgstr ""
 "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
 "ovanpå \"%s\"."
 
-#: wt-status.c:1392
+#: 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:1395
+#: 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:1399
+#: 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:1404
+#: 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:1407
+#: 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:1409
+#: 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:1420
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "Cherry-pick pågår."
 
-#: wt-status.c:1423
+#: 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:1430
+#: 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:1433
+#: 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:1436
+#: 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:1438
+#: 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:1440
+#: 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:1450
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "Ångring pågår."
 
-#: wt-status.c:1453
+#: 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:1459
+#: 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:1462
+#: 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:1465
+#: 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:1467
+#: 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:1469
+#: 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:1479
+#: 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:1483
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "Du håller på med en \"bisect\"."
 
-#: wt-status.c:1486
+#: 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:1497
+#: wt-status.c:1559
+msgid "You are in a sparse checkout."
+msgstr "Du är i en gles utcheckning."
+
+#: 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:1736
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "PÃ¥ grenen "
 
-#: wt-status.c:1743
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "interaktiv ombasering pågår; ovanpå "
 
-#: wt-status.c:1745
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "ombasering pågår; ovanpå "
 
-#: wt-status.c:1750
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "HEAD frånkopplad vid "
 
-#: wt-status.c:1752
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "HEAD frånkopplad från "
 
-#: wt-status.c:1755
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "Inte på någon gren för närvarande."
 
-#: wt-status.c:1772
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Första incheckning"
 
-#: wt-status.c:1773
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "Inga incheckningar ännu"
 
-#: wt-status.c:1787
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "Ospårade filer"
 
-#: wt-status.c:1789
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Ignorerade filer"
 
-#: wt-status.c:1793
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9988,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:1799
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Ospårade filer visas ej%s"
 
-#: wt-status.c:1801
+#: 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:1807
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "Inga ändringar"
 
-#: wt-status.c:1812
+#: 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:1816
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "inga ändringar att checka in\n"
 
-#: wt-status.c:1820
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -10022,85 +10247,85 @@ msgstr ""
 "inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
 "\")\n"
 
-#: wt-status.c:1824
+#: 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:1828
+#: 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:1832 wt-status.c:1838
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "inget att checka in\n"
 
-#: wt-status.c:1835
+#: 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:1840
+#: 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:1945
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "Inga incheckningar ännu på "
 
-#: wt-status.c:1949
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (ingen gren)"
 
-#: wt-status.c:1980
+#: wt-status.c:2050
 msgid "different"
 msgstr "olika"
 
-#: wt-status.c:1982 wt-status.c:1990
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "efter "
 
-#: wt-status.c:1985 wt-status.c:1988
+#: 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:2511
+#: 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:2517
+#: 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:2519
+#: 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:178
+#: 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:185
+#: 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:862
+#: 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:874
+#: 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\""
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "misslyckades ta bort länken \"%s\""
@@ -10109,131 +10334,136 @@ msgstr "misslyckades ta bort länken \"%s\""
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<flaggor>] [--] <sökväg>..."
 
-#: builtin/add.c:61
+#: builtin/add.c:64
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "kan inte utföra chmod %cx \"%s\""
 
-#: builtin/add.c:99
+#: builtin/add.c:106
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "diff-status %c förväntades inte"
 
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
 msgid "updating files failed"
 msgstr "misslyckades uppdatera filer"
 
-#: builtin/add.c:114
+#: builtin/add.c:121
 #, c-format
 msgid "remove '%s'\n"
 msgstr "ta bort \"%s\"\n"
 
-#: builtin/add.c:198
+#: builtin/add.c:205
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
 
-#: builtin/add.c:307 builtin/rev-parse.c:991
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Kunde inte läsa indexet"
 
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Kunde inte öppna \"%s\" för skrivning."
-
-#: builtin/add.c:322
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "Kunde inte skriva patch"
 
-#: builtin/add.c:325
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "redigering av patch misslyckades"
 
-#: builtin/add.c:328
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Kunde inte ta status på \"%s\""
 
-#: builtin/add.c:330
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "Tom patch. Avbryter."
 
-#: builtin/add.c:335
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Kunde inte tillämpa \"%s\""
 
-#: builtin/add.c:343
+#: 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:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: 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:366
+#: 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:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "välj stycken interaktivt"
 
-#: builtin/add.c:368
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "redigera aktuell diff och applicera"
 
-#: builtin/add.c:369
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "tillåt lägga till annars ignorerade filer"
 
-#: builtin/add.c:370
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "uppdatera spårade filer"
 
-#: builtin/add.c:371
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "åternormalisera radslut i spårade filer (implicerar -u)"
 
-#: builtin/add.c:372
+#: 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:373
+#: 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:376
+#: 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:378
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "lägg inte till, uppdatera endast indexet"
 
-#: builtin/add.c:379
+#: 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:380
+#: 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:382 builtin/update-index.c:1006
+#: 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: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:384
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "varna när ett inbyggt arkiv läggs till"
 
-#: builtin/add.c:386
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "bakända för \"git stash -p\""
 
-#: builtin/add.c:404
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10264,12 +10494,12 @@ msgstr ""
 "\n"
 "Se \"git help submodule\" för ytterligare information."
 
-#: builtin/add.c:432
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "lägger till inbäddat git-arkiv: %s"
 
-#: builtin/add.c:451
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10279,51 +10509,27 @@ msgstr ""
 "Slå av detta meddelande med\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:460
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "misslyckades lägga till filer"
 
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run är inkompatibelt med --interactive/--patch"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file är inkompatibelt med --edit"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A och -u är ömsesidigt inkompatibla"
-
-#: builtin/add.c:522
-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:526
+#: 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:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"
+msgstr "\"--chmod\"-parametern \"%s\" måste antingen vara -x eller +x"
 
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
-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:555
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Inget angivet, inget tillagt.\n"
 
-#: builtin/add.c:557
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10333,109 +10539,117 @@ msgstr ""
 "Slå av detta meddelande genom att köra\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:364
+#: 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:454
+#: 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:496
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Felaktig indatarad: \"%s\"."
 
-#: builtin/am.c:534
+#: 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:560
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "\"fseek\" misslyckades"
 
-#: builtin/am.c:748
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "kunde inte tolka patchen \"%s\""
 
-#: builtin/am.c:813
+#: 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:861
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "ogiltig tidsstämpel"
 
-#: builtin/am.c:866 builtin/am.c:878
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "ogiltig \"Date\"-rad"
 
-#: builtin/am.c:873
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "ogiltig tidszons-offset"
 
-#: builtin/am.c:966
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "Misslyckades detektera patchformat."
 
-#: builtin/am.c:971 builtin/clone.c:414
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "misslyckades skapa katalogen \"%s\""
 
-#: builtin/am.c:976
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Misslyckades dela patchar."
 
-#: builtin/am.c:1125
+#: 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:1126
+#: 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:1127
+#: 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:1222
+#: 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:1250
-msgid "Patch is empty."
-msgstr "Patchen är tom."
-
-#: builtin/am.c:1315
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "saknad \"author\"-rad i incheckningen %s"
 
-#: builtin/am.c:1318
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "ogiltig ident-rad: %.*s"
 
-#: builtin/am.c:1537
+#: 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:1539
+#: 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:1558
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10443,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:1564
+#: 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:1590
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "Misslyckades slå ihop ändringarna."
 
-#: builtin/am.c:1622
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "tillämpar på en tom historik"
 
-#: builtin/am.c:1674 builtin/am.c:1678
+#: 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:1696
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "Incheckningskroppen är:"
 
@@ -10469,41 +10683,59 @@ msgstr "Incheckningskroppen är:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1706
+#: 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:1752 builtin/commit.c:408
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "kan inte skriva indexfil"
 
-#: builtin/am.c:1756
+#: 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:1796 builtin/am.c:1864
+#: 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:1813
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "Inga ändringar -- Patchen har redan tillämpats."
 
-#: builtin/am.c:1819
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Patch misslyckades på %s %.*s"
 
-#: builtin/am.c:1823
+#: 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:1867
+#: 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"
@@ -10513,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:1874
+#: 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 "
@@ -10525,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:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
-#: builtin/reset.c:355
+#: 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:2033
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "misslyckades städa upp indexet"
 
-#: builtin/am.c:2077
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10543,159 +10775,167 @@ msgstr ""
 "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
 "Återställer inte till ORIG_HEAD"
 
-#: builtin/am.c:2184
+#: 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:2226
+#: 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:2230
+#: 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:2261
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2268
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "kör interaktivt"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "historisk flagga -- no-op"
 
-#: builtin/am.c:2272
+#: 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:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:948
+#: 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:2275
+#: 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:2278
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "koda om till utf8 (standard)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "sänd flaggan -k till git-mailinfo"
 
-#: builtin/am.c:2282
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "sänd flaggan -b till git-mailinfo"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "sänd flaggan -m till git-mailinfo"
 
-#: builtin/am.c:2286
+#: 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:2289
+#: 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:2292
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "ta bort allting före en saxlinje"
 
-#: builtin/am.c:2294
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "sänd det genom git-mailinfo"
 
-#: builtin/am.c:2297 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:2324
+#: 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:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
+#: 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:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: 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:2321
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "format för patch(ar)"
 
-#: builtin/am.c:2327
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
 msgstr "överstyr felmeddelanden när patchfel uppstår"
 
-#: builtin/am.c:2329
+#: 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:2332
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "synonymer till --continue"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "hoppa över den aktuella grenen"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr "återställ originalgrenen och avbryt patchningen"
 
-#: builtin/am.c:2341
+#: 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:2345
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "visa patchen som tillämpas"
 
-#: builtin/am.c:2350
+#: 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:2352
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr "använd nuvarande tidsstämpel för författardatum"
 
-#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: 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:2355 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "GPG-signera incheckningar"
 
-#: builtin/am.c:2358
+#: 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:2376
+#: 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."
@@ -10703,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:2383
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr "misslyckades läsa indexet"
 
-#: builtin/am.c:2398
+#: 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:2422
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -10721,11 +10961,11 @@ msgstr ""
 "Kvarbliven katalog %s hittades.\n"
 "Använd \"git am --abort\" för att ta bort den."
 
-#: builtin/am.c:2428
+#: 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:2438
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "interaktivt läge kräver patchar på kommandoraden"
 
@@ -10733,51 +10973,41 @@ msgstr "interaktivt läge kräver patchar på kommandoraden"
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<flaggor>] [<patch>...]"
 
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "kunde inte skapa arkivfilen \"%s\""
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "kunde inte omdirigera utdata"
 
-#: builtin/archive.c:37
+#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Fjärr utan URL"
 
-#: builtin/archive.c:61
+#: builtin/archive.c:59
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive: förväntade ACK/NAK, fick flush-paket"
 
-#: builtin/archive.c:64
+#: builtin/archive.c:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: NACK %s"
 
-#: builtin/archive.c:65
+#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive: protokollfel"
 
-#: builtin/archive.c:69
+#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive: förväntade en tömning (flush)"
 
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<incheckning>]"
 
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <term-för-rätt> <term-för-fel> <eterm>"
-
 #: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
 msgstr ""
-"git-bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
 
 #: builtin/bisect--helper.c:26
@@ -10810,46 +11040,59 @@ msgstr "git bisect--helper --bisect-replay <filnamn>"
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<incheckning>|<intervall>)...]"
 
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <kommando>..."
+
+#: builtin/bisect--helper.c:109
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr "kan inte kopiera filen \"%s\" i läget \"%s\""
 
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "kunde inte skriva till filen \"%s\""
 
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "kan inte öppna filen \"%s\" för läsning"
+
+#: builtin/bisect--helper.c:170
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "\"%s\" är inte en giltig term"
 
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "kan inte använda det inbyggda kommandot \"%s\" som term"
 
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "kan inte ändra betydelsen av termen \"%s\""
 
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
 msgid "please use two different terms"
 msgstr "termerna måste vara olika"
 
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "Vi utför ingen bisect för tillfället.\n"
 
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "\"%s\" är inte en giltig incheckning"
 
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10857,27 +11100,27 @@ msgstr ""
 "Kunde inte checka ut original-HEAD \"%s\". Försök \"git bisect reset "
 "<incheckning>\"."
 
-#: builtin/bisect--helper.c:254
+#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Felaktigt argument till bisect_write: %s"
 
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "kan inte läsa oid för referensen \"%s\""
 
-#: builtin/bisect--helper.c:271
+#: builtin/bisect--helper.c:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "kunde inte öppna filen \"%s\""
 
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:314
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "Ogiltigt kommando: du utför just nu en \"bisect\" med %s/%s."
 
-#: builtin/bisect--helper.c:324
+#: builtin/bisect--helper.c:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -10886,7 +11129,7 @@ msgstr ""
 "Du måste ange åtminstone en %s och en %s version.\n"
 "(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)"
 
-#: builtin/bisect--helper.c:328
+#: builtin/bisect--helper.c:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -10897,7 +11140,7 @@ msgstr ""
 "Du måste sedan ange åtminstone en %s och en %s version.\n"
 "(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)"
 
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "utför bisect med endast en %s incheckning"
@@ -10906,15 +11149,15 @@ msgstr "utför bisect med endast en %s incheckning"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "Är du säker [Y=ja/N=nej]? "
 
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
 msgid "no terms defined"
 msgstr "inga termer angivna"
 
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -10923,7 +11166,7 @@ msgstr ""
 "Aktuella termer är %s för det gamla tillståndet\n"
 "och %s för det nya tillståndet.\n"
 
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -10932,54 +11175,54 @@ msgstr ""
 "ogiltigt argument %s för \"git bisect terms\".\n"
 "Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new."
 
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
 msgstr "misslyckades starta revisionstraversering\n"
 
-#: builtin/bisect--helper.c:519
+#: builtin/bisect--helper.c:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "kunde inte öppna \"%s\" för tillägg"
 
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
 msgstr "\"\" är inte en giltig term"
 
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "okänd flagga: %s"
 
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "\"%s\" verkar inte vara en giltig revision"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "felaktigt HEAD - Jag behöver ett HEAD"
 
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 "misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"."
 
 # cogito-relaterat
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts"
 
-#: builtin/bisect--helper.c:735
+#: builtin/bisect--helper.c:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "felaktigt HEAD - konstig symbolisk referens"
 
-#: builtin/bisect--helper.c:755
+#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "ogiltig referens: \"%s\""
 
-#: builtin/bisect--helper.c:813
+#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "Du måste starta med \"git bisect start\"\n"
 
@@ -10987,104 +11230,151 @@ msgstr "Du måste starta med \"git bisect start\"\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]? "
 
-#: builtin/bisect--helper.c:842
+#: builtin/bisect--helper.c:859
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr "Anropa \"--bisect-state\" med minst ett argument."
 
-#: builtin/bisect--helper.c:855
+#: builtin/bisect--helper.c:872
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "\"git bisect %s\" kan bara ta ett argument."
 
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "Felaktig rev-indata: %s"
 
-#: builtin/bisect--helper.c:887
+#: builtin/bisect--helper.c:904
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "Felaktig rev-indata (ej incheckning): %s"
 
-#: builtin/bisect--helper.c:919
+#: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
 msgstr "Vi utför ingen bisect för tillfället."
 
-#: builtin/bisect--helper.c:969
+#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "\"%s\"?? vad menar du?"
 
-#: builtin/bisect--helper.c:981
+#: builtin/bisect--helper.c:998
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr "kan inte läsa filen \"%s\" för återuppspelning"
 
-#: builtin/bisect--helper.c:1054
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "bisect-körning misslyckades: inget kommando gavs."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "kör %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+"\"bisect\"-körningen misslyckades: felkod %d från \"%s\" är < 0 eller >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "kan inte öppna \"%s\" för skrivning"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "\"bisect\"-körningen kan inte fortsätta längre"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "\"bisect\"-körningen lyckades"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "bisect hittade första trasiga incheckning"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"\"bisect\"-körningen misslyckades: \"git bisect--helper --bisect-state %s\" "
+"avslutades med felkoden %d"
+
+#: builtin/bisect--helper.c:1192
 msgid "reset the bisection state"
 msgstr "återställ bisect-tillstånd"
 
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1194
 msgid "check whether bad or good terms exist"
 msgstr "se efter om termer för rätt och fel finns"
 
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1196
 msgid "print out the bisect terms"
 msgstr "skriv ut termer för bisect"
 
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1198
 msgid "start the bisect session"
 msgstr "påbörja bisect-körningen"
 
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1200
 msgid "find the next bisection commit"
 msgstr "hitta nästa incheckning i bisect"
 
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1202
 msgid "mark the state of ref (or refs)"
 msgstr "markera tillståndet för en eller flera referenser"
 
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1204
 msgid "list the bisection steps so far"
 msgstr "lista \"bisect\"-stegen som utförts så långt"
 
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1206
 msgid "replay the bisection process from the given file"
 msgstr "spela upp \"bisect\"-processen från angiven fil"
 
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1208
 msgid "skip some commits for checkout"
 msgstr "hoppa över ett par incheckningar"
 
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "visualisera \"bisect\"-körningen"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "använd <kommando>... för att utföra \"bisect\" automatiskt."
+
+#: builtin/bisect--helper.c:1214
 msgid "no log for BISECT_WRITE"
 msgstr "ingen logg för BISECT_WRITE"
 
-#: builtin/bisect--helper.c:1087
+#: builtin/bisect--helper.c:1229
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset kräver antingen inget argument eller en incheckning"
 
-#: builtin/bisect--helper.c:1092
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check kräver 2 eller 3 argument"
-
-#: builtin/bisect--helper.c:1098
+#: builtin/bisect--helper.c:1234
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms kräver noll eller ett argument"
 
-#: builtin/bisect--helper.c:1107
+#: builtin/bisect--helper.c:1243
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next kräver 0 argument"
 
-#: builtin/bisect--helper.c:1118
+#: builtin/bisect--helper.c:1254
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log kräver 0 argument"
 
-#: builtin/bisect--helper.c:1123
+#: builtin/bisect--helper.c:1259
 msgid "no logfile given"
 msgstr "ingen loggfil angiven"
 
@@ -11096,150 +11386,152 @@ msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "förväntade en färg: %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "måste sluta med en färg"
 
-#: builtin/blame.c:728
+#: builtin/blame.c:724
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "felaktig färg \"%s\" i color.blame.repeatedLines"
 
-#: builtin/blame.c:746
+#: builtin/blame.c:742
 msgid "invalid value for blame.coloring"
 msgstr "ogiltigt värde för blame.coloring"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:841
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "kan inte hitta revision %s att ignorera"
 
-#: builtin/blame.c:867
+#: builtin/blame.c:863
 msgid "show blame entries as we find them, incrementally"
 msgstr "visa klandringsposter när vi hittar dem, interaktivt"
 
-#: builtin/blame.c:868
+#: builtin/blame.c:864
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr "visa inte objektnamn för gränsincheckningar (Standard: av)"
 
-#: builtin/blame.c:869
+#: builtin/blame.c:865
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "vehandla inte rotincheckningar som gränser (Standard: av)"
 
-#: builtin/blame.c:870
+#: builtin/blame.c:866
 msgid "show work cost statistics"
 msgstr "visa statistik över arbetskostnad"
 
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: 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"
 
-#: builtin/blame.c:872
+#: builtin/blame.c:868
 msgid "show output score for blame entries"
 msgstr "visa utdatapoäng för klandringsposter"
 
-#: builtin/blame.c:873
+#: builtin/blame.c:869
 msgid "show original filename (Default: auto)"
 msgstr "visa originalfilnamn (Standard: auto)"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:870
 msgid "show original linenumber (Default: off)"
 msgstr "visa ursprungligt radnummer (Standard: av)"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:871
 msgid "show in a format designed for machine consumption"
 msgstr "visa i ett format avsett för maskinkonsumtion"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:872
 msgid "show porcelain format with per-line commit information"
 msgstr "visa porslinsformat med per-rad-incheckningsinformation"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:873
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr "använd samma utdataläge som git-annotate (Standard: av)"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:874
 msgid "show raw timestamp (Default: off)"
 msgstr "visa rå tidsstämpel (Standard: av)"
 
-#: builtin/blame.c:879
+#: builtin/blame.c:875
 msgid "show long commit SHA1 (Default: off)"
 msgstr "visa lång inchecknings-SHA1 (Standard: av)"
 
-#: builtin/blame.c:880
+#: builtin/blame.c:876
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "undertryck författarnamn och tidsstämpel (Standard: av)"
 
-#: builtin/blame.c:881
+#: builtin/blame.c:877
 msgid "show author email instead of name (Default: off)"
 msgstr "visa författarens e-post istället för namn (Standard: av)"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:878
 msgid "ignore whitespace differences"
 msgstr "ignorera ändringar i blanksteg"
 
-#: builtin/blame.c:883 builtin/log.c:1820
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "incheckning"
 
-#: builtin/blame.c:883
+#: builtin/blame.c:879
 msgid "ignore <rev> when blaming"
 msgstr "ignorera <incheckning> vid klandringen"
 
-#: builtin/blame.c:884
+#: builtin/blame.c:880
 msgid "ignore revisions from <file>"
 msgstr "ignorera incheckningar från <fil>"
 
-#: builtin/blame.c:885
+#: builtin/blame.c:881
 msgid "color redundant metadata from previous line differently"
 msgstr "färglägg redundant metadata från tidigare rader annorlunda"
 
-#: builtin/blame.c:886
+#: builtin/blame.c:882
 msgid "color lines by age"
 msgstr "färglägg rader efter ålder"
 
-#: builtin/blame.c:887
+#: builtin/blame.c:883
 msgid "spend extra cycles to find better match"
 msgstr "slösa extra cykler med att hitta bättre träff"
 
-#: builtin/blame.c:888
+#: builtin/blame.c:884
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "använd revisioner från <fil> istället för att anropa git-rev-list"
 
-#: builtin/blame.c:889
+#: builtin/blame.c:885
 msgid "use <file>'s contents as the final image"
 msgstr "använd <fil>s innehåll som slutgiltig bild"
 
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
 msgid "score"
 msgstr "poäng"
 
-#: builtin/blame.c:890
+#: builtin/blame.c:886
 msgid "find line copies within and across files"
 msgstr "hitta kopierade rader inuti och mellan filer"
 
-#: builtin/blame.c:891
+#: builtin/blame.c:887
 msgid "find line movements within and across files"
 msgstr "hitta flyttade rader inuti och mellan filer"
 
-#: builtin/blame.c:892
+#: builtin/blame.c:888
 msgid "range"
 msgstr "intervall"
 
-#: builtin/blame.c:893
+#: builtin/blame.c:889
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
 "behandla endast intervallet <start>,<slut> eller funktionen :<funknamn>"
 
-#: builtin/blame.c:945
+#: 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"
 
@@ -11251,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:996
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "4 år, 11 månader sedan"
 
-#: builtin/blame.c:1112
+#: 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:1157
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "Klandra rader"
 
@@ -11294,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"
@@ -11303,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"
@@ -11312,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"
@@ -11326,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"
 
@@ -11338,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:440 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:471
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "kunde inte slå upp HEAD"
 
-#: builtin/branch.c:477
+#: 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:492
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Grenen %s ombaseras på %s"
 
-#: builtin/branch.c:496
+#: 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:513
+#: 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:515
+#: 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:526
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Felaktigt namn på gren: \"%s\""
 
-#: builtin/branch.c:555
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "Misslyckades byta namn på gren"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "Misslyckades kopiera gren"
 
-#: builtin/branch.c:561
+#: 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:564
+#: 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:570
+#: 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:579
+#: builtin/branch.c:584
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:586
 msgid "Branch is copied, but update of config-file failed"
 msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"
 
-#: builtin/branch.c:597
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11442,211 +11734,207 @@ msgstr ""
 "  %s\n"
 "Rader som inleds med \"%c\" ignoreras.\n"
 
-#: builtin/branch.c:631
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Allmänna flaggor"
 
-#: builtin/branch.c:633
+#: 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:634
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "undertryck informationsmeddelanden"
 
-#: builtin/branch.c:635
-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:637
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "använd ej"
 
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "uppströms"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "ändra uppströmsinformationen"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "ta bort uppströmsinformationen"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "använd färgad utdata"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "arbeta på fjärrspårande grenar"
 
-#: builtin/branch.c:644 builtin/branch.c:646
+#: 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:645 builtin/branch.c:647
+#: 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:650
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "Specifika git-branch-åtgärder:"
 
-#: builtin/branch.c:651
+#: 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:653
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "ta bort helt sammanslagen gren"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "ta bort gren (även om inte helt sammanslagen)"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr "flytta/ta bort en gren och dess reflogg"
 
-#: builtin/branch.c:656
+#: 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:657
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "kopiera en gren och dess reflogg"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "kopiera en gren, även om målet finns"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "lista namn på grenar"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "visa namn på aktuell gren"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "skapa grenens reflogg"
 
-#: builtin/branch.c:663
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "redigera beskrivning för grenen"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "tvinga skapande, flytt/namnändring, borttagande"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "visa endast sammanslagna grenar"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "visa endast ej sammanslagna grenar"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "visa grenar i spalter"
 
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: 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:670
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "visa endast grenar för objektet"
 
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: 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:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: 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:695 builtin/clone.c:794
+#: 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:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column och --verbose är inkompatibla"
-
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "grennamn krävs"
 
-#: builtin/branch.c:766
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "Kan inte beskriva frånkopplad HEAD"
 
-#: builtin/branch.c:771
+#: 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:778
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Inga incheckningar på grenen \"%s\" ännu."
 
-#: builtin/branch.c:781
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Ingen gren vid namnet \"%s\"."
 
-#: builtin/branch.c:796
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "för många grenar för kopiering"
 
-#: builtin/branch.c:805
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "för många flaggor för namnbyte"
 
-#: builtin/branch.c:810
+#: 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:814
+#: 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:817 builtin/branch.c:840
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "okänd gren \"%s\""
 
-#: builtin/branch.c:821
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "grenen \"%s\" finns inte"
 
-#: builtin/branch.c:834
+#: 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:838
+#: 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:844
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Grenen \"%s\" har ingen uppströmsinformation"
 
-#: builtin/branch.c:854
+#: 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>?"
@@ -11654,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:858
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -11662,32 +11950,32 @@ msgstr ""
 "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
 "eller --set-upstream-to istället."
 
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "git version:\n"
 
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "uname() misslyckades med felet \"%s\" (%d)\n"
 
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
 msgid "compiler info: "
 msgstr "kompilatorinfo:"
 
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "libc-info:"
 
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
 msgid "not run from a git repository - no hooks to show\n"
 msgstr "körs inte från ett git-arkiv - inga krokar att visa\n"
 
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory <fil>] [-s|--suffix <format>]"
 
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -11723,38 +12011,33 @@ msgstr ""
 "Se över resten av felrapporten nedan.\n"
 "Du kan ta bort rader du inte vill dela.\n"
 
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
 msgid "specify a destination for the bugreport file"
 msgstr "ange mål för buggrapporteringsfilen"
 
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
 msgid "specify a strftime format suffix for the filename"
 msgstr "ange ett filändelse i strftime-format"
 
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "kunde inte skapa inledande kataloger för \"%s\""
 
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "Systeminfo"
 
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "Aktiverade krokar"
 
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "kunde inte skapa filen på \"%s\""
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "kunde inte skriva till %s"
 
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "Skapade ny rapport på \"%s\"\n"
@@ -11775,53 +12058,53 @@ msgstr "git bundle list-heads <fil> [<refnamn>...]"
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <fil> [<refnamn>...]"
 
-#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
 msgid "do not show progress meter"
 msgstr "visa inte förloppsindikator"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
 msgid "show progress meter"
 msgstr "visa förloppsindikator"
 
-#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
 msgid "show progress meter during object writing phase"
 msgstr "visa förloppsindikator under objektskrivningsfasen"
 
-#: builtin/bundle.c:74 builtin/pack-objects.c:3754
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "som --all-progress när förloppsindikatorn visas"
 
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
 msgid "specify bundle format version"
-msgstr "ange formatversion för paket (bundle)."
+msgstr "ange formatversion för bunten."
 
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
-msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."
+msgstr "Behöver ett arkiv för att skapa en bunt."
 
 #: builtin/bundle.c:107
 msgid "do not show bundle details"
-msgstr "visa inte paketdetaljer"
+msgstr "visa inte buntdetaljer"
 
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s är okej\n"
 
-#: builtin/bundle.c:163
+#: builtin/bundle.c:182
 msgid "Need a repository to unbundle."
-msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
+msgstr "Behöver ett arkiv för att packa upp en bunt."
 
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "var pratsam; måste skrivas före ett underkommando"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Packar upp objektbunt"
 
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Okänt underkommando: %s"
 
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:622
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11829,7 +12112,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>"
 
-#: builtin/cat-file.c:599
+#: builtin/cat-file.c:623
 msgid ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
@@ -11837,72 +12120,72 @@ msgstr ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:644
 msgid "only one batch option may be specified"
 msgstr "endast en buntflagga kan anges"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<typ> kan vara en av: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
 msgid "show object type"
 msgstr "visa objekttyp"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
 msgid "show object size"
 msgstr "visa objektstorlek"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
 msgid "exit with zero when there's no error"
 msgstr "avsluta med noll när det inte uppstått något fel"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
 msgid "pretty-print object's content"
 msgstr "visa objektets innehåll snyggt"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
 msgid "for blob objects, run textconv on object's content"
 msgstr "för blob-objekt, kör filter på objektets innehåll"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
 msgid "for blob objects, run filters on object's content"
 msgstr "för blob-objekt, kör filger på objektets innehåll"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
 msgid "use a specific path for --textconv/--filters"
 msgstr "använd specifik sökväg för --textconv/--filters"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt"
 
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
 msgid "buffer --batch output"
 msgstr "buffra utdata från --batch"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
 msgid "show info and content of objects fed from the standard input"
 msgstr "visa information och innehåll för objekt som listas på standard in"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
 msgid "show info about objects fed from the standard input"
 msgstr "visa information för objekt som listas på standard in"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "följ symboliska länkar i trädet (använd med --batch eller --batch-check)"
 
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
 msgid "show all objects with --batch or --batch-check"
 msgstr "visa alla objekt med --batch eller --batch-check"
 
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:690
 msgid "do not order --batch-all-objects output"
 msgstr "ordna inte --batch-all-objects output"
 
@@ -11922,7 +12205,7 @@ msgstr "visa alla attribut som satts på filen"
 msgid "use .gitattributes only from the index"
 msgstr "använd .gitattributes endast från indexet"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "läs filnamn från standard in"
 
@@ -11930,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:1520 builtin/gc.c:549
-#: builtin/worktree.c:491
+#: 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"
 
@@ -11989,9 +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/submodule--helper.c:1825
-#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836
-#: builtin/submodule--helper.c:2334 builtin/worktree.c:719
+#: 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"
 
@@ -12055,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:414
+#: 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:419
+#: 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:426
+#: 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:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: 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:462 builtin/checkout.c:465
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "\"%s\" kan inte användas med %s"
-
-#: builtin/checkout.c:469
+#: 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:473
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "varken \"%s\" eller \"%s\" har angivits"
 
-#: builtin/checkout.c:477
+#: 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:482 builtin/checkout.c:487
+#: 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:563 builtin/checkout.c:570
+#: 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:739
+#: 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:793
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12155,50 +12434,50 @@ msgstr ""
 "kan inte fortsätta med köade ändringar i följande filer:\n"
 "%s"
 
-#: builtin/checkout.c:886
+#: 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:928
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD är nu på"
 
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
+#: 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:936
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Återställ gren \"%s\"\n"
 
-#: builtin/checkout.c:939
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Redan på \"%s\"\n"
 
-#: builtin/checkout.c:943
+#: 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:945 builtin/checkout.c:1376
+#: 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:947
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Växlade till grenen \"%s\"\n"
 
-#: builtin/checkout.c:998
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... och %d till.\n"
 
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12221,7 +12500,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1023
+#: 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"
@@ -12248,19 +12527,19 @@ msgstr[1] ""
 " git branch <nytt_grennamn> %s\n"
 "\n"
 
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "internt fel vid genomgång av revisioner (revision walk)"
 
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "Tidigare position för HEAD var"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: 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:1184
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12269,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:1191
+#: 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"
@@ -12289,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:1201
+#: 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:1267
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "endast en referens förväntades"
 
-#: builtin/checkout.c:1284
+#: 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:1330 builtin/worktree.c:270 builtin/worktree.c:438
+#: 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:1343 builtin/checkout.c:1709
+#: 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:1390
+#: 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:1392
+#: 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:1393 builtin/checkout.c:1401
+#: 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:1396
+#: 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:1412
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12341,7 +12620,7 @@ msgstr ""
 "kan inte växla gren vid sammanslagning\n"
 "Överväg \"git merge --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1416
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12349,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:1420
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12357,7 +12636,7 @@ msgstr ""
 "kan inte växla gren vid ombasering\n"
 "Överväg \"git rebase --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1424
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12365,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:1428
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12373,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:1432
+#: 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:1439
+#: 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:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: 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:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: 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:1467
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "\"%s\" kan inte ta <startpunkt>"
 
-#: builtin/checkout.c:1475
+#: 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:1482
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "saknar gren- eller incheckingsargument"
 
-#: builtin/checkout.c:1525
+#: 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:1526 builtin/log.c:1807 parse-options.h:323
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "stil"
 
-#: builtin/checkout.c:1527
-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:1539 builtin/worktree.c:488
+#: 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:1540
-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:1542
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "ny-gren"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "ny gren utan förälder"
 
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "uppdatera ignorerade filer (standard)"
 
-#: builtin/checkout.c:1549
+#: 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:1562
+#: 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:1565
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "checka ut deras version för ej sammanslagna filer"
 
-#: builtin/checkout.c:1569
+#: 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:1624
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande"
-
-#: builtin/checkout.c:1628
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p och --overlay ä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:1665
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track behöver ett namn på en gren"
 
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "grennamn saknas; försök med -%c"
 
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "kunde inte upplösa %s"
 
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "felaktig sökvägsangivelse"
 
-#: builtin/checkout.c:1725
+#: 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:1729
+#: 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:1738
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file är inkompatibelt med --detach"
-
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file är inkompatibelt med --patch"
-
-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -12513,70 +12780,71 @@ msgstr ""
 "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
 "du checkar ut från indexet."
 
-#: builtin/checkout.c:1759
+#: 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:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484
+#: 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:1786
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "skapa och checka ut en ny gren"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "skapa/nollställ och checka ut en gren"
 
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "skapa reflogg för ny gren"
 
-#: builtin/checkout.c:1791
+#: 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:1792
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "använd överläggsläge (standard)"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "skapa och växla till en ny gren"
 
-#: builtin/checkout.c:1839
+#: 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:1841
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "förutspå \"git checkout <gren-saknas>\""
 
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "kasta bort lokala ändringar"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "vilken träd-igt att checka ut från"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "återställ indexet"
 
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "återställ arbetskatalogen (förval)"
 
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "ignorera ej sammanslagna poster"
 
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "använd överläggsläge"
 
@@ -12612,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:302 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"
@@ -12625,7 +12901,7 @@ msgstr ""
 "foo        - markera post baserad på unikt prefix\n"
 "           - (tomt) markera ingenting\n"
 
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12646,33 +12922,33 @@ msgstr ""
 "*          - välj alla poster\n"
 "           - (tomt) avsluta markering\n"
 
-#: builtin/clean.c:521 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:661
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Ange ignoreringsmönster>>"
 
-#: builtin/clean.c:696
+#: 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:717
+#: 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:758
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Ta bort %s [Y=ja / N=nej]? "
 
-#: builtin/clean.c:789
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12690,52 +12966,52 @@ msgstr ""
 "help                - denna skärm\n"
 "?                   - hjälp för kommandoval"
 
-#: builtin/clean.c:825
+#: 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:841
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Inga fler filer att städa, avslutar."
 
-#: builtin/clean.c:903
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "skriv inte ut namn på borttagna filer"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:928
 msgid "force"
 msgstr "tvinga"
 
-#: builtin/clean.c:906
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "städa interaktivt"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "ta bort hela kataloger"
 
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: 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:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "mönster"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "lägg till <mönster> till ignoreringsregler"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "ta även bort ignorerade filer"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "ta endast bort ignorerade filer"
 
-#: builtin/clean.c:929
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -12743,7 +13019,7 @@ msgstr ""
 "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
 "städa"
 
-#: builtin/clean.c:932
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -12751,7 +13027,7 @@ msgstr ""
 "clean.requireForce har standardvärdet true och varken -i, -n eller -f "
 "angavs; vägrar städa"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x och -X kan inte användas samtidigt"
 
@@ -12767,7 +13043,7 @@ msgstr "klona inte grunt arkiv"
 msgid "don't create a checkout"
 msgstr "skapa inte någon utcheckning"
 
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "skapa ett naket (\"bare\") arkiv"
 
@@ -12799,27 +13075,29 @@ msgstr "initiera undermoduler i klonen"
 msgid "number of submodules cloned in parallel"
 msgstr "antal undermoduler som klonas parallellt"
 
-#: builtin/clone.c:116 builtin/init-db.c:538
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "mallkatalog"
 
-#: builtin/clone.c:117 builtin/init-db.c:539
+#: builtin/clone.c:117 builtin/init-db.c:540
 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:1832
-#: builtin/submodule--helper.c:2337
+#: 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:1834
-#: builtin/submodule--helper.c:2339
+#: 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:549
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: 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"
 
@@ -12835,8 +13113,8 @@ 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:863
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
+#: builtin/pull.c:212
 msgid "depth"
 msgstr "djup"
 
@@ -12844,8 +13122,8 @@ 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:3804
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
 msgid "time"
 msgstr "tid"
 
@@ -12853,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/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: 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:215
+#: 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:1844
-#: builtin/submodule--helper.c:2353
+#: 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"
 
@@ -12875,11 +13153,11 @@ msgstr "klona inga taggar och gör att senare hämtningar inte följer dem"
 msgid "any cloned submodules will be shallow"
 msgstr "klonade undermoduler kommer vara grunda"
 
-#: builtin/clone.c:142 builtin/init-db.c:547
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "gitkat"
 
-#: builtin/clone.c:143 builtin/init-db.c:548
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "separera gitkatalogen från arbetskatalogen"
 
@@ -12891,25 +13169,23 @@ 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/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: 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/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: 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:234
-#: builtin/push.c:585
+#: 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:237
-#: builtin/push.c:587
+#: 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"
 
@@ -12919,52 +13195,44 @@ 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:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Kunde inte gissa katalognamn.\n"
-"Ange en katalog på kommandoraden"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: Kan inte skapa suppleant för \"%s\": %s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:304
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s finns och är ingen katalog"
 
-#: builtin/clone.c:436
+#: builtin/clone.c:322
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "misslyckades starta iterator över \"%s\""
 
-#: builtin/clone.c:467
+#: builtin/clone.c:353
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "misslyckades skapa länken \"%s\""
 
-#: builtin/clone.c:471
+#: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "misslyckades kopiera filen till \"%s\""
 
-#: builtin/clone.c:476
+#: builtin/clone.c:362
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "misslyckades iterera över \"%s\""
 
-#: builtin/clone.c:503
+#: builtin/clone.c:389
 #, c-format
 msgid "done.\n"
 msgstr "klart.\n"
 
-#: builtin/clone.c:517
+#: builtin/clone.c:403
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -12972,149 +13240,149 @@ msgid ""
 msgstr ""
 "Klonen lyckades, men utcheckningen misslyckades.\n"
 "Du kan inspektera det som checkades ut med \"git status\"\n"
-"och försöka med \"git restore -source=HEAD :/\"\n"
+"och försöka med \"git restore --source=HEAD :/\"\n"
 
-#: builtin/clone.c:594
+#: builtin/clone.c:480
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
 
-#: builtin/clone.c:713
+#: builtin/clone.c:597
 #, c-format
 msgid "unable to update %s"
 msgstr "kan inte uppdatera %s"
 
-#: builtin/clone.c:761
+#: builtin/clone.c:645
 msgid "failed to initialize sparse-checkout"
 msgstr "misslyckades initiera sparse-checkout"
 
-#: builtin/clone.c:784
+#: builtin/clone.c:668
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:701
 msgid "unable to checkout working tree"
 msgstr "kunde inte checka ut arbetskatalogen"
 
-#: builtin/clone.c:894
+#: builtin/clone.c:779
 msgid "unable to write parameters to config file"
 msgstr "kunde inte skriva parametrar till konfigurationsfilen"
 
-#: builtin/clone.c:957
+#: builtin/clone.c:842
 msgid "cannot repack to clean up"
 msgstr "kan inte packa om för att städa upp"
 
-#: builtin/clone.c:959
+#: builtin/clone.c:844
 msgid "cannot unlink temporary alternates file"
 msgstr "kunde inte ta bort temporär \"alternates\"-fil"
 
-#: builtin/clone.c:1001 builtin/receive-pack.c:2491
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "För många argument."
 
-#: builtin/clone.c:1005
+#: 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:1018
+#: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "flaggorna --bare och --origin %s ä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:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "arkivet \"%s\" finns inte"
 
-#: builtin/clone.c:1039 builtin/fetch.c:2011
+#: 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"
 
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr "arkivsökvägen \"%s\" finns redan och är inte en tom katalog."
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "arbetsträdet \"%s\" finns redan."
 
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
+#: 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\""
 
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "kunde inte skapa arbetskatalogen \"%s\""
 
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klonar till ett naket arkiv \"%s\"...\n"
 
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klonar till \"%s\"...\n"
 
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr ""
 "clone --recursive är inte kompatibel med --reference och --reference-if-able"
 
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
 
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället."
 
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället."
 
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude ignoreras i lokala kloningar; använd file:// istället."
 
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter ignoreras i lokala kloningar; använd file:// istället."
 
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
 msgid "source repository is shallow, ignoring --local"
 msgstr "källarkivet är grunt, ignorerar --local"
 
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
 msgid "--local is ignored"
 msgstr "--local ignoreras"
 
-#: builtin/clone.c:1337 builtin/clone.c:1345
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr "fjärrtransport rapporterade fel"
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
 
-#: builtin/clone.c:1348
+#: builtin/clone.c:1242
 msgid "You appear to have cloned an empty repository."
 msgstr "Du verkar ha klonat ett tomt arkiv."
 
@@ -13150,13 +13418,13 @@ msgstr "spaltfyllnad mellan spalter"
 msgid "--command must be the first argument"
 msgstr "--command måste vara första argument"
 
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
 msgid ""
 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 "git commit-graph verify [--object-dir <objkat>] [--shallow] [--[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13166,94 +13434,92 @@ msgstr ""
 "split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <delnings-flaggor>"
 
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "kunde inte hitta objektkatalog för %s"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "kat"
 
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr "objektkatalogen där grafen ska lagras"
 
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen"
 
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Kunde inte öppna incheckningsgrafen \"%s\""
 
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "okänt argument för --split, %s"
 
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr "oväntat icke-hexadecimalt objekt-ID: %s"
 
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "ogiltigt objekt: %s"
 
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
 msgid "start walk at all refs"
 msgstr "starta traversering vid alla referenser"
 
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "sök paketindex listade på standard in efter incheckningar"
 
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
 msgid "start walk at commits listed by stdin"
 msgstr "börja gå genom incheckningar listade på standard in"
 
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
 msgstr "ta med alla incheckningar redan i filen commit-graph"
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
 msgid "enable computation for changed paths"
 msgstr "aktivera beräkning av ändrade sökvägar"
 
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
 msgid "allow writing an incremental commit-graph file"
 msgstr "tillåt skriva en inkrementell incheckningsgraffil"
 
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr ""
 "maximalt antal incheckningar i en delad incheckingsgraf som inte är bad"
 
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "maximalt förhållande mellan två nivåer av en delad incheckningsgraf"
 
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
 msgid "only expire files older than a given date-time"
 msgstr "låt tid endast gå ut för filer äldre än givet datum och tid"
 
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr "maximalt antal Bloom-filer med ändrad sökväg att beräkna"
 
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs"
+msgstr "använd som mest en av --reachable, --stdin-commits och --stdin-packs"
 
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
 msgid "Collecting commits from input"
 msgstr "Hämtar incheckningar från indata"
 
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "okänt underkommando: %s"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13267,70 +13533,65 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "duplicerad förälder %s ignorerades"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
+#: 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"
 
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: misslyckades öppna \"%s\""
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree: misslyckades läsa \"%s\""
 
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree: misslyckades stänga \"%s\""
 
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr "förälder"
 
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "id på ett förälderincheckningsobjekt"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
-#: builtin/tag.c:456
+#: 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:115 builtin/commit.c:1614
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "incheckningsmeddelande"
 
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
 msgstr "läs incheckningsloggmeddelande från fil"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299
-#: 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 "GPG-signera incheckning"
 
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "måste ange exakt ett träd"
 
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: misslyckades läsa"
 
-#: builtin/commit.c:41
+#: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<flaggor>] [--] <sökväg>..."
 
-#: builtin/commit.c:46
+#: builtin/commit.c:47
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<flaggor>] [--] <sökväg>..."
 
-#: builtin/commit.c:51
+#: builtin/commit.c:52
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13340,7 +13601,7 @@ msgstr ""
 "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"
 "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"
 
-#: builtin/commit.c:56
+#: builtin/commit.c:57
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -13354,15 +13615,15 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:63
+#: builtin/commit.c:64
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "Använd annars \"git rebase --skip\"\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:67
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Använd annars \"git cherry-pick --skip\"\n"
 
-#: builtin/commit.c:69
+#: builtin/commit.c:70
 msgid ""
 "and then use:\n"
 "\n"
@@ -13384,73 +13645,69 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:324
+#: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
 msgstr "misslyckades packa upp HEAD:s trädobjekt"
 
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file med -a ger ingen mening"
-
-#: builtin/commit.c:374
+#: 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."
 
-#: builtin/commit.c:386
+#: builtin/commit.c:387
 msgid "unable to create temporary index"
 msgstr "kunde inte skapa temporär indexfil"
 
-#: builtin/commit.c:395
+#: builtin/commit.c:396
 msgid "interactive add failed"
 msgstr "interaktiv tilläggning misslyckades"
 
-#: builtin/commit.c:410
+#: builtin/commit.c:411
 msgid "unable to update temporary index"
 msgstr "kan inte uppdatera temporärt index"
 
-#: builtin/commit.c:412
+#: builtin/commit.c:413
 msgid "Failed to update main cache tree"
 msgstr "Misslyckades uppdatera huvud-cacheträdet"
 
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
 msgid "unable to write new_index file"
 msgstr "kunde inte skriva filen new_index"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "cannot do a partial commit during a merge."
 msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
 
-#: builtin/commit.c:491
+#: builtin/commit.c:492
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
 
-#: builtin/commit.c:493
+#: builtin/commit.c:494
 msgid "cannot do a partial commit during a rebase."
 msgstr "kan inte utföra en delvis incheckning under en ombasering."
 
-#: builtin/commit.c:501
+#: builtin/commit.c:502
 msgid "cannot read the index"
 msgstr "kan inte läsa indexet"
 
-#: builtin/commit.c:520
+#: builtin/commit.c:521
 msgid "unable to write temporary index file"
 msgstr "kunde inte skriva temporär indexfil"
 
-#: builtin/commit.c:618
+#: builtin/commit.c:619
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "incheckningen \"%s\" saknar författarhuvud"
 
-#: builtin/commit.c:620
+#: builtin/commit.c:621
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
 
-#: builtin/commit.c:639
+#: builtin/commit.c:640
 msgid "malformed --author parameter"
 msgstr "felformad \"--author\"-flagga"
 
-#: builtin/commit.c:692
+#: builtin/commit.c:693
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -13458,43 +13715,82 @@ msgstr ""
 "kunde inte välja ett kommentarstecken som inte använts\n"
 "i det befintliga incheckningsmeddelandet"
 
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "kunde inte slå upp incheckningen %s"
 
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(läser loggmeddelande från standard in)\n"
 
-#: builtin/commit.c:760
+#: builtin/commit.c:761
 msgid "could not read log from standard input"
 msgstr "kunde inte läsa logg från standard in"
 
-#: builtin/commit.c:764
+#: builtin/commit.c:765
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "kunde inte läsa loggfilen \"%s\""
 
-#: builtin/commit.c:801
+#: 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:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
 msgstr "kunde inte läsa SQUASH_MSG"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:821
 msgid "could not read MERGE_MSG"
 msgstr "kunde inte läsa MERGE_MSG"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:881
 msgid "could not write commit template"
 msgstr "kunde inte skriva incheckningsmall"
 
+#: builtin/commit.c:894
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr ""
+"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
+"med \"%c\" kommer ignoreras.\n"
+
+#: builtin/commit.c:896
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
+"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
+"incheckningen.\n"
+
 #: builtin/commit.c:900
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
+"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
+
+#: builtin/commit.c:904
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
+"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
+"Ett tomt meddelande avbryter incheckningen.\n"
+
+#: builtin/commit.c:916
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -13508,7 +13804,7 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "och försöker igen.\n"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:921
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -13522,196 +13818,168 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "och försöker igen.\n"
 
-#: builtin/commit.c:915
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
-"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
-"incheckningen.\n"
-
-#: builtin/commit.c:923
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
-"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
-"Ett tomt meddelande avbryter incheckningen.\n"
-
-#: builtin/commit.c:940
+#: builtin/commit.c:948
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sFörfattare: %.*s <%.*s>"
 
-#: builtin/commit.c:948
+#: builtin/commit.c:956
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDatum:      %s"
 
-#: builtin/commit.c:955
+#: builtin/commit.c:963
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sIncheckare: %.*s <%.*s>"
 
-#: builtin/commit.c:973
+#: builtin/commit.c:981
 msgid "Cannot read index"
 msgstr "Kan inte läsa indexet"
 
-#: builtin/commit.c:1018
+#: builtin/commit.c:1026
 msgid "unable to pass trailers to --trailers"
 msgstr "kan inte sända släprader till --trailers"
 
-#: builtin/commit.c:1058
+#: builtin/commit.c:1066
 msgid "Error building trees"
 msgstr "Fel vid byggande av träd"
 
-#: builtin/commit.c:1072 builtin/tag.c:319
+#: 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"
 
-#: builtin/commit.c:1116
+#: builtin/commit.c:1124
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' är inte 'Namn <epost>' och motsvarar ingen befintlig författare"
 
-#: builtin/commit.c:1130
+#: builtin/commit.c:1138
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Ogiltigt ignorerat läge \"%s\""
 
-#: builtin/commit.c:1148 builtin/commit.c:1441
+#: 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:1188
-msgid "--long and -z are incompatible"
-msgstr "--long och -z är inkompatibla"
-
-#: builtin/commit.c:1219
+#: 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."
 
-#: builtin/commit.c:1221
+#: builtin/commit.c:1229
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr "Du är i mitten av en cherry-pick -- kan inte omformulera."
 
-#: builtin/commit.c:1224
+#: 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:1226
-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"
+#: builtin/commit.c:1234
+#, 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:1245
+#: 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:1254
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "Du har inget att utöka."
 
-#: builtin/commit.c:1257
+#: 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:1259
+#: 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:1261
+#: 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:1264
+#: 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:1274
+#: 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:1276
+#: 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:1285
+#: 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:1303
+#: 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:1331
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "okänd flagga: --fixup=%s:%s"
 
-#: builtin/commit.c:1345
+#: 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:1476 builtin/commit.c:1642
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "visa koncis status"
 
-#: builtin/commit.c:1478 builtin/commit.c:1644
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "visa information om gren"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "visa information om stash"
 
-#: builtin/commit.c:1482 builtin/commit.c:1646
+#: 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:1484
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
-#: builtin/worktree.c:681
+#: 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:1487 builtin/commit.c:1650
+#: 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:1490 builtin/commit.c:1653
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "terminera poster med NUL"
 
-#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: 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:1493 builtin/commit.c:1656
+#: 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:1497
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -13719,11 +13987,11 @@ msgstr ""
 "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: "
 "traditional)"
 
-#: builtin/commit.c:1499 parse-options.h:193
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "när"
 
-#: builtin/commit.c:1500
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -13731,194 +13999,194 @@ msgstr ""
 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
 "(Default: all)"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "visa ospårade filer i spalter"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "detektera inte namnändringar"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr "detektera namnändringar, möjligen sätt likhetsindex"
 
-#: builtin/commit.c:1525
+#: 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:1607
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "undertryck sammanfattning efter framgångsrik incheckning"
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "visa diff i mallen för incheckningsmeddelandet"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "Alternativ för incheckningsmeddelande"
 
-#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
+#: 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:1612
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "författare"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "överstyr författare för incheckningen"
 
-#: builtin/commit.c:1613 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "datum"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "överstyr datum för incheckningen"
 
-#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
-#: parse-options.h:329 ref-filter.h:90
+#: 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:1615
+#: 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:1616
+#: 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:1621
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]incheckning"
 
-#: builtin/commit.c:1621
+#: 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:1622
+#: 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:1623
+#: 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:1624 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "släprad"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "använd skräddarsydd(a) släprad(er)"
 
-#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: 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:1626
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "använd angiven mallfil"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "tvinga redigering av incheckning"
 
-#: builtin/commit.c:1629
+#: 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:1634
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "Alternativ för incheckningens innehåll"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "checka in alla ändrade filer"
 
-#: builtin/commit.c:1636
+#: 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:1637
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "lägg till filer interaktivt"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "lägg till ändringar interaktivt"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "checka endast in angivna filer"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "förbigå pre-commit- och commit-msg-krokar"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "visa vad som skulle checkas in"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "lägg till föregående incheckning"
 
-#: builtin/commit.c:1655
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "förbigå post-rewrite-krok"
 
-#: builtin/commit.c:1662
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "ok att registrera en tom ändring"
 
-#: builtin/commit.c:1664
+#: 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:1737
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Trasig MERGE_HEAD-fil (%s)"
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "kunde inte läsa MERGE_MODE"
 
-#: builtin/commit.c:1765
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "kunde inte läsa incheckningsmeddelande: %s"
 
-#: builtin/commit.c:1772
+#: 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:1777
+#: 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:1788
+#: 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:1824
+#: 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"
@@ -14283,7 +14551,7 @@ msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr ""
 "\"credential-cache--daemon\" ej tillgänglig; stöd för unix-uttag saknas"
 
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "\"credential-cache\" ej tillgänglig; stöd för unix-uttag saknas"
 
@@ -14425,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"
 
@@ -14441,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"
@@ -14480,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:684
+#: 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"
@@ -14509,113 +14766,105 @@ msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr ""
 "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]"
 
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "misslyckades: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "kunde inte läsa symboliska länken %s"
 
-#: builtin/difftool.c:305
+#: 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:313
+#: 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:413
+#: builtin/difftool.c:421
 msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
 msgstr ""
 "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"
 "katalogdiffläge (\"-d\" och \"--dir-diff\")."
 
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "filen i arbetskatalogen lämnades kvar."
 
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "temporära filer finns i \"%s\"."
 
-#: builtin/difftool.c:651
+#: 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:700
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "misslyckades: %d"
+
+#: 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:702
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "utför diff för hela katalogen"
 
-#: builtin/difftool.c:704
+#: 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:709
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "använd symboliska länkar i katalogdiffläge"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "verktyg"
 
-#: builtin/difftool.c:711
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "använd angivet diff-verktyg"
 
-#: builtin/difftool.c:713
+#: 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:716
+#: builtin/difftool.c:706
 msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr ""
-"låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde "
+"låt \"git-difftool\" avsluta när ett anropat diff-verktyg ger returvärde "
 "skilt från noll"
 
-#: builtin/difftool.c:719
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "ange eget kommando för att visa diffar"
 
-#: builtin/difftool.c:720
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "sändes till \"diff\""
 
-#: builtin/difftool.c:735
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool kräver en arbetskatalog eller --no-index"
 
-#: builtin/difftool.c:742
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff är inkompatibelt med --no-index"
-
-#: builtin/difftool.c:745
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande"
-
-#: builtin/difftool.c:753
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "inget <verktyg> angavs för --tool=<verktyg>"
 
-#: builtin/difftool.c:760
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "inget <kommando> angavs för --extcmd=<kommando>"
 
@@ -14623,7 +14872,7 @@ msgstr "inget <kommando> angavs för --extcmd=<kommando>"
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <flaggor> <miljövariabel>"
 
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
 msgid "type"
 msgstr "typ"
 
@@ -14655,123 +14904,115 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-flaggor]"
 
-#: builtin/fast-export.c:868
+#: 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:1177
+#: 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:1197
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "visa förlopp efter <n> objekt"
 
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "välj hantering av signerade taggar"
 
-#: builtin/fast-export.c:1202
+#: 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:1205
+#: 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:1208
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "dumpa märken till filen"
 
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "importera märken från filen"
 
-#: builtin/fast-export.c:1214
+#: 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:1216
+#: 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:1218
+#: 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:1220
+#: 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:1221
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "hoppa över skrivning av blob-data"
 
-#: builtin/fast-export.c:1222 builtin/log.c:1823
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "referensspecifikation"
 
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "applicera referensspecifikation på exporterade referenser"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "anonymisera utdata"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "från:till"
 
-#: builtin/fast-export.c:1226
+#: 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:1229
+#: 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:1231
+#: 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:1233
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "märk taggar med märke-id"
 
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map utan --anonymize ger ingen mening"
-
-#: builtin/fast-export.c:1271
-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"
@@ -14781,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:185
+#: 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:245
+#: 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:188
+#: 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:191
+#: 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:195
+#: 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:198
+#: 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:122
+#: 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:206
+#: 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: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 "fördjupa historik för grund klon"
 
-#: 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 "fördjupa historik för grund klon baserad på tid"
 
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: 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)"
@@ -14901,141 +15142,145 @@ msgstr ""
 "standard för rekursiv hämtning av undermoduler (lägre prioritet än "
 "konfigurationsfiler)"
 
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: 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:226
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "referenskarta"
 
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: 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:240
+#: 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:243
+#: 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:757
+#: 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:856
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "objektet %s hittades inte"
 
-#: builtin/fetch.c:860
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[àjour]"
 
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[refuserad]"
 
-#: builtin/fetch.c:874
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "kan inte hämta i aktuell gren"
 
-#: builtin/fetch.c:884
+#: 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:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: 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:889
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "skulle skriva över befintlig tagg"
 
-#: builtin/fetch.c:911
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[ny tagg]"
 
-#: builtin/fetch.c:914
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[ny gren]"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[ny ref]"
 
-#: builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "tvingad uppdatering"
 
-#: builtin/fetch.c:961
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "ej snabbspolad"
 
-#: builtin/fetch.c:1065
+#: 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:1069
+#: 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:1101
+#: 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:1129
+#: builtin/fetch.c:1141
 #, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr "avvisa %s då grunda rötter inte kan uppdateras"
+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:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "Från %.*s\n"
 
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15044,132 +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:1327
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s kommer bli dinglande)"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s har blivit dinglande)"
 
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[borttagen]"
 
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(ingen)"
 
-#: builtin/fetch.c:1384
+#: 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:1403
+#: 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:1406
+#: 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:1618
+#: builtin/fetch.c:1455
+#, c-format
+msgid "the object %s does not exist"
+msgstr "objektet %s finns inte"
+
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream"
 
-#: builtin/fetch.c:1633
+#: 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:1635
+#: 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:1637
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "okänd grentyp"
 
-#: builtin/fetch.c:1639
+#: 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:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Hämtar %s\n"
 
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 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:1790
+#: 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:1894
+#: 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:1930
-msgid "You need to specify a tag name."
-msgstr "Du måste ange namnet på en tagg."
-
-#: builtin/fetch.c:1995
-msgid "Negative depth in --deepen is not supported"
-msgstr "Negativa djup stöds inte i --deepen"
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "du måste ange namnet på en tagg"
 
-#: builtin/fetch.c:1997
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen och --depth är ömsesidigt uteslutande"
+#: 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:2002
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth och --unshallow kan inte användas samtidigt"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
+msgstr "negativa djup stöds inte i --deepen"
 
-#: builtin/fetch.c:2004
+#: 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:2021
+#: 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:2023
+#: builtin/fetch.c:2064
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all kan inte anges med referensspecifikationer"
 
-#: builtin/fetch.c:2032
+#: 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:2039
-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:2055
+#: 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:2060
-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:2079
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15177,11 +15432,11 @@ msgstr ""
 "--filter kan endast användas med fjärren konfigurerad i extensions."
 "partialclone"
 
-#: builtin/fetch.c:2083
+#: 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:2087
+#: 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"
 
@@ -15191,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"
 
@@ -15229,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:483
+#: 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"
 
@@ -15277,19 +15536,19 @@ msgstr "visa endast referenser som inte innehåller incheckningen"
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<konfig> <kommandoargument>"
 
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "konfig"
 
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "konfigurationsnyckel som innehåller en lista över arkivsökvägar"
 
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "saknar --config=<konfig>"
 
-#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "okänd"
 
@@ -15305,16 +15564,16 @@ msgstr "fel i %s %s: %s"
 msgid "warning in %s %s: %s"
 msgstr "varning i %s %s: %s"
 
-#: builtin/fsck.c:123 builtin/fsck.c:126
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "trasig länk från %7s %s"
 
-#: builtin/fsck.c:135
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "fel objekttyp i länk"
 
-#: builtin/fsck.c:151
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -15323,215 +15582,225 @@ msgstr ""
 "trasig länk från %7s %s\n"
 "            till %7s %s"
 
-#: builtin/fsck.c:263
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "saknat %s %s"
 
-#: builtin/fsck.c:290
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "onåbart %s %s"
 
-#: builtin/fsck.c:310
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "hängande %s %s"
 
-#: builtin/fsck.c:320
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "kunde inte skapa lost-found"
 
-#: builtin/fsck.c:331
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "kunde inte avsluta \"%s\""
 
-#: builtin/fsck.c:348
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Kontrollerar %s"
 
 # Vague original, not networking-related, but rather related to the actual
 # objects in the database.
-#: builtin/fsck.c:386
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Kontrollerar konnektivitet (%d objekt)"
 
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Kontrollerar %s %s"
 
-#: builtin/fsck.c:410
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "trasiga länkar"
 
-#: builtin/fsck.c:419
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "roten %s"
 
-#: builtin/fsck.c:427
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "taggad %s %s (%s) i %s"
 
-#: builtin/fsck.c:456
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: objekt trasigt eller saknas"
 
-#: builtin/fsck.c:481
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: ogiltig reflog-post %s"
 
-#: builtin/fsck.c:495
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Kontrollerar reflog %s->%s"
 
-#: builtin/fsck.c:529
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: ogiltig sha1-pekare %s"
 
-#: builtin/fsck.c:536
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: inte en incheckning!"
 
-#: builtin/fsck.c:590
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "obs: Inga förvalda referenser"
 
-#: builtin/fsck.c:605
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: hashsökväg stämmer inte överens, hittad vid: %s"
+
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: objektet trasigt eller saknas: %s"
 
-#: builtin/fsck.c:618
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: objektet har okänd typ \"%s\": %s"
+
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: objektet kunde inte tolkas: %s"
 
-#: builtin/fsck.c:638
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "ogiltig sha1-fil: %s"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Kontrollerar objektkatalog"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Kontrollerar objektkataloger"
 
-#: builtin/fsck.c:671
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "Kontrollerar %s-länk"
 
-#: builtin/fsck.c:676 builtin/index-pack.c:866
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "ogiltigt %s"
 
-#: builtin/fsck.c:683
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s pekar på något konstigt (%s)"
 
-#: builtin/fsck.c:689
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: frånkopplat HEAD pekar på ingenting"
 
-#: builtin/fsck.c:693
+#: 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:705
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "Kontrollerar cacheträd"
 
-#: builtin/fsck.c:710
+#: 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:719
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "icke-träd i cacheträd"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<flaggor>] [<objekt>...]"
 
-#: builtin/fsck.c:756
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "visa onåbara objekt"
 
-#: builtin/fsck.c:757
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "visa dinglande objekt"
 
-#: builtin/fsck.c:758
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "rapportera taggar"
 
-#: builtin/fsck.c:759
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "rapportera rotnoder"
 
-#: builtin/fsck.c:760
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "gör indexojekt till huvudnoder"
 
-#: builtin/fsck.c:761
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "gör refloggar till huvudnoder (standard)"
 
-#: builtin/fsck.c:762
+#: 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:763
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "kontrollera endast konnektivitet"
 
-#: builtin/fsck.c:764 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "aktivera striktare kontroll"
 
-#: builtin/fsck.c:766
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "skriv dinglande objekt i .git/lost-found"
 
-#: builtin/fsck.c:767 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "visa förlopp"
 
-#: builtin/fsck.c:768
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "visa ordrika namn för nåbara objekt"
 
-#: builtin/fsck.c:827 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Kontrollerar objekt"
 
-#: builtin/fsck.c:855
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: objekt saknas"
 
-#: builtin/fsck.c:866
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "ogiltig parameter: förväntade sha1, fick \"%s\""
@@ -15550,77 +15819,72 @@ 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:240 builtin/tag.c:573
-#, 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"
-"and remove %s.\n"
+"and remove %s\n"
 "Automatic cleanup will not be performed until the file is removed.\n"
 "\n"
 "%s"
 msgstr ""
 "Senaste körningen av git gc rapporterade följande. Fixa grundproblemet\n"
-"och ta bort %s.\n"
+"och ta bort %s\n"
 "Automatisk städning kommer inte utföras förrän filen tas bort.\n"
 "\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)"
@@ -15628,33 +15892,33 @@ 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:869
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "kunde inte skriva incheckningsgraf"
 
-#: builtin/gc.c:905
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "kunde inte förhämta fjärrar"
 
@@ -15666,134 +15930,174 @@ msgstr "kunde inte starta \"git pack-objects\"-process"
 msgid "failed to finish 'git pack-objects' process"
 msgstr "kunde inte avsluta \"git pack-objects\"-process"
 
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "kunde inte skriva multi-pack-index"
 
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "\"git multi-pack-index expire\" misslyckades"
 
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "\"git multi-pack-index repack\" misslyckades"
 
-#: builtin/gc.c:1179
+#: 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:1283
+#: 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:1313
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "uppgiften \"%s\" misslyckades"
 
-#: builtin/gc.c:1395
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "\"%s\" är inte en giltig uppgift"
 
-#: builtin/gc.c:1400
+#: 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:1415
+#: 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:1416
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "frekvens"
 
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "kör uppgifter baserat på frekvens"
 
-#: builtin/gc.c:1420
+#: 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:1421
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "uppgift"
 
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "utför en specifik uppgift"
 
-#: builtin/gc.c:1439
+#: 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:1482
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "misslyckades köra \"git config\""
 
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "misslyckades expandera sökvägen \"%s\""
 
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "misslyckades starta launchctl"
 
-#: builtin/gc.c:1613
+#: 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:1674
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "misslyckades starta tjänsten %s"
 
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "misslyckades skapa temporär xml-fil"
 
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "misslyckades starta schtasks"
 
-#: builtin/gc.c:1879
+#: 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:1896
+#: 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:1900
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "misslyckades öppna standard in för \"crontab\""
 
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "\"crontab\" dog"
 
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "misslyckades starta systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "misslyckades att köra systemctl"
+
+#: 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:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "okänt argument för --scheduler, \"%s\""
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "varken systemd-timer eller crontab är tillgänglig"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s-schemaläggare är inte tillgänglig"
+
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "en annan process schemalägger bakgrundsunderhåll"
 
-#: builtin/gc.c:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<schemaläggare>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "schemaläggare"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "schemaläggare som utlöser \"git maintenance\"-körning"
+
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "misslyckades lägga till arkiv till global konfiguration"
 
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <underkommando> [<flaggor>]"
 
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "felaktigt underkommando: %s"
@@ -15802,12 +16106,12 @@ msgstr "felaktigt underkommando: %s"
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
 
-#: builtin/grep.c:223
+#: builtin/grep.c:239
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: misslyckades skapa tråd. %s"
 
-#: builtin/grep.c:277
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "felaktigt antal trådar angivet (%d) för %s"
@@ -15816,262 +16120,262 @@ msgstr "felaktigt antal trådar angivet (%d) för %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
-#: builtin/pack-objects.c:2969
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "trådstöd saknas, ignorerar %s"
 
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "kunde inte läsa träd (%s)"
 
-#: builtin/grep.c:658
+#: builtin/grep.c:672
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "kunde inte \"grep\" från objekt av typen %s"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:752
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "flaggan \"%c\" antar ett numeriskt värde"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:851
 msgid "search in index instead of in the work tree"
 msgstr "sök i indexet istället för i arbetskatalogen"
 
-#: builtin/grep.c:840
+#: builtin/grep.c:853
 msgid "find in contents not managed by git"
 msgstr "sök i innehåll som inte hanteras av git"
 
-#: builtin/grep.c:842
+#: builtin/grep.c:855
 msgid "search in both tracked and untracked files"
 msgstr "sök i både spårade och ospårade filer"
 
-#: builtin/grep.c:844
+#: builtin/grep.c:857
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorera filer angivna i \".gitignore\""
 
-#: builtin/grep.c:846
+#: builtin/grep.c:859
 msgid "recursively search in each submodule"
 msgstr "sök varje undermodul rekursivt"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:862
 msgid "show non-matching lines"
 msgstr "visa rader som inte träffas"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:864
 msgid "case insensitive matching"
 msgstr "skiftlägesokänslig sökning"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:866
 msgid "match patterns only at word boundaries"
 msgstr "träffa endast mönster vid ordgränser"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:868
 msgid "process binary files as text"
 msgstr "hantera binärfiler som text"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:870
 msgid "don't match patterns in binary files"
 msgstr "träffa inte mönster i binärfiler"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:873
 msgid "process binary files with textconv filters"
 msgstr "hantera binärfiler med textconv-filter"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:875
 msgid "search in subdirectories (default)"
 msgstr "sök i underkataloger (standard)"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:877
 msgid "descend at most <depth> levels"
 msgstr "gå som mest ned <djup> nivåer"
 
-#: builtin/grep.c:868
+#: builtin/grep.c:881
 msgid "use extended POSIX regular expressions"
 msgstr "använd utökade POSIX-reguljära uttryck"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:884
 msgid "use basic POSIX regular expressions (default)"
 msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:887
 msgid "interpret patterns as fixed strings"
 msgstr "tolka mönster som fixerade strängar"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:890
 msgid "use Perl-compatible regular expressions"
 msgstr "använd Perlkompatibla reguljära uttryck"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:893
 msgid "show line numbers"
 msgstr "visa radnummer"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:894
 msgid "show column number of first match"
 msgstr "visa kolumnnummer för första träff"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:895
 msgid "don't show filenames"
 msgstr "visa inte filnamn"
 
-#: builtin/grep.c:883
+#: builtin/grep.c:896
 msgid "show filenames"
 msgstr "visa filnamn"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:898
 msgid "show filenames relative to top directory"
 msgstr "visa filnamn relativa till toppkatalogen"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:900
 msgid "show only filenames instead of matching lines"
 msgstr "visa endast filnamn istället för träffade rader"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:902
 msgid "synonym for --files-with-matches"
 msgstr "synonym för --files-with-matches"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:905
 msgid "show only the names of files without match"
 msgstr "visa endast namn på filer utan träffar"
 
-#: builtin/grep.c:894
+#: builtin/grep.c:907
 msgid "print NUL after filenames"
 msgstr "skriv NUL efter filnamn"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:910
 msgid "show only matching parts of a line"
 msgstr "visa endast träffade delar av rader"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:912
 msgid "show the number of matches instead of matching lines"
 msgstr "visa antal träffar istället för träffade rader"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:913
 msgid "highlight matches"
 msgstr "ljusmarkera träffar"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:915
 msgid "print empty line between matches from different files"
 msgstr "skriv tomma rader mellan träffar från olika filer"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:917
 msgid "show filename only once above matches from same file"
 msgstr "visa filnamn endast en gång ovanför träffar från samma fil"
 
-#: builtin/grep.c:907
+#: builtin/grep.c:920
 msgid "show <n> context lines before and after matches"
 msgstr "visa <n> rader sammanhang före och efter träffar"
 
-#: builtin/grep.c:910
+#: builtin/grep.c:923
 msgid "show <n> context lines before matches"
 msgstr "visa <n> rader sammanhang före träffar"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:925
 msgid "show <n> context lines after matches"
 msgstr "visa <n> rader sammanhang efter träffar"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:927
 msgid "use <n> worker threads"
 msgstr "använd <n> jobbtrådar"
 
-#: builtin/grep.c:915
+#: builtin/grep.c:928
 msgid "shortcut for -C NUM"
 msgstr "genväg för -C NUM"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:931
 msgid "show a line with the function name before matches"
 msgstr "visa en rad med funktionsnamnet före träffen"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:933
 msgid "show the surrounding function"
 msgstr "visa den omkringliggande funktionen"
 
-#: builtin/grep.c:923
+#: builtin/grep.c:936
 msgid "read patterns from file"
 msgstr "läs mönster från fil"
 
-#: builtin/grep.c:925
+#: builtin/grep.c:938
 msgid "match <pattern>"
 msgstr "träffa <mönster>"
 
-#: builtin/grep.c:927
+#: builtin/grep.c:940
 msgid "combine patterns specified with -e"
 msgstr "kombinera mönster som anges med -e"
 
-#: builtin/grep.c:939
+#: builtin/grep.c:952
 msgid "indicate hit with exit status without output"
 msgstr "ange träff med slutstatuskod utan utdata"
 
-#: builtin/grep.c:941
+#: builtin/grep.c:954
 msgid "show only matches from files that match all patterns"
 msgstr "visa endast träffar från filer som träffar alla mönster"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "pager"
 msgstr "bläddrare"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "show matching files in the pager"
 msgstr "visa träffade filer i filbläddraren"
 
-#: builtin/grep.c:948
+#: builtin/grep.c:961
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1027
 msgid "no pattern given"
 msgstr "inget mönster angavs"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:1063
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index och --untracked kan inte användas med revisioner"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:1071
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "kan inte slå upp revision: %s"
 
-#: builtin/grep.c:1088
+#: builtin/grep.c:1101
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked stöds inte med --recurse-submodules"
 
-#: builtin/grep.c:1092
+#: builtin/grep.c:1105
 msgid "invalid option combination, ignoring --threads"
 msgstr "ogiltig kombination av flaggor, ignorerar --threads"
 
-#: builtin/grep.c:1095 builtin/pack-objects.c:3930
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
 msgid "no threads support, ignoring --threads"
 msgstr "trådstöd saknas, ignorerar --threads"
 
-#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "felaktigt antal trådar angivet (%d)"
 
-#: builtin/grep.c:1132
+#: builtin/grep.c:1145
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
 
-#: builtin/grep.c:1158
+#: builtin/grep.c:1171
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached och --untracked kan inte användas med --no-index"
 
-#: builtin/grep.c:1161
+#: builtin/grep.c:1174
 msgid "--untracked cannot be used with --cached"
 msgstr "--untracked kan inte användas med --cached"
 
-#: builtin/grep.c:1167
+#: builtin/grep.c:1180
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll"
 
-#: builtin/grep.c:1175
+#: builtin/grep.c:1188
 msgid "both --cached and trees are given"
 msgstr "både --cached och träd angavs"
 
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -16079,96 +16383,108 @@ msgstr ""
 "git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] "
 "<fil>..."
 
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "objekttyp"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "skriv objektet till objektdatabasen"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "läs objektet från standard in"
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "spara filen som den är utan filer"
 
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git"
 
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "hantera filen som om den kom från sökvägen"
 
-#: builtin/help.c:47
+#: builtin/help.c:55
 msgid "print all available commands"
 msgstr "visa alla tillgängliga kommandon"
 
-#: builtin/help.c:48
+#: builtin/help.c:57
 msgid "exclude guides"
 msgstr "uteslut vägledningar"
 
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "lista användbara vägledningar"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "visa namn på alla konfigurationsvariabler"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
 msgid "show man page"
 msgstr "visa manualsida"
 
-#: builtin/help.c:53
+#: builtin/help.c:59
 msgid "show manual in web browser"
 msgstr "visa manual i webbläsare"
 
-#: builtin/help.c:55
+#: builtin/help.c:61
 msgid "show info page"
 msgstr "visa info-sida"
 
-#: builtin/help.c:57
+#: builtin/help.c:63
 msgid "print command description"
 msgstr "visa kommandobeskrivning"
 
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "lista användbara vägledningar"
+
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "visa namn på alla konfigurationsvariabler"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<kommando>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
 
-#: builtin/help.c:163
+#: builtin/help.c:196
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "okänt hjälpformat: \"%s\""
 
-#: builtin/help.c:190
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "Misslyckades starta emacsclient."
 
-#: builtin/help.c:203
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "Kunde inte tolka emacsclient-version."
 
-#: builtin/help.c:211
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient version \"%d\" för gammal (< 22)."
 
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: 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:307
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16177,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:319
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16186,331 +16502,314 @@ msgstr ""
 "\"%s\": kommando för man-visare som stöds.\n"
 "Använd \"man.<verktyg>.path\" istället."
 
-#: builtin/help.c:436
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "\"%s\": okänd man-visare."
 
-#: builtin/help.c:453
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "ingen man-visare hanterade förfrågan"
 
-#: builtin/help.c:461
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr "ingen info-visare hanterade förfrågan"
 
-#: builtin/help.c:520 builtin/help.c:531 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:534 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:563 builtin/help.c:593
+#: builtin/help.c:580
+msgid "this option doesn't take any other arguments"
+msgstr "flaggan tar inte några andra argument"
+
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "användning: %s%s"
 
-#: builtin/help.c:577
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "\"git help config\" för mer information"
 
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "objekttyp stämmer inte överens vid %s"
 
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "emottog inte det förväntade objektet %s"
 
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objektet %s: förväntad typ %s, såg %s"
 
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "kan inte fylla %d byte"
 msgstr[1] "kan inte fylla %d byte"
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr "tidigt filslut"
 
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "indataläsfel"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "använde fler byte än tillgängligt"
 
-#: builtin/index-pack.c:325 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr "paket för stort för nuvarande definition av off_t"
 
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "paket är större än tillåten maximal storlek"
 
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "kunde inte skapa \"%s\""
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "kan inte öppna paketfilen \"%s\""
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
 msgid "pack signature mismatch"
 msgstr "paketsignatur stämmer inte överens"
 
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "paketversion %<PRIu32> stöds ej"
 
-#: builtin/index-pack.c:383
+#: builtin/index-pack.c:376
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:489
+#: builtin/index-pack.c:482
 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate returnerade %d"
 
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:531
 msgid "offset value overflow for delta base object"
 msgstr "indexvärdespill för deltabasobjekt"
 
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:539
 msgid "delta base offset is out of bound"
 msgstr "deltabasindex utanför gränsen"
 
-#: builtin/index-pack.c:554
+#: builtin/index-pack.c:547
 #, c-format
 msgid "unknown object type %d"
 msgstr "okänd objekttyp %d"
 
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:578
 msgid "cannot pread pack file"
 msgstr "kan inte utföra \"pread\" på paketfil"
 
-#: builtin/index-pack.c:587
+#: builtin/index-pack.c:580
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
 msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
 
-#: builtin/index-pack.c:613
+#: builtin/index-pack.c:606
 msgid "serious inflate inconsistency"
 msgstr "allvarlig inflate-inkonsekvens"
 
-#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788
-#: builtin/index-pack.c:827 builtin/index-pack.c:836
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
 
-#: builtin/index-pack.c:761 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
 #, c-format
 msgid "unable to read %s"
 msgstr "kunde inte läsa %s"
 
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:818
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "kan inte läsa information om befintligt objekt %s"
 
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:826
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "kan inte läsa befintligt objekt %s"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:840
 #, c-format
 msgid "invalid blob object %s"
 msgstr "ogiltigt blob-objekt %s"
 
-#: builtin/index-pack.c:850 builtin/index-pack.c:869
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
 msgid "fsck error in packed object"
 msgstr "fsck-fel i packat objekt"
 
-#: builtin/index-pack.c:871
+#: builtin/index-pack.c:864
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Inte alla barnobjekt för %s kan nås"
 
-#: builtin/index-pack.c:932 builtin/index-pack.c:979
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
 msgstr "misslyckades tillämpa delta"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Receiving objects"
 msgstr "Tar emot objekt"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Indexing objects"
 msgstr "Skapar index för objekt"
 
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1190
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paketet är trasigt (SHA1 stämmer inte)"
 
-#: builtin/index-pack.c:1201
+#: builtin/index-pack.c:1195
 msgid "cannot fstat packfile"
 msgstr "kan inte utföra \"fstat\" på paketfil"
 
-#: builtin/index-pack.c:1204
+#: builtin/index-pack.c:1198
 msgid "pack has junk at the end"
 msgstr "paket har skräp i slutet"
 
-#: builtin/index-pack.c:1216
+#: builtin/index-pack.c:1210
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "förvirrad bortom vanvett i parse_pack_objects()"
 
-#: builtin/index-pack.c:1239
+#: builtin/index-pack.c:1233
 msgid "Resolving deltas"
 msgstr "Analyserar delta"
 
-#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "kunde inte skapa tråd: %s"
 
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1277
 msgid "confusion beyond insanity"
 msgstr "förvirrad bortom vanvett"
 
-#: builtin/index-pack.c:1289
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "slutfördes med %d lokalt objekt"
 msgstr[1] "slutfördes med %d lokala objekt"
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
-msgstr "Oväntad svanschecksumma för %s (trasig disk?)"
+msgstr "Oväntad svanskontrollsumma för %s (trasig disk?)"
 
-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "paketet har %d oanalyserat delta"
 msgstr[1] "paketet har %d oanalyserade delta"
 
-#: builtin/index-pack.c:1329
+#: builtin/index-pack.c:1323
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1419
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "lokalt objekt %s är trasigt"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1440
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "paketfilnamnet \"%s\" slutar inte med \".%s\""
 
-#: builtin/index-pack.c:1470
+#: builtin/index-pack.c:1464
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "kan inte ta skriva %s-fil \"%s\""
 
-#: builtin/index-pack.c:1478
+#: builtin/index-pack.c:1472
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "kan inte stänga skriven %s-fil \"%s\""
 
-#: builtin/index-pack.c:1504
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "kunde inte byta namn på temporär \"*.%s\"-fil till \"%s\""
+
+#: builtin/index-pack.c:1514
 msgid "error while closing pack file"
 msgstr "fel vid stängning av paketfil"
 
-#: builtin/index-pack.c:1518
-msgid "cannot store pack file"
-msgstr "kan inte spara paketfil"
-
-#: builtin/index-pack.c:1526
-msgid "cannot store index file"
-msgstr "kan inte spara indexfil"
-
-#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "felaktig pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1643
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Kan inte öppna befintlig paketfil \"%s\""
 
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1645
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""
 
-#: builtin/index-pack.c:1701
+#: builtin/index-pack.c:1693
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "icke-delta: %d objekt"
 msgstr[1] "icke-delta: %d objekt"
 
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1700
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "kedjelängd = %d: %lu objekt"
 msgstr[1] "kedjelängd = %d: %lu objekt"
 
-#: builtin/index-pack.c:1750
+#: builtin/index-pack.c:1742
 msgid "Cannot come back to cwd"
 msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
 
-#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
-#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
 #, c-format
 msgid "bad %s"
 msgstr "felaktig %s"
 
-#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "okänd hashningsalgoritm \"%s\""
 
-#: builtin/index-pack.c:1852
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin kan inte användas med --stdin"
-
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin kräver ett git-arkiv"
 
-#: builtin/index-pack.c:1856
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format kan inte användas med --stdin"
-
-#: builtin/index-pack.c:1871
+#: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify angavs utan paketfilnamn"
 
-#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "fsck-fel i packat objekt"
 
@@ -16554,56 +16853,56 @@ msgstr "mallarna hittades inte i %s"
 msgid "not copying templates from '%s': %s"
 msgstr "kopierade inte mallar från \"%s\": %s"
 
-#: builtin/init-db.c:262
+#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "ogiltigt namn på första gren: \"%s\""
 
-#: builtin/init-db.c:353
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "kan inte hantera filtyp %d"
 
-#: builtin/init-db.c:356
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "kan inte flytta %s till %s"
 
-#: builtin/init-db.c:372
+#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr "försöker initiera arkivet på nytt med annan hash"
 
-#: builtin/init-db.c:396 builtin/init-db.c:399
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s finns redan"
 
-#: builtin/init-db.c:431
+#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: ignorerade --initial-branch=%s"
 
-#: builtin/init-db.c:462
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n"
 
-#: builtin/init-db.c:463
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Ominitierade befintligt Git-arkiv i %s%s\n"
 
-#: builtin/init-db.c:467
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Initierade tomt delat Git-arkiv i %s%s\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Initierade tomt Git-arkiv i %s%s\n"
 
-#: builtin/init-db.c:517
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -16611,41 +16910,37 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
 "shared[=<behörigheter>]] [<katalog>]"
 
-#: builtin/init-db.c:543
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "behörigheter"
 
-#: builtin/init-db.c:544
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "ange att git-arkivet ska delas bland flera användare"
 
-#: builtin/init-db.c:550
+#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "överstyr namnet på första gren"
 
-#: builtin/init-db.c:551 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "hash"
 
-#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "ange hashningsalgoritm att använda"
 
-#: builtin/init-db.c:559
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir och --bare är ömsesidigt uteslutande"
-
-#: builtin/init-db.c:590 builtin/init-db.c:595
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "kan inte skapa katalogen (mkdir) %s"
 
-#: builtin/init-db.c:599 builtin/init-db.c:654
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "kan inte byta katalog (chdir) till %s"
 
-#: builtin/init-db.c:626
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -16654,14 +16949,14 @@ msgstr ""
 "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"
 "dir=<katalog>)"
 
-#: builtin/init-db.c:678
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Kan inte komma åt arbetskatalogen \"%s\""
 
-#: builtin/init-db.c:683
+#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
-msgstr "--separatebgit-dir är inkompatibelt med naket arkiv"
+msgstr "--separate-git-dir är inkompatibelt med naket arkiv"
 
 #: builtin/interpret-trailers.c:16
 msgid ""
@@ -16768,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:303
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Slututdata: %d %s\n"
 
-#: builtin/log.c:568
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: felaktig fil"
 
-#: builtin/log.c:583 builtin/log.c:673
+#: 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:698
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "okänd typ: %d"
 
-#: builtin/log.c:843
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: ogiltigt omslag från beskrivningsläge"
 
-#: builtin/log.c:850
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers utan värde"
 
-#: builtin/log.c:979
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "kan inte öppna patchfilen %s"
 
-#: builtin/log.c:996
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "behöver precis ett intervall"
 
-#: builtin/log.c:1006
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "inte ett intervall"
 
-#: builtin/log.c:1170
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "omslagsbrevet behöver e-postformat"
 
-#: builtin/log.c:1176
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "misslyckades skapa fil för omslagsbrev"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "tokigt in-reply-to: %s"
 
-#: builtin/log.c:1290
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
 
-#: builtin/log.c:1348
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "två utdatakataloger?"
 
-#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#: 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:1510 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:1519
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "kunde inte hitta exakt sammanslagningsbas"
 
-#: builtin/log.c:1529
+#: 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"
@@ -16856,416 +17151,408 @@ 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:1552
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "kunde inte hitta exakt sammanslagningsbas"
 
-#: builtin/log.c:1569
+#: 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:1579
+#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr "basincheckningen bör inte vara i revisionslistan"
 
-#: builtin/log.c:1637
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "kan inte hämta patch-id"
 
-#: builtin/log.c:1700
+#: 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:1702
+#: 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:1746
+#: 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:1749
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "använd [PATCH] även för flera patchar"
 
-#: builtin/log.c:1753
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "skriv patcharna på standard ut"
 
-#: builtin/log.c:1755
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "generera ett följebrev"
 
-#: builtin/log.c:1757
+#: builtin/log.c:1775
 msgid "use simple number sequence for output file names"
 msgstr "använd enkel nummersekvens för utdatafilnamn"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1759
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "använd <sfx> istället för \".patch\""
 
-#: builtin/log.c:1761
+#: 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:1762
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "antal iterationer"
 
-#: builtin/log.c:1763
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "markera serien som N:te försök"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "maximal längd för utdatafilnamn"
 
-#: builtin/log.c:1767
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "använd [RFC PATCH] istället för [PATCH]"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "cover-from-description-läge"
 
-#: builtin/log.c:1771
+#: 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:1773
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "använd [<prefix>] istället för [PATCH]"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "spara filerna i <katalog>"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "ta inte bort eller lägg till [PATCH]"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "skriv inte binära diffar"
 
-#: builtin/log.c:1784
+#: 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:1786
+#: 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:1788
+#: 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:1790
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "E-post"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1809
 msgid "header"
 msgstr "huvud"
 
-#: builtin/log.c:1792
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "lägg till e-posthuvud"
 
-#: builtin/log.c:1793 builtin/log.c:1794
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "epost"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "lägg till mottagarhuvud (\"To:\")"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "lägg till kopiehuvud (\"Cc:\")"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1796
+#: 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:1798
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "meddelande-id"
 
-#: builtin/log.c:1799
+#: 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:1800 builtin/log.c:1803
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "gräns"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "bifoga patchen"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "gör patchen ett inline-objekt"
 
-#: builtin/log.c:1808
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr "aktivera brevtrådning, typer: shallow, deep"
 
-#: builtin/log.c:1810
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "signatur"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "lägg till signatur"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "basincheckning"
 
-#: builtin/log.c:1813
+#: 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:1816
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "lägg till signatur från fil"
 
-#: builtin/log.c:1817
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "visa inte filnamn för patchar"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "visa förloppsindikator medan patchar skapas"
 
-#: builtin/log.c:1821
+#: 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:1824
+#: 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:1826 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:1913
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ogiltig ident-rad: %s"
 
-#: builtin/log.c:1928
-msgid "-n and -k are mutually exclusive"
-msgstr "-n och -k kan inte användas samtidigt"
-
-#: builtin/log.c:1930
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt"
-
-#: builtin/log.c:1938
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "kan inte använda --name-only"
 
-#: builtin/log.c:1940
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "kan inte använda --name-status"
 
-#: builtin/log.c:1942
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "kan inte använda --check"
 
-#: builtin/log.c:1964
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output, och --output-directory är ömsesidigt uteslutande"
-
-#: builtin/log.c:2087
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff kräver --cover-letter eller ensam patch"
 
-#: builtin/log.c:2091
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2092
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff mot v%d:"
 
-#: builtin/log.c:2098
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor kräver --range-diff"
-
-#: builtin/log.c:2102
+#: 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:2110
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "Intervall-diff:"
 
-#: builtin/log.c:2111
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Intervall-diff mot v%d:"
 
-#: builtin/log.c:2122
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "kunde inte läsa signaturfil \"%s\""
 
-#: builtin/log.c:2158
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "Skapar patchar"
 
-#: builtin/log.c:2202
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "misslyckades skapa utdatafiler"
 
-#: builtin/log.c:2261
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
 
-#: builtin/log.c:2315
+#: 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:563
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<flaggor>] [<fil>...]"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "sökvägar avdelas med NUL-tecken"
+
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "identifiera filstatus med taggar"
 
-#: builtin/ls-files.c:621
+#: 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:623
+#: 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:625
+#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "visa cachade filer i utdata (standard)"
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "visa borttagna filer i utdata"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "visa modifierade filer i utdata"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "visa andra filer i utdata"
 
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "visa ignorerade filer i utdata"
 
-#: builtin/ls-files.c:636
+#: 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:638
+#: 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:640
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "visa endast namn för \"andra\" kataloger"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "visa radslut i filer"
 
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "visa inte tomma kataloger"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "visa ej sammanslagna filer i utdata"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "visa \"resolve-undo\"-information"
 
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "hoppa över filer som motsvarar mönster"
 
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "exkludera mönster som läses från <fil>"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "läs exkluderingsmönster från <fil>"
 
-#: builtin/ls-files.c:657
+#: 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:659
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "lägg till git:s standardexkluderingar"
 
-#: builtin/ls-files.c:663
+#: 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:666
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "rekursera ner i undermoduler"
 
-#: builtin/ls-files.c:668
+#: 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:669
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "träd-igt"
 
-#: builtin/ls-files.c:670
+#: 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:672
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "visa felsökningsutdata"
 
-#: builtin/ls-files.c:674
+#: 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"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<repository> [<refs>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repository> [<refs>...]]"
 msgstr ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<arkiv> [<referenser>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<arkiv> [<referenser>...]]"
 
 #: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "visa inte fjärr-URL"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
 msgid "exec"
 msgstr "exec"
 
@@ -17319,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"
@@ -17352,7 +17639,7 @@ msgstr "kopiera Message-ID till slutet av incheckningsmeddelandet"
 
 #: builtin/mailinfo.c:64
 msgid "re-code metadata to i18n.commitEncoding"
-msgstr "koda om metadata till i18n.commmitEncoding"
+msgstr "koda om metadata till i18n.commitEncoding"
 
 #: builtin/mailinfo.c:67
 msgid "disable charset re-coding of metadata"
@@ -17382,7 +17669,7 @@ msgstr "åtgärd när citerad vagnretur hittas"
 msgid "use headers in message's body"
 msgstr "använd huvuden i brevkroppen"
 
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "tom mbox: \"%s\""
@@ -17444,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"
 
@@ -17498,192 +17789,188 @@ msgstr "kunde inte bestämma referensen \"%s\""
 msgid "Merging %s with %s\n"
 msgstr "Slår ihop %s med %s\n"
 
-#: builtin/merge.c:58
+#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<flaggor>] [<incheckning>...]"
 
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "flaggan \"m\" behöver ett värde"
 
-#: builtin/merge.c:146
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "flaggan \"%s\" behöver ett värde"
 
-#: builtin/merge.c:199
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Tillgängliga strategier är:"
 
-#: builtin/merge.c:205
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Tillgängliga skräddarsydda strategier är:"
 
-#: builtin/merge.c:256 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 "visa inte en diffstat när sammanslagningen är färdig"
 
-#: builtin/merge.c:259 builtin/pull.c:136
+#: 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:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(synonym till --stat)"
 
-#: builtin/merge.c:262 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 ""
 "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
 
-#: builtin/merge.c:265 builtin/pull.c:148
+#: 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:267 builtin/pull.c:151
+#: 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:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "redigera meddelande innan incheckning"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "tillåt snabbspolning (standard)"
 
-#: builtin/merge.c:273 builtin/pull.c:161
+#: 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:277 builtin/pull.c:164
+#: 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:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: 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:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "sammanslagningsstrategi att använda"
 
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "alternativ=värde"
 
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "alternativ för vald sammanslagningsstrategi"
 
-#: builtin/merge.c:283
+#: builtin/merge.c:285
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
 
-#: builtin/merge.c:290
+#: 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:292
+#: 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:294
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "fortsätt den pågående sammanslagningen"
 
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "tillåt sammanslagning av orelaterade historier"
 
-#: builtin/merge.c:303
+#: 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:320
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "kunde köra stash."
 
-#: builtin/merge.c:325
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "stash misslyckades"
 
-#: builtin/merge.c:330
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "inte ett giltigt objekt: %s"
 
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree misslyckades"
 
-#: builtin/merge.c:400
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Redan à jour. (inget att platta till)"
 
-#: builtin/merge.c:414
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
 
-#: builtin/merge.c:464
+#: 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:602
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
 
-#: builtin/merge.c:728
+#: 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:741
+#: builtin/merge.c:745
 #, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Felaktig flagga för merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "okänd strategiflagga: -X%s"
 
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
+#: 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:812
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Kunde inte läsa från \"%s\""
 
-#: builtin/merge.c:821
+#: 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:827
+#: 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"
@@ -17694,11 +17981,11 @@ msgstr ""
 "temagren.\n"
 "\n"
 
-#: builtin/merge.c:832
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Ett tomt meddelande avbryter incheckningen.\n"
 
-#: builtin/merge.c:835
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17707,73 +17994,73 @@ msgstr ""
 "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
 "avbryter incheckningen.\n"
 
-#: builtin/merge.c:888
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "Tomt incheckningsmeddelande."
 
-#: builtin/merge.c:903
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Underbart.\n"
 
-#: builtin/merge.c:964
+#: 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:1003
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "Inte på någon gren."
 
-#: builtin/merge.c:1005
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "Ingen fjärr för aktuell gren."
 
-#: builtin/merge.c:1007
+#: 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:1012
+#: 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:1069
+#: 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:1172
+#: 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:1206
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "inte något vi kan slå ihop"
 
-#: builtin/merge.c:1316
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort tar inga argument"
 
-#: builtin/merge.c:1320
+#: 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:1338
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit tar inga argument"
 
-#: builtin/merge.c:1351
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue tar inga argument"
 
-#: builtin/merge.c:1355
+#: 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:1371
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17781,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:1378
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17789,88 +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:1381
+#: 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:1395
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Du kan inte kombinera --squash med --no-ff."
-
-#: builtin/merge.c:1397
-msgid "You cannot combine --squash with --commit."
-msgstr "Du kan inte kombinera --squash med --commit."
-
-#: builtin/merge.c:1413
+#: 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:1430
+#: 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:1432
+#: 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:1437
+#: 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:1439
+#: 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:1520
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "vägrar slå samman orelaterad historik"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Uppdaterar %s..%s\n"
 
-#: builtin/merge.c:1585
+#: 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:1592
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "Nej.\n"
 
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr "Kan inte snabbspola, avbryter."
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: 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:1655
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Försöker sammanslagningsstrategin %s...\n"
 
-#: builtin/merge.c:1707
+#: builtin/merge.c:1723
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
 
-#: builtin/merge.c:1709
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Sammanslagning med strategin %s misslyckades.\n"
 
-#: builtin/merge.c:1718
+#: builtin/merge.c:1735
 #, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Använder %s för att förbereda lösning för hand.\n"
+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:1732
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -17905,15 +18180,15 @@ msgstr "kunde inte läsa det taggade objektet \"%s\""
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr "objektet \"%s\" taggat som \"%s\", men är av typen \"%s\""
 
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr "tagg på stdin godkänns inte av vår strikta fsck-kontroll"
 
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
 msgid "tag on stdin did not refer to a valid object"
 msgstr "taggen på stdin pekar inte på ett giltigt objekt"
 
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "kunde inte skriva tagg-filen"
 
@@ -17934,34 +18209,50 @@ msgid "allow creation of more than one tree"
 msgstr "tillåt skapa mer än ett träd"
 
 #: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<flaggor>] write [--preferred-pack=<paket>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<flaggor>] write [--preferred-pack=<paket>] [--refs-"
+"snapshot=<sökväg>]"
 
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
 msgid "git multi-pack-index [<options>] verify"
 msgstr "git multi-pack-index [<flaggor>] verify"
 
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<flaggor>] expire"
 
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<flaggor>] repack [--batch-size=<storlek>]"
 
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr "objektkatalog med uppsättning av par med paketfiler och pack-index"
 
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
 msgid "preferred-pack"
 msgstr "föredraget paket"
 
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr "paket att återanvända vid beräkning av multipaketsbitkarta"
 
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "skriv flerpaketsbitkarta"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "skriv flerpaketsindex som endast innehåller angivna index"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "refs-ögonblicksbild för att välja bitkarte-incheckningar"
+
+#: builtin/multi-pack-index.c:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -17969,11 +18260,6 @@ msgstr ""
 "vid ompackning, samla mindre paketfiler i en bunt som är större än denna "
 "storlek"
 
-#: builtin/multi-pack-index.c:180
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "okänt underkommando: %s"
-
 #: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<flaggor>] <källa>... <mål>"
@@ -18001,117 +18287,117 @@ msgstr "tvinga flytta/ändra namn även om målet finns"
 msgid "skip move/rename errors"
 msgstr "hoppa över fel vid flytt/namnändring"
 
-#: builtin/mv.c:170
+#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "destinationen \"%s\" är ingen katalog"
 
-#: builtin/mv.c:181
+#: builtin/mv.c:184
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:190
 msgid "bad source"
 msgstr "felaktig källa"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "kan inte flytta katalog till sig själv"
 
-#: builtin/mv.c:191
+#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "kan inte flytta katalog över fil"
 
-#: builtin/mv.c:200
+#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "källkatalogen är tom"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "inte versionshanterad"
 
-#: builtin/mv.c:227
+#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "i konflikt"
 
-#: builtin/mv.c:230
+#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "destinationen finns"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "skriver över \"%s\""
 
-#: builtin/mv.c:241
+#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "Kan inte skriva över"
 
-#: builtin/mv.c:244
+#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "flera källor för samma mål"
 
-#: builtin/mv.c:246
+#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "destinationskatalogen finns inte"
 
-#: builtin/mv.c:253
+#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, källa=%s, mål=%s"
 
-#: builtin/mv.c:274
+#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Byter namn på %s till %s\n"
 
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: 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)"
 
@@ -18231,61 +18517,61 @@ 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:197
+#: 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:206
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "kunde inte skriva anteckningsobjekt"
 
-#: builtin/notes.c:208
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "anteckningens innehåll har lämnats kvar i %s"
 
-#: builtin/notes.c:242 builtin/tag.c:576
+#: 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\""
 
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "kunde inte slå upp \"%s\" som en giltig referens."
 
-#: builtin/notes.c:265
+#: builtin/notes.c:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "kunde inte läsa objektet \"%s\"."
 
-#: builtin/notes.c:268
+#: builtin/notes.c:266
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"."
 
-#: builtin/notes.c:309
+#: builtin/notes.c:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "felaktig indatarad: \"%s\"."
 
-#: builtin/notes.c:324
+#: builtin/notes.c:322
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\""
@@ -18293,48 +18579,48 @@ msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\""
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)"
 
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: 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: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"
 
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
 #, c-format
 msgid "no note found for object %s."
 msgstr "inga anteckningar hittades för objektet %s."
 
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "anteckningsinnehåll som sträng"
 
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "anteckningsinnehåll i en fil"
 
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
 msgid "reuse and edit specified note object"
 msgstr "återanvänd och redigera angivet anteckningsobjekt"
 
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "återanvänd angivet anteckningsobjekt"
 
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "tillåt lagra tom anteckning"
 
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "ersätt befintliga anteckningar"
 
-#: builtin/notes.c:448
+#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18343,29 +18629,29 @@ msgstr ""
 "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "
 "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"
 
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Skriver över befintliga anteckningar för objektet %s\n"
 
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: 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"
 
-#: builtin/notes.c:497
+#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "läs objekt från standard in"
 
-#: builtin/notes.c:499
+#: builtin/notes.c:497
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"
 
-#: builtin/notes.c:517
+#: builtin/notes.c:515
 msgid "too few arguments"
 msgstr "för få argument"
 
-#: builtin/notes.c:538
+#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18374,12 +18660,12 @@ msgstr ""
 "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "
 "%s. Använd \"-f\" för att skriva över befintliga anteckningar"
 
-#: builtin/notes.c:550
+#: builtin/notes.c:548
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "anteckningar på källobjektet %s saknas. Kan inte kopiera."
 
-#: builtin/notes.c:603
+#: builtin/notes.c:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18388,52 +18674,52 @@ msgstr ""
 "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"
 "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"
 
-#: builtin/notes.c:698
+#: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:700
+#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "misslyckades ta bort referensen NOTES_MERGE_REF"
 
-#: builtin/notes.c:702
+#: builtin/notes.c:700
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\""
 
-#: builtin/notes.c:722
+#: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:724
+#: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:726
+#: builtin/notes.c:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:739
+#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "misslyckades bestämma NOTES_MERGE_REF"
 
-#: builtin/notes.c:742
+#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "misslyckades färdigställa sammanslagning av anteckningar"
 
-#: builtin/notes.c:768
+#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "okänd sammanslagningsstrategi för anteckningar: %s"
 
-#: builtin/notes.c:784
+#: builtin/notes.c:782
 msgid "General options"
 msgstr "Allmänna flaggor"
 
-#: builtin/notes.c:786
+#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Flaggor för sammanslagning"
 
-#: builtin/notes.c:788
+#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -18441,48 +18727,48 @@ msgstr ""
 "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 
-#: builtin/notes.c:790
+#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "Checkar in ej sammanslagna anteckningar"
 
-#: builtin/notes.c:792
+#: builtin/notes.c:790
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 "färdigställ sammanslagning av anteckningar genom att checka in ej "
 "sammanslagna anteckningar"
 
-#: builtin/notes.c:794
+#: builtin/notes.c:792
 msgid "Aborting notes merge resolution"
 msgstr "Avbryt lösning av sammanslagning av anteckningar"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "avbryt sammanslagning av anteckningar"
 
-#: builtin/notes.c:807
+#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "kan inte blanda --commit, --abort eller -s/--strategy"
 
-#: builtin/notes.c:812
+#: builtin/notes.c:810
 msgid "must specify a notes ref to merge"
 msgstr "måste ange en antecknings-referens att slå ihop"
 
-#: builtin/notes.c:836
+#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "okänd -s/--strategy: %s"
 
-#: builtin/notes.c:873
+#: 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:876
+#: 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:878
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18493,58 +18779,58 @@ msgstr ""
 "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt "
 "sammanslagningen med \"git notes merge --abort\".\n"
 
-#: builtin/notes.c:897 builtin/tag.c:589
+#: 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:900
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "Objektet %s har ingen anteckning\n"
 
-#: builtin/notes.c:912
+#: 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:915
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr "läs objektnamn från standard in"
 
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
+#: 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:955
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "rapportera borttagna anteckningar"
 
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "anteckningar-ref"
 
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "använd anteckningar från <anteckningsref>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1739
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "okänt underkommando: %s"
 
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]"
 
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
 
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18553,107 +18839,111 @@ msgstr ""
 "write_reuse_object: kunde inte hitta %s, förväntat på position %<PRIuMAX> i "
 "paketet %s"
 
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "felaktig CRC för packat objekt %s"
 
-#: builtin/pack-objects.c:459
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "trasigt packat objekt för %s"
 
-#: builtin/pack-objects.c:590
+#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "rekursivt delta upptäcktes för objektet %s"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "ordnade %u objekt, förväntade %<PRIu32>"
 
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "förväntade objekt på position %<PRIuMAX> i paketet %s"
 
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1160
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit"
 
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
 msgid "Writing objects"
 msgstr "Skriver objekt"
 
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "misslyckades ta status på %s"
 
-#: builtin/pack-objects.c:1141
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "misslyckade skriva bitkarteindex"
+
+#: builtin/pack-objects.c:1294
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades"
 
-#: builtin/pack-objects.c:1383
+#: builtin/pack-objects.c:1536
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"
 
-#: builtin/pack-objects.c:1831
+#: builtin/pack-objects.c:1984
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "deltabasoffset utanför gränsen i pack för %s"
 
-#: builtin/pack-objects.c:1840
+#: builtin/pack-objects.c:1993
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "deltabasoffset utanför gränsvärden för %s"
 
-#: builtin/pack-objects.c:2121
+#: builtin/pack-objects.c:2274
 msgid "Counting objects"
 msgstr "Räknar objekt"
 
-#: builtin/pack-objects.c:2266
+#: builtin/pack-objects.c:2439
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "kunde inte tolka objekthuvud för %s"
 
-#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
-#: builtin/pack-objects.c:2362
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
 #, c-format
 msgid "object %s cannot be read"
 msgstr "objektet %s kunde inte läsas"
 
-#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2376
+#: builtin/pack-objects.c:2549
 msgid "suboptimal pack - out of memory"
 msgstr "icke-optimalt pack - minnet slut"
 
-#: builtin/pack-objects.c:2691
+#: builtin/pack-objects.c:2864
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Deltakomprimering använder upp till %d trådar"
 
-#: builtin/pack-objects.c:2830
+#: builtin/pack-objects.c:3003
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "kan inte packa objekt nåbara från taggen %s"
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:3089
 msgid "Compressing objects"
 msgstr "Komprimerar objekt"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:3095
 msgid "inconsistency with delta count"
 msgstr "deltaräknaren är inkonsekvent"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3174
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18662,24 +18952,25 @@ msgstr ""
 "värdet på uploadpack.blobpackfileuri måste vara på formen '<objekt-hash> "
 "<paket-hash> <uri>' (fick '%s')"
 
-#: builtin/pack-objects.c:3004
+#: builtin/pack-objects.c:3177
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
 msgstr ""
 "objektet redan konfigurerat i et annat uploadpack.blobpackfileuri (fick '%s)"
 
-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3212
 #, c-format
 msgid "could not get type of object %s in pack %s"
 msgstr "kunde inte hämta typ för objektet %s i paketet %s"
 
-#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "kunde inte hitta paketet \"%s\""
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3408
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -18688,7 +18979,7 @@ msgstr ""
 "förväntade kant-objekt-id, fick skräp:\n"
 " %s"
 
-#: builtin/pack-objects.c:3224
+#: builtin/pack-objects.c:3414
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -18697,248 +18988,244 @@ msgstr ""
 "förväntade objekt-id, fick skräp:\n"
 " %s"
 
-#: builtin/pack-objects.c:3322
+#: builtin/pack-objects.c:3507
 msgid "invalid value for --missing"
 msgstr "ogiltigt värde för --missing"
 
-#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
 msgid "cannot open pack index"
 msgstr "kan inte öppna paketfilen"
 
-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3541
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "lösa objekt på %s kunde inte underökas"
 
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3627
 msgid "unable to force loose object"
 msgstr "kan inte tvinga lösa objekt"
 
-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3757
 #, c-format
 msgid "not a rev '%s'"
 msgstr "inte en referens \"%s\""
 
-#: builtin/pack-objects.c:3631
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "felaktig revision \"%s\""
 
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3788
 msgid "unable to add recent objects"
 msgstr "kan inte lägga till nya objekt"
 
-#: builtin/pack-objects.c:3712
+#: builtin/pack-objects.c:3841
 #, c-format
 msgid "unsupported index version %s"
 msgstr "indexversionen %s stöds ej"
 
-#: builtin/pack-objects.c:3716
+#: builtin/pack-objects.c:3845
 #, c-format
 msgid "bad index version '%s'"
 msgstr "felaktig indexversion \"%s\""
 
-#: builtin/pack-objects.c:3755
+#: builtin/pack-objects.c:3884
 msgid "<version>[,<offset>]"
 msgstr "<version>[,<offset>]"
 
-#: builtin/pack-objects.c:3756
+#: builtin/pack-objects.c:3885
 msgid "write the pack index file in the specified idx format version"
 msgstr "skriv paketindexfilen i angiven indexformatversion"
 
-#: builtin/pack-objects.c:3759
+#: builtin/pack-objects.c:3888
 msgid "maximum size of each output pack file"
 msgstr "maximal storlek på varje utdatapaketfil"
 
-#: builtin/pack-objects.c:3761
+#: builtin/pack-objects.c:3890
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorera lånade objekt från supplerande objektlager"
 
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c:3892
 msgid "ignore packed objects"
 msgstr "ignorera packade objekt"
 
-#: builtin/pack-objects.c:3765
+#: builtin/pack-objects.c:3894
 msgid "limit pack window by objects"
 msgstr "begränsa paketfönster efter objekt"
 
-#: builtin/pack-objects.c:3767
+#: builtin/pack-objects.c:3896
 msgid "limit pack window by memory in addition to object limit"
 msgstr "begränsa paketfönster efter minne förutom objektgräns"
 
-#: builtin/pack-objects.c:3769
+#: builtin/pack-objects.c:3898
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "maximal längd på deltakedja tillåten i slutligt paket"
 
-#: builtin/pack-objects.c:3771
+#: builtin/pack-objects.c:3900
 msgid "reuse existing deltas"
 msgstr "återanvänd befintliga delta"
 
-#: builtin/pack-objects.c:3773
+#: builtin/pack-objects.c:3902
 msgid "reuse existing objects"
 msgstr "återanvänd befintliga objekt"
 
-#: builtin/pack-objects.c:3775
+#: builtin/pack-objects.c:3904
 msgid "use OFS_DELTA objects"
 msgstr "använd OFS_DELTA-objekt"
 
-#: builtin/pack-objects.c:3777
+#: builtin/pack-objects.c:3906
 msgid "use threads when searching for best delta matches"
 msgstr "använd trådar vid sökning efter bästa deltaträffar"
 
-#: builtin/pack-objects.c:3779
+#: builtin/pack-objects.c:3908
 msgid "do not create an empty pack output"
 msgstr "försök inte skapa tom paketutdata"
 
-#: builtin/pack-objects.c:3781
+#: builtin/pack-objects.c:3910
 msgid "read revision arguments from standard input"
 msgstr "läs revisionsargument från standard in"
 
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:3912
 msgid "limit the objects to those that are not yet packed"
 msgstr "begränsa objekt till dem som ännu inte packats"
 
-#: builtin/pack-objects.c:3786
+#: 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:3789
+#: 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:3792
+#: 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:3795
+#: builtin/pack-objects.c:3924
 msgid "read packs from stdin"
 msgstr "läs paket från standard in"
 
-#: builtin/pack-objects.c:3797
+#: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
 msgstr "skriv paket på standard ut"
 
-#: builtin/pack-objects.c:3799
+#: 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:3801
+#: builtin/pack-objects.c:3930
 msgid "keep unreachable objects"
 msgstr "behåll onåbara objekt"
 
-#: builtin/pack-objects.c:3803
+#: builtin/pack-objects.c:3932
 msgid "pack loose unreachable objects"
 msgstr "packa lösa onåbara objekt"
 
-#: builtin/pack-objects.c:3805
+#: builtin/pack-objects.c:3934
 msgid "unpack unreachable objects newer than <time>"
 msgstr "packa upp onåbara objekt nyare än <tid>"
 
-#: builtin/pack-objects.c:3808
+#: builtin/pack-objects.c:3937
 msgid "use the sparse reachability algorithm"
 msgstr "använd gles-nåbarhetsalgoritmen"
 
-#: builtin/pack-objects.c:3810
+#: builtin/pack-objects.c:3939
 msgid "create thin packs"
 msgstr "skapa tunna paket"
 
-#: builtin/pack-objects.c:3812
+#: builtin/pack-objects.c:3941
 msgid "create packs suitable for shallow fetches"
 msgstr "skapa packfiler lämpade för grunda hämtningar"
 
-#: builtin/pack-objects.c:3814
+#: builtin/pack-objects.c:3943
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorera paket som har tillhörande .keep-fil"
 
-#: builtin/pack-objects.c:3816
+#: builtin/pack-objects.c:3945
 msgid "ignore this pack"
 msgstr "ignorera detta paket"
 
-#: builtin/pack-objects.c:3818
+#: builtin/pack-objects.c:3947
 msgid "pack compression level"
 msgstr "komprimeringsgrad för paket"
 
-#: builtin/pack-objects.c:3820
+#: builtin/pack-objects.c:3949
 msgid "do not hide commits by grafts"
 msgstr "göm inte incheckningar med ympningar (\"grafts\")"
 
-#: builtin/pack-objects.c:3822
+#: builtin/pack-objects.c:3951
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
 
-#: builtin/pack-objects.c:3824
+#: builtin/pack-objects.c:3953
 msgid "write a bitmap index together with the pack index"
 msgstr "använd bitkartindex tillsammans med packindexet"
 
-#: builtin/pack-objects.c:3828
+#: builtin/pack-objects.c:3957
 msgid "write a bitmap index if possible"
 msgstr "skriv bitkartindex om möjligt"
 
-#: builtin/pack-objects.c:3832
+#: builtin/pack-objects.c:3961
 msgid "handling for missing objects"
 msgstr "hantering av saknade objekt"
 
-#: builtin/pack-objects.c:3835
+#: builtin/pack-objects.c:3964
 msgid "do not pack objects in promisor packfiles"
 msgstr "packa inte objekt i kontraktspackfiler"
 
-#: builtin/pack-objects.c:3837
+#: builtin/pack-objects.c:3966
 msgid "respect islands during delta compression"
 msgstr "respektera öar under deltakomprimering"
 
-#: builtin/pack-objects.c:3839
+#: builtin/pack-objects.c:3968
 msgid "protocol"
 msgstr "protokoll"
 
-#: builtin/pack-objects.c:3840
+#: builtin/pack-objects.c:3969
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr ""
 "uteslut redan konfigurerade uploadpack.blobpackfileuri med detta protokoll"
 
-#: builtin/pack-objects.c:3873
+#: builtin/pack-objects.c:4002
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "deltakedjedjupet %d är för djupt, påtvingar %d"
 
-#: builtin/pack-objects.c:3878
+#: builtin/pack-objects.c:4007
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit är för högt, påtvingar %d"
 
-#: builtin/pack-objects.c:3934
+#: builtin/pack-objects.c:4063
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "--max-pack-size kan inte användas för att bygga ett paket som ska överföras"
 
-#: builtin/pack-objects.c:3936
+#: builtin/pack-objects.c:4065
 msgid "minimum pack size limit is 1 MiB"
 msgstr "minsta packstorlek är 1 MiB"
 
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:4070
 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:3944
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt"
-
-#: builtin/pack-objects.c:3950
+#: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "kan inte använda --filter utan --stdout"
 
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:4081
 msgid "cannot use --filter with --stdin-packs"
 msgstr "kan inte använda --filter med --stdin-packs"
 
-#: builtin/pack-objects.c:3956
+#: builtin/pack-objects.c:4085
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr "kan inte använda intern revisionslista med --stdin-packs"
 
-#: builtin/pack-objects.c:4015
+#: builtin/pack-objects.c:4144
 msgid "Enumerating objects"
 msgstr "Räknar upp objekt"
 
-#: builtin/pack-objects.c:4052
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -18981,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:152
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
 
@@ -19006,44 +19293,48 @@ msgstr "Felaktigt värde för %s: %s"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
 
-#: builtin/pull.c:123
+#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
 msgstr "styrning för rekursiv hämtning av undermoduler"
 
-#: builtin/pull.c:127
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Alternativ gällande sammanslagning"
 
-#: builtin/pull.c:130
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
 
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "tillåt snabbspolning"
 
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+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:340
 msgid "automatically stash/stash pop before and after"
 msgstr "utför automatiskt stash/stash pop före och efter"
 
-#: builtin/pull.c:183
+#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "Alternativ gällande hämtningar"
 
-#: builtin/pull.c:193
+#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "tvinga överskrivning av lokal gren"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr "antal undermoduler som hämtas parallellt"
 
-#: builtin/pull.c:317
+#: builtin/pull.c:321
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Felaktigt värde för 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."
@@ -19051,14 +19342,14 @@ msgstr ""
 "Det finns ingen kandidat för ombasering bland referenserna du precis har "
 "hämtat."
 
-#: builtin/pull.c:447
+#: builtin/pull.c:451
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Det finns ingen kandidat för sammanslagning bland referenserna du precis har "
 "hämtat."
 
-#: builtin/pull.c:448
+#: builtin/pull.c:452
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -19066,7 +19357,7 @@ msgstr ""
 "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
 "motsvarade något i fjärränden."
 
-#: builtin/pull.c:451
+#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -19077,41 +19368,42 @@ msgstr ""
 "gren. Eftersom det inte är den fjärr som är konfigurerad som\n"
 "standard för aktuell gren måste du ange en gren på kommandoraden."
 
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
 msgid "You are not currently on a branch."
 msgstr "Du är inte på någon gren för närvarande."
 
-#: 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 "Ange vilken gren du vill ombasera mot."
 
-#: 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 "Ange vilken gren du vill slå samman med."
 
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "Se git-pull(1) för detaljer."
 
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
 msgid "<remote>"
 msgstr "<fjärr>"
 
-#: 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 "<gren>"
 
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
 msgid "There is no tracking information for the current branch."
 msgstr "Det finns ingen spårningsinformation för aktuell gren."
 
-#: 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 "Om du vill ange spårningsinformation för grenen kan du göra det med:"
 
-#: builtin/pull.c:485
+#: builtin/pull.c:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -19120,22 +19412,22 @@ msgstr ""
 "Dina inställningar anger sammanslagning med referensen \"%s\"\n"
 "från fjärren, men någon sådan referens togs inte emot."
 
-#: builtin/pull.c:596
+#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "kunde inte komma åt incheckningen %s"
 
-#: builtin/pull.c:902
+#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignorera --verify-signatures för ombasering"
 
-#: builtin/pull.c:930
+#: builtin/pull.c:969
 msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"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"
@@ -19145,11 +19437,11 @@ msgid ""
 "or --ff-only on the command line to override the configured default per\n"
 "invocation.\n"
 msgstr ""
-"Det avråds från att göra \"pull\" utan att ange hur avvikande grenar\n"
-"ska förlikas. Du kan ta bort det här meddelandet genom att köra ett av\n"
-"följande kommandon innan du gör \"pull\" nästa gång: \n"
+"Du har avvikande grenar och måste ange hur de skall förlikas.\n"
+"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"
@@ -19158,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:991
+#: 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:995
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "pull med ombasering"
 
-#: builtin/pull.c:996
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "checka in eller använd \"stash\" på dem."
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19181,7 +19473,7 @@ msgstr ""
 "snabbspolar din arbetskatalog från\n"
 "incheckningen %s."
 
-#: builtin/pull.c:1027
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19198,15 +19490,23 @@ msgstr ""
 "$ git reset --hard\n"
 "för att återgå."
 
-#: builtin/pull.c:1042
+#: 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:1046
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kan inte ombasera ovanpå flera grenar."
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1104
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Kan inte snabbspola till flera grenar."
+
+#: 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:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
 
@@ -19271,7 +19571,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<namn-på-fjärrgren>\n"
 
-#: builtin/push.c:194
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -19284,12 +19584,19 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:202
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända."
 
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Du angav inga referensspecifikationer att sända, och push.default är "
+"\"nothing\"."
+
+#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -19300,14 +19607,7 @@ msgstr ""
 "aktuella grenen \"%s\", utan att tala om för mig vad som\n"
 "ska sändas för att uppdatera fjärrgrenen."
 
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"Du angav inga referensspecifikationer att sända, och push.default är "
-"\"nothing\"."
-
-#: builtin/push.c:267
+#: builtin/push.c:258
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19319,7 +19619,7 @@ msgstr ""
 "\"git pull ....\") innan du sänder igen.\n"
 "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
 
-#: builtin/push.c:273
+#: builtin/push.c:264
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -19331,7 +19631,7 @@ msgstr ""
 "\"git pull ...\") innan du sänder igen.\n"
 "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
 
-#: builtin/push.c:279
+#: builtin/push.c:270
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -19345,11 +19645,11 @@ msgstr ""
 "(t.ex. \"git pull ...\") innan du sänder igen.\n"
 "Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer."
 
-#: builtin/push.c:286
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren."
 
-#: builtin/push.c:289
+#: builtin/push.c:280
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -19360,7 +19660,7 @@ msgstr ""
 "pekar på något som inte är en incheckning, utan att använda flaggan\n"
 "\"--force\".\n"
 
-#: builtin/push.c:294
+#: builtin/push.c:285
 msgid ""
 "Updates were rejected because the tip of the remote-tracking\n"
 "branch has been updated since the last checkout. You may want\n"
@@ -19372,103 +19672,99 @@ msgstr ""
 "fjärrändringarna lokalt (t.ex \"git pull ....\") innan du\n"
 "tvingar en uppdatering.\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Sänder till %s\n"
 
-#: builtin/push.c:371
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "misslyckades sända vissa referenser till \"%s\""
 
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "arkiv"
 
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
 msgstr "sänd alla referenser"
 
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr "spegla alla referenser"
 
-#: builtin/push.c:557
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "ta bort referenser"
 
-#: builtin/push.c:558
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "sänd taggar (kan inte användas med --all eller --mirror)"
 
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "tvinga uppdateringar"
 
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "<refnamn>:<förvänta>"
 
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
 msgid "require old value of ref to be at this value"
 msgstr "kräv att ref:s tidigare värde är detta"
 
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
 msgid "require remote updates to be integrated locally"
 msgstr "kräv att fjärruppdateringar har integrerats lokalt"
 
-#: builtin/push.c:569
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "styr rekursiv insändning av undermoduler"
 
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
 msgid "use thin pack"
 msgstr "använd tunna paket"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "program för att ta emot paket"
 
-#: builtin/push.c:573
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "ställ in uppström för git pull/status"
 
-#: builtin/push.c:576
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "ta bort lokalt borttagna referenser"
 
-#: builtin/push.c:578
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "förbigå pre-push-krok"
 
-#: builtin/push.c:579
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "sänd in saknade men relevanta taggar"
 
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
 msgstr "GPG-signera insändningen"
 
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
 msgid "request atomic transaction on remote side"
 msgstr "begär atomiska transaktioner på fjärrsidan"
 
-#: builtin/push.c:601
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete är inkompatibel med --all, --mirror och --tags"
-
-#: builtin/push.c:603
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete kan inte användas utan referenser"
 
-#: builtin/push.c:623
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "felaktigt arkiv \"%s\""
 
-#: builtin/push.c:624
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -19489,27 +19785,15 @@ msgstr ""
 "\n"
 "    git push <namn>\n"
 
-#: builtin/push.c:639
-msgid "--all and --tags are incompatible"
-msgstr "--all och --tags är inkompatibla"
-
-#: builtin/push.c:641
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all kan inte kombineras med referensspecifikationer"
 
-#: builtin/push.c:645
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror och --tags är inkompatibla"
-
-#: builtin/push.c:647
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror kan inte kombineras med referensspecifikationer"
 
-#: builtin/push.c:650
-msgid "--all and --mirror are incompatible"
-msgstr "--all och --mirror är inkompatibla"
-
-#: builtin/push.c:657
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "push-flaggor kan inte innehålla radbrytning"
 
@@ -19562,82 +19846,82 @@ msgstr "behöver två incheckningsintervall"
 #: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-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=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<fil>] (--empty | <träd-"
+"igt1> [<träd-igt2> [<träd-igt3>]])"
 
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "skriv resulterande index till <fil>"
 
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "töm bara indexet"
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "Sammanslagning"
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
 msgid "perform a merge in addition to a read"
 msgstr "utför en sammanslagning i tillägg till en läsning"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
 msgid "3-way merge if no file level merging required"
 msgstr "3-vägssammanslagning om sammanslagning på filnivå ej krävs"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
 msgid "3-way merge in presence of adds and removes"
 msgstr "3-vägssammanslagning när det finns tillägg och borttagningar"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "som -m, men kasta bort ej sammanslagna poster"
 
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<underkatalog>/"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "läs in trädet i indexet under <underkatalog>/"
 
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
 msgid "update working tree with merge result"
 msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "tillåt explicit ignorerade filer att skrivas över"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
 msgid "don't check the working tree after merging"
 msgstr "kontrollera inte arbetskatalogen efter sammanslagning"
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
 msgid "don't update the index or the work tree"
 msgstr "uppdatera inte indexet eller arbetskatalogen"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
 msgid "skip applying sparse checkout filter"
 msgstr "hoppa över att applicera filter för gles utcheckning"
 
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "felsök unpack-trees"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "undertryck återkopplingsmeddelanden"
 
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
 msgid "You need to resolve your current index first"
 msgstr "Du måste lösa ditt befintliga index först"
 
@@ -19659,193 +19943,44 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "oanvändbar todo-lista: %s"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
 #, c-format
 msgid "could not create temporary %s"
 msgstr "kunde inte skapa temporär %s"
 
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
 msgid "could not mark as interactive"
 msgstr "kunde inte markera som interaktiv"
 
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
 msgid "could not generate todo list"
 msgstr "Kunde inte skapa attgöra-lista"
 
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "en basincheckning måste anges med --upstream eller --onto"
 
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<flaggor>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "behåller incheckningar som är tomma från början"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "tillåt incheckningar med tomt meddelande"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "ombasera sammanslagningar"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "behåll ursprungliga förgreningspunkter för kusiner"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "flytta incheckningar som inleds med squash!/fixup!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "signera incheckningar"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "vis diffstat för vad som ändrats uppströms"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "fortsätt ombasering"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "hoppa över incheckning"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "redigera attgöra-listan"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "visa nuvarande patch"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "förkorta inchecknings-id i todo-listan"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "utöka inchecknings-id i todo-listan"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "kontrollera todo-listan"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "ordna om fixup-/squash-rader"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "lägg in exec-kommandon i todo-listan"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "ovanpå"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "begränsa revision"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "tryck ihop ovanpå"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "uppströmsincheckningen"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "namn på huvud"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "sammanslagningsstrategi"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "strategiflaggor"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "switch-to"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "gren eller inchecking att checka ut"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "på-namn"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "kmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "kommando att köra"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s kräver \"merge\"-bakändan"
 
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "kunde inte hämta \"onto\": \"%s\""
 
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "ogiltigt orig-head: \"%s\""
 
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\""
 
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19859,7 +19994,7 @@ msgstr ""
 "För att avbryta och återgå till där du var före ombaseringen, kör \"git "
 "rebase --abort\"."
 
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
 #, c-format
 msgid ""
 "\n"
@@ -19878,7 +20013,7 @@ msgstr ""
 "\n"
 "Därför kan inte git ombasera dessa."
 
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -19886,7 +20021,7 @@ msgid ""
 msgstr ""
 "okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"."
 
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -19903,7 +20038,7 @@ msgstr ""
 "    git rebase '<gren>'\n"
 "\n"
 
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -19916,182 +20051,180 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<gren> %s\n"
 "\n"
 
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
 msgid "exec commands cannot contain newlines"
 msgstr "exec-kommandon kan inte innehålla nyradstecken"
 
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
 msgid "empty exec command"
 msgstr "tomt exec-kommando"
 
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
 msgid "rebase onto given branch instead of upstream"
 msgstr "ombasera mot given grenen istället för uppström"
 
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "använd sammanslagningsbasen mellan uppströms och gren som aktuell bas"
 
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
 msgid "allow pre-rebase hook to run"
 msgstr "tillåt pre-rebase-krok att köra"
 
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
 msgid "be quiet. implies --no-stat"
 msgstr "var tyst. implicerar --no-stat"
 
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "vis diffstat för vad som ändrats uppströms"
+
+#: builtin/rebase.c:1035
 msgid "do not show diffstat of what changed upstream"
 msgstr "visa inte en diffstat för vad som ändrats uppströms"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "lägg \"Signed-off-by:\"-släprad till varje incheckning"
 
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
 msgid "make committer date match author date"
 msgstr "sätt incheckningsdatum till författardatum"
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
 msgid "ignore author date and use current date"
 msgstr "ignorera författardatum och använd nuvarande"
 
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
 msgid "synonym of --reset-author-date"
 msgstr "synonym för --reset-author-date"
 
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
 msgid "passed to 'git apply'"
 msgstr "sänds till \"git apply\""
 
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
 msgid "ignore changes in whitespace"
 msgstr "ignorera ändringar i blanksteg"
 
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "utför cherry-pick på alla incheckningar, även om oändrad"
 
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
 msgid "continue"
 msgstr "fortsätt"
 
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
 msgid "skip current patch and continue"
 msgstr "hoppa över nuvarande patch och fortsätt"
 
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
 msgid "abort and check out the original branch"
 msgstr "avbryt och checka ut ursprungsgrenen"
 
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
 msgid "abort but keep HEAD where it is"
 msgstr "avbryt men behåll HEAD där det är"
 
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
 msgid "edit the todo list during an interactive rebase"
 msgstr "redigera attgöra-listan under interaktiv ombasering."
 
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
 msgid "show the patch file being applied or merged"
 msgstr "visa patchen som tillämpas eller slås samman"
 
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
 msgid "use apply strategies to rebase"
 msgstr "använd appliceringstrategier för ombasering"
 
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
 msgid "use merging strategies to rebase"
 msgstr "använd sammanslagningsstrategier för ombasering"
 
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
 msgid "let the user edit the list of commits to rebase"
 msgstr "låt användaren redigera listan över incheckningar att ombasera"
 
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr ""
 "(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem"
 
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
 msgid "how to handle commits that become empty"
 msgstr "hur incheckningar som blir tomma ska hanteras"
 
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "behåller incheckningar som är tomma från början"
+
+#: builtin/rebase.c:1097
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "flytta incheckningar som börjar med squash!/fixup! under -i"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
 msgid "add exec lines after each commit of the editable list"
 msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan"
 
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
 msgid "allow rebasing commits with empty messages"
 msgstr "tillåt ombasering av incheckningar med tomt meddelande"
 
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
 msgid "try to rebase merges instead of skipping them"
 msgstr "försök ombasera sammanslagningar istället för att ignorera dem"
 
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "använd \"merge-base --fork-point\" för att förfina uppström"
 
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
 msgid "use the given merge strategy"
 msgstr "använd angiven sammanslagningsstrategi"
 
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
 msgid "option"
 msgstr "alternativ"
 
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
 msgid "pass the argument through to the merge strategy"
 msgstr "sänd flaggan till sammanslagningsstrategin"
 
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt"
+
+#: builtin/rebase.c:1128
 msgid "apply all changes, even those already present upstream"
 msgstr "applicera alla ändringar, även de som redan finns uppströms"
 
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera."
 
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges avråds från. Använd --rebase-merges istället."
-
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "kan inte kombinera \"--keep-base\" med \"--onto\""
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges har ersatts av --rebase-merges"
 
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "kan inte kombinera \"--keep-base\" med \"--root\""
-
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "kan inte kombinera \"--root\" med \"--fork-point\""
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Ingen ombasering pågår?"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
 
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Kan inte läsa HEAD"
 
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -20099,16 +20232,16 @@ msgstr ""
 "Du måste redigera alla sammanslagningskonflikter och\n"
 "därefter markera dem som lösta med git add"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
 msgid "could not discard worktree changes"
 msgstr "kunde inte kasta ändringar i arbetskatalogen"
 
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
 #, c-format
 msgid "could not move back to %s"
 msgstr "kunde inte flytta tillbaka till %s"
 
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -20129,143 +20262,133 @@ msgstr ""
 "och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
 "något av värde där.\n"
 
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
 msgstr "flaggan \"C\" förväntar ett numeriskt värde"
 
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Okänt läge: %s"
 
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy kräver --merge eller --interactive"
 
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr "kan inte kombinera apply-flaggor med merge-flaggor"
+#: builtin/rebase.c:1463
+msgid "apply options and merge options cannot be used together"
+msgstr ""
+"appliceringsflaggor och sammanslagningsflaggor kan inte användas tillsammans"
 
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Okänd rebase-bakända: %s"
 
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec kräver --exec eller --interactive"
 
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec"
-"\""
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "felaktig uppström \"%s\""
 
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
 msgid "Could not create new root commit"
 msgstr "kunde inte skapa ny rotincheckning"
 
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "\"%s\": behöver precis en sammanslagningsbas med gren"
 
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "\"%s\": behöver precis en sammanslagningsbas"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "Pekar inte på en giltig incheckning: \"%s\""
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
 #, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\""
+msgid "no such branch/commit '%s'"
+msgstr "ingen sådan gren/incheckning: \"%s\""
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2415
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "Ingen sådan referens: %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
 msgid "Could not resolve HEAD to a revision"
 msgstr "Kunde inte bestämma HEAD:s incheckning"
 
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
 msgid "Please commit or stash them."
 msgstr "Checka in eller använd \"stash\" på dem."
 
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
 #, c-format
 msgid "could not switch to %s"
 msgstr "kunde inte växla till %s"
 
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
 msgid "HEAD is up to date."
 msgstr "HEAD är à jour."
 
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Aktuell gren %s är à jour.\n"
 
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD är à jour, ombasering framtvingad."
 
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Aktuell gren %s är à jour, ombasering framtvingad.\n"
 
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Kroken pre-rebase vägrade ombaseringen."
 
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Ändringar till %s:\n"
 
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Ändringar från %s till %s:\n"
 
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det...\n"
 
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
 msgid "Could not detach HEAD"
 msgstr "Kunde inte koppla från HEAD"
 
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Snabbspolade %s till %s.\n"
 
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-katalog>"
 
-#: builtin/receive-pack.c:1276
+#: 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"
@@ -20295,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:1296
+#: 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"
@@ -20316,13 +20439,13 @@ msgstr ""
 "\n"
 "För att undvika detta meddelande kan du sätta det till \"refuse\"."
 
-#: builtin/receive-pack.c:2479
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "tyst"
 
-#: builtin/receive-pack.c:2493
-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 ""
@@ -20346,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:699
+#: 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 ]"
 
@@ -20471,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"
@@ -20516,7 +20644,7 @@ msgstr "att ange en master-gren ger ingen mening med --mirror"
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar"
 
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
 #, c-format
 msgid "remote %s already exists."
 msgstr "fjärrarkivet %s finns redan."
@@ -20526,25 +20654,30 @@ msgstr "fjärrarkivet %s finns redan."
 msgid "Could not setup master '%s'"
 msgstr "Kunde inte skapa master \"%s\""
 
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "ohanterad branch.%s.rebase=%s; antar \"true\""
+
+#: builtin/remote.c:366
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Kunde inte hämta mappning för referensspecifikation %s"
 
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
 msgid "(matching)"
 msgstr "(träffande)"
 
-#: builtin/remote.c:466
+#: builtin/remote.c:472
 msgid "(delete)"
 msgstr "(ta bort)"
 
-#: builtin/remote.c:655
+#: builtin/remote.c:660
 #, c-format
 msgid "could not set '%s'"
 msgstr "kunde inte ställa in \"%s\""
 
-#: builtin/remote.c:660
+#: builtin/remote.c:665
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -20555,17 +20688,17 @@ msgstr ""
 "\t%s:%d\n"
 "anger nu den icke-existerande fjärren \"%s\""
 
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Ingen sådan fjärr: \"%s\""
 
-#: builtin/remote.c:710
+#: builtin/remote.c:715
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""
 
-#: builtin/remote.c:730
+#: builtin/remote.c:735
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -20576,17 +20709,17 @@ msgstr ""
 "\t%s\n"
 "\tUppdatera konfigurationen manuellt om nödvändigt."
 
-#: builtin/remote.c:770
+#: builtin/remote.c:775
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "misslyckades ta bort \"%s\""
 
-#: builtin/remote.c:804
+#: builtin/remote.c:809
 #, c-format
 msgid "creating '%s' failed"
 msgstr "misslyckades skapa \"%s\""
 
-#: builtin/remote.c:882
+#: builtin/remote.c:887
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -20600,118 +20733,118 @@ msgstr[1] ""
 "Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"
 "för att ta bort dem, använd:"
 
-#: builtin/remote.c:896
+#: builtin/remote.c:901
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
 
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " ny (nästa hämtning sparar i remotes/%s)"
 
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
 msgid " tracked"
 msgstr " spårad"
 
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
 
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren"
 
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "ombaseras interaktivt på fjärren %s"
 
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "ombaseras interaktivt (med sammanslagningar) på fjärren %s"
 
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "ombaseras på fjärren %s"
 
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
 #, c-format
 msgid " merges with remote %s"
 msgstr " sammanslås med fjärren %s"
 
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
 #, c-format
 msgid "merges with remote %s"
 msgstr "sammanslås med fjärren %s"
 
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    och med fjärren %s\n"
 
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
 msgid "create"
 msgstr "skapa"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
 msgid "delete"
 msgstr "ta bort"
 
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
 msgid "up to date"
 msgstr "àjour"
 
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
 msgid "fast-forwardable"
 msgstr "kan snabbspolas"
 
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
 msgid "local out of date"
 msgstr "lokal föråldrad"
 
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s tvingar till %-*s (%s)"
 
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s sänder till %-*s (%s)"
 
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s tvingar till %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s sänder till %s"
 
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
 msgid "do not query remotes"
 msgstr "fråga inte fjärrar"
 
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
 msgstr "* fjärr %s"
 
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  Hämt-URL: %s"
 
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
 msgid "(no URL)"
 msgstr "(ingen URL)"
 
@@ -20719,184 +20852,188 @@ msgstr "(ingen URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  Sänd-URL: %s"
 
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD-gren: %s"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
 msgid "(not queried)"
 msgstr "(inte förfrågad)"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
 msgid "(unknown)"
 msgstr "(okänd)"
 
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n"
 
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Fjärrgren:%s"
 msgstr[1] "  Fjärrgrenar:%s"
 
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
 msgid " (status not queried)"
 msgstr " (status inte förfrågad)"
 
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Lokal gren konfigurerad för \"git pull\":"
 msgstr[1] "  Lokala grenar konfigurerade för \"git pull\":"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Lokala referenser speglas av \"git push\""
 
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Lokal referens konfigurerad för \"git push\"%s:"
 msgstr[1] "  Lokala referenser konfigurerade för \"git push\"%s:"
 
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
 
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "ta bort refs/remotes/<namn>/HEAD"
 
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
 msgid "Cannot determine remote HEAD"
 msgstr "Kan inte bestämma HEAD på fjärren"
 
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:"
 
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
 #, c-format
 msgid "Could not delete %s"
 msgstr "Kunde inte ta bort %s"
 
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Inte en giltig referens: %s"
 
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
 #, c-format
 msgid "Could not setup %s"
 msgstr "Kunde inte ställa in %s"
 
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s kommer bli dinglande!"
 
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s har blivit dinglande!"
 
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
 #, c-format
 msgid "Pruning %s"
 msgstr "Rensar %s"
 
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [skulle rensa] %s"
 
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [rensad] %s"
 
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
 msgid "prune remotes after fetching"
 msgstr "rensa fjärrar efter hämtning"
 
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Ingen sådan fjärr \"%s\""
 
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
 msgid "add branch"
 msgstr "lägg till gren"
 
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
 msgid "no remote specified"
 msgstr "ingen fjärr angavs"
 
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
 msgid "query push URLs rather than fetch URLs"
 msgstr "fråga sänd-URL:er istället för hämta-URL:er"
 
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
 msgid "return all URLs"
 msgstr "returnera alla URL:er"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "ingen URL:er angivna för fjärren \"%s\""
 
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
 msgid "manipulate push URLs"
 msgstr "manipulera URL:ar för sändning"
 
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
 msgid "add URL"
 msgstr "lägg till URL"
 
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
 msgid "delete URLs"
 msgstr "ta bort URL:ar"
 
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete ger ingen mening"
 
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Felaktig gammalt URL-mönster: %s"
 
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Ingen sådan URL hittades: %s"
 
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
 msgid "Will not delete all non-push URLs"
 msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
 
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "var pratsam; måste skrivas före ett underkommando"
+
+#: builtin/repack.c:28
 msgid "git repack [<options>]"
 msgstr "git repack [<flaggor>]"
 
-#: builtin/repack.c:31
+#: builtin/repack.c:33
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -20905,140 +21042,145 @@ msgstr ""
 "Använd --no-write-bitmap-index eller inaktivera inställningen\n"
 "pack.writebitmaps"
 
-#: builtin/repack.c:198
+#: builtin/repack.c:201
 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:270 builtin/repack.c:630
+#: 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:294
+#: 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:309
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "kunde inte öppna indexet för %s"
 
-#: builtin/repack.c:368
+#: 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:401 builtin/repack.c:408 builtin/repack.c:413
+#: 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:460
+#: 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:516
+msgid "could not close refs snapshot tempfile"
+msgstr "kunde inte stänga temporär fil för refs-ögonblicksbild"
+
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "packa allt i ett enda paket"
 
-#: builtin/repack.c:462
+#: 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:465
+#: 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:467
+#: 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:469
+#: 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:471
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "kör inte git-update-server-info"
 
-#: builtin/repack.c:474
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "sänd --local till git-pack-objects"
 
-#: builtin/repack.c:476
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "skriv bitkartindex"
 
-#: builtin/repack.c:478
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "sänd --delta-islands till git-pack-objects"
 
-#: builtin/repack.c:479
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "cirkadatum"
 
-#: builtin/repack.c:480
+#: 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:482
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "med -a, packa om onåbara objekt"
 
-#: builtin/repack.c:484
+#: 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:485 builtin/repack.c:491
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "byte"
 
-#: builtin/repack.c:486
+#: 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:488
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "begränsa maximalt deltadjup"
 
-#: builtin/repack.c:490
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "begränsar maximalt antal trådar"
 
-#: builtin/repack.c:492
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "maximal storlek på varje paketfil"
 
-#: builtin/repack.c:494
+#: 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:496
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "packa inte om detta paket"
 
-#: builtin/repack.c:498
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "hitta ett geometrisk förlopp med faktor <N>"
 
-#: builtin/repack.c:508
+#: 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:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
 
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable och -A kan inte användas samtidigt"
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric är inkompatibel med -A, -a"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "Inget nytt att packa."
 
-#: builtin/repack.c:669
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "nödvändig fil saknas: %s"
 
-#: builtin/repack.c:671
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "kunde inte ta bort: \"%s\""
@@ -21121,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 "
@@ -21190,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"
@@ -21223,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"
 
@@ -21295,145 +21431,137 @@ msgstr "endast ett mönster kan anges med -l"
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "registrera rena lösningar i indexet"
 
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "\"git rerere forget\" utan sökvägar är föråldrat"
 
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
 #, c-format
 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:83
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Du har inte en giltig HEAD."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Kunde inte hitta trädet för HEAD."
 
-#: builtin/reset.c:91
+#: 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:116
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD är nu på %s"
 
-#: builtin/reset.c:195
+#: 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:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: 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:297
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "återställ HEAD och index"
 
-#: builtin/reset.c:298
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "återställ endast HEAD"
 
-#: builtin/reset.c:300 builtin/reset.c:302
+#: 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:304
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "återställ HEAD men behåll lokala ändringar"
 
-#: builtin/reset.c:310
+#: 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:344
+#: 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:352
+#: 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:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
-
-#: builtin/reset.c:371
+#: 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:373
+#: 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:388
+#: 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:392
-msgid "-N can only be used with --mixed"
-msgstr "-N kan endast användas med --mixed"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "Oköade ändringar efter återställning:"
 
-#: builtin/reset.c:416
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -21447,30 +21575,27 @@ msgstr ""
 "konfigurationsvariabeln\n"
 "reset.quiet till true för att göra detta till förval.\n"
 
-#: builtin/reset.c:434
+#: 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:439
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "Kunde inte skriva ny indexfil."
 
-#: builtin/rev-list.c:538
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
-
-#: builtin/rev-list.c:599
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "objektfiltrering kräver --objects"
 
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr "rev-list stöder inte visning av anteckningar"
 
-#: builtin/rev-list.c:664
-msgid "marked counting is incompatible with --objects"
-msgstr "markerad räkning är inkompatibelt med --objects"
+#: builtin/rev-list.c:679
+#, 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>...]"
@@ -21488,6 +21613,18 @@ msgstr "sluta tolka efter första argument som inte är flagga"
 msgid "output in stuck long form"
 msgstr "utdata fast i lång form"
 
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "för tidigt slut på indata"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr "ingen användningssträng angavs före \"--\"-avdelaren"
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "Behövde ensam revision"
+
 #: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -21503,6 +21640,50 @@ msgstr ""
 "Kör \"git rev-parse --parseopt -h\" för mer information om den första "
 "varianten."
 
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir kräver ett argument"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "inte en gitkatalog \"%s\""
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "--git-path kräver ett argument"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "-n kräver ett argument"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "--path-format kräver ett argument"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "felaktigt argument till --path-format: %s"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "--default kräver ett argument"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "--prefix kräver ett argument"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "okänt läge för --abbrev-ref: %s"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "okänt läge för --show-object-format: %s"
+
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<flaggor>] <incheckning-igt>..."
@@ -21577,15 +21758,19 @@ msgstr "lägg till incheckningsnamn"
 msgid "preserve initially empty commits"
 msgstr "behåll incheckningar som börjar som tomma"
 
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "tillåt incheckningar med tomt meddelande"
+
 #: builtin/revert.c:129
 msgid "keep redundant, empty commits"
 msgstr "behåll redundanta, tomma incheckningar"
 
-#: builtin/revert.c:237
+#: builtin/revert.c:241
 msgid "revert failed"
 msgstr "\"revert\" misslyckades"
 
-#: builtin/revert.c:250
+#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "\"cherry-pick\" misslyckades"
 
@@ -21633,70 +21818,70 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "följande fil har lokala ändringar:"
 msgstr[1] "följande filer har lokala ändringar:"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "lista inte borttagna filer"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "ta bara bort från indexet"
 
-#: builtin/rm.c:246
+#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "överstyr àjour-testet"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "tillåt rekursiv borttagning"
 
-#: builtin/rm.c:249
+#: builtin/rm.c:250
 msgid "exit with a zero status even if nothing matched"
 msgstr "avsluta med nollstatus även om inget träffades"
 
-#: builtin/rm.c:283
+#: builtin/rm.c:285
 msgid "No pathspec was given. Which files should I remove?"
 msgstr "Ingen sökvägsangivelse gavs. Vilka filer ska jag ta bort?"
 
-#: builtin/rm.c:310
+#: builtin/rm.c:315
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "löa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
 
-#: builtin/rm.c:331
+#: builtin/rm.c:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "tar inte bort \"%s\" rekursivt utan -r"
 
-#: builtin/rm.c:379
+#: builtin/rm.c:385
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: kan inte ta bort %s"
 
 #: builtin/send-pack.c:20
 msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-"  --all and explicit <ref> specification are mutually exclusive."
+"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=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<värd>:]<katalog> "
-"[<ref>...]\n"
-"  --all och explicit angiven <ref> är ömsesidigt uteslutande."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [<värd>:]<katalog> (--all | <ref>...)"
 
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "fjärrnamn"
 
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "använd tillståndslöst RPC-protokoll"
 
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "läs referenser från standard in"
 
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "visa status från fjärrhjälpare"
 
@@ -21710,7 +21895,7 @@ msgstr "git log --pretty=short | git shortlog [<flaggor>]"
 
 #: builtin/shortlog.c:123
 msgid "using multiple --group options with stdin is not supported"
-msgstr "mer än en --group-flagga stöds inte med standard in"
+msgstr "mer än en \"--group\"-flagga stöds inte med standard in"
 
 #: builtin/shortlog.c:133
 msgid "using --group=trailer with stdin is not supported"
@@ -21753,21 +21938,21 @@ msgstr "föt"
 msgid "group by field"
 msgstr "gruppera efter fält"
 
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
 msgid "too many arguments given outside repository"
 msgstr "för många flaggor givna utanför arkivet"
 
 #: builtin/show-branch.c:13
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<när>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
+"                [--current] [--color[=<när>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
 
 #: builtin/show-branch.c:17
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -21780,115 +21965,108 @@ msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "ignorerar %s; kan inte hantera mer än %d referens"
 msgstr[1] "ignorerar %s; kan inte hantera mer än %d referenser"
 
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
 #, c-format
 msgid "no matching refs with %s"
 msgstr "inga motsvarande referenser med %s"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
 msgid "show remote-tracking and local branches"
 msgstr "visa fjärrspårande och lokala grenar"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
 msgid "show remote-tracking branches"
 msgstr "visa fjärrspårande grenar"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
 msgid "color '*!+-' corresponding to the branch"
 msgstr "färga \"*!+-\" enligt grenen"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
 msgid "show <n> more commits after the common ancestor"
 msgstr "visa <n> ytterligare incheckningar efter gemensam anfader"
 
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
 msgid "synonym to more=-1"
 msgstr "synonym till more=-1"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
 msgid "suppress naming strings"
 msgstr "undertyck namnsträngar"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
 msgid "include the current branch"
-msgstr "inkludera aktuell gren"
+msgstr "ta med aktuell gren"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
 msgid "name commits with their object names"
 msgstr "namnge incheckningar med deras objektnamn"
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
 msgid "show possible merge bases"
 msgstr "visa möjliga sammanslagningsbaser"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
 msgid "show refs unreachable from any other ref"
 msgstr "visa referenser som inte kan nås från någon annan referens"
 
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
 msgid "show commits in topological order"
 msgstr "visa incheckningar i topologisk ordning"
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
 msgid "show only commits not on the first branch"
 msgstr "visa endast incheckningar inte på den första grenen"
 
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
 msgid "show merges reachable from only one tip"
 msgstr "visa sammanslagningar som endast kan nås från en spets"
 
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
 msgid "topologically sort, maintaining date order where possible"
 msgstr "sortera topologiskt, behåll datumordning när möjligt"
 
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
 msgid "<n>[,<base>]"
 msgstr "<n>[,<bas>]"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
 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:711
-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:735
+#: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "inga grenar angavs, och HEAD är inte giltigt"
 
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
 msgid "--reflog option needs one branch name"
 msgstr "--reflog behöver ett namn på en gren"
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "maximalt %d poster kan visas samtidigt."
 msgstr[1] "maximalt %d poster kan visas samtidigt."
 
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
 #, c-format
 msgid "no such ref %s"
 msgstr "ingen sådan referens %s"
 
-#: builtin/show-branch.c:831
+#: 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:835
+#: 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:838
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "hittar inte incheckning %s (%s)"
@@ -21953,75 +22131,116 @@ 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:227
+#: builtin/sparse-checkout.c:176
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"katalogen \"%s\" innehåller ospårade filer, men är inte i området som ages i "
+"\"sparse-checkout\""
+
+#: builtin/sparse-checkout.c:184
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "misslyckades ta bort katalogen \"%s\""
+
+#: 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:268
+#: 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:270
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "misslyckades ändra inställningen extensions.worktreeConfig"
 
-#: builtin/sparse-checkout.c:290
+#: 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:310
+#: 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:312
+#: 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:340
-msgid "failed to modify sparse-index config"
-msgstr "misslyckades ändra inställning för sparse-index"
-
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "misslyckades öppna \"%s\""
 
-#: builtin/sparse-checkout.c:419
+#: 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:431
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)"
-
-#: builtin/sparse-checkout.c:456
+#: 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:510 builtin/sparse-checkout.c:534
+#: 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:579
+#: 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:594
-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:613
+#: 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: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:644
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "fel vid uppdatering av arbetskatalog"
 
@@ -22045,28 +22264,28 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <grennamn> [<stash>]"
 
-#: builtin/stash.c:29 builtin/stash.c:70
-msgid "git stash clear"
-msgstr "git stash clear"
-
 #: 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 builtin/stash.c:87
+#: 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
@@ -22091,6 +22310,14 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n"
 "          [--] [<sökväg>...]]"
 
+#: builtin/stash.c:87
+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] [<meddelande>]"
+
 #: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
@@ -22114,7 +22341,7 @@ msgstr "%s är inte en giltigt referens"
 msgid "git stash clear with arguments is unimplemented"
 msgstr "\"git stash clear\" med argument har inte implementerats"
 
-#: builtin/stash.c:431
+#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -22125,166 +22352,183 @@ msgstr ""
 "            %s -> %s\n"
 "         för att lämna plats.\n"
 
-#: builtin/stash.c:492
+#: builtin/stash.c:508
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "kan inte tillämpa en \"stash\" mitt i en sammanslagning"
 
-#: builtin/stash.c:503
+#: builtin/stash.c:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "kunde inte skapa diff %s^!."
 
-#: builtin/stash.c:510
+#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr "konflikter i indexet. Testa utan --index."
 
-#: builtin/stash.c:516
+#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "kunde inte spara indexträd"
 
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "kunde inte återställa ospårade filer från stash-post"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Slår ihop %s med %s"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "Indexet har inte tagits upp ur \"stash\":en"
 
-#: builtin/stash.c:591 builtin/stash.c:689
+#: 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:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "försök återskapa indexet"
 
-#: builtin/stash.c:635
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Kastade %s (%s)"
 
-#: builtin/stash.c:638
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Kunde inte kasta \"stash\"-post"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "\"%s\" är inte en \"stash\"-referens"
 
-#: builtin/stash.c:701
+#: 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:724
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "Inget grennamn angavs"
 
-#: builtin/stash.c:808
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "misslyckades tolka träd"
 
-#: builtin/stash.c:819
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "misslyckades packa upp träd"
 
-#: builtin/stash.c:839
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "ta med ospårade filer i \"stash\""
 
-#: builtin/stash.c:842
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "visa bara ospårade filer i \"stash\""
 
-#: builtin/stash.c:932 builtin/stash.c:969
+#: 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:950 builtin/stash.c:1606 builtin/stash.c:1671
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "\"stash\"-meddelande"
 
-#: builtin/stash.c:960
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" kräver ett <incheckning>-argument"
 
-#: builtin/stash.c:1175
+#: 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:1275
+#: 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:1302
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "Kan inte spara aktuellt tillstånd för indexet"
 
-#: builtin/stash.c:1311
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "Kan inte spara ospårade filer"
 
-#: builtin/stash.c:1322 builtin/stash.c:1331
+#: 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:1359
+#: 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:1408
+#: 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:1426
+#: 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:1441
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "Inga lokala ändringar att spara"
 
-#: builtin/stash.c:1448
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "Kan inte initiera \"stash\""
 
-#: builtin/stash.c:1463
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "Kan inte spara aktuell status"
 
-#: builtin/stash.c:1468
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Sparade arbetskatalogen och indexstatus %s"
 
-#: builtin/stash.c:1558
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "Kan inte ta bort ändringar i arbetskatalogen"
 
-#: builtin/stash.c:1597 builtin/stash.c:1662
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "behåll indexet"
 
-#: builtin/stash.c:1599 builtin/stash.c:1664
+#: 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:1600 builtin/stash.c:1665
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "tyst läge"
 
-#: builtin/stash.c:1602 builtin/stash.c:1667
+#: 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:1604 builtin/stash.c:1669
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "ta med ignorerade filer"
 
-#: builtin/stash.c:1704
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -22308,40 +22552,49 @@ 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:47 builtin/submodule--helper.c:2424
+#: 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"
 
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper print-default-remote tar inga argument"
 
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "kan inte ta bort en komponent från url:en \"%s\""
 
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+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:1859
 msgid "alternative anchor for relative paths"
 msgstr "alternativa ankare för relativa sökvägar"
 
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:410
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:520
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "GÃ¥r in i \"%s\"\n"
 
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -22350,7 +22603,7 @@ msgstr ""
 "run_command returnerade icke-nollstatus för %s\n"
 "."
 
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:545
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -22361,76 +22614,67 @@ msgstr ""
 "undermoduler för %s\n"
 "."
 
-#: builtin/submodule--helper.c:566
+#: builtin/submodule--helper.c:561
 msgid "suppress output of entering each submodule command"
 msgstr "dölj utdata från för varje undermodulskommando som startas"
 
-#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
-#: builtin/submodule--helper.c:1488
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
 msgid "recurse into nested submodules"
 msgstr "rekursera in i nästlade undermoduler"
 
-#: builtin/submodule--helper.c:573
+#: builtin/submodule--helper.c:568
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]"
 
-#: builtin/submodule--helper.c:600
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget "
-"officiella uppström."
-
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:642
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Misslyckades registrera url för undermodulsökväg \"%s\""
 
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:646
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
 
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:656
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n"
 
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:663
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\""
 
-#: builtin/submodule--helper.c:710
+#: builtin/submodule--helper.c:685
 msgid "suppress output for initializing a submodule"
 msgstr "dölj utdata från initiering av undermodul"
 
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<flaggor>] [<sökväg>]"
 
-#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\""
 
-#: builtin/submodule--helper.c:836
+#: builtin/submodule--helper.c:811
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "misslyckades rekursera in i undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "hindra statusutskrift för undermodul"
 
-#: builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:863
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -22438,109 +22682,103 @@ msgstr ""
 "visa incheckning från indexet istället för den som lagrats i undermodulens "
 "HEAD"
 
-#: builtin/submodule--helper.c:894
+#: builtin/submodule--helper.c:869
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:918
+#: builtin/submodule--helper.c:893
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <sökväg>"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:965
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s(blob)->%s(submodule)"
 
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:968
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(submodule)->%s(blob)"
 
-#: builtin/submodule--helper.c:1006
+#: builtin/submodule--helper.c:981
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1056
+#: builtin/submodule--helper.c:1031
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "kunde inte hasha objekt från \"%s\""
 
-#: builtin/submodule--helper.c:1060
+#: builtin/submodule--helper.c:1035
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "okänt läge %o\n"
 
-#: builtin/submodule--helper.c:1301
+#: builtin/submodule--helper.c:1276
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr "använd incechkning lagrad i indexet istället för undermodulens HEAD"
 
-#: builtin/submodule--helper.c:1303
-msgid "to compare the commit in the index with that in the submodule HEAD"
-msgstr ""
-"för att jämföra incheckningen i indexet med den som lagrats i undermodulens "
-"HEAD"
+#: builtin/submodule--helper.c:1278
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "jämför incheckningen i indexet med den i undermodulens HEAD"
 
-#: builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1280
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr ""
 "hoppa över undermoduler där värdet för \"ignore_config\" är satt till \"all\""
 
-#: builtin/submodule--helper.c:1307
+#: builtin/submodule--helper.c:1282
 msgid "limit the summary size"
 msgstr "begränsa översiktsstorleken"
 
-#: builtin/submodule--helper.c:1312
+#: builtin/submodule--helper.c:1287
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr ""
 "git submodule--helper summary [<flaggor>] [<incheckning>] [--] [<sökväg>]"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1311
 msgid "could not fetch a revision for HEAD"
 msgstr "kunde inte hämta en version för HEAD"
 
-#: builtin/submodule--helper.c:1341
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached och --files är ömsesidigt uteslutande"
-
-#: builtin/submodule--helper.c:1408
+#: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Synkroniserar undermodul-url för \"%s\"\n"
 
-#: builtin/submodule--helper.c:1414
+#: builtin/submodule--helper.c:1379
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "misslyckades registrera url för undermodulsökväg \"%s\""
 
-#: builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c:1393
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\""
 
-#: builtin/submodule--helper.c:1439
+#: builtin/submodule--helper.c:1404
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\""
 
-#: builtin/submodule--helper.c:1486
+#: builtin/submodule--helper.c:1451
 msgid "suppress output of synchronizing submodule url"
 msgstr "dölj utdata från synkronisering av undermodul-url"
 
-#: builtin/submodule--helper.c:1493
+#: builtin/submodule--helper.c:1458
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]"
 
-#: builtin/submodule--helper.c:1547
+#: 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:1559
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22549,46 +22787,46 @@ msgstr ""
 "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort "
 "dem"
 
-#: builtin/submodule--helper.c:1567
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Rensade katalogen \"%s\"\n"
 
-#: builtin/submodule--helper.c:1569
+#: 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:1580
+#: 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:1596
+#: 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:1625
+#: 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:1626
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "avregistrera alla undermoduler"
 
-#: builtin/submodule--helper.c:1631
+#: 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:1645
+#: 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:1714
+#: 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"
@@ -22600,46 +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:1753 builtin/submodule--helper.c:1756
+#: 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:1792
+#: 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:1799
+#: 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:1823
+#: 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: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:1818
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "katalogen inte tom: \"%s\""
+
+#: 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:1862
 msgid "where the new submodule will be cloned to"
 msgstr "var den nya undermodulen ska klonas till"
 
-#: builtin/submodule--helper.c:1826
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "namn på den nya undermodulen"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr "URL att klona undermodulen från"
 
-#: builtin/submodule--helper.c:1837
+#: 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:1840 builtin/submodule--helper.c:2349
+#: 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:1842 builtin/submodule--helper.c:2351
+#: 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:1849
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22649,103 +22908,178 @@ msgstr ""
 "<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --"
 "path <sökväg>"
 
-#: builtin/submodule--helper.c:1874
-#, 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:1885
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
-
-#: builtin/submodule--helper.c:1889
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "katalogen inte tom: \"%s\""
-
-#: builtin/submodule--helper.c:1901
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
-
-#: builtin/submodule--helper.c:1937
+#: 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:1941
+#: 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:2042
+#: 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:2046
+#: 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:2076
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Hoppar över ej sammanslagen undermodul %s"
 
-#: builtin/submodule--helper.c:2105
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Hoppar över undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:2255
+#: 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:2266
+#: 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:2328 builtin/submodule--helper.c:2574
+#: 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: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: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: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:2409
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "Undermodulsökvägen \"%s\": checkade ut \"%s\"\n"
+
+#: 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:2417
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "Undermodulsökvägen \"%s\": sammanslagen i \"%s\"\n"
+
+#: 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: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:2454
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+msgstr ""
+"Hämtade i undermodulssökvägen \"%s\", men den innehöll inte %s. Direkt "
+"hämtning av incheckningen misslyckades."
+
+#: 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:2331
+#: 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:2335
+#: 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:2341
+#: 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:2344
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "parallella jobb"
 
-#: builtin/submodule--helper.c:2346
+#: 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:2347
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "skriv inte klonförlopp"
 
-#: builtin/submodule--helper.c:2358
+#: 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:2371
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "felaktigt värde för parametern update"
 
-#: builtin/submodule--helper.c:2419
+#: 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:2567
+msgid "force checkout updates"
+msgstr "tvinga utcheckningsuppdateringar"
+
+#: 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: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:2572
+msgid "depth for shallow fetch"
+msgstr "djup för grund hämtning"
+
+#: builtin/submodule--helper.c:2582
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2583
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 förväntades av överprojekt{"
+
+#: builtin/submodule--helper.c:2585
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2586
+msgid "SHA1 of submodule's HEAD"
+msgstr "SHA1 för undermodulens \"HEAD\""
+
+#: 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:2663
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22754,84 +23088,186 @@ 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:2542
+#: 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:2575
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "rekursera ner i undermoduler"
 
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
-msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]"
+msgstr "git submodule--helper absorb-git-dirs [<flaggor>] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:2637
+#: 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:2640
+#: 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:2645
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <namn> [<värde>]"
 
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <namn>"
 
-#: builtin/submodule--helper.c:2647
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2666 git-submodule.sh:150
-#, sh-format
+#: 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:2682
+#: 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:2686
+#: 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:2719
+#: 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:2721
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "välj förvald spårad gren"
 
-#: builtin/submodule--helper.c:2725
+#: 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:2726
+#: 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|--brand) <gren> <sökväg>"
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <gren> <sökväg>"
 
-#: builtin/submodule--helper.c:2733
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "--branch eller --default krävs"
 
-#: builtin/submodule--helper.c:2736
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch och --default är ömsesidigt uteslutande"
+#: 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: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: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: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 ""
+"Om du vill återanvända den lokala git-katalogen istället för att klona på "
+"nytt från\n"
+"  %s\n"
+"kan du använda flaggan \"--force\". Om den lokala git-katalogen inte är "
+"korrekt\n"
+"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: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:3110
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "Kan inte checka ut undermodulen \"%s\""
+
+#: builtin/submodule--helper.c:3149
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "Misslyckades lägga till undermodulen \"%s\""
+
+#: 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:3222
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "\"%s\" finns redan i indexet"
 
-#: builtin/submodule--helper.c:2793 git.c:449 git.c:724
+#: 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:3254
+msgid "branch of repository to add as submodule"
+msgstr "gren från arkivet att lägga till som undermodul"
+
+#: 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:3257
+msgid "print only error messages"
+msgstr "visa endast felmeddelanden"
+
+#: builtin/submodule--helper.c:3261
+msgid "borrow the objects from reference repositories"
+msgstr "låna objekt från referensarkiv"
+
+#: builtin/submodule--helper.c:3263
+msgid ""
+"sets the submodule’s name to the given string instead of defaulting to its "
+"path"
+msgstr ""
+"sätter undermodulens namn till den angivna strängen istället för att använda "
+"sökvägen"
+
+#: 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: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: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:3341
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "\"%s\" är inte ett giltigt namn på undermodul"
+
+#: 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:2799
+#: 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"
@@ -22857,21 +23293,21 @@ msgstr "ta bort symbolisk referens"
 msgid "shorten ref output"
 msgstr "förkorta ref-utdata"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "skäl"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr "skäl till uppdateringen"
 
 #: builtin/tag.c:25
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+"        <tagname> [<head>]"
 msgstr ""
 "git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>]\n"
-"\t\t<taggnamn> [<huvud>]"
+"        <taggnamn> [<huvud>]"
 
 #: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
@@ -22881,13 +23317,13 @@ msgstr "git tag -d <taggnamn>..."
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
 "[<pattern>...]"
 msgstr ""
 "git tag -l [-n[<antal>]] [--contains <incheckning>] [--no-contains "
 "<incheckning>] [--points-at <objekt>]\n"
-"\t\t[--format=<format>] [--merged <incheckning>] [--no-merged <incheckning>] "
-"[<mönster>...]"
+"        [--format=<format>] [--merged <incheckning>] [--no-merged "
+"<incheckning>] [<mönster>...]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
@@ -22931,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"
@@ -22948,134 +23384,111 @@ 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:328
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "inget taggmeddelande?"
 
-#: builtin/tag.c:335
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Taggmeddelandet har lämnats i %s\n"
 
-#: builtin/tag.c:446
+#: builtin/tag.c:444
 msgid "list tag names"
 msgstr "lista taggnamn"
 
-#: builtin/tag.c:448
+#: builtin/tag.c:446
 msgid "print <n> lines of each tag message"
 msgstr "visa <n> rader från varje taggmeddelande"
 
-#: builtin/tag.c:450
+#: builtin/tag.c:448
 msgid "delete tags"
 msgstr "ta bort taggar"
 
-#: builtin/tag.c:451
+#: builtin/tag.c:449
 msgid "verify tags"
 msgstr "verifiera taggar"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:451
 msgid "Tag creation options"
 msgstr "Alternativ för att skapa taggar"
 
-#: builtin/tag.c:455
+#: builtin/tag.c:453
 msgid "annotated tag, needs a message"
 msgstr "annoterad tagg, behöver meddelande"
 
-#: builtin/tag.c:457
+#: builtin/tag.c:455
 msgid "tag message"
 msgstr "taggmeddelande"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:457
 msgid "force edit of tag message"
 msgstr "tvinga redigering av incheckningsmeddelande"
 
-#: builtin/tag.c:460
+#: builtin/tag.c:458
 msgid "annotated and GPG-signed tag"
 msgstr "annoterad och GPG-signerad tagg"
 
-#: builtin/tag.c:463
+#: builtin/tag.c:461
 msgid "use another key to sign the tag"
 msgstr "använd annan nyckel för att signera taggen"
 
-#: builtin/tag.c:464
+#: builtin/tag.c:462
 msgid "replace the tag if exists"
 msgstr "ersätt taggen om den finns"
 
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "skapa en reflog"
 
-#: builtin/tag.c:467
+#: builtin/tag.c:465
 msgid "Tag listing options"
 msgstr "Alternativ för listning av taggar"
 
-#: builtin/tag.c:468
+#: builtin/tag.c:466
 msgid "show tag list in columns"
 msgstr "lista taggar i spalter"
 
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
 msgid "print only tags that contain the commit"
 msgstr "visa endast taggar som innehåller incheckningen"
 
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that don't contain the commit"
 msgstr "visa endast taggar som inte innehåller incheckningen"
 
-#: builtin/tag.c:473
+#: builtin/tag.c:471
 msgid "print only tags that are merged"
 msgstr "visa endast taggar som slagits samman"
 
-#: builtin/tag.c:474
+#: builtin/tag.c:472
 msgid "print only tags that are not merged"
 msgstr "visa endast taggar som ej slagits samman"
 
-#: builtin/tag.c:478
+#: builtin/tag.c:476
 msgid "print only tags of the object"
 msgstr "visa endast taggar för objektet"
 
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column och -n är inkompatibla"
-
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "Flaggan -n är endast tillåten i listläge"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "Flaggan --contains är endast tillåten i listläge"
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "Flaggan --no-contains är endast tillåten i listläge"
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "Flaggan --points-at är endast tillåten i listläge"
-
-#: builtin/tag.c:556
-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:567
-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:592
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "\"%s\" är inte ett giltigt taggnamn."
 
-#: builtin/tag.c:597
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "taggen \"%s\" finns redan"
 
-#: builtin/tag.c:628
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
@@ -23089,198 +23502,193 @@ msgstr "Packar upp objekt"
 msgid "failed to create directory %s"
 msgstr "misslyckades skapa katalogen %s"
 
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "misslyckades skapa filen %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "misslyckades ta bort filen %s"
 
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "misslyckades ta bort katalogen %s"
 
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Testar mtime i \"%s\" "
 
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
 msgstr "stat-informationen för en katalog ändras inte när nya filer läggs till"
 
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "stat-informationen för en katalog ändras inte när nya kataloger läggs till"
 
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
 msgid "directory stat info changes after updating a file"
 msgstr "stat-informationen för en katalog ändras när filer uppdateras"
 
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "stat-informationen för en katalog ändras när filer läggs till i en "
 "underkatalog"
 
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
 msgid "directory stat info does not change after deleting a file"
 msgstr "stat-informationen för en katalog ändras inte när en fil tas bort"
 
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
 msgid "directory stat info does not change after deleting a directory"
 msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort"
 
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<flaggor>] [--] [<fil>...]"
 
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr "fortsätt uppdatera även när index inte är àjour"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "refresh: ignorera undermoduler"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "ignorera inte nya filer"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "låt filer ersätta kataloger och omvänt"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "lägg märke till filer som saknas i arbetskatalogen"
 
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "uppdatera statusinformation"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "som --refresh, men ignorera assume-unchanged-inställning"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<läge>,<objekt>,<sökväg>"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "lägg till angiven post i indexet"
 
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "markera filer som \"ändras inte\""
 
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "rensa \"assume-unchanged\"-biten"
 
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "markera filer som \"endast index\""
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "töm \"skip-worktree\"-biten"
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
 msgid "do not touch index-only entries"
 msgstr "rör inte \"endast index\"-poster"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen"
 
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "med --stdin: indatarader termineras med null-byte"
 
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "läs lista över sökvägar att uppdatera från standard in"
 
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "lägg poster från standard in till indexet"
 
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "återfyll etapp 2 och 3 från angivna sökvägar"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "uppdatera endast poster som skiljer sig från HEAD"
 
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "ignorera filer som saknas i arbetskatalogen"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "rapportera åtgärder på standard ut"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(för porslin) glöm sparade olösta konflikter"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "skriv index i detta format"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "aktivera eller inaktivera delat index"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "aktivera/inaktivera ospårad cache"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "testa om filsystemet stöder ospårad cache"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "aktivera ospårad cache utan att testa filsystemet"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "skriv ut indexet även om det inte angivits som ändrat"
 
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "aktivera eller inaktivera filsystemsövervakning"
 
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "markera filer som \"fsmonitor valid\""
 
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "töm \"fsmonitor valid\"-bit"
 
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -23288,7 +23696,7 @@ msgstr ""
 "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen "
 "vill aktivera delat index"
 
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -23296,7 +23704,7 @@ msgstr ""
 "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen "
 "vill inaktivera delat index"
 
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -23304,11 +23712,11 @@ msgstr ""
 "core.untrackedCache är satt till true; ta bort eller ändra det om du "
 "verkligen vill inaktivera den ospårade cachen"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Ospårad cache är inaktiverad"
 
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -23316,26 +23724,26 @@ msgstr ""
 "core.untrackedCache är satt till false; ta bort eller ändra det om du "
 "verkligen vill aktivera den ospårade cachen"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Ospårad cache är aktiverad för \"%s\""
 
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr "core.fsmonitor inte satt; sätt om du verkligen vill aktivera fsmonitor"
 
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "fsmonitor aktiverat"
 
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 "core.fsmonitor är satt; ta bort om du verkligen vill inaktivera fsmonitor"
 
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "fsmonitor inaktiverat"
 
@@ -23351,19 +23759,19 @@ msgstr "git update-ref [<flaggor>]    <refnamn> <gammaltvärde> [<nyttvärde>]"
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<flaggor>] --stdin [-z]"
 
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "ta bort referensen"
 
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
 msgstr "uppdatera <refnamn> inte det den pekar på"
 
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "standard in har NUL-terminerade argument"
 
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "läs uppdateringar från standard in"
 
@@ -23379,19 +23787,19 @@ msgstr "uppdatera informationsfilerna från grunden"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<flaggor>] <katalog>"
 
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
 msgid "quit after a single request/response exchange"
 msgstr "avsluta omedelbart efter första anrop/svar-utväxling"
 
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "presentera info/referenser för git-http-backend"
 
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog"
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
 
@@ -23421,69 +23829,64 @@ msgstr "visa endast statistik"
 
 #: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
-msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tagg>..."
 
 #: builtin/verify-tag.c:36
 msgid "print tag contents"
 msgstr "visa innehåll för tag"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<flaggor>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<flaggor>] <sökväg>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <arbetskatalog> <ny-sökväg>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<flaggor>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<flaggor>] <arbetskatalog>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <sökväg>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:935
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "misslyckades ta bort \"%s\""
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "Tar bort %s/%s: %s"
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
 msgid "report pruned working trees"
 msgstr "rapportera borttagna arbetskataloger"
 
-#: builtin/worktree.c:151
+#: builtin/worktree.c:150
 msgid "expire working trees older than <time>"
 msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c:220
 #, c-format
 msgid "'%s' already exists"
 msgstr "\"%s\" finns redan"
 
-#: builtin/worktree.c:230
+#: builtin/worktree.c:229
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "oanvändbar mål för arbetskatalog \"%s\""
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -23493,7 +23896,7 @@ msgstr ""
 "använd \"%s -f -f\" för att överstyra, eller \"unlock\" och \"prune\" eller "
 "\"remove\" för att rensa"
 
-#: builtin/worktree.c:237
+#: builtin/worktree.c:236
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -23503,27 +23906,31 @@ msgstr ""
 "använd \"%s -f\" för att överstyra, eller \"prune\" eller \"remove\" för att "
 "rensa"
 
-#: builtin/worktree.c:288
+#: builtin/worktree.c:287
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "kunde inte skapa katalogen \"%s\""
 
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+msgid "initializing"
+msgstr "initierar"
+
+#: 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:424
+#: 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:433
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Förbereder arbetskatalog (checkar ut \"%s\")"
 
-#: builtin/worktree.c:439
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)"
@@ -23549,83 +23956,79 @@ msgstr "befolka den nya arbetskatalogen"
 msgid "keep the new working tree locked"
 msgstr "låt arbetskatalogen förbli låst"
 
-#: builtin/worktree.c:493
+#: builtin/worktree.c:492 builtin/worktree.c:729
+msgid "reason for locking"
+msgstr "orsak till lås"
+
+#: 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:496
+#: 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:504
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B och --detach är ömsesidigt uteslutande"
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "lagt till med --lock"
 
-#: builtin/worktree.c:565
+#: 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:682
+#: 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:684
+#: 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:693
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose och --porcelain är ömsesidigt uteslutande"
-
-#: builtin/worktree.c:720
-msgid "reason for locking"
-msgstr "orsak till lås"
-
-#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
-#: builtin/worktree.c:963
+#: 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:734 builtin/worktree.c:767
+#: 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:739
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "\"%s\" är redan låst, orsak: %s"
 
-#: builtin/worktree.c:741
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "\"%s\" är redan låst"
 
-#: builtin/worktree.c:769
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "\"%s\" är inte låst"
 
-#: builtin/worktree.c:810
+#: 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:818
+#: 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:841 builtin/worktree.c:965
+#: 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:846
+#: 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:859
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -23634,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:861
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -23642,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:864
+#: 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:869
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "misslyckades flytta \"%s\" till \"%s\""
 
-#: builtin/worktree.c:915
+#: 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:919
+#: 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:924
+#: 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:947
+#: 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:970
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -23682,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:972
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -23690,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:975
+#: 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:999
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "reparera: %s: %s"
 
-#: builtin/worktree.c:1002
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "fel: %s: %s"
@@ -23752,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"
@@ -23782,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"
@@ -23816,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:833
+#: 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:883
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "kan inte hantera %s som inbyggd"
 
-#: git.c:896
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -23847,35 +24240,27 @@ msgstr ""
 "användning: %s\n"
 "\n"
 
-#: git.c:916
+#: 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:928
+#: 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"
@@ -23901,66 +24286,32 @@ msgstr "test-tool serve-v2 [<flaggor>]"
 msgid "exit immediately after advertising capabilities"
 msgstr "avsluta omedelbart efter kungörelse av kapabiliteter"
 
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "uttag/rör används redan: \"%s\""
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "kunde inte starta server på: \"%s\""
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "kunde inte starta serverprocess i bakgrunden"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "\"waitpid\" misslyckades"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "serverprocessen ännu inte operativ"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "serverprocessen kunde inte startas"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid är förvirrad"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "serverprocessen har ännu inte avslutats"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
 msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
 msgstr "test-helper simple-ipc is-active    [<namn>] [<flaggor>]"
 
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
 msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
 msgstr "test-helper simple-ipc run-daemon   [<namn>] [<trådar>]"
 
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
 msgstr ""
 "test-helper simple-ipc start-daemon [<namn>] [<trådar>] [<max-väntetid>]"
 
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
 msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
 msgstr "test-helper simple-ipc stop-daemon  [<namn>] [<max-väntetid>]"
 
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
 msgid "test-helper simple-ipc send         [<name>] [<token>]"
 msgstr "test-helper simple-ipc send         [<namn>] [<igenkänningstecken>]"
 
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
 msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
 msgstr "test-helper simple-ipc sendbytes    [<namn>] [<antal-byte>] [<byte>]"
 
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
 msgid ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
@@ -23968,83 +24319,79 @@ msgstr ""
 "test-helper simple-ipc multiple     [<namn>] [<trådar>] [<antal-byte>] "
 "[<buntstorlek>]"
 
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
 msgid "name or pathname of unix domain socket"
 msgstr "namn eller sövkäg till unixdomän-uttag"
 
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
 msgid "named-pipe name"
 msgstr "namn på namngivet rör"
 
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
 msgid "number of threads in server thread pool"
 msgstr "antal trådar i serverns trådpool"
 
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
 msgid "seconds to wait for daemon to start or stop"
 msgstr "sekunder att vänta på att serverprocessen startar eller stoppar"
 
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
 msgid "number of bytes"
 msgstr "antal byte"
 
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
 msgid "number of requests per thread"
 msgstr "antal frågor per tråd"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "byte"
 msgstr "byte"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "ballast character"
 msgstr "ballasttecken"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "token"
 msgstr "igenkänningstecken"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "command token to send to the server"
 msgstr "igenkänningstecken för kommando att sända till servern"
 
-#: http.c:399
+#: http.c:350
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "http.postbuffer har negativt värde; använder förvalet %d"
 
-#: http.c:420
+#: http.c:371
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
 
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.39.0"
 
-#: http.c:910
+#: http.c:812
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "CURLSSLOPT_NO_REVOKE stöds inte av cURL < 7.44.0"
 
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Prtokollbegränsningar stöds inte av cURL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "SSL-bakändan \"%s\" stöds inte. Dessa SSL-bakändor stöds:"
 
-#: http.c:1139
+#: http.c:1023
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr "Kan inte sätta SSL-bakända till \"%s\": cURL byggdes utan SSL-bakändor"
 
-#: http.c:1143
+#: http.c:1027
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "Kunde inte sätta SSL-bakända till \"%s\": redan valt"
 
-#: http.c:2035
+#: http.c:1876
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -24060,133 +24407,308 @@ msgstr ""
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "felaktig citering på värde för push-option: \"%s\""
 
-#: remote-curl.c:307
+#: remote-curl.c:304
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs inte giltig: är detta ett git-arkiv?"
 
-#: remote-curl.c:408
+#: remote-curl.c:405
 msgid "invalid server response; expected service, got flush packet"
 msgstr "ogiltigt svar från servern; förväntade tjänst, fick flush-paket"
 
-#: remote-curl.c:439
+#: remote-curl.c:436
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "ogiltigt svar från servern; fick \"%s\""
 
-#: remote-curl.c:499
+#: remote-curl.c:496
 #, c-format
 msgid "repository '%s' not found"
 msgstr "arkivet \"%s\" hittades inte"
 
-#: remote-curl.c:503
+#: remote-curl.c:500
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Autentisering misslyckades \"%s\""
 
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "kan inte nå \"%s\" med http.pinnedPubkey inställt till: %s"
+
+#: remote-curl.c:508
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "kan inte komma åt \"%s\": %s"
 
-#: remote-curl.c:513
+#: remote-curl.c:514
 #, c-format
 msgid "redirecting to %s"
 msgstr "omdirigerar till %s"
 
-#: remote-curl.c:642
+#: remote-curl.c:645
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "borde inte ha EOF när inte försiktig på EOF"
 
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr "fjärrservern sände tillståndslös avdelare"
+#: remote-curl.c:657
+msgid "remote server sent unexpected response end packet"
+msgstr "fjärrservern sände oväntat svarsavslutningspaketet"
 
-#: remote-curl.c:724
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr "kunde inte spola tillbaka rpc-postdata - försök öka http.postBuffer"
 
-#: remote-curl.c:754
+#: remote-curl.c:755
 #, c-format
 msgid "remote-curl: bad line length character: %.4s"
 msgstr "remote-curl: felaktig radlängdstecken: %.4s"
 
-#: remote-curl.c:756
+#: remote-curl.c:757
 msgid "remote-curl: unexpected response end packet"
 msgstr "remote-curl: oväntat svarsavslutningspaketet"
 
-#: remote-curl.c:832
+#: remote-curl.c:833
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC misslyckades; %s"
 
-#: remote-curl.c:872
+#: remote-curl.c:873
 msgid "cannot handle pushes this big"
 msgstr "kan inte hantera så stora sändningar"
 
-#: remote-curl.c:987
+#: remote-curl.c:986
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "kan inte packa upp anrop; zlib-deflate-fel %d"
 
-#: remote-curl.c:991
+#: remote-curl.c:990
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "kan inte packa upp anrop; zlib-slutfel %d"
 
-#: remote-curl.c:1041
+#: remote-curl.c:1040
 #, c-format
 msgid "%d bytes of length header were received"
 msgstr "%d byte av längd-huvudet togs emot"
 
-#: remote-curl.c:1043
+#: remote-curl.c:1042
 #, c-format
 msgid "%d bytes of body are still expected"
 msgstr "%d byte av kroppen väntas fortfarande"
 
-#: remote-curl.c:1132
+#: remote-curl.c:1131
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "dum http-transport stöder inte grunda arkiv"
 
-#: remote-curl.c:1147
+#: remote-curl.c:1146
 msgid "fetch failed."
 msgstr "mottagning misslyckades."
 
-#: remote-curl.c:1193
+#: remote-curl.c:1192
 msgid "cannot fetch by sha1 over smart http"
 msgstr "kan inte hämta med sha1 över smart http"
 
-#: remote-curl.c:1237 remote-curl.c:1243
+#: remote-curl.c:1236 remote-curl.c:1242
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "protokollfel: förväntade sha/ref, fick \"%s\""
 
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1254 remote-curl.c:1372
 #, c-format
 msgid "http transport does not support %s"
 msgstr "http-transporten stöder inte %s"
 
-#: remote-curl.c:1291
+#: remote-curl.c:1290
 msgid "git-http-push failed"
 msgstr "git-http-push misslyckades"
 
-#: remote-curl.c:1479
+#: remote-curl.c:1478
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]"
 
-#: remote-curl.c:1511
+#: remote-curl.c:1510
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl: fel vid läsning av kommandoström från git"
 
-#: remote-curl.c:1518
+#: remote-curl.c:1517
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: försökte ta emot utan lokalt arkiv"
 
-#: remote-curl.c:1559
+#: remote-curl.c:1558
 #, c-format
 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"
@@ -24203,11 +24725,11 @@ msgstr "argument"
 msgid "object filtering"
 msgstr "objektfiltrering"
 
-#: parse-options.h:184
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "giltig-till"
 
-#: parse-options.h:198
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "ingen funktion (bakåtkompatibilitet)"
 
@@ -24236,11 +24758,11 @@ 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:99
+#: ref-filter.h:98
 msgid "key"
 msgstr "nyckel"
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "fältnamn att sortera på"
 
@@ -24310,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"
@@ -24515,452 +25037,417 @@ 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 "Mappa författar-/incheckarnamn och/eller -e-postadresser"
+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"
 msgstr "Översikt över rekommenderade arbetsflöden med Git"
 
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "bisect-körning misslyckades: inget kommando gavs."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "kör $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"\"bisect\"-körningen misslyckades:\n"
-"felkod $res från \"$command\" är < 0 eller >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "\"bisect\"-körningen kan inte fortsätta längre"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"\"bisect\"-körningen misslyckades:\n"
-"\"bisect-state $state\" avslutades med felkoden $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "\"bisect\"-körningen lyckades"
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -25001,94 +25488,17 @@ msgstr "Försök enkel sammanslagning med $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
 
-#: git-submodule.sh:179
-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å"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "\"$sm_path\" finns redan i indexet"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "\"$sm_path\" har inte någon utcheckad incheckning"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-"  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"Om du vill återanvända den lokala git-katalogen instället för att klona på "
-"nytt från\n"
-"  $realrepo\n"
-"kan du använda flaggan \"--force\". Om den lokala git-katalogen inte är "
-"korrekt\n"
-"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
-"flaggan \"--name\"."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Kan inte checka ut undermodulen \"$sm_path\""
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Misslyckades registrera undermodulen \"$sm_path\""
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:578
+#: git-submodule.sh:411
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
 
-#: git-submodule.sh:583
+#: git-submodule.sh:416
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25097,453 +25507,50 @@ msgstr ""
 "Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
 "undermodulsökvägen \"$sm_path\""
 
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 "
-"direkt:"
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
-"Direkt hämtning av incheckningen misslyckades."
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\""
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\""
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\""
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
 
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Tillämpade autostash."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Kan inte spara $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"Tillämpning av autostash gav konflikter.\n"
-"Dina ändringar är säkra i stashen.\n"
-"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Ombaserar ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-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"
-"Kommandon:\n"
-"p, pick <incheckning> = använd incheckning\n"
-"r, reword <incheckning> = använd incheckning, men redigera "
-"incheckningsmeddelandet\n"
-"e, edit <incheckning> = använd incheckning, men stanna för tillägg\n"
-"s, squash <incheckning> = använd incheckning, men infoga i föregående "
-"incheckning\n"
-"f, fixup <incheckning> = som \"squash\", men förkasta "
-"incheckningsmeddelandet\n"
-"x, exec <incheckning> = kör kommando (resten av raden) i skalet\n"
-"d, drop <incheckning> = ta bort incheckning\n"
-"l, label <etikett> = ge aktuellt HEAD ett namn\n"
-"t, reset <etikett> = återställ HEAD till en etikett\n"
-"m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n"
-".       skapa en sammanslagning med ursprungligt meddelande (eller\n"
-".       enrads, om inget incheckningsmeddelande angavs). Använd\n"
-".       -v <incheckning> för att skriva om meddelandet.\n"
-"\n"
-"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, 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 ""
-"Du kan utöka incheckningen nu, med\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"När du är nöjd med dina ändringar kör du\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: inte en incheckning som kan väljas"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Felaktigt incheckningsnamn: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Snabbspolade till $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Kan inte snabbspola till $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Kan inte flytta HEAD till $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Fel när sammanslagningen $sha1 skulle göras om"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Kunde inte välja $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Det här är incheckningsmeddelande ${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Incheckningsmeddelande ${n} kommer hoppas över:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Det här är en kombination av $count incheckning."
-msgstr[1] "Det här är en kombination av $count incheckningar."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Kan inte skriva $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Det här är en kombination av 2 incheckningar."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Kunde inte tillämpa $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, 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 ""
-"Kunde inte utöka incheckning efter att ha lyckats välja $sha1... $rest\n"
-"Det är antagligen på grund av ett tomt incheckningsmeddelande, eller att\n"
-"pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n"
-"du måste lösa problemet innan du kan skriva om incheckningsmeddelandet."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Stoppade på $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Kör: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Körning misslyckades: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Du kan rätta problemet och sedan köra\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, 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 ""
-"Körningen lyckades: $rest\n"
-"men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n"
-"Checka in eller utför \"stash\" på ändringarna och kör sedan\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Okänt kommando: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Rätta det med \"git rebase --edit-todo\"."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Lyckades ombasera och uppdatera $head_name."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, 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 ""
-"Du har köade ändringar i din arbetskatalog.\n"
-"Om det är meningen att ändringarna\n"
-"ska läggas in i föregående incheckning, kör:\n"
-"\n"
-"  git commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Om de ska checkas in i en egen incheckning, kör:\n"
-"\n"
-"  git commit $gpg_sign_opt_quoted\n"
-"\n"
-"Oavsett vilket, när du är färdig fortsätter du med:\n"
-"\n"
-"  git rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
-"först och kör sedan \"git rebase --continue\" igen."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Kunde inte checka in köade ändringar."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Kunde inte starta textredigerare"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Kunde inte checka ut $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Inget HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Kunde inte skapa temporär $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Kunde inte markera som interaktiv"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)"
-msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Observera att tomma incheckningar är utkommenterade"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Kunde inte initiera omskrivna incheckningar"
-
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 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
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Kan inte ombasera: Du har oköade ändringar."
-
-#: git-sh-setup.sh:224
+#: 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:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "Kan inte hämta med ombasering: Du har oköade ändringar."
-
-#: git-sh-setup.sh:230
+#: 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:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar."
-
-#: git-sh-setup.sh:249
+#: 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:253
+#: 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:373
+#: 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:378
+#: 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"
 
@@ -25625,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"
@@ -25639,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"
@@ -25653,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"
@@ -25667,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"
@@ -25681,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"
@@ -25695,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"
@@ -25709,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"
@@ -25723,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"
@@ -25737,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"
@@ -25759,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"
@@ -25859,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:138
+#: 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:145 git-send-email.perl:151
+#: 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:222
+#: 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:235
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting"
 
-#: git-send-email.perl:321
+#: 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:326
+#: 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:419
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
-msgstr "--dump-alias är inkompatibelt med andra flaggor\n"
+msgstr "--dump-aliases är inkompatibelt med andra flaggor\n"
 
-#: git-send-email.perl:493
+#: 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"
@@ -25921,11 +25928,11 @@ msgstr ""
 "Sätt sendemail.forbidSendmailVariables till false för att inaktivera denna "
 "kontroll.\n"
 
-#: git-send-email.perl:498 git-send-email.perl:700
+#: 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:501
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -25933,37 +25940,37 @@ msgstr ""
 "\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad "
 "eller konfigurationsflagga)\n"
 
-#: git-send-email.perl:514
+#: 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:545
+#: 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:573
+#: 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:575
+#: 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:577
+#: 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:582
+#: 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:666
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -25978,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:687
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Misslyckades utföra opendir %s: %s"
 
-#: git-send-email.perl:720
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -25993,17 +26000,17 @@ msgstr ""
 "Inga patchfiler angavs!\n"
 "\n"
 
-#: git-send-email.perl:733
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Ingen ärenderad i %s?"
 
-#: git-send-email.perl:743
+#: 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:754
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26017,38 +26024,38 @@ msgstr ""
 "\n"
 "Rensa brevkroppen om du inte vill sända någon sammanfattning.\n"
 
-#: git-send-email.perl:778
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Misslyckades öppna %s: %s"
 
-#: git-send-email.perl:795
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Misslyckades öppna %s.final: %s"
 
-#: git-send-email.perl:838
+#: 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:873
+#: 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:928
+#: 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:933
+#: 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:941
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26061,21 +26068,21 @@ msgstr ""
 "har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen "
 "vill sända.\n"
 
-#: git-send-email.perl:960
+#: 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:978
+#: 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:990
+#: 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:1048 git-send-email.perl:1056
+#: 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"
@@ -26083,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:1060
+#: 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:1377
+#: 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:1460
+#: 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"
@@ -26119,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:1475
+#: 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:1478
+#: 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:1506
+#: 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:1553
+#: 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:1558 git-send-email.perl:1562
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS misslyckades! %s"
 
-#: git-send-email.perl:1571
+#: 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:1589
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Misslyckades sända %s\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Test-Sände %s\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Sände %s\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Test-OK. Loggen säger:\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK. Loggen säger:\n"
 
-#: git-send-email.perl:1606
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Resultat: "
 
-#: git-send-email.perl:1609
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Resultat: OK\n"
 
-#: git-send-email.perl:1627
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "kan inte öppna filen %s"
 
-#: git-send-email.perl:1674 git-send-email.perl:1694
+#: 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:1680
+#: 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:1737
+#: 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:1772
+#: 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:1883
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Kunde inte köra \"%s\""
 
-#: git-send-email.perl:1890
+#: 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:1894
+#: 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:1924
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "kan inte sända brev som sjubitars"
 
-#: git-send-email.perl:1932
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "ogiltig överföringskondning"
 
-#: git-send-email.perl:1966
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -26237,12 +26244,12 @@ msgstr ""
 "%s\n"
 "varning: inga patchar har sänts\n"
 
-#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039
+#: 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:1979
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26251,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:1997
+#: git-send-email.perl:2126
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
@@ -26259,11 +26266,911 @@ msgstr ""
 "säkerhetskopior.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2001
+#: 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"
+
+#~ msgid "--format=%.*s cannot be used with--python, --shell, --tcl"
+#~ msgstr "--format=%.*s kan inte användas med --python, --shell, --tcl"
+
+#~ msgid "unable to rename temporary '*.%s' file to '%s"
+#~ msgstr "kunde inte byta namn på temporär \"*.%s\"-fil till \"%s\""
+
+#~ msgid ""
+#~ "The following pathspecs didn't match any eligible path, but they do match "
+#~ "index\n"
+#~ "entries outside the current sparse checkout:\n"
+#~ msgstr ""
+#~ "Följande sökvägsangivelser motsvarar inte någon kvalificerad sökväg, men "
+#~ "motsvarar\n"
+#~ "indexposter utanför den nuvarande glesa utcheckningen:\n"
+
+#~ msgid ""
+#~ "Disable or modify the sparsity rules if you intend to update such entries."
+#~ msgstr ""
+#~ "Du måste ta bort eller ändra glesningsreglerna för att uppdatera sådana "
+#~ "poster."
+
+#~ msgid "could not set GIT_DIR to '%s'"
+#~ msgstr "kunde inte ställa in GIT_DIR till \"%s\""
+
+#~ msgid "unable to unpack %s header with --allow-unknown-type"
+#~ msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
+
+#~ msgid "unable to parse %s header with --allow-unknown-type"
+#~ msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
+
+#~ msgid "open /dev/null failed"
+#~ msgstr "misslyckades öppna /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 ""
+#~ "efter att ha löst konflikterna, markera de rättade sökvägarna\n"
+#~ "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
+#~ "och checka in resultatet med \"git commit\""
+
+#~ msgid "open /dev/null or dup failed"
+#~ msgstr "misslyckades öppna /dev/null eller \"dup\""
+
+#~ msgid "attempting to use sparse-index without cone mode"
+#~ msgstr "försöker använda glest index utan \"cone\"-läge"
+
+#~ msgid "unable to update cache-tree, staying full"
+#~ msgstr "kan inte uppdatera cacheträd, behåller fullt läge"
+
+#~ msgid "Could not open '%s' for writing."
+#~ msgstr "Kunde inte öppna \"%s\" för skrivning."
+
+#~ msgid "could not create archive file '%s'"
+#~ msgstr "kunde inte skapa arkivfilen \"%s\""
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-next-check <term-för-rätt> <term-för-fel> "
+#~ "<eterm>"
+
+#~ msgid "--bisect-next-check requires 2 or 3 arguments"
+#~ msgstr "--bisect-next-check kräver 2 eller 3 argument"
+
+#~ msgid "couldn't create a new file at '%s'"
+#~ msgstr "kunde inte skapa filen på \"%s\""
+
+#~ msgid "git commit-tree: failed to open '%s'"
+#~ msgstr "git commit-tree: misslyckades öppna \"%s\""
+
+#~ msgid "cannot open packfile '%s'"
+#~ msgstr "kan inte öppna paketfilen \"%s\""
+
+#~ msgid "cannot store pack file"
+#~ msgstr "kan inte spara paketfil"
+
+#~ msgid "cannot store index file"
+#~ msgstr "kan inte spara indexfil"
+
+#~ msgid "exclude patterns are read from <file>"
+#~ msgstr "exkludera mönster som läses från <fil>"
+
+#~ msgid "Unknown option for merge-recursive: -X%s"
+#~ msgstr "Felaktig flagga för merge-recursive: -X%s"
+
+#~ msgid "unusable todo list: '%s'"
+#~ msgstr "oanvändbar todo-lista: %s"
+
+#~ msgid "git rebase--interactive [<options>]"
+#~ msgstr "git rebase--interactive [<flaggor>]"
+
+#~ msgid "rebase merge commits"
+#~ msgstr "ombasera sammanslagningar"
+
+#~ msgid "keep original branch points of cousins"
+#~ msgstr "behåll ursprungliga förgreningspunkter för kusiner"
+
+#~ msgid "move commits that begin with squash!/fixup!"
+#~ msgstr "flytta incheckningar som inleds med squash!/fixup!"
+
+#~ msgid "sign commits"
+#~ msgstr "signera incheckningar"
+
+#~ msgid "continue rebase"
+#~ msgstr "fortsätt ombasering"
+
+#~ msgid "skip commit"
+#~ msgstr "hoppa över incheckning"
+
+#~ msgid "edit the todo list"
+#~ msgstr "redigera attgöra-listan"
+
+#~ msgid "shorten commit ids in the todo list"
+#~ msgstr "förkorta inchecknings-id i todo-listan"
+
+#~ msgid "expand commit ids in the todo list"
+#~ msgstr "utöka inchecknings-id i todo-listan"
+
+#~ msgid "check the todo list"
+#~ msgstr "kontrollera todo-listan"
+
+#~ msgid "rearrange fixup/squash lines"
+#~ msgstr "ordna om fixup-/squash-rader"
+
+#~ msgid "insert exec commands in todo list"
+#~ msgstr "lägg in exec-kommandon i todo-listan"
+
+#~ msgid "onto"
+#~ msgstr "ovanpå"
+
+#~ msgid "restrict-revision"
+#~ msgstr "restrict-revision"
+
+#~ msgid "restrict revision"
+#~ msgstr "begränsa revision"
+
+#~ msgid "squash-onto"
+#~ msgstr "squash-onto"
+
+#~ msgid "squash onto"
+#~ msgstr "tryck ihop ovanpå"
+
+#~ msgid "the upstream commit"
+#~ msgstr "uppströmsincheckningen"
+
+#~ msgid "head-name"
+#~ msgstr "head-name"
+
+#~ msgid "head name"
+#~ msgstr "namn på huvud"
+
+#~ msgid "rebase strategy"
+#~ msgstr "sammanslagningsstrategi"
+
+#~ msgid "strategy-opts"
+#~ msgstr "strategy-opts"
+
+#~ msgid "strategy options"
+#~ msgstr "strategiflaggor"
+
+#~ msgid "switch-to"
+#~ msgstr "switch-to"
+
+#~ msgid "the branch or commit to checkout"
+#~ msgstr "gren eller inchecking att checka ut"
+
+#~ msgid "onto-name"
+#~ msgstr "onto-name"
+
+#~ msgid "onto name"
+#~ msgstr "på-namn"
+
+#~ msgid "cmd"
+#~ msgstr "kmd"
+
+#~ msgid "the command to run"
+#~ msgstr "kommando att köra"
+
+#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+#~ msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges"
+
+#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+#~ msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
+
+#~ msgid ""
+#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+#~ msgstr ""
+#~ "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-"
+#~ "exec\""
+
+#~ msgid ""
+#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
+#~ "--name <name>"
+#~ msgstr ""
+#~ "git submodule--helper add-clone [<flaggor>...] --url <url> --path "
+#~ "<sökväg> --name <namn>"
+
+#~ msgid "failed to create file %s"
+#~ msgstr "misslyckades skapa filen %s"
+
+#~ msgid "exit immediately after initial ref advertisement"
+#~ msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
+
+#~ msgid "socket/pipe already in use: '%s'"
+#~ msgstr "uttag/rör används redan: \"%s\""
+
+#~ msgid "could not start server on: '%s'"
+#~ msgstr "kunde inte starta server på: \"%s\""
+
+#~ msgid "could not spawn daemon in the background"
+#~ msgstr "kunde inte starta serverprocess i bakgrunden"
+
+#~ msgid "waitpid failed"
+#~ msgstr "\"waitpid\" misslyckades"
+
+#~ msgid "daemon not online yet"
+#~ msgstr "serverprocessen ännu inte operativ"
+
+#~ msgid "daemon failed to start"
+#~ msgstr "serverprocessen kunde inte startas"
+
+#~ msgid "waitpid is confused"
+#~ msgstr "waitpid är förvirrad"
+
+#~ msgid "daemon has not shutdown yet"
+#~ msgstr "serverprocessen har ännu inte avslutats"
+
+#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
+#~ msgstr "Prtokollbegränsningar stöds inte av cURL < 7.19.4"
+
+#~ msgid "running $command"
+#~ msgstr "kör $command"
+
+#~ msgid "'$sm_path' does not have a commit checked out"
+#~ msgstr "\"$sm_path\" har inte någon utcheckad incheckning"
+
+#~ msgid "Submodule path '$displaypath': '$command $sha1'"
+#~ msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
+
+#~ msgid "Applied autostash."
+#~ msgstr "Tillämpade autostash."
+
+#~ msgid "Cannot store $stash_sha1"
+#~ msgstr "Kan inte spara $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 ""
+#~ "Tillämpning av autostash gav konflikter.\n"
+#~ "Dina ändringar är säkra i stashen.\n"
+#~ "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
+
+#~ msgid "Rebasing ($new_count/$total)"
+#~ msgstr "Ombaserar ($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"
+#~ "Kommandon:\n"
+#~ "p, pick <incheckning> = använd incheckning\n"
+#~ "r, reword <incheckning> = använd incheckning, men redigera "
+#~ "incheckningsmeddelandet\n"
+#~ "e, edit <incheckning> = använd incheckning, men stanna för tillägg\n"
+#~ "s, squash <incheckning> = använd incheckning, men infoga i föregående "
+#~ "incheckning\n"
+#~ "f, fixup <incheckning> = som \"squash\", men förkasta "
+#~ "incheckningsmeddelandet\n"
+#~ "x, exec <incheckning> = kör kommando (resten av raden) i skalet\n"
+#~ "d, drop <incheckning> = ta bort incheckning\n"
+#~ "l, label <etikett> = ge aktuellt HEAD ett namn\n"
+#~ "t, reset <etikett> = återställ HEAD till en etikett\n"
+#~ "m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n"
+#~ ".       skapa en sammanslagning med ursprungligt meddelande (eller\n"
+#~ ".       enrads, om inget incheckningsmeddelande angavs). Använd\n"
+#~ ".       -v <incheckning> för att skriva om meddelandet.\n"
+#~ "\n"
+#~ "Du kan byta ordning på raderna; de utförs uppifrån och ned.\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 ""
+#~ "Du kan utöka incheckningen nu, med\n"
+#~ "\n"
+#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "När du är nöjd med dina ändringar kör du\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid "$sha1: not a commit that can be picked"
+#~ msgstr "$sha1: inte en incheckning som kan väljas"
+
+#~ msgid "Invalid commit name: $sha1"
+#~ msgstr "Felaktigt incheckningsnamn: $sha1"
+
+#~ msgid "Cannot write current commit's replacement sha1"
+#~ msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning"
+
+#~ msgid "Fast-forward to $sha1"
+#~ msgstr "Snabbspolade till $sha1"
+
+#~ msgid "Cannot fast-forward to $sha1"
+#~ msgstr "Kan inte snabbspola till $sha1"
+
+#~ msgid "Cannot move HEAD to $first_parent"
+#~ msgstr "Kan inte flytta HEAD till $first_parent"
+
+#~ msgid "Refusing to squash a merge: $sha1"
+#~ msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1"
+
+#~ msgid "Error redoing merge $sha1"
+#~ msgstr "Fel när sammanslagningen $sha1 skulle göras om"
+
+#~ msgid "Could not pick $sha1"
+#~ msgstr "Kunde inte välja $sha1"
+
+#~ msgid "This is the commit message #${n}:"
+#~ msgstr "Det här är incheckningsmeddelande ${n}:"
+
+#~ msgid "The commit message #${n} will be skipped:"
+#~ msgstr "Incheckningsmeddelande ${n} kommer hoppas över:"
+
+#~ msgid "This is a combination of $count commit."
+#~ msgid_plural "This is a combination of $count commits."
+#~ msgstr[0] "Det här är en kombination av $count incheckning."
+#~ msgstr[1] "Det här är en kombination av $count incheckningar."
+
+#~ msgid "Cannot write $fixup_msg"
+#~ msgstr "Kan inte skriva $fixup_msg"
+
+#~ msgid "This is a combination of 2 commits."
+#~ msgstr "Det här är en kombination av 2 incheckningar."
+
+#~ msgid "Could not apply $sha1... $rest"
+#~ msgstr "Kunde inte tillämpa $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 ""
+#~ "Kunde inte utöka incheckning efter att ha lyckats välja $sha1... $rest\n"
+#~ "Det är antagligen på grund av ett tomt incheckningsmeddelande, eller att\n"
+#~ "pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n"
+#~ "du måste lösa problemet innan du kan skriva om incheckningsmeddelandet."
+
+#~ msgid "Stopped at $sha1_abbrev... $rest"
+#~ msgstr "Stoppade på $sha1_abbrev... $rest"
+
+#~ msgid "Cannot '$squash_style' without a previous commit"
+#~ msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning"
+
+#~ msgid "Executing: $rest"
+#~ msgstr "Kör: $rest"
+
+#~ msgid "Execution failed: $rest"
+#~ msgstr "Körning misslyckades: $rest"
+
+#~ msgid "and made changes to the index and/or the working tree"
+#~ msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen"
+
+#~ msgid ""
+#~ "You can fix the problem, and then run\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+#~ msgstr ""
+#~ "Du kan rätta problemet och sedan köra\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 ""
+#~ "Körningen lyckades: $rest\n"
+#~ "men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n"
+#~ "Checka in eller utför \"stash\" på ändringarna och kör sedan\n"
+#~ "\n"
+#~ "\tgit rebase --continue"
+
+#~ msgid "Unknown command: $command $sha1 $rest"
+#~ msgstr "Okänt kommando: $command $sha1 $rest"
+
+#~ msgid "Please fix this using 'git rebase --edit-todo'."
+#~ msgstr "Rätta det med \"git rebase --edit-todo\"."
+
+#~ msgid "Successfully rebased and updated $head_name."
+#~ msgstr "Lyckades ombasera och uppdatera $head_name."
+
+#~ msgid "Could not remove CHERRY_PICK_HEAD"
+#~ msgstr "Kunde inte ta bort 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 ""
+#~ "Du har köade ändringar i din arbetskatalog.\n"
+#~ "Om det är meningen att ändringarna\n"
+#~ "ska läggas in i föregående incheckning, kör:\n"
+#~ "\n"
+#~ "  git commit --amend $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Om de ska checkas in i en egen incheckning, kör:\n"
+#~ "\n"
+#~ "  git commit $gpg_sign_opt_quoted\n"
+#~ "\n"
+#~ "Oavsett vilket, när du är färdig fortsätter du med:\n"
+#~ "\n"
+#~ "  git rebase --continue\n"
+
+#~ msgid "Error trying to find the author identity to amend commit"
+#~ msgstr ""
+#~ "Fel vid försök att hitta författaridentitet för att utöka incheckning"
+
+#~ msgid ""
+#~ "You have uncommitted changes in your working tree. Please commit them\n"
+#~ "first and then run 'git rebase --continue' again."
+#~ msgstr ""
+#~ "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
+#~ "först och kör sedan \"git rebase --continue\" igen."
+
+#~ msgid "Could not commit staged changes."
+#~ msgstr "Kunde inte checka in köade ändringar."
+
+#~ msgid "Could not execute editor"
+#~ msgstr "Kunde inte starta textredigerare"
+
+#~ msgid "Could not checkout $switch_to"
+#~ msgstr "Kunde inte checka ut $switch_to"
+
+#~ msgid "No HEAD?"
+#~ msgstr "Inget HEAD?"
+
+#~ msgid "Could not create temporary $state_dir"
+#~ msgstr "Kunde inte skapa temporär $state_dir"
+
+#~ msgid "Could not mark as interactive"
+#~ msgstr "Kunde inte markera som interaktiv"
+
+#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+#~ msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)"
+#~ msgstr[1] ""
+#~ "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)"
+
+#~ msgid "Note that empty commits are commented out"
+#~ msgstr "Observera att tomma incheckningar är utkommenterade"
+
+#~ msgid "Could not init rewritten commits"
+#~ msgstr "Kunde inte initiera omskrivna incheckningar"
+
+#~ msgid "Cannot rebase: You have unstaged changes."
+#~ msgstr "Kan inte ombasera: Du har oköade ändringar."
+
+#~ msgid "Cannot pull with rebase: You have unstaged changes."
+#~ msgstr "Kan inte hämta med ombasering: Du har oköade ändringar."
+
+#~ msgid "Cannot rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in."
+
+#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+#~ msgstr ""
+#~ "Kan inte hämta med ombasering: Ditt index innehåller oincheckade "
+#~ "ändringar."
+
+#~ msgid "unable to write stateless separator packet"
+#~ msgstr "kan inte skriva tillståndslöst avdelarpaket"
+
+#~ 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 "fjärrservern sände tillståndslös avdelare"
+
 #~ msgid "--cached and --3way cannot be used together."
 #~ msgstr "--cached och --3way kan inte användas samtidigt."
 
@@ -26639,12 +27546,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "Cannot store %s"
 #~ msgstr "Kan inte spara %s"
 
-#~ msgid "initialize sparse-checkout"
-#~ msgstr "initiera sparse-checkout"
-
-#~ msgid "set sparse-checkout patterns"
-#~ msgstr "ställ in filter för gles utcheckning"
-
 #~ msgid "disable sparse-checkout"
 #~ msgstr "inaktivera gles utcheckning"
 
@@ -26918,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"
 
@@ -27179,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\""
 
@@ -27207,9 +28102,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "Failed to recurse into submodule path '$sm_path'"
 #~ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
 
-#~ msgid "%%(trailers) does not take arguments"
-#~ msgstr "%%(trailers) tar inte argument"
-
 #~ msgid ""
 #~ "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring."
 #~ msgstr ""
@@ -27538,9 +28430,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "Can't cherry-pick into empty head"
 #~ msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
 
-#~ msgid "could not open %s for writing"
-#~ msgstr "kunde inte öppna %s för skrivning"
-
 #~ msgid "bug: unhandled unmerged status %x"
 #~ msgstr "programfel: ej hanterad \"unmerged\"-status %x"
 
@@ -27564,9 +28453,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "  (unable to update local ref)"
 #~ msgstr "  (kunde inte uppdatera lokal ref)"
 
-#~ msgid "Reinitialized existing"
-#~ msgstr "Ominitierade befintligt"
-
 #~ msgid "Initialized empty"
 #~ msgstr "Initierade tomt"
 
@@ -27718,9 +28604,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "branch '%s' does not point at a commit"
 #~ msgstr "grenen \"%s\" pekar inte på en incheckning"
 
-#~ msgid "print only merged branches"
-#~ msgstr "visa endast sammanslagna grenar"
-
 #~ msgid "--dissociate given, but there is no --reference"
 #~ msgstr "--dissociate angavs, men --reference har inte angivits"
 
diff --git a/po/tr.po b/po/tr.po
index e26ca7d551..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 <bitigchi@me.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 <bitigchi@me.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-05-17 16:02+0800\n"
-"PO-Revision-Date: 2021-05-17 18:00+0300\n"
-"Last-Translator: Emir SARI <bitigchi@me.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"
@@ -100,232 +100,233 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: add-interactive.c:376
+#: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Pardon (%s)?"
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: 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ı"
 
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
 #: git-add--interactive.perl:294
 msgid "binary"
 msgstr "ikili"
 
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
 #: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "hiçbir şey"
 
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
 #: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "deÄŸiÅŸtirilmemiÅŸ"
 
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Güncelle"
 
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
 #, c-format
 msgid "could not stage '%s'"
 msgstr "'%s' hazırlanamadı"
 
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "indeks yazılamadı"
 
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
 #, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "%d yol güncellendi\n"
 msgstr[1] "%d yol güncellendi\n"
 
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "not: %s artık izlenmiyor.\n"
 
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: 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"
 
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Geri al"
 
-#: add-interactive.c:775
+#: add-interactive.c:779
 msgid "Could not parse HEAD^{tree}"
 msgstr "HEAD^{tree} ayrıştırılamadı"
 
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
 #, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "%d yol geri alındı\n"
 msgstr[1] "%d yol geri alındı\n"
 
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "Ä°zlenmeyen dosya yok.\n"
 
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Ä°zlenmeyenleri ekle"
 
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
 #, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "%d yol eklendi\n"
 msgstr[1] "%d yol eklendi\n"
 
-#: add-interactive.c:925
+#: add-interactive.c:929
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "birleştirilmeyenler yok sayılıyor: %s"
 
-#: add-interactive.c:937 add-patch.c:1751 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:939 add-patch.c:1749 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:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Yama güncellemesi"
 
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "diff'i gözden geçir"
 
-#: add-interactive.c:1010
+#: add-interactive.c:1014
 msgid "show paths with changes"
 msgstr "değiştirilmiş yolları göster"
 
-#: add-interactive.c:1012
+#: add-interactive.c:1016
 msgid "add working tree state to the staged set of changes"
 msgstr "hazırlanan değişikliklere çalışma ağacı durumunu ekle"
 
-#: add-interactive.c:1014
+#: add-interactive.c:1018
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "hazırlanan değişiklikleri HEAD sürümüne geri al"
 
-#: add-interactive.c:1016
+#: add-interactive.c:1020
 msgid "pick hunks and update selectively"
 msgstr "parçaları seç ve seçerek güncelle"
 
-#: add-interactive.c:1018
+#: add-interactive.c:1022
 msgid "view diff between HEAD and index"
 msgstr "HEAD ve indeks arasındaki diff'i gör"
 
-#: add-interactive.c:1020
+#: add-interactive.c:1024
 msgid "add contents of untracked files to the staged set of changes"
 msgstr "izlenmeyen dosyaların içeriğini hazırlanan değişikliklere ekle"
 
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
 msgid "Prompt help:"
 msgstr "İstem yardımı:"
 
-#: add-interactive.c:1030
+#: add-interactive.c:1034
 msgid "select a single item"
 msgstr "tek bir öge seç"
 
-#: add-interactive.c:1032
+#: add-interactive.c:1036
 msgid "select a range of items"
 msgstr "bir öge erimi seç"
 
-#: add-interactive.c:1034
+#: add-interactive.c:1038
 msgid "select multiple ranges"
 msgstr "birden çok erim seç"
 
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
 msgid "select item based on unique prefix"
 msgstr "benzersiz öneke dayanarak öge seç"
 
-#: add-interactive.c:1038
+#: add-interactive.c:1042
 msgid "unselect specified items"
 msgstr "belirtilen ögelerin seçimini kaldır"
 
-#: add-interactive.c:1040
+#: add-interactive.c:1044
 msgid "choose all items"
 msgstr "tüm ögeleri seç"
 
-#: add-interactive.c:1042
+#: add-interactive.c:1046
 msgid "(empty) finish selecting"
 msgstr "(boş) seçimi bitir"
 
-#: add-interactive.c:1079
+#: add-interactive.c:1083
 msgid "select a numbered item"
 msgstr "numaralandırılmış bir öge seç"
 
-#: add-interactive.c:1083
+#: add-interactive.c:1087
 msgid "(empty) select nothing"
 msgstr "(boş) hiçbir şey seçme"
 
-#: add-interactive.c:1091 builtin/clean.c:816 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:1092 builtin/clean.c:817 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"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "staged"
 msgstr "hazırlanmış"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "hazırlanmamış"
 
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
-#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
-#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
-#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
+#: 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"
 
-#: add-interactive.c:1151
+#: add-interactive.c:1155
 msgid "could not refresh index"
 msgstr "indeks yenilenemedi"
 
-#: add-interactive.c:1165 builtin/clean.c:781 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,?]? "
@@ -352,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,?]? "
@@ -394,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,?]? "
@@ -436,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,?]? "
@@ -478,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,?]? "
@@ -524,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,?]? "
@@ -559,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,?]? "
@@ -608,34 +609,34 @@ 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:342
+#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "parça üstbilgisi '%.*s' ayrıştırılamadı"
 
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "renklendirilmiş parça üstbilgisi '%.*s' ayrıştırılamadı"
 
-#: add-patch.c:419
+#: add-patch.c:420
 msgid "could not parse diff"
 msgstr "diff ayrıştırılamadı"
 
-#: add-patch.c:438
+#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr "renklendirilmiş diff ayrıştırılamadı"
 
-#: add-patch.c:452
+#: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
 msgstr "'%s' çalıştırılamadı"
 
-#: add-patch.c:611
+#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
 msgstr "interactive.diffFilter ögesinden eşleşmeyen çıktı"
 
-#: add-patch.c:612
+#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -643,7 +644,7 @@ msgstr ""
 "Süzgeciniz kendisinin girdi ve çıktı satırları arasında\n"
 "birebir karşılık sağlamalıdır."
 
-#: add-patch.c:790
+#: add-patch.c:791
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -652,7 +653,7 @@ msgstr ""
 "şurada bağlam satırı #%d bekleniyordu:\n"
 "%.*s"
 
-#: add-patch.c:805
+#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -665,11 +666,11 @@ msgstr ""
 "\tÅŸununla bitmiyor:\n"
 "%.*s"
 
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "El ile parça düzenleme kipi -- hızlıca öğrenmek için aşağıya bakın.\n"
 
-#: add-patch.c:1085
+#: add-patch.c:1086
 #, c-format
 msgid ""
 "---\n"
@@ -683,7 +684,7 @@ msgstr ""
 "%c kaldırılacak.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -693,11 +694,11 @@ msgstr ""
 "sunulacaktır. Parçanın tüm satırları kaldırılırsa düzenleme durdurulur\n"
 "ve parça değiştirilmeden bırakılır.\n"
 
-#: add-patch.c:1132
+#: add-patch.c:1133
 msgid "could not parse hunk header"
 msgstr "parça üstbilgisi ayrıştırılamadı"
 
-#: add-patch.c:1177
+#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr "'git apply --cached' başarısız oldu"
 
@@ -713,26 +714,26 @@ 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:1246 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 ""
 "Düzenlediğiniz parça uygulanamıyor. Yeniden düzenlensin mi (\"n (hayır)\" "
 "ıskartaya çıkarır!) [y/n]? "
 
-#: add-patch.c:1289
+#: add-patch.c:1290
 msgid "The selected hunks do not apply to the index!"
 msgstr "Seçili parçalar indekse uygulanamıyor!"
 
-#: add-patch.c:1290 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:1297 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"
 
-#: add-patch.c:1354
+#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -754,73 +755,73 @@ msgstr ""
 "e - geçerli parçayı el ile düzenle\n"
 "? - yardımı yazdır\n"
 
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
 msgstr "Öncesinde parça yok"
 
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
 msgstr "Sonrasında parça yok"
 
-#: add-patch.c:1537
+#: add-patch.c:1538
 msgid "No other hunks to goto"
 msgstr "Gidilecek başka bir parça yok"
 
-#: add-patch.c:1548 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:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "hangi parçaya gidilsin? "
 
-#: add-patch.c:1560
+#: add-patch.c:1561
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Geçersiz sayı: '%s'"
 
-#: add-patch.c:1565
+#: add-patch.c:1566
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Üzgünüm, yalnızca %d parça kullanılabilir."
 msgstr[1] "Üzgünüm, yalnızca %d parça kullanılabilir."
 
-#: add-patch.c:1574
+#: add-patch.c:1575
 msgid "No other hunks to search"
 msgstr "Aranacak başka parça yok"
 
-#: add-patch.c:1580 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ı? "
 
-#: add-patch.c:1595
+#: add-patch.c:1596
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "Hatalı oluşturulmuş düzenli ifade %s: %s"
 
-#: add-patch.c:1612
+#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
 msgstr "Verilen dizgi ile eşleşen bir parça yok"
 
-#: add-patch.c:1619
+#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
 msgstr "Üzgünüm, bu parça bölünemiyor"
 
-#: add-patch.c:1623
+#: add-patch.c:1624
 #, c-format
 msgid "Split into %d hunks."
 msgstr "%d parçaya bölündü."
 
-#: add-patch.c:1627
+#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
 msgstr "Üzgünüm, bu parça düzenlenemiyor"
 
-#: add-patch.c:1679
+#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr "'git apply' başarısız oldu"
 
-#: advice.c:145
+#: advice.c:78
 #, c-format
 msgid ""
 "\n"
@@ -829,37 +830,37 @@ msgstr ""
 "\n"
 "Bu iletiyi \"git config advice.%s false\" ile devre dışı bırakın"
 
-#: advice.c:161
+#: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sipucu: %.*s%s\n"
 
-#: advice.c:252
+#: advice.c:178
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "Seç-al yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
 
-#: advice.c:254
+#: advice.c:180
 msgid "Committing is not possible because you have unmerged files."
 msgstr "İşleme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
 
-#: advice.c:256
+#: advice.c:182
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Birleştirme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
 
-#: advice.c:258
+#: advice.c:184
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Çekme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
 
-#: advice.c:260
+#: advice.c:186
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Geriye al yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
 
-#: advice.c:262
+#: advice.c:188
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "%s yapılamıyor; birleştirmesi tamamlanmamış dosyalarınız var."
 
-#: advice.c:270
+#: 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."
@@ -867,39 +868,49 @@ msgstr ""
 "Onları çalışma ağacında onarın, ardından hazırlığı bitirmek için uygun\n"
 "görüldüğü biçimde 'git add/rm <dosya>' yaptıktan sonra işleyin."
 
-#: advice.c:278
+#: advice.c:204
 msgid "Exiting because of an unresolved conflict."
 msgstr "Çözüme kavuşturulmamış bir çakışmadan dolayı çıkılıyor."
 
-#: advice.c:283 builtin/merge.c:1374
+#: 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)."
 
-#: advice.c:285
+#: advice.c:211
 msgid "Please, commit your changes before merging."
 msgstr "Birleştirme öncesinde değişikliklerinizi işleyin."
 
-#: advice.c:286
+#: advice.c:212
 msgid "Exiting because of unfinished merge."
 msgstr "Tamamlanmamış birleştirmeden dolayı çıkılıyor."
 
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "İleri sarma olanaklı değil, iptal ediliyor."
+
+#: advice.c:227
 #, 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"
+"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 ""
-"Aşağıdaki yol belirteçleri uygun bir yolla eşleşmediler; ancak geçerli\n"
-"aralıklı çıkışın dışındaki girdilerle eşleşiyorlar:\n"
+"Aşağıdaki yollar ve/veya yol belirteçleri, aralıklı çıkış\n"
+"tanımınızın dışında kalan yollarla eşleştiğinden dolayı\n"
+"indeksinizde güncellenmeyecek:\n"
 
-#: advice.c:303
+#: advice.c:234
 msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
-msgstr "Böyle girdileri güncellemeyi düşünüyorsanız aralıklandırma kurallarını "
-"devre dışı bırakın veya değiştirin."
+"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 ""
+"Eğer böyle girdileri güncellemek istiyorsanız, aşağıdakilerden\n"
+"birini deneyin:\n"
+"* --sparse seçeneğini kullanın.\n"
+"* Aralıklandırma kurallarını devre dışı bırakın veya değiştirin."
 
-#: advice.c:310
+#: advice.c:242
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -958,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
@@ -987,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
@@ -1078,50 +1101,50 @@ msgstr "%s silinen dosyasının içinde hâlâ bir şeyler var"
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** uyarı: %s dosyası boş duruma gelir; ancak silinmez"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "hasarlı ikili yama, %d. satır: %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "tanımlanamayan ikili yama, %d. satır"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "yalnızca anlamsız veri içeren yama, %d. satır"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "%s sembolik bağı okunamıyor"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "%s açılamıyor veya okunamıyor"
 
-#: apply.c:2935
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "geçersiz satır başlangıcı: '%c'"
 
-#: apply.c:3056
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Parça #%d başarılı oldu, %d (%d satır ofset)."
 msgstr[1] "Parça #%d başarılı oldu, %d (%d satır ofset)."
 
-#: apply.c:3068
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 "Bağlam şuna indirildi: (%ld/%ld) (%d konumundaki parçacığı uygulamak için)"
 
-#: apply.c:3074
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1130,442 +1153,441 @@ msgstr ""
 "ÅŸunu ararken:\n"
 "%.*s"
 
-#: apply.c:3096
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "'%s' için ikili yama verisi eksik"
 
-#: apply.c:3104
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "'%s' parçası geri alınmadan bir ikili yama reverse-apply yapılamıyor"
 
-#: apply.c:3151
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "tam indeks satırı olmadan '%s' üzerine bir ikili yama uygulanamıyor"
 
-#: apply.c:3162
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "Bu yama geçerli içerik ile eşleşmeyen '%s' üzerine uygulanır (%s)."
 
-#: apply.c:3170
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "yama boş bir '%s' üzerine uygulanır; ancak o boş değil"
 
-#: apply.c:3188
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "gereken songörüntü %s ('%s' için) okunamıyor"
 
-#: apply.c:3201
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "ikili yama '%s' üzerine uygulanamıyor"
 
-#: apply.c:3208
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "'%s' üzerine ikili yama yanlış sonuç doğuruyor (%s bekleniyordu, %s alındı)"
 
-#: apply.c:3229
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "yama başarısız oldu: %s:%ld"
 
-#: apply.c:3352
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "%s çıkışı yapılamıyor"
 
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 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ı"
 
-#: apply.c:3412
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "'%s' bir sembolik bağın ötesinden okunuyor"
 
-#: apply.c:3441 apply.c:3687
+#: 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:3527 apply.c:3702
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: indekste bulunmuyor"
 
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: 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:3571
+#: 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:3574
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "3 yönlü birleştirme gerçekleştiriliyor...\n"
 
-#: apply.c:3590 apply.c:3594
+#: 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:3606
+#: 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:3620
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "'%s' üzerine yama çakışmalarla birlikte uygulandı.\n"
 
-#: apply.c:3625
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "'%s' üzerine yama sorunsuzca uygulandı.\n"
 
-#: apply.c:3642
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Doğrudan uygulamaya geri çekiliniyor...\n"
 
-#: apply.c:3654
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "kaldırma yaması dosya içeriğini bırakır"
 
-#: apply.c:3727
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: yanlış tür"
 
-#: apply.c:3729
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s, %o türüne iye, %o bekleniyordu"
 
-#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
-#: read-cache.c:1351
+#: 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:3952
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: indekste halihazırda var"
 
-#: apply.c:3956
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: çalışma dizininde halihazırda var"
 
-#: apply.c:3976
+#: 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:3981
+#: 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:4001
+#: 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:4005
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: yama uygulanamıyor"
 
-#: apply.c:4020
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "%s yaması denetleniyor..."
 
-#: apply.c:4112
+#: 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:4119
+#: 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:4122
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 bilgisi eksik veya yararsız (%s)."
 
-#: apply.c:4131
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "%s geçici indekse eklenemedi"
 
-#: apply.c:4141
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "geçici indeks şuraya yazılamadı: %s"
 
-#: apply.c:4279
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "%s indeksten kaldırılamıyor"
 
-#: apply.c:4313
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "%s altmodülü için hasarlı yama"
 
-#: apply.c:4319
+#: 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:4327
+#: 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:4333 apply.c:4478
+#: 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:4376 builtin/bisect--helper.c:523
+#: 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:4380
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "'%s' dosyası kapatılıyor"
 
-#: apply.c:4450
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "'%s' dosyası yazılamıyor, %o kipi"
 
-#: apply.c:4548
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "%s yaması sorunsuzca uygulandı."
 
-#: apply.c:4556
+#: apply.c:4580
 msgid "internal error"
 msgstr "iç hata"
 
-#: apply.c:4559
+#: 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:4570
+#: 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:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "%s açılamıyor"
 
-#: apply.c:4592
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Parça #%d sorunsuzca uygulandı."
 
-#: apply.c:4596
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Parça %d geri çevrildi."
 
-#: apply.c:4725
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "'%s' yaması atlandı."
 
-#: apply.c:4733
-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:4753
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "indeks dosyası okunamıyor"
 
-#: apply.c:4910
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "'%s' yaması açılamıyor: %s"
 
-#: apply.c:4937
+#: 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:4943 apply.c:4958
+#: 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:4951
+#: 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:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
+#: 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:4995
+#: 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:4998
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "verilen yol ile eÅŸleÅŸen deÄŸiÅŸiklikleri uygula"
 
-#: apply.c:5000 builtin/am.c:2317
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "sayı"
 
-#: apply.c:5001
+#: 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:5004
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "yamanın yaptığı eklemeleri yok say"
 
-#: apply.c:5006
+#: 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:5010
+#: 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:5012
+#: 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:5014
+#: 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:5016
+#: 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:5018
+#: 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:5020
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "çalışma ağacına dokunmadan bir yama uygula"
 
-#: apply.c:5022
+#: 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:5025
+#: 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:5027
+#: 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:5029
+#: 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:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: 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:5034
+#: 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:5035 builtin/am.c:2293 builtin/am.c:2296
+#: 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:3831
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
 msgid "action"
 msgstr "eylem"
 
-#: apply.c:5036
+#: 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:5039 apply.c:5042
+#: 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:5045
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "yamayı tersten uygula"
 
-#: apply.c:5047
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "en az bir satır bağlam bekleme"
 
-#: apply.c:5049
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "reddedilmiş parçaları ilgili *.rej dosyalarında bırak"
 
-#: apply.c:5051
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "üst üste binen parçalara izin ver"
 
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
-#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "ayrıntı ver"
-
-#: apply.c:5054
+#: 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:5057
+#: 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:5059 builtin/am.c:2305
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "kök"
 
-#: apply.c:5060
+#: 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"
@@ -1576,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"
@@ -1600,7 +1622,7 @@ msgstr "yol geçerli UTF-8 değil: %s"
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "yol çok uzun (%d karakter, SHA1: %s): %s"
 
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
 msgstr "söndürme hatası (%d)"
@@ -1628,156 +1650,152 @@ 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:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
-#: builtin/merge.c:1143
-#, c-format
-msgid "could not read '%s'"
-msgstr "'%s' okunamadı"
+msgid "cannot read '%s'"
+msgstr "'%s' okunamıyor"
 
-#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
+#: 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"
 
-#: archive.c:451
+#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "böyle bir başvuru yok: %.*s"
 
-#: archive.c:457
+#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "geçerli bir nesne adı değil: %s"
 
-#: archive.c:470
+#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "bir ağaç nesnesi değil: %s"
 
-#: archive.c:482
+#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "geçerli çalışma dizini izlenmiyor"
 
-#: archive.c:523
+#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Dosya bulunamadı: %s"
 
-#: archive.c:525
+#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "Normal bir dosya deÄŸil: %s"
 
-#: archive.c:552
+#: archive.c:551
 msgid "fmt"
 msgstr "biçim"
 
-#: archive.c:552
+#: archive.c:551
 msgid "archive format"
 msgstr "arşiv biçimi"
 
-#: archive.c:553 builtin/log.c:1772
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "önek"
 
-#: archive.c:554
+#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
 msgstr "öneki arşivdeki tüm yol adlarının başına ekle"
 
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: 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: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"
 
-#: archive.c:556
+#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "izlenmeyen dosyaları arşive ekle"
 
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
 msgid "write the archive to this file"
 msgstr "arÅŸivi bu dosyaya yaz"
 
-#: archive.c:561
+#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "çalışma dizinindeki .gitattributes'u oku"
 
-#: archive.c:562
+#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "arşivlenmiş dosyaları stderr'de raporla"
 
-#: archive.c:564
+#: archive.c:563
 msgid "set compression level"
 msgstr "sıkıştırma düzeyini ayarla"
 
-#: archive.c:567
+#: archive.c:566
 msgid "list supported archive formats"
 msgstr "desteklenen arşiv biçimlerini listele"
 
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "depo"
 
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "arÅŸivi uzak konum deposu <depo>'dan al"
 
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
 msgid "command"
 msgstr "komut"
 
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
 msgid "path to the remote git-upload-archive command"
 msgstr "uzak konum komutu git-upload-archive'e olan yol"
 
-#: archive.c:579
+#: archive.c:578
 msgid "Unexpected option --remote"
 msgstr "Beklenmedik seçenek --remote"
 
-#: archive.c:581
-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:583
+#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Beklenmedik seçenek --output"
 
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "--add-file ve --remote seçenekleri birlikte kullanılamaz"
-
-#: archive.c:607
+#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Bilinmeyen arşiv biçimi '%s'"
 
-#: archive.c:616
+#: archive.c:615
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "'%s' biçimi için desteklenmeyen argüman: -%d"
 
-#: attr.c:202
+#: attr.c:203
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s geçerli bir öznitelik adı değil"
 
-#: attr.c:363
+#: attr.c:364
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s izin verilmiyor: %s:%d"
 
-#: attr.c:403
+#: attr.c:404
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1785,22 +1803,22 @@ msgstr ""
 "Negatif dizgiler git özniteliklerinde yok sayılır.\n"
 "Gerçek öncü ünlem için '\\!' kullanın."
 
-#: bisect.c:489
+#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "'%s' dosyasında hatalı tırnağa alınmış içerik: %s"
 
-#: bisect.c:699
+#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Daha fazla ikili arama yapılamıyor!\n"
 
-#: bisect.c:766
+#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "Geçerli bir işleme adı değil: %s"
 
-#: bisect.c:791
+#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1809,7 +1827,7 @@ msgstr ""
 "Birleştirme temeli %s hatalı.\n"
 "Bu demek oluyor ki hata %s ve [%s] arasında düzeltilmiş.\n"
 
-#: bisect.c:796
+#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1818,7 +1836,7 @@ msgstr ""
 "BirleÅŸtirme temeli %s yeni.\n"
 "Özellik %s ve [%s] arasında değişmiş.\n"
 
-#: bisect.c:801
+#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1827,7 +1845,7 @@ msgstr ""
 "BirleÅŸtirme temeli %s, %s.\n"
 "Bu demek oluyor ki ilk '%s' işlemesi %s ve [%s] arasında.\n"
 
-#: bisect.c:809
+#: bisect.c:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1838,7 +1856,7 @@ msgstr ""
 "git bisect bu durumda düzgünce çalışamaz.\n"
 "%s ve %s revizyonlarını birbirine mi karıştırdınız?\n"
 
-#: bisect.c:822
+#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1849,36 +1867,36 @@ msgstr ""
 "%s işlemesinin %s ve [%s] arasında olduğundan emin olamıyoruz.\n"
 "Yine de sürdüreceğiz."
 
-#: bisect.c:861
+#: bisect.c:859
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "İkili arama: Birleştirme temelleri sınanmalı\n"
 
-#: bisect.c:911
+#: bisect.c:909
 #, c-format
 msgid "a %s revision is needed"
 msgstr "bir %s revizyonu gerekiyor"
 
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
 #, c-format
 msgid "could not create file '%s'"
 msgstr "'%s' dosyası oluşturulamadı"
 
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "'%s' dosyası okunamadı"
 
-#: bisect.c:1027
+#: bisect.c:1025
 msgid "reading bisect refs failed"
 msgstr "ikili arama başvurularını okuma başarısız oldu"
 
-#: bisect.c:1057
+#: bisect.c:1055
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s hem %s hem %s idi\n"
 
-#: bisect.c:1066
+#: bisect.c:1064
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1887,7 +1905,7 @@ msgstr ""
 "Sınanabilir bir işleme bulunamadı.\n"
 "Hatalı yol argümanları ile mi başladınız?\n"
 
-#: bisect.c:1095
+#: bisect.c:1093
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1897,7 +1915,7 @@ msgstr[1] "(aşağı yukarı %d adım)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1101
+#: bisect.c:1099
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1918,11 +1936,12 @@ msgstr ""
 "--reverse ve --first-parent birlikte en son iÅŸlemenin belirtilmesini "
 "gerektiriyor"
 
-#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
-#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
-#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
-#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
+#: 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 "revizyonda gezinme ayarlaması başarısız oldu"
 
@@ -1943,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ı."
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "izlenmiyor: %s başvurusu için belirsiz bilgi"
 
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Üstkaynak dal yapılandırması yazılamıyor"
-
-#: 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."
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Geçerli dal zorla güncellenemiyor."
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr "'%s' dalı zorla güncellenemiyor, '%s' konumunda çıkış yapılmış"
 
-#: 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"
@@ -2061,153 +2068,154 @@ 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ş"
 
-#: bundle.c:41
+#: bundle.c:44
 #, c-format
 msgid "unrecognized bundle hash algorithm: %s"
 msgstr "bilinmeyen demet sağlama algoritması: %s"
 
-#: bundle.c:45
+#: bundle.c:48
 #, c-format
 msgid "unknown capability '%s'"
 msgstr "bilinmeyen yetenek '%s'"
 
-#: bundle.c:71
+#: bundle.c:74
 #, c-format
 msgid "'%s' does not look like a v2 or v3 bundle file"
 msgstr "'%s' bir v2 veya v3 demet dosyası gibi görünmüyor"
 
-#: bundle.c:110
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "tanımlanamayan üstbilgi: %s%s (%d)"
 
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: 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'"
 msgstr "'%s' açılamadı"
 
-#: bundle.c:189
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Depo aşağıdaki önkoşul işlemelere iye değil:"
 
-#: bundle.c:192
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
 msgstr "bir demeti doğrulamak için bir depo gerekiyor"
 
-#: bundle.c:243
+#: bundle.c:257
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "Demet şu başvuruyu içeriyor:"
 msgstr[1] "Demet şu %d başvuruyu içeriyor:"
 
-#: bundle.c:250
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "Demet tam bir geçmiş kaydını yazar."
 
-#: bundle.c:252
+#: bundle.c:266
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Demet ÅŸu iÅŸlemeyi gerektiriyor:"
 msgstr[1] "Demet ÅŸu %d iÅŸlemeyi gerektiriyor:"
 
-#: bundle.c:319
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "demet açıklayıcısı çoğaltılamıyor"
 
-#: bundle.c:326
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "pack-objects ortaya çıkarılamadı"
 
-#: bundle.c:337
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "pack-objects sonlandı"
 
-#: bundle.c:386
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "'%s' başvurusu revizyon listesi seçenekleri tarafından dışlandı"
 
-#: bundle.c:490
+#: bundle.c:504
 #, c-format
 msgid "unsupported bundle version %d"
 msgstr "desteklenmeyen demet sürümü %d"
 
-#: bundle.c:492
+#: bundle.c:506
 #, c-format
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "demet sürümü %d, %s algoritması ile yazılamıyor"
 
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
+#: 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"
 
-#: bundle.c:539
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "BoÅŸ demet oluÅŸturma reddediliyor."
 
-#: bundle.c:549
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "'%s' oluşturulamıyor"
 
-#: bundle.c:574
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "index-pack sonlandı"
 
-#: chunk-format.c:113
+#: chunk-format.c:117
 msgid "terminating chunk id appears earlier than expected"
 msgstr "iri parça numarası sonlandırması beklenenden önce ortaya çıkıyor"
 
-#: chunk-format.c:122
+#: chunk-format.c:126
 #, c-format
 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
 msgstr "düzgün olmayan iri parça ofseti %<PRIx64> ve %<PRIx64>"
 
-#: chunk-format.c:129
+#: chunk-format.c:133
 #, c-format
 msgid "duplicate chunk ID %<PRIx32> found"
 msgstr "yinelenmiş iri parça numarası %<PRIx32> bulundu"
 
-#: chunk-format.c:143
+#: chunk-format.c:147
 #, c-format
 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"
 
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
 msgid "invalid hash version"
 msgstr "geçersiz sağlama sürümü"
 
@@ -2252,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:745 commit-graph.c:782
+#: 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:766
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "%s işlemesi bulunamadı"
 
-#: commit-graph.c:799
+#: 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:1075 builtin/am.c:1340
+#: 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:1337 builtin/pack-objects.c:2897
+#: 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:1368
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "İşleme grafiğindeki bilinen işlemeler yükleniyor"
 
-#: commit-graph.c:1385
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr "İşleme grafiğindeki ulaşılabilir işlemeler genişletiliyor"
 
-#: commit-graph.c:1405
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr "Ä°ÅŸleme grafiÄŸindeki iÅŸleme imleri temizleniyor"
 
-#: commit-graph.c:1424
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "İşleme grafiği ilingesel düzeyleri hesaplanıyor"
 
-#: commit-graph.c:1477
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr "İşleme grafiği kuşak sayıları hesaplanıyor"
 
-#: commit-graph.c:1558
+#: 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:1635
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "Başvurulmuş işlemeler toplanıyor"
 
-#: commit-graph.c:1660
+#: 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:1673
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "%s paketi eklenirken hata"
 
-#: commit-graph.c:1677
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "%s için indeks açılırken hata"
 
-#: commit-graph.c:1714
+#: 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:1732
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr "İşleme grafiğindeki ek sınırlar bulunuyor"
 
-#: commit-graph.c:1781
+#: 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:1812 midx.c:906
+#: 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:1825
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "geçici grafik katmanı oluşturulamıyor"
 
-#: commit-graph.c:1830
+#: 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:1887
+#: 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:1923
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr "commit-graph zincir dosyası açılamıyor"
 
-#: commit-graph.c:1939
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr "temel commit-graph dosyası yeniden adlandırılamadı"
 
-#: commit-graph.c:1959
+#: 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:2092
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "Birleştirilen işlemeler taranıyor"
 
-#: commit-graph.c:2136
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "commit-graph birleÅŸtiriliyor"
 
-#: commit-graph.c:2244
+#: 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:2351
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr "grafik yazımı için çok fazla işleme"
 
-#: commit-graph.c:2450
+#: 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:2460
+#: 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:2470 commit-graph.c:2485
+#: 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:2477
+#: 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:2495
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "İşleme grafiğindeki işlemeler doğrulanıyor"
 
-#: commit-graph.c:2510
+#: 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:2517
+#: 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:2527
+#: 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:2536
+#: 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:2550
+#: 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:2555
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2443,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:2559
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2451,29 +2459,29 @@ 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:2576
+#: 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:2582
+#: 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:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
-#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 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ı"
 
-#: commit.c:54
+#: commit.c:55
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s bir iÅŸleme deÄŸil!"
 
-#: commit.c:194
+#: commit.c:196
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -2493,28 +2501,28 @@ msgstr ""
 "\"git config advice.graftFileDeprecated false\"\n"
 "kullanarak bu iletiyi kapatabilirsiniz."
 
-#: commit.c:1237
+#: 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:1241
+#: 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:1244
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "%s işlemesinin bir GPG imzası yok."
 
-#: commit.c:1247
+#: 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:1501
+#: 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"
@@ -2529,7 +2537,7 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "bellek tükendi"
 
-#: config.c:126
+#: config.c:125
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -2544,35 +2552,35 @@ msgstr ""
 "\t%s\n"
 "Bu dairesel içermelerden dolayı olabilir."
 
-#: config.c:142
+#: config.c:141
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "içerme yolu '%s' genişletilemedi"
 
-#: config.c:153
+#: config.c:152
 msgid "relative config includes must come from files"
 msgstr "göreceli yapılandırma içermeleri dosyalardan gelmeli"
 
-#: config.c:199
+#: config.c:201
 msgid "relative config include conditionals must come from files"
 msgstr "göreceli yapılandırma içerme koşulluları dosyalardan gelmeli"
 
-#: config.c:396
+#: config.c:398
 #, c-format
 msgid "invalid config format: %s"
 msgstr "geçersiz yapılandırma biçimi: %s"
 
-#: config.c:400
+#: config.c:402
 #, c-format
 msgid "missing environment variable name for configuration '%.*s'"
 msgstr "'%.*s' yapılandırması için ortam değişkeni adı eksik"
 
-#: config.c:405
+#: config.c:407
 #, c-format
 msgid "missing environment variable '%s' for configuration '%.*s'"
 msgstr "şu yapılandırma için '%s' ortam değişkeni eksik: '%.*s'"
 
-#: config.c:442
+#: config.c:443
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "anahtar, bir bölüm içermiyor: %s"
@@ -2582,303 +2590,303 @@ 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:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "geçersiz anahtar: %s"
 
-#: config.c:478
+#: config.c:475
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "geçersiz anahtar (yenisatır): %s"
 
-#: config.c:511
+#: config.c:495
 msgid "empty config key"
 msgstr "boş yapılandırma anahtarı"
 
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "düzmece yapılandırma parametresi: %s"
 
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
 #, c-format
 msgid "bogus format in %s"
 msgstr "%s içinde düzmece biçim"
 
-#: config.c:622
+#: config.c:606
 #, c-format
 msgid "bogus count in %s"
 msgstr "%s içinde düzmece sayım"
 
-#: config.c:626
+#: config.c:610
 #, c-format
 msgid "too many entries in %s"
 msgstr "%s içinde çok fazla girdi"
 
-#: config.c:636
+#: config.c:620
 #, c-format
 msgid "missing config key %s"
 msgstr "%s yapılandırma anahtarı eksik"
 
-#: config.c:644
+#: config.c:628
 #, c-format
 msgid "missing config value %s"
 msgstr "%s yapılandırma değeri eksik"
 
-#: config.c:995
+#: config.c:979
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "hatalı yapılandırma satırı %d, %s ikili nesnesi içinde"
 
-#: config.c:999
+#: config.c:983
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "hatalı yapılandırma satırı %d, %s dosyası içinde"
 
-#: config.c:1003
+#: config.c:987
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "standart girdi içinde hatalı yapılandırma satırı %d"
 
-#: config.c:1007
+#: config.c:991
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "hatalı yapılandırma satırı %d, %s altmodül ikili nesnesi içinde"
 
-#: config.c:1011
+#: config.c:995
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "hatalı yapılandırma satırı %d, %s komut satırı içinde"
 
-#: config.c:1015
+#: config.c:999
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "hatalı yapılandırma satırı %d (%s içinde)"
 
-#: config.c:1152
+#: config.c:1136
 msgid "out of range"
 msgstr "erim dışı"
 
-#: config.c:1152
+#: config.c:1136
 msgid "invalid unit"
 msgstr "geçersiz birim"
 
-#: config.c:1153
+#: config.c:1137
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "hatalı sayısal yapılandırma değeri '%s', '%s' için: %s"
 
-#: config.c:1163
+#: config.c:1147
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr ""
 "hatalı sayısal yapılandırma değeri '%s', '%s' için, %s ikili nesnesi içinde: "
 "%s"
 
-#: config.c:1166
+#: config.c:1150
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 "hatalı sayısal yapılandırma değeri '%s', '%s' için, %s dosyası içinde: %s"
 
-#: config.c:1169
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "hatalı sayısal yapılandırma değeri '%s', '%s' için, standart girdi içinde: %s"
 
-#: config.c:1172
+#: config.c:1156
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "hatalı sayısal yapılandırma değeri '%s', '%s' için, %s altmodül ikili "
 "nesnesi içinde: %s"
 
-#: config.c:1175
+#: config.c:1159
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "hatalı sayısal yapılandırma değeri '%s', '%s' için, %s komut satırı içinde: "
 "%s"
 
-#: config.c:1178
+#: config.c:1162
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "hatalı sayısal yapılandırma değeri '%s', '%s' için (%s içinde): %s"
 
-#: config.c:1257
+#: config.c:1241
 #, c-format
 msgid "bad boolean config value '%s' for '%s'"
 msgstr "hatalı Boole yapılandırma değeri '%s', '%s' için"
 
-#: config.c:1275
+#: config.c:1259
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "şuradaki kullanıcı dizini genişletilemedi: '%s'"
 
-#: config.c:1284
+#: config.c:1268
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "%s', '%s' için geçerli bir zaman damgası değil"
 
-#: config.c:1377
+#: config.c:1361
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "kısaltma uzunluğu erim dışında: %d"
 
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "hatalı zlib sıkıştırma düzeyi %d"
 
-#: config.c:1494
+#: config.c:1476
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar yalnızca bir karakter olmalı"
 
-#: config.c:1527
+#: config.c:1509
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "nesne oluşturma için geçersiz kip: %s"
 
-#: config.c:1599
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "%s için hatalı oluşturulmuş değer"
 
-#: config.c:1625
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "%s için hatalı oluşturulmuş değer: %s"
 
-#: config.c:1626
+#: 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:1687 builtin/pack-objects.c:3924
+#: 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:1809
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "'%s' yapılandırma ikili nesnesi yüklenemiyor"
 
-#: config.c:1812
+#: 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:1829
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "'%s' yapılandırma ikili nesnesi çözülemiyor"
 
-#: config.c:1873
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "%s ayrıştırılamadı"
 
-#: config.c:1929
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr "komut satırı yapılandırması ayrıştırılamıyor"
 
-#: config.c:2293
+#: 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:2467
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Geçersiz %s: '%s'"
 
-#: config.c:2512
+#: 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:2558
+#: 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:2560
+#: 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:2644
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "geçersiz bölüm adı '%s'"
 
-#: config.c:2676
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s birden çok değere iye"
 
-#: config.c:2705
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "yeni yapılandırma dosyası %s yazılamadı"
 
-#: config.c:2957 config.c:3283
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "%s yapılandırma dosyası kilitlenemedi"
 
-#: config.c:2968
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "%s açılıyor"
 
-#: config.c:3005 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "geçersiz dizgi: %s"
 
-#: config.c:3030
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "geçersiz yapılandırma dosyası %s"
 
-#: config.c:3043 config.c:3296
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "%s üzerinde fstat başarısız oldu"
 
-#: config.c:3054
+#: config.c:3047
 #, c-format
-msgid "unable to mmap '%s'"
-msgstr "'%s' mmap yapılamıyor"
+msgid "unable to mmap '%s'%s"
+msgstr "'%s'%s mmap yapılamıyor"
 
-#: config.c:3063 config.c:3301
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "%s üzerinde chmod başarısız oldu"
 
-#: config.c:3148 config.c:3398
+#: 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:3182
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "'%s', '%s' olarak ayarlanamadı"
 
-#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: 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:3274
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "geçersiz bölüm adı: %s"
 
-#: config.c:3441
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "'%s' için değer eksik"
@@ -2913,81 +2921,81 @@ msgstr "sunucu '%s' özelliğini desteklemiyor"
 msgid "expected flush after capabilities"
 msgstr "yeteneklerden sonra floÅŸ bekleniyordu"
 
-#: connect.c:263
+#: connect.c:265
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "'%s' ilk satırından sonra yetenekler yok sayılıyor"
 
-#: connect.c:284
+#: connect.c:286
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "protokol hatası: beklenmedik yetenekler^{}"
 
-#: connect.c:306
+#: connect.c:308
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "protokol hatası: sığ sha-1 bekleniyordu, '%s' alındı"
 
-#: connect.c:308
+#: connect.c:310
 msgid "repository on the other end cannot be shallow"
 msgstr "diğer uçtaki depo sığ olamaz"
 
-#: connect.c:347
+#: connect.c:349
 msgid "invalid packet"
 msgstr "geçersiz paket"
 
-#: connect.c:367
+#: connect.c:369
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "protokol hatası: beklenmedik '%s'"
 
-#: connect.c:497
+#: connect.c:499
 #, c-format
 msgid "unknown object format '%s' specified by server"
 msgstr "sunucu tarafından bilinmeyen nesne biçimi '%s' belirtildi"
 
-#: connect.c:526
+#: connect.c:528
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "geçersiz ls-refs yanıtı: %s"
 
-#: connect.c:530
+#: connect.c:532
 msgid "expected flush after ref listing"
 msgstr "baÅŸvuru listelemesinden sonra floÅŸ bekleniyordu"
 
-#: connect.c:533
+#: connect.c:535
 msgid "expected response end packet after ref listing"
 msgstr "başvuru listelemesinden sonra yanıt sonu paketi bekleniyordu"
 
-#: connect.c:666
+#: connect.c:670
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "'%s' protokolü desteklenmiyor"
 
-#: connect.c:717
+#: connect.c:721
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "soket üzerinde SO_KEEPALIVE ayarlanamıyor"
 
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
 #, c-format
 msgid "Looking up %s ... "
-msgstr "%s adresi aranıyor..."
+msgstr "%s adresi aranıyor ... "
 
-#: connect.c:761
+#: connect.c:765
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "%s aranamıyor (kapı %s) (%s)"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
 #, c-format
 msgid ""
 "done.\n"
 "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:787 connect.c:864
+#: connect.c:791 connect.c:868
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2997,77 +3005,77 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
 msgid "done."
 msgstr "bitti."
 
-#: connect.c:824
+#: connect.c:828
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "%s aranamıyor (%s)"
 
-#: connect.c:830
+#: connect.c:834
 #, c-format
 msgid "unknown port %s"
 msgstr "bilinmeyen kapı %s"
 
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "garip makine adı '%s' engellendi"
 
-#: connect.c:969
+#: connect.c:973
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "garip kapı '%s' engellendi"
 
-#: connect.c:979
+#: connect.c:983
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "vekil %s başlatılamıyor"
 
-#: connect.c:1050
+#: connect.c:1054
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr "yol belirtilmedi; geçerli url sözdizimi için 'git help pull' yazın"
 
-#: connect.c:1190
+#: connect.c:1194
 msgid "newline is forbidden in git:// hosts and repo paths"
 msgstr "git:// makinelerinde ve depo yollarında yenisatır karakteri yasak"
 
-#: connect.c:1247
+#: connect.c:1251
 msgid "ssh variant 'simple' does not support -4"
 msgstr "ssh değişik biçimi 'simple' -4 desteklemiyor"
 
-#: connect.c:1259
+#: connect.c:1263
 msgid "ssh variant 'simple' does not support -6"
 msgstr "ssh değişik biçimi 'simple' -6 desteklemiyor"
 
-#: connect.c:1276
+#: connect.c:1280
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "ssh değişik biçimi 'simple' kapı ayarlamayı desteklemiyor"
 
-#: connect.c:1388
+#: connect.c:1392
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "garip yol adı '%s' engellendi"
 
-#: connect.c:1436
+#: connect.c:1440
 msgid "unable to fork"
 msgstr "çatallanamıyor"
 
-#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "Bağlantı denetleniyor"
 
-#: connected.c:120
+#: connected.c:122
 msgid "Could not run 'git rev-list'"
 msgstr "'git rev-list' çalıştırılamadı"
 
-#: connected.c:144
+#: connected.c:146
 msgid "failed write to rev-list"
 msgstr "rev-list yazılamadı"
 
-#: connected.c:149
+#: connected.c:151
 msgid "failed to close rev-list's stdin"
 msgstr "rev-list'in stdin'i kapatılamadı"
 
@@ -3176,7 +3184,7 @@ msgstr "beklenmedik süzgeç türü"
 msgid "path name too long for external filter"
 msgstr "dış süzgeç için yol adı pek uzun"
 
-#: convert.c:934
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -3184,16 +3192,16 @@ msgid ""
 msgstr ""
 "'%s' dış süzgeci artık kullanılamıyor; ancak tüm yolların süzümü bitmedi"
 
-#: convert.c:1234
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr "doğru/yanlış geçerli bir çalışma ağacı kodlaması değil"
 
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: temiz süzgeç '%s' başarısız oldu"
 
-#: convert.c:1490
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: is süzgeci %s başarısız oldu"
@@ -3211,17 +3219,17 @@ msgstr "anamakine bilgisi eksik yetki ile çalışma reddediliyor"
 msgid "refusing to work with credential missing protocol field"
 msgstr "protokol bilgisi eksik yetki ile çalışma reddediliyor"
 
-#: credential.c:394
+#: credential.c:395
 #, c-format
 msgid "url contains a newline in its %s component: %s"
 msgstr "url, kendisinin %s bileşeninde bir yenisatır içeriyor: %s"
 
-#: credential.c:438
+#: credential.c:439
 #, c-format
 msgid "url has no scheme: %s"
 msgstr "url'nin şeması yok: %s"
 
-#: credential.c:511
+#: credential.c:512
 #, c-format
 msgid "credential url cannot be parsed: %s"
 msgstr "yetki url'si ayrıştırılamıyor: %s"
@@ -3320,36 +3328,36 @@ msgstr ""
 msgid "Marked %d islands, done.\n"
 msgstr "%d delta adası imlendi, bitti.\n"
 
-#: diff-merges.c:80
+#: diff-merges.c:70
 #, c-format
 msgid "unknown value for --diff-merges: %s"
 msgstr "--diff-merges için bilinmeyen değer: %s"
 
-#: diff-lib.c:538
+#: diff-lib.c:561
 msgid "--merge-base does not work with ranges"
 msgstr "--merge-base erimlerle çalışmaz"
 
-#: diff-lib.c:540
+#: diff-lib.c:563
 msgid "--merge-base only works with commits"
 msgstr "--merge-base yalnızca işlemelerle çalışır"
 
-#: diff-lib.c:557
+#: diff-lib.c:580
 msgid "unable to get HEAD"
 msgstr "HEAD alınamıyor"
 
-#: diff-lib.c:564
+#: diff-lib.c:587
 msgid "no merge base found"
 msgstr "bir birleştirme temeli bulunamadı"
 
-#: diff-lib.c:566
+#: diff-lib.c:589
 msgid "multiple merge bases found"
 msgstr "birden çok birleştirme temeli bulundu"
 
-#: diff-no-index.c:238
+#: diff-no-index.c:237
 msgid "git diff --no-index [<options>] <path> <path>"
 msgstr "git diff --no-index [<seçenekler>] <yol> <yol>"
 
-#: diff-no-index.c:263
+#: diff-no-index.c:262
 msgid ""
 "Not a git repository. Use --no-index to compare two paths outside a working "
 "tree"
@@ -3357,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:156
+#: 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:161
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Bilinmeyen dirstat parametresi '%s'\n"
 
-#: diff.c:297
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -3375,7 +3383,7 @@ msgstr ""
 "\"color-moved\" ayarı 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', "
 "'plain' seçeneklerinden biri olmalıdır"
 
-#: diff.c:325
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3384,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:333
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3392,12 +3400,12 @@ msgstr ""
 "color-moved-ws: allow-indentation-change diÄŸer boÅŸluk kipleri ile birlikte "
 "kullanılamaz"
 
-#: diff.c:410
+#: 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:470
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3406,35 +3414,52 @@ msgstr ""
 "'diff.dirstat' yapılandırma değişkeninde hatalar bulundu:\n"
 "%s"
 
-#: diff.c:4278
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "dış diff sonlandı, %s konumunda durdu"
 
-#: diff.c:4630
-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: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:4633
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S ve --find-object birlikte kullanılmaz"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr ""
+"'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' ile "
+"kullanın"
 
-#: diff.c:4712
+#: diff.c:4601
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' ve '%s' "
+"ile kullanın"
+
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow tam olarak yalnızca bir yol belirteci gerektiriyor"
 
-#: diff.c:4760
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "geçersiz --stat değeri: %s"
 
-#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: 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:4797
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3443,42 +3468,42 @@ msgstr ""
 "--dirstat/-X seçenek parametresi ayrıştırılamadı:\n"
 "%s"
 
-#: diff.c:4882
+#: 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"
+msgstr "şurada bilinmeyen değişiklik sınıfı '%c': --diff-filter=%s"
 
-#: diff.c:4906
+#: 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:4920
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "'%s' çözülemiyor"
 
-#: diff.c:4970 diff.c:4976
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s <n>/<m> biçimi bekliyor"
 
-#: diff.c:4988
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s bir karakter bekliyor, '%s' aldı"
 
-#: diff.c:5009
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "hatalı --color-moved argümanı: %s"
 
-#: diff.c:5028
+#: 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:5068
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -3486,162 +3511,162 @@ msgstr ""
 "diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", "
 "\"patience\" ve \"histogram\""
 
-#: diff.c:5104 diff.c:5124
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "%s için geçersiz argüman"
 
-#: diff.c:5228
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "-I'ya geçersiz düzenli ifade verildi: '%s'"
 
-#: diff.c:5277
+#: 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:5333
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "hatalı --word-diff argümanı: %s"
 
-#: diff.c:5369
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "Diff çıktısı biçimlendirme seçenekleri"
 
-#: diff.c:5371 diff.c:5377
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "yama oluÅŸtur"
 
-#: diff.c:5374 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "diff çıktısını gizle"
 
-#: diff.c:5379 diff.c:5493 diff.c:5500
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5380 diff.c:5383
+#: 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:5385
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "diff'i ham biçimde oluştur"
 
-#: diff.c:5388
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "'-p --raw eşanlamlısı"
 
-#: diff.c:5392
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "'-p --stat eşanlamlısı"
 
-#: diff.c:5396
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "makinede okunabilen --stat"
 
-#: diff.c:5399
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "--stat'ın yalnızca son satırını çıktı ver"
 
-#: diff.c:5401 diff.c:5409
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5402
+#: 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:5406
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
-msgstr "--dirstat-cumulative eşanlamlısı"
+msgstr "--dirstat=cumulative eşanlamlısı"
 
-#: diff.c:5410
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "--dirstat=files,param1,param2... eşanlamlısı"
 
-#: diff.c:5414
+#: 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:5417
+#: 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:5420
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "yalnızca değiştirilen dosyaların adlarını göster"
 
-#: diff.c:5423
+#: 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:5425
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<genişlik>[,<ad-genişlik>[,<sayım>]]"
 
-#: diff.c:5426
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "diffstat oluÅŸtur"
 
-#: diff.c:5428 diff.c:5431 diff.c:5434
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<geniÅŸlik>"
 
-#: diff.c:5429
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "diffstat'ı verilmiş bir genişlik ile oluştur"
 
-#: diff.c:5432
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "diffstat'ı verilmiş bir ad genişliği ile oluştur"
 
-#: diff.c:5435
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "diffstat'ı verilmiş bir grafik genişliği ile oluştur"
 
-#: diff.c:5437
+#: diff.c:5406
 msgid "<count>"
 msgstr "<sayım>"
 
-#: diff.c:5438
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "diffstat'ı kısıtlı satırlarla oluştur"
 
-#: diff.c:5441
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "diffstat içinde ufak özet oluştur"
 
-#: diff.c:5444
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "uygulanabilir bir ikili diff çıktısı ver"
 
-#: diff.c:5447
+#: 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:5449
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "renkli diff göster"
 
-#: diff.c:5450
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<çeşit>"
 
-#: diff.c:5451
+#: 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:5454
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3649,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:5457 diff.c:5460 diff.c:5463 diff.c:5572
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<önek>"
 
-#: diff.c:5458
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "\"a/\" yerine verilmiş kaynak önekini göster"
 
-#: diff.c:5461
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "\"b/\"yerine verilmiş kaynak önekini göster"
 
-#: diff.c:5464
+#: 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:5467
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "hiçbir kaynak ve hedef önekini gösterme"
 
-#: diff.c:5470
+#: 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:5474 diff.c:5479 diff.c:5484
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<karakter>"
 
-#: diff.c:5475
+#: 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:5480
+#: 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:5485
+#: 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:5488
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "Diff yeniden adlandırma seçenekleri"
 
-#: diff.c:5489
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5490
+#: 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:5494
+#: diff.c:5463
 msgid "detect renames"
 msgstr "yeniden adlandırmaları algıla"
 
-#: diff.c:5498
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "silmeler için öngörüntüyü atla"
 
-#: diff.c:5501
+#: diff.c:5470
 msgid "detect copies"
 msgstr "kopyaları algıla"
 
-#: diff.c:5505
+#: 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:5507
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "yeniden adlandırma algılamasını devre dışı bırak"
 
-#: diff.c:5510
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "boş ikili nesneleri yeniden adlandırma kaynağı olarak kullan"
 
-#: diff.c:5512
+#: 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:5515
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -3738,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:5517
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Diff algoritma seçenekleri"
 
-#: diff.c:5519
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "olabilecek en küçük diff'i üret"
 
-#: diff.c:5522
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "satırları karşılaştırırken boşlukları yok say"
 
-#: diff.c:5525
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "boşluk sayısındaki değişiklikleri yok say"
 
-#: diff.c:5528
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "satır sonundaki boşluk değişikliklerini yok say"
 
-#: diff.c:5531
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "satır sonundaki satırbaşı karakterini yok say"
 
-#: diff.c:5534
+#: 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:5536 diff.c:5558 diff.c:5561 diff.c:5606
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<ifade>"
 
-#: diff.c:5537
+#: 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:5540
+#: 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:5543
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "diff'i \"patience diff\" algoritmasını kullanarak oluştur"
 
-#: diff.c:5547
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "diff'i \"histogram diff\" algoritmasını kullanarak oluştur"
 
-#: diff.c:5549
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<algoritma>"
 
-#: diff.c:5550
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "bir diff algoritması seç"
 
-#: diff.c:5552
+#: diff.c:5521
 msgid "<text>"
 msgstr "<metin>"
 
-#: diff.c:5553
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "diff'i \"anchored diff\" algoritmasını kullanarak oluştur"
 
-#: diff.c:5555 diff.c:5564 diff.c:5567
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<kip>"
 
-#: diff.c:5556
+#: 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:5559
+#: 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:5562
+#: 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:5565
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "taşınan kod satırları farklı renklendirilir"
 
-#: diff.c:5568
+#: 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:5571
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Diğer diff seçenekleri"
 
-#: diff.c:5573
+#: 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:5577
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "tüm dosyaları metin olarak varsay"
 
-#: diff.c:5579
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "iki girdiyi değiştir, diff'i tersine döndür"
 
-#: diff.c:5581
+#: 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:5583
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "tüm program çıktısını devre dışı bırak"
 
-#: diff.c:5585
+#: 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:5587
+#: 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:5589
+#: diff.c:5558
 msgid "<when>"
 msgstr "<ne-zaman>"
 
-#: diff.c:5590
+#: 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:5593
+#: diff.c:5562
 msgid "<format>"
 msgstr "<biçim>"
 
-#: diff.c:5594
+#: 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:5598
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "indeksten 'git add -N' girdilerini gizle"
 
-#: diff.c:5601
+#: 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:5603
+#: diff.c:5572
 msgid "<string>"
 msgstr "<dizi>"
 
-#: diff.c:5604
+#: 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:5607
+#: 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:5610
+#: 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:5613
+#: 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:5616
+#: 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:5617 diff.c:5620
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<yol>"
 
-#: diff.c:5618
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "öncelikle belirtilen yoldaki değişikliği göster"
 
-#: diff.c:5621
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "belirtilen yola olan çıktıyı atla"
 
-#: diff.c:5623
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<nesne-no>"
 
-#: diff.c:5624
+#: 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:5626
+#: 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:5627
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "dosyaları diff türüne göre seç"
 
-#: diff.c:5629
+#: diff.c:5598
 msgid "<file>"
 msgstr "<dosya>"
 
-#: diff.c:5630
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "belirli bir dosyaya çıktı ver"
 
-#: diff.c:6287
-msgid "inexact rename detection was skipped due to too many files."
+#: diff.c:6257
+msgid "exhaustive rename detection was skipped due to too many files."
 msgstr ""
-"Kesin olmayan yeniden adlandırma algılaması çok fazla dosya olmasından "
+"Geniş kapsamlı yeniden adlandırma algılaması çok fazla dosya olmasından "
 "dolayı atlandı."
 
-#: diff.c:6290
+#: 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:6293
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3978,7 +4003,7 @@ msgstr ""
 msgid "failed to read orderfile '%s'"
 msgstr "orderfile '%s' okunamadı"
 
-#: diffcore-rename.c:1418
+#: diffcore-rename.c:1564
 msgid "Performing inexact rename detection"
 msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor"
 
@@ -3987,59 +4012,67 @@ msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor"
 msgid "No such path '%s' in the diff"
 msgstr "diff'te '%s' diye bir yol yok"
 
-#: dir.c:578
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "yol belirteci '%s' git'in tanıdığı herhangi bir dosya ile eşleşmedi"
 
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr "tanımlanamayan dizgi: '%s'"
 
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "tanımlanamayan negatif dizgi: '%s'"
 
-#: dir.c:809
+#: dir.c:820
 #, c-format
 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:819
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "koni dizgi eşleşmesi devre dışı bırakılıyor"
 
-#: dir.c:1206
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "%s bir 'exclude' dosyası olarak kullanılamıyor"
 
-#: dir.c:2314
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "'%s' dizini açılamadı"
 
-#: dir.c:2614
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr "çekirdek adı ve bilgisi alınamadı"
 
-#: dir.c:2738
+#: 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:3543
+#: dir.c:3112
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Bir dizin adı tahmin edilemedi.\n"
+"Lütfen komut satırında bir dizin belirtin."
+
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "%s deposundaki indeks dosyası hasarlı"
 
-#: dir.c:3590 dir.c:3595
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr "%s için dizinler oluşturulamadı"
 
-#: dir.c:3624
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi"
@@ -4058,293 +4091,362 @@ msgstr "İçerik süzülüyor"
 msgid "could not stat file '%s'"
 msgstr "'%s' dosyasının bilgileri alınamadı"
 
-#: environment.c:152
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "hatalı git ad alanı yolu \"%s\""
 
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "GIT_DIR şuna ayarlanamadı: '%s'"
-
 #: exec-cmd.c:363
 #, c-format
 msgid "too many args to run %s"
 msgstr "%s çalıştırmak için çok fazla argüman"
 
-#: fetch-pack.c:182
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: sığ bir liste bekleniyordu"
 
-#: fetch-pack.c:185
+#: 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:196
+#: 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:216
+#: 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:227
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "uzak konuma yazılamıyor"
 
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc multi_ack_detailed gerektiriyor"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: 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:389 fetch-pack.c:1429
+#: 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:391 fetch-pack.c:1431
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "nesne bulunamadı: %s"
 
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "nesne içinde hata: %s"
 
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "sığ bulunamadı: %s"
 
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: 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:439
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "%s %d %s alındı"
 
-#: fetch-pack.c:456
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "geçersiz işleme %s"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "vazgeçiliyor"
 
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "bitti"
 
-#: fetch-pack.c:512
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s (%d) %s alındı"
 
-#: fetch-pack.c:548
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "%s tamam olarak imleniyor"
 
-#: fetch-pack.c:763
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "%s halihazırda var (%s)"
 
-#: fetch-pack.c:849
+#: 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:857
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "protokol hatası: hatalı paket üstbilgisi"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: %s ayrı çatallanamıyor"
 
-#: fetch-pack.c:957
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack: geçersiz index-pack çıktısı"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "%s başarısız oldu"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "yanbant çoğullama çözücüsünde hata"
 
-#: fetch-pack.c:1019
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Sunucu sürümü %.*s"
 
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
+#: 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:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: 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:1029
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "Sunucu sığ istemcileri desteklemiyor"
 
-#: fetch-pack.c:1089
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "Sunucu --shallow-since desteklemiyor"
 
-#: fetch-pack.c:1094
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "Sunucu --shallow-exclude desteklemiyor"
 
-#: fetch-pack.c:1098
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "Sunucu --deepen desteklemiyor"
 
-#: fetch-pack.c:1100
+#: 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:1113
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "ortak iÅŸleme yok"
 
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: 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:1128 fetch-pack.c:1651
+#: 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:1242
+#: 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:1246
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "sunucu '%s' algoritmasını desteklemiyor"
 
-#: fetch-pack.c:1279
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "Sunucu sığ istekleri desteklemiyor"
 
-#: fetch-pack.c:1286
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "Sunucu süzgeç destekliyor"
 
-#: fetch-pack.c:1329 fetch-pack.c:2034
+#: 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:1347
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "bölüm üstbilgisi '%s' okunurken hata"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "'%s' bekleniyordu, '%s' alındı"
 
-#: fetch-pack.c:1387
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "beklenmedik alındı satırı: '%s'"
 
-#: fetch-pack.c:1392
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "alındılar işlenirken hata: %d"
 
-#: fetch-pack.c:1402
+#: 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:1404
+#: 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:1445
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "sığ bilgi işlenirken hata: %d"
 
-#: fetch-pack.c:1494
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "wanted-ref bekleniyordu, '%s' alındı"
 
-#: fetch-pack.c:1499
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "beklenmedik wanted-ref: '%s'"
 
-#: fetch-pack.c:1504
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "aranan baÅŸvurular iÅŸlenirken hata: %d"
 
-#: fetch-pack.c:1534
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack: yanıt sonu paketi bekleniyordu"
 
-#: fetch-pack.c:1930
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "eÅŸleÅŸen uzak dal ucu yok"
 
-#: fetch-pack.c:1953 builtin/clone.c:697
+#: 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:2056
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "uzak konumdan beklenmedik 'ready'"
 
-#: fetch-pack.c:2079
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "böyle bir uzak başvuru yok: %s"
 
-#: fetch-pack.c:2082
+#: 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:273
+#: 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:276
+#: 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:470
+#: gpg-interface.c:451
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+msgstr ""
+"gpg.ssh.allowedSignersFile'ın ssh imza doğrulaması için yapılandırılması ve "
+"var olması gerekiyor"
+
+#: gpg-interface.c:480
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+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: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:624
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "hatalı/uyumsuz imza '%s'"
+
+#: 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: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: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:857
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand başarısız oldu: %s %s"
+
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr "gpg veriyi imzalayamadı"
 
+#: 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:978
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "ssh imzalama anahtarı '%s' konumuna yazılamadı"
+
+#: 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:1014
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+msgstr ""
+"ssh-keygen -Y imzası, ssh imzalaması için gerekli (openssh 8.21p1+ sürümünde "
+"mevcut)"
+
+#: gpg-interface.c:1026
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "ssh imzalama verisi arabelleği '%s' konumundan okunamadı"
+
 #: graph.c:98
 #, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr "log.graphColors içindeki '%.*s' geçersiz rengini yok say"
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "log.graphColors içindeki '%.*s' geçersiz renk yok sayıldı"
 
 #: grep.c:531
 msgid ""
@@ -4354,110 +4456,110 @@ msgstr ""
 "verilen dizgi NULL baytı içeriyor (-f <dosya> aracılığıyla). Bu yalnızca "
 "PCRE v2 altında -P ile desteklenir"
 
-#: grep.c:1893
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': %s okunamıyor"
 
-#: grep.c:1910 setup.c:176 builtin/clone.c:416 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:1921
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': kısa okuma"
 
-#: help.c:23
+#: help.c:24
 msgid "start a working area (see also: git help tutorial)"
 msgstr "bir çalışma alanı başlatın (ayrıca bkz: git help tutorial)"
 
-#: help.c:24
+#: help.c:25
 msgid "work on the current change (see also: git help everyday)"
 msgstr "güncel değişiklikler üzerinde çalışın (ayrıca bkz: git help everyday)"
 
-#: help.c:25
+#: help.c:26
 msgid "examine the history and state (see also: git help revisions)"
 msgstr ""
 "geçmişi ve geçerli durumu gözden geçirin (ayrıca bkz: git help revisions)"
 
-#: help.c:26
+#: help.c:27
 msgid "grow, mark and tweak your common history"
 msgstr "ortak geçmişinizi büyütün, imleyin ve geliştirin"
 
-#: help.c:27
+#: help.c:28
 msgid "collaborate (see also: git help workflows)"
 msgstr "birlikte çalışın (ayrıca bkz: git help workflows)"
 
-#: help.c:31
+#: help.c:32
 msgid "Main Porcelain Commands"
 msgstr "Ana Komutlar"
 
-#: help.c:32
+#: help.c:33
 msgid "Ancillary Commands / Manipulators"
 msgstr "Yan Komutlar / Yönlendiriciler"
 
-#: help.c:33
+#: help.c:34
 msgid "Ancillary Commands / Interrogators"
 msgstr "Yan Komutlar / Sorgucular"
 
-#: help.c:34
+#: help.c:35
 msgid "Interacting with Others"
 msgstr "Başkaları ile Etkileşim"
 
-#: help.c:35
+#: help.c:36
 msgid "Low-level Commands / Manipulators"
 msgstr "Düşük Düzeyli Komutlar / Yönlendiriciler"
 
-#: help.c:36
+#: help.c:37
 msgid "Low-level Commands / Interrogators"
 msgstr "Düşük Düzeyli Komutlar / Sorgucular"
 
-#: help.c:37
+#: help.c:38
 msgid "Low-level Commands / Syncing Repositories"
 msgstr "Düşük Düzeyli Komutlar / Depo Eşitleme"
 
-#: help.c:38
+#: help.c:39
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Düşük Düzeyli Komutlar / İç Yardımcılar"
 
-#: help.c:300
+#: help.c:313
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "'%s' içindeki kullanılabilir git komutları"
 
-#: help.c:307
+#: help.c:320
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "$PATH içindeki başka yerlerden kullanılabilen git komutları"
 
-#: help.c:316
+#: help.c:329
 msgid "These are common Git commands used in various situations:"
 msgstr "En çok kullanılan temel Git komutlarının bir listesi aşağıdadır:"
 
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "desteklenmeyen komut listeleme türü '%s'"
 
-#: help.c:405
+#: help.c:418
 msgid "The Git concept guides are:"
 msgstr "Git konsept kılavuzları şunlardır:"
 
-#: help.c:429
+#: help.c:442
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr "Belirli bir altkomut üzerine okumak için 'git help <komut>' kullanın"
 
-#: help.c:434
+#: help.c:447
 msgid "External commands"
 msgstr "Dış komutlar"
 
-#: help.c:449
+#: help.c:462
 msgid "Command aliases"
 msgstr "Komut armaları"
 
-#: help.c:527
+#: help.c:543
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -4466,32 +4568,37 @@ msgstr ""
 "'%s' bir git komutu gibi görünüyor; ancak biz onu\n"
 "çalıştıramadık. git-%s bozuk olabilir mi?"
 
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git: '%s' bir git komutu değil. Yardım için: 'git --help'."
 
-#: help.c:591
+#: help.c:613
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Tüh. Sisteminiz hiçbir Git komutu bildirmiyor."
 
-#: help.c:613
+#: help.c:635
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr ""
 "UYARI: '%s' adında bir Git komutunu çağırdınız; ancak böyle bir komut yok."
 
-#: help.c:618
+#: help.c:640
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "'%s' demek istediğiniz varsayılarak sürdürülüyor."
 
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Bunun yerine '%s' çalıştırılsın mı? (y/N)? "
+
+#: help.c:654
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr "%0.1f saniye içinde sürdürülüyor, '%s' demek istediğiniz varsayılacak."
 
-#: help.c:635
+#: help.c:666
 msgid ""
 "\n"
 "The most similar command is"
@@ -4505,16 +4612,16 @@ msgstr[1] ""
 "\n"
 "Buna en yakın komutlar:"
 
-#: help.c:675
+#: help.c:706
 msgid "git version [<options>]"
 msgstr "git version [<seçenekler>]"
 
-#: help.c:730
+#: help.c:761
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:734
+#: help.c:765
 msgid ""
 "\n"
 "Did you mean this?"
@@ -4528,6 +4635,15 @@ msgstr[1] ""
 "\n"
 "Åžunlardan birini mi demek istediniz?"
 
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"'%s' kancası yok sayıldı; çünkü bir çalıştırılabilir olarak ayarlanmamış.\n"
+"Bu uyarıyı 'git config advice.ignoredHook false' ile kapatabilirsiniz."
+
 #: ident.c:353
 msgid "Author identity unknown\n"
 msgstr "Yazar kimliÄŸi bilinmiyor\n"
@@ -4591,7 +4707,7 @@ msgstr "boş tanımlayıcı adına (<%s> için) izin verilmiyor"
 msgid "name consists only of disallowed characters: %s"
 msgstr "ad yalnızca izin verilmeyen karakterlerden oluşuyor: %s"
 
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
 #, c-format
 msgid "invalid date format: %s"
 msgstr "geçersiz tarih biçimi: %s"
@@ -4606,7 +4722,7 @@ msgstr "sparse:path süzgeçleri desteği artık yok"
 
 #: list-objects-filter-options.c:105
 #, c-format
-msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
 msgstr "'object:type=<tür>' için '%s' geçerli bir nesne türü değil"
 
 #: list-objects-filter-options.c:124
@@ -4653,7 +4769,7 @@ msgstr ""
 "'%s' girdisi (%s ağacında) ikili nesne kipine iye; ancak bir ikili geniş "
 "nesne deÄŸil"
 
-#: list-objects.c:395
+#: list-objects.c:398
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "%s işlemesi için kök ağacı yüklenemiyor"
@@ -4687,7 +4803,12 @@ msgstr "'%s.lock' oluşturulamıyor: %s"
 msgid "invalid value '%s' for lsrefs.unborn"
 msgstr "lsrefs.unborn için '%s' geçersiz değeri"
 
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "beklenmedik satır: '%s'"
+
+#: ls-refs.c:178
 msgid "expected flush after ls-refs arguments"
 msgstr "ls-refs argümanlarından sonra floş bekleniyordu"
 
@@ -4695,37 +4816,37 @@ 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:176 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"
 
-#: merge-ort.c:1116 merge-recursive.c:1205
+#: merge-ort.c:1584 merge-recursive.c:1211
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "%s altmodülü birleştirilemedi (çıkış yapılmadı)"
 
-#: merge-ort.c:1125 merge-recursive.c:1212
+#: merge-ort.c:1593 merge-recursive.c:1218
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "%s altmodülü birleştirilemedi (işlemeler mevcut değil)"
 
-#: merge-ort.c:1134 merge-recursive.c:1219
+#: merge-ort.c:1602 merge-recursive.c:1225
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr "%s altmodülü birleştirilemedi (işlemeler merge-base'i takip etmiyor)"
 
-#: merge-ort.c:1144 merge-ort.c:1151
+#: merge-ort.c:1612 merge-ort.c:1620
 #, c-format
 msgid "Note: Fast-forwarding submodule %s to %s"
 msgstr "Not: %s altmodülü %s yönüne ileri sarılıyor"
 
-#: merge-ort.c:1172
+#: merge-ort.c:1642
 #, c-format
 msgid "Failed to merge submodule %s"
 msgstr "'%s' altmodülünü birleştirilemedi"
 
-#: merge-ort.c:1179
+#: merge-ort.c:1649
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4734,7 +4855,7 @@ msgstr ""
 "%s altmodülü birleştirilemedi; ancak olası bir birleştirme çözümü mevcut:\n"
 "%s\n"
 
-#: merge-ort.c:1183 merge-recursive.c:1273
+#: merge-ort.c:1653 merge-recursive.c:1281
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -4750,7 +4871,7 @@ msgstr ""
 "\n"
 "komutu bu öneriyi kabul edecektir.\n"
 
-#: merge-ort.c:1196
+#: merge-ort.c:1666
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4760,21 +4881,21 @@ msgstr ""
 "mevcut:\n"
 "%s"
 
-#: merge-ort.c:1415 merge-recursive.c:1362
+#: merge-ort.c:1887 merge-recursive.c:1372
 msgid "Failed to execute internal merge"
 msgstr "İç birleştirme çalıştırılamadı"
 
-#: merge-ort.c:1420 merge-recursive.c:1367
+#: merge-ort.c:1892 merge-recursive.c:1377
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "%s veritabanına eklenemedi"
 
-#: merge-ort.c:1427 merge-recursive.c:1400
+#: merge-ort.c:1899 merge-recursive.c:1410
 #, c-format
 msgid "Auto-merging %s"
 msgstr "%s kendiliÄŸinden birleÅŸtiriliyor"
 
-#: merge-ort.c:1566 merge-recursive.c:2122
+#: merge-ort.c:2038 merge-recursive.c:2132
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4784,7 +4905,7 @@ msgstr ""
 "örtülü yeniden adlandırmanın aşağıdaki yolları oraya koymasına engel oluyor: "
 "%s."
 
-#: merge-ort.c:1576 merge-recursive.c:2132
+#: merge-ort.c:2048 merge-recursive.c:2142
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4794,7 +4915,7 @@ msgstr ""
 "eşlemlenemiyor; örtülü dizin yeniden adlandırmaları aşağıdaki yolları oraya "
 "koymayı denedi: %s."
 
-#: merge-ort.c:1634
+#: merge-ort.c:2106
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4805,7 +4926,7 @@ msgstr ""
 "adlandırılacağı belirsiz; herhangi bir hedef dosyaların çoğunu almadan "
 "birden çok başka dizine yeniden adlandırılmıştı."
 
-#: merge-ort.c:1788 merge-recursive.c:2468
+#: merge-ort.c:2260 merge-recursive.c:2478
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4814,7 +4935,7 @@ msgstr ""
 "UYARI: %s -> %s yeniden adlandırmasını %s ögesine uygulamadan kaçınılıyor, "
 "çünkü %s ögesinin kendisi yeniden adlandırıldı."
 
-#: merge-ort.c:1932 merge-recursive.c:3244
+#: merge-ort.c:2400 merge-recursive.c:3261
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4823,7 +4944,7 @@ msgstr ""
 "Yol güncellendi: %s, (%s içinde eklenen) %s içinde yeniden adlandırılan bir "
 "dizinde; onu %s konumuna taşıdı."
 
-#: merge-ort.c:1939 merge-recursive.c:3251
+#: merge-ort.c:2407 merge-recursive.c:3268
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4832,7 +4953,7 @@ msgstr ""
 "Yol güncellendi: %s, %s olarak yeniden adlandırıldı (%s içinde), %s içinde "
 "yeniden adlandırılan bir dizinde; onu %s konumuna taşıdı."
 
-#: merge-ort.c:1952 merge-recursive.c:3247
+#: merge-ort.c:2420 merge-recursive.c:3264
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4841,7 +4962,7 @@ msgstr ""
 "ÇAKIŞMA (dosya konumu): %s, (%s içinde eklenen) %s içinde yeniden "
 "adlandırılan bir dizinde, belki de %s konumuna taşınmalı."
 
-#: merge-ort.c:1960 merge-recursive.c:3254
+#: merge-ort.c:2428 merge-recursive.c:3271
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4850,14 +4971,14 @@ msgstr ""
 "ÇAKIŞMA (dosya konumu): %s, %s olarak yeniden adlandırıldı (%s içinde), %s "
 "içinde yeniden adlandırılan bir dizinde, belki de %s konumuna taşınmalı."
 
-#: merge-ort.c:2103
+#: merge-ort.c:2584
 #, c-format
 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
 msgstr ""
 "ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandırıldı (%s içinde) ve "
 "ek olarak %s olarak da adlandırıldı (%s içinde)."
 
-#: merge-ort.c:2198
+#: merge-ort.c:2679
 #, c-format
 msgid ""
 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4868,24 +4989,24 @@ msgstr ""
 "içerik çakışmaları var ve başka bir yolla çarpışıyor; bu iç içe geçmiş "
 "çakışmaimleyicilerine neden olabilir."
 
-#: merge-ort.c:2217 merge-ort.c:2241
+#: merge-ort.c:2698 merge-ort.c:2722
 #, c-format
 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr ""
 "ÇAKIŞMA (yeniden adlandır/sil): %s->%s olarak adlandırıldı (%s içinde); "
 "ancak %s içinde silindi."
 
-#: merge-ort.c:2550 merge-recursive.c:3002
+#: merge-ort.c:3212 merge-recursive.c:3022
 #, c-format
 msgid "cannot read object %s"
 msgstr "%s nesnesi okunamıyor"
 
-#: merge-ort.c:2553 merge-recursive.c:3005
+#: merge-ort.c:3215 merge-recursive.c:3025
 #, c-format
 msgid "object %s is not a blob"
 msgstr "%s nesnesi ikili bir nesne deÄŸil"
 
-#: merge-ort.c:2981
+#: merge-ort.c:3644
 #, c-format
 msgid ""
 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4894,7 +5015,7 @@ msgstr ""
 "ÇAKIŞMA (dosya/dizin): Dizin, şuradan %s yolunda: %s; bunun yerine %s "
 "konumuna taşınıyor."
 
-#: merge-ort.c:3055
+#: merge-ort.c:3721
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4904,7 +5025,7 @@ msgstr ""
 "ikisi de yeniden adlandırıldı; böylelikle başka bir yerde kayıtları "
 "yazılabilir."
 
-#: merge-ort.c:3062
+#: merge-ort.c:3728
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4914,24 +5035,24 @@ msgstr ""
 "bir tanesi yeniden adlandırıldı; böylelikle her birinin başka bir yerde "
 "kayıtları yazılabilir."
 
-#: merge-ort.c:3162 merge-recursive.c:3081
+#: merge-ort.c:3819 merge-recursive.c:3101
 msgid "content"
 msgstr "içerik"
 
-#: merge-ort.c:3164 merge-recursive.c:3085
+#: merge-ort.c:3821 merge-recursive.c:3105
 msgid "add/add"
 msgstr "ekle/ekle"
 
-#: merge-ort.c:3166 merge-recursive.c:3130
+#: merge-ort.c:3823 merge-recursive.c:3150
 msgid "submodule"
 msgstr "altmodül"
 
-#: merge-ort.c:3168 merge-recursive.c:3131
+#: merge-ort.c:3825 merge-recursive.c:3151
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "ÇAKIŞMA (%s): %s içinde birleştirme çakışması"
 
-#: merge-ort.c:3198
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -4940,24 +5061,24 @@ 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:3433
+#: 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"
 msgstr ""
-"Not: %s güncel değil ve çakışmalı sürümlerin çıkışının önünde; eski kopya "
-"%s olarak yeniden adlandırıldı."
+"Not: %s güncel değil ve çakışmalı sürümlerin çıkışının önünde; eski kopya %s "
+"olarak yeniden adlandırıldı."
 
 #. 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:3730
+#: 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"
 
-#: merge-ort-wrappers.c:13 merge-recursive.c:3699
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4967,107 +5088,107 @@ msgstr ""
 "yazılacak:\n"
 "\t%s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "Tümü güncel."
 
-#: merge-recursive.c:356
+#: merge-recursive.c:353
 msgid "(bad commit)\n"
 msgstr "(hatalı işleme)\n"
 
-#: merge-recursive.c:379
+#: merge-recursive.c:381
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr ""
 "add_cacheinfo '%s' yolu için başarısız oldu; birleştirme iptal ediliyor."
 
-#: merge-recursive.c:388
+#: merge-recursive.c:390
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr "add_cacheinfo '%s' yolu için yenilenemedi; birleştirme iptal ediliyor."
 
-#: merge-recursive.c:876
+#: merge-recursive.c:881
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "'%s'%s yolu oluşturulamadı"
 
-#: merge-recursive.c:887
+#: merge-recursive.c:892
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Altdizine yer açmak için %s kaldırılıyor\n"
 
-#: merge-recursive.c:901 merge-recursive.c:920
+#: merge-recursive.c:906 merge-recursive.c:925
 msgid ": perhaps a D/F conflict?"
 msgstr ": bir D/F çakışması olabilir mi?"
 
-#: merge-recursive.c:910
+#: merge-recursive.c:915
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "'%s' konumundaki izlenmeyen dosyayı kaybetme reddediliyor"
 
-#: merge-recursive.c:951 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "%s '%s' nesnesi okunamıyor"
 
-#: merge-recursive.c:956
+#: merge-recursive.c:961
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "%s '%s' için ikili nesne bekleniyordu"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:986
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "'%s' açılamadı: %s"
 
-#: merge-recursive.c:992
+#: merge-recursive.c:997
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "'%s' için sembolik bağ oluşturulamadı: %s"
 
-#: merge-recursive.c:997
+#: merge-recursive.c:1002
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "şununla ne yapılacağı bilinmiyor: %06o %s '%s'"
 
-#: merge-recursive.c:1227 merge-recursive.c:1239
+#: merge-recursive.c:1233 merge-recursive.c:1246
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "%s altmodülü şu işlemeye ileri sarılıyor:"
 
-#: merge-recursive.c:1230 merge-recursive.c:1242
+#: merge-recursive.c:1236 merge-recursive.c:1249
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "%s altmodülü ileri sarılıyor"
 
-#: merge-recursive.c:1265
+#: merge-recursive.c:1273
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "%s altmodülü birleştirilemedi (işlemeleri takip eden birleştirme bulunamadı)"
 
-#: merge-recursive.c:1269
+#: merge-recursive.c:1277
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "%s altmodülü birleştirilemedi (ileri sarım değil)"
 
-#: merge-recursive.c:1270
+#: merge-recursive.c:1278
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "Şu altmodül için olası bir birleştirme çözümü bulundu:\n"
 
-#: merge-recursive.c:1282
+#: merge-recursive.c:1290
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "%s altmodülü birleştirilemedi (birden çok birleştirme bulundu)"
 
-#: merge-recursive.c:1424
+#: merge-recursive.c:1434
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 "Hata: %s konumundaki izlenmeyen dosyayı kaybetme reddediliyor, bunun yerine "
 "%s konumuna yazılacak."
 
-#: merge-recursive.c:1496
+#: merge-recursive.c:1506
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5076,7 +5197,7 @@ msgstr ""
 "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s (%s içinde). %s (%s) sürümü "
 "ağaçta bırakıldı."
 
-#: merge-recursive.c:1501
+#: merge-recursive.c:1511
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5085,7 +5206,7 @@ msgstr ""
 "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s şuraya: %s (%s içinde). %s "
 "(%s) sürümü ağaçta bırakıldı."
 
-#: merge-recursive.c:1508
+#: merge-recursive.c:1518
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5094,7 +5215,7 @@ msgstr ""
 "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s (%s içinde). %s (%s) sürümü "
 "ağaçta %s konumunda bırakıldı."
 
-#: merge-recursive.c:1513
+#: merge-recursive.c:1523
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5103,45 +5224,45 @@ msgstr ""
 "ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s şuraya: %s (%s içinde). %s "
 "(%s) sürümü ağaçta %s konumunda bırakıldı."
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "rename"
 msgstr "yeniden adlandır"
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "renamed"
 msgstr "yeniden adlandırıldı"
 
-#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "%s konumundaki kirli dosyayı kaybetme reddediliyor"
 
-#: merge-recursive.c:1609
+#: merge-recursive.c:1619
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 "Engel olduğu halde %s konumundaki izlenmeyen dosyayı kaybetme reddediliyor."
 
-#: merge-recursive.c:1667
+#: merge-recursive.c:1677
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "ÇAKIŞMA (yeniden adlandır/ekle): %s->%s olarak adlandırıldı (%s içinde). %s "
 "eklendi (%s içinde)."
 
-#: merge-recursive.c:1698
+#: merge-recursive.c:1708
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s bir dizin (%s içinde), bunun yerine %s olarak ekleniyor"
 
-#: merge-recursive.c:1703
+#: merge-recursive.c:1713
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 "%s konumundaki izlenmeyen dosyayı kaybetme reddediliyor, bunun yerine %s "
 "olarak ekleniyor"
 
-#: merge-recursive.c:1730
+#: merge-recursive.c:1740
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5150,18 +5271,18 @@ msgstr ""
 "ÇAKIŞMA (y. adlandır/y. adlandır): \"%s\"->\"%s\" olarak adlandır (\"%s\" "
 "dalında), \"%s\"->\"%s\" olarak adlandır (\"%s\"%s içinde)"
 
-#: merge-recursive.c:1735
+#: merge-recursive.c:1745
 msgid " (left unresolved)"
 msgstr " (çözülmeden bırakıldı)"
 
-#: merge-recursive.c:1827
+#: merge-recursive.c:1837
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandır (%s içinde). %s->"
 "%s olarak adlandır (%s içinde)"
 
-#: merge-recursive.c:2090
+#: merge-recursive.c:2100
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5172,7 +5293,7 @@ msgstr ""
 "yerleştirileceği belirsiz; çünkü %s dizini birden çok başka dizine yeniden "
 "adlandırılırken hiçbir hedef dosyaların büyük çoğunluğunu almadı."
 
-#: merge-recursive.c:2224
+#: merge-recursive.c:2234
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5181,80 +5302,80 @@ msgstr ""
 "ÇAKIŞMA (y. adlandır/y. adlandır): Dizini %s->%s olarak adlandır (%s "
 "içinde). Dizini %s->%s olarak adlandır (%s içinde)."
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modify"
 msgstr "deÄŸiÅŸtir"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modified"
 msgstr "deÄŸiÅŸtirilmiÅŸ"
 
-#: merge-recursive.c:3108
+#: merge-recursive.c:3128
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "%s atlandı (mevcut ile aynı biçimde birleştirildi)"
 
-#: merge-recursive.c:3161
+#: merge-recursive.c:3181
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Bunun yerine %s olarak ekleniyor"
 
-#: merge-recursive.c:3368
+#: merge-recursive.c:3385
 #, c-format
 msgid "Removing %s"
 msgstr "%s kaldırılıyor"
 
-#: merge-recursive.c:3391
+#: merge-recursive.c:3408
 msgid "file/directory"
 msgstr "dosya/dizin"
 
-#: merge-recursive.c:3396
+#: merge-recursive.c:3413
 msgid "directory/file"
 msgstr "dizin/dosya"
 
-#: merge-recursive.c:3403
+#: merge-recursive.c:3420
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "ÇAKIŞMA (%s): %s adıyla bir dizin var (%s içinde). %s, %s olarak ekleniyor."
 
-#: merge-recursive.c:3412
+#: merge-recursive.c:3429
 #, c-format
 msgid "Adding %s"
 msgstr "%s ekleniyor"
 
-#: merge-recursive.c:3421
+#: merge-recursive.c:3438
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "ÇAKIŞMA (ekle/ekle): %s içinde birleştirme çakışması"
 
-#: merge-recursive.c:3474
+#: merge-recursive.c:3491
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "%s ve %s ağaçlarının birleştirilmesi başarısız"
 
-#: merge-recursive.c:3568
+#: merge-recursive.c:3585
 msgid "Merging:"
 msgstr "BirleÅŸtiriliyor:"
 
-#: merge-recursive.c:3581
+#: merge-recursive.c:3598
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "%u ortak ata bulundu:"
 msgstr[1] "%u ortak ata bulundu:"
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3648
 msgid "merge returned no commit"
 msgstr "birleştirme herhangi bir işleme döndürmedi"
 
-#: merge-recursive.c:3796
+#: merge-recursive.c:3816
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "'%s' nesnesi ayrıştırılamadı"
 
-#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
-#: builtin/stash.c:473
+#: 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."
 
@@ -5262,181 +5383,221 @@ msgstr "İndeks yazılamıyor."
 msgid "failed to read the cache"
 msgstr "önbellek okunamadı"
 
-#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
-#: builtin/stash.c:267
+#: 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"
 
-#: midx.c:74
+#: midx.c:78
 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:105
+#: 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:121
+#: 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:126
+#: 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:131
+#: 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:148
+#: 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:150
+#: 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:152
+#: 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:154
+#: 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:170
+#: 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:214
+#: 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:264
+#: 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:490
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "paket dosyası '%s' eklenemedi"
 
-#: midx.c:496
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "pack-index '%s' açılamadı"
 
-#: midx.c:564
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "%d nesnesi paket dosyasında bulunamadı"
 
-#: midx.c:880 builtin/index-pack.c:1535
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "ters indeks dosyası depolanamıyor"
 
-#: midx.c:933
-msgid "Adding packfiles to multi-pack-index"
-msgstr "Paket dosyaları multi-pack-index'e ekleniyor"
+#: midx.c:993
+#, c-format
+msgid "could not parse line: %s"
+msgstr "satır ayrıştırılamadı: %s"
 
-#: midx.c:979
+#: midx.c:995
 #, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "bırakılacak pack-file %s görülmedi"
+msgid "malformed line: %s"
+msgstr "hatalı oluşturulmuş satır: %s"
+
+#: 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:1024
+#: midx.c:1187
+msgid "could not load pack"
+msgstr "paket yüklenemedi"
+
+#: midx.c:1193
+#, c-format
+msgid "could not open index for %s"
+msgstr "%s için indeks açılamadı"
+
+#: midx.c:1204
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Paket dosyaları multi-pack-index'e ekleniyor"
+
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "bilinmeyen tercih edilen paket: '%s'"
 
-#: midx.c:1029
+#: midx.c:1292
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "yeğlenen paket %s nesnesiz seçilemiyor"
+
+#: 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:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "tercih edilen '%s' paketinin süresi geçmiş"
 
-#: midx.c:1045
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "indekslenecek paket dosyası yok."
 
-#: midx.c:1125 builtin/clean.c:37
+#: midx.c:1420
+msgid "could not write multi-pack bitmap"
+msgstr "çoklu paket biteşlem yazılamadı"
+
+#: midx.c:1430
+msgid "could not write multi-pack-index"
+msgstr "multi-pack-index yazılamadı"
+
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "%s kaldırılamadı"
 
-#: midx.c:1156
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "multi-pack-index %s konumunda temizlenemedi"
 
-#: midx.c:1214
+#: 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:1222
+#: midx.c:1593
+msgid "incorrect checksum"
+msgstr "yanlış sağlama toplamı"
+
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "Başvurulmuş paket dosyaları aranıyor"
 
-#: midx.c:1237
+#: 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:1242
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "midx bir oid içermiyor"
 
-#: midx.c:1251
+#: 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:1260
+#: 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:1280
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "Nesneler paket dosyasına göre sıralanıyor"
 
-#: midx.c:1287
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "Nesne ofsetleri doğrulanıyor"
 
-#: midx.c:1303
+#: 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:1309
+#: 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:1318
+#: 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:1343
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "Başvurulmuş nesneler sayılıyor"
 
-#: midx.c:1353
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "Başvurulmamış paket dosyaları bulunuyor ve siliniyor"
 
-#: midx.c:1544
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "pack-objects başlatılamadı"
 
-#: midx.c:1564
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "pack-objects bitirilemedi"
 
@@ -5495,271 +5656,272 @@ 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:526
+#: 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:577
+#: 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:649
+#: 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:656
+#: 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:699
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "alternatifler kilit dosyası fdopen yapılamıyor"
 
-#: object-file.c:717
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "alternatifler dosyası okunamıyor"
 
-#: object-file.c:724
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr "yeni alternatifler dosyası yerine taşınamıyor"
 
-#: object-file.c:759
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "'%s' diye bir yol yok"
 
-#: object-file.c:780
+#: 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:786
+#: 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:792
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "başvuru deposu '%s' sığ"
 
-#: object-file.c:800
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "başvuru deposu '%s' aşılı"
 
-#: object-file.c:860
+#: 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: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:1010
+#: 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:1031
-msgid "mmap failed"
-msgstr "mmap başarısız"
+#: object-file.c:1048
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap başarısız%s"
 
-#: object-file.c:1195
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "nesne dosyası %s boş"
 
-#: object-file.c:1330 object-file.c:2524
+#: 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:1332 object-file.c:2528
+#: 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:1374
+#: object-file.c:1457
+#, c-format
+msgid "unable to parse %s header"
+msgstr "%s üstbilgisi ayrıştırılamıyor"
+
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "geçersiz nesne türü"
 
-#: object-file.c:1458
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "%s üstbilgisi --allow-unknown-type ile açılamıyor"
-
-#: object-file.c:1461
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "%s üstbilgisi açılamıyor"
 
-#: object-file.c:1467
+#: object-file.c:1474
 #, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "%s üstbilgisi paketi --allow-unknown-type ile ayrıştırılamıyor"
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "%s üstbilgisi pek uzun, %d bayt'ı aşıyor"
 
-#: object-file.c:1470
-#, c-format
-msgid "unable to parse %s header"
-msgstr "%s üstbilgisi ayrıştırılamıyor"
-
-#: object-file.c:1697
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr "%s nesnesi okunamadı"
 
-#: object-file.c:1701
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "%s yedeği %s için bulunamadı"
 
-#: object-file.c:1705
+#: 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:1709
+#: 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:1814
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "%s dosyası yazılamıyor"
 
-#: object-file.c:1821
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "'%s' ögesine izin ayarlanamıyor"
 
-#: object-file.c:1828
+#: object-file.c:1835
 msgid "file write error"
 msgstr "dosya yazım hatası"
 
-#: object-file.c:1848
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr "gevşek nesne dosyası kapatılırken hata"
 
-#: object-file.c:1913
+#: 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:1915
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "geçici dosya oluşturulamıyor"
 
-#: object-file.c:1939
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "gevşek nesne dosyası yazılamıyor"
 
-#: object-file.c:1945
+#: 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:1949
+#: 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:1953
+#: 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:1963 builtin/pack-objects.c:1097
+#: 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:2040
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "%s için nesne okunamıyor"
 
-#: object-file.c:2091
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "hasar görmüş işleme"
 
-#: object-file.c:2099
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "hasar görmüş etiket"
 
-#: object-file.c:2199
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "%s indekslenirken okuma hatası"
 
-#: object-file.c:2202
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "%s indekslenirken kısa read"
 
-#: object-file.c:2275 object-file.c:2285
+#: 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:2291
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: desteklenmeyen dosya türü"
 
-#: object-file.c:2315
+#: 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:2317
+#: 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:2344 builtin/index-pack.c:192
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "%s açılamıyor"
 
-#: object-file.c:2535 object-file.c:2588
+#: 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:2559
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "%s mmap yapılamadı"
 
-#: object-file.c:2564
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "%s üstbilgisi açılamıyor"
 
-#: object-file.c:2570
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "%s üstbilgisi ayrıştırılamıyor"
 
-#: object-file.c:2581
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "%s içeriği açılamıyor"
 
-#: object-name.c:486
+#: object-name.c:480
 #, c-format
 msgid "short object ID %s is ambiguous"
 msgstr "kısa nesne ID'si %s belirsiz"
 
-#: object-name.c:497
+#: object-name.c:491
 msgid "The candidates are:"
 msgstr "Adaylar:"
 
-#: object-name.c:796
+#: object-name.c:790
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5782,22 +5944,22 @@ msgstr ""
 "iletiyi\n"
 "kapatmak için \"git config advice.objectNameWarning\" yapın."
 
-#: object-name.c:916
+#: object-name.c:910
 #, c-format
 msgid "log for '%.*s' only goes back to %s"
 msgstr "'%.*s' günlüğü yalnızca şuna geri gider: %s"
 
-#: object-name.c:924
+#: object-name.c:918
 #, c-format
 msgid "log for '%.*s' only has %d entries"
 msgstr "'%.*s' günlüğünde yalnızca %d girdi var"
 
-#: object-name.c:1702
+#: object-name.c:1696
 #, c-format
 msgid "path '%s' exists on disk, but not in '%.*s'"
 msgstr "'%s' yolu disk üzerinde mevcut; ancak '%.*s' içinde değil"
 
-#: object-name.c:1708
+#: object-name.c:1702
 #, c-format
 msgid ""
 "path '%s' exists, but not '%s'\n"
@@ -5806,12 +5968,12 @@ msgstr ""
 "'%s' yolu mevcut; ancak '%s' deÄŸil\n"
 "İpucu: Şunu mu demek istediniz: '%.*s:%s', nam-ı diğer '%.*s:./%s'?"
 
-#: object-name.c:1717
+#: object-name.c:1711
 #, c-format
 msgid "path '%s' does not exist in '%.*s'"
 msgstr "'%s' yolu '%.*s' içinde mevcut değil"
 
-#: object-name.c:1745
+#: object-name.c:1739
 #, c-format
 msgid ""
 "path '%s' is in the index, but not at stage %d\n"
@@ -5820,7 +5982,7 @@ msgstr ""
 "'%s' yolu indekste; ancak %d numaralı alanda değil\n"
 "Ä°pucu: Åžunu mu demek istediniz: ':%d:%s'?"
 
-#: object-name.c:1761
+#: object-name.c:1755
 #, c-format
 msgid ""
 "path '%s' is in the index, but not '%s'\n"
@@ -5829,21 +5991,21 @@ msgstr ""
 "'%s' yolu indekste; ancak '%s' deÄŸil\n"
 "İpucu: Şunu mu demek istediniz: '%d:%s', nam-ı diğer ':%d:./%s'?"
 
-#: object-name.c:1769
+#: object-name.c:1763
 #, c-format
 msgid "path '%s' exists on disk, but not in the index"
 msgstr "'%s' yolu diskte mevcut; ancak indekste deÄŸil"
 
-#: object-name.c:1771
+#: object-name.c:1765
 #, c-format
 msgid "path '%s' does not exist (neither on disk nor in the index)"
 msgstr "'%s' diye bir yol yok (ne diskte ne de indekste)"
 
-#: object-name.c:1784
+#: object-name.c:1778
 msgid "relative path syntax can't be used outside working tree"
 msgstr "göreceli yol sözdizimi çalışma ağacı dışında kullanılamaz"
 
-#: object-name.c:1922
+#: object-name.c:1916
 #, c-format
 msgid "invalid object name '%.*s'."
 msgstr "geçersiz nesne adı: '%.*s'"
@@ -5858,27 +6020,40 @@ msgstr "geçersiz nesne türü \"%s\""
 msgid "object %s is a %s, not a %s"
 msgstr "%s nesnesi bir %s, %s deÄŸil"
 
-#: object.c:232
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "%s nesnesi %d bilinmeyen tür numarasına iye"
 
-#: object.c:245
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "nesne ayrıştırılamıyor: %s"
 
-#: object.c:265 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "sağlama uyuşmazlığı %s"
 
-#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
+#: 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:429
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: paket açılamadı"
+
+#: 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:1547 builtin/rev-list.c:92
+#: 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: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"
@@ -5908,124 +6083,134 @@ msgstr "%s reverse-index dosyasının sürümü %<PRIu32> desteklenmiyor"
 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
 msgstr "%s reverse-index dosyasının sağlama numarası %<PRIu32> desteklenmiyor"
 
-#: pack-write.c:250
+#: pack-write.c:251
 msgid "cannot both write and verify reverse index"
 msgstr "ters indeks dosyası hem yazılıp hem doğrulanamıyor"
 
-#: pack-write.c:271
+#: pack-write.c:270
 #, c-format
 msgid "could not stat: %s"
 msgstr "dosya bilgileri alınamadı: %s"
 
-#: pack-write.c:283
+#: pack-write.c:282
 #, c-format
 msgid "failed to make %s readable"
 msgstr "%s, yazılabilir yapılamadı"
 
-#: pack-write.c:522
+#: pack-write.c:520
 #, c-format
 msgid "could not write '%s' promisor file"
 msgstr "vaat dosyası '%s' yazılamadı"
 
-#: packfile.c:625
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "ofset paket dosyasının sonundan önce (bozuk .idx?)"
 
-#: packfile.c:1937
+#: packfile.c:657
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "paket dosyası %s eşlemlenemiyor%s"
+
+#: 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:1941
+#: 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
+#: 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.c:38
+#: 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"
 msgstr "%s bir deÄŸer gerektiriyor"
 
-#: parse-options.c:73
+#: parse-options.c:93
 #, c-format
 msgid "%s is incompatible with %s"
 msgstr "%s, %s ile uyumsuz"
 
-#: parse-options.c:78
+#: parse-options.c:98
 #, c-format
 msgid "%s : incompatible with something else"
 msgstr "%s: baÅŸka bir ÅŸeyle uyumsuz"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
 #, c-format
 msgid "%s takes no value"
 msgstr "%s bir değer almıyor"
 
-#: parse-options.c:94
+#: parse-options.c:114
 #, c-format
 msgid "%s isn't available"
 msgstr "%s kullanılabilir değil"
 
-#: parse-options.c:217
+#: parse-options.c:237
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr "%s negatif olmayan bir tamsayı bekliyor, isteğe bağlı k/m/g eki ile"
 
-#: parse-options.c:386
+#: parse-options.c:393
 #, c-format
 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:420 parse-options.c:428
+#: 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:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "şunun arması: --%s"
 
-#: parse-options.c:879
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "bilinmeyen seçenek '%s'"
 
-#: parse-options.c:881
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "bilinmeyen anahtar '%c'"
 
-#: parse-options.c:883
+#: 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:907
+#: parse-options.c:920
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:926
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "kullanım: %s"
@@ -6033,47 +6218,71 @@ msgstr "kullanım: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:932
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "    veya: %s"
 
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. 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:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:974
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-SAYI"
 
-#: path.c:915
+#: path.c:922
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "%s grup ile yazılabilir yapılamadı"
 
-#: pathspec.c:151
+#: pathspec.c:150
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "Kaçış karakteri '\\' attr değerindeki son karakter olarak kullanılamaz"
 
-#: pathspec.c:169
+#: pathspec.c:168
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Yalnızca bir 'attr:' belirtimine izin verilir."
 
-#: pathspec.c:172
+#: pathspec.c:171
 msgid "attr spec must not be empty"
-msgstr "attr belirteci boş olmamalı"
+msgstr "attr belirteci boş bırakılmamalı"
 
-#: pathspec.c:215
+#: pathspec.c:214
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "geçersiz öznitelik adı %s"
 
-#: pathspec.c:280
+#: pathspec.c:279
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr "global 'glob' ve 'noglob' yol belirteci ayarları birbiriyle uyumsuz"
 
-#: pathspec.c:287
+#: pathspec.c:286
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -6081,51 +6290,51 @@ msgstr ""
 "global 'literal' yol belirteci ayarı diğer tüm global yol belirteci "
 "ayarlarıyla uyumsuz"
 
-#: pathspec.c:327
+#: pathspec.c:326
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "yol belirteci sihri 'prefix' için geçersiz parametre"
 
-#: pathspec.c:348
+#: pathspec.c:347
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Geçersiz yol belirteci sihri '%.*s' (%s içinde)"
 
-#: pathspec.c:353
+#: pathspec.c:352
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "'%s' içindeki yol belirteci sihrinin sonunda eksik ')'"
 
-#: pathspec.c:391
+#: pathspec.c:390
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Yerine getirilmemiş yol belirteci sihri '%c' ('%s' içinde)"
 
-#: pathspec.c:450
+#: pathspec.c:449
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: 'literal' ve 'glob' birbiriyle uyumsuz"
 
-#: pathspec.c:466
+#: pathspec.c:465
 #, c-format
 msgid "%s: '%s' is outside repository at '%s'"
 msgstr "%s: '%s', '%s' konumunda depo dışında"
 
-#: pathspec.c:542
+#: pathspec.c:541
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (belleten: '%c')"
 
-#: pathspec.c:552
+#: pathspec.c:551
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: yol belirteci sihri bu komut tarafından desteklenmiyor: %s"
 
-#: pathspec.c:619
+#: pathspec.c:618
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "yol belirteci '%s' bir sembolik bağın ötesinde"
 
-#: pathspec.c:664
+#: pathspec.c:663
 #, c-format
 msgid "line is badly quoted: %s"
 msgstr "satırda hatalı tırnaklar: %s"
@@ -6139,14 +6348,14 @@ msgid "unable to write delim packet"
 msgstr "sınırlandıran paket yazılamıyor"
 
 #: pkt-line.c:106
-msgid "unable to write stateless separator packet"
-msgstr "durumsuz ayırıcı paketi yazılamıyor"
+msgid "unable to write response end packet"
+msgstr "yanıt sonu paketi yazılamıyor"
 
 #: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr "floş paketi yazımı başarısız"
 
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
 msgid "protocol error: impossibly long line"
 msgstr "protokol hatası: olanaksız uzun satır"
 
@@ -6154,7 +6363,7 @@ msgstr "protokol hatası: olanaksız uzun satır"
 msgid "packet write with format failed"
 msgstr "biçimlendirilmiş paket yazımı başarısız"
 
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
 msgid "packet write failed - data exceeds max packet size"
 msgstr "paket yazımı başarısız - veri olabilecek en çok paket boyutunu aşıyor"
 
@@ -6163,25 +6372,25 @@ msgstr "paket yazımı başarısız - veri olabilecek en çok paket boyutunu aş
 msgid "packet write failed: %s"
 msgstr "paket yazımı başarısız: %s"
 
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
 msgid "read error"
 msgstr "okuma hatası"
 
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
 msgid "the remote end hung up unexpectedly"
 msgstr "uzak konum beklenmedik bir biçimde hattı kapattı"
 
-#: pkt-line.c:369 pkt-line.c:371
+#: 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:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: 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:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "uzak konum hatası: %s"
@@ -6195,23 +6404,23 @@ msgstr "Ä°ndeks yenileniyor"
 msgid "unable to create threaded lstat: %s"
 msgstr "iş parçacıklarına ayrılmış 'lstat' oluşturulamıyor: %s"
 
-#: pretty.c:988
+#: pretty.c:1051
 msgid "unable to parse --pretty format"
 msgstr "--pretty biçimi ayrıştırılamıyor"
 
-#: promisor-remote.c:30
+#: promisor-remote.c:31
 msgid "promisor-remote: unable to fork off fetch subprocess"
 msgstr "promisor-remote: getirme altişlemi çatallanamıyor"
 
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
 msgid "promisor-remote: could not write to fetch subprocess"
 msgstr "promisor-remote: getirme altişlemine yazılamıyor"
 
-#: promisor-remote.c:41
+#: promisor-remote.c:44
 msgid "promisor-remote: could not close stdin to fetch subprocess"
 msgstr "promisor-remote: altişlemi getirmek için stdin kapatılamıyor"
 
-#: promisor-remote.c:53
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "vaatçi uzak konum adı '/' ile başlayamaz: %s"
@@ -6224,20 +6433,20 @@ msgstr "object-info: argümanlardan sonra floş bekleniyordu"
 msgid "Removing duplicate objects"
 msgstr "Yinelenmiş nesneler kaldırılıyor"
 
-#: range-diff.c:78
+#: range-diff.c:67
 msgid "could not start `log`"
 msgstr "'log' başlatılamadı"
 
-#: range-diff.c:80
+#: range-diff.c:69
 msgid "could not read `log` output"
 msgstr "'log' çıktısı okunamadı"
 
-#: range-diff.c:101 sequencer.c:5551
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "'%s' işlemesi ayrıştırılamadı"
 
-#: range-diff.c:115
+#: range-diff.c:111
 #, c-format
 msgid ""
 "could not parse first line of `log` output: did not start with 'commit ': "
@@ -6245,69 +6454,65 @@ msgid ""
 msgstr ""
 "'log' çıktısının ilk satırı ayrıştırılamadı: 'commit ' ile başlamıyor: '%s'"
 
-#: range-diff.c:140
+#: range-diff.c:137
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "git üstbilgisi '%.*s' ayrıştırılamadı"
 
-#: range-diff.c:306
+#: range-diff.c:304
 msgid "failed to generate diff"
 msgstr "diff oluşturulamadı"
 
-#: range-diff.c:558
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "-p ve --overlay birlikte kullanılmaz"
-
-#: range-diff.c:561 range-diff.c:563
+#: 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:708
+#: 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:724
+#: 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:746
+#: 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:751
+#: 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:803
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "'%s' dosyası indekslenemiyor"
 
-#: read-cache.c:822
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "'%s' indekse eklenemiyor"
 
-#: read-cache.c:833
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "'%s' dosyasının bilgileri alınamıyor"
 
-#: read-cache.c:1356
+#: 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:1571
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "Ä°ndeks yenileniyor"
 
-#: read-cache.c:1700
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6316,7 +6521,7 @@ msgstr ""
 "index.version ayarlanmış; ancak değer geçersiz.\n"
 "%i sürümü kullanılıyor"
 
-#: read-cache.c:1710
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6325,143 +6530,143 @@ msgstr ""
 "GIT_INDEX_VERSION ayarlanmış; ancak değer geçersiz.\n"
 "%i sürümü kullanılıyor"
 
-#: read-cache.c:1766
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "hatalı imza 0x%08x"
 
-#: read-cache.c:1769
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "hatalı indeks sürümü %d"
 
-#: read-cache.c:1778
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "hatalı indeks dosyası sha1 imzası"
 
-#: read-cache.c:1812
+#: 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:1814
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "%.4s uzantısı yok sayılıyor"
 
-#: read-cache.c:1851
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "bilinmeyen indeks girdisi biçimi 0x%08x"
 
-#: read-cache.c:1867
+#: 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:1924
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr "indekste sırasız hazırlama alanı girdileri"
 
-#: read-cache.c:1927
+#: 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:1930
+#: 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:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:332
+#: 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: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:2180
+#: 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:2193
+#: 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:2226
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: indeks dosyası açılamadı"
 
-#: read-cache.c:2230
+#: 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:2234
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: indeks dosyası beklenenden daha küçük"
 
-#: read-cache.c:2238
+#: read-cache.c:2280
 #, c-format
-msgid "%s: unable to map index file"
-msgstr "%s: indeks dosyası eşlemlenemiyor"
+msgid "%s: unable to map index file%s"
+msgstr "%s: indeks dosyası eşlemlenemiyor%s"
 
-#: read-cache.c:2280
+#: 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:2307
+#: 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:2345
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "paylaşılan indeks '%s' tazelenemedi"
 
-#: read-cache.c:2392
+#: 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:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: 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:3138
+#: 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:3209 sequencer.c:2684 sequencer.c:4441
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "'%s' bilgileri alınamadı"
 
-#: read-cache.c:3222
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "git dizini açılamıyor: %s"
 
-#: read-cache.c:3234
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "bağlantı kesilemiyor: %s"
 
-#: read-cache.c:3263
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "'%s' üzerindeki izin bitleri onarılamıyor"
 
-#: read-cache.c:3412
+#: 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"
@@ -6538,7 +6743,7 @@ msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "%s ögesini %s üzerine yeniden temellendir (%d komut)"
 msgstr[1] "%s ögesini %s üzerine yeniden temellendir (%d komut)"
 
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6547,7 +6752,7 @@ msgstr ""
 "Hiçbir satırı kaldırmayın. Bir işlemeyi kaldırmak için 'drop'u açıkça "
 "kullanın.\n"
 
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6555,7 +6760,7 @@ msgstr ""
 "\n"
 "Buradaki bir satırı kaldırırsanız İŞLEME KAYBOLUR.\n"
 
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6570,7 +6775,7 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -6580,14 +6785,14 @@ 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:3816
-#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
+#: 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'"
 msgstr "'%s' yazılamadı"
 
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
 #, c-format
 msgid "could not write '%s'."
 msgstr "'%s' yazılamadı."
@@ -6618,14 +6823,12 @@ msgstr ""
 "Kullanılabilir davranışlar: ignore, warn, error.\n"
 "\n"
 
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
 #, c-format
-msgid "could not read '%s'."
-msgstr "'%s' okunamadı."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: 'preserve'in yerini 'merges' aldı"
 
-#: ref-filter.c:42 wt-status.c:1978
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "gitti"
 
@@ -6644,258 +6847,229 @@ msgstr "%d arkasında"
 msgid "ahead %d, behind %d"
 msgstr "%d önünde, %d arkasında"
 
-#: ref-filter.c:175
+#: ref-filter.c:235
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "beklenen biçim: %%(color:<renk>)"
 
-#: ref-filter.c:177
+#: ref-filter.c:237
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "tanımlanamayan renk: %%(color:%s)"
 
-#: ref-filter.c:199
+#: ref-filter.c:259
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Tamsayı değeri şunu bekliyordu: refname:lstrip=%s"
 
-#: ref-filter.c:203
+#: ref-filter.c:263
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Tamsayı değeri şunu bekliyordu: refname:rstrip=%s"
 
-#: ref-filter.c:205
+#: 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"
 
-#: ref-filter.c:260
+#: ref-filter.c:320
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) argüman almıyor"
 
-#: ref-filter.c:282
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "tanımlanamayan %%(objectsize) argümanı: %s"
-
-#: ref-filter.c:290
+#: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) argüman almıyor"
 
-#: ref-filter.c:302
+#: ref-filter.c:364
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) argüman almıyor"
 
-#: ref-filter.c:315
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "tanımlanamayan %%(subject) argümanı: %s"
-
-#: ref-filter.c:334
+#: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
 msgstr "%%(trailers:key=<deÄŸer>) bekleniyordu"
 
-#: ref-filter.c:336
+#: ref-filter.c:398
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "bilinmeyen %%(trailers) argümanı: %s"
 
-#: ref-filter.c:367
+#: ref-filter.c:429
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "pozitif deÄŸer ÅŸunu bekliyordu: contents:lines=%s"
 
-#: ref-filter.c:369
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "tanımlanamayan %%(contents) argümanı: %s"
-
-#: ref-filter.c:384
+#: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "pozitif deÄŸer ÅŸurada '%s' bekliyordu: %%(%s)"
 
-#: ref-filter.c:388
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "şurada tanımlanamayan argüman '%s': %%(%s)"
-
-#: ref-filter.c:402
+#: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
 msgstr "tanımlanamayan e-posta seçeneği: %s"
 
-#: ref-filter.c:432
+#: ref-filter.c:506
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "beklenen biçim: %%(align:<genişlik>,<konum>)"
 
-#: ref-filter.c:444
+#: ref-filter.c:518
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "tanımlanamayan konum:%s"
 
-#: ref-filter.c:451
+#: ref-filter.c:525
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "tanımlanamayan genişlik:%s"
 
-#: ref-filter.c:460
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "tanımlanamayan %%(align) argümanı: %s"
-
-#: ref-filter.c:468
+#: 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:486
+#: ref-filter.c:568
 #, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "tanımlanamayan %%(if) argümanı: %s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) argüman almıyor"
 
-#: ref-filter.c:588
+#: ref-filter.c:680
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "hatalı oluşturulmuş alan adı: %.*s"
 
-#: ref-filter.c:615
+#: ref-filter.c:707
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "bilinmeyen alan adı: %.*s"
 
-#: ref-filter.c:619
+#: ref-filter.c:711
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 "bir git deposu değil; ancak '%.*s' alanı nesne verisine erişim gerektiriyor"
 
-#: ref-filter.c:743
+#: 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 "biçim: %%(if) ögeciği bir %%(then) ö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:807
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "biçim: %%(then) ögeciği bir %%(if) ögeciği olmadan kullanıldı"
-
-#: ref-filter.c:809
+#: ref-filter.c:912
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "biçim: %%(then) ögeciği birden çok kez kullanıldı"
 
-#: ref-filter.c:811
+#: ref-filter.c:914
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "biçim: %%(then) ögeciği %%(else) ögeciğinden sonra kullanıldı"
 
-#: ref-filter.c:839
-#, 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:841
-#, 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:843
+#: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "biçim: %%(else) ögeciği birden çok kez kullanıldı"
 
-#: ref-filter.c:858
+#: ref-filter.c:965
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "biçim: %%(end) ögeciği eş ögeciği olmadan kullanıldı"
 
-#: ref-filter.c:915
+#: ref-filter.c:1027
 #, c-format
 msgid "malformed format string %s"
 msgstr "hatalı oluşturulmuş biçim dizisi %s"
 
-#: ref-filter.c:1556
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "bu komut atom %%(%.*s) reddediyor"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s, --python, --shell ve --tcl ile kullanılamaz"
+
+#: ref-filter.c:1706
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(dal yok, %s yeniden temellendiriliyor)"
 
-#: ref-filter.c:1559
+#: ref-filter.c:1709
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr "(dal yok, ayrık HEAD %s yeniden temellendiriliyor)"
 
-#: ref-filter.c:1562
+#: ref-filter.c:1712
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(dal yok, ikili arama %s üzerinde başladı)"
 
-#: ref-filter.c:1566
+#: ref-filter.c:1716
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD, %s konumunda ayrıldı)"
 
-#: ref-filter.c:1569
+#: ref-filter.c:1719
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD, %s ögesinden ayrıldı)"
 
-#: ref-filter.c:1572
+#: ref-filter.c:1722
 msgid "(no branch)"
 msgstr "(dal yok)"
 
-#: ref-filter.c:1604 ref-filter.c:1813
+#: ref-filter.c:1754 ref-filter.c:1972
 #, c-format
 msgid "missing object %s for %s"
 msgstr "eksik nesne %s (%s için)"
 
-#: ref-filter.c:1614
+#: ref-filter.c:1764
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer %s üzerinde başarısız oldu (%s için)"
 
-#: ref-filter.c:1997
+#: ref-filter.c:2155
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "'%s' konumunda hatalı oluşturulmuş nesne"
 
-#: ref-filter.c:2086
+#: ref-filter.c:2245
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "bozuk ada iye %s başvurusu yok sayılıyor"
 
-#: ref-filter.c:2091 refs.c:676
+#: 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:2431
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "biçim: %%(end) ögeciği eksik"
 
-#: ref-filter.c:2525
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "hatalı oluşturulmuş nesne adı %s"
 
-#: ref-filter.c:2530
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "'%s' bir iÅŸlemeye iÅŸaret etmeli"
 
-#: refs.c:264
+#: refs.c:261
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr "%s geçerli bir nesneye işaret etmiyor!"
 
-#: refs.c:566
+#: refs.c:563
 #, c-format
 msgid ""
 "Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6920,12 +7094,12 @@ msgstr ""
 "\n"
 "\tgit branch -m <ad>\n"
 
-#: refs.c:588
+#: refs.c:585
 #, c-format
 msgid "could not retrieve `%s`"
 msgstr "'%s' alınamadı"
 
-#: refs.c:598
+#: refs.c:595
 #, c-format
 msgid "invalid branch name: %s = %s"
 msgstr "geçersiz dal adı: %s = %s"
@@ -6935,67 +7109,67 @@ msgstr "geçersiz dal adı: %s = %s"
 msgid "ignoring dangling symref %s"
 msgstr "sarkan sembolik başvuru %s yok sayılıyor"
 
-#: refs.c:922
+#: 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:929
+#: 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:994
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "%s için olan günlük boş"
 
-#: refs.c:1086
+#: 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:1157
+#: 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:2051
+#: 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:2131
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "başvuru güncellemeleri karantina ortamı içinde yasak"
 
-#: refs.c:2142
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "başvuru güncellemeleri kanca tarafından iptal edildi"
 
-#: refs.c:2242 refs.c:2272
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' mevcut; '%s' oluşturulamıyor"
 
-#: refs.c:2248 refs.c:2283
+#: 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:1228
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr "%s başvurusu kaldırılamadı"
 
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: 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:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr "baÅŸvurular silinemedi: %s"
@@ -7005,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"
@@ -7057,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"
@@ -7081,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"
@@ -7092,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"
@@ -7103,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"
@@ -7114,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"
@@ -7125,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 ""
@@ -7240,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"
@@ -7259,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"
@@ -7296,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
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "'%s' floş yapılamadı"
@@ -7319,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
@@ -7341,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:2089 builtin/log.c:2000
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
+#: 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ı"
@@ -7380,46 +7554,33 @@ 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:3669
+#: 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:2343
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "--unpacked=<paketdosyası> artık desteklenmiyor"
 
-#: revision.c:2683
+#: 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:2686
+#: 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:2892
+#: 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:767
-msgid "open /dev/null failed"
-msgstr "/dev/null açılamadı"
-
-#: run-command.c:1275
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "async iş parçacığı oluşturulamadı: %s"
 
-#: run-command.c:1345
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"'%s' kancası yok sayıldı; çünkü bir çalıştırılabilir olarak ayarlanmamış.\n"
-"Bu uyarıyı 'git config advice.ignoredHook false' ile kapatabilirsiniz."
-
 #: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr "uzak konum açım durumu okunurken beklenmedik floş paketi"
@@ -7438,23 +7599,23 @@ msgstr "uzak konum açımı başarısız: %s"
 msgid "failed to sign the push certificate"
 msgstr "itme sertifikası imzalanamadı"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "send-pack: unable to fork off fetch subprocess"
 msgstr "send-pack: getirme altişlemi çatallanamıyor"
 
-#: send-pack.c:455
+#: send-pack.c:457
 msgid "push negotiation failed; proceeding anyway with push"
 msgstr "itme pazarlığı başarısız; yine de itme olmadan sürdürülüyor"
 
-#: send-pack.c:520
+#: send-pack.c:528
 msgid "the receiving end does not support this repository's hash algorithm"
 msgstr "alıcı uç bu deponun sağlama algoritmasını desteklemiyor"
 
-#: send-pack.c:529
+#: send-pack.c:537
 msgid "the receiving end does not support --signed push"
 msgstr "alıcı uç --signed itmeyi desteklemiyor"
 
-#: send-pack.c:531
+#: send-pack.c:539
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -7462,47 +7623,48 @@ msgstr ""
 "alıcı uç --signed itmeyi desteklemediğinden dolayı bir itme sertifikası "
 "gönderilmiyor"
 
-#: send-pack.c:543
+#: send-pack.c:546
 msgid "the receiving end does not support --atomic push"
 msgstr "alıcı uç --atomic itmeyi desteklemiyor"
 
-#: send-pack.c:548
+#: send-pack.c:551
 msgid "the receiving end does not support push options"
 msgstr "alıcı uç itme seçeneklerini desteklemiyor"
 
-#: sequencer.c:196
+#: sequencer.c:197
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "geçersiz işleme iletisi temizleme kipi '%s'"
 
-#: sequencer.c:324
+#: sequencer.c:325
 #, c-format
 msgid "could not delete '%s'"
 msgstr "'%s' silinemedi"
 
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: 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ı"
 
-#: sequencer.c:354
+#: sequencer.c:355
 msgid "revert"
 msgstr "geri al"
 
-#: sequencer.c:356
+#: sequencer.c:357
 msgid "cherry-pick"
 msgstr "seç-al"
 
-#: sequencer.c:358
+#: sequencer.c:359
 msgid "rebase"
 msgstr "yeniden temellendirme"
 
-#: sequencer.c:360
+#: sequencer.c:361
 #, c-format
 msgid "unknown action: %d"
 msgstr "bilinmeyen eylem: %d"
 
-#: sequencer.c:419
+#: sequencer.c:420
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -7510,53 +7672,81 @@ msgstr ""
 "çakışmaları çözdükten sonra doğrusu verilen yolları 'git add <yollar>'\n"
 "veya 'git rm <yollar>' ile imleyin"
 
-#: sequencer.c:422
+#: sequencer.c:423
 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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
 msgstr ""
-"çakışmaları çözdükten sonra doğrusu verilen yolları 'git add <yollar>'\n"
-"veya 'git rm <yollar>' ile imleyin ve çıkan sonucu\n"
-"'git commit' ile iÅŸleyin"
+"Çakışmaları çözdükten sonra onları şu komutla imleyin:\n"
+"\"git add/rm <yolblrtç>\", sonrasında şunu çalıştırın:\n"
+"\"git cherry-pick --continue\".\n"
+"Bunun yerine bu iÅŸlemeyi \"git cherry-pick --skip\" ile\n"
+"atlayabilirsiniz. İptal edip \"git cherry-pick\" öncesine\n"
+"geri dönmek için \"git cherry-pick --abort\" çalıştırın."
 
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Çakışmaları çözdükten sonra onları şu komutla imleyin:\n"
+"\"git add/rm <yolblrtç>\", sonrasında şunu çalıştırın:\n"
+"\"git revert --continue\".\n"
+"Bunun yerine bu iÅŸlemeyi \"git revert --skip\" ile\n"
+"atlayabilirsiniz. İptal edip \"git revert\" öncesine\n"
+"geri dönmek için \"git revert --abort\" çalıştırın."
+
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "'%s' kilitlenemedi"
 
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#: 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'"
 
-#: sequencer.c:442
+#: sequencer.c:455
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "satır sonu şuraya yazılamadı: '%s'"
 
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3554
+#: 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:486
+#: 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."
 msgstr "%s ile yerel değişikliklerinizin üzerine yazılacaktır."
 
-#: sequencer.c:490
+#: sequencer.c:503
 msgid "commit your changes or stash them to proceed."
 msgstr "İlerlemek için değişikliklerinizi işleyin veya zulalayın."
 
-#: sequencer.c:522
+#: sequencer.c:535
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: ileri sar"
 
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Geçersiz temizlik kipi %s"
@@ -7564,65 +7754,65 @@ msgstr "Geçersiz temizlik kipi %s"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
 #.
-#: sequencer.c:671
+#: sequencer.c:685
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Yeni indeks dosyası yazılamıyor"
 
-#: sequencer.c:685
+#: sequencer.c:699
 msgid "unable to update cache tree"
 msgstr "önbellek ağacı güncellenemiyor"
 
-#: sequencer.c:699
+#: sequencer.c:713
 msgid "could not resolve HEAD commit"
 msgstr "HEAD işlemesi çözülemedi"
 
-#: sequencer.c:779
+#: sequencer.c:793
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "'%.*s' içinde bir anahtar yok"
 
-#: sequencer.c:790
+#: sequencer.c:804
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "'%s' ögesinin tırnakları kaldırılamıyor"
 
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
-#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
+#: 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ı"
 
-#: sequencer.c:837
+#: sequencer.c:851
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "'GIT_AUTHOR_NAME' halihazırda verilmiş"
 
-#: sequencer.c:842
+#: sequencer.c:856
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "'GIT_AUTHOR_EMAIL' halihazırda verilmiş"
 
-#: sequencer.c:847
+#: sequencer.c:861
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "'GIT_AUTHOR_DATE' halihazırda verilmiş"
 
-#: sequencer.c:851
+#: sequencer.c:865
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "bilinmeyen deÄŸiÅŸken '%s'"
 
-#: sequencer.c:856
+#: sequencer.c:870
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "'GIT_AUTHOR_NAME' eksik"
 
-#: sequencer.c:858
+#: sequencer.c:872
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "'GIT_AUTHOR_EMAIL' eksik"
 
-#: sequencer.c:860
+#: sequencer.c:874
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "'GIT_AUTHOR_DATE' eksik"
 
-#: sequencer.c:925
+#: sequencer.c:939
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -7652,11 +7842,11 @@ msgstr ""
 "\n"
 "\tgit rebase --continue\n"
 
-#: sequencer.c:1212
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "'prepare-commit-msg' başarısız oldu"
 
-#: sequencer.c:1218
+#: 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"
@@ -7682,7 +7872,7 @@ msgstr ""
 "\n"
 "\tgit commit --amend --reset-author\n"
 
-#: sequencer.c:1231
+#: 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"
@@ -7706,342 +7896,349 @@ msgstr ""
 "\n"
 "\tgit commit --amend --reset-author\n"
 
-#: sequencer.c:1273
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "yeni yapılan işleme aranamadı"
 
-#: sequencer.c:1275
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr "yeni yapılan işleme ayrıştırılamadı"
 
-#: sequencer.c:1321
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr "HEAD, işleme yapıldıktan sonra çözülemiyor"
 
-#: sequencer.c:1323
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "ayrık HEAD"
 
-#: sequencer.c:1327
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (kök işleme)"
 
-#: sequencer.c:1348
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "HEAD ayrıştırılamadı"
 
-#: sequencer.c:1350
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s bir iÅŸleme deÄŸil"
 
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
+#: 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:1410 sequencer.c:2295
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "işleme yazarı ayrıştırılamıyor"
 
-#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
+#: 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:1454 sequencer.c:1574
+#: 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:1485 sequencer.c:1517
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "geçersiz yazar kimliği '%s'"
 
-#: sequencer.c:1491
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "hasar görmüş yazar: tarih bilgisi eksik"
 
-#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
-#: builtin/merge.c:934 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:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#: 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:1606
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "%s işlemesi ayrıştırılamadı"
 
-#: sequencer.c:1611
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "üst işleme %s ayrıştırılamadı"
 
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "bilinmeyen komut: %d"
 
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "Birinci iÅŸleme iletisi bu:"
 
-#: sequencer.c:1737
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Ä°ÅŸleme iletisi #%d bu:"
 
-#: sequencer.c:1738
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "Birinci iÅŸlemenin iletisi atlanacak:"
 
-#: sequencer.c:1739
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Ä°ÅŸleme iletisi #%d atlanacak:"
 
-#: sequencer.c:1740
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Bu %d iÅŸlemenin bir birleÅŸimi."
 
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "'%s' yazılamıyor"
 
-#: sequencer.c:1934
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "düzeltmek için bir HEAD gerekiyor"
 
-#: sequencer.c:1936 sequencer.c:3581
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "HEAD okunamadı"
 
-#: sequencer.c:1938
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr "HEAD'in işleme iletisi okunamadı"
 
-#: sequencer.c:1962
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "%s işleme iletisi okunamadı"
 
-#: sequencer.c:2072
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "indeks dosyanız birleştirilmemiş"
 
-#: sequencer.c:2079
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "kök işleme düzeltilemiyor"
 
-#: sequencer.c:2098
+#: 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:2106 sequencer.c:2114
+#: 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:2120
+#: 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:2139
+#: 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:2205
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "'%s', '%s' olarak yeniden adlandırılamadı"
 
-#: sequencer.c:2265
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "%s geri alınamadı... %s"
 
-#: sequencer.c:2266
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "%s uygulanamadı... %s"
 
-#: sequencer.c:2287
+#: 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:2345
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: indeks okunamadı"
 
-#: sequencer.c:2352
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: indeks yenilenemedi"
 
-#: sequencer.c:2425
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s argüman kabul etmiyor: '%s'"
 
-#: sequencer.c:2434
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "%s için eksik argüman"
 
-#: sequencer.c:2477
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "'%s' ayrıştırılamadı"
 
-#: sequencer.c:2538
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "geçersiz satır %d: %.*s"
 
-#: sequencer.c:2549
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "öncesinde bir işleme olmadan '%s' yapılamıyor"
 
-#: sequencer.c:2635
+#: sequencer.c:2624 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "'%s' okunamadı."
+
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "sürmekte olan bir seç-al iptal ediliyor"
 
-#: sequencer.c:2644
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "sürmekte olan bir geri al iptal ediliyor"
 
-#: sequencer.c:2690
+#: 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:2692
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "kullanılabilir olmayan yönerge tablosu: '%s'"
 
-#: sequencer.c:2697
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "Hiçbir işleme ayrıştırılmadı."
 
-#: sequencer.c:2708
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "bir geri al sırasında seç-al yapılamıyor"
 
-#: sequencer.c:2710
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "bir seç-al sırasında geri al yapılamıyor"
 
-#: sequencer.c:2788
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "%s için geçersiz değer: %s"
 
-#: sequencer.c:2897
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "kullanılabilir olmayan squash-onto"
 
-#: sequencer.c:2917
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "hatalı oluşturulmuş seçenekler tablosu: '%s'"
 
-#: sequencer.c:3012 sequencer.c:4869
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "boş işleme seti aktarıldı"
 
-#: sequencer.c:3029
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "geri al halihazırda sürüyor"
 
-#: sequencer.c:3031
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "\"git revert (--continue | %s--abort | --quit)\" deneyin"
 
-#: sequencer.c:3034
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "seç-al halihazırda sürüyor"
 
-#: sequencer.c:3036
+#: 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:3050
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "ardıştırıcı dizini '%s' oluşturulamadı"
 
-#: sequencer.c:3065
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "HEAD kilitlenemedi"
 
-#: sequencer.c:3125 sequencer.c:4582
+#: 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:3127 sequencer.c:3138
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "HEAD çözülemiyor"
 
-#: sequencer.c:3129 sequencer.c:3173
+#: 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:3159 builtin/grep.c:759
+#: 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:3161
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "'%s' okunamıyor: %s"
 
-#: sequencer.c:3162
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "beklenmedik dosya sonu"
 
-#: sequencer.c:3168
+#: 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:3179
+#: 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:3220
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "süren bir geri al yok"
 
-#: sequencer.c:3229
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "süren bir seç-al yok"
 
-#: sequencer.c:3239
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "işleme atlanamadı"
 
-#: sequencer.c:3246
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "atlanacak bir ÅŸey yok"
 
-#: sequencer.c:3249
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8050,16 +8247,16 @@ msgstr ""
 "İşlemeyi yaptınız mı?\n"
 "\"git %s --continue\" deneyin.\""
 
-#: sequencer.c:3411 sequencer.c:4473
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "HEAD okunamıyor"
 
-#: sequencer.c:3428
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "'%s', '%s' konumuna kopyalanamıyor"
 
-#: sequencer.c:3436
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8078,27 +8275,27 @@ msgstr ""
 "\n"
 "\tgit rebase --continue\n"
 
-#: sequencer.c:3446
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "%s uygulanamıyor... %.*s"
 
-#: sequencer.c:3453
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "%.*s birleÅŸtirilemedi"
 
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: 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:3483
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "Çalıştırılıyor: %s\n"
 
-#: sequencer.c:3498
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8113,11 +8310,11 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:3504
+#: 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:3510
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8134,90 +8331,90 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:3571
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "izin verilmeyen etiket adı: '%.*s'"
 
-#: sequencer.c:3625
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "sahte kök işlemesi yazılıyor"
 
-#: sequencer.c:3630
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "squash-onto yazılıyor"
 
-#: sequencer.c:3714
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "'%s' çözülemedi"
 
-#: sequencer.c:3747
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "güncel bir revizyon olmadan birleştirilemiyor"
 
-#: sequencer.c:3769
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "'%.*s' ayrıştırılamıyor"
 
-#: sequencer.c:3778
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "birleÅŸtirilecek bir ÅŸey yok: '%.*s'"
 
-#: sequencer.c:3790
+#: 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:3806
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "'%s' işlemesinin işleme iletisi alınamadı"
 
-#: sequencer.c:3989
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "şunu birleştirme girişiminde bulunulamadı bile: '%.*s'"
 
-#: sequencer.c:4005
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "merge: Yeni indeks dosyası yazılamıyor"
 
-#: sequencer.c:4079
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr "Kendiliğinden zulalanamıyor"
 
-#: sequencer.c:4082
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Beklenmedik zula yanıtı: '%s'"
 
-#: sequencer.c:4088
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "'%s' için dizin oluşturulamadı"
 
-#: sequencer.c:4091
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Zula kendiliÄŸinden oluÅŸturuldu: %s\n"
 
-#: sequencer.c:4095
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "'reset --hard' yapılamadı"
 
-#: sequencer.c:4120
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Kendiliğinden zulalama uygulandı.\n"
 
-#: sequencer.c:4132
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "%s depolanamıyor"
 
-#: sequencer.c:4135
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8228,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:4140
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "Kendiliğinden zulalama çakışmalara neden oldu."
 
-#: sequencer.c:4141
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr "KendiliÄŸinden zulalama mevcut; yeni bir zula girdisi oluÅŸturuluyor."
 
-#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "HEAD ayrılamadı"
 
-#: sequencer.c:4249
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "HEAD'de duruldu\n"
 
-#: sequencer.c:4251
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "%s konumunda duruldu\n"
 
-#: sequencer.c:4259
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8271,58 +8468,58 @@ msgstr ""
 "\tgit rebase --edit-todo\n"
 "\tgit rebase --continue\n"
 
-#: sequencer.c:4305
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "Yeniden temellendiriliyor: (%d/%d)%s"
 
-#: sequencer.c:4351
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "%s konumunda durdu... %.*s\n"
 
-#: sequencer.c:4422
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "bilinmeyen komut %d"
 
-#: sequencer.c:4481
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "orig-head okunamadı"
 
-#: sequencer.c:4486
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "'onto' okunamadı"
 
-#: sequencer.c:4500
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "HEAD şu konuma güncellenemedi: %s"
 
-#: sequencer.c:4560
+#: 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:4612
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
 msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var."
 
-#: sequencer.c:4621
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "var olmayan iÅŸleme deÄŸiÅŸtirilemiyor"
 
-#: sequencer.c:4623
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "geçersiz dosya: '%s'"
 
-#: sequencer.c:4625
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "geçersiz içerik: '%s'"
 
-#: sequencer.c:4628
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8332,59 +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:4664 sequencer.c:4703
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "dosya yazılamadı: '%s'"
 
-#: sequencer.c:4719
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "CHERRY_PICK_HEAD kaldırılamadı"
 
-#: sequencer.c:4726
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "Hazırlanmış değişiklikler işlenemedi."
 
-#: sequencer.c:4846
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: Bir %s seçip alınamıyor"
 
-#: sequencer.c:4850
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s hatalı revizyon"
 
-#: sequencer.c:4885
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "ilk işleme geri alınamaz"
 
-#: sequencer.c:5362
+#: sequencer.c:5189 sequencer.c:5418
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "daha önce uygulanan %s işlemesi atlandı"
+
+#: 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:5405
 msgid "make_script: unhandled options"
 msgstr "make_script: ele alınmayan seçenekler"
 
-#: sequencer.c:5365
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script: revizyonlar hazırlanırken hata"
 
-#: sequencer.c:5615 sequencer.c:5632
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "yapılacak bir şey yok"
 
-#: sequencer.c:5651
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "gerekli olmayan seçim komutları atlanamadı"
 
-#: sequencer.c:5751
+#: 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"
@@ -8393,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"
@@ -8405,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"
@@ -8421,96 +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
+#: 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:661
+#: 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:669
-msgid "unknown repository extensions found:"
-msgstr "bilinmeyen depo geniÅŸletmeleri bulundu:"
+#: 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:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "depo sürümü 0; ancak v1'e özel genişletmeler bulundu:"
+#: 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:700
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "'%s' açılırken hata"
 
-#: setup.c:702
+#: 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:704
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "%s okunurken hata"
 
-#: setup.c:706
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "geçersiz gitfile biçimi: %s"
 
-#: setup.c:708
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "gitfile içinde yol yok: %s"
 
-#: setup.c:710
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "bir git deposu deÄŸil: %s"
 
-#: setup.c:812
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' çok büyük"
 
-#: setup.c:826
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "bir git deposu deÄŸil: '%s'"
 
-#: setup.c:855 setup.c:857 setup.c:888
+#: 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:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: 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:987
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "'%*s%s%s' bilgileri alınamadı"
 
-#: setup.c:1225
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "Şu anki çalışma dizini okunamıyor"
 
-#: setup.c:1234 setup.c:1240
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "ÅŸuraya deÄŸiÅŸtirilemiyor: '%s'"
 
-#: setup.c:1245
+#: 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:1251
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8520,7 +8730,7 @@ msgstr ""
 "Dosya sistemi sınırında duruluyor (GIT_DISCOVERY_ACROSS_FILESYSTEM "
 "ayarlanmamış)."
 
-#: setup.c:1370
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8529,27 +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:1417
-msgid "open /dev/null or dup failed"
-msgstr "/dev/null açılması veya açıklayıcı çoğaltılması başarısız"
-
-#: setup.c:1432
+#: setup.c:1508
 msgid "fork failed"
 msgstr "çatallama başarısız"
 
-#: setup.c:1437 t/helper/test-simple-ipc.c:285
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "setsid başarısız"
 
-#: sparse-index.c:151
-msgid "attempting to use sparse-index without cone mode"
-msgstr "koni kipi olmadan sparse-index kullanılmaya çalışılıyor"
-
-#: sparse-index.c:156
-msgid "unable to update cache-tree, staying full"
-msgstr "önbellek ağacı güncellenemiyor, dolu kalınıyor"
-
-#: sparse-index.c:239
+#: 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)"
@@ -8606,13 +8804,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] "%u bayt/sn"
 msgstr[1] "%u bayt/sn"
 
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
-#: builtin/rebase.c:866
+#: 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:1177
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "'%s' düzenlenemedi"
@@ -8637,7 +8835,7 @@ msgstr ""
 msgid "invalid value for %s"
 msgstr "%s için geçersiz değer"
 
-#: submodule-config.c:766
+#: submodule-config.c:767
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr ".gitmodules girdisi %s güncellenemedi"
@@ -8662,22 +8860,22 @@ msgstr "%s için .gitmodules girdisi kaldırılamadı"
 msgid "staging updated .gitmodules failed"
 msgstr "güncellenmiş .gitmodules'u hazırlama başarısız oldu"
 
-#: submodule.c:328
+#: submodule.c:358
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "içi doldurulmamış '%s' altmodülünde"
 
-#: submodule.c:359
+#: submodule.c:389
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Yol belirteci '%s' '%.*s' altmodülünde"
 
-#: submodule.c:436
+#: submodule.c:466
 #, c-format
 msgid "bad --ignore-submodules argument: %s"
 msgstr "hatalı --ignore-submodules argümanı: %s"
 
-#: submodule.c:818
+#: submodule.c:844
 #, c-format
 msgid ""
 "Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8686,12 +8884,12 @@ msgstr ""
 "%s işlemesinde '%s' yolunda bulunan altmodül, aynı adlı bir altmodülle "
 "çarpışıyor. Atlanıyor."
 
-#: submodule.c:921
+#: submodule.c:954
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "altmodül girdisi '%s' (%s) bir %s, işleme değil"
 
-#: submodule.c:1006
+#: submodule.c:1042
 #, c-format
 msgid ""
 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8700,36 +8898,36 @@ msgstr ""
 "'%s' altmodülünde 'git rev-list <commits> --not --remotes -n 1' "
 "çalıştırılamadı"
 
-#: submodule.c:1129
+#: submodule.c:1165
 #, c-format
 msgid "process for submodule '%s' failed"
 msgstr "'%s' altmodülü için işlem başarısız oldu"
 
-#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
+#: 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."
 
-#: submodule.c:1169
+#: submodule.c:1205
 #, c-format
 msgid "Pushing submodule '%s'\n"
 msgstr "'%s' altmodülü itiliyor\n"
 
-#: submodule.c:1172
+#: submodule.c:1208
 #, c-format
 msgid "Unable to push submodule '%s'\n"
 msgstr "'%s' altmodülü itilemiyor\n"
 
-#: submodule.c:1464
+#: submodule.c:1491
 #, c-format
 msgid "Fetching submodule %s%s\n"
 msgstr "%s%s altmodülü getiriliyor\n"
 
-#: submodule.c:1498
+#: submodule.c:1525
 #, c-format
 msgid "Could not access submodule '%s'\n"
 msgstr "'%s' altmodülüne erişilemedi\n"
 
-#: submodule.c:1653
+#: submodule.c:1680
 #, c-format
 msgid ""
 "Errors during submodule fetch:\n"
@@ -8738,78 +8936,78 @@ msgstr ""
 "Altmodül getirilirken hata:\n"
 "%s"
 
-#: submodule.c:1678
+#: submodule.c:1705
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' bir git deposu olarak tanımlanamadı"
 
-#: submodule.c:1695
+#: submodule.c:1722
 #, c-format
 msgid "Could not run 'git status --porcelain=2' in submodule %s"
 msgstr "'%s' altmodülü içinde 'git status --porcelain=2' çalıştırılamadı"
 
-#: submodule.c:1736
+#: submodule.c:1763
 #, c-format
 msgid "'git status --porcelain=2' failed in submodule %s"
 msgstr "'%s' altmodülü içinde 'git status --porcelain=2' başarısız oldu"
 
-#: submodule.c:1811
+#: submodule.c:1838
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "'%s' altmodülü içinde 'git status' başlatılamadı"
 
-#: submodule.c:1824
+#: submodule.c:1851
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "'%s' altmodülü içinde 'git status' çalıştırılamadı"
 
-#: submodule.c:1839
+#: submodule.c:1868
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "'%s' altmodülü içinde core.worktree ayarı kapatılamadı"
 
-#: submodule.c:1866 submodule.c:2176
+#: submodule.c:1895 submodule.c:2210
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "'%s' altmodülüne özyinelenemedi"
 
-#: submodule.c:1887
+#: submodule.c:1917
 msgid "could not reset submodule index"
 msgstr "altmodül indeksi sıfırlanamadı"
 
-#: submodule.c:1929
+#: submodule.c:1959
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "'%s' altmodülü indeksi kirli"
 
-#: submodule.c:1981
+#: submodule.c:2013
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "'%s' altmodülü güncellenemedi."
 
-#: submodule.c:2049
+#: submodule.c:2081
 #, c-format
 msgid "submodule git dir '%s' is inside git dir '%.*s'"
 msgstr "altmodül git dizini '%s', '%.*s' git dizini içinde"
 
-#: submodule.c:2070
+#: submodule.c:2102
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr ""
 "relocate_gitdir birden çok çalışma ağaçlı '%s' altmodülü için desteklenmiyor"
 
-#: submodule.c:2082 submodule.c:2141
+#: submodule.c:2114 submodule.c:2174
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "'%s' altmodülü adı aranamadı"
 
-#: submodule.c:2086
+#: submodule.c:2118
 #, c-format
 msgid "refusing to move '%s' into an existing git dir"
 msgstr "'%s' ögesini mevcut bir git dizinine taşıma reddediliyor"
 
-#: submodule.c:2093
+#: submodule.c:2124
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -8820,11 +9018,11 @@ msgstr ""
 "ÅŸuradan: '%s'\n"
 "ÅŸuraya: '%s'\n"
 
-#: submodule.c:2221
+#: submodule.c:2255
 msgid "could not start ls-files in .."
 msgstr "ls-files şurada başlatılamadı .."
 
-#: submodule.c:2261
+#: submodule.c:2295
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree beklenmedik bir biçimde %d kodu ile çıktı"
@@ -8846,7 +9044,7 @@ msgid "unknown value '%s' for key '%s'"
 msgstr "bilinmeyen değer '%s' ('%s' anahtarı için)"
 
 #: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
 #, c-format
 msgid "more than one %s"
 msgstr "birden çok %s"
@@ -8861,11 +9059,11 @@ msgstr "'%.*s' artbilgisi içinde boş artbilgi jetonu"
 msgid "could not read input file '%s'"
 msgstr "'%s' girdi dosyası okunamadı"
 
-#: trailer.c:766 builtin/mktag.c:88
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
 msgid "could not read from stdin"
 msgstr "stdin'den okunamadı"
 
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
 #, c-format
 msgid "could not stat %s"
 msgstr "%s dosya bilgileri alınamadı"
@@ -8933,7 +9131,7 @@ msgstr "fast-import çalıştırılamadı"
 msgid "error while running fast-import"
 msgstr "fast-import çalıştırılırken hata"
 
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
 #, c-format
 msgid "could not read ref %s"
 msgstr "%s başvurusu okunamadı"
@@ -8951,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:1471
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "işlem protokol tarafından desteklenmiyor"
 
@@ -8960,7 +9158,7 @@ msgstr "işlem protokol tarafından desteklenmiyor"
 msgid "can't connect to subservice %s"
 msgstr "%s altservisine bağlanılamıyor"
 
-#: transport-helper.c:693 transport.c:397
+#: transport-helper.c:693 transport.c:404
 msgid "--negotiate-only requires protocol v2"
 msgstr "--negotiate-only protokolün ikinci sürümünü gerektiriyor"
 
@@ -8973,59 +9171,59 @@ msgstr "eÅŸleÅŸen bir 'tamam/hata' direktifi olmadan 'option'"
 msgid "expected ok/error, helper said '%s'"
 msgstr "tamam/hata bekleniyordu, yardımcı şunu söyledi: '%s'"
 
-#: transport-helper.c:855
+#: transport-helper.c:859
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "yardımcı %s beklenmedik durumu bildirdi"
 
-#: transport-helper.c:938
+#: transport-helper.c:942
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "%s yardımcısı 'dry-run' desteklemiyor"
 
-#: transport-helper.c:941
+#: transport-helper.c:945
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "%s yardımcısı --signed desteklemiyor"
 
-#: transport-helper.c:944
+#: transport-helper.c:948
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "%s yardımcısı --signed=if-asked desteklemiyor"
 
-#: transport-helper.c:949
+#: transport-helper.c:953
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "%s yardımcısı --atomic desteklemiyor"
 
-#: transport-helper.c:953
+#: transport-helper.c:957
 #, c-format
 msgid "helper %s does not support --%s"
 msgstr "%s yardımcısı --%s desteklemiyor"
 
-#: transport-helper.c:960
+#: transport-helper.c:964
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "%s yardımcısı 'push-option' desteklemiyor"
 
-#: transport-helper.c:1060
+#: transport-helper.c:1064
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "remote-helper itme desteklemiyor; baÅŸvuru belirteci gerekli"
 
-#: transport-helper.c:1065
+#: transport-helper.c:1069
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "%s yardımcısı 'force' desteklemiyor"
 
-#: transport-helper.c:1112
+#: transport-helper.c:1116
 msgid "couldn't run fast-export"
 msgstr "fast-export çalıştırılamadı"
 
-#: transport-helper.c:1117
+#: transport-helper.c:1121
 msgid "error while running fast-export"
 msgstr "fast-export çalıştırılırken hata"
 
-#: transport-helper.c:1142
+#: transport-helper.c:1146
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -9034,52 +9232,52 @@ msgstr ""
 "Ortak başvuru yok ve hiç belirtilmemiş; bir şey yapılmayacak.\n"
 "Belki de bir dal belirtmelisiniz.\n"
 
-#: transport-helper.c:1224
+#: transport-helper.c:1228
 #, c-format
 msgid "unsupported object format '%s'"
 msgstr "desteklenmeyen nesne biçimi '%s'"
 
-#: transport-helper.c:1233
+#: transport-helper.c:1237
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "başvuru listesinde hatalı oluşturulmuş yanıt: %s"
 
-#: transport-helper.c:1385
+#: transport-helper.c:1389
 #, c-format
 msgid "read(%s) failed"
 msgstr "read(%s) başarısız oldu"
 
-#: transport-helper.c:1412
+#: transport-helper.c:1416
 #, c-format
 msgid "write(%s) failed"
 msgstr "write(%s) başarısız oldu"
 
-#: transport-helper.c:1461
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed"
 msgstr "%s iş parçacığı başarısız oldu"
 
-#: transport-helper.c:1465
+#: transport-helper.c:1469
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "%s iş parçacığı eklenemedi: %s"
 
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "veri kopyalama için iş parçacığı başlatılamıyor: %s"
 
-#: transport-helper.c:1525
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed to wait"
 msgstr "%s iÅŸlemi bekleyemedi"
 
-#: transport-helper.c:1529
+#: transport-helper.c:1533
 #, c-format
 msgid "%s process failed"
 msgstr "%s işlemi başarısız oldu"
 
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
 msgid "can't start thread for copying data"
 msgstr "veri kopyalama için iş parçacığı başlatılamıyor"
 
@@ -9093,46 +9291,46 @@ msgstr "'%s' üst kaynağı '%s' (kaynak: '%s') olarak ayarlanacak\n"
 msgid "could not read bundle '%s'"
 msgstr "'%s' demeti okunamadı"
 
-#: transport.c:220
+#: transport.c:227
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transport: Geçersiz derinlik seçeneği '%s'"
 
-#: transport.c:272
+#: transport.c:279
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "ayrıntılar için 'git help config' içinde protocol.version'a bakın"
 
-#: transport.c:273
+#: transport.c:280
 msgid "server options require protocol version 2 or later"
 msgstr "sunucu seçenekleri protokol sürüm 2 veya sonrasını gerektirir"
 
-#: transport.c:400
+#: transport.c:407
 msgid "server does not support wait-for-done"
 msgstr "Sunucu, wait-for-done desteklemiyor"
 
-#: transport.c:751
+#: transport.c:759
 msgid "could not parse transport.color.* config"
 msgstr "transport.color.* yapılandırması ayrıştırılamadı"
 
-#: transport.c:826
+#: transport.c:834
 msgid "support for protocol v2 not implemented yet"
 msgstr "protokol v2 desteği henüz yerine getirilmedi"
 
-#: transport.c:960
+#: transport.c:967
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "'%s' yapılandırması için bilinmeyen değer: %s"
 
-#: transport.c:1026
+#: transport.c:1033
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "'%s' taşıyıcısına izin verilmiyor"
 
-#: transport.c:1079
+#: transport.c:1082
 msgid "git-over-rsync is no longer supported"
 msgstr "git-over-rsync artık desteklenmiyor"
 
-#: transport.c:1181
+#: transport.c:1185
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -9141,7 +9339,7 @@ msgstr ""
 "Aşağıdaki altmodül yolları başka hiçbir uzak konumda bulunamayan\n"
 "değişiklikler içeriyor:\n"
 
-#: transport.c:1185
+#: transport.c:1189
 #, c-format
 msgid ""
 "\n"
@@ -9168,11 +9366,11 @@ msgstr ""
 "kullanın.\n"
 "\n"
 
-#: transport.c:1193
+#: transport.c:1197
 msgid "Aborting."
-msgstr "Ä°ptal ediliyor"
+msgstr "Ä°ptal ediliyor."
 
-#: transport.c:1340
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr "gereken tüm altmodüller itilemedi"
 
@@ -9192,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"
@@ -9201,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"
@@ -9210,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"
@@ -9220,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"
@@ -9230,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"
@@ -9239,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"
@@ -9248,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"
@@ -9257,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"
@@ -9266,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"
@@ -9275,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"
@@ -9284,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"
@@ -9293,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"
@@ -9302,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"
@@ -9311,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 "
@@ -9322,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 "
@@ -9333,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"
@@ -9343,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"
@@ -9353,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"
@@ -9362,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"
@@ -9371,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"
@@ -9385,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 "
@@ -9395,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"
@@ -9404,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 "
@@ -9415,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 "
@@ -9429,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"
@@ -9443,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:1519
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "İndeks bayrakları güncelleniyor"
 
-#: unpack-trees.c:2608
+#: 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:1548
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "getir argümanlarından sonra floş bekleniyordu"
 
@@ -9489,113 +9696,123 @@ msgstr "geçersiz '..' yol kesimi"
 msgid "Fetching objects"
 msgstr "Nesneler getiriliyor"
 
-#: worktree.c:238 builtin/am.c:2151
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr "'%s' okunamadı"
 
-#: worktree.c:304
+#: 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:315
+#: 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:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' mevcut deÄŸil"
 
-#: worktree.c:333
+#: 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:342
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' ÅŸuna geri iÅŸaret etmiyor: '%s'"
 
-#: worktree.c:608
+#: worktree.c:604
 msgid "not a directory"
 msgstr "bir dizin deÄŸil"
 
-#: worktree.c:617
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git bir dosya deÄŸil"
 
-#: worktree.c:619
+#: worktree.c:615
 msgid ".git file broken"
 msgstr ".git dosyası bozuk"
 
-#: worktree.c:621
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr ".git dosyası doğru değil"
 
-#: worktree.c:727
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "geçerli bir yol değil"
 
-#: worktree.c:733
+#: 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:737
+#: 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:741
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "depo konumu bulunamıyor: .git dosyası bozuk"
 
-#: worktree.c:747
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "okunamayan gitdir"
 
-#: worktree.c:751
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "doÄŸru olmayan gitdir"
 
-#: worktree.c:776
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "geçerli bir dizin değil"
 
-#: worktree.c:782
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "gitdir dosyası mevcut değil"
 
-#: worktree.c:787 worktree.c:796
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "gitdir dosyası (%s) okunamıyor"
 
-#: worktree.c:806
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "az okundu (%<PRIuMAX> bayt bekleniyordu, %<PRIuMAX> okundu)"
 
-#: worktree.c:814
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "geçersiz gitdir dosyası"
 
-#: worktree.c:822
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "gitdir dosyası var olmayan bir konuma işaret ediyor"
 
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "setenv '%s' yapılamadı"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "'%s' oluşturulamıyor"
+
+#: wrapper.c:205 wrapper.c:375
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "'%s' okuma ve yazma için açılamadı"
 
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
 #, c-format
 msgid "unable to access '%s'"
 msgstr "'%s' eriÅŸilemiyor"
 
-#: wrapper.c:607
+#: wrapper.c:615
 msgid "unable to get current working directory"
 msgstr "geçerli çalışma dizini alınamıyor"
 
@@ -9633,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:1075
+#: 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:1084
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "İşleme için hazırlanmamış değişiklikler:"
 
@@ -9719,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:"
@@ -9737,22 +9954,22 @@ msgstr "değiştirilen içerik, "
 msgid "untracked content, "
 msgstr "izlenmeyen içerik, "
 
-#: wt-status.c:908
+#: 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:939
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "Değiştirilen; ancak güncellenmeyen altmodüller:"
 
-#: wt-status.c:941
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "İşlenecek altmodül değişiklikleri:"
 
-#: wt-status.c:1023
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -9760,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:1115
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -9771,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:1145
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "Birleştirilmemiş yollarınız var."
 
-#: wt-status.c:1148
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (çakışmaları onar ve \"git commit\" çalıştır)"
 
-#: wt-status.c:1150
+#: 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:1154
+#: 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:1157
+#: 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:1166
+#: 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:1169
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "Mevcut yama boÅŸ."
 
-#: wt-status.c:1173
+#: 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:1175
+#: 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:1177
+#: 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:1310
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo eksik"
 
-#: wt-status.c:1312
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "Yerine getirilen bir komut yok."
 
-#: wt-status.c:1315
+#: 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:1326
+#: 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:1331
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "Kalan komut yok."
 
-#: wt-status.c:1334
+#: 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:1342
+#: 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:1354
+#: 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:1359
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "Şu anda yeniden temellendirme yapmaktasınız."
 
-#: wt-status.c:1372
+#: 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:1374
+#: 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:1376
+#: 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:1383
+#: 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:1387
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9879,154 +10103,158 @@ msgstr ""
 "Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi "
 "parçalara bölüyorsunuz."
 
-#: wt-status.c:1392
+#: 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:1395
+#: 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:1399
+#: 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:1404
+#: 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:1407
+#: 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:1409
+#: 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:1420
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "Seç-al şu anda sürmekte."
 
-#: wt-status.c:1423
+#: 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:1430
+#: 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:1433
+#: 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:1436
+#: 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:1438
+#: 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:1440
+#: 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:1450
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "Geriye al şu anda sürmekte."
 
-#: wt-status.c:1453
+#: 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:1459
+#: 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:1462
+#: 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:1465
+#: 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:1467
+#: 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:1469
+#: 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:1479
+#: 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:1483
+#: 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:1486
+#: 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:1497
+#: wt-status.c:1559
+msgid "You are in a sparse checkout."
+msgstr "Bir aralıklı çıkış içindesiniz."
+
+#: 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:1736
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "Ãœzerinde bulunulan dal: "
 
-#: wt-status.c:1743
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "şunun üzerine etkileşimli yeniden temellendirme sürmekte: "
 
-#: wt-status.c:1745
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "şunun üzerine yeniden temellendirme sürmekte: "
 
-#: wt-status.c:1750
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "HEAD şurada ayrıldı: "
 
-#: wt-status.c:1752
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "HEAD şundan ayrıldı: "
 
-#: wt-status.c:1755
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "Şu anda bir dal üzerinde değil."
 
-#: wt-status.c:1772
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Ä°lk iÅŸleme"
 
-#: wt-status.c:1773
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "Henüz bir işleme yok"
 
-#: wt-status.c:1787
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "Ä°zlenmeyen dosyalar"
 
-#: wt-status.c:1789
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Yok sayılan dosyalar"
 
-#: wt-status.c:1793
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10037,122 +10265,122 @@ 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:1799
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Ä°zlenmeyen dosyalar listelenmiyor%s"
 
-#: wt-status.c:1801
+#: 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:1807
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "DeÄŸiÅŸiklik yok"
 
-#: wt-status.c:1812
+#: 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:1816
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "Ä°ÅŸlemeye eklenen deÄŸiÅŸiklik yok\n"
 
-#: wt-status.c:1820
+#: 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:1824
+#: 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:1828
+#: 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:1832 wt-status.c:1838
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "Ä°ÅŸlenecek bir ÅŸey yok\n"
 
-#: wt-status.c:1835
+#: 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:1840
+#: 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:1945
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "Şurada henüz bir işleme yok: "
 
-#: wt-status.c:1949
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (dal yok)"
 
-#: wt-status.c:1980
+#: wt-status.c:2050
 msgid "different"
 msgstr "deÄŸiÅŸik"
 
-#: wt-status.c:1982 wt-status.c:1990
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "şunun arkasında: "
 
-#: wt-status.c:1985 wt-status.c:1988
+#: 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:2511
+#: 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:2517
+#: 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:2519
+#: 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:178
+#: 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:185
+#: 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:862
+#: 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:874
+#: 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ı"
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "'%s' bağlantısı kesilemedi"
@@ -10161,135 +10389,140 @@ msgstr "'%s' bağlantısı kesilemedi"
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<seçenekler>] [--] <yol-blrtç>..."
 
-#: builtin/add.c:61
+#: builtin/add.c:64
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "%cx '%s' chmod yapılamıyor"
 
-#: builtin/add.c:99
+#: builtin/add.c:106
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "beklenmedik diff durumu %c"
 
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
 msgid "updating files failed"
 msgstr "dosyaları güncelleme başarısız"
 
-#: builtin/add.c:114
+#: builtin/add.c:121
 #, c-format
 msgid "remove '%s'\n"
 msgstr "kaldır: '%s'\n"
 
-#: builtin/add.c:198
+#: builtin/add.c:205
 msgid "Unstaged changes after refreshing the index:"
 msgstr "İndeksi yeniledikten sonra hazırlanmamış değişiklikler:"
 
-#: builtin/add.c:307 builtin/rev-parse.c:991
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "İndeks okunamadı"
 
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "'%s' yazım için açılamadı."
-
-#: builtin/add.c:322
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "Yama yazılamadı"
 
-#: builtin/add.c:325
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "yamayı düzenleme başarısız"
 
-#: builtin/add.c:328
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "'%s' dosya bilgileri alınamadı"
 
-#: builtin/add.c:330
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "BoÅŸ yama. Ä°ptal edildi."
 
-#: builtin/add.c:335
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "'%s' uygulanamadı"
 
-#: builtin/add.c:343
+#: 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:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: 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:366
+#: 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:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: 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:368
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "geçerli diff'i düzenle ve uygula"
 
-#: builtin/add.c:369
+#: 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:370
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "izlenen dosyaları güncelle"
 
-#: builtin/add.c:371
+#: 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:372
+#: 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:373
+#: 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:376
+#: 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:378
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "ekleme, yalnızca indeksi yenile"
 
-#: builtin/add.c:379
+#: 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:380
+#: 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:382 builtin/update-index.c:1006
+#: 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: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:384
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "gömülü bir depo eklenirken uyar"
 
-#: builtin/add.c:386
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "'git stash -p' için arka uç"
 
-#: builtin/add.c:404
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10320,12 +10553,12 @@ msgstr ""
 "\n"
 "Ek bilgi için: \"git help submodule\"."
 
-#: builtin/add.c:432
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "gömülü git deposu ekleniyor: %s"
 
-#: builtin/add.c:451
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10335,53 +10568,27 @@ msgstr ""
 "Bu iletiyi 'git config advice.addIgnoredFile false'\n"
 "kullanarak kapatabilirsiniz."
 
-#: builtin/add.c:460
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "dosya ekleme başarısız"
 
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run, --interactive/--patch ile uyumsuz"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file, --interactive/--patch ile uyumsuz"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file, --edit ile uyumsuz"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A ve -u karşılıklı olarak uyumlu"
-
-#: builtin/add.c:522
-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:526
+#: 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:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file yol belirteci argümanları ile uyumsuz"
-
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
-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:555
+#: 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:557
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10391,111 +10598,119 @@ msgstr ""
 "Bu iletiyi 'git config advice.addEmptyPathspec false'\n"
 "yaparak kapatabilirsiniz."
 
-#: builtin/am.c:364
+#: 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:454
+#: 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:496
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Hatalı oluşturulmuş girdi satırı: '%s'."
 
-#: builtin/am.c:534
+#: 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:560
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "fseek başarısız oldu"
 
-#: builtin/am.c:748
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "'%s' yaması ayrıştırılamadı"
 
-#: builtin/am.c:813
+#: 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:861
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "geçersiz zaman damgası"
 
-#: builtin/am.c:866 builtin/am.c:878
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "geçersiz tarih satırı"
 
-#: builtin/am.c:873
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "geçersiz zaman dilimi ofseti"
 
-#: builtin/am.c:966
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "Yama biçimi algılaması başarısız."
 
-#: builtin/am.c:971 builtin/clone.c:414
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "'%s' dizini oluşturulamadı"
 
-#: builtin/am.c:976
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Yamalar parçalanıp bölünemedi."
 
-#: builtin/am.c:1125
+#: 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:1126
+#: 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:1127
+#: 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:1222
+#: 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:1250
-msgid "Patch is empty."
-msgstr "Yama boÅŸ."
-
-#: builtin/am.c:1315
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "%s işlemesinde yazar satırı eksik"
 
-#: builtin/am.c:1318
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "geçersiz tanımlama satırı: %.*s"
 
-#: builtin/am.c:1537
+#: 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:1539
+#: 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:1558
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10503,24 +10718,24 @@ msgstr ""
 "Yamanızı elle mi düzenlediniz?\n"
 "Kendi indeksinde kaydı yazılan ikili nesnelere uygulanamıyor."
 
-#: builtin/am.c:1564
+#: 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:1590
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "DeÄŸiÅŸiklikler birleÅŸtirilemedi."
 
-#: builtin/am.c:1622
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "boş bir geçmişe uygulanıyor"
 
-#: builtin/am.c:1674 builtin/am.c:1678
+#: 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:1696
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "İşleme gövdesi:"
 
@@ -10528,41 +10743,59 @@ msgstr "İşleme gövdesi:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1706
+#: 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:1752 builtin/commit.c:408
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "indeks dosyası yazılamıyor"
 
-#: builtin/am.c:1756
+#: 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:1796 builtin/am.c:1864
+#: 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:1813
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "Değişiklik yok -- Yama halihazırda uygulandı."
 
-#: builtin/am.c:1819
+#: 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:1823
+#: 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:1867
+#: 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"
@@ -10572,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:1874
+#: 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 "
@@ -10585,17 +10818,17 @@ msgstr ""
 "Bir dosyanın \"onlar sildi\" olduğunu kabul etmek için dosya ile 'git rm' "
 "yapabilirsiniz."
 
-#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
-#: builtin/reset.c:355
+#: 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:2033
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "indeks temizlenemedi"
 
-#: builtin/am.c:2077
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10603,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:2184
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Geçersiz --patch-format değeri: %s"
 
-#: builtin/am.c:2226
+#: 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:2230
+#: 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:2261
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<seçenekler>] [(<mbox> | <posta-dizin>)...]"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<seçenekler>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2268
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "etkileşimli olarak çalıştır"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "tarihi seçenek -- no-op"
 
-#: builtin/am.c:2272
+#: 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:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:948
+#: 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:2275
+#: 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:2278
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "utf8 olarak yeniden kodla (öntanımlı)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "'git-mailinfo'ya -k bayrağını geçir"
 
-#: builtin/am.c:2282
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "'git-mailinfo'ya -b bayrağını geçir"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "'git-mailinfo'ya -m bayrağını geçir"
 
-#: builtin/am.c:2286
+#: 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:2289
+#: 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:2292
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "bir kesim çizgisinden önceki her şeyi çıkar"
 
-#: builtin/am.c:2294
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "git-mailinfo içerisinden geçir"
 
-#: builtin/am.c:2297 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:2324
+#: 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:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
+#: 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:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: 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:2321
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "yama biçimi"
 
-#: builtin/am.c:2327
+#: 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:2329
+#: 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:2332
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "--continue eşanlamlıları"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "geçerli yamayı atla"
 
-#: builtin/am.c:2338
+#: 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:2341
+#: 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:2345
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "uygulanmakta olan yamayı göster"
 
-#: builtin/am.c:2350
+#: 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:2352
+#: 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:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: 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:2355 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "GPG imzalı işlemeler"
 
-#: builtin/am.c:2358
+#: 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:2376
+#: 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."
@@ -10764,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:2383
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr "indeks okunamadı"
 
-#: builtin/am.c:2398
+#: 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:2422
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -10783,11 +11024,11 @@ msgstr ""
 "Başıboş %s dizini bulundu.\n"
 "Kaldırmak için \"git am --abort\" kullanın."
 
-#: builtin/am.c:2428
+#: 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:2438
+#: 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"
 
@@ -10795,45 +11036,35 @@ msgstr "etkileşimli kip yamanın komut satırında olmasını gerektirir"
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<seçenekler>] [<yama>...]"
 
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "arşiv dosyası '%s' oluşturulamadı"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "çıktı yeniden yönlendirilemedi"
 
-#: builtin/archive.c:37
+#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive: URL'si olmayan uzak konum"
 
-#: builtin/archive.c:61
+#: builtin/archive.c:59
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive: ACK/NAK bekleniyordu, floş paketi alındı"
 
-#: builtin/archive.c:64
+#: builtin/archive.c:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive NACK %s"
 
-#: builtin/archive.c:65
+#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive: Protokol hatası"
 
-#: builtin/archive.c:69
+#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive: FloÅŸ bekleniyordu"
 
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<iÅŸleme>]"
 
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr ""
-"git bisect--helper --bisect-next-check <iyi_terim> <kötü_terim> [<terim>]"
-
 #: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10872,73 +11103,86 @@ msgstr "git bisect--helper --bisect-replay <dosyaadı>"
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<rev>|<erim>)...]"
 
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <komut>..."
+
+#: builtin/bisect--helper.c:109
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr "'%s' dosyası '%s' kipinde açılamıyor"
 
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "'%s' dosyasına yazılamadı"
 
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "'%s' dosyası okuma için açılamıyor"
+
+#: builtin/bisect--helper.c:170
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' geçerli bir terim değil"
 
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "'%s yerleşik komutu bir terim olarak kullanılamıyor"
 
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "'%s' teriminin anlamı değiştirilemiyor"
 
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
 msgid "please use two different terms"
 msgstr "lütfen iki değişik terim kullanın"
 
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "İkili arama yapılmıyor.\n"
 
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "'%s' geçerli bir işleme değil"
 
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr ""
 "Orijinal HEAD '%s' çıkışı yapılamadı. 'git bisect reset <işleme>' deneyin."
 
-#: builtin/bisect--helper.c:254
+#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Hatalı bisect_write argümanı: %s"
 
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "'%s' revizyonunun oid'si alınamadı"
 
-#: builtin/bisect--helper.c:271
+#: builtin/bisect--helper.c:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "'%s' dosyası açılamadı"
 
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:314
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "Geçersiz komut: Şu anda bir %s/%s ikili aramasındasınız"
 
-#: builtin/bisect--helper.c:324
+#: builtin/bisect--helper.c:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -10947,7 +11191,7 @@ msgstr ""
 "Bana en azından bir %s ve %s revizyonu vermeniz gerekiyor.\n"
 "Bunun için \"git bisect %s\" ve \"git bisect %s\" kullanabilirsiniz."
 
-#: builtin/bisect--helper.c:328
+#: builtin/bisect--helper.c:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -10958,7 +11202,7 @@ msgstr ""
 "Bundan sonra bana en azından bir %s ve %s revizyonu vermeniz gerekiyor.\n"
 "Bunun için \"git bisect %s\" ve \"git bisect %s\" kullanabilirsiniz."
 
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "yalnızca bir %s işlemesi ile ikili arama yapılıyor"
@@ -10967,15 +11211,15 @@ msgstr "yalnızca bir %s işlemesi ile ikili arama yapılıyor"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "Emin misiniz [Y/n]? "
 
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
 msgid "no terms defined"
 msgstr "hiçbir terim tanımlanmadı"
 
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -10984,7 +11228,7 @@ msgstr ""
 "Mevcut terimleriniz eski durum için %s ve\n"
 "yeni durum için %s.\n"
 
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -10993,52 +11237,52 @@ msgstr ""
 "'git bisect terms' için geçersiz argüman %s.\n"
 "Desteklenen seçenekler: --term-good|--term-old ve --term-bad|--term-new."
 
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
 msgstr "revizyonda gezinme ayarlaması başarısız oldu\n"
 
-#: builtin/bisect--helper.c:519
+#: builtin/bisect--helper.c:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "'%s' iliştirme için açılamadı"
 
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
 msgstr "'' geçerli bir terim değil"
 
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "tanımlanamayan seçenek: '%s'"
 
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' geçerli bir revizyon değil gibi görünüyor"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "hatalı HEAD - Bana bir HEAD gerek"
 
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr "'%s' çıkış yapımı başarısız. 'git bisect start <geçerli-dal>' deneyin."
 
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "cg-seek yapılmış bir ağaçta ikili arama yapılmayacak"
 
-#: builtin/bisect--helper.c:735
+#: builtin/bisect--helper.c:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "hatalı HEAD - tuhaf sembolik başvuru"
 
-#: builtin/bisect--helper.c:755
+#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "geçersiz başvuru: '%s'"
 
-#: builtin/bisect--helper.c:813
+#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "\"git bisect start\" ile başlamalısınız\n"
 
@@ -11046,104 +11290,151 @@ msgstr "\"git bisect start\" ile başlamalısınız\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "Bunu sizin yerinize benim yapmamı ister misiniz [Y/n]? "
 
-#: builtin/bisect--helper.c:842
+#: builtin/bisect--helper.c:859
 msgid "Please call `--bisect-state` with at least one argument"
-msgstr "Lütfen '--bisec-state'i en az bir argümanla çalıştırın"
+msgstr "Lütfen '--bisect-state'i en az bir argümanla çağırın"
 
-#: builtin/bisect--helper.c:855
+#: builtin/bisect--helper.c:872
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "'git bisect %s' yalnızca bir argüman alabilir."
 
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "Hatalı revizyon girdisi: %s"
 
-#: builtin/bisect--helper.c:887
+#: builtin/bisect--helper.c:904
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "Hatalı revizyon girdisi (bir işleme değil): %s"
 
-#: builtin/bisect--helper.c:919
+#: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
 msgstr "İkili arama yapmıyoruz."
 
-#: builtin/bisect--helper.c:969
+#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "'%s'?? ney ney?"
 
-#: builtin/bisect--helper.c:981
+#: builtin/bisect--helper.c:998
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr "'%s' dosyası yeniden oynatım için okunamıyor"
 
-#: builtin/bisect--helper.c:1054
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "ikili arama başarısız: Komut verilmedi."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "%s çalıştırılıyor\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr ""
+"bisect çalıştırılamadı: çıkış kodu %d, '%s' konumundan, < 0 veya >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "'%s' dosyası yazma için açılamadı"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "ikili arama artık çalışmayı sürdüremiyor"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "ikili arama başarılı"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "ikili arama ilk hatalı işlemeyi buldu"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"ikili arama çalıştırılamadı: 'git bisect--helper --bisect-state %s', %d hata "
+"koduyla çıktı"
+
+#: builtin/bisect--helper.c:1192
 msgid "reset the bisection state"
 msgstr "ikili arama durumunu sıfırla"
 
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1194
 msgid "check whether bad or good terms exist"
 msgstr "iyi veya kötü terimlerin olup olmadığını denetle"
 
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1196
 msgid "print out the bisect terms"
 msgstr "ikili arama terimlerini yazdır"
 
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1198
 msgid "start the bisect session"
 msgstr "ikili arama oturumunu baÅŸlat"
 
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1200
 msgid "find the next bisection commit"
 msgstr "bir sonraki ikili arama iÅŸlemesini bul"
 
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1202
 msgid "mark the state of ref (or refs)"
 msgstr "başvurunun (veya başvuruların) durumunu imle"
 
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1204
 msgid "list the bisection steps so far"
 msgstr "ÅŸu ana kadarki ikili arama durumunu listele"
 
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1206
 msgid "replay the bisection process from the given file"
 msgstr "verilen dosyadan ikili arama iÅŸlemini yeniden oynat"
 
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1208
 msgid "skip some commits for checkout"
 msgstr "çıkış için birkaç işlemeyi atla"
 
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "ikili aramayı görselleştir"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "kendiliğinden ikili aramak için <komut>... kullan"
+
+#: builtin/bisect--helper.c:1214
 msgid "no log for BISECT_WRITE"
 msgstr "BISECT_WRITE için günlük yok"
 
-#: builtin/bisect--helper.c:1087
+#: builtin/bisect--helper.c:1229
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset bir argüman veya işleme gerektirmiyor"
 
-#: builtin/bisect--helper.c:1092
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check 2 veya 3 argüman gerektiriyor"
-
-#: builtin/bisect--helper.c:1098
+#: builtin/bisect--helper.c:1234
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms 0 veya 1 argüman gerektiriyor"
 
-#: builtin/bisect--helper.c:1107
+#: builtin/bisect--helper.c:1243
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next 0 argüman gerektiriyor"
 
-#: builtin/bisect--helper.c:1118
+#: builtin/bisect--helper.c:1254
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log 0 argüman gerektiriyor"
 
-#: builtin/bisect--helper.c:1123
+#: builtin/bisect--helper.c:1259
 msgid "no logfile given"
 msgstr "hiçbir günlük dosyası verilmedi"
 
@@ -11155,150 +11446,152 @@ msgstr "git blame [<seçenekler>] [<rev-sçnk>] [<rev>] [--] <dosya>"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-sçnk>, git-rev-list(1) içinde belgelendirilmiştir"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "bir renk bekleniyor: %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "bir renk ile bitmeli"
 
-#: builtin/blame.c:728
+#: builtin/blame.c:724
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "color.blame.repeatedLines içinde geçersiz renk '%s'"
 
-#: builtin/blame.c:746
+#: builtin/blame.c:742
 msgid "invalid value for blame.coloring"
 msgstr "blame.coloring için geçersiz değer"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:841
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "yok saymak için %s revizyonu bulunamıyor"
 
-#: builtin/blame.c:867
+#: builtin/blame.c:863
 msgid "show blame entries as we find them, incrementally"
 msgstr "genel bakış girdilerini biz buldukça artan biçimde göster"
 
-#: builtin/blame.c:868
+#: builtin/blame.c:864
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr "sınır işlemeleri için nesne adlarını gösterme (Öntanımlı: Kapalı)"
 
-#: builtin/blame.c:869
+#: builtin/blame.c:865
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "kök işlemelerini sınır olarak değerlendirme (Öntanımlı: Kapalı)"
 
-#: builtin/blame.c:870
+#: builtin/blame.c:866
 msgid "show work cost statistics"
 msgstr "iş maliyet istatistiklerini göster"
 
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: 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"
 
-#: builtin/blame.c:872
+#: builtin/blame.c:868
 msgid "show output score for blame entries"
 msgstr "genel bakış girdileri için çıktı skorunu göster"
 
-#: builtin/blame.c:873
+#: builtin/blame.c:869
 msgid "show original filename (Default: auto)"
 msgstr "orijinal dosya adını göster (Öntanımlı: Otomatik)"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:870
 msgid "show original linenumber (Default: off)"
 msgstr "orijinal satır numarasını göster (Öntanımlı: Kapalı)"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:871
 msgid "show in a format designed for machine consumption"
 msgstr "makine işlemesi için tasarlanmış bir biçimde göster"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:872
 msgid "show porcelain format with per-line commit information"
 msgstr "okunabilir biçimde her satır için işleme bilgisi ile göster"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:873
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr "git-annotate ile aynı çıktı kipini kullan (Öntanımlı: Kapalı)"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:874
 msgid "show raw timestamp (Default: off)"
 msgstr "ham zaman damgasını göster (Öntanımlı: Kapalı)"
 
-#: builtin/blame.c:879
+#: builtin/blame.c:875
 msgid "show long commit SHA1 (Default: off)"
 msgstr "uzun işleme SHA1'ini göster (Öntanımlı: Kapalı)"
 
-#: builtin/blame.c:880
+#: builtin/blame.c:876
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "yazar adını ve zaman damgasını gizle (Öntanımlı: Kapalı)"
 
-#: builtin/blame.c:881
+#: builtin/blame.c:877
 msgid "show author email instead of name (Default: off)"
 msgstr "yazar adı yerine e-postasını göster (Öntanımlı: Kapalı)"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:878
 msgid "ignore whitespace differences"
 msgstr "boşluk ayrımlarını yok say"
 
-#: builtin/blame.c:883 builtin/log.c:1820
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "revizyon"
 
-#: builtin/blame.c:883
+#: builtin/blame.c:879
 msgid "ignore <rev> when blaming"
 msgstr "suçlarken <revizyon>'u yok say"
 
-#: builtin/blame.c:884
+#: builtin/blame.c:880
 msgid "ignore revisions from <file>"
 msgstr "<dosya>'dan olan revizyonları yok say"
 
-#: builtin/blame.c:885
+#: builtin/blame.c:881
 msgid "color redundant metadata from previous line differently"
 msgstr "bir önceki dosyadan gereksiz üstveriyi başka biçimde renklendir"
 
-#: builtin/blame.c:886
+#: builtin/blame.c:882
 msgid "color lines by age"
 msgstr "satırları yaşına göre renklendir"
 
-#: builtin/blame.c:887
+#: builtin/blame.c:883
 msgid "spend extra cycles to find better match"
 msgstr "daha iyi eşleşme bulmak için ek döngüler harca"
 
-#: builtin/blame.c:888
+#: builtin/blame.c:884
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "git-rev-list çağırma yerine <dosya>'dan olan revizyonları kullan"
 
-#: builtin/blame.c:889
+#: builtin/blame.c:885
 msgid "use <file>'s contents as the final image"
 msgstr "<dosya>'nın içeriğini son görüntü olarak kullan"
 
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
 msgid "score"
 msgstr "skor"
 
-#: builtin/blame.c:890
+#: builtin/blame.c:886
 msgid "find line copies within and across files"
 msgstr "satır kopyalarını dosyaların içinde ve aralarında ara"
 
-#: builtin/blame.c:891
+#: builtin/blame.c:887
 msgid "find line movements within and across files"
 msgstr "satır hareketlerini dosyaların içinde ve aralarında ara"
 
-#: builtin/blame.c:892
+#: builtin/blame.c:888
 msgid "range"
 msgstr "erim"
 
-#: builtin/blame.c:893
+#: builtin/blame.c:889
 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:945
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress, --incremental veya okunabilir biçimlerle kullanılamaz"
 
@@ -11310,18 +11603,18 @@ msgstr "--progress, --incremental veya okunabilir biçimlerle kullanılamaz"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:996
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "4 yıl 11 ay önce"
 
-#: builtin/blame.c:1112
+#: 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:1157
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "Genel bakış satırları"
 
@@ -11353,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"
@@ -11371,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"
@@ -11385,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"
 
@@ -11395,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:440 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:471
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "HEAD çözülemedi"
 
-#: builtin/branch.c:477
+#: 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:492
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "%s dalı %s konumunda yeniden temellendiriliyor"
 
-#: builtin/branch.c:496
+#: 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:513
+#: 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:515
+#: 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:526
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Geçersiz dal adı: '%s'"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "Dal yeniden adlandırması başarısız"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "Dal kopyalaması başarısız"
 
-#: builtin/branch.c:561
+#: 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:564
+#: 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:570
+#: 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:579
+#: 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:581
+#: 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:597
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11500,180 +11793,176 @@ msgstr ""
 "\t%s\n"
 "'%c' ile başlayan satırlar çıkarılacaktır.\n"
 
-#: builtin/branch.c:631
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Genel seçenekler"
 
-#: builtin/branch.c:633
+#: 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:634
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "bilgi iletilerini gizle"
 
-#: builtin/branch.c:635
-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:637
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "kullanma"
 
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "üstkaynak"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "üstkaynak bilgisini değiştir"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "üstkaynak bilgisini kaldır"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "renklendirilmiş çıktı kullan"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "uzak izleme dallarında iş yap"
 
-#: builtin/branch.c:644 builtin/branch.c:646
+#: 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:645 builtin/branch.c:647
+#: 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:650
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "Özel git-branch eylemleri:"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "hem uzak izleme hem de yerel dalları listele"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "tümüyle birleştirilen dalı sil"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "dalı sil (birleştirilmemiş olsa bile)"
 
-#: builtin/branch.c:655
+#: 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:656
+#: 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:657
+#: 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:658
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "bir dalı kopyala, hedef var olsa bile"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "dal adlarını listele"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "geçerli dal adını göster"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "dalın başvuru günlüğünü oluştur"
 
-#: builtin/branch.c:663
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "dalın açıklamasını düzenle"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "zorla oluştur, taşı/yeniden adlandır, sil"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "yalnızca birleştirilen dalları yazdır"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "yalnızca birleştirilmeyen dalları yazdır"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "dalları sütunlarla listele"
 
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: 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:670
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "yalnızca nesnenin dallarını yazdır"
 
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: 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:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: 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:695 builtin/clone.c:794
+#: 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:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column ve --verbose birbiriyle uyumsuz"
-
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "dal adı gerekli"
 
-#: builtin/branch.c:766
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "Ayrılmış HEAD'e açıklama verilemiyor"
 
-#: builtin/branch.c:771
+#: 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:778
+#: 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:781
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "'%s' adında bir dal yok."
 
-#: builtin/branch.c:796
+#: 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:805
+#: 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:810
+#: 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:814
+#: builtin/branch.c:822
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11681,31 +11970,31 @@ msgstr ""
 "HEAD'in üst kaynağı %s olarak ayarlanamadı; çünkü herhangi bir dala işaret "
 "etmiyor."
 
-#: builtin/branch.c:817 builtin/branch.c:840
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "'%s' diye bir dal yok"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "'%s' diye bir dal mevcut deÄŸil"
 
-#: builtin/branch.c:834
+#: 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:838
+#: 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:844
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "'%s' dalının üstkaynak bilgisi yok"
 
-#: builtin/branch.c:854
+#: 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>?"
@@ -11713,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:858
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -11721,32 +12010,32 @@ msgstr ""
 "--set-upstream seçeneği artık desteklenmiyor. Lütfen --track veya --set-"
 "upstream-to kullanın."
 
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "git sürümü:\n"
 
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "uname() '%s' hatasını verip çıktı (%d)\n"
 
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
 msgid "compiler info: "
 msgstr "derleyici bilgisi: "
 
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "libc bilgisi: "
 
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
 msgid "not run from a git repository - no hooks to show\n"
 msgstr "bir git deposundan çalıştırılmadı - gösterilecek kanca yok\n"
 
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory <dosya>] [-s|--suffix <biçim>]"
 
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -11781,38 +12070,33 @@ msgstr ""
 "Aşağıda hata raporunun geri kalanına bir göz atın.\n"
 "Paylaşmak istemediğiniz satırları silebilirsiniz.\n"
 
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
 msgid "specify a destination for the bugreport file"
 msgstr "hata raporu dosyası için bir konum belirtin"
 
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
 msgid "specify a strftime format suffix for the filename"
 msgstr "dosya adı için bir strftime biçimli ek belirtin"
 
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "'%s' için öncü dizinler oluşturulamadı"
 
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "Sistem Bilgisi"
 
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "Etkin Kancalar"
 
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "'%s' hata raporu dosyası oluşturulamadı"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "%s dosyasına yazılamıyor"
 
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "Hata raporu '%s' dosyasına yazıldı.\n"
@@ -11833,27 +12117,27 @@ msgstr "git bundle list-heads <dosya> [<başvuru-adı>...]"
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <dosya> [<başvuru-adı>...]"
 
-#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
 msgid "do not show progress meter"
 msgstr "ilerleme çubuğunu gösterme"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
 msgid "show progress meter"
 msgstr "ilerleme çubuğunu göster"
 
-#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
 msgid "show progress meter during object writing phase"
 msgstr "ilerleme çubuğunu nesne yazımı aşaması sırasında göster"
 
-#: builtin/bundle.c:74 builtin/pack-objects.c:3754
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "ilerleme çubuğu gösterildiğinde --all-progress'e benzer"
 
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
 msgid "specify bundle format version"
 msgstr "demet biçim sürümünü belirt"
 
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
 msgstr "Bir demet oluşturmak için bir depo gerekli."
 
@@ -11861,25 +12145,25 @@ msgstr "Bir demet oluşturmak için bir depo gerekli."
 msgid "do not show bundle details"
 msgstr "demet ayrıntılarını gösterme"
 
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s tamam\n"
 
-#: builtin/bundle.c:163
+#: 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:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "ayrıntılı anlat; bir altkomuttan önce yerleştirilmelidir"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Nesneler demetten çıkarılıyor"
 
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Bilinmeyen altkomut: %s"
 
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:622
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11887,7 +12171,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <tür> | --textconv | --filters) [--path=<yol>] <nesne>"
 
-#: builtin/cat-file.c:599
+#: builtin/cat-file.c:623
 msgid ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
@@ -11895,72 +12179,72 @@ msgstr ""
 "git cat-file (--batch[=<biçim>] | --batch-check[=<biçim>]) [--follow-"
 "symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:644
 msgid "only one batch option may be specified"
 msgstr "yalnızca bir toplu iş seçeneği belirtilebilir"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tür> yalnızca şunlardan biri olabilir: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
 msgid "show object type"
 msgstr "nesne türünü göster"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
 msgid "show object size"
 msgstr "nesne boyutunu göster"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
 msgid "exit with zero when there's no error"
 msgstr "hata yoksa sıfır koduyla çık"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
 msgid "pretty-print object's content"
 msgstr "nesne içeriğini okunabilir biçimde göster"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
 msgid "for blob objects, run textconv on object's content"
 msgstr "ikili nesneler için nesne içeriği üzerinde textconv çalıştır"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
 msgid "for blob objects, run filters on object's content"
 msgstr "ikili nesneler için nesne içeriği üzerinde süzgeçler çalıştır"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
 msgid "blob"
 msgstr "ikili nesne"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
 msgid "use a specific path for --textconv/--filters"
 msgstr "--textconv/--filters için belirli bir yol kullan"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "-s ve -t'nin bozuk/hasar görmüş nesnelerle çalışmasına izin ver"
 
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
 msgid "buffer --batch output"
 msgstr "--batch çıktısını arabelleğe al"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
 msgid "show info and content of objects fed from the standard input"
 msgstr "standart girdi'den beslenen nesnelerin bilgisini ve içeriğini göster"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
 msgid "show info about objects fed from the standard input"
 msgstr "standart girdi'den beslenen nesneler hakkında bilgi göster"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "ağaç içi sembolik bağları izle (--batch veya --batch-check ile kullanılır)"
 
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
 msgid "show all objects with --batch or --batch-check"
 msgstr "--batch veya --batch-check ile olan tüm nesneleri göster"
 
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:690
 msgid "do not order --batch-all-objects output"
 msgstr "--batch-all-objects çıktısını sıralama"
 
@@ -11980,7 +12264,7 @@ msgstr "tüm dosya özniteliklerini bildir"
 msgid "use .gitattributes only from the index"
 msgstr "yalnızca indeksteki .gitattributes'u kullan"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "dosya adlarını stdin'den oku"
 
@@ -11988,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:1520 builtin/gc.c:549
-#: builtin/worktree.c:491
+#: 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"
 
@@ -12047,9 +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/submodule--helper.c:1825
-#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836
-#: builtin/submodule--helper.c:2334 builtin/worktree.c:719
+#: 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"
 
@@ -12113,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:414
+#: 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:419
+#: 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:426
+#: 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:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: 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:462 builtin/checkout.c:465
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s', %s ile birlikte kullanılamaz"
-
-#: builtin/checkout.c:469
+#: 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:473
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "ne '%s' ne de '%s' belirtilmiÅŸ"
 
-#: builtin/checkout.c:477
+#: 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:482 builtin/checkout.c:487
+#: 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:563 builtin/checkout.c:570
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "'%s' yolu birleÅŸtirilmemiÅŸ"
 
-#: builtin/checkout.c:739
+#: builtin/checkout.c:747
 msgid "you need to resolve your current index first"
 msgstr "önce geçerli indeksinizi çözmelisiniz"
 
-#: builtin/checkout.c:793
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12213,50 +12493,50 @@ msgstr ""
 "aşağıdaki dosyalardaki hazırlanan değişikliklerle sürdürülemiyor:\n"
 "%s"
 
-#: builtin/checkout.c:886
+#: 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:928
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD konumu:"
 
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
+#: 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:936
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "'%s' dalı sıfırlandı.\n"
 
-#: builtin/checkout.c:939
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Halihazırda '%s' üzerinde\n"
 
-#: builtin/checkout.c:943
+#: 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:945 builtin/checkout.c:1376
+#: 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:947
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "'%s' dalına geçildi.\n"
 
-#: builtin/checkout.c:998
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
-msgstr "... ve %d daha.\n"
+msgstr " ... ve %d daha.\n"
 
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12279,7 +12559,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1023
+#: 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"
@@ -12306,19 +12586,19 @@ msgstr[1] ""
 "\tgit branch <yeni-dal-adı> %s\n"
 "\n"
 
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "revizyonlarda gezinirken iç hata"
 
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "Önceki HEAD konumu şuydu:"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: 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:1184
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12327,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:1191
+#: 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"
@@ -12344,54 +12624,54 @@ msgstr ""
 "\tgit checkout --track origin/<ad>\n"
 "\n"
 "Eğer her zaman belirsiz <ad> çıkışlarının bir uzak konumu tercih etmesini\n"
-"isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultsRemote=origin\n"
+"isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultRemote=origin\n"
 "ayarını yapmayı düşünün."
 
-#: builtin/checkout.c:1201
+#: 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:1267
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "yalnızca bir başvuru bekleniyordu"
 
-#: builtin/checkout.c:1284
+#: 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:1330 builtin/worktree.c:270 builtin/worktree.c:438
+#: 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:1343 builtin/checkout.c:1709
+#: 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:1390
+#: 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:1392
+#: 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:1393 builtin/checkout.c:1401
+#: 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:1396
+#: 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:1412
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12399,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:1416
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12407,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:1420
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12415,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:1424
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12423,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:1428
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12431,209 +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:1432
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr "ikili arama yaparken dal deÄŸiÅŸtiriyorsunuz"
 
-#: builtin/checkout.c:1439
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr "dal değiştirilirken yollar kullanılamaz"
 
-#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: 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:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: 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:1467
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s', <başlama-noktası> alamaz"
 
-#: builtin/checkout.c:1475
+#: 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:1482
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "dal veya işleme argümanı eksik"
 
-#: builtin/checkout.c:1525
+#: 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:1526 builtin/log.c:1807 parse-options.h:323
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "stil"
 
-#: builtin/checkout.c:1527
-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:1539 builtin/worktree.c:488
+#: 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:1540
-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:1542
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "zorla çıkış yap (yerel değişiklikleri çöpe at)"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "yeni dal"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "yeni üst ögesi olmayan dal"
 
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: 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:1549
+#: 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:1562
+#: 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:1565
+#: 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:1569
+#: 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:1624
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c ve --orphan 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:1628
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p ve --overlay birlikte kullanılmaz"
-
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track için bir dal adı gerekli"
 
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "eksik dal adı; -%c deneyin"
 
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "%s çözülemedi"
 
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "geçersiz yol belirtimi"
 
-#: builtin/checkout.c:1725
+#: 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:1729
+#: 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:1738
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file, --detach ile uyumsuz"
-
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file, --patch ile uyumsuz"
-
-#: builtin/checkout.c:1754
+#: 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:1759
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "eski durumuna getirilecek yolları belirtmelisiniz"
 
-#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484
+#: 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:1786
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "yeni bir dal oluştur ve çıkış yap"
 
-#: builtin/checkout.c:1788
+#: 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:1789
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "yeni dal için başvuru günlüğü oluştur"
 
-#: builtin/checkout.c:1791
+#: 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:1792
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "yerpaylaşım kipini kullan (öntanımlı)"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "yeni bir dal oluştur ve ona geç"
 
-#: builtin/checkout.c:1839
+#: 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:1841
+#: 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:1843
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "yerel değişiklikleri çöpe at"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "çıkış yapılacak ağacımsı"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "indeksi eski durumuna getir"
 
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "çalışma ağacını eski durumuna getir"
 
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "birleÅŸtirilmemiÅŸ girdileri yok say"
 
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "yerpaylaşım kipini kullan"
 
@@ -12668,7 +12937,15 @@ msgstr "%s dizini atlanacak\n"
 msgid "could not lstat %s\n"
 msgstr "%s 'lstat' yapılamadı\n"
 
-#: builtin/clean.c:302 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"
@@ -12681,7 +12958,7 @@ msgstr ""
 "foo        - benzersiz öneke dayanarak bir öge seç\n"
 "           - (boş) hiçbir şey seçme\n"
 
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12693,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"
@@ -12701,33 +12979,33 @@ msgstr ""
 "*          - tüm ögeleri seç\n"
 "           - (boş) seçimi bitir\n"
 
-#: builtin/clean.c:521 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:661
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Girdi için yok sayma dizgileri>> "
 
-#: builtin/clean.c:696
+#: 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:717
+#: 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:758
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "%s kaldırılsın mı [y/N]? "
 
-#: builtin/clean.c:789
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12745,52 +13023,52 @@ msgstr ""
 "help                - bu ekranı görüntüle\n"
 "?                   - istem seçimi için yardım"
 
-#: builtin/clean.c:825
+#: 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:841
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Temizlenecek başka dosya yok, çıkılıyor."
 
-#: builtin/clean.c:903
+#: 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:905
+#: builtin/clean.c:928
 msgid "force"
 msgstr "zorla"
 
-#: builtin/clean.c:906
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "etkileÅŸimli temizlik"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "dizinleri tümüyle kaldır"
 
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: 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:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "dizgi"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "yok sayma kurallarına <dizgi> ekle"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "yok sayılan dosyalar da kaldırıldı"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "yalnızca yok sayılan dosyaları kaldır"
 
-#: builtin/clean.c:929
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -12798,7 +13076,7 @@ msgstr ""
 "clean.requireForce 'true' olarak ayarlanmış ve ne -i ne -n ne de -f "
 "verilmiÅŸ; temizleme reddediliyor"
 
-#: builtin/clean.c:932
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -12806,7 +13084,7 @@ msgstr ""
 "clean.requireForce öntanımlı olarak 'true' ve ne -i ne -n ne de -f verilmiş; "
 "temizleme reddediliyor"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x ve -X birlikte kullanılamaz"
 
@@ -12822,7 +13100,7 @@ msgstr "sığ depoyu klonlama"
 msgid "don't create a checkout"
 msgstr "çıkış yapma!"
 
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "çıplak bir depo oluştur"
 
@@ -12854,27 +13132,29 @@ msgstr "klon içerisindeki altmodülleri ilklendir"
 msgid "number of submodules cloned in parallel"
 msgstr "paralelde klonlanan altmodüllerin sayısı"
 
-#: builtin/clone.c:116 builtin/init-db.c:538
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "ÅŸablon dizini"
 
-#: builtin/clone.c:117 builtin/init-db.c:539
+#: builtin/clone.c:117 builtin/init-db.c:540
 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:1832
-#: builtin/submodule--helper.c:2337
+#: 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:1834
-#: builtin/submodule--helper.c:2339
+#: 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:549
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: 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"
 
@@ -12890,8 +13170,8 @@ 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:863
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
+#: builtin/pull.c:212
 msgid "depth"
 msgstr "derinlik"
 
@@ -12899,8 +13179,8 @@ 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:3804
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
 msgid "time"
 msgstr "zaman"
 
@@ -12908,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/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: 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:215
+#: 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:1844
-#: builtin/submodule--helper.c:2353
+#: 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"
 
@@ -12930,11 +13210,11 @@ msgstr "etiket klonlama ve sonraki getirmeler de onları izlemesin"
 msgid "any cloned submodules will be shallow"
 msgstr "klonlanan altmodüller sığ olacak"
 
-#: builtin/clone.c:142 builtin/init-db.c:547
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "git dizini"
 
-#: builtin/clone.c:143 builtin/init-db.c:548
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "git dizinini çalışma ağacından ayır"
 
@@ -12946,23 +13226,23 @@ 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/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: 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/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: 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:234
-#: builtin/push.c:585
+#: 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:237
-#: builtin/push.c:587
+#: 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"
 
@@ -12976,50 +13256,42 @@ msgstr ""
 "sparse-checkout dosyasını yalnızca kökteki dosyaları içerecek biçimde "
 "ilklendir"
 
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Bir dizin adı tahmin edilemedi.\n"
-"Lütfen komut satırında bir dizin belirtin."
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: '%s' için alternatif eklenemedi: %s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:304
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s var ve bir dizin deÄŸil"
 
-#: builtin/clone.c:436
+#: builtin/clone.c:322
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "yineleyici '%s' üzerinden çalıştırılamadı"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:353
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "'%s' bağı oluşturulamadı"
 
-#: builtin/clone.c:471
+#: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "dosya şuraya kopyalanamadı: '%s'"
 
-#: builtin/clone.c:476
+#: builtin/clone.c:362
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "'%s' üzerinde yinelenemedi"
 
-#: builtin/clone.c:503
+#: builtin/clone.c:389
 #, c-format
 msgid "done.\n"
 msgstr "bitti.\n"
 
-#: builtin/clone.c:517
+#: builtin/clone.c:403
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -13029,147 +13301,147 @@ msgstr ""
 "Neyin çıkış yapılıp yapılmadığını 'git status' ile inceleyebilir\n"
 "ve 'git restore --source=HEAD' ile yeniden deneyebilirsiniz.\n"
 
-#: builtin/clone.c:594
+#: builtin/clone.c:480
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Klonlanacak %s uzak dal bulunamadı."
 
-#: builtin/clone.c:713
+#: builtin/clone.c:597
 #, c-format
 msgid "unable to update %s"
 msgstr "%s güncellenemiyor"
 
-#: builtin/clone.c:761
+#: builtin/clone.c:645
 msgid "failed to initialize sparse-checkout"
 msgstr "sparse-checkout ilklendirilemedi"
 
-#: builtin/clone.c:784
+#: builtin/clone.c:668
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "uzak konum HEAD'i var olmayan başvuruya bağlanıyor, çıkış yapılamıyor.\n"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:701
 msgid "unable to checkout working tree"
 msgstr "çalışma ağacı çıkış yapılamıyor"
 
-#: builtin/clone.c:894
+#: builtin/clone.c:779
 msgid "unable to write parameters to config file"
 msgstr "parametreler yapılandırma dosyasına yazılamıyor"
 
-#: builtin/clone.c:957
+#: builtin/clone.c:842
 msgid "cannot repack to clean up"
 msgstr "temizlik için yeniden paketlenemiyor"
 
-#: builtin/clone.c:959
+#: builtin/clone.c:844
 msgid "cannot unlink temporary alternates file"
 msgstr "geçici alternatifler dosyasının bağlantısı kesilemiyor"
 
-#: builtin/clone.c:1001 builtin/receive-pack.c:2491
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "Çok fazla argüman."
 
-#: builtin/clone.c:1005
+#: 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:1018
+#: 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:1021
-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:1035
+#: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "'%s' deposu mevcut deÄŸil"
 
-#: builtin/clone.c:1039 builtin/fetch.c:2011
+#: 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"
 
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "Hedef yolu '%s' halihazırda mevcut ve boş bir dizin değil."
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr "Depo yolu '%s' halihazırda mevcut ve boş bir dizin değil."
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "Çalışma ağacı '%s' halihazırda mevcut."
 
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
+#: 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'"
 
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "'%s' çalışma ağacı dizini oluşturulamadı"
 
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "'%s' çıplak deposuna klonlanıyor...\n"
 
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klonlama konumu: '%s'...\n"
 
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr ""
 "clone --recursive hem --reference hem --reference-if-able ile uyumlu deÄŸil"
 
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' geçerli bir uzak konum adı değil"
 
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth yerel klonlarda yok sayılır; yerine file:// kullanın."
 
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since yerel klonlarda yok sayılır; yerine file:// kullanın."
 
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude yerel klonlarda yok sayılır; yerine file:// kullanın."
 
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter yerel klonlarda yok sayılır; yerine file:// kullanın."
 
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
 msgid "source repository is shallow, ignoring --local"
 msgstr "kaynak depo sığ, --local yok sayılıyor"
 
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
 msgid "--local is ignored"
 msgstr "--local yok sayıldı"
 
-#: builtin/clone.c:1337 builtin/clone.c:1345
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr "uzak konum taşıması hata bildirdi"
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "%s uzak dalı %s üstkaynağında bulunamadı"
 
-#: builtin/clone.c:1348
+#: builtin/clone.c:1242
 msgid "You appear to have cloned an empty repository."
 msgstr "Boş bir depoyu klonlamış görünüyorsunuz."
 
@@ -13205,13 +13477,13 @@ msgstr "sütunlar arasındaki dolgu boşluğu"
 msgid "--command must be the first argument"
 msgstr "--command ilk argüman olmalı"
 
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
 msgid ""
 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 "git commit-graph verify [--object-dir <nsndzn>] [--shallow] [--[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13221,97 +13493,95 @@ 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:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "'%s' ile eşleşen nesne dizini bulunamadı"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "dizin"
 
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr "Grafiğin depolanacağı nesne dizini"
 
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr "commit-graph parçalara bölünmüşse yalnızca uç dosyayı doğrula"
 
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "commit-graph '%s' açılamadı"
 
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "tanımlanamayan --split argümanı, %s"
 
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr "beklenmedik onaltılık olmayan nesne kimliği: %s"
 
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "geçersiz nesne: %s"
 
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
 msgid "start walk at all refs"
 msgstr "tüm başvurularda gezinmeyi başlat"
 
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "stdin tarafından listelenen paket indekslerini tara"
 
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
 msgid "start walk at commits listed by stdin"
 msgstr "stdin tarafından listelenen tüm işlemelerde gezinmeyi başlat"
 
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
 msgstr "halihazırda commit-graph dosyasında bulunan tüm işlemeleri içer"
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
 msgid "enable computation for changed paths"
 msgstr "değiştirilen yollar için hesaplamayı etkinleştir"
 
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
 msgid "allow writing an incremental commit-graph file"
 msgstr "artan bir commit-graph dosyasının yazımına izin ver"
 
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr ""
 "bir temel olmayan parçalara bölünmüş commit-graph içinde en çok olabilecek "
 "işleme sayısı"
 
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr ""
 "bölünmüş bir commit-graph'ın iki düzeyi arasında olabilecek en büyük oran"
 
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
 msgid "only expire files older than a given date-time"
 msgstr "yalnızca verilen bir tarihten daha eski dosyaların hükmünü kaldır"
 
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr "Hesaplanacak en çok değiştirilen yollar için Bloom süzgeçleri sayısı"
 
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr ""
 "--reachable, --stdin-commits veya --stdin-packs'ten en çok birini kullan"
 
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
 msgid "Collecting commits from input"
 msgstr "Girdiden işlemeler toplanıyor"
 
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "tanımlanamayan altkomut: %s"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13325,70 +13595,65 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "yinelenmiş üst öge %s yok sayıldı"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
+#: 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"
 
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: '%s' açılamadı"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree: '%s' okunamadı"
 
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree: '%s' kapatılamadı"
 
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr "üst öge"
 
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "bir üst işleme ögesinin no'su"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
-#: builtin/tag.c:456
+#: 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:115 builtin/commit.c:1614
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "iÅŸleme iletisi"
 
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
 msgstr "işleme günlük iletisini dosyadan oku"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299
-#: 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 "iÅŸlemeyi GPG ile imzala"
 
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "bir tam ağaç vermeli"
 
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: okunamadı"
 
-#: builtin/commit.c:41
+#: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<seçenekler>] [--] <yol-blrtç>..."
 
-#: builtin/commit.c:46
+#: builtin/commit.c:47
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<seçenekler>] [--] <yol-blrtç>..."
 
-#: builtin/commit.c:51
+#: builtin/commit.c:52
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13398,7 +13663,7 @@ msgstr ""
 "boş yapacaktır. Komutunuzu --allow-empty ile yineleyebilir veya\n"
 "işlemeyi \"git reset HEAD^\" ile tümüyle kaldırabilirsiniz.\n"
 
-#: builtin/commit.c:56
+#: builtin/commit.c:57
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -13412,15 +13677,15 @@ msgstr ""
 "\tgit commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:63
+#: builtin/commit.c:64
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "Aksi durumda, lütfen 'git rebase --skip' kullanın.\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:67
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Aksi durumda, lütfen 'git cherry-pick --skip' kullanın.\n"
 
-#: builtin/commit.c:69
+#: builtin/commit.c:70
 msgid ""
 "and then use:\n"
 "\n"
@@ -13439,76 +13704,72 @@ msgstr ""
 "kullanın.\n"
 "Bu işlemeyi atlamak isterseniz şunu kullanın:\n"
 "\n"
-"\tgit cherry-pick --continue\n"
+"\tgit cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:324
+#: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
 msgstr "HEAD ağaç nesnesi açılamadı"
 
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file, -a ile bir anlam ifade etmiyor"
-
-#: builtin/commit.c:374
+#: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "--include/--only içermeyen yollar bir anlam ifade etmiyor."
 
-#: builtin/commit.c:386
+#: builtin/commit.c:387
 msgid "unable to create temporary index"
 msgstr "geçici indeks oluşturulamıyor"
 
-#: builtin/commit.c:395
+#: builtin/commit.c:396
 msgid "interactive add failed"
 msgstr "etkileşimli ekleme başarısız"
 
-#: builtin/commit.c:410
+#: builtin/commit.c:411
 msgid "unable to update temporary index"
 msgstr "geçici indeks güncellenemiyor"
 
-#: builtin/commit.c:412
+#: builtin/commit.c:413
 msgid "Failed to update main cache tree"
 msgstr "Ana önbellek ağacı güncellenemedi"
 
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
 msgid "unable to write new_index file"
-msgstr "new_index_file yazılamıyor"
+msgstr "new_index dosyası yazılamıyor"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "cannot do a partial commit during a merge."
 msgstr "Bir birleştirme sırasında kısmi işleme yapılamaz."
 
-#: builtin/commit.c:491
+#: builtin/commit.c:492
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "Bir seç-al sırasında kısmi işleme yapılamaz."
 
-#: builtin/commit.c:493
+#: builtin/commit.c:494
 msgid "cannot do a partial commit during a rebase."
 msgstr "Bir yeniden temellendirme sırasında kısmi işleme yapılamaz."
 
-#: builtin/commit.c:501
+#: builtin/commit.c:502
 msgid "cannot read the index"
 msgstr "indeks okunamıyor"
 
-#: builtin/commit.c:520
+#: builtin/commit.c:521
 msgid "unable to write temporary index file"
 msgstr "geçici indeks dosyası yazılamıyor"
 
-#: builtin/commit.c:618
+#: builtin/commit.c:619
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "'%s' işlemesinde yazar üstbilgisi yok"
 
-#: builtin/commit.c:620
+#: builtin/commit.c:621
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "'%s' işlemesindeki yazar satırı hatalı oluşturulmuş"
 
-#: builtin/commit.c:639
+#: builtin/commit.c:640
 msgid "malformed --author parameter"
 msgstr "hatalı oluşturulmuş --author parametresi"
 
-#: builtin/commit.c:692
+#: builtin/commit.c:693
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -13516,43 +13777,81 @@ msgstr ""
 "mevcut işleme iletisinde kullanılmayan bir yorum\n"
 "karakteri seçilemiyor"
 
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "%s işlemesi aranamadı"
 
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(günlük iletisi standart girdi'den okunuyor)\n"
 
-#: builtin/commit.c:760
+#: builtin/commit.c:761
 msgid "could not read log from standard input"
 msgstr "günlük standart girdi'den okunamadı"
 
-#: builtin/commit.c:764
+#: builtin/commit.c:765
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "günlük dosyası '%s' okunamadı"
 
-#: builtin/commit.c:801
+#: 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:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
 msgstr "SQUASH_MSG okunamadı"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:821
 msgid "could not read MERGE_MSG"
 msgstr "MERGE_MSG okunamadı"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:881
 msgid "could not write commit template"
 msgstr "işleme şablonu yazılamadı"
 
+#: builtin/commit.c:894
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr ""
+"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n"
+"satırlar yok sayılacaktır.\n"
+
+#: builtin/commit.c:896
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n"
+"satırlar yok sayılacaktır. Boş bir ileti işlemeyi iptal eder.\n"
+
 #: builtin/commit.c:900
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n"
+"satırlar tutulacaktır; isterseniz onları kaldırabilirsiniz.\n"
+
+#: builtin/commit.c:904
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n"
+"satırlar tutulacaktır; isterseniz onları kaldırabilirsiniz.\n"
+"BoÅŸ bir ileti iÅŸlemeyi iptal eder.\n"
+
+#: builtin/commit.c:916
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -13566,7 +13865,7 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "ve yeniden deneyin.\n"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:921
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -13580,201 +13879,174 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "ve yeniden deneyin.\n"
 
-#: builtin/commit.c:915
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n"
-"satırlar yok sayılacaktır. Boş bir ileti işlemeyi iptal eder.\n"
-
-#: builtin/commit.c:923
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"Lütfen değişiklikleriniz için bir işleme iletisi girin. '%c' ile başlayan\n"
-"satırlar tutulacaktır; isterseniz onları kaldırabilirsiniz.\n"
-"BoÅŸ bir ileti iÅŸlemeyi iptal eder.\n"
-
-#: builtin/commit.c:940
+#: builtin/commit.c:948
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sYazar:     %.*s <%.*s>"
 
-#: builtin/commit.c:948
+#: builtin/commit.c:956
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sTarih:     %s"
 
-#: builtin/commit.c:955
+#: builtin/commit.c:963
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sÄ°ÅŸleyici:  %.*s <%.*s>"
 
-#: builtin/commit.c:973
+#: builtin/commit.c:981
 msgid "Cannot read index"
 msgstr "İndeks okunamıyor"
 
-#: builtin/commit.c:1018
+#: builtin/commit.c:1026
 msgid "unable to pass trailers to --trailers"
 msgstr "--trailers'a artbilgiler geçirilemiyor"
 
-#: builtin/commit.c:1058
+#: builtin/commit.c:1066
 msgid "Error building trees"
 msgstr "Ağaçlar yapılırken hata"
 
-#: builtin/commit.c:1072 builtin/tag.c:319
+#: 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"
 
-#: builtin/commit.c:1116
+#: builtin/commit.c:1124
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s', 'Ad <e-posta>' biçiminde değil ve mevcut bir yazarla "
 "eÅŸleÅŸmiyor"
 
-#: builtin/commit.c:1130
+#: builtin/commit.c:1138
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Geçersiz yok sayılanları göster kipi '%s'"
 
-#: builtin/commit.c:1148 builtin/commit.c:1441
+#: 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:1188
-msgid "--long and -z are incompatible"
-msgstr "--long ve -z birbiriyle uyumsuz"
-
-#: builtin/commit.c:1219
+#: 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."
 
-#: builtin/commit.c:1221
+#: builtin/commit.c:1229
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr "Bir seç-al'ın tam ortasındasınız -- ileti değiştirilemiyor."
 
-#: builtin/commit.c:1224
+#: 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:1226
-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"
+#: builtin/commit.c:1234
+#, 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:1245
+#: 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:1254
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "DeÄŸiÅŸtirecek bir ÅŸeyiniz yok."
 
-#: builtin/commit.c:1257
+#: 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:1259
+#: 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:1261
+#: 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:1264
+#: 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:1274
+#: 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:1276
+#: 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:1285
+#: 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:1303
+#: 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:1331
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "bilinmeyen seçenek: --fixup=%s:%s"
 
-#: builtin/commit.c:1345
+#: 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:1476 builtin/commit.c:1642
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "durumu kısaca göster"
 
-#: builtin/commit.c:1478 builtin/commit.c:1644
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "dal bilgisini göster"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "zula bilgisini göster"
 
-#: builtin/commit.c:1482 builtin/commit.c:1646
+#: 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:1484
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "sürüm"
 
-#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
-#: builtin/worktree.c:681
+#: 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:1487 builtin/commit.c:1650
+#: 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:1490 builtin/commit.c:1653
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "girdileri NUL ile sonlandır"
 
-#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: 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:1493 builtin/commit.c:1656
+#: 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:1497
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -13782,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:1499 parse-options.h:193
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "ne zaman"
 
-#: builtin/commit.c:1500
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -13794,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:1502
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "izlenmeyen dosyaları sütunlarla göster"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "yeniden adlandırmaları algılama"
 
-#: builtin/commit.c:1505
+#: 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:1525
+#: 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:1607
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "başarılı işlemenin ardından özeti gizle"
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "diff'i işleme iletisi şablonunda göster"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "İşleme iletisi seçenekleri"
 
-#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr "iletiyi dosyadan oku"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "yazar"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "işleme yazarını geçersiz kıl"
 
-#: builtin/commit.c:1613 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "tarih"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "işleme tarihini geçersiz kıl"
 
-#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
-#: parse-options.h:329 ref-filter.h:90
+#: 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:1615
+#: 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:1616
+#: 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:1621
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]iÅŸleme"
 
-#: builtin/commit.c:1621
+#: 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:1622
+#: 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:1623
+#: 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:1624 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "artbilgi"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "özel artbilgiler ekle"
 
-#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: 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:1626
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "belirtilen şablon dosyasını kullan"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "işlemeyi zorla düzenle"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr "işleme iletisi şablonunda durumu içer"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "İşleme içeriği seçenekleri"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "değiştirilen tüm dosyaları gönder"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "belirtilen dosyaları işleme için indekse ekle"
 
-#: builtin/commit.c:1637
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "dosyaları etkileşimli olarak ekle"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "deÄŸiÅŸiklikleri etkileÅŸimli olarak ekle"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "yalnızca belirtilen dosyaları gönder"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "pre-commit ve commit-msg kancalarını atla"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "neyin işleneceğini göster"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "önceki işlemeyi değiştir"
 
-#: builtin/commit.c:1655
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "post-rewrite kancasını atla"
 
-#: builtin/commit.c:1662
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "boş bir değişikliğin kaydı yazılabilir"
 
-#: builtin/commit.c:1664
+#: 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:1737
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Hasar görmüş MERGE_HEAD dosyası (%s)"
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "MERGE_MODE okunamadı"
 
-#: builtin/commit.c:1765
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "işleme iletisi okunamadı: %s"
 
-#: builtin/commit.c:1772
+#: builtin/commit.c:1788
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
-msgstr "İşleme iletisinin boş olmasından dolayı iptal ediliyor.\n"
+msgstr "İşleme iletisinin boş bırakılmasından ötürü iptal ediliyor.\n"
 
-#: builtin/commit.c:1777
+#: 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:1788
+#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
-msgstr "İşleme iletisi gövdesinin boş olmasından dolayı iptal ediliyor.\n"
+msgstr "İşleme iletisi gövdesinin boş bırakılmasından ötürü iptal ediliyor.\n"
 
-#: builtin/commit.c:1824
+#: 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"
@@ -14078,7 +14350,7 @@ msgstr "tüm eşleşmeleri kaldır: ad [değer-dizgisi]"
 
 #: builtin/config.c:146
 msgid "rename section: old-name new-name"
-msgstr "bölümü yeniden adlandır: eski_ad yeni_ad"
+msgstr "bölümü yeniden adlandır: eski-ad yeni-ad"
 
 #: builtin/config.c:147
 msgid "remove a section: name"
@@ -14349,9 +14621,9 @@ msgstr "hata ayıklama iletilerini stderr'e yazdır"
 
 #: builtin/credential-cache--daemon.c:316
 msgid "credential-cache--daemon unavailable; no unix socket support"
-msgstr "credential-cache-daemon kullanılamıyor; unix soket desteği yok"
+msgstr "credential-cache--daemon kullanılamıyor; unix soket desteği yok"
 
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "credential-cache kullanılamıyor; unix soket desteği yok"
 
@@ -14493,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"
 
@@ -14509,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"
@@ -14548,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:684
+#: 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"
@@ -14576,113 +14837,106 @@ 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:261
-#, c-format
-msgid "failed: %d"
-msgstr "başarısız: %d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "%s sembolik bağı okunamadı"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "%s sembolik bağ dosyası okunamadı"
 
-#: builtin/difftool.c:313
+#: 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:413
+#: builtin/difftool.c:421
 msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
 msgstr ""
-"Birleştirilmiş diff biçimleri (-c ve --cc) dizin diff kipinde\n"
-"(-d ve --dir-diff) desteklenmiyor."
+"Birleştirilmiş diff biçimleri ('-c' ve '--cc') dizin diff kipinde\n"
+"('-d' ve '--dir-diff') desteklenmiyor."
 
-#: builtin/difftool.c:637
+#: 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:639
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "Çalışma ağacı dosyası bırakıldı."
 
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "'%s' konumunda geçici dosyalar var."
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "Bunları temizlemek veya kurtarmak isteyebilirsiniz."
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "başarısız: %d"
+
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "'diff.tool' yerine 'diff.guitool' kullan"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "bir tam dizin diff'i gerçekleştir"
 
-#: builtin/difftool.c:704
+#: 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:709
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "dir-diff kipinde sembolik baÄŸlar kullan"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "araç"
 
-#: builtin/difftool.c:711
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "belirtilen diff aracını kullan"
 
-#: builtin/difftool.c:713
+#: 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"
+msgstr ""
+"'--tool' ile birlikte kullanılabilecek diff araçlarının listesini çıkar"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:706
 msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 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:719
+#: 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:720
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "'diff'e aktarıldı"
 
-#: builtin/difftool.c:735
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool, çalışma ağacı veya --no-index gerektiriyor"
 
-#: builtin/difftool.c:742
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "-dir-diff, --no-index ile uyumsuz"
-
-#: builtin/difftool.c:745
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool ve --extcmd birlikte kullanılamaz"
-
-#: builtin/difftool.c:753
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "--tool=<araç> için bir <araç> verilmedi"
 
-#: builtin/difftool.c:760
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "--extcmd=<komut> için bir <komut> verilmedi"
 
@@ -14690,7 +14944,7 @@ msgstr "--extcmd=<komut> için bir <komut> verilmedi"
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <seçenekler> <ortam-dğşkn>"
 
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
 msgid "type"
 msgstr "tür"
 
@@ -14700,7 +14954,7 @@ msgstr "git_env_*(...)'ın geri çekileceği öntanımlı"
 
 #: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
-msgstr "sessiz ol, yalnızca git_env*() değerini çıkış kodu olarak kullan"
+msgstr "sessiz ol, yalnızca git_env_*() değerini çıkış kodu olarak kullan"
 
 #: builtin/env--helper.c:67
 #, c-format
@@ -14722,126 +14976,118 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:868
+#: 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:1177
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "--anonymize-map jetonu boÅŸ olamaz"
 
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "<n> nesneden sonra ilerlemeyi göster"
 
-#: builtin/fast-export.c:1199
+#: 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:1202
+#: 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:1205
+#: 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:1208
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "imleri bu dosyaya boÅŸalt"
 
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "imleri bu dosyadan içe aktar"
 
-#: builtin/fast-export.c:1214
+#: 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:1216
+#: 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:1218
+#: 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:1220
+#: 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:1221
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "ikili nesne verisi çıktısını atla"
 
-#: builtin/fast-export.c:1222 builtin/log.c:1823
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "baÅŸvuru belirteci"
 
-#: builtin/fast-export.c:1223
+#: 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:1224
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "çıktı kimliğini gizle"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "kimden:kime"
 
-#: builtin/fast-export.c:1226
+#: 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:1229
+#: 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:1231
+#: 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:1233
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "etiketleri im numaralarıyla adlandır"
 
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map, --anonymize olmadan bir anlam ifade etmiyor"
-
-#: builtin/fast-export.c:1271
-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ı"
@@ -14851,119 +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:185
+#: 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:245
+#: 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:188
+#: 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:191
+#: 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:195
+#: 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"
+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:198
+#: 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:122
+#: 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:206
+#: 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: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 "sığ klonun geçmişini derinleştir"
 
-#: 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 "zamana bağlı olarak sığ deponun geçmişini derinleştir"
 
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: 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)"
@@ -14971,140 +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:224
+#: 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:226
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "ilgili baÅŸvuru"
 
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: 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:240
+#: 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"
+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:243
+#: 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:757
+#: 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:856
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "%s nesnesi bulunamadı"
 
-#: builtin/fetch.c:860
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[güncel]"
 
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[reddedildi]"
 
-#: builtin/fetch.c:874
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "geçerli dalda getirme yapılamıyor"
 
-#: builtin/fetch.c:884
+#: 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:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: 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:889
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "var olan etiketi deÄŸiÅŸtirecektir"
 
-#: builtin/fetch.c:911
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[yeni etiket]"
 
-#: builtin/fetch.c:914
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[yeni dal]"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[yeni baÅŸvuru]"
 
-#: builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "zorlanmış güncelleme"
 
-#: builtin/fetch.c:961
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "ileri sarım değil"
 
-#: builtin/fetch.c:1065
+#: 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:1069
+#: 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:1101
+#: 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:1129
+#: builtin/fetch.c:1141
 #, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr "%s reddedilmeli; çünkü sığ köklerin güncellenmesine izin verilmiyor"
+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:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "Åžu konumdan: %.*s\n"
 
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15113,133 +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:1327
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s sarkacak)"
 
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s sarkmaya başladı)"
 
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[silindi]"
 
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(hiçbiri)"
 
-#: builtin/fetch.c:1384
+#: 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:1403
+#: 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:1406
+#: 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:1618
+#: builtin/fetch.c:1455
+#, c-format
+msgid "the object %s does not exist"
+msgstr "%s diye bir nesne yok"
+
+#: 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:1633
+#: 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:1635
+#: 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:1637
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "bilinmeyen dal türü"
 
-#: builtin/fetch.c:1639
+#: 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-option ile tam olarak bir dal belirtmeniz gerekiyor."
+"--set-upstream seçeneği ile tam olarak bir dal belirtmeniz gerekiyor."
 
-#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "%s getiriliyor\n"
 
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 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:1790
+#: 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:1894
+#: 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."
-
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "Bir etiket adı belirtmeniz gerekiyor."
+"getirileceği bir URL veya uzak konum adı belirtin."
 
-#: builtin/fetch.c:1995
-msgid "Negative depth in --deepen is not supported"
-msgstr "--deepen için negatif derinlik desteklenmiyor"
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "bir etiket adı belirtmeniz gerekiyor"
 
-#: builtin/fetch.c:1997
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen ve --depth birlikte kullanılamaz"
+#: 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:2002
-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:2004
+#: 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:2021
+#: 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:2023
+#: 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:2032
+#: 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:2039
-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:2055
+#: 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:2060
-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:2079
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15247,11 +15511,11 @@ msgstr ""
 "--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum "
 "ile kullanılabilir."
 
-#: builtin/fetch.c:2083
+#: 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:2087
+#: 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"
@@ -15262,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"
 
@@ -15298,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:483
+#: 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"
 
@@ -15346,19 +15614,19 @@ msgstr "yalnızca işlemeyi içermeyen başvuruları yazdır"
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<yapılandırma> <komut-argümanları>"
 
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "yapılandırma"
 
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "bir depo yolları listesi tutan yapılandırma anahtarı"
 
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "--config=<yapılandırma> eksik"
 
-#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "bilinmeyen"
 
@@ -15374,16 +15642,16 @@ msgstr "%s %s içinde hata: %s"
 msgid "warning in %s %s: %s"
 msgstr "%s %s içinde uyarı: %s"
 
-#: builtin/fsck.c:123 builtin/fsck.c:126
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "şuradan kırık bağ: %7s %s"
 
-#: builtin/fsck.c:135
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "bağda yanlış nesne türü"
 
-#: builtin/fsck.c:151
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -15392,211 +15660,221 @@ msgstr ""
 "şuradan kırık bağ: %7s %s\n"
 "           ÅŸuraya: %7s %s"
 
-#: builtin/fsck.c:263
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "eksik %s %s"
 
-#: builtin/fsck.c:290
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "ulaşılamayan %s %s"
 
-#: builtin/fsck.c:310
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "sarkan %s %s"
 
-#: builtin/fsck.c:320
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "lost-found oluşturulamadı"
 
-#: builtin/fsck.c:331
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "'%s' bitirilemedi"
 
-#: builtin/fsck.c:348
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "%s denetleniyor"
 
-#: builtin/fsck.c:386
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "BaÄŸlanabilirlik denetleniyor (%d nesne)"
 
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "%s %s denetleniyor"
 
-#: builtin/fsck.c:410
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "kırık bağlar"
 
-#: builtin/fsck.c:419
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "kök %s"
 
-#: builtin/fsck.c:427
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "%s %s (%s) ÅŸurada etiketlendi: %s"
 
-#: builtin/fsck.c:456
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: nesne hasar görmüş veya kayıp"
 
-#: builtin/fsck.c:481
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: geçersiz başvuru günlüğü girdisi %s"
 
-#: builtin/fsck.c:495
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Başvuru günlüğü denetleniyor: %s->%s"
 
-#: builtin/fsck.c:529
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: geçersiz sha1 işaretçisi %s"
 
-#: builtin/fsck.c:536
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: bir iÅŸleme deÄŸil"
 
-#: builtin/fsck.c:590
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "Uyarı: Öntanımlı başvurular yok"
 
-#: builtin/fsck.c:605
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: sağlama yolu uyuşmazlığı, şurada bulundu: %s"
+
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: nesne hasar görmüş veya kayıp: %s"
 
-#: builtin/fsck.c:618
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s: nesne bilinmeyen bir türde: '%s': %s"
+
+#: 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:638
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "hatalı sha1 dosyası: %s"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Nesne dizini denetleniyor"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Nesne dizinleri denetleniyor"
 
-#: builtin/fsck.c:671
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "%s baÄŸ denetleniyor"
 
-#: builtin/fsck.c:676 builtin/index-pack.c:866
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "geçersiz %s"
 
-#: builtin/fsck.c:683
+#: 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:689
+#: 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:693
+#: 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:705
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "Önbellek ağacı denetleniyor"
 
-#: builtin/fsck.c:710
+#: 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:719
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "cache-tree içinde ağaç olmayan öge"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<seçenekler>] [<nesne>...]"
 
-#: builtin/fsck.c:756
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "ulaşılamayan nesneleri göster"
 
-#: builtin/fsck.c:757
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "sarkan nesneleri göster"
 
-#: builtin/fsck.c:758
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "etiketleri bildir"
 
-#: builtin/fsck.c:759
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "kök düğümleri bildir"
 
-#: builtin/fsck.c:760
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "indeks nesnelerini dal ucu düğümü yap"
 
-#: builtin/fsck.c:761
+#: 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:762
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "ek olarak paketleri ve alternatif nesneleri de dikkate al"
 
-#: builtin/fsck.c:763
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "yalnızca bağlanabilirliği denetle"
 
-#: builtin/fsck.c:764 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "daha kesin denetlemeyi etkinleÅŸtir"
 
-#: builtin/fsck.c:766
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "sarkan nesneleri .git/lost-found'a yaz"
 
-#: builtin/fsck.c:767 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "ilerlemeyi göster"
 
-#: builtin/fsck.c:768
+#: 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:827 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Nesneler denetleniyor"
 
-#: builtin/fsck.c:855
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: nesne kayıp"
 
-#: builtin/fsck.c:866
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "geçersiz parametre: sha1 bekleniyordu, '%s' alındı"
@@ -15615,77 +15893,72 @@ 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:240 builtin/tag.c:573
-#, 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"
-"and remove %s.\n"
+"and remove %s\n"
 "Automatic cleanup will not be performed until the file is removed.\n"
 "\n"
 "%s"
 msgstr ""
-"En son yapılan 'gc' işlemi aşağıdakileri bildirdi. Lütfen sorunun ana\n"
-"nedenini düzeltin ve %s ögesini kaldırın.\n"
-"Kendiliğinden temizlik dosya kaldırılana değin gerçekleştirilmeyecektir.\n"
+"En son yapılan gc işlemi aşağıdakileri bildirdi. Lütfen sorunun ana\n"
+"nedenini düzeltin ve %s ögesini kaldırın. Kendiliğinden temizlik\n"
+"dosya kaldırılana değin gerçekleştirilmeyecektir.\n"
 "\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)"
@@ -15693,169 +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:869
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "commit-graph yazılamadı"
 
-#: builtin/gc.c:905
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "uzak konumlar önden getirilemedi"
 
 #: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
-msgstr "'git-pack-objects' işlemi başlatılamadı"
+msgstr "'git pack-objects' işlemi başlatılamadı"
 
 #: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
-msgstr "'git-pack-objects' iÅŸlemi bitirilemedi"
+msgstr "'git pack-objects' iÅŸlemi bitirilemedi"
 
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "multi-pack-index yazılamadı"
 
-#: builtin/gc.c:1109
+#: 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:1170
+#: 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:1179
+#: 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:1283
+#: 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:1313
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "'%s' görevi başarısız oldu"
 
-#: builtin/gc.c:1395
+#: 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:1400
+#: 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:1415
+#: 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:1416
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "sıklık"
 
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "görevleri sıklığa göre çalıştır"
 
-#: builtin/gc.c:1420
+#: 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:1421
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "görev"
 
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "belirli bir görevi çalıştır"
 
-#: builtin/gc.c:1439
+#: 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:1482
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "'git config' çalıştırılamadı"
 
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "'%s' yolu oluşturulamadı"
 
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "launchctl başlatılamadı"
 
-#: builtin/gc.c:1613
+#: 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:1674
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "%s servisi özyüklenemedi"
 
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "geçici xml dosyası oluşturulamadı"
 
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "schtasks başlatılamadı"
 
-#: builtin/gc.c:1879
+#: 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:1896
+#: 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:1900
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "'crontab' stdin'i açılamadı"
 
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "'crontab' beklenmedik bir biçimde sonlandı"
 
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "systemctl başlatılamadı"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "systemctl çalıştırılamadı"
+
+#: 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:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "tanımlanamayan --scheduler argümanı, '%s'"
+
+#: 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:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s planlayıcısı mevcut değil"
+
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
-msgstr "başka bir işlem arka plan bakımı zamanının ayarlıyor"
+msgstr "başka bir işlem arka plan bakımı zamanını planlıyor"
+
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<görev-planlayıcı>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "görev planlayıcı"
 
-#: builtin/gc.c:2000
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "git bakımını tetikleyecek görev planlayıcı"
+
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "depo, global yapılandırmaya eklenemedi"
 
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <altkomut> [<seçenekler>]"
 
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "geçersiz altkomut: %s"
@@ -15864,12 +16177,12 @@ msgstr "geçersiz altkomut: %s"
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<seçenekler>] [-e] <dizgi> [<rev>...] [[--] <yol>...]"
 
-#: builtin/grep.c:223
+#: builtin/grep.c:239
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: iş parçacığı oluşturulamadı: %s"
 
-#: builtin/grep.c:277
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "geçersiz belirtilen iş parçacığı sayısı (%d), %s için"
@@ -15878,263 +16191,263 @@ msgstr "geçersiz belirtilen iş parçacığı sayısı (%d), %s için"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
-#: builtin/pack-objects.c:2969
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "iş parçacığı desteği yok, %s yok sayılıyor"
 
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "ağaç okunamıyor (%s)"
 
-#: builtin/grep.c:658
+#: builtin/grep.c:672
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "%s türündeki bir nesneden grep yapılamıyor"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:752
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "'%c' anahtarı sayısal bir değer bekliyor"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:851
 msgid "search in index instead of in the work tree"
 msgstr "çalışma ağacı yerine indekste ara"
 
-#: builtin/grep.c:840
+#: builtin/grep.c:853
 msgid "find in contents not managed by git"
 msgstr "git tarafından yönetilmeyen içerikte bul"
 
-#: builtin/grep.c:842
+#: builtin/grep.c:855
 msgid "search in both tracked and untracked files"
 msgstr "hem izlenen hem izlenmeyen dosyalar içinde ara"
 
-#: builtin/grep.c:844
+#: builtin/grep.c:857
 msgid "ignore files specified via '.gitignore'"
 msgstr "'.gitignore'da belirtilen dosyaları yok say"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:859
 msgid "recursively search in each submodule"
 msgstr "her altmodülde özyineli olarak ara"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:862
 msgid "show non-matching lines"
 msgstr "eşleşmeyen satırları göster"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:864
 msgid "case insensitive matching"
 msgstr "BÜYÜK/küçük harf duyarsız eşleşme"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:866
 msgid "match patterns only at word boundaries"
 msgstr "yalnızca sözcük sınırlarındaki dizgileri eşleştir"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:868
 msgid "process binary files as text"
 msgstr "ikili dosyaları metin olarak işle"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:870
 msgid "don't match patterns in binary files"
 msgstr "ikili dosyalardaki dizgileri eÅŸleÅŸtirme"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:873
 msgid "process binary files with textconv filters"
 msgstr "ikili dosyaları textconv süzgeçleri ile işle"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:875
 msgid "search in subdirectories (default)"
 msgstr "altdizinlerde ara (öntanımlı)"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:877
 msgid "descend at most <depth> levels"
 msgstr "en çok <derinlik> düzey in"
 
-#: builtin/grep.c:868
+#: builtin/grep.c:881
 msgid "use extended POSIX regular expressions"
 msgstr "genişletilmiş POSIX düzenli ifadelerini kullan"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:884
 msgid "use basic POSIX regular expressions (default)"
 msgstr "temel POSIX düzenli ifadelerini kullan (öntanımlı)"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:887
 msgid "interpret patterns as fixed strings"
 msgstr "dizgileri sabit diziler olarak yorumla"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:890
 msgid "use Perl-compatible regular expressions"
 msgstr "Perl uyumlu düzenli ifadeler kullan"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:893
 msgid "show line numbers"
 msgstr "satır numaralarını göster"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:894
 msgid "show column number of first match"
 msgstr "ilk eşleşmenin sütun numarasını göster"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:895
 msgid "don't show filenames"
 msgstr "dosya adlarını gösterme"
 
-#: builtin/grep.c:883
+#: builtin/grep.c:896
 msgid "show filenames"
 msgstr "dosya adlarını göster"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:898
 msgid "show filenames relative to top directory"
 msgstr "dosya adlarını en üst dizine göreceli olarak göster"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:900
 msgid "show only filenames instead of matching lines"
 msgstr "eşleşen satırlar yerine yalnızca dosya adlarını göster"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:902
 msgid "synonym for --files-with-matches"
 msgstr "--files-with-matches eşanlamlısı"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:905
 msgid "show only the names of files without match"
 msgstr "eşleşme olmadan yalnızca dosya adlarını göster"
 
-#: builtin/grep.c:894
+#: builtin/grep.c:907
 msgid "print NUL after filenames"
 msgstr "dosya adlarından sonra NUL yazdır"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:910
 msgid "show only matching parts of a line"
 msgstr "yalnızca bir satırın eşleşen kısımlarını göster"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:912
 msgid "show the number of matches instead of matching lines"
 msgstr "eşleşen satırlar yerine eşleşme sayısını göster"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:913
 msgid "highlight matches"
 msgstr "eÅŸleÅŸmeleri vurgula"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:915
 msgid "print empty line between matches from different files"
 msgstr "başka dosyalardan olan eşleşmelerin arasına boş satır yazdır"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:917
 msgid "show filename only once above matches from same file"
 msgstr ""
 "aynı dosyadan olan eşleşmelerin üzerinde dosya adını yalnızca bir kez göster"
 
-#: builtin/grep.c:907
+#: builtin/grep.c:920
 msgid "show <n> context lines before and after matches"
 msgstr "eşleşmelerden önce ve sonra <n> satır bağlam göster"
 
-#: builtin/grep.c:910
+#: builtin/grep.c:923
 msgid "show <n> context lines before matches"
 msgstr "eşleşmelerden önce <n> satır bağlam göster"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:925
 msgid "show <n> context lines after matches"
 msgstr "eşleşmelerden sonra <n> satır bağlam göster"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:927
 msgid "use <n> worker threads"
 msgstr "<n> iş parçacığı kullan"
 
-#: builtin/grep.c:915
+#: builtin/grep.c:928
 msgid "shortcut for -C NUM"
 msgstr "-C NUM için kısayol"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:931
 msgid "show a line with the function name before matches"
 msgstr "eşleşmelerden önce işlev adının olduğu bir satır göster"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:933
 msgid "show the surrounding function"
 msgstr "çevresindeki işlevi göster"
 
-#: builtin/grep.c:923
+#: builtin/grep.c:936
 msgid "read patterns from file"
 msgstr "dizgileri dosyadan oku"
 
-#: builtin/grep.c:925
+#: builtin/grep.c:938
 msgid "match <pattern>"
 msgstr "<dizgi> ile eÅŸleÅŸ"
 
-#: builtin/grep.c:927
+#: builtin/grep.c:940
 msgid "combine patterns specified with -e"
 msgstr "-e ile belirtilen dizgileri birleÅŸtir"
 
-#: builtin/grep.c:939
+#: builtin/grep.c:952
 msgid "indicate hit with exit status without output"
 msgstr "çıkış durumu ile olan eşleşmelerde çıktı verme"
 
-#: builtin/grep.c:941
+#: builtin/grep.c:954
 msgid "show only matches from files that match all patterns"
 msgstr "yalnızca tüm dizgilerle eşleşen dosyalardan eşleşmeleri göster"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "pager"
 msgstr "sayfalayıcı"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "show matching files in the pager"
 msgstr "sayfalayıcıda eşleşen dosyaları göster"
 
-#: builtin/grep.c:948
+#: builtin/grep.c:961
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "grep(1)'in çağrılmasına izin ver (bu yapım tarafından yok sayıldı)"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1027
 msgid "no pattern given"
 msgstr "bir dizgi verilmedi"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:1063
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index veya --untracked revizyonlarla birlikte kullanılamaz"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:1071
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "revizyon çözülemiyor: %s"
 
-#: builtin/grep.c:1088
+#: builtin/grep.c:1101
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked, --recurse-submodules ile desteklenmiyor"
 
-#: builtin/grep.c:1092
+#: builtin/grep.c:1105
 msgid "invalid option combination, ignoring --threads"
 msgstr "geçersiz seçenek birleştirmesi, --threads yok sayılıyor"
 
-#: builtin/grep.c:1095 builtin/pack-objects.c:3930
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
 msgid "no threads support, ignoring --threads"
 msgstr "iş parçacığı desteği yok, --threads yok sayılıyor"
 
-#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "geçersiz belirtilen iş parçacığı sayısı (%d)"
 
-#: builtin/grep.c:1132
+#: builtin/grep.c:1145
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager yalnızca çalışma ağacında çalışır"
 
-#: builtin/grep.c:1158
+#: builtin/grep.c:1171
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached veya --untracked, --no-index ile birlikte kullanılamıyor"
 
-#: builtin/grep.c:1161
+#: builtin/grep.c:1174
 msgid "--untracked cannot be used with --cached"
 msgstr "--untracked, --cached ile birlikte kullanılamıyor"
 
-#: builtin/grep.c:1167
+#: builtin/grep.c:1180
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard, izlenen içerik için kullanılamıyor"
 
-#: builtin/grep.c:1175
+#: builtin/grep.c:1188
 msgid "both --cached and trees are given"
 msgstr "hem --cached hem ağaçlar verilmiş"
 
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -16142,97 +16455,109 @@ msgstr ""
 "git hash-object [-t <tür>] [-w] [--path=<dosya> | --no-filters] [--stdin] "
 "[--] <dosya>..."
 
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "nesne türü"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "nesneyi nesne veritabanına yaz"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "nesneyi stdin'den oku"
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "dosyayı süzgeçler olmadan olduğu gibi depola"
 
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "Git hata ayıklamasında kullanmak için çer çöp toplayarak hasarlı nesneler "
 "oluÅŸtur"
 
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "dosyayı sanki bu yoldanmış gibi işle"
 
-#: builtin/help.c:47
+#: builtin/help.c:55
 msgid "print all available commands"
 msgstr "tüm kullanılabilir komutları yazdır"
 
-#: builtin/help.c:48
+#: builtin/help.c:57
 msgid "exclude guides"
 msgstr "kılavuzları hariç tut"
 
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "kullanışlı kılavuzların listesini çıkar"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "tüm yapılandırma değişkenleri adlarını yazdır"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
 msgid "show man page"
 msgstr "man sayfasını göster"
 
-#: builtin/help.c:53
+#: builtin/help.c:59
 msgid "show manual in web browser"
 msgstr "kılavuzu web tarayıcısında göster"
 
-#: builtin/help.c:55
+#: builtin/help.c:61
 msgid "show info page"
 msgstr "bilgi sayfasını göster"
 
-#: builtin/help.c:57
+#: builtin/help.c:63
 msgid "print command description"
 msgstr "komut açıklamasını yazdır"
 
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<komut>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "kullanışlı kılavuzların listesini çıkar"
+
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "tüm yapılandırma değişkenleri adlarını yazdır"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<komut>]"
 
-#: builtin/help.c:163
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "tanımlanamayan yardım biçimi '%s'"
 
-#: builtin/help.c:190
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "emacsclient başlatılamadı."
 
-#: builtin/help.c:203
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "emacsclient sürümü ayrıştırılamadı."
 
-#: builtin/help.c:211
+#: 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:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: 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:307
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16241,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:319
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16250,331 +16575,314 @@ msgstr ""
 "'%s': desteklenmeyen man görüntüleyicisi komutu.\n"
 "Bunun yerine 'man.<araç>.path' kullanmayı düşünün."
 
-#: builtin/help.c:436
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': Bilinmeyen man görüntüleyicisi."
 
-#: builtin/help.c:453
+#: 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:461
+#: 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:520 builtin/help.c:531 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:534 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:563 builtin/help.c:593
+#: 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:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "kullanım: %s%s"
 
-#: builtin/help.c:577
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "ek bilgi için: 'git help config'"
 
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "%s konumunda nesne türü uyuşmazlığı"
 
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "beklenen nesne %s alınmadı"
 
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "nesne %s: beklenen tür %s, bulunan %s"
 
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "%d bayt doldurulamıyor"
 msgstr[1] "%d bayt doldurulamıyor"
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr "erken dosya sonu"
 
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "girdide okuma hatası"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "kullanılabilir olandan daha çok bayt kullanıldı"
 
-#: builtin/index-pack.c:325 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr "paket off_t'nin geçerli tanımı için çok büyük"
 
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "paket izin verilen en büyük boyutu aşıyor"
 
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "'%s' oluşturulamıyor"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "'%s' paket dosyası açılamıyor"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
 msgid "pack signature mismatch"
 msgstr "paket imzası uyuşmazlığı"
 
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "paket sürümü %<PRIu32> desteklenmiyor"
 
-#: builtin/index-pack.c:383
+#: builtin/index-pack.c:376
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "paketin %<PRIuMAX> ofsetinde hatalı nesne var: %s"
 
-#: builtin/index-pack.c:489
+#: builtin/index-pack.c:482
 #, c-format
 msgid "inflate returned %d"
 msgstr "şişirme programı %d döndürdü"
 
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:531
 msgid "offset value overflow for delta base object"
 msgstr "delta tabanı nesnesi için ofset değeri taşımı"
 
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:539
 msgid "delta base offset is out of bound"
 msgstr "delta tabanı ofseti sınırlar dışında"
 
-#: builtin/index-pack.c:554
+#: builtin/index-pack.c:547
 #, c-format
 msgid "unknown object type %d"
 msgstr "bilinmeyen nesne türü %d"
 
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:578
 msgid "cannot pread pack file"
 msgstr "paket dosyası 'pread' yapılamıyor"
 
-#: builtin/index-pack.c:587
+#: builtin/index-pack.c:580
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik"
 msgstr[1] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik"
 
-#: builtin/index-pack.c:613
+#: builtin/index-pack.c:606
 msgid "serious inflate inconsistency"
 msgstr "ciddi şişirme programı tutarsızlığı"
 
-#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788
-#: builtin/index-pack.c:827 builtin/index-pack.c:836
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "%s İLE SHA1 ÇARPIŞMASI BULUNDU!"
 
-#: builtin/index-pack.c:761 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
 #, c-format
 msgid "unable to read %s"
 msgstr "%s okunamıyor"
 
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:818
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "mevcut %s nesne bilgisi okunamıyor"
 
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:826
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "mevcut %s nesnesi okunamıyor"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:840
 #, c-format
 msgid "invalid blob object %s"
 msgstr "geçersiz %s ikili nesnesi"
 
-#: builtin/index-pack.c:850 builtin/index-pack.c:869
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
 msgid "fsck error in packed object"
 msgstr "paketlenmiş nesne içinde fsck hatası"
 
-#: builtin/index-pack.c:871
+#: builtin/index-pack.c:864
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "%s ögesinin tüm alt ögeleri ulaşılabilir değil"
 
-#: builtin/index-pack.c:932 builtin/index-pack.c:979
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
 msgstr "delta uygulanamadı"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Receiving objects"
 msgstr "Nesneler alınıyor"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Indexing objects"
 msgstr "Nesneler indeksleniyor"
 
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1190
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paket hasar görmüş (SHA1 uyumsuzluğu)"
 
-#: builtin/index-pack.c:1201
+#: builtin/index-pack.c:1195
 msgid "cannot fstat packfile"
 msgstr "paket dosyası fstat yapılamıyor"
 
-#: builtin/index-pack.c:1204
+#: builtin/index-pack.c:1198
 msgid "pack has junk at the end"
 msgstr "paket sonunda döküntüler var"
 
-#: builtin/index-pack.c:1216
+#: builtin/index-pack.c:1210
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "parse_pack_objects() içindeki karmaşa akıl almaz düzeyde"
 
-#: builtin/index-pack.c:1239
+#: builtin/index-pack.c:1233
 msgid "Resolving deltas"
 msgstr "Deltalar çözülüyor"
 
-#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "iş parçacığı oluşturulamadı: %s"
 
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1277
 msgid "confusion beyond insanity"
 msgstr "karmaşa akıl almaz düzeyde"
 
-#: builtin/index-pack.c:1289
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "%d yerel nesneyle tamamlandı"
 msgstr[1] "%d yerel nesneyle tamamlandı"
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "%s için beklenmedik kuyruk sağlaması (disk hasarı?)"
 
-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "paketin %d çözülmemiş deltası var"
 msgstr[1] "paketin %d çözülmemiş deltası var"
 
-#: builtin/index-pack.c:1329
+#: builtin/index-pack.c:1323
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "iliştirilen nesne söndürülemedi (%d)"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1419
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "yerel nesne %s hasarlı"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1440
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "paket dosyası adı '%s', '.%s' ile bitmiyor"
 
-#: builtin/index-pack.c:1470
+#: builtin/index-pack.c:1464
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "%s dosyası '%s' yazılamıyor"
 
-#: builtin/index-pack.c:1478
+#: builtin/index-pack.c:1472
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "yazılmış %s dosyası '%s' kapatılamıyor"
 
-#: builtin/index-pack.c:1504
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "geçici '*.%s' dosyası '%s' olarak yeniden adlandırılamıyor"
+
+#: builtin/index-pack.c:1514
 msgid "error while closing pack file"
 msgstr "paket dosyası kapatılırken hata"
 
-#: builtin/index-pack.c:1518
-msgid "cannot store pack file"
-msgstr "paket dosyası depolanamıyor"
-
-#: builtin/index-pack.c:1526
-msgid "cannot store index file"
-msgstr "indeks dosyası depolanamıyor"
-
-#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "hatalı pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1643
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Mevcut paket dosyası '%s' açılamıyor"
 
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1645
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "'%s' için mevcut paket idx dosyası açılamıyor"
 
-#: builtin/index-pack.c:1701
+#: builtin/index-pack.c:1693
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "delta deÄŸil: %d nesne"
 msgstr[1] "delta deÄŸil: %d nesne"
 
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1700
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "zincir uzunluÄŸu = %d: %lu nesne"
 msgstr[1] "zincir uzunluÄŸu = %d: %lu nesne"
 
-#: builtin/index-pack.c:1750
+#: builtin/index-pack.c:1742
 msgid "Cannot come back to cwd"
 msgstr "Şu anki çalışma dizinine geri gelinemiyor"
 
-#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
-#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
 #, c-format
 msgid "bad %s"
 msgstr "hatalı %s"
 
-#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "bilinmeyen sağlama algoritması '%s'"
 
-#: builtin/index-pack.c:1852
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin, --stdin olmadan kullanılamaz"
-
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin bir git dizini gerektirir"
 
-#: builtin/index-pack.c:1856
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format, --stdin olmadan kullanılamaz"
-
-#: builtin/index-pack.c:1871
+#: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify ile bir paket dosyası adı verilmedi"
 
-#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "paket nesnelerinde fsck hatası"
 
@@ -16618,56 +16926,56 @@ msgstr "şablonlar %s içinde bulunamadı"
 msgid "not copying templates from '%s': %s"
 msgstr "şablonlar '%s' konumundan kopyalanmıyor: %s"
 
-#: builtin/init-db.c:262
+#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "geçersiz başlangıç dalı adı: '%s'"
 
-#: builtin/init-db.c:353
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "%d dosya türü ele alınamıyor"
 
-#: builtin/init-db.c:356
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "%s şuraya taşınamıyor: %s"
 
-#: builtin/init-db.c:372
+#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr "depoyu baÅŸka bir saÄŸlama ile yeniden ilklendirme deneniyor"
 
-#: builtin/init-db.c:396 builtin/init-db.c:399
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s halihazırda var"
 
-#: builtin/init-db.c:431
+#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: --initial-branch=%s yok sayıldı"
 
-#: builtin/init-db.c:462
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "%s%s içindeki mevcut paylaşılan Git deposu yeniden ilklendirildi\n"
 
-#: builtin/init-db.c:463
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "%s%s içindeki mevcut Git deposu yeniden ilklendirildi\n"
 
-#: builtin/init-db.c:467
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "%s%s içinde paylaşılan boş Git deposu ilklendirildi\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "%s%s içinde boş Git deposu ilklendirildi\n"
 
-#: builtin/init-db.c:517
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -16675,41 +16983,37 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<ÅŸablon-dizini>] [--"
 "shared[=<izinler>]] [<dizin>]"
 
-#: builtin/init-db.c:543
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "izinler"
 
-#: builtin/init-db.c:544
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "git deposunun kullanıcılar arasında paylaşıp paylaşılmayacağını belirt"
 
-#: builtin/init-db.c:550
+#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "başlangıç dalının adını geçersiz kıl"
 
-#: builtin/init-db.c:551 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "saÄŸlama"
 
-#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "kullanılacak sağlama algoritmasını belirle"
 
-#: builtin/init-db.c:559
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir ve --bare birlikte kullanılamaz"
-
-#: builtin/init-db.c:590 builtin/init-db.c:595
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "%s mkdir yapılamıyor"
 
-#: builtin/init-db.c:599 builtin/init-db.c:654
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "%s ögesine chdir yapılamıyor"
 
-#: builtin/init-db.c:626
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -16718,12 +17022,12 @@ msgstr ""
 "%s (veya --work-tree=<dizin>), %s (veya --git-dir=<dizin>) belirlenmeden "
 "izin verilmiyor"
 
-#: builtin/init-db.c:678
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "'%s' çalışma ağacı erişilemiyor"
 
-#: builtin/init-db.c:683
+#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir, çıplak depo ile uyumsuz"
 
@@ -16832,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:303
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Son çıktı: %d %s\n"
 
-#: builtin/log.c:568
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: hatalı dosya"
 
-#: builtin/log.c:583 builtin/log.c:673
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr "%s nesnesi okunamadı"
 
-#: builtin/log.c:698
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "bilinmeyen tür: %d"
 
-#: builtin/log.c:843
+#: 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:850
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers deÄŸere iye deÄŸil"
 
-#: builtin/log.c:979
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "%s yama dosyası okunamıyor"
 
-#: builtin/log.c:996
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "bir tam erim gerekiyor"
 
-#: builtin/log.c:1006
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "bir erim deÄŸil"
 
-#: builtin/log.c:1170
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "ön yazı için e-posta biçimi gerekli"
 
-#: builtin/log.c:1176
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "cover-letter dosyası oluşturulamadı"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "akıl almaz in-reply-to: %s"
 
-#: builtin/log.c:1290
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<seçenekler>] [<-beri> | <revizyon-erimi>]"
 
-#: builtin/log.c:1348
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "iki çıktı dizini?"
 
-#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#: 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:1510 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:1519
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "kesin birleştirme temeli bulunamadı"
 
-#: builtin/log.c:1529
+#: 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"
@@ -16921,418 +17225,410 @@ msgstr ""
 "izleyin. Bunun dışında taban işlemesini kendiniz --base=<taban-işlemesi-no>\n"
 "kullanarak el ile belirtebilirsiniz."
 
-#: builtin/log.c:1552
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "kesin birleştirme temeli bulunamadı"
 
-#: builtin/log.c:1569
+#: 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:1579
+#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr "taban işlemesi revizyon listesinde olmamalı"
 
-#: builtin/log.c:1637
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "yama numarası alınamıyor"
 
-#: builtin/log.c:1700
+#: 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:1702
+#: 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:1746
+#: 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:1749
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "birden çok yama bile olsa [PATCH] kullan"
 
-#: builtin/log.c:1753
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "yamaları standart çıktıya yazdır"
 
-#: builtin/log.c:1755
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "bir ön yazı oluştur"
 
-#: builtin/log.c:1757
+#: 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:1758
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "sonek"
 
-#: builtin/log.c:1759
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "'.patch' yerine <sonek> kullan"
 
-#: builtin/log.c:1761
+#: 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:1762
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "reroll-count"
 
-#: builtin/log.c:1763
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "diziyi n. deneme olarak imle"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "çıktı dosya adının olabilecek en çok uzunluğu"
 
-#: builtin/log.c:1767
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "[PATCH] yerine [RFC PATCH] kullan"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "açıklama kipinden kapak sayfası kipi"
 
-#: builtin/log.c:1771
+#: 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:1773
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "[PATCH] yerine [<önek>] kullan"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "ortaya çıkan dosyaları <dizin>'de depola"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "[PATCH]'i soyma/ekleme"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "ikili diff'leri çıktı verme"
 
-#: builtin/log.c:1784
+#: 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:1786
+#: 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:1788
+#: 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:1790
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "Ä°letileÅŸme"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1809
 msgid "header"
 msgstr "üstbilgi"
 
-#: builtin/log.c:1792
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "e-posta üstbilgisi ekle"
 
-#: builtin/log.c:1793 builtin/log.c:1794
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "e-posta"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "To: üstbilgisi ekle"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "Cc: üstbilgisi ekle"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "tanımlayıcı"
 
-#: builtin/log.c:1796
+#: 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:1798
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "ileti no"
 
-#: builtin/log.c:1799
+#: 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:1800 builtin/log.c:1803
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "sınır"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "yamayı ekle"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "yamayı iletiye koy"
 
-#: builtin/log.c:1808
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr "iletileri kataloglamayı etkinleştir, stiller: shallow, deep"
 
-#: builtin/log.c:1810
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "imza"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "imza ekle"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "taban iÅŸleme"
 
-#: builtin/log.c:1813
+#: 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:1816
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "dosyadan bir imza ekle"
 
-#: builtin/log.c:1817
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "yama dosya adlarını yazdırma"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "yamalar oluşturulurken ilerlemeyi göster"
 
-#: builtin/log.c:1821
+#: 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:1824
+#: 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:1826 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:1913
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "geçersiz tanımlayıcı satırı: %s"
 
-#: builtin/log.c:1928
-msgid "-n and -k are mutually exclusive"
-msgstr "-n ve -k birlikte kullanılamaz"
-
-#: builtin/log.c:1930
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc ve -k birlikte kullanılamaz"
-
-#: builtin/log.c:1938
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only bir anlam ifade etmiyor"
 
-#: builtin/log.c:1940
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status bir anlam ifade etmiyor"
 
-#: builtin/log.c:1942
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check bir anlam ifade etmiyor"
 
-#: builtin/log.c:1964
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output ve --output-directory  birlikte kullanılamaz"
-
-#: builtin/log.c:2087
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff, --cover-letter veya tek yama gerektiriyor"
 
-#: builtin/log.c:2091
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2092
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff v%d karşısında:"
 
-#: builtin/log.c:2098
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor, --range-diff gerektiriyor"
-
-#: builtin/log.c:2102
+#: 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:2110
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:2111
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff v%d karşısında:"
 
-#: builtin/log.c:2122
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "'%s' imza dosyası okunamıyor"
 
-#: builtin/log.c:2158
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "Yamalar oluÅŸturuluyor"
 
-#: builtin/log.c:2202
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "çıktı dosyaları oluşturulamadı"
 
-#: builtin/log.c:2261
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<üstkaynak> [<dal-ucu> [<sınır>]]]"
 
-#: builtin/log.c:2315
+#: 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:563
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<seçenekler>] [<dosya>...]"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "yolları NUL karakteri ile ayır"
+
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "dosya durumunu etiketlerle tanımla"
 
-#: builtin/ls-files.c:621
+#: 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:623
+#: 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:625
+#: 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:627
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "silinen dosyaları çıktıda göster"
 
-#: builtin/ls-files.c:629
+#: 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:631
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "diğer dosyaları çıktıda göster"
 
-#: builtin/ls-files.c:633
+#: 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:636
+#: 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:638
+#: 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:640
+#: 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:642
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "dosyaların satır sonlarını göster"
 
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "boş dizinleri gösterme"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "birleştirilmemiş dosyaları çıktıda göster"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "'resolve-undo' bilgisini göster"
 
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "dizgi ile eşleşen dosyaları atla"
 
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "hariç tutma dizgileri <dosya>'dan okunuyor"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "hariç bırakma dizgilerini <dosya>'dan oku"
 
-#: builtin/ls-files.c:657
+#: 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:659
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "standart git hariç tutmalarını ekle"
 
-#: builtin/ls-files.c:663
+#: 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:666
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "altmodüller içinden özyinele"
 
-#: builtin/ls-files.c:668
+#: 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:669
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "ağacımsı"
 
-#: builtin/ls-files.c:670
+#: 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:672
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "hata ayıklama verisini göster"
 
-#: builtin/ls-files.c:674
+#: 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"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<repository> [<refs>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repository> [<refs>...]]"
 msgstr ""
-"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<depo> [<baÅŸvurular>...]]"
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<çlştr>]\n"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<depo> [<baÅŸvurular>...]]"
 
 #: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "uzak konum URL'sini yazdırma"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
 msgid "exec"
 msgstr "çalıştır"
 
@@ -17449,7 +17745,7 @@ msgstr "alıntılanmış CR bulunduğu zaman yapılacak eylem"
 msgid "use headers in message's body"
 msgstr "ileti gövdesinde üstbilgi kullan"
 
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "boÅŸ mbox: '%s'"
@@ -17511,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"
 
@@ -17565,191 +17865,187 @@ msgstr "'%s' başvurusu çözülemedi"
 msgid "Merging %s with %s\n"
 msgstr "%s, %s ile birleÅŸtiriliyor\n"
 
-#: builtin/merge.c:58
+#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<seçenekler>] [<işleme>...]"
 
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "'m' anahtarı bir değer gerektiriyor"
 
-#: builtin/merge.c:146
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "'%s' seçeneği bir değer gerektiriyor"
 
-#: builtin/merge.c:199
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Birleştirme stratejisi '%s' bulunamadı.\n"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Kullanılabilir stratejiler:"
 
-#: builtin/merge.c:205
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Kullanılabilir özel stratejiler:"
 
-#: builtin/merge.c:256 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 "birleştirmenin sonunda bir diffstat gösterme"
 
-#: builtin/merge.c:259 builtin/pull.c:136
+#: 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:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(--stat eşanlamlısı)"
 
-#: builtin/merge.c:262 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 ""
 "kısa günlükten birleştirme işlemesi iletisine girdiler (en çok <n>) ekle"
 
-#: builtin/merge.c:265 builtin/pull.c:148
+#: 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:267 builtin/pull.c:151
+#: 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:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "göndermeden önce iletiyi düzenle"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "ileri sarıma izin ver (öntanımlı)"
 
-#: builtin/merge.c:273 builtin/pull.c:161
+#: 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:277 builtin/pull.c:164
+#: 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:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: 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:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "kullanılacak birleştirme stratejisi"
 
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "seçenek=değer"
 
-#: builtin/merge.c:281 builtin/pull.c:173
+#: 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:283
+#: 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:290
+#: 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:292
+#: 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:294
+#: 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:296 builtin/pull.c:180
+#: 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:303
+#: 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:320
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "zula yapılamadı"
 
-#: builtin/merge.c:325
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "zulalama başarısız oldu"
 
-#: builtin/merge.c:330
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "geçerli bir nesne değil: %s"
 
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree başarısız oldu"
 
-#: builtin/merge.c:400
+#: 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:414
+#: 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:464
+#: 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:602
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Hatalı branch.%s.mergeoptions dizisi: %s"
 
-#: builtin/merge.c:728
+#: 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:741
+#: builtin/merge.c:745
 #, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "merge-recursive için geçersiz seçenek: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "bilinmeyen strateji seçeneği: -X%s"
 
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
+#: 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:812
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Şu konumdan okunamadı: '%s'"
 
-#: builtin/merge.c:821
+#: 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:827
+#: 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"
@@ -17759,11 +18055,11 @@ msgstr ""
 "girin, özellikle güncellenmiş bir üstkaynağı kişisel dala birleştiriyorsa.\n"
 "\n"
 
-#: builtin/merge.c:832
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "BoÅŸ bir ileti iÅŸlemeyi iptal eder.\n"
 
-#: builtin/merge.c:835
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17772,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:888
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "BoÅŸ iÅŸleme iletisi."
 
-#: builtin/merge.c:903
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Harika.\n"
 
-#: builtin/merge.c:964
+#: 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:1003
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "Geçerli dal yok."
 
-#: builtin/merge.c:1005
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "Geçerli dal için uzak konum yok."
 
-#: builtin/merge.c:1007
+#: 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:1012
+#: 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:1069
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Hatalı değer '%s', '%s' ortamında"
 
-#: builtin/merge.c:1172
+#: 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:1206
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "birleÅŸtirebileceÄŸimiz bir ÅŸey deÄŸil"
 
-#: builtin/merge.c:1316
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort bir argüman beklemez"
 
-#: builtin/merge.c:1320
+#: 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:1338
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit bir argüman beklemez"
 
-#: builtin/merge.c:1351
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue bir argüman beklemez"
 
-#: builtin/merge.c:1355
+#: 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:1371
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17845,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:1378
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17853,89 +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:1381
+#: 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:1395
-msgid "You cannot combine --squash with --no-ff."
-msgstr "--squash ile --no-ff birlikte kullanılamaz."
-
-#: builtin/merge.c:1397
-msgid "You cannot combine --squash with --commit."
-msgstr "--squash ile --commit birlikte kullanılamaz."
-
-#: builtin/merge.c:1413
+#: 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:1430
+#: 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:1432
+#: 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:1437
+#: 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:1439
+#: 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:1520
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "birbiriyle ilişkisi olmayan geçmişleri birleştirme reddediliyor"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Güncelleniyor: %s..%s\n"
 
-#: builtin/merge.c:1585
+#: 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:1592
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "Yok.\n"
 
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr "İleri sarma olanaklı değil, iptal ediliyor."
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: 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:1655
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "%s birleÅŸtirme stratejisi deneniyor...\n"
 
-#: builtin/merge.c:1707
+#: 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:1709
+#: 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:1718
+#: builtin/merge.c:1735
 #, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "El ile çözümü hazırlamak için %s kullanılıyor.\n"
+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:1732
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -17970,15 +18254,15 @@ msgstr "etiketlenmiş nesne '%s' okunamadı"
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr "'%s' nesnesi '%s' olarak etiketlenmiş; ancak bir '%s' türü"
 
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr "stdin üzerindeki etiket bizim sıkı fsck denetimimizi geçemedi"
 
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
 msgid "tag on stdin did not refer to a valid object"
 msgstr "stdin üzerindeki etiket geçerli bir nesneye başvurmuyor"
 
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "etiket dosyası yazılamıyor"
 
@@ -17999,34 +18283,50 @@ msgid "allow creation of more than one tree"
 msgstr "birden çok ağacın oluşturulmasına izin ver"
 
 #: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<seçenekler>] write [--preferred-pack=<paket>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<seçenekler>] write [--preferred-pack=<paket>][--refs-"
+"snapshot=<yol>]"
 
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
 msgid "git multi-pack-index [<options>] verify"
 msgstr "git multi-pack-index [<seçenekler>] verify"
 
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<seçenekler>] expire"
 
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<seçenekler>] repack [--batch-size=<boyut>]"
 
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr "nesne dizini paket dosyası seti ve pack-index eşleri içeriyor"
 
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
 msgid "preferred-pack"
 msgstr "preferred-pack"
 
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr "bir çoklu paket biteşlemi hesaplanırken yeniden kullanılacak paket"
 
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "çoklu paket biteşlemi yaz"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "yalnızca verilen indeksleri içeren çoklu paket indekslerini yaz"
+
+#: builtin/multi-pack-index.c:107
+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:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18034,11 +18334,6 @@ msgstr ""
 "yeniden paketleme sırasında daha küçük boyutlu paket dosyalarını bu boyuttan "
 "daha büyük bir toplu iş olarak toplayın"
 
-#: builtin/multi-pack-index.c:180
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "tanımlanamayan altkomut: %s"
-
 #: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<seçenekler>] <kaynak>... <hedef>"
@@ -18067,117 +18362,117 @@ msgstr "hedef var olsa bile zorla taşı/yeniden adlandır"
 msgid "skip move/rename errors"
 msgstr "taşı/yeniden adlandır hatalarını atla"
 
-#: builtin/mv.c:170
+#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "'%s' hedefi bir dizin deÄŸil"
 
-#: builtin/mv.c:181
+#: builtin/mv.c:184
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "'%s'->'%s' yeniden adlandırması denetleniyor\n"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:190
 msgid "bad source"
 msgstr "hatalı kaynak"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "dizin kendi içine taşınamıyor"
 
-#: builtin/mv.c:191
+#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "dizin dosya üzerinden taşınamıyor"
 
-#: builtin/mv.c:200
+#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "kaynak dizin boÅŸ"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "sürüm denetimi altında değil"
 
-#: builtin/mv.c:227
+#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "çakışmalı"
 
-#: builtin/mv.c:230
+#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "hedef mevcut"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "üzerine yazılıyor: '%s'"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "Üzerine yazılamıyor"
 
-#: builtin/mv.c:244
+#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "aynı hedef için birden çok kaynak"
 
-#: builtin/mv.c:246
+#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "hedef dizin mevcut deÄŸil"
 
-#: builtin/mv.c:253
+#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, kaynak=%s, hedef:%s"
 
-#: builtin/mv.c:274
+#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "%s, %s olarak yeniden adlandırılıyor\n"
 
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: 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)"
 
@@ -18295,61 +18590,61 @@ 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:197
+#: 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:206
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "not nesnesi yazılamıyor"
 
-#: builtin/notes.c:208
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "not içeriği %s içinde bırakıldı"
 
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "'%s' açılamadı veya okunamadı"
 
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "'%s' geçerli bir başvuru olarak çözülemedi"
 
-#: builtin/notes.c:265
+#: builtin/notes.c:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "'%s' nesnesi okunamadı."
 
-#: builtin/notes.c:268
+#: builtin/notes.c:266
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "İkili nesne olmayan '%s' nesnesinden not verisi okunamıyor."
 
-#: builtin/notes.c:309
+#: builtin/notes.c:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "hatalı oluşturulmuş girdi satırı: '%s'"
 
-#: builtin/notes.c:324
+#: builtin/notes.c:322
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "notlar '%s' konumundan '%s' konumuna kopyalanamadı"
@@ -18357,48 +18652,48 @@ msgstr "notlar '%s' konumundan '%s' konumuna kopyalanamadı"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "notları %s yapma (%s içinde) reddediliyor (refs/notes/ dışında)"
 
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: 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: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"
 
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
 #, c-format
 msgid "no note found for object %s."
 msgstr "%s nesnesi için not bulunamadı."
 
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "not içeriği dizi olarak"
 
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "not içeriği bir dosyada"
 
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
 msgid "reuse and edit specified note object"
 msgstr "belirtilen not nesnesini düzenle ve yeniden kullan"
 
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "belirtilen not nesnesini yeniden kullan"
 
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "boş not depolamasına izin ver"
 
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "var olan notları başkalarıyla değiştir"
 
-#: builtin/notes.c:448
+#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18407,29 +18702,29 @@ msgstr ""
 "Not eklenemiyor. %s nesnesi için halihazırda var olan notlar bulundu. Bu "
 "notların üzerine yazmak için '-f' kullanın."
 
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
 #, c-format
 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:475 builtin/notes.c:637 builtin/notes.c:902
+#: 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"
 
-#: builtin/notes.c:497
+#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "nesneleri stdin'den oku"
 
-#: builtin/notes.c:499
+#: builtin/notes.c:497
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "<komut> için yapılandırma yeniden yazımını yükle (--stdin ima eder)"
 
-#: builtin/notes.c:517
+#: builtin/notes.c:515
 msgid "too few arguments"
 msgstr "pek az argüman"
 
-#: builtin/notes.c:538
+#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18438,12 +18733,12 @@ msgstr ""
 "Notlar kopyalanamıyor. %s nesnesi için halihazırda var olan notlar bulundu. "
 "Bu notların üzerine yazmak için '-f' kullanın."
 
-#: builtin/notes.c:550
+#: builtin/notes.c:548
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "%s kaynak nesnesi için not eksik. Kopyalanamıyor."
 
-#: builtin/notes.c:603
+#: builtin/notes.c:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18452,52 +18747,52 @@ msgstr ""
 "'edit' altkomutunun -m/-F/-c/-C seçenekleri artık eski ve kullanılmamalı.\n"
 "Lütfen bunun yerine 'git notes add -f -m/-F/-c/-C' kullanın.\n"
 
-#: builtin/notes.c:698
+#: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "NOTES_MERGE_PARTIAL baÅŸvurusu silinemedi"
 
-#: builtin/notes.c:700
+#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "NOTES_MERGE_REF baÅŸvurusu silinemedi"
 
-#: builtin/notes.c:702
+#: builtin/notes.c:700
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "'git remove merge' çalışma ağacı kaldırılamadı"
 
-#: builtin/notes.c:722
+#: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "NOTES_MERGE_PARTIAL başvurusu okunamadı"
 
-#: builtin/notes.c:724
+#: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "işleme, NOTES_MERGE_PARTIAL ögesinden bulunamadı."
 
-#: builtin/notes.c:726
+#: builtin/notes.c:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "işleme, NOTES_MERGE_PARTIAL ögesinden ayrıştırılamadı"
 
-#: builtin/notes.c:739
+#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "NOTES_MERGE_REF çözülemedi"
 
-#: builtin/notes.c:742
+#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "not birleştirilmesi tamamlanamadı"
 
-#: builtin/notes.c:768
+#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "bilinmeyen not birleÅŸtirme stratejisi %s"
 
-#: builtin/notes.c:784
+#: builtin/notes.c:782
 msgid "General options"
 msgstr "Genel seçenekler"
 
-#: builtin/notes.c:786
+#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Birleştirme seçenekleri"
 
-#: builtin/notes.c:788
+#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -18505,46 +18800,46 @@ msgstr ""
 "not çakışmalarını verilen stratejiyi kullanarak çöz (el ile/bizimkionlarınki/"
 "birlik olmuÅŸ/cat_sort_uniq)"
 
-#: builtin/notes.c:790
+#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "BirleÅŸtirilmemiÅŸ notlar iÅŸleniyor"
 
-#: builtin/notes.c:792
+#: builtin/notes.c:790
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "birleştirilmemiş notları işleyerek not birleştirmesini tamamla"
 
-#: builtin/notes.c:794
+#: builtin/notes.c:792
 msgid "Aborting notes merge resolution"
 msgstr "Notlar birleştirmesi çözümü iptal ediliyor"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "not birleÅŸtirmesini iptal et"
 
-#: builtin/notes.c:807
+#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "--commit, --abort veya -s/--strategy karıştırılamıyor"
 
-#: builtin/notes.c:812
+#: builtin/notes.c:810
 msgid "must specify a notes ref to merge"
 msgstr "birleştirmek için bir not başvurusu belirtilmeli"
 
-#: builtin/notes.c:836
+#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "bilinmeyen -s/--strategy: %s"
 
-#: builtin/notes.c:873
+#: 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:876
+#: 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:878
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18555,59 +18850,59 @@ 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:897 builtin/tag.c:589
+#: 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:900
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "%s nesnesinin notu yok\n"
 
-#: builtin/notes.c:912
+#: 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:915
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr "nesne adlarını standart girdi'den oku"
 
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
+#: 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:955
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "budanmış notları kaldır"
 
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "not baÅŸvurusu"
 
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "notları <not-bşvr>'ndan kullan"
 
-#: builtin/notes.c:1034 builtin/stash.c:1739
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "bilinmeyen altkomut: %s"
 
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<seçenekler>...] [< <bşvr-liste> | < <nesne-"
 "liste>]"
 
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<sçnklr>...] <base-name> [< <bşvr-liste> | < <nesne-liste>]"
 
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18616,108 +18911,112 @@ msgstr ""
 "write_reuse_object: %s bulunamıyor, %<PRIuMAX> ofsetinde bekleniyordu (%s "
 "paketinde)"
 
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "%s için hatalı paketlenmiş nesne CRC'si"
 
-#: builtin/pack-objects.c:459
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "%s için hasar görmüş paketlenmiş nesne"
 
-#: builtin/pack-objects.c:590
+#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "%s nesnesi için özyineli delta algılandı"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u nesne sipariÅŸ verildi, %<PRIu32> bekleniyordu"
 
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "ÅŸu paketin %<PRIuMAX> ofsetinde nesne bekleniyordu: %s"
 
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1160
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "biteşlem yazımı kapatılıyor, paketler pack.packSizeLimit dolayısıyla "
 "parçalara ayrılmış"
 
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
 msgid "Writing objects"
 msgstr "Nesneler yazılıyor"
 
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "%s bilgileri alınamıyor"
 
-#: builtin/pack-objects.c:1141
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "biteşlem indeksi yazılamadı"
+
+#: builtin/pack-objects.c:1294
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "%<PRIu32> nesne yazıldı (%<PRIu32> bekleniyordu)"
 
-#: builtin/pack-objects.c:1383
+#: builtin/pack-objects.c:1536
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "bazı nesneler paketlenmediğinden dolayı biteşlem yazımı kapatılıyor"
 
-#: builtin/pack-objects.c:1831
+#: builtin/pack-objects.c:1984
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "%s için paket içinde delta taban ofset taşımı"
 
-#: builtin/pack-objects.c:1840
+#: builtin/pack-objects.c:1993
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "%s için delta taban ofseti sınırların dışında"
 
-#: builtin/pack-objects.c:2121
+#: builtin/pack-objects.c:2274
 msgid "Counting objects"
 msgstr "Nesneler sayılıyor"
 
-#: builtin/pack-objects.c:2266
+#: builtin/pack-objects.c:2439
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "%s nesne üstbilgisi ayrıştırılamıyor"
 
-#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
-#: builtin/pack-objects.c:2362
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
 #, c-format
 msgid "object %s cannot be read"
 msgstr "%s nesnesi okunamıyor"
 
-#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "%s nesnesi için tutarsız nesne uzunluğu (%<PRIuMAX> / %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2376
+#: builtin/pack-objects.c:2549
 msgid "suboptimal pack - out of memory"
 msgstr "standart altı paket - bellek yetersiz"
 
-#: builtin/pack-objects.c:2691
+#: builtin/pack-objects.c:2864
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Delta sıkıştırması %d iş parçacığı kullanıyor"
 
-#: builtin/pack-objects.c:2830
+#: builtin/pack-objects.c:3003
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "%s etiketinden ulaşılabilir nesneler paketlenemiyor"
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:3089
 msgid "Compressing objects"
 msgstr "Nesneler sıkıştırılıyor"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:3095
 msgid "inconsistency with delta count"
 msgstr "delta sayımında tutarsızlık"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3174
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18726,7 +19025,7 @@ msgstr ""
 "uploadpack.blobpackfileuri değeri '<nesne-sağlaması> <paket-sağlaması> <uri> "
 "biçiminde olmalıdır ('%s' alındı)"
 
-#: builtin/pack-objects.c:3004
+#: builtin/pack-objects.c:3177
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -18734,17 +19033,18 @@ msgstr ""
 "nesne halihazırda başka bir uploadpack.blobpackfileuri içinde yapılandırıldı "
 "('%s' alındı)"
 
-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3212
 #, c-format
 msgid "could not get type of object %s in pack %s"
 msgstr "%s nesnesinin türü alınamıyor (%s paketinde)"
 
-#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "'%s' paketi bulunamadı"
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3408
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -18753,7 +19053,7 @@ msgstr ""
 "sınır nesnesi numarası bekleniyordu, anlamsız veri alındı:\n"
 " %s"
 
-#: builtin/pack-objects.c:3224
+#: builtin/pack-objects.c:3414
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -18762,249 +19062,245 @@ msgstr ""
 "nesne numarası bekleniyordu, anlamsız veri alındı:\n"
 "%s"
 
-#: builtin/pack-objects.c:3322
+#: builtin/pack-objects.c:3507
 msgid "invalid value for --missing"
 msgstr "--missing için geçersiz değer"
 
-#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
 msgid "cannot open pack index"
 msgstr "paket indeksi açılamıyor"
 
-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3541
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "%s konumundaki gevÅŸek nesne incelenemedi"
 
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3627
 msgid "unable to force loose object"
 msgstr "gevşek nesne zorlanamıyor"
 
-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3757
 #, c-format
 msgid "not a rev '%s'"
 msgstr "bir revizyon deÄŸil: '%s'"
 
-#: builtin/pack-objects.c:3631
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "hatalı revizyon: '%s'"
 
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3788
 msgid "unable to add recent objects"
 msgstr "en son nesneler eklenemiyor"
 
-#: builtin/pack-objects.c:3712
+#: builtin/pack-objects.c:3841
 #, c-format
 msgid "unsupported index version %s"
 msgstr "desteklenmeyen indeks sürümü %s"
 
-#: builtin/pack-objects.c:3716
+#: builtin/pack-objects.c:3845
 #, c-format
 msgid "bad index version '%s'"
 msgstr "hatalı indeks sürümü '%s'"
 
-#: builtin/pack-objects.c:3755
+#: builtin/pack-objects.c:3884
 msgid "<version>[,<offset>]"
 msgstr "<sürüm>[,<ofset>]"
 
-#: builtin/pack-objects.c:3756
+#: builtin/pack-objects.c:3885
 msgid "write the pack index file in the specified idx format version"
 msgstr "paket indeks dosyasını belirtilen idx biçiminde yaz"
 
-#: builtin/pack-objects.c:3759
+#: builtin/pack-objects.c:3888
 msgid "maximum size of each output pack file"
 msgstr "her çıktı paketi dosyasının olabilecek en büyük boyutu"
 
-#: builtin/pack-objects.c:3761
+#: builtin/pack-objects.c:3890
 msgid "ignore borrowed objects from alternate object store"
 msgstr "alternatif nesne mağazasından ödünç alınan nesneleri yok say"
 
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c:3892
 msgid "ignore packed objects"
 msgstr "paketlenmiÅŸ nesneleri yok say"
 
-#: builtin/pack-objects.c:3765
+#: builtin/pack-objects.c:3894
 msgid "limit pack window by objects"
 msgstr "paket penceresini nesnelerle sınırla"
 
-#: builtin/pack-objects.c:3767
+#: builtin/pack-objects.c:3896
 msgid "limit pack window by memory in addition to object limit"
 msgstr "paket penceresini nesne limitine ek olarak bellek ile kısıtla"
 
-#: builtin/pack-objects.c:3769
+#: builtin/pack-objects.c:3898
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "ortaya çıkan pakette olabilecek en büyük delta zincirinin uzunluğu"
 
-#: builtin/pack-objects.c:3771
+#: builtin/pack-objects.c:3900
 msgid "reuse existing deltas"
 msgstr "var olan deltaları yeniden kullan"
 
-#: builtin/pack-objects.c:3773
+#: builtin/pack-objects.c:3902
 msgid "reuse existing objects"
 msgstr "var olan nesneleri yeniden kullan"
 
-#: builtin/pack-objects.c:3775
+#: builtin/pack-objects.c:3904
 msgid "use OFS_DELTA objects"
 msgstr "OFS_DELTA nesneleri kullan"
 
-#: builtin/pack-objects.c:3777
+#: builtin/pack-objects.c:3906
 msgid "use threads when searching for best delta matches"
 msgstr "en iyi delta eşleşmelerini ararken iş parçacıklarını kullan"
 
-#: builtin/pack-objects.c:3779
+#: builtin/pack-objects.c:3908
 msgid "do not create an empty pack output"
 msgstr "boş bir paket çıktısı oluşturma"
 
-#: builtin/pack-objects.c:3781
+#: builtin/pack-objects.c:3910
 msgid "read revision arguments from standard input"
 msgstr "revizyon argümanlarını standart girdi'den oku"
 
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:3912
 msgid "limit the objects to those that are not yet packed"
 msgstr "nesneleri henüz paketlenmeyenlere kısıtla"
 
-#: builtin/pack-objects.c:3786
+#: builtin/pack-objects.c:3915
 msgid "include objects reachable from any reference"
 msgstr "herhangi bir başvurudan ulaşılabilir olan nesneleri içer"
 
-#: builtin/pack-objects.c:3789
+#: builtin/pack-objects.c:3918
 msgid "include objects referred by reflog entries"
 msgstr "başvuru günlüğü tarafından başvurulan nesneleri içer"
 
-#: builtin/pack-objects.c:3792
+#: builtin/pack-objects.c:3921
 msgid "include objects referred to by the index"
 msgstr "indeks tarafından başvurulan nesneleri içer"
 
-#: builtin/pack-objects.c:3795
+#: builtin/pack-objects.c:3924
 msgid "read packs from stdin"
 msgstr "paketleri stdin'den oku"
 
-#: builtin/pack-objects.c:3797
+#: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
 msgstr "paketi stdout'a çıktı ver"
 
-#: builtin/pack-objects.c:3799
+#: builtin/pack-objects.c:3928
 msgid "include tag objects that refer to objects to be packed"
 msgstr "paketlenecek nesnelere başvuran etiket nesnelerini içer"
 
-#: builtin/pack-objects.c:3801
+#: builtin/pack-objects.c:3930
 msgid "keep unreachable objects"
 msgstr "ulaşılamayan nesneleri tut"
 
-#: builtin/pack-objects.c:3803
+#: builtin/pack-objects.c:3932
 msgid "pack loose unreachable objects"
 msgstr "ulaşılamayan gevşek nesneleri paketle"
 
-#: builtin/pack-objects.c:3805
+#: builtin/pack-objects.c:3934
 msgid "unpack unreachable objects newer than <time>"
 msgstr "<zaman>'dan daha yeni ulaşılamayan nesneleri aç"
 
-#: builtin/pack-objects.c:3808
+#: builtin/pack-objects.c:3937
 msgid "use the sparse reachability algorithm"
 msgstr "aralıklı ulaşılabilirlik algoritmasını kullan"
 
-#: builtin/pack-objects.c:3810
+#: builtin/pack-objects.c:3939
 msgid "create thin packs"
 msgstr "ince paketler oluÅŸtur"
 
-#: builtin/pack-objects.c:3812
+#: builtin/pack-objects.c:3941
 msgid "create packs suitable for shallow fetches"
 msgstr "sığ getirmelere uygun paketler oluştur"
 
-#: builtin/pack-objects.c:3814
+#: builtin/pack-objects.c:3943
 msgid "ignore packs that have companion .keep file"
 msgstr "eşlik eden .keep dosyasına iye paketleri yok say"
 
-#: builtin/pack-objects.c:3816
+#: builtin/pack-objects.c:3945
 msgid "ignore this pack"
 msgstr "bu paketi yok say"
 
-#: builtin/pack-objects.c:3818
+#: builtin/pack-objects.c:3947
 msgid "pack compression level"
 msgstr "paket sıkıştırma düzeyi"
 
-#: builtin/pack-objects.c:3820
+#: builtin/pack-objects.c:3949
 msgid "do not hide commits by grafts"
 msgstr "aşılarla gelen işlemeleri gizleme"
 
-#: builtin/pack-objects.c:3822
+#: builtin/pack-objects.c:3951
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "nesnelerin sayımını hızlandırmak için eğer varsa bir biteşlem indeksi kullan"
 
-#: builtin/pack-objects.c:3824
+#: builtin/pack-objects.c:3953
 msgid "write a bitmap index together with the pack index"
 msgstr "paket indeksiyle birlikte bir biteÅŸlem indeksi de yaz"
 
-#: builtin/pack-objects.c:3828
+#: builtin/pack-objects.c:3957
 msgid "write a bitmap index if possible"
 msgstr "eğer olanaklıysa bir biteşlem indeksi yaz"
 
-#: builtin/pack-objects.c:3832
+#: builtin/pack-objects.c:3961
 msgid "handling for missing objects"
 msgstr "eksik nesneler için işlem"
 
-#: builtin/pack-objects.c:3835
+#: builtin/pack-objects.c:3964
 msgid "do not pack objects in promisor packfiles"
 msgstr "nesneleri vaatçi paket dosyalarıyla paketleme"
 
-#: builtin/pack-objects.c:3837
+#: builtin/pack-objects.c:3966
 msgid "respect islands during delta compression"
 msgstr "delta sıkıştırması sırasında adalara uy"
 
-#: builtin/pack-objects.c:3839
+#: builtin/pack-objects.c:3968
 msgid "protocol"
 msgstr "protokol"
 
-#: builtin/pack-objects.c:3840
+#: builtin/pack-objects.c:3969
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr ""
 "bu protokol ile herhangi bir yapılandırılmış uploadpack.blobpackfileuri "
 "ögesini hariç tut"
 
-#: builtin/pack-objects.c:3873
+#: builtin/pack-objects.c:4002
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "delta zincir derinliği %d çok derin, %d zorlanıyor"
 
-#: builtin/pack-objects.c:3878
+#: builtin/pack-objects.c:4007
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit çok yüksek, %d zorlanıyor"
 
-#: builtin/pack-objects.c:3934
+#: builtin/pack-objects.c:4063
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr "--max-pack-size, aktarım için bir paket yapımında kullanılamaz"
 
-#: builtin/pack-objects.c:3936
+#: builtin/pack-objects.c:4065
 msgid "minimum pack size limit is 1 MiB"
 msgstr "olabilecek en küçük paket boyutu limiti 1 MiB'dır"
 
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:4070
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin bir indekslenebilir paket yapımında kullanılamaz"
 
-#: builtin/pack-objects.c:3944
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable ve --unpack-unreachable birbiriyle uyumsuz"
-
-#: builtin/pack-objects.c:3950
+#: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "--filter, --stdout olmadan kullanılamaz"
 
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:4081
 msgid "cannot use --filter with --stdin-packs"
 msgstr "--filter, --stdin-packs ile birlikte kullanılamıyor"
 
-#: builtin/pack-objects.c:3956
+#: builtin/pack-objects.c:4085
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr "iç revizyon listeleri, --stdin-packs ile birlikte kullanılamıyor"
 
-#: builtin/pack-objects.c:4015
+#: builtin/pack-objects.c:4144
 msgid "Enumerating objects"
 msgstr "Nesneler ortaya dökülüyor"
 
-#: builtin/pack-objects.c:4052
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19049,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:152
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "bir precious-objects deposu içinde budama yapılamıyor"
 
@@ -19074,56 +19370,60 @@ msgstr "%s için geçersiz değer: %s"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<seçenekler>] [<depo> [<bşvr-blrtç>...]]"
 
-#: builtin/pull.c:123
+#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
 msgstr "altmodüllerin özyineli getirilmesi için denetleme"
 
-#: builtin/pull.c:127
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Birleştirme ile ilgili seçenekler"
 
-#: builtin/pull.c:130
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "deÄŸiÅŸiklikleri birleÅŸtirme yerine yeniden temellendirme ile kat"
 
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "ileri sarıma izin ver"
 
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+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:340
 msgid "automatically stash/stash pop before and after"
 msgstr "öncesinde ve sonrasında kendiliğinden zulala/zulaları patlat"
 
-#: builtin/pull.c:183
+#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "Getirme ile ilgili seçenekler"
 
-#: builtin/pull.c:193
+#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "zorla yerel dalın üzerine yaz"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr "paralelde çekilen altmodüllerin sayısı"
 
-#: builtin/pull.c:317
+#: builtin/pull.c:321
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "pull.ff için geçersiz değer: %s"
 
-#: builtin/pull.c:445
+#: builtin/pull.c:449
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr ""
 "Az önce getirdiğiniz başvurular arasında yeniden temellendirme için aday yok."
 
-#: builtin/pull.c:447
+#: builtin/pull.c:451
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "Az önce getirdiğiniz başvurular arasında birleştirme için aday yok."
 
-#: 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."
@@ -19131,7 +19431,7 @@ msgstr ""
 "Genellikle bu, uzak uçta eşleşmesi olmayan bir joker başvuru belirteci\n"
 "sağladığınız anlamına gelir."
 
-#: builtin/pull.c:451
+#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -19142,43 +19442,44 @@ msgstr ""
 "Bu, geçerli dalınız için öntanımlı yapılandırılmış uzak konum olmadığından,\n"
 "komut satırında bir dal belirtmeniz gerekir."
 
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
 msgid "You are not currently on a branch."
 msgstr "Şu anda bir dal üzerinde değilsiniz."
 
-#: 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 ""
 "Lütfen hangi dala karşı yeniden temellendirme yapmak istediğinizi belirtin."
 
-#: 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 "Lütfen hangi dal ile birleştirmek istediğinizi belirtin."
 
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "Ayrıntılar için: git-pull(1)"
 
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
 msgid "<remote>"
 msgstr "<uzak-konum>"
 
-#: 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 "<dal>"
 
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
 msgid "There is no tracking information for the current branch."
 msgstr "Geçerli dal için izleme bilgisi yok."
 
-#: 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 ""
 "Eğer bu dal için izleme bilgisi ayarlamak isterseniz şununla yapabilirsiniz:"
 
-#: builtin/pull.c:485
+#: builtin/pull.c:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -19187,22 +19488,22 @@ msgstr ""
 "Yapılandırmanız uzak konumdan '%s' başvurusu ile birleştirmeyi belirtiyor,\n"
 "ancak böyle bir başvuru getirilmedi."
 
-#: builtin/pull.c:596
+#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "%s iÅŸlemesine eriÅŸilemedi"
 
-#: builtin/pull.c:902
+#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
-msgstr "yeniden temellendirme için --verify-signature yok sayılıyor"
+msgstr "yeniden temellendirme için --verify-signatures yok sayılıyor"
 
-#: builtin/pull.c:930
+#: builtin/pull.c:969
 msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"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"
@@ -19212,31 +19513,32 @@ msgid ""
 "or --ff-only on the command line to override the configured default per\n"
 "invocation.\n"
 msgstr ""
-"Iraksak dalların nasıl uzlaştırılacağını belirtmeden çekme\n"
-"yapılması önerilmez. Bu iletiyi bir sonraki çekimden önce\n"
-"aşağıdaki komutlardan birini çalıştırarak susturabilirsiniz:\n"
+"Iraksak dallarınız mevcut ve onların nasıl uzlaştırılacağını\n"
+"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"
-"Ayarı global kılmak için \"git config\"i \"git config --global\" ile\n"
-"değiştirin. Öntanımlı yapılandırmayı yürütme sırasında --rebase,\n"
-"--no-rebase veya --ff-only ile geçersiz kılabilirsiniz.\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:991
+#: 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:995
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "yeniden temellendirme ile çekim"
 
-#: builtin/pull.c:996
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "Lütfen onları işleyin veya zulalayın."
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19247,7 +19549,7 @@ msgstr ""
 "Çalışma ağacınız %s işlemesinden\n"
 "ileri sarılıyor."
 
-#: builtin/pull.c:1027
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19264,15 +19566,23 @@ msgstr ""
 "$ git reset --hard\n"
 "komutunu çalıştırın."
 
-#: builtin/pull.c:1042
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Boş dal ucuna birden çok dal birleştirilemez."
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "Birden çok dala yeniden temellendirme yapılamaz."
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1104
+msgid "Cannot fast-forward to multiple branches."
+msgstr "Birden çok dala ileri sarım yapılamaz."
+
+#: 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:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "yerelde kaydı yazılmış altmodül değişiklikleriyle yeniden temellendirme "
@@ -19338,7 +19648,7 @@ msgstr ""
 "\n"
 "\tgit push %s HEAD:<uzak-konum-dalının-adı>\n"
 
-#: builtin/push.c:194
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -19352,12 +19662,18 @@ msgstr ""
 "\n"
 "\tgit push --set-upstream %s %s\n"
 
-#: builtin/push.c:202
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "Geçerli %s dalının birden çok üstkaynağı var, itme reddediliyor."
 
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"İtmek için bir başvuru belirteci belirtmediniz ve push.default \"nothing\"."
+
+#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -19368,13 +19684,7 @@ msgstr ""
 "itileceğini belirtmeden itiyorsunuz; ancak o geçerli '%s'\n"
 "dalınızın üstkaynağı değil."
 
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"İtmek için bir başvuru belirteci belirtmediniz ve push.default \"nothing\"."
-
-#: builtin/push.c:267
+#: builtin/push.c:258
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19386,7 +19696,7 @@ msgstr ""
 "değişiklikleri entegre edin (örn. 'git pull ...').\n"
 "Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a bakın."
 
-#: builtin/push.c:273
+#: builtin/push.c:264
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -19398,7 +19708,7 @@ msgstr ""
 "yapın ve uzak konumdaki değişiklikleri entegre edin (örn. 'git pull ...').\n"
 "Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a bakın."
 
-#: builtin/push.c:279
+#: builtin/push.c:270
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -19412,11 +19722,11 @@ msgstr ""
 "etmek isteyebilirsiniz (örn. 'git pull ...').\n"
 "Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a bakın."
 
-#: builtin/push.c:286
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "Güncellemeler reddedildi; çünkü etiket uzak konumda halihazırda var."
 
-#: builtin/push.c:289
+#: builtin/push.c:280
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -19426,114 +19736,111 @@ msgstr ""
 "veya --force seçeneğini kullanmadan bir uzak başvuruyu işlemesi\n"
 "olmayan bir nesneye işaret etmesini sağlaması için güncelleyemezsiniz.\n"
 
-#: builtin/push.c:294
+#: builtin/push.c:285
 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 ""
-"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:364
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Ä°tme konumu: %s\n"
 
-#: builtin/push.c:371
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "bazı başvurular '%s' konumuna itilemedi"
 
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "depo"
 
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
 msgstr "tüm başvuruları it"
 
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr "tüm başvuruları yansıla"
 
-#: builtin/push.c:557
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "başvuruları sil"
 
-#: builtin/push.c:558
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "etiketleri it (--all veya --mirror ile kullanılamaz)"
 
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "zorla güncelle"
 
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "<başvuruadı>:<bekle>"
 
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
 msgid "require old value of ref to be at this value"
 msgstr "başvurunun eski değerinin bu değerde olmasını gerektir"
 
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
 msgid "require remote updates to be integrated locally"
 msgstr "uzak güncellemelerin yerele entegre edilmesini gerektir"
 
-#: builtin/push.c:569
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "altmodüllerin özyineli itilmesini denetle"
 
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
 msgid "use thin pack"
 msgstr "ince paket kullan"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "paket programını al"
 
-#: builtin/push.c:573
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "git pull/status için üstkaynak ayarla"
 
-#: builtin/push.c:576
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "yerelde kaldırılan başvuruları buda"
 
-#: builtin/push.c:578
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "pre-push kancasını atla"
 
-#: builtin/push.c:579
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "eksik; ancak ilgili etiketleri it"
 
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
 msgstr "itmeyi GPG ile imzala"
 
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
 msgid "request atomic transaction on remote side"
 msgstr "uzak tarafta atomsal iÅŸlem iste"
 
-#: builtin/push.c:601
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete; --all, --mirror ve --tags ile uyumsuz"
-
-#: builtin/push.c:603
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete bir baÅŸvuru olmadan anlam ifade etmiyor"
 
-#: builtin/push.c:623
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "hatalı depo '%s'"
 
-#: builtin/push.c:624
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -19555,27 +19862,15 @@ msgstr ""
 "\n"
 "\tgit push <ad>\n"
 
-#: builtin/push.c:639
-msgid "--all and --tags are incompatible"
-msgstr "--all ve --tags birbiriyle uyumsuz"
-
-#: builtin/push.c:641
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all başvuru belirteçleriyle birleştirilemez"
 
-#: builtin/push.c:645
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror ve --tags birbiriyle uyumsuz"
-
-#: builtin/push.c:647
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror başvuru belirteçleriyle birleştirilemez"
 
-#: builtin/push.c:650
-msgid "--all and --mirror are incompatible"
-msgstr "--all ve --mirror birbiriyle uyumsuz"
-
-#: builtin/push.c:657
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "itme seçeneklerinde yeni satır karakterleri olmamalı"
 
@@ -19628,82 +19923,82 @@ msgstr "iki iÅŸleme erimi gerekli"
 #: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<önek>) [-"
-"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<dosya>] (--empty | <ağacımsı1> [<ağacımsı2> [<ağacımsı3>]])"
+"u | -i]] [--no-sparse-checkout] [--index-output=<dosya>] (--empty | "
+"<ağacımsı1> [<ağacımsı2> [<ağacımsı3>]])"
 
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "ortaya çıkan indeksi <dosya>'ya yaz"
 
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "yalnızca indeksi boşalt"
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "BirleÅŸtiriliyor"
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
 msgid "perform a merge in addition to a read"
 msgstr "bir okumaya ek olarak bir birleştirme gerçekleştir"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
 msgid "3-way merge if no file level merging required"
 msgstr "dosya düzeyinde birleştirme gerekmiyorsa 3 yönlü birleştir"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
 msgid "3-way merge in presence of adds and removes"
 msgstr "eklemeler ve kaldırmalar varlığında 3 yönlü birleştir"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "-m ile aynı; ancak birleştirilmeyen girdileri atar"
 
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<altdizin>/"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "ağacı indekse <altdizin>/ altında oku"
 
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
 msgid "update working tree with merge result"
 msgstr "birleştirme sonucuyla çalışma ağacını güncelleştir"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "açıkça yok sayılan dosyaların üzerine yazılmasına izin ver"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
 msgid "don't check the working tree after merging"
 msgstr "birleştirmeden sonra çalışma ağacını denetleme"
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
 msgid "don't update the index or the work tree"
 msgstr "indeksi veya çalışma ağacını güncelleme"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
 msgid "skip applying sparse checkout filter"
 msgstr "aralıklı çıkış süzgeci uygulamayı atla"
 
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "unpack-trees hatalarını ayıkla"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "geribildirim iletilerini gizle"
 
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
 msgid "You need to resolve your current index first"
 msgstr "Öncelikle geçerli indeksinizi çözmelisiniz"
 
@@ -19726,194 +20021,44 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "kullanılamaz yapılacaklar listesi: '%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
 #, c-format
 msgid "could not create temporary %s"
 msgstr "geçici %s oluşturulamadı"
 
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
 msgid "could not mark as interactive"
 msgstr "etkileÅŸimli olarak imlenemedi"
 
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
 msgid "could not generate todo list"
 msgstr "yapılacaklar listesi oluşturulamadı"
 
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "bir taban işlemesi --upstream veya --onto ile sağlanmalıdır"
 
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<seçenekler>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "boÅŸ baÅŸlayan iÅŸlemeleri tut"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "boÅŸ iletili iÅŸlemelere izin ver"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "birleÅŸtirme iÅŸlemelerini yeniden temellendir"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "kuzenlerin orijinal dal noktalarını tut"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "squash!/fixup! ile başlayan işlemeleri taşı"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "iÅŸlemeleri imzala"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "üstkaynakta nelerin değiştiğini gösteren bir diffstat görüntüle"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "yeniden temellendirmeyi sürdür"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "iÅŸlemeyi atla"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "yapılacaklar listesini düzenle"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "geçerli yamayı göster"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "yapılacaklar listesindeki işleme numaralarını kısalt"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "yapılacaklar listesindeki işleme numaralarını genişlet"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "yapılacaklar listesini denetle"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "fixup/squash satırlarını yeniden düzenle"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "yapılacaklar listesine 'exec' komutları ekle"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "üzerine"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "revizyonu sınırla"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "tıkıştır"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "üstkaynak işlemesi"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "dal ucu adı"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "yeniden temellendirme stratejisi"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "strateji seçenekleri"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "switch-to"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "çıkış yapılacak dal veya işleme"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "'onto' adı:"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "komut"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "çalıştırılacak komut"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "başarısız olan her 'exec'i kendiliğinden yeniden zamanla"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr ""
-"--[no-]rebase-cousins seçeneğinin --rebase-merges olmadan hiçbir etkisi yok"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s birleÅŸtirme arka ucunu gerektiriyor"
 
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "'onto' alınamadı: '%s'"
 
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "geçersiz orig-head: '%s'"
 
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "geçersiz allow_rerere_autoupdate yok sayılıyor: '%s'"
 
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19927,7 +20072,7 @@ msgstr ""
 "İptal edip \"git rebase\" öncesine geri dönmek için \"git rebase --abort\"\n"
 "çalıştırın."
 
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
 #, c-format
 msgid ""
 "\n"
@@ -19946,7 +20091,7 @@ msgstr ""
 "\n"
 "Bunun sonucu olarak git onları yeniden temellendiremiyor."
 
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -19954,7 +20099,7 @@ msgid ""
 msgstr ""
 "tanımlanamayan boş tür '%s'; geçerli türler: \"drop\", \"keep\" ve \"ask\""
 
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -19971,7 +20116,7 @@ msgstr ""
 "\tgit rebase '<dal>'\n"
 "\n"
 
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -19984,189 +20129,187 @@ msgstr ""
 "\tgit branch --set-upstream-to=%s/<dal> %s\n"
 "\n"
 
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
 msgid "exec commands cannot contain newlines"
 msgstr "'exec' komutları yenisatırlar içeremez"
 
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
 msgid "empty exec command"
 msgstr "boÅŸ 'exec' komutu"
 
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
 msgid "rebase onto given branch instead of upstream"
 msgstr "üstkaynak yerine verilen dalın üzerine yeniden temellendir"
 
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "üstkaynağın birleştirme temelini ve dalını geçerli temel olarak kullan"
 
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
 msgid "allow pre-rebase hook to run"
 msgstr "pre-rebase kancasının çalışmasına izin ver"
 
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
 msgid "be quiet. implies --no-stat"
 msgstr "sessiz ol (--no-stat ima eder)"
 
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "üstkaynakta nelerin değiştiğini gösteren bir diffstat görüntüle"
+
+#: builtin/rebase.c:1035
 msgid "do not show diffstat of what changed upstream"
 msgstr "üstkaynakta nelerin değiştiğini gösteren diffstat gösterme"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "her iÅŸlemeye bir Signed-off-by artbilgisi ekle"
 
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
 msgid "make committer date match author date"
 msgstr "işleyici tarihi ile yazar tarihini aynı yap"
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
 msgid "ignore author date and use current date"
 msgstr "yazar tarihini yok say ve geçerli tarihi kullan"
 
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
 msgid "synonym of --reset-author-date"
 msgstr "--reset-author-date eşanlamlısı"
 
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
 msgid "passed to 'git apply'"
 msgstr "'git apply'a aktarıldı"
 
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
 msgid "ignore changes in whitespace"
 msgstr "boÅŸluk deÄŸiÅŸikliklerini yok say"
 
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "değiştirilmemiş olsa bile tüm işlemeleri seç-al yap"
 
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
 msgid "continue"
 msgstr "sürdür"
 
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
 msgid "skip current patch and continue"
 msgstr "geçerli yamayı atla ve sürdür"
 
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
 msgid "abort and check out the original branch"
 msgstr "iptal et ve orijinal dalı çıkış yap"
 
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
 msgid "abort but keep HEAD where it is"
 msgstr "iptal et; ancak HEAD'i olduğu yerde bırak"
 
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
 msgid "edit the todo list during an interactive rebase"
 msgstr ""
 "bir etkileşimli yeniden temellendirme sırasında yapılacaklar listesini "
 "düzenle"
 
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
 msgid "show the patch file being applied or merged"
 msgstr "yama dosyası uygulanırken veya birleştirilirken göster"
 
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
 msgid "use apply strategies to rebase"
 msgstr "yeniden temellendirmek için \"apply\" stratejilerini kullan"
 
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
 msgid "use merging strategies to rebase"
 msgstr "yeniden temellendirmek için birleştirme stratejilerini kullan"
 
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 "yeniden temellendirilecek işlemelerin listesini kullanıcının düzenlemesine "
 "izin ver"
 
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr ""
 "(KULLANILMAMALI) birleştirmeleri yok saymak yerine onları yeniden "
 "oluşturmaya çalış"
 
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
 msgid "how to handle commits that become empty"
 msgstr "boşalan işlemelerin nasıl ele alınacağı"
 
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "boÅŸ baÅŸlayan iÅŸlemeleri tut"
+
+#: builtin/rebase.c:1097
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "-i altındaki squash!/fixup! ile başlayan işlemeleri taşı"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
 msgid "add exec lines after each commit of the editable list"
 msgstr "düzenlenebilir listenin her işlemesinden sonra exec satırları ekle"
 
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
 msgid "allow rebasing commits with empty messages"
 msgstr "boÅŸ iletili iÅŸlemelerin yeniden temellendirilmesine izin ver"
 
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
 msgid "try to rebase merges instead of skipping them"
 msgstr "birleştirmeleri atlamak yerine onları yeniden temellendirmeyi dene"
 
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "üstkaynağı arılaştırmak için 'merge-base --fork-point' kullan"
 
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
 msgid "use the given merge strategy"
 msgstr "verilen birleÅŸtirme stratejisini kullan"
 
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
 msgid "option"
 msgstr "seçenek"
 
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
 msgid "pass the argument through to the merge strategy"
 msgstr "argümanı birleştirme stratejisine aktar"
 
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "ulaşılabilir tüm işlemeleri kök(ler)e kadar yeniden temellendir"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "başarısız olan her 'exec'i kendiliğinden yeniden zamanla"
+
+#: builtin/rebase.c:1128
 msgid "apply all changes, even those already present upstream"
 msgstr "tüm değişiklikleri uygula, halihazırda üstkaynakta olanları bile"
 
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Görünüşe göre 'git am' sürmekte. Yeniden temellendirilemiyor."
 
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"'git rebase --preserve-merges' artık eski. Yerine --rebase-merges kullanın."
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges, --rebase-merges olarak deÄŸiÅŸtirildi"
 
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "--keep-base ile --onto birlikte kullanılamaz"
-
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "--keep-base ile --root birlikte kullanılamaz"
-
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "--root ile --fork-point birlikte kullanılamaz"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Sürmekte olan bir yeniden temellendirme yok"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "--edit-todo seçeneği yalnızca etkileşimli yeniden temellendirme sırasında "
 "kullanılabilir."
 
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "HEAD okunamıyor"
 
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -20174,16 +20317,16 @@ msgstr ""
 "Önce tüm birleştirme çakışmalarını düzenlemeli ve onları\n"
 "git add kullanarak tamamlandı olarak imlemelisiniz."
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
 msgid "could not discard worktree changes"
 msgstr "çalışma ağacı değişiklikleri atılamadı"
 
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
 #, c-format
 msgid "could not move back to %s"
 msgstr "%s konumuna geri taşınamadı"
 
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -20204,143 +20347,133 @@ msgstr ""
 "yapın ve beni yeniden çalıştırın. Ben sizi belki orada hâlâ değerli bir\n"
 "ÅŸeyler olabilir diye durdurdum.\n"
 
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
 msgstr "'C' anahtarı sayısal bir değer bekliyor"
 
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Bilinmeyen kip: %s"
 
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy, --merge veya --interactive gerektiriyor"
 
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr "\"apply\" seçenekleri \"merge\" seçenekleriyle birlikte kullanılamıyor"
+#: builtin/rebase.c:1463
+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:1772
+#: builtin/rebase.c:1476
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Bilinmeyen yeniden temellendirme arka ucu: %s"
 
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec, --exec veya --interactive gerektiriyor"
 
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "--preserve-merges ile --rebase-merges birlikte kullanılamıyor"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"hata: --preserve-merges ile --reschedule-failed-exec birlikte kullanılamıyor"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "geçersiz üstkaynak '%s'"
 
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
 msgid "Could not create new root commit"
 msgstr "Yeni kök işleme oluşturulamadı"
 
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "'%s': tam olarak dallı bir birleştirme temeli gerekli"
 
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': tam olarak bir birleÅŸtirme temeli gerekiyor"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "'%s' geçerli bir işlemeye işaret etmiyor"
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
 #, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "onulmaz: böyle bir dal/işleme yok: '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "böyle bir dal/işleme yok: '%s'"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2415
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "Böyle bir başvuru yok: %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
 msgid "Could not resolve HEAD to a revision"
 msgstr "HEAD bir revizyona çözülemedi"
 
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
 msgid "Please commit or stash them."
 msgstr "Lütfen onları işleyin veya zulalayın."
 
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
 #, c-format
 msgid "could not switch to %s"
 msgstr "şuraya geçilemedi: %s"
 
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
 msgid "HEAD is up to date."
 msgstr "HEAD güncel."
 
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Geçerli dal %s güncel.\n"
 
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD güncel, yeniden temellendirme zorla yapıldı."
 
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Geçerli dal %s güncel, yeniden temellendirme zorla yapıldı.\n"
 
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
 msgid "The pre-rebase hook refused to rebase."
 msgstr "'pre-rebase' kancası yeniden temellendirmeyi reddetti."
 
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "%s için olan değişiklikler:\n"
 
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "%s -> %s deÄŸiÅŸiklikleri:\n"
 
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "Öncelikle dal ucu üzerindeki çalışmanızı yeniden oynatmak için geri "
 "sarılıyor...\n"
 
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
 msgid "Could not detach HEAD"
 msgstr "HEAD ayrılamadı"
 
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "%s, %s konumuna ileri sarıldı.\n"
 
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dizini>"
 
-#: builtin/receive-pack.c:1276
+#: 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"
@@ -20356,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:1296
+"Ö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"
@@ -20380,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:2479
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "sessiz"
 
-#: builtin/receive-pack.c:2493
-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 ""
@@ -20419,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:699
+#: 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 ]"
 
@@ -20544,13 +20678,18 @@ 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"
 "\t use --mirror=fetch or --mirror=push instead"
 msgstr ""
 "--mirror tehlikeli ve artık kullanılmamalı; lütfen\n"
-"\t yerine --mirror-fetch veya --mirror=push kullanın."
+"\t yerine --mirror=fetch veya --mirror=push kullanın."
 
 #: builtin/remote.c:148
 #, c-format
@@ -20592,7 +20731,7 @@ msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "izlemek için dallar belirtmek yalnızca getirme yansılarıyla anlamifade ediyor"
 
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
 #, c-format
 msgid "remote %s already exists."
 msgstr "%s uzak konumu halihazırda var."
@@ -20602,25 +20741,30 @@ msgstr "%s uzak konumu halihazırda var."
 msgid "Could not setup master '%s'"
 msgstr "'%s' ana dalı ayarlanamadı"
 
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "ilgilenilmemiş branch.%s.rebase=%s, 'true' olduğu var sayılıyor"
+
+#: builtin/remote.c:366
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "%s başvuru belirteci için getirme haritası alınamadı"
 
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
 msgid "(matching)"
 msgstr "(eÅŸleÅŸiyor)"
 
-#: builtin/remote.c:466
+#: builtin/remote.c:472
 msgid "(delete)"
 msgstr "(sil)"
 
-#: builtin/remote.c:655
+#: builtin/remote.c:660
 #, c-format
 msgid "could not set '%s'"
 msgstr "'%s' ayarlanamadı"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:665
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -20631,17 +20775,17 @@ msgstr ""
 "\t%s:%d\n"
 "artık var olmayan '%s' uzak konumunu adlandırıyor."
 
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Böyle bir uzak konum yok: '%s'"
 
-#: builtin/remote.c:710
+#: builtin/remote.c:715
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "'%s' yapılandırma bölümü '%s' olarak yeniden adlandırılamadı"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:735
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -20652,17 +20796,17 @@ msgstr ""
 "\t%s\n"
 "\tLütfen gerekirse yapılandırmayı el ile güncelleyin."
 
-#: builtin/remote.c:770
+#: builtin/remote.c:775
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "'%s' silinmesi başarısız"
 
-#: builtin/remote.c:804
+#: builtin/remote.c:809
 #, c-format
 msgid "creating '%s' failed"
 msgstr "'%s' oluşturulması başarısız"
 
-#: builtin/remote.c:882
+#: builtin/remote.c:887
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -20676,120 +20820,120 @@ msgstr[1] ""
 "Not: refs/remotes hiyerarşisi dışındaki bazı dallar kaldırılmadı;\n"
 "onları silmek için şunu kullanın:"
 
-#: builtin/remote.c:896
+#: builtin/remote.c:901
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "'%s' yapılandırsa bölümü kaldırılamadı"
 
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " yeni (bir sonraki getirme uzak konumlarda depolayacak/%s"
 
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
 msgid " tracked"
 msgstr " izlendi"
 
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " eskimiş (kaldırmak için 'git remote prune' kullanın)"
 
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "geçersiz branch.%s.merge; birden çok dala yeniden temellendirilemiyor"
 
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "%s uzak konumuna etkileÅŸimli olarak yeniden temellendirir"
 
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr ""
 "%s uzak konumuna etkileÅŸimli olarak (birleÅŸtirmelerle birlikte) yeniden "
 "temellendirir"
 
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "%s uzak konumuna yeniden temellendirir"
 
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
 #, c-format
 msgid " merges with remote %s"
 msgstr " %s uzak konumu ile birleÅŸtirir"
 
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
 #, c-format
 msgid "merges with remote %s"
 msgstr "%s uzak konumu ile birleÅŸtirir"
 
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    ve %s uzak konumu ile birlikte\n"
 
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
 msgid "create"
 msgstr "oluÅŸtur"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
 msgid "delete"
 msgstr "sil"
 
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
 msgid "up to date"
 msgstr "güncel"
 
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
 msgid "fast-forwardable"
 msgstr "ileri sarılabilir"
 
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
 msgid "local out of date"
 msgstr "yerelin tarihi geçmiş"
 
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s ÅŸuna zorluyor: %-*s (%s)"
 
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s ÅŸuna itiyor: %-*s (%s)"
 
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s ÅŸuna zorluyor: %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s ÅŸuna itiyor: %s"
 
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
 msgid "do not query remotes"
 msgstr "uzak konumları sorgulama"
 
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
 msgstr "* uzak konum %s"
 
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL'yi getir: %s"
 
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
 msgid "(no URL)"
 msgstr "(URL yok)"
 
@@ -20797,327 +20941,336 @@ msgstr "(URL yok)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "     URL'yi it: %s"
 
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "     HEAD dalı: %s"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
 msgid "(not queried)"
 msgstr "(sorgulanmadı"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
 msgid "(unknown)"
 msgstr "(bilinmiyor)"
 
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 "  HEAD dalı (uzak konum HEAD'i belirsiz, aşağıdakilerden biri olabilir):\n"
 
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Uzak dal:%s"
 msgstr[1] "  Uzak dallar:%s"
 
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
 msgid " (status not queried)"
 msgstr " (durum sorgulanmadı)"
 
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  'git pull' için yapılandırılan yerel dal:"
 msgstr[1] "  'git pull' için yapılandırılan yerel dallar:"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Yerel başvurular 'git pull' tarafından yansılanacak"
 
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  'git push'%s için yapılandırılan yerel başvuru:"
 msgstr[1] "  'git push'%s için yapılandırılan yerel başvurular:"
 
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "refs/remotes/<ad>/HEAD'i uzak konuma göre ayarla"
 
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "refs/remotes/<ad>/HEAD'i sil"
 
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
 msgid "Cannot determine remote HEAD"
 msgstr "Uzak konum HEAD'i belirlenemiyor"
 
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Birden çok uzak konum HEAD dalı. Lütfen birini açıkça seçin:"
 
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
 #, c-format
 msgid "Could not delete %s"
 msgstr "%s silinemedi"
 
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Geçerli bir başvuru değil: %s"
 
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
 #, c-format
 msgid "Could not setup %s"
 msgstr "%s ayarlanamadı"
 
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s sarkacak!"
 
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s sarkmaya başladı!"
 
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
 #, c-format
 msgid "Pruning %s"
 msgstr "%s budanıyor"
 
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * %s [budanacak]"
 
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * %s [budandı]"
 
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
 msgid "prune remotes after fetching"
 msgstr "getirme sonrasında uzak konumları buda"
 
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Böyle bir uzak konum yok '%s'"
 
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
 msgid "add branch"
 msgstr "dal ekle"
 
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
 msgid "no remote specified"
 msgstr "uzak konum belirtilmedi"
 
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
 msgid "query push URLs rather than fetch URLs"
 msgstr "itme URL'lerinden çok getirme URL'lerini sorgula"
 
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
 msgid "return all URLs"
 msgstr "tüm URL'leri döndür"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "'%s' uzak konumu için URL yapılandırılmamış"
 
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
 msgid "manipulate push URLs"
 msgstr "itme URL'lerini deÄŸiÅŸtir"
 
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
 msgid "add URL"
 msgstr "URL ekle"
 
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
 msgid "delete URLs"
 msgstr "URL'leri sil"
 
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete bir anlam ifade etmiyor"
 
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Geçersiz eski URL dizgisi: %s"
 
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Böyle bir URL bulunamadı: %s"
 
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
 msgid "Will not delete all non-push URLs"
 msgstr "Tüm itme olmayan URL'ler silinmeyecek"
 
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "ayrıntılı anlat; bir altkomuttan önce yerleştirilmelidir"
+
+#: builtin/repack.c:28
 msgid "git repack [<options>]"
 msgstr "git repack [<seçenekler>]"
 
-#: builtin/repack.c:31
+#: builtin/repack.c:33
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--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:198
+#: 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:270 builtin/repack.c:630
+#: 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:294
+#: 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:309
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "%s için indeks açılamıyor"
 
-#: builtin/repack.c:368
+#: 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:401 builtin/repack.c:408 builtin/repack.c:413
+#: 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:460
+#: 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:516
+msgid "could not close refs snapshot tempfile"
+msgstr "başvurular anlık görüntü geçici dosyası kapatılamadı"
+
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "her şeyi tek bir pakete sığdır"
 
-#: builtin/repack.c:462
+#: 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:465
+#: 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"
+msgstr "gereksiz paketleri kaldır ve 'git-prune-packed' çalıştır"
 
-#: builtin/repack.c:467
+#: 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:469
+#: 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:471
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "'git-update-server-info' çalıştırma"
 
-#: builtin/repack.c:474
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "--local'ı 'git-pack-objects'e geçir"
 
-#: builtin/repack.c:476
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "biteÅŸlem indeksi yaz"
 
-#: builtin/repack.c:478
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "--delta-islands'ı 'git-pack-objects'e geçir"
 
-#: builtin/repack.c:479
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "yaklaşık tarih"
 
-#: builtin/repack.c:480
+#: 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:482
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "-a ile, ulaşılamayan nesneleri yeniden paketle"
 
-#: builtin/repack.c:484
+#: 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:485 builtin/repack.c:491
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "baytlar"
 
-#: builtin/repack.c:486
+#: 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:488
+#: 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:490
+#: 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:492
+#: 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:494
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr "nesneleri .keep ile imlenmiÅŸ paketlerde yeniden paketle"
 
-#: builtin/repack.c:496
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "bu paketi yeniden paketleme"
 
-#: builtin/repack.c:498
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "<N> faktörlü bir geometrik ilerleme bul"
 
-#: builtin/repack.c:508
+#: 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:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "bir precious-objects deposundaki paketler silinemiyor"
 
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable ve -A birbiriyle uyumsuz"
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric, -A ve -a ile uyumsuz"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "Paketlenecek yeni bir ÅŸey yok."
 
-#: builtin/repack.c:669
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "gereken dosya eksik: %s"
 
-#: builtin/repack.c:671
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "bağlantı kaldırılamadı: %s"
@@ -21200,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 "
@@ -21269,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"
@@ -21302,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"
 
@@ -21374,147 +21521,139 @@ msgstr "-l ile yalnızca bir dizgi verilebilir"
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget <yol>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "indeksteki temiz çözümlerin kaydını yap"
 
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "yol olmadan 'git rerere forget' kullanım dışı"
 
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
 #, c-format
 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:83
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Geçerli bir HEAD'iniz yok."
 
-#: builtin/reset.c:85
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "HEAD ağacı bulunamadı."
 
-#: builtin/reset.c:91
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "%s ağacı bulunamadı."
 
-#: builtin/reset.c:116
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ÅŸimdi ÅŸurada: %s"
 
-#: builtin/reset.c:195
+#: 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:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: 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:297
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "HEAD'i ve indeksi sıfırla"
 
-#: builtin/reset.c:298
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "yalnızca HEAD'i sıfırla"
 
-#: builtin/reset.c:300 builtin/reset.c:302
+#: 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:304
+#: 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:310
+#: 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:344
+#: 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:352
+#: 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:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch, --{hard,mixed,soft} ile uyumsuz"
-
-#: builtin/reset.c:371
+#: 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:373
+#: 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:388
+#: 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:392
-msgid "-N can only be used with --mixed"
-msgstr "-N yalnızca --mixed ile birlikte kullanılabilir"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "Sıfırlama sonrasında hazırlanmamış değişiklikler:"
 
-#: builtin/reset.c:416
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -21527,30 +21666,27 @@ 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:434
+#: 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:439
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "Yeni indeks dosyası yazılamadı."
 
-#: builtin/rev-list.c:538
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "--exclude-promisor-objects ve --missing birlikte kullanılamıyor"
-
-#: builtin/rev-list.c:599
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "nesne süzme --objects gerektiriyor"
 
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr "rev-list not görüntülemesini desteklemiyor"
 
-#: builtin/rev-list.c:664
-msgid "marked counting is incompatible with --objects"
-msgstr "imlenmiş sayım, --objects ile uyumsuz"
+#: builtin/rev-list.c:679
+#, 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>...]"
@@ -21568,6 +21704,18 @@ msgstr "seçenek olmayan ilk argümandan sonra ayrıştırmayı durdur"
 msgid "output in stuck long form"
 msgstr "uzun biçimde çıktı ver"
 
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "zamansız girdi sonu"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr "'--' ayırıcısı öncesinde bir kullanım dizisi verilmedi"
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "Tek bir revizyon gerekiyordu"
+
 #: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -21582,6 +21730,50 @@ msgstr ""
 "\n"
 "İlki hakkında ek bilgi için \"git rev-parse --parseopt -h\" çalıştırın."
 
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir bir argüman gerektiriyor"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "bir git dizini deÄŸil: '%s'"
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "--git-path bir argüman gerektiriyor"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "-n bir argüman gerektiriyor"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "--path-format bir argüman gerektiriyor"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "--path-format için bilinmeyen bir argüman: %s"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "--default bir argüman gerektiriyor"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "--prefix bir argüman gerektiriyor"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "--abbrev-ref için bilinmeyen kip: %s"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "--show-object-format için bilinmeyen kip: %s"
+
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<seçenekler>] <işlememsi>..."
@@ -21656,15 +21848,19 @@ msgstr "işleme adını iliştir"
 msgid "preserve initially empty commits"
 msgstr "başlangıçta boş olan işlemeleri koru"
 
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "boÅŸ iletili iÅŸlemelere izin ver"
+
 #: builtin/revert.c:129
 msgid "keep redundant, empty commits"
 msgstr "gereksiz, boÅŸ iÅŸlemeleri tut"
 
-#: builtin/revert.c:237
+#: builtin/revert.c:241
 msgid "revert failed"
 msgstr "geri al başarısız"
 
-#: builtin/revert.c:250
+#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "seç-al başarısız"
 
@@ -21714,71 +21910,71 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "Aşağıdaki dosyanın yerel değişiklikleri var:"
 msgstr[1] "Aşağıdaki dosyaların yerel değişiklikleri var:"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "kaldırılan dosyaları listeleme"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "yalnızca indeksten kaldır"
 
-#: builtin/rm.c:246
+#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "güncellik denetlemesini geçersiz kıl"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "özyineli kaldırmaya izin ver"
 
-#: builtin/rm.c:249
+#: builtin/rm.c:250
 msgid "exit with a zero status even if nothing matched"
 msgstr "hiçbir şey eşleşmemiş olsa bile sıfır koduyla çık"
 
-#: builtin/rm.c:283
+#: builtin/rm.c:285
 msgid "No pathspec was given. Which files should I remove?"
 msgstr "Yol belirteci verilmedi. Hangi dosyaları kaldırmalıyım?"
 
-#: builtin/rm.c:310
+#: builtin/rm.c:315
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "ilerlemek için lütfen değişikliklerinizi .gitmodules'a hazırlayın veya "
 "zulalayın"
 
-#: builtin/rm.c:331
+#: builtin/rm.c:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "'%s', -r olmadan özyineli olarak kaldırılmıyor"
 
-#: builtin/rm.c:379
+#: builtin/rm.c:385
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: %s kaldırılamadı"
 
 #: builtin/send-pack.c:20
 msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-"  --all and explicit <ref> specification are mutually exclusive."
+"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=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<makine>:]<dizin> "
-"[<baÅŸvuru>...]\n"
-"  --all ve açık <başvuru> tanımlaması birlikte kullanılamaz."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [<makine>:]<dizin> (--all | <baÅŸvurular>...)"
 
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "uzak konum adı"
 
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "durumsuz RPC protokolünü kullan"
 
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "başvuruları stdin'den oku"
 
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "uzak konum yardımcısından durum yazdır"
 
@@ -21835,21 +22031,21 @@ msgstr "alan"
 msgid "group by field"
 msgstr "alan ile grupla"
 
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
 msgid "too many arguments given outside repository"
 msgstr "depo dışında çok fazla argüman verildi"
 
 #: builtin/show-branch.c:13
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<ne-zaman>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"                [--current] [--color[=<nezaman>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<bÅŸvr> | <glob>)...]"
 
 #: builtin/show-branch.c:17
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -21862,114 +22058,108 @@ msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "%s yok sayılıyor; %d başvurudan fazlası ele alınamıyor"
 msgstr[1] "%s yok sayılıyor; %d başvurudan fazlası ele alınamıyor"
 
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
 #, c-format
 msgid "no matching refs with %s"
 msgstr "%s ile eÅŸleÅŸen baÅŸvuru yok"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
 msgid "show remote-tracking and local branches"
 msgstr "uzak izleme dallarını ve yerel dalları göster"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
 msgid "show remote-tracking branches"
 msgstr "uzak izleme dallarını göster"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
 msgid "color '*!+-' corresponding to the branch"
 msgstr "'*!+-'i dala göre renklendir"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
 msgid "show <n> more commits after the common ancestor"
 msgstr "ortak atadan sonra <n> işleme daha göster"
 
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
 msgid "synonym to more=-1"
 msgstr "more=-+ eşanlamlısı"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
 msgid "suppress naming strings"
 msgstr "adlandırma dizilerini gizle"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
 msgid "include the current branch"
 msgstr "geçerli dalı içer"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
 msgid "name commits with their object names"
 msgstr "işlemeleri kendi nesne adlarıyla adlandır"
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
 msgid "show possible merge bases"
 msgstr "olası birleştirme temellerini göster"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
 msgid "show refs unreachable from any other ref"
 msgstr "başka başvurudan erişilemeyen başvuruları göster"
 
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
 msgid "show commits in topological order"
 msgstr "işlemeleri ilingesel sırada göster"
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
 msgid "show only commits not on the first branch"
 msgstr "yalnızca birinci dalda olmayan işlemeleri göster"
 
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
 msgid "show merges reachable from only one tip"
 msgstr "yalnızca bir uçtan ulaşılabilir olan birleştirmeleri göster"
 
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
 msgid "topologically sort, maintaining date order where possible"
 msgstr "olabildiğince tarih sırasını koruyarak ilingesel biçimde sırala"
 
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
 msgid "<n>[,<base>]"
 msgstr "<n>[,<temel>]"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
 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:711
-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:735
+#: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "dal verilmedi ve HEAD geçersiz"
 
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
 msgid "--reflog option needs one branch name"
 msgstr "--reflog seçeneği için bir dal adı gerekli"
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "aynı anda yalnızca %d girdi gösterilebilir"
 msgstr[1] "aynı anda yalnızca %d girdi gösterilebilir"
 
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
 #, c-format
 msgid "no such ref %s"
 msgstr "böyle bir başvuru yok: %s"
 
-#: builtin/show-branch.c:831
+#: 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:835
+#: 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:838
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "%s işlemesi bulunamıyor (%s)"
@@ -22034,75 +22224,117 @@ 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:227
+#: builtin/sparse-checkout.c:176
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr ""
+"'%s' dizini izlenmeyen dosyalar içeriyor; ancak aralıklı çıkış konisinde "
+"deÄŸil"
+
+#: builtin/sparse-checkout.c:184
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "'%s' dizini kaldırılamadı"
+
+#: 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:268
+#: 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:270
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "extensions.worktreeConfig yapılandırması ayarlanamadı"
 
-#: builtin/sparse-checkout.c:290
+#: 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:310
+#: 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:312
+#: 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"
+msgstr "bir aralıklı indeksin kullanımını aç/kapat"
 
-#: builtin/sparse-checkout.c:340
-msgid "failed to modify sparse-index config"
-msgstr "sparse-index yapılandırması değiştirilemedi"
-
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "'%s' açılamadı"
 
-#: builtin/sparse-checkout.c:419
+#: 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:431
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <dizgiler>)"
-
-#: builtin/sparse-checkout.c:456
+#: 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:510 builtin/sparse-checkout.c:534
+#: 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:579
+#: 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:594
-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: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:613
+#: builtin/sparse-checkout.c:803
 msgid "git sparse-checkout disable"
 msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:644
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "çalışma dizini yenilenirken hata"
 
@@ -22126,28 +22358,28 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<zula>]"
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <dal-adı> [<zula>]"
 
-#: builtin/stash.c:29 builtin/stash.c:70
-msgid "git stash clear"
-msgstr "git stash clear"
-
 #: 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 builtin/stash.c:87
+#: 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
@@ -22172,6 +22404,14 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <ileti>]\n"
 "          [--] [<yol-blrtç>...]]"
 
+#: builtin/stash.c:87
+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] [<ileti>]"
+
 #: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
@@ -22195,7 +22435,7 @@ msgstr "%s geçerli bir başvuru değil"
 msgid "git stash clear with arguments is unimplemented"
 msgstr "parametreli git stash clear henüz kullanılabilir değil"
 
-#: builtin/stash.c:431
+#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -22207,166 +22447,182 @@ msgstr ""
 "            %s -> %s\n"
 "         yeniden adlandırılıyor.\n"
 
-#: builtin/stash.c:492
+#: builtin/stash.c:508
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "bir birleştirmenin ortasında zula uygulanamıyor"
 
-#: builtin/stash.c:503
+#: builtin/stash.c:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "diff oluşturulamadı: %s^!."
 
-#: builtin/stash.c:510
+#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr "İndekste çakışmalar var. --index olmadan deneyin."
 
-#: builtin/stash.c:516
+#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "indeks ağacı kaydedilemedi"
 
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "izlenmeyen dosyalar zuladan geri getirilemedi"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "%s, %s ile birleÅŸtiriliyor"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "İndeks zuladan çıkartılmamıştı."
 
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "izlenmeyen dosyalar zuladan geri getirilemedi"
+
+#: 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:635
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s bırakıldı (%s)"
 
-#: builtin/stash.c:638
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Zula girdisi bırakılamadı"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' bir zula baÅŸvurusu deÄŸil"
 
-#: builtin/stash.c:701
+#: 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:724
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "Dal adı belirtilmedi"
 
-#: builtin/stash.c:808
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "ağaç ayrıştırılamadı"
 
-#: builtin/stash.c:819
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "ağaçların paketi açılamadı"
 
-#: builtin/stash.c:839
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "zulada izlenmeyen dosyaları içer"
 
-#: builtin/stash.c:842
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "zulada yalnızca izlenmeyen dosyaları göster"
 
-#: builtin/stash.c:932 builtin/stash.c:969
+#: 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:950 builtin/stash.c:1606 builtin/stash.c:1671
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "zula iletisi"
 
-#: builtin/stash.c:960
+#: 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:1175
+#: 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:1275
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "Henüz ilk işleme yapılmamış"
 
-#: builtin/stash.c:1302
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "Geçerli indeks durumu kaydedilemiyor"
 
-#: builtin/stash.c:1311
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "Ä°zlenmeyen dosyalar kaydedilemiyor"
 
-#: builtin/stash.c:1322 builtin/stash.c:1331
+#: 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:1359
+#: 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:1408
+#: 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:1426
+#: 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:1441
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "Kaydedilecek yerel deÄŸiÅŸiklik yok"
 
-#: builtin/stash.c:1448
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "Zula ilklendirilemiyor"
 
-#: builtin/stash.c:1463
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "Geçerli durum kaydedilemiyor"
 
-#: builtin/stash.c:1468
+#: 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:1558
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "Çalışma ağacı değişiklikleri kaldırılamıyor"
 
-#: builtin/stash.c:1597 builtin/stash.c:1662
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "indeksi tut"
 
-#: builtin/stash.c:1599 builtin/stash.c:1664
+#: 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:1600 builtin/stash.c:1665
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "sessiz kip"
 
-#: builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "zulada izlenmeyen dosyaları içer"
 
-#: builtin/stash.c:1604 builtin/stash.c:1669
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "yok sayma dosyalarını içer"
 
-#: builtin/stash.c:1704
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -22390,40 +22646,49 @@ 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:47 builtin/submodule--helper.c:2424
+#: 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ı"
 
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper print-default-remote argümanı almaz"
 
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "'%s' url'sinden bir bileşen çıkarılamıyor"
 
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+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:1859
 msgid "alternative anchor for relative paths"
 msgstr "göreceli yollar için alternatif tutturucu"
 
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:410
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<yol>] [<yol>...]"
 
-#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr ".gitmodules içinde '%s' altmodül yolu için url bulunamadı"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:520
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Giriliyor: '%s'\n"
 
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -22432,7 +22697,7 @@ msgstr ""
 "run_command, %s için sıfır olmayan durum döndürdü\n"
 "."
 
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:545
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -22440,78 +22705,69 @@ 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:566
+#: builtin/submodule--helper.c:561
 msgid "suppress output of entering each submodule command"
 msgstr "her bir altmodül komutu girişinin çıktısını gizle"
 
-#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
-#: builtin/submodule--helper.c:1488
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
 msgid "recurse into nested submodules"
 msgstr "iç içe geçmiş altmodüle özyinele"
 
-#: builtin/submodule--helper.c:573
+#: builtin/submodule--helper.c:568
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <komut>"
 
-#: builtin/submodule--helper.c:600
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr ""
-"'%s' yapılandırması aranamadı. Bu deponun kendi yetkili üstkaynağı olduğu "
-"varsayılıyor."
-
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:642
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Altmodül yolu url'si '%s' kaydı yapılamadı"
 
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:646
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "'%s' altmodülü (%s), '%s' yoluna kaydı yapıldı\n"
 
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:656
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "uyarı: '%s' altmodülü için komut güncellemesi önerilmiyor\n"
 
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:663
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "'%s' altmodülü yolu için güncelleme kipi kaydı yapılamadı"
 
-#: builtin/submodule--helper.c:710
+#: builtin/submodule--helper.c:685
 msgid "suppress output for initializing a submodule"
 msgstr "bir altmodül ilklendirmesi çıktısını gizle"
 
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<seçenekler>] [<yol>]"
 
-#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "'%s' yolu için .gitmodules içinde altmodül eşlemi bulunmadı"
 
-#: builtin/submodule--helper.c:836
+#: builtin/submodule--helper.c:811
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "'%s' altmodülü içinde HEAD başvurusu çözülemedi"
 
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "'%s' altmodülüne özyinelenemedi"
 
-#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "altmodül durum çıktısını gizle"
 
-#: builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:863
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -22519,105 +22775,101 @@ msgstr ""
 "altmodül HEAD'i içinde depolanan işleme yerine indekste depolanan işlemeyi "
 "kullan"
 
-#: builtin/submodule--helper.c:894
+#: builtin/submodule--helper.c:869
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<yol>...]"
 
-#: builtin/submodule--helper.c:918
+#: builtin/submodule--helper.c:893
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <yol>"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:965
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s(ikili nesne)->%s(altmodül)"
 
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:968
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(altmodül)->%s(ikili nesne)"
 
-#: builtin/submodule--helper.c:1006
+#: builtin/submodule--helper.c:981
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1056
+#: builtin/submodule--helper.c:1031
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "'%s' üzerinden nesne sağlaması yapılamadı"
 
-#: builtin/submodule--helper.c:1060
+#: builtin/submodule--helper.c:1035
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "beklenmedik kip %o\n"
 
-#: builtin/submodule--helper.c:1301
+#: builtin/submodule--helper.c:1276
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr "altmodül HEAD'i içindeki işleme ile indekstekini karşılaştırmak için"
 
-#: builtin/submodule--helper.c:1303
-msgid "to compare the commit in the index with that in the submodule HEAD"
-msgstr "altmodül HEAD'i yerine indekste depolanan işlemeyi kullan"
+#: builtin/submodule--helper.c:1278
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "indeksteki işlemeyi altmodül HEAD'inde olan ile karşılaştır"
 
-#: builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1280
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr "'ignore_config' değeri 'all' olan altmodülleri atla"
 
-#: builtin/submodule--helper.c:1307
+#: builtin/submodule--helper.c:1282
 msgid "limit the summary size"
 msgstr "özet boyutunu sınırla"
 
-#: builtin/submodule--helper.c:1312
+#: builtin/submodule--helper.c:1287
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [<seçenekler>] [<işleme>] [--] [<yol>]"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1311
 msgid "could not fetch a revision for HEAD"
 msgstr "HEAD için bir revizyon getirilemedi"
 
-#: builtin/submodule--helper.c:1341
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached ve --files birlikte kullanılamaz"
-
-#: builtin/submodule--helper.c:1408
+#: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "'%s' için altmodül url'si eşitleniyor\n"
 
-#: builtin/submodule--helper.c:1414
+#: builtin/submodule--helper.c:1379
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "'%s' altmodülü yolu için url kaydı yapılamadı"
 
-#: builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c:1393
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "'%s' altmodülü için öntanımlı uzak konum alınamadı"
 
-#: builtin/submodule--helper.c:1439
+#: builtin/submodule--helper.c:1404
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "'%s' altmodülü için uzak konum güncellenemedi"
 
-#: builtin/submodule--helper.c:1486
+#: builtin/submodule--helper.c:1451
 msgid "suppress output of synchronizing submodule url"
 msgstr "altmodül url'si eşitleme çıktısını gizle"
 
-#: builtin/submodule--helper.c:1493
+#: builtin/submodule--helper.c:1458
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<yol>]"
 
-#: builtin/submodule--helper.c:1547
+#: 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:1559
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22626,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:1567
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "'%s' dizini temizlendi\n"
 
-#: builtin/submodule--helper.c:1569
+#: 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:1580
+#: 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:1596
+#: 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:1625
+#: 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:1626
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "tüm altmodüllerin kaydını kaldır"
 
-#: builtin/submodule--helper.c:1631
+#: 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:1645
+#: 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' "
+"Tüm altmodüllerin ilklendirmesini gerçekten geri almak istiyorsanız '--all' "
 "kullanın"
 
-#: builtin/submodule--helper.c:1714
+#: 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"
@@ -22678,46 +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:1753 builtin/submodule--helper.c:1756
+#: 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:1792
+#: 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:1799
+#: 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:1823
+#: 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: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:1818
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "dizin boÅŸ deÄŸil: '%s'"
+
+#: 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:1862
 msgid "where the new submodule will be cloned to"
 msgstr "yeni altmodülün nereye klonlanacağı"
 
-#: builtin/submodule--helper.c:1826
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "yeni altmodülün adı"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr "altmodülün klonlanacağı url konumu"
 
-#: builtin/submodule--helper.c:1837
+#: 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:1840 builtin/submodule--helper.c:2349
+#: 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:1842 builtin/submodule--helper.c:2351
+#: 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:1849
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22726,103 +23000,180 @@ msgstr ""
 "git submodule--helper clone [--prefix=<yol>] [--quiet] [--reference <depo>] "
 "[--name <ad>] [--depth <derinlik>] [--single-branch] --url <url> --path <yol>"
 
-#: builtin/submodule--helper.c:1874
-#, 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:1885
-#, 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:1889
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "dizin boÅŸ deÄŸil: '%s'"
-
-#: builtin/submodule--helper.c:1901
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "'%s' için altmodül dizini alınamadı"
-
-#: builtin/submodule--helper.c:1937
+#: 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:1941
+#: 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:2042
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Altmodül yolu '%s' ilklendirilmedi"
 
-#: builtin/submodule--helper.c:2046
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "'update --init' mi kullanmak istersiniz?"
 
-#: builtin/submodule--helper.c:2076
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Birleştirilmemiş altmodül %s atlanıyor"
 
-#: builtin/submodule--helper.c:2105
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "'%s' altmodülü atlanıyor"
 
-#: builtin/submodule--helper.c:2255
+#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "'%s' klonlanamadı. Yeniden deneme zamanlandı."
 
-#: builtin/submodule--helper.c:2266
+#: 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:2328 builtin/submodule--helper.c:2574
+#: 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: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: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: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: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: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: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:2421
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "Altmodül yolu '%s': '%s %s'\n"
+
+#: 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:2454
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+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: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:2331
+#: 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:2335
+#: 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:2341
+#: 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:2344
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "paralel iÅŸler"
 
-#: builtin/submodule--helper.c:2346
+#: 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:2347
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "klonlama işlemini yazdırma"
 
-#: builtin/submodule--helper.c:2358
+#: 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:2371
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "güncelleme parametresi için hatalı değer"
 
-#: builtin/submodule--helper.c:2419
+#: 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:2567
+msgid "force checkout updates"
+msgstr "güncellemeleri zorla çıkış yap"
+
+#: 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: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:2572
+msgid "depth for shallow fetch"
+msgstr "sığ getirme derinliği"
+
+#: builtin/submodule--helper.c:2582
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2583
+msgid "SHA1 expected by superproject"
+msgstr "superproject tarafından SHA1 bekleniyordu"
+
+#: builtin/submodule--helper.c:2585
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2586
+msgid "SHA1 of submodule's HEAD"
+msgstr "altmodülün HEAD'inin SHA1'i"
+
+#: 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:2663
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22831,87 +23182,188 @@ 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:2542
+#: 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:2575
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "altmodüllere özyinele"
 
-#: builtin/submodule--helper.c:2581
+#: 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:2637
+#: 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:2640
+#: 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:2645
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <ad> [<deÄŸer>]"
 
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <ad>"
 
-#: builtin/submodule--helper.c:2647
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2666 git-submodule.sh:150
-#, sh-format
+#: 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:2682
+#: 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:2686
+#: 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:2719
+#: 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:2721
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "öntanımlı izleme dalını ayarla"
 
-#: builtin/submodule--helper.c:2725
+#: 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:2726
+#: 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:2733
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "--branch veya --default gerekli"
 
-#: builtin/submodule--helper.c:2736
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch ve --default birlikte kullanılamaz"
+#: 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: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: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: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 ""
+"EÄŸer bu yerel git dizinini\n"
+"  %s\n"
+"konumundan yeniden klonlama yerine yeniden kullanmak isterseniz\n"
+"'--force' seçeneğini kullanın. Eğer bu yerel git dizini doğru\n"
+"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: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:3110
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "'%s' altmodülü çıkış yapılamıyor"
+
+#: builtin/submodule--helper.c:3149
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "'%s' altmodülü eklenemedi"
+
+#: 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:3222
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' indekste halihazırda var"
+
+#: 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:3254
+msgid "branch of repository to add as submodule"
+msgstr "altmodül olarak eklenecek depo dalı"
+
+#: 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:3257
+msgid "print only error messages"
+msgstr "yalnızca hata iletilerini yazdır"
+
+#: 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: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:3270
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<seçenekler>] [--] <depo> [<yol>]"
+
+#: 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: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:2793 git.c:449 git.c:724
+#: 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: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:2799
+#: 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"
+msgstr "'%s' geçerli bir submodule--helper altkomutu değil"
 
 #: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -22933,21 +23385,21 @@ msgstr "sembolik baÅŸvuruyu sil"
 msgid "shorten ref output"
 msgstr "başvuru çıktısını kısalt"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "neden"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr "güncelleme nedeni"
 
 #: builtin/tag.c:25
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+"        <tagname> [<head>]"
 msgstr ""
-"git tag [-a | -s | -u <anahtar-no>] [-f] [-m <ileti> | -F <dosya>]\n"
-"\t\t<etiket-adı> [<dal-ucu>]"
+"git tag [-a | -s | -u <anahtar-kimliÄŸi>] [-f] [-m <ileti> | -F <dosya>]\n"
+"        <etiket-adı> [<head>]"
 
 #: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
@@ -22957,13 +23409,12 @@ msgstr "git tag -d <etiket-adı>..."
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
 "[<pattern>...]"
 msgstr ""
-"git tag -l [-n[<sayı>]] [--contains <işleme>] [--no-contains <işleme>] [--"
-"points-at <nesne>]\n"
-"\t\t[--format=<biçim>] [--merged <işleme>] [--no-merged <işleme>] "
-"[<dizgi>...]"
+"git tag -l [-n[<sayı>]] [--contains <işleme>] [--no-contains <işleme>]\n"
+" [-- points-at <nesne>] [--format=<biçim>] [--merged <işleme>]\n"
+" [--no-merged <iÅŸleme>] [<dizgi>...]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
@@ -23007,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"
@@ -23024,135 +23475,111 @@ 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:328
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "etiket iletisi yok mu?"
 
-#: builtin/tag.c:335
+#: 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"
 
-#: builtin/tag.c:446
+#: builtin/tag.c:444
 msgid "list tag names"
 msgstr "etiket adlarını listele"
 
-#: builtin/tag.c:448
+#: builtin/tag.c:446
 msgid "print <n> lines of each tag message"
 msgstr "her etiket iletisinin <n> satırını listele"
 
-#: builtin/tag.c:450
+#: builtin/tag.c:448
 msgid "delete tags"
 msgstr "etiketleri sil"
 
-#: builtin/tag.c:451
+#: builtin/tag.c:449
 msgid "verify tags"
 msgstr "etiketleri doÄŸrula"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:451
 msgid "Tag creation options"
 msgstr "Etiket oluşturma seçenekleri"
 
-#: builtin/tag.c:455
+#: builtin/tag.c:453
 msgid "annotated tag, needs a message"
 msgstr "açıklama eklenmiş etiket için bir ileti gerek"
 
-#: builtin/tag.c:457
+#: builtin/tag.c:455
 msgid "tag message"
 msgstr "etiket iletisi"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:457
 msgid "force edit of tag message"
 msgstr "etiket iletisini zorla düzenle"
 
-#: builtin/tag.c:460
+#: builtin/tag.c:458
 msgid "annotated and GPG-signed tag"
 msgstr "açıklama eklenmiş ve GPG imzalı etiket"
 
-#: builtin/tag.c:463
+#: builtin/tag.c:461
 msgid "use another key to sign the tag"
 msgstr "etiketi imzalamak için başka bir anahtar kullanın"
 
-#: builtin/tag.c:464
+#: builtin/tag.c:462
 msgid "replace the tag if exists"
 msgstr "eğer varsa etiketi başkasıyla değiştir"
 
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "bir başvuru günlüğü oluştur"
 
-#: builtin/tag.c:467
+#: builtin/tag.c:465
 msgid "Tag listing options"
 msgstr "Etiket listeleme seçenekleri"
 
-#: builtin/tag.c:468
+#: builtin/tag.c:466
 msgid "show tag list in columns"
 msgstr "etiket listesini sütunlarla göster"
 
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
 msgid "print only tags that contain the commit"
 msgstr "yalnızca işlemeyi içeren etiketleri yazdır"
 
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that don't contain the commit"
 msgstr "yalnızca işleme içermeyen etiketleri yazdır"
 
-#: builtin/tag.c:473
+#: builtin/tag.c:471
 msgid "print only tags that are merged"
 msgstr "yalnızca birleştirilen etiketleri yazdır"
 
-#: builtin/tag.c:474
+#: builtin/tag.c:472
 msgid "print only tags that are not merged"
 msgstr "yalnızca birleştirilmeyen etiketleri yazdır"
 
-#: builtin/tag.c:478
+#: builtin/tag.c:476
 msgid "print only tags of the object"
 msgstr "yalnızca nesnenin etiketlerini yazdır"
 
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column ve -n birbiriyle uyumsuz"
-
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "-n seçeneğine yalnızca liste kipinde izin verilir"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "--contains seçeneğine yalnızca liste kipinde izin verilir"
-
-#: builtin/tag.c:552
-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:554
-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:556
-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:567
-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:592
+#: 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:597
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "'%s' etiketi halihazırda var"
 
-#: builtin/tag.c:628
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "'%s' etiketi güncellendi (%s idi)\n"
@@ -23166,195 +23593,190 @@ msgstr "Nesneler açılıyor"
 msgid "failed to create directory %s"
 msgstr "%s dizini oluşturulamadı"
 
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "%s dosyası oluşturulamadı"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "%s dosyası silinemedi"
 
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "%s dizini silinemedi"
 
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "'%s' içindeki mtime sınanıyor "
 
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
 msgstr "dizin bilgileri yeni bir dosya ekledikten sonra deÄŸiÅŸmez"
 
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
 msgid "directory stat info does not change after adding a new directory"
 msgstr "dizin bilgileri yeni bir dizin ekledikten sonra deÄŸiÅŸmez"
 
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
 msgid "directory stat info changes after updating a file"
 msgstr "dizin bilgileri bir dosya güncellemesinden sonra değişir"
 
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr "dizin bilgileri altdizin içine yeni bir dosya ekledikten sonra değişir"
 
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
 msgid "directory stat info does not change after deleting a file"
 msgstr "dizin bilgileri bir dosya sildikten sonra deÄŸiÅŸmez"
 
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
 msgid "directory stat info does not change after deleting a directory"
 msgstr "dizin bilgileri bir dizin sildikten sonra deÄŸiÅŸmez"
 
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
 msgid " OK"
 msgstr " Tamam"
 
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<seçenekler>] [--] [<dosya>...]"
 
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr "indeksin güncellenmesi gerekse bile yenilemeyi sürdür"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "refresh: altmodülleri yok say"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "yeni dosyaları yok sayma"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "dosyaların dizinlerin yerine geçmesine ve tersine izin ver"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "çalışma ağacından eksik olan dosyaları fark et"
 
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "indekste birleÅŸtirilmemiÅŸ girdiler olsa bile yenile"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "dosya durum bilgisini yenile"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "--refresh gibi; ancak assume-unchanged ayarını yok sayar"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<kip>,<nesne>,<yol>"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "belirtilen girdiyi indekse ekle"
 
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "dosyaları \"not changing\" olarak imle"
 
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "assumed-unchanged kısmını temizle"
 
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "dosyaları \"index-only\" olarak imle"
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "skip-worktree kısmını atla"
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
 msgid "do not touch index-only entries"
 msgstr "'index-only' girdilerine dokunma"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr "yalnızca indekse ekle; içeriğe nesne veritabanına ekleme"
 
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr "çalışma ağacında mevcut olsa bile ad verilen yolları kaldır"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "--stdin ile: girdi satırları boş baytlarla sonlandırılır"
 
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "güncellenecek yol listelerini standart girdi'den oku"
 
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "indekse standart girdi'den girdiler ekle"
 
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "#2 ve #3 numaralı adımları listelenmiş yollar için yeniden doldur"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "yalnızca HEAD'den farklı olan girdileri güncelle"
 
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "çalışma ağacından eksik olan dosyaları yok say"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "eylemleri standart çıktı'ya bildir"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(okunabilir veri için) kaydedilmiş çözülmeyen çakışmaları unut"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "indeksi bu biçimle yaz"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "bölünmüş indeksi etkinleştir veya devre dışı bırak"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "izlenmeyen önbelleği etkinleştir/devre dışı bırak"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "dosya sisteminin izlenmeyen önbellek destekleyip desteklemediğini sına"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "dosya sistemini sınamadan izlenmeyen önbelleği etkinleştir"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "deÄŸiÅŸtirilmiÅŸ olarak imlenmese bile indeksi yaz"
 
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "dosya sistemi monitörünü etkinleştir veya devre dışı bırak"
 
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "dosyaları dosya sistemi monitöründe geçerli olarak imle"
 
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "dosya sistemi monitöründe geçerli kısmını temizle"
 
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -23362,7 +23784,7 @@ msgstr ""
 "core.splitIndex 'false' olarak ayarlanmış; bölünmüş indeksi etkinleştirmeyi "
 "gerçekten istiyorsanız bunu kaldırın veya değiştirin"
 
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -23370,7 +23792,7 @@ msgstr ""
 "core.splitIndex 'true' olarak ayarlanmış; bölünmüş indeksi devre dışı "
 "bırakmayı gerçekten istiyorsanız bunu kaldırın veya değiştirin"
 
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -23378,11 +23800,11 @@ msgstr ""
 "core.untrackedCache 'true' olarak ayarlanmış; izlenmeyen önbelleği gerçekten "
 "devre dışı bırakmayı istiyorsanız bunu kaldırın veya değiştirin"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "İzlenmeyen önbellek devre dışı bırakıldı"
 
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -23390,29 +23812,29 @@ msgstr ""
 "core.untrackedCache 'false' olarak ayarlanmış; izlenmeyen önbelleği "
 "gerçekten etkinleştirmek istiyorsanız bunu kaldırın veya değiştirin"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "İzlenmeyen önbellek '%s' için etkinleştirildi"
 
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 "core.fsmonitor ayarlanmamış; dosya sistemin monitörünü gerçekten "
 "etkinleştirmek istiyorsanız onu ayarlayın"
 
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "dosya sistemi monitörü etkin"
 
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 "core.fsmonitor ayarlanmış; dosya sistemi monitörünü gerçekten devre dışı "
 "bırakmak istiyorsanız onu kaldırın"
 
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "dosya sistemi monitörü devre dışı"
 
@@ -23429,19 +23851,19 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<seçenekler>] --stdin [-z]"
 
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "baÅŸvuruyu sil"
 
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
 msgstr "<başvuru-adı>'nı güncelleyin, işaret ettiğini değil"
 
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin'de NUL ile sonlandırılan argümanlar var"
 
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "güncellemeleri stdin'den oku"
 
@@ -23457,19 +23879,19 @@ msgstr "bilgi dosyalarını en baştan güncelle"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<seçenekler>] <dizin>"
 
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
 msgid "quit after a single request/response exchange"
 msgstr "tek bir istek/yanıt değiş tokuşundan sonra çık"
 
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "ilk başvuru tanıtımından sonra hemen çık"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "git-http-backend için info/refs'i sun"
 
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "eÄŸer <dizin> bir Git dizini deÄŸilse <dizin>/.git/ deneme"
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "aktarımı <n> saniye hareketsizlikten sonra kes"
 
@@ -23505,63 +23927,58 @@ msgstr "git verify-tag [-v | --verbose] [--format=<biçim>] <etiket>..."
 msgid "print tag contents"
 msgstr "etiket içeriğini yazdır"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<seçenekler>] <yol> [<işlememsi>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<seçenekler>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<seçenekler>] <yol>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <ç-ağacı> <yeni-yol>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<seçenekler>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<seçenekler>] <ç-ağacı>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <yol>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:935
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "'%s' silinemedi"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "%s/%s kaldırılıyor: %s"
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
 msgid "report pruned working trees"
 msgstr "budanan çalışma ağaçlarını bildir"
 
-#: builtin/worktree.c:151
+#: builtin/worktree.c:150
 msgid "expire working trees older than <time>"
 msgstr "<zaman>'dan eski çalışma ağaçlarının hükmünü kaldır"
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c:220
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' halihazırda var"
 
-#: builtin/worktree.c:230
+#: builtin/worktree.c:229
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "kullanılamayan çalışma ağacı konumu '%s'"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -23571,7 +23988,7 @@ msgstr ""
 "geçersiz kılmak için '%s -f -f', temizlemek için 'unlock', 'prune' veya "
 "'remove' kullanın"
 
-#: builtin/worktree.c:237
+#: builtin/worktree.c:236
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -23580,27 +23997,31 @@ msgstr ""
 "'%s' eksik; ancak halihazırda kaydı yapılmış bir çalışma ağacı;\n"
 "geçersiz kılmak için '%s -f', temizlemek için 'prune' veya 'remove' kullanın"
 
-#: builtin/worktree.c:288
+#: builtin/worktree.c:287
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "'%s' dizini oluşturulamadı"
 
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+msgid "initializing"
+msgstr "ilklendiriliyor"
+
+#: 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:424
+#: 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:433
+#: 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:439
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Çalışma ağacı hazırlanıyor (ayrık HEAD %s)"
@@ -23625,82 +24046,78 @@ msgstr "yeni çalışma ağacını doldur"
 msgid "keep the new working tree locked"
 msgstr "yeni çalışma ağacını kilitli tut"
 
-#: builtin/worktree.c:493
+#: builtin/worktree.c:492 builtin/worktree.c:729
+msgid "reason for locking"
+msgstr "kilitleme nedeni"
+
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "izleme kipini ayarla (bkz: git-branch(1))"
 
-#: builtin/worktree.c:496
+#: 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:504
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B ve --detach birlikte kullanılamaz"
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "--lock ile eklendi"
 
-#: builtin/worktree.c:565
+#: 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:682
+#: 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:684
+#: 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:693
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose ve --porcelain birlikte kullanılamaz"
-
-#: builtin/worktree.c:720
-msgid "reason for locking"
-msgstr "kilitleme nedeni"
-
-#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
-#: builtin/worktree.c:963
+#: 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:734 builtin/worktree.c:767
+#: 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:739
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' halihazırda kilitli, nedeni: %s"
 
-#: builtin/worktree.c:741
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' halihazırda kilitli"
 
-#: builtin/worktree.c:769
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' kilitli deÄŸil"
 
-#: builtin/worktree.c:810
+#: 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:818
+#: 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:841 builtin/worktree.c:965
+#: 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:846
+#: 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:859
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -23709,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:861
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -23717,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:864
+#: 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:869
+#: 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:915
+#: 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:919
+#: 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:924
+#: 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:947
+#: 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:970
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -23757,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:972
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -23765,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:975
+#: 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:999
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "ÅŸunu onar %s: %s"
 
-#: builtin/worktree.c:1002
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "hata: %s: %s"
@@ -23826,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"
@@ -23856,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"
@@ -23890,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:833
+#: 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:883
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "%s bir yerleşik olarak ele alınamıyor"
 
-#: git.c:896
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -23921,34 +24328,26 @@ msgstr ""
 "kullanım: %s\n"
 "\n"
 
-#: git.c:916
+#: 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:928
+#: 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"
@@ -23974,66 +24373,32 @@ msgstr "test-tool serve-v2 [<seçenekler>]"
 msgid "exit immediately after advertising capabilities"
 msgstr "becerileri gösterdikten hemen sonra çık"
 
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "soket/boru halihazırda kullanımda: '%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "sunucu şurada başlatılamadı: '%s'"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "arka plan servisi oluşturulup çalıştırılamadı"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "waitpid başarısız"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "arka plan servisi henüz çevrimiçi değil"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "arka plan servisi başlatılamadı"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid'in kafası karışmış"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "arka plan servisi henüz kapanmadı"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
 msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
 msgstr "test-helper simple-ipc is-active    [<ad>] [<seçenekler>]"
 
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
 msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
 msgstr "test-helper simple-ipc run-daemon   [<ad>] [<iş-parçacıkları>]"
 
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
 msgstr ""
 "test-helper simple-ipc start-daemon [<ad>] [<iş-parçacıkları>] [<maks-bekl>]"
 
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
 msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
 msgstr "test-helper simple-ipc stop-daemon  [<ad>] [<maks-bekle>]"
 
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
 msgid "test-helper simple-ipc send         [<name>] [<token>]"
 msgstr "test-helper simple-ipc send         [<ad>] [<jeton>]"
 
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
 msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
 msgstr "test-helper simple-ipc sendbytes    [<ad>] [<bayt-sayısı>] [<bayt>]"
 
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
 msgid ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
@@ -24041,84 +24406,80 @@ msgstr ""
 "test-helper simple-ipc multiple     [<ad>] [<iş-parçacığı>] [<bayt-sayısı>] "
 "[<parti-boyutu>]"
 
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
 msgid "name or pathname of unix domain socket"
 msgstr "unix ad alanının adı veya yol adı"
 
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
 msgid "named-pipe name"
 msgstr "named-pipe adı"
 
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
 msgid "number of threads in server thread pool"
 msgstr "sunucu iş parçacığı havuzundaki iş parçacığı sayısı"
 
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
 msgid "seconds to wait for daemon to start or stop"
 msgstr "arka plan servisinin başlaaması veya durması için beklenecek saniye"
 
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
 msgid "number of bytes"
 msgstr "bayt sayısı"
 
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
 msgid "number of requests per thread"
 msgstr "iş parçacığı başına düşen istek sayısı"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "byte"
 msgstr "bayt"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "ballast character"
 msgstr "dengeleyici karakter"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "token"
 msgstr "jeton"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "command token to send to the server"
 msgstr "sunucuya gönderilecek komut jetonu"
 
-#: http.c:399
+#: http.c:350
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "http.postbuffer için negatif değer; %d olarak varsayılıyor"
 
-#: http.c:420
+#: http.c:371
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Delegasyon denetimi cURL < 7.22.0 tarafından desteklenmiyor"
 
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Ortak anahtar iğnelemesi cURL < 7.44.0 tarafından desteklenmiyor"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Ortak anahtar iğnelemesi cURL < 7.39.0 tarafından desteklenmiyor"
 
-#: http.c:910
+#: http.c:812
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "CURLSSLOPT_NO_REVOKE cURL < 7.44.0 tarafından desteklenmiyor"
 
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "Protokol sınırlamaları cURL < 7.19.4 tarafından desteklenmiyor"
-
-#: http.c:1132
+#: http.c:1016
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "Desteklenmeyen SSL arka ucu '%s'. Desteklenen SSL arka uçları:"
 
-#: http.c:1139
+#: http.c:1023
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 "SSL arka ucu '%s' olarak ayarlanamadı: cURL, SSL arka uçları olmadan yapılmış"
 
-#: http.c:1143
+#: http.c:1027
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "SSL arka ucu '%s' olarak ayarlanamadı: Halihazırda ayarlanmış"
 
-#: http.c:2035
+#: http.c:1876
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -24134,134 +24495,309 @@ msgstr ""
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "push-option değerinde geçersiz tırnak içine alım: '%s'"
 
-#: remote-curl.c:307
+#: remote-curl.c:304
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs geçerli değil: bu bir git deposu mu?"
 
-#: remote-curl.c:408
+#: remote-curl.c:405
 msgid "invalid server response; expected service, got flush packet"
 msgstr "geçersiz sunucu yanıtı; servis bekleniyordu, floş paketi alındı"
 
-#: remote-curl.c:439
+#: remote-curl.c:436
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "geçersiz sunucu yanıtı; '%s' alındı"
 
-#: remote-curl.c:499
+#: remote-curl.c:496
 #, c-format
 msgid "repository '%s' not found"
 msgstr "'%s' deposu bulunamadı"
 
-#: remote-curl.c:503
+#: remote-curl.c:500
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "'%s' için kimlik doğrulaması başarısız"
 
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "'%s', http.pinnedPubkey yapılandırması ile erişilemiyor: %s"
+
+#: remote-curl.c:508
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "'%s' eriÅŸilemiyor: %s"
 
-#: remote-curl.c:513
+#: remote-curl.c:514
 #, c-format
 msgid "redirecting to %s"
 msgstr "şuraya yeniden yönlendiriliyor: %s"
 
-#: remote-curl.c:642
+#: remote-curl.c:645
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "dosya sonuna dikkat edilmiyorsa dosya sonu olmamalıdır"
 
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr "uzak sunucu durumsuz ayırıcı gönderdi"
+#: remote-curl.c:657
+msgid "remote server sent unexpected response end packet"
+msgstr "uzak sunucu beklenmedik yanıt sonu paketi gönderdi"
 
-#: remote-curl.c:724
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
-"rpc sonrası verisi geri sarılamıyor - https.postBuffer'ı artırmayı deneyin"
+"rpc sonrası verisi geri sarılamıyor - http.postBuffer'ı artırmayı deneyin"
 
-#: remote-curl.c:754
+#: remote-curl.c:755
 #, c-format
 msgid "remote-curl: bad line length character: %.4s"
 msgstr "remote-curl: hatalı satır uzunluğu karakteri: %.4s"
 
-#: remote-curl.c:756
+#: remote-curl.c:757
 msgid "remote-curl: unexpected response end packet"
 msgstr "remote-curl: beklenmedik yanıt sonu paketi"
 
-#: remote-curl.c:832
+#: remote-curl.c:833
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC başarısız oldu; %s"
 
-#: remote-curl.c:872
+#: remote-curl.c:873
 msgid "cannot handle pushes this big"
 msgstr "bu kadar büyük itmeler ele alınamıyor"
 
-#: remote-curl.c:987
+#: remote-curl.c:986
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "istek söndürülemiyor; 'zlib deflate' hatası %d"
 
-#: remote-curl.c:991
+#: remote-curl.c:990
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "istek söndürülemiyor; 'zlib end' hatası %d"
 
-#: remote-curl.c:1041
+#: remote-curl.c:1040
 #, c-format
 msgid "%d bytes of length header were received"
 msgstr "üstbilginin %d baytı alındı"
 
-#: remote-curl.c:1043
+#: remote-curl.c:1042
 #, c-format
 msgid "%d bytes of body are still expected"
 msgstr "gövdenin %d baytı hâlâ bekleniyor"
 
-#: remote-curl.c:1132
+#: remote-curl.c:1131
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "programlanamayan http taşıyıcısı sığ işlevleri desteklemiyor"
 
-#: remote-curl.c:1147
+#: remote-curl.c:1146
 msgid "fetch failed."
 msgstr "getirme başarısız."
 
-#: remote-curl.c:1193
+#: remote-curl.c:1192
 msgid "cannot fetch by sha1 over smart http"
 msgstr "akıllı http üzerinden sha1 ile getirme yapılamıyor"
 
-#: remote-curl.c:1237 remote-curl.c:1243
+#: remote-curl.c:1236 remote-curl.c:1242
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "protokol hatası: sha/ref bekleniyordu, '%s' alındı"
 
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1254 remote-curl.c:1372
 #, c-format
 msgid "http transport does not support %s"
 msgstr "http taşıyıcısı %s desteklemiyor"
 
-#: remote-curl.c:1291
+#: remote-curl.c:1290
 msgid "git-http-push failed"
 msgstr "git-http-push başarısız"
 
-#: remote-curl.c:1479
+#: remote-curl.c:1478
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: kullanım: git remote-curl <uzak-konum> [<url>]"
 
-#: remote-curl.c:1511
+#: remote-curl.c:1510
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl: git'ten komut akışı okunurken hata"
 
-#: remote-curl.c:1518
+#: remote-curl.c:1517
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: yerel bir depo olmadan getirme yapılmaya çalışıldı"
 
-#: remote-curl.c:1559
+#: remote-curl.c:1558
 #, c-format
 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"
@@ -24278,11 +24814,11 @@ msgstr "argümanlar"
 msgid "object filtering"
 msgstr "nesne süzümü"
 
-#: parse-options.h:184
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "son kullanım tarihi"
 
-#: parse-options.h:198
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "işlem yok (geriye dönük uyumluluk için)"
 
@@ -24312,11 +24848,11 @@ msgid ""
 msgstr ""
 "--pathspec-from-file ile, yol belirteci ögeleri NUL karakteri ile ayrılır"
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "key"
 msgstr "anahtar"
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "üzerine sıralanacak alan adı"
 
@@ -24386,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"
@@ -24591,453 +25127,418 @@ 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"
 msgstr "Önerilen Git çalışma akışlarına genel bakış"
 
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "ikili arama başarısız: Komut verilmedi."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "$command çalıştırılıyor"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"bisect çalıştırılamadı:\n"
-"çıkış kodu $res, '$command' konumundan, < 0 veya >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "bisect daha fazla çalıştırılamıyor"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"ikili arama başarısız oldu:\n"
-"'bisect-state $state' $res hata koduyla çıktı"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "ikili arama başarılı"
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -25076,96 +25577,19 @@ 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:179
-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"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "depo URL'si: '$repo' kesin olmalı veya ./|../ ile başlamalıdır"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' indekste halihazırda var"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' indekste halihazırda var ve bir altmodül değil"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' çıkış yapılan bir işlemeye iye değil"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "'$sm_path' konumundaki mevcut depo indekse ekleniyor"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "'$sm_path' halihazırda mevcut ve geçerli bir git deposu değil"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr "'$sm_name' için bir git deposu yerelde şu uzak konumlarla bulundu:"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-"  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"Bu yerel git dizinini\n"
-"  $realrepo\n"
-"konumundan bir kez daha klonlamak yerine yeniden kullanmak istiyorsanız\n"
-"--force seçeneğini kullanın. Eğer bu git dizini doğru depo değilse veya \n"
-"bunun ne anlama geldiğinden emin değilseniz --name seçeneği ile başka bir\n"
-"ad seçin."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "'$sm_name' altmodülü için yerel git dizini yeniden etkinleştiriliyor."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "'$sm_path' altmodülü çıkış yapılamıyor"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "'$sm_path' altmodülü eklenemedi"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "'$sm_path' altmodülü kaydı yapılamadı"
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "'$displaypath' altmodül yolunda geçerli revizyon bulunamadı"
 
-#: git-submodule.sh:578
+#: git-submodule.sh:411
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "'$sm_path' altmodül yolunda getirme yapılamadı"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:416
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25174,454 +25598,49 @@ msgstr ""
 "'$sm_path' altmodül yolunda geçerli ${remote_name}/${branch} revizyonu "
 "bulunamadı"
 
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"'$displaypath' altmodül yolunda getirme yapılamadı; $sha1 doğrudan "
-"getirilmeye çalışılıyor"
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"'$displaypath' altmodül yolunda getirme tamamlandı; ancak $sha1 içermiyor. "
-"Bu işlemenin doğrudan getirilmesi başarısız oldu."
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "'$displaypath' altmodül yolunda '$sha1' çıkışı yapılamadı"
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "Altmodül yolu '$displaypath': '$sha1' çıkışı yaptı"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "'$sha1', '$displaypath' altmodül yolunda yeniden temellendirilemedi"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Altmodül yolu '$displaypath': '$sha1' içine yeniden temellendirildi"
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "'$sha1', '$displaypath' altmodül yolunda birleştirilemedi"
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Altmodül yolu '$displaypath': '$sha1' içinde birleştirildi"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr "'$displaypath' altmodül yolunda '$command $sha1' çalıştırılamadı"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "Altmodül yolu '$displaypath': '$command $sha1'"
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "'$displaypath' altmodül yoluna özyinelenemedi"
 
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "Kendiliğinden zulalama uygulandı."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "$stash_sha1 depolanamıyor"
-
-#: git-rebase--preserve-merges.sh:113
-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 ""
-"Kendiliğinden zulalama uygulaması çakışmalara neden oldu.\n"
-"Değişiklikleriniz zula içerisinde güvende.\n"
-"Ä°stediÄŸiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "Yeniden temellendiriliyor ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-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"
-"Komutlar:\n"
-"p, pick <iÅŸleme> = iÅŸlemeyi kullan\n"
-"r, reword <işleme> = işlemeyi kullan; ancak işleme iletisini düzenle\n"
-"e, edit <işleme> = işlemeyi kullan; ancak değiştirme için dur\n"
-"s, squash <işleme> = işlemeyi kullan; ancak önceki işleme içine karıştır\n"
-"f, fixup <işleme> = \"squash\" gibi; ancak bu işlemenin günlük iletisini at\n"
-"x, exec <işleme> = komutu (satırın geri kalanı) kabuk kullanarak çalıştır\n"
-"d, drop <işleme> = işlemeyi kaldır\n"
-"l, label <etiket> = geçerli HEAD'i bir ad ile etiketle\n"
-"t, reset <etiket> = HEAD'i bir etikete sıfırla\n"
-"m, merge [-C <işleme> | -c <işleme>] <etiket> [# <tek-satır>]\n"
-".       orijinal birleÅŸtirme iÅŸlemesi iletisini kullanarak bir\n"
-".       birleştirme işlemesi oluştur (veya teksatır, eğer bir orijinal\n"
-".       birleÅŸtirme iÅŸlemesi belirtilmemiÅŸse). Ä°ÅŸleme iletisini yeniden\n"
-".       yazmak için -c <işleme> kullanın.\n"
-"\n"
-"Bu satırlar yeniden sıralanabilirler, yukarıdan aşağıya çalıştırılırlar.\n"
-
-#: git-rebase--preserve-merges.sh:260
-#, 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 ""
-"Ä°ÅŸlemeyi ÅŸimdi ÅŸu komutla deÄŸiÅŸtirebilirsiniz:\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Değişikliklerinizden memnunsanız şu komutla sürdürün:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: seçilebilecek bir işleme değil"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Geçersiz işleme adı: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Geçerli işlemenin yerine geçecek sha1 yazılamıyor"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Åžuraya ileri sar: $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Şuraya ileri sarılamıyor: $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "HEAD şuraya taşınamıyor: $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Bir birleştirmeyi tıkıştırma reddediliyor: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "$sha1 birleştirmesi yeniden yapılırken hata"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "$sha1 seçilemedi"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "Ä°ÅŸleme iletisi #${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Ä°ÅŸleme iletisi #${n} atlanacak:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "Bu $count iÅŸlemenin bir birleÅŸimidir."
-msgstr[1] "Bu $count iÅŸlemenin bir birleÅŸimidir."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "$fixup_msg yazılamıyor"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "Bu 2 iÅŸlemenin bir birleÅŸimidir."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "$sha1... $rest uygulanamadı"
-
-#: git-rebase--preserve-merges.sh:601
-#, 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 başarıyla seçildikten sonra işleme değiştirilemedi.\n"
-"Bu büyük olasılıkla boş bir işleme iletisinden veya pre-commit kancasının\n"
-"başarısız olmasından kaynaklıdır. Eğer pre-commit kancası başarısız olduysa\n"
-"işlemeyi düzenleyebilmeye başlamanız için bu sorunu çözmeniz gerekebilir."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Åžurada duruldu: $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Öncesinde bir işleme olmadan '$squash_style' yapılamıyor"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "Çalıştırılıyor: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Çalıştırma başarısız: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "ve indekse ve/veya çalışma ağacına değişiklikler yaptı"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"Sorunu çözüp sürdürmek için şunu çalıştırın\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, 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 ""
-"Çalıştırma başarılı: $rest\n"
-"ancak indekse ve/veya çalışma ağacına değişiklikler bıraktı.\n"
-"Değişikliklerinizi işleyin veya zulalayın, ardından şunu çalıştırın:\n"
-"\n"
-"\tgit rebase --continue"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Bilinmeyen komut: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Lütfen bunu 'git rebase --edit-todo' kullanarak onarın."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "$head_name başarıyla yeniden temellendirildi ve güncellendi."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "CHERRY_PICK_HEAD kaldırılamadı"
-
-#: git-rebase--preserve-merges.sh:807
-#, 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 ""
-"Çalışma ağacınızda hazırlanmış değişiklikleriniz var.\n"
-"Eğer bu değişiklikleri bir önceki işlemeye eklenmesi\n"
-"gerekiyorsa şu komutu çalıştırın:\n"
-"\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
-"\n"
-"Eğer yeni bir işleme içinse şunu çalıştırın:\n"
-"\n"
-"\tgit commit $gpg_sign_opt_quoted\n"
-"\n"
-"Her iki durumda da işinizi bitirdikten sonra şununla sürdürün:\n"
-"\n"
-"\tgit rebase --continue\n"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "İşlemeyi değiştirmek için yazar kimliğini bulmaya çalışırken hata"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"Çalışma ağacınızda işlenmemiş değişiklikleriniz var. Lütfen önce onları\n"
-"işleyin ve ardından yeniden 'git rebase --continue' çalıştırın."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Hazırlanan değişiklikler işlenemedi."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Düzenleyici çalıştırılamadı"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "$switch_to çıkışı yapılamadı"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "HEAD yok mu?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Geçici $state_dir oluşturulamadı"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "EtkileÅŸimli olarak imlenemedi"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] ""
-"$shortrevisions ögesini $shortonto üzerine yeniden temelle ($todocount komut)"
-msgstr[1] ""
-"$shortrevisions ögesini $shortonto üzerine yeniden temelle ($todocount komut)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Boş işlemelerin yorum olarak varsayıldığını kenara yazın."
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Yeniden yazılan işlemeler ilklendirilemedi"
-
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 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
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var."
-
-#: git-sh-setup.sh:224
+#: 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:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr ""
-"Yeniden temellendirme ile çekilemiyor: Hazırlanmamış değişiklikleriniz var."
-
-#: git-sh-setup.sh:230
+#: 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:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr ""
-"Yeniden temellendirme yapılamıyor: İndeksinizde işlenmemiş değişiklikleriniz "
-"var."
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Yeniden temellendirme ile çekilemiyor: İndeksinizde işlenmemiş "
-"deÄŸiÅŸiklikleriniz var."
-
-#: git-sh-setup.sh:249
+#: 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:253
+#: 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:373
+#: 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:378
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr "Git dizininin kesin yolu algılanamıyor"
 
@@ -25703,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"
@@ -25717,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"
@@ -25731,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"
@@ -25745,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"
@@ -25759,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"
@@ -25773,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"
@@ -25787,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"
@@ -25801,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"
@@ -25815,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"
@@ -25837,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"
@@ -25938,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:138
+#: 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:145 git-send-email.perl:151
+#: 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:222
+#: 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:235
+#: 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:321
+#: 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:326
+#: 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:419
+#: 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:493
+#: 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"
@@ -25995,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:498 git-send-email.perl:700
+#: 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:501
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -26010,37 +26029,37 @@ msgstr ""
 "'batch-size' ve 'relogin' birlikte belirtilmeli (komut satırı veya "
 "yapılandırma seçeneklerinden)\n"
 
-#: git-send-email.perl:514
+#: 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:545
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Bilinmeyen --confirm ayarı: '%s'\n"
 
-#: git-send-email.perl:573
+#: 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:575
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "uyarı: ':include:' desteklenmiyor: %s\n"
 
-#: git-send-email.perl:577
+#: 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:582
+#: 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:666
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26055,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:687
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "%s opendir yapılamadı: %s"
 
-#: git-send-email.perl:720
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26070,17 +26089,17 @@ msgstr ""
 "Hiçbir yama dosyası belirtilmedi!\n"
 "\n"
 
-#: git-send-email.perl:733
+#: 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:743
+#: 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:754
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26094,38 +26113,38 @@ msgstr ""
 "\n"
 "Bir özet göndermek istemiyorsanız gövde kısmını temizleyin.\n"
 
-#: git-send-email.perl:778
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "%s açılamadı: %s"
 
-#: git-send-email.perl:795
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "%s.final açılamadı: %s"
 
-#: git-send-email.perl:838
+#: 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:873
+#: 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:928
+#: 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:933
+#: 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:941
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26138,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:960
+#: 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:978
+#: 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:990
+#: 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:1048 git-send-email.perl:1056
+#: 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"
@@ -26161,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:1060
+#: 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:1377
+#: 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:1460
+#: 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"
@@ -26196,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:1475
+#: 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:1478
+#: 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:1506
+#: 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:1553
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Sunucu STARTTLS desteklemiyor! %s"
 
-#: git-send-email.perl:1558 git-send-email.perl:1562
+#: 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:1571
+#: 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:1589
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "%s gönderilemedi\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "%s gönderilir gibi yapıldı\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s gönderildi\n"
 
-#: git-send-email.perl:1594
+#: 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:1594
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "Tamam. Günlük çıktısı:\n"
 
-#: git-send-email.perl:1606
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Sonuç: "
 
-#: git-send-email.perl:1609
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Sonuç: Tamam\n"
 
-#: git-send-email.perl:1627
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "%s dosyası açılamıyor"
 
-#: git-send-email.perl:1674 git-send-email.perl:1694
+#: 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:1680
+#: 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:1737
+#: 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:1772
+#: 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:1883
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) '%s' çalıştırılamadı"
 
-#: git-send-email.perl:1890
+#: 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:1894
+#: 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:1924
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "ileti 7 bit olarak gönderilemiyor"
 
-#: git-send-email.perl:1932
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "geçersiz aktarım kodlaması"
 
-#: git-send-email.perl:1966
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -26315,12 +26334,12 @@ msgstr ""
 "%s\n"
 "uyarı: hiçbir yama gönderilmedi\n"
 
-#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039
+#: 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:1979
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26329,13 +26348,13 @@ msgstr ""
 "onulmaz: %s:%d, 998 karakterden uzun\n"
 "uyarı: hiçbir yama gönderilmedi\n"
 
-#: git-send-email.perl:1997
+#: 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:2001
+#: 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 ccdabfa2c8..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.32.0-rc0\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-05-17 16:02+0800\n"
-"PO-Revision-Date: 2021-05-24 13:49+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,237 +19,238 @@ 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:376
+#: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Hả (%s)?"
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: 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"
 
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
 #: git-add--interactive.perl:294
 msgid "binary"
 msgstr "nhị phân"
 
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
 #: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "không có gì"
 
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
 #: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "không thay đổi"
 
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
 msgid "Update"
 msgstr "Cập nhật"
 
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
 #, c-format
 msgid "could not stage '%s'"
 msgstr "không thể đưa “%s� lên bệ phóng"
 
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
+#: 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"
 
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
 #, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "đã cập nhật %d đư�ng dẫn\n"
 
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "chú ý: %s gi� đã b� theo dõi.\n"
 
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: 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�"
 
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "Hoàn nguyên"
 
-#: add-interactive.c:775
+#: add-interactive.c:779
 msgid "Could not parse HEAD^{tree}"
 msgstr "Không thể phân tích cú pháp HEAD^{tree}"
 
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
 #, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "đã hoàn nguyên %d đư�ng dẫn\n"
 
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "Không có tập tin nào chưa được theo dõi.\n"
 
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "Thêm các cái chưa được theo dõi"
 
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
 #, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "đã thêm %d đư�ng dẫn\n"
 
-#: add-interactive.c:925
+#: add-interactive.c:929
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "b� qua những thứ chưa hòa trộn: %s"
 
-#: add-interactive.c:937 add-patch.c:1751 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:939 add-patch.c:1749 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:943 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:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Xem xét lại diff"
 
-#: add-interactive.c:1010
+#: add-interactive.c:1014
 msgid "show paths with changes"
 msgstr "hiển thị đư�ng dẫn với các thay đổi"
 
-#: add-interactive.c:1012
+#: add-interactive.c:1016
 msgid "add working tree state to the staged set of changes"
 msgstr ""
 "thêm trạng thái cây làm việc vào tập hợp các thay đổi đã được đưa lên bệ "
 "phóng"
 
-#: add-interactive.c:1014
+#: add-interactive.c:1018
 msgid "revert staged set of changes back to the HEAD version"
 msgstr ""
 "hoàn nguyên lại tập hợp các thay đổi đã được đưa lên bệ phóng trở lại phiên "
 "bản HEAD"
 
-#: add-interactive.c:1016
+#: add-interactive.c:1020
 msgid "pick hunks and update selectively"
 msgstr "ch�n các “khúc� và cập nhật có tuyển ch�n"
 
-#: add-interactive.c:1018
+#: add-interactive.c:1022
 msgid "view diff between HEAD and index"
 msgstr "xem khác biệt giữa HEAD và mục lục"
 
-#: add-interactive.c:1020
+#: add-interactive.c:1024
 msgid "add contents of untracked files to the staged set of changes"
 msgstr ""
 "thêm nội dung của các tập tin chưa được theo dõi vào tập hợp các thay đổi đã "
 "được đưa lên bệ phóng"
 
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
 msgid "Prompt help:"
 msgstr "Trợ giúp v� nhắc:"
 
-#: add-interactive.c:1030
+#: add-interactive.c:1034
 msgid "select a single item"
 msgstr "ch�n một mục đơn"
 
-#: add-interactive.c:1032
+#: add-interactive.c:1036
 msgid "select a range of items"
 msgstr "ch�n một vùng các mục"
 
-#: add-interactive.c:1034
+#: add-interactive.c:1038
 msgid "select multiple ranges"
 msgstr "ch�n nhi�u vùng"
 
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
 msgid "select item based on unique prefix"
 msgstr "ch�n mục dựa trên ti�n tố duy nhất"
 
-#: add-interactive.c:1038
+#: add-interactive.c:1042
 msgid "unselect specified items"
 msgstr "b� ch�n các mục đã cho"
 
-#: add-interactive.c:1040
+#: add-interactive.c:1044
 msgid "choose all items"
 msgstr "ch�n tất cả các mục"
 
-#: add-interactive.c:1042
+#: add-interactive.c:1046
 msgid "(empty) finish selecting"
 msgstr "(để trống) hoàn tất ch�n lựa"
 
-#: add-interactive.c:1079
+#: add-interactive.c:1083
 msgid "select a numbered item"
 msgstr "tùy ch�n mục bằng số"
 
-#: add-interactive.c:1083
+#: add-interactive.c:1087
 msgid "(empty) select nothing"
 msgstr "(để trống) không ch�n gì"
 
-#: add-interactive.c:1091 builtin/clean.c:816 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:1092 builtin/clean.c:817 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"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "staged"
 msgstr "đã đưa lên bệ phóng"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "chưa đưa lên bệ phóng"
 
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
-#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
-#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
-#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
+#: 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"
 
-#: add-interactive.c:1151
+#: add-interactive.c:1155
 msgid "could not refresh index"
 msgstr "không thể đ�c lại bảng mục lục"
 
-#: add-interactive.c:1165 builtin/clean.c:781 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,?]? "
@@ -277,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,?]? "
@@ -319,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,?]? "
@@ -363,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,?]? "
@@ -405,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,?]? "
@@ -451,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,?]? "
@@ -485,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,?]? "
@@ -533,34 +534,34 @@ 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:342
+#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "không thể phân tích cú pháp phần đầu của khúc “%.*s�"
 
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "không thể phân tích cú pháp phần đầu khúc đã tô màu “%.*s�"
 
-#: add-patch.c:419
+#: add-patch.c:420
 msgid "could not parse diff"
 msgstr "không thể phân tích cú pháp khác biệt"
 
-#: add-patch.c:438
+#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr "không thể phân tích khác biệt được tô màu"
 
-#: add-patch.c:452
+#: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
 msgstr "gặp lỗi khi chạy “%s�"
 
-#: add-patch.c:611
+#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
 msgstr "đầu ra không khớp từ interactive.diffFilter"
 
-#: add-patch.c:612
+#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
@@ -568,7 +569,7 @@ msgstr ""
 "Bộ l�c của bạn phải duy trì một quan hệ một-đến-một\n"
 "giữa các dòng đầu vào và đầu ra của nó."
 
-#: add-patch.c:790
+#: add-patch.c:791
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -577,7 +578,7 @@ msgstr ""
 "cần dòng ngữ cảnh #%d trong\n"
 "%.*s"
 
-#: add-patch.c:805
+#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -590,11 +591,11 @@ msgstr ""
 "\tkhông được kết thúc bằng:\n"
 "%.*s"
 
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "Chế độ sửa khúc bằng tay -- xem ở đáy để có hướng dẫn sử dụng nhanh.\n"
 
-#: add-patch.c:1085
+#: add-patch.c:1086
 #, c-format
 msgid ""
 "---\n"
@@ -603,12 +604,12 @@ msgid ""
 "Lines starting with %c will be removed.\n"
 msgstr ""
 "---\n"
-"�ể gỡ b� dòng “%c�, sửa chúng thành những dòng ' ' (ngữ cảnh).\n"
+"�ể gỡ b� dòng “%c�, sửa chúng thành những dòng “ � (ngữ cảnh).\n"
 "�ể gõ b� dòng “%c�, xóa chúng đi.\n"
 "Những dòng bắt đầu bằng %c sẽ bị loại b�.\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -618,11 +619,11 @@ msgstr ""
 "để sửa lần nữa. Nếu m�i dòng của khúc bị xóa b�, thế thì những\n"
 "sửa dổi sẽ bị loại b�, và khúc vẫn giữ nguyên.\n"
 
-#: add-patch.c:1132
+#: add-patch.c:1133
 msgid "could not parse hunk header"
 msgstr "không thể phân tích cú pháp phần đầu khúc"
 
-#: add-patch.c:1177
+#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr "“git apply --cached� gặp lỗi"
 
@@ -638,26 +639,26 @@ 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:1246 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 ""
 "Hunk đã sửa của bạn không được áp dụng. Sửa lại lần nữa (nói \"n\" để loại "
 "b�!) [y/n]? "
 
-#: add-patch.c:1289
+#: add-patch.c:1290
 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:1290 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:1297 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"
 
-#: add-patch.c:1354
+#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -679,72 +680,72 @@ msgstr ""
 "e - sửa bằng tay khúc hiện hành\n"
 "? - hiển thị trợ giúp\n"
 
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
 msgstr "Không có khúc kế trước"
 
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
 msgstr "Không có khúc kế tiếp"
 
-#: add-patch.c:1537
+#: add-patch.c:1538
 msgid "No other hunks to goto"
 msgstr "Không còn khúc nào để mà nhảy đến"
 
-#: add-patch.c:1548 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:1549 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? "
 
-#: add-patch.c:1560
+#: add-patch.c:1561
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "Số không hợp lệ: “%s�"
 
-#: add-patch.c:1565
+#: add-patch.c:1566
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "Rất tiếc, chỉ có sẵn %d khúc."
 
-#: add-patch.c:1574
+#: add-patch.c:1575
 msgid "No other hunks to search"
 msgstr "Không còn khúc nào để mà tìm kiếm"
 
-#: add-patch.c:1580 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? "
 
-#: add-patch.c:1595
+#: add-patch.c:1596
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "�ịnh dạng tìm kiếm của biểu thức chính quy không đúng %s: %s"
 
-#: add-patch.c:1612
+#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
 msgstr "Không thấy khúc nào khớp mẫu đã cho"
 
-#: add-patch.c:1619
+#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
 msgstr "Rất tiếc, không thể chia nh� khúc này"
 
-#: add-patch.c:1623
+#: add-patch.c:1624
 #, c-format
 msgid "Split into %d hunks."
 msgstr "Chi nh� thành %d khúc."
 
-#: add-patch.c:1627
+#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
 msgstr "Rất tiếc, không thể sửa khúc này"
 
-#: add-patch.c:1679
+#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr "“git apply� gặp lỗi"
 
-#: advice.c:145
+#: advice.c:78
 #, c-format
 msgid ""
 "\n"
@@ -753,45 +754,47 @@ msgstr ""
 "\n"
 "Tắt l�i nhắn này bằng \"git config advice.%s false\""
 
-#: advice.c:161
+#: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sgợi ý: %.*s%s\n"
 
-#: advice.c:252
+#: advice.c:178
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 "Cherry-picking là không thể thực hiện bởi vì bạn có những tập tin chưa được "
 "hòa trộn."
 
-#: advice.c:254
+#: advice.c:180
 msgid "Committing is not possible because you have unmerged files."
 msgstr ""
-"Commit là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+"Không thể thực hiện chuyển giao được bởi vì bạn có những tập tin chưa được "
+"hòa trộn."
 
-#: advice.c:256
+#: advice.c:182
 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
-"Merge là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+"Không thể thực hiện hòa trộn bởi vì bạn có những tập tin chưa được hòa trộn."
 
-#: advice.c:258
+#: advice.c:184
 msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
-"Pull là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+"Không thể thực hiện kéo v� bởi vì bạn có những tập tin chưa được hòa trộn."
 
-#: advice.c:260
+#: advice.c:186
 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
-"Revert là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
+"Không thể thực hiện hoàn nguyên bởi vì bạn có những tập tin chưa được hòa "
+"trá»™n."
 
-#: advice.c:262
+#: advice.c:188
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr ""
 "Việc này không thể thực hiện với %s bởi vì bạn có những tập tin chưa được "
 "hòa trộn."
 
-#: advice.c:270
+#: 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."
@@ -799,41 +802,49 @@ msgstr ""
 "Sửa chúng trong cây làm việc, và sau đó dùng lệnh “git add/rm <tập-tin>�\n"
 "dành riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao."
 
-#: advice.c:278
+#: advice.c:204
 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:283 builtin/merge.c:1374
+#: 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)."
 
-#: advice.c:285
+#: advice.c:211
 msgid "Please, commit your changes before merging."
 msgstr "Vui lòng chuyển giao các thay đổi trước khi hòa trộn."
 
-#: advice.c:286
+#: advice.c:212
 msgid "Exiting because of unfinished merge."
 msgstr "Thoát ra bởi vì việc hòa trộn không hoàn tất."
 
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang b� qua."
+
+#: advice.c:227
 #, 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"
+"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 ""
-"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"
+"Các đư�ng dẫn và/hoặc đặc tả đư�ng dẫn sau đây khớp với các đư�ng dẫn tồn "
+"tại\n"
+"bên ngoài định nghĩa “sparse-checkout� của bạn, vì vậy sẽ không\n"
+"cập nhật trong chỉ mục:\n"
 
-#: advice.c:303
+#: advice.c:234
 msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
+"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 ""
-"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."
+"Nếu bạn có ý định cập nhật các mục như vậy, hãy thử một trong các mục sau:\n"
+"* Sử dụng tùy ch�n --sparse.\n"
+"* Vô hiệu hóa hoặc sửa đổi các quy tắc thưa thớt."
 
-#: advice.c:310
+#: advice.c:242
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -893,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
@@ -1012,48 +1035,48 @@ msgstr "tập tin đã xóa %s vẫn còn nội dung"
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "miếng vá định dạng nhị phân sai h�ng tại dòng %d: %.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "vá chỉ với “rác� tại dòng %d"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "không thể đ�c liên kết m�m %s"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "không thể mở hay đ�c %s"
 
-#: apply.c:2935
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "sai khởi đầu dòng: “%c�"
 
-#: apply.c:3056
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)."
 
-#: apply.c:3068
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Ngữ cảnh bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d"
 
-#: apply.c:3074
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1062,451 +1085,451 @@ msgstr ""
 "trong khi đang tìm kiếm cho:\n"
 "%.*s"
 
-#: apply.c:3096
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%s�"
 
-#: apply.c:3104
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "không thể reverse-apply một miếng vá nhị phân mà không đảo ngược khúc thành "
 "“%s�"
 
-#: apply.c:3151
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "không thể áp dụng miếng vá nhị phân thành “%s� mà không có dòng chỉ mục đầy "
 "đủ"
 
-#: apply.c:3162
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
 "miếng vá áp dụng cho “%s� (%s), cái mà không khớp với các nội dung hiện tại."
 
-#: apply.c:3170
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "miếng vá áp dụng cho một “%s� trống rỗng nhưng nó lại không trống"
 
-#: apply.c:3188
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "không thể đ�c postimage %s cần thiết cho “%s�"
 
-#: apply.c:3201
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%s�"
 
-#: apply.c:3208
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "vá nhị phân cho “%s� tạo ra kết quả không chính xác (mong ch� %s, lại nhận "
 "%s)"
 
-#: apply.c:3229
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "gặp lỗi khi vá: %s:%ld"
 
-#: apply.c:3352
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "không thể lấy ra %s"
 
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 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"
 
-#: apply.c:3412
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "đ�c từ “%s� vượt ra ngoài liên kết m�m"
 
-#: apply.c:3441 apply.c:3687
+#: 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:3527 apply.c:3702
+#: 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:3536 apply.c:3710 apply.c:3954
+#: 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:3571
+#: 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:3574
+#: 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:3590 apply.c:3594
+#: 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:3606
+#: 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:3620
+#: 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:3625
+#: 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:3642
+#: 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:3654
+#: 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:3727
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: sai kiểu"
 
-#: apply.c:3729
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s có kiểu %o, cần %o"
 
-#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
-#: read-cache.c:1351
+#: 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:3952
+#: 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:3956
+#: 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:3976
+#: 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:3981
+#: 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:4001
+#: 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:4005
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: miếng vá không được áp dụng"
 
-#: apply.c:4020
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "�ang kiểm tra miếng vá %s…"
 
-#: apply.c:4112
+#: 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:4119
+#: 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:4122
+#: 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:4131
+#: 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:4141
+#: 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:4279
+#: 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:4313
+#: 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:4319
+#: 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:4327
+#: 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:4333 apply.c:4478
+#: 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:4376 builtin/bisect--helper.c:523
+#: 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:4380
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "đang đóng tập tin “%s�"
 
-#: apply.c:4450
+#: 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:4548
+#: 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:4556
+#: apply.c:4580
 msgid "internal error"
 msgstr "lá»—i ná»™i bá»™"
 
-#: apply.c:4559
+#: 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:4570
+#: 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:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "không mở được “%s�"
 
-#: apply.c:4592
+#: 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:4596
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "�oạn dữ liệu #%d bị từ chối."
 
-#: apply.c:4725
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "B� qua đư�ng dẫn “%s�."
 
-#: apply.c:4733
-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:4753
+#: 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:4910
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "không thể mở miếng vá “%s�: %s"
 
-#: apply.c:4937
+#: 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:4943 apply.c:4958
+#: 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:4951
+#: 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:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
+#: 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:4995
+#: 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:4998
+#: 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:5000 builtin/am.c:2317
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "số"
 
-#: apply.c:5001
+#: 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:5004
+#: 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:5006
+#: 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:5010
+#: 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:5012
+#: 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:5014
+#: 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:5016
+#: 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:5018
+#: 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:5020
+#: 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:5022
+#: 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:5025
+#: 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:5027
+#: 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:5029
+#: 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:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: 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:5034
+#: 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:5035 builtin/am.c:2293 builtin/am.c:2296
+#: 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:3831
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
 msgid "action"
 msgstr "hành động"
 
-#: apply.c:5036
+#: 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:5039 apply.c:5042
+#: 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:5045
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "áp dụng miếng vá theo chi�u ngược"
 
-#: apply.c:5047
+#: 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:5049
+#: 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:5051
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "cho phép chồng khối nhớ"
 
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
-#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "chi tiết"
-
-#: apply.c:5054
+#: 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:5057
+#: 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:5059 builtin/am.c:2305
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "gốc"
 
-#: apply.c:5060
+#: 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"
@@ -1515,18 +1538,18 @@ msgstr "không thể stream blob “%s�"
 #: archive-tar.c:265 archive-zip.c:358
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "chế độ tập tin lục không được hỗ trợ: 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"
@@ -1541,7 +1564,7 @@ msgstr "đư�ng dẫn không hợp lệ UTF-8: %s"
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "đư�ng dẫn quá dài (%d ký tự, SHA1: %s): %s"
 
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
 msgstr "lỗi giải nén (%d)"
@@ -1570,156 +1593,152 @@ 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:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
-#: builtin/merge.c:1143
+#: 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:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
+#: 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"
 
-#: archive.c:451
+#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "không có tham chiếu nào như thế: %.*s"
 
-#: archive.c:457
+#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "không phải là tên đối tượng hợp lệ: “%s�"
 
-#: archive.c:470
+#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "không phải là đối tượng cây: “%s�"
 
-#: archive.c:482
+#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "thư mục làm việc hiện hành chưa được theo dõi"
 
-#: archive.c:523
+#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "Không tìm thấy tập tin: %s"
 
-#: archive.c:525
+#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "Không phải một tập tin thư�ng: %s"
 
-#: archive.c:552
+#: archive.c:551
 msgid "fmt"
 msgstr "định_dạng"
 
-#: archive.c:552
+#: archive.c:551
 msgid "archive format"
 msgstr "định dạng lưu trữ"
 
-#: archive.c:553 builtin/log.c:1772
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "ti�n_tố"
 
-#: archive.c:554
+#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
 msgstr "nối thêm ti�n tố vào từng đư�ng dẫn tập tin trong kho lưu"
 
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: 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: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"
 
-#: archive.c:556
+#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "thêm các tập tin không được theo dõi vào kho lưu"
 
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
 msgid "write the archive to this file"
 msgstr "ghi kho lưu vào tập tin này"
 
-#: archive.c:561
+#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "đ�c .gitattributes trong thư mục làm việc"
 
-#: archive.c:562
+#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "liệt kê các tập tin được lưu trữ vào stderr (đầu ra lỗi tiêu chuẩn)"
 
-#: archive.c:564
+#: archive.c:563
 msgid "set compression level"
 msgstr "đặt mức nén"
 
-#: archive.c:567
+#: archive.c:566
 msgid "list supported archive formats"
 msgstr "liệt kê các kiểu nén được hỗ trợ"
 
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "kho"
 
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
 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:571 builtin/archive.c:93 builtin/difftool.c:718
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
 msgid "command"
 msgstr "lệnh"
 
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
 msgid "path to the remote git-upload-archive command"
-msgstr "đư�ng dẫn đến lệnh git-upload-pack trên máy chủ"
+msgstr "đư�ng dẫn đến lệnh git-upload-archive trên máy chủ"
 
-#: archive.c:579
+#: archive.c:578
 msgid "Unexpected option --remote"
 msgstr "Gặp tùy ch�n không cần --remote"
 
-#: archive.c:581
-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:583
+#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Gặp tùy ch�n không cần --output"
 
-#: archive.c:585
-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:607
+#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Không hiểu định dạng “%s�"
 
-#: archive.c:616
+#: archive.c:615
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Tham số không được hỗ trợ cho định dạng “%s�: -%d"
 
-#: attr.c:202
+#: attr.c:203
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s không phải tên thuộc tính hợp lệ"
 
-#: attr.c:363
+#: attr.c:364
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s không được phép: %s:%d"
 
-#: attr.c:403
+#: attr.c:404
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1727,22 +1746,22 @@ msgstr ""
 "Các mẫu dạng phủ định bị cấm dùng cho các thuộc tính của git\n"
 "Dùng “\\!� cho các chuỗi văn bản có dấu chấm than dẫn đầu."
 
-#: bisect.c:489
+#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Nội dung được trích dẫn sai trong tập tin “%s�: %s"
 
-#: bisect.c:699
+#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Chúng tôi không bisect thêm nữa!\n"
 
-#: bisect.c:766
+#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "Không phải tên đối tượng commit %s hợp lệ"
 
-#: bisect.c:791
+#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1751,7 +1770,7 @@ msgstr ""
 "Hòa trộn trên %s là sai.\n"
 "�i�u đó có nghĩa là lỗi đã được sửa chữa giữa %s và [%s].\n"
 
-#: bisect.c:796
+#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1760,7 +1779,7 @@ msgstr ""
 "Hòa trộn trên %s là mới.\n"
 "Gần như chắc chắn là có thay đổi giữa %s và [%s].\n"
 
-#: bisect.c:801
+#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1769,7 +1788,7 @@ msgstr ""
 "Hòa trộn trên %s là %s.\n"
 "�i�u đó có nghĩa là lần chuyển giao “%s� đầu tiên là giữa %s và [%s].\n"
 
-#: bisect.c:809
+#: bisect.c:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1780,7 +1799,7 @@ msgstr ""
 "git bisect không thể làm việc đúng đắn trong trư�ng hợp này.\n"
 "Liệu có phải bạn nhầm lẫn các điểm %s và %s không?\n"
 
-#: bisect.c:822
+#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1792,36 +1811,36 @@ msgstr ""
 "%s.\n"
 "Chúng tôi vẫn cứ tiếp tục."
 
-#: bisect.c:861
+#: bisect.c:859
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisecting: n�n hòa trộn cần phải được kiểm tra\n"
 
-#: bisect.c:911
+#: bisect.c:909
 #, c-format
 msgid "a %s revision is needed"
 msgstr "cần một điểm xét duyệt %s"
 
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
 #, c-format
 msgid "could not create file '%s'"
 msgstr "không thể tạo tập tin “%s�"
 
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "không thể đ�c tập tin “%s�"
 
-#: bisect.c:1027
+#: bisect.c:1025
 msgid "reading bisect refs failed"
 msgstr "việc đ�c tham chiếu bisect gặp lỗi"
 
-#: bisect.c:1057
+#: bisect.c:1055
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s là cả %s và %s\n"
 
-#: bisect.c:1066
+#: bisect.c:1064
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1830,7 +1849,7 @@ msgstr ""
 "Không tìm thấy lần chuyển giao kiểm tra được nào.\n"
 "Có lẽ bạn bắt đầu với các tham số đư�ng dẫn sai?\n"
 
-#: bisect.c:1095
+#: bisect.c:1093
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1839,7 +1858,7 @@ msgstr[0] "(ước chừng %d bước)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1101
+#: bisect.c:1099
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1847,7 +1866,7 @@ msgstr[0] "Bisecting: còn %d điểm xét duyệt để kiểm sau %s này\n"
 
 #: blame.c:2776
 msgid "--contents and --reverse do not blend well."
-msgstr "tùy ch�n--contents và --reverse không được trộn vào nhau."
+msgstr "tùy ch�n --contents và --reverse không được trộn vào nhau."
 
 #: blame.c:2790
 msgid "cannot use --contents with final commit object name"
@@ -1858,11 +1877,12 @@ 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:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
-#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
-#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
-#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
+#: 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 "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi"
 
@@ -1883,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�."
-
-#: 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"
+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: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�."
+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: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."
-
-#: 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"
@@ -1999,151 +2010,152 @@ 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"
 
-#: bundle.c:41
+#: bundle.c:44
 #, c-format
 msgid "unrecognized bundle hash algorithm: %s"
 msgstr "không hiểu thuật toán băm dữ liệu bundle: %s"
 
-#: bundle.c:45
+#: bundle.c:48
 #, c-format
 msgid "unknown capability '%s'"
 msgstr "không hiểu dung lượng “%s�"
 
-#: bundle.c:71
+#: bundle.c:74
 #, c-format
 msgid "'%s' does not look like a v2 or v3 bundle file"
 msgstr "“%s� không giống như tập tin v2 hay v3 bundle (định dạng dump của git)"
 
-#: bundle.c:110
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "phần đầu không được thừa nhận: %s%s (%d)"
 
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: 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'"
 msgstr "không thể mở “%s�"
 
-#: bundle.c:189
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Kho chứa thiếu những lần chuyển giao tiên quyết này:"
 
-#: bundle.c:192
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
 msgstr "cần một kho chứa để thẩm tra một bundle"
 
-#: bundle.c:243
+#: bundle.c:257
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "Bó dữ liệu chứa %d tham chiếu:"
 
-#: bundle.c:250
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "Lệnh bundle ghi lại toàn bộ lịch sử."
 
-#: bundle.c:252
+#: bundle.c:266
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Lệnh bundle yêu cầu %d tham chiếu này:"
 
-#: bundle.c:319
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "không thể nhân đôi bộ mô tả bundle"
 
-#: bundle.c:326
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "Không thể sản sinh đối tượng gói"
 
-#: bundle.c:337
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "đối tượng gói đã chết"
 
-#: bundle.c:386
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "th.chiếu “%s� bị loại trừ bởi các tùy ch�n rev-list"
 
-#: bundle.c:490
+#: bundle.c:504
 #, c-format
 msgid "unsupported bundle version %d"
 msgstr "phiên bản bundle %d không được hỗ trợ"
 
-#: bundle.c:492
+#: bundle.c:506
 #, c-format
 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:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
+#: 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"
 
-#: bundle.c:539
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "Từ chối tạo một bó dữ liệu trống rỗng."
 
-#: bundle.c:549
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "không thể tạo “%s�"
 
-#: bundle.c:574
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "mục lục gói đã chết"
 
-#: chunk-format.c:113
+#: chunk-format.c:117
 msgid "terminating chunk id appears earlier than expected"
 msgstr "mã mảnh kết thúc sớm hơn bình thư�ng"
 
-#: chunk-format.c:122
+#: chunk-format.c:126
 #, c-format
 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
 msgstr "bù mảnh không đúng cách %<PRIx64> và %<PRIx64>"
 
-#: chunk-format.c:129
+#: chunk-format.c:133
 #, c-format
 msgid "duplicate chunk ID %<PRIx32> found"
 msgstr "tìm thấy ID của mảnh bị trùng lặp %<PRIx32>"
 
-#: chunk-format.c:143
+#: chunk-format.c:147
 #, c-format
 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"
 
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
 msgid "invalid hash version"
 msgstr "phiên bản băm không hợp lệ"
 
@@ -2190,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:745 commit-graph.c:782
+#: 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:766
+#: 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:799
+#: 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:1075 builtin/am.c:1340
+#: 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:1337 builtin/pack-objects.c:2897
+#: 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:1368
+#: 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:1385
+#: 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:1405
+#: 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:1424
+#: 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:1477
+#: 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:1558
+#: 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:1635
+#: 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:1660
+#: 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:1673
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "gặp lỗi thêm gói %s"
 
-#: commit-graph.c:1677
+#: 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:1714
+#: 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:1732
+#: 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:1781
+#: 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:1812 midx.c:906
+#: 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:1825
+#: 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:1830
+#: 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:1887
+#: 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:1923
+#: 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:1939
+#: 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:1959
+#: 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:2092
+#: 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:2136
+#: 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:2244
+#: 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:2351
+#: 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:2450
+#: 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:2460
+#: 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:2470 commit-graph.c:2485
+#: 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:2477
+#: 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:2495
+#: 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:2510
+#: 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:2517
+#: 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:2527
+#: 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:2536
+#: 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:2550
+#: 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:2555
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2393,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:2559
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2401,32 +2413,32 @@ 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:2576
+#: 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:2582
+#: 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:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
-#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 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"
 
-#: commit.c:54
+#: commit.c:55
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s không phải là một lần chuyển giao!"
 
-#: commit.c:194
+#: commit.c:196
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -2446,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:1237
+#: 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:1241
+#: 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:1244
+#: 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:1247
+#: 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:1501
+#: 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"
@@ -2481,7 +2493,7 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "hết bộ nhớ"
 
-#: config.c:126
+#: config.c:125
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -2496,35 +2508,35 @@ msgstr ""
 "\t%s\n"
 "Nguyên nhân có thể là gồm quẩn vòng."
 
-#: config.c:142
+#: config.c:141
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "không thể khai triển đư�ng dẫn “%s�"
 
-#: config.c:153
+#: config.c:152
 msgid "relative config includes must come from files"
 msgstr "các bao gồm cấu hình liên quan phải đến từ các tập tin"
 
-#: config.c:199
+#: config.c:201
 msgid "relative config include conditionals must come from files"
 msgstr "các đi�u kiện bao gồm cấu hình liên quan phải đến từ các tập tin"
 
-#: config.c:396
+#: config.c:398
 #, c-format
 msgid "invalid config format: %s"
 msgstr "định dạng cấu hình không hợp lệ: %s"
 
-#: config.c:400
+#: config.c:402
 #, c-format
 msgid "missing environment variable name for configuration '%.*s'"
-msgstr "thiếu tên biến môi trư�ng cho cấu hình '%.*s'"
+msgstr "thiếu tên biến môi trư�ng cho cấu hình “%.*s�"
 
-#: config.c:405
+#: config.c:407
 #, c-format
 msgid "missing environment variable '%s' for configuration '%.*s'"
-msgstr "thiếu biến môi trư�ng '%s' cho cấu hình '%.*s'"
+msgstr "thiếu biến môi trư�ng “%s� cho cấu hình “%.*s�"
 
-#: config.c:442
+#: config.c:443
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "khóa không chứa một phần: %s"
@@ -2534,297 +2546,297 @@ 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:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "khóa không đúng: %s"
 
-#: config.c:478
+#: config.c:475
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "khóa không hợp lệ (dòng mới): %s"
 
-#: config.c:511
+#: config.c:495
 msgid "empty config key"
 msgstr "khóa cấu hình trống rỗng"
 
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "tham số cấu hình không có thực: %s"
 
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
 #, c-format
 msgid "bogus format in %s"
 msgstr "định dạng không có thực trong %s"
 
-#: config.c:622
+#: config.c:606
 #, c-format
 msgid "bogus count in %s"
 msgstr "số lượng không có thực trong %s"
 
-#: config.c:626
+#: config.c:610
 #, c-format
 msgid "too many entries in %s"
 msgstr "quá nhi�u mục tin trong %s"
 
-#: config.c:636
+#: config.c:620
 #, c-format
 msgid "missing config key %s"
 msgstr "thiếu khóa cấu hình “%s�"
 
-#: config.c:644
+#: config.c:628
 #, c-format
 msgid "missing config value %s"
 msgstr "thiếu giá trị cấu hình “%s�"
 
-#: config.c:995
+#: config.c:979
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "tập tin cấu hình sai tại dòng %d trong blob %s"
 
-#: config.c:999
+#: config.c:983
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "cấu hình sai tại dòng %d trong tập tin %s"
 
-#: config.c:1003
+#: config.c:987
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "cấu hình sai tại dòng %d trong đầu vào tiêu chuẩn"
 
-#: config.c:1007
+#: config.c:991
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "cấu hình sai tại dòng %d trong blob-mô-đun-con %s"
 
-#: config.c:1011
+#: config.c:995
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "cấu hình sai tại dòng %d trong dòng lệnh %s"
 
-#: config.c:1015
+#: config.c:999
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "cấu hình sai tại dòng %d trong %s"
 
-#: config.c:1152
+#: config.c:1136
 msgid "out of range"
 msgstr "nằm ngoài phạm vi"
 
-#: config.c:1152
+#: config.c:1136
 msgid "invalid unit"
 msgstr "đơn vị không hợp lệ"
 
-#: config.c:1153
+#: config.c:1137
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "sai giá trị bằng số của cấu hình “%s� cho “%s�: %s"
 
-#: config.c:1163
+#: config.c:1147
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "sai giá trị bằng số của cấu hình “%s� cho “%s� trong blob %s: %s"
 
-#: config.c:1166
+#: config.c:1150
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "sai giá trị bằng số của cấu hình “%s� cho “%s� trong tập tin %s: %s"
 
-#: config.c:1169
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "sai giá trị bằng số của cấu hình “%s� cho “%s� trong đầu vào tiêu chuẩn: %s"
 
-#: config.c:1172
+#: config.c:1156
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "sai giá trị bằng số của cấu hình “%s� cho “%s� trong submodule-blob %s: %s"
 
-#: config.c:1175
+#: config.c:1159
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr "sai giá trị bằng số của cấu hình “%s� cho “%s� trong dòng lệnh %s: %s"
 
-#: config.c:1178
+#: config.c:1162
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "sai giá trị bằng số của cấu hình “%s� cho “%s� trong %s: %s"
 
-#: config.c:1257
+#: config.c:1241
 #, c-format
 msgid "bad boolean config value '%s' for '%s'"
 msgstr "sai giá trị kiểu lô-gíc của cấu hình “%s� cho “%s�"
 
-#: config.c:1275
+#: config.c:1259
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "gặp lỗi mở rộng thư mục ngư�i dùng trong: “%s�"
 
-#: config.c:1284
+#: config.c:1268
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "“%s� dành cho “%s� không phải là dấu vết th�i gian hợp lệ"
 
-#: config.c:1377
+#: config.c:1361
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "chi�u dài abbrev nằm ngoài phạm vi: %d"
 
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "mức nén zlib %d là sai"
 
-#: config.c:1494
+#: config.c:1476
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar chỉ được có một ký tự"
 
-#: config.c:1527
+#: config.c:1509
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "chế độ không hợp lệ đối với việc tạo đối tượng: %s"
 
-#: config.c:1599
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "giá trị cho %s sai dạng"
 
-#: config.c:1625
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "giá trị cho %s sai dạng: %s"
 
-#: config.c:1626
+#: 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:1687 builtin/pack-objects.c:3924
+#: 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:1809
+#: 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:1812
+#: 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:1829
+#: 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:1873
+#: 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:1929
+#: 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:2293
+#: 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:2467
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s không hợp lệ: “%s�"
 
-#: config.c:2512
+#: 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:2558
+#: 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:2560
+#: 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:2644
+#: 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:2676
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s có đa giá trị"
 
-#: config.c:2705
+#: 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:2957 config.c:3283
+#: 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:2968
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "đang mở “%s�"
 
-#: config.c:3005 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:3030
+#: 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:3043 config.c:3296
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat trên %s gặp lỗi"
 
-#: config.c:3054
+#: config.c:3047
 #, c-format
-msgid "unable to mmap '%s'"
-msgstr "không thể mmap “%s�"
+msgid "unable to mmap '%s'%s"
+msgstr "không thể mmap “%s�%s"
 
-#: config.c:3063 config.c:3301
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod trên %s gặp lỗi"
 
-#: config.c:3148 config.c:3398
+#: 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:3182
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "không thể đặt “%s� thành “%s�"
 
-#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: 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:3274
+#: 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:3441
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "thiếu giá trị cho cho “%s�"
@@ -2859,72 +2871,72 @@ msgstr "máy chủ không hỗ trợ tính năng “%s�"
 msgid "expected flush after capabilities"
 msgstr "cần đẩy dữ liệu lên đĩa sau các capabilities"
 
-#: connect.c:263
+#: connect.c:265
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "b� qua capabilities sau dòng đầu tiên “%s�"
 
-#: connect.c:284
+#: connect.c:286
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "lỗi giao thức: không cần capabilities^{}"
 
-#: connect.c:306
+#: connect.c:308
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "lỗi giao thức: cần sha-1 shallow, nhưng lại nhận được “%s�"
 
-#: connect.c:308
+#: connect.c:310
 msgid "repository on the other end cannot be shallow"
 msgstr "kho đã ở điểm cuối khoác nên không thể được shallow"
 
-#: connect.c:347
+#: connect.c:349
 msgid "invalid packet"
 msgstr "gói không hợp lệ"
 
-#: connect.c:367
+#: connect.c:369
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "lỗi giao thức: không cần “%s�"
 
-#: connect.c:497
+#: connect.c:499
 #, c-format
 msgid "unknown object format '%s' specified by server"
 msgstr "không hiểu định dạng đối tượng “%s� được chỉ định bởi máy phục vụ"
 
-#: connect.c:526
+#: connect.c:528
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "trả v� của ls-refs không hợp lệ: %s"
 
-#: connect.c:530
+#: connect.c:532
 msgid "expected flush after ref listing"
 msgstr "cần đẩy dữ liệu lên đĩa sau khi liệt kê tham chiếu"
 
-#: connect.c:533
+#: connect.c:535
 msgid "expected response end packet after ref listing"
 msgstr "cần nhận được trả l�i là kết thúc gói sau khi liệt kê tham chiếu"
 
-#: connect.c:666
+#: connect.c:670
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "giao thức “%s� chưa được hỗ trợ"
 
-#: connect.c:717
+#: connect.c:721
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "không thể đặt SO_KEEPALIVE trên ổ cắm"
 
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
 #, c-format
 msgid "Looking up %s ... "
 msgstr "�ang tìm kiếm %s … "
 
-#: connect.c:761
+#: connect.c:765
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "không tìm được %s (cổng %s) (%s)"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
 #, c-format
 msgid ""
 "done.\n"
@@ -2933,7 +2945,7 @@ msgstr ""
 "xong.\n"
 "�ang kết nối đến %s (cổng %s) … "
 
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2943,77 +2955,77 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
 msgid "done."
 msgstr "hoàn tất."
 
-#: connect.c:824
+#: connect.c:828
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "không thể tìm thấy %s (%s)"
 
-#: connect.c:830
+#: connect.c:834
 #, c-format
 msgid "unknown port %s"
 msgstr "không hiểu cổng %s"
 
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "đã khóa tên máy lạ “%s�"
 
-#: connect.c:969
+#: connect.c:973
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "đã khóa cổng lạ “%s�"
 
-#: connect.c:979
+#: connect.c:983
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "không thể khởi chạy ủy nhiệm “%s�"
 
-#: connect.c:1050
+#: connect.c:1054
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr "chưa chỉ định đư�ng dẫn; xem'git help pull� để biết cú pháp url hợp lệ"
 
-#: connect.c:1190
+#: connect.c:1194
 msgid "newline is forbidden in git:// hosts and repo paths"
 msgstr "newline bị cấm trong các git:// máy chủ và đư�ng dẫn repo"
 
-#: connect.c:1247
+#: connect.c:1251
 msgid "ssh variant 'simple' does not support -4"
 msgstr "ssh biến thể “simple� không hỗ trợ -4"
 
-#: connect.c:1259
+#: connect.c:1263
 msgid "ssh variant 'simple' does not support -6"
 msgstr "ssh biến thể “simple� không hỗ trợ -6"
 
-#: connect.c:1276
+#: connect.c:1280
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "ssh biến thể “simple� không hỗ trợ đặt cổng"
 
-#: connect.c:1388
+#: connect.c:1392
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "đã khóa tên đư�ng dẫn lạ “%s�"
 
-#: connect.c:1436
+#: connect.c:1440
 msgid "unable to fork"
 msgstr "không thể rẽ nhánh tiến trình con"
 
-#: connected.c:108 builtin/fsck.c:188 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"
 
-#: connected.c:120
+#: connected.c:122
 msgid "Could not run 'git rev-list'"
 msgstr "Không thể chạy “git rev-list�"
 
-#: connected.c:144
+#: connected.c:146
 msgid "failed write to rev-list"
 msgstr "gặp lỗi khi ghi vào rev-list"
 
-#: connected.c:149
+#: connected.c:151
 msgid "failed to close rev-list's stdin"
 msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list"
 
@@ -3121,7 +3133,7 @@ msgstr "gặp kiểu bộ l�c thừa"
 msgid "path name too long for external filter"
 msgstr "tên đư�ng dẫn quá dài cho bộ l�c bên ngoài"
 
-#: convert.c:934
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -3130,16 +3142,16 @@ msgstr ""
 "bộ l�c bên ngoài “%s� không sẵn sàng nữa mặc dù không phải tất cả các đư�ng "
 "dẫn đã được l�c"
 
-#: convert.c:1234
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false là không phải bảng-mã-cây-làm-việc hợp lệ"
 
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: gặp lỗi khi xóa bộ l�c “%s�"
 
-#: convert.c:1490
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: smudge bộ l�c %s gặp lỗi"
@@ -3157,17 +3169,17 @@ msgstr "từ chối làm việc vá»›i giấy chứng thá»±c thiếu trÆ°á»�ng mÃ
 msgid "refusing to work with credential missing protocol field"
 msgstr "từ chối làm việc với giấy chứng thực thiếu trư�ng giao thức"
 
-#: credential.c:394
+#: credential.c:395
 #, c-format
 msgid "url contains a newline in its %s component: %s"
 msgstr "url có chứa một dấu xuống dòng trong thành phần %s của nó: %s"
 
-#: credential.c:438
+#: credential.c:439
 #, c-format
 msgid "url has no scheme: %s"
 msgstr "url không có lược đồ: %s"
 
-#: credential.c:511
+#: credential.c:512
 #, c-format
 msgid "credential url cannot be parsed: %s"
 msgstr "không thể phân tích cú pháp giấy chứng thực url: %s"
@@ -3256,36 +3268,36 @@ msgstr ""
 msgid "Marked %d islands, done.\n"
 msgstr "�ã đánh dấu %d island, xong.\n"
 
-#: diff-merges.c:80
+#: diff-merges.c:70
 #, c-format
 msgid "unknown value for --diff-merges: %s"
 msgstr "không hiểu giá trị cho --diff-merges: %s"
 
-#: diff-lib.c:538
+#: diff-lib.c:561
 msgid "--merge-base does not work with ranges"
 msgstr "--merge-base không hoạt động với phạm vi"
 
-#: diff-lib.c:540
+#: diff-lib.c:563
 msgid "--merge-base only works with commits"
 msgstr "--merge-base chỉ hoạt động với các lần chuyển giao"
 
-#: diff-lib.c:557
+#: diff-lib.c:580
 msgid "unable to get HEAD"
 msgstr "không thể lấy HEAD"
 
-#: diff-lib.c:564
+#: diff-lib.c:587
 msgid "no merge base found"
 msgstr "không tìm thấy cơ sở để hòa trộn"
 
-#: diff-lib.c:566
+#: diff-lib.c:589
 msgid "multiple merge bases found"
 msgstr "có nhi�u cơ sở để hòa trộn"
 
-#: diff-no-index.c:238
+#: diff-no-index.c:237
 msgid "git diff --no-index [<options>] <path> <path>"
 msgstr "git diff --no-index [<các tùy ch�n>] </đư�ng/dẫn> </đư�ng/dẫn>"
 
-#: diff-no-index.c:263
+#: diff-no-index.c:262
 msgid ""
 "Not a git repository. Use --no-index to compare two paths outside a working "
 "tree"
@@ -3293,25 +3305,25 @@ 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:156
+#: 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:161
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Không hiểu đối số dirstat “%s�\n"
 
-#: diff.c:297
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
 msgstr ""
 "cài đặt màu đã di chuyển phải là một trong “no�, “default�, “blocks�, "
-"“zebra�, “dimmed_zebra�, “plain�"
+"“zebra�, “dimmed-zebra�, “plain�"
 
-#: diff.c:325
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3321,7 +3333,7 @@ msgstr ""
 "change�, “ignore-space-at-eol�, “ignore-all-space�, “allow-indentation-"
 "change�"
 
-#: diff.c:333
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3329,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:410
+#: 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:470
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3343,35 +3355,49 @@ msgstr ""
 "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat�:\n"
 "%s"
 
-#: diff.c:4278
+#: 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:4630
-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: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: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:4633
-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:4601
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr ""
+"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:4712
+#: 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:4760
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "giá trị --stat không hợp lệ: “%s�"
 
-#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: 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:4797
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3380,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:4882
+#: 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:4906
+#: 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:4920
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "không thể phân giải “%s�"
 
-#: diff.c:4970 diff.c:4976
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s cần dạng <n>/<m>"
 
-#: diff.c:4988
+#: 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:5009
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "đối số --color-moved sai: %s"
 
-#: diff.c:5028
+#: 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:5068
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -3423,155 +3449,155 @@ msgstr ""
 "tùy ch�n  diff-algorithm chấp nhận \"myers\", \"minimal\", \"patience\" và "
 "\"histogram\""
 
-#: diff.c:5104 diff.c:5124
+#: 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:5228
+#: 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:5277
+#: 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:5333
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "đối số --word-diff sai: %s"
 
-#: diff.c:5369
+#: 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:5371 diff.c:5377
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "tạo miếng vá"
 
-#: diff.c:5374 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:5379 diff.c:5493 diff.c:5500
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5380 diff.c:5383
+#: 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:5385
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "tạo khác biệt ở định dạng thô"
 
-#: diff.c:5388
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "đồng nghĩa với “-p --raw�"
 
-#: diff.c:5392
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "đồng nghĩa với “-p --stat�"
 
-#: diff.c:5396
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "--stat thuận tiện cho máy đ�c"
 
-#: diff.c:5399
+#: 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:5401 diff.c:5409
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<tham_số_1,tham_số_2>…"
 
-#: diff.c:5402
+#: 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:5406
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "đồng nghĩa với --dirstat=cumulative"
 
-#: diff.c:5410
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "đồng nghĩa với --dirstat=files,param1,param2…"
 
-#: diff.c:5414
+#: 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:5417
+#: 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:5420
+#: 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:5423
+#: 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:5425
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<rộng>[,<name-width>[,<số-lượng>]]"
 
-#: diff.c:5426
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "tạo diffstat"
 
-#: diff.c:5428 diff.c:5431 diff.c:5434
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<rá»™ng>"
 
-#: diff.c:5429
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "tạo diffstat với độ rộng đã cho"
 
-#: diff.c:5432
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "tạo diffstat với tên độ rộng đã cho"
 
-#: diff.c:5435
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "tạo diffstat với độ rộng đồ thị đã cho"
 
-#: diff.c:5437
+#: diff.c:5406
 msgid "<count>"
 msgstr "<số_lượng>"
 
-#: diff.c:5438
+#: 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:5441
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "tạo tổng hợp xúc tích trong diffstat"
 
-#: diff.c:5444
+#: 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:5447
+#: 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:5449
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "hiển thị thay đổi được tô màu"
 
-#: diff.c:5450
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<kiểu>"
 
-#: diff.c:5451
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -3579,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:5454
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3587,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:5457 diff.c:5460 diff.c:5463 diff.c:5572
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<ti�n_tố>"
 
-#: diff.c:5458
+#: 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:5461
+#: 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:5464
+#: 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:5467
+#: 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:5470
+#: 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:5474 diff.c:5479 diff.c:5484
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<ký_tự>"
 
-#: diff.c:5475
+#: 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:5480
+#: 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:5485
+#: 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:5488
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "Tùy ch�n khác biệt đổi tên"
 
-#: diff.c:5489
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5490
+#: 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:5494
+#: diff.c:5463
 msgid "detect renames"
 msgstr "dò tìm các tên thay đổi"
 
-#: diff.c:5498
+#: 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:5501
+#: diff.c:5470
 msgid "detect copies"
 msgstr "dò bản sao"
 
-#: diff.c:5505
+#: 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:5507
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "tắt dò tìm đổi tên"
 
-#: diff.c:5510
+#: 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:5512
+#: 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:5515
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -3677,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:5517
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Tùy ch�n thuật toán khác biệt"
 
-#: diff.c:5519
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "sản sinh khác biệt ít nhất có thể"
 
-#: diff.c:5522
+#: 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:5525
+#: 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:5528
+#: 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:5531
+#: 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:5534
+#: 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:5536 diff.c:5558 diff.c:5561 diff.c:5606
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<regex>"
 
-#: diff.c:5537
+#: 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:5540
+#: 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:5543
+#: 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:5547
+#: 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:5549
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<thuật toán>"
 
-#: diff.c:5550
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "ch�n một thuật toán khác biệt"
 
-#: diff.c:5552
+#: diff.c:5521
 msgid "<text>"
 msgstr "<văn bản>"
 
-#: diff.c:5553
+#: 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:5555 diff.c:5564 diff.c:5567
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<chế độ>"
 
-#: diff.c:5556
+#: 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:5559
+#: 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:5562
+#: 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:5565
+#: 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:5568
+#: 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:5571
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Các tùy ch�n khác biệt khác"
 
-#: diff.c:5573
+#: 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:5577
+#: 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:5579
+#: 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:5581
+#: 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:5583
+#: 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:5585
+#: 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:5587
+#: 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:5589
+#: diff.c:5558
 msgid "<when>"
 msgstr "<khi>"
 
-#: diff.c:5590
+#: 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:5593
+#: diff.c:5562
 msgid "<format>"
 msgstr "<định dạng>"
 
-#: diff.c:5594
+#: 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:5598
+#: 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:5601
+#: 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:5603
+#: diff.c:5572
 msgid "<string>"
 msgstr "<chuá»—i>"
 
-#: diff.c:5604
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
@@ -3838,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:5607
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3846,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:5610
+#: 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:5613
+#: 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:5616
+#: 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:5617 diff.c:5620
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<đư�ng-dẫn>"
 
-#: diff.c:5618
+#: 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:5621
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "b� qua đầu ra đến đư�ng dẫn đã cho"
 
-#: diff.c:5623
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<mã-số-đối-tượng>"
 
-#: diff.c:5624
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
@@ -3882,33 +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:5626
+#: 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:5627
+#: 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:5629
+#: diff.c:5598
 msgid "<file>"
 msgstr "<tập_tin>"
 
-#: diff.c:5630
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "Xuất ra một tập tin cụ thể"
 
-#: diff.c:6287
-msgid "inexact rename detection was skipped due to too many files."
-msgstr ""
-"nhận thấy đổi tên không chính xác đã bị b� qua bởi có quá nhi�u tập tin."
+#: diff.c: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:6290
+#: 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:6293
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3921,7 +3946,7 @@ msgstr ""
 msgid "failed to read orderfile '%s'"
 msgstr "gặp lỗi khi đ�c tập-tin-thứ-tự “%s�"
 
-#: diffcore-rename.c:1418
+#: diffcore-rename.c:1564
 msgid "Performing inexact rename detection"
 msgstr "�ang thực hiện dò tìm đổi tên không chính xác"
 
@@ -3930,59 +3955,67 @@ msgstr "�ang thực hiện dò tìm đổi tên không chính xác"
 msgid "No such path '%s' in the diff"
 msgstr "Không có đư�ng dẫn %s trong diff"
 
-#: dir.c:578
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "đặc tả đư�ng dẫn “%s� không khớp với bất kỳ tập tin nào mà git biết"
 
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr "mẫu không được thừa nhận: “%s�"
 
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "mẫu âm không được thừa nhận: “%s�"
 
-#: dir.c:809
+#: dir.c:820
 #, c-format
 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:819
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "vô hiệu khớp mẫu nón"
 
-#: dir.c:1206
+#: 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:2314
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "không thể mở thư mục “%s�"
 
-#: dir.c:2614
+#: 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:2738
+#: 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:3543
+#: dir.c:3112
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+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: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:3590 dir.c:3595
+#: 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:3624
+#: 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�"
@@ -4001,293 +4034,360 @@ msgstr "Nội dung l�c"
 msgid "could not stat file '%s'"
 msgstr "không thể lấy thống kê tập tin “%s�"
 
-#: environment.c:152
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "đư�ng dẫn không gian tên git \"%s\" sai"
 
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "không thể đặt GIT_DIR thành “%s�"
-
 #: exec-cmd.c:363
 #, c-format
 msgid "too many args to run %s"
 msgstr "quá nhi�u tham số để chạy %s"
 
-#: fetch-pack.c:182
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: cần danh sách shallow"
 
-#: fetch-pack.c:185
+#: 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:196
+#: 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:216
+#: 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:227
+#: 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:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc cần multi_ack_detailed"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: 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:389 fetch-pack.c:1429
+#: 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:391 fetch-pack.c:1431
+#: 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:394 fetch-pack.c:1434
+#: 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:396 fetch-pack.c:1436
+#: 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:399 fetch-pack.c:1440
+#: 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:439
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "nhận %s %d - %s"
 
-#: fetch-pack.c:456
+#: 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:487
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "chịu thua"
 
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "xong"
 
-#: fetch-pack.c:512
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "nhận %s (%d) %s"
 
-#: fetch-pack.c:548
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "�ánh dấu %s là đã hoàn thành"
 
-#: fetch-pack.c:763
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "đã sẵn có %s (%s)"
 
-#: fetch-pack.c:849
+#: 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:857
+#: 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:951
+#: 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:957
+#: 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:974
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "%s gặp lỗi"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "có lỗi trong sideband demultiplexer"
 
-#: fetch-pack.c:1019
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Phiên bản máy chủ là %.*s"
 
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
+#: 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:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: 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:1029
+#: 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:1089
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "Máy chủ không hỗ trợ --shallow-since"
 
-#: fetch-pack.c:1094
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "Máy chủ không hỗ trợ --shallow-exclude"
 
-#: fetch-pack.c:1098
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "Máy chủ không hỗ trợ --deepen"
 
-#: fetch-pack.c:1100
+#: 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:1113
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "không có lần chuyển giao chung nào"
 
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: 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:1128 fetch-pack.c:1651
+#: 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:1242
+#: 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:1246
+#: 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:1279
+#: 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:1286
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "Máy chủ hỗ trợ bộ l�c"
 
-#: fetch-pack.c:1329 fetch-pack.c:2034
+#: 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:1347
+#: 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:1353
+#: 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:1387
+#: 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:1392
+#: 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:1402
+#: 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:1404
+#: 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:1445
+#: 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:1494
+#: 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:1499
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref không được mong đợi: “%s�"
 
-#: fetch-pack.c:1504
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "lỗi khi xử lý wanted refs: %d"
 
-#: fetch-pack.c:1534
+#: 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:1930
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "không khớp phần đầu máy chủ"
 
-#: fetch-pack.c:1953 builtin/clone.c:697
+#: 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:2056
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
-msgstr "gặp 'ready' đột xuất từ máy chủ"
+msgstr "gặp “ready� đột xuất từ máy chủ"
 
-#: fetch-pack.c:2079
+#: 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:2082
+#: 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:273
+#: 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:276
+#: 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:470
+#: gpg-interface.c:451
+msgid ""
+"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
+"signature verification"
+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:480
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+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: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:624
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "chữ sai / không tương thích “%s�"
+
+#: 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: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: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:857
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand gặp lỗi: %s %s"
+
+#: 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:967
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "user.signingkey cần được đặt cho ký ssh"
+
+#: 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: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:1014
+msgid ""
+"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
+"8.2p1+)"
+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: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�"
+
 #: graph.c:98
 #, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
+msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "b� qua màu không hợp lệ “%.*s� trong log.graphColors"
 
 #: grep.c:531
@@ -4298,109 +4398,109 @@ 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:1893
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "“%s�: không thể đ�c %s"
 
-#: grep.c:1910 setup.c:176 builtin/clone.c:416 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:1921
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "“%s�: đ�c ngắn"
 
-#: help.c:23
+#: help.c:24
 msgid "start a working area (see also: git help tutorial)"
 msgstr "bắt đầu một vùng làm việc (xem thêm: git help tutorial)"
 
-#: help.c:24
+#: help.c:25
 msgid "work on the current change (see also: git help everyday)"
 msgstr "làm việc trên thay đổi hiện tại (xem thêm: git help everyday)"
 
-#: help.c:25
+#: help.c:26
 msgid "examine the history and state (see also: git help revisions)"
 msgstr "xem xét lịch sử tình trạng (xem thêm: git help revisions)"
 
-#: help.c:26
+#: help.c:27
 msgid "grow, mark and tweak your common history"
 msgstr "thêm, ghi dấu và chỉnh lịch sử chung của bạn"
 
-#: help.c:27
+#: help.c:28
 msgid "collaborate (see also: git help workflows)"
 msgstr "làm việc nhóm (xem thêm: git help workflows)"
 
-#: help.c:31
+#: help.c:32
 msgid "Main Porcelain Commands"
 msgstr "Các lệnh Porcelain chính"
 
-#: help.c:32
+#: help.c:33
 msgid "Ancillary Commands / Manipulators"
 msgstr "Lệnh/thao tác thứ cấp"
 
-#: help.c:33
+#: help.c:34
 msgid "Ancillary Commands / Interrogators"
 msgstr "Lệnh/bộ h�i thứ cấp"
 
-#: help.c:34
+#: help.c:35
 msgid "Interacting with Others"
 msgstr "Tương tác với những cái khác"
 
-#: help.c:35
+#: help.c:36
 msgid "Low-level Commands / Manipulators"
 msgstr "Lệnh/thao tác ở mức thấp"
 
-#: help.c:36
+#: help.c:37
 msgid "Low-level Commands / Interrogators"
 msgstr "Lệnh/bộ h�i ở mức thấp"
 
-#: help.c:37
+#: help.c:38
 msgid "Low-level Commands / Syncing Repositories"
 msgstr "Lệnh/�ồng bộ kho ở mức thấp"
 
-#: help.c:38
+#: help.c:39
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Lệnh/Hỗ trợ nội tại ở mức thấp"
 
-#: help.c:300
+#: help.c:313
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "các lệnh git sẵn có trong thư mục “%s�:"
 
-#: help.c:307
+#: help.c:320
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "các lệnh git sẵn có từ một nơi khác trong $PATH của bạn"
 
-#: help.c:316
+#: help.c:329
 msgid "These are common Git commands used in various situations:"
 msgstr "Có các lệnh Git chung được sử dụng trong các tình huống khác nhau:"
 
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "không hỗ trợ liệt kê lệnh kiểu “%s�"
 
-#: help.c:405
+#: help.c:418
 msgid "The Git concept guides are:"
 msgstr "Các chỉ dẫn khái niệm v� Git là:"
 
-#: help.c:429
+#: help.c:442
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr "Xem “git help <lệnh>� để đ�c các đặc tả của lệnh con"
 
-#: help.c:434
+#: help.c:447
 msgid "External commands"
 msgstr "Các lệnh bên ngoài"
 
-#: help.c:449
+#: help.c:462
 msgid "Command aliases"
 msgstr "Các bí danh lệnh"
 
-#: help.c:527
+#: help.c:543
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -4409,31 +4509,36 @@ msgstr ""
 "“%s� trông như là một lệnh git, nhưng chúng tôi không\n"
 "thể thực thi nó. Có lẽ là lệnh git-%s đã bị h�ng?"
 
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git: “%s� không phải là một lệnh của git. Xem “git --help�."
 
-#: help.c:591
+#: help.c:613
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "�i chà. Hệ thống của bạn báo rằng chẳng có lệnh Git nào cả."
 
-#: help.c:613
+#: help.c:635
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr "CẢNH B�O: Bạn đã g�i lệnh Git có tên “%s�, mà nó lại không có sẵn."
 
-#: help.c:618
+#: help.c:640
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "Tiếp tục và coi rằng ý bạn là “%s�."
 
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Chạy “%s� để thay thế? (y/N)? "
+
+#: help.c:654
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr "Tiếp tục trong %0.1f giây,và coi rằng ý bạn là “%s�."
 
-#: help.c:635
+#: help.c:666
 msgid ""
 "\n"
 "The most similar command is"
@@ -4444,16 +4549,16 @@ msgstr[0] ""
 "\n"
 "Những lệnh giống nhất là"
 
-#: help.c:675
+#: help.c:706
 msgid "git version [<options>]"
 msgstr "git version [<các tùy ch�n>]"
 
-#: help.c:730
+#: help.c:761
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:734
+#: help.c:765
 msgid ""
 "\n"
 "Did you mean this?"
@@ -4464,6 +4569,15 @@ msgstr[0] ""
 "\n"
 "Có phải ý bạn là một trong số những cái này không?"
 
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"Móc “%s� bị b� qua bởi vì nó không thể đặt là thực thi được.\n"
+"Bạn có thể tắt cảnh báo này bằng “git config advice.ignoredHook false“."
+
 #: ident.c:353
 msgid "Author identity unknown\n"
 msgstr "Chưa biết định danh tác giả\n"
@@ -4526,7 +4640,7 @@ msgstr "không cho phép tên định danh là rỗng (cho <%s>)"
 msgid "name consists only of disallowed characters: %s"
 msgstr "tên chỉ được phép bao gồm các ký tự sau: %s"
 
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
 #, c-format
 msgid "invalid date format: %s"
 msgstr "ngày tháng không hợp lệ: %s"
@@ -4541,7 +4655,7 @@ msgstr "việc hỗ trợ bộ l�c sparse:đư�ng/dẫn đã bị b�"
 
 #: list-objects-filter-options.c:105
 #, c-format
-msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
 msgstr "“%s� dành cho “object:type=<type>� không phải là kiểu đối tượng hợp lệ"
 
 #: list-objects-filter-options.c:124
@@ -4586,7 +4700,7 @@ msgstr "mục “%sâ€� trong cây %s có nút cây, nhÆ°ng không phải là má»
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "mục “%s� trong cây %s có nút blob, nhưng không phải là một blob"
 
-#: list-objects.c:395
+#: list-objects.c:398
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "không thể tải cây gốc cho lần chuyển giao “%s�"
@@ -4618,9 +4732,14 @@ msgstr "Không thể tạo “%s.lock�: %s"
 #: ls-refs.c:37
 #, c-format
 msgid "invalid value '%s' for lsrefs.unborn"
-msgstr "giá trị '%s' không hợp lệ cho lsrefs.unborn"
+msgstr "giá trị “%s� không hợp lệ cho lsrefs.unborn"
 
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "dòng không cần: “%s�"
+
+#: ls-refs.c:178
 msgid "expected flush after ls-refs arguments"
 msgstr "cần đẩy dữ liệu lên đĩa sau tham số ls-refs (liệt kê tham chiếu)"
 
@@ -4628,39 +4747,39 @@ 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:176 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�"
 
-#: merge-ort.c:1116 merge-recursive.c:1205
+#: merge-ort.c:1584 merge-recursive.c:1211
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s� (không lấy ra được)"
 
-#: merge-ort.c:1125 merge-recursive.c:1212
+#: merge-ort.c:1593 merge-recursive.c:1218
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s� (lần chuyển giao không hiện diện)"
 
-#: merge-ort.c:1134 merge-recursive.c:1219
+#: merge-ort.c:1602 merge-recursive.c:1225
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 "Gặp lỗi khi hòa trộn mô-đun-con “%s� (lần chuyển giao không theo sau n�n-hòa-"
 "trá»™n)"
 
-#: merge-ort.c:1144 merge-ort.c:1151
+#: merge-ort.c:1612 merge-ort.c:1620
 #, c-format
 msgid "Note: Fast-forwarding submodule %s to %s"
 msgstr "Chú ý: Chuyển-tiếp-nhanh mô-đun-con “%s� sang “%s�"
 
-#: merge-ort.c:1172
+#: merge-ort.c:1642
 #, c-format
 msgid "Failed to merge submodule %s"
 msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s�"
 
-#: merge-ort.c:1179
+#: merge-ort.c:1649
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4669,7 +4788,7 @@ msgstr ""
 "Gặp lỗi khi hòa trộn mô-đun-con “%s�, nhưng có cách giải quyết:\n"
 "%s\n"
 
-#: merge-ort.c:1183 merge-recursive.c:1273
+#: merge-ort.c:1653 merge-recursive.c:1281
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -4686,7 +4805,7 @@ msgstr ""
 "\n"
 "cái mà sẽ chấp nhận gợi ý này.\n"
 
-#: merge-ort.c:1196
+#: merge-ort.c:1666
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4695,21 +4814,21 @@ msgstr ""
 "Gặp lỗi khi hòa trộn mô-đun-con “%s�, nhưng có nhi�u cách giải quyết:\n"
 "%s"
 
-#: merge-ort.c:1415 merge-recursive.c:1362
+#: merge-ort.c:1887 merge-recursive.c:1372
 msgid "Failed to execute internal merge"
 msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
 
-#: merge-ort.c:1420 merge-recursive.c:1367
+#: merge-ort.c:1892 merge-recursive.c:1377
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Không thể thêm %s vào cơ sở dữ liệu"
 
-#: merge-ort.c:1427 merge-recursive.c:1400
+#: merge-ort.c:1899 merge-recursive.c:1410
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Tự-động-hòa-trộn %s"
 
-#: merge-ort.c:1566 merge-recursive.c:2122
+#: merge-ort.c:2038 merge-recursive.c:2132
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4718,7 +4837,7 @@ msgstr ""
 "XUNG �ỘT: (ngầm đổi tên thư mục): Tập tin/thư mục đã sẵn có tại %s theo cách "
 "của các đổi tên thư mục ngầm đặt (các) đư�ng dẫn sau ở đây: %s."
 
-#: merge-ort.c:1576 merge-recursive.c:2132
+#: merge-ort.c:2048 merge-recursive.c:2142
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4727,7 +4846,7 @@ msgstr ""
 "XUNG �ỘT: (ngầm đổi tên thư mục): Không thể ánh xạ một đư�ng dẫn thành %s; "
 "các đổi tên thư mục ngầm cố đặt các đư�ng dẫn ở đây: %s"
 
-#: merge-ort.c:1634
+#: merge-ort.c:2106
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4738,7 +4857,7 @@ msgstr ""
 "thành; nó đã bị đổi tên thành nhi�u thư mục khác, với không đích đến nhận "
 "một phần nhi�u của các tập tin."
 
-#: merge-ort.c:1788 merge-recursive.c:2468
+#: merge-ort.c:2260 merge-recursive.c:2478
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4747,7 +4866,7 @@ msgstr ""
 "CẢNH B�O: tránh áp dụng %s -> %s đổi thên thành %s, bởi vì bản thân %s cũng "
 "bị đổi tên."
 
-#: merge-ort.c:1932 merge-recursive.c:3244
+#: merge-ort.c:2400 merge-recursive.c:3261
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4756,7 +4875,7 @@ msgstr ""
 "�ư�ng dẫn đã được cập nhật: %s được thêm vào trong %s bên trong một thư mục "
 "đã được đổi tên trong %s; di chuyển nó đến %s."
 
-#: merge-ort.c:1939 merge-recursive.c:3251
+#: merge-ort.c:2407 merge-recursive.c:3268
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4765,7 +4884,7 @@ msgstr ""
 "�ư�ng dẫn đã được cập nhật: %s được đổi tên thành %s trong %s, bên trong một "
 "thư mục đã được đổi tên trong %s; di chuyển nó đến %s."
 
-#: merge-ort.c:1952 merge-recursive.c:3247
+#: merge-ort.c:2420 merge-recursive.c:3264
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4774,7 +4893,7 @@ msgstr ""
 "XUNG �ỘT (vị trí tệp): %s được thêm vào trong %s trong một thư mục đã được "
 "đổi tên thành %s, đoán là nó nên được di chuyển đến %s."
 
-#: merge-ort.c:1960 merge-recursive.c:3254
+#: merge-ort.c:2428 merge-recursive.c:3271
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4783,13 +4902,13 @@ msgstr ""
 "XUNG �ỘT (vị trí tệp): %s được đổi tên thành %s trong %s, bên trong một thư "
 "mục đã được đổi tên thành %s, đoán là nó nên được di chuyển đến %s."
 
-#: merge-ort.c:2103
+#: merge-ort.c:2584
 #, c-format
 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
 msgstr ""
 "XUNG �ỘT (đổi-tên/đổi-tên): �ổi tên %s->%s trong %s và thành %s trong %s."
 
-#: merge-ort.c:2198
+#: merge-ort.c:2679
 #, c-format
 msgid ""
 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4800,23 +4919,23 @@ msgstr ""
 "VÀ va chạm với một đư�ng dẫn khác; đi�u này có thể dẫn đến tạo ra các xung "
 "đột lồng nhau."
 
-#: merge-ort.c:2217 merge-ort.c:2241
+#: merge-ort.c:2698 merge-ort.c:2722
 #, c-format
 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr ""
 "XUNG �ỘT (đổi-tên/xóa): �ổi tên %s->%s trong %s, nhưng lại bị xóa trong %s."
 
-#: merge-ort.c:2550 merge-recursive.c:3002
+#: merge-ort.c:3212 merge-recursive.c:3022
 #, c-format
 msgid "cannot read object %s"
 msgstr "không thể đ�c đối tượng %s"
 
-#: merge-ort.c:2553 merge-recursive.c:3005
+#: merge-ort.c:3215 merge-recursive.c:3025
 #, c-format
 msgid "object %s is not a blob"
 msgstr "đối tượng %s không phải là một blob"
 
-#: merge-ort.c:2981
+#: merge-ort.c:3644
 #, c-format
 msgid ""
 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -4825,7 +4944,7 @@ msgstr ""
 "XUNG �ỘT (tập tin/thư mục): thư mục theo cách của %s từ %s; thay vào đó, di "
 "chuyển nó đến %s."
 
-#: merge-ort.c:3055
+#: merge-ort.c:3721
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4834,7 +4953,7 @@ msgstr ""
 "XUNG �ỘT (các kiểu riêng biệt): %s có các kiểu khác nhau ở mỗi bên; đã đổi "
 "tên cả hai trong số chúng để mỗi cái có thể được ghi lại ở đâu đó."
 
-#: merge-ort.c:3062
+#: merge-ort.c:3728
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4843,24 +4962,24 @@ msgstr ""
 "XUNG �ỘT (các kiểu riêng biệt): %s có các loại khác nhau ở mỗi bên; đã đổi "
 "tên một trong số chúng để mỗi cái có thể được ghi lại ở đâu đó."
 
-#: merge-ort.c:3162 merge-recursive.c:3081
+#: merge-ort.c:3819 merge-recursive.c:3101
 msgid "content"
 msgstr "ná»™i dung"
 
-#: merge-ort.c:3164 merge-recursive.c:3085
+#: merge-ort.c:3821 merge-recursive.c:3105
 msgid "add/add"
 msgstr "thêm/thêm"
 
-#: merge-ort.c:3166 merge-recursive.c:3130
+#: merge-ort.c:3823 merge-recursive.c:3150
 msgid "submodule"
 msgstr "mô-đun-con"
 
-#: merge-ort.c:3168 merge-recursive.c:3131
+#: merge-ort.c:3825 merge-recursive.c:3151
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "XUNG �ỘT (%s): Xung đột hòa trộn trong %s"
 
-#: merge-ort.c:3198
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -4869,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:3433
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4881,12 +5000,12 @@ 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:3730
+#: 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"
 
-#: merge-ort-wrappers.c:13 merge-recursive.c:3699
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4896,109 +5015,109 @@ msgstr ""
 "hòa trộn:\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#: 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."
 
-#: merge-recursive.c:356
+#: merge-recursive.c:353
 msgid "(bad commit)\n"
 msgstr "(commit sai)\n"
 
-#: merge-recursive.c:379
+#: merge-recursive.c:381
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
-msgstr "addinfo_cache gặp lỗi đối với đư�ng dẫn “%s�; việc hòa trộn bị bãi b�."
+msgstr "add_cacheinfo gặp lỗi đối với đư�ng dẫn “%s�; việc hòa trộn bị bãi b�."
 
-#: merge-recursive.c:388
+#: merge-recursive.c:390
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
-"addinfo_cache gặp lỗi khi làm mới đối với đư�ng dẫn “%s�; việc hòa trộn bị "
+"add_cacheinfo gặp lỗi khi làm mới đối với đư�ng dẫn “%s�; việc hòa trộn bị "
 "bãi b�."
 
-#: merge-recursive.c:876
+#: merge-recursive.c:881
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "gặp lỗi khi tạo đư�ng dẫn “%s�%s"
 
-#: merge-recursive.c:887
+#: merge-recursive.c:892
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Gỡ b� %s để tạo chỗ (room) cho thư mục con\n"
 
-#: merge-recursive.c:901 merge-recursive.c:920
+#: merge-recursive.c:906 merge-recursive.c:925
 msgid ": perhaps a D/F conflict?"
 msgstr ": có lẽ là một xung đột D/F?"
 
-#: merge-recursive.c:910
+#: merge-recursive.c:915
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "từ chối đóng tập tin không được theo dõi tại “%s�"
 
-#: merge-recursive.c:951 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "không thể đ�c đối tượng %s “%s�"
 
-#: merge-recursive.c:956
+#: merge-recursive.c:961
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "mong đợi đối tượng blob cho %s “%s�"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:986
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "gặp lỗi khi mở “%s�: %s"
 
-#: merge-recursive.c:992
+#: merge-recursive.c:997
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "gặp lỗi khi tạo liên kết m�m (symlink) “%s�: %s"
 
-#: merge-recursive.c:997
+#: merge-recursive.c:1002
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "không hiểu phải làm gì với %06o %s “%s�"
 
-#: merge-recursive.c:1227 merge-recursive.c:1239
+#: merge-recursive.c:1233 merge-recursive.c:1246
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s� đến lần chuyển giao sau đây:"
 
-#: merge-recursive.c:1230 merge-recursive.c:1242
+#: merge-recursive.c:1236 merge-recursive.c:1249
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s�"
 
-#: merge-recursive.c:1265
+#: merge-recursive.c:1273
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "Gặp lỗi khi hòa trộn mô-đun-con “%s� (không tìm thấy các lần chuyển giao "
 "theo sau hòa trộn)"
 
-#: merge-recursive.c:1269
+#: merge-recursive.c:1277
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s� (không chuyển tiếp nhanh được)"
 
-#: merge-recursive.c:1270
+#: merge-recursive.c:1278
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "Tìm thấy một giải pháp hòa trộn có thể cho mô-đun-con:\n"
 
-#: merge-recursive.c:1282
+#: merge-recursive.c:1290
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s� (thấy nhi�u hòa trộn đa trùng)"
 
-#: merge-recursive.c:1424
+#: merge-recursive.c:1434
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 "Lỗi: từ chối đóng tập tin không được theo dõi tại “%s�; thay vào đó ghi vào "
 "%s."
 
-#: merge-recursive.c:1496
+#: merge-recursive.c:1506
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5007,7 +5126,7 @@ msgstr ""
 "XUNG �ỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
 "còn lại trong cây (tree)."
 
-#: merge-recursive.c:1501
+#: merge-recursive.c:1511
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5016,7 +5135,7 @@ msgstr ""
 "XUNG �ỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s "
 "của %s còn lại trong cây (tree)."
 
-#: merge-recursive.c:1508
+#: merge-recursive.c:1518
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5025,7 +5144,7 @@ msgstr ""
 "XUNG �ỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s "
 "còn lại trong cây (tree) tại %s."
 
-#: merge-recursive.c:1513
+#: merge-recursive.c:1523
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5034,45 +5153,45 @@ msgstr ""
 "XUNG �ỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s "
 "của %s còn lại trong cây (tree) tại %s."
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "rename"
 msgstr "đổi tên"
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "renamed"
 msgstr "đã đổi tên"
 
-#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Từ chối đóng tập tin không được theo dõi tại “%s�"
 
-#: merge-recursive.c:1609
+#: merge-recursive.c:1619
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 "Từ chối đóng tập tin không được theo dõi tại “%s�, ngay cả khi nó ở trên "
 "đư�ng."
 
-#: merge-recursive.c:1667
+#: merge-recursive.c:1677
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "XUNG �ỘT (đổi-tên/thêm): �ổi tên %s->%s trong %s. %s được thêm trong %s"
 
-#: merge-recursive.c:1698
+#: merge-recursive.c:1708
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s"
 
-#: merge-recursive.c:1703
+#: merge-recursive.c:1713
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 "Từ chối đóng tập tin không được theo dõi tại “%s�; thay vào đó đang thêm "
 "thành %s"
 
-#: merge-recursive.c:1730
+#: merge-recursive.c:1740
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5081,17 +5200,17 @@ msgstr ""
 "XUNG �ỘT (đổi-tên/đổi-tên): �ổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi "
 "tên \"%s\"->\"%s\" trong \"%s\"%s"
 
-#: merge-recursive.c:1735
+#: merge-recursive.c:1745
 msgid " (left unresolved)"
 msgstr " (cần giải quyết)"
 
-#: merge-recursive.c:1827
+#: merge-recursive.c:1837
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "XUNG �ỘT (đổi-tên/đổi-tên): �ổi tên %s->%s trong %s. �ổi tên %s->%s trong %s"
 
-#: merge-recursive.c:2090
+#: merge-recursive.c:2100
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5102,7 +5221,7 @@ msgstr ""
 "vì thư mục %s đã bị đổi tên thành nhi�u thư mục khác, với không đích đến "
 "nhận một phần nhi�u của các tập tin."
 
-#: merge-recursive.c:2224
+#: merge-recursive.c:2234
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5111,80 +5230,80 @@ msgstr ""
 "XUNG �ỘT (đổi-tên/đổi-tên): �ổi tên thư mục %s->%s trong %s. �ổi tên thư mục "
 "%s->%s trong %s"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modify"
 msgstr "sửa đổi"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modified"
 msgstr "đã sửa"
 
-#: merge-recursive.c:3108
+#: merge-recursive.c:3128
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "�ã b� qua %s (đã có sẵn lần hòa trộn này)"
 
-#: merge-recursive.c:3161
+#: merge-recursive.c:3181
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Thay vào đó thêm vào %s"
 
-#: merge-recursive.c:3368
+#: merge-recursive.c:3385
 #, c-format
 msgid "Removing %s"
 msgstr "�ang xóa %s"
 
-#: merge-recursive.c:3391
+#: merge-recursive.c:3408
 msgid "file/directory"
 msgstr "tập-tin/thư-mục"
 
-#: merge-recursive.c:3396
+#: merge-recursive.c:3413
 msgid "directory/file"
 msgstr "thư-mục/tập-tin"
 
-#: merge-recursive.c:3403
+#: merge-recursive.c:3420
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "XUNG �ỘT (%s): Ở đây không có thư mục nào có tên %s trong %s. Thêm %s như là "
 "%s"
 
-#: merge-recursive.c:3412
+#: merge-recursive.c:3429
 #, c-format
 msgid "Adding %s"
 msgstr "Thêm \"%s\""
 
-#: merge-recursive.c:3421
+#: merge-recursive.c:3438
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "XUNG �ỘT (thêm/thêm): Xung đột hòa trộn trong %s"
 
-#: merge-recursive.c:3474
+#: merge-recursive.c:3491
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "hòa trộn các cây %s và %s gặp lỗi"
 
-#: merge-recursive.c:3568
+#: merge-recursive.c:3585
 msgid "Merging:"
 msgstr "�ang trộn:"
 
-#: merge-recursive.c:3581
+#: merge-recursive.c:3598
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "tìm thấy %u tổ tiên chung:"
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3648
 msgid "merge returned no commit"
 msgstr "hòa trộn không trả v� lần chuyển giao nào"
 
-#: merge-recursive.c:3796
+#: merge-recursive.c:3816
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Không thể phân tích đối tượng “%s�"
 
-#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
-#: builtin/stash.c:473
+#: 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."
 
@@ -5192,182 +5311,222 @@ 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:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
-#: builtin/stash.c:267
+#: 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"
 
-#: midx.c:74
+#: midx.c:78
 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:105
+#: 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:121
+#: 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:126
+#: 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:131
+#: 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:148
+#: 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:150
+#: 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:152
+#: 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:154
+#: 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:170
+#: 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:214
+#: 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:264
+#: 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:490
+#: 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:496
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "gặp lỗi khi mở pack-index “%s�"
 
-#: midx.c:564
+#: 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:880 builtin/index-pack.c:1535
+#: 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:933
-msgid "Adding packfiles to multi-pack-index"
-msgstr "�ang thêm tập tin gói từ multi-pack-index"
+#: 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:979
+#: midx.c:995
 #, 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"
+msgid "malformed line: %s"
+msgstr "dòng dị hình: %s"
+
+#: 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:1024
+#: midx.c:1187
+msgid "could not load pack"
+msgstr "không thể tải gói"
+
+#: 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:1204
+msgid "Adding packfiles to multi-pack-index"
+msgstr "�ang thêm tập tin gói từ multi-pack-index"
+
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "không hiểu \"preferred pack\": %s"
 
-#: midx.c:1029
+#: 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: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:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "\"preferred pack\" “%s� đã hết hạn"
 
-#: midx.c:1045
+#: 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:1125 builtin/clean.c:37
+#: midx.c:1420
+msgid "could not write multi-pack bitmap"
+msgstr "không thể ghi “multi-pack bitmap�"
+
+#: midx.c:1430
+msgid "could not write multi-pack-index"
+msgstr "không thể ghi “multi-pack-index�"
+
+#: 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:1156
+#: 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:1214
+#: 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:1222
+#: midx.c:1593
+msgid "incorrect checksum"
+msgstr "tổng kiểm không đúng"
+
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "�ang khóa cho các gói bị tham chiếu"
 
-#: midx.c:1237
+#: 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:1242
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "midx chẳng chứa oid nào"
 
-#: midx.c:1251
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr "Thẩm tra thứ tự OID trong multi-pack-index"
 
-#: midx.c:1260
+#: 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:1280
+#: 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:1287
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "�ang thẩm tra các khoảng bù đối tượng"
 
-#: midx.c:1303
+#: 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:1309
+#: 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:1318
+#: 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:1343
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "�ang đếm các đối tượng được tham chiếu"
 
-#: midx.c:1353
+#: 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:1544
+#: 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:1564
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "không thể hoàn thiện các đối tượng gói"
 
@@ -5428,272 +5587,273 @@ 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:526
+#: 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:577
+#: 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:649
+#: 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:656
+#: 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:699
+#: 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:717
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "không thể đ�c tập tin thay thế"
 
-#: object-file.c:724
+#: 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:759
+#: 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:780
+#: 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:786
+#: 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:792
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "kho tham chiếu “%s� là nông"
 
-#: object-file.c:800
+#: 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:860
+#: 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: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:1010
+#: 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:1031
-msgid "mmap failed"
-msgstr "mmap gặp lỗi"
+#: object-file.c:1048
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap gặp lỗi%s"
 
-#: object-file.c:1195
+#: 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:1330 object-file.c:2524
+#: 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:1332 object-file.c:2528
+#: 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:1374
+#: 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:1459
 msgid "invalid object type"
 msgstr "kiểu đối tượng không hợp lệ"
 
-#: object-file.c:1458
-#, c-format
-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"
-
-#: object-file.c:1461
+#: 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:1467
-#, c-format
-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"
-
-#: object-file.c:1470
+#: object-file.c:1474
 #, c-format
-msgid "unable to parse %s header"
-msgstr "không thể phân tích phần đầu của “%s�"
+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:1697
+#: 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:1701
+#: 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:1705
+#: 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:1709
+#: 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:1814
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "không thể ghi tập tin %s"
 
-#: object-file.c:1821
+#: 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:1828
+#: object-file.c:1835
 msgid "file write error"
 msgstr "lỗi ghi tập tin"
 
-#: object-file.c:1848
+#: 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:1913
+#: 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:1915
+#: 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:1939
+#: 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:1945
+#: 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:1949
+#: 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:1953
+#: 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:1963 builtin/pack-objects.c:1097
+#: 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:2040
+#: 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:2091
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "lần chuyển giao sai h�ng"
 
-#: object-file.c:2099
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "thẻ sai h�ng"
 
-#: object-file.c:2199
+#: 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:2202
+#: 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:2275 object-file.c:2285
+#: 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:2291
+#: 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:2315
+#: 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:2317
+#: 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:2344 builtin/index-pack.c:192
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "không thể mở %s"
 
-#: object-file.c:2535 object-file.c:2588
+#: 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:2559
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "không thể mmap %s"
 
-#: object-file.c:2564
+#: 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:2570
+#: 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:2581
+#: 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�"
 
-#: object-name.c:486
+#: object-name.c:480
 #, c-format
 msgid "short object ID %s is ambiguous"
 msgstr "mã đối tượng dạng rút g�n %s chưa rõ ràng"
 
-#: object-name.c:497
+#: object-name.c:491
 msgid "The candidates are:"
 msgstr "Các ứng cử là:"
 
-#: object-name.c:796
+#: object-name.c:790
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5717,22 +5877,22 @@ msgstr ""
 "này\n"
 "bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
 
-#: object-name.c:916
+#: object-name.c:910
 #, c-format
 msgid "log for '%.*s' only goes back to %s"
 msgstr "nhật ký cho “%.*s� chỉ trở lại đến %s"
 
-#: object-name.c:924
+#: object-name.c:918
 #, c-format
 msgid "log for '%.*s' only has %d entries"
 msgstr "nhật ký cho “%.*s� chỉ có %d mục"
 
-#: object-name.c:1702
+#: object-name.c:1696
 #, c-format
 msgid "path '%s' exists on disk, but not in '%.*s'"
 msgstr "đư�ng dẫn “%s� có ở trên đĩa, nhưng không trong “%.*s�"
 
-#: object-name.c:1708
+#: object-name.c:1702
 #, c-format
 msgid ""
 "path '%s' exists, but not '%s'\n"
@@ -5741,12 +5901,12 @@ msgstr ""
 "đư�ng dẫn “%s� tồn tại, nhưng không phải “%s�\n"
 "gợi ý: Có phải ý bạn là “%.*s:%s� aka “%.*s:./%s�?"
 
-#: object-name.c:1717
+#: object-name.c:1711
 #, c-format
 msgid "path '%s' does not exist in '%.*s'"
 msgstr "đư�ng dẫn “%s� không tồn tại trong “%.*s�"
 
-#: object-name.c:1745
+#: object-name.c:1739
 #, c-format
 msgid ""
 "path '%s' is in the index, but not at stage %d\n"
@@ -5755,7 +5915,7 @@ msgstr ""
 "đư�ng dẫn “%s� nằm trong chỉ mục, nhưng không phải ở giai đoạn %d\n"
 "gợi ý: Có phải ý bạn là “:%d:%s�?"
 
-#: object-name.c:1761
+#: object-name.c:1755
 #, c-format
 msgid ""
 "path '%s' is in the index, but not '%s'\n"
@@ -5764,21 +5924,21 @@ msgstr ""
 "đư�ng dẫn “%s� nằm trong chỉ mục, nhưng không phải “%s�\n"
 "gợi ý: Có phải ý bạn là “:% d:%s “ aka “:%d:./%s�?"
 
-#: object-name.c:1769
+#: object-name.c:1763
 #, c-format
 msgid "path '%s' exists on disk, but not in the index"
 msgstr "đư�ng dẫn “%s� tồn tại trên đĩa, nhưng không có trong chỉ mục"
 
-#: object-name.c:1771
+#: object-name.c:1765
 #, c-format
 msgid "path '%s' does not exist (neither on disk nor in the index)"
 msgstr "đư�ng dẫn “%s� không tồn tại (không trên đĩa cũng không trong mục lục)"
 
-#: object-name.c:1784
+#: object-name.c:1778
 msgid "relative path syntax can't be used outside working tree"
 msgstr "cú pháp đư�ng dẫn tương đối không thể thể dùng ngoài cây làm việc"
 
-#: object-name.c:1922
+#: object-name.c:1916
 #, c-format
 msgid "invalid object name '%.*s'."
 msgstr "“%.*s� không phải là tên đối tượng hợp lệ."
@@ -5793,27 +5953,40 @@ msgstr "kiểu đối tượng \"%s\" không hợp lệ"
 msgid "object %s is a %s, not a %s"
 msgstr "đối tượng %s là một %s, không phải là một %s"
 
-#: object.c:232
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "đối tượng %s có mã kiểu %d chưa biết"
 
-#: object.c:245
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "không thể phân tích đối tượng: “%s�"
 
-#: object.c:265 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "mã băm không khớp %s"
 
-#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
+#: 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:429
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index: không thể mở gói"
+
+#: 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:1547 builtin/rev-list.c:92
+#: 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: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"
@@ -5843,125 +6016,135 @@ msgstr "tệp chỉ mục ngược %s có phiên bản không được há»— trá»
 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
 msgstr "tệp chỉ mục ngược %s có id mã băm không được hỗ trợ %<PRIu32>"
 
-#: pack-write.c:250
+#: pack-write.c:251
 msgid "cannot both write and verify reverse index"
 msgstr "không thể cùng lúc đ�c và xác minh được bảng mục lục đảo ngược"
 
-#: pack-write.c:271
+#: pack-write.c:270
 #, c-format
 msgid "could not stat: %s"
 msgstr "không thể lấy thông tin thống kê: %s"
 
-#: pack-write.c:283
+#: pack-write.c:282
 #, c-format
 msgid "failed to make %s readable"
 msgstr "gặp lỗi làm cho %s đ�c được"
 
-#: pack-write.c:522
+#: pack-write.c:520
 #, c-format
 msgid "could not write '%s' promisor file"
 msgstr "không thể ghi tập tin promisor “%s�"
 
-#: packfile.c:625
+#: 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:1937
+#: 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: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:1941
+#: 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
+#: 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.c:38
+#: 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"
 msgstr "“%s� yêu cầu một giá trị"
 
-#: parse-options.c:73
+#: parse-options.c:93
 #, c-format
 msgid "%s is incompatible with %s"
 msgstr "%s là xung khắc với %s"
 
-#: parse-options.c:78
+#: parse-options.c:98
 #, c-format
 msgid "%s : incompatible with something else"
 msgstr "%s : xung khắc với các cái khác"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
 #, c-format
 msgid "%s takes no value"
 msgstr "%s k nhận giá trị"
 
-#: parse-options.c:94
+#: parse-options.c:114
 #, c-format
 msgid "%s isn't available"
 msgstr "%s không sẵn có"
 
-#: parse-options.c:217
+#: parse-options.c:237
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr "%s cần một giá trị dạng số không âm với một hậu tố tùy ch�n k/m/g"
 
-#: parse-options.c:386
+#: parse-options.c:393
 #, c-format
 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:420 parse-options.c:428
+#: 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:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "bí danh của --%s"
 
-#: parse-options.c:879
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "không hiểu tùy ch�n “%s�"
 
-#: parse-options.c:881
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "không hiểu tùy ch�n “%c�"
 
-#: parse-options.c:883
+#: 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:907
+#: parse-options.c:920
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:926
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "cách dùng: %s"
@@ -5969,49 +6152,73 @@ msgstr "cách dùng: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:932
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "     hoặc: %s"
 
-#: parse-options.c:935
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. 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:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:974
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-S�"
 
-#: path.c:915
+#: path.c:922
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Không thể làm %s được ghi bởi nhóm"
 
-#: pathspec.c:151
+#: pathspec.c:150
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 "Ký tự thoát chuỗi “\\� không được phép là ký tự cuối trong giá trị thuộc tính"
 
-#: pathspec.c:169
+#: pathspec.c:168
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Chỉ có một đặc tả “attr:� là được phép."
 
-#: pathspec.c:172
+#: pathspec.c:171
 msgid "attr spec must not be empty"
 msgstr "đặc tả attr phải không được để trống"
 
-#: pathspec.c:215
+#: pathspec.c:214
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "tên thuộc tính không hợp lệ %s"
 
-#: pathspec.c:280
+#: pathspec.c:279
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "các cài đặt đặc tả đư�ng dẫn “glob� và “noglob� toàn cục là xung khắc nhau"
 
-#: pathspec.c:287
+#: pathspec.c:286
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -6019,51 +6226,51 @@ msgstr ""
 "cài đặt đặc tả đư�ng dẫn “literal� toàn cục là xung khắc với các cài đặt đặc "
 "tả đư�ng dẫn toàn cục khác"
 
-#: pathspec.c:327
+#: pathspec.c:326
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "tham số không hợp lệ cho “ti�n tố� màu nhiệm đặc tả đư�ng đẫn"
 
-#: pathspec.c:348
+#: pathspec.c:347
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Số màu nhiệm đặc tả đư�ng dẫn không hợp lệ “%.*s� trong “%s�"
 
-#: pathspec.c:353
+#: pathspec.c:352
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "Thiếu “)� tại cuối của số màu nhiệm đặc tả đư�ng dẫn trong “%s�"
 
-#: pathspec.c:391
+#: pathspec.c:390
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Chưa viết mã cho số màu nhiệm đặc tả đư�ng dẫn “%c� trong “%s�"
 
-#: pathspec.c:450
+#: pathspec.c:449
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: “literal� và “glob� xung khắc nhau"
 
-#: pathspec.c:466
+#: pathspec.c:465
 #, c-format
 msgid "%s: '%s' is outside repository at '%s'"
 msgstr "%s: “%s� ngoài một kho chứa tại “%s�"
 
-#: pathspec.c:542
+#: pathspec.c:541
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "“%s� (mnemonic: “%c�)"
 
-#: pathspec.c:552
+#: pathspec.c:551
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: số mầu nhiệm đặc tả đư�ng dẫn chưa được hỗ trợ bởi lệnh này: %s"
 
-#: pathspec.c:619
+#: pathspec.c:618
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "đặc tả đư�ng dẫn “%s� vượt ra ngoài liên kết m�m"
 
-#: pathspec.c:664
+#: pathspec.c:663
 #, c-format
 msgid "line is badly quoted: %s"
 msgstr "dòng được trích dẫn sai: %s"
@@ -6077,14 +6284,14 @@ msgid "unable to write delim packet"
 msgstr "không thể ghi gói delim"
 
 #: pkt-line.c:106
-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 "unable to write response end packet"
+msgstr "không thể ghi gói cuối trả v�"
 
 #: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr "gặp lỗi khi ghi vào tập tin gói lúc đẩy dữ liệu lên bộ nhớ"
 
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
 msgid "protocol error: impossibly long line"
 msgstr "lỗi giao thức: không thể làm được dòng dài"
 
@@ -6092,7 +6299,7 @@ msgstr "lỗi giao thức: không thể làm được dòng dài"
 msgid "packet write with format failed"
 msgstr "gặp lỗi khi ghi gói có định dạng"
 
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
 msgid "packet write failed - data exceeds max packet size"
 msgstr "gặp lỗi khi ghi gói - dữ liệu vượt quá cỡ vói tối đa"
 
@@ -6101,25 +6308,25 @@ msgstr "gặp lỗi khi ghi gói - dữ liệu vượt quá cỡ vói tối đa"
 msgid "packet write failed: %s"
 msgstr "gặp lỗi khi ghi gói: %s"
 
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
 msgid "read error"
 msgstr "lỗi đ�c"
 
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
 msgid "the remote end hung up unexpectedly"
 msgstr "máy chủ bị treo bất ng�"
 
-#: pkt-line.c:369 pkt-line.c:371
+#: 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:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: 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:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "lỗi máy chủ: %s"
@@ -6133,24 +6340,24 @@ msgstr "Làm mới bảng mục lục"
 msgid "unable to create threaded lstat: %s"
 msgstr "không thể tạo tuyến trình lstat: %s"
 
-#: pretty.c:988
+#: pretty.c:1051
 msgid "unable to parse --pretty format"
 msgstr "không thể phân tích định dạng --pretty"
 
-#: promisor-remote.c:30
+#: promisor-remote.c:31
 msgid "promisor-remote: unable to fork off fetch subprocess"
 msgstr "promisor-remote: không thể rẽ nhánh tuyến trình con fetch"
 
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
 msgid "promisor-remote: could not write to fetch subprocess"
 msgstr "promisor-remote: không thể ghi tiến trình con fetch"
 
-#: promisor-remote.c:41
+#: promisor-remote.c:44
 msgid "promisor-remote: could not close stdin to fetch subprocess"
 msgstr ""
 "promisor-remote: không thể đóng đầu vào tiêu chuẩn tiến trình con fetch"
 
-#: promisor-remote.c:53
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "tên máy chủ hứa hẹn không thể bắt đầu bằng “/�: %s"
@@ -6163,20 +6370,20 @@ msgstr "object-info: cần đẩy dữ liệu lên đĩa sau các tham số"
 msgid "Removing duplicate objects"
 msgstr "�ang gỡ các đối tượng trùng lặp"
 
-#: range-diff.c:78
+#: range-diff.c:67
 msgid "could not start `log`"
 msgstr "không thể lấy thông tin thống kê v� “log“"
 
-#: range-diff.c:80
+#: range-diff.c:69
 msgid "could not read `log` output"
 msgstr "không thể đ�c kết xuất “log�"
 
-#: range-diff.c:101 sequencer.c:5551
+#: 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�"
 
-#: range-diff.c:115
+#: range-diff.c:111
 #, c-format
 msgid ""
 "could not parse first line of `log` output: did not start with 'commit ': "
@@ -6185,70 +6392,66 @@ msgstr ""
 "không thể phân tích cú pháp dòng đầu tiên của đầu ra “log�: không bắt đầu "
 "bằng “commit �: “%s�"
 
-#: range-diff.c:140
+#: range-diff.c:137
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "không thể phân tích cú pháp phần đầu git “%.*s�"
 
-#: range-diff.c:306
+#: range-diff.c:304
 msgid "failed to generate diff"
 msgstr "gặp lỗi khi tạo khác biệt"
 
-#: range-diff.c:558
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only và --right-only loại từ lẫn nhau"
-
-#: range-diff.c:561 range-diff.c:563
+#: 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:708
+#: 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:724
+#: 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:746
+#: 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:751
+#: 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:803
+#: 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:822
+#: 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:833
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "không thể lấy thống kê “%s�"
 
-#: read-cache.c:1356
+#: 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:1571
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "Làm tươi mới bảng mục lục"
 
-#: read-cache.c:1700
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6257,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:1710
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6266,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:1766
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "chữ ký sai 0x%08x"
 
-#: read-cache.c:1769
+#: 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:1778
+#: 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:1812
+#: 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:1814
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "đang l� đi phần mở rộng %.4s"
 
-#: read-cache.c:1851
+#: 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:1867
+#: 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:1924
+#: 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:1927
+#: 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:1930
+#: 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:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:332
+#: 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: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:2180
+#: 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:2193
+#: 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:2226
+#: 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:2230
+#: 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:2234
+#: 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:2238
+#: read-cache.c:2280
 #, c-format
-msgid "%s: unable to map index file"
-msgstr "%s: không thể ánh xạ tập tin mục lục"
+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:2280
+#: 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:2307
+#: 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:2345
+#: 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:2392
+#: 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:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: 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:3138
+#: 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:3209 sequencer.c:2684 sequencer.c:4441
+#: 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:3222
+#: 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:3234
+#: 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:3263
+#: 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:3412
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: không thể xóa b� stage #0"
@@ -6484,7 +6687,7 @@ msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Cải tổ %s vào %s (%d lệnh )"
 
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6493,7 +6696,7 @@ msgstr ""
 "�ừng xóa bất kỳ dòng nào. Dùng “drop� một cách rõ ràng để xóa b� một lần "
 "chuyển giao.\n"
 
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6501,7 +6704,7 @@ msgstr ""
 "\n"
 "Nếu bạn xóa b� một dòng ở đây thì LẦN CHUYỂN GIAO �Ó SẼ MẤT.\n"
 
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6515,7 +6718,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -6525,14 +6728,14 @@ 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:3816
-#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
+#: 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'"
 msgstr "không thể ghi “%s�"
 
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
 #, c-format
 msgid "could not write '%s'."
 msgstr "không thể ghi “%s�."
@@ -6564,14 +6767,12 @@ msgstr ""
 "Cánh ứng xử có thể là: ignore, warn, error.\n"
 "\n"
 
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
 #, c-format
-msgid "could not read '%s'."
-msgstr "không thể đ�c “%s�."
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s: “preserve� bị cấm bởi “merges�"
 
-#: ref-filter.c:42 wt-status.c:1978
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "đã ra đi"
 
@@ -6590,132 +6791,108 @@ msgstr "đằng sau %d"
 msgid "ahead %d, behind %d"
 msgstr "trÆ°á»›c %d, sau %d"
 
-#: ref-filter.c:175
+#: ref-filter.c:235
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "cần định dạng: %%(color:<color>)"
 
-#: ref-filter.c:177
+#: ref-filter.c:237
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
-msgstr "không nhận ra màu: %%(màu:%s)"
+msgstr "không nhận ra màu: %%(color:%s)"
 
-#: ref-filter.c:199
+#: ref-filter.c:259
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Giá trị nguyên cần tên tham chiếu:lstrip=%s"
 
-#: ref-filter.c:203
+#: ref-filter.c:263
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Giá trị nguyên cần tên tham chiếu:rstrip=%s"
 
-#: ref-filter.c:205
+#: 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"
 
-#: ref-filter.c:260
+#: ref-filter.c:320
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) không nhận các đối số"
 
-#: ref-filter.c:282
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "tham số không được thừa nhận %%(objectname): %s"
-
-#: ref-filter.c:290
+#: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) không nhận các đối số"
 
-#: ref-filter.c:302
+#: ref-filter.c:364
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) không nhận các đối số"
 
-#: ref-filter.c:315
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "tham số không được thừa nhận %%(subject): %s"
-
-#: ref-filter.c:334
+#: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
 msgstr "cần %%(trailers:key=<giá trị>)"
 
-#: ref-filter.c:336
+#: ref-filter.c:398
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "không hiểu tham số %%(trailers): %s"
 
-#: ref-filter.c:367
+#: ref-filter.c:429
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "cần nội dung mang giá trị dương:lines=%s"
 
-#: ref-filter.c:369
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "đối số không được thừa nhận %%(contents): %s"
-
-#: ref-filter.c:384
+#: 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:388
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "đối số “%s� không được thừa nhận trong %%(%s)"
-
-#: ref-filter.c:402
+#: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
 msgstr "không nhận ra tùy ch�n thư điện tử: “%s�"
 
-#: ref-filter.c:432
+#: ref-filter.c:506
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "cần định dạng: %%(align:<width>,<position>)"
 
-#: ref-filter.c:444
+#: ref-filter.c:518
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "vị trí không được thừa nhận:%s"
 
-#: ref-filter.c:451
+#: ref-filter.c:525
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "chi�u rộng không được thừa nhận:%s"
 
-#: ref-filter.c:460
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "đối số không được thừa nhận %%(align): %s"
-
-#: ref-filter.c:468
+#: 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:486
+#: ref-filter.c:568
 #, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "đối số không được thừa nhận %%(if): %s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) không nhận các đối số"
 
-#: ref-filter.c:588
+#: ref-filter.c:680
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "tên trư�ng dị hình: %.*s"
 
-#: ref-filter.c:615
+#: ref-filter.c:707
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "không hiểu tên trư�ng: %.*s"
 
-#: ref-filter.c:619
+#: ref-filter.c:711
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
@@ -6723,126 +6900,121 @@ 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:743
+#: 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 "định dạng: nguyên tử %%(if) được dùng mà không có nguyên tử %%(then)"
+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:807
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "định dạng: nguyên tử %%(then) được dùng mà không có nguyên tử %%(if)"
-
-#: ref-filter.c:809
+#: ref-filter.c:912
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "định dạng: nguyên tử %%(then) được dùng nhi�u hơn một lần"
 
-#: ref-filter.c:811
+#: ref-filter.c:914
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "định dạng: nguyên tử %%(then) được dùng sau %%(else)"
 
-#: ref-filter.c:839
-#, 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:841
-#, 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:843
+#: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "định dạng: nguyên tử %%(else) được dùng nhi�u hơn một lần"
 
-#: ref-filter.c:858
+#: ref-filter.c:965
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "định dạng: nguyên tử %%(end) được dùng mà không có nguyên tử tương ứng"
 
-#: ref-filter.c:915
+#: ref-filter.c:1027
 #, c-format
 msgid "malformed format string %s"
 msgstr "chuỗi định dạng dị hình %s"
 
-#: ref-filter.c:1556
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "lệnh này từ chối atom %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s không thể được dùng với --python, --shell, --tcl"
+
+#: ref-filter.c:1706
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "(không nhánh, đang cải tổ %s)"
 
-#: ref-filter.c:1559
+#: ref-filter.c:1709
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr "(không nhánh, đang cải tổ HEAD %s đã tách r�i)"
 
-#: ref-filter.c:1562
+#: ref-filter.c:1712
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)"
 
-#: ref-filter.c:1566
+#: ref-filter.c:1716
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD được tách r�i tại %s)"
 
-#: ref-filter.c:1569
+#: ref-filter.c:1719
 #, c-format
 msgid "(HEAD detached from %s)"
-msgstr "(HEAD được tách r�i từ %s)"
+msgstr "(HEAD được tách r�i kh�i %s)"
 
-#: ref-filter.c:1572
+#: ref-filter.c:1722
 msgid "(no branch)"
 msgstr "(không nhánh)"
 
-#: ref-filter.c:1604 ref-filter.c:1813
+#: ref-filter.c:1754 ref-filter.c:1972
 #, c-format
 msgid "missing object %s for %s"
 msgstr "thiếu đối tượng %s cho %s"
 
-#: ref-filter.c:1614
+#: ref-filter.c:1764
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer gặp lỗi trên %s cho %s"
 
-#: ref-filter.c:1997
+#: ref-filter.c:2155
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "đối tượng dị hình tại “%s�"
 
-#: ref-filter.c:2086
+#: ref-filter.c:2245
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "đang l� đi tham chiếu với tên h�ng %s"
 
-#: ref-filter.c:2091 refs.c:676
+#: 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:2431
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "định dạng: thiếu nguyên tử %%(end)"
 
-#: ref-filter.c:2525
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "tên đối tượng dị hình %s"
 
-#: ref-filter.c:2530
+#: 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"
 
-#: refs.c:264
+#: refs.c:261
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr "“%s� không chỉ đến một lần chuyển giao hợp lệ nào cả!"
 
-#: refs.c:566
+#: refs.c:563
 #, c-format
 msgid ""
 "Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6856,23 +7028,23 @@ msgid ""
 "\n"
 "\tgit branch -m <name>\n"
 msgstr ""
-"Sử dụng '%s' làm tên cho nhánh ban đầu. Tên nhánh mặc định này\n"
+"Sử dụng “%s� làm tên cho nhánh ban đầu. Tên nhánh mặc định này\n"
 "có thể thay đổi. �ể cấu hình tên nhánh khởi đầu sử dụng trong tất cả\n"
 "kho lưu trữ mới của bạn, cái mà sẽ ngăn chặn cảnh báo này, g�i lệnh:\n"
 "\n"
 "\tgit config --global init.defaultBranch <tên>\n"
 "\n"
-"Tên thư�ng được ch�n thay cho 'master' là 'main', 'trunk' và\n"
-"'development'. Nhánh vừa tạo có thể được đổi tên thông qua lệnh:\n"
+"Tên thư�ng được ch�n thay cho “master� là “main�, “trunk� và\n"
+"“development�. Nhánh vừa tạo có thể được đổi tên thông qua lệnh:\n"
 "\n"
 "\tgit branch -m <tên>\n"
 
-#: refs.c:588
+#: refs.c:585
 #, c-format
 msgid "could not retrieve `%s`"
 msgstr "không thể lấy v� “%s�"
 
-#: refs.c:598
+#: refs.c:595
 #, c-format
 msgid "invalid branch name: %s = %s"
 msgstr "tên nhánh không hợp lệ: %s = %s"
@@ -6882,66 +7054,66 @@ msgstr "tên nhánh không hợp lệ: %s = %s"
 msgid "ignoring dangling symref %s"
 msgstr "đang l� đi tham chiếu m�m thừa %s"
 
-#: refs.c:922
+#: 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:929
+#: 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:994
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "nhật ký cho %s trống rỗng"
 
-#: refs.c:1086
+#: 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:1157
+#: 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:2051
+#: 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:2131
+#: 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:2142
+#: 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:2242 refs.c:2272
+#: 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:2248 refs.c:2283
+#: 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:1228
+#: 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:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: 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:1245 refs/packed-backend.c:1555
+#: 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"
@@ -6951,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"
@@ -7003,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"
@@ -7028,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"
@@ -7039,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"
@@ -7050,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"
@@ -7061,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"
@@ -7072,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 ""
@@ -7189,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"
@@ -7206,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�"
@@ -7245,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
+#: 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"
@@ -7290,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:2089 builtin/log.c:2000
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
+#: 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�"
@@ -7329,45 +7501,32 @@ 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:3669
+#: 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:2343
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "--unpacked=<packfile> không còn được hỗ trợ nữa"
 
-#: revision.c:2683
+#: 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:2686
+#: 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:2892
+#: 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:767
-msgid "open /dev/null failed"
-msgstr "gặp lỗi khi mở “/dev/null�"
-
-#: run-command.c:1275
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
-msgstr "không thể tạo tuyến async: %s"
-
-#: run-command.c:1345
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"Móc “%s� bị b� qua bởi vì nó không thể đặt là thực thi được.\n"
-"Bạn có thể tắt cảnh báo này bằng “git config advice.ignoredHook false“."
+msgstr "không thể tạo tuyến trình async: %s"
 
 #: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
@@ -7388,23 +7547,23 @@ msgstr "máy chủ gặp lỗi unpack: %s"
 msgid "failed to sign the push certificate"
 msgstr "gặp lỗi khi ký chứng thực đẩy"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "send-pack: unable to fork off fetch subprocess"
 msgstr "send-pack: không thể rẽ nhánh tuyến trình con fetch"
 
-#: send-pack.c:455
+#: send-pack.c:457
 msgid "push negotiation failed; proceeding anyway with push"
 msgstr "đẩy đàm phán thất bại; vẫn tiếp tục xử lý bằng lệnh đẩy"
 
-#: send-pack.c:520
+#: send-pack.c:528
 msgid "the receiving end does not support this repository's hash algorithm"
 msgstr "kết thúc nhận không hỗ trợ các tùy ch�n của lệnh push"
 
-#: send-pack.c:529
+#: send-pack.c:537
 msgid "the receiving end does not support --signed push"
 msgstr "kết thúc nhận không hỗ trợ đẩy --signed"
 
-#: send-pack.c:531
+#: send-pack.c:539
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -7412,47 +7571,48 @@ msgstr ""
 "đừng gửi giấy chứng nhận đẩy trước khi kết thúc nhận không hỗ trợ đẩy --"
 "signed"
 
-#: send-pack.c:543
+#: send-pack.c:546
 msgid "the receiving end does not support --atomic push"
 msgstr "kết thúc nhận không hỗ trợ đẩy --atomic"
 
-#: send-pack.c:548
+#: send-pack.c:551
 msgid "the receiving end does not support push options"
 msgstr "kết thúc nhận không hỗ trợ các tùy ch�n của lệnh push"
 
-#: sequencer.c:196
+#: sequencer.c:197
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "chế độ d�n dẹp ghi chú các lần chuyển giao không hợp lệ “%s�"
 
-#: sequencer.c:324
+#: sequencer.c:325
 #, c-format
 msgid "could not delete '%s'"
 msgstr "không thể xóa b� “%s�"
 
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: 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�"
 
-#: sequencer.c:354
+#: sequencer.c:355
 msgid "revert"
 msgstr "hoàn nguyên"
 
-#: sequencer.c:356
+#: sequencer.c:357
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:358
+#: sequencer.c:359
 msgid "rebase"
 msgstr "rebase"
 
-#: sequencer.c:360
+#: sequencer.c:361
 #, c-format
 msgid "unknown action: %d"
 msgstr "không nhận ra thao tác: %d"
 
-#: sequencer.c:419
+#: sequencer.c:420
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -7460,53 +7620,81 @@ 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>�"
 
-#: sequencer.c:422
+#: sequencer.c:423
 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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
 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�"
+"Sau khi giải quyết vấn đ� xung đột, hãy đánh dấu bằng\n"
+"\"git add/rm <pathspec>\", sai đó chạy\n"
+"\"git cherry-pick --continue\".\n"
+"Bạn có thể b� qua lần chuyển giao này với \"git cherry-pick --skip\".\n"
+"�ể bãi b� và quay trở lại trạng thái trước khi \"git cherry-pick\",\n"
+"chạy \"git cherry-pick --abort\"."
+
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"Sau khi giải quyết vấn đ� này, hãy đánh dấu chúng bằng\n"
+"\"git add/rm <đặc_tả_đư�ng_dẫn_xung_đột>\", sau đó chạy\n"
+"\"git revert --continue\".\n"
+"Bạn có thể b� qua lần chuyển giao này với \"git rebase --skip\".\n"
+"�ể bãi b� và quay trở lại trạng thái trước \"git revert\",\n"
+"chạy \"git revert --abort\"."
 
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "không thể khóa “%s�"
 
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#: 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�"
 
-#: sequencer.c:442
+#: sequencer.c:455
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "không thể ghi eol vào “%s�"
 
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3554
+#: 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:486
+#: 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."
 msgstr "các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh %s."
 
-#: sequencer.c:490
+#: sequencer.c:503
 msgid "commit your changes or stash them to proceed."
 msgstr "chuyển giao các thay đổi của bạn hay tạm cất (stash) chúng để xử lý."
 
-#: sequencer.c:522
+#: sequencer.c:535
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: chuyển-tiếp-nhanh"
 
-#: sequencer.c:561 builtin/tag.c:609
+#: 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"
@@ -7514,65 +7702,65 @@ msgstr "Chế độ d�n dẹp không hợp lệ %s"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
 #.
-#: sequencer.c:671
+#: sequencer.c:685
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới"
 
-#: sequencer.c:685
+#: sequencer.c:699
 msgid "unable to update cache tree"
 msgstr "không thể cập nhật cây bộ nhớ đệm"
 
-#: sequencer.c:699
+#: sequencer.c:713
 msgid "could not resolve HEAD commit"
 msgstr "không thể phân giải lần chuyển giao HEAD"
 
-#: sequencer.c:779
+#: sequencer.c:793
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "không có khóa hiện diện trong “%.*s�"
 
-#: sequencer.c:790
+#: sequencer.c:804
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "không thể giải trích dẫn giá trị của “%s�"
 
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
-#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
+#: 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"
 
-#: sequencer.c:837
+#: sequencer.c:851
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "“GIT_AUTHOR_NAME� đã sẵn đưa ra rồi"
 
-#: sequencer.c:842
+#: sequencer.c:856
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "“GIT_AUTHOR_EMAIL� đã sẵn đưa ra rồi"
 
-#: sequencer.c:847
+#: sequencer.c:861
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "“GIT_AUTHOR_DATE� đã sẵn đưa ra rồi"
 
-#: sequencer.c:851
+#: sequencer.c:865
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "không hiểu biến “%s�"
 
-#: sequencer.c:856
+#: sequencer.c:870
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "thiếu “GIT_AUTHOR_NAME�"
 
-#: sequencer.c:858
+#: sequencer.c:872
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "thiếu “GIT_AUTHOR_EMAIL�"
 
-#: sequencer.c:860
+#: sequencer.c:874
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "thiếu “GIT_AUTHOR_DATE�"
 
-#: sequencer.c:925
+#: sequencer.c:939
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -7601,11 +7789,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1212
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "móc “prepare-commit-msg� bị lỗi"
 
-#: sequencer.c:1218
+#: 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"
@@ -7636,7 +7824,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1231
+#: 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"
@@ -7664,345 +7852,352 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1273
+#: 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:1275
+#: 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:1321
+#: 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:1323
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "đã r�i kh�i HEAD"
 
-#: sequencer.c:1327
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (root-commit)"
 
-#: sequencer.c:1348
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "không thể phân tích HEAD"
 
-#: sequencer.c:1350
+#: 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:1354 sequencer.c:1432 builtin/commit.c:1692
+#: 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:1410 sequencer.c:2295
+#: 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:1421 builtin/am.c:1614 builtin/merge.c:706
+#: 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:1454 sequencer.c:1574
+#: 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:1485 sequencer.c:1517
+#: 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:1491
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
-msgstr "tác giả sai h�ng: thiếu thông tin này tháng"
+msgstr "tác giả sai h�ng: thiếu thông tin ngày tháng"
 
-#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
-#: builtin/merge.c:934 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:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#: 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:1606
+#: 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:1611
+#: 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:1694 sequencer.c:1975
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "không hiểu câu lệnh %d"
 
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: 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:1737
+#: 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:1738
+#: 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:1739
+#: 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:1740
+#: 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:1887 sequencer.c:1944
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "không thể ghi “%s�"
 
-#: sequencer.c:1934
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "cần một HEAD để sửa"
 
-#: sequencer.c:1936 sequencer.c:3581
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "không thể đ�c HEAD"
 
-#: sequencer.c:1938
+#: 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:1962
+#: 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:2072
+#: 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:2079
+#: 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:2098
+#: 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:2106 sequencer.c:2114
+#: 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:2120
+#: 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:2139
+#: 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:2205
+#: 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:2265
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "không thể hoàn nguyên %s… %s"
 
-#: sequencer.c:2266
+#: 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:2287
+#: 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:2345
+#: 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:2352
+#: 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:2425
+#: 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:2434
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "thiếu đối số cho %s"
 
-#: sequencer.c:2477
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "không thể phân tích cú pháp “%s�"
 
-#: sequencer.c:2538
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "dòng không hợp lệ %d: %.*s"
 
-#: sequencer.c:2549
+#: 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:2635
+#: sequencer.c:2624 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "không thể đ�c “%s�."
+
+#: 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:2644
+#: 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:2690
+#: 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:2692
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "bảng chỉ thị không thể dùng được: %s"
 
-#: sequencer.c:2697
+#: 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:2708
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "không thể cherry-pick trong khi hoàn nguyên."
 
-#: sequencer.c:2710
+#: 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:2788
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "giá trị cho %s không hợp lệ: %s"
 
-#: sequencer.c:2897
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "squash-onto không dùng được"
 
-#: sequencer.c:2917
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "bảng tùy ch�n dị hình: “%s�"
 
-#: sequencer.c:3012 sequencer.c:4869
+#: 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:3029
+#: 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:3031
+#: 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:3034
+#: 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:3036
+#: 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:3050
+#: 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:3065
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "không thể khóa HEAD"
 
-#: sequencer.c:3125 sequencer.c:4582
+#: 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:3127 sequencer.c:3138
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "không thể phân giải HEAD"
 
-#: sequencer.c:3129 sequencer.c:3173
+#: 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:3159 builtin/grep.c:759
+#: 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:3161
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "không thể đ�c “%s�: %s"
 
-#: sequencer.c:3162
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "gặp kết thúc tập tin đột xuất"
 
-#: sequencer.c:3168
+#: 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:3179
+#: 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:3220
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "không có tiến trình hoàn nguyên nào"
 
-#: sequencer.c:3229
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "không có cherry-pick đang được thực hiện"
 
-#: sequencer.c:3239
+#: 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:3246
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "ở đây không có gì để mà b� qua cả"
 
-#: sequencer.c:3249
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8011,16 +8206,16 @@ msgstr ""
 "bạn đã sẵn sàng chuyển giao chưa?\n"
 "thá»­ \"git %s --continue\""
 
-#: sequencer.c:3411 sequencer.c:4473
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "không thể đ�c HEAD"
 
-#: sequencer.c:3428
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "không thể chép “%s� sang “%s�"
 
-#: sequencer.c:3436
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8039,27 +8234,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3446
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Không thể áp dụng %s… %.*s"
 
-#: sequencer.c:3453
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Không hòa trộn %.*s"
 
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: 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:3483
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "�ang thực thi: %s\n"
 
-#: sequencer.c:3498
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8074,11 +8269,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3504
+#: 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:3510
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8095,90 +8290,90 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3571
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "tên nhãn dị hình: “%.*s�"
 
-#: sequencer.c:3625
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "ghi lần chuyển giao gốc giả"
 
-#: sequencer.c:3630
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "Ä‘ang ghi squash-onto"
 
-#: sequencer.c:3714
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "không thể phân giải “%s�"
 
-#: sequencer.c:3747
+#: 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:3769
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "không thể phân tích “%.*s�"
 
-#: sequencer.c:3778
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "chẳng có gì để hòa trộn: “%.*s�"
 
-#: sequencer.c:3790
+#: 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:3806
+#: 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:3989
+#: 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:4005
+#: 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:4079
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr "Không thể autostash"
 
-#: sequencer.c:4082
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Gặp đáp ứng stash không cần: “%s�"
 
-#: sequencer.c:4088
+#: 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:4091
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "�ã tạo autostash: %s\n"
 
-#: sequencer.c:4095
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "không thể reset --hard"
 
-#: sequencer.c:4120
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "�ã áp dụng autostash.\n"
 
-#: sequencer.c:4132
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "không thử lưu “%s�"
 
-#: sequencer.c:4135
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8190,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:4140
+#: 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:4141
+#: 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:4234 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "không thể tách r�i HEAD"
 
-#: sequencer.c:4249
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Dừng lại ở HEAD\n"
 
-#: sequencer.c:4251
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Dừng lại ở %s\n"
 
-#: sequencer.c:4259
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8233,58 +8428,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4305
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "�ang cải tổ (%d/%d)%s"
 
-#: sequencer.c:4351
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Dừng lại ở %s…  %.*s\n"
 
-#: sequencer.c:4422
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "không hiểu câu lệnh %d"
 
-#: sequencer.c:4481
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "không thể đ�c orig-head"
 
-#: sequencer.c:4486
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "không thể đ�c “onto�."
 
-#: sequencer.c:4500
+#: 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:4560
+#: 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:4612
+#: 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:4621
+#: 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:4623
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "tập tin không hợp lệ: “%s�"
 
-#: sequencer.c:4625
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "nội dung không hợp lệ: “%s�"
 
-#: sequencer.c:4628
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8294,59 +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:4664 sequencer.c:4703
+#: 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:4719
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "không thể xóa b� CHERRY_PICK_HEAD"
 
-#: sequencer.c:4726
+#: 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:4846
+#: 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:4850
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: điểm xét duyệt sai"
 
-#: sequencer.c:4885
+#: 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:5362
+#: 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: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:5405
 msgid "make_script: unhandled options"
 msgstr "make_script: các tùy ch�n được không xử lý"
 
-#: sequencer.c:5365
+#: 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:5615 sequencer.c:5632
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "không có gì để làm"
 
-#: sequencer.c:5651
+#: 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:5751
+#: 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"
@@ -8356,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"
@@ -8368,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"
@@ -8384,96 +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
+#: 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:661
+#: 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:669
-msgid "unknown repository extensions found:"
-msgstr "tìm thấy phần mở rộng kho chưa biết:"
+#: 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:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "phiên bản kho là 0, nhưng lại tìm thấy phần mở rộng chỉ v1:"
+#: 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:700
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "gặp lỗi khi mở “%s�"
 
-#: setup.c:702
+#: 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:704
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "gặp lỗi khi đ�c %s"
 
-#: setup.c:706
+#: 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:708
+#: 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:710
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "không phải là kho git: %s"
 
-#: setup.c:812
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "“$%s� quá lớn"
 
-#: setup.c:826
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "không phải là kho git: “%s�"
 
-#: setup.c:855 setup.c:857 setup.c:888
+#: 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:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: 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:987
+#: 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:1225
+#: 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:1234 setup.c:1240
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "không thể chuyển sang “%s�"
 
-#: setup.c:1245
+#: 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:1251
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8483,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:1370
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8492,27 +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:1417
-msgid "open /dev/null or dup failed"
-msgstr "gặp lỗi khi mở “/dev/null� hay dup"
-
-#: setup.c:1432
+#: setup.c:1508
 msgid "fork failed"
 msgstr "gặp lỗi khi rẽ nhánh tiến trình"
 
-#: setup.c:1437 t/helper/test-simple-ipc.c:285
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "setsid gặp lỗi"
 
-#: sparse-index.c:151
-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"
-
-#: sparse-index.c:156
-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"
-
-#: sparse-index.c:239
+#: 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)"
@@ -8567,13 +8762,13 @@ msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u byte/giây"
 
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
-#: builtin/rebase.c:866
+#: 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:1177
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "không thể sửa “%s�"
@@ -8585,7 +8780,7 @@ msgstr "đang l� đi tên mô-đun-con mập m�: %s"
 
 #: submodule-config.c:304
 msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
+msgstr "không cho phép giá trị âm ở submodule.fetchjobs"
 
 #: submodule-config.c:402
 #, c-format
@@ -8599,7 +8794,7 @@ msgstr ""
 msgid "invalid value for %s"
 msgstr "giá trị cho %s không hợp lệ"
 
-#: submodule-config.c:766
+#: submodule-config.c:767
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "Không thể cập nhật mục .gitmodules %s"
@@ -8624,22 +8819,22 @@ msgstr "Không thể gỡ b� mục .gitmodules dành cho %s"
 msgid "staging updated .gitmodules failed"
 msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
 
-#: submodule.c:328
+#: submodule.c:358
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "trong mô-đun-con không có gì “%s�"
 
-#: submodule.c:359
+#: submodule.c:389
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "�ặc tả đư�ng dẫn “%s� thì ở trong mô-đun-con “%.*s�"
 
-#: submodule.c:436
+#: submodule.c:466
 #, c-format
 msgid "bad --ignore-submodules argument: %s"
 msgstr "đối số --ignore-submodules sai: %s"
 
-#: submodule.c:818
+#: submodule.c:844
 #, c-format
 msgid ""
 "Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8648,13 +8843,13 @@ msgstr ""
 "Mô-đun-con trong lần chuyển giao %s tại đư�ng dẫn: “%s� va chạm với mô-đun-"
 "con cùng tên. Nên b� qua nó."
 
-#: submodule.c:921
+#: submodule.c:954
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr ""
 "mục tin mô-đun-con “%s� (%s) là một %s, không phải là một lần chuyển giao"
 
-#: submodule.c:1006
+#: submodule.c:1042
 #, c-format
 msgid ""
 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8663,36 +8858,36 @@ msgstr ""
 "Không thể chạy lệnh “git rev-list <các lần chuyển giao> --not --remotes -n "
 "1� trong mô-đun-con “%s�"
 
-#: submodule.c:1129
+#: submodule.c:1165
 #, c-format
 msgid "process for submodule '%s' failed"
 msgstr "xử lý cho mô-đun-con “%s� gặp lỗi"
 
-#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
+#: 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ệ."
 
-#: submodule.c:1169
+#: submodule.c:1205
 #, c-format
 msgid "Pushing submodule '%s'\n"
 msgstr "�ẩy lên mô-đun-con “%s�\n"
 
-#: submodule.c:1172
+#: submodule.c:1208
 #, c-format
 msgid "Unable to push submodule '%s'\n"
 msgstr "Không thể đẩy lên mô-đun-con “%s�\n"
 
-#: submodule.c:1464
+#: submodule.c:1491
 #, c-format
 msgid "Fetching submodule %s%s\n"
 msgstr "�ang lấy v� mô-đun-con %s%s\n"
 
-#: submodule.c:1498
+#: submodule.c:1525
 #, c-format
 msgid "Could not access submodule '%s'\n"
 msgstr "Không thể truy cập mô-đun-con “%s�\n"
 
-#: submodule.c:1653
+#: submodule.c:1680
 #, c-format
 msgid ""
 "Errors during submodule fetch:\n"
@@ -8701,61 +8896,61 @@ msgstr ""
 "Có lỗi khi lấy v� mô-đun-con:\n"
 " “%s�"
 
-#: submodule.c:1678
+#: submodule.c:1705
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "không nhận ra “%s� là một kho git"
 
-#: submodule.c:1695
+#: submodule.c:1722
 #, c-format
 msgid "Could not run 'git status --porcelain=2' in submodule %s"
 msgstr "Không thể chạy “git status --porcelain=2� trong mô-đun-con “%s�"
 
-#: submodule.c:1736
+#: submodule.c:1763
 #, c-format
 msgid "'git status --porcelain=2' failed in submodule %s"
 msgstr "“git status --porcelain=2� gặp lỗi trong mô-đun-con “%s�"
 
-#: submodule.c:1811
+#: submodule.c:1838
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "không thể lấy thống kê “git status� trong mô-đun-con “%s�"
 
-#: submodule.c:1824
+#: submodule.c:1851
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "không thể chạy “git status� trong mô-đun-con “%s�"
 
-#: submodule.c:1839
+#: submodule.c:1868
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "Không thể đặt core.worktree trong mô-đun-con “%s�"
 
-#: submodule.c:1866 submodule.c:2176
+#: submodule.c:1895 submodule.c:2210
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "không thể đệ quy vào trong mô-đun-con “%s�"
 
-#: submodule.c:1887
+#: submodule.c:1917
 msgid "could not reset submodule index"
 msgstr "không thể đặt lại mục lục của mô-đun-con"
 
-#: submodule.c:1929
+#: submodule.c:1959
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "mô-đun-con “%s� có mục lục còn bẩn"
 
-#: submodule.c:1981
+#: submodule.c:2013
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Mô-đun-con “%s� không thể được cập nhật."
 
-#: submodule.c:2049
+#: submodule.c:2081
 #, c-format
 msgid "submodule git dir '%s' is inside git dir '%.*s'"
 msgstr "thư mục git mô đun con “%s� là bên trong git DIR “%.*s�"
 
-#: submodule.c:2070
+#: submodule.c:2102
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8763,17 +8958,17 @@ msgstr ""
 "relocate_gitdir cho mô-đun-con “%s� với nhi�u hơn một cây làm việc là chưa "
 "được hỗ trợ"
 
-#: submodule.c:2082 submodule.c:2141
+#: submodule.c:2114 submodule.c:2174
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "không thể tìm kiếm tên cho mô-đun-con “%s�"
 
-#: submodule.c:2086
+#: submodule.c:2118
 #, c-format
 msgid "refusing to move '%s' into an existing git dir"
 msgstr "từ chối di chuyển “%s� vào trong một thư mục git sẵn có"
 
-#: submodule.c:2093
+#: submodule.c:2124
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -8784,11 +8979,11 @@ msgstr ""
 "“%s� sang\n"
 "“%s�\n"
 
-#: submodule.c:2221
+#: submodule.c:2255
 msgid "could not start ls-files in .."
 msgstr "không thể lấy thông tin thống kê v� ls-files trong .."
 
-#: submodule.c:2261
+#: submodule.c:2295
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree trả v� mã không như mong đợi %d"
@@ -8810,7 +9005,7 @@ msgid "unknown value '%s' for key '%s'"
 msgstr "không hiểu giá trị “%s� cho khóa “%s�"
 
 #: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
 #, c-format
 msgid "more than one %s"
 msgstr "nhi�u hơn một %s"
@@ -8825,11 +9020,11 @@ msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s�"
 msgid "could not read input file '%s'"
 msgstr "không đ�c được tập tin đầu vào “%s�"
 
-#: trailer.c:766 builtin/mktag.c:88
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
 msgid "could not read from stdin"
 msgstr "không thể đ�c từ đầu vào tiêu chuẩn"
 
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
 #, c-format
 msgid "could not stat %s"
 msgstr "không thể lấy thông tin thống kê v� %s"
@@ -8897,7 +9092,7 @@ msgstr "không thể chạy fast-import"
 msgid "error while running fast-import"
 msgstr "gặp lỗi trong khi chạy fast-import"
 
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
 #, c-format
 msgid "could not read ref %s"
 msgstr "không thể đ�c tham chiếu %s"
@@ -8915,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:1471
+#: 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ợ"
 
@@ -8924,7 +9119,7 @@ msgstr "thao tác không được gia thức hỗ trợ"
 msgid "can't connect to subservice %s"
 msgstr "không thể kết nối đến dịch vụ phụ %s"
 
-#: transport-helper.c:693 transport.c:397
+#: transport-helper.c:693 transport.c:404
 msgid "--negotiate-only requires protocol v2"
 msgstr "--negotiate-only cần giao thức v2"
 
@@ -8937,59 +9132,59 @@ msgstr "“option� không có chỉ thị “ok/error� tương ứng"
 msgid "expected ok/error, helper said '%s'"
 msgstr "cần ok/error, nhưng bộ hỗ trợ lại nói “%s�"
 
-#: transport-helper.c:855
+#: transport-helper.c:859
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "bộ hỗ trợ báo cáo rằng không cần tình trạng của %s"
 
-#: transport-helper.c:938
+#: transport-helper.c:942
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "helper %s không hỗ trợ dry-run"
 
-#: transport-helper.c:941
+#: transport-helper.c:945
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "helper %s không hỗ trợ --signed"
 
-#: transport-helper.c:944
+#: transport-helper.c:948
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "helper %s không hỗ trợ --signed=if-asked"
 
-#: transport-helper.c:949
+#: transport-helper.c:953
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "helper %s không hỗ trợ --atomic"
 
-#: transport-helper.c:953
+#: transport-helper.c:957
 #, c-format
 msgid "helper %s does not support --%s"
 msgstr "helper %s không hỗ trợ --%s"
 
-#: transport-helper.c:960
+#: transport-helper.c:964
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "helper %s không hỗ trợ “push-option�"
 
-#: transport-helper.c:1060
+#: transport-helper.c:1064
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "remote-helper không hỗ trợ push; cần đặc tả tham chiếu"
 
-#: transport-helper.c:1065
+#: transport-helper.c:1069
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "helper %s không hỗ trợ “force�"
 
-#: transport-helper.c:1112
+#: transport-helper.c:1116
 msgid "couldn't run fast-export"
 msgstr "không thể chạy fast-export"
 
-#: transport-helper.c:1117
+#: transport-helper.c:1121
 msgid "error while running fast-export"
 msgstr "gặp lỗi trong khi chạy fast-export"
 
-#: transport-helper.c:1142
+#: transport-helper.c:1146
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -8999,52 +9194,52 @@ msgstr ""
 "cả.\n"
 "Tuy nhiên bạn nên chỉ định một nhánh.\n"
 
-#: transport-helper.c:1224
+#: transport-helper.c:1228
 #, c-format
 msgid "unsupported object format '%s'"
 msgstr "không hỗ trợ định dạng đối tượng “%s�"
 
-#: transport-helper.c:1233
+#: transport-helper.c:1237
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "đáp ứng sai dạng trong danh sách tham chiếu: %s"
 
-#: transport-helper.c:1385
+#: transport-helper.c:1389
 #, c-format
 msgid "read(%s) failed"
 msgstr "read(%s) gặp lỗi"
 
-#: transport-helper.c:1412
+#: transport-helper.c:1416
 #, c-format
 msgid "write(%s) failed"
 msgstr "write(%s) gặp lỗi"
 
-#: transport-helper.c:1461
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed"
 msgstr "tuyến trình %s gặp lỗi"
 
-#: transport-helper.c:1465
+#: transport-helper.c:1469
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "tuyến trình %s gặp lỗi khi gia nhập: %s"
 
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "không thể khởi chạy tuyến trình để sao chép dữ liệu: %s"
 
-#: transport-helper.c:1525
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed to wait"
 msgstr "xử lý %s gặp lỗi khi đợi"
 
-#: transport-helper.c:1529
+#: transport-helper.c:1533
 #, c-format
 msgid "%s process failed"
 msgstr "xử lý %s gặp lỗi"
 
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
 msgid "can't start thread for copying data"
 msgstr "không thể khởi chạy tuyến trình cho việc chép dữ liệu"
 
@@ -9058,46 +9253,46 @@ msgstr "Không thể đặt thượng nguồn của “%sâ€� thành “%sâ€� cá»
 msgid "could not read bundle '%s'"
 msgstr "không thể đ�c bó “%s�"
 
-#: transport.c:220
+#: transport.c:227
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "vận chuyển: tùy ch�n độ sâu “%s� không hợp lệ"
 
-#: transport.c:272
+#: transport.c:279
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "xem protocol.version trong “git help config� để có thêm thông tin"
 
-#: transport.c:273
+#: transport.c:280
 msgid "server options require protocol version 2 or later"
 msgstr "các tùy ch�n máy chủ yêu cầu giao thức phiên bản 2 hoặc mới hơn"
 
-#: transport.c:400
+#: transport.c:407
 msgid "server does not support wait-for-done"
-msgstr "Máy chủ không hỗ trợ wait-for-done"
+msgstr "máy chủ không hỗ trợ wait-for-done"
 
-#: transport.c:751
+#: transport.c:759
 msgid "could not parse transport.color.* config"
 msgstr "không thể phân tích cú pháp cấu hình transport.color.*"
 
-#: transport.c:826
+#: transport.c:834
 msgid "support for protocol v2 not implemented yet"
 msgstr "việc hỗ trợ giao thức v2 chưa được thực hiện"
 
-#: transport.c:960
+#: transport.c:967
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "không hiểu giá trị cho cho cấu hình “%s�: %s"
 
-#: transport.c:1026
+#: transport.c:1033
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "không cho phép phương thức vận chuyển “%s�"
 
-#: transport.c:1079
+#: transport.c:1082
 msgid "git-over-rsync is no longer supported"
 msgstr "git-over-rsync không còn được hỗ trợ nữa"
 
-#: transport.c:1181
+#: transport.c:1185
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
@@ -9106,7 +9301,7 @@ msgstr ""
 "Các đư�ng dẫn mô-đun-con sau đây có chứa các thay đổi cái mà\n"
 "có thể được tìm thấy trên m�i máy phục vụ:\n"
 
-#: transport.c:1185
+#: transport.c:1189
 #, c-format
 msgid ""
 "\n"
@@ -9133,11 +9328,11 @@ msgstr ""
 "để đẩy chúng lên máy phục vụ.\n"
 "\n"
 
-#: transport.c:1193
+#: transport.c:1197
 msgid "Aborting."
 msgstr "Bãi b�."
 
-#: transport.c:1340
+#: 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"
 
@@ -9157,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"
@@ -9168,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"
@@ -9178,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"
@@ -9189,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"
@@ -9199,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"
@@ -9209,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"
@@ -9219,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"
@@ -9229,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"
@@ -9239,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"
@@ -9249,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"
@@ -9259,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"
@@ -9269,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"
@@ -9278,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"
@@ -9287,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 "
@@ -9298,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 "
@@ -9309,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"
@@ -9319,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"
@@ -9329,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"
@@ -9339,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"
@@ -9349,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"
@@ -9363,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 "
@@ -9374,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"
@@ -9384,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 "
@@ -9395,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 "
@@ -9409,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"
@@ -9423,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:1519
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "�ang cập nhật các c� mục lục"
 
-#: unpack-trees.c:2608
+#: 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:1548
+#: 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"
 
@@ -9470,114 +9674,124 @@ 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:238 builtin/am.c:2151
+#: 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:304
+#: 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:315
+#: 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:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "\"%s\" không tồn tại"
 
-#: worktree.c:333
+#: 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:342
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "“%s� không chỉ ngược đến “%s�"
 
-#: worktree.c:608
+#: worktree.c:604
 msgid "not a directory"
 msgstr "không phải thư mục"
 
-#: worktree.c:617
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git không phải là một tập tin"
 
-#: worktree.c:619
+#: worktree.c:615
 msgid ".git file broken"
 msgstr "tệp .git bị h�ng"
 
-#: worktree.c:621
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr "tập tin .git không chính xác"
 
-#: worktree.c:727
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "không phải là một đư�ng dẫn hợp lệ"
 
-#: worktree.c:733
+#: 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:737
+#: 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:741
+#: 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:747
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "gitdir không thể đ�c được"
 
-#: worktree.c:751
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "gitdir không chính xác"
 
-#: worktree.c:776
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "không phải thư mục hợp lệ"
 
-#: worktree.c:782
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "tập tin gitdir không tồn tại"
 
-#: worktree.c:787 worktree.c:796
+#: 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:806
+#: 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:814
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "tập tin gitdir (thư mục git) không hợp lệ"
 
-#: worktree.c:822
+#: 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"
 
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "không thể setenv “%s�"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "không thể tạo “%s�"
+
+#: wrapper.c:205 wrapper.c:375
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "không thể mở “%s� để đ�c và ghi"
 
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
 #, c-format
 msgid "unable to access '%s'"
 msgstr "không thể truy cập “%s�"
 
-#: wrapper.c:607
+#: wrapper.c:615
 msgid "unable to get current working directory"
 msgstr "không thể lấy thư mục làm việc hiện hành"
 
@@ -9614,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:1075
+#: 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:1084
+#: 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:"
 
@@ -9722,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:908
+#: 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:939
+#: 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:941
+#: 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:1023
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -9744,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:1115
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -9755,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:1145
+#: 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:1148
+#: 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:1150
+#: 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:1154
+#: 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:1157
+#: 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:1166
+#: 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:1169
+#: 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:1173
+#: 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:1175
+#: 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:1177
+#: 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:1310
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "thiếu git-rebase-todo."
 
-#: wt-status.c:1312
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "Không thực hiện lệnh nào."
 
-#: wt-status.c:1315
+#: 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:1326
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (xem thêm trong %s)"
 
-#: wt-status.c:1331
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "Không có lệnh nào còn lại."
 
-#: wt-status.c:1334
+#: 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:1342
+#: 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:1354
+#: 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:1359
+#: 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:1372
+#: 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:1374
+#: 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:1376
+#: 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:1383
+#: 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:1387
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9865,165 +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:1392
+#: 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:1395
+#: 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:1399
+#: 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:1404
+#: 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:1407
+#: 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:1409
+#: 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:1420
+#: 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:1423
+#: 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:1430
+#: 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:1433
+#: 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:1436
+#: 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:1438
+#: 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:1440
+#: 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:1450
+#: 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:1453
+#: 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:1459
+#: 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:1462
+#: 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:1465
+#: 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:1467
+#: 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:1469
+#: 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:1479
+#: 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:1483
+#: 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:1486
+#: 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:1497
+#: 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: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:1736
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "Trên nhánh "
 
-#: wt-status.c:1743
+#: 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:1745
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "rebase đang được thực hiện: lên trên "
 
-#: wt-status.c:1750
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "HEAD được tách r�i tại "
 
-#: wt-status.c:1752
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "HEAD được tách r�i từ "
 
-#: wt-status.c:1755
+#: 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:1772
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Lần chuyển giao khởi tạo"
 
-#: wt-status.c:1773
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "Vẫn chưa chuyển giao"
 
-#: wt-status.c:1787
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "Những tập tin chưa được theo dõi"
 
-#: wt-status.c:1789
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Những tập tin bị l� đi"
 
-#: wt-status.c:1793
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10035,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:1799
+#: 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:1801
+#: 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:1807
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "Không có thay đổi nào"
 
-#: wt-status.c:1812
+#: 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:1816
+#: 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:1820
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -10069,92 +10294,92 @@ 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:1824
+#: 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:1828
+#: 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:1832 wt-status.c:1838
+#: 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:1835
+#: 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:1840
+#: 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:1945
+#: 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:1949
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (không nhánh)"
 
-#: wt-status.c:1980
+#: wt-status.c:2050
 msgid "different"
 msgstr "khác"
 
-#: wt-status.c:1982 wt-status.c:1990
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "đằng sau "
 
-#: wt-status.c:1985 wt-status.c:1988
+#: 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:2511
+#: 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:2517
+#: 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:2519
+#: 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:178
+#: 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:185
+#: 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:862
+#: 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:874
+#: 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�"
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "gặp lỗi khi b� liên kết (unlink) “%s�"
@@ -10163,138 +10388,143 @@ msgstr "gặp lỗi khi b� liên kết (unlink) “%s�"
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<các tùy ch�n>] [--]  <pathspec>…"
 
-#: builtin/add.c:61
+#: builtin/add.c:64
 #, c-format
 msgid "cannot chmod %cx '%s'"
-msgstr "không thể chmod %cx '%s'"
+msgstr "không thể chmod %cx “%s�"
 
-#: builtin/add.c:99
+#: builtin/add.c:106
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "trạng thái lệnh diff không như mong đợi %c"
 
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
 msgid "updating files failed"
 msgstr "cập nhật tập tin gặp lỗi"
 
-#: builtin/add.c:114
+#: builtin/add.c:121
 #, c-format
 msgid "remove '%s'\n"
 msgstr "gỡ b� “%s�\n"
 
-#: builtin/add.c:198
+#: builtin/add.c:205
 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:307 builtin/rev-parse.c:991
+#: 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:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Không thể mở “%s� để ghi."
-
-#: builtin/add.c:322
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "Không thể ghi ra miếng vá"
 
-#: builtin/add.c:325
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "gặp lỗi khi sửa miếng vá"
 
-#: builtin/add.c:328
+#: 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:330
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "Miếng vá trống rỗng. Nên b� qua."
 
-#: builtin/add.c:335
+#: 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:343
+#: 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:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: 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:366
+#: 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:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: 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:368
+#: 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:369
+#: 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:370
+#: 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:371
+#: 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:372
+#: 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:373
+#: 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:376
+#: 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:378
+#: 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:379
+#: 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:380
+#: 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:382 builtin/update-index.c:1006
+#: 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: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:384
+#: 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:386
+#: 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:404
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10325,12 +10555,12 @@ msgstr ""
 "\n"
 "Xem \"git help submodule\" để biết thêm chi tiết."
 
-#: builtin/add.c:432
+#: 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:451
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10340,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:460
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "thêm tập tin gặp lỗi"
 
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run xung khắc với --interactive/--patch"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file xung khắc với --interactive/--patch"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file xung khắc với --edit"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A và -u xung khắc nhau"
-
-#: builtin/add.c:522
-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:526
+#: 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:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
-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:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
-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:555
+#: 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:557
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10394,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:364
+#: 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:454
+#: 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:496
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Dòng đầu vào dị hình: “%s�."
 
-#: builtin/am.c:534
+#: 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:560
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "fseek gặp lỗi"
 
-#: builtin/am.c:748
+#: 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:813
+#: 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:861
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "dấu th�i gian không hợp lệ"
 
-#: builtin/am.c:866 builtin/am.c:878
+#: 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:873
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "độ lệch múi gi� không hợp lệ"
 
-#: builtin/am.c:966
+#: 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:971 builtin/clone.c:414
+#: 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:976
+#: 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:1125
+#: 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:1126
+#: 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:1127
+#: 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:1222
+#: 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:1250
-msgid "Patch is empty."
-msgstr "Miếng vá trống rỗng."
-
-#: builtin/am.c:1315
+#: 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:1318
+#: 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:1537
+#: 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:1539
+#: 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:1558
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10504,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:1564
+#: 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:1590
+#: 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:1622
+#: 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:1674 builtin/am.c:1678
+#: 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:1696
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "Thân của lần chuyển giao là:"
 
@@ -10529,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:1706
+#: 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:1752 builtin/commit.c:408
+#: 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:1756
+#: 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:1796 builtin/am.c:1864
+#: 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:1813
+#: 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:1819
+#: 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:1823
+#: 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:1867
+#: 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"
@@ -10574,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:1874
+#: 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 "
@@ -10587,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:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
-#: builtin/reset.c:355
+#: 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:2033
+#: 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:2077
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10605,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:2184
+#: 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:2226
+#: 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:2230
+#: 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:2261
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<các tùy ch�n>] [(<mbox>|<Maildir>)…]"
 
-#: builtin/am.c:2262
+#: 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:2268
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "chạy kiểu tương tác"
 
-#: builtin/am.c:2270
+#: 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:2272
+#: 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:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:948
+#: 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:2275
+#: 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:2278
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "chuyển mã thành utf8 (mặc định)"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "chuyển c� -k cho git-mailinfo"
 
-#: builtin/am.c:2282
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "chuyển c� -b cho git-mailinfo"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "chuyển c� -m cho git-mailinfo"
 
-#: builtin/am.c:2286
+#: 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:2289
+#: 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:2292
+#: 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:2294
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "chuyển nó qua git-mailinfo"
 
-#: builtin/am.c:2297 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:2324
+#: 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:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
+#: 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:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: 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:2321
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "định dạng (các) miếng vá theo"
 
-#: builtin/am.c:2327
+#: 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:2329
+#: 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:2332
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "đồng nghĩa với --continue"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "b� qua miếng vá hiện hành"
 
-#: builtin/am.c:2338
+#: 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:2341
+#: 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:2345
+#: 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:2350
+#: 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:2352
+#: 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:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: 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:2355 builtin/rebase.c:538 builtin/rebase.c:1396
+#: 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:2358
+#: 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:2376
+#: 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."
@@ -10766,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:2383
+#: 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:2398
+#: 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:2422
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -10784,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:2428
+#: 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:2438
+#: 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"
 
@@ -10796,44 +11036,35 @@ msgstr "chế Ä‘á»™ tÆ°Æ¡ng tác yêu cầu có các miếng vá trên dòng lá»
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<các tùy ch�n>] [<miếng-vá>…]"
 
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "không thể tạo tập tin kho (lưu trữ, nén) “%s�"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "không thể chuyển hướng kết xuất"
 
-#: builtin/archive.c:37
+#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive: Máy chủ không có địa chỉ URL"
 
-#: builtin/archive.c:61
+#: builtin/archive.c:59
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive: cần ACK/NAK, nhưng lại nhận được gói flush"
 
-#: builtin/archive.c:64
+#: builtin/archive.c:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: NACK %s"
 
-#: builtin/archive.c:65
+#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive: lỗi giao thức"
 
-#: builtin/archive.c:69
+#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive: cần một flush (đẩy dữ liệu lên đĩa)"
 
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<lần_chuyển_giao>]"
 
-#: builtin/bisect--helper.c:24
-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>]"
-
 #: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10862,7 +11093,7 @@ msgstr "git bisect--helper --bisect-state (bad|new) [<lần_chuyển_giao>]"
 
 #: builtin/bisect--helper.c:30
 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
-msgstr "git bisect--helper --bisect-reset (good|old) [<lần_chuyển_giao>…]"
+msgstr "git bisect--helper --bisect-state (good|old) [<lần_chuyển_giao>…]"
 
 #: builtin/bisect--helper.c:31
 msgid "git bisect--helper --bisect-replay <filename>"
@@ -10870,48 +11101,61 @@ msgstr "git bisect--helper --bisect-replay <tên_tập_tin>"
 
 #: builtin/bisect--helper.c:32
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
-msgstr "git bisect--helper --bisect-skip [(<rev>|<vùng>)...]"
+msgstr "git bisect--helper --bisect-skip [(<rev>|<vùng>)…]"
+
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
 
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <lệnh>…"
+
+#: builtin/bisect--helper.c:109
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr "không thể mở tập tin “%s� ở chế độ “%s�"
 
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "không thể ghi vào tập tin “%s�"
 
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "không thể mở tập tin “%s� để đ�c"
+
+#: builtin/bisect--helper.c:170
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "“%s� không phải một th�i hạn hợp lệ"
 
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "không thể dùng lệnh tích hợp “%s� như là một th�i kỳ"
 
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "không thể thay đổi nghĩa của th�i kỳ “%s�"
 
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
 msgid "please use two different terms"
 msgstr "vui lòng dùng hai th�i kỳ khác nhau"
 
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "Chúng tôi đang không bisect.\n"
 
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "“%s� không phải một lần chuyển giao hợp lệ"
 
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10919,27 +11163,27 @@ msgstr ""
 "không thể lấy ra HEAD nguyên thủy của “%s�. Hãy thử “git bisect reset <lần-"
 "chuyển-giao>�."
 
-#: builtin/bisect--helper.c:254
+#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "�ối số bisect_write sai: %s"
 
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "không thể lấy oid của điểm xét duyệt “%s�"
 
-#: builtin/bisect--helper.c:271
+#: builtin/bisect--helper.c:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "không thể mở tập tin “%s�"
 
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:314
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "Lệnh không hợp lệ: bạn hiện đang ở một bisect %s/%s"
 
-#: builtin/bisect--helper.c:324
+#: builtin/bisect--helper.c:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -10948,7 +11192,7 @@ msgstr ""
 "Bạn phải chỉ cho tôi ít nhất một điểm %s và một %s.\n"
 "Bạn có thể sử dụng \"git bisect %s\" và \"git bisect %s\" cho cái đó."
 
-#: builtin/bisect--helper.c:328
+#: builtin/bisect--helper.c:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -10959,7 +11203,7 @@ msgstr ""
 "Bạn sau đó cần phải chỉ cho tôi ít nhất một điểm xét duyệt %s và một %s.\n"
 "Bạn có thể sử dụng \"git bisect %s\" và \"git bisect %s\" cho chúng."
 
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "chỉ thực hiện việc bisect với một lần chuyển giao %s"
@@ -10968,15 +11212,15 @@ msgstr "chỉ thực hiện việc bisect với một lần chuyển giao %s"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "Bạn có chắc chắn chưa [Y/n]? "
 
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
 msgid "no terms defined"
 msgstr "chưa định nghĩa th�i kỳ nào"
 
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -10985,7 +11229,7 @@ msgstr ""
 "Bạn hiện tại đang ở th�i kỳ %s cho tình trạng cũ\n"
 "và %s cho tình trạng mới.\n"
 
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -10994,52 +11238,52 @@ msgstr ""
 "tham số không hợp lệ %s cho “git bisect terms�.\n"
 "Các tùy ch�n hỗ trợ là: --term-good|--term-old và --term-bad|--term-new."
 
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
 msgstr "gặp lỗi cài đặt việc di chuyển qua các điểm xét duyệt\n"
 
-#: builtin/bisect--helper.c:519
+#: builtin/bisect--helper.c:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "không thể mở “%s� để nối thêm"
 
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
 msgstr "� không phải một th�i hạn hợp lệ"
 
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "tùy ch�n không được thừa nhận: “%s�"
 
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "“%s� không có vẻ như là một điểm xét duyệt hợp lệ"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "sai HEAD - Tôi cần một HEAD"
 
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr "lấy ra “%s� ra gặp lỗi. Hãy thử \"git bisect reset <nhánh_hợp_lệ>\"."
 
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "sẽ không di chuyển nửa bước trên cây được cg-seek"
 
-#: builtin/bisect--helper.c:735
+#: builtin/bisect--helper.c:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "sai HEAD - tham chiếu m�m kỳ lạ"
 
-#: builtin/bisect--helper.c:755
+#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "refspec không hợp lệ: “%s�"
 
-#: builtin/bisect--helper.c:813
+#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "Bạn cần khởi đầu bằng \"git bisect start\"\n"
 
@@ -11047,105 +11291,151 @@ msgstr "Bạn cần khởi đầu bằng \"git bisect start\"\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "Bạn có muốn tôi thực hiện đi�u này cho bạn không [Y/n]? "
 
-#: builtin/bisect--helper.c:842
+#: builtin/bisect--helper.c:859
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr "Hãy g�i “--bisect-state� với ít nhất một đối số"
 
-#: builtin/bisect--helper.c:855
+#: builtin/bisect--helper.c:872
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "“git bisect %s� có thể lấy chỉ một đối số."
 
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "�ầu vào rev sai: %s"
 
-#: builtin/bisect--helper.c:887
+#: builtin/bisect--helper.c:904
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "�ầu vào rev sai (không phải là lần chuyển giao): %s"
 
-#: builtin/bisect--helper.c:919
+#: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
 msgstr "Chúng tôi không bisect."
 
-#: builtin/bisect--helper.c:969
+#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
-msgstr "'%s'?? bạn đang nói gì thế?"
+msgstr "“%s�?? bạn đang nói gì thế?"
 
-#: builtin/bisect--helper.c:981
+#: builtin/bisect--helper.c:998
 #, c-format
 msgid "cannot read file '%s' for replaying"
-msgstr "không thể đ�c tập tin '%s' để thao diễn lại"
+msgstr "không thể đ�c tập tin “%s� để thao diễn lại"
+
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "bisect chạy gặp lỗi: không đưa ra lệnh."
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "đang chạy %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "chạy bisect gặp lỗi: mã trả v� %d từ lệnh “%s� là < 0 hoặc >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "không thể mở “%s� để ghi"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "bisect không thể tiếp tục thêm được nữa"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "bisect chạy thành công"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "bisect tìm thấy lần chuyển giao sai đầu tiên"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"chạy bisect gặp lỗi: “git bisect--helper --bisect-state %s� đã thoát ra với "
+"mã lỗi %d"
 
-#: builtin/bisect--helper.c:1054
+#: builtin/bisect--helper.c:1192
 msgid "reset the bisection state"
 msgstr "đặt lại trạng di chuyển nửa bước"
 
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1194
 msgid "check whether bad or good terms exist"
 msgstr "kiểm tra xem các th�i điểm xấu/tốt có tồn tại không"
 
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1196
 msgid "print out the bisect terms"
 msgstr "in ra các th�i điểm di chuyển nửa bước"
 
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1198
 msgid "start the bisect session"
 msgstr "bắt đầu phiên di chuyển nửa bước"
 
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1200
 msgid "find the next bisection commit"
 msgstr "tìm lần chuyển giao không di chuyển phân đôi"
 
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1202
 msgid "mark the state of ref (or refs)"
 msgstr "đánh dấu trạng thái ref (hoặc refs)"
 
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1204
 msgid "list the bisection steps so far"
 msgstr "liệt kê các bước bisection đi quá xa"
 
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1206
 msgid "replay the bisection process from the given file"
 msgstr "phát lại quá trình bisection từ tệp đã cho"
 
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1208
 msgid "skip some commits for checkout"
 msgstr "b� qua một số lần chuyển giao để lấy ra"
 
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "trực quan việc di chuyển nửa bước"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "dùng <cmd>… để bisect một cách tự động."
+
+#: builtin/bisect--helper.c:1214
 msgid "no log for BISECT_WRITE"
 msgstr "không có nhật ký cho BISECT_WRITE"
 
-#: builtin/bisect--helper.c:1087
+#: builtin/bisect--helper.c:1229
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr ""
 "--bisect-reset requires không nhận đối số cũng không nhận lần chuyển giao"
 
-#: builtin/bisect--helper.c:1092
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check cần 2 hoặc 3 tham số"
-
-#: builtin/bisect--helper.c:1098
+#: builtin/bisect--helper.c:1234
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms cần 0 hoặc 1 tham số"
 
-#: builtin/bisect--helper.c:1107
+#: builtin/bisect--helper.c:1243
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next cần 0 tham số"
 
-#: builtin/bisect--helper.c:1118
+#: builtin/bisect--helper.c:1254
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log cần 0 tham số"
 
-#: builtin/bisect--helper.c:1123
+#: builtin/bisect--helper.c:1259
 msgid "no logfile given"
 msgstr "chưa chỉ ra tập tin ghi nhật ký"
 
@@ -11157,152 +11447,154 @@ msgstr "git blame [<các tùy ch�n>] [<rev-opts>] [<rev>] [--] <tập-tin>"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "cần một màu: %s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "phải kết thúc bằng một màu"
 
-#: builtin/blame.c:728
+#: builtin/blame.c:724
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "màu không hợp lệ “%s� trong color.blame.repeatedLines"
 
-#: builtin/blame.c:746
+#: builtin/blame.c:742
 msgid "invalid value for blame.coloring"
 msgstr "màu không hợp lệ cho blame.coloring"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:841
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "không thể tìm thấy điểm xét duyệt %s để mà b� qua"
 
-#: builtin/blame.c:867
+#: builtin/blame.c:863
 msgid "show blame entries as we find them, incrementally"
 msgstr "hiển thị các mục “blame� như là chúng ta thấy chúng, tăng dần"
 
-#: builtin/blame.c:868
+#: builtin/blame.c:864
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr ""
 "đừng hiển thị tên đối tượng của những lần chuyển giao biên giới (Mặc định: "
 "off)"
 
-#: builtin/blame.c:869
+#: builtin/blame.c:865
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)"
 
-#: builtin/blame.c:870
+#: builtin/blame.c:866
 msgid "show work cost statistics"
 msgstr "hiển thị thống kê công sức làm việc"
 
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: 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"
 
-#: builtin/blame.c:872
+#: builtin/blame.c:868
 msgid "show output score for blame entries"
 msgstr "hiển thị kết xuất điểm số cho các mục tin “blame�"
 
-#: builtin/blame.c:873
+#: builtin/blame.c:869
 msgid "show original filename (Default: auto)"
 msgstr "hiển thị tên tập tin gốc (Mặc định: auto)"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:870
 msgid "show original linenumber (Default: off)"
 msgstr "hiển thị số dòng gốc (Mặc định: off)"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:871
 msgid "show in a format designed for machine consumption"
 msgstr "hiển thị ở định dạng đã thiết kế cho dùng bằng máy"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:872
 msgid "show porcelain format with per-line commit information"
 msgstr "hiển thị định dạng “porcelain� với thông tin chuyển giao mỗi dòng"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:873
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr "dùng cùng chế độ xuất ra với git-annotate (Mặc định: off)"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:874
 msgid "show raw timestamp (Default: off)"
 msgstr "hiển thị dấu vết th�i gian dạng thô (Mặc định: off)"
 
-#: builtin/blame.c:879
+#: builtin/blame.c:875
 msgid "show long commit SHA1 (Default: off)"
 msgstr "hiển thị SHA1 của lần chuyển giao dạng dài (Mặc định: off)"
 
-#: builtin/blame.c:880
+#: builtin/blame.c:876
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "không hiển thị tên tác giả và dấu vết th�i gian (Mặc định: off)"
 
-#: builtin/blame.c:881
+#: builtin/blame.c:877
 msgid "show author email instead of name (Default: off)"
 msgstr "hiển thị thư điện tử của tác giả thay cho tên (Mặc định: off)"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:878
 msgid "ignore whitespace differences"
 msgstr "b� qua các khác biệt do khoảng trắng gây ra"
 
-#: builtin/blame.c:883 builtin/log.c:1820
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "rev"
 
-#: builtin/blame.c:883
+#: builtin/blame.c:879
 msgid "ignore <rev> when blaming"
 msgstr "b� qua <rev> khi blame"
 
-#: builtin/blame.c:884
+#: builtin/blame.c:880
 msgid "ignore revisions from <file>"
 msgstr "b� qua các điểm xét duyệt từ <tập tin>"
 
-#: builtin/blame.c:885
+#: builtin/blame.c:881
 msgid "color redundant metadata from previous line differently"
 msgstr "siêu dữ liệu dư thừa màu từ dòng trước khác hẳn"
 
-#: builtin/blame.c:886
+#: builtin/blame.c:882
 msgid "color lines by age"
 msgstr "các dòng màu theo tuổi"
 
-#: builtin/blame.c:887
+#: builtin/blame.c:883
 msgid "spend extra cycles to find better match"
 msgstr "tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa"
 
-#: builtin/blame.c:888
+#: builtin/blame.c:884
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 "sử dụng các điểm xét duyệt (revision) từ <tập tin> thay vì g�i “git-rev-list�"
 
-#: builtin/blame.c:889
+#: builtin/blame.c:885
 msgid "use <file>'s contents as the final image"
 msgstr "sử dụng nội dung của <tập tin> như là ảnh cuối cùng"
 
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
 msgid "score"
 msgstr "điểm số"
 
-#: builtin/blame.c:890
+#: builtin/blame.c:886
 msgid "find line copies within and across files"
 msgstr "tìm các bản sao chép dòng trong và ngang qua tập tin"
 
-#: builtin/blame.c:891
+#: builtin/blame.c:887
 msgid "find line movements within and across files"
 msgstr "tìm các di chuyển dòng trong và ngang qua tập tin"
 
-#: builtin/blame.c:892
+#: builtin/blame.c:888
 msgid "range"
 msgstr "vùng"
 
-#: builtin/blame.c:893
+#: builtin/blame.c:889
 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:945
+#: 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"
@@ -11315,17 +11607,17 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:996
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "4 năm, 11 tháng trước"
 
-#: builtin/blame.c:1112
+#: 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:1157
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "Các dòng blame"
 
@@ -11357,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"
@@ -11366,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"
@@ -11375,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"
@@ -11389,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"
 
@@ -11401,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:440 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:471
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "không thể phân giải HEAD"
 
-#: builtin/branch.c:477
+#: 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:492
+#: 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:496
+#: 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:513
+#: 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:515
+#: 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:526
+#: 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:555
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "Gặp lỗi khi đổi tên nhánh"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "Gặp lỗi khi sao chép nhánh"
 
-#: builtin/branch.c:561
+#: 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:564
+#: 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:570
+#: 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:579
+#: 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:581
+#: 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:597
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11504,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:631
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Tùy ch�n chung"
 
-#: builtin/branch.c:633
+#: 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:634
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "không xuất các thông tin"
 
-#: builtin/branch.c:635
-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:637
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "không dùng"
 
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "thượng nguồn"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "thay đổi thông tin thượng nguồn"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "b� đặt thông tin thượng nguồn"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "tô màu kết xuất"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "thao tác trên nhánh “remote-tracking�"
 
-#: builtin/branch.c:644 builtin/branch.c:646
+#: 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:645 builtin/branch.c:647
+#: 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:650
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "Hành động git-branch:"
 
-#: builtin/branch.c:651
+#: 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:653
+#: 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:654
+#: 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:655
+#: 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:656
+#: 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:657
+#: 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:658
+#: 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:659
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "liệt kê các tên nhánh"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "hiển thị nhánh hiện hành"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "tạo reflog của nhánh"
 
-#: builtin/branch.c:663
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "sửa mô tả cho nhánh"
 
-#: builtin/branch.c:664
+#: 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:665
+#: 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:666
+#: 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:667
+#: 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:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: 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:670
+#: 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:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: 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:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: 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:695 builtin/clone.c:794
+#: 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:719
-msgid "--column and --verbose are incompatible"
-msgstr "tùy ch�n --column và --verbose xung khắc nhau"
-
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: 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:766
+#: 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:771
+#: 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:778
+#: 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:781
+#: 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:796
+#: 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:805
+#: 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:810
+#: 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:814
+#: builtin/branch.c:822
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11685,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:817 builtin/branch.c:840
+#: 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:821
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "chưa có nhánh “%s�"
 
-#: builtin/branch.c:834
+#: 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:838
+#: 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:844
+#: 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:854
+#: 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>?"
@@ -11717,7 +12005,7 @@ msgstr ""
 "nhánh.\n"
 "Có phải ý bạn là dùng: -a|-r --list <mẫu>?"
 
-#: builtin/branch.c:858
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -11725,33 +12013,33 @@ msgstr ""
 "tùy ch�n --set-upstream đã không còn được hỗ trợ nữa. Vui lòng dùng “--"
 "track� hoặc “--set-upstream-to� để thay thế."
 
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "phiên bản git:\n"
 
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "uname() gặp lỗi “%s� (%d)\n"
 
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
 msgid "compiler info: "
 msgstr "thông tin trình biên dịch: "
 
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "thông tin libc: "
 
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
 msgid "not run from a git repository - no hooks to show\n"
 msgstr "không chạy từ một kho git - nên chẳng có móc nào để mà hiển thị cả\n"
 
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr ""
 "git bugreport [-o|--output-directory <tập_tin>] [-s|--suffix <định_dạng>]"
 
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -11785,39 +12073,34 @@ msgstr ""
 "Vui lòng xen xét phần còn lại của báo cáo lỗi bên dưới.\n"
 "Bạn có thể xóa bất kỳ dòng nào bạn không muốn chia sẻ.\n"
 
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
 msgid "specify a destination for the bugreport file"
 msgstr "chỉ định thư mục định để tạo tập tin báo cáo lỗi"
 
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
 msgid "specify a strftime format suffix for the filename"
 msgstr ""
 "chỉ định chuỗi định dạng th�i gian strftime dùng làm hậu tố cho tên tập tin"
 
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "không thể tạo các thư mục dẫn đầu cho “%s�"
 
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "Thông tin hệ thống"
 
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "Các Móc đã được bật"
 
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "không thể tạo tập tin mới tại “%s�"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "không thể ghi vào %s"
 
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "�ã tạo báo cáo mới tại “%s�\n"
@@ -11838,27 +12121,27 @@ msgstr "git bundle list-heads <tập tin> [<tên tham chiếu>…]"
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <tập tin> [<tên tham chiếu>…]"
 
-#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
 msgid "do not show progress meter"
 msgstr "không hiển thị bộ đo tiến trình"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
 msgid "show progress meter"
 msgstr "hiển thị bộ đo tiến trình"
 
-#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
 msgid "show progress meter during object writing phase"
 msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng"
 
-#: builtin/bundle.c:74 builtin/pack-objects.c:3754
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện"
 
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
 msgid "specify bundle format version"
 msgstr "chỉ điịnh định dạng cho bundle"
 
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
 msgstr "Cần một kho chứa để có thể tạo một bundle."
 
@@ -11866,25 +12149,25 @@ msgstr "Cần một kho chứa để có thể tạo một bundle."
 msgid "do not show bundle details"
 msgstr "không hiển thị chi tiết bundle (bó)"
 
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
 #, c-format
 msgid "%s is okay\n"
 msgstr "“%s� tốt\n"
 
-#: builtin/bundle.c:163
+#: builtin/bundle.c:182
 msgid "Need a repository to unbundle."
 msgstr "Cần một kho chứa để có thể giải nén một bundle."
 
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "chi tiết; phải được đặt trước một lệnh-con"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "Tháo r�i các đối tượng"
 
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "Không hiểu câu lệnh con: %s"
 
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:622
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11892,7 +12175,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <kiểu> | --textconv) | --filters) [--path=<đư�ng/dẫn>] <đối_tượng>"
 
-#: builtin/cat-file.c:599
+#: builtin/cat-file.c:623
 msgid ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
@@ -11900,72 +12183,72 @@ msgstr ""
 "git cat-file (--batch[=<định dạng>] | --batch-check[=<định dạng>]) [--follow-"
 "symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:644
 msgid "only one batch option may be specified"
 msgstr "chỉ một tùy ch�n batch được chỉ ra"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<kiểu> là một trong số: blob, tree, commit hoặc tag"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
 msgid "show object type"
 msgstr "hiển thị kiểu đối tượng"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
 msgid "show object size"
 msgstr "hiển thị kích thước đối tượng"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
 msgid "exit with zero when there's no error"
 msgstr "thoát với 0 khi không có lỗi"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
 msgid "pretty-print object's content"
 msgstr "in nội dung đối tượng dạng dễ đ�c"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
 msgid "for blob objects, run textconv on object's content"
 msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
 msgid "for blob objects, run filters on object's content"
-msgstr "với đối tượng blob, chạy lệnh filters trên nội dung của đối tượng"
+msgstr "với đối tượng blob, chạy các bộ l�c nội dung của đối tượng"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
 msgid "use a specific path for --textconv/--filters"
 msgstr "dùng một đư�ng dẫn rõ ràng cho --textconv/--filters"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "cho phép -s và -t để làm việc với các đối tượng sai/h�ng"
 
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
 msgid "buffer --batch output"
 msgstr "đệm kết xuất --batch"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
 msgid "show info about objects fed from the standard input"
 msgstr "hiển thị các thông tin v� đối tượng fed  từ đầu vào tiêu chuẩn"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr "theo liên kết m�m trong-cây (được dùng với --batch hay --batch-check)"
 
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
 msgid "show all objects with --batch or --batch-check"
 msgstr "hiển thị m�i đối tượng với --batch hay --batch-check"
 
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:690
 msgid "do not order --batch-all-objects output"
 msgstr "đừng sắp xếp đầu ra --batch-all-objects"
 
@@ -11985,7 +12268,7 @@ msgstr "báo cáo tất cả các thuộc tính đặt trên tập tin"
 msgid "use .gitattributes only from the index"
 msgstr "chỉ dùng .gitattributes từ bảng mục lục"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "đ�c tên tập tin từ đầu vào tiêu chuẩn"
 
@@ -11993,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:1520 builtin/gc.c:549
-#: builtin/worktree.c:491
+#: 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"
 
@@ -12052,9 +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/submodule--helper.c:1825
-#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836
-#: builtin/submodule--helper.c:2334 builtin/worktree.c:719
+#: 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"
 
@@ -12119,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:414
+#: 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:419
+#: 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:426
+#: 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:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: 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:462 builtin/checkout.c:465
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "không được dùng “%s� với %s"
-
-#: builtin/checkout.c:469
+#: 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:473
+#: 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:477
+#: 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:482 builtin/checkout.c:487
+#: 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:563 builtin/checkout.c:570
+#: 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:739
+#: 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:793
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12218,50 +12497,50 @@ msgstr ""
 "sau:\n"
 "%s"
 
-#: builtin/checkout.c:886
+#: 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:928
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD hiện gi� tại"
 
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
+#: 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:936
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "�ặt lại nhánh “%s�\n"
 
-#: builtin/checkout.c:939
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "�ã sẵn sàng trên “%s�\n"
 
-#: builtin/checkout.c:943
+#: 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:945 builtin/checkout.c:1376
+#: 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:947
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "�ã chuyển đến nhánh “%s�\n"
 
-#: builtin/checkout.c:998
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " … và nhi�u hơn %d.\n"
 
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12280,7 +12559,7 @@ msgstr[0] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1023
+#: 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"
@@ -12301,19 +12580,19 @@ msgstr[0] ""
 " git branch <tên_nhánh_mới> %s\n"
 "\n"
 
-#: builtin/checkout.c:1058
+#: 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:1062
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "Vị trí trước kia của HEAD là"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: 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:1184
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12322,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:1191
+#: 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"
@@ -12342,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:1201
+#: 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:1267
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "chỉ cần một tham chiếu"
 
-#: builtin/checkout.c:1284
+#: 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:1330 builtin/worktree.c:270 builtin/worktree.c:438
+#: 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:1343 builtin/checkout.c:1709
+#: 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:1390
+#: 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:1392
+#: 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:1393 builtin/checkout.c:1401
+#: 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:1396
+#: 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:1412
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12394,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:1416
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12402,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:1420
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12410,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:1424
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12418,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:1428
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12426,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:1432
+#: 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:1439
+#: 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:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: 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:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: 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:1467
+#: 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:1475
+#: 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:1482
+#: 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:1525
+#: 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:1526 builtin/log.c:1807 parse-options.h:323
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "kiểu"
 
-#: builtin/checkout.c:1527
-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:1539 builtin/worktree.c:488
+#: 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:1540
-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:1542
+#: 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:1544
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "nhánh-mới"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "nhánh không cha mới"
 
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: 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:1549
+#: 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:1562
+#: 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:1565
+#: 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:1569
+#: 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:1624
+#: 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"
-
-#: builtin/checkout.c:1628
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p và --overlay 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:1665
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track cần tên một nhánh"
 
-#: builtin/checkout.c:1670
+#: 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:1702
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "không thể phân giải “%s�"
 
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "đư�ng dẫn đã cho không hợp lệ"
 
-#: builtin/checkout.c:1725
+#: 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:1729
+#: 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:1738
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file xung khắc với --detach"
-
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file xung khắc với --patch"
-
-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -12570,70 +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:1759
+#: 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:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484
+#: 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:1786
+#: 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:1788
+#: 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:1789
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "tạo reflog cho nhánh mới"
 
-#: builtin/checkout.c:1791
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "đoán thứ hai “git checkout <không-nhánh-nào-như-vậy>� (mặc định)"
+msgstr "gợi ý thứ hai “git checkout <không-nhánh-nào-như-vậy>� (mặc định)"
 
-#: builtin/checkout.c:1792
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "dùng chế độ che phủ (mặc định)"
 
-#: builtin/checkout.c:1837
+#: 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:1839
+#: 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:1841
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
-msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
+msgstr "gợi ý thứ hai \"git switch <không-nhánh-nào-như-vậy>\""
 
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "vứt b� các sửa đổi địa phương"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "lấy ra từ tree-ish nào"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "phục hồi bảng mục lục"
 
-#: builtin/checkout.c:1881
+#: 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:1883
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "b� qua những thứ chưa hòa trộn: %s"
 
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "dùng chế độ che phủ"
 
@@ -12669,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:302 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"
@@ -12682,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:306 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12703,33 +12979,33 @@ msgstr ""
 "*          - ch�n tất\n"
 "           - (để trống) kết thúc việc ch�n\n"
 
-#: builtin/clean.c:521 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:661
+#: 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:696
+#: 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:717
+#: 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:758
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Xóa b� “%s� [y/N]? "
 
-#: builtin/clean.c:789
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12747,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:825
+#: 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:841
+#: 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:903
+#: 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:905
+#: builtin/clean.c:928
 msgid "force"
 msgstr "ép buộc"
 
-#: builtin/clean.c:906
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "d�n bằng kiểu tương tác"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "gỡ b� toàn bộ thư mục"
 
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: 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:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "mẫu"
 
-#: builtin/clean.c:910
+#: 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:911
+#: 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:913
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "chỉ gỡ b� những tập tin bị b� qua"
 
-#: builtin/clean.c:929
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -12799,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:932
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -12807,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:944
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x và -X không thể dùng cùng nhau"
 
@@ -12823,7 +13099,7 @@ msgstr "đừng nhân bản từ kho nông"
 msgid "don't create a checkout"
 msgstr "không tạo một checkout"
 
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "tạo kho thuần"
 
@@ -12855,27 +13131,29 @@ msgstr "khởi tạo mô-đun-con trong bản sao"
 msgid "number of submodules cloned in parallel"
 msgstr "số lượng mô-đun-con được nhân bản đồng th�i"
 
-#: builtin/clone.c:116 builtin/init-db.c:538
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "thư-mục-mẫu"
 
-#: builtin/clone.c:117 builtin/init-db.c:539
+#: builtin/clone.c:117 builtin/init-db.c:540
 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:1832
-#: builtin/submodule--helper.c:2337
+#: 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:1834
-#: builtin/submodule--helper.c:2339
+#: 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:549
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: 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"
 
@@ -12891,8 +13169,8 @@ 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:863
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
+#: builtin/pull.c:212
 msgid "depth"
 msgstr "độ-sâu"
 
@@ -12900,8 +13178,8 @@ 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:3804
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
 msgid "time"
 msgstr "th�i-gian"
 
@@ -12909,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/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: 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:215
+#: 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:1844
-#: builtin/submodule--helper.c:2353
+#: 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"
 
@@ -12933,11 +13211,11 @@ msgstr ""
 msgid "any cloned submodules will be shallow"
 msgstr "m�i mô-đun-con nhân bản sẽ là shallow (nông)"
 
-#: builtin/clone.c:142 builtin/init-db.c:547
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:143 builtin/init-db.c:548
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "không dùng chung thư mục dành riêng cho git và thư mục làm việc"
 
@@ -12949,23 +13227,23 @@ 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/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: 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/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: 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:234
-#: builtin/push.c:585
+#: 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:237
-#: builtin/push.c:587
+#: 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"
 
@@ -12977,50 +13255,42 @@ msgstr "má»�i mô-Ä‘un-con nhân bản sẽ dung nhánh theo dõi máy chủ cá»
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr "khởi tạo tập tin sparse-checkout để bao gồm chỉ các tập tin ở gốc"
 
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"Không đoán được thư mục tên là gì.\n"
-"Vui lòng chỉ định tên một thư mục trên dòng lệnh"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "thông tin: không thể thêm thay thế cho “%s�: %s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:304
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s có tồn tại nhưng lại không phải là một thư mục"
 
-#: builtin/clone.c:436
+#: builtin/clone.c:322
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "gặp lỗi khi bắt đầu lặp qua “%s�"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:353
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "gặp lỗi khi tạo được liên kết m�m %s"
 
-#: builtin/clone.c:471
+#: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "gặp lỗi khi sao chép tập tin và “%s�"
 
-#: builtin/clone.c:476
+#: builtin/clone.c:362
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "gặp lỗi khi lặp qua “%s�"
 
-#: builtin/clone.c:503
+#: builtin/clone.c:389
 #, c-format
 msgid "done.\n"
 msgstr "hoàn tất.\n"
 
-#: builtin/clone.c:517
+#: builtin/clone.c:403
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -13030,105 +13300,101 @@ msgstr ""
 "Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status�\n"
 "và thử lấy ra với lệnh “git restore --source=HEAD :/�\n"
 
-#: builtin/clone.c:594
+#: builtin/clone.c:480
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)."
 
-#: builtin/clone.c:713
+#: builtin/clone.c:597
 #, c-format
 msgid "unable to update %s"
 msgstr "không thể cập nhật %s"
 
-#: builtin/clone.c:761
+#: builtin/clone.c:645
 msgid "failed to initialize sparse-checkout"
 msgstr "gặp lỗi khi khởi tạo sparse-checkout"
 
-#: builtin/clone.c:784
+#: builtin/clone.c:668
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "refers HEAD máy chủ  chỉ đến ref không tồn tại, không thể lấy ra.\n"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:701
 msgid "unable to checkout working tree"
 msgstr "không thể lấy ra (checkout) cây làm việc"
 
-#: builtin/clone.c:894
+#: builtin/clone.c:779
 msgid "unable to write parameters to config file"
 msgstr "không thể ghi các tham số vào tập tin cấu hình"
 
-#: builtin/clone.c:957
+#: builtin/clone.c:842
 msgid "cannot repack to clean up"
 msgstr "không thể đóng gói để d�n dẹp"
 
-#: builtin/clone.c:959
+#: builtin/clone.c:844
 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:1001 builtin/receive-pack.c:2491
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "Có quá nhi�u đối số."
 
-#: builtin/clone.c:1005
+#: 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:1018
+#: 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."
+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:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "tùy ch�n --bare và --separate-git-dir xung khắc nhau."
-
-#: builtin/clone.c:1035
+#: 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:1039 builtin/fetch.c:2011
+#: 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"
 
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "đư�ng dẫn đích “%s� đã có từ trước và không phải là một thư mục rỗng."
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr ""
 "đư�ng dẫn kho chứa “%s� đã có từ trước và không phải là một thư mục rỗng."
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "cây làm việc “%s� đã sẵn tồn tại rồi."
 
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
+#: 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�"
 
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "không thể tạo cây thư mục làm việc dir “%s�"
 
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "�ang nhân bản thành kho chứa bare “%s�…\n"
 
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "�ang nhân bản thành “%s�…\n"
 
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -13136,46 +13402,50 @@ msgstr ""
 "nhân bản --recursive không tương thích với cả hai --reference và --reference-"
 "if-able"
 
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "“%s� không phải tên máy chủ hợp lệ"
 
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth bị l� đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
 
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since bị l� đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
 "thế."
 
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude bị l� đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
 "thế."
 
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 "--filter bị l� đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
 
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
 msgid "source repository is shallow, ignoring --local"
 msgstr "kho nguồn là nông, nên b� qua --local"
 
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
 msgid "--local is ignored"
 msgstr "--local bị l� đi"
 
-#: builtin/clone.c:1337 builtin/clone.c:1345
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr "vận chuyển máy mạng đã báo cáo lỗi"
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s"
 
-#: builtin/clone.c:1348
+#: builtin/clone.c:1242
 msgid "You appear to have cloned an empty repository."
 msgstr "Bạn hình như là đã nhân bản một kho trống rỗng."
 
@@ -13211,14 +13481,14 @@ msgstr "chèn thêm khoảng trắng giữa các cột"
 msgid "--command must be the first argument"
 msgstr "--command phải là đối số đầu tiên"
 
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
 msgid ""
 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 "git commit-graph verify [--object-dir </thư/mục/đối/tượng>] [--shallow] [--"
 "[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13229,102 +13499,100 @@ msgstr ""
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <các tùy ch�n chia "
 "tách>"
 
-#: builtin/commit-graph.c:64
-#, 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�"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "tmục"
 
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr "thư mục đối tượng để lưu đồ thị"
 
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr ""
 "nếu đồ-thị-các-lần-chuyển-giao bị chia cắt, thì chỉ thẩm tra tập tin đỉnh"
 
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "Không thể mở đồ thị chuyển giao “%s�"
 
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "đối số --split không được thừa nhận, %s"
 
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr "nhận được ID đối tượng không phải dạng hex không cần: %s"
 
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "đối tượng không hợp lệ: %s"
 
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
 msgid "start walk at all refs"
 msgstr "bắt đầu di chuyển tại m�i tham chiếu"
 
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr ""
 "quét dó các mục lục gói được liệt kê bởi đầu vào tiêu chuẩn cho các lần "
 "chuyển giao"
 
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
 msgid "start walk at commits listed by stdin"
 msgstr ""
 "bắt đầu di chuyển tại các lần chuyển giao được liệt kê bởi đầu vào tiêu chuẩn"
 
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
 msgstr ""
 "bao gồm m�i lần chuyển giao đã sẵn có trongư�i tập tin đồ-thị-các-lần-chuyển-"
 "giao"
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
 msgid "enable computation for changed paths"
 msgstr "cho phép tính toán các đư�ng dẫn đã bị thay đổi"
 
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
 msgid "allow writing an incremental commit-graph file"
 msgstr "cho phép ghi một tập tin đồ h�a các lần chuyển giao lớn lên"
 
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr ""
 "số lượng tối đa của các lần chuyển giao trong một đồ-thị-các-lần-chuyển-giao "
 "chia cắt không-cơ-sở"
 
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "tỷ lệ tối đa giữa hai mức của một đồ-thị-các-lần-chuyển-giao chia cắt"
 
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
 msgid "only expire files older than a given date-time"
 msgstr "chỉ làm hết hạn các tập tin khi nó cũ hơn khoảng <th�i gian> đưa ra"
 
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr "số tối đa các bộ l�c các đư�ng dẫn thay đổi Bloom để tính toán"
 
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr ""
 "không thể sử dụng hơn một --reachable, --stdin-commits, hay --stdin-packs"
 
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
 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:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "không hiểu câu lệnh con: %s"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13338,70 +13606,65 @@ 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:136 builtin/log.c:559
+#: 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�"
 
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree: gặp lỗi khi mở “%s�"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree: gặp lỗi khi đ�c “%s�"
 
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree: gặp lỗi khi đóng “%s�"
 
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr "cha-mẹ"
 
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "mã số của đối tượng chuyển giao cha mẹ"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
-#: builtin/tag.c:456
+#: 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:115 builtin/commit.c:1614
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "chú thích của lần chuyển giao"
 
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
 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:121 builtin/commit.c:1631 builtin/merge.c:299
-#: 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 "Ký lần chuyển giao dùng GPG"
 
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "phải đưa ra chính xác một cây"
 
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree: gặp lỗi khi đ�c"
 
-#: builtin/commit.c:41
+#: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<các tùy ch�n>] [--] <pathspec>…"
 
-#: builtin/commit.c:46
+#: builtin/commit.c:47
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<các tùy ch�n>] [--] <pathspec>…"
 
-#: builtin/commit.c:51
+#: builtin/commit.c:52
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13414,7 +13677,7 @@ msgstr ""
 "hoặc là bạn gỡ b� các lần chuyển giao một cách hoàn toàn bằng lệnh:\n"
 "\"git reset HEAD^\".\n"
 
-#: builtin/commit.c:56
+#: builtin/commit.c:57
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -13429,15 +13692,15 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:63
+#: builtin/commit.c:64
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "Nếu không được thì dùng lệnh \"git rebase --skip\"\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:67
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Nếu không được thì dùng lệnh \"git cherry-pick --skip\"\n"
 
-#: builtin/commit.c:69
+#: builtin/commit.c:70
 msgid ""
 "and then use:\n"
 "\n"
@@ -13459,76 +13722,72 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:324
+#: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
 msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây"
 
-#: builtin/commit.c:360
-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:374
+#: 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ý."
 
-#: builtin/commit.c:386
+#: builtin/commit.c:387
 msgid "unable to create temporary index"
 msgstr "không thể tạo bảng mục lục tạm th�i"
 
-#: builtin/commit.c:395
+#: builtin/commit.c:396
 msgid "interactive add failed"
 msgstr "gặp lỗi khi thêm bằng cách tương"
 
-#: builtin/commit.c:410
+#: builtin/commit.c:411
 msgid "unable to update temporary index"
 msgstr "không thể cập nhật bảng mục lục tạm th�i"
 
-#: builtin/commit.c:412
+#: builtin/commit.c:413
 msgid "Failed to update main cache tree"
 msgstr "Gặp lỗi khi cập nhật cây bộ nhớ đệm"
 
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
 msgid "unable to write new_index file"
 msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 "không thể thực hiện việc chuyển giao cục bộ trong khi đang được hòa trộn."
 
-#: builtin/commit.c:491
+#: builtin/commit.c:492
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 "không thể thực hiện việc chuyển giao bộ phận trong khi đang cherry-pick."
 
-#: builtin/commit.c:493
+#: builtin/commit.c:494
 msgid "cannot do a partial commit during a rebase."
 msgstr ""
 "không thể thực hiện việc chuyển giao cục bộ trong khi đang thực hiện cải tổ."
 
-#: builtin/commit.c:501
+#: builtin/commit.c:502
 msgid "cannot read the index"
 msgstr "không đ�c được bảng mục lục"
 
-#: builtin/commit.c:520
+#: builtin/commit.c:521
 msgid "unable to write temporary index file"
 msgstr "không thể ghi tập tin lưu bảng mục lục tạm th�i"
 
-#: builtin/commit.c:618
+#: builtin/commit.c:619
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "lần chuyển giao “%s� thiếu phần tác giả ở đầu"
 
-#: builtin/commit.c:620
+#: builtin/commit.c:621
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "lần chuyển giao “%s� có phần tác giả ở đầu dị dạng"
 
-#: builtin/commit.c:639
+#: builtin/commit.c:640
 msgid "malformed --author parameter"
 msgstr "đối số cho --author bị dị hình"
 
-#: builtin/commit.c:692
+#: builtin/commit.c:693
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -13536,43 +13795,85 @@ msgstr ""
 "không thể ch�n một ký tự ghi chú cái mà không được dùng\n"
 "trong phần ghi chú hiện tại"
 
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "không thể tìm kiếm commit (lần chuyển giao) %s"
 
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(đang đ�c thông điệp nhật ký từ đầu vào tiêu chuẩn)\n"
 
-#: builtin/commit.c:760
+#: builtin/commit.c:761
 msgid "could not read log from standard input"
 msgstr "không thể đ�c nhật ký từ đầu vào tiêu chuẩn"
 
-#: builtin/commit.c:764
+#: builtin/commit.c:765
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "không đ�c được tệp nhật ký “%s�"
 
-#: builtin/commit.c:801
+#: 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:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
 msgstr "không thể đ�c SQUASH_MSG"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:821
 msgid "could not read MERGE_MSG"
 msgstr "không thể đ�c MERGE_MSG"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:881
 msgid "could not write commit template"
 msgstr "không thể ghi mẫu chuyển giao"
 
+#: builtin/commit.c:894
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr ""
+"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những\n"
+"dòng được bắt đầu bằng “%c� sẽ được b� qua.\n"
+
+#: builtin/commit.c:896
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những dòng "
+"được\n"
+"bắt đầu bằng “%c� sẽ được b� qua, nếu phần chú thích rỗng sẽ hủy b� lần "
+"chuyển giao.\n"
+
 #: builtin/commit.c:900
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những dòng "
+"được\n"
+"bắt đầu bằng “%c� sẽ được b� qua; bạn có thể xóa chúng đi nếu muốn thế.\n"
+
+#: builtin/commit.c:904
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những dòng "
+"được\n"
+"bắt đầu bằng “%c� sẽ được b� qua; bạn có thể xóa chúng đi nếu muốn thế.\n"
+"Phần chú thích này nếu trống rỗng sẽ hủy b� lần chuyển giao.\n"
+
+#: builtin/commit.c:916
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -13586,7 +13887,7 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "và thử lại.\n"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:921
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -13600,209 +13901,180 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "và thử lại.\n"
 
-#: builtin/commit.c:915
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những dòng "
-"được\n"
-"bắt đầu bằng “%c� sẽ được b� qua, nếu phần chú thích rỗng sẽ hủy b� lần "
-"chuyển giao.\n"
-
-#: builtin/commit.c:923
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những dòng "
-"được\n"
-"bắt đầu bằng “%c� sẽ được b� qua; bạn có thể xóa chúng đi nếu muốn thế.\n"
-"Phần chú thích này nếu trống rỗng sẽ hủy b� lần chuyển giao.\n"
-
-#: builtin/commit.c:940
+#: builtin/commit.c:948
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sTác giả:           %.*s <%.*s>"
 
-#: builtin/commit.c:948
+#: builtin/commit.c:956
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sNgày tháng:        %s"
 
-#: builtin/commit.c:955
+#: builtin/commit.c:963
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sNgư�i chuyển giao: %.*s <%.*s>"
 
-#: builtin/commit.c:973
+#: builtin/commit.c:981
 msgid "Cannot read index"
 msgstr "Không đ�c được bảng mục lục"
 
-#: builtin/commit.c:1018
+#: builtin/commit.c:1026
 msgid "unable to pass trailers to --trailers"
 msgstr "không thể chuyển phần đuôi cho “--trailers�"
 
-#: builtin/commit.c:1058
+#: builtin/commit.c:1066
 msgid "Error building trees"
 msgstr "Gặp lỗi khi xây dựng cây"
 
-#: builtin/commit.c:1072 builtin/tag.c:319
+#: 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"
 
-#: builtin/commit.c:1116
+#: builtin/commit.c:1124
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author “%s� không phải là “H� và tên <thư điện tửl>� và không khớp bất kỳ "
 "tác giả nào sẵn có"
 
-#: builtin/commit.c:1130
+#: builtin/commit.c:1138
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Chế độ b� qua không hợp lệ “%s�"
 
-#: builtin/commit.c:1148 builtin/commit.c:1441
+#: 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:1188
-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:1219
+#: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr ""
 "Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “reword�."
 
-#: builtin/commit.c:1221
+#: builtin/commit.c:1229
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr ""
 "Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc "
 "“reword�."
 
-#: builtin/commit.c:1224
+#: 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'"
-
-#: builtin/commit.c:1226
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
+msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr ""
-"tùy ch�n \"reword\" của --fixup là loại trừ qua lại với --patch/--"
-"interactive/--all/--include/--only"
+"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
+#, 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:1245
+#: 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:1254
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "Không có gì để mà “tu bổ� cả."
 
-#: builtin/commit.c:1257
+#: 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:1259
+#: 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:1261
+#: 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:1264
+#: 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:1274
+#: 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:1276
+#: 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:1285
+#: 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:1303
+#: 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:1331
+#: 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:1345
+#: 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:1476 builtin/commit.c:1642
+#: 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:1478 builtin/commit.c:1644
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "hiển thị thông tin nhánh"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "hiển thị thông tin v� tạm cất"
 
-#: builtin/commit.c:1482 builtin/commit.c:1646
+#: 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:1484
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "phiên bản"
 
-#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
-#: builtin/worktree.c:681
+#: 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:1487 builtin/commit.c:1650
+#: 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:1490 builtin/commit.c:1653
+#: 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:1492 builtin/commit.c:1496 builtin/commit.c:1656
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: 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:1493 builtin/commit.c:1656
+#: 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:1497
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -13810,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:1499 parse-options.h:193
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "khi"
 
-#: builtin/commit.c:1500
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -13822,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:1502
+#: 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:1503
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "không dò tìm các tên thay đổi"
 
-#: builtin/commit.c:1505
+#: 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:1525
+#: 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:1607
+#: 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:1608
+#: 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:1610
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "Các tùy ch�n ghi chú commit"
 
-#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
+#: 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:1612
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "tác giả"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "ghi đè tác giả cho commit"
 
-#: builtin/commit.c:1613 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "ngày tháng"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "ghi đè ngày tháng cho lần chuyển giao"
 
-#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
-#: parse-options.h:329 ref-filter.h:90
+#: 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:1615
+#: 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:1616
+#: 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:1621
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]commit"
 
-#: builtin/commit.c:1621
+#: 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:1622
+#: 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:1623
+#: 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:1624 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "bộ dò vết"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "thêm đuôi tự ch�n"
 
-#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: 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:1626
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "sử dụng tập tin mẫu đã cho"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "ép buộc sửa lần commit"
 
-#: builtin/commit.c:1629
+#: 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:1634
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "Các tùy nội dung ghi chú commit"
 
-#: builtin/commit.c:1635
+#: 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:1636
+#: 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:1637
+#: 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:1638
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "thêm các thay đổi bằng tương tác"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
 
-#: builtin/commit.c:1640
+#: 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:1641
+#: 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:1654
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "“tu bổ� (amend) lần commit trước"
 
-#: builtin/commit.c:1655
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "vòng qua móc (hook) post-rewrite"
 
-#: builtin/commit.c:1662
+#: 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:1664
+#: 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:1737
+#: 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:1744
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "không thể đ�c MERGE_MODE"
 
-#: builtin/commit.c:1765
+#: 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:1772
+#: 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:1777
+#: 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:1788
+#: 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:1824
+#: 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"
@@ -14276,7 +14548,7 @@ msgstr "--worktree chỉ có thể được dùng bên trong một kho git"
 
 #: builtin/config.c:684
 msgid "$HOME not set"
-msgstr "Chưa đặt biến môi trư�ng HOME"
+msgstr "Chưa đặt biến môi trư�ng $HOME"
 
 #: builtin/config.c:708
 msgid ""
@@ -14381,7 +14653,7 @@ msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn"
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr "credential-cache--daemon không sẵn có; không hỗ trợ unix socket"
 
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "credential-cache không sẵn có; không hỗ trợ unix socket"
 
@@ -14522,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"
 
@@ -14538,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"
@@ -14577,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:684
+#: 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"
@@ -14607,113 +14868,103 @@ 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:261
-#, c-format
-msgid "failed: %d"
-msgstr "gặp lỗi: %d"
-
-#: builtin/difftool.c:303
+#: 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:305
+#: 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:313
+#: 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:413
+#: builtin/difftool.c:421
 msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
 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:637
+#: 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:639
+#: 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:650
+#: 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:651
+#: 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:700
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "gặp lỗi: %d"
+
+#: 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:702
+#: 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:704
+#: 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:709
+#: 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:710
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "công cụ"
 
-#: builtin/difftool.c:711
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "dùng công cụ diff đã cho"
 
-#: builtin/difftool.c:713
+#: 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:716
+#: builtin/difftool.c:706
 msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"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ông phải số "
-"không"
+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:719
+#: 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:720
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "chuyển cho “diff�"
 
-#: builtin/difftool.c:735
+#: 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:742
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff xung khắc với --no-index"
-
-#: builtin/difftool.c:745
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool và --extcmd loại từ lẫn nhau"
-
-#: builtin/difftool.c:753
+#: 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:760
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>"
 
@@ -14721,7 +14972,7 @@ msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>"
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <các tùy ch�n> <env-var>"
 
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
 msgid "type"
 msgstr "kiểu"
 
@@ -14752,126 +15003,118 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:868
+#: 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:1177
+#: 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:1197
+#: 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:1199
+#: 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:1202
+#: 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:1205
+#: 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:1208
+#: 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:1210
+#: 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:1214
+#: 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:1216
+#: 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:1218
+#: 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:1220
+#: 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:1221
+#: 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:1222 builtin/log.c:1823
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "refspec"
 
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "áp dụng refspec cho refs đã xuất"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "kết xuất anonymize"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "từ:đến"
 
-#: builtin/fast-export.c:1226
+#: 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:1229
+#: 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:1231
+#: 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:1233
+#: 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:1256
-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:1271
-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 ""
@@ -14882,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:185
+#: 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:245
+#: 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:188
+#: 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:191
+#: 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:195
+#: 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:198
+#: 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:122
+#: 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:206
+#: 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: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 "làm sâu hơn lịch sử của bản sao"
 
-#: 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 "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:221
+#: 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)"
@@ -15002,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:224
+#: 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:226
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "refmap"
 
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: 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:240
+#: 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:243
+#: 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:757
+#: 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:856
+#: 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:860
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[đã cập nhật]"
 
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[Bị từ chối]"
 
-#: builtin/fetch.c:874
+#: 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:884
+#: 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:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: 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:889
+#: 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:911
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[thẻ mới]"
 
-#: builtin/fetch.c:914
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[nhánh mới]"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[ref (tham chiếu) mới]"
 
-#: builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "cưỡng bức cập nhật"
 
-#: builtin/fetch.c:961
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "không-phải-chuyển-tiếp-nhanh"
 
-#: builtin/fetch.c:1065
+#: 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:1069
+#: 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:1101
+#: 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:1129
+#: builtin/fetch.c:1141
 #, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
+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:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "Từ %.*s\n"
 
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15146,134 +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:1327
+#: 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:1328
+#: 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:1360
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[đã xóa]"
 
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(không)"
 
-#: builtin/fetch.c:1384
+#: 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:1403
+#: 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:1406
+#: 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:1618
+#: 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: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:1633
+#: 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:1635
+#: 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:1637
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "không hiểu kiểu nhánh"
 
-#: builtin/fetch.c:1639
+#: 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:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "�ang lấy “%s� v�\n"
 
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 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:1790
+#: 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:1894
+#: 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�)."
-
-#: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "Bạn phải định rõ tên thẻ."
+"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:1995
-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:1966
+msgid "you need to specify a tag name"
+msgstr "bạn cần chỉ định một tên thẻ"
 
-#: builtin/fetch.c:1997
-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: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:2002
-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: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:2004
+#: 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:2021
+#: 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:2023
+#: 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:2032
+#: 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:2039
-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:2055
+#: 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:2060
-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:2079
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15281,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:2083
+#: 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:2087
+#: 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ủ"
 
@@ -15296,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ừ đó"
 
@@ -15336,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:483
+#: 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"
 
@@ -15384,19 +15643,19 @@ msgstr "chỉ hiển thị những tham chiếu mà nó không chứa lần chuy
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<config> <command-args>"
 
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "config"
 
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "khóa cấu hình lưu trữ danh sách đư�ng dẫn kho lưu trữ"
 
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "thiếu --config=<config>"
 
-#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "không hiểu"
 
@@ -15412,16 +15671,16 @@ msgstr "lá»—i trong %s %s: %s"
 msgid "warning in %s %s: %s"
 msgstr "có cảnh báo trong %s %s: %s"
 
-#: builtin/fsck.c:123 builtin/fsck.c:126
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "liên kết gãy từ %7s %s"
 
-#: builtin/fsck.c:135
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "kiểu đối tượng sai trong liên kết"
 
-#: builtin/fsck.c:151
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -15430,211 +15689,221 @@ msgstr ""
 "liên kết gãy từ %7s %s \n"
 "              tá»›i %7s %s"
 
-#: builtin/fsck.c:263
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "thiếu %s %s"
 
-#: builtin/fsck.c:290
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "không tiếp cận được %s %s"
 
-#: builtin/fsck.c:310
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "dangling %s %s"
 
-#: builtin/fsck.c:320
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "không thể tạo lost-found"
 
-#: builtin/fsck.c:331
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "không thể hoàn thành “%s�"
 
-#: builtin/fsck.c:348
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "�ang kiểm tra %s"
 
-#: builtin/fsck.c:386
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "�ang kiểm tra kết nối (%d đối tượng)"
 
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "�ang kiểm tra %s %s"
 
-#: builtin/fsck.c:410
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "các liên kết bị gẫy"
 
-#: builtin/fsck.c:419
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "gốc %s"
 
-#: builtin/fsck.c:427
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "đã đánh thẻ %s %s (%s) trong %s"
 
-#: builtin/fsck.c:456
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: đối tượng thiếu hay h�ng"
 
-#: builtin/fsck.c:481
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: mục reflog không hợp lệ %s"
 
-#: builtin/fsck.c:495
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "�ang kiểm tra việc đổi tên của “%s� thành “%s�"
 
-#: builtin/fsck.c:529
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: con tr� sha1 không hợp lệ %s"
 
-#: builtin/fsck.c:536
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: không phải là một lần chuyển giao"
 
-#: builtin/fsck.c:590
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "cảnh báo: Không có các tham chiếu mặc định"
 
-#: builtin/fsck.c:605
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s: đư�ng dẫn mã băm không khớp, tìm thấy tại: %s"
+
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: thiếu đối tượng hoặc h�ng: %s"
 
-#: builtin/fsck.c:618
+#: builtin/fsck.c:628
+#, c-format
+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: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:638
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "tập tin sha1 sai: %s"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "�ang kiểm tra thư mục đối tượng"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "�ang kiểm tra các thư mục đối tượng"
 
-#: builtin/fsck.c:671
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "�ang lấy liên kết %s"
 
-#: builtin/fsck.c:676 builtin/index-pack.c:866
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "%s không hợp lệ"
 
-#: builtin/fsck.c:683
+#: 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:689
+#: 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:693
+#: 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:705
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "�ang kiểm tra cây nhớ tạm"
 
-#: builtin/fsck.c:710
+#: 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:719
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "non-tree trong cache-tree"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<các tùy ch�n>] [<đối-tượng>…]"
 
-#: builtin/fsck.c:756
+#: 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:757
+#: 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:758
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "báo cáo các thẻ"
 
-#: builtin/fsck.c:759
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "báo cáo node gốc"
 
-#: builtin/fsck.c:760
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "tạo “index objects head nodes�"
 
-#: builtin/fsck.c:761
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "tạo “reflogs head nodes� (mặc định)"
 
-#: builtin/fsck.c:762
+#: 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:763
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "chỉ kiểm tra kết nối"
 
-#: builtin/fsck.c:764 builtin/mktag.c:75
+#: 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:766
+#: 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:767 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:768
+#: 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:827 builtin/index-pack.c:262
+#: 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:855
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: thiếu đối tượng"
 
-#: builtin/fsck.c:866
+#: 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�"
@@ -15653,21 +15922,16 @@ 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:240 builtin/tag.c:573
-#, 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"
-"and remove %s.\n"
+"and remove %s\n"
 "Automatic cleanup will not be performed until the file is removed.\n"
 "\n"
 "%s"
@@ -15678,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)"
@@ -15733,33 +15997,33 @@ 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:869
+#: 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:905
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "gặp lỗi khi tải trước các máy chủ"
 
@@ -15771,132 +16035,172 @@ msgstr "gặp lỗi khi lấy thông tin thống kê v� tiến trình “git p
 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:1091
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "gặp lỗi khi ghi multi-pack-index"
 
-#: builtin/gc.c:1109
+#: 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:1170
+#: 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:1179
+#: 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:1283
+#: 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:1313
+#: 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:1395
+#: 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:1400
+#: 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:1415
+#: 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:1416
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "tần số"
 
-#: builtin/gc.c:1417
+#: 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:1420
+#: 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:1421
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "tác vụ"
 
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "chạy một nhiệm vụ cụ thể"
 
-#: builtin/gc.c:1439
+#: 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:1482
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "gặp lỗi khi chạy “git config�"
 
-#: builtin/gc.c:1547
+#: 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:1576
+#: 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:1613
+#: 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:1674
+#: 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:1745
+#: 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:1835
+#: 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:1879
+#: 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:1896
+#: 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:1900
+#: 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:1942
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "“crontab� đã chết"
 
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "gặp lỗi khi khởi chạy systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "gặp lỗi khi chạy systemctl"
+
+#: 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:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "đối số --scheduler không được thừa nhận “%s�"
+
+#: 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:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "bộ lên lịch %s không sẵn có"
+
+#: 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:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<bộ lên lịch>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "bộ lên lịch"
+
+#: 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: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:2010
+#: 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:2029
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "lện con không hợp lệ: %s"
@@ -15905,12 +16209,12 @@ msgstr "lện con không hợp lệ: %s"
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<các tùy ch�n>] [-e] <mẫu> [<rev>…] [[--] </đư�ng/dẫn>…]"
 
-#: builtin/grep.c:223
+#: builtin/grep.c:239
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: gặp lỗi tạo tuyến (thread): %s"
 
-#: builtin/grep.c:277
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
@@ -15919,263 +16223,263 @@ msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
-#: builtin/pack-objects.c:2969
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "không hỗ trợ đa tuyến, b� qua %s"
 
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "không thể đ�c cây (%s)"
 
-#: builtin/grep.c:658
+#: builtin/grep.c:672
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "không thể thực hiện lệnh grep (l�c tìm) từ đối tượng thuộc kiểu %s"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:752
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "chuyển đến “%c� cần một giá trị bằng số"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:851
 msgid "search in index instead of in the work tree"
 msgstr "tìm trong bảng mục lục thay vì trong cây làm việc"
 
-#: builtin/grep.c:840
+#: builtin/grep.c:853
 msgid "find in contents not managed by git"
 msgstr "tìm trong nội dung không được quản lý bởi git"
 
-#: builtin/grep.c:842
+#: builtin/grep.c:855
 msgid "search in both tracked and untracked files"
 msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết"
 
-#: builtin/grep.c:844
+#: builtin/grep.c:857
 msgid "ignore files specified via '.gitignore'"
 msgstr "các tập tin bị b� qua được chỉ định thông qua “.gitignore�"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:859
 msgid "recursively search in each submodule"
 msgstr "tìm kiếm đệ quy trong từng mô-đun-con"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:862
 msgid "show non-matching lines"
 msgstr "hiển thị những dòng không khớp với mẫu"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:864
 msgid "case insensitive matching"
 msgstr "phân biệt HOA/thư�ng"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:866
 msgid "match patterns only at word boundaries"
 msgstr "chỉ khớp mẫu tại đư�ng ranh giới từ"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:868
 msgid "process binary files as text"
 msgstr "xử lý tập tin nhị phân như là dạng văn bản thư�ng"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:870
 msgid "don't match patterns in binary files"
 msgstr "không khớp mẫu trong các tập tin nhị phân"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:873
 msgid "process binary files with textconv filters"
 msgstr "xử lý tập tin nhị phân với các bộ l�c “textconv�"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:875
 msgid "search in subdirectories (default)"
 msgstr "tìm kiếm trong thư mục con (mặc định)"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:877
 msgid "descend at most <depth> levels"
 msgstr "hạ xuống ít nhất là mức <sâu>"
 
-#: builtin/grep.c:868
+#: builtin/grep.c:881
 msgid "use extended POSIX regular expressions"
 msgstr "dùng biểu thức chính qui POSIX có mở rộng"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:884
 msgid "use basic POSIX regular expressions (default)"
 msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:887
 msgid "interpret patterns as fixed strings"
 msgstr "diễn dịch các mẫu như là chuỗi cố định"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:890
 msgid "use Perl-compatible regular expressions"
 msgstr "sử dụng biểu thức chính quy tương thích Perl"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:893
 msgid "show line numbers"
 msgstr "hiển thị số của dòng"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:894
 msgid "show column number of first match"
 msgstr "hiển thị số cột của khớp với mẫu đầu tiên"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:895
 msgid "don't show filenames"
 msgstr "không hiển thị tên tập tin"
 
-#: builtin/grep.c:883
+#: builtin/grep.c:896
 msgid "show filenames"
 msgstr "hiển thị các tên tập tin"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:898
 msgid "show filenames relative to top directory"
 msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:900
 msgid "show only filenames instead of matching lines"
 msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:902
 msgid "synonym for --files-with-matches"
 msgstr "đồng nghĩa với --files-with-matches"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:905
 msgid "show only the names of files without match"
 msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu"
 
-#: builtin/grep.c:894
+#: builtin/grep.c:907
 msgid "print NUL after filenames"
 msgstr "thêm NUL vào sau tên tập tin"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:910
 msgid "show only matching parts of a line"
 msgstr "chỉ hiển thị những phần khớp với mẫu của một dòng"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:912
 msgid "show the number of matches instead of matching lines"
 msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:913
 msgid "highlight matches"
 msgstr "tô sáng phần khớp mẫu"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:915
 msgid "print empty line between matches from different files"
 msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:917
 msgid "show filename only once above matches from same file"
 msgstr ""
 "hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin"
 
-#: builtin/grep.c:907
+#: builtin/grep.c:920
 msgid "show <n> context lines before and after matches"
 msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp"
 
-#: builtin/grep.c:910
+#: builtin/grep.c:923
 msgid "show <n> context lines before matches"
 msgstr "hiển thị <n> dòng nội dung trước khớp"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:925
 msgid "show <n> context lines after matches"
 msgstr "hiển thị <n> dòng nội dung sau khớp"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:927
 msgid "use <n> worker threads"
 msgstr "dùng <n> tuyến trình làm việc"
 
-#: builtin/grep.c:915
+#: builtin/grep.c:928
 msgid "shortcut for -C NUM"
 msgstr "dạng viết tắt của -C S�"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:931
 msgid "show a line with the function name before matches"
 msgstr "hiển thị dòng vói tên hàm trước các lần khớp"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:933
 msgid "show the surrounding function"
 msgstr "hiển thị hàm bao quanh"
 
-#: builtin/grep.c:923
+#: builtin/grep.c:936
 msgid "read patterns from file"
 msgstr "đ�c mẫu từ tập-tin"
 
-#: builtin/grep.c:925
+#: builtin/grep.c:938
 msgid "match <pattern>"
 msgstr "match <mẫu>"
 
-#: builtin/grep.c:927
+#: builtin/grep.c:940
 msgid "combine patterns specified with -e"
 msgstr "tổ hợp mẫu được chỉ ra với tùy ch�n -e"
 
-#: builtin/grep.c:939
+#: builtin/grep.c:952
 msgid "indicate hit with exit status without output"
 msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất"
 
-#: builtin/grep.c:941
+#: builtin/grep.c:954
 msgid "show only matches from files that match all patterns"
 msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "pager"
 msgstr "dàn trang"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "show matching files in the pager"
 msgstr "hiển thị các tập tin khớp trong trang giấy"
 
-#: builtin/grep.c:948
+#: builtin/grep.c:961
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "cho phép g�i grep(1) (bị b� qua bởi lần dịch này)"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1027
 msgid "no pattern given"
 msgstr "chưa chỉ ra mẫu"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:1063
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index hay --untracked không được sử dụng cùng với revs"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:1071
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "không thể phân giải điểm xét duyệt: %s"
 
-#: builtin/grep.c:1088
+#: builtin/grep.c:1101
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "tùy ch�n --untracked không được hỗ trợ với --recurse-submodules"
 
-#: builtin/grep.c:1092
+#: builtin/grep.c:1105
 msgid "invalid option combination, ignoring --threads"
 msgstr "tổ hợp tùy ch�n không hợp lệ, b� qua --threads"
 
-#: builtin/grep.c:1095 builtin/pack-objects.c:3930
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
 msgid "no threads support, ignoring --threads"
 msgstr "không hỗ trợ đa tuyến, b� qua --threads"
 
-#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "số tuyến chỉ ra không hợp lệ (%d)"
 
-#: builtin/grep.c:1132
+#: builtin/grep.c:1145
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc"
 
-#: builtin/grep.c:1158
+#: builtin/grep.c:1171
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached hay --untracked không được sử dụng với --no-index"
 
-#: builtin/grep.c:1161
+#: builtin/grep.c:1174
 msgid "--untracked cannot be used with --cached"
 msgstr "--untracked không thể được sử dụng với tùy ch�n --cached"
 
-#: builtin/grep.c:1167
+#: builtin/grep.c:1180
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết"
 
-#: builtin/grep.c:1175
+#: builtin/grep.c:1188
 msgid "both --cached and trees are given"
 msgstr "cả hai --cached và các cây phải được chỉ ra"
 
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -16183,95 +16487,107 @@ msgstr ""
 "git hash-object [-t <kiểu>] [-w] [--path=<tập-tin> | --no-filters] [--stdin] "
 "[--] <tập-tin>…"
 
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "kiểu đối tượng"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "ghi đối tượng vào dữ liệu đối tượng"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "đ�c đối tượng từ đầu vào tiêu chuẩn stdin"
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "lưu các tập tin mà nó không có các bộ l�c"
 
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr "chỉ cần băm rác ngẫu nhiên để tạo một đối tượng h�ng để mà gỡ lỗi Git"
 
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "xử lý tập tin như là nó đang ở thư mục này"
 
-#: builtin/help.c:47
+#: builtin/help.c:55
 msgid "print all available commands"
 msgstr "hiển thị danh sách các câu lệnh ngư�i dùng có thể sử dụng"
 
-#: builtin/help.c:48
+#: builtin/help.c:57
 msgid "exclude guides"
 msgstr "hướng dẫn loại trừ"
 
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "hiển thị danh sách các hướng dẫn hữu dụng"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "in ra tất cả các tên biến cấu hình"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
 msgid "show man page"
 msgstr "hiển thị trang man"
 
-#: builtin/help.c:53
+#: builtin/help.c:59
 msgid "show manual in web browser"
 msgstr "hiển thị hướng dẫn sử dụng trong trình duyệt web"
 
-#: builtin/help.c:55
+#: builtin/help.c:61
 msgid "show info page"
-msgstr "hiện trang info"
+msgstr "hiển thị trang info"
 
-#: builtin/help.c:57
+#: builtin/help.c:63
 msgid "print command description"
 msgstr "hiển thị mô tả lệnh"
 
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<lệnh>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "hiển thị danh sách các hướng dẫn hữu dụng"
+
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "in ra tất cả các tên biến cấu hình"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<lệnh>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
 
-#: builtin/help.c:163
+#: builtin/help.c:196
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "không nhận ra định dạng trợ giúp “%s�"
 
-#: builtin/help.c:190
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "Gặp lỗi khi khởi chạy emacsclient."
 
-#: builtin/help.c:203
+#: 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:211
+#: 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:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: 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:307
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16280,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:319
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16289,325 +16605,308 @@ 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:436
+#: 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:453
+#: 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:461
+#: 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:520 builtin/help.c:531 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:534 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:563 builtin/help.c:593
+#: 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:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "cách dùng: %s%s"
 
-#: builtin/help.c:577
+#: 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"
 
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "kiểu đối tượng không khớp tại %s"
 
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "không thể lấy v� đối tượng cần %s"
 
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "đối tượng %s: cần kiểu %s nhưng lại nhận được %s"
 
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "không thể đi�n thêm vào %d byte"
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr "gặp kết thúc tập tin EOF quá sớm"
 
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "lỗi đ�c ở đầu vào"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "sử dụng nhi�u hơn số lượng byte mà nó sẵn có"
 
-#: builtin/index-pack.c:325 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr "gói quá lớn so với định nghĩa hiện tại của kiểu off_t"
 
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "gói đã vượt quá cỡ tối đa được phép"
 
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "không thể tạo “%s�"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "không thể mở packfile “%s�"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
 msgid "pack signature mismatch"
 msgstr "chữ ký cho gói không khớp"
 
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "không hỗ trợ phiên bản gói %<PRIu32>"
 
-#: builtin/index-pack.c:383
+#: builtin/index-pack.c:376
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "gói có đối tượng sai tại khoảng bù %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:489
+#: builtin/index-pack.c:482
 #, c-format
 msgid "inflate returned %d"
 msgstr "xả nén trả v� %d"
 
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:531
 msgid "offset value overflow for delta base object"
 msgstr "tràn giá trị khoảng bù cho đối tượng delta cơ sở"
 
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:539
 msgid "delta base offset is out of bound"
 msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm vi"
 
-#: builtin/index-pack.c:554
+#: builtin/index-pack.c:547
 #, c-format
 msgid "unknown object type %d"
 msgstr "không hiểu kiểu đối tượng %d"
 
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:578
 msgid "cannot pread pack file"
 msgstr "không thể chạy hàm pread cho tập tin gói"
 
-#: builtin/index-pack.c:587
+#: builtin/index-pack.c:580
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "tập tin gói bị kết thúc sớm, thiếu %<PRIuMAX> byte"
 
-#: builtin/index-pack.c:613
+#: builtin/index-pack.c:606
 msgid "serious inflate inconsistency"
 msgstr "sự mâu thuẫn xả nén nghiêm tr�ng"
 
-#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788
-#: builtin/index-pack.c:827 builtin/index-pack.c:836
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "SỰ VA CHẠM SHA1 �à XẢY RA VỚI %s!"
 
-#: builtin/index-pack.c:761 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
 #, c-format
 msgid "unable to read %s"
 msgstr "không thể đ�c %s"
 
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:818
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "không thể đ�c thông tin đối tượng sẵn có %s"
 
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:826
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "không thể đ�c đối tượng đã tồn tại %s"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:840
 #, c-format
 msgid "invalid blob object %s"
 msgstr "đối tượng blob không hợp lệ %s"
 
-#: builtin/index-pack.c:850 builtin/index-pack.c:869
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
 msgid "fsck error in packed object"
 msgstr "lỗi fsck trong đối tượng đóng gói"
 
-#: builtin/index-pack.c:871
+#: builtin/index-pack.c:864
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được"
 
-#: builtin/index-pack.c:932 builtin/index-pack.c:979
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
 msgstr "gặp lỗi khi áp dụng delta"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Receiving objects"
 msgstr "�ang nhận v� các đối tượng"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Indexing objects"
 msgstr "Các đối tượng bảng mục lục"
 
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1190
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "gói bị sai h�ng (SHA1 không khớp)"
 
-#: builtin/index-pack.c:1201
+#: builtin/index-pack.c:1195
 msgid "cannot fstat packfile"
 msgstr "không thể lấy thông tin thống kê packfile"
 
-#: builtin/index-pack.c:1204
+#: builtin/index-pack.c:1198
 msgid "pack has junk at the end"
 msgstr "pack có phần thừa ở cuối"
 
-#: builtin/index-pack.c:1216
+#: builtin/index-pack.c:1210
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()"
 
-#: builtin/index-pack.c:1239
+#: builtin/index-pack.c:1233
 msgid "Resolving deltas"
 msgstr "�ang phân giải các delta"
 
-#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "không thể tạo tuyến: %s"
 
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1277
 msgid "confusion beyond insanity"
 msgstr "lộn xộn hơn cả điên rồ"
 
-#: builtin/index-pack.c:1289
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "đầy đủ với %d đối tượng nội bộ"
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Gặp tổng kiểm tra tail không cần cho %s (đĩa h�ng?)"
 
-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "gói có %d delta chưa được giải quyết"
 
-#: builtin/index-pack.c:1329
+#: builtin/index-pack.c:1323
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "không thể xả nén đối tượng nối thêm (%d)"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1419
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "đối tượng nội bộ %s bị h�ng"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1440
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "tên tập tin tập tin gói “%s� không được kết thúc “.%s�"
 
-#: builtin/index-pack.c:1470
+#: builtin/index-pack.c:1464
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "không thể ghi %s tập tin “%s�"
 
-#: builtin/index-pack.c:1478
+#: builtin/index-pack.c:1472
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "không thể đóng tập tin được ghi %s “%s�"
 
-#: builtin/index-pack.c:1504
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "không thể đổi tên tập tin tạm th�i “*.%s� thành “%s�"
+
+#: builtin/index-pack.c:1514
 msgid "error while closing pack file"
 msgstr "gặp lỗi trong khi đóng tập tin gói"
 
-#: builtin/index-pack.c:1518
-msgid "cannot store pack file"
-msgstr "không thể lưu tập tin gói"
-
-#: builtin/index-pack.c:1526
-msgid "cannot store index file"
-msgstr "không thể lưu trữ tập tin ghi mục lục"
-
-#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "sai pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1643
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Không thể mở tập tin gói đã sẵn có “%s�"
 
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1645
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Không thể mở tập tin idx của gói cho “%s�"
 
-#: builtin/index-pack.c:1701
+#: builtin/index-pack.c:1693
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "không delta: %d đối tượng"
 
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1700
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "chi�u dài xích = %d: %lu đối tượng"
 
-#: builtin/index-pack.c:1750
+#: builtin/index-pack.c:1742
 msgid "Cannot come back to cwd"
 msgstr "Không thể quay lại cwd"
 
-#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
-#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
 #, c-format
 msgid "bad %s"
 msgstr "%s sai"
 
-#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "không hiểu thuật toán băm dữ liệu “%s�"
 
-#: builtin/index-pack.c:1852
-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:1854
+#: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin cần một kho git"
 
-#: builtin/index-pack.c:1856
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format không thể được dùng với --stdin"
-
-#: builtin/index-pack.c:1871
+#: 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"
 
-#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "lỗi fsck trong các đối tượng gói"
 
@@ -16651,56 +16950,56 @@ msgstr "các mẫu không được tìm thấy trong %s"
 msgid "not copying templates from '%s': %s"
 msgstr "không sao chép các mẫu từ “%s�: %s"
 
-#: builtin/init-db.c:262
+#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "tên nhánh khởi tạo không hợp lệ: “%s�"
 
-#: builtin/init-db.c:353
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "không thể xử lý (handle) tập tin kiểu %d"
 
-#: builtin/init-db.c:356
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "không di chuyển được %s vào %s"
 
-#: builtin/init-db.c:372
+#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr "cố để khởi tạo lại một kho với kiểu băm dữ liệu khác"
 
-#: builtin/init-db.c:396 builtin/init-db.c:399
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s đã có từ trước rồi"
 
-#: builtin/init-db.c:431
+#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: --initial-branch=%s bị b� qua"
 
-#: builtin/init-db.c:462
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "�ã khởi tạo lại kho Git chia sẻ sẵn có trong %s%s\n"
 
-#: builtin/init-db.c:463
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "�ã khởi tạo lại kho Git sẵn có trong %s%s\n"
 
-#: builtin/init-db.c:467
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "�ã khởi tạo lại kho Git chia sẻ trống rỗng sẵn có trong %s%s\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "�ã khởi tạo lại kho Git trống rỗng sẵn có trong %s%s\n"
 
-#: builtin/init-db.c:517
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -16708,41 +17007,37 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-"
 "quy�n>]] [thư-mục]"
 
-#: builtin/init-db.c:543
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "các quy�n"
 
-#: builtin/init-db.c:544
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "chỉ ra cái mà kho git được chia sẻ giữa nhi�u ngư�i dùng"
 
-#: builtin/init-db.c:550
+#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "ghi đè lên tên của nhánh khởi tạo"
 
-#: builtin/init-db.c:551 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "băm"
 
-#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 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:559
-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:590 builtin/init-db.c:595
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "không thể mkdir (tạo thư mục): %s"
 
-#: builtin/init-db.c:599 builtin/init-db.c:654
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "không thể chdir (chuyển đổi thư mục) sang %s"
 
-#: builtin/init-db.c:626
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -16751,12 +17046,12 @@ msgstr ""
 "%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-"
 "dir=<thư-mục>)"
 
-#: builtin/init-db.c:678
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Không thể truy cập cây (tree) làm việc “%s�"
 
-#: builtin/init-db.c:683
+#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir xung khắc với kho thuần"
 
@@ -16831,7 +17126,7 @@ msgstr "git show [<các tùy ch�n>] <đối-tượng>…"
 #: builtin/log.c:113
 #, c-format
 msgid "invalid --decorate option: %s"
-msgstr "tùy ch�n--decorate không hợp lệ: %s"
+msgstr "tùy ch�n --decorate không hợp lệ: %s"
 
 #: builtin/log.c:180
 msgid "show source"
@@ -16865,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:303
+#: 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:568
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: sai tập tin"
 
-#: builtin/log.c:583 builtin/log.c:673
+#: 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:698
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "không nhận ra kiểu: %d"
 
-#: builtin/log.c:843
+#: 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:850
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers không có giá trị cụ thể"
 
-#: builtin/log.c:979
+#: 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:996
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "cần chính xác một vùng"
 
-#: builtin/log.c:1006
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "không phải là một vùng"
 
-#: builtin/log.c:1170
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "“cover letter� cần cho định dạng thư"
 
-#: builtin/log.c:1176
+#: 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:1263
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to điên rồ: %s"
 
-#: builtin/log.c:1290
+#: 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:1348
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "hai thư mục kết xuất?"
 
-#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#: 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:1510 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:1519
+#: 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:1529
+#: 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"
@@ -16954,293 +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:1552
+#: 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:1569
+#: 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:1579
+#: 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:1637
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "không thể lấy mã miếng vá"
 
-#: builtin/log.c:1700
+#: 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:1702
+#: 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:1746
+#: 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:1749
+#: 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:1753
+#: 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:1755
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "tạo bì thư"
 
-#: builtin/log.c:1757
+#: 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:1758
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1759
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "sử dụng <sfx> thay cho “.patch�"
 
-#: builtin/log.c:1761
+#: 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:1762
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "đếm reroll"
 
-#: builtin/log.c:1763
+#: 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:1765
+#: 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:1767
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "dùng [V� RFC] thay cho [V�]"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "cover-from-description-mode"
 
-#: builtin/log.c:1771
+#: 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:1773
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "dùng [<ti�n-tố>] thay cho [V�]"
 
-#: builtin/log.c:1776
+#: 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:1779
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "không strip/add [V�]"
 
-#: builtin/log.c:1782
+#: 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:1784
+#: 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:1786
+#: 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:1788
+#: 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:1790
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "L�i nhắn"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1809
 msgid "header"
 msgstr "đầu đ� thư"
 
-#: builtin/log.c:1792
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "thêm đầu đ� thư"
 
-#: builtin/log.c:1793 builtin/log.c:1794
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "thư điện tử"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "thêm To: đầu đ� thư"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "thêm Cc: đầu đ� thư"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "thụt l�"
 
-#: builtin/log.c:1796
+#: 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:1798
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1799
+#: 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:1800 builtin/log.c:1803
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "ranh giá»›i"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "đính kèm miếng vá"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "dùng miếng vá làm nội dung"
 
-#: builtin/log.c:1808
+#: 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:1810
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "chữ ký"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "thêm chữ ký"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "lần_chuyển_giao_n�n"
 
-#: builtin/log.c:1813
+#: 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:1816
+#: 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:1817
+#: 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:1819
+#: 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:1821
+#: 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:1824
+#: 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:1826 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:1913
+#: 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:1928
-msgid "-n and -k are mutually exclusive"
-msgstr "-n và -k loại trừ lẫn nhau"
-
-#: builtin/log.c:1930
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc và -k xung khắc nhau"
-
-#: builtin/log.c:1938
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only không hợp lý"
 
-#: builtin/log.c:1940
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status không hợp lý"
 
-#: builtin/log.c:1942
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check không hợp lý"
 
-#: builtin/log.c:1964
-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:2087
+#: 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:2091
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2092
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff dựa trên v%d:"
 
-#: builtin/log.c:2098
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor yêu cầu --range-diff"
-
-#: builtin/log.c:2102
+#: 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:2110
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:2111
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff dựa trên v%d:"
 
-#: builtin/log.c:2122
+#: 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:2158
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "�ang tạo các miếng vá"
 
-#: builtin/log.c:2202
+#: 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:2261
+#: 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:2315
+#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17248,132 +17527,140 @@ 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:563
+#: 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:619
+#: 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: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:621
+#: 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:623
+#: 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:625
+#: 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:627
+#: 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:629
+#: 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:631
+#: 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:633
+#: 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:636
+#: 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:638
+#: 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:640
+#: 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:642
+#: 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:644
+#: 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:647
+#: 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:649
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "hiển thị thông tin resolve-undo"
 
-#: builtin/ls-files.c:651
+#: 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:654
-msgid "exclude patterns are read from <file>"
-msgstr "mẫu loại trừ được đ�c từ <tập tin>"
+#: 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:657
+#: 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:659
+#: 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:663
+#: 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:666
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "đệ quy xuyên qua mô-đun con"
 
-#: builtin/ls-files.c:668
+#: 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:669
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "tree-ish"
 
-#: builtin/ls-files.c:670
+#: 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:672
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "hiển thị dữ liệu gỡ lỗi"
 
-#: builtin/ls-files.c:674
+#: 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"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<repository> [<refs>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repository> [<refs>...]]"
 msgstr ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<kho> [<các tham chiếu>…]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<kho> [<các tham chiếu>…]]"
 
 #: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "không hiển thị URL máy chủ"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
 msgid "exec"
 msgstr "thá»±c thi"
 
@@ -17490,7 +17777,7 @@ msgstr "hành động khi CR được trích dẫn được tìm thấy"
 msgid "use headers in message's body"
 msgstr "sử dụng phần đầu trong nội dung thư"
 
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "mbox trống rỗng: “%s�"
@@ -17552,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"
 
@@ -17605,193 +17896,189 @@ msgstr "không thể phân giải tham chiếu %s"
 msgid "Merging %s with %s\n"
 msgstr "�ang hòa trộn %s với %s\n"
 
-#: builtin/merge.c:58
+#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<các tùy ch�n>] [<commit>…]"
 
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "switch “m� yêu cầu một giá trị"
 
-#: builtin/merge.c:146
+#: 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:199
+#: 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:200
+#: 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:205
+#: 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:256 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 "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:259 builtin/pull.c:136
+#: 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:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(đồng nghĩa với --stat)"
 
-#: builtin/merge.c:262 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 "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn"
 
-#: builtin/merge.c:265 builtin/pull.c:148
+#: 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:267 builtin/pull.c:151
+#: 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:269 builtin/pull.c:154
+#: 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:271
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
 
-#: builtin/merge.c:273 builtin/pull.c:161
+#: 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:277 builtin/pull.c:164
+#: 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:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: 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:279 builtin/pull.c:169
+#: 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:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "tùy_ch�n=giá_trị"
 
-#: builtin/merge.c:281 builtin/pull.c:173
+#: 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:283
+#: 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:290
+#: 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:292
+#: 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:294
+#: 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:296 builtin/pull.c:180
+#: 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:303
+#: 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:320
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "không thể chạy stash."
 
-#: builtin/merge.c:325
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "lệnh tạm cất gặp lỗi"
 
-#: builtin/merge.c:330
+#: 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:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree gặp lỗi"
 
-#: builtin/merge.c:400
+#: 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:414
+#: 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:464
+#: 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:602
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Chuá»—i branch.%s.mergeoptions sai: %s"
 
-#: builtin/merge.c:728
+#: 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:741
+#: builtin/merge.c:745
 #, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Không hiểu tùy ch�n cho merge-recursive: -X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "không hiểu chiến lược: -X%s"
 
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
+#: 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:812
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Không thể đ�c từ “%s�"
 
-#: builtin/merge.c:821
+#: 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:827
+#: 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"
@@ -17803,11 +18090,11 @@ msgstr ""
 "topic.\n"
 "\n"
 
-#: builtin/merge.c:832
+#: 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:835
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17816,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:888
+#: 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:903
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Tuyệt v�i.\n"
 
-#: builtin/merge.c:964
+#: 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:1003
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "Không phải nhánh hiện hành."
 
-#: builtin/merge.c:1005
+#: 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:1007
+#: 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:1012
+#: 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:1069
+#: 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:1172
+#: 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:1206
+#: 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:1316
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort không nhận các đối số"
 
-#: builtin/merge.c:1320
+#: 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:1338
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit không nhận các đối số"
 
-#: builtin/merge.c:1351
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue không nhận đối số"
 
-#: builtin/merge.c:1355
+#: 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:1371
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17892,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:1378
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17900,90 +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:1381
+#: 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:1395
-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:1397
-msgid "You cannot combine --squash with --commit."
-msgstr "Bạn không thể kết hợp --squash với --commit."
-
-#: builtin/merge.c:1413
+#: 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:1430
+#: 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:1432
+#: 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:1437
+#: 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:1439
+#: 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:1520
+#: 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:1539
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "�ang cập nhật %s..%s\n"
 
-#: builtin/merge.c:1585
+#: 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:1592
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "Không.\n"
 
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang b� qua."
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: 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:1655
+#: 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:1707
+#: 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:1709
+#: 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:1718
+#: builtin/merge.c:1735
 #, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n"
+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:1732
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -18019,17 +18294,17 @@ msgstr "không thể đ�c đối tượng được đánh thẻ %s"
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr "đối tượng %s được đánh thẻ là %s, không phải là kiểu %s"
 
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr ""
 "thẻ trên stdin đã không vượt qua kiểm tra fsck nghiêm ngặt của chúng tôi"
 
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
 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:103 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ẻ"
 
@@ -18050,34 +18325,50 @@ msgid "allow creation of more than one tree"
 msgstr "cho phép tạo nhi�u hơn một cây"
 
 #: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<các tùy ch�n>] write [--preferred-pack=<cỡ>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<các tùy ch�n>] write [--preferred-pack=<gói>][--refs-"
+"snapshot=</đư�ng/dẫn>]"
 
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
 msgid "git multi-pack-index [<options>] verify"
 msgstr "git multi-pack-index [<các tùy ch�n>] verify"
 
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<các tùy ch�n>] expire"
 
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<các-tùy-ch�n>] repack [--batch-size=<cỡ>]"
 
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr "thư mục đối tượng có chứa một bộ các tập tin gói và cặp pack-index"
 
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
 msgid "preferred-pack"
 msgstr "preferred-pack"
 
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr "gói được sử dụng khi tính toán một \"multi-pack bitmap\""
 
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "ghi multi-pack bitmap"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "ghi mục lục multi-pack chỉ chứa các mục lục đã cho"
+
+#: builtin/multi-pack-index.c:107
+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:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18085,11 +18376,6 @@ msgstr ""
 "trong suốt quá trình đóng gói lại, gom các tập tin gói có kích cỡ nh� hơn "
 "vào một bó cái mà lớn hơn kích thước này"
 
-#: builtin/multi-pack-index.c:180
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "không hiểu câu lệnh con: %s"
-
 #: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<các tùy ch�n>] <nguồn>… <đích>"
@@ -18117,118 +18403,118 @@ msgstr "ép buộc di chuyển hay đổi tên thậm chí cả khi đích đã
 msgid "skip move/rename errors"
 msgstr "b� qua các lỗi liên quan đến di chuyển, đổi tên"
 
-#: builtin/mv.c:170
+#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "có đích “%s� nhưng đây không phải là một thư mục"
 
-#: builtin/mv.c:181
+#: builtin/mv.c:184
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "�ang kiểm tra việc đổi tên của “%s� thành “%s�\n"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:190
 msgid "bad source"
 msgstr "nguồn sai"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "không thể di chuyển một thư mục vào trong chính nó được"
 
-#: builtin/mv.c:191
+#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "không di chuyển được thư mục thông qua tập tin"
 
-#: builtin/mv.c:200
+#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "thư mục nguồn là trống rỗng"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "không nằm dưới sự quản lý mã nguồn"
 
-#: builtin/mv.c:227
+#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "bị xung đột"
 
-#: builtin/mv.c:230
+#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "đích đã tồn tại sẵn rồi"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "đang ghi đè lên “%s�"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "Không thể ghi đè"
 
-#: builtin/mv.c:244
+#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "nhi�u nguồn cho cùng một đích"
 
-#: builtin/mv.c:246
+#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "thư mục đích không tồn tại"
 
-#: builtin/mv.c:253
+#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, nguồn=%s, đích=%s"
 
-#: builtin/mv.c:274
+#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "�ổi tên %s thành %s\n"
 
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: 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ộ)"
 
@@ -18346,62 +18632,62 @@ 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:197
+#: 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:206
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "không thể ghi đối tượng ghi chú (note)"
 
-#: builtin/notes.c:208
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "nội dung ghi chú còn lại %s"
 
-#: builtin/notes.c:242 builtin/tag.c:576
+#: 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�"
 
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
 #, 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:265
+#: builtin/notes.c:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "gặp lỗi khi đ�c đối tượng “%s�."
 
-#: builtin/notes.c:268
+#: builtin/notes.c:266
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "không thể đ�c dữ liệu ghi chú từ đối tượng không-blob “%s�."
 
-#: builtin/notes.c:309
+#: builtin/notes.c:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "dòng đầu vào dị hình: “%s�."
 
-#: builtin/notes.c:324
+#: builtin/notes.c:322
 #, 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� sang “%s�"
@@ -18409,48 +18695,48 @@ msgstr "gặp lỗi khi sao chép ghi chú (note) từ “%s� sang “%s�"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "từ chối %s ghi chú trong %s (nằm ngoài refs/notes/)"
 
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: 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: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ố"
 
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
 #, c-format
 msgid "no note found for object %s."
 msgstr "không tìm thấy ghi chú cho đối tượng %s."
 
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "nội dung ghi chú (note) nằm trong một chuỗi"
 
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "nội dung ghi chú (note) nằm trong một tập tin"
 
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
 msgid "reuse and edit specified note object"
 msgstr "dùng lại nhưng có sửa chữa đối tượng note đã chỉ ra"
 
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "dùng lại đối tượng ghi chú (note) đã chỉ ra"
 
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "cho lưu trữ ghi chú trống rỗng"
 
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "thay thế ghi chú trước"
 
-#: builtin/notes.c:448
+#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18459,29 +18745,29 @@ msgstr ""
 "Không thể thêm các ghi chú. �ã tìm thấy các ghi chú đã có sẵn cho đối tượng "
 "%s. Sử dụng tùy ch�n “-f� để ghi đè lên các ghi chú cũ"
 
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "�ang ghi đè lên ghi chú cũ cho đối tượng %s\n"
 
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: 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"
 
-#: builtin/notes.c:497
+#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "đ�c các đối tượng từ đầu vào tiêu chuẩn"
 
-#: builtin/notes.c:499
+#: builtin/notes.c:497
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "tải cấu hình chép lại cho <lệnh> (ngầm định là --stdin)"
 
-#: builtin/notes.c:517
+#: builtin/notes.c:515
 msgid "too few arguments"
 msgstr "quá ít đối số"
 
-#: builtin/notes.c:538
+#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -18490,12 +18776,12 @@ msgstr ""
 "Không thể sao chép các ghi chú. �ã tìm thấy các ghi chú đã có sẵn cho đối "
 "tượng %s. Sử dụng tùy ch�n “-f� để ghi đè lên các ghi chú cũ"
 
-#: builtin/notes.c:550
+#: builtin/notes.c:548
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "thiếu ghi chú trên đối tượng nguồn %s. Không thể sao chép."
 
-#: builtin/notes.c:603
+#: builtin/notes.c:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18504,52 +18790,52 @@ msgstr ""
 "Các tùy ch�n -m/-F/-c/-C đã cổ không còn dùng nữa cho lệnh con “edit�.\n"
 "Xin hãy sử dụng lệnh sau để thay thế: “git notes add -f -m/-F/-c/-C�.\n"
 
-#: builtin/notes.c:698
+#: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:700
+#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "gặp lỗi khi xóa tham chiếu NOTES_MERGE_REF"
 
-#: builtin/notes.c:702
+#: builtin/notes.c:700
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "gặp lỗi khi gỡ b� cây làm việc “git notes merge�"
 
-#: builtin/notes.c:722
+#: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "gặp lỗi khi đ�c tham chiếu NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:724
+#: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "không thể tìm thấy lần chuyển giao từ NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:726
+#: builtin/notes.c:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "không thể phân tích cú pháp lần chuyển giao từ NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:739
+#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "gặp lỗi khi phân giải NOTES_MERGE_REF"
 
-#: builtin/notes.c:742
+#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "gặp lỗi khi hoàn thành hòa trộn ghi chú"
 
-#: builtin/notes.c:768
+#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "không hiểu chiến lược hòa trộn ghi chú %s"
 
-#: builtin/notes.c:784
+#: builtin/notes.c:782
 msgid "General options"
 msgstr "Tùy ch�n chung"
 
-#: builtin/notes.c:786
+#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "Tùy ch�n v� hòa trộn"
 
-#: builtin/notes.c:788
+#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -18557,48 +18843,48 @@ msgstr ""
 "phân giải các xung đột “notes� sử dụng chiến lược đã đưa ra (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:790
+#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "Chuyển giao các note chưa được hòa trộn"
 
-#: builtin/notes.c:792
+#: builtin/notes.c:790
 msgid "finalize notes merge by committing unmerged notes"
 msgstr ""
 "các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển "
 "giao"
 
-#: builtin/notes.c:794
+#: builtin/notes.c:792
 msgid "Aborting notes merge resolution"
 msgstr "Hủy b� phân giải ghi chú (note) hòa trộn"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "b� qua hòa trộn các ghi chú (note)"
 
-#: builtin/notes.c:807
+#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "không thể trộn lẫn --commit, --abort hay -s/--strategy"
 
-#: builtin/notes.c:812
+#: builtin/notes.c:810
 msgid "must specify a notes ref to merge"
 msgstr "bạn phải chỉ định tham chiếu ghi chú để hòa trộn"
 
-#: builtin/notes.c:836
+#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "không hiểu -s/--strategy: %s"
 
-#: builtin/notes.c:873
+#: 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:876
+#: 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:878
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18609,60 +18895,60 @@ 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:897 builtin/tag.c:589
+#: 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:900
+#: 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:912
+#: 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:915
+#: 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:954 builtin/prune.c:132 builtin/worktree.c:148
+#: 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:955
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "báo cáo các đối tượng đã prune"
 
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "notes-ref"
 
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "dùng “notes� từ <notes-ref>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1739
+#: 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"
 
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [các tùy ch�n…] [< <danh-sách-tham-chiếu> | < "
 "<danh-sách-đối-tượng>]"
 
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [các tùy ch�n…] <base-name> [< <danh-sách-ref> | < <danh-"
 "sách-đối-tượng>]"
 
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18671,108 +18957,112 @@ msgstr ""
 "write_reuse_object: không thể phân bổ %s, cần tại vị trí bù %<PRIuMAX> trong "
 "gói %s"
 
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "CRC của đối tượng gói sai với %s"
 
-#: builtin/pack-objects.c:459
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "đối tượng đã đóng gói sai h�ng cho %s"
 
-#: builtin/pack-objects.c:590
+#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "dò thấy delta đệ quy cho đối tượng %s"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "đã sắp xếp %u đối tượng, cần %<PRIu32>"
 
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "cần đối tượng tại khoảng bù %<PRIuMAX> trong gói: %s"
 
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1160
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "tắt ghi bitmap, các gói bị chia nh� bởi vì pack.packSizeLimit"
 
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
 msgid "Writing objects"
 msgstr "�ang ghi lại các đối tượng"
 
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "gặp lỗi khi lấy thông tin thống kê v� %s"
 
-#: builtin/pack-objects.c:1141
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "gặp lỗi khi ghi mục lục ánh xạ"
+
+#: builtin/pack-objects.c:1294
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "đã ghi %<PRIu32> đối tượng trong khi cần %<PRIu32>"
 
-#: builtin/pack-objects.c:1383
+#: builtin/pack-objects.c:1536
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói"
 
-#: builtin/pack-objects.c:1831
+#: builtin/pack-objects.c:1984
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "khoảng bù cơ sở cho delta bị tràn trong gói cho %s"
 
-#: builtin/pack-objects.c:1840
+#: builtin/pack-objects.c:1993
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm cho %s"
 
-#: builtin/pack-objects.c:2121
+#: builtin/pack-objects.c:2274
 msgid "Counting objects"
 msgstr "�ang đếm các đối tượng"
 
-#: builtin/pack-objects.c:2266
+#: builtin/pack-objects.c:2439
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "không thể phân tích phần đầu đối tượng của “%s�"
 
-#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
-#: builtin/pack-objects.c:2362
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
 #, c-format
 msgid "object %s cannot be read"
 msgstr "không thể đ�c đối tượng %s"
 
-#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 "đối tượng %s không nhất quán v� chi�u dài đối tượng (%<PRIuMAX> so với "
 "%<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2376
+#: builtin/pack-objects.c:2549
 msgid "suboptimal pack - out of memory"
 msgstr "suboptimal pack - hết bộ nhớ"
 
-#: builtin/pack-objects.c:2691
+#: builtin/pack-objects.c:2864
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Nén delta dùng tới %d tuyến trình"
 
-#: builtin/pack-objects.c:2830
+#: builtin/pack-objects.c:3003
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "không thể đóng gói các đối tượng tiếp cận được từ thẻ “%s�"
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:3089
 msgid "Compressing objects"
 msgstr "�ang nén các đối tượng"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:3095
 msgid "inconsistency with delta count"
 msgstr "mâu thuẫn với số lượng delta"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3174
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18781,7 +19071,7 @@ msgstr ""
 "giá trị của uploadpack.blobpackfileuri phải có dạng “<object-hash> <pack-"
 "hash> <uri>� (nhận “%s�)"
 
-#: builtin/pack-objects.c:3004
+#: builtin/pack-objects.c:3177
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
@@ -18789,17 +19079,18 @@ msgstr ""
 "đối tượng đã được cấu hình trong một uploadpack.blobpackfileuri khác (đã "
 "nhận “%s�)"
 
-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3212
 #, c-format
 msgid "could not get type of object %s in pack %s"
 msgstr "không thể lấy kiểu của đối tượng “%s� trong gói “%s�"
 
-#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "không thể tìm thấy gói “%s�"
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3408
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -18808,7 +19099,7 @@ msgstr ""
 "cần ID đối tượng cạnh, nhận được rác:\n"
 " %s"
 
-#: builtin/pack-objects.c:3224
+#: builtin/pack-objects.c:3414
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -18817,248 +19108,244 @@ msgstr ""
 "cần ID đối tượng, nhận được rác:\n"
 " %s"
 
-#: builtin/pack-objects.c:3322
+#: builtin/pack-objects.c:3507
 msgid "invalid value for --missing"
 msgstr "giá trị cho --missing không hợp lệ"
 
-#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
 msgid "cannot open pack index"
 msgstr "không thể mở mục lục của gói"
 
-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3541
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "đối tượng mất tại %s không thể đã kiểm tra"
 
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3627
 msgid "unable to force loose object"
 msgstr "không thể buộc mất đối tượng"
 
-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3757
 #, c-format
 msgid "not a rev '%s'"
 msgstr "không phải một rev “%s�"
 
-#: builtin/pack-objects.c:3631
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "điểm xem xét sai “%s�"
 
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3788
 msgid "unable to add recent objects"
 msgstr "không thể thêm các đối tượng mới dùng"
 
-#: builtin/pack-objects.c:3712
+#: builtin/pack-objects.c:3841
 #, c-format
 msgid "unsupported index version %s"
 msgstr "phiên bản mục lục không được hỗ trợ %s"
 
-#: builtin/pack-objects.c:3716
+#: builtin/pack-objects.c:3845
 #, c-format
 msgid "bad index version '%s'"
 msgstr "phiên bản mục lục sai “%s�"
 
-#: builtin/pack-objects.c:3755
+#: builtin/pack-objects.c:3884
 msgid "<version>[,<offset>]"
 msgstr "<phiên bản>[,offset]"
 
-#: builtin/pack-objects.c:3756
+#: builtin/pack-objects.c:3885
 msgid "write the pack index file in the specified idx format version"
 msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho"
 
-#: builtin/pack-objects.c:3759
+#: builtin/pack-objects.c:3888
 msgid "maximum size of each output pack file"
 msgstr "kcíh thước tối đa cho tập tin gói được tạo"
 
-#: builtin/pack-objects.c:3761
+#: builtin/pack-objects.c:3890
 msgid "ignore borrowed objects from alternate object store"
 msgstr "b� qua các đối tượng vay mượn từ kho đối tượng thay thế"
 
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c:3892
 msgid "ignore packed objects"
 msgstr "b� qua các đối tượng đóng gói"
 
-#: builtin/pack-objects.c:3765
+#: builtin/pack-objects.c:3894
 msgid "limit pack window by objects"
 msgstr "giới hạn cửa sổ đóng gói theo đối tượng"
 
-#: builtin/pack-objects.c:3767
+#: builtin/pack-objects.c:3896
 msgid "limit pack window by memory in addition to object limit"
 msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng"
 
-#: builtin/pack-objects.c:3769
+#: builtin/pack-objects.c:3898
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "độ dài tối đa của chuỗi móc xích “delta� được phép trong gói kết quả"
 
-#: builtin/pack-objects.c:3771
+#: builtin/pack-objects.c:3900
 msgid "reuse existing deltas"
 msgstr "dùng lại các delta sẵn có"
 
-#: builtin/pack-objects.c:3773
+#: builtin/pack-objects.c:3902
 msgid "reuse existing objects"
 msgstr "dùng lại các đối tượng sẵn có"
 
-#: builtin/pack-objects.c:3775
+#: builtin/pack-objects.c:3904
 msgid "use OFS_DELTA objects"
 msgstr "dùng các đối tượng OFS_DELTA"
 
-#: builtin/pack-objects.c:3777
+#: builtin/pack-objects.c:3906
 msgid "use threads when searching for best delta matches"
 msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất"
 
-#: builtin/pack-objects.c:3779
+#: builtin/pack-objects.c:3908
 msgid "do not create an empty pack output"
 msgstr "không thể tạo kết xuất gói trống rỗng"
 
-#: builtin/pack-objects.c:3781
+#: builtin/pack-objects.c:3910
 msgid "read revision arguments from standard input"
 msgstr "đ�c tham số “revision� từ thiết bị nhập chuẩn"
 
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:3912
 msgid "limit the objects to those that are not yet packed"
 msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói"
 
-#: builtin/pack-objects.c:3786
+#: builtin/pack-objects.c:3915
 msgid "include objects reachable from any reference"
 msgstr "bao gồm các đối tượng có thể đ�c được từ bất kỳ tham chiếu nào"
 
-#: builtin/pack-objects.c:3789
+#: builtin/pack-objects.c:3918
 msgid "include objects referred by reflog entries"
 msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog"
 
-#: builtin/pack-objects.c:3792
+#: builtin/pack-objects.c:3921
 msgid "include objects referred to by the index"
 msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục"
 
-#: builtin/pack-objects.c:3795
+#: builtin/pack-objects.c:3924
 msgid "read packs from stdin"
 msgstr "đ�c các gói từ đầu vào tiêu chuẩn"
 
-#: builtin/pack-objects.c:3797
+#: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
 msgstr "xuất gói ra đầu ra tiêu chuẩn"
 
-#: builtin/pack-objects.c:3799
+#: builtin/pack-objects.c:3928
 msgid "include tag objects that refer to objects to be packed"
 msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói"
 
-#: builtin/pack-objects.c:3801
+#: builtin/pack-objects.c:3930
 msgid "keep unreachable objects"
 msgstr "giữ lại các đối tượng không thể đ�c được"
 
-#: builtin/pack-objects.c:3803
+#: builtin/pack-objects.c:3932
 msgid "pack loose unreachable objects"
 msgstr "pack mất các đối tượng không thể đ�c được"
 
-#: builtin/pack-objects.c:3805
+#: builtin/pack-objects.c:3934
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 "xả nén (gỡ kh�i gói) các đối tượng không thể đ�c được mới hơn <th�i-gian>"
 
-#: builtin/pack-objects.c:3808
+#: builtin/pack-objects.c:3937
 msgid "use the sparse reachability algorithm"
 msgstr "sử dụng thuật toán “sparse reachability�"
 
-#: builtin/pack-objects.c:3810
+#: builtin/pack-objects.c:3939
 msgid "create thin packs"
 msgstr "tạo gói nhẹ"
 
-#: builtin/pack-objects.c:3812
+#: builtin/pack-objects.c:3941
 msgid "create packs suitable for shallow fetches"
 msgstr "tạo gói để phù hợp cho lấy v� nông (shallow)"
 
-#: builtin/pack-objects.c:3814
+#: builtin/pack-objects.c:3943
 msgid "ignore packs that have companion .keep file"
 msgstr "b� qua các gói mà nó có tập tin .keep đi kèm"
 
-#: builtin/pack-objects.c:3816
+#: builtin/pack-objects.c:3945
 msgid "ignore this pack"
 msgstr "b� qua gói này"
 
-#: builtin/pack-objects.c:3818
+#: builtin/pack-objects.c:3947
 msgid "pack compression level"
 msgstr "mức nén gói"
 
-#: builtin/pack-objects.c:3820
+#: builtin/pack-objects.c:3949
 msgid "do not hide commits by grafts"
 msgstr "không ẩn các lần chuyển giao bởi “grafts�"
 
-#: builtin/pack-objects.c:3822
+#: builtin/pack-objects.c:3951
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng"
 
-#: builtin/pack-objects.c:3824
+#: builtin/pack-objects.c:3953
 msgid "write a bitmap index together with the pack index"
 msgstr "ghi một mục lục ánh xạ cùng với mục lục gói"
 
-#: builtin/pack-objects.c:3828
+#: builtin/pack-objects.c:3957
 msgid "write a bitmap index if possible"
 msgstr "ghi mục lục ánh xạ nếu được"
 
-#: builtin/pack-objects.c:3832
+#: builtin/pack-objects.c:3961
 msgid "handling for missing objects"
 msgstr "xử lý cho thiếu đối tượng"
 
-#: builtin/pack-objects.c:3835
+#: builtin/pack-objects.c:3964
 msgid "do not pack objects in promisor packfiles"
 msgstr "không thể đóng gói các đối tượng trong các tập tin gói hứa hẹn"
 
-#: builtin/pack-objects.c:3837
+#: builtin/pack-objects.c:3966
 msgid "respect islands during delta compression"
 msgstr "tôn tr�ng island trong suốt quá trình nén “delta�"
 
-#: builtin/pack-objects.c:3839
+#: builtin/pack-objects.c:3968
 msgid "protocol"
 msgstr "giao thức"
 
-#: builtin/pack-objects.c:3840
+#: builtin/pack-objects.c:3969
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr "loại trừ bất kỳ cấu hình uploadpack.blobpackfileuri với giao thức này"
 
-#: builtin/pack-objects.c:3873
+#: builtin/pack-objects.c:4002
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "mức sau xích delta %d là quá sâu, buộc dùng %d"
 
-#: builtin/pack-objects.c:3878
+#: builtin/pack-objects.c:4007
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit là quá cao, ép dùng %d"
 
-#: builtin/pack-objects.c:3934
+#: builtin/pack-objects.c:4063
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "--max-pack-size không thể được sử dụng để xây dựng một gói để vận chuyển"
 
-#: builtin/pack-objects.c:3936
+#: builtin/pack-objects.c:4065
 msgid "minimum pack size limit is 1 MiB"
 msgstr "giới hạn kích thước tối thiểu của gói là 1 MiB"
 
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:4070
 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:3944
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable và --unpack-unreachable xung khắc nhau"
-
-#: builtin/pack-objects.c:3950
+#: 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"
 
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:4081
 msgid "cannot use --filter with --stdin-packs"
 msgstr "không thể dùng tùy ch�n --filter với --stdin-packs"
 
-#: builtin/pack-objects.c:3956
+#: builtin/pack-objects.c:4085
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr "không thể dùng danh sách rev bên trong với --stdin-packs"
 
-#: builtin/pack-objects.c:4015
+#: builtin/pack-objects.c:4144
 msgid "Enumerating objects"
 msgstr "�ánh số các đối tượng"
 
-#: builtin/pack-objects.c:4052
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19075,9 +19362,9 @@ 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' được đ� cử để loại b�.\n"
+"“git pack-redundant� được đ� cử để loại b�.\n"
 "Nếu bạn vẫn sử dụng lệnh này, vui lòng bổ sung\n"
-"thêm một tùy ch�n, '--i-still-use-this', trên dòng lệnh\n"
+"thêm một tùy ch�n, “--i-still-use-this�, trên dòng lệnh\n"
 "và cho chúng tôi biết bạn vẫn sử dụng nó bằng cách gửi e-mail\n"
 "đến <git@vger.kernel.org>.  Cảm ơn.\n"
 
@@ -19101,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:152
+#: 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"
 
@@ -19126,44 +19413,48 @@ msgstr "Giá trị không hợp lệ %s: %s"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<các tùy ch�n>] [<kho-chứa> [<refspec>…]]"
 
-#: builtin/pull.c:123
+#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
 msgstr "đi�u khiển việc lấy v� đệ quy của các mô-đun-con"
 
-#: builtin/pull.c:127
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Các tùy ch�n liên quan đến hòa trộn"
 
-#: builtin/pull.c:130
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "các thay đổi hợp nhất bằng cải tổ thay vì hòa trộn"
 
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "cho phép chuyển-tiếp-nhanh"
 
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+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:340
 msgid "automatically stash/stash pop before and after"
 msgstr "tự động stash/stash pop trước và sau"
 
-#: builtin/pull.c:183
+#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "Các tùy ch�n liên quan đến lệnh lấy v�"
 
-#: builtin/pull.c:193
+#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "ép buộc ghi đè lên nhánh nội bộ"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr "số lượng mô-đun-con được đẩy lên đồng th�i"
 
-#: builtin/pull.c:317
+#: builtin/pull.c:321
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Giá trị không hợp lệ cho 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."
@@ -19171,14 +19462,14 @@ msgstr ""
 "Ở đây không có ứng cử nào để cải tổ lại trong số các tham chiếu mà bạn vừa "
 "lấy v�."
 
-#: builtin/pull.c:447
+#: builtin/pull.c:451
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Ở đây không có ứng cử nào để hòa trộn trong số các tham chiếu mà bạn vừa lấy "
 "v�."
 
-#: builtin/pull.c:448
+#: builtin/pull.c:452
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -19187,7 +19478,7 @@ msgstr ""
 "tá»±\n"
 "đại diện mà nó lại không khớp trên điểm cuối máy phục vụ."
 
-#: builtin/pull.c:451
+#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -19199,42 +19490,43 @@ msgstr ""
 "theo mặc định cho nhánh hiện tại của bạn, bạn phải chỉ định\n"
 "một nhánh trên dòng lệnh."
 
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
 msgid "You are not currently on a branch."
 msgstr "Hiện tại bạn chẳng ở nhánh nào cả."
 
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
 msgid "Please specify which branch you want to rebase against."
 msgstr "Vui lòng chỉ định nhánh nào bạn muốn cải tổ lại."
 
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
 msgid "Please specify which branch you want to merge with."
 msgstr "Vui lòng chỉ định nhánh nào bạn muốn hòa trộn vào."
 
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "Xem git-pull(1) để biết thêm chi tiết."
 
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
 msgid "<remote>"
 msgstr "<máy chủ>"
 
-#: 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 "<nhánh>"
 
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
 msgid "There is no tracking information for the current branch."
 msgstr "Ở đây không có thông tin theo dõi cho nhánh hiện hành."
 
-#: builtin/pull.c:480
+#: builtin/pull.c:484
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 "Nếu bạn muốn theo dõi thông tin cho nhánh này bạn có thể thực hiện bằng lệnh:"
 
-#: builtin/pull.c:485
+#: builtin/pull.c:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -19243,22 +19535,22 @@ msgstr ""
 "Các đặc tả cấu hình của bạn để hòa trộn với tham chiếu “%s�\n"
 "từ máy dịch vụ, nhưng không có nhánh nào như thế được lấy v�."
 
-#: builtin/pull.c:596
+#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "không thể truy cập lần chuyển giao “%s�"
 
-#: builtin/pull.c:902
+#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "b� qua --verify-signatures khi rebase"
 
-#: builtin/pull.c:930
+#: builtin/pull.c:969
 msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"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"
@@ -19268,38 +19560,36 @@ msgid ""
 "or --ff-only on the command line to override the configured default per\n"
 "invocation.\n"
 msgstr ""
-"Kéo mà không chỉ định làm thế nào để hòa giải các nhánh phân kỳ là khác nhau "
-"là\n"
-"không khuyến khích. Bạn có thể dịu thông báo này bằng cách chạy một trong "
-"những lệnh sau đây\n"
-"các lệnh thỉnh thoảng trước khi thực hiện lệnh pull tiếp theo của bạn:\n"
+"Bạn có các nhánh phân kỳ và cần chỉ định cách hòa hợp chúng.\n"
+"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"
 "ưu tiên cho tất cả các kho. Bạn cũng có thể chuyển qua --rebase, --no-"
 "rebase,\n"
-"hoặc --ff-only trên dòng lệnh để ghi đè mặc định được cấu hình cho mỗi\n"
+"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:991
+#: 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:995
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "pull vá»›i rebase"
 
-#: builtin/pull.c:996
+#: 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:1021
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19310,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:1027
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19328,15 +19618,23 @@ msgstr ""
 "$ git reset --hard\n"
 "để khôi phục lại."
 
-#: builtin/pull.c:1042
+#: 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:1046
+#: 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:1067
+#: 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: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: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ộ"
@@ -19402,7 +19700,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<tên-của-nhánh-máy-chủ>\n"
 
-#: builtin/push.c:194
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -19416,12 +19714,19 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:202
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "Nhánh hiện tại %s có nhi�u nhánh thượng nguồn, từ chối push."
 
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Bạn đã không chỉ ra một refspecs nào để đẩy lên, và push.default là \"không "
+"là gì cả\"."
+
+#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -19433,14 +19738,7 @@ msgstr ""
 "nhánh hiện tại “%s� của bạn, mà không báo cho tôi biết là cái gì được push\n"
 "để cập nhật nhánh máy chủ nào."
 
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"Bạn đã không chỉ ra một refspecs nào để đẩy lên, và push.default là \"không "
-"là gì cả\"."
-
-#: builtin/push.c:267
+#: builtin/push.c:258
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19453,7 +19751,7 @@ msgstr ""
 "Xem “Note about fast-forwards� trong “git push --help� để có thông tin chi "
 "tiết."
 
-#: builtin/push.c:273
+#: builtin/push.c:264
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -19467,7 +19765,7 @@ msgstr ""
 "Xem “Note about fast-forwards� trong “git push --help� để có thông tin chi "
 "tiết."
 
-#: builtin/push.c:279
+#: builtin/push.c:270
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -19482,11 +19780,11 @@ msgstr ""
 "Xem “Note about fast-forwards� trong “git push --help� để có thông tin chi "
 "tiết."
 
-#: builtin/push.c:286
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "Việc cập nhật bị từ chối bởi vì thẻ đã sẵn có từ trước trên máy chủ."
 
-#: builtin/push.c:289
+#: builtin/push.c:280
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -19498,7 +19796,7 @@ msgstr ""
 "đối tượng\n"
 "không phải chuyển giao, mà không sử dụng tùy ch�n “--force�.\n"
 
-#: builtin/push.c:294
+#: builtin/push.c:285
 msgid ""
 "Updates were rejected because the tip of the remote-tracking\n"
 "branch has been updated since the last checkout. You may want\n"
@@ -19510,103 +19808,99 @@ msgstr ""
 "tích hợp các thay đổi này một cách cục bộ (v.d. \"git pull …\")\n"
 "trước khi ép buộc một cập nhật.\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "�ang đẩy lên %s\n"
 
-#: builtin/push.c:371
+#: builtin/push.c:362
 #, c-format
 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:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "kho"
 
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
 msgstr "đẩy tất cả các tham chiếu"
 
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr "mirror tất cả các tham chiếu"
 
-#: builtin/push.c:557
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "xóa các tham chiếu"
 
-#: builtin/push.c:558
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "đẩy các thẻ (không dùng cùng với --all hay --mirror)"
 
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "ép buộc cập nhật"
 
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "<tên-tham-chiếu>:<cần>"
 
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
 msgid "require old value of ref to be at this value"
 msgstr "yêu cầu giá-trị cũ của tham chiếu thì là giá-trị này"
 
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
 msgid "require remote updates to be integrated locally"
 msgstr "yêu cầu máy chủ cập nhật để thích hợp với máy cục bộ"
 
-#: builtin/push.c:569
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "đi�u khiển việc đẩy lên (push) đệ qui của mô-đun-con"
 
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
 msgid "use thin pack"
 msgstr "tạo gói nhẹ"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "chương trình nhận gói"
 
-#: builtin/push.c:573
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "đặt thượng nguồn cho git pull/status"
 
-#: builtin/push.c:576
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "xén tỉa những tham chiếu bị gỡ b�"
 
-#: builtin/push.c:578
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "vòng qua móc ti�n-đẩy (pre-push)"
 
-#: builtin/push.c:579
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "push phần bị thiếu nhưng các thẻ lại thích hợp"
 
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
 msgstr "ký lần đẩy dùng GPG"
 
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
 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:601
-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:603
+#: 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"
 
-#: builtin/push.c:623
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "repository (kho) sai “%s�"
 
-#: builtin/push.c:624
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -19627,27 +19921,15 @@ msgstr ""
 "\n"
 "    git push <tên>\n"
 
-#: builtin/push.c:639
-msgid "--all and --tags are incompatible"
-msgstr "--all và --tags xung khắc nhau"
-
-#: builtin/push.c:641
+#: 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:645
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror và --tags xung khắc nhau"
-
-#: builtin/push.c:647
+#: 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:650
-msgid "--all and --mirror are incompatible"
-msgstr "--all và --mirror xung khắc nhau"
-
-#: builtin/push.c:657
+#: 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"
 
@@ -19700,84 +19982,83 @@ msgstr "cần hai vùng lần chuyển giao"
 #: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
-"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<ti�n-"
-"tố>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] "
-"[--index-output=<tập-tin>] (--empty | <tree-ish1> [<tree-ish2> [<tree-"
-"ish3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<ti�n_tố>) [-u | -i]] [--no-sparse-checkout] [--index-"
+"output=<tập_tin>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
 
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "ghi mục lục kết quả vào <tập-tin>"
 
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "chỉ với bảng mục lục trống rỗng"
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "Hòa trộn"
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
 msgid "perform a merge in addition to a read"
 msgstr "thực hiện một hòa trộn thêm vào việc đ�c"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
 msgid "3-way merge if no file level merging required"
 msgstr ""
 "hòa trộn kiểu “3-way� nếu không có tập tin mức hòa trộn nào được yêu cầu"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
 msgid "3-way merge in presence of adds and removes"
 msgstr "hòa trộn 3-way trong sự hiện diện của “adds� và “removes�"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "giống với -m, nhưng b� qua các mục chưa được hòa trộn"
 
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<thư-mục-con>/"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "đ�c cây vào trong bảng mục lục dưới <thư_mục_con>/"
 
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
 msgid "update working tree with merge result"
 msgstr "cập nhật cây làm việc với kết quả hòa trộn"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "cho phép các tập tin rõ ràng bị l� đi được ghi đè"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
 msgid "don't check the working tree after merging"
 msgstr "không kiểm tra cây làm việc sau hòa trộn"
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
 msgid "don't update the index or the work tree"
 msgstr "không cập nhật bảng mục lục hay cây làm việc"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
 msgid "skip applying sparse checkout filter"
 msgstr "b� qua áp dụng bộ l�c lấy ra (checkout) thưa thớt"
 
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "gỡ lỗi “unpack-trees�"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "không xuất các thông tin phản hồi"
 
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
 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 đã"
 
@@ -19800,193 +20081,44 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "danh sách cần làm không dùng được: “%s�"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
 #, c-format
 msgid "could not create temporary %s"
 msgstr "không thể tạo %s tạm th�i"
 
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
 msgid "could not mark as interactive"
 msgstr "không thể đánh dấu là tương tác"
 
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
 msgid "could not generate todo list"
 msgstr "không thể tạo danh sách cần làm"
 
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "lần chuyển giao cơ s� phải được chỉ định với --upstream hoặc --onto"
 
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<các tùy ch�n>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "b� qua các lần chuyển giao mà nó bắt đầu trống rỗng"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "chấp nhận chuyển giao mà không ghi chú gì"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "cải tổ các lần chuyển giao hòa trộn"
-
-#: builtin/rebase.c:502
-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�"
-
-#: builtin/rebase.c:504
-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!"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "ký các lần chuyển giao"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "hiển thị một diffstat của những thay đổi thượng nguồn"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "tiếp tục cải tổ"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "b� qua lần chuyển giao"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "sửa danh sách cần làm"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "hiển thị miếng vá hiện hành"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "rút ngắn mã chuyển giao trong danh sách cần làm"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "khai triển mã chuyển giao trong danh sách cần làm"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "kiểm tra danh sách cần làm"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "sắp xếp lại các dòng fixup/squash"
-
-#: builtin/rebase.c:525
-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"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "lên trên"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "điểm-xét-duyệt-hạn-chế"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "điểm xét duyệt hạn chế"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-lên-trên"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "squash lên trên"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "lần chuyển giao thượng nguồn"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "tên-đầu"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "tên đầu"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "chiến lược cải tổ"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "tùy-ch�n-chiến-lược"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "các tùy ch�n chiến lược"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "chuyển-đến"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "nhánh hay lần chuyển giao lần lấy ra"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "tên lên trên"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "lệnh"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "lệnh muốn chạy"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "lập lịch lại một cách tự động bất kỳ “exec“ bị lỗi"
-
-#: builtin/rebase.c:566
-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"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s cần một ứng dụng hòa trộn chạy phía sau"
 
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "không thể đặt lấy “onto�: “%s�"
 
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head không hợp lệ: “%s�"
 
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "đang b� qua allow_rerere_autoupdate không hợp lệ: “%s�"
 
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -20001,7 +20133,7 @@ msgstr ""
 "�ể bãi b� và quay trở lại trạng thái trước \"git rebase\", chạy \"git rebase "
 "--abort\"."
 
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
 #, c-format
 msgid ""
 "\n"
@@ -20020,7 +20152,7 @@ msgstr ""
 "\n"
 "Kết quả là git không thể cải tổ lại chúng."
 
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -20029,7 +20161,7 @@ msgstr ""
 "kiểu rỗng không được nhận dạng “%s�; giá trị hợp lệ là \"drop\", \"keep\", "
 "và \"ask\"."
 
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -20046,7 +20178,7 @@ msgstr ""
 "    git rebase “<nhánh>�\n"
 "\n"
 
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -20060,188 +20192,185 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<nhánh> %s\n"
 "\n"
 
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
 msgid "exec commands cannot contain newlines"
 msgstr "các lệnh thực thi không thể chứa các ký tự dòng mới"
 
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
 msgid "empty exec command"
 msgstr "lệnh thực thi trống rỗng"
 
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
 msgid "rebase onto given branch instead of upstream"
 msgstr "cải tổ vào nhánh đã cho thay cho thượng nguồn"
 
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr ""
 "sử dụng các cơ sở hòa trộn của thượng nguồn và nhánh như là cơ sở hiện tại"
 
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
 msgid "allow pre-rebase hook to run"
 msgstr "cho phép móc (hook) pre-rebase được chạy"
 
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
 msgid "be quiet. implies --no-stat"
 msgstr "hãy im lặng. ý là --no-stat"
 
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "hiển thị một diffstat của những thay đổi thượng nguồn"
+
+#: builtin/rebase.c:1035
 msgid "do not show diffstat of what changed upstream"
 msgstr "đừng hiển thị diffstat của những thay đổi thượng nguồn"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "thêm dòng Signed-off-by vào cuối cho từng lần chuyển giao"
 
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
 msgid "make committer date match author date"
 msgstr "làm ngày tháng chuyển giao khớp với ngày của tác giả"
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
 msgid "ignore author date and use current date"
 msgstr "b� qua ngày tác giả và sử dụng ngày tháng hiện tại"
 
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
 msgid "synonym of --reset-author-date"
 msgstr "đồng nghĩa với --reset-author-date"
 
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
 msgid "passed to 'git apply'"
 msgstr "chuyển cho “git apply�"
 
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
 msgid "ignore changes in whitespace"
 msgstr "l� đi sự thay đổi do khoảng trắng gây ra"
 
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
 msgid "cherry-pick all commits, even if unchanged"
 msgstr ""
 "cherry-pick tất cả các lần chuyển giao, ngay cả khi không có thay đổi gì"
 
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
 msgid "continue"
 msgstr "tiếp tục"
 
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
 msgid "skip current patch and continue"
 msgstr "b� qua miếng vá hiện hành và tiếp tục"
 
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
 msgid "abort and check out the original branch"
 msgstr "bãi b� và lấy ra nhánh nguyên thủy"
 
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
 msgid "abort but keep HEAD where it is"
 msgstr "bãi b� nhưng vẫn vẫn giữ HEAD chỉ đến nó"
 
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
 msgid "edit the todo list during an interactive rebase"
 msgstr "sửa danh sách cần làm trong quá trình “rebase� (cải tổ) tương tác"
 
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
 msgid "show the patch file being applied or merged"
 msgstr "hiển thị miếng vá đã được áp dụng hay hòa trộn"
 
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
 msgid "use apply strategies to rebase"
 msgstr "dùng chiến lược áp dụng để cải tổ"
 
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
 msgid "use merging strategies to rebase"
 msgstr "dùng chiến lược hòa trộn để cải tổ"
 
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
 msgid "let the user edit the list of commits to rebase"
 msgstr "để ngư�i dùng sửa danh sách các lần chuyển giao muốn cải tổ"
 
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "(�à LẠC HẬU) hay thử tạo lại các hòa trộn thay vì b� qua chúng"
 
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
 msgid "how to handle commits that become empty"
 msgstr "xử lý các lần chuyển giao mà nó trở thành trống rỗng như thế nào"
 
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "b� qua các lần chuyển giao mà nó bắt đầu trống rỗng"
+
+#: builtin/rebase.c:1097
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "di chuyển các lần chuyển giao mà bắt đầu bằng squash!/fixup! dưới -i"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
 msgid "add exec lines after each commit of the editable list"
 msgstr "thêm các dòng thực thi sau từng lần chuyển giao của danh sách sửa được"
 
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
 msgid "allow rebasing commits with empty messages"
 msgstr "chấp nhận cải tổ các chuyển giao mà không ghi chú gì"
 
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
 msgid "try to rebase merges instead of skipping them"
 msgstr "cố thử cải tổ các hòa trộn thay vì b� qua chúng"
 
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "dùng “merge-base --fork-point� để định nghĩa lại thượng nguồn"
 
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
 msgid "use the given merge strategy"
 msgstr "dùng chiến lược hòa trộn đã cho"
 
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
 msgid "option"
 msgstr "tùy ch�n"
 
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
 msgid "pass the argument through to the merge strategy"
 msgstr "chuyển thao số đến chiến lược hòa trộn"
 
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "cải tổ tất các các lần chuyển giao cho đến root"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "lập lịch lại một cách tự động bất kỳ “exec“ bị lỗi"
+
+#: builtin/rebase.c:1128
 msgid "apply all changes, even those already present upstream"
 msgstr ""
 "áp dụng m�i thay đổi, ngay cả khi những thứ đó đã sẵn có ở thượng nguồn"
 
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
-"Hình như đang trong quá trình thực hiện lệnh “git-am�. Không thể rebase."
-
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr ""
-"git rebase --preserve-merges đã lạc hậu. Hãy dùng --rebase-merges để thay "
-"thế."
-
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "không thể kết hợp “--keep-base� với “--onto�"
-
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "không thể kết hợp “--keep-base� với “--root�"
+"Hình như đang trong quá trình thực hiện lệnh “git am�. Không thể rebase."
 
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "không thể kết hợp “--root� với “--fork-point�"
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges đã bị thay thế bằng --rebase-merges"
 
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Không có tiến trình rebase nào phải không?"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "Hành động “--edit-todo� chỉ có thể dùng trong quá trình “rebase� (sửa lịch "
 "sử) tương tác."
 
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Không thể đ�c HEAD"
 
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -20249,16 +20378,16 @@ msgstr ""
 "Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n"
 "đó đánh dấu chúng là cần xử lý sử dụng lệnh git add"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
 msgid "could not discard worktree changes"
 msgstr "không thể loại b� các thay đổi cây-làm-việc"
 
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
 #, c-format
 msgid "could not move back to %s"
 msgstr "không thể quay trở lại %s"
 
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -20279,141 +20408,133 @@ msgstr ""
 "và chạy TÔI lần nữa. TÔI dừng lại trong trư�ng hợp bạn vẫn\n"
 "có một số thứ quý giá ở đây.\n"
 
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
 msgstr "tùy ch�n “%c� cần một giá trị bằng số"
 
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Không hiểu chế độ: %s"
 
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy cần --merge hay --interactive"
 
-#: builtin/rebase.c:1759
-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"
+#: builtin/rebase.c:1463
+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:1772
+#: builtin/rebase.c:1476
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "Không hiểu ứng dụng chạy phía sau lệnh cải tổ: %s"
 
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec cần --exec hay --interactive"
 
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "không thể kết hợp “--preserve-merges� với “--rebase-merges�"
-
-#: builtin/rebase.c:1826
-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�"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "thượng nguồn không hợp lệ “%s�"
 
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
 msgid "Could not create new root commit"
 msgstr "Không thể tạo lần chuyển giao gốc mới"
 
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "“%s�: cần chính xác một cơ sở hòa trộn với nhánh"
 
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "“%s�: cần chính xác một cơ sở hòa trộn"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "Không chỉ đến một lần chuyển giao không hợp lệ “%s�"
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
 #, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "nghiêm tr�ng: không có nhánh/lần chuyển giao “%s� như thế"
+msgid "no such branch/commit '%s'"
+msgstr "không có nhánh/lần chuyển giao “%s� như thế"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2415
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "Không có tham chiếu nào như thế: %s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
 msgid "Could not resolve HEAD to a revision"
 msgstr "Không thể phân giải lần chuyển giao HEAD đến một điểm xét duyệt"
 
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
 msgid "Please commit or stash them."
 msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng."
 
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
 #, c-format
 msgid "could not switch to %s"
 msgstr "không thể chuyển đến %s"
 
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
 msgid "HEAD is up to date."
 msgstr "HEAD đã cập nhật."
 
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Nhánh hiện tại %s đã được cập nhật rồi.\n"
 
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD hiện đã được cập nhật rồi, bị ép buộc rebase."
 
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Nhánh hiện tại %s đã được cập nhật rồi, lệnh rebase ép buộc.\n"
 
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Móc (hook) pre-rebase từ chối rebase."
 
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Thay đổi thành %s:\n"
 
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Thay đổi từ %s thành %s:\n"
 
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…\n"
 
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
 msgid "Could not detach HEAD"
 msgstr "Không thể tách r�i HEAD"
 
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Chuyển-tiếp-nhanh %s đến %s.\n"
 
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <thư-mục-git>"
 
-#: builtin/receive-pack.c:1276
+#: 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"
@@ -20443,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:1296
+#: 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"
@@ -20464,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:2479
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "im lặng"
 
-#: builtin/receive-pack.c:2493
-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 ""
@@ -20494,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:699
+#: 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 ]"
 
@@ -20619,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"
@@ -20664,7 +20790,7 @@ msgstr "Ä‘ang chỉ định má»™t nhánh master không hợp lý vá»›i tùy chá»
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "chỉ định những nhánh để theo dõi chỉ hợp lý với các “fetch mirror�"
 
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
 #, c-format
 msgid "remote %s already exists."
 msgstr "máy chủ %s đã tồn tại rồi."
@@ -20674,25 +20800,30 @@ msgstr "máy chủ %s đã tồn tại rồi."
 msgid "Could not setup master '%s'"
 msgstr "Không thể cài đặt nhánh master “%s�"
 
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "nhánh chưa được quản lý.%s.rebase=%s; giả định là “true�"
+
+#: builtin/remote.c:366
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Không thể lấy ánh xạ (map) fetch cho đặc tả tham chiếu %s"
 
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
 msgid "(matching)"
 msgstr "(khá»›p)"
 
-#: builtin/remote.c:466
+#: builtin/remote.c:472
 msgid "(delete)"
 msgstr "(xóa)"
 
-#: builtin/remote.c:655
+#: builtin/remote.c:660
 #, c-format
 msgid "could not set '%s'"
 msgstr "không thể đặt “%s�"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:665
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -20703,17 +20834,17 @@ msgstr ""
 "\t%s:%d\n"
 "bây gi� tên trên máy chủ không tồn tại “%s�"
 
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Không có máy chủ nào như vậy: “%s�"
 
-#: builtin/remote.c:710
+#: builtin/remote.c:715
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Không thể đổi tên phần của cấu hình từ “%s� thành “%s�"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:735
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -20724,17 +20855,17 @@ msgstr ""
 "\t%s\n"
 "\tXin hãy cập nhật phần cấu hình một cách thủ công nếu thấy cần thiết."
 
-#: builtin/remote.c:770
+#: builtin/remote.c:775
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "gặp lỗi khi xóa “%s�"
 
-#: builtin/remote.c:804
+#: builtin/remote.c:809
 #, c-format
 msgid "creating '%s' failed"
 msgstr "gặp lỗi khi tạo “%s�"
 
-#: builtin/remote.c:882
+#: builtin/remote.c:887
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -20746,119 +20877,119 @@ msgstr[0] ""
 "Ä‘i;\n"
 "để xóa đi, sử dụng:"
 
-#: builtin/remote.c:896
+#: builtin/remote.c:901
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Không thể gỡ b� phần cấu hình “%s�"
 
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " mới (lần lấy v� tiếp theo sẽ lưu trong remotes/%s)"
 
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
 msgid " tracked"
 msgstr " được theo dõi"
 
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " cũ rích (dùng “git remote prune� để gỡ b�)"
 
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "branch.%s.merge không hợp lệ; không thể cải tổ v� phía > 1 nhánh"
 
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "thực hiện rebase một cách tương tác trên máy chủ %s"
 
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr ""
 "thực hiện cải tổ (với các hòa trộn) một cách tương tác lên trên máy chủ %s"
 
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "thực hiện rebase trên máy chủ %s"
 
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
 #, c-format
 msgid " merges with remote %s"
 msgstr " hòa trộn với máy chủ %s"
 
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
 #, c-format
 msgid "merges with remote %s"
 msgstr "hòa trộn với máy chủ %s"
 
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    và với máy chủ %s\n"
 
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
 msgid "create"
 msgstr "tạo"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
 msgid "delete"
 msgstr "xóa"
 
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
 msgid "up to date"
 msgstr "đã cập nhật"
 
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
 msgid "fast-forwardable"
 msgstr "có-thể-chuyển-tiếp-nhanh"
 
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
 msgid "local out of date"
 msgstr "dữ liệu nội bộ đã cũ"
 
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s ép buộc thành %-*s (%s)"
 
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s đẩy lên thành %-*s (%s)"
 
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s ép buộc thành %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s đẩy lên thành %s"
 
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
 msgid "do not query remotes"
 msgstr "không truy vấn các máy chủ"
 
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
 msgstr "* máy chủ %s"
 
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL để lấy v�: %s"
 
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
 msgid "(no URL)"
 msgstr "(không có URL)"
 
@@ -20866,181 +20997,185 @@ msgstr "(không có URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL để đẩy lên: %s"
 
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Nhánh HEAD: %s"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
 msgid "(not queried)"
 msgstr "(không yêu cầu)"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
 msgid "(unknown)"
 msgstr "(không hiểu)"
 
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  nhánh HEAD (HEAD máy chủ chưa rõ ràng, có lẽ là một trong số sau):\n"
 
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Những nhánh trên máy chủ:%s"
 
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
 msgid " (status not queried)"
 msgstr " (trạng thái không được yêu cầu)"
 
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Những nhánh nội bộ đã được cấu hình cho lệnh “git pull�:"
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  refs nội bộ sẽ được phản chiếu bởi lệnh “git push�"
 
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Những tham chiếu nội bộ được cấu hình cho lệnh “git push�%s:"
 
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "đặt refs/remotes/<tên>/HEAD cho phù hợp với máy chủ"
 
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "xóa refs/remotes/<tên>/HEAD"
 
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
 msgid "Cannot determine remote HEAD"
 msgstr "Không thể xác định được HEAD máy chủ"
 
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Nhi�u nhánh HEAD máy chủ. Hãy ch�n rõ ràng một:"
 
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
 #, c-format
 msgid "Could not delete %s"
 msgstr "Không thể xóa b� %s"
 
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Không phải là tham chiếu hợp lệ: %s"
 
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
 #, c-format
 msgid "Could not setup %s"
 msgstr "Không thể cài đặt %s"
 
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s sẽ trở thành không đầu (không được quản lý)!"
 
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s đã trở thành không đầu (không được quản lý)!"
 
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
 #, c-format
 msgid "Pruning %s"
 msgstr "�ang xén bớt %s"
 
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [nên xén bớt] %s"
 
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [đã bị xén] %s"
 
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
 msgid "prune remotes after fetching"
 msgstr "cắt máy chủ sau khi lấy v�"
 
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Không có máy chủ nào có tên “%s�"
 
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
 msgid "add branch"
 msgstr "thêm nhánh"
 
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
 msgid "no remote specified"
 msgstr "chưa chỉ ra máy chủ nào"
 
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
 msgid "query push URLs rather than fetch URLs"
 msgstr "truy vấn đẩy URL thay vì lấy"
 
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
 msgid "return all URLs"
 msgstr "trả v� m�i URL"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "không có URL nào được cấu hình cho nhánh “%s�"
 
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
 msgid "manipulate push URLs"
 msgstr "đẩy các “URL� bằng tay"
 
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
 msgid "add URL"
 msgstr "thêm URL"
 
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
 msgid "delete URLs"
 msgstr "xóa URLs"
 
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete không hợp lý"
 
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Kiểu mẫu URL cũ không hợp lệ: %s"
 
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Không tìm thấy URL như vậy: %s"
 
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
 msgid "Will not delete all non-push URLs"
 msgstr "Sẽ không xóa những địa chỉ URL không-push"
 
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "chi tiết; phải được đặt trước một lệnh-con"
+
+#: builtin/repack.c:28
 msgid "git repack [<options>]"
 msgstr "git repack [<các tùy ch�n>]"
 
-#: builtin/repack.c:31
+#: builtin/repack.c:33
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -21048,143 +21183,148 @@ msgstr ""
 "Gia tăng repack là không tương thích với chỉ mục bitmap. Dùng\n"
 "--no-write-bitmap-index hay tắt cấu hình pack.writebitmaps."
 
-#: builtin/repack.c:198
+#: builtin/repack.c:201
 msgid "could not start pack-objects to repack promisor objects"
 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:270 builtin/repack.c:630
+#: 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:294
+#: 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:309
+#: 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:368
+#: 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:401 builtin/repack.c:408 builtin/repack.c:413
+#: 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:460
+#: 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: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:630
 msgid "pack everything in a single pack"
 msgstr "đóng gói m�i thứ trong một gói đơn"
 
-#: builtin/repack.c:462
+#: 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:465
+#: 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:467
+#: 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:469
+#: 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:471
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "không chạy git-update-server-info"
 
-#: builtin/repack.c:474
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "chuyển --local cho git-pack-objects"
 
-#: builtin/repack.c:476
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "ghi mục lục ánh xạ"
 
-#: builtin/repack.c:478
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "chuyển --delta-islands cho git-pack-objects"
 
-#: builtin/repack.c:479
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "ngày ước tính"
 
-#: builtin/repack.c:480
+#: 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:482
+#: 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:484
+#: 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:485 builtin/repack.c:491
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "byte"
 
-#: builtin/repack.c:486
+#: 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:488
+#: 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:490
+#: 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:492
+#: 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:494
+#: 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:496
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "đừng đóng gói lại gói này"
 
-#: builtin/repack.c:498
+#: 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:508
+#: 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: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:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable và -A xung khắc nhau"
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric là xung khắc với tùy ch�n -A, -a"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "Không có gì mới để mà đóng gói."
 
-#: builtin/repack.c:669
+#: 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:671
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "không thể b� liên kết: %s"
@@ -21267,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 "
@@ -21336,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"
@@ -21369,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"
 
@@ -21442,146 +21576,138 @@ msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr ""
 "git rerere [clear | forget <đư�ng dẫn>… | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "sổ ghi d�n sạch các phân giải trong bản mục lục"
 
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "“git rerere forget� mà không có các đư�ng dẫn là đã lạc hậu"
 
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
 #, c-format
 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:83
+#: 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:85
+#: 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:91
+#: 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:116
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD hiện gi� tại %s"
 
-#: builtin/reset.c:195
+#: 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:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: 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:297
+#: 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:298
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "chỉ đặt lại (reset) HEAD"
 
-#: builtin/reset.c:300 builtin/reset.c:302
+#: 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:304
+#: 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:310
+#: 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:344
+#: 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:352
+#: 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:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch xung khắc với --{hard,mixed,soft}"
-
-#: builtin/reset.c:371
+#: 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:373
+#: 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:388
+#: 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:392
-msgid "-N can only be used with --mixed"
-msgstr "-N chỉ được dùng khi có --mixed"
-
-#: builtin/reset.c:413
+#: 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:416
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -21592,33 +21718,31 @@ msgstr ""
 "\n"
 "Cần %.2f giây để kiểm đếm các thay đổi chưa đưa lên bệ phóng sau khi đặt "
 "lại.\n"
-"Bạn có thể sử dụng để tránh việc này. �ặt reset.quiet thành true trong\n"
+"Bạn có thể sử dụng “--quiet� để tránh việc này. �ặt reset.quiet thành true "
+"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:434
+#: 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:439
+#: 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:538
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "không thể tổ hợp --exclude-promisor-objects và --missing"
-
-#: builtin/rev-list.c:599
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "l�c đối tượng yêu cầu --objects"
 
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c:674
 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:664
-msgid "marked counting is incompatible with --objects"
-msgstr "được đánh dấu đếm là xung khắc với --objects"
+#: builtin/rev-list.c:679
+#, 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>...]"
@@ -21636,6 +21760,18 @@ msgstr "dừng phân tích sau đối số đầu tiên không có tùy ch�n"
 msgid "output in stuck long form"
 msgstr "kết xuất trong định dạng gậy dài"
 
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "đầu vào chấm dứt bất thư�ng"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr "không có chuỗi cách dùng nào được đưa ra trước dấu phân cách “--�"
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "Cần một điểm xét duyệt đơn"
+
 #: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -21650,6 +21786,50 @@ msgstr ""
 "\n"
 "Chạy lệnh \"git rev-parse --parseopt -h\" để có thêm thông tin v� cách dùng."
 
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir cần một tham số"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "không phải một thư mục git “%s�"
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "--git-path cần một tham số"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "-n cần một tham số"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "--path-format cần một tham số"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "không hiểu tham số cho --path-format: %s"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "--default cần một tham số"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "--prefix cần một tham số"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "không hiểu chế độ cho --abbrev-ref: %s"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "không hiểu chế độ cho --show-object-format: %s"
+
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<các tùy ch�n>] <commit-ish>…"
@@ -21724,15 +21904,19 @@ msgstr "nối thêm tên lần chuyển giao"
 msgid "preserve initially empty commits"
 msgstr "cấm khởi tạo lần chuyển giao trống rỗng"
 
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "chấp nhận chuyển giao mà không ghi chú gì"
+
 #: builtin/revert.c:129
 msgid "keep redundant, empty commits"
 msgstr "giữ lại các lần chuyển giao dư thừa, rỗng"
 
-#: builtin/revert.c:237
+#: builtin/revert.c:241
 msgid "revert failed"
 msgstr "hoàn nguyên gặp lỗi"
 
-#: builtin/revert.c:250
+#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "cherry-pick gặp lỗi"
 
@@ -21777,70 +21961,70 @@ msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "những tập tin sau đây có những thay đổi nội bộ:"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "không liệt kê các tập tin đã gỡ b�"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "chỉ gỡ b� từ mục lục"
 
-#: builtin/rm.c:246
+#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "ghi đè lên kiểm tra cập nhật"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "cho phép gỡ b� đệ qui"
 
-#: builtin/rm.c:249
+#: builtin/rm.c:250
 msgid "exit with a zero status even if nothing matched"
 msgstr "thoát ra với trạng thái khác không thậm chí nếu không có gì khớp"
 
-#: builtin/rm.c:283
+#: builtin/rm.c:285
 msgid "No pathspec was given. Which files should I remove?"
 msgstr "Không đưa ra đặc tả đư�ng dẫn. Tôi nên loại b� các tập tin nào?"
 
-#: builtin/rm.c:310
+#: builtin/rm.c:315
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "hãy đưa các thay đổi của bạn vào .gitmodules hay tạm cất chúng đi để xử lý"
 
-#: builtin/rm.c:331
+#: builtin/rm.c:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "không thể gỡ b� “%s� một cách đệ qui mà không có tùy ch�n -r"
 
-#: builtin/rm.c:379
+#: builtin/rm.c:385
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: không thể gỡ b� %s"
 
 #: builtin/send-pack.c:20
 msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-"  --all and explicit <ref> specification are mutually exclusive."
+"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=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<máy>:]<thư/mục> [<các-tham-"
-"chiếu>…]\n"
-"  --all và đặc tả <ref> rõ ràng là loại trừ lẫn nhau."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [<host>:]<thư mục> (--all | <tham chiếu>…)"
 
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "tên máy dịch vụ"
 
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "dùng giao thức RPC không ổn định"
 
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "đ�c tham chiếu từ đầu vào tiêu chuẩn"
 
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "in các trạng thái từ phần hướng dẫn trên máy dịch vụ"
 
@@ -21898,21 +22082,21 @@ msgstr "trư�ng"
 msgid "group by field"
 msgstr "nhóm theo trư�ng"
 
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
 msgid "too many arguments given outside repository"
 msgstr "quá nhi�u tham số đưa ra ngoài kho chứa"
 
 #: builtin/show-branch.c:13
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<khi>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <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>]"
@@ -21924,113 +22108,106 @@ msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "đang b� qua %s; không thể xử lý nhi�u hơn %d tham chiếu"
 
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
 #, c-format
 msgid "no matching refs with %s"
 msgstr "không tham chiếu nào khớp với %s"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
 msgid "show remote-tracking and local branches"
 msgstr "hiển thị các nhánh remote-tracking và nội bộ"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
 msgid "show remote-tracking branches"
 msgstr "hiển thị các nhánh remote-tracking"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
 msgid "color '*!+-' corresponding to the branch"
 msgstr "màu “*!+-� tương ứng với nhánh"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
 msgid "show <n> more commits after the common ancestor"
 msgstr "hiển thị thêm <n> lần chuyển giao sau cha mẹ chung"
 
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
 msgid "synonym to more=-1"
 msgstr "đồng nghĩa với more=-1"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
 msgid "suppress naming strings"
 msgstr "chặn các chuỗi đặt tên"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
 msgid "include the current branch"
 msgstr "bao gồm nhánh hiện hành"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
 msgid "name commits with their object names"
 msgstr "đặt tên các lần chuyển giao bằng các tên của đối tượng của chúng"
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
 msgid "show possible merge bases"
 msgstr "hiển thị m�i cơ sở có thể dùng để hòa trộn"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
 msgid "show refs unreachable from any other ref"
 msgstr "hiển thị các tham chiếu không thể được đ�c bởi bất kỳ tham chiếu khác"
 
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
 msgid "show commits in topological order"
 msgstr "hiển thị các lần chuyển giao theo thứ tự tôpô"
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
 msgid "show only commits not on the first branch"
 msgstr "chỉ hiển thị các lần chuyển giao không nằm trên nhánh đầu tiên"
 
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
 msgid "show merges reachable from only one tip"
 msgstr "hiển thị các lần hòa trộn có thể đ�c được chỉ từ một đầu mút"
 
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
 msgid "topologically sort, maintaining date order where possible"
 msgstr "sắp xếp hình thái h�c, bảo trì thứ tự ngày nếu có thể"
 
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
 msgid "<n>[,<base>]"
 msgstr "<n>[,<cơ_sở>]"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
 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:711
-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:735
+#: 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ệ"
 
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
 msgid "--reflog option needs one branch name"
 msgstr "--reflog cần tên một nhánh"
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "chỉ có thể hiển thị cùng lúc %d hạng mục."
 
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
 #, c-format
 msgid "no such ref %s"
 msgstr "không có tham chiếu nào như thế %s"
 
-#: builtin/show-branch.c:831
+#: 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:835
+#: 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:838
+#: 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)"
@@ -22099,76 +22276,116 @@ 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:227
+#: builtin/sparse-checkout.c:176
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+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: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: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:268
+#: 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:270
+#: 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:290
+#: 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:310
+#: 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:312
+#: 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:340
-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:361
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "gặp lỗi khi mở “%s�"
 
-#: builtin/sparse-checkout.c:419
+#: 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:431
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <các mẫu>)"
-
-#: builtin/sparse-checkout.c:456
+#: 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:510 builtin/sparse-checkout.c:534
+#: 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:579
+#: 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:594
-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: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:613
+#: 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:644
+#: 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"
 
@@ -22192,28 +22409,28 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <tên-nhánh> [<stash>]"
 
-#: builtin/stash.c:29 builtin/stash.c:70
-msgid "git stash clear"
-msgstr "git stash clear"
-
 #: 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 builtin/stash.c:87
+#: 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
@@ -22238,6 +22455,14 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <l�i nhắn>]\n"
 "          [--] [<đặc/tả/đư�ng/dẫn>…]]"
 
+#: builtin/stash.c:87
+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] [<ghi chú>]"
+
 #: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
@@ -22261,7 +22486,7 @@ msgstr "“%s� không phải một tham chiếu hợp lệ"
 msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear với các tham số là chưa được thực hiện"
 
-#: builtin/stash.c:431
+#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -22272,166 +22497,182 @@ msgstr ""
 "            %s -> %s\n"
 "         để như�ng chỗ.\n"
 
-#: builtin/stash.c:492
+#: builtin/stash.c:508
 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"
 
-#: builtin/stash.c:503
+#: builtin/stash.c:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "không thể tạo diff %s^!."
 
-#: builtin/stash.c:510
+#: builtin/stash.c:526
 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."
 
-#: builtin/stash.c:516
+#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "không thể ghi lại cây chỉ mục"
 
-#: builtin/stash.c:525
-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:539
+#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "�ang hòa trộn %s với %s"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "Bảng mục lục đã không được b� stash."
 
-#: builtin/stash.c:591 builtin/stash.c:689
+#: 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: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:635
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "�ã xóa %s (%s)"
 
-#: builtin/stash.c:638
+#: 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:651
+#: 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:701
+#: 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:724
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "Chưa chỉ ra tên của nhánh"
 
-#: builtin/stash.c:808
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "gặp lỗi khi phân tích cây"
 
-#: builtin/stash.c:819
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "gặp lỗi khi tháo dỡ cây"
 
-#: builtin/stash.c:839
+#: 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:842
+#: 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:932 builtin/stash.c:969
+#: 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:950 builtin/stash.c:1606 builtin/stash.c:1671
+#: 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:960
+#: 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:1175
+#: 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:1275
+#: 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:1302
+#: 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:1311
+#: 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:1322 builtin/stash.c:1331
+#: 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:1359
+#: 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:1408
+#: 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:1426
+#: 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:1441
+#: 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:1448
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "Không thể khởi tạo stash"
 
-#: builtin/stash.c:1463
+#: 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:1468
+#: 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:1558
+#: 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:1597 builtin/stash.c:1662
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "giữ nguyên bảng mục lục"
 
-#: builtin/stash.c:1599 builtin/stash.c:1664
+#: 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:1600 builtin/stash.c:1665
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "chế độ im lặng"
 
-#: builtin/stash.c:1602 builtin/stash.c:1667
+#: 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:1604 builtin/stash.c:1669
+#: 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:1704
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -22455,40 +22696,49 @@ 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:47 builtin/submodule--helper.c:2424
+#: 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"
 
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper print-default-remote takes không nhận tham số"
 
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "không thể cắt b� một thành phần ra kh�i “%s� url"
 
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+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:1859
 msgid "alternative anchor for relative paths"
 msgstr "điểm neo thay thế cho các đư�ng dẫn tương đối"
 
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:410
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=</đư�ng/dẫn>] [</đư�ng/dẫn>…]"
 
-#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Không tìm thấy url cho đư�ng dẫn mô-đun-con “%s� trong .gitmodules"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:520
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "�ang vào “%s�\n"
 
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -22497,7 +22747,7 @@ msgstr ""
 "run_command trả v� trạng thái khác không cho %s\n"
 "."
 
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:545
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -22508,78 +22758,69 @@ msgstr ""
 "con lồng nhau của %s\n"
 "."
 
-#: builtin/submodule--helper.c:566
+#: builtin/submodule--helper.c:561
 msgid "suppress output of entering each submodule command"
 msgstr "chặn kết xuất của từng lệnh mô-đun-con"
 
-#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
-#: builtin/submodule--helper.c:1488
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
 msgid "recurse into nested submodules"
 msgstr "đệ quy vào trong mô-đun-con lồng nhau"
 
-#: builtin/submodule--helper.c:573
+#: builtin/submodule--helper.c:568
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--]  <lệnh>"
 
-#: builtin/submodule--helper.c:600
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-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:667
+#: builtin/submodule--helper.c:642
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Gặp lỗi khi đăng ký url cho đư�ng dẫn mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:646
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Mô-đun-con “%s� (%s) được đăng ký cho đư�ng dẫn “%s�\n"
 
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:656
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "cảnh báo: chế độ lệnh cập nhật được gợi ý cho mô-đun-con “%s�\n"
 
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:663
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "Gặp lỗi khi đăng ký chế độ cập nhật cho đư�ng dẫn mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:710
+#: builtin/submodule--helper.c:685
 msgid "suppress output for initializing a submodule"
 msgstr "chặn kết xuất của khởi tạo một mô-đun-con"
 
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<các tùy ch�n>] [</đư�ng/dẫn>]"
 
-#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 "không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đư�ng dẫn "
 "“%s�"
 
-#: builtin/submodule--helper.c:836
+#: builtin/submodule--helper.c:811
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "không thể phân giải tham chiếu HEAD bên trong mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "gặp lỗi khi đệ quy vào trong mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
+#: 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"
 
-#: builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:863
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -22587,112 +22828,107 @@ msgstr ""
 "dùng lần chuyển giao lưu trong mục lục thay cho cái được lưu trong HEAD mô-"
 "Ä‘un-con"
 
-#: builtin/submodule--helper.c:894
+#: builtin/submodule--helper.c:869
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 "git submodule status [--quiet] [--cached] [--recursive] [</đư�ng/dẫn>…]"
 
-#: builtin/submodule--helper.c:918
+#: builtin/submodule--helper.c:893
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name </đư�ng/dẫn>"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:965
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr ""
 "* %s %s(blob)->%s(\n"
 ")"
 
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:968
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(mô-đun-con)->%s(blob)"
 
-#: builtin/submodule--helper.c:1006
+#: builtin/submodule--helper.c:981
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1056
+#: builtin/submodule--helper.c:1031
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "không thể băm đối tượng từ “%s�"
 
-#: builtin/submodule--helper.c:1060
+#: builtin/submodule--helper.c:1035
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "gặp chế độ không như mong ch� %o\n"
 
-#: builtin/submodule--helper.c:1301
+#: builtin/submodule--helper.c:1276
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr "hùng lần chuyển giao đã lưu trong mục lục thay cho HEAD mô-đun-con"
 
-#: builtin/submodule--helper.c:1303
-msgid "to compare the commit in the index with that in the submodule HEAD"
-msgstr ""
-"để so sánh lần chuyển giao lưu trong mục lục với cái trong HEAD mô-đun-con"
+#: builtin/submodule--helper.c:1278
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "để so sánh lần trong mục lục với cái trong HEAD mô-đun-con"
 
-#: builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1280
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr ""
 "b� qua các mô-đun-con với giá trị của “ignore_config� được đặt thành “all�"
 
-#: builtin/submodule--helper.c:1307
+#: builtin/submodule--helper.c:1282
 msgid "limit the summary size"
 msgstr "giới hạn kích cỡ tổng hợp"
 
-#: builtin/submodule--helper.c:1312
+#: builtin/submodule--helper.c:1287
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr ""
 "git submodule--helper summary [<các tùy ch�n>] [<lần_chuyển_giao>] [--] [</"
 "đư�ng/dẫn>]"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1311
 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:1341
-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:1408
+#: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Url mô-đun-con đồng bộ hóa cho “%s�\n"
 
-#: builtin/submodule--helper.c:1414
+#: builtin/submodule--helper.c:1379
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "gặp lỗi khi đăng ký url cho đư�ng dẫn mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c:1393
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "gặp lỗi khi lấy máy chủ mặc định cho mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:1439
+#: builtin/submodule--helper.c:1404
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "gặp lỗi khi cập nhật cho mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:1486
+#: builtin/submodule--helper.c:1451
 msgid "suppress output of synchronizing submodule url"
 msgstr "chặn kết xuất của url mô-đun-con đồng bộ"
 
-#: builtin/submodule--helper.c:1493
+#: builtin/submodule--helper.c:1458
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [</đư�ng/dẫn>]"
 
-#: builtin/submodule--helper.c:1547
+#: 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:1559
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22701,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:1567
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "�ã xóa thư mục “%s�\n"
 
-#: builtin/submodule--helper.c:1569
+#: 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:1580
+#: 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:1596
+#: 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:1625
+#: 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:1626
+#: 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:1631
+#: 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:1645
+#: 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:1714
+#: 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"
@@ -22754,154 +22990,253 @@ msgstr ""
 "bằng\n"
 "“--reference-if-able� thay vì dùng “--reference�."
 
-#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756
+#: 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:1792
+#: 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:1799
+#: 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:1823
+#: 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: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:1818
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "thư mục không trống: “%s�"
+
+#: 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: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:1826
+#: 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:1829
+#: 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:1837
+#: 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:1840 builtin/submodule--helper.c:2349
+#: 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:1842 builtin/submodule--helper.c:2351
+#: 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:1849
+#: 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=</đư�ng/dẫn>] [--quiet] [--reference "
-"<kho>] [--name <tên>] [--depth <sâu>] [--single-branch] [--url <url>] --path "
-"</đư�ng/dẫn>"
-
-#: builtin/submodule--helper.c:1874
-#, 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:1885
-#, 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:1889
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "thư mục không trống: “%s�"
-
-#: builtin/submodule--helper.c:1901
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "không thể lấy thư mục mô-đun-con cho “%s�"
+"<kho>] [--name <tên>] [--depth <sâu>] [--single-branch] --url <url> --path </"
+"đư�ng/dẫn>"
 
-#: builtin/submodule--helper.c:1937
+#: 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:1941
+#: 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:2042
+#: 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:2046
+#: 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:2076
+#: 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:2105
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "B� qua mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:2255
+#: 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:2266
+#: 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:2328 builtin/submodule--helper.c:2574
+#: 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: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: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: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: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: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: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: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: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:2454
+#, c-format
+msgid ""
+"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
+"of that commit failed."
+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: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:2331
+#: 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:2335
+#: 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:2341
+#: 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:2344
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "công việc đồng th�i"
 
-#: builtin/submodule--helper.c:2346
+#: 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:2347
+#: 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:2358
+#: 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:2371
+#: 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:2419
+#: 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:2567
+msgid "force checkout updates"
+msgstr "ép buộc lấy ra các cập nhật"
+
+#: 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: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:2572
+msgid "depth for shallow fetch"
+msgstr "chi�u sâu lịch sử muốn lấy v�"
+
+#: builtin/submodule--helper.c:2582
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2583
+msgid "SHA1 expected by superproject"
+msgstr "SHA1 là cần thiết cho superproject"
+
+#: builtin/submodule--helper.c:2585
+msgid "subsha1"
+msgstr "subsha1"
+
+#: 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: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:2663
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22910,86 +23245,190 @@ 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:2542
+#: 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:2575
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "đệ quy vào trong mô-đun-con"
 
-#: builtin/submodule--helper.c:2581
+#: 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:2637
+#: 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:2640
+#: 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:2645
+#: 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:2646
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <tên>"
 
-#: builtin/submodule--helper.c:2647
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2666 git-submodule.sh:150
-#, sh-format
+#: 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:2682
+#: 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:2686
+#: 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:2719
+#: 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:2721
+#: 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:2725
+#: 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:2726
+#: 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:2733
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "cần --branch hoặc --default"
 
-#: builtin/submodule--helper.c:2736
-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: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: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: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: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 ""
+"Nếu bạn muốn sử dụng lại thư mục git nội bộ này thay vì nhân bản lại lần nữa "
+"từ\n"
+"  %s\n"
+"dùng tùy ch�n “--force�. Nếu thư mục git nội bộ không phải là một kho đúng "
+"hoặc\n"
+"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:2793 git.c:449 git.c:724
+#: 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:3110
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "không thể lấy ra mô-đun-con “%s�"
+
+#: 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: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: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: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: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: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: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: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: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: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: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: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: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: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:2799
+#: 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ệ"
@@ -23014,21 +23453,21 @@ msgstr "xóa tham chiếu m�m"
 msgid "shorten ref output"
 msgstr "làm ngắn kết xuất ref (tham chiếu)"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "lý do"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr "lý do cập nhật"
 
 #: builtin/tag.c:25
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+"        <tagname> [<head>]"
 msgstr ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <tập-tin>]\n"
-"\t\t<tên-thẻ> [<head>]"
+"        <tên-thẻ> [<head>]"
 
 #: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
@@ -23038,12 +23477,12 @@ msgstr "git tag -d <tên-thẻ>…"
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
 "[<pattern>...]"
 msgstr ""
 "git tag -l [-n[<số>]] [--contains <lần_chuyển_giao>] [--no-contains "
 "<lần_chuyển_giao>] [--points-at <đối-tượng>]\n"
-"\t\t[--format=<định_dạng>] [--merged <lần_chuyển_giao>] [--no-merged "
+"        [--format=<định_dạng>] [--merged <lần_chuyển_giao>] [--no-merged "
 "[<lần_chuyển_giao>]] [<mẫu>…]"
 
 #: builtin/tag.c:30
@@ -23088,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"
@@ -23105,135 +23544,111 @@ 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:328
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "không có chú thích gì cho cho thẻ à?"
 
-#: builtin/tag.c:335
+#: 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"
 
-#: builtin/tag.c:446
+#: builtin/tag.c:444
 msgid "list tag names"
 msgstr "chỉ liệt kê tên các thẻ"
 
-#: builtin/tag.c:448
+#: builtin/tag.c:446
 msgid "print <n> lines of each tag message"
 msgstr "hiển thị <n> dòng cho mỗi ghi chú"
 
-#: builtin/tag.c:450
+#: builtin/tag.c:448
 msgid "delete tags"
 msgstr "xóa thẻ"
 
-#: builtin/tag.c:451
+#: builtin/tag.c:449
 msgid "verify tags"
 msgstr "thẩm tra thẻ"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:451
 msgid "Tag creation options"
 msgstr "Tùy ch�n tạo thẻ"
 
-#: builtin/tag.c:455
+#: builtin/tag.c:453
 msgid "annotated tag, needs a message"
 msgstr "để chú giải cho thẻ, cần một l�i ghi chú"
 
-#: builtin/tag.c:457
+#: builtin/tag.c:455
 msgid "tag message"
 msgstr "phần chú thích cho thẻ"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:457
 msgid "force edit of tag message"
 msgstr "ép buộc sửa thẻ lần commit"
 
-#: builtin/tag.c:460
+#: builtin/tag.c:458
 msgid "annotated and GPG-signed tag"
 msgstr "thẻ chú giải và ký kiểu GPG"
 
-#: builtin/tag.c:463
+#: builtin/tag.c:461
 msgid "use another key to sign the tag"
 msgstr "dùng kháo khác để ký thẻ"
 
-#: builtin/tag.c:464
+#: builtin/tag.c:462
 msgid "replace the tag if exists"
 msgstr "thay thế nếu thẻ đó đã có trước"
 
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "tạo một reflog"
 
-#: builtin/tag.c:467
+#: builtin/tag.c:465
 msgid "Tag listing options"
 msgstr "Các tùy ch�n liệt kê thẻ"
 
-#: builtin/tag.c:468
+#: builtin/tag.c:466
 msgid "show tag list in columns"
 msgstr "hiển thị danh sách thẻ trong các cột"
 
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
 msgid "print only tags that contain the commit"
 msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
 
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that don't contain the commit"
 msgstr "chỉ hiển thị những thẻ mà nó không chứa lần chuyển giao"
 
-#: builtin/tag.c:473
+#: builtin/tag.c:471
 msgid "print only tags that are merged"
 msgstr "chỉ hiển thị những thẻ mà nó được hòa trộn"
 
-#: builtin/tag.c:474
+#: builtin/tag.c:472
 msgid "print only tags that are not merged"
 msgstr "chỉ hiển thị những thẻ mà nó không được hòa trộn"
 
-#: builtin/tag.c:478
+#: builtin/tag.c:476
 msgid "print only tags of the object"
 msgstr "chỉ hiển thị các thẻ của đối tượng"
 
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column và -n xung khắc nhau"
-
-#: builtin/tag.c:548
-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:550
-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:552
-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:554
-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:556
-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:567
-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:592
+#: 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:597
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "thẻ “%s� đã tồn tại rồi"
 
-#: builtin/tag.c:628
+#: 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"
@@ -23247,201 +23662,196 @@ msgstr "�ang giải nén các đối tượng"
 msgid "failed to create directory %s"
 msgstr "tạo thư mục \"%s\" gặp lỗi"
 
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "gặp lỗi khi tạo tập tin %s"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "gặp lỗi khi xóa tập tin %s"
 
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "gặp lỗi khi xóa thư mục %s"
 
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "�ang kiểm thử mtime trong “%s� "
 
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
 msgstr "thông tin thống kê thư mục không thay đổi sau khi thêm tập tin mới"
 
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
 msgid "directory stat info does not change after adding a new directory"
 msgstr "thông tin thống kê thư mục không thay đổi sau khi thêm thư mục mới"
 
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
 msgid "directory stat info changes after updating a file"
 msgstr "thông tin thống kê thư mục thay đổi sau khi cập nhật tập tin"
 
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "thông tin thống kê thư mục thay đổi sau khi thêm tập tin mới vào trong thư "
 "mục con"
 
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
 msgid "directory stat info does not change after deleting a file"
 msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa tập tin"
 
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
 msgid "directory stat info does not change after deleting a directory"
 msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa thư mục"
 
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
 msgid " OK"
 msgstr " �ồng ý"
 
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<các tùy ch�n>] [--] [<tập-tin>…]"
 
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr "tiếp tục làm mới ngay cả khi bảng mục lục cần được cập nhật"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "refresh: l� đi mô-đun-con"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "không b� qua các tập tin mới tạo"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "để các tập tin thay thế các thư mục và “vice-versa�"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "thông báo các tập-tin thiếu trong thư-mục làm việc"
 
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 "làm tươi mới thậm chí khi bảng mục lục chứa các mục tin chưa được hòa trộn"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "lấy lại thông tin thống kê"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "giống --refresh, nhưng b� qua các cài đặt “assume-unchanged�"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<chế_độ>,<đối_tượng>,<đư�ng_dẫn>"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục"
 
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "đánh dấu các tập tin là \"không thay đổi\""
 
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)"
 
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "đánh dấu các tập tin là “chỉ-đ�c�"
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "xóa bít skip-worktree"
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
 msgid "do not touch index-only entries"
 msgstr "đừng động vào các mục index-only"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "chỉ thêm vào bảng mục lục; không thêm nội dung vào cơ sở dữ liệu đối tượng"
 
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "gỡ b� các đư�ng dẫn được đặt tên thậm chí cả khi nó hiện diện trong thư mục "
 "làm việc"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "với tùy ch�n --stdin: các dòng đầu vào được chấm dứt bởi ký tự null"
 
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "đ�c danh sách đư�ng dẫn cần cập nhật từ đầu vào tiêu chuẩn"
 
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "không thể đ�c các mục từ đầu vào tiêu chuẩn vào bảng mục lục"
 
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "phục hồi các trạng thái #2 và #3 cho các đư�ng dẫn được liệt kê"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "chỉ cập nhật các mục tin mà nó khác biệt so với HEAD"
 
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "b� qua các tập-tin thiếu trong thư-mục làm việc"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "báo cáo các thao tác ra thiết bị xuất chuẩn"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(cho “porcelains�) quên các xung đột chưa được giải quyết đã ghi"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "ghi mục lục ở định dạng này"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "bật/tắt chia cắt bảng mục lục"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "bật/tắt bộ đệm không theo vết"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "kiểm tra xem hệ thống tập tin có hỗ trợ đệm không theo dõi hay không"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "bật bộ đệm không theo vết mà không kiểm tra hệ thống tập tin"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "ghi ra mục lục ngay cả khi không được đánh c� là có thay đổi"
 
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "bật/tắt theo dõi hệ thống tập tin"
 
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "đánh dấu các tập tin là hợp lệ fsmonitor"
 
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "xóa bít hợp lệ fsmonitor"
 
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -23449,7 +23859,7 @@ msgstr ""
 "core.splitIndex được đặt là sai; xóa b� hay thay đổi nó, nếu bạn thực sự "
 "muốn bật chia tách mục lục"
 
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -23457,7 +23867,7 @@ msgstr ""
 "core.splitIndex được đặt là đúng; xóa b� hay thay đổi nó, nếu bạn thực sự "
 "muốn tắt chia tách mục lục"
 
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -23465,11 +23875,11 @@ msgstr ""
 "core.untrackedCache được đặt là đúng; xóa b� hay thay đổi nó, nếu bạn thực "
 "sự muốn tắt bộ đệm chưa theo dõi"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Nhớ đệm không theo vết bị tắt"
 
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -23477,29 +23887,29 @@ msgstr ""
 "core.untrackedCache được đặt là sai; xóa b� hay thay đổi nó, nếu bạn thực sự "
 "muốn bật bộ đệm chưa theo dõi"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Nhớ đệm không theo vết được bật cho “%s�"
 
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 "core.fsmonitor chưa được đặt; đặt nó nếu bạn thực sự muốn bật theo dõi hệ "
 "thống tập tin"
 
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "fsmonitor được bật"
 
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 "core.fsmonitor đã được đặt; b� đặt nó nếu bạn thực sự muốn bật theo dõi hệ "
 "thống tập tin"
 
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "fsmonitor bị tắt"
 
@@ -23515,19 +23925,19 @@ msgstr "git update-ref [<các tùy ch�n>]    <refname> <biến-mới> [<biến
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<các tùy ch�n>] --stdin [-z]"
 
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "xóa tham chiếu"
 
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
 msgstr "cập nhật <tên-tham-chiếu> không phải cái nó chỉ tới"
 
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "đầu vào tiêu chuẩn có các đối số được chấm dứt bởi NUL"
 
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "đ�c cập nhật từ đầu vào tiêu chuẩn"
 
@@ -23543,19 +23953,19 @@ msgstr "cập nhật các tập tin thông tin từ điểm xuất phát"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<các tùy ch�n>] </đư�ng/dẫn>"
 
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
 msgid "quit after a single request/response exchange"
 msgstr "thoát sau khi một trao đổi yêu cầu hay trả l�i đơn"
 
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "thoát ngay sau khi khởi tạo quảng cáo tham chiếu"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "phục vụ info/refs (thông tin/tham chiếu) cho git-http-backend"
 
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "đừng thử <thư_mục>/.git/ nếu <thư_mục> không phải là thư mục Git"
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "ngắt truy�n thông sau <n> giây không hoạt động"
 
@@ -23591,63 +24001,58 @@ msgstr "git verify-tag [-v | --verbose] [--format=<định_dạng>] <thẻ>…"
 msgid "print tag contents"
 msgstr "hiển thị nội dung của thẻ"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<các tùy ch�n>] </đư�ng/dẫn> [<commit-ish>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<các tùy ch�n>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<các tùy ch�n>] </đư�ng/dẫn>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <worktree> </đư�ng/dẫn/mới>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<các tùy ch�n>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<các tùy ch�n>] <worktree>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock </đư�ng/dẫn>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:935
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "gặp lỗi khi xóa “%s�"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "�ang xóa %s/%s: %s"
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
 msgid "report pruned working trees"
 msgstr "báo cáo các cây làm việc đã prune"
 
-#: builtin/worktree.c:151
+#: builtin/worktree.c:150
 msgid "expire working trees older than <time>"
 msgstr "các cây làm việc hết hạn cũ hơn khoảng <th�i gian>"
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c:220
 #, c-format
 msgid "'%s' already exists"
 msgstr "“%s� đã có từ trước rồi"
 
-#: builtin/worktree.c:230
+#: builtin/worktree.c:229
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "đích cây làm việc không sử dụng được “%s�"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -23656,7 +24061,7 @@ msgstr ""
 "“%s� bị mất nhưng cây làm việc bị khóa;\n"
 "dùng “%s -f -f� để ghi đè, hoặc “unlock� và “prune� hay “remove� để xóa"
 
-#: builtin/worktree.c:237
+#: builtin/worktree.c:236
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -23665,27 +24070,31 @@ msgstr ""
 "“%s� bị mất nhưng cây làm việc đã được đăng ký;\n"
 "dùng “%s -f� để ghi đè, hoặc “prune� hay “remove� để xóa"
 
-#: builtin/worktree.c:288
+#: builtin/worktree.c:287
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "không thể tạo thư mục của “%s�"
 
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+msgid "initializing"
+msgstr "khởi tạo"
+
+#: 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:424
+#: 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:433
+#: 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:439
+#: 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�)"
@@ -23710,84 +24119,80 @@ msgstr "di chuyển cây làm việc mới"
 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:492 builtin/worktree.c:729
+msgid "reason for locking"
+msgstr "lý do khóa"
+
+#: 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:496
+#: 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:504
-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:512
+msgid "added with --lock"
+msgstr "được thêm với --lock"
 
-#: builtin/worktree.c:565
+#: 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:682
+#: 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:684
+#: 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ê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:693
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose và --porcelain loại từ lẫn nhau"
-
-#: builtin/worktree.c:720
-msgid "reason for locking"
-msgstr "lý do khóa"
-
-#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
-#: builtin/worktree.c:963
+#: 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:734 builtin/worktree.c:767
+#: 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:739
+#: 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:741
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "“%s� đã được khóa rồi"
 
-#: builtin/worktree.c:769
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "“%s� chưa bị khóa"
 
-#: builtin/worktree.c:810
+#: 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:818
+#: 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:841 builtin/worktree.c:965
+#: 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:846
+#: 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:859
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -23796,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:861
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -23804,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:864
+#: 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:869
+#: 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:915
+#: 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:919
+#: 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:924
+#: 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:947
+#: 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:970
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -23844,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:972
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -23852,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:975
+#: 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:999
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "sửa chữa: %s: %s"
 
-#: builtin/worktree.c:1002
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "lá»—i: %s: %s"
@@ -23915,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"
@@ -23945,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"
@@ -23979,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:833
+#: 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:883
+#: 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:896
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -24011,33 +24406,25 @@ msgstr ""
 "cách dùng: %s\n"
 "\n"
 
-#: git.c:916
+#: 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:928
+#: 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ý"
@@ -24063,66 +24450,32 @@ msgstr "test-tool serve-v2 [<các tùy ch�n>]"
 msgid "exit immediately after advertising capabilities"
 msgstr "thoát ngay sau khi khởi tạo quảng cáo capabilities"
 
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "socket/pipe đã đang được sử dụng rồi: '%s'"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "không thể khởi động máy phục vụ lên: “%s�"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "không thể sinh ra daemon trong n�n"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "waitpid gặp lỗi"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "\"daemon\" vẫn chưa trực tuyến"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "daemon gặp lỗi khi khởi động"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid là chưa rõ ràng"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "\"daemon\" vẫn chưa được tắt đi"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
 msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
 msgstr "test-helper simple-ipc is-active    [<tên>] [<các tùy ch�n>]"
 
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
 msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
 msgstr "test-helper simple-ipc run-daemon   [<tên>] [<các tiến trình>]"
 
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
 msgstr ""
 "test-helper simple-ipc start-daemon [<tên>] [<các tiến trình>] [<ch� tối đa>]"
 
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
 msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
 msgstr "test-helper simple-ipc stop-daemon  [<tên>] [<ch� tối đa>]"
 
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
 msgid "test-helper simple-ipc send         [<name>] [<token>]"
 msgstr "test-helper simple-ipc send         [<tên>] [<thẻ>]"
 
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
 msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
 msgstr "test-helper simple-ipc sendbytes    [<tên>] [<số lượng byte>] [<byte>]"
 
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
 msgid ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
@@ -24130,87 +24483,83 @@ msgstr ""
 "test-helper simple-ipc multiple     [<tên>] [<các tiến trình>] [<số lượng "
 "byte>] [<cỡ bó>]"
 
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
 msgid "name or pathname of unix domain socket"
 msgstr "tên hoặc tên đư�ng dẫn của ổ cắm mi�n unix"
 
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
 msgid "named-pipe name"
 msgstr "tên named-pipe"
 
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
 msgid "number of threads in server thread pool"
 msgstr "số lượng tiến trình trong kho tiến trình máy phục vụ"
 
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
 msgid "seconds to wait for daemon to start or stop"
 msgstr "số giây mà dịch vụ chạy n�n ch� khi khởi động hoặc dừng"
 
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
 msgid "number of bytes"
 msgstr "số lượng byte"
 
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
 msgid "number of requests per thread"
 msgstr "số lượng yêu cầu mỗi tiến trình"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "byte"
 msgstr "byte"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "ballast character"
 msgstr "ký tự ballast"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "token"
 msgstr "thẻ bài"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "command token to send to the server"
 msgstr "thẻ bài lệnh để gửi lên cho máy phục vụ"
 
-#: http.c:399
+#: http.c:350
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "giá trị âm cho http.postbuffer; đặt thành mặc định là %d"
 
-#: http.c:420
+#: http.c:371
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "�i�u khiển giao quy�n không được hỗ trợ với cURL < 7.22.0"
 
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Chốt khóa công không được hỗ trợ với cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "Chốt khóa công không được hỗ trợ với cURL < 7.39.0"
 
-#: http.c:910
+#: http.c:812
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "CURLSSLOPT_NO_REVOKE không được hỗ trợ với cURL < 7.44.0"
 
-#: http.c:989
-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"
-
-#: http.c:1132
+#: http.c:1016
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr ""
 "Không hỗ trợ ứng dụng SSL chạy phía sau “%s�. Hỗ trợ ứng dụng SSL chạy phía "
 "sau:"
 
-#: http.c:1139
+#: http.c:1023
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 "Không thể đặt ứng dụng chạy SSL phía sau “%s�: cURL được biên dịch không có "
 "sự hỗ trợ ứng dụng chạy phía sau SSL"
 
-#: http.c:1143
+#: http.c:1027
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "Không thể đặt ứng dụng chạy sau SSL cho “%s�: đã đặt rồi"
 
-#: http.c:2035
+#: http.c:1876
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -24226,135 +24575,309 @@ msgstr ""
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "sai trích dẫn trong giá trị push-option :“%s�"
 
-#: remote-curl.c:307
+#: remote-curl.c:304
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs không hợp lệ: đây có phải là một kho git?"
 
-#: remote-curl.c:408
+#: remote-curl.c:405
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 "đáp ứng từ máy phục vụ không hợp lệ; cần dịch vụ, nhưng lại nhận được gói "
 "flush"
 
-#: remote-curl.c:439
+#: remote-curl.c:436
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "trả v� của máy phục vụ không hợp lệ; nhận được %s"
 
-#: remote-curl.c:499
+#: remote-curl.c:496
 #, c-format
 msgid "repository '%s' not found"
 msgstr "không tìm thấy kho “%s�"
 
-#: remote-curl.c:503
+#: remote-curl.c:500
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Xác thực gặp lỗi cho “%s�"
 
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "không thể truy cập “%s� với cấu hình http.pinnedPubkey: %s"
+
+#: remote-curl.c:508
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "không thể truy cập “%s�: %s"
 
-#: remote-curl.c:513
+#: remote-curl.c:514
 #, c-format
 msgid "redirecting to %s"
 msgstr "chuyển hướng đến %s"
 
-#: remote-curl.c:642
+#: remote-curl.c:645
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "không nên có EOF khi không gentle trên EOF"
 
-#: remote-curl.c:654
-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"
+#: remote-curl.c:657
+msgid "remote server sent unexpected response end packet"
+msgstr "máy phục vụ gửi gói kết thúc không cần"
 
-#: remote-curl.c:724
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr "không thể tua lại dữ liệu post rpc - thử tăng http.postBuffer"
 
-#: remote-curl.c:754
+#: remote-curl.c:755
 #, c-format
 msgid "remote-curl: bad line length character: %.4s"
 msgstr "remote-curl: ký tự chi�u dài dòng bị sai: %.4s"
 
-#: remote-curl.c:756
+#: remote-curl.c:757
 msgid "remote-curl: unexpected response end packet"
 msgstr "remote-curl: gặp đáp ứng là gói kết thúc bất ng�"
 
-#: remote-curl.c:832
+#: remote-curl.c:833
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC gặp lỗi; %s"
 
-#: remote-curl.c:872
+#: remote-curl.c:873
 msgid "cannot handle pushes this big"
 msgstr "không thể xử lý đẩy cái lớn này"
 
-#: remote-curl.c:987
+#: remote-curl.c:986
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "không thể giải nén yêu cầu; có lỗi khi giải nén của zlib %d"
 
-#: remote-curl.c:991
+#: remote-curl.c:990
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "không thể giải nén yêu cầu; có lỗi ở cuối %d"
 
-#: remote-curl.c:1041
+#: remote-curl.c:1040
 #, c-format
 msgid "%d bytes of length header were received"
 msgstr "đã nhận v� phần đầu có chi�u dài %d byte"
 
-#: remote-curl.c:1043
+#: remote-curl.c:1042
 #, c-format
 msgid "%d bytes of body are still expected"
 msgstr "phần thân vẫn còn cần %d byte"
 
-#: remote-curl.c:1132
+#: remote-curl.c:1131
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "đổ vận chuyển http không hỗ trợ khả năng nông"
 
-#: remote-curl.c:1147
+#: remote-curl.c:1146
 msgid "fetch failed."
 msgstr "lấy v� gặp lỗi."
 
-#: remote-curl.c:1193
+#: remote-curl.c:1192
 msgid "cannot fetch by sha1 over smart http"
 msgstr "không thể lấy v� bằng sha1 thông qua smart http"
 
-#: remote-curl.c:1237 remote-curl.c:1243
+#: remote-curl.c:1236 remote-curl.c:1242
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "lỗi giao thức: cần sha/ref, nhưng lại nhận được “%s�"
 
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1254 remote-curl.c:1372
 #, c-format
 msgid "http transport does not support %s"
 msgstr "vận chuyển http không hỗ trợ %s"
 
-#: remote-curl.c:1291
+#: remote-curl.c:1290
 msgid "git-http-push failed"
 msgstr "git-http-push gặp lỗi"
 
-#: remote-curl.c:1479
+#: remote-curl.c:1478
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: usage: git remote-curl <máy chủ> [<url>]"
 
-#: remote-curl.c:1511
+#: remote-curl.c:1510
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl: gặp lỗi khi đ�c luồng dữ liệu lệnh từ git"
 
-#: remote-curl.c:1518
+#: remote-curl.c:1517
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: đã cố gắng fetch mà không có kho nội bộ"
 
-#: remote-curl.c:1559
+#: remote-curl.c:1558
 #, c-format
 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"
@@ -24371,11 +24894,11 @@ msgstr "các_tham_số"
 msgid "object filtering"
 msgstr "l�c đối tượng"
 
-#: parse-options.h:184
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "ngày hết hạn"
 
-#: parse-options.h:198
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "no-op (tương thích ngược)"
 
@@ -24406,11 +24929,11 @@ 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:99
+#: ref-filter.h:98
 msgid "key"
 msgstr "khóa"
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "tên trư�ng cần sắp xếp"
 
@@ -24482,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"
@@ -24696,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 ""
@@ -24754,397 +25277,362 @@ 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"
 msgstr "Tổng quan v� luồng công việc khuyến nghị nên dùng với Git"
 
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "bisect chạy gặp lỗi: không đưa ra lệnh."
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "đang chạy lệnh $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"chạy bisect gặp lỗi:\n"
-"mã trả v� $res từ lệnh “$command� là < 0 hoặc >= 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "bisect không thể tiếp tục thêm được nữa"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"chạy bisect gặp lỗi:\n"
-"�bisect-state $state� đã thoát ra với mã lỗi $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "bisect chạy thành công"
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -25185,101 +25673,19 @@ msgstr "�ang thử hòa trộn đơn giản với $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Hòa trộn đơn giản không làm việc, thử hòa trộn tự động."
 
-#: git-submodule.sh:179
-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"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr ""
-"repo URL: “$repo� phải là đư�ng dẫn tuyệt đối hoặc là bắt đầu bằng ./|../"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "�$sm_path� thực sự đã tồn tại ở bảng mục lục rồi"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr ""
-"�$sm_path� 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"
-
-#: git-submodule.sh:218
-#, sh-format
-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"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "�ang thêm repo có sẵn tại “$sm_path� vào bảng mục lục"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "�$sm_path� đã tồn tại từ trước và không phải là một kho git hợp lệ"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-"Thư mục git cho “$sm_name� được tìm thấy một cách cục bộ với các máy chủ:"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-"  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"Nếu bạn muốn sử dụng lại thư mục nội bộ này thay vì nhân bản lại lần nữa từ\n"
-"  $realrepo\n"
-"dùng tùy ch�n “--force�. Nếu thư mục git nội bộ không phải là một kho đúng\n"
-"hoặc 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�."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr ""
-"Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “$sm_name�."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Không thể lấy ra mô-đun-con “$sm_path�"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Gặp lỗi khi thêm mô-đun-con “$sm_path�"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun-con “$sm_path�"
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "Không tìm thấy điểm xét duyệt hiện hành trong đư�ng dẫn mô-đun-con "
 "“$displaypath�"
 
-#: git-submodule.sh:578
+#: git-submodule.sh:411
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Không thể lấy v� trong đư�ng dẫn mô-đun-con “$sm_path�"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:416
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25288,465 +25694,56 @@ msgstr ""
 "Không thể tìm thấy điểm xét duyệt hiện hành ${remote_name}/${branch} trong "
 "đư�ng dẫn mô-đun-con “$sm_path�"
 
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr ""
-"Không thể lấy v� trong đư�ng dẫn mô-đun-con “$displaypath�; thử lấy v� trực "
-"tiếp $sha1:"
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"�ã lấy v� từ đư�ng dẫn mô-đun con “$displaypath�, nhưng nó không chứa $sha1. "
-"Lấy v� theo định hướng của lần chuyển giao đó gặp lỗi."
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Không thể lấy ra “$sha1� trong đư�ng dẫn mô-đun-con “$displaypath�"
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: đã checkout “$sha1�"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "Không thể cải tổ “$sha1� trong đư�ng dẫn mô-đun-con “$displaypath�"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: được rebase vào trong “$sha1�"
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"Không thể hòa trộn (merge) “$sha1� trong đư�ng dẫn mô-đun-con “$displaypath�"
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: được hòa trộn vào “$sha1�"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr ""
-"Thực hiện không thành công lệnh “$command $sha1� trong đư�ng dẫn mô-đun-con "
-"“$displaypath�"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: “$command $sha1�"
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Gặp lỗi khi đệ quy vào trong đư�ng dẫn mô-đun-con “$displaypath�"
 
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "�ã áp dụng autostash."
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Không thể lưu $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "�ang rebase ($new_count/$total)"
-
-#: git-rebase--preserve-merges.sh:197
-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"
-
-#: git-rebase--preserve-merges.sh:260
-#, 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 ""
-"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"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1: không phải là lần chuyển giao mà có thể lấy ra được"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "Tên lần chuyển giao không hợp lệ: $sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "Không thể ghi lại sha1 thay thế của lần chuyển giao"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "Chuyển-tiếp-nhanh đến $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "Không thể chuyển-tiếp-nhanh đến $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "Không thể di chuyển HEAD đến $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "Từ chối squash lần hòa trộn: $sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "Gặp lỗi khi hoàn lại bước hòa trộn $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "Không thể lấy ra $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "�ây là chú thích cho lần chuyển giao thứ #${n}:"
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "Chú thích cho lần chuyển giao thứ #${n} sẽ bị b� qua:"
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "�ây là tổ hợp của $count lần chuyển giao."
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "Không thể $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "�ây là tổ hợp của 2 lần chuyển giao."
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "Không thể áp dụng $sha1… $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, 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 ""
-"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."
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "Bị dừng tại $sha1_abbrev… $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Không “$squash_style� thể mà không có lần chuyển giao kế trước"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "�ang thực thi: $rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "Thực thi gặp lỗi: $rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc"
-
-#: git-rebase--preserve-merges.sh:685
-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"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, 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 ""
-"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"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "Lệnh chưa biết: $command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo�."
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "Cài tổ và cập nhật $head_name một cách thành công."
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Không thể xóa b� CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, 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 ""
-"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"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "Lỗi khi cố tìm định danh của tác giả để tu bổ lần chuyển giao"
-
-#: git-rebase--preserve-merges.sh:829
-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."
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "Không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "Không thể thực thi trình biên soạn"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "Không thể lấy ra $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "Không HEAD?"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "Không thể tạo thư mục tạm th�i $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "Không thể đánh dấu là tương tác"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "Cải tổ $shortrevisions vào $shortonto (các lệnh $todocount)"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "Không thể khởi tạo các lần chuyển giao ghi lại"
-
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 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
-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."
-
-#: git-sh-setup.sh:224
+#: 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:227
-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."
-
-#: git-sh-setup.sh:230
+#: 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:243
-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."
-
-#: git-sh-setup.sh:246
-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."
-
-#: git-sh-setup.sh:249
+#: 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:253
+#: 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:373
+#: 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:378
+#: 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"
 
@@ -25827,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"
@@ -25842,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"
@@ -25856,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"
@@ -25872,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"
@@ -25886,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"
@@ -25900,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"
@@ -25914,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"
@@ -25928,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"
@@ -25942,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"
@@ -25964,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"
@@ -26065,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:138
+#: 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:145 git-send-email.perl:151
+#: 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:222
+#: 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"
+msgstr "lỗi nghiêm tr�ng: lệnh “%s� chết với mã thoát %d"
 
-#: git-send-email.perl:235
+#: 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:321
+#: 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:326
+#: 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:419
+#: 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:493
+#: 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"
@@ -26124,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:498 git-send-email.perl:700
+#: 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:501
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -26136,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:514
+#: 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:545
+#: 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:573
+#: 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:575
+#: 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:577
+#: 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:582
+#: 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:666
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26181,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:687
+#: 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:720
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26196,17 +26193,17 @@ msgstr ""
 "Chưa chỉ định các tập tin miếng vá!\n"
 "\n"
 
-#: git-send-email.perl:733
+#: 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:743
+#: 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:754
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26220,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:778
+#: 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:795
+#: 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:838
+#: 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:873
+#: 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:928
+#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -26248,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:933
+#: 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:941
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26265,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:960
+#: 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:978
+#: 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:990
+#: 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:1048 git-send-email.perl:1056
+#: 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"
@@ -26286,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:1060
+#: 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:1377
+#: 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:1460
+#: 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"
@@ -26322,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:1475
+#: 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:1478
+#: 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:1506
+#: 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:1553
+#: 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:1558 git-send-email.perl:1562
+#: 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:1571
+#: 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:1589
+#: 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:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Thá»­ gá»­i %s\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Gá»­i %s\n"
 
-#: git-send-email.perl:1594
+#: 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:1594
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK. Nhật ký nói rằng:\n"
 
-#: git-send-email.perl:1606
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Kết quả: "
 
-#: git-send-email.perl:1609
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Kết quả: Tốt\n"
 
-#: git-send-email.perl:1627
+#: 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:1674 git-send-email.perl:1694
+#: 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:1680
+#: 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:1737
+#: 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:1772
+#: 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:1883
+#: 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:1890
+#: 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:1894
+#: 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:1924
+#: 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:1932
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "bảng mã truy�n không hợp lệ"
 
-#: git-send-email.perl:1966
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -26440,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:1976 git-send-email.perl:2029 git-send-email.perl:2039
+#: 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:1979
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26454,1878 +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:1997
+#: 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:2001
+#: 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 "--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"
-
-#, c-format
-#~ 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."
-
-#, perl-format
-#~ msgid "%s: patch contains a line longer than 998 characters"
-#~ msgstr "%s: miếng vá có chứa dòng dài hơn 998 ký tự"
-
-#~ 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"
-
-#, c-format
-#~ 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"
-
-#, c-format
-#~ 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"
-
-#, c-format
-#~ msgid "Error deleting remote-tracking branch '%s'"
-#~ msgstr "Gặp lỗi khi đang xóa nhánh theo dõi máy chủ “%s�"
-
-#, c-format
-#~ 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ố"
-
-#, sh-format
-#~ 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"
-
-#, c-format
-#~ 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 "initialize sparse-checkout"
-#~ msgstr "khởi tạo sparse-checkout"
-
-#~ 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 "%%(trailers) does not take arguments"
-#~ msgstr "%%(trailers) không nhận các đối số"
-
-#~ msgid "submodule update strategy not supported for submodule '%s'"
-#~ msgstr ""
-#~ "chiến lược cập nhật mô-đun-con không được hỗ trợ cho mô-đun-con “%s�"
-
-#~ msgid "change upstream info"
-#~ msgstr "thay đổi thông tin thượng nguồn"
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wanted to make '%s' track '%s', do this:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Nếu bạn muốn “%s� theo dõi “%s�, thực hiện lệnh sau:\n"
-#~ "\n"
-
-#~ msgid "basename"
-#~ msgstr "tên cơ sở"
-
-#~ msgid ""
-#~ "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 "could not open %s for writing"
-#~ msgstr "không thể mở %s để ghi"
-
-#~ 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 "Reinitialized existing"
-#~ msgstr "Khởi tạo lại đã sẵn có rồi"
-
-#~ 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 "print only merged branches"
-#~ msgstr "chỉ hiển thị các nhánh đã hòa trộn"
-
-#~ 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 7ede055381..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,247 +138,250 @@
 #   upstream                         |  上游
 #   upstream branch                  |  上游分支
 #   working tree                     |  工作区
+# 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-05-17 16:02+0800\n"
-"PO-Revision-Date: 2021-06-05 22:10+0800\n"
-"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 41.0\n"
 
-#: add-interactive.c:376
+#: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "嗯（%s）？"
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: 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 "�能读�索引"
 
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
 #: git-add--interactive.perl:294
 msgid "binary"
 msgstr "二进制"
 
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
 #: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "æ— "
 
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
 #: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "没有修改"
 
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
 msgid "Update"
 msgstr "æ›´æ–°"
 
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
 #, c-format
 msgid "could not stage '%s'"
 msgstr "�能暂存 '%s'"
 
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "�能写入索引"
 
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
 #, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "更新了 %d 个路径\n"
 msgstr[1] "更新了 %d 个路径\n"
 
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "说明：%s 现已�为未跟踪的。\n"
 
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: 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 �作失败"
 
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "还原"
 
-#: add-interactive.c:775
+#: add-interactive.c:779
 msgid "Could not parse HEAD^{tree}"
 msgstr "�能解� HEAD^{tree}"
 
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
 #, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "还原了 %d 个路径\n"
 msgstr[1] "还原了 %d 个路径\n"
 
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "没有未跟踪的文件。\n"
 
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "添加未跟踪的"
 
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
 #, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "增加了 %d 个路径\n"
 msgstr[1] "增加了 %d 个路径\n"
 
-#: add-interactive.c:925
+#: add-interactive.c:929
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "忽略未�入的：%s"
 
-#: add-interactive.c:937 add-patch.c:1751 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:939 add-patch.c:1749 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:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "补�更新"
 
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "检视 diff"
 
-#: add-interactive.c:1010
+#: add-interactive.c:1014
 msgid "show paths with changes"
 msgstr "显示��更的路径"
 
-#: add-interactive.c:1012
+#: add-interactive.c:1016
 msgid "add working tree state to the staged set of changes"
 msgstr "将工作区状�添加到暂存区修改集中"
 
-#: add-interactive.c:1014
+#: add-interactive.c:1018
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "将暂存的修改集��为 HEAD 版本"
 
-#: add-interactive.c:1016
+#: add-interactive.c:1020
 msgid "pick hunks and update selectively"
 msgstr "挑选数��并有选择地更新"
 
-#: add-interactive.c:1018
+#: add-interactive.c:1022
 msgid "view diff between HEAD and index"
 msgstr "显示 HEAD 和索引的差异"
 
-#: add-interactive.c:1020
+#: add-interactive.c:1024
 msgid "add contents of untracked files to the staged set of changes"
 msgstr "将未跟踪文件的内容添加到暂存区修改集中"
 
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
 msgid "Prompt help:"
 msgstr "帮助："
 
-#: add-interactive.c:1030
+#: add-interactive.c:1034
 msgid "select a single item"
 msgstr "选择一个�目"
 
-#: add-interactive.c:1032
+#: add-interactive.c:1036
 msgid "select a range of items"
 msgstr "选择一系列�目"
 
-#: add-interactive.c:1034
+#: add-interactive.c:1038
 msgid "select multiple ranges"
 msgstr "选择多个范围"
 
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
 msgid "select item based on unique prefix"
 msgstr "基于唯一�缀选择�目"
 
-#: add-interactive.c:1038
+#: add-interactive.c:1042
 msgid "unselect specified items"
 msgstr "�选指定的�目"
 
-#: add-interactive.c:1040
+#: add-interactive.c:1044
 msgid "choose all items"
 msgstr "选择所有�目"
 
-#: add-interactive.c:1042
+#: add-interactive.c:1046
 msgid "(empty) finish selecting"
 msgstr "（空）结�选择"
 
-#: add-interactive.c:1079
+#: add-interactive.c:1083
 msgid "select a numbered item"
 msgstr "选择一个编��目"
 
-#: add-interactive.c:1083
+#: add-interactive.c:1087
 msgid "(empty) select nothing"
 msgstr "（空）�选择任何内容"
 
-#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** 命令 ***"
 
-#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "请选择"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "staged"
 msgstr "缓存"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "未缓存"
 
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
-#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
-#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
-#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
+#: 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 "路径"
 
-#: add-interactive.c:1151
+#: add-interactive.c:1155
 msgid "could not refresh index"
 msgstr "�能刷新索引"
 
-#: add-interactive.c:1165 builtin/clean.c:781 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,?]? "
@@ -401,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,?]? "
@@ -441,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,?]? "
@@ -481,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,?]? "
@@ -521,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,?]? "
@@ -565,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,?]? "
@@ -599,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,?]? "
@@ -647,40 +652,40 @@ msgstr ""
 "a - 应用该�和本文件中��的全部�\n"
 "d - ��应用该�和本文件中��的全部�\n"
 
-#: add-patch.c:342
+#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "无法解�数��头信� '%.*s'"
 
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "无法解�彩色数��头信� '%.*s'"
 
-#: add-patch.c:419
+#: add-patch.c:420
 msgid "could not parse diff"
 msgstr "�能解�差异信�"
 
-#: add-patch.c:438
+#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr "�能解�彩色差异信�"
 
-#: add-patch.c:452
+#: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
-msgstr "�行 '%s' 失败"
+msgstr "无法�行 '%s'"
 
-#: add-patch.c:611
+#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
 msgstr "interactive.diffFilter 的输出�匹�"
 
-#: add-patch.c:612
+#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
 msgstr "您的过滤器必须在其输入和输出的行之间��一一对应的关系。"
 
-#: add-patch.c:790
+#: add-patch.c:791
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -689,7 +694,7 @@ msgstr ""
 "预期上下文行 #%d 于\n"
 "%.*s"
 
-#: add-patch.c:805
+#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -702,11 +707,11 @@ msgstr ""
 "\t�是结尾于：\n"
 "%.*s"
 
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "手动�编辑模� -- 查看底部的快速指�。\n"
 
-#: add-patch.c:1085
+#: add-patch.c:1086
 #, c-format
 msgid ""
 "---\n"
@@ -720,7 +725,7 @@ msgstr ""
 "以 %c 开始的行将被删除。\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -729,11 +734,11 @@ msgstr ""
 "如果�能干净地应用，您将有机会�新编辑。如果该�的全部内容删除，则\n"
 "此次编辑被终止，该��会被修改。\n"
 
-#: add-patch.c:1132
+#: add-patch.c:1133
 msgid "could not parse hunk header"
 msgstr "无法解�数��头信�"
 
-#: add-patch.c:1177
+#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr "'git apply --cached' 失败"
 
@@ -749,24 +754,24 @@ 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:1246 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]? "
 
-#: add-patch.c:1289
+#: add-patch.c:1290
 msgid "The selected hunks do not apply to the index!"
 msgstr "选中的��能应用到索引�"
 
-#: add-patch.c:1290 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:1297 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "未应用。\n"
 
-#: add-patch.c:1354
+#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -788,73 +793,73 @@ msgstr ""
 "e - 手动编辑当��\n"
 "? - 显示帮助\n"
 
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
 msgstr "没有�一个�"
 
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
 msgstr "没有下一个�"
 
-#: add-patch.c:1537
+#: add-patch.c:1538
 msgid "No other hunks to goto"
 msgstr "没有其它�供跳转的�"
 
-#: add-patch.c:1548 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:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "跳转到哪个�？"
 
-#: add-patch.c:1560
+#: add-patch.c:1561
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "无效数字：'%s'"
 
-#: add-patch.c:1565
+#: add-patch.c:1566
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "对�起，�有 %d 个�用�。"
 msgstr[1] "对�起，�有 %d 个�用�。"
 
-#: add-patch.c:1574
+#: add-patch.c:1575
 msgid "No other hunks to search"
 msgstr "没有其它�供查找的�"
 
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "使用正则表达��索？"
 
-#: add-patch.c:1595
+#: add-patch.c:1596
 #, c-format
 msgid "Malformed search regexp %s: %s"
 msgstr "错误的正则表达� %s：%s"
 
-#: add-patch.c:1612
+#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
 msgstr "没有和给定模�相匹�的�"
 
-#: add-patch.c:1619
+#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
 msgstr "对�起，�能拆分这个�"
 
-#: add-patch.c:1623
+#: add-patch.c:1624
 #, c-format
 msgid "Split into %d hunks."
 msgstr "拆分为 %d �。"
 
-#: add-patch.c:1627
+#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
 msgstr "对�起，�能编辑这个�"
 
-#: add-patch.c:1679
+#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr "'git apply' 失败"
 
-#: advice.c:145
+#: advice.c:78
 #, c-format
 msgid ""
 "\n"
@@ -863,37 +868,37 @@ msgstr ""
 "\n"
 "使用 \"git config advice.%s false\" �关闭此消�"
 
-#: advice.c:161
+#: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%s�示：%.*s%s\n"
 
-#: advice.c:252
+#: advice.c:178
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "无法拣选，因为您有未�并的文件。"
 
-#: advice.c:254
+#: advice.c:180
 msgid "Committing is not possible because you have unmerged files."
 msgstr "无法�交，因为您有未�并的文件。"
 
-#: advice.c:256
+#: advice.c:182
 msgid "Merging is not possible because you have unmerged files."
 msgstr "无法�并，因为您有未�并的文件。"
 
-#: advice.c:258
+#: advice.c:184
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "无法拉�，因为您有未�并的文件。"
 
-#: advice.c:260
+#: advice.c:186
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "无法回退，因为您有未�并的文件。"
 
-#: advice.c:262
+#: advice.c:188
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "无法 %s，因为您有未�并的文件。"
 
-#: advice.c:270
+#: 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."
@@ -901,36 +906,47 @@ msgstr ""
 "请在工作区改正文件，然�酌情使用 'git add/rm <文件>' 命令标记\n"
 "解决方案并�交。"
 
-#: advice.c:278
+#: advice.c:204
 msgid "Exiting because of an unresolved conflict."
 msgstr "因为存在未解决的冲�而退出。"
 
-#: advice.c:283 builtin/merge.c:1374
+#: advice.c:209 builtin/merge.c:1382
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "您尚未结�您的�并（存在 MERGE_HEAD）。"
 
-#: advice.c:285
+#: advice.c:211
 msgid "Please, commit your changes before merging."
 msgstr "请在�并�先�交您的修改。"
 
-#: advice.c:286
+#: advice.c:212
 msgid "Exiting because of unfinished merge."
 msgstr "因为存在未完�的�并而退出。"
 
-#: advice.c:296
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "无法快进，终止。"
+
+#: advice.c:227
 #, 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"
+"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 ""
+"下�的路径和/或者路径规格匹�了您定义的稀�检出以外的路径，\n"
+"所以�会在索引中更新：\n"
 
-#: advice.c:303
+#: advice.c:234
 msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
-msgstr "如果您打算更新此类�目，请�用或修改稀�规则。"
+"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 ""
+"如果您�图更新这些�目，请�试下列其中之一：\n"
+"* 使用 --sparse 选项。\n"
+"* �用或者修改稀�规则。"
 
-#: advice.c:310
+#: advice.c:242
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -987,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
@@ -1102,49 +1130,49 @@ msgstr "删除的文件 %s �有内容"
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** 警告：文件 %s �为空文件但并未删除"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "二进制补�在第 %d 行��：%.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "未能识别的二进制补��于第 %d 行"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "补�文件的第 %d 行�有垃圾数�"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "无法读�符�链接 %s"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "�能打开或读� %s"
 
-#: apply.c:2935
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "无效的行首字符：'%c'"
 
-#: apply.c:3056
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "� #%d �功应用于 %d（�移 %d 行）"
 msgstr[1] "� #%d �功应用于 %d（�移 %d 行）"
 
-#: apply.c:3068
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "上下文�少到（%ld/%ld）以在第 %d 行应用补�片段"
 
-#: apply.c:3074
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1153,441 +1181,440 @@ msgstr ""
 "当查询：\n"
 "%.*s"
 
-#: apply.c:3096
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "缺失 '%s' 的二进制补�数�"
 
-#: apply.c:3104
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "�能��应用一个缺少到 '%s' 的��数��的二进制补�"
 
-#: apply.c:3151
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "�能在 '%s' 上应用没有完整索引行的二进制补�"
 
-#: apply.c:3162
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "补�应用到 '%s'（%s），但是和当�内容�匹�。"
 
-#: apply.c:3170
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "补�应用到空文件 '%s'，但其并�空文件"
 
-#: apply.c:3188
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "无法读� '%2$s' 必需的目标文件 %1$s"
 
-#: apply.c:3201
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "二进制补�未应用到 '%s'"
 
-#: apply.c:3208
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "到 '%s' 的二进制补�产生了�正确的结果（应为 %s，�为 %s）"
 
-#: apply.c:3229
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "打补�失败：%s:%ld"
 
-#: apply.c:3352
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "�能检出 %s"
 
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 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"
 
-#: apply.c:3412
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "读��于符�链接中的 '%s'"
 
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "路径 %s 已�被�命�/删除"
 
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s：�存在于索引中"
 
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s：和索引�匹�"
 
-#: apply.c:3571
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr "仓库缺�执行三方�并所必需的数�对象。"
 
-#: apply.c:3574
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "执行三方�并...\n"
 
-#: apply.c:3590 apply.c:3594
+#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "无法读� '%s' 的当�内容"
 
-#: apply.c:3606
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "无法执行三方�并...\n"
 
-#: apply.c:3620
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "应用补�到 '%s' 存在冲�。\n"
 
-#: apply.c:3625
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "�功应用补�到 '%s'。\n"
 
-#: apply.c:3642
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "回�到直接应用...\n"
 
-#: apply.c:3654
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "移除补��留下了文件内容"
 
-#: apply.c:3727
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s：错误类型"
 
-#: apply.c:3729
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s 的类型是 %o，应为 %o"
 
-#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
-#: read-cache.c:1351
+#: 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:3952
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s：已�存在于索引中"
 
-#: apply.c:3956
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s：已�存在于工作区中"
 
-#: apply.c:3976
+#: 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:3981
+#: 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:4001
+#: apply.c:4025
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "�影�的文件 '%s' �于符�链接中"
 
-#: apply.c:4005
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s：补�未应用"
 
-#: apply.c:4020
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "正在检查补� %s..."
 
-#: apply.c:4112
+#: apply.c:4136
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "�模组 %s 的 sha1 信�缺失或无效"
 
-#: apply.c:4119
+#: apply.c:4143
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "%s 的模��更，但它�在当� HEAD 中"
 
-#: apply.c:4122
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 信�缺失或无效（%s）。"
 
-#: apply.c:4131
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "�能在临时索引中添加 %s"
 
-#: apply.c:4141
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "�能把临时索引写入到 %s"
 
-#: apply.c:4279
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "�能从索引中移除 %s"
 
-#: apply.c:4313
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "�模组 %s ��的补�"
 
-#: apply.c:4319
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "�能对新建文件 '%s' 调用 stat"
 
-#: apply.c:4327
+#: apply.c:4351
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "�能为新建文件 %s 创建�端存储"
 
-#: apply.c:4333 apply.c:4478
+#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "无法为 %s 添加缓存�目"
 
-#: apply.c:4376 builtin/bisect--helper.c:523
+#: 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:4380
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "关闭文件 '%s'"
 
-#: apply.c:4450
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "�能写文件 '%s' �� %o"
 
-#: apply.c:4548
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "�功应用补� %s。"
 
-#: apply.c:4556
+#: apply.c:4580
 msgid "internal error"
 msgstr "内部错误"
 
-#: apply.c:4559
+#: 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:4570
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "截短 .rej 文件�为 %.*s.rej"
 
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "�能打开 %s"
 
-#: apply.c:4592
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "第 #%d 个片段�功应用。"
 
-#: apply.c:4596
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "拒�第 #%d 个片段。"
 
-#: apply.c:4725
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "略过补� '%s'。"
 
-#: apply.c:4733
-msgid "unrecognized input"
-msgstr "未能识别的输入"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "输入中没有�法的补� （使用 \"--allow-empty\" ��许）"
 
-#: apply.c:4753
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "无法读�索引文件"
 
-#: apply.c:4910
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "�能打开补� '%s'：%s"
 
-#: apply.c:4937
+#: apply.c:4963
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "抑制下�有 %d 个空白字符误用"
 msgstr[1] "抑制下�有 %d 个空白字符误用"
 
-#: apply.c:4943 apply.c:4958
+#: 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:4951
+#: 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:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
+#: 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:4995
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
 msgstr "��应用与给出路径�匹�的�更"
 
-#: apply.c:4998
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "应用与给出路径�匹�的�更"
 
-#: apply.c:5000 builtin/am.c:2317
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "æ•°å­—"
 
-#: apply.c:5001
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "从传统的 diff 路径中移除指定数�的�导斜线"
 
-#: apply.c:5004
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "忽略补�中的添加的文件"
 
-#: apply.c:5006
+#: apply.c:5032
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "�应用补�，而是显示输入的差异统计（diffstat）"
 
-#: apply.c:5010
+#: apply.c:5036
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "以�进制数显示添加和删除的行数"
 
-#: apply.c:5012
+#: apply.c:5038
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "�应用补�，而是显示输入的概�"
 
-#: apply.c:5014
+#: apply.c:5040
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "�应用补�，而是查看补�是��应用"
 
-#: apply.c:5016
+#: apply.c:5042
 msgid "make sure the patch is applicable to the current index"
 msgstr "确认补��以应用到当�索引"
 
-#: apply.c:5018
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
 
-#: apply.c:5020
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "应用补�而�修改工作区"
 
-#: apply.c:5022
+#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
 msgstr "接�修改工作区之外文件的补�"
 
-#: apply.c:5025
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "还应用此补�（与 --stat/--summary/--check 选项�时使用）"
 
-#: apply.c:5027
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
-msgstr "�试三路�并，如果失败则�试正常补�模�"
+msgstr "�试三路�并，如果失败则回�至正常补�模�"
 
-#: apply.c:5029
+#: apply.c:5055
 msgid "build a temporary index based on embedded index information"
 msgstr "创建一个临时索引基于嵌入的索引信�"
 
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "路径以 NUL 字符分隔"
 
-#: apply.c:5034
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr "确�至少匹� <n> 行上下文"
 
-#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296
+#: 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:3831
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
 msgid "action"
 msgstr "动作"
 
-#: apply.c:5036
+#: apply.c:5062
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "检查新增和修改的行中间的空白字符滥用"
 
-#: apply.c:5039 apply.c:5042
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr "查找上下文时忽略空白字符的�更"
 
-#: apply.c:5045
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "��应用补�"
 
-#: apply.c:5047
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "无需至少一行上下文"
 
-#: apply.c:5049
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "将拒�的补�片段�存在对应的 *.rej 文件中"
 
-#: apply.c:5051
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "�许��的补�片段"
 
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
-#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "冗长输出"
-
-#: apply.c:5054
+#: apply.c:5080
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "�许�正确的文件末尾�行符"
 
-#: apply.c:5057
+#: apply.c:5083
 msgid "do not trust the line counts in the hunk headers"
 msgstr "�信任补�片段的头信�中的行�"
 
-#: apply.c:5059 builtin/am.c:2305
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "根目录"
 
-#: apply.c:5060
+#: 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"
@@ -1598,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' 过滤器报告了错误"
@@ -1622,7 +1649,7 @@ msgstr "路径�是有效的 UTF-8：%s"
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "路径太长（%d 字符，SHA1：%s）：%s"
 
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
 msgstr "压缩错误 (%d)"
@@ -1650,156 +1677,152 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 
-#: archive.c:188
-#, c-format
-msgid "cannot read %s"
-msgstr "�能读� %s"
-
-#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
-#: builtin/merge.c:1143
+#: 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 "�能读� '%s'"
 
-#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
+#: 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' 未匹�任何文件"
 
-#: archive.c:451
+#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "无此引用：%.*s"
 
-#: archive.c:457
+#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "�是一个有效的对象�：%s"
 
-#: archive.c:470
+#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "�是一个树对象：%s"
 
-#: archive.c:482
+#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "当�工作目录未被跟踪"
 
-#: archive.c:523
+#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "文件未找到：%s"
 
-#: archive.c:525
+#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "�是一个常规文件：%s"
 
-#: archive.c:552
+#: archive.c:551
 msgid "fmt"
 msgstr "格�"
 
-#: archive.c:552
+#: archive.c:551
 msgid "archive format"
 msgstr "归档格�"
 
-#: archive.c:553 builtin/log.c:1772
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "�缀"
 
-#: archive.c:554
+#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
 msgstr "为归档中�个路径�加上�缀"
 
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: 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: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 "文件"
 
-#: archive.c:556
+#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "将未跟踪文件添加到归档"
 
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
 msgid "write the archive to this file"
 msgstr "归档写入此文件"
 
-#: archive.c:561
+#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "读�工作区中的 .gitattributes"
 
-#: archive.c:562
+#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "在标准错误上报告归档文件"
 
-#: archive.c:564
+#: archive.c:563
 msgid "set compression level"
 msgstr "设置压缩级别"
 
-#: archive.c:567
+#: archive.c:566
 msgid "list supported archive formats"
 msgstr "列出支�的归档格�"
 
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "仓库"
 
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "从远程仓库（<仓库>）��归档文件"
 
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
 msgid "command"
 msgstr "命令"
 
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
 msgid "path to the remote git-upload-archive command"
 msgstr "远程 git-upload-archive 命令的路径"
 
-#: archive.c:579
+#: archive.c:578
 msgid "Unexpected option --remote"
 msgstr "未知�数 --remote"
 
-#: archive.c:581
-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:583
+#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "未知�数 --output"
 
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "选项 --add-file 和 --remote �能�时使用"
-
-#: archive.c:607
+#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "未知归档格� '%s'"
 
-#: archive.c:616
+#: archive.c:615
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "�数�支�此格� '%s'：-%d"
 
-#: attr.c:202
+#: attr.c:203
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s �是一个有效的属性�"
 
-#: attr.c:363
+#: attr.c:364
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "��许 %s：%s:%d"
 
-#: attr.c:403
+#: attr.c:404
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1807,22 +1830,22 @@ msgstr ""
 "负值模版在 git attributes 中被忽略\n"
 "当字符串确实�以感��开始时，使用 '\\!'。"
 
-#: bisect.c:489
+#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "文件 '%s' 包�错误的引用格�：%s"
 
-#: bisect.c:699
+#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "我们无法进行更多的二分查找�\n"
 
-#: bisect.c:766
+#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "�是一个有效的�交� %s"
 
-#: bisect.c:791
+#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1831,7 +1854,7 @@ msgstr ""
 "�并基线 %s 是�的。\n"
 "这�味�介于 %s 和 [%s] 之间的 bug 已�被修�。\n"
 
-#: bisect.c:796
+#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1840,7 +1863,7 @@ msgstr ""
 "�并基线 %s 是新的。\n"
 "介于 %s 和 [%s] 之间的属性已�被修改。\n"
 
-#: bisect.c:801
+#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1849,7 +1872,7 @@ msgstr ""
 "�并基线 %s 是 %s。\n"
 "这�味�第一个 '%s' �交�于 %s 和 [%s] 之间。\n"
 
-#: bisect.c:809
+#: bisect.c:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1860,7 +1883,7 @@ msgstr ""
 "这�情况下 git 二分查找无法正常工作。\n"
 "您�能弄错了 %s 和 %s 版本？\n"
 
-#: bisect.c:822
+#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1871,36 +1894,36 @@ msgstr ""
 "所以我们无法确认第一个 %s �交是�介于 %s 和 %s 之间。\n"
 "我们�旧继续。"
 
-#: bisect.c:861
+#: bisect.c:859
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "二分查找中：�并基线必须是�过测试的\n"
 
-#: bisect.c:911
+#: bisect.c:909
 #, c-format
 msgid "a %s revision is needed"
 msgstr "需�一个 %s 版本"
 
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
 #, c-format
 msgid "could not create file '%s'"
 msgstr "�能创建文件 '%s'"
 
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "�能读�文件 '%s'"
 
-#: bisect.c:1027
+#: bisect.c:1025
 msgid "reading bisect refs failed"
 msgstr "读�二分查找引用失败"
 
-#: bisect.c:1057
+#: bisect.c:1055
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s �时为 %s 和 %s\n"
 
-#: bisect.c:1066
+#: bisect.c:1064
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1909,7 +1932,7 @@ msgstr ""
 "没有�现�测试的�交。\n"
 "�能您在�行时使用了错误的路径�数？\n"
 
-#: bisect.c:1095
+#: bisect.c:1093
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1919,7 +1942,7 @@ msgstr[1] "（大概 %d 步）"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1101
+#: bisect.c:1099
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1938,11 +1961,12 @@ msgstr "�能将 --contents 和最终的�交对象�共用"
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse 和 --first-parent 共用，需�指定最新的�交"
 
-#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
-#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
-#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
-#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
+#: 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 "版本�历设置失败"
 
@@ -1961,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\" 。"
-
-#: branch.c:67
-#, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "未设置分支 %s 作为它自己的上游。"
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
+msgstr "在请求�基时无法继承上游多个引用的跟踪设置"
 
-#: branch.c:93
+#: branch.c:88
 #, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-msgstr "分支 '%1$s' 设置为使用�基�跟踪�自 '%3$s' 的远程分支 '%2$s'。"
+msgid "not setting branch '%s' as its own upstream"
+msgstr "没有将分支 '%s' 设置为它自己的上游"
 
-#: branch.c:94
+#: branch.c:144
 #, 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' by rebasing."
+msgstr "分支 '%s' 设置为使用�基�跟踪 '%s'。"
 
-#: branch.c:98
+#: branch.c:145
 #, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr "分支 '%s' 设置为使用�基�跟踪本地分支 '%s'。"
+msgid "branch '%s' set up to track '%s'."
+msgstr "分支 '%s' 设置为跟踪 '%s'。"
 
-#: branch.c:99
+#: branch.c:148
 #, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
+msgid "branch '%s' set up to track:"
+msgstr "分支 '%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'。"
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr "�求从 '%s' 继承跟踪信�，但是没有设置�并�置"
 
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "无法写入上游分支�置"
-
-#: 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"
@@ -2063,159 +2076,160 @@ msgid ""
 "\"git push -u\" to set the upstream config as you push."
 msgstr ""
 "\n"
-"如果您正计划基于远程一个现存的上游分支开始你的工作，\n"
+"如果您正计划基于远程一个现存的上游分支开始您的工作，\n"
 "您�能需�执行 \"git fetch\" �获�分支。\n"
 "\n"
 "如果您正计划推�一个能与对应远程分支建立跟踪的新的本地分支，\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 指�没有被更新"
 
-#: bundle.c:41
+#: bundle.c:44
 #, c-format
 msgid "unrecognized bundle hash algorithm: %s"
 msgstr "未能识别的归档包哈希算法：%s"
 
-#: bundle.c:45
+#: bundle.c:48
 #, c-format
 msgid "unknown capability '%s'"
 msgstr "未知能力 '%s'"
 
-#: bundle.c:71
+#: bundle.c:74
 #, c-format
 msgid "'%s' does not look like a v2 or v3 bundle file"
 msgstr "'%s' ��是一个 v2 或 v3 版本的归档包文件"
 
-#: bundle.c:110
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "未能识别的包头：%s%s (%d)"
 
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: 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'"
 msgstr "�能打开 '%s'"
 
-#: bundle.c:189
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr "仓库中缺少这些必备的�交："
 
-#: bundle.c:192
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
 msgstr "需�一个仓库�校验一个归档包"
 
-#: bundle.c:243
+#: bundle.c:257
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "这个归档包中�有这个引用："
 msgstr[1] "这个归档包中�有 %d 个引用："
 
-#: bundle.c:250
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "这个归档包记录一个完整历�。"
 
-#: bundle.c:252
+#: bundle.c:266
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "这个归档包需�这个引用："
 msgstr[1] "这个归档包需� %d 个引用："
 
-#: bundle.c:319
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "无法�制归档包�述符"
 
-#: bundle.c:326
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "�能生� pack-objects 进程"
 
-#: bundle.c:337
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "pack-objects 终止"
 
-#: bundle.c:386
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "引用 '%s' 被 rev-list 选项排除"
 
-#: bundle.c:490
+#: bundle.c:504
 #, c-format
 msgid "unsupported bundle version %d"
 msgstr "�支�的归档包版本 %d"
 
-#: bundle.c:492
+#: bundle.c:506
 #, c-format
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "�能写入，归档包版本 %d �支�算法 %s"
 
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "未能识别的�数：%s"
 
-#: bundle.c:539
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "�能创建空的归档包。"
 
-#: bundle.c:549
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "�能创建 '%s'"
 
-#: bundle.c:574
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "index-pack 终止"
 
-#: chunk-format.c:113
+#: chunk-format.c:117
 msgid "terminating chunk id appears earlier than expected"
 msgstr "终止� ID 比预期更早出现"
 
-#: chunk-format.c:122
+#: chunk-format.c:126
 #, c-format
 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
 msgstr "�正确的��移 %<PRIx64> 和 %<PRIx64>"
 
-#: chunk-format.c:129
+#: chunk-format.c:133
 #, c-format
 msgid "duplicate chunk ID %<PRIx32> found"
 msgstr "�现��的�ID %<PRIx32>"
 
-#: chunk-format.c:143
+#: chunk-format.c:147
 #, c-format
 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"
 
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
 msgid "invalid hash version"
 msgstr "无效的哈希版本"
 
@@ -2260,217 +2274,217 @@ msgstr "无效的�交图形链：行 '%s' �是一个哈希值"
 msgid "unable to find all commit-graph files"
 msgstr "无法找到所有�交图形文件"
 
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "无效的�交�置。�交图形�能已��"
 
-#: commit-graph.c:766
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "无法找到�交 %s"
 
-#: commit-graph.c:799
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "�交图需�溢出世代数�，但是没有"
 
-#: commit-graph.c:1075 builtin/am.c:1340
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "�能解��交 %s"
 
-#: commit-graph.c:1337 builtin/pack-objects.c:2897
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "无法获得对象 %s 类型"
 
-#: commit-graph.c:1368
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "正在加载�交图中的已知�交"
 
-#: commit-graph.c:1385
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr "正在扩展�交图中的�达�交"
 
-#: commit-graph.c:1405
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr "正在清除�交图中的�交标记"
 
-#: commit-graph.c:1424
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "正在计算�交图拓扑级别"
 
-#: commit-graph.c:1477
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr "正在计算�交图世代数字"
 
-#: commit-graph.c:1558
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr "计算�交�更路径的布隆过滤器"
 
-#: commit-graph.c:1635
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "正在收集引用的�交"
 
-#: commit-graph.c:1660
+#: 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:1673
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "添加包 %s 出错"
 
-#: commit-graph.c:1677
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "为 %s 打开索引出错"
 
-#: commit-graph.c:1714
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr "正在打包对象中查找�交图的�交"
 
-#: commit-graph.c:1732
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr "正在查找�交图中�外的边"
 
-#: commit-graph.c:1781
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr "无法写入正确数�的基础图形 ID"
 
-#: commit-graph.c:1812 midx.c:906
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "�能为 %s 创建先导目录"
 
-#: commit-graph.c:1825
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "无法创建临时图层"
 
-#: commit-graph.c:1830
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "无法为 '%s' 调整共享��"
 
-#: commit-graph.c:1887
+#: 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:1923
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr "无法打开�交图形链文件"
 
-#: commit-graph.c:1939
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr "无法�命�基础�交图形文件"
 
-#: commit-graph.c:1959
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr "无法�命�临时�交图形文件"
 
-#: commit-graph.c:2092
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "正在扫��并�交"
 
-#: commit-graph.c:2136
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "正在�并�交图形"
 
-#: commit-graph.c:2244
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr "正�试写�交图，但是 'core.commitGraph' 被�用"
 
-#: commit-graph.c:2351
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr "�交太多�能画图"
 
-#: commit-graph.c:2450
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr "�交图文件的校验�错误，�能已���"
 
-#: commit-graph.c:2460
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "�交图形的对象 ID 顺��正确：%s 然� %s"
 
-#: commit-graph.c:2470 commit-graph.c:2485
+#: 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:2477
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "无法从�交图形中解��交 %s"
 
-#: commit-graph.c:2495
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "正在校验�交图中的�交"
 
-#: commit-graph.c:2510
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr "无法从�交图形的对象库中解��交 %s"
 
-#: commit-graph.c:2517
+#: 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:2527
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "�交 %s 的�交图形父�交列表太长了"
 
-#: commit-graph.c:2536
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "%s 的�交图形父�交是 %s != %s"
 
-#: commit-graph.c:2550
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "�交 %s 的�交图形父�交列表过早终止"
 
-#: commit-graph.c:2555
+#: 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:2559
+#: 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:2576
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr "�交图形中的�交 %s 的世代�是 %<PRIuMAX> < %<PRIuMAX>"
 
-#: commit-graph.c:2582
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr "�交图形中�交 %s 的�交日期是 %<PRIuMAX> != %<PRIuMAX>"
 
-#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
-#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 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"
 
-#: commit.c:54
+#: commit.c:55
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s �是一个�交�"
 
-#: commit.c:194
+#: commit.c:196
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -2490,27 +2504,27 @@ msgstr ""
 "设置 \"git config advice.graftFileDeprecated false\"\n"
 "�关闭本消�"
 
-#: commit.c:1237
+#: commit.c:1241
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "�交 %s 有一个��信的声称�自 %s 的 GPG 签�。"
 
-#: commit.c:1241
+#: commit.c:1245
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "�交 %s 有一个错误的声称�自 %s 的 GPG 签�。"
 
-#: commit.c:1244
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "�交 %s 没有 GPG 签�。"
 
-#: commit.c:1247
+#: commit.c:1251
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "�交 %s 有一个�自 %s 的好的 GPG 签�。\n"
 
-#: commit.c:1501
+#: 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"
@@ -2524,7 +2538,7 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: config.c:126
+#: config.c:125
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -2539,35 +2553,35 @@ msgstr ""
 "\t%2$s\n"
 "这�能是因为循环包�。"
 
-#: config.c:142
+#: config.c:141
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "无法扩展包�路径 '%s'"
 
-#: config.c:153
+#: config.c:152
 msgid "relative config includes must come from files"
 msgstr "相对路径的�置文件引用必须�自于文件"
 
-#: config.c:199
+#: config.c:201
 msgid "relative config include conditionals must come from files"
 msgstr "相对路径的�置文件�件引用必须�自于文件"
 
-#: config.c:396
+#: config.c:398
 #, c-format
 msgid "invalid config format: %s"
 msgstr "无效的�置格�：%s"
 
-#: config.c:400
+#: config.c:402
 #, c-format
 msgid "missing environment variable name for configuration '%.*s'"
 msgstr "�置 '%.*s' 缺少环境���称"
 
-#: config.c:405
+#: config.c:407
 #, c-format
 msgid "missing environment variable '%s' for configuration '%.*s'"
 msgstr "缺少环境�� '%s' 于�置 '%.*s' "
 
-#: config.c:442
+#: config.c:443
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "键�没有包�一个�节�称：%s"
@@ -2577,295 +2591,295 @@ msgstr "键�没有包�一个�节�称：%s"
 msgid "key does not contain variable name: %s"
 msgstr "键�没有包����：%s"
 
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "无效键�：%s"
 
-#: config.c:478
+#: config.c:475
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "无效键�（有�行符）：%s"
 
-#: config.c:511
+#: config.c:495
 msgid "empty config key"
 msgstr "空的�置键�"
 
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "伪�置�数：%s"
 
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
 #, c-format
 msgid "bogus format in %s"
 msgstr "%s 中格�错误"
 
-#: config.c:622
+#: config.c:606
 #, c-format
 msgid "bogus count in %s"
 msgstr "%s 中错误计数"
 
-#: config.c:626
+#: config.c:610
 #, c-format
 msgid "too many entries in %s"
 msgstr "%s 中太多的�目"
 
-#: config.c:636
+#: config.c:620
 #, c-format
 msgid "missing config key %s"
 msgstr "缺失�置键� %s"
 
-#: config.c:644
+#: config.c:628
 #, c-format
 msgid "missing config value %s"
 msgstr "缺失�置�值 %s"
 
-#: config.c:995
+#: config.c:979
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "数�对象 %2$s 中错误的�置行 %1$d"
 
-#: config.c:999
+#: config.c:983
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "文件 %2$s 中错误的�置行 %1$d"
 
-#: config.c:1003
+#: config.c:987
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "标准输入中错误的�置行 %d"
 
-#: config.c:1007
+#: config.c:991
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "�模组数�对象 %2$s 中错误的�置行 %1$d"
 
-#: config.c:1011
+#: config.c:995
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "命令行 %2$s 中错误的�置行 %1$d"
 
-#: config.c:1015
+#: config.c:999
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "在 %2$s 中错误的�置行 %1$d"
 
-#: config.c:1152
+#: config.c:1136
 msgid "out of range"
 msgstr "超出范围"
 
-#: config.c:1152
+#: config.c:1136
 msgid "invalid unit"
 msgstr "无效的��"
 
-#: config.c:1153
+#: config.c:1137
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "�置�� '%2$s' 的数字�值 '%1$s' 设置错误：%3$s"
 
-#: config.c:1163
+#: config.c:1147
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "数�对象 %3$s 中�置�� '%2$s' 错误的�值 '%1$s'：%4$s"
 
-#: config.c:1166
+#: config.c:1150
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "文件 %3$s 中�置�� '%2$s' 错误的�值 '%1$s'：%4$s"
 
-#: config.c:1169
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "标准输入中�置�� '%2$s' 错误的�值 '%1$s'：%3$s"
 
-#: config.c:1172
+#: config.c:1156
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr "�模组数� %3$s 中�置�� '%2$s' 错误的�值 '%1$s'：%4$s"
 
-#: config.c:1175
+#: config.c:1159
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr "命令行 %3$s 中�置�� '%2$s' 错误的�值 '%1$s'：%4$s"
 
-#: config.c:1178
+#: config.c:1162
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "在 %3$s 中�置�� '%2$s' 错误的�值 '%1$s'：%4$s"
 
-#: config.c:1257
+#: config.c:1241
 #, c-format
 msgid "bad boolean config value '%s' for '%s'"
 msgstr "'%2$s' 的错误的布尔�值 '%1$s'"
 
-#: config.c:1275
+#: config.c:1259
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "无法扩展用户目录：'%s'"
 
-#: config.c:1284
+#: config.c:1268
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%2$s' 的值 '%1$s' �是一个有效的时间戳"
 
-#: config.c:1377
+#: config.c:1361
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "缩写长度超出范围：%d"
 
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "错误的 zlib 压缩级别 %d"
 
-#: config.c:1494
+#: config.c:1476
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar 应该是一个字符"
 
-#: config.c:1527
+#: config.c:1509
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "无效的对象创建模�：%s"
 
-#: config.c:1599
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "%s 的�值格�错误"
 
-#: config.c:1625
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "%s 的�值格�错误：%s"
 
-#: config.c:1626
+#: config.c:1611
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "必须是其中之一：nothing�matching�simple�upstream 或 current"
 
-#: config.c:1687 builtin/pack-objects.c:3924
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "错误的打包压缩级别 %d"
 
-#: config.c:1809
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "无法从数�对象 '%s' 加载�置"
 
-#: config.c:1812
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "引用 '%s' 没有指�一个数�对象"
 
-#: config.c:1829
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "�能解��置对象 '%s'"
 
-#: config.c:1873
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
-msgstr "解� %s 失败"
+msgstr "无法解� %s"
 
-#: config.c:1929
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr "无法解�命令行中的�置"
 
-#: config.c:2293
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr "在读��置文件时�到未知错误"
 
-#: config.c:2467
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "无效 %s：'%s'"
 
-#: config.c:2512
+#: config.c:2504
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "splitIndex.maxPercentChange 的�值 '%d' 应该介于 0 和 100 之间"
 
-#: config.c:2558
+#: config.c:2550
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "无法解�命令行�置中的 '%s'"
 
-#: config.c:2560
+#: 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:2644
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "无效的�节�称 '%s'"
 
-#: config.c:2676
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s 有多个�值"
 
-#: config.c:2705
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
-msgstr "写入新的�置文件 %s 失败"
+msgstr "无法写入新的�置文件 %s"
 
-#: config.c:2957 config.c:3283
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "�能�定�置文件 %s"
 
-#: config.c:2968
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "打开 %s"
 
-#: config.c:3005 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "无效模�：%s"
 
-#: config.c:3030
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "无效的�置文件 %s"
 
-#: config.c:3043 config.c:3296
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "对 %s 调用 fstat 失败"
 
-#: config.c:3054
+#: config.c:3047
 #, c-format
-msgid "unable to mmap '%s'"
-msgstr "�能 mmap '%s'"
+msgid "unable to mmap '%s'%s"
+msgstr "�能 mmap '%s'%s"
 
-#: config.c:3063 config.c:3301
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "对 %s 调用 chmod 失败"
 
-#: config.c:3148 config.c:3398
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "�能写入�置文件 %s"
 
-#: config.c:3182
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "�能设置 '%s' 为 '%s'"
 
-#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: 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:3274
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "无效的�节�称：%s"
 
-#: config.c:3441
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "%s 的�值缺失"
@@ -2899,72 +2913,72 @@ msgstr "�务器�支�特性 '%s'"
 msgid "expected flush after capabilities"
 msgstr "在能力之�应为一个 flush 包"
 
-#: connect.c:263
+#: connect.c:265
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "忽略第一行 '%s' 之�的能力字段"
 
-#: connect.c:284
+#: connect.c:286
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "�议错误：�外的 capabilities^{}"
 
-#: connect.c:306
+#: connect.c:308
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "�议错误：预期浅克隆 sha-1，�得到 '%s'"
 
-#: connect.c:308
+#: connect.c:310
 msgid "repository on the other end cannot be shallow"
 msgstr "�一端的仓库�能是浅克隆仓库"
 
-#: connect.c:347
+#: connect.c:349
 msgid "invalid packet"
 msgstr "无效数�包"
 
-#: connect.c:367
+#: connect.c:369
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "�议错误：�外的 '%s'"
 
-#: connect.c:497
+#: connect.c:499
 #, c-format
 msgid "unknown object format '%s' specified by server"
 msgstr "�务器给出未知的对象格� '%s'"
 
-#: connect.c:526
+#: connect.c:528
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "无效的 ls-refs �应：%s"
 
-#: connect.c:530
+#: connect.c:532
 msgid "expected flush after ref listing"
 msgstr "在引用列表之�应该有一个 flush 包"
 
-#: connect.c:533
+#: connect.c:535
 msgid "expected response end packet after ref listing"
 msgstr "在引用列表之�应该有�应结�包"
 
-#: connect.c:666
+#: connect.c:670
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "�支� '%s' �议"
 
-#: connect.c:717
+#: connect.c:721
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "无法为 socket 设置 SO_KEEPALIVE"
 
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
 #, c-format
 msgid "Looking up %s ... "
 msgstr "查找 %s ..."
 
-#: connect.c:761
+#: connect.c:765
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "无法查找 %s（端� %s）（%s）"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
 #, c-format
 msgid ""
 "done.\n"
@@ -2973,7 +2987,7 @@ msgstr ""
 "完�。\n"
 "连接到 %s（端� %s）... "
 
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2983,84 +2997,84 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
 msgid "done."
 msgstr "完�。"
 
-#: connect.c:824
+#: connect.c:828
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "无法查找 %s（%s）"
 
-#: connect.c:830
+#: connect.c:834
 #, c-format
 msgid "unknown port %s"
 msgstr "未知端� %s"
 
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "已阻止奇怪的主机� '%s'"
 
-#: connect.c:969
+#: connect.c:973
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "已阻止奇怪的端�� '%s'"
 
-#: connect.c:979
+#: connect.c:983
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "�能�动代� %s"
 
-#: connect.c:1050
+#: connect.c:1054
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"
 
-#: connect.c:1190
+#: connect.c:1194
 msgid "newline is forbidden in git:// hosts and repo paths"
 msgstr "在 git:// 主机和仓库路径中�止使用�行符"
 
-#: connect.c:1247
+#: connect.c:1251
 msgid "ssh variant 'simple' does not support -4"
 msgstr "ssh �体 'simple' �支� -4"
 
-#: connect.c:1259
+#: connect.c:1263
 msgid "ssh variant 'simple' does not support -6"
 msgstr "ssh �体 'simple' �支� -6"
 
-#: connect.c:1276
+#: connect.c:1280
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "ssh �体 'simple' �支�设置端�"
 
-#: connect.c:1388
+#: connect.c:1392
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "已阻止奇怪的路径� '%s'"
 
-#: connect.c:1436
+#: connect.c:1440
 msgid "unable to fork"
 msgstr "无法 fork"
 
-#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "正在检查连通性"
 
-#: connected.c:120
+#: connected.c:122
 msgid "Could not run 'git rev-list'"
 msgstr "�能执行 'git rev-list'"
 
-#: connected.c:144
+#: connected.c:146
 msgid "failed write to rev-list"
 msgstr "写入 rev-list 失败"
 
-#: connected.c:149
+#: connected.c:151
 msgid "failed to close rev-list's stdin"
-msgstr "关闭 rev-list 的标准输入失败"
+msgstr "无法关闭 rev-list 的标准输入"
 
 #: convert.c:183
 #, c-format
 msgid "illegal crlf_action %d"
-msgstr "�法的 crlf 动作 %d"
+msgstr "�法的 crlf_action %d"
 
 #: convert.c:196
 #, c-format
@@ -3160,23 +3174,23 @@ msgstr "�外的过滤类型"
 msgid "path name too long for external filter"
 msgstr "外部过滤器的路径�太长"
 
-#: convert.c:934
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
 "been filtered"
 msgstr "外部过滤器 '%s' ���用，但并�所有路径都已过滤"
 
-#: convert.c:1234
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false �是有效的工作区编�"
 
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s：clean 过滤器 '%s' 失败"
 
-#: convert.c:1490
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s：smudge 过滤器 %s 失败"
@@ -3194,17 +3208,17 @@ msgstr "拒�使用缺少主机字段的凭�"
 msgid "refusing to work with credential missing protocol field"
 msgstr "拒�使用缺少�议字段的凭�"
 
-#: credential.c:394
+#: credential.c:395
 #, c-format
 msgid "url contains a newline in its %s component: %s"
 msgstr "URL 的 %s 组件中包��行符：%s"
 
-#: credential.c:438
+#: credential.c:439
 #, c-format
 msgid "url has no scheme: %s"
 msgstr "URL 没有 scheme：%s"
 
-#: credential.c:511
+#: credential.c:512
 #, c-format
 msgid "credential url cannot be parsed: %s"
 msgstr "�能解�凭� URL：%s"
@@ -3301,62 +3315,62 @@ msgstr "�自 config 的数�岛正则表达�有太多的�获组（最多
 msgid "Marked %d islands, done.\n"
 msgstr "已标记 %d 个数�岛，结�。\n"
 
-#: diff-merges.c:80
+#: diff-merges.c:70
 #, c-format
 msgid "unknown value for --diff-merges: %s"
 msgstr "未知的 --diff-merges �值：%s"
 
-#: diff-lib.c:538
+#: diff-lib.c:561
 msgid "--merge-base does not work with ranges"
 msgstr "--merge-base �适用于范围"
 
-#: diff-lib.c:540
+#: diff-lib.c:563
 msgid "--merge-base only works with commits"
 msgstr "--merge-base 仅适用于�交"
 
-#: diff-lib.c:557
+#: diff-lib.c:580
 msgid "unable to get HEAD"
 msgstr "�能解� HEAD"
 
-#: diff-lib.c:564
+#: diff-lib.c:587
 msgid "no merge base found"
 msgstr "未找到�并基线"
 
-#: diff-lib.c:566
+#: diff-lib.c:589
 msgid "multiple merge bases found"
 msgstr "找到了多��并基线"
 
-#: diff-no-index.c:238
+#: diff-no-index.c:237
 msgid "git diff --no-index [<options>] <path> <path>"
 msgstr "git diff --no-index [<选项>] <路径> <路径>"
 
-#: diff-no-index.c:263
+#: diff-no-index.c:262
 msgid ""
 "Not a git repository. Use --no-index to compare two paths outside a working "
 "tree"
 msgstr "�是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
 
 #  译者：注����导空格
-#: diff.c:156
+#: diff.c:158
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  无法解� dirstat 截止（cut-off）百分比 '%s'\n"
 
 #  译者：注����导空格
-#: diff.c:161
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  未知的 dirstat �数 '%s'\n"
 
-#: diff.c:297
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
 msgstr ""
-"移动的颜色设置必须是 'no'�'default'�'blocks'�'zebra'�'dimmed_zebra' 或 "
+"移动的颜色设置必须是 'no'�'default'�'blocks'�'zebra'�'dimmed-zebra' 或 "
 "'plain'"
 
-#: diff.c:325
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3365,18 +3379,18 @@ msgstr ""
 "未知的 color-moved-ws 模� '%s'，�能的�值有 'ignore-space-change'�'ignore-"
 "space-at-eol'�'ignore-all-space'�'allow-indentation-change'"
 
-#: diff.c:333
+#: 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:410
+#: diff.c:412
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "�置�� 'diff.submodule' 未知的�值：'%s'"
 
-#: diff.c:470
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3385,35 +3399,48 @@ msgstr ""
 "�现�置�� 'diff.dirstat' 中的错误：\n"
 "%s"
 
-#: diff.c:4278
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "外部 diff 退出，�止在 %s"
 
-#: diff.c:4630
-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:4633
-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:4712
+#: 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:4601
+#, c-format
+msgid ""
+"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:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow 明确�求�跟一个路径规格"
 
-#: diff.c:4760
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "无效的 --stat 值：%s"
 
-#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: 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:4797
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3422,200 +3449,200 @@ msgstr ""
 "无法解� --dirstat/-X 选项的�数：\n"
 "%s"
 
-#: diff.c:4882
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "--diff-filter=%2$s 中未知的�更类 '%1$c'"
 
-#: diff.c:4906
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "ws-error-highlight=%.*s 之�未知的值"
 
-#: diff.c:4920
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "�能解� '%s'"
 
-#: diff.c:4970 diff.c:4976
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s 期望 <n>/<m> 格�"
 
-#: diff.c:4988
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s 期望一个字符，得到 '%s'"
 
-#: diff.c:5009
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "�的 --color-moved �数：%s"
 
-#: diff.c:5028
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "--color-moved-ws 中的无效模� '%s' "
 
-#: diff.c:5068
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
 "diff-algorithm 选项有 \"myers\"�\"minimal\"�\"patience\" 和 \"histogram\""
 
-#: diff.c:5104 diff.c:5124
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "%s 的�数无效"
 
-#: diff.c:5228
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "选项 -I 的正则表达�无效：'%s'"
 
-#: diff.c:5277
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "无法解� --submodule 选项的�数：'%s'"
 
-#: diff.c:5333
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "�的 --word-diff �数：%s"
 
-#: diff.c:5369
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "差异输出格�化选项"
 
-#: diff.c:5371 diff.c:5377
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "生�补�"
 
-#: diff.c:5374 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "�显示差异输出"
 
-#: diff.c:5379 diff.c:5493 diff.c:5500
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5380 diff.c:5383
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "生�� <n> 行上下文的差异"
 
-#: diff.c:5385
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "生�原始格�的差异"
 
-#: diff.c:5388
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "和 '-p --raw' �义"
 
-#: diff.c:5392
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "和 '-p --stat' �义"
 
-#: diff.c:5396
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "机器�好的 --stat"
 
-#: diff.c:5399
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "�输出 --stat 的最�一行"
 
-#: diff.c:5401 diff.c:5409
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<�数1,�数2>..."
 
-#: diff.c:5402
+#: diff.c:5371
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "输出�个�目录相对�更的分布"
 
-#: diff.c:5406
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "和 --dirstat=cumulative �义"
 
-#: diff.c:5410
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "是 --dirstat=files,param1,param2... 的�义�"
 
-#: diff.c:5414
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr "如果�更中引入冲�定界符或空白错误，给出警告"
 
-#: diff.c:5417
+#: diff.c:5386
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "精简摘�，例如创建��命�和模��更"
 
-#: diff.c:5420
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "�显示�更文件的文件�"
 
-#: diff.c:5423
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "�显示�更文件的文件�和状�"
 
-#: diff.c:5425
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<宽度>[,<文件�宽度>[,<次数>]]"
 
-#: diff.c:5426
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "生�差异统计（diffstat）"
 
-#: diff.c:5428 diff.c:5431 diff.c:5434
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<宽度>"
 
-#: diff.c:5429
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "使用给定的长度生�差异统计"
 
-#: diff.c:5432
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "使用给定的文件�长度生�差异统计"
 
-#: diff.c:5435
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "使用给定的图形长度生�差异统计"
 
-#: diff.c:5437
+#: diff.c:5406
 msgid "<count>"
 msgstr "<次数>"
 
-#: diff.c:5438
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "生�有�行数的差异统计"
 
-#: diff.c:5441
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "生�差异统计的简�摘�"
 
-#: diff.c:5444
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "输出一个�以应用的二进制差异"
 
-#: diff.c:5447
+#: diff.c:5416
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr "在 \"index\" 行显示完整的��对象�称"
 
-#: diff.c:5449
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "显示带颜色的差异"
 
-#: diff.c:5450
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<类型>"
 
-#: diff.c:5451
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr "对于差异中的上下文�旧的和新的行，加亮显示错误的空白字符"
 
-#: diff.c:5454
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3623,311 +3650,311 @@ msgstr ""
 "在 --raw 或者 --numstat 中，�对路径字符转�并使用 NUL 字符�为输出字段的分隔"
 "符"
 
-#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<�缀>"
 
-#: diff.c:5458
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "显示给定的��缀�代 \"a/\""
 
-#: diff.c:5461
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "显示给定的目标�缀�代 \"b/\""
 
-#: diff.c:5464
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr "输出的�一行附加�缀"
 
-#: diff.c:5467
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "�显示任何�和目标�缀"
 
-#: diff.c:5470
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr "显示指定行数的差异�间的上下文"
 
-#: diff.c:5474 diff.c:5479 diff.c:5484
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<字符>"
 
-#: diff.c:5475
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "指定一个字符�代 '+' �表示新的一行"
 
-#: diff.c:5480
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "指定一个字符�代 '-' �表示旧的一行"
 
-#: diff.c:5485
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "指定一个字符�代 ' ' �表示一行上下文"
 
-#: diff.c:5488
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "差异�命�选项"
 
-#: diff.c:5489
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5490
+#: diff.c:5459
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "将完全�写的�更打破为�对的删除和创建"
 
-#: diff.c:5494
+#: diff.c:5463
 msgid "detect renames"
 msgstr "检测�命�"
 
-#: diff.c:5498
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "�略删除�作的差异输出"
 
-#: diff.c:5501
+#: diff.c:5470
 msgid "detect copies"
 msgstr "检测拷�"
 
-#: diff.c:5505
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
 msgstr "使用未修改的文件�为�现拷�的�"
 
-#: diff.c:5507
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "�用�命�探测"
 
-#: diff.c:5510
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "使用空的数�对象�为�命�的�"
 
-#: diff.c:5512
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr "继续列出文件�命�以外的历�记录"
 
-#: diff.c:5515
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr "如果�命�/拷�目标超过给定的�制，�止�命�/拷�检测"
 
-#: diff.c:5517
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "差异算法选项"
 
-#: diff.c:5519
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "生�尽�能�的差异"
 
-#: diff.c:5522
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "行比较时忽略空白字符"
 
-#: diff.c:5525
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "忽略空白字符的�更"
 
-#: diff.c:5528
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "忽略行尾的空白字符�更"
 
-#: diff.c:5531
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "忽略行尾的回车符（CR）"
 
-#: diff.c:5534
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "忽略整行都是空白的�更"
 
-#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<正则>"
 
-#: diff.c:5537
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr "忽略所有行都和正则表达�匹�的�更"
 
-#: diff.c:5540
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "���转�差异边界以便阅读"
 
-#: diff.c:5543
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "使用 \"patience diff\" 算法生�差异"
 
-#: diff.c:5547
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "使用 \"histogram diff\" 算法生�差异"
 
-#: diff.c:5549
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<算法>"
 
-#: diff.c:5550
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "选择一个差异算法"
 
-#: diff.c:5552
+#: diff.c:5521
 msgid "<text>"
 msgstr "<文本>"
 
-#: diff.c:5553
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "使用 \"anchored diff\" 算法生�差异"
 
-#: diff.c:5555 diff.c:5564 diff.c:5567
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<模�>"
 
-#: diff.c:5556
+#: diff.c:5525
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr "显示��差异，使用 <模�> 分隔�更的��"
 
-#: diff.c:5559
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr "使用 <正则表达�> 确定何为一个�"
 
-#: diff.c:5562
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
 
-#: diff.c:5565
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "移动的代�行用��方��色"
 
-#: diff.c:5568
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr "在 --color-moved 下如何忽略空白字符"
 
-#: diff.c:5571
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "其它差异选项"
 
-#: diff.c:5573
+#: diff.c:5542
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr "当从�目录�行，排除目录之外的�更并显示相对路径"
 
-#: diff.c:5577
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "把所有文件当�文本处�"
 
-#: diff.c:5579
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "交�两个输入，�转差异"
 
-#: diff.c:5581
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "有差异时退出�为 1，�则为 0"
 
-#: diff.c:5583
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "�用本程�的所有输出"
 
-#: diff.c:5585
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "�许执行一个外置的差异助手"
 
-#: diff.c:5587
+#: diff.c:5556
 msgid "run external text conversion filters when comparing binary files"
 msgstr "当比较二进制文件时，�行外部的文本转�过滤器"
 
-#: diff.c:5589
+#: diff.c:5558
 msgid "<when>"
 msgstr "<何时>"
 
-#: diff.c:5590
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr "在生�差异时，忽略�模组的更改"
 
-#: diff.c:5593
+#: diff.c:5562
 msgid "<format>"
 msgstr "<格�>"
 
-#: diff.c:5594
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "指定�模组的差异如何显示"
 
-#: diff.c:5598
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "��索引中 'git add -N' �目"
 
-#: diff.c:5601
+#: diff.c:5570
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "将索引中 'git add -N' �目当�真实的"
 
-#: diff.c:5603
+#: diff.c:5572
 msgid "<string>"
 msgstr "<字符串>"
 
-#: diff.c:5604
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "查找改�了指定字符串出现次数的差异"
 
-#: diff.c:5607
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr "查找改�指定正则匹�出现次数的差异"
 
-#: diff.c:5610
+#: diff.c:5579
 msgid "show all changes in the changeset with -S or -G"
 msgstr "显示使用 -S 或 -G 的�更集的所有�更"
 
-#: diff.c:5613
+#: diff.c:5582
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "将 -S 的 <string> 当�扩展的 POSIX 正则表达�"
 
-#: diff.c:5616
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr "控制输出中的文件显示顺�"
 
-#: diff.c:5617 diff.c:5620
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<路径>"
 
-#: diff.c:5618
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "先显示指定路径的�更"
 
-#: diff.c:5621
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "跳过指定路径的输出"
 
-#: diff.c:5623
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<对象 ID>"
 
-#: diff.c:5624
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "查找改�指定对象出现次数的差异"
 
-#: diff.c:5626
+#: 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:5627
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "通过差异类型选择文件"
 
-#: diff.c:5629
+#: diff.c:5598
 msgid "<file>"
 msgstr "<文件>"
 
-#: diff.c:5630
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "输出到一个指定的文件"
 
-#: diff.c:6287
-msgid "inexact rename detection was skipped due to too many files."
-msgstr "因为文件太多，略过�严格的�命�检查。"
+#: diff.c:6257
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr "由于文件太多，跳过详尽的�命�检查。"
 
-#: diff.c:6290
+#: diff.c:6260
 msgid "only found copies from modified paths due to too many files."
-msgstr "因为文件太多，�在修改的路径中查找拷�。"
+msgstr "由于文件太多，�在修改的路径中找到了拷�。"
 
-#: diff.c:6293
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3936,9 +3963,9 @@ msgstr "您å�¯èƒ½æƒ³è¦�å°†å�˜é‡� %s 设置为至少 %d 并å†�次执行此命令ã
 #: diffcore-order.c:24
 #, c-format
 msgid "failed to read orderfile '%s'"
-msgstr "读�排�文件 '%s' 失败"
+msgstr "无法读�排�文件 '%s'"
 
-#: diffcore-rename.c:1418
+#: diffcore-rename.c:1564
 msgid "Performing inexact rename detection"
 msgstr "正在进行�精确的�命�探测"
 
@@ -3947,59 +3974,67 @@ msgstr "正在进行�精确的�命�探测"
 msgid "No such path '%s' in the diff"
 msgstr "在差异中无此路径 '%s'"
 
-#: dir.c:578
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "路径规格 '%s' 未匹�任何 git 已知文件"
 
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr "未识别的模�：'%s'"
 
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "未识别的��模�：'%s'"
 
-#: dir.c:809
+#: dir.c:820
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr "您的 sparse-checkout 文件�能有问题：��的模� '%s'"
 
-#: dir.c:819
+#: dir.c:828
 msgid "disabling cone pattern matching"
-msgstr "�止 cone 模�匹�"
+msgstr "�用锥形模�匹�"
 
-#: dir.c:1206
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "�能将 %s 用作排除文件"
 
-#: dir.c:2314
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "�能打开目录 '%s'"
 
-#: dir.c:2614
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr "无法获得内核�称和信�"
 
-#: dir.c:2738
+#: dir.c:2844
 msgid "untracked cache is disabled on this system or location"
 msgstr "缓存未跟踪文件在本系统或�置中被�用"
 
-#: dir.c:3543
+#: dir.c:3112
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"无法猜到目录�。\n"
+"请在命令行指定一个目录"
+
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "仓库 %s 中的索引文件��"
 
-#: dir.c:3590 dir.c:3595
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr "�能为 %s 创建目录"
 
-#: dir.c:3624
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "�能从 '%s' �移 git 目录到 '%s'"
@@ -4018,292 +4053,353 @@ msgstr "过滤内容"
 msgid "could not stat file '%s'"
 msgstr "�能对文件 '%s' 调用 stat"
 
-#: environment.c:152
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "错误的 git �字空间路径 \"%s\""
 
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "�能设置 GIT_DIR 为 '%s'"
-
 #: exec-cmd.c:363
 #, c-format
 msgid "too many args to run %s"
 msgstr "执行 %s 的�数太多"
 
-#: fetch-pack.c:182
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack：应为 shallow 列表"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack：在浅克隆列表之�期望一个 flush 包"
 
-#: fetch-pack.c:196
+#: 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:216
+#: 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:227
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "无法写到远程"
 
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc 需� multi_ack_detailed"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "无效的 shallow 信�：%s"
 
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "无效的 unshallow 信�：%s"
 
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "对象未找到：%s"
 
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "对象中出错：%s"
 
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "未�现 shallow：%s"
 
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "应为 shallow/unshallow，�得到 %s"
 
-#: fetch-pack.c:439
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "得到 %s %d %s"
 
-#: fetch-pack.c:456
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "无效�交 %s"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "放弃"
 
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "完�"
 
-#: fetch-pack.c:512
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "得到 %s (%d) %s"
 
-#: fetch-pack.c:548
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "标记 %s 为完�"
 
-#: fetch-pack.c:763
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "已�有 %s（%s）"
 
-#: fetch-pack.c:849
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack：无法派生 sideband 多路输出"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "�议错误：�的包头"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack：无法派生进程 %s"
 
-#: fetch-pack.c:957
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack：无效的 index-pack 输出"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "%s 失败"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "sideband 多路输出出错"
 
-#: fetch-pack.c:1019
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "�务器版本 %.*s"
 
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
+#: 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:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: 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:1029
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
-msgstr "�务器�支� shalllow 客户端"
+msgstr "�务器�支�浅客户端"
 
-#: fetch-pack.c:1089
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "�务器�支� --shallow-since"
 
-#: fetch-pack.c:1094
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "�务器�支� --shallow-exclude"
 
-#: fetch-pack.c:1098
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "�务器�支� --deepen"
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
 msgstr "�务器�支�这个仓库的对象格�"
 
-#: fetch-pack.c:1113
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "没有共�的�交"
 
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
 msgstr "�仓库是浅克隆，拒�克隆。"
 
-#: fetch-pack.c:1128 fetch-pack.c:1651
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack：获�失败。"
 
-#: fetch-pack.c:1242
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "�匹�的算法：客户端 %s，�务端 %s"
 
-#: fetch-pack.c:1246
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "�务器�支�算法 '%s'"
 
-#: fetch-pack.c:1279
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
-msgstr "�务器�支� shalllow 请求"
+msgstr "�务器�支�浅克隆请求"
 
-#: fetch-pack.c:1286
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "�务器支� filter"
 
-#: fetch-pack.c:1329 fetch-pack.c:2034
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
 msgstr "无法将请求写到远程"
 
-#: fetch-pack.c:1347
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "读�节标题 '%s' 出错"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "预期 '%s'，得到 '%s'"
 
-#: fetch-pack.c:1387
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "�外的确认行：'%s'"
 
-#: fetch-pack.c:1392
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "处� ack 出错：%d"
 
-#: fetch-pack.c:1402
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr "预期在 'ready' 之��� packfile"
 
-#: fetch-pack.c:1404
+#: fetch-pack.c:1420
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "在没有 'ready' �应该��其它�节"
 
-#: fetch-pack.c:1445
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "处�浅克隆信�出错：%d"
 
-#: fetch-pack.c:1494
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "预期 wanted-ref，得到 '%s'"
 
-#: fetch-pack.c:1499
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "�外的 wanted-ref：'%s'"
 
-#: fetch-pack.c:1504
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "处��获�的引用出错：%d"
 
-#: fetch-pack.c:1534
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack：预期�应结�包"
 
-#: fetch-pack.c:1930
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "没有匹�的远程分支"
 
-#: fetch-pack.c:1953 builtin/clone.c:697
+#: fetch-pack.c:1982 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
 msgstr "远程没有��所有必需的对象"
 
-#: fetch-pack.c:2056
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "�自远程的�外的 'ready'"
 
-#: fetch-pack.c:2079
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "没有这样的远程引用 %s"
 
-#: fetch-pack.c:2082
+#: fetch-pack.c:2111
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "�务器��许请求未公开的对象 %s"
 
-#: gpg-interface.c:273
+#: 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:276
+#: gpg-interface.c:332 gpg-interface.c:460
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "无法将分离�签�写入 '%s'"
 
-#: gpg-interface.c:470
+#: 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:480
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"ssh 签�验�需� ssh-keygen -Y find-principals/verify \n"
+"（openssh 8.2p1+ 版本�用）"
+
+#: gpg-interface.c:536
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "设置了 ssh 签��销文件但无法找到：%s"
+
+#: gpg-interface.c:624
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "�的/�兼容的签� '%s‘"
+
+#: 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:829
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "需��置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一"
+
+#: 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:857
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s"
+
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
-msgstr "gpg 数�签�失败"
+msgstr "gpg 无法为数�签�"
+
+#: gpg-interface.c:967
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "ssh 签�需�设置 user.signingkey"
+
+#: gpg-interface.c:978
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "无法将 ssh 签�密钥写入 '%s'"
+
+#: gpg-interface.c:996
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "无法将 ssh 签�密钥缓冲区写入 '%s'"
+
+#: 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:1026
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "无法从 '%s' 读入 ssh 签�数�"
 
 #: graph.c:98
 #, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
+msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
 
 #: grep.c:531
@@ -4314,109 +4410,109 @@ msgstr ""
 "给定的模�包� NULL 字符（通过 -f <文件> �数）。�有 PCRE v2 下的 -P 支�此"
 "功能"
 
-#: grep.c:1893
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s'：无法读� %s"
 
-#: grep.c:1910 setup.c:176 builtin/clone.c:416 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:1921
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s'：读��完整"
 
-#: help.c:23
+#: help.c:24
 msgid "start a working area (see also: git help tutorial)"
 msgstr "开始一个工作区（��：git help tutorial）"
 
-#: help.c:24
+#: help.c:25
 msgid "work on the current change (see also: git help everyday)"
 msgstr "在当��更上工作（��：git help everyday）"
 
-#: help.c:25
+#: help.c:26
 msgid "examine the history and state (see also: git help revisions)"
 msgstr "检查历�和状�（��：git help revisions）"
 
-#: help.c:26
+#: help.c:27
 msgid "grow, mark and tweak your common history"
 msgstr "扩展�标记和调校您的历�记录"
 
-#: help.c:27
+#: help.c:28
 msgid "collaborate (see also: git help workflows)"
 msgstr "��（��：git help workflows）"
 
-#: help.c:31
+#: help.c:32
 msgid "Main Porcelain Commands"
 msgstr "主�的上层命令"
 
-#: help.c:32
+#: help.c:33
 msgid "Ancillary Commands / Manipulators"
 msgstr "辅助命令/�作者"
 
-#: help.c:33
+#: help.c:34
 msgid "Ancillary Commands / Interrogators"
 msgstr "辅助命令/询问者"
 
-#: help.c:34
+#: help.c:35
 msgid "Interacting with Others"
 msgstr "与其它系统交互"
 
-#: help.c:35
+#: help.c:36
 msgid "Low-level Commands / Manipulators"
 msgstr "低级命令/�作者"
 
-#: help.c:36
+#: help.c:37
 msgid "Low-level Commands / Interrogators"
 msgstr "低级命令/询问者"
 
-#: help.c:37
+#: help.c:38
 msgid "Low-level Commands / Syncing Repositories"
 msgstr "低级命令/�步仓库"
 
-#: help.c:38
+#: help.c:39
 msgid "Low-level Commands / Internal Helpers"
 msgstr "低级命令/内部助手"
 
-#: help.c:300
+#: help.c:313
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "在 '%s' 下�用的 git 命令"
 
-#: help.c:307
+#: help.c:320
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "在 $PATH 路径中的其他地方�用的 git 命令"
 
-#: help.c:316
+#: help.c:329
 msgid "These are common Git commands used in various situations:"
 msgstr "这些是��场�常�的 Git 命令："
 
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "�支�的命令列表类型 '%s'"
 
-#: help.c:405
+#: help.c:418
 msgid "The Git concept guides are:"
 msgstr "Git 概念�导有："
 
-#: help.c:429
+#: help.c:442
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr "执行　'git help <command>' �查看特定�命令"
 
-#: help.c:434
+#: help.c:447
 msgid "External commands"
 msgstr "外部命令"
 
-#: help.c:449
+#: help.c:462
 msgid "Command aliases"
 msgstr "命令别�"
 
-#: help.c:527
+#: help.c:543
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -4425,31 +4521,36 @@ msgstr ""
 "'%s' �是一个 git 命令，但�无法�行。\n"
 "�能是 git-%s ��？"
 
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git：'%s' �是一个 git 命令。�� 'git --help'。"
 
-#: help.c:591
+#: help.c:613
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "唉呀，您的系统中未�现 Git 命令。"
 
-#: help.c:613
+#: help.c:635
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr "警告：您�行了一个并�存在的 Git 命令 '%s'。"
 
-#: help.c:618
+#: help.c:640
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
-msgstr "�定你想�的是 '%s' 并继续。"
+msgstr "�定您想�的是 '%s' 并继续。"
+
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "�而代之�行 '%s' [y/N]？"
 
-#: help.c:623
+#: help.c:654
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr "�定你想�的是 '%2$s'，在 %1$0.1f 秒钟�继续。"
+msgstr "�定您想�的是 '%2$s'，在 %1$0.1f 秒钟�继续。"
 
-#: help.c:635
+#: help.c:666
 msgid ""
 "\n"
 "The most similar command is"
@@ -4463,16 +4564,16 @@ msgstr[1] ""
 "\n"
 "最相似的命令是"
 
-#: help.c:675
+#: help.c:706
 msgid "git version [<options>]"
 msgstr "git version [<选项>]"
 
-#: help.c:730
+#: help.c:761
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s：%s - %s"
 
-#: help.c:734
+#: help.c:765
 msgid ""
 "\n"
 "Did you mean this?"
@@ -4486,6 +4587,15 @@ msgstr[1] ""
 "\n"
 "您指的是这其中的�一个么？"
 
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"因为没有将钩� '%s' 设置为�执行，钩�被忽略。您�以通过\n"
+"�置 `git config advice.ignoredHook false` �关闭这�警告。"
+
 #: ident.c:353
 msgid "Author identity unknown\n"
 msgstr "作者身份未知\n"
@@ -4509,7 +4619,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"*** 请告诉我你是�。\n"
+"*** 请告诉我您是�。\n"
 "\n"
 "�行\n"
 "\n"
@@ -4547,7 +4657,7 @@ msgstr "��许空的姓�（对于 <%s>）"
 msgid "name consists only of disallowed characters: %s"
 msgstr "姓�中仅包��用字符：%s"
 
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
 #, c-format
 msgid "invalid date format: %s"
 msgstr "无效的日期格�：%s"
@@ -4562,7 +4672,7 @@ msgstr "sparse:path 过滤器支�已被删除"
 
 #: list-objects-filter-options.c:105
 #, c-format
-msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
 msgstr "'object:type=<type>' 的值 '%s' �是有效的对象类型"
 
 #: list-objects-filter-options.c:124
@@ -4607,7 +4717,7 @@ msgstr "æ ‘ %2$s 中的æ�¡ç›® '%1$s' 具有树的模å¼�，但ä¸�是一个树对è
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "树 %2$s 中的�目 '%1$s' 具有数�对象的模�，但�是一个数�对象"
 
-#: list-objects.c:395
+#: list-objects.c:398
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "无法为�交 %s 加载根树"
@@ -4640,45 +4750,50 @@ msgstr "�能创建 '%s.lock'：%s"
 msgid "invalid value '%s' for lsrefs.unborn"
 msgstr "lsrefs.unborn 的�值 '%s' 无效"
 
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "�外的行：'%s'"
+
+#: ls-refs.c:178
 msgid "expected flush after ls-refs arguments"
 msgstr "在 ls-refs �数�应该有一个 flush 包"
 
 #: mailinfo.c:1050
 msgid "quoted CRLF detected"
-msgstr "检测到引�中的�行符"
+msgstr "检测到被引用的 CRLF"
 
-#: mailinfo.c:1254 builtin/am.c:176 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'"
 
-#: merge-ort.c:1116 merge-recursive.c:1205
+#: merge-ort.c:1584 merge-recursive.c:1211
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "无法�并�模组 %s （没有检出）"
 
-#: merge-ort.c:1125 merge-recursive.c:1212
+#: merge-ort.c:1593 merge-recursive.c:1218
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "无法�并�模组 %s（�交�存在）"
 
-#: merge-ort.c:1134 merge-recursive.c:1219
+#: merge-ort.c:1602 merge-recursive.c:1225
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr "无法�并�模组 %s （�交未跟��并基线）"
 
-#: merge-ort.c:1144 merge-ort.c:1151
+#: merge-ort.c:1612 merge-ort.c:1620
 #, c-format
 msgid "Note: Fast-forwarding submodule %s to %s"
 msgstr "注�：快进�模组 %s 到 %s"
 
-#: merge-ort.c:1172
+#: merge-ort.c:1642
 #, c-format
 msgid "Failed to merge submodule %s"
 msgstr "无法�并�模组 %s"
 
-#: merge-ort.c:1179
+#: merge-ort.c:1649
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4687,7 +4802,7 @@ msgstr ""
 "无法�并�模组 %s，但是存在一个�能的�并方案：\n"
 "%s\n"
 
-#: merge-ort.c:1183 merge-recursive.c:1273
+#: merge-ort.c:1653 merge-recursive.c:1281
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -4703,7 +4818,7 @@ msgstr ""
 "\n"
 "以接�此建议。\n"
 
-#: merge-ort.c:1196
+#: merge-ort.c:1666
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4712,21 +4827,21 @@ msgstr ""
 "无法�并�模组 %s，但是存在多个�能的�并：\n"
 "%s"
 
-#: merge-ort.c:1415 merge-recursive.c:1362
+#: merge-ort.c:1887 merge-recursive.c:1372
 msgid "Failed to execute internal merge"
 msgstr "无法执行内部�并"
 
-#: merge-ort.c:1420 merge-recursive.c:1367
+#: merge-ort.c:1892 merge-recursive.c:1377
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "�能添加 %s 至对象库"
 
-#: merge-ort.c:1427 merge-recursive.c:1400
+#: merge-ort.c:1899 merge-recursive.c:1410
 #, c-format
 msgid "Auto-merging %s"
 msgstr "自动�并 %s"
 
-#: merge-ort.c:1566 merge-recursive.c:2122
+#: merge-ort.c:2038 merge-recursive.c:2132
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4735,7 +4850,7 @@ msgstr ""
 "冲�（��目录�命�）：处于��目录�命�的现存文件/目录 %s，将以下路径放"
 "在：%s。"
 
-#: merge-ort.c:1576 merge-recursive.c:2132
+#: merge-ort.c:2048 merge-recursive.c:2142
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4744,7 +4859,7 @@ msgstr ""
 "冲�（��目录�命�）：无法映射一个以上路径到 %s，��目录�命��试将这些路"
 "径放置于此：%s"
 
-#: merge-ort.c:1634
+#: merge-ort.c:2106
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4754,14 +4869,14 @@ msgstr ""
 "冲�（分割的目录�命�）：�清楚�命� %s 到哪里，因为它被�命�到多个其他目"
 "录中，没有一个目标目录中包�多数文件。"
 
-#: merge-ort.c:1788 merge-recursive.c:2468
+#: merge-ort.c:2260 merge-recursive.c:2478
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
 "renamed."
 msgstr "警告：��应用 %s -> %s 的�命�到 %s，因为 %s 本身已被�命�。"
 
-#: merge-ort.c:1932 merge-recursive.c:3244
+#: merge-ort.c:2400 merge-recursive.c:3261
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4769,7 +4884,7 @@ msgid ""
 msgstr ""
 "路径已更新：%s 添加到 %s，�于一个被�命�到 %s 的目录中，将其移动到 %s。"
 
-#: merge-ort.c:1939 merge-recursive.c:3251
+#: merge-ort.c:2407 merge-recursive.c:3268
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4778,7 +4893,7 @@ msgstr ""
 "路径已更新：%1$s �命�为 %3$s 中的 %2$s，而该目录被�命�到 %4$s 中，将其移"
 "动到 %5$s。"
 
-#: merge-ort.c:1952 merge-recursive.c:3247
+#: merge-ort.c:2420 merge-recursive.c:3264
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4787,7 +4902,7 @@ msgstr ""
 "冲�（文件�置）：%s 添加到 %s，�于一个被�命�为 %s 的目录中，建议将其移动"
 "到 %s。"
 
-#: merge-ort.c:1960 merge-recursive.c:3254
+#: merge-ort.c:2428 merge-recursive.c:3271
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4796,13 +4911,13 @@ msgstr ""
 "冲�（文件�置）：%1$s �命�为 %3$s 中的 %2$s，而该目录被�命�到 %4$s 中，"
 "建议将其移动到 %5$s。"
 
-#: merge-ort.c:2103
+#: merge-ort.c:2584
 #, c-format
 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
 msgstr ""
 "冲�（�命�/�命�）：%1$s �命�为 %3$s 中的 %2$s，以�在 %5$s 中的 %4$s。"
 
-#: merge-ort.c:2198
+#: merge-ort.c:2679
 #, c-format
 msgid ""
 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4812,60 +4927,64 @@ msgstr ""
 "冲�（�命��入冲�）：�命� %s -> %s 有内容冲�并且和�外一个路径碰撞，这"
 "�能导致嵌套的冲�标签。"
 
-#: merge-ort.c:2217 merge-ort.c:2241
+#: merge-ort.c:2698 merge-ort.c:2722
 #, c-format
 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr "冲�（�命�/删除）：%1$s 在 %3$s 中�命�为 %2$s，但在 %4$s 中删除。"
 
-#: merge-ort.c:2550 merge-recursive.c:3002
+#: merge-ort.c:3212 merge-recursive.c:3022
 #, c-format
 msgid "cannot read object %s"
 msgstr "�能读�对象 %s"
 
-#: merge-ort.c:2553 merge-recursive.c:3005
+#: merge-ort.c:3215 merge-recursive.c:3025
 #, c-format
 msgid "object %s is not a blob"
 msgstr "对象 %s �是一个数�对象"
 
-#: merge-ort.c:2981
+#: merge-ort.c:3644
 #, c-format
 msgid ""
 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
 "%s instead."
 msgstr "冲�（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。"
 
-#: merge-ort.c:3055
+#: merge-ort.c:3721
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed both "
 "of them so each can be recorded somewhere."
-msgstr "冲�（��类型）：%s 在�一侧有��的类型，把它们都�命�以便�个能记录在���置。"
+msgstr ""
+"冲�（��类型）：%s 在两侧有��的类型，将两者都�命�以便它们能记录在���"
+"置。"
 
-#: merge-ort.c:3062
+#: merge-ort.c:3728
 #, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed one "
 "of them so each can be recorded somewhere."
-msgstr "冲�（��类型）：%s 在�一侧有��的类型，�命�它们中的一个以便�个被记录在���置。"
+msgstr ""
+"冲�（��类型）：%s 在两侧有��的类型，将其中之一�命�以便它们能记录在��"
+"�置。"
 
-#: merge-ort.c:3162 merge-recursive.c:3081
+#: merge-ort.c:3819 merge-recursive.c:3101
 msgid "content"
 msgstr "内容"
 
-#: merge-ort.c:3164 merge-recursive.c:3085
+#: merge-ort.c:3821 merge-recursive.c:3105
 msgid "add/add"
 msgstr "添加/添加"
 
-#: merge-ort.c:3166 merge-recursive.c:3130
+#: merge-ort.c:3823 merge-recursive.c:3150
 msgid "submodule"
 msgstr "�模组"
 
-#: merge-ort.c:3168 merge-recursive.c:3131
+#: merge-ort.c:3825 merge-recursive.c:3151
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "冲�（%s）：�并冲�于 %s"
 
-#: merge-ort.c:3198
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -4874,22 +4993,22 @@ msgstr ""
 "冲�（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本"
 "在树中被�留。"
 
-#: merge-ort.c:3433
+#: 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"
-msgstr "注�：%s �是最新的，并且正在检出冲�的版本。旧副本�命�为 %s"
+msgstr "注�：%s �是最新的，并且与�检出的版本冲�。旧副本�命�为 %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:3730
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr "无法收集树 %s�%s�%s 的�并信�"
 
-#: merge-ort-wrappers.c:13 merge-recursive.c:3699
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4898,103 +5017,103 @@ msgstr ""
 "您对下列文件的本地修改将被�并�作覆盖：\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "已�是最新的。"
 
-#: merge-recursive.c:356
+#: merge-recursive.c:353
 msgid "(bad commit)\n"
 msgstr "（��交）\n"
 
-#: merge-recursive.c:379
+#: merge-recursive.c:381
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "add_cacheinfo 对路径 '%s' 执行失败，�并终止。"
 
-#: merge-recursive.c:388
+#: merge-recursive.c:390
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr "add_cacheinfo 无法刷新路径 '%s'，�并终止。"
 
-#: merge-recursive.c:876
+#: merge-recursive.c:881
 #, c-format
 msgid "failed to create path '%s'%s"
-msgstr "创建路径 '%s'%s 失败"
+msgstr "无法创建路径 '%s'%s"
 
-#: merge-recursive.c:887
+#: merge-recursive.c:892
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "删除 %s 以便为�目录留出空间\n"
 
-#: merge-recursive.c:901 merge-recursive.c:920
+#: merge-recursive.c:906 merge-recursive.c:925
 msgid ": perhaps a D/F conflict?"
 msgstr "：�能是一个目录/文件冲�？"
 
-#: merge-recursive.c:910
+#: merge-recursive.c:915
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "拒�丢弃 '%s' 中的未跟踪文件"
 
-#: merge-recursive.c:951 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "�能读�对象 %s '%s'"
 
-#: merge-recursive.c:956
+#: merge-recursive.c:961
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "%s '%s' 应为数�对象"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:986
 #, c-format
 msgid "failed to open '%s': %s"
-msgstr "打开 '%s' 失败：%s"
+msgstr "无法打开 '%s'：%s"
 
-#: merge-recursive.c:992
+#: merge-recursive.c:997
 #, c-format
 msgid "failed to symlink '%s': %s"
-msgstr "创建符�链接 '%s' 失败：%s"
+msgstr "无法创建符�链接 '%s'：%s"
 
-#: merge-recursive.c:997
+#: merge-recursive.c:1002
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "�知�如何处� %06o %s '%s'"
 
-#: merge-recursive.c:1227 merge-recursive.c:1239
+#: merge-recursive.c:1233 merge-recursive.c:1246
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "�模组 %s 快进到如下�交："
 
-#: merge-recursive.c:1230 merge-recursive.c:1242
+#: merge-recursive.c:1236 merge-recursive.c:1249
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "快进�模组 %s"
 
-#: merge-recursive.c:1265
+#: merge-recursive.c:1273
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr "无法�并�模组 %s （没�现�并跟�的�交）"
 
-#: merge-recursive.c:1269
+#: merge-recursive.c:1277
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "无法�并�模组 %s（�快进）"
 
-#: merge-recursive.c:1270
+#: merge-recursive.c:1278
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "找到�模组的一个�能的�并方案：\n"
 
-#: merge-recursive.c:1282
+#: merge-recursive.c:1290
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "无法�并�模组 %s （�现多个�并）"
 
-#: merge-recursive.c:1424
+#: merge-recursive.c:1434
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr "错误：拒�丢失未跟踪文件 '%s'，而是写入 %s。"
 
-#: merge-recursive.c:1496
+#: merge-recursive.c:1506
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5003,7 +5122,7 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
 "本被�留。"
 
-#: merge-recursive.c:1501
+#: merge-recursive.c:1511
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5012,7 +5131,7 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
 "%7$s 版本被�留。"
 
-#: merge-recursive.c:1508
+#: merge-recursive.c:1518
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5021,7 +5140,7 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
 "本�留在 %8$s 中。"
 
-#: merge-recursive.c:1513
+#: merge-recursive.c:1523
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5030,40 +5149,40 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
 "%7$s 版本�留在 %9$s 中。"
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "rename"
 msgstr "�命�"
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "renamed"
 msgstr "�命�"
 
-#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "拒�丢失�文件 '%s'"
 
-#: merge-recursive.c:1609
+#: merge-recursive.c:1619
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr "拒�在 '%s' 处失去未跟踪文件，�使它存在于�命�中。"
 
-#: merge-recursive.c:1667
+#: merge-recursive.c:1677
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr "冲�（�命�/添加）：在 %3$s 中�命� %1$s->%2$s。在 %5$s 中添加 %4$s"
 
-#: merge-recursive.c:1698
+#: merge-recursive.c:1708
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s 是 %s 中的一个目录而以 %s 为�被添加"
 
-#: merge-recursive.c:1703
+#: merge-recursive.c:1713
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr "拒�丢失未跟踪文件 '%s'，而是添加为 %s"
 
-#: merge-recursive.c:1730
+#: merge-recursive.c:1740
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5072,18 +5191,18 @@ msgstr ""
 "冲�（�命�/�命�）：在分支 \"%3$s\" 中�命� \"%1$s\"->\"%2$s\"，在分支 "
 "\"%6$s\" 中�命� \"%4$s\"->\"%5$s\"%7$s"
 
-#: merge-recursive.c:1735
+#: merge-recursive.c:1745
 msgid " (left unresolved)"
 msgstr "（留下未解决）"
 
-#: merge-recursive.c:1827
+#: merge-recursive.c:1837
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "冲�（�命�/�命�）：在 %3$s 中�命� %1$s->%2$s，在 %6$s 中�命� %4$s->"
 "%5$s"
 
-#: merge-recursive.c:2090
+#: merge-recursive.c:2100
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5093,7 +5212,7 @@ msgstr ""
 "冲�（分割的目录�命�）：�清楚 %s 应该放在哪里，因为目录 %s 被�命�到多个"
 "其它目录，没有目录包�大部分文件。"
 
-#: merge-recursive.c:2224
+#: merge-recursive.c:2234
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5102,261 +5221,301 @@ msgstr ""
 "冲�（�命�/�命�）：在 %3$s 中�命�目录 %1$s->%2$s，在 %6$s 中�命�目录 "
 "%4$s->%5$s"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modify"
 msgstr "修改"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modified"
 msgstr "修改"
 
-#: merge-recursive.c:3108
+#: merge-recursive.c:3128
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "略过 %s（已��过相��并）"
 
-#: merge-recursive.c:3161
+#: merge-recursive.c:3181
 #, c-format
 msgid "Adding as %s instead"
 msgstr "而是以 %s 为�添加"
 
-#: merge-recursive.c:3368
+#: merge-recursive.c:3385
 #, c-format
 msgid "Removing %s"
 msgstr "删除 %s"
 
-#: merge-recursive.c:3391
+#: merge-recursive.c:3408
 msgid "file/directory"
 msgstr "文件/目录"
 
-#: merge-recursive.c:3396
+#: merge-recursive.c:3413
 msgid "directory/file"
 msgstr "目录/文件"
 
-#: merge-recursive.c:3403
+#: merge-recursive.c:3420
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr "冲�（%1$s）：在 %3$s 中有一个�为 %2$s 的目录。以 %5$s 为�添加 %4$s"
 
-#: merge-recursive.c:3412
+#: merge-recursive.c:3429
 #, c-format
 msgid "Adding %s"
 msgstr "添加 %s"
 
-#: merge-recursive.c:3421
+#: merge-recursive.c:3438
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "冲�（add/add）：�并冲�于 %s"
 
-#: merge-recursive.c:3474
+#: merge-recursive.c:3491
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "无法�并树 %s 和 %s"
 
-#: merge-recursive.c:3568
+#: merge-recursive.c:3585
 msgid "Merging:"
 msgstr "�并："
 
-#: merge-recursive.c:3581
+#: merge-recursive.c:3598
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "�现 %u 个共�祖先："
 msgstr[1] "�现 %u 个共�祖先："
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3648
 msgid "merge returned no commit"
 msgstr "�并未返回�交"
 
-#: merge-recursive.c:3796
+#: merge-recursive.c:3816
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "�能解�对象 '%s'"
 
-#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
-#: builtin/stash.c:473
+#: 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:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
-#: builtin/stash.c:267
+#: 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 "无法写新的索引文件"
 
-#: midx.c:74
+#: midx.c:78
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "多包索引的对象ID扇出表大�错误"
 
-#: midx.c:105
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "多包索引文件 %s 太�"
 
-#: midx.c:121
+#: 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:126
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-index 版本 %d �能被识别"
 
-#: midx.c:131
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr "多包索引哈希版本 %u 和版本 %u �匹�"
 
-#: midx.c:148
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "多包索引缺少必需的包��"
 
-#: midx.c:150
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "多包索引缺少必需的对象 ID 扇出�"
 
-#: midx.c:152
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "多包索引缺少必需的对象 ID 查询�"
 
-#: midx.c:154
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "多包索引缺少必需的对象�移�"
 
-#: midx.c:170
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "多包索引包�无�：'%s' 在 '%s' 之�"
 
-#: midx.c:214
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "错的 pack-int-id：%u（共有 %u 个包）"
 
-#: midx.c:264
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr "多包索引存储一个64��移，但是 off_t 太�"
 
-#: midx.c:490
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
-msgstr "添加包文件 '%s' 失败"
+msgstr "无法添加包文件 '%s'"
 
-#: midx.c:496
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
-msgstr "打开包索引 '%s' 失败"
+msgstr "无法打开包索引 '%s'"
 
-#: midx.c:564
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
-msgstr "在包文件中定�对象 %d 失败"
+msgstr "无法在包文件中定�对象 %d"
 
-#: midx.c:880 builtin/index-pack.c:1535
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "无法存储��索引文件"
 
-#: midx.c:933
-msgid "Adding packfiles to multi-pack-index"
-msgstr "添加包文件到多包索引"
+#: midx.c:993
+#, c-format
+msgid "could not parse line: %s"
+msgstr "�能解�行：%s"
 
-#: midx.c:979
+#: midx.c:995
 #, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "没有看到�丢弃的包文件 %s"
+msgid "malformed line: %s"
+msgstr "格�错误的行：%s"
+
+#: midx.c:1162
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "忽略已存在的多包索引，校验��匹�"
+
+#: midx.c:1187
+msgid "could not load pack"
+msgstr "�能载入包"
+
+#: midx.c:1193
+#, c-format
+msgid "could not open index for %s"
+msgstr "�能打开 %s 的索引"
 
-#: midx.c:1024
+#: midx.c:1204
+msgid "Adding packfiles to multi-pack-index"
+msgstr "添加包文件到多包索引"
+
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "未知的首选包：'%s'"
 
-#: midx.c:1029
+#: midx.c:1292
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "�能选择没有对象的首选包 %s"
+
+#: midx.c:1324
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "没有看到�丢弃的包文件 %s"
+
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "首选包 '%s' 已过期"
 
-#: midx.c:1045
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "没有�索引的包文件。"
 
-#: midx.c:1125 builtin/clean.c:37
+#: midx.c:1420
+msgid "could not write multi-pack bitmap"
+msgstr "无法写入多包�图"
+
+#: midx.c:1430
+msgid "could not write multi-pack-index"
+msgstr "无法写入多包索引"
+
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
-msgstr "删除 %s 失败"
+msgstr "无法删除 %s"
 
-#: midx.c:1156
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
-msgstr "清��于 %s 的多包索引失败"
+msgstr "无法清��于 %s 的多包索引"
 
-#: midx.c:1214
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr "多包索引文件存在，但无法解�"
 
-#: midx.c:1222
+#: midx.c:1593
+msgid "incorrect checksum"
+msgstr "�正确的校验�"
+
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "正在查找引用的包文件"
 
-#: midx.c:1237
+#: 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:1242
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "midx �包� oid"
 
-#: midx.c:1251
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr "校验多包索引中的 OID 顺�"
 
-#: midx.c:1260
+#: 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:1280
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "通过包文件为对象排�"
 
-#: midx.c:1287
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "校验对象�移"
 
-#: midx.c:1303
+#: 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:1309
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
-msgstr "为包文件 %s 加载包索引失败"
+msgstr "无法为包文件 %s 加载包索引"
 
-#: midx.c:1318
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "oid[%d] = %s 错误的对象�移：%<PRIx64> != %<PRIx64>"
 
-#: midx.c:1343
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "正在对引用对象计数"
 
-#: midx.c:1353
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "正在查找和删除未引用的包文件"
 
-#: midx.c:1544
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "�能开始 pack-objects"
 
-#: midx.c:1564
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "�能结� pack-objects"
 
@@ -5373,7 +5532,7 @@ msgstr "�能创建 lazy_name 线程：%s"
 #: name-hash.c:570
 #, c-format
 msgid "unable to join lazy_name thread: %s"
-msgstr "�能加入 lasy_name 线程：%s"
+msgstr "�能加入 lazy_name 线程：%s"
 
 #: notes-merge.c:277
 #, c-format
@@ -5414,270 +5573,271 @@ msgstr "拒�� %s（在 refs/notes/ 之外）写入注解"
 msgid "Bad %s value: '%s'"
 msgstr "�的 %s 值：'%s'"
 
-#: object-file.c:526
+#: 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:577
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "无法规范化备用对象路径：%s"
 
-#: object-file.c:649
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s：忽略备用对象库，嵌套太深"
 
-#: object-file.c:656
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "无法规范化对象目录: %s"
 
-#: object-file.c:699
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "无法 fdopen 替��文件"
 
-#: object-file.c:717
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "无法读�替代文件"
 
-#: object-file.c:724
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr "无法将新的替代文件移动到�"
 
-#: object-file.c:759
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "路径 '%s' �存在"
 
-#: object-file.c:780
+#: object-file.c:762
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "尚�支�将�考仓库 '%s' 作为一个链接检出。"
 
-#: object-file.c:786
+#: object-file.c:768
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "�考仓库 '%s' �是一个本地仓库。"
 
-#: object-file.c:792
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "�考仓库 '%s' 是一个浅克隆"
 
-#: object-file.c:800
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "�考仓库 '%s' 已被移�"
 
-#: object-file.c:860
+#: object-file.c:813
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "无法找到和 %s 匹�的对象目录"
+
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "解�备用引用时无效的行：%s"
 
-#: object-file.c:1010
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "�试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
 
-#: object-file.c:1031
-msgid "mmap failed"
-msgstr "mmap 失败"
+#: object-file.c:1048
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap 失败%s"
 
-#: object-file.c:1195
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "对象文件 %s 为空"
 
-#: object-file.c:1330 object-file.c:2524
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "��的�散对象 '%s'"
 
-#: object-file.c:1332 object-file.c:2528
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "�散对象 '%s' ��有垃圾数�"
 
-#: object-file.c:1374
+#: object-file.c:1457
+#, c-format
+msgid "unable to parse %s header"
+msgstr "无法解� %s 头部"
+
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "无效的对象类型"
 
-#: object-file.c:1458
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "无法用 --allow-unknown-type �数解开 %s 头信�"
-
-#: object-file.c:1461
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "无法解开 %s 头部"
 
-#: object-file.c:1467
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "无法用 --allow-unknown-type �数解� %s 头信�"
-
-#: object-file.c:1470
+#: object-file.c:1474
 #, c-format
-msgid "unable to parse %s header"
-msgstr "无法解� %s 头部"
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "%s 的头部太长，超出了 %d 字节"
 
-#: object-file.c:1697
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
-msgstr "读�对象 %s 失败"
+msgstr "无法读�对象 %s"
 
-#: object-file.c:1701
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "找�到 %2$s 的替代 %1$s"
 
-#: object-file.c:1705
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "�散对象 %s（�存在 %s）已��"
 
-#: object-file.c:1709
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "打包对象 %s（�存在 %s）已��"
 
-#: object-file.c:1814
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "无法写文件 %s"
 
-#: object-file.c:1821
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "无法为 '%s' 设置��"
 
-#: object-file.c:1828
+#: object-file.c:1835
 msgid "file write error"
 msgstr "文件写错误"
 
-#: object-file.c:1848
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr "关闭�散对象文件时出错"
 
-#: object-file.c:1913
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr "���足，无法在仓库对象库 %s 中添加对象"
 
-#: object-file.c:1915
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "无法创建临时文件"
 
-#: object-file.c:1939
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "�能写�散对象文件"
 
-#: object-file.c:1945
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "�能压缩新对象 %s（%d）"
 
-#: object-file.c:1949
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
 
-#: object-file.c:1953
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "被 %s 的�稳定对象�数��糊涂了"
 
-#: object-file.c:1963 builtin/pack-objects.c:1097
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr "在 %s 上调用 utime() 失败"
 
-#: object-file.c:2040
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "�能读�对象 %s"
 
-#: object-file.c:2091
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "��的�交"
 
-#: object-file.c:2099
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "��的标签"
 
-#: object-file.c:2199
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "索引 %s 时读�错误"
 
-#: object-file.c:2202
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "索引 %s 时读入�完整"
 
-#: object-file.c:2275 object-file.c:2285
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
-msgstr "%s：�入数�库失败"
+msgstr "%s：无法�入数�库"
 
-#: object-file.c:2291
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s：�支�的文件类型"
 
-#: object-file.c:2315
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s �是一个有效的对象"
 
-#: object-file.c:2317
+#: object-file.c:2331
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s �是一个有效的 '%s' 对象"
 
-#: object-file.c:2344 builtin/index-pack.c:192
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "�能打开 %s"
 
-#: object-file.c:2535 object-file.c:2588
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "%s 的哈希值�匹�（预期 %s）"
 
-#: object-file.c:2559
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "�能 mmap %s"
 
-#: object-file.c:2564
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "无法解压缩 %s 的头部"
 
-#: object-file.c:2570
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "无法解� %s 的头部"
 
-#: object-file.c:2581
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "无法解压缩 %s 的内容"
 
-#: object-name.c:486
+#: object-name.c:480
 #, c-format
 msgid "short object ID %s is ambiguous"
 msgstr "短对象ID %s 存在歧义"
 
-#: object-name.c:497
+#: object-name.c:491
 msgid "The candidates are:"
 msgstr "候选者有："
 
-#: object-name.c:796
+#: object-name.c:790
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5698,22 +5858,22 @@ msgstr ""
 "引用，�能需�删除它们。�行 \"git config advice.objectNameWarning\n"
 "false\" 命令关闭本消�通知。"
 
-#: object-name.c:916
+#: object-name.c:910
 #, c-format
 msgid "log for '%.*s' only goes back to %s"
 msgstr "'%.*s' 的日志仅能回到 %s"
 
-#: object-name.c:924
+#: object-name.c:918
 #, c-format
 msgid "log for '%.*s' only has %d entries"
 msgstr "'%.*s' 的日志仅有 %d 个�目"
 
-#: object-name.c:1702
+#: object-name.c:1696
 #, c-format
 msgid "path '%s' exists on disk, but not in '%.*s'"
 msgstr "路径 '%s' 在�盘上，但是�在 '%.*s' 中"
 
-#: object-name.c:1708
+#: object-name.c:1702
 #, c-format
 msgid ""
 "path '%s' exists, but not '%s'\n"
@@ -5722,12 +5882,12 @@ msgstr ""
 "路径 '%s' 存在，而 '%s' �存在\n"
 "�示：您的��是 '%.*s:%s' 亦� '%.*s:./%s'？"
 
-#: object-name.c:1717
+#: object-name.c:1711
 #, c-format
 msgid "path '%s' does not exist in '%.*s'"
 msgstr "路径 '%s' �在 '%.*s' 中"
 
-#: object-name.c:1745
+#: object-name.c:1739
 #, c-format
 msgid ""
 "path '%s' is in the index, but not at stage %d\n"
@@ -5736,7 +5896,7 @@ msgstr ""
 "路径 '%s' 在索引中，但�在暂存区 %d 中\n"
 "�示：您的��是 ':%d:%s'？"
 
-#: object-name.c:1761
+#: object-name.c:1755
 #, c-format
 msgid ""
 "path '%s' is in the index, but not '%s'\n"
@@ -5745,21 +5905,21 @@ msgstr ""
 "路径 '%s' 在索引中，但 '%s' �在\n"
 "�示：您的��是 ':%d:%s' 亦� ':%d:./%s'？"
 
-#: object-name.c:1769
+#: object-name.c:1763
 #, c-format
 msgid "path '%s' exists on disk, but not in the index"
 msgstr "路径 '%s' 在�盘上，但�在索引里"
 
-#: object-name.c:1771
+#: object-name.c:1765
 #, c-format
 msgid "path '%s' does not exist (neither on disk nor in the index)"
 msgstr "路径 '%s' �存在（既�在�盘上，也�在索引中）"
 
-#: object-name.c:1784
+#: object-name.c:1778
 msgid "relative path syntax can't be used outside working tree"
 msgstr "�能在工作区之外使用相对路径语法"
 
-#: object-name.c:1922
+#: object-name.c:1916
 #, c-format
 msgid "invalid object name '%.*s'."
 msgstr "无效的对象� '%.*s'。"
@@ -5774,27 +5934,40 @@ msgstr "无效的对象类型 \"%s\""
 msgid "object %s is a %s, not a %s"
 msgstr "对象 %s 是一个 %s，�是一个 %s"
 
-#: object.c:232
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "对象 %s 有未知的类型 id %d"
 
-#: object.c:245
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "�能解�对象：%s"
 
-#: object.c:265 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "哈希值与 %s �匹�"
 
-#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "多包�图缺少必需的��索引"
+
+#: pack-bitmap.c:429
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index：无法打开包"
+
+#: 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:1547 builtin/rev-list.c:92
+#: 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:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "无法得到 %s 的�盘使用�"
@@ -5824,124 +5997,134 @@ msgstr "��索引文件 %s �支�的版本 %<PRIu32>"
 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
 msgstr "��索引文件 %s 有�支�的哈希 ID %<PRIu32>"
 
-#: pack-write.c:250
+#: pack-write.c:251
 msgid "cannot both write and verify reverse index"
 msgstr "无法�时写入和校验��索引"
 
-#: pack-write.c:271
+#: pack-write.c:270
 #, c-format
 msgid "could not stat: %s"
 msgstr "�能调用 stat：%s"
 
-#: pack-write.c:283
+#: pack-write.c:282
 #, c-format
 msgid "failed to make %s readable"
 msgstr "无法设置 %s 为�读"
 
-#: pack-write.c:522
+#: pack-write.c:520
 #, c-format
 msgid "could not write '%s' promisor file"
 msgstr "无法写入 '%s' 承诺者文件"
 
-#: packfile.c:625
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "�移�在包文件结�之�（��的 .idx？）"
 
-#: packfile.c:1937
+#: packfile.c:657
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "包文件 %s �能被映射%s"
+
+#: packfile.c:1924
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "�移�在 %s 的包索引开始之�（��的索引？）"
 
-#: packfile.c:1941
+#: 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
+#: 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.c:38
+#: 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"
 msgstr "%s 需�一个值"
 
-#: parse-options.c:73
+#: parse-options.c:93
 #, c-format
 msgid "%s is incompatible with %s"
 msgstr "%s 与 %s �兼容"
 
-#: parse-options.c:78
+#: parse-options.c:98
 #, c-format
 msgid "%s : incompatible with something else"
 msgstr "%s：和其它的�兼容"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
 #, c-format
 msgid "%s takes no value"
 msgstr "%s ��值"
 
-#: parse-options.c:94
+#: parse-options.c:114
 #, c-format
 msgid "%s isn't available"
 msgstr "%s ��用"
 
-#: parse-options.c:217
+#: parse-options.c:237
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr "%s 期望一个�负整数和一个�选的 k/m/g �缀"
 
-#: parse-options.c:386
+#: parse-options.c:393
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "有歧义的选项：%s（�以是 --%s%s 或 --%s%s）"
 
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
-msgstr "你的��是 `--%s`（有两个短线）？"
+msgstr "您的��是 `--%s`（有两个短线）？"
 
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "--%s 的别�"
 
-#: parse-options.c:879
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "未知选项 `%s'"
 
-#: parse-options.c:881
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "未知开关 `%c'"
 
-#: parse-options.c:883
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "字符串中未知的� ascii 字符选项：`%s'"
 
-#: parse-options.c:907
+#: parse-options.c:920
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:926
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "用法：%s"
@@ -5949,98 +6132,122 @@ msgstr "用法：%s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:932
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "  或：%s"
 
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. 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:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
 #  译者：为��在输出中对�，注�调整�中空格�
-#: parse-options.c:935
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:974
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-æ•°å­—"
 
-#: path.c:915
+#: path.c:922
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "�能设置 %s 为组�写"
 
-#: pathspec.c:151
+#: pathspec.c:150
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "转义字符 '\\' �能作为属性值的最�一个字符"
 
-#: pathspec.c:169
+#: pathspec.c:168
 msgid "Only one 'attr:' specification is allowed."
 msgstr "��许一个 'attr:' 规格。"
 
-#: pathspec.c:172
+#: pathspec.c:171
 msgid "attr spec must not be empty"
 msgstr "属性规格�能为空"
 
-#: pathspec.c:215
+#: pathspec.c:214
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "无效的属性� %s"
 
-#: pathspec.c:280
+#: pathspec.c:279
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr "全局的 'glob' 和 'noglob' 路径规格设置�兼容"
 
-#: pathspec.c:287
+#: pathspec.c:286
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置�兼容"
 
-#: pathspec.c:327
+#: pathspec.c:326
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "路径规格包�无效的神奇�缀"
 
-#: pathspec.c:348
+#: pathspec.c:347
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "在路径规格 '%3$s' 中无效的神奇�缀 '%2$.*1$s'"
 
-#: pathspec.c:353
+#: pathspec.c:352
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "路径规格 '%s' 的神奇�缀结尾少了一个 ')'"
 
-#: pathspec.c:391
+#: pathspec.c:390
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "路径规格 '%2$s' 中包�未实现的神奇�缀 '%1$c'"
 
-#: pathspec.c:450
+#: pathspec.c:449
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s：'literal' 和 'glob' �兼容"
 
-#: pathspec.c:466
+#: pathspec.c:465
 #, c-format
 msgid "%s: '%s' is outside repository at '%s'"
 msgstr "%s：'%s' 在�于 '%s' 的仓库之外"
 
-#: pathspec.c:542
+#: pathspec.c:541
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s'（助记符：'%c'）"
 
-#: pathspec.c:552
+#: pathspec.c:551
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s：路径规格神奇�缀�被此命令支�：%s"
 
-#: pathspec.c:619
+#: pathspec.c:618
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "路径规格 '%s' �于符�链接中"
 
-#: pathspec.c:664
+#: pathspec.c:663
 #, c-format
 msgid "line is badly quoted: %s"
 msgstr "行被错误地引用：%s"
@@ -6054,14 +6261,14 @@ msgid "unable to write delim packet"
 msgstr "无法写 delim 包"
 
 #: pkt-line.c:106
-msgid "unable to write stateless separator packet"
-msgstr "无法写入无状�分隔符数�包"
+msgid "unable to write response end packet"
+msgstr "无法写入�应结�数�包"
 
 #: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr "flush 包写错误"
 
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
 msgid "protocol error: impossibly long line"
 msgstr "�议错误：��能的长行"
 
@@ -6069,7 +6276,7 @@ msgstr "�议错误：��能的长行"
 msgid "packet write with format failed"
 msgstr "格�化包写入错误"
 
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
 msgid "packet write failed - data exceeds max packet size"
 msgstr "写数�包失败：数�超过了包的最大长度"
 
@@ -6078,25 +6285,25 @@ msgstr "写数�包失败：数�超过了包的最大长度"
 msgid "packet write failed: %s"
 msgstr "数�包写入失败：%s"
 
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
 msgid "read error"
 msgstr "读�错误"
 
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
 msgid "the remote end hung up unexpectedly"
 msgstr "远端�外挂断了"
 
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "�议错误：错误的行长度字符串：%.4s"
 
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: 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:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "远程错误：%s"
@@ -6110,23 +6317,23 @@ msgstr "正在刷新索引"
 msgid "unable to create threaded lstat: %s"
 msgstr "无法创建线程 lstat：%s"
 
-#: pretty.c:988
+#: pretty.c:1051
 msgid "unable to parse --pretty format"
 msgstr "�能解� --pretty 格�"
 
-#: promisor-remote.c:30
+#: promisor-remote.c:31
 msgid "promisor-remote: unable to fork off fetch subprocess"
 msgstr "promisor-remote：无法派生 fetch �进程"
 
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
 msgid "promisor-remote: could not write to fetch subprocess"
 msgstr "promisor-remote：无法� fetch �进程写入"
 
-#: promisor-remote.c:41
+#: promisor-remote.c:44
 msgid "promisor-remote: could not close stdin to fetch subprocess"
 msgstr "promisor-remote：无法关闭至 fetch �进程的标准输入"
 
-#: promisor-remote.c:53
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "promisor 远程�称�能以 '/' 开始：%s"
@@ -6139,88 +6346,84 @@ msgstr "object-info：在�数之�应有一个 flush"
 msgid "Removing duplicate objects"
 msgstr "正在删除��对象"
 
-#: range-diff.c:78
+#: range-diff.c:67
 msgid "could not start `log`"
 msgstr "�能�动 `log`"
 
-#: range-diff.c:80
+#: range-diff.c:69
 msgid "could not read `log` output"
 msgstr "�能读� `log` 的输出"
 
-#: range-diff.c:101 sequencer.c:5551
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "�能解��交 '%s'"
 
-#: range-diff.c:115
+#: range-diff.c:111
 #, c-format
 msgid ""
 "could not parse first line of `log` output: did not start with 'commit ': "
 "'%s'"
 msgstr "无法解� `log` 输出的首行：�是以 'commit ' 开头：'%s'"
 
-#: range-diff.c:140
+#: range-diff.c:137
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "无法解� git 头 '%.*s'"
 
-#: range-diff.c:306
+#: range-diff.c:304
 msgid "failed to generate diff"
-msgstr "生� diff 失败"
+msgstr "无法生� diff"
 
-#: range-diff.c:558
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only 和 --right-only 互斥"
-
-#: range-diff.c:561 range-diff.c:563
+#: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "�能解� '%s' 的日志"
 
-#: read-cache.c:708
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "将�会添加文件别� '%s'（'%s' 已�存在于索引中）"
 
-#: read-cache.c:724
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr "�能在对象数�库中创建空的数�对象"
 
-#: read-cache.c:746
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr "%s：�能添加常规文件�符�链接或 git 目录"
 
-#: read-cache.c:751
+#: 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:803
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "无法索引文件 '%s'"
 
-#: read-cache.c:822
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "无法在索引中添加 '%s'"
 
-#: read-cache.c:833
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "无法对 %s 执行 stat"
 
-#: read-cache.c:1356
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' 看起�既是文件�是目录"
 
-#: read-cache.c:1571
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "刷新索引"
 
-#: read-cache.c:1700
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6229,7 +6432,7 @@ msgstr ""
 "设置了 index.version，但是�值无效。\n"
 "使用版本 %i"
 
-#: read-cache.c:1710
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6238,144 +6441,144 @@ msgstr ""
 "设置了 GIT_INDEX_VERSION，但是�值无效。\n"
 "使用版本 %i"
 
-#: read-cache.c:1766
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "�的签� 0x%08x"
 
-#: read-cache.c:1769
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "�的索引版本 %d"
 
-#: read-cache.c:1778
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "�的索引文件 sha1 签�"
 
-#: read-cache.c:1812
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "索引使用�被支�的 %.4s 扩展"
 
 # 	
-#: read-cache.c:1814
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "忽略 %.4s 扩展"
 
-#: read-cache.c:1851
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "未知的索引�目格� 0x%08x"
 
-#: read-cache.c:1867
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "索引中�近路径 '%s' 有错误的�称字段"
 
-#: read-cache.c:1924
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr "索引中有未排�的暂存�目"
 
-#: read-cache.c:1927
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "�并文件 '%s' 有多个暂存�目"
 
-#: read-cache.c:1930
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "'%s' 的未排�暂存�目"
 
-#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:332
+#: 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:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr "索引文件��"
 
-#: read-cache.c:2180
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "无法创建 load_cache_entries 线程：%s"
 
-#: read-cache.c:2193
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "无法加入 load_cache_entries 线程：%s"
 
-#: read-cache.c:2226
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s：打开索引文件失败"
 
-#: read-cache.c:2230
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s：�能对打开的索引执行 stat �作"
 
-#: read-cache.c:2234
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s：索引文件比预期的�"
 
-#: read-cache.c:2238
+#: read-cache.c:2280
 #, c-format
-msgid "%s: unable to map index file"
-msgstr "%s：无法对索引文件执行 map �作"
+msgid "%s: unable to map index file%s"
+msgstr "%s：无法映射索引文件%s"
 
-#: read-cache.c:2280
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "无法创建 load_index_extensions 线程：%s"
 
-#: read-cache.c:2307
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "无法加入 load_index_extensions 线程：%s"
 
-#: read-cache.c:2345
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "无法刷新共享索引 '%s'"
 
-#: read-cache.c:2392
+#: 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:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: 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:3138
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr "无法转�为稀�索引"
 
-#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "�能对 '%s' 调用 stat"
 
-#: read-cache.c:3222
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "�能打开 git 目录：%s"
 
-#: read-cache.c:3234
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "无法删除：%s"
 
-#: read-cache.c:3263
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "�能修� '%s' 的���"
 
-#: read-cache.c:3412
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s：�能�到暂存区 #0"
@@ -6448,7 +6651,7 @@ msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "�基 %s 到 %s（%d 个�交）"
 msgstr[1] "�基 %s 到 %s（%d 个�交）"
 
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6456,7 +6659,7 @@ msgstr ""
 "\n"
 "��删除任�一行。使用 'drop' 显�地删除一个�交。\n"
 
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6464,7 +6667,7 @@ msgstr ""
 "\n"
 "如果您在这里删除一行，对应的�交将会丢失。\n"
 
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6478,7 +6681,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -6488,14 +6691,14 @@ msgstr ""
 "然而，如果您删除全部内容，�基�作将会终止。\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816
-#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
+#: 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'"
 msgstr "�能写入 '%s'"
 
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
 #, c-format
 msgid "could not write '%s'."
 msgstr "�能写入 '%s'。"
@@ -6525,14 +6728,12 @@ msgstr ""
 "�选值有：ignore�warn�error。\n"
 "\n"
 
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
 #, c-format
-msgid "could not read '%s'."
-msgstr "�能读� '%s'。"
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s：'preserve' 被 'merges' �代"
 
-#: ref-filter.c:42 wt-status.c:1978
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "丢失"
 
@@ -6551,257 +6752,228 @@ msgstr "�� %d"
 msgid "ahead %d, behind %d"
 msgstr "领先 %d，�� %d"
 
-#: ref-filter.c:175
+#: ref-filter.c:235
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "期望的格�：%%(color:<颜色>)"
 
-#: ref-filter.c:177
+#: ref-filter.c:237
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "未能识别的颜色：%%(color:%s)"
 
-#: ref-filter.c:199
+#: ref-filter.c:259
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "期望整数值 refname:lstrip=%s"
 
-#: ref-filter.c:203
+#: ref-filter.c:263
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "期望整数值 refname:rstrip=%s"
 
-#: ref-filter.c:205
+#: 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"
 
-#: ref-filter.c:260
+#: ref-filter.c:320
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) �带�数"
 
-#: ref-filter.c:282
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "未能识别的 %%(objectsize) �数：%s"
-
-#: ref-filter.c:290
+#: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) �带�数"
 
-#: ref-filter.c:302
+#: ref-filter.c:364
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) �带�数"
 
-#: ref-filter.c:315
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "未能识别的 %%(subject) �数：%s"
-
-#: ref-filter.c:334
+#: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
 msgstr "预期 %%(trailers:key=<值>)"
 
-#: ref-filter.c:336
+#: ref-filter.c:398
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "未知的 %%(trailers) �数：%s"
 
-#: ref-filter.c:367
+#: ref-filter.c:429
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "期望一个正数 contents:lines=%s"
 
-#: ref-filter.c:369
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "未能识别的 %%(contents) �数：%s"
-
-#: ref-filter.c:384
+#: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"
 
-#: ref-filter.c:388
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "未能识别 %%(%2$s) 中的�数 '%1$s'"
-
-#: ref-filter.c:402
+#: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
 msgstr "未识别的邮件选项：%s"
 
-#: ref-filter.c:432
+#: ref-filter.c:506
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "期望的格�：%%(align:<宽度>,<�置>)"
 
-#: ref-filter.c:444
+#: ref-filter.c:518
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "未能识别的�置：%s"
 
-#: ref-filter.c:451
+#: ref-filter.c:525
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "未能识别的宽度：%s"
 
-#: ref-filter.c:460
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "未能识别的 %%(align) �数：%s"
-
-#: ref-filter.c:468
+#: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "元素 %%(align) 需�一个正数的宽度"
 
-#: ref-filter.c:486
+#: ref-filter.c:568
 #, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "未能识别的 %%(if) �数：%s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) �带�数"
 
-#: ref-filter.c:588
+#: ref-filter.c:680
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "格�错误的字段�：%.*s"
 
-#: ref-filter.c:615
+#: ref-filter.c:707
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "未知的字段�：%.*s"
 
-#: ref-filter.c:619
+#: ref-filter.c:711
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr "�是 git 仓库，但是字段 '%.*s' 需�访问对象数�"
 
-#: ref-filter.c:743
+#: 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) 元素"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "格�：在没有 %%(%2$s) 元素的情况下使用了 %%(%1$s) 元素"
 
-#: ref-filter.c:807
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "格�：使用了 %%(then) 元素而没有 %%(if) 元素"
-
-#: ref-filter.c:809
+#: ref-filter.c:912
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "格�：%%(then) 元素用了多次"
 
-#: ref-filter.c:811
+#: ref-filter.c:914
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "格�：%%(then) 元素用在了 %%(else) 之�"
 
-#: ref-filter.c:839
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "格�：使用了 %%(else) 元素而没有 %%(if) 元素"
-
-#: ref-filter.c:841
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "格�：使用了 %%(else) 元素而没有 %%(then) 元素"
-
-#: ref-filter.c:843
+#: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "格�：%%(else) 元素用了多次"
 
-#: ref-filter.c:858
+#: ref-filter.c:965
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "格�：使用了 %%(end) 元素�没有它的对应元素"
 
-#: ref-filter.c:915
+#: ref-filter.c:1027
 #, c-format
 msgid "malformed format string %s"
 msgstr "错误的格�化字符串 %s"
 
-#: ref-filter.c:1556
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "这个命令拒�元素 %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s �能和 --python�--shell�--tcl �时使用"
+
+#: ref-filter.c:1706
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "（�分支，正�基 %s）"
 
-#: ref-filter.c:1559
+#: ref-filter.c:1709
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr "（�分支，正�基分离头指针 %s）"
 
-#: ref-filter.c:1562
+#: ref-filter.c:1712
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "（�分支，二分查找开始于 %s）"
 
-#: ref-filter.c:1566
+#: ref-filter.c:1716
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "（头指针在 %s 分离）"
 
-#: ref-filter.c:1569
+#: ref-filter.c:1719
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "（头指针自 %s 分离）"
 
-#: ref-filter.c:1572
+#: ref-filter.c:1722
 msgid "(no branch)"
 msgstr "（�分支）"
 
-#: ref-filter.c:1604 ref-filter.c:1813
+#: ref-filter.c:1754 ref-filter.c:1972
 #, c-format
 msgid "missing object %s for %s"
 msgstr "缺失 %2$s 的对象 %1$s"
 
-#: ref-filter.c:1614
+#: ref-filter.c:1764
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
 
-#: ref-filter.c:1997
+#: ref-filter.c:2155
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "格�错误的对象 '%s'"
 
-#: ref-filter.c:2086
+#: ref-filter.c:2245
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "忽略带有错误�称 %s 的引用"
 
-#: ref-filter.c:2091 refs.c:676
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "忽略��的引用 %s"
 
-#: ref-filter.c:2431
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "格�：缺少 %%(end) 元素"
 
-#: ref-filter.c:2525
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "格�错误的对象� %s"
 
-#: ref-filter.c:2530
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "选项 `%s' 必须指�一个�交"
 
-#: refs.c:264
+#: refs.c:261
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr "%s 没有指�一个有效的对象�"
 
-#: refs.c:566
+#: refs.c:563
 #, c-format
 msgid ""
 "Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6825,12 +6997,12 @@ msgstr ""
 "\n"
 "\tgit branch -m <name>\n"
 
-#: refs.c:588
+#: refs.c:585
 #, c-format
 msgid "could not retrieve `%s`"
 msgstr "无法获� `%s`"
 
-#: refs.c:598
+#: refs.c:595
 #, c-format
 msgid "invalid branch name: %s = %s"
 msgstr "无效的分支�：%s = %s"
@@ -6840,66 +7012,66 @@ msgstr "无效的分支�：%s = %s"
 msgid "ignoring dangling symref %s"
 msgstr "忽略悬空符�引用 %s"
 
-#: refs.c:922
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "引用 %s 的日志在 %s 之�有缺�"
 
-#: refs.c:929
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "引用 %s 的日志�外终止于 %s "
 
-#: refs.c:994
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "%s 的日志为空"
 
-#: refs.c:1086
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "拒�更新有错误�称 '%s' 的引用"
 
-#: refs.c:1157
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "对引用 '%s' 执行 update_ref 失败：%s"
 
-#: refs.c:2051
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "��许对引用 '%s' 多次更新"
 
-#: refs.c:2131
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "在隔离环境中�止更新引用"
 
-#: refs.c:2142
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "引用更新被钩�中止"
 
-#: refs.c:2242 refs.c:2272
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' 已存在，无法创建 '%s'"
 
-#: refs.c:2248 refs.c:2283
+#: 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:1228
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr "无法删除引用 %s"
 
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: 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:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr "无法删除引用：%s"
@@ -6909,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 匹�超过一个"
@@ -6961,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"
@@ -6983,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"
@@ -6993,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"
@@ -7003,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"
@@ -7013,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"
@@ -7023,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 ""
@@ -7139,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"
@@ -7159,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'"
@@ -7196,10 +7368,10 @@ msgstr "无法写入 rerere 记录"
 msgid "there were errors while writing '%s' (%s)"
 msgstr "写入 '%s' (%s) 时出错"
 
-#: rerere.c:482
+#: 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
@@ -7241,8 +7413,8 @@ msgstr "�能删除 stray '%s'"
 msgid "Recorded preimage for '%s'"
 msgstr "为 '%s' 记录 preimage"
 
-#: rerere.c:865 submodule.c:2089 builtin/log.c:2000
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
+#: 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'"
@@ -7250,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
@@ -7280,46 +7452,33 @@ msgstr "�能打开 rr-cache 目录"
 msgid "could not determine HEAD revision"
 msgstr "�能确定 HEAD 版本"
 
-#: reset.c:70 reset.c:76 sequencer.c:3669
+#: reset.c:70 reset.c:76 sequencer.c:3700
 #, c-format
 msgid "failed to find tree of %s"
-msgstr "无法找到 %s 指�的树。"
+msgstr "无法找到 %s 指�的树"
 
-#: revision.c:2343
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "��支� --unpacked=<packfile>"
 
-#: revision.c:2683
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr "您的当�分支好�被��"
 
-#: revision.c:2686
+#: revision.c:2689
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "您的当�分支 '%s' 尚无任何�交"
 
-#: revision.c:2892
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L 尚�支� -p 和 -s 之外的差异格�"
 
-#: run-command.c:767
-msgid "open /dev/null failed"
-msgstr "�能打开 /dev/null"
-
-#: run-command.c:1275
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "�能创建 async 线程：%s"
 
-#: run-command.c:1345
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"因为没有将钩� '%s' 设置为�执行，钩�被忽略。您�以通过\n"
-"�置 `git config advice.ignoredHook false` �关闭这�警告。"
-
 #: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr "读�远程解包状�时收到�外的 flush 包"
@@ -7336,71 +7495,72 @@ msgstr "远程解包失败：%s"
 
 #: send-pack.c:378
 msgid "failed to sign the push certificate"
-msgstr "为推��书签�失败"
+msgstr "无法为推��书签�"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "send-pack: unable to fork off fetch subprocess"
 msgstr "send-pack：无法派生 fetch �进程"
 
-#: send-pack.c:455
+#: send-pack.c:457
 msgid "push negotiation failed; proceeding anyway with push"
-msgstr "推��商失败；无论如何继续推�"
+msgstr "推��商失败，但还是继续推�"
 
-#: send-pack.c:520
+#: send-pack.c:528
 msgid "the receiving end does not support this repository's hash algorithm"
 msgstr "接收端�支�这个仓库的哈希算法"
 
-#: send-pack.c:529
+#: send-pack.c:537
 msgid "the receiving end does not support --signed push"
-msgstr "接收端�支�签�推�"
+msgstr "接收端�支�签�推�（--signed）"
 
-#: send-pack.c:531
+#: send-pack.c:539
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
-msgstr "未��推��书，因为接收端�支�签�推�"
+msgstr "未��推��书，因为接收端�支�签�推�（--signed）"
 
-#: send-pack.c:543
+#: send-pack.c:546
 msgid "the receiving end does not support --atomic push"
-msgstr "接收端�支�原�推�"
+msgstr "接收端�支�原�推�（--atomic）"
 
-#: send-pack.c:548
+#: send-pack.c:551
 msgid "the receiving end does not support push options"
 msgstr "接收端�支�推�选项"
 
-#: sequencer.c:196
+#: sequencer.c:197
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "无效的�交信�清�模� '%s'"
 
-#: sequencer.c:324
+#: sequencer.c:325
 #, c-format
 msgid "could not delete '%s'"
 msgstr "无法删除 '%s'"
 
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: 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'"
 
-#: sequencer.c:354
+#: sequencer.c:355
 msgid "revert"
 msgstr "还原"
 
-#: sequencer.c:356
+#: sequencer.c:357
 msgid "cherry-pick"
 msgstr "拣选"
 
-#: sequencer.c:358
+#: sequencer.c:359
 msgid "rebase"
 msgstr "�基"
 
-#: sequencer.c:360
+#: sequencer.c:361
 #, c-format
 msgid "unknown action: %d"
 msgstr "未知动作：%d"
 
-#: sequencer.c:419
+#: sequencer.c:420
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -7408,52 +7568,77 @@ msgstr ""
 "冲�解决完毕�，用 'git add <路径>' 或 'git rm <路径>'\n"
 "命令标记修正�的文件"
 
-#: sequencer.c:422
+#: sequencer.c:423
 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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
 msgstr ""
-"冲�解决完毕�，用 'git add <路径>' 或 'git rm <路径>'\n"
-"对修正�的文件�标记，然�用 'git commit' �交"
+"解决所有冲�之�，用 \"git add/rm <路径规格>\" 标记它们，\n"
+"然�执行 \"git cherry-pick --continue\"。您也�以执行\n"
+"\"git cherry-pick --skip\" 命令跳过这个�交。如果想�终止执行并回到\n"
+"执行 \"git cherry-pick\" 之�的状�，执行 \"git cherry-pick --abort\"。"
 
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"解决所有冲�之�，用 \"git add/rm <路径规格>\" 标记它们，\n"
+"然�执行 \"git revert --continue\"。您也�以执行\n"
+"\"git revert --skip\" 命令跳过这个�交。如果想�终止执行并回到\n"
+"执行 \"git revert\" 之�的状�，执行 \"git revert --abort\"。"
+
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "�能�定 '%s'"
 
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#: 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'"
 
-#: sequencer.c:442
+#: sequencer.c:455
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "�能将�行符写入 '%s'"
 
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3554
+#: 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:486
+#: 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."
 msgstr "您的本地修改将被%s覆盖。"
 
-#: sequencer.c:490
+#: sequencer.c:503
 msgid "commit your changes or stash them to proceed."
 msgstr "�交您的修改或贮���继续。"
 
-#: sequencer.c:522
+#: sequencer.c:535
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s：快进"
 
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "无效的清�模� %s"
@@ -7461,65 +7646,65 @@ msgstr "无效的清�模� %s"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
 #.
-#: sequencer.c:671
+#: sequencer.c:685
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s：无法写入新索引文件"
 
-#: sequencer.c:685
+#: sequencer.c:699
 msgid "unable to update cache tree"
 msgstr "�能更新缓存树"
 
-#: sequencer.c:699
+#: sequencer.c:713
 msgid "could not resolve HEAD commit"
 msgstr "�能解� HEAD �交"
 
-#: sequencer.c:779
+#: sequencer.c:793
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "在 '%.*s' 中没有 key"
 
-#: sequencer.c:790
+#: sequencer.c:804
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "无法为 '%s' 的值去引�"
 
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
-#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
+#: 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' 进行读�"
 
-#: sequencer.c:837
+#: sequencer.c:851
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "已�给出 'GIT_AUTHOR_NAME'"
 
-#: sequencer.c:842
+#: sequencer.c:856
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "已�给出 'GIT_AUTHOR_EMAIL'"
 
-#: sequencer.c:847
+#: sequencer.c:861
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "已�给出 'GIT_AUTHOR_DATE'"
 
-#: sequencer.c:851
+#: sequencer.c:865
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "未知�� '%s'"
 
-#: sequencer.c:856
+#: sequencer.c:870
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "缺少 'GIT_AUTHOR_NAME'"
 
-#: sequencer.c:858
+#: sequencer.c:872
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "缺少 'GIT_AUTHOR_EMAIL'"
 
-#: sequencer.c:860
+#: sequencer.c:874
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "缺少 'GIT_AUTHOR_DATE'"
 
-#: sequencer.c:925
+#: sequencer.c:939
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -7548,11 +7733,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1212
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "'prepare-commit-msg' 钩�失败"
 
-#: sequencer.c:1218
+#: 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"
@@ -7576,7 +7761,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1231
+#: 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"
@@ -7599,343 +7784,350 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1273
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "无法找到新创建的�交"
 
-#: sequencer.c:1275
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr "�能解�新创建的�交"
 
-#: sequencer.c:1321
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr "创建�交�，�能解� HEAD"
 
-#: sequencer.c:1323
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "分离头指针"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: sequencer.c:1327
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr "（根�交）"
 
-#: sequencer.c:1348
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "�能解� HEAD"
 
-#: sequencer.c:1350
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s �是一个�交�"
 
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
 msgid "could not parse HEAD commit"
 msgstr "�能解� HEAD �交"
 
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "�能解��交作者"
 
-#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
+#: 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:1454 sequencer.c:1574
+#: sequencer.c:1473 sequencer.c:1593
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "�能从 '%s' 读��交说明"
 
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "无效的作者身份 '%s'"
 
-#: sequencer.c:1491
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "��的作者：缺失日期信�"
 
-#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
-#: builtin/merge.c:934 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:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#: 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:1606
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "�能解��交 %s"
 
-#: sequencer.c:1611
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "�能解�父�交 %s"
 
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "未知命令：%d"
 
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "这是第一个�交说明："
 
-#: sequencer.c:1737
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "这是�交说明 #%d："
 
-#: sequencer.c:1738
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "第一个�交说明将被跳过："
 
-#: sequencer.c:1739
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "�交说明 #%d 将被跳过："
 
-#: sequencer.c:1740
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "这是一个 %d 个�交的组�。"
 
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "�能写 '%s'"
 
-#: sequencer.c:1934
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "需�一个 HEAD �修�"
 
-#: sequencer.c:1936 sequencer.c:3581
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "�能读� HEAD"
 
-#: sequencer.c:1938
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr "�能读� HEAD 的�交说明"
 
-#: sequencer.c:1962
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "�能读� %s 的�交说明"
 
-#: sequencer.c:2072
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "您的索引文件未完��并。"
 
-#: sequencer.c:2079
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "�能修�根�交"
 
-#: sequencer.c:2098
+#: sequencer.c:2117
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "�交 %s 是一个�并�交但未�供 -m 选项。"
 
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2125 sequencer.c:2133
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "�交 %s 没有第 %d 个父�交"
 
-#: sequencer.c:2120
+#: 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:2139
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s：�能解�父�交 %s"
 
-#: sequencer.c:2205
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "�能将 '%s' �命�为 '%s'"
 
-#: sequencer.c:2265
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "�能还原 %s... %s"
 
-#: sequencer.c:2266
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "�能应用 %s... %s"
 
-#: sequencer.c:2287
+#: sequencer.c:2306
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr "丢弃 %s %s -- 补�内容已在上游\n"
 
-#: sequencer.c:2345
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s：无法读�索引"
 
-#: sequencer.c:2352
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s：无法刷新索引"
 
-#: sequencer.c:2425
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s �接��数：'%s'"
 
-#: sequencer.c:2434
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "缺少 %s 的�数"
 
-#: sequencer.c:2477
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "无法解� '%s'"
 
-#: sequencer.c:2538
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "无效行 %d：%.*s"
 
-#: sequencer.c:2549
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "没有父�交的情况下�能 '%s'"
 
-#: sequencer.c:2635
+#: sequencer.c:2624 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "�能读� '%s'。"
+
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "正在�消一个进行中的拣选"
 
-#: sequencer.c:2644
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "正在�消一个进行中的还原"
 
-#: sequencer.c:2690
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "请用 'git rebase --edit-todo' �修改。"
 
-#: sequencer.c:2692
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "��用的指令清�：'%s'"
 
-#: sequencer.c:2697
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "没有解��交。"
 
-#: sequencer.c:2708
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "�能在回退中执行拣选。"
 
-#: sequencer.c:2710
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "�能在拣选中执行回退。"
 
-#: sequencer.c:2788
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "%s 的值无效：%s"
 
-#: sequencer.c:2897
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "��用的 squash-onto"
 
-#: sequencer.c:2917
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "格�错误的选项清�：'%s'"
 
-#: sequencer.c:3012 sequencer.c:4869
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "�供了空的�交集"
 
-#: sequencer.c:3029
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "一个还原�作已在进行"
 
-#: sequencer.c:3031
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "�试 \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3034
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "拣选�作已在进行"
 
-#: sequencer.c:3036
+#: sequencer.c:3057
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "�试 \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3050
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "�能创建�列目录 '%s'"
 
-#: sequencer.c:3065
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "�能�定 HEAD"
 
-#: sequencer.c:3125 sequencer.c:4582
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
 msgstr "拣选或还原�作并未进行"
 
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "�能解� HEAD"
 
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3150 sequencer.c:3194
 msgid "cannot abort from a branch yet to be born"
 msgstr "�能从尚未建立的分支终止"
 
-#: sequencer.c:3159 builtin/grep.c:759
+#: 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:3161
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "�能读� '%s'：%s"
 
-#: sequencer.c:3162
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "�外的文件结�"
 
-#: sequencer.c:3168
+#: sequencer.c:3189
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "�存拣选�交�的 HEAD 文件 '%s' ��"
 
-#: sequencer.c:3179
+#: sequencer.c:3200
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "您好�移动了 HEAD。未能回退，检查您的 HEAD�"
 
-#: sequencer.c:3220
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "没有正在进行的还原"
 
-#: sequencer.c:3229
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "没有正在进行的拣选"
 
-#: sequencer.c:3239
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "无法跳过这个�交"
 
-#: sequencer.c:3246
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "没有�跳过的"
 
-#: sequencer.c:3249
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -7944,16 +8136,16 @@ msgstr ""
 "您已��交了么？\n"
 "试试 \"git %s --continue\""
 
-#: sequencer.c:3411 sequencer.c:4473
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "�能读� HEAD"
 
-#: sequencer.c:3428
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "无法拷� '%s' 至 '%s'"
 
-#: sequencer.c:3436
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -7972,27 +8164,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3446
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "�能应用 %s... %.*s"
 
-#: sequencer.c:3453
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "�能�并 %.*s"
 
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "�能拷� '%s' 至 '%s'"
 
-#: sequencer.c:3483
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "正在执行：%s\n"
 
-#: sequencer.c:3498
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8007,11 +8199,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3504
+#: sequencer.c:3520
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "并且修改索引和/或工作区\n"
 
-#: sequencer.c:3510
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8028,90 +8220,90 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3571
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "�法的标签�称：'%.*s'"
 
-#: sequencer.c:3625
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "写伪根�交"
 
-#: sequencer.c:3630
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "写入 squash-onto"
 
-#: sequencer.c:3714
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "无法解� '%s'"
 
-#: sequencer.c:3747
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "没有当�版本�能�并"
 
-#: sequencer.c:3769
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "无法解� '%.*s'"
 
-#: sequencer.c:3778
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "无�用�并：'%.*s'"
 
-#: sequencer.c:3790
+#: sequencer.c:3818
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "章鱼�并�能在一个新的根�交上执行"
 
-#: sequencer.c:3806
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "�能获� '%s' 的�交说明"
 
-#: sequencer.c:3989
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "甚至�能�试�并 '%.*s'"
 
-#: sequencer.c:4005
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "�并：无法写入新索引文件"
 
-#: sequencer.c:4079
+#: sequencer.c:4116
 msgid "Cannot autostash"
-msgstr "无法 autostash"
+msgstr "无法自动贮�"
 
-#: sequencer.c:4082
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
-msgstr "�外的 stash �应：'%s'"
+msgstr "�外的贮��应：'%s'"
 
-#: sequencer.c:4088
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "�能为 '%s' 创建目录"
 
-#: sequencer.c:4091
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
-msgstr "创建了 autostash：%s\n"
+msgstr "创建了自动贮�：%s\n"
 
-#: sequencer.c:4095
+#: sequencer.c:4132
 msgid "could not reset --hard"
-msgstr "无法 reset --hard"
+msgstr "无法硬性�置（reset --hard）"
 
-#: sequencer.c:4120
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
-msgstr "已应用 autostash。\n"
+msgstr "已应用自动贮�。\n"
 
-#: sequencer.c:4132
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "�能存储 %s"
 
-#: sequencer.c:4135
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8122,29 +8314,29 @@ msgstr ""
 "您的修改在贮�区中很安全。\n"
 "您�以在任何时候�行 \"git stash pop\" 或 \"git stash drop\"。\n"
 
-#: sequencer.c:4140
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "应用自动贮�导致冲�。"
 
-#: sequencer.c:4141
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr "自动贮�已�存在；正在创建一个新的贮��目。"
 
-#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "�能分离头指针"
 
-#: sequencer.c:4249
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "�止在 HEAD\n"
 
-#: sequencer.c:4251
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "�止在 %s\n"
 
-#: sequencer.c:4259
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8164,58 +8356,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4305
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "正在�基（%d/%d）%s"
 
-#: sequencer.c:4351
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "�止在 %s... %.*s\n"
 
-#: sequencer.c:4422
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "未知命令 %d"
 
-#: sequencer.c:4481
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "�能读� orig-head"
 
-#: sequencer.c:4486
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "�能读� 'onto'"
 
-#: sequencer.c:4500
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "�能更新 HEAD 为 %s"
 
-#: sequencer.c:4560
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "�功�基并更新 %s。\n"
 
-#: sequencer.c:4612
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
 msgstr "�能�基：您有未暂存的�更。"
 
-#: sequencer.c:4621
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "�能修补�存在的�交"
 
-#: sequencer.c:4623
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "无效文件：'%s'"
 
-#: sequencer.c:4625
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "无效内容：'%s'"
 
-#: sequencer.c:4628
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8224,59 +8416,68 @@ msgstr ""
 "\n"
 "您的工作区中有未�交的�更。请先�交然��次�行 'git rebase --continue'。"
 
-#: sequencer.c:4664 sequencer.c:4703
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "�能写入文件：'%s'"
 
-#: sequencer.c:4719
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "�能删除 CHERRY_PICK_HEAD"
 
-#: sequencer.c:4726
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "�能�交暂存的修改。"
 
-#: sequencer.c:4846
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s：�能拣选一个%s"
 
-#: sequencer.c:4850
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s：错误的版本"
 
-#: sequencer.c:4885
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "�能作为�始�交回退"
 
-#: sequencer.c:5362
+#: sequencer.c:5189 sequencer.c:5418
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "跳过了先�已应用的�交 %s"
+
+#: sequencer.c:5259 sequencer.c:5434
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "使用 --reapply-cherry-picks �包括跳过的�交"
+
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
 msgstr "make_script：有未能处�的选项"
 
-#: sequencer.c:5365
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script：准备版本时错误"
 
-#: sequencer.c:5615 sequencer.c:5632
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "无事��"
 
-#: sequencer.c:5651
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "无法跳过�必�的拣选"
 
-#: sequencer.c:5751
+#: 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"
@@ -8285,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"
@@ -8296,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"
@@ -8312,96 +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
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "该�作必须在一个工作区中�行"
 
-#: setup.c:661
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "期望 git 仓库版本 <= %d，�得到 %d"
 
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr "�现未知的仓库扩展："
+#: setup.c:730
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "�现未知的仓库扩展："
+msgstr[1] "�现未知的仓库扩展："
 
-#: setup.c:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "仓库的版本是 0，但是�现仅用于 v1 的扩展："
+#: 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:700
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "打开 '%s' 出错"
 
-#: setup.c:702
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "文件太大，无法作为 .git 文件：'%s'"
 
-#: setup.c:704
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "读� %s 出错"
 
-#: setup.c:706
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "无效的 gitfile 格�：%s"
 
-#: setup.c:708
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "在 gitfile 中没有路径：%s"
 
-#: setup.c:710
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "�是 git 仓库：%s"
 
-#: setup.c:812
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' 太大"
 
-#: setup.c:826
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "�是 git 仓库：'%s'"
 
-#: setup.c:855 setup.c:857 setup.c:888
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "�能切�目录到 '%s'"
 
-#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr "无法返回当�工作目录"
 
-#: setup.c:987
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
-msgstr "获� '%*s%s%s' 状�（stat）失败"
+msgstr "无法获� '%*s%s%s' 状�（stat）"
 
-#: setup.c:1225
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "�能读�当�工作目录"
 
-#: setup.c:1234 setup.c:1240
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "�能切�到 '%s'"
 
-#: setup.c:1245
+#: setup.c:1315
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "�是 git 仓库（或者任何父目录）：%s"
 
-#: setup.c:1251
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8410,7 +8615,7 @@ msgstr ""
 "�是 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
 "�止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
 
-#: setup.c:1370
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8419,27 +8624,15 @@ msgstr ""
 "�数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"
 "文件属主必须始终拥有读写��。"
 
-#: setup.c:1417
-msgid "open /dev/null or dup failed"
-msgstr "�能打开或者�制 /dev/null"
-
-#: setup.c:1432
+#: setup.c:1508
 msgid "fork failed"
 msgstr "fork 失败"
 
-#: setup.c:1437 t/helper/test-simple-ipc.c:285
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "setsid 失败"
 
-#: sparse-index.c:151
-msgid "attempting to use sparse-index without cone mode"
-msgstr "�试在没有 cone 模�下使用稀�索引"
-
-#: sparse-index.c:156
-msgid "unable to update cache-tree, staying full"
-msgstr "�能更新缓存树，��完整"
-
-#: sparse-index.c:239
+#: sparse-index.c:289
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr "索引�目是一个目录，但�是稀�的 (%08x)"
@@ -8496,13 +8689,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] "%u 字节/秒"
 msgstr[1] "%u 字节/秒"
 
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
-#: builtin/rebase.c:866
+#: 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:1177
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "�能编辑 '%s'"
@@ -8526,7 +8719,7 @@ msgstr "忽略�能被解�为命令行选项的 '%s'：%s"
 msgid "invalid value for %s"
 msgstr "%s 的值无效"
 
-#: submodule-config.c:766
+#: submodule-config.c:767
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "�能更新 .gitmodules �目 %s"
@@ -8549,70 +8742,70 @@ msgstr "无法移除 %s 的 .gitmodules �目"
 msgid "staging updated .gitmodules failed"
 msgstr "将更新� .gitmodules 添加暂存区失败"
 
-#: submodule.c:328
+#: submodule.c:358
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "�于未检出的�模组 '%s'"
 
-#: submodule.c:359
+#: submodule.c:389
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "路径规格 '%s' 在�模组 '%.*s' 中"
 
-#: submodule.c:436
+#: submodule.c:466
 #, c-format
 msgid "bad --ignore-submodules argument: %s"
 msgstr "�的 --ignore-submodules �数：%s"
 
-#: submodule.c:818
+#: submodule.c:844
 #, c-format
 msgid ""
 "Submodule in commit %s at path: '%s' collides with a submodule named the "
 "same. Skipping it."
 msgstr "�交 %s 中�于路径 '%s' 的�模组和��的�模组冲�。 跳过它。"
 
-#: submodule.c:921
+#: submodule.c:954
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "�模组�目 '%s'（%s）是一个 %s，�是一个�交"
 
-#: submodule.c:1006
+#: submodule.c:1042
 #, c-format
 msgid ""
 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
 "submodule %s"
 msgstr "无法在�模组 %s 中执行 'git rev-list <�交> --not --remotes -n 1'"
 
-#: submodule.c:1129
+#: submodule.c:1165
 #, c-format
 msgid "process for submodule '%s' failed"
 msgstr "处��模组 '%s' 失败"
 
-#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "无法将 HEAD 解�为有效引用。"
 
-#: submodule.c:1169
+#: submodule.c:1205
 #, c-format
 msgid "Pushing submodule '%s'\n"
 msgstr "正在推��模组 '%s'\n"
 
-#: submodule.c:1172
+#: submodule.c:1208
 #, c-format
 msgid "Unable to push submodule '%s'\n"
 msgstr "无法推��模组 '%s'\n"
 
-#: submodule.c:1464
+#: submodule.c:1491
 #, c-format
 msgid "Fetching submodule %s%s\n"
 msgstr "正在获��模组 %s%s\n"
 
-#: submodule.c:1498
+#: submodule.c:1525
 #, c-format
 msgid "Could not access submodule '%s'\n"
 msgstr "无法访问�模组 '%s'\n"
 
-#: submodule.c:1653
+#: submodule.c:1680
 #, c-format
 msgid ""
 "Errors during submodule fetch:\n"
@@ -8621,77 +8814,77 @@ msgstr ""
 "获��模组时的错误：\n"
 "%s"
 
-#: submodule.c:1678
+#: submodule.c:1705
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "无法将 '%s' 识别为 git 仓库"
 
-#: submodule.c:1695
+#: submodule.c:1722
 #, c-format
 msgid "Could not run 'git status --porcelain=2' in submodule %s"
 msgstr "无法在�模组 %s 中执行 'git status --porcelain=2'"
 
-#: submodule.c:1736
+#: submodule.c:1763
 #, c-format
 msgid "'git status --porcelain=2' failed in submodule %s"
 msgstr "在�模组 %s 中执行 'git status --porcelain=2' 失败"
 
-#: submodule.c:1811
+#: submodule.c:1838
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "无法在�模组 '%s' 中�动 'git status'"
 
-#: submodule.c:1824
+#: submodule.c:1851
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "无法在�模组 '%s' 中执行 'git status'"
 
-#: submodule.c:1839
+#: submodule.c:1868
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "无法在�模组 '%s' 中�消 core.worktree 的设置"
 
-#: submodule.c:1866 submodule.c:2176
+#: submodule.c:1895 submodule.c:2210
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "无法递归进�模组路径 '%s'"
 
-#: submodule.c:1887
+#: submodule.c:1917
 msgid "could not reset submodule index"
 msgstr "无法�置�模组索引"
 
-#: submodule.c:1929
+#: submodule.c:1959
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "�模组 '%s' 中有�索引"
 
-#: submodule.c:1981
+#: submodule.c:2013
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "�模组 '%s' 无法被更新。"
 
-#: submodule.c:2049
+#: submodule.c:2081
 #, c-format
 msgid "submodule git dir '%s' is inside git dir '%.*s'"
 msgstr "�模组 git 目录 '%s' �于 git 目录 '%.*s' 中"
 
-#: submodule.c:2070
+#: submodule.c:2102
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr "�支�对有多个工作区的�模组 '%s' 执行 relocate_gitdir"
 
-#: submodule.c:2082 submodule.c:2141
+#: submodule.c:2114 submodule.c:2174
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "�能查询�模组 '%s' 的�称"
 
-#: submodule.c:2086
+#: submodule.c:2118
 #, c-format
 msgid "refusing to move '%s' into an existing git dir"
 msgstr "�止移动 '%s' 到现存 git 目录中"
 
-#: submodule.c:2093
+#: submodule.c:2124
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -8702,11 +8895,11 @@ msgstr ""
 "'%s' �移至\n"
 "'%s'\n"
 
-#: submodule.c:2221
+#: submodule.c:2255
 msgid "could not start ls-files in .."
 msgstr "无法在 .. 中�动 ls-files"
 
-#: submodule.c:2261
+#: submodule.c:2295
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree 返回未知返回值 %d"
@@ -8728,7 +8921,7 @@ msgid "unknown value '%s' for key '%s'"
 msgstr "键 '%2$s' 的未知�值 '%1$s'"
 
 #: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
 #, c-format
 msgid "more than one %s"
 msgstr "多于一个 %s"
@@ -8743,11 +8936,11 @@ msgstr "尾注 '%.*s' 的键为空"
 msgid "could not read input file '%s'"
 msgstr "�能读�输入文件 '%s'"
 
-#: trailer.c:766 builtin/mktag.c:88
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
 msgid "could not read from stdin"
 msgstr "�能自标准输入读�"
 
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
 #, c-format
 msgid "could not stat %s"
 msgstr "�能对 %s 调用 stat"
@@ -8813,7 +9006,7 @@ msgstr "�能执行 fast-import"
 msgid "error while running fast-import"
 msgstr "执行 fast-import 出错"
 
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
 #, c-format
 msgid "could not read ref %s"
 msgstr "无法读�引用 %s"
@@ -8831,7 +9024,7 @@ msgstr "�议�支�设置远程�务路径"
 msgid "invalid remote service path"
 msgstr "无效的远程�务路径"
 
-#: transport-helper.c:661 transport.c:1471
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "�议�支�该�作"
 
@@ -8840,7 +9033,7 @@ msgstr "�议�支�该�作"
 msgid "can't connect to subservice %s"
 msgstr "�能连接到��务 %s"
 
-#: transport-helper.c:693 transport.c:397
+#: transport-helper.c:693 transport.c:404
 msgid "--negotiate-only requires protocol v2"
 msgstr "--negotiate-only 需��议 v2"
 
@@ -8853,59 +9046,59 @@ msgstr "'option' 缺�一个匹�的 'ok/error' 指令"
 msgid "expected ok/error, helper said '%s'"
 msgstr "预期 ok/error，助手说 '%s'"
 
-#: transport-helper.c:855
+#: transport-helper.c:859
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "助手报告 %s 的�外状�"
 
-#: transport-helper.c:938
+#: transport-helper.c:942
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "助手 %s �支� dry-run"
 
-#: transport-helper.c:941
+#: transport-helper.c:945
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "助手 %s �支� --signed"
 
-#: transport-helper.c:944
+#: transport-helper.c:948
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "助手 %s �支� --signed=if-asked"
 
-#: transport-helper.c:949
+#: transport-helper.c:953
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "助手 %s �支� --atomic"
 
-#: transport-helper.c:953
+#: transport-helper.c:957
 #, c-format
 msgid "helper %s does not support --%s"
 msgstr "助手 %s �支� --%s"
 
-#: transport-helper.c:960
+#: transport-helper.c:964
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "助手 %s �支� 'push-option'"
 
-#: transport-helper.c:1060
+#: transport-helper.c:1064
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "remote-heper �支�推�，需�引用规格"
 
-#: transport-helper.c:1065
+#: transport-helper.c:1069
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "助手 %s �支� 'force'"
 
-#: transport-helper.c:1112
+#: transport-helper.c:1116
 msgid "couldn't run fast-export"
 msgstr "无法执行 fast-export"
 
-#: transport-helper.c:1117
+#: transport-helper.c:1121
 msgid "error while running fast-export"
 msgstr "执行 fast-export 时出错"
 
-#: transport-helper.c:1142
+#: transport-helper.c:1146
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -8914,52 +9107,52 @@ msgstr ""
 "没有共�的引用并且也没有指定，什么也�会�。\n"
 "也许您应该指定一个分支。\n"
 
-#: transport-helper.c:1224
+#: transport-helper.c:1228
 #, c-format
 msgid "unsupported object format '%s'"
 msgstr "�支�的对象格� '%s'"
 
-#: transport-helper.c:1233
+#: transport-helper.c:1237
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "引用列表中格�错误的�应：%s"
 
-#: transport-helper.c:1385
+#: transport-helper.c:1389
 #, c-format
 msgid "read(%s) failed"
 msgstr "读�（%s）失败"
 
-#: transport-helper.c:1412
+#: transport-helper.c:1416
 #, c-format
 msgid "write(%s) failed"
 msgstr "写（%s）失败"
 
-#: transport-helper.c:1461
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed"
 msgstr "%s 线程失败"
 
-#: transport-helper.c:1465
+#: transport-helper.c:1469
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "%s 线程等待失败：%s"
 
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "�能�动线程�拷�数�：%s"
 
-#: transport-helper.c:1525
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed to wait"
 msgstr "%s 进程等待失败"
 
-#: transport-helper.c:1529
+#: transport-helper.c:1533
 #, c-format
 msgid "%s process failed"
 msgstr "%s 进程失败"
 
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
 msgid "can't start thread for copying data"
 msgstr "�能�动线程�拷�数�"
 
@@ -8973,53 +9166,53 @@ msgstr "将�设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
 msgid "could not read bundle '%s'"
 msgstr "无法读�归档包 '%s'"
 
-#: transport.c:220
+#: transport.c:227
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "传输：无效的深度选项 '%s'"
 
-#: transport.c:272
+#: transport.c:279
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "查看 'git help config' 中的 protocol.version 获�更多信�"
 
-#: transport.c:273
+#: transport.c:280
 msgid "server options require protocol version 2 or later"
 msgstr "�务端选项需�版本 2 �议或更高"
 
-#: transport.c:400
+#: transport.c:407
 msgid "server does not support wait-for-done"
 msgstr "�务器�支� wait-for-done"
 
-#: transport.c:751
+#: transport.c:759
 msgid "could not parse transport.color.* config"
 msgstr "�能解� transport.color.* �置"
 
-#: transport.c:826
+#: transport.c:834
 msgid "support for protocol v2 not implemented yet"
 msgstr "�议 v2 的支�尚未实现"
 
-#: transport.c:960
+#: transport.c:967
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "�置 '%s' 的�值未知：%s"
 
-#: transport.c:1026
+#: transport.c:1033
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "传输 '%s' ��许"
 
-#: transport.c:1079
+#: transport.c:1082
 msgid "git-over-rsync is no longer supported"
 msgstr "��支� git-over-rsync"
 
-#: transport.c:1181
+#: transport.c:1185
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr "下列�模组路径所包�的修改在任何远程�中都找�到：\n"
 
-#: transport.c:1185
+#: transport.c:1189
 #, c-format
 msgid ""
 "\n"
@@ -9046,11 +9239,11 @@ msgstr ""
 "以推�至远程。\n"
 "\n"
 
-#: transport.c:1193
+#: transport.c:1197
 msgid "Aborting."
 msgstr "正在终止。"
 
-#: transport.c:1340
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr "�能推�全部需�的�模组"
 
@@ -9070,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"
@@ -9079,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"
@@ -9088,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"
@@ -9097,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"
@@ -9106,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"
@@ -9115,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"
@@ -9124,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"
@@ -9133,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"
@@ -9142,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"
@@ -9151,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"
@@ -9160,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"
@@ -9169,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"
@@ -9178,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"
@@ -9187,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 "
@@ -9197,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 "
@@ -9207,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"
@@ -9216,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"
@@ -9225,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"
@@ -9234,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"
@@ -9243,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"
@@ -9257,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 "
@@ -9267,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"
@@ -9276,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 "
@@ -9286,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"
+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"
@@ -9311,16 +9513,16 @@ msgstr ""
 "以下路径�生碰撞（如：在�区分大�写的文件系统上的区分大�写的路径），\n"
 "并且碰撞组中�有一个文件存在工作区中：\n"
 
-#: unpack-trees.c:1519
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "正在更新索引标志"
 
-#: unpack-trees.c:2608
+#: unpack-trees.c:2803
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr "工作树和未跟踪�交具有���目：%s"
 
-#: upload-pack.c:1548
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "在 fetch �数之�应该有一个 flush 包"
 
@@ -9357,113 +9559,123 @@ msgstr "无效的 '..' 路径片段"
 msgid "Fetching objects"
 msgstr "正在获�对象"
 
-#: worktree.c:238 builtin/am.c:2151
+#: 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:304
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "在主工作区的 '%s' �是仓库目录"
 
-#: worktree.c:315
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "文件 '%s' �包�工作区的�对路径"
 
-#: worktree.c:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' �存在"
 
-#: worktree.c:333
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' �是一个 .git 文件，错误� %d"
 
-#: worktree.c:342
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' 没有指回到 '%s'"
 
-#: worktree.c:608
+#: worktree.c:604
 msgid "not a directory"
 msgstr "�是一个目录"
 
-#: worktree.c:617
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git �是一个文件"
 
-#: worktree.c:619
+#: worktree.c:615
 msgid ".git file broken"
 msgstr ".git 文件��"
 
-#: worktree.c:621
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr ".git 文件�正确"
 
-#: worktree.c:727
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "�是一个有效的路径"
 
-#: worktree.c:733
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr "无法定�仓库，.git �是一个文件"
 
-#: worktree.c:737
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr "无法定�仓库，.git 文件没有指�一个仓库"
 
-#: worktree.c:741
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "无法定�仓库，.git 文件��"
 
-#: worktree.c:747
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "gitdir ��读"
 
-#: worktree.c:751
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "gitdir �正确"
 
-#: worktree.c:776
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "�是一个有效的目录"
 
-#: worktree.c:782
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "gitdir 文件�存在"
 
-#: worktree.c:787 worktree.c:796
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "无法读� gitdir 文件（%s）"
 
-#: worktree.c:806
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "读�过短（期望 %<PRIuMAX> 字节，读� %<PRIuMAX>）"
 
-#: worktree.c:814
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "无效的 gitdir 文件"
 
-#: worktree.c:822
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "gitdir 文件指�一个�存在的�置"
 
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "�能设置环境�� '%s'"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "�能创建 '%s'"
+
+#: wrapper.c:205 wrapper.c:375
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "无法打开 '%s' 进行读写"
 
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
 #, c-format
 msgid "unable to access '%s'"
 msgstr "�能访问 '%s'"
 
-#: wrapper.c:607
+#: wrapper.c:615
 msgid "unable to get current working directory"
 msgstr "�能获�当�工作目录"
 
@@ -9502,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:1075
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr "��交的�更："
 
-#: wt-status.c:234 wt-status.c:1084
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "尚未暂存以备�交的�更："
 
@@ -9612,22 +9824,22 @@ msgstr "修改的内容, "
 msgid "untracked content, "
 msgstr "未跟踪的内容, "
 
-#: wt-status.c:908
+#: 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:939
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "�模组已修改但尚未更新："
 
-#: wt-status.c:941
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "��交的�模组�更："
 
-#: wt-status.c:1023
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -9635,7 +9847,7 @@ msgstr ""
 "��改动或删除上�的一行。\n"
 "其下所有内容都将被忽略。"
 
-#: wt-status.c:1115
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -9646,77 +9858,83 @@ msgstr ""
 "花了 %.2f 秒�计算出分支的领先/��范围。\n"
 "为��，您�以使用 '--no-ahead-behind'。\n"
 
-#: wt-status.c:1145
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "您有尚未�并的路径。"
 
 #  译者：注����导空格
-#: wt-status.c:1148
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  （解决冲�并�行 \"git commit\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1150
+#: wt-status.c:1206
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  （使用 \"git merge --abort\" 终止�并）"
 
-#: wt-status.c:1154
+#: wt-status.c:1210
 msgid "All conflicts fixed but you are still merging."
 msgstr "所有冲�已解决但您�处于�并中。"
 
 #  译者：注����导空格
-#: wt-status.c:1157
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  （使用 \"git commit\" 结��并）"
 
-#: wt-status.c:1166
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr "您正处于 am �作过程中。"
 
-#: wt-status.c:1169
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "当�的补�为空。"
 
 #  译者：注����导空格
-#: wt-status.c:1173
+#: wt-status.c:1232
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  （解决冲�，然��行 \"git am --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1175
+#: wt-status.c:1234
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  （使用 \"git am --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:1177
+#: 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:1310
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo 丢失。"
 
-#: wt-status.c:1312
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "没有命令被执行。"
 
-#: wt-status.c:1315
+#: 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:1326
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  （更多��文件 %s）"
 
-#: wt-status.c:1331
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "未剩下任何命令。"
 
-#: wt-status.c:1334
+#: wt-status.c:1396
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
@@ -9724,202 +9942,206 @@ msgstr[0] "接下��执行的命令（剩余 %d �命令）："
 msgstr[1] "接下��执行的命令（剩余 %d �命令）："
 
 #  译者：注����导空格
-#: wt-status.c:1342
+#: wt-status.c:1404
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  （使用 \"git rebase --edit-todo\" �查看和编辑）"
 
-#: wt-status.c:1354
+#: wt-status.c:1416
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' �基到 '%s' 的�作。"
 
-#: wt-status.c:1359
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "您在执行�基�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1372
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  （解决冲�，然��行 \"git rebase --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1374
+#: wt-status.c:1436
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  （使用 \"git rebase --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:1376
+#: wt-status.c:1438
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  （使用 \"git rebase --abort\" 以检出原有分支）"
 
 #  译者：注����导空格
-#: wt-status.c:1383
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  （所有冲�已解决：�行 \"git rebase --continue\"）"
 
-#: wt-status.c:1387
+#: 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:1392
+#: wt-status.c:1454
 msgid "You are currently splitting a commit during a rebase."
 msgstr "您在执行�基�作时拆分�交。"
 
 #  译者：注����导空格
-#: wt-status.c:1395
+#: wt-status.c:1457
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr "  （一旦您工作目录�交干净�，�行 \"git rebase --continue\"）"
 
-#: wt-status.c:1399
+#: 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:1404
+#: wt-status.c:1466
 msgid "You are currently editing a commit during a rebase."
 msgstr "您在执行�基�作时编辑�交。"
 
 #  译者：注����导空格
-#: wt-status.c:1407
+#: wt-status.c:1469
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  （使用 \"git commit --amend\" 修补当��交）"
 
 #  译者：注����导空格
-#: wt-status.c:1409
+#: wt-status.c:1471
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  （当您对您的修改满��执行 \"git rebase --continue\"）"
 
-#: wt-status.c:1420
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "拣选�作正在进行中。"
 
-#: wt-status.c:1423
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "您在执行拣选�交 %s 的�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1430
+#: wt-status.c:1492
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  （解决冲�并�行 \"git cherry-pick --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1433
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  （执行 \"git cherry-pick --continue\" 以继续）"
 
 #  译者：注����导空格
-#: wt-status.c:1436
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  （所有冲�已解决：�行 \"git cherry-pick --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1438
+#: wt-status.c:1500
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  （使用 \"git cherry-pick --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:1440
+#: wt-status.c:1502
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  （使用 \"git cherry-pick --abort\" 以�消拣选�作）"
 
-#: wt-status.c:1450
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "还原�作正在行中。"
 
-#: wt-status.c:1453
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "您在执行�转�交 %s 的�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1459
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  （解决冲�并执行 \"git revert --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1462
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  （执行 \"git revert --continue\" 以继续）"
 
 #  译者：注����导空格
-#: wt-status.c:1465
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  （所有冲�已解决：执行 \"git revert --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1467
+#: wt-status.c:1529
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  （使用 \"git revert --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:1469
+#: wt-status.c:1531
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  （使用 \"git revert --abort\" 以�消�转�交�作）"
 
-#: wt-status.c:1479
+#: wt-status.c:1541
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "您在执行从分支 '%s' 开始的二分查找�作。"
 
-#: wt-status.c:1483
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "您在执行二分查找�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1486
+#: wt-status.c:1548
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  （使用 \"git bisect reset\" 以回到原有分支）"
 
-#: wt-status.c:1497
+#: wt-status.c:1559
+msgid "You are in a sparse checkout."
+msgstr "您处于一个稀�检出中。"
+
+#: wt-status.c:1562
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
-msgstr "您处于稀�签出状�，包� %d%% 的跟踪文件"
+msgstr "您处于稀�检出状�，包� %d%% 的跟踪文件"
 
-#: wt-status.c:1736
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "�于分支 "
 
-#: wt-status.c:1743
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "交互��基�作正在进行中；至 "
 
-#: wt-status.c:1745
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "�基�作正在进行中；至 "
 
-#: wt-status.c:1750
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "头指针分离于 "
 
-#: wt-status.c:1752
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "头指针分离自 "
 
-#: wt-status.c:1755
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "当��在任何分支上。"
 
-#: wt-status.c:1772
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "�始�交"
 
-#: wt-status.c:1773
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "尚无�交"
 
-#: wt-status.c:1787
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "未跟踪的文件"
 
-#: wt-status.c:1789
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "忽略的文件"
 
-#: wt-status.c:1793
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9929,250 +10151,255 @@ msgstr ""
 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能�高速度，\n"
 "但您需��心��忘了添加新文件（�� 'git help status'）。"
 
-#: wt-status.c:1799
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "未跟踪的文件没有列出%s"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: wt-status.c:1801
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr "（使用 -u �数显示未跟踪的文件）"
 
-#: wt-status.c:1807
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "没有修改"
 
-#: wt-status.c:1812
+#: 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:1816
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "修改尚未加入�交\n"
 
-#: wt-status.c:1820
+#: 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:1824
+#: wt-status.c:1894
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "�交为空，但是存在尚未跟踪的文件\n"
 
-#: wt-status.c:1828
+#: 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:1832 wt-status.c:1838
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "无文件��交\n"
 
-#: wt-status.c:1835
+#: wt-status.c:1905
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "无文件��交（使用 -u 显示未跟踪的文件）\n"
 
-#: wt-status.c:1840
+#: wt-status.c:1910
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "无文件��交，干净的工作区\n"
 
-#: wt-status.c:1945
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "尚无�交在 "
 
-#: wt-status.c:1949
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD（�分支）"
 
-#: wt-status.c:1980
+#: wt-status.c:2050
 msgid "different"
 msgstr "��"
 
 #  译者：注����尾空格
-#: wt-status.c:1982 wt-status.c:1990
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "�� "
 
-#: wt-status.c:1985 wt-status.c:1988
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr "领先 "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2511
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "�能%s：您有未暂存的�更。"
 
-#: wt-status.c:2517
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr "�外，您的索引中包�未�交的�更。"
 
-#: wt-status.c:2519
+#: wt-status.c:2604
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "�能%s：您的索引中包�未�交的�更。"
 
-#: compat/simple-ipc/ipc-unix-socket.c:178
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr "无法�� IPC 命令"
 
-#: compat/simple-ipc/ipc-unix-socket.c:185
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr "无法读� IPC �应"
 
-#: compat/simple-ipc/ipc-unix-socket.c:862
+#: compat/simple-ipc/ipc-unix-socket.c:892
 #, c-format
 msgid "could not start accept_thread '%s'"
-msgstr "无法�动  accept_thread '%s'"
+msgstr "无法�动 accept_thread '%s'"
 
-#: compat/simple-ipc/ipc-unix-socket.c:874
+#: compat/simple-ipc/ipc-unix-socket.c:904
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr "无法�动 '%s' 的 worker[0]"
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: 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>..."
 msgstr "git add [<选项>] [--] <路径规格>..."
 
-#: builtin/add.c:61
+#: builtin/add.c:64
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "�能 chmod %cx '%s'"
 
-#: builtin/add.c:99
+#: builtin/add.c:106
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "�外的差异状� %c"
 
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
 msgid "updating files failed"
 msgstr "更新文件失败"
 
-#: builtin/add.c:114
+#: builtin/add.c:121
 #, c-format
 msgid "remove '%s'\n"
 msgstr "删除 '%s'\n"
 
-#: builtin/add.c:198
+#: builtin/add.c:205
 msgid "Unstaged changes after refreshing the index:"
 msgstr "刷新索引之�尚未被暂存的�更："
 
-#: builtin/add.c:307 builtin/rev-parse.c:991
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "�能读�索引"
 
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "无法为写入打开 '%s'。"
-
-#: builtin/add.c:322
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "�能生�补�"
 
-#: builtin/add.c:325
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "编辑补�失败"
 
-#: builtin/add.c:328
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "�能对 '%s' 调用 stat"
 
-#: builtin/add.c:330
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "空补�。异常终止。"
 
-#: builtin/add.c:335
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "�能应用 '%s'"
 
-#: builtin/add.c:343
+#: builtin/add.c:348
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "下列路径根�您的一个 .gitignore 文件而被忽略：\n"
 
-#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: 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:366
+#: 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:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "交互�挑选数��"
 
-#: builtin/add.c:368
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "编辑当�差异并应用"
 
-#: builtin/add.c:369
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "�许添加忽略的文件"
 
-#: builtin/add.c:370
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "更新已跟踪的文件"
 
-#: builtin/add.c:371
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "对已跟踪文件（暗� -u）�新归一�行符"
 
-#: builtin/add.c:372
+#: builtin/add.c:377
 msgid "record only the fact that the path will be added later"
 msgstr "�记录，该路径���添加"
 
-#: builtin/add.c:373
+#: builtin/add.c:378
 msgid "add changes from all tracked and untracked files"
 msgstr "添加所有改�的已跟踪文件和未跟踪文件"
 
-#: builtin/add.c:376
+#: builtin/add.c:381
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "忽略工作区中移除的路径（和 --no-all 相�）"
 
-#: builtin/add.c:378
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "�添加，�刷新索引"
 
-#: builtin/add.c:379
+#: builtin/add.c:384
 msgid "just skip files which cannot be added because of errors"
 msgstr "跳过因出错�能添加的文件"
 
-#: builtin/add.c:380
+#: builtin/add.c:385
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "检查在演习模�下文件（�使�存在）是�被忽略"
 
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: 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:388 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "覆盖列表里文件的�执行�"
 
-#: builtin/add.c:384
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "创建一个嵌入�仓库时给予警告"
 
-#: builtin/add.c:386
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "`git stash -p` 的�端"
 
-#: builtin/add.c:404
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10200,12 +10427,12 @@ msgstr ""
 "\n"
 "�� \"git help submodule\" 获�更多信�。"
 
-#: builtin/add.c:432
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "正在添加嵌入� git 仓库：%s"
 
-#: builtin/add.c:451
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10215,51 +10442,27 @@ msgstr ""
 "�行下�的命令�关闭本消�\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:460
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "添加文件失败"
 
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run 与 --interactive/--patch �兼容"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file 与 --interactive/--patch �兼容"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file 与 --edit �兼容"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A 和 -u 选项互斥"
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "选项 --ignore-missing �能和 --dry-run �时使用"
-
-#: builtin/add.c:526
+#: builtin/add.c:548
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "�数 --chmod �值 '%s' 必须是 -x 或 +x"
 
-#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file 与路径表达��数�兼容"
-
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
-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:555
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "没有指定文件，也没有文件被添加。\n"
 
-#: builtin/add.c:557
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10269,105 +10472,111 @@ msgstr ""
 "�行下�的命令�关闭本消�\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:364
+#: 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:454
+#: builtin/am.c:482
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' 被 applypatch-msg 钩�删除"
 
-#: builtin/am.c:496
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "�法的输入行：'%s'。"
 
-#: builtin/am.c:534
+#: builtin/am.c:562
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "从 '%s' 拷�注解到 '%s' 时失败"
 
-#: builtin/am.c:560
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "fseek 失败"
 
-#: builtin/am.c:748
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "无法解�补� '%s'"
 
-#: builtin/am.c:813
+#: builtin/am.c:841
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "一次�能有一个 StGIT 补�队列被应用"
 
-#: builtin/am.c:861
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "无效的时间戳"
 
-#: builtin/am.c:866 builtin/am.c:878
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "无效的日期行"
 
-#: builtin/am.c:873
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "无效的时区�移值"
 
-#: builtin/am.c:966
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "补�格�探测失败。"
 
-#: builtin/am.c:971 builtin/clone.c:414
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
-msgstr "创建目录 '%s' 失败"
+msgstr "无法创建目录 '%s'"
 
-#: builtin/am.c:976
+#: builtin/am.c:1004
 msgid "Failed to split patches."
-msgstr "拆分补�失败。"
+msgstr "无法拆分补�。"
 
-#: builtin/am.c:1125
+#: builtin/am.c:1153
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "当您解决这一问题，执行 \"%s --continue\"。"
 
-#: builtin/am.c:1126
+#: builtin/am.c:1154
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "如果您想�跳过这一补�，则执行 \"%s --skip\"。"
 
-#: builtin/am.c:1127
+#: 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:1222
+#: 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:1250
-msgid "Patch is empty."
-msgstr "补�为空。"
-
-#: builtin/am.c:1315
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "在�交 %s 中缺失作者行"
 
-#: builtin/am.c:1318
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "无效的身份标识：%.*s"
 
-#: builtin/am.c:1537
+#: builtin/am.c:1566
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "仓库缺�必�的数�对象以进行三方�并。"
 
-#: builtin/am.c:1539
+#: builtin/am.c:1568
 msgid "Using index info to reconstruct a base tree..."
 msgstr "使用索引��建一个（三方�并的）基础目录树..."
 
-#: builtin/am.c:1558
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10375,24 +10584,24 @@ msgstr ""
 "您是�曾手动编辑过您的补�？\n"
 "无法应用补�到索引中的数�对象上。"
 
-#: builtin/am.c:1564
+#: builtin/am.c:1593
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "回�到基础版本上打补��进行三方�并..."
 
-#: builtin/am.c:1590
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "无法�并�更。"
 
-#: builtin/am.c:1622
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "正应用到一个空历�上"
 
-#: builtin/am.c:1674 builtin/am.c:1678
+#: builtin/am.c:1703 builtin/am.c:1707
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "无法继续：%s �存在。"
 
-#: builtin/am.c:1696
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "�交内容为："
 
@@ -10400,39 +10609,57 @@ msgstr "�交内容为："
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1706
+#: 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:1752 builtin/commit.c:408
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "无法写入索引文件"
 
-#: builtin/am.c:1756
+#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "�索引：�能应用补�（�文件：%s）"
 
-#: builtin/am.c:1796 builtin/am.c:1864
+#: 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:1813
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "没有�更 —— 补�已�应用过。"
 
-#: builtin/am.c:1819
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "打补�失败于 %s %.*s"
 
-#: builtin/am.c:1823
+#: 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:1867
+#: 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"
@@ -10442,7 +10669,7 @@ msgstr ""
 "如果没有什么�添加到暂存区的，则很�能是其它�交已�引入了相�的�更。\n"
 "您也许想�跳过这个补�。"
 
-#: builtin/am.c:1874
+#: 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 "
@@ -10451,177 +10678,185 @@ msgid ""
 msgstr ""
 "在您的索引中�存在未�并的路径。\n"
 "您应该对已�冲�解决的�一个文件执行 'git add' �标记已�完�。 \n"
-"你�以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
+"您�以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
 
-#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
-#: builtin/reset.c:355
+#: 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:2033
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
-msgstr "清空索引失败"
+msgstr "无法清空索引"
 
-#: builtin/am.c:2077
+#: 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:2184
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "无效的 --patch-format 值：%s"
 
-#: builtin/am.c:2226
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr "无效的 --show-current-patch 值：%s"
 
-#: builtin/am.c:2230
+#: 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:2261
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<选项>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2268
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "以交互�方��行"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "�的�数 —— 无作用"
 
-#: builtin/am.c:2272
+#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
 msgstr "如果必�，�许使用三方�并。"
 
-#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:948
+#: 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:2275
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "在�交说明中添加 Signed-off-by 尾注"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "使用 utf8 字符集（默认）"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -k �数"
 
-#: builtin/am.c:2282
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -b �数"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -m �数"
 
-#: builtin/am.c:2286
+#: builtin/am.c:2345
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "针对 mbox 格�，� git-mailsplit 传递 --keep-cr �数"
 
-#: builtin/am.c:2289
+#: 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:2292
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "丢弃�切线�的所有内容"
 
-#: builtin/am.c:2294
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "传递给 git-mailinfo"
 
-#: builtin/am.c:2297 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:2324
+#: 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:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
+#: 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:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: 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:2321
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "补�的格�"
 
-#: builtin/am.c:2327
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
 msgstr "打补�失败时显示的错误信�"
 
-#: builtin/am.c:2329
+#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
 msgstr "冲�解决�继续应用补�"
 
-#: builtin/am.c:2332
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "和 --continue �义"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "跳过当�补�"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr "��原始分支并终止打补��作"
 
-#: builtin/am.c:2341
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "终止补��作但�� HEAD ��"
 
-#: builtin/am.c:2345
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "显示正在应用的补�"
 
-#: builtin/am.c:2350
+#: 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:2352
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr "用当�时间作为作者日期"
 
-#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: 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:2355 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "使用 GPG 签��交"
 
-#: builtin/am.c:2358
+#: 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:2376
+#: 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."
@@ -10629,16 +10864,16 @@ msgstr ""
 "�数 -b/--binary 已�很长时间��任何实质�作了，并且将被移除。\n"
 "请���使用它了。"
 
-#: builtin/am.c:2383
+#: builtin/am.c:2448
 msgid "failed to read the index"
-msgstr "读�索引失败"
+msgstr "无法读�索引"
 
-#: builtin/am.c:2398
+#: builtin/am.c:2463
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "之�的�基目录 %s �然存在，但��供了 mbox。"
 
-#: builtin/am.c:2422
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -10647,11 +10882,11 @@ msgstr ""
 "�现了错误的 %s 目录。\n"
 "使用 \"git am --abort\" 删除它。"
 
-#: builtin/am.c:2428
+#: builtin/am.c:2493
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "解决�作未进行，我们�会继续。"
 
-#: builtin/am.c:2438
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "交互�模�需�命令行上�供补�"
 
@@ -10659,44 +10894,35 @@ msgstr "交互�模�需�命令行上�供补�"
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<选项>] [<补�>...]"
 
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "�能创建归档文件 '%s'"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "�能�定�输出"
 
-#: builtin/archive.c:37
+#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive：未�供远程 URL"
 
-#: builtin/archive.c:61
+#: builtin/archive.c:59
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive：期望是 ACK/NAK，�得到 flush 包"
 
-#: builtin/archive.c:64
+#: builtin/archive.c:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive：NACK %s"
 
-#: builtin/archive.c:65
+#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive：�议错误"
 
-#: builtin/archive.c:69
+#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive：应有一个 flush 包"
 
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<�交>]"
 
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check <好-术语> <�-术语> [<术语>]"
-
 #: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10734,72 +10960,85 @@ msgstr "git bisect--helper --bisect-replay <文件>"
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<版本>|<范围>)...]"
 
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <命令>..."
+
+#: builtin/bisect--helper.c:109
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr "�能以 '%2$s' 模�打开文件 '%1$s'"
 
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "�能写入文件 '%s'"
 
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "�能打开文件 '%s' �读�"
+
+#: builtin/bisect--helper.c:170
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' �是一个有效的术语"
 
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "�能使用内置命令 '%s' 作为术语"
 
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "�能修改术语 '%s' 的�义"
 
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
 msgid "please use two different terms"
 msgstr "请使用两个��的术语"
 
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "我们没有在二分查找。\n"
 
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "'%s' �是一个有效的�交"
 
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr "�能检出原始 HEAD '%s'。�试 'git bisect reset <�交>'。"
 
-#: builtin/bisect--helper.c:254
+#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "�的 bisect_write �数：%s"
 
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "无法获�版本 '%s' 的对象 ID"
 
-#: builtin/bisect--helper.c:271
+#: builtin/bisect--helper.c:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "无法打开文件 '%s'"
 
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:314
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "无效的命令：您当�正处于一个 %s/%s 二分查找中"
 
-#: builtin/bisect--helper.c:324
+#: builtin/bisect--helper.c:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -10808,7 +11047,7 @@ msgstr ""
 "您需�给我至少一个 %s 和一个 %s 版本。\n"
 "为此您�以用 \"git bisect %s\" 和 \"git bisect %s\"。"
 
-#: builtin/bisect--helper.c:328
+#: builtin/bisect--helper.c:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -10819,7 +11058,7 @@ msgstr ""
 "然�需��供我至少一个 %s 和一个 %s 版本。\n"
 "为此您�以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
 
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "在�有一个 %s �交的情况下二分查找"
@@ -10828,22 +11067,22 @@ msgstr "在�有一个 %s �交的情况下二分查找"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "您确认么[Y/n]？ "
 
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
 msgid "no terms defined"
 msgstr "未定义术语"
 
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
 "and %s for the new state.\n"
 msgstr "您当�针对旧状�的术语是 %s，对新状�的术语是 %s。\n"
 
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -10852,52 +11091,52 @@ msgstr ""
 "命令 'git bisect terms' 的�数 %s 无效。\n"
 "支�的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
 
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
 msgstr "版本�历设置失败\n"
 
-#: builtin/bisect--helper.c:519
+#: builtin/bisect--helper.c:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "无法打开 '%s' 进行追加"
 
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
 msgstr "'' �是一个有效的术语"
 
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "未识别的选项：'%s'"
 
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' 看起��是一个有效的版本"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "�的 HEAD - 我需�一个 HEAD"
 
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr "检出 '%s' 失败。�试 'git bisect start <有效分支>'。"
 
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "�会在�了 cg-seek 的树上�二分查找"
 
-#: builtin/bisect--helper.c:735
+#: builtin/bisect--helper.c:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "�的 HEAD - 奇怪的符�引用"
 
-#: builtin/bisect--helper.c:755
+#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "无效的引用：'%s'"
 
-#: builtin/bisect--helper.c:813
+#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "您需�执行 \"git bisect start\" �开始\n"
 
@@ -10905,104 +11144,148 @@ msgstr "您需�执行 \"git bisect start\" �开始\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "您想让我为您这样�么[Y/n]？ "
 
-#: builtin/bisect--helper.c:842
+#: builtin/bisect--helper.c:859
 msgid "Please call `--bisect-state` with at least one argument"
 msgstr "请使用至少一个�数调用 `--bisect-state`"
 
-#: builtin/bisect--helper.c:855
+#: builtin/bisect--helper.c:872
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "'git bisect %s' �能带一个�数。"
 
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "�的版本输入：%s"
 
-#: builtin/bisect--helper.c:887
+#: builtin/bisect--helper.c:904
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "�的版本输入（�是�交）：%s"
 
-#: builtin/bisect--helper.c:919
+#: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
 msgstr "我们没有在二分查找。"
 
-#: builtin/bisect--helper.c:969
+#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "'%s'?? 您在说什么?"
 
-#: builtin/bisect--helper.c:981
+#: builtin/bisect--helper.c:998
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr "�能读�文件 '%s' ��放"
 
-#: builtin/bisect--helper.c:1054
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "二分查找�行失败：没有�供命令。"
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "正在执行 %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "二分查找�行失败：命令 '%2$s' 的退出� %1$d < 0 或 >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "无法打开文件 '%s' 进行写入"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "二分查找�能继续�行"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "二分查找�行�功"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "二分查找找到了第一个�的�交"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr "二分查找�行失败：'git bisect--helper --bisect-state %s' 退出�为 %d"
+
+#: builtin/bisect--helper.c:1192
 msgid "reset the bisection state"
 msgstr "清除二分查找状�"
 
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1194
 msgid "check whether bad or good terms exist"
 msgstr "检查�的或好的术语是�存在"
 
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1196
 msgid "print out the bisect terms"
 msgstr "打�二分查找术语"
 
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1198
 msgid "start the bisect session"
 msgstr "�动二分查找过程"
 
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1200
 msgid "find the next bisection commit"
 msgstr "查询下一个二分查找�交"
 
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1202
 msgid "mark the state of ref (or refs)"
 msgstr "标记引用的状�"
 
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1204
 msgid "list the bisection steps so far"
 msgstr "列出到目�为止的二分查找步骤"
 
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1206
 msgid "replay the bisection process from the given file"
 msgstr "从给定文件�放二分查找进程"
 
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1208
 msgid "skip some commits for checkout"
 msgstr "跳过�检出的一些�交"
 
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "�视化二分查找过程"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "使用 <命令>... �自动二分查找。"
+
+#: builtin/bisect--helper.c:1214
 msgid "no log for BISECT_WRITE"
 msgstr "BISECT_WRITE 无日志"
 
-#: builtin/bisect--helper.c:1087
+#: builtin/bisect--helper.c:1229
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset 无需�数或者需�一个�交"
 
-#: builtin/bisect--helper.c:1092
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check 需� 2 或 3 个�数"
-
-#: builtin/bisect--helper.c:1098
+#: builtin/bisect--helper.c:1234
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms 需� 0 或 1 个�数"
 
-#: builtin/bisect--helper.c:1107
+#: builtin/bisect--helper.c:1243
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next 需� 0 个�数"
 
-#: builtin/bisect--helper.c:1118
+#: builtin/bisect--helper.c:1254
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log 需� 0 个�数"
 
-#: builtin/bisect--helper.c:1123
+#: builtin/bisect--helper.c:1259
 msgid "no logfile given"
 msgstr "未�供日志文件"
 
@@ -11014,151 +11297,153 @@ msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "期望一个颜色：%s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "必须以一个颜色结尾"
 
-#: builtin/blame.c:728
+#: builtin/blame.c:724
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
 
-#: builtin/blame.c:746
+#: builtin/blame.c:742
 msgid "invalid value for blame.coloring"
 msgstr "设置 blame.coloring 中的无效�值"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:841
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "�能找到�忽略的版本 %s"
 
-#: builtin/blame.c:867
+#: builtin/blame.c:863
 msgid "show blame entries as we find them, incrementally"
 msgstr "增��地显示�现的 blame �目"
 
-#: builtin/blame.c:868
+#: builtin/blame.c:864
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr "�显示边界�交的对象�（默认：关闭）"
 
-#: builtin/blame.c:869
+#: builtin/blame.c:865
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "�把根�交作为边界（默认：关闭）"
 
-#: builtin/blame.c:870
+#: builtin/blame.c:866
 msgid "show work cost statistics"
 msgstr "显示工作消耗统计"
 
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: 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 "强制显示进度报告"
 
-#: builtin/blame.c:872
+#: builtin/blame.c:868
 msgid "show output score for blame entries"
 msgstr "显示 blame �目的输出得分"
 
-#: builtin/blame.c:873
+#: builtin/blame.c:869
 msgid "show original filename (Default: auto)"
 msgstr "显示原始文件�（默认：自动）"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:870
 msgid "show original linenumber (Default: off)"
 msgstr "显示原始的行�（默认：关闭）"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:871
 msgid "show in a format designed for machine consumption"
 msgstr "显示为一个适�机器读�的格�"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:872
 msgid "show porcelain format with per-line commit information"
 msgstr "为�一行显示机器适用的�交信�"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:873
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr "使用和 git-annotate 相�的输出模�（默认：关闭）"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:874
 msgid "show raw timestamp (Default: off)"
 msgstr "显示原始时间戳（默认：关闭）"
 
-#: builtin/blame.c:879
+#: builtin/blame.c:875
 msgid "show long commit SHA1 (Default: off)"
 msgstr "显示长的 SHA1 �交�（默认：关闭）"
 
-#: builtin/blame.c:880
+#: builtin/blame.c:876
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "��作者�字和时间戳（默认：关闭）"
 
-#: builtin/blame.c:881
+#: builtin/blame.c:877
 msgid "show author email instead of name (Default: off)"
 msgstr "显示作者的邮箱而�是�字（默认：关闭）"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:878
 msgid "ignore whitespace differences"
 msgstr "忽略空白差异"
 
-#: builtin/blame.c:883 builtin/log.c:1820
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "版本"
 
-#: builtin/blame.c:883
+#: builtin/blame.c:879
 msgid "ignore <rev> when blaming"
 msgstr "在执行 blame �作时忽略 <版本>"
 
-#: builtin/blame.c:884
+#: builtin/blame.c:880
 msgid "ignore revisions from <file>"
 msgstr "忽略�自 <文件> 中的版本"
 
-#: builtin/blame.c:885
+#: builtin/blame.c:881
 msgid "color redundant metadata from previous line differently"
 msgstr "使用颜色间隔输出与�一行��的��元信�"
 
-#: builtin/blame.c:886
+#: builtin/blame.c:882
 msgid "color lines by age"
 msgstr "��时间�色"
 
-#: builtin/blame.c:887
+#: builtin/blame.c:883
 msgid "spend extra cycles to find better match"
 msgstr "花费�外的循环�找到更好的匹�"
 
-#: builtin/blame.c:888
+#: builtin/blame.c:884
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "使用�自 <文件> 的修订集而�是调用 git-rev-list"
 
-#: builtin/blame.c:889
+#: builtin/blame.c:885
 msgid "use <file>'s contents as the final image"
 msgstr "使用 <文件> 的内容作为最终的镜�"
 
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
 msgid "score"
 msgstr "得分"
 
-#: builtin/blame.c:890
+#: builtin/blame.c:886
 msgid "find line copies within and across files"
 msgstr "找到文件内�跨文件的行拷�"
 
-#: builtin/blame.c:891
+#: builtin/blame.c:887
 msgid "find line movements within and across files"
 msgstr "找到文件内�跨文件的行移动"
 
-#: builtin/blame.c:892
+#: builtin/blame.c:888
 msgid "range"
 msgstr "范围"
 
-#: builtin/blame.c:893
+#: builtin/blame.c:889
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr "�处�在 <开始>,<结�> 范围内的行，或者函数：<函数�>"
 
-#: builtin/blame.c:945
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
-msgstr "--progress �能和 --incremental 或 --porcelain �时使用"
+msgstr "--progress �能和 --incremental 或机器内部格�一起使用"
 
 #. TRANSLATORS: This string is used to tell us the
 #. maximum display width for a relative timestamp in
@@ -11168,18 +11453,18 @@ msgstr "--progress �能和 --incremental 或 --porcelain �时使用"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:996
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "4 年 11 个月�"
 
-#: builtin/blame.c:1112
+#: 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:1157
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "追踪代�行"
 
@@ -11212,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"
@@ -11222,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"
@@ -11231,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"
@@ -11245,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 "更新�置文件失败"
 
@@ -11257,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:440 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "�能解�格�化字符串"
 
-#: builtin/branch.c:471
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "�能解� HEAD �交"
 
-#: builtin/branch.c:477
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) 指� refs/heads/ 之外"
 
-#: builtin/branch.c:492
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "分支 %s 正被�基到 %s"
 
-#: builtin/branch.c:496
+#: builtin/branch.c:501
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "分支 %s 正被二分查找于 %s"
 
-#: builtin/branch.c:513
+#: builtin/branch.c:518
 msgid "cannot copy the current branch while not on any."
 msgstr "无法拷�当�分支因为�处于任何分支上。"
 
-#: builtin/branch.c:515
+#: builtin/branch.c:520
 msgid "cannot rename the current branch while not on any."
 msgstr "无法�命�当�分支因为�处于任何分支上。"
 
-#: builtin/branch.c:526
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "无效的分支�：'%s'"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "分支�命�失败"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "分支拷�失败"
 
-#: builtin/branch.c:561
+#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "已为错误命�的分支 '%s' 创建了一个副本"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "已将错误命�的分支 '%s' �命�"
 
-#: builtin/branch.c:570
+#: builtin/branch.c:575
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "分支�命�为 %s，但 HEAD 没有更新�"
 
-#: builtin/branch.c:579
+#: builtin/branch.c:584
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "分支被�命�，但更新�置文件失败"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:586
 msgid "Branch is copied, but update of config-file failed"
 msgstr "分支已拷�，但更新�置文件失败"
 
-#: builtin/branch.c:597
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11360,209 +11645,205 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被过滤。\n"
 
-#: builtin/branch.c:631
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "通用选项"
 
-#: builtin/branch.c:633
+#: builtin/branch.c:639
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "显示哈希值和主题，若�数出现两次则显示上游分支"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "�显示信�"
 
-#: builtin/branch.c:635
-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:637
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "��使用"
 
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "上游"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "改�上游信�"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "�消上游信�的设置"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "使用彩色输出"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "作用于远程跟踪分支"
 
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:652 builtin/branch.c:654
 msgid "print only branches that contain the commit"
 msgstr "�打�包�该�交的分支"
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:653 builtin/branch.c:655
 msgid "print only branches that don't contain the commit"
 msgstr "�打��包�该�交的分支"
 
-#: builtin/branch.c:650
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "具体的 git-branch 动作："
 
-#: builtin/branch.c:651
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "列出远程跟踪�本地分支"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "删除完全�并的分支"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "删除分支（�使没有�并）"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr "移动/�命�一个分支，以�它的引用日志"
 
-#: builtin/branch.c:656
+#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr "移动/�命�一个分支，�使目标已存在"
 
-#: builtin/branch.c:657
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "拷�一个分支和它的引用日志"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "拷�一个分支，�使目标已存在"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "列出分支�"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "显示当�分支�"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "创建分支的引用日志"
 
-#: builtin/branch.c:663
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "标记分支的�述"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "强制创建�移动/�命��删除"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "�打�已��并的分支"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "�打�尚未�并的分支"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "以列的方�显示分支"
 
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: 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:670
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "�打�指�该对象的分支"
 
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: 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:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: 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:695 builtin/clone.c:794
+#: builtin/branch.c:703 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 没有�于 /refs/heads 之下�"
 
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column 和 --verbose �兼容"
-
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "必须�供分支�"
 
-#: builtin/branch.c:766
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "�能�分离头指针�供�述"
 
-#: builtin/branch.c:771
+#: builtin/branch.c:779
 msgid "cannot edit description of more than one branch"
 msgstr "�能为一个以上的分支编辑�述"
 
-#: builtin/branch.c:778
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "分支 '%s' 尚无�交。"
 
-#: builtin/branch.c:781
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "没有分支 '%s'。"
 
-#: builtin/branch.c:796
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "为拷��作�供了太多的分支�"
 
-#: builtin/branch.c:805
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "为�命��作�供了太多的�数"
 
-#: builtin/branch.c:810
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr "为设置新上游�供了太多的�数"
 
-#: builtin/branch.c:814
+#: 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:817 builtin/branch.c:840
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "没有此分支 '%s'"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "分支 '%s' �存在"
 
-#: builtin/branch.c:834
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "为�消上游设置�作�供了太多的�数"
 
-#: builtin/branch.c:838
+#: builtin/branch.c:846
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "无法�消 HEAD 的上游设置因为它没有指�一个分支"
 
-#: builtin/branch.c:844
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "分支 '%s' 没有上游信�"
 
-#: builtin/branch.c:854
+#: 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>?"
@@ -11570,39 +11851,39 @@ msgstr ""
 "'git branch' 的 -a 和 -r 选项�带一个分支�。\n"
 "您是�想�使用：-a|-r --list <模�>？"
 
-#: builtin/branch.c:858
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
 msgstr ""
 "��支�选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
 
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "git 版本：\n"
 
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "uname() 失败，错误为 '%s'（%d）\n"
 
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
 msgid "compiler info: "
 msgstr "编译器信�："
 
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "libc 信�："
 
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
 msgid "not run from a git repository - no hooks to show\n"
 msgstr "�是在 git 仓库中执行 - 没有�显示的钩�\n"
 
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格�>]"
 
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -11636,38 +11917,33 @@ msgstr ""
 "请检查下�错误报告中余下的内容。\n"
 "您�以删除任何您�想共享的内容。\n"
 
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
 msgid "specify a destination for the bugreport file"
 msgstr "指定错误报告文件的目标�置"
 
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
 msgid "specify a strftime format suffix for the filename"
 msgstr "指定文件的 strftime 格��缀"
 
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "�能为 '%s' 创建先导目录"
 
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "系统信�"
 
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "�用的钩�"
 
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "�能在 '%s' 创建新文件"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "无法写入 %s"
 
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "在 '%s' 创建了新报告。\n"
@@ -11688,27 +11964,27 @@ msgstr "git bundle list-heads <文件> [<引用�>...]"
 msgid "git bundle unbundle <file> [<refname>...]"
 msgstr "git bundle unbundle <文件> [<引用�>...]"
 
-#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
 msgid "do not show progress meter"
 msgstr "�显示进度表"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
 msgid "show progress meter"
 msgstr "显示进度表"
 
-#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
 msgid "show progress meter during object writing phase"
 msgstr "在对象写入阶段显示进度表"
 
-#: builtin/bundle.c:74 builtin/pack-objects.c:3754
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "当进度表显示时类似于 --all-progress"
 
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
 msgid "specify bundle format version"
 msgstr "指定归档包的格�版本"
 
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
 msgstr "需�一个仓库�创建归档包。"
 
@@ -11716,25 +11992,25 @@ msgstr "需�一个仓库�创建归档包。"
 msgid "do not show bundle details"
 msgstr "�显示归档包的细节"
 
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s �以\n"
 
-#: builtin/bundle.c:163
+#: builtin/bundle.c:182
 msgid "Need a repository to unbundle."
 msgstr "需�一个仓库�解开归档包。"
 
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "冗长输出；必须置于�命令之�"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "解包对象中"
 
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "未知�命令：%s"
 
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:622
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11742,7 +12018,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
 
-#: builtin/cat-file.c:599
+#: builtin/cat-file.c:623
 msgid ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
@@ -11750,71 +12026,71 @@ msgstr ""
 "git cat-file (--batch[=<格�>] | --batch-check[=<格�>]) [--follow-symlinks] "
 "[--textconv | --filters]"
 
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:644
 msgid "only one batch option may be specified"
 msgstr "�能指定一个批处�选项"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<类型> �以是其中之一：blob�tree�commit�tag"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
 msgid "show object type"
 msgstr "显示对象类型"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
 msgid "show object size"
 msgstr "显示对象大�"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
 msgid "exit with zero when there's no error"
 msgstr "当没有错误时退出并返回零"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
 msgid "pretty-print object's content"
 msgstr "美观地打�对象的内容"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
 msgid "for blob objects, run textconv on object's content"
 msgstr "对于数�对象，对其内容�文本转�"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
 msgid "for blob objects, run filters on object's content"
 msgstr "对于数�对象，对其内容�过滤"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
 msgid "blob"
 msgstr "数�对象"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
 msgid "use a specific path for --textconv/--filters"
 msgstr "对于 --textconv/--filters 使用一个特定的路径"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "�许 -s 和 -t 对��的对象生效"
 
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
 msgid "buffer --batch output"
 msgstr "缓冲 --batch 的输出"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
 msgid "show info and content of objects fed from the standard input"
 msgstr "显示从标准输入�供的对象的信�和内容"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
 msgid "show info about objects fed from the standard input"
 msgstr "显示从标准输入�供的对象的信�"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr "跟�树内符�链接（和 --batch 或 --batch-check 共用）"
 
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
 msgid "show all objects with --batch or --batch-check"
 msgstr "使用 --batch 或 --batch-check �数显示所有对象"
 
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:690
 msgid "do not order --batch-all-objects output"
 msgstr "��对 --batch-all-objects 的输出排�"
 
@@ -11834,7 +12110,7 @@ msgstr "报告设置在文件上的所有属性"
 msgid "use .gitattributes only from the index"
 msgstr "�使用索引中的 .gitattributes"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "从标准输入读出文件�"
 
@@ -11842,8 +12118,8 @@ msgstr "从标准输入读出文件�"
 msgid "terminate input and output records by a NUL character"
 msgstr "输入和输出的记录使用 NUL 字符终结"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
-#: builtin/worktree.c:491
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "�显示进度报告"
 
@@ -11901,9 +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/submodule--helper.c:1825
-#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836
-#: builtin/submodule--helper.c:2334 builtin/worktree.c:719
+#: 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 "字符串"
 
@@ -11967,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:414
+#: 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:419
+#: 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:426
+#: 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:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: 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:462 builtin/checkout.c:465
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' �能和 %s �时使用"
-
-#: builtin/checkout.c:469
+#: builtin/checkout.c:474
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "�能�时更新路径并切�到分支'%s'。"
 
-#: builtin/checkout.c:473
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "'%s' 或 '%s' 都没有指定"
 
-#: builtin/checkout.c:477
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "未指定 '%2$s' 时，必须使用 '%1$s'"
 
-#: builtin/checkout.c:482 builtin/checkout.c:487
+#: 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:563 builtin/checkout.c:570
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "路径 '%s' 未�并"
 
-#: builtin/checkout.c:739
+#: builtin/checkout.c:747
 msgid "you need to resolve your current index first"
 msgstr "您需�先解决当�索引的冲�"
 
-#: builtin/checkout.c:793
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12067,51 +12339,51 @@ msgstr ""
 "�能继续，下列文件有暂存的修改：\n"
 "%s"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:890
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "�能对 '%s' 执行 reflog �作：%s\n"
 
-#: builtin/checkout.c:928
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD 目��于"
 
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
+#: 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:936
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "�置分支 '%s'\n"
 
-#: builtin/checkout.c:939
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已��于 '%s'\n"
 
-#: builtin/checkout.c:943
+#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切�并�置分支 '%s'\n"
 
-#: builtin/checkout.c:945 builtin/checkout.c:1376
+#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切�到一个新分支 '%s'\n"
 
-#: builtin/checkout.c:947
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切�到分支 '%s'\n"
 
 #  译者：注����导空格
-#: builtin/checkout.c:998
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... �其它 %d 个。\n"
 
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12132,7 +12404,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1023
+#: 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"
@@ -12159,19 +12431,19 @@ msgstr[1] ""
 " git branch <新分支�> %s\n"
 "\n"
 
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "在版本�历时�到内部错误"
 
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "之�的 HEAD �置是"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
 msgid "You are on a branch yet to be born"
 msgstr "您�于一个尚未�始化的分支"
 
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12180,7 +12452,7 @@ msgstr ""
 "'%s' 既�以是一个本地文件，也�以是一个跟踪分支。\n"
 "请使用 --（和�选的 --no-guess）�消除歧义"
 
-#: builtin/checkout.c:1191
+#: 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"
@@ -12199,51 +12471,51 @@ msgstr ""
 "如果您总是喜欢使用模糊的简短分支� <�称>，而�喜欢如 'origin' 的远程\n"
 "�称，�以在�置中设置 checkout.defaultRemote=origin。"
 
-#: builtin/checkout.c:1201
+#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' 匹�多个（%d 个）远程跟踪分支"
 
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "�期望一个引用"
 
-#: builtin/checkout.c:1284
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "应�有一个引用，�给出了 %d 个"
 
-#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "无效引用：%s"
 
-#: builtin/checkout.c:1343 builtin/checkout.c:1709
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用�是一个树：%s"
 
-#: builtin/checkout.c:1390
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "期望一个分支，得到标签 '%s'"
 
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "期望一个分支，得到远程分支 '%s'"
 
-#: builtin/checkout.c:1393 builtin/checkout.c:1401
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "期望一个分支，得到 '%s'"
 
-#: builtin/checkout.c:1396
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "期望一个分支，得到�交 '%s'"
 
-#: builtin/checkout.c:1412
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12251,7 +12523,7 @@ msgstr ""
 "�能在�并时切�分支\n"
 "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1416
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12259,7 +12531,7 @@ msgstr ""
 "�能在一个 am 会�期间切�分支\n"
 "考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1420
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12267,7 +12539,7 @@ msgstr ""
 "�能在�基时切�分支\n"
 "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1424
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12275,7 +12547,7 @@ msgstr ""
 "�能在拣选时切�分支\n"
 "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1428
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12283,207 +12555,196 @@ msgstr ""
 "�能在还原时切�分支\n"
 "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr "您在执行二分查找时切�分支"
 
-#: builtin/checkout.c:1439
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr "路径�能和切�分支�时使用"
 
-#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: 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:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: 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:1467
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' �带 <起始点>"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1487
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "�能切�分支到一个��交 '%s'"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "缺少分支或�交�数"
 
-#: builtin/checkout.c:1525
+#: builtin/checkout.c:1537
 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支执行三方�并"
 
-#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "风格"
 
-#: builtin/checkout.c:1527
-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:1539 builtin/worktree.c:488
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "HEAD 从指定的�交分离"
 
-#: builtin/checkout.c:1540
-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:1542
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "强制检出（丢弃本地修改）"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "新分支"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "新的没有父�交的分支"
 
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "更新忽略的文件（默认）"
 
-#: builtin/checkout.c:1549
+#: builtin/checkout.c:1563
 msgid "do not check if another worktree is holding the given ref"
 msgstr "�检查指定的引用是�被其他工作区所�用"
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "对尚未�并的文件检出我们的版本"
 
-#: builtin/checkout.c:1565
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "对尚未�并的文件检出他们的版本"
 
-#: builtin/checkout.c:1569
+#: builtin/checkout.c:1583
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "对路径��稀�检出的�制"
 
-#: builtin/checkout.c:1624
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c�-%c 和 --orphan 是互斥的"
-
-#: builtin/checkout.c:1628
-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:1665
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track 需�一个分支�"
 
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "缺少分支�，�试 -%c"
 
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "无法解� %s"
 
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "无效的路径规格"
 
-#: builtin/checkout.c:1725
+#: 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:1729
+#: 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:1738
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file 与 --detach �兼容"
-
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file 与 --patch �兼容"
-
-#: builtin/checkout.c:1754
+#: 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:1759
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "您必须指定一个���的路径"
 
-#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484
+#: 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:1786
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "创建并检出一个新的分支"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "创建/�置并检出一个分支"
 
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "为新的分支创建引用日志"
 
-#: builtin/checkout.c:1791
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "二次猜测 'git checkout <无此分支>'（默认）"
 
-#: builtin/checkout.c:1792
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "使用�加模�（默认）"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "创建并切�一个新分支"
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "创建/�置并切�一个分支"
 
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "二次猜测 'git switch <无此分支>'"
 
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "丢弃本地修改"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "�检出哪一个树"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "��索引"
 
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "��工作区（默认）"
 
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "忽略未�并�目"
 
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "使用�加模�"
 
@@ -12518,7 +12779,15 @@ msgstr "将忽略仓库 %s\n"
 msgid "could not lstat %s\n"
 msgstr "�能对 %s 调用 lstat\n"
 
-#: builtin/clean.c:302 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"
@@ -12531,7 +12800,7 @@ msgstr ""
 "foo        - 通过唯一�缀选择一个选项\n"
 "           - （空）什么也�选择\n"
 
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12552,33 +12821,33 @@ msgstr ""
 "*          - 选择所有选项\n"
 "           - （空）结�选择\n"
 
-#: builtin/clean.c:521 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:661
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "输入模版以排除�目>> "
 
-#: builtin/clean.c:696
+#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "警告：无法找到和 %s 匹�的�目"
 
-#: builtin/clean.c:717
+#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "选择�删除的�目"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "删除 %s [y/N]？"
 
-#: builtin/clean.c:789
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12596,66 +12865,66 @@ msgstr ""
 "help                - 显示本帮助\n"
 "?                   - 显示如何在�示符下选择的帮助"
 
-#: builtin/clean.c:825
+#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "将删除如下�目："
 msgstr[1] "将删除如下�目："
 
-#: builtin/clean.c:841
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "没有�清�的文件，退出。"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "�打�删除文件的�称"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:928
 msgid "force"
 msgstr "强制"
 
-#: builtin/clean.c:906
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "交互�清除"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "删除整个目录"
 
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: 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:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "模�"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "添加 <模�> 到忽略规则"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "也删除忽略的文件"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "�删除忽略的文件"
 
-#: builtin/clean.c:929
+#: 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:932
+#: 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:944
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x 和 -X �能�时使用"
 
@@ -12671,7 +12940,7 @@ msgstr "�克隆浅仓库"
 msgid "don't create a checkout"
 msgstr "�创建一个检出"
 
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "创建一个纯仓库"
 
@@ -12703,27 +12972,29 @@ msgstr "在克隆时�始化�模组"
 msgid "number of submodules cloned in parallel"
 msgstr "并�克隆的�模组的数�"
 
-#: builtin/clone.c:116 builtin/init-db.c:538
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "模�目录"
 
-#: builtin/clone.c:117 builtin/init-db.c:539
+#: builtin/clone.c:117 builtin/init-db.c:540
 msgid "directory from which templates will be used"
 msgstr "模�目录将被使用"
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832
-#: builtin/submodule--helper.c:2337
+#: 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:1834
-#: builtin/submodule--helper.c:2339
+#: 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:549
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: 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 "�称"
 
@@ -12739,8 +13010,8 @@ 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:863
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
+#: builtin/pull.c:212
 msgid "depth"
 msgstr "深度"
 
@@ -12748,8 +13019,8 @@ msgstr "深度"
 msgid "create a shallow clone of that depth"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
 msgid "time"
 msgstr "时间"
 
@@ -12757,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/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: 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:215
+#: 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:1844
-#: builtin/submodule--helper.c:2353
+#: 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"
 
@@ -12779,11 +13050,11 @@ msgstr "��克隆任何标签，并且�续获��作也�下载它们"
 msgid "any cloned submodules will be shallow"
 msgstr "�模组将以浅下载模�克隆"
 
-#: builtin/clone.c:142 builtin/init-db.c:547
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "git目录"
 
-#: builtin/clone.c:143 builtin/init-db.c:548
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "git目录和工作区分离"
 
@@ -12795,23 +13066,23 @@ 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/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: 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/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: 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:234
-#: builtin/push.c:585
+#: 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:237
-#: builtin/push.c:587
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
+#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "�使用 IPv6 地�"
 
@@ -12823,50 +13094,42 @@ msgstr "任何克隆的�模组将使用它们的远程跟踪分支"
 msgid "initialize sparse-checkout file to include only files at root"
 msgstr "�始化稀�检出文件，�包�根目录文件"
 
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"无法猜到目录�。\n"
-"请在命令行指定一个目录"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: �能为 '%s' 添加一个备用：%s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:304
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s 存在且�是一个目录"
 
-#: builtin/clone.c:436
+#: builtin/clone.c:322
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "无法在 '%s' 上�动迭代器"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:353
 #, c-format
 msgid "failed to create link '%s'"
-msgstr "创建链接 '%s' 失败"
+msgstr "无法创建链接 '%s'"
 
-#: builtin/clone.c:471
+#: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
-msgstr "拷�文件至 '%s' 失败"
+msgstr "无法拷�文件至 '%s'"
 
-#: builtin/clone.c:476
+#: builtin/clone.c:362
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "无法在 '%s' 上迭代"
 
-#: builtin/clone.c:503
+#: builtin/clone.c:389
 #, c-format
 msgid "done.\n"
 msgstr "完�。\n"
 
-#: builtin/clone.c:517
+#: builtin/clone.c:403
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -12876,144 +13139,144 @@ msgstr ""
 "您�以通过 'git status' 检查哪些已被检出，然�使用命令\n"
 "'git restore --source=HEAD :/' �试\n"
 
-#: builtin/clone.c:594
+#: builtin/clone.c:480
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "�能�现�克隆的远程分支 %s。"
 
-#: builtin/clone.c:713
+#: builtin/clone.c:597
 #, c-format
 msgid "unable to update %s"
 msgstr "�能更新 %s"
 
-#: builtin/clone.c:761
+#: builtin/clone.c:645
 msgid "failed to initialize sparse-checkout"
 msgstr "无法�始化稀�检出"
 
-#: builtin/clone.c:784
+#: builtin/clone.c:668
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "远程 HEAD 指�一个�存在的引用，无法检出。\n"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:701
 msgid "unable to checkout working tree"
 msgstr "�能检出工作区"
 
-#: builtin/clone.c:894
+#: builtin/clone.c:779
 msgid "unable to write parameters to config file"
 msgstr "无法将�数写入�置文件"
 
-#: builtin/clone.c:957
+#: builtin/clone.c:842
 msgid "cannot repack to clean up"
 msgstr "无法执行 repack �清�"
 
-#: builtin/clone.c:959
+#: builtin/clone.c:844
 msgid "cannot unlink temporary alternates file"
 msgstr "无法删除临时的 alternates 文件"
 
-#: builtin/clone.c:1001 builtin/receive-pack.c:2491
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "太多�数。"
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
 msgstr "您必须指定一个仓库�克隆。"
 
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare 和 --origin %s 选项�兼容。"
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "选项 '%s' 和 '%s %s' �能�时使用"
 
-#: builtin/clone.c:1021
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare 和 --separate-git-dir 选项�兼容。"
-
-#: builtin/clone.c:1035
+#: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "仓库 '%s' �存在"
 
-#: builtin/clone.c:1039 builtin/fetch.c:2011
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "深度 %s �是一个正数"
 
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "目标路径 '%s' 已�存在，并且�是一个空目录。"
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr "仓库路径 '%s' 已�存在，并且�是一个空目录。"
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "工作区 '%s' 已�存在。"
 
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
+#: 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' 创建先导目录"
 
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "�能创建工作区目录 '%s'"
 
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "克隆到纯仓库 '%s'...\n"
 
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "正克隆到 '%s'...\n"
 
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr "clone --recursive 和 --reference 以� --reference-if-able �兼容"
 
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' �是一个有效的远程�称"
 
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth 在本地克隆时被忽略，请改用 file:// �议。"
 
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// �议。"
 
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// �议。"
 
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter 在本地克隆时被忽略，请改用 file:// �议。"
 
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
 msgid "source repository is shallow, ignoring --local"
 msgstr "�仓库是浅克隆，忽略 --local"
 
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
 msgid "--local is ignored"
 msgstr "--local 被忽略"
 
-#: builtin/clone.c:1337 builtin/clone.c:1345
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr "远程传输报告错误"
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "远程分支 %s 在上游 %s 未�现"
 
-#: builtin/clone.c:1348
+#: builtin/clone.c:1242
 msgid "You appear to have cloned an empty repository."
 msgstr "您似乎克隆了一个空仓库。"
 
@@ -13049,14 +13312,14 @@ msgstr "两列之间的填充空间"
 msgid "--command must be the first argument"
 msgstr "--command 必须是第一个�数"
 
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
 msgid ""
 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 "git commit-graph verify [--object-dir <对象目录>] [--shallow] [--"
 "[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13066,93 +13329,91 @@ msgstr ""
 ">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--"
 "[no-]max-new-filters <n>] [--[no-]progress] <切分选项>"
 
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "无法找到和 %s 匹�的对象目录"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "目录"
 
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr "�存图形的对象目录"
 
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr "如果�交图形被拆分，�验�头一个文件"
 
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "无法打开�交图形 '%s'"
 
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "未能识别的 --split �数，%s"
 
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr "�外的��六进制对象 ID：%s"
 
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "无效对象：%s"
 
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
 msgid "start walk at all refs"
 msgstr "开始�历所有引用"
 
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "从标准输入中的包索引文件列表中扫��交"
 
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
 msgid "start walk at commits listed by stdin"
 msgstr "从标准输入中的�交开始扫�"
 
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
 msgstr "包� commit-graph 文件中已有所有�交"
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
 msgid "enable computation for changed paths"
 msgstr "�用�更路径的计算"
 
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
 msgid "allow writing an incremental commit-graph file"
 msgstr "�许写一个增��交图形文件"
 
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr "在�基本拆分�交图形中的最大�交数"
 
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "一个拆分�交图形的两个级别之间的最大比率"
 
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
 msgid "only expire files older than a given date-time"
 msgstr "�让早于给定时间的文件过期"
 
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr "�计算的�更路径布隆过滤器的最大数"
 
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "�能�时使用 --reachable�--stdin-commits 或 --stdin-packs"
 
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
 msgid "Collecting commits from input"
 msgstr "正从标准输入收集�交"
 
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "未识别的�命令：%s"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13166,70 +13427,65 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "忽略��的父�交 %s"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
+#: 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"
 
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree：无法打开 '%s'"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree：无法读� '%s'"
 
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree：无法关闭 '%s'"
 
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr "父�交"
 
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "父�交对象 ID"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
-#: builtin/tag.c:456
+#: 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:115 builtin/commit.c:1614
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "�交说明"
 
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
 msgstr "从文件中读��交说明"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299
-#: 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 "GPG �交签�"
 
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "必须精确地�供一个树"
 
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
-msgstr "git commit-tree：读�失败"
+msgstr "git commit-tree：无法读�"
 
-#: builtin/commit.c:41
+#: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<选项>] [--] <路径规格>..."
 
-#: builtin/commit.c:46
+#: builtin/commit.c:47
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<选项>] [--] <路径规格>..."
 
-#: builtin/commit.c:51
+#: builtin/commit.c:52
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13238,7 +13494,7 @@ msgstr ""
 "您�修补最近的�交，但这么�会让它�为空�交。您�以��您的命令并带上\n"
 "--allow-empty 选项，或者您�用命令 \"git reset HEAD^\" 整个删除该�交。\n"
 
-#: builtin/commit.c:56
+#: builtin/commit.c:57
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -13252,15 +13508,15 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:63
+#: builtin/commit.c:64
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "�则，请使用 'git rebase --skip'\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:67
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "�则，请使用 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:69
+#: builtin/commit.c:70
 msgid ""
 "and then use:\n"
 "\n"
@@ -13281,115 +13537,146 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:324
+#: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
-msgstr "解包 HEAD 树对象失败"
+msgstr "无法解包 HEAD 树对象"
 
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file 和 -a 在一起没有�义"
-
-#: builtin/commit.c:374
+#: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "�数 --include/--only �跟路径没有�义。"
 
-#: builtin/commit.c:386
+#: builtin/commit.c:387
 msgid "unable to create temporary index"
 msgstr "�能创建临时索引"
 
-#: builtin/commit.c:395
+#: builtin/commit.c:396
 msgid "interactive add failed"
 msgstr "交互�添加失败"
 
-#: builtin/commit.c:410
+#: builtin/commit.c:411
 msgid "unable to update temporary index"
 msgstr "无法更新临时索引"
 
-#: builtin/commit.c:412
+#: builtin/commit.c:413
 msgid "Failed to update main cache tree"
 msgstr "�能更新树的主缓存"
 
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
 msgid "unable to write new_index file"
 msgstr "无法写 new_index 文件"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "cannot do a partial commit during a merge."
 msgstr "在�并过程中�能�部分�交。"
 
-#: builtin/commit.c:491
+#: builtin/commit.c:492
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "在拣选过程中�能�部分�交。"
 
-#: builtin/commit.c:493
+#: builtin/commit.c:494
 msgid "cannot do a partial commit during a rebase."
 msgstr "在�基过程中�能�部分�交。"
 
-#: builtin/commit.c:501
+#: builtin/commit.c:502
 msgid "cannot read the index"
 msgstr "无法读�索引"
 
-#: builtin/commit.c:520
+#: builtin/commit.c:521
 msgid "unable to write temporary index file"
 msgstr "无法写临时索引文件"
 
-#: builtin/commit.c:618
+#: builtin/commit.c:619
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "�交 '%s' 缺少作者信�"
 
-#: builtin/commit.c:620
+#: builtin/commit.c:621
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "�交 '%s' 有格�错误的作者信�"
 
-#: builtin/commit.c:639
+#: builtin/commit.c:640
 msgid "malformed --author parameter"
 msgstr "格�错误的 --author �数"
 
-#: builtin/commit.c:692
+#: builtin/commit.c:693
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "无法选择一个未被当��交说明使用的注释字符"
 
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "�能查询�交 %s"
 
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "（正从标准输入中读�日志信�）\n"
 
-#: builtin/commit.c:760
+#: builtin/commit.c:761
 msgid "could not read log from standard input"
 msgstr "�能从标准输入中读�日志信�"
 
-#: builtin/commit.c:764
+#: builtin/commit.c:765
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "�能读�日志文件 '%s'"
 
-#: builtin/commit.c:801
+#: 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:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
 msgstr "�能读� SQUASH_MSG"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:821
 msgid "could not read MERGE_MSG"
 msgstr "�能读� MERGE_MSG"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:881
 msgid "could not write commit template"
 msgstr "�能写�交模版"
 
+#: builtin/commit.c:894
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr "请为您的�更输入�交说明。以 '%c' 开始的行将被忽略。\n"
+
+#: builtin/commit.c:896
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"请为您的�更输入�交说明。以 '%c' 开始的行将被忽略，而一个空的�交\n"
+"说明将会终止�交。\n"
+
 #: builtin/commit.c:900
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"请为您的�更输入�交说明。以 '%c' 开始的行将被�留，如果您愿�\n"
+"也�以删除它们。\n"
+
+#: builtin/commit.c:904
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"请为您的�更输入�交说明。以 '%c' 开始的行将被�留，如果您愿�\n"
+"也�以删除它们。一个空的�交说明将会终止�交。\n"
+
+#: builtin/commit.c:916
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -13402,7 +13689,7 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "然��试。\n"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:921
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -13415,393 +13702,369 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "然��试。\n"
 
-#: builtin/commit.c:915
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"请为您的�更输入�交说明。以 '%c' 开始的行将被忽略，而一个空的�交\n"
-"说明将会终止�交。\n"
-
-#: builtin/commit.c:923
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"请为您的�更输入�交说明。以 '%c' 开始的行将被�留，如果您原�\n"
-"也�以删除它们。一个空的�交说明将会终止�交。\n"
-
 #  译者：为��在输出中对�，注�调整�中空格�
-#: builtin/commit.c:940
+#: builtin/commit.c:948
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s作者：  %.*s <%.*s>"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: builtin/commit.c:948
+#: builtin/commit.c:956
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%s日期：  %s"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: builtin/commit.c:955
+#: builtin/commit.c:963
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%s�交者：%.*s <%.*s>"
 
-#: builtin/commit.c:973
+#: builtin/commit.c:981
 msgid "Cannot read index"
 msgstr "无法读�索引"
 
-#: builtin/commit.c:1018
+#: builtin/commit.c:1026
 msgid "unable to pass trailers to --trailers"
 msgstr "无法将尾注传递给 --trailers"
 
-#: builtin/commit.c:1058
+#: builtin/commit.c:1066
 msgid "Error building trees"
 msgstr "无法创建树对象"
 
-#: builtin/commit.c:1072 builtin/tag.c:319
+#: 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"
 
-#: builtin/commit.c:1116
+#: builtin/commit.c:1124
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author '%s' �是 '姓� <邮箱>' 格�，且未能在现有作者中找到匹�"
 
-#: builtin/commit.c:1130
+#: builtin/commit.c:1138
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "无效的忽略模� '%s'"
 
-#: builtin/commit.c:1148 builtin/commit.c:1441
+#: builtin/commit.c:1156 builtin/commit.c:1451
 #, c-format
 msgid "Invalid untracked files mode '%s'"
-msgstr "无效的未追踪文件�数 '%s'"
+msgstr "无效的未跟踪文件�数 '%s'"
 
-#: builtin/commit.c:1188
-msgid "--long and -z are incompatible"
-msgstr "--long 和 -z 选项�兼容"
-
-#: builtin/commit.c:1219
+#: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "您正处于一个�并过程中 -- 无法改写说明。"
 
-#: builtin/commit.c:1221
+#: builtin/commit.c:1229
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr "您正处于一个拣选过程中 -- 无法改写说明。"
 
-#: builtin/commit.c:1224
+#: builtin/commit.c:1232
 #, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr "�能将 --fixup 的 reword 选项和路径 '%s' 组�使用"
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "改写说明选项 '%s' 和路径 '%s' �能�时使用"
 
-#: builtin/commit.c:1226
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr "--fixup 的 reword 选项和 --patch/--interactive/--all/--include/--only 互斥"
+#: builtin/commit.c:1234
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "改写说明选项 '%s' 和 '%s' �能�时使用"
 
-#: builtin/commit.c:1245
+#: builtin/commit.c:1254
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "�时使用 --reset-author 和 --author 没有�义"
 
-#: builtin/commit.c:1254
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "您没有�修补的�交。"
 
-#: builtin/commit.c:1257
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "您正处于一个�并过程中 -- 无法修补�交。"
 
-#: builtin/commit.c:1259
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正处于一个拣选过程中 -- 无法修补�交。"
 
-#: builtin/commit.c:1261
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "您正处于一个�基过程中 -- 无法修补�交。"
 
-#: builtin/commit.c:1264
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "选项 --squash 和 --fixup �能�时使用"
 
-#: builtin/commit.c:1274
+#: builtin/commit.c:1281
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "�能用一个 -c/-C/-F/--fixup 选项。"
 
-#: builtin/commit.c:1276
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "选项 -m �能和 -c/-C/-F �时使用。"
 
-#: builtin/commit.c:1285
+#: 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:1303
+#: 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:1331
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "未知选项：--fixup=%s:%s"
 
-#: builtin/commit.c:1345
+#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "路径  '%s ...' 和 -a 选项�时使用没有�义"
 
-#: builtin/commit.c:1476 builtin/commit.c:1642
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "以简�的格�显示状�"
 
-#: builtin/commit.c:1478 builtin/commit.c:1644
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "显示分支信�"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "显示贮�区信�"
 
-#: builtin/commit.c:1482 builtin/commit.c:1646
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "计算完整的领先/��值"
 
-#: builtin/commit.c:1484
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "版本"
 
-#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
-#: builtin/worktree.c:681
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "机器�读的输出"
 
-#: builtin/commit.c:1487 builtin/commit.c:1650
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr "以长格�显示状�（默认）"
 
-#: builtin/commit.c:1490 builtin/commit.c:1653
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "�目以 NUL 字符结尾"
 
-#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: 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:1493 builtin/commit.c:1656
+#: 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:1497
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
 "显示已忽略的文件，�选模�：traditional�matching�no。（默认：traditional）"
 
-#: builtin/commit.c:1499 parse-options.h:193
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "何时"
 
-#: builtin/commit.c:1500
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 "忽略�模组的更改，“何时�的�选�数：all�dirty�untracked。（默认：all）"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "以列的方�显示未跟踪的文件"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "�检测�命�"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr "检测�命�，�以设置索引相似度"
 
-#: builtin/commit.c:1525
+#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "�支�已忽略和未跟踪文件�数的组�"
 
-#: builtin/commit.c:1607
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "�交�功��显示概述信�"
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "在�交说明模�里显示差异"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "�交说明选项"
 
-#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr "从文件中读��交说明"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "作者"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "�交时覆盖作者"
 
-#: builtin/commit.c:1613 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "日期"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "�交时覆盖日期"
 
-#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
-#: parse-options.h:329 ref-filter.h:90
+#: 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:1615
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr "�用并编辑指定�交的�交说明"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr "�用指定�交的�交说明"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1621
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]�交"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr "使用自动挤压格�的�交说明对指定的�交进行修正�修补或改写说明"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1635
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "使用自动挤压格�的�交说明用以挤压至指定的�交"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1636
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "现在将该�交的作者改为我（和 -C/-c/--amend �数共用）"
 
-#: builtin/commit.c:1624 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "尾注"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "添加自定义尾注"
 
-#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: 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:1626
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "使用指定的模�文件"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "强制编辑�交"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr "在�交说明模�里包�状�信�"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "�交内容选项"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "�交所有改动的文件"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "添加指定的文件到索引区等待�交"
 
-#: builtin/commit.c:1637
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "交互�添加文件"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "交互�添加�更"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "��交指定的文件"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "绕过 pre-commit 和 commit-msg 钩�"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "显示将��交的内容"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "修改先�的�交"
 
-#: builtin/commit.c:1655
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "绕过 post-rewrite 钩�"
 
-#: builtin/commit.c:1662
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "�许一个空�交"
 
-#: builtin/commit.c:1664
+#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr "�许空的�交说明"
 
-#: builtin/commit.c:1737
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "��的 MERGE_HEAD 文件（%s）"
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "�能读� MERGE_MODE"
 
-#: builtin/commit.c:1765
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "�能读��交说明：%s"
 
-#: builtin/commit.c:1772
+#: builtin/commit.c:1788
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "终止�交因为�交说明为空。\n"
 
-#: builtin/commit.c:1777
+#: builtin/commit.c:1793
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "终止�交；您未更改�自模版的�交说明。\n"
 
-#: builtin/commit.c:1788
+#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
-msgstr "终止�交因为�交说明的正文为空。\n"
+msgstr "因�交说明的正文为空而终止�交。\n"
 
-#: builtin/commit.c:1824
+#: 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"
@@ -14001,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
@@ -14159,7 +14422,7 @@ msgstr "输出调试信�到标准错误"
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr "credential-cache--daemon ��用，�支� unix 套接字"
 
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "credential-cache ��用，�支� unix 套接字"
 
@@ -14300,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 "显示简写的�交�作为�备"
 
@@ -14316,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"
@@ -14355,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:684
+#: 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"
@@ -14383,111 +14635,103 @@ msgstr "%s...%s：多��并基线，使用 %s"
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<选项>] [<�交> [<�交>]] [--] [<路径>...]"
 
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "失败：%d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "无法读�符�链接 %s"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "无法读�符�链接文件 %s"
 
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "无法读�符�链接 %2$s 指�的对象 %1$s"
 
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
 msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
 msgstr ""
 "�支�在目录比较模�（'-d' 和 '--dir-diff'）中采用组�差异格�（'-c' 和 '--"
 "cc'）。"
 
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "两个文件都被修改：'%s' 和 '%s'。"
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "工作区文件被留了下�。"
 
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "临时文件存在于 '%s'。"
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "您�能想�清�或者��它们。"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "失败：%d"
+
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "使用 `diff.guitool` 代替 `diff.tool`"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "执行一个全目录差异比较"
 
-#: builtin/difftool.c:704
+#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "�动差异比较工具之���示"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "在 dir-diff 模�中使用符�链接"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "工具"
 
-#: builtin/difftool.c:711
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "使用指定的差异比较工具"
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "显示�以用在 `--tool` �数�的差异工具列表"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:706
 msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
-msgstr "当执行 diff 工具返回�零退出�时，使 'git-difftool' 退出"
+msgstr "当执行的 diff 工具返回�零退出�时，使 'git-difftool' 退出"
 
-#: builtin/difftool.c:719
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "指定一个用于查看差异的自定义命令"
 
-#: builtin/difftool.c:720
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "传递给 `diff`"
 
-#: builtin/difftool.c:735
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool �求工作区或者 --no-index"
 
-#: builtin/difftool.c:742
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff 和 --no-index �兼容"
-
-#: builtin/difftool.c:745
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui�--tool 和 --extcmd 互斥"
-
-#: builtin/difftool.c:753
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "没有为 --tool=<工具> �数�供 <工具>"
 
-#: builtin/difftool.c:760
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "没有为 --extcmd=<命令> �数�供 <命令>"
 
@@ -14495,7 +14739,7 @@ msgstr "没有为 --extcmd=<命令> �数�供 <命令>"
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <选项> <环境��>"
 
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
 msgid "type"
 msgstr "类型"
 
@@ -14510,136 +14754,128 @@ msgstr "安�模�，�使用 git_env_*() 的值作为退出�"
 #: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
-msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值，�是 `%s`"
+msgstr "选项 `--default' 和 `--type=bool` 期望一个布尔值，�是 `%s`"
 
 #: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
 "%s`"
-msgstr "选项 `--default' 和 `type=ulong` 期望一个无符�长整型，�是 `%s`"
+msgstr "选项 `--default' 和 `--type=ulong` 期望一个无符�长整型，�是 `%s`"
 
 #: builtin/fast-export.c:29
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr "错误：除�指定 --mark-tags，�则无法导出嵌套标签。"
 
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "--anonymize-map �值�能为空"
 
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "在 <n> 个对象之�显示进度"
 
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "选择如何处�签�标签"
 
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr "选择当标签指�被过滤对象时该标签的处�方�"
 
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "选择使用备用编�处��交说明"
 
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "把标记存储到这个文件"
 
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "从这个文件导入标记"
 
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "如果文件存在，从该文件导入标记"
 
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr "当标签缺少标记人字段时，�装�供一个"
 
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "�次�交都输出整个树"
 
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "使用 done 功能�终止�"
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "跳过数�对象的输出"
 
-#: builtin/fast-export.c:1222 builtin/log.c:1823
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "引用规格"
 
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "对导出的引用应用引用规格"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "匿�输出"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "from:to"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "在匿�输出中将 <from> 转�为 <to>"
 
-#: builtin/fast-export.c:1229
+#: 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:1231
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr "显示数�对象/�交的原始对象 ID"
 
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "对带有标记 ID 的标签�标记"
 
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map 而没有 --anonymize 没有�义"
-
-#: builtin/fast-export.c:1271
-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'"
@@ -14649,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:185
+#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "从所有的远程抓�"
 
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: 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:188
+#: 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:191
+#: 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:195
+#: 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:198
+#: 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:122
+#: 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:206
+#: 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: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 "深化浅克隆的历�"
 
-#: 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 "基于时间�深化浅克隆的历�"
 
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: 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:224
+#: 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:226
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "引用映射"
 
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "指定获��作的引用映射"
 
-#: 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 "报告我们�拥有从该对象开始�达的对象"
 
-#: 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:243
+#: 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:757
+#: builtin/fetch.c:766
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "�置�� fetch.output 包�无效值 %s"
 
-#: builtin/fetch.c:856
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "对象 %s 未�现"
 
-#: builtin/fetch.c:860
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[最新]"
 
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[已拒�]"
 
-#: builtin/fetch.c:874
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "当�分支下�能执行获��作"
 
-#: builtin/fetch.c:884
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr "已在�一个工作树中检出"
+
+#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr "[标签更新]"
 
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: 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:889
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "会破�现有的标签"
 
-#: builtin/fetch.c:911
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[新标签]"
 
-#: builtin/fetch.c:914
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[新分支]"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[新引用]"
 
-#: builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "强制更新"
 
-#: builtin/fetch.c:961
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "�快进"
 
-#: builtin/fetch.c:1065
+#: 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:1069
+#: 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:1101
+#: builtin/fetch.c:1112
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s 未��所有必需的对象\n"
 
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1141
 #, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr "拒� %s 因为浅克隆��许被更新"
+msgid "rejected %s because shallow roots are not allowed to be updated"
+msgstr "拒� %s 因为浅克隆的根��许被更新"
 
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "�自 %.*s\n"
 
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -14906,141 +15146,149 @@ msgstr ""
 " 'git remote prune %s' �删除旧的�有冲�的分支"
 
 #  译者：注����导空格
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   （%s 将�为悬空状�）"
 
 #  译者：注����导空格
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   （%s 已�为悬空状�）"
 
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[已删除]"
 
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "（无）"
 
-#: builtin/fetch.c:1384
+#: 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:1403
+#: 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:1406
+#: 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:1618
+#: builtin/fetch.c:1455
+#, c-format
+msgid "the object %s does not exist"
+msgstr "对象 '%s' �存在"
+
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "检测到多分支，和 --set-upstream �兼容"
 
-#: builtin/fetch.c:1633
+#: 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:1635
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr "没有为一个远程标签设置上游"
 
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "未知的分支类型"
 
-#: builtin/fetch.c:1639
+#: 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:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "正在获� %s\n"
 
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 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:1790
+#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "无法获� '%s'（退出�：%d）\n"
 
-#: builtin/fetch.c:1894
-msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
-msgstr "未指定远程仓库。请通过一个 URL 或远程仓库�指定，用以获�新�交。"
-
 #: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "您需�指定一个标签�称。"
+msgid ""
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
+msgstr "未指定远程仓库；请指定一个用于获�新版本的 URL 或远程仓库�"
 
-#: builtin/fetch.c:1995
-msgid "Negative depth in --deepen is not supported"
-msgstr "--deepen �支�负数深度"
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "您需�指定一个标签�称"
 
-#: builtin/fetch.c:1997
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen 和 --depth 是互斥的"
+#: builtin/fetch.c:2032
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr "--negotiate-only 需�一个或多个 --negotiate-tip=*"
 
-#: builtin/fetch.c:2002
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth 和 --unshallow �能�时使用"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
+msgstr "--deepen �支�负数深度"
 
-#: builtin/fetch.c:2004
+#: builtin/fetch.c:2045
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "对于一个完整的仓库，�数 --unshallow 没有�义"
 
-#: builtin/fetch.c:2021
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all �能带一个仓库�数"
 
-#: builtin/fetch.c:2023
+#: builtin/fetch.c:2064
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 带引用规格没有任何�义"
 
-#: builtin/fetch.c:2032
+#: 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:2039
-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:2055
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr "在使用 --negotiate-only 时必须�供远程仓库"
 
-#: builtin/fetch.c:2060
-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:2079
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
-msgstr "��以将 --filter 用于在 extensions.partialClone 中�置的远程仓库"
+msgstr "��以将 --filter 用于在 extensions.partialclone 中�置的远程仓库"
 
-#: builtin/fetch.c:2083
+#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
 msgstr "--atomic 仅在从一个远程仓库获�的时候�用"
 
-#: builtin/fetch.c:2087
+#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "--stdin 仅在从一个远程仓库获�的时候�用"
 
@@ -15049,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 "从文件中读�"
 
@@ -15085,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:483
+#: 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 "�打��包�该�交的引用"
 
@@ -15133,19 +15385,19 @@ msgstr "�打��包�该�交的引用"
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<�置> <命令�数>"
 
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "�置"
 
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "存储�仓库路径列表的�置项键�"
 
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "缺少 --config=<�置>"
 
-#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "未知"
 
@@ -15161,16 +15413,16 @@ msgstr "%s %s 错误：%s"
 msgid "warning in %s %s: %s"
 msgstr "%s %s 警告：%s"
 
-#: builtin/fsck.c:123 builtin/fsck.c:126
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "�自 %7s %s 的��的链接"
 
-#: builtin/fsck.c:135
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "链接中错误的对象类型"
 
-#: builtin/fsck.c:151
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -15179,211 +15431,221 @@ msgstr ""
 "��的链接�自于 %7s %s\n"
 "              到 %7s %s"
 
-#: builtin/fsck.c:263
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "缺失 %s %s"
 
-#: builtin/fsck.c:290
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "��达 %s %s"
 
-#: builtin/fsck.c:310
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "悬空 %s %s"
 
-#: builtin/fsck.c:320
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "�能创建 lost-found"
 
-#: builtin/fsck.c:331
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "�能完� '%s'"
 
-#: builtin/fsck.c:348
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "正在检查 %s"
 
-#: builtin/fsck.c:386
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "正在检查连通性（%d 个对象）"
 
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "正在检查 %s %s"
 
-#: builtin/fsck.c:410
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "��的链接"
 
-#: builtin/fsck.c:419
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "æ ¹ %s"
 
-#: builtin/fsck.c:427
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "标记 %s %s (%s) 于 %s"
 
-#: builtin/fsck.c:456
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s：对象��或丢失"
 
-#: builtin/fsck.c:481
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s：无效的引用日志�目 %s"
 
-#: builtin/fsck.c:495
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "正在检查引用日志 %s->%s"
 
-#: builtin/fsck.c:529
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s：无效的 sha1 指针 %s"
 
-#: builtin/fsck.c:536
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s：�是一个�交"
 
-#: builtin/fsck.c:590
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "注�：无默认引用"
 
-#: builtin/fsck.c:605
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s：哈希路径�匹�，�现于 %s"
+
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s：对象��或丢失：%s"
 
-#: builtin/fsck.c:618
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s：对象有未知的类型 '%s': %s"
+
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s：�能解�对象：%s"
 
-#: builtin/fsck.c:638
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "�的 sha1 文件：%s"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "正在检查对象目录"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "正在检查对象目录"
 
-#: builtin/fsck.c:671
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "正在检查 %s 链接"
 
-#: builtin/fsck.c:676 builtin/index-pack.c:866
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "无效的 %s"
 
-#: builtin/fsck.c:683
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s 指�奇怪的东西（%s）"
 
-#: builtin/fsck.c:689
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s：分离头指针的指��存在"
 
-#: builtin/fsck.c:693
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "注�：%s 指�一个尚未诞生的分支（%s）"
 
-#: builtin/fsck.c:705
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "正在检查缓存树"
 
-#: builtin/fsck.c:710
+#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s：cache-tree 中无效的 sha1 指针"
 
-#: builtin/fsck.c:719
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "cache-tree 中�树对象"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<选项>] [<对象>...]"
 
-#: builtin/fsck.c:756
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "显示��达的对象"
 
-#: builtin/fsck.c:757
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "显示悬空的对象"
 
-#: builtin/fsck.c:758
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "报告标签"
 
-#: builtin/fsck.c:759
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "报告根节点"
 
-#: builtin/fsck.c:760
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "将索引亦作为检查的头节点"
 
-#: builtin/fsck.c:761
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "将引用日志作为检查的头节点（默认）"
 
-#: builtin/fsck.c:762
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "也考虑包和备用对象"
 
-#: builtin/fsck.c:763
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "仅检查连通性"
 
-#: builtin/fsck.c:764 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "�用更严格的检查"
 
-#: builtin/fsck.c:766
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "将悬空对象写入 .git/lost-found 中"
 
-#: builtin/fsck.c:767 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "显示进度"
 
-#: builtin/fsck.c:768
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "显示�达对象的详细�称"
 
-#: builtin/fsck.c:827 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "正在检查对象"
 
-#: builtin/fsck.c:855
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s：对象缺失"
 
-#: builtin/fsck.c:866
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "无效的�数：期望 sha1，得到 '%s'"
@@ -15402,107 +15664,102 @@ 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:240 builtin/tag.c:573
-#, 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"
-"and remove %s.\n"
+"and remove %s\n"
 "Automatic cleanup will not be performed until the file is removed.\n"
 "\n"
 "%s"
 msgstr ""
-"最�一次 gc �作报告如下信�。请检查原因并删除 %s。\n"
+"最�一次 gc �作报告如下信�。请检查原因并删除 %s\n"
 "在该文件被删除之�，自动清�将�会执行。\n"
 "\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:869
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "无法写入�交图"
 
-#: builtin/gc.c:905
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "无法预先获�远程仓库"
 
@@ -15514,131 +15771,171 @@ msgstr "无法�动 'git pack-objects' 进程"
 msgid "failed to finish 'git pack-objects' process"
 msgstr "无法完� 'git pack-objects' 进程"
 
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "无法写入多包索引"
 
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "'git multi-pack-index expire' 失败"
 
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "'git multi-pack-index repack' 失败"
 
-#: builtin/gc.c:1179
+#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr "跳过增��新打包任务，因为 core.multiPackIndex 被�用"
 
-#: builtin/gc.c:1283
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "�文件 '%s' 已存在，跳过维护"
 
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "任务 '%s' 失败"
 
-#: builtin/gc.c:1395
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' �是一个有效的任务"
 
-#: builtin/gc.c:1400
+#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "任务 '%s' �能被多次选择"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "基于仓库状���行任务"
 
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "频率"
 
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "基于频率�行任务"
 
-#: builtin/gc.c:1420
+#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "�通过标准错误报告进度或其它信�"
 
-#: builtin/gc.c:1421
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "任务"
 
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "�行一个特定的任务"
 
-#: builtin/gc.c:1439
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
 
-#: builtin/gc.c:1482
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "无法�行 'git config'"
 
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "无法扩展路径 '%s'"
 
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "无法�动 launchctl"
 
-#: builtin/gc.c:1613
+#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "无法为 '%s' 创建目录"
 
-#: builtin/gc.c:1674
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "无法引导�务 %s"
 
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "无法创建临时 XML 文件"
 
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "无法�动计划任务"
 
-#: builtin/gc.c:1879
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr "无法执行 'crontab -l'，您的系统�能�支� 'cron'"
 
-#: builtin/gc.c:1896
+#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr "无法�行 'crontab'，您的系统�能�支� 'cron'"
 
-#: builtin/gc.c:1900
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "无法打开 'crontab' 的标准输入"
 
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "'crontab' 终止"
 
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "无法�动 systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "无法�行 systemctl"
+
+#: 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:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "无法识别的 --scheduler �数 '%s'"
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "systemd 和 crontab 的定时器都��用"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "%s 调度器��用"
+
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "�外一个进程正�行于��维护"
 
-#: builtin/gc.c:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<调度器>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "调度器"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "触� git maintenance 执行的调度器"
+
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "无法将仓库添加到全局�置"
 
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <�命令> [<选项>]"
 
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "无效�命令：%s"
@@ -15647,12 +15944,12 @@ msgstr "无效�命令：%s"
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<选项>] [-e] <模�> [<版本>...] [[--] <路径>...]"
 
-#: builtin/grep.c:223
+#: builtin/grep.c:239
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep：无法创建线程：%s"
 
-#: builtin/grep.c:277
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
@@ -15661,262 +15958,262 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
-#: builtin/pack-objects.c:2969
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "没有线程支�，忽略 %s"
 
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "无法读�树（%s）"
 
-#: builtin/grep.c:658
+#: builtin/grep.c:672
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "无法抓��自于 %s 类型的对象"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:752
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "开关 `%c' 期望一个数字值"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:851
 msgid "search in index instead of in the work tree"
 msgstr "在索引区�索而�是在工作区"
 
-#: builtin/grep.c:840
+#: builtin/grep.c:853
 msgid "find in contents not managed by git"
 msgstr "在未被 git 管�的内容中查找"
 
-#: builtin/grep.c:842
+#: builtin/grep.c:855
 msgid "search in both tracked and untracked files"
 msgstr "在跟踪和未跟踪的文件中�索"
 
-#: builtin/grep.c:844
+#: builtin/grep.c:857
 msgid "ignore files specified via '.gitignore'"
 msgstr "忽略 '.gitignore' 包�的文件"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:859
 msgid "recursively search in each submodule"
 msgstr "在�一个�模组中递归�索"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:862
 msgid "show non-matching lines"
 msgstr "显示未匹�的行"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:864
 msgid "case insensitive matching"
 msgstr "�区分大�写匹�"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:866
 msgid "match patterns only at word boundaries"
 msgstr "�在��边界匹�模�"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:868
 msgid "process binary files as text"
 msgstr "把二进制文件当�文本处�"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:870
 msgid "don't match patterns in binary files"
 msgstr "�在二进制文件中匹�模�"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:873
 msgid "process binary files with textconv filters"
 msgstr "用 textconv 过滤器处�二进制文件"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:875
 msgid "search in subdirectories (default)"
 msgstr "在�目录中寻找（默认）"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:877
 msgid "descend at most <depth> levels"
 msgstr "最多以指定的深度�下寻找"
 
-#: builtin/grep.c:868
+#: builtin/grep.c:881
 msgid "use extended POSIX regular expressions"
 msgstr "使用扩展的 POSIX 正则表达�"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:884
 msgid "use basic POSIX regular expressions (default)"
 msgstr "使用基本的 POSIX 正则表达�（默认）"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:887
 msgid "interpret patterns as fixed strings"
 msgstr "把模�解�为固定的字符串"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:890
 msgid "use Perl-compatible regular expressions"
 msgstr "使用 Perl 兼容的正则表达�"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:893
 msgid "show line numbers"
 msgstr "显示行�"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:894
 msgid "show column number of first match"
 msgstr "显示第一个匹�的列�"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:895
 msgid "don't show filenames"
 msgstr "�显示文件�"
 
-#: builtin/grep.c:883
+#: builtin/grep.c:896
 msgid "show filenames"
 msgstr "显示文件�"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:898
 msgid "show filenames relative to top directory"
 msgstr "显示相对于顶级目录的文件�"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:900
 msgid "show only filenames instead of matching lines"
 msgstr "�显示文件�而�显示匹�的行"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:902
 msgid "synonym for --files-with-matches"
 msgstr "和 --files-with-matches �义"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:905
 msgid "show only the names of files without match"
 msgstr "�显示未匹�的文件�"
 
-#: builtin/grep.c:894
+#: builtin/grep.c:907
 msgid "print NUL after filenames"
 msgstr "在文件��输出 NUL 字符"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:910
 msgid "show only matching parts of a line"
 msgstr "�显示行中的匹�的部分"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:912
 msgid "show the number of matches instead of matching lines"
 msgstr "显示总匹�行数，而�显示匹�的行"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:913
 msgid "highlight matches"
 msgstr "高亮显示匹�项"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:915
 msgid "print empty line between matches from different files"
 msgstr "在��文件的匹�项之间打�空行"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:917
 msgid "show filename only once above matches from same file"
 msgstr "�在�一文件的匹�项的上�显示一次文件�"
 
-#: builtin/grep.c:907
+#: builtin/grep.c:920
 msgid "show <n> context lines before and after matches"
 msgstr "显示匹�项��的 <n> 行上下文"
 
-#: builtin/grep.c:910
+#: builtin/grep.c:923
 msgid "show <n> context lines before matches"
 msgstr "显示匹�项� <n> 行上下文"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:925
 msgid "show <n> context lines after matches"
 msgstr "显示匹�项� <n> 行上下文"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:927
 msgid "use <n> worker threads"
 msgstr "使用 <n> 个工作线程"
 
-#: builtin/grep.c:915
+#: builtin/grep.c:928
 msgid "shortcut for -C NUM"
 msgstr "快�键 -C 数字"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:931
 msgid "show a line with the function name before matches"
 msgstr "在匹�的��显示一行函数�"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:933
 msgid "show the surrounding function"
 msgstr "显示所在函数的��内容"
 
-#: builtin/grep.c:923
+#: builtin/grep.c:936
 msgid "read patterns from file"
 msgstr "从文件读�模�"
 
-#: builtin/grep.c:925
+#: builtin/grep.c:938
 msgid "match <pattern>"
 msgstr "匹� <模�>"
 
-#: builtin/grep.c:927
+#: builtin/grep.c:940
 msgid "combine patterns specified with -e"
 msgstr "组�用 -e �数设定的模�"
 
-#: builtin/grep.c:939
+#: builtin/grep.c:952
 msgid "indicate hit with exit status without output"
 msgstr "�输出，而用退出�标识命中状�"
 
-#: builtin/grep.c:941
+#: builtin/grep.c:954
 msgid "show only matches from files that match all patterns"
 msgstr "�显示匹�所有模�的文件中的匹�"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "pager"
 msgstr "分页"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "show matching files in the pager"
 msgstr "分页显示匹�的文件"
 
-#: builtin/grep.c:948
+#: builtin/grep.c:961
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "�许调用 grep(1)（本次构建忽略）"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1027
 msgid "no pattern given"
 msgstr "未�供匹�模�"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:1063
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index 或 --untracked �能和版本�时使用"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:1071
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "�能解�版本：%s"
 
-#: builtin/grep.c:1088
+#: builtin/grep.c:1101
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked �支�和 --recurse-submodules 共用"
 
-#: builtin/grep.c:1092
+#: builtin/grep.c:1105
 msgid "invalid option combination, ignoring --threads"
 msgstr "无效的选项组�，忽略 --threads"
 
-#: builtin/grep.c:1095 builtin/pack-objects.c:3930
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
 msgid "no threads support, ignoring --threads"
 msgstr "没有线程支�，忽略 --threads"
 
-#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "指定的线程数无效（%d）"
 
-#: builtin/grep.c:1132
+#: builtin/grep.c:1145
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager 仅用于工作区"
 
-#: builtin/grep.c:1158
+#: builtin/grep.c:1171
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached 或 --untracked �能与 --no-index �时使用"
 
-#: builtin/grep.c:1161
+#: builtin/grep.c:1174
 msgid "--untracked cannot be used with --cached"
 msgstr "--untracked �能与 --cached �时使用"
 
-#: builtin/grep.c:1167
+#: builtin/grep.c:1180
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard �能用于已跟踪内容"
 
-#: builtin/grep.c:1175
+#: builtin/grep.c:1188
 msgid "both --cached and trees are given"
 msgstr "�时给出了 --cached 和树对象"
 
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -15924,95 +16221,107 @@ msgstr ""
 "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
 "[--] <文件>..."
 
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "对象类型"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "将对象写入对象数�库"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "从标准输入读�对象"
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "原样存储文件�使用过滤器"
 
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr "�许对任��机垃圾数��散列�创建��的对象以便调试 Git"
 
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "处�文件并�设其�自于此路径"
 
-#: builtin/help.c:47
+#: builtin/help.c:55
 msgid "print all available commands"
 msgstr "打�所有�用的命令"
 
-#: builtin/help.c:48
+#: builtin/help.c:57
 msgid "exclude guides"
 msgstr "排除�导"
 
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "显示有用的指�列表"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "打�所有�置���称"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
 msgid "show man page"
 msgstr "显示 man 手册"
 
-#: builtin/help.c:53
+#: builtin/help.c:59
 msgid "show manual in web browser"
 msgstr "在 web �览器中显示手册"
 
-#: builtin/help.c:55
+#: builtin/help.c:61
 msgid "show info page"
 msgstr "显示 info 手册"
 
-#: builtin/help.c:57
+#: builtin/help.c:63
 msgid "print command description"
 msgstr "打�命令�述"
 
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "显示有用的指�列表"
+
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "打�所有�置���称"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<命令>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
 
-#: builtin/help.c:163
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
+
+#: builtin/help.c:196
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "未能识别的帮助格� '%s'"
 
-#: builtin/help.c:190
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "无法�动 emacsclient。"
 
-#: builtin/help.c:203
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "无法解� emacsclient 版本。"
 
-#: builtin/help.c:211
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient 版本 '%d' 太�（< 22）。"
 
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: 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:307
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16021,7 +16330,7 @@ msgstr ""
 "'%s'：�支�的 man 手册查看器的路径。\n"
 "请使用 'man.<工具>.cmd'。"
 
-#: builtin/help.c:319
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16030,331 +16339,314 @@ msgstr ""
 "'%s': 支�的 man 手册查看器命令。\n"
 "请使用 'man.<工具>.path'。"
 
-#: builtin/help.c:436
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s'：未知的 man 查看器。"
 
-#: builtin/help.c:453
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "没有 man 查看器处�此请求"
 
-#: builtin/help.c:461
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr "没有 info 查看器处�此请求"
 
-#: builtin/help.c:520 builtin/help.c:531 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:534 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:563 builtin/help.c:593
+#: builtin/help.c:580
+msgid "this option doesn't take any other arguments"
+msgstr "这个选项�带其他�数"
+
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "用法：%s%s"
 
-#: builtin/help.c:577
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "'git help config' 获�更多信�"
 
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "%s 的对象类型�匹�"
 
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "未能获�预期的对象 %s"
 
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "对象 %s：应为类型 %s，�是 %s"
 
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "无法填充 %d 字节"
 msgstr[1] "无法填充 %d 字节"
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr "过早的文件结�符（EOF）"
 
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "输入上的读错误"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "用掉了超过�用的字节"
 
-#: builtin/index-pack.c:325 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr "包太大超过了当� off_t 的定义"
 
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "包超过了最大�许值"
 
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "�能创建 '%s'"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "无法打开包文件 '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
 msgid "pack signature mismatch"
 msgstr "包签��匹�"
 
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "�支�包版本 %<PRIu32>"
 
-#: builtin/index-pack.c:383
+#: builtin/index-pack.c:376
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "包中有错误的对象�于�移� %<PRIuMAX>：%s"
 
-#: builtin/index-pack.c:489
+#: builtin/index-pack.c:482
 #, c-format
 msgid "inflate returned %d"
 msgstr "解压缩返回 %d"
 
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:531
 msgid "offset value overflow for delta base object"
 msgstr "�移值覆盖了 delta 基准对象"
 
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:539
 msgid "delta base offset is out of bound"
 msgstr "delta 基准�移越界"
 
-#: builtin/index-pack.c:554
+#: builtin/index-pack.c:547
 #, c-format
 msgid "unknown object type %d"
 msgstr "未知对象类型 %d"
 
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:578
 msgid "cannot pread pack file"
 msgstr "无法读�包文件"
 
-#: builtin/index-pack.c:587
+#: builtin/index-pack.c:580
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "包文件过早结�，缺少 %<PRIuMAX> 字节"
 msgstr[1] "包文件过早结�，缺少 %<PRIuMAX> 字节"
 
-#: builtin/index-pack.c:613
+#: builtin/index-pack.c:606
 msgid "serious inflate inconsistency"
 msgstr "解压缩严�的�一致"
 
-#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788
-#: builtin/index-pack.c:827 builtin/index-pack.c:836
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "�现 %s 出现 SHA1 冲��"
 
-#: builtin/index-pack.c:761 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
 #, c-format
 msgid "unable to read %s"
 msgstr "�能读 %s"
 
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:818
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "�能读�现存对象信� %s"
 
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:826
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "�能读�现存对象 %s"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:840
 #, c-format
 msgid "invalid blob object %s"
 msgstr "无效的数�对象 %s"
 
-#: builtin/index-pack.c:850 builtin/index-pack.c:869
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
 msgid "fsck error in packed object"
 msgstr "对打包对象 fsck 检查出错"
 
-#: builtin/index-pack.c:871
+#: builtin/index-pack.c:864
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "%s 的所有�对象并�都�达"
 
-#: builtin/index-pack.c:932 builtin/index-pack.c:979
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
-msgstr "应用 delta 失败"
+msgstr "无法应用 delta"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Receiving objects"
 msgstr "接收对象中"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Indexing objects"
 msgstr "索引对象中"
 
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1190
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "包冲�（SHA1 �匹�）"
 
-#: builtin/index-pack.c:1201
+#: builtin/index-pack.c:1195
 msgid "cannot fstat packfile"
 msgstr "�能对包文件调用 fstat"
 
-#: builtin/index-pack.c:1204
+#: builtin/index-pack.c:1198
 msgid "pack has junk at the end"
 msgstr "包的结尾有垃圾数�"
 
-#: builtin/index-pack.c:1216
+#: builtin/index-pack.c:1210
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "parse_pack_objects() 中�到���喻的问题"
 
-#: builtin/index-pack.c:1239
+#: builtin/index-pack.c:1233
 msgid "Resolving deltas"
 msgstr "处� delta 中"
 
-#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "�能创建线程：%s"
 
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1277
 msgid "confusion beyond insanity"
 msgstr "���喻"
 
-#: builtin/index-pack.c:1289
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "完� %d 个本地对象"
 msgstr[1] "完� %d 个本地对象"
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "对 %s 的尾部校验出现�外（�盘��？）"
 
-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "包有 %d 个未解决的 delta"
 msgstr[1] "包有 %d 个未解决的 delta"
 
-#: builtin/index-pack.c:1329
+#: builtin/index-pack.c:1323
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "�能压缩附加对象（%d）"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1419
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "本地对象 %s 已��"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1440
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "包文件� '%s' 没有以 '.%s' 结尾"
 
-#: builtin/index-pack.c:1470
+#: builtin/index-pack.c:1464
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "无法写入 %s 文件 '%s'"
 
-#: builtin/index-pack.c:1478
+#: builtin/index-pack.c:1472
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "无法关闭已写入的 %s 文件 '%s'"
 
-#: builtin/index-pack.c:1504
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "�能�命�临时文件 '*.%s' 为 '%s'"
+
+#: builtin/index-pack.c:1514
 msgid "error while closing pack file"
 msgstr "关闭包文件时出错"
 
-#: builtin/index-pack.c:1518
-msgid "cannot store pack file"
-msgstr "无法存储包文件"
-
-#: builtin/index-pack.c:1526
-msgid "cannot store index file"
-msgstr "无法存储索引文件"
-
-#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "�的 pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1643
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "无法打开现存包文件 '%s'"
 
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1645
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "无法为 %s 打开包索引文件"
 
-#: builtin/index-pack.c:1701
+#: builtin/index-pack.c:1693
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "� delta：%d 个对象"
 msgstr[1] "� delta：%d 个对象"
 
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1700
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "链长 = %d: %lu 对象"
 msgstr[1] "链长 = %d: %lu 对象"
 
-#: builtin/index-pack.c:1750
+#: builtin/index-pack.c:1742
 msgid "Cannot come back to cwd"
 msgstr "无法返回当�工作目录"
 
-#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
-#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
 #, c-format
 msgid "bad %s"
 msgstr "错误选项 %s"
 
-#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "未知的哈希算法 '%s'"
 
-#: builtin/index-pack.c:1852
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin �能和 --stdin �时使用"
-
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin 需� git 仓库"
 
-#: builtin/index-pack.c:1856
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format �能和 --stdin �时使用"
-
-#: builtin/index-pack.c:1871
+#: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify 没有�供包文件��数"
 
-#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "在打包对象中 fsck 检查出错"
 
@@ -16398,56 +16690,56 @@ msgstr "没有在 %s 中找到模版"
 msgid "not copying templates from '%s': %s"
 msgstr "没有从 '%s' �制模版：%s"
 
-#: builtin/init-db.c:262
+#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "无效的�始分支�：'%s'"
 
-#: builtin/init-db.c:353
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "�能处� %d 类型的文件"
 
-#: builtin/init-db.c:356
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "�能移动 %s 至 %s"
 
-#: builtin/init-db.c:372
+#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr "�试用��的哈希算法�新�始化仓库"
 
-#: builtin/init-db.c:396 builtin/init-db.c:399
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s 已�存在"
 
-#: builtin/init-db.c:431
+#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init：已忽略 --initial-branch=%s"
 
-#: builtin/init-db.c:462
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "�新�始化已存在的共享 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:463
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
-msgstr "�新�始化已存在的 Git 仓库于 %s%s\n"
+msgstr "已�新�始化已存在的 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:467
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "已�始化空的共享 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "已�始化空的 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:517
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -16455,53 +16747,49 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<模�目录>] [--shared[=<��>]] "
 "[<目录>]"
 
-#: builtin/init-db.c:543
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "��"
 
-#: builtin/init-db.c:544
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "指定 git 仓库是多个用户之间共享的"
 
-#: builtin/init-db.c:550
+#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "覆盖�始分支�称"
 
-#: builtin/init-db.c:551 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "hash"
 
-#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "指定�使用的哈希算法"
 
-#: builtin/init-db.c:559
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir 和 --bare 是互斥的"
-
-#: builtin/init-db.c:590 builtin/init-db.c:595
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "�能创建目录 %s"
 
-#: builtin/init-db.c:599 builtin/init-db.c:654
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "�能切�目录到 %s"
 
-#: builtin/init-db.c:626
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr "��许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
 
-#: builtin/init-db.c:678
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "�能访问工作区 '%s'"
 
-#: builtin/init-db.c:683
+#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir �能用于纯仓库"
 
@@ -16608,504 +16896,496 @@ msgstr "跟踪 <文件> 中 <开始>,<结æ�Ÿ> 范围内的行或函数 :<函数å
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<范围>:<文件> �能和路径表达�共用"
 
-#: builtin/log.c:303
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "最终输出：%d %s\n"
 
-#: builtin/log.c:568
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ��的文件"
 
-#: builtin/log.c:583 builtin/log.c:673
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr "�能读�对象 %s"
 
-#: builtin/log.c:698
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "未知类型：%d"
 
-#: builtin/log.c:843
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s：从�述生�附函的模�无效"
 
-#: builtin/log.c:850
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers 没有值"
 
-#: builtin/log.c:979
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "无法打开补�文件 %s"
 
-#: builtin/log.c:996
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "�需�一个范围"
 
-#: builtin/log.c:1006
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "�是一个范围"
 
-#: builtin/log.c:1170
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "附函需�邮件地�格�"
 
-#: builtin/log.c:1176
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "无法创建附函文件"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "�正常的 in-reply-to：%s"
 
-#: builtin/log.c:1290
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
 
-#: builtin/log.c:1348
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "两个输出目录？"
 
-#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#: 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:1510 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:1519
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "�能找到准确的�并基线"
 
-#: builtin/log.c:1529
+#: 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 ""
-"无法得到上游地�，如果你想自动记录基线�交，请使用命令\n"
-"git branch --set-upstream-to �跟踪一个远程分支。或者你�以通过\n"
+"无法得到上游地�，如果您想自动记录基线�交，请使用命令\n"
+"git branch --set-upstream-to �跟踪一个远程分支。或者您�以通过\n"
 "�数 --base=<基线�交> 手动指定一个基线�交"
 
-#: builtin/log.c:1552
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "无法找到准确的�并基线"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1587
 msgid "base commit should be the ancestor of revision list"
 msgstr "基线�交应该是版本列表的祖先"
 
-#: builtin/log.c:1579
+#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr "基线�交�应该出现在版本列表中"
 
-#: builtin/log.c:1637
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "无法得到补� id"
 
-#: builtin/log.c:1700
+#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
 msgstr "无法推断当�系列的 range-diff 起始"
 
-#: builtin/log.c:1702
+#: builtin/log.c:1720
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "使用 '%s' 作为当�系列的 range-diff �"
 
-#: builtin/log.c:1746
+#: builtin/log.c:1764
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "使用 [PATCH n/m]，�使�有一个补�"
 
-#: builtin/log.c:1749
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "使用 [PATCH]，�使有多个补�"
 
-#: builtin/log.c:1753
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "打�补�到标准输出"
 
-#: builtin/log.c:1755
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "生�一�附函"
 
-#: builtin/log.c:1757
+#: builtin/log.c:1775
 msgid "use simple number sequence for output file names"
 msgstr "使用简�的数字�列作为输出文件�"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "�缀"
 
-#: builtin/log.c:1759
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "使用 <�缀> 代替 '.patch'"
 
-#: builtin/log.c:1761
+#: builtin/log.c:1779
 msgid "start numbering patches at <n> instead of 1"
 msgstr "补�以 <n> 开始编�，而�是1"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "�制-计数"
 
-#: builtin/log.c:1763
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "标记补�系列是第几次�制"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "输出文件�的最大长度"
 
-#: builtin/log.c:1767
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "从分支�述获�附函的模�"
 
-#: builtin/log.c:1771
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "基于一个分支�述生�部分附函"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "使用 [<�缀>] 代替 [PATCH]"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "把结果文件存储在 <目录>"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "�删除/添加 [PATCH]"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "�输出二进制差异"
 
-#: builtin/log.c:1784
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr "在 From 头信�中输出全为零的哈希值"
 
-#: builtin/log.c:1786
+#: builtin/log.c:1804
 msgid "don't include a patch matching a commit upstream"
 msgstr "�包�已在上游�交中的补�"
 
-#: builtin/log.c:1788
+#: builtin/log.c:1806
 msgid "show patch format instead of default (patch + stat)"
 msgstr "显示纯补�格�而�默认的（补�+状�）"
 
-#: builtin/log.c:1790
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "邮件��"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1809
 msgid "header"
 msgstr "header"
 
-#: builtin/log.c:1792
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "添加邮件头"
 
-#: builtin/log.c:1793 builtin/log.c:1794
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "邮件地�"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "添加收件人"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "添加抄�"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "标识"
 
-#: builtin/log.c:1796
+#: builtin/log.c:1814
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "将 From 地�设置为 <标识>（如若��供，则用�交者 ID �为地�）"
 
-#: builtin/log.c:1798
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "邮件标识"
 
-#: builtin/log.c:1799
+#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr "使第一�邮件作为对 <邮件标识> 的回�"
 
-#: builtin/log.c:1800 builtin/log.c:1803
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "边界"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "附件方�添加补�"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "内�显示补�"
 
-#: builtin/log.c:1808
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr "�用邮件线索，风格：浅，深"
 
-#: builtin/log.c:1810
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "签�"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "添加一个签�"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "基线�交"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr "为补�列表添加�置树信�"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "从文件添加一个签�"
 
-#: builtin/log.c:1817
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "��打�补�文件�"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "在生�补�时显示进度"
 
-#: builtin/log.c:1821
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
-msgstr "在附函或�个补�中显示和 <rev> 的差异"
+msgstr "在附函或�个补�中显示和 <版本> 的差异"
 
-#: builtin/log.c:1824
+#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
-msgstr "在附函或�个补�中显示和 <refspec> 的差异"
+msgstr "在附函或�个补�中显示和 <引用规格> 的差异"
 
-#: builtin/log.c:1826 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:1913
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "包�无效的身份标识：%s"
 
-#: builtin/log.c:1928
-msgid "-n and -k are mutually exclusive"
-msgstr "-n 和 -k 互斥"
-
-#: builtin/log.c:1930
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc 和 -k 互斥"
-
-#: builtin/log.c:1938
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only 无�义"
 
-#: builtin/log.c:1940
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status 无�义"
 
-#: builtin/log.c:1942
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check 无�义"
 
-#: builtin/log.c:1964
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout�--output 和 --output-directory 是互斥的"
-
-#: builtin/log.c:2087
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff 需� --cover-letter 或�一补�"
 
-#: builtin/log.c:2091
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "版本间差异："
 
-#: builtin/log.c:2092
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "对 v%d 的版本差异："
 
-#: builtin/log.c:2098
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor 需� --range-diff"
-
-#: builtin/log.c:2102
+#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff 需� --cover-letter 或�一补�"
 
-#: builtin/log.c:2110
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "范围差异："
 
-#: builtin/log.c:2111
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "对 v%d 的范围差异："
 
-#: builtin/log.c:2122
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "无法读�签�文件 '%s'"
 
-#: builtin/log.c:2158
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "生�补�"
 
-#: builtin/log.c:2202
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "无法创建输出文件"
 
-#: builtin/log.c:2261
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<上游> [<头> [<�制>]]]"
 
-#: builtin/log.c:2315
+#: 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:563
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<选项>] [<文件>...]"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "用 NUL 字符分隔路径"
+
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "用标签标识文件的状�"
 
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "使用�写字�表示 '�设未改�的' 文件"
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "使用�写字�表示 'fsmonitor clean' 文件"
 
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "显示缓存的文件（默认）"
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "显示已删除的文件"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "显示已修改的文件"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "显示其它文件"
 
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "显示忽略的文件"
 
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
 msgstr "显示暂存区内容的对象�称"
 
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:639
 msgid "show files on the filesystem that need to be removed"
 msgstr "显示文件系统需�删除的文件"
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "�显示“其他�目录的�称"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "显示文件�行符格�"
 
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "�显示空目录"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "显示未�并的文件"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "显示 resolve-undo 信�"
 
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "跳过和模�匹�的文件"
 
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "从 <文件> 中读�排除模�"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "从 <文件> 读�排除模�"
 
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "从 <文件> 读��外的�个目录的排除模�"
 
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "添加标准的 git 排除"
 
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr "显示相对于顶级目录的文件�"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "在�模组中递归"
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:669
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "如果任何 <文件> 都�在索引区，视为错误"
 
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "树对象"
 
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:671
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "�装自从 <树对象> 之�删除的路径�然存在"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "显示调试数�"
 
-#: builtin/ls-files.c:674
+#: 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"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<repository> [<refs>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repository> [<refs>...]]"
 msgstr ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<仓库> [<引用>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<仓库> [<引用>...]]"
 
 #: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "�打�远程 URL"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
 msgid "exec"
 msgstr "exec"
 
@@ -17184,7 +17464,7 @@ msgstr "��主题"
 
 #: builtin/mailinfo.c:60
 msgid "keep non patch brackets in subject"
-msgstr "在标题��无补�括�标注"
+msgstr "在主题中��无补�括�标注"
 
 #: builtin/mailinfo.c:62
 msgid "copy Message-ID to the end of commit message"
@@ -17216,13 +17496,13 @@ msgstr "<动作>"
 
 #: builtin/mailinfo.c:74
 msgid "action when quoted CR is found"
-msgstr "找到引用的 CR 时的�作"
+msgstr "找到引�中的 CR 时的�作"
 
 #: builtin/mailinfo.c:77
 msgid "use headers in message's body"
-msgstr "在消�正文中使用标题"
+msgstr "在消�正文中使用标头"
 
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "空的 mbox：'%s'"
@@ -17284,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 设置标签"
 
@@ -17338,190 +17622,186 @@ msgstr "无法解�引用 '%s'"
 msgid "Merging %s with %s\n"
 msgstr "�并 %s 和 %s\n"
 
-#: builtin/merge.c:58
+#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<选项>] [<�交>...]"
 
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "开关 `m' 需�一个值"
 
-#: builtin/merge.c:146
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "选项 `%s' 需�一个值"
 
-#: builtin/merge.c:199
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "�能找到�并策略 '%s'。\n"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "�用的策略有："
 
-#: builtin/merge.c:205
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "�用的自定义策略有："
 
-#: builtin/merge.c:256 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 "在�并的最��显示差异统计"
 
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:261 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "在�并的最�显示差异统计"
 
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "（和 --stat �义）"
 
-#: builtin/merge.c:262 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 "在�并�交信�中添加（最多 <n> �）精简�交记录"
 
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr "创建一个�独的�交而�是�一次�并"
 
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "如果�并�功，执行一次�交（默认）"
 
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "在�交�编辑�交说明"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "�许快进（默认）"
 
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "如果�能快进就放弃�并"
 
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "验�指定的�交是�包�一个有效的 GPG 签�"
 
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: 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:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "�使用的�并策略"
 
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "option=value"
 
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "所选的�并策略的选项"
 
-#: builtin/merge.c:283
+#: builtin/merge.c:285
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "�并的�交说明（针对�快进��并）"
 
-#: builtin/merge.c:290
+#: 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:292
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort，但是�留索引和工作区"
 
-#: builtin/merge.c:294
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "继续当�正在进行的�并"
 
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "�许�并�相关的历�"
 
-#: builtin/merge.c:303
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "绕过 pre-merge-commit 和 commit-msg 钩�"
 
-#: builtin/merge.c:320
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "�能�行贮�。"
 
-#: builtin/merge.c:325
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "贮�失败"
 
-#: builtin/merge.c:330
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "�是一个有效对象：%s"
 
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "读�树失败"
 
-#: builtin/merge.c:400
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "已�是最新的。（无�挤压）"
 
-#: builtin/merge.c:414
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "挤压�交 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:464
+#: 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:602
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "�的 branch.%s.mergeoptions 字符串：%s"
 
-#: builtin/merge.c:728
+#: builtin/merge.c:732
 msgid "Not handling anything other than two heads merge."
 msgstr "未处�两个头�并之外的任何�作。"
 
-#: builtin/merge.c:741
+#: builtin/merge.c:745
 #, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "merge-recursive 的未知选项：-X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "未知的策略选项：-X%s"
 
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "�能写 %s"
 
-#: builtin/merge.c:812
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "�能从 '%s' 读�"
 
-#: builtin/merge.c:821
+#: 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:827
+#: 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"
@@ -17531,83 +17811,83 @@ msgstr ""
 "�并到主题分支。\n"
 "\n"
 
-#: builtin/merge.c:832
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "空的�交说明会终止�交。\n"
 
-#: builtin/merge.c:835
+#: 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:888
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "空�交信�。"
 
-#: builtin/merge.c:903
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "太棒了。\n"
 
-#: builtin/merge.c:964
+#: builtin/merge.c:970
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "自动�并失败，修正冲�然��交修正的结果。\n"
 
-#: builtin/merge.c:1003
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "没有当�分支。"
 
-#: builtin/merge.c:1005
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "当�分支没有对应的远程仓库。"
 
-#: builtin/merge.c:1007
+#: builtin/merge.c:1013
 msgid "No default upstream defined for the current branch."
 msgstr "当�分支没有定义默认的上游分支。"
 
-#: builtin/merge.c:1012
+#: builtin/merge.c:1018
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "对于 %s 没有�自 %s 的远程跟踪分支"
 
-#: builtin/merge.c:1069
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "环境 '%2$s' 中存在�的�值 '%1$s'"
 
-#: builtin/merge.c:1172
+#: builtin/merge.c:1177
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "�能在 %s 中�并：%s"
 
-#: builtin/merge.c:1206
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "�能�并"
 
-#: builtin/merge.c:1316
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort �带�数"
 
-#: builtin/merge.c:1320
+#: builtin/merge.c:1328
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "没有�终止的�并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1338
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit �带�数"
 
-#: builtin/merge.c:1351
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue �带�数"
 
-#: builtin/merge.c:1355
+#: builtin/merge.c:1363
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "没有进行中的�并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1371
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17615,7 +17895,7 @@ msgstr ""
 "您尚未结�您的�并（存在 MERGE_HEAD）。\n"
 "请在�并�先�交您的修改。"
 
-#: builtin/merge.c:1378
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17623,88 +17903,76 @@ msgstr ""
 "您尚未结�您的拣选（存在 CHERRY_PICK_HEAD）。\n"
 "请在�并�先�交您的修改。"
 
-#: builtin/merge.c:1381
+#: builtin/merge.c:1389
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "您尚未结�您的拣选（存在 CHERRY_PICK_HEAD）。"
 
-#: builtin/merge.c:1395
-msgid "You cannot combine --squash with --no-ff."
-msgstr "您�能将 --squash 和 --no-ff 组�使用。"
-
-#: builtin/merge.c:1397
-msgid "You cannot combine --squash with --commit."
-msgstr "您�能将 --squash 和 --commit 组�使用。"
-
-#: builtin/merge.c:1413
+#: builtin/merge.c:1421
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "未指定�交并且 merge.defaultToUpstream 未设置。"
 
-#: builtin/merge.c:1430
+#: builtin/merge.c:1438
 msgid "Squash commit into empty head not supported yet"
 msgstr "尚�支�到空分支的压缩�交"
 
-#: builtin/merge.c:1432
+#: builtin/merge.c:1440
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "到空分支的�快进��交没有�义"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - �能被�并"
 
-#: builtin/merge.c:1439
+#: builtin/merge.c:1447
 msgid "Can merge only exactly one commit into empty head"
 msgstr "�能将一个�交�并到空分支上"
 
-#: builtin/merge.c:1520
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "拒��并无关的历�"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "æ›´æ–° %s..%s\n"
 
-#: builtin/merge.c:1585
+#: builtin/merge.c:1601
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "�试�常�的索引内�并...\n"
 
-#: builtin/merge.c:1592
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "无。\n"
 
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr "无法快进，终止。"
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: builtin/merge.c:1667 builtin/merge.c:1733
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "将树回滚至原始状�...\n"
 
-#: builtin/merge.c:1655
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "�试�并策略 %s...\n"
 
-#: builtin/merge.c:1707
+#: builtin/merge.c:1723
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "没有�并策略处�此�并。\n"
 
-#: builtin/merge.c:1709
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "使用策略 %s �并失败。\n"
 
-#: builtin/merge.c:1718
+#: builtin/merge.c:1735
 #, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "使用 %s 以准备手工解决。\n"
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr "使用 %s 策略以准备手工解决。\n"
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "自动�并进展顺利，按�求在�交��止\n"
@@ -17726,7 +17994,7 @@ msgstr "错误：标签输入未通过 fsck：%s"
 #: builtin/mktag.c:41
 #, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr "%d（忽略 FSCK?）�应该触�这个调用"
+msgstr "%d (FSCK_IGNORE?) 永远�应该触�这个回调"
 
 #: builtin/mktag.c:56
 #, c-format
@@ -17738,15 +18006,15 @@ msgstr "�能读�被标记的对象 '%s'"
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr "对象 '%s' 被标记为 '%s'，然而是一个 '%s' 类型"
 
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr "标准输入上的标签未通过我们严格的 fsck 检查"
 
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
 msgid "tag on stdin did not refer to a valid object"
 msgstr "标准输入上的标签未指�一个有效的对象"
 
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "无法写标签文件"
 
@@ -17767,44 +18035,55 @@ msgid "allow creation of more than one tree"
 msgstr "�许创建一个以上的树"
 
 #: builtin/multi-pack-index.c:10
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<选项>] write [--preferred-pack=<包>]"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<选项>] write [--preferred-pack=<包>][--refs-snapshot=<"
+"路径>]"
 
-#: builtin/multi-pack-index.c:13
+#: builtin/multi-pack-index.c:14
 msgid "git multi-pack-index [<options>] verify"
 msgstr "git multi-pack-index [<选项>] verify"
 
-#: builtin/multi-pack-index.c:16
+#: builtin/multi-pack-index.c:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<选项>] expire"
 
-#: builtin/multi-pack-index.c:19
+#: builtin/multi-pack-index.c:20
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<选项>] repack [--batch-size=<尺寸>]"
 
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr "包��对包文件和包索引的对象目录"
 
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
 msgid "preferred-pack"
 msgstr "首选包"
 
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr "在计算多包�图时打包以供�用"
 
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "写入多包�图"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "写入�包括给定索引的多包索引"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "用于选择�图�交的引用快照"
+
+#: 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 "在 repack 期间，将较�尺寸的包文件收集到大于此大�的批次中"
 
-#: builtin/multi-pack-index.c:180
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "未识别的�命令：%s"
-
 #: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<选项>] <�>... <目标>"
@@ -17831,117 +18110,117 @@ msgstr "强制移动/�命令，�使目标存在"
 msgid "skip move/rename errors"
 msgstr "跳过移动/�命�错误"
 
-#: builtin/mv.c:170
+#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "目标 '%s' �是一个目录"
 
-#: builtin/mv.c:181
+#: builtin/mv.c:184
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "检查 '%s' 到 '%s' 的�命�\n"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:190
 msgid "bad source"
 msgstr "�的�"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "�能将目录移动到自身"
 
-#: builtin/mv.c:191
+#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "�能将目录移动到文件"
 
-#: builtin/mv.c:200
+#: builtin/mv.c:205
 msgid "source directory is empty"
 msgstr "�目录为空"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "�在版本控制之下"
 
-#: builtin/mv.c:227
+#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "冲�"
 
-#: builtin/mv.c:230
+#: builtin/mv.c:236
 msgid "destination exists"
 msgstr "目标已存在"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "覆盖 '%s'"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "�能覆盖"
 
-#: builtin/mv.c:244
+#: builtin/mv.c:250
 msgid "multiple sources for the same target"
 msgstr "�一目标具有多个�"
 
-#: builtin/mv.c:246
+#: builtin/mv.c:252
 msgid "destination directory does not exist"
 msgstr "目标目录�存在"
 
-#: builtin/mv.c:253
+#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s，�=%s，目标=%s"
 
-#: builtin/mv.c:274
+#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "�命� %s 至 %s\n"
 
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: 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 "��解�输入中的标签（内部使用）"
 
@@ -18058,151 +18337,151 @@ 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:197
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr "请通过 -m 或 -F 选项为注解�供内容"
 
-#: builtin/notes.c:206
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "�能写注解对象"
 
-#: builtin/notes.c:208
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "注解内容被留在 %s 中"
 
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "�能打开或读� '%s'"
 
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "无法解� '%s' 为一个有效引用。"
 
-#: builtin/notes.c:265
+#: builtin/notes.c:263
 #, c-format
 msgid "failed to read object '%s'."
-msgstr "读�对象 '%s' 失败。"
+msgstr "无法读�对象 '%s'。"
 
-#: builtin/notes.c:268
+#: builtin/notes.c:266
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "�能从�数�对象 '%s' 中读�注解数�。"
 
-#: builtin/notes.c:309
+#: builtin/notes.c:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "格�错误的输入行：'%s'。"
 
-#: builtin/notes.c:324
+#: 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.
 #.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "拒�� %2$s（在 refs/notes/ 之外）%1$s注解"
 
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: 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:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr "太多�数"
 
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
 #, c-format
 msgid "no note found for object %s."
 msgstr "未�现对象 %s 的注解。"
 
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "注解内容作为一个字符串"
 
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "注解内容到一个文件中"
 
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
 msgid "reuse and edit specified note object"
 msgstr "�用和编辑指定的注解对象"
 
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "�用指定的注解对象"
 
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "�许�存空白注释"
 
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "替�已存在的注解"
 
-#: builtin/notes.c:448
+#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "�能添加注解。�现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
 
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "覆盖对象 %s 现存注解\n"
 
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "删除对象 %s 的注解\n"
 
-#: builtin/notes.c:497
+#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "从标准输入读�对象"
 
-#: builtin/notes.c:499
+#: builtin/notes.c:497
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "�新加载 <命令> 的�置（�� --stdin）"
 
-#: builtin/notes.c:517
+#: builtin/notes.c:515
 msgid "too few arguments"
 msgstr "�数太少"
 
-#: builtin/notes.c:538
+#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "�能拷�注解。�现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
 
-#: builtin/notes.c:550
+#: builtin/notes.c:548
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
 msgstr "�对象 %s 缺少注解。�能拷�。"
 
-#: builtin/notes.c:603
+#: builtin/notes.c:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18211,97 +18490,97 @@ msgstr ""
 "�命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
 "请�用 'git notes add -f -m/-F/-c/-C'。\n"
 
-#: builtin/notes.c:698
+#: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
-msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
+msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:700
+#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
-msgstr "删除引用 NOTES_MERGE_REF 失败"
+msgstr "无法删除引用 NOTES_MERGE_REF"
 
-#: builtin/notes.c:702
+#: builtin/notes.c:700
 msgid "failed to remove 'git notes merge' worktree"
-msgstr "删除 'git notes merge' 工作区失败"
+msgstr "无法删除 'git notes merge' 工作区"
 
-#: builtin/notes.c:722
+#: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
-msgstr "读�引用 NOTES_MERGE_PARTIAL 失败"
+msgstr "无法读�引用 NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:724
+#: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "无法从 NOTES_MERGE_PARTIAL 中找到�交。"
 
-#: builtin/notes.c:726
+#: builtin/notes.c:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "无法从 NOTES_MERGE_PARTIAL 中解��交。"
 
-#: builtin/notes.c:739
+#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
-msgstr "解� NOTES_MERGE_REF 失败"
+msgstr "无法解� NOTES_MERGE_REF"
 
-#: builtin/notes.c:742
+#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "无法完�注解�并"
 
-#: builtin/notes.c:768
+#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "未知的注解�并策略 %s"
 
-#: builtin/notes.c:784
+#: builtin/notes.c:782
 msgid "General options"
 msgstr "通用选项"
 
-#: builtin/notes.c:786
+#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "�并选项"
 
-#: builtin/notes.c:788
+#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr "使用指定的策略解决注解冲� (manual/ours/theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:790
+#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "�交未�并的注解"
 
-#: builtin/notes.c:792
+#: builtin/notes.c:790
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "通过�交未�并的注解�完�注解�并"
 
-#: builtin/notes.c:794
+#: builtin/notes.c:792
 msgid "Aborting notes merge resolution"
 msgstr "中止注解�并的方案"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "中止注解�并"
 
-#: builtin/notes.c:807
+#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "�能混用 --commit�--abort 或 -s/--strategy"
 
-#: builtin/notes.c:812
+#: builtin/notes.c:810
 msgid "must specify a notes ref to merge"
 msgstr "必须指定一个注解引用��并"
 
-#: builtin/notes.c:836
+#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "未知的 -s/--strategy：%s"
 
-#: builtin/notes.c:873
+#: 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:876
+#: builtin/notes.c:878
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "无法存储链接到当�的注解引用（%s）"
 
-#: builtin/notes.c:878
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18311,56 +18590,56 @@ msgstr ""
 "自动�并说明失败。修改 %s 中的冲�并且使用命令 'git notes merge --commit' �"
 "交结果，或者使用命令 'git notes merge --abort' 终止�并。\n"
 
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "无法解� '%s' 为一个有效引用。"
 
-#: builtin/notes.c:900
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "对象 %s 没有注解\n"
 
-#: builtin/notes.c:912
+#: builtin/notes.c:914
 msgid "attempt to remove non-existent note is not an error"
 msgstr "�试删除�存在的注解�是一个错误"
 
-#: builtin/notes.c:915
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr "从标准输入读�对象�称"
 
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr "�删除，�显示"
 
-#: builtin/notes.c:955
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "报告清除的注解"
 
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "注解引用"
 
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "从 <注解引用> 使用注解"
 
-#: builtin/notes.c:1034 builtin/stash.c:1739
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "未知�命令：%s"
 
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
 
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<选项>...] <�缀�称> [< <引用列表> | < <对象列表>]"
 
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18368,106 +18647,110 @@ msgid ""
 msgstr ""
 "write_reuse_object：无法定� %1$s，预期在包 %3$s 中的�移� %2$<PRIuMAX> 上"
 
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "%s 错的包对象 CRC"
 
-#: builtin/pack-objects.c:459
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "%s ��的包对象"
 
-#: builtin/pack-objects.c:590
+#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "�现对象 %s 递归 delta"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "排�了 %u 个对象，预期 %<PRIu32> 个"
 
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "预期对象在包文件 %2$s 的�移� %1$<PRIuMAX> 上"
 
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1160
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "�用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
 
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
 msgid "Writing objects"
 msgstr "写入对象中"
 
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: 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:1141
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "无法写入�图索引"
+
+#: builtin/pack-objects.c:1294
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
 
-#: builtin/pack-objects.c:1383
+#: builtin/pack-objects.c:1536
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "�用 bitmap 写入，因为一些对象将�会被打包"
 
-#: builtin/pack-objects.c:1831
+#: builtin/pack-objects.c:1984
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "%s 压缩中 delta 基准�移越界"
 
-#: builtin/pack-objects.c:1840
+#: builtin/pack-objects.c:1993
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "%s 的 delta 基准�移越界"
 
-#: builtin/pack-objects.c:2121
+#: builtin/pack-objects.c:2274
 msgid "Counting objects"
 msgstr "对象计数中"
 
-#: builtin/pack-objects.c:2266
+#: builtin/pack-objects.c:2439
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "无法解�对象 %s 头信�"
 
-#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
-#: builtin/pack-objects.c:2362
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
 #, c-format
 msgid "object %s cannot be read"
 msgstr "对象 %s 无法读�"
 
-#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "对象 %s �一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）"
 
-#: builtin/pack-objects.c:2376
+#: builtin/pack-objects.c:2549
 msgid "suboptimal pack - out of memory"
 msgstr "次优（suboptimal）打包 - 内存�足"
 
-#: builtin/pack-objects.c:2691
+#: builtin/pack-objects.c:2864
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "使用 %d 个线程进行压缩"
 
-#: builtin/pack-objects.c:2830
+#: builtin/pack-objects.c:3003
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "无法为标签 %s 压缩对象"
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:3089
 msgid "Compressing objects"
 msgstr "压缩对象中"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:3095
 msgid "inconsistency with delta count"
 msgstr "�一致的差异计数"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3174
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18476,23 +18759,24 @@ msgstr ""
 "uploadpack.blobpackfileuri 的�值必须是 '<object-hash> <pack-hash> <uri>' 格"
 "�（得到 '%s'）"
 
-#: builtin/pack-objects.c:3004
+#: builtin/pack-objects.c:3177
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
 msgstr "对象已�在�外的 uploadpack.blobpackfileuri 中�置（得到 '%s'）"
 
-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3212
 #, c-format
 msgid "could not get type of object %s in pack %s"
 msgstr "无法获得包 %2$s 中对象 %1$s 的类型"
 
-#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "�能找到包 '%s'"
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3408
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -18501,7 +18785,7 @@ msgstr ""
 "预期边界对象（edge object）ID，�得到垃圾数�：\n"
 " %s"
 
-#: builtin/pack-objects.c:3224
+#: builtin/pack-objects.c:3414
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -18510,246 +18794,242 @@ msgstr ""
 "预期对象 ID，�得到垃圾数�：\n"
 " %s"
 
-#: builtin/pack-objects.c:3322
+#: builtin/pack-objects.c:3507
 msgid "invalid value for --missing"
 msgstr "选项 --missing 的值无效"
 
-#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
 msgid "cannot open pack index"
 msgstr "无法打开包文件索引"
 
-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3541
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "无法检查 %s 处的�散对象"
 
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3627
 msgid "unable to force loose object"
 msgstr "无法强制�散对象"
 
-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3757
 #, c-format
 msgid "not a rev '%s'"
 msgstr "�是一个版本 '%s'"
 
-#: builtin/pack-objects.c:3631
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "�的版本 '%s'"
 
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3788
 msgid "unable to add recent objects"
 msgstr "无法添加最近的对象"
 
-#: builtin/pack-objects.c:3712
+#: builtin/pack-objects.c:3841
 #, c-format
 msgid "unsupported index version %s"
 msgstr "�支�的索引版本 %s"
 
-#: builtin/pack-objects.c:3716
+#: builtin/pack-objects.c:3845
 #, c-format
 msgid "bad index version '%s'"
 msgstr "�的索引版本 '%s'"
 
-#: builtin/pack-objects.c:3755
+#: builtin/pack-objects.c:3884
 msgid "<version>[,<offset>]"
 msgstr "<版本>[,<�移>]"
 
-#: builtin/pack-objects.c:3756
+#: builtin/pack-objects.c:3885
 msgid "write the pack index file in the specified idx format version"
 msgstr "用指定的 idx 格�版本�写包索引文件"
 
-#: builtin/pack-objects.c:3759
+#: builtin/pack-objects.c:3888
 msgid "maximum size of each output pack file"
 msgstr "�个输出包的最大尺寸"
 
-#: builtin/pack-objects.c:3761
+#: builtin/pack-objects.c:3890
 msgid "ignore borrowed objects from alternate object store"
 msgstr "忽略从备用对象存储里借用对象"
 
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c:3892
 msgid "ignore packed objects"
 msgstr "忽略包对象"
 
-#: builtin/pack-objects.c:3765
+#: builtin/pack-objects.c:3894
 msgid "limit pack window by objects"
 msgstr "�制打包窗�的对象数"
 
-#: builtin/pack-objects.c:3767
+#: builtin/pack-objects.c:3896
 msgid "limit pack window by memory in addition to object limit"
 msgstr "除对象数��制外设置打包窗�的内存�制"
 
-#: builtin/pack-objects.c:3769
+#: builtin/pack-objects.c:3898
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "打包�许的 delta 链的最大长度"
 
-#: builtin/pack-objects.c:3771
+#: builtin/pack-objects.c:3900
 msgid "reuse existing deltas"
 msgstr "�用已存在的 deltas"
 
-#: builtin/pack-objects.c:3773
+#: builtin/pack-objects.c:3902
 msgid "reuse existing objects"
 msgstr "�用已存在的对象"
 
-#: builtin/pack-objects.c:3775
+#: builtin/pack-objects.c:3904
 msgid "use OFS_DELTA objects"
 msgstr "使用 OFS_DELTA 对象"
 
-#: builtin/pack-objects.c:3777
+#: builtin/pack-objects.c:3906
 msgid "use threads when searching for best delta matches"
 msgstr "使用线程查询最佳 delta 匹�"
 
-#: builtin/pack-objects.c:3779
+#: builtin/pack-objects.c:3908
 msgid "do not create an empty pack output"
 msgstr "�创建空的包输出"
 
-#: builtin/pack-objects.c:3781
+#: builtin/pack-objects.c:3910
 msgid "read revision arguments from standard input"
 msgstr "从标准输入读�版本��数"
 
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:3912
 msgid "limit the objects to those that are not yet packed"
 msgstr "�制那些尚未打包的对象"
 
-#: builtin/pack-objects.c:3786
+#: builtin/pack-objects.c:3915
 msgid "include objects reachable from any reference"
 msgstr "包括�以从任何引用访问到的对象"
 
-#: builtin/pack-objects.c:3789
+#: builtin/pack-objects.c:3918
 msgid "include objects referred by reflog entries"
 msgstr "包括被引用日志引用到的对象"
 
-#: builtin/pack-objects.c:3792
+#: builtin/pack-objects.c:3921
 msgid "include objects referred to by the index"
 msgstr "包括被索引引用到的对象"
 
-#: builtin/pack-objects.c:3795
+#: builtin/pack-objects.c:3924
 msgid "read packs from stdin"
 msgstr "从标准输入读�包"
 
-#: builtin/pack-objects.c:3797
+#: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
 msgstr "输出包到标准输出"
 
-#: builtin/pack-objects.c:3799
+#: builtin/pack-objects.c:3928
 msgid "include tag objects that refer to objects to be packed"
 msgstr "包括那些引用了待打包对象的标签对象"
 
-#: builtin/pack-objects.c:3801
+#: builtin/pack-objects.c:3930
 msgid "keep unreachable objects"
 msgstr "维���达的对象"
 
-#: builtin/pack-objects.c:3803
+#: builtin/pack-objects.c:3932
 msgid "pack loose unreachable objects"
 msgstr "打包�散的��达对象"
 
-#: builtin/pack-objects.c:3805
+#: builtin/pack-objects.c:3934
 msgid "unpack unreachable objects newer than <time>"
 msgstr "将比给定 <时间> 新的无法访问的对象解包"
 
-#: builtin/pack-objects.c:3808
+#: builtin/pack-objects.c:3937
 msgid "use the sparse reachability algorithm"
 msgstr "使用稀��达性算法"
 
-#: builtin/pack-objects.c:3810
+#: builtin/pack-objects.c:3939
 msgid "create thin packs"
 msgstr "创建精简包"
 
-#: builtin/pack-objects.c:3812
+#: builtin/pack-objects.c:3941
 msgid "create packs suitable for shallow fetches"
 msgstr "创建适�浅克隆仓库获�的包"
 
-#: builtin/pack-objects.c:3814
+#: builtin/pack-objects.c:3943
 msgid "ignore packs that have companion .keep file"
 msgstr "忽略�有 .keep 文件的包"
 
-#: builtin/pack-objects.c:3816
+#: builtin/pack-objects.c:3945
 msgid "ignore this pack"
 msgstr "忽略该 pack"
 
-#: builtin/pack-objects.c:3818
+#: builtin/pack-objects.c:3947
 msgid "pack compression level"
 msgstr "打包压缩级别"
 
-#: builtin/pack-objects.c:3820
+#: builtin/pack-objects.c:3949
 msgid "do not hide commits by grafts"
 msgstr "显示被移���的�交"
 
-#: builtin/pack-objects.c:3822
+#: builtin/pack-objects.c:3951
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "使用 bitmap 索引（如果有的�）以�高对象计数时的速度"
 
-#: builtin/pack-objects.c:3824
+#: builtin/pack-objects.c:3953
 msgid "write a bitmap index together with the pack index"
 msgstr "在建立包索引的�时创建 bitmap 索引"
 
-#: builtin/pack-objects.c:3828
+#: builtin/pack-objects.c:3957
 msgid "write a bitmap index if possible"
 msgstr "如果�能，写 bitmap 索引"
 
-#: builtin/pack-objects.c:3832
+#: builtin/pack-objects.c:3961
 msgid "handling for missing objects"
 msgstr "处�丢失的对象"
 
-#: builtin/pack-objects.c:3835
+#: builtin/pack-objects.c:3964
 msgid "do not pack objects in promisor packfiles"
 msgstr "��打包 promisor 包文件中的对象"
 
-#: builtin/pack-objects.c:3837
+#: builtin/pack-objects.c:3966
 msgid "respect islands during delta compression"
 msgstr "在增�压缩时�考数�岛"
 
-#: builtin/pack-objects.c:3839
+#: builtin/pack-objects.c:3968
 msgid "protocol"
 msgstr "�议"
 
-#: builtin/pack-objects.c:3840
+#: builtin/pack-objects.c:3969
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr "使用此�议排除任何已�置的 uploadpack.blobpackfileuri"
 
-#: builtin/pack-objects.c:3873
+#: builtin/pack-objects.c:4002
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "增�链深度 %d 太深了，强制为 %d"
 
-#: builtin/pack-objects.c:3878
+#: builtin/pack-objects.c:4007
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "�置 pack.deltaCacheLimit 太高了，强制为 %d"
 
-#: builtin/pack-objects.c:3934
+#: builtin/pack-objects.c:4063
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr "�能使用 --max-pack-size �构建传输用的包文件"
 
-#: builtin/pack-objects.c:3936
+#: builtin/pack-objects.c:4065
 msgid "minimum pack size limit is 1 MiB"
 msgstr "最�的包文件大�是 1 MiB"
 
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:4070
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin �能用于创建一个�索引包"
 
-#: builtin/pack-objects.c:3944
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable 和 --unpack-unreachable �兼容"
-
-#: builtin/pack-objects.c:3950
+#: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "�能在没有 --stdout 的情况下使用 --filter"
 
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:4081
 msgid "cannot use --filter with --stdin-packs"
 msgstr "�能�时使用 --filter 和 --stdin-packs"
 
-#: builtin/pack-objects.c:3956
+#: builtin/pack-objects.c:4085
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr "�能�时使用内部版本列表和 --stdin-packs"
 
-#: builtin/pack-objects.c:4015
+#: builtin/pack-objects.c:4144
 msgid "Enumerating objects"
 msgstr "枚举对象中"
 
-#: builtin/pack-objects.c:4052
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -18791,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:152
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "�能在��仓库中执行清��作"
 
@@ -18816,61 +19096,65 @@ msgstr "%s 的值无效：%s"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/pull.c:123
+#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
 msgstr "控制�模组的递归获�"
 
-#: builtin/pull.c:127
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "和�并相关的选项"
 
-#: builtin/pull.c:130
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "使用�基�作�代�并�作以�入修改"
 
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "�许快进�"
 
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "控制 pre-merge-commit 和 commit-msg 钩�的使用"
+
+#: builtin/pull.c:171 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr "在�作��执行自动贮�和弹出贮�"
 
-#: builtin/pull.c:183
+#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "和获�相关的�数"
 
-#: builtin/pull.c:193
+#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "强制覆盖本地分支"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr "并�拉�的�模组的数�"
 
-#: builtin/pull.c:317
+#: builtin/pull.c:321
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "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."
 msgstr "在您刚刚获�到的引用中没有�基�作的候选。"
 
-#: builtin/pull.c:447
+#: builtin/pull.c:451
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "在您刚刚获�到的引用中没有�并�作的候选。"
 
-#: 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."
 msgstr "通常这�味�您�供了一个通�符引用规格但未能和远端匹�。"
 
-#: builtin/pull.c:451
+#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -18880,41 +19164,42 @@ msgstr ""
 "您�求从远程 '%s' 拉�，但是未指定一个分支。因为这�是当�\n"
 "分支默认的远程仓库，您必须在命令行中指定一个分支�。"
 
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
 msgid "You are not currently on a branch."
 msgstr "您当��在一个分支上。"
 
-#: 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 "请指定您��基到哪一个分支。"
 
-#: 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 "请指定您��并哪一个分支。"
 
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "详� git-pull(1)。"
 
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
 msgid "<remote>"
 msgstr "<远程>"
 
-#: 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 "<分支>"
 
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
 msgid "There is no tracking information for the current branch."
 msgstr "当�分支没有跟踪信�。"
 
-#: 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 "如果您想�为此分支创建跟踪信�，您�以执行："
 
-#: builtin/pull.c:485
+#: builtin/pull.c:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -18923,22 +19208,22 @@ msgstr ""
 "您的�置中指定��并远程的引用 '%s'，\n"
 "但是没有获�到这个引用。"
 
-#: builtin/pull.c:596
+#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "无法访问�交 %s"
 
-#: builtin/pull.c:902
+#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "为�基�作忽略 --verify-signatures"
 
-#: builtin/pull.c:930
+#: builtin/pull.c:969
 msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"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"
@@ -18948,10 +19233,10 @@ msgid ""
 "or --ff-only on the command line to override the configured default per\n"
 "invocation.\n"
 msgstr ""
-"�建议在没有为�离分支指定�并策略时执行 pull �作。 您�以在执行下一次\n"
+"您有�离的分支，需�指定如何调和它们。您�以在执行下一次\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"
@@ -18959,19 +19244,19 @@ msgstr ""
 "缺�的�置项。您也�以在�次执行 pull 命令时添加 --rebase�--no-rebase，\n"
 "或者 --ff-only �数覆盖缺�设置。\n"
 
-#: builtin/pull.c:991
+#: builtin/pull.c:1046
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "更新尚未诞生的分支，�更添加至索引。"
 
-#: builtin/pull.c:995
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "�基�拉�"
 
-#: builtin/pull.c:996
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "请�交或贮�它们。"
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -18981,7 +19266,7 @@ msgstr ""
 "fetch 更新了当�的分支。快进您的工作区\n"
 "至�交 %s。"
 
-#: builtin/pull.c:1027
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -18998,15 +19283,23 @@ msgstr ""
 "$ git reset --hard\n"
 "��之�的状�。"
 
-#: builtin/pull.c:1042
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr "无法将多个分支�并到空分支。"
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "无法�基到多个分支。"
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1104
+msgid "Cannot fast-forward to multiple branches."
+msgstr "无法快进到多个分支。"
+
+#: builtin/pull.c:1119
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "需�指定如何调和�离的分支。"
+
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "本地�模组中有修改，无法�基"
 
@@ -19068,7 +19361,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<远程分支�字>\n"
 
-#: builtin/push.c:194
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -19081,12 +19374,17 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:202
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "当�分支 %s 有多个上游分支，拒�推�。"
 
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr "您没有为推�指定任何引用规格，并且 push.default 为 \"nothing\"。"
+
+#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -19096,12 +19394,7 @@ msgstr ""
 "您正推�至远程 '%s'（其并�当�分支 '%s' 的上游），\n"
 "而没有告诉我�推�什么�更新哪个远程分支。"
 
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "您没有为推�指定任何引用规格，并且 push.default 为 \"nothing\"。"
-
-#: builtin/push.c:267
+#: builtin/push.c:258
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19112,7 +19405,7 @@ msgstr ""
 "�次推��，先与远程�更�并（如 'git pull ...'）。详�\n"
 "'git push --help' 中的 'Note about fast-forwards' �节。"
 
-#: builtin/push.c:273
+#: builtin/push.c:264
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -19123,7 +19416,7 @@ msgstr ""
 "检出该分支并整�远程�更（如 'git pull ...'），然��推�。详�\n"
 "'git push --help' 中的 'Note about fast-forwards' �节。"
 
-#: builtin/push.c:279
+#: builtin/push.c:270
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -19136,11 +19429,11 @@ msgstr ""
 "（如 'git pull ...'）。\n"
 "详� 'git push --help' 中的 'Note about fast-forwards' �节。"
 
-#: builtin/push.c:286
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "更新被拒�，因为该标签在远程已�存在。"
 
-#: builtin/push.c:289
+#: builtin/push.c:280
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -19149,7 +19442,7 @@ msgstr ""
 "如果�使用 '--force' �数，您�能更新一个指���交对象的远程引用，\n"
 "也�能更新远程引用让其指�一个��交对象。\n"
 
-#: builtin/push.c:294
+#: builtin/push.c:285
 msgid ""
 "Updates were rejected because the tip of the remote-tracking\n"
 "branch has been updated since the last checkout. You may want\n"
@@ -19159,103 +19452,99 @@ msgstr ""
 "更新被拒�，因为远程跟踪分支的最新�交自从上次检出之�已被更新。\n"
 "在强制更新�，您�能想将这些�更整�到本地（如 'git pull ...'）。\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "推�到 %s\n"
 
-#: builtin/push.c:371
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
-msgstr "推�一些引用到 '%s' 失败"
+msgstr "无法推�一些引用到 '%s'"
 
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "仓库"
 
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
 msgstr "推�所有引用"
 
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr "镜�所有引用"
 
-#: builtin/push.c:557
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "删除引用"
 
-#: builtin/push.c:558
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "推�标签（�能使用 --all or --mirror）"
 
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "强制更新"
 
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "<引用�>:<期望值>"
 
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
 msgid "require old value of ref to be at this value"
 msgstr "�求引用旧的�值为设定值"
 
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
 msgid "require remote updates to be integrated locally"
 msgstr "�求远程更新在本地被整�"
 
-#: builtin/push.c:569
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "控制�模组的递归推�"
 
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
 msgid "use thin pack"
 msgstr "使用精简打包"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "接收包程�"
 
-#: builtin/push.c:573
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "设置 git pull/status 的上游"
 
-#: builtin/push.c:576
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "清除本地删除的引用"
 
-#: builtin/push.c:578
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "绕过 pre-push 钩�"
 
-#: builtin/push.c:579
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "推�缺失但有关的标签"
 
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
 msgstr "用 GPG 为推�签�"
 
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
 msgid "request atomic transaction on remote side"
 msgstr "需�远端支�原�事务"
 
-#: builtin/push.c:601
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete 与 --all�--mirror � --tags �兼容"
-
-#: builtin/push.c:603
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete 未接任何引用没有�义"
 
-#: builtin/push.c:623
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "�的仓库 '%s'"
 
-#: builtin/push.c:624
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -19276,27 +19565,15 @@ msgstr ""
 "\n"
 "    git push <�称>\n"
 
-#: builtin/push.c:639
-msgid "--all and --tags are incompatible"
-msgstr "--all 和 --tags �兼容"
-
-#: builtin/push.c:641
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all �能和引用规格�时使用"
 
-#: builtin/push.c:645
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror 和 --tags �兼容"
-
-#: builtin/push.c:647
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror �能和引用规格�时使用"
 
-#: builtin/push.c:650
-msgid "--all and --mirror are incompatible"
-msgstr "--all 和 --mirror �兼容"
-
-#: builtin/push.c:657
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "推�选项�能有�行符"
 
@@ -19348,82 +19625,82 @@ msgstr "需�两个�交范围"
 #: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<�缀>) [-"
-"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
+"u | -i]] [--no-sparse-checkout] [--index-output=<文件>] (--empty | <树对象一"
+"> [<树对象二> [<树对象三>]])"
 
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "将索引结果写入 <文件>"
 
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "�是清空索引"
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "�并"
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
 msgid "perform a merge in addition to a read"
 msgstr "读�之余�执行一个�并"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
 msgid "3-way merge if no file level merging required"
 msgstr "如果没有文件级�并需�，执行三方�并"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
 msgid "3-way merge in presence of adds and removes"
 msgstr "存在添加和删除时，也执行三方�并"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "类似于 -m，但丢弃未�并的�目"
 
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<�目录>/"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "读�树对象到索引的 <�目录>/ 下"
 
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
 msgid "update working tree with merge result"
 msgstr "用�并的结果更新工作区"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "�许忽略文件中设定的文件�以被覆盖"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
 msgid "don't check the working tree after merging"
 msgstr "�并��检查工作区"
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
 msgid "don't update the index or the work tree"
 msgstr "�更新索引区和工作区"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
 msgid "skip applying sparse checkout filter"
 msgstr "跳过应用稀�检出过滤器"
 
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "调试 unpack-trees"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "抑制�馈信�"
 
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
 msgid "You need to resolve your current index first"
 msgstr "您需�先解决当�索引的冲�"
 
@@ -19445,193 +19722,44 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "��用的待办列表：'%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
 #, c-format
 msgid "could not create temporary %s"
 msgstr "无法创建临时的 %s"
 
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
 msgid "could not mark as interactive"
 msgstr "无法标记为交互�"
 
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
 msgid "could not generate todo list"
 msgstr "无法生�待办列表"
 
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "使用 --upstream 或 --onto 必须�供一个基线�交"
 
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<选项>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "�留�始为空的�交"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "�许�交说明为空"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "对�并�交�基"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "��兄弟�交的原始分支点"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "移动以 squash!/fixup! 开头的�交"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "签��交"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "显示上游�化的差异统计"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "继续�基"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "跳过�交"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "�基待办列表"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "显示当�补�"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "缩短待办列表中的�交�"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "扩展待办列表中的�交�"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "检查待办列表"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "�新排列 fixup/squash 行"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "在待办列表中�入 exec 执行命令"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "onto"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "�制版本"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "squash onto"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "上游�交"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "head �称"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "�基策略"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "策略选项"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "切�到"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "�检出的分支或�交"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "onto name"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "�执行的命令"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "自动�新安排任何失败的 `exec`"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "�使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s 需��并�端"
 
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "无法获� 'onto'：'%s'"
 
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "无效的原始 head：'%s'"
 
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "忽略无效的 allow_rerere_autoupdate：'%s'"
 
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19644,7 +19772,7 @@ msgstr ""
 "\"git rebase --skip\" 命令跳过这个�交。如果想�终止执行并回到\n"
 "\"git rebase\" 执行之�的状�，执行 \"git rebase --abort\"。"
 
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
 #, c-format
 msgid ""
 "\n"
@@ -19662,14 +19790,14 @@ msgstr ""
 "\n"
 "因此 git 无法对其�基。"
 
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
 "\"."
 msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"�\"keep\" 和 \"ask\"。"
 
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -19686,7 +19814,7 @@ msgstr ""
 "    git rebase '<branch>'\n"
 "\n"
 
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -19699,180 +19827,179 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<branch> %s\n"
 "\n"
 
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
 msgid "exec commands cannot contain newlines"
 msgstr "exec 命令�能包��行符"
 
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
 msgid "empty exec command"
 msgstr "空的 exec 命令"
 
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
 msgid "rebase onto given branch instead of upstream"
 msgstr "�基到给定的分支而�上游"
 
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "使用上游和分支的�并基线�为当�基线"
 
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
 msgid "allow pre-rebase hook to run"
 msgstr "�许执行 pre-rebase 钩�"
 
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
 msgid "be quiet. implies --no-stat"
 msgstr "安�。暗示 --no-stat"
 
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "显示上游�化的差异统计"
+
+#: builtin/rebase.c:1035
 msgid "do not show diffstat of what changed upstream"
 msgstr "�显示上游�化的差异统计"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "为�一个�交添加 Signed-off-by 尾注"
 
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
 msgid "make committer date match author date"
 msgstr "使�交者日期和作者日期一致"
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
 msgid "ignore author date and use current date"
 msgstr "忽略作者日期，使用当�日期"
 
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
 msgid "synonym of --reset-author-date"
 msgstr "--reset-author-date 的�义�"
 
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
 msgid "passed to 'git apply'"
 msgstr "传递给 'git apply'"
 
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
 msgid "ignore changes in whitespace"
 msgstr "忽略空白字符的�更"
 
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "拣选所有�交，�使未修改"
 
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
 msgid "continue"
 msgstr "继续"
 
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
 msgid "skip current patch and continue"
 msgstr "跳过当�补�并继续"
 
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
 msgid "abort and check out the original branch"
 msgstr "终止并检出原有分支"
 
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
 msgid "abort but keep HEAD where it is"
 msgstr "终止但�� HEAD ��"
 
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
 msgid "edit the todo list during an interactive rebase"
 msgstr "在交互��基中编辑待办列表"
 
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
 msgid "show the patch file being applied or merged"
 msgstr "显示正在应用或�并的补�文件"
 
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
 msgid "use apply strategies to rebase"
 msgstr "使用应用策略进行�基"
 
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
 msgid "use merging strategies to rebase"
 msgstr "使用�并策略进行�基"
 
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
 msgid "let the user edit the list of commits to rebase"
 msgstr "让用户编辑��基的�交列表"
 
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "（已弃用）�试�建�并�交而�忽略它们"
 
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
 msgid "how to handle commits that become empty"
 msgstr "如何处��为空�交的�交"
 
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "�留�始为空的�交"
+
+#: builtin/rebase.c:1097
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "在 -i 交互模�下，移动以 squash!/fixup! 开头的�交"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
 msgid "add exec lines after each commit of the editable list"
 msgstr "�编辑列表的�一个�交下�增加一行 exec"
 
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
 msgid "allow rebasing commits with empty messages"
 msgstr "�许针对空�交说明的�交�基"
 
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
 msgid "try to rebase merges instead of skipping them"
 msgstr "�试对�并�交�基而�是忽略它们"
 
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "使用 'merge-base --fork-point' �优化上游"
 
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
 msgid "use the given merge strategy"
 msgstr "使用给定的�并策略"
 
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
 msgid "option"
 msgstr "选项"
 
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
 msgid "pass the argument through to the merge strategy"
 msgstr "将�数传递给�并策略"
 
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "将所有�达的�交�基到根�交"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "自动�新安排任何失败的 `exec`"
+
+#: builtin/rebase.c:1128
 msgid "apply all changes, even those already present upstream"
 msgstr "应用所有更改，甚至那些已在上游存在的"
 
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
 msgid "It looks like 'git am' is in progress. Cannot rebase."
-msgstr "看起� 'git-am' 正在执行中。无法�基。"
-
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
-
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "�能将 '--keep-base' 和 '--onto' 组�使用"
+msgstr "看起� 'git am' 正在执行中。无法�基。"
 
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "�能将 '--keep-base' 和 '--root' 组�使用"
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges 被 --rebase-merges 代替。"
 
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "�能将 '--root' 和 '--fork-point' 组�使用"
-
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "没有正在进行的�基？"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "动作 --edit-todo �能用在交互��基过程中。"
 
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "�能读� HEAD"
 
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -19880,16 +20007,16 @@ msgstr ""
 "您必须编辑所有的�并冲�，然�通过 git add\n"
 "命令将它们标记为已解决"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
 msgid "could not discard worktree changes"
 msgstr "无法丢弃工作区�更"
 
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
 #, c-format
 msgid "could not move back to %s"
 msgstr "无法移回 %s"
 
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -19908,141 +20035,131 @@ msgstr ""
 "\t%s\n"
 "然���新执行。 为��丢失��数�，我已��止当��作。\n"
 
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
 msgstr "开关 `C' 期望一个数字值"
 
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "未知模�：%s"
 
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy 需� --merge 或 --interactive"
 
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr "�能组�使用应用选项和�并选项"
+#: builtin/rebase.c:1463
+msgid "apply options and merge options cannot be used together"
+msgstr "应用选项和�并选项�能�时使用"
 
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "未知的�基�端：%s"
 
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec 需� --exec 或 --interactive"
 
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "�能将 '--preserve-merges' 和 '--rebase-merges' �时使用"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"错误：�能将 '--preserve-merges' 和 '--reschedule-failed-exec' �时使用"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "无效的上游 '%s'"
 
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
 msgid "Could not create new root commit"
 msgstr "�能创建新的根�交"
 
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "'%s'：�需�与分支的一个�并基线"
 
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s'：�需�一个�并基线"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "没有指�一个有效的�交 '%s'"
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
 #, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "致命错误：无此分支/�交 '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "无此分支/�交 '%s'"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2415
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "没有这样的引用：%s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
 msgid "Could not resolve HEAD to a revision"
 msgstr "无法将 HEAD 解�为一个版本"
 
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
 msgid "Please commit or stash them."
 msgstr "请�交或贮�修改。"
 
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
 #, c-format
 msgid "could not switch to %s"
 msgstr "无法切�到 %s"
 
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
 msgid "HEAD is up to date."
 msgstr "HEAD 是最新的。"
 
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "当�分支 %s 是最新的。\n"
 
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD 是最新的，强制�基。"
 
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "当�分支 %s 是最新的，强制�基。\n"
 
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
 msgid "The pre-rebase hook refused to rebase."
 msgstr "pre-rebase 钩�拒�了�基�作。"
 
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "到 %s 的�更：\n"
 
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "从 %s 到 %s 的�更：\n"
 
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr "首先，回退头指针以便在其上�放您的工作...\n"
 
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
 msgid "Could not detach HEAD"
 msgstr "无法分离头指针"
 
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "快进 %s 到 %s。\n"
 
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <仓库目录>"
 
-#: builtin/receive-pack.c:1276
+#: 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"
@@ -20068,7 +20185,7 @@ msgstr ""
 "若��蔽此信�且��默认行为，设置 'receive.denyCurrentBranch'\n"
 "�置��为 'refuse'。"
 
-#: builtin/receive-pack.c:1296
+#: 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"
@@ -20087,13 +20204,13 @@ msgstr ""
 "\n"
 "若��蔽此信�，您�以设置它为 'refuse'。"
 
-#: builtin/receive-pack.c:2479
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "�默模�"
 
-#: builtin/receive-pack.c:2493
-msgid "You must specify a directory."
-msgstr "您必须指定一个目录。"
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "您必须指定一个目录"
 
 #: builtin/reflog.c:17
 msgid ""
@@ -20117,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:699
+#: 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 ]"
 
@@ -20241,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"
@@ -20286,7 +20408,7 @@ msgstr "指定一个 master 分支并使用 --mirror 选项没有�义"
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "指定�跟踪的分支�在与获�镜��时使用�有�义"
 
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
 #, c-format
 msgid "remote %s already exists."
 msgstr "远程 %s 已�存在。"
@@ -20296,25 +20418,30 @@ msgstr "远程 %s 已�存在。"
 msgid "Could not setup master '%s'"
 msgstr "无法设置 master '%s'"
 
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "未处�的 branch.%s.rebase=%s; �定为 'true'"
+
+#: builtin/remote.c:366
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "无法得到引用规格 %s 的获�列表"
 
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
 msgid "(matching)"
 msgstr "（匹�）"
 
-#: builtin/remote.c:466
+#: builtin/remote.c:472
 msgid "(delete)"
 msgstr "（删除）"
 
-#: builtin/remote.c:655
+#: builtin/remote.c:660
 #, c-format
 msgid "could not set '%s'"
 msgstr "�能设置 '%s'"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:665
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -20325,17 +20452,17 @@ msgstr ""
 "\t%s:%d\n"
 "现在在为�存在的远程� '%s' 命�"
 
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "没有此远程仓库：'%s'"
 
-#: builtin/remote.c:710
+#: builtin/remote.c:715
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "�能�命��置�节 '%s' 到 '%s'"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:735
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -20346,17 +20473,17 @@ msgstr ""
 "\t%s\n"
 "\t如果必�请手动更新�置。"
 
-#: builtin/remote.c:770
+#: builtin/remote.c:775
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "删除 '%s' 失败"
 
-#: builtin/remote.c:804
+#: builtin/remote.c:809
 #, c-format
 msgid "creating '%s' failed"
 msgstr "创建 '%s' 失败"
 
-#: builtin/remote.c:882
+#: builtin/remote.c:887
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -20366,118 +20493,118 @@ msgid_plural ""
 msgstr[0] "注�：ref/remotes 层级之外的一个分支未被移除。�删除它，使用："
 msgstr[1] "注�：ref/remotes 层级之外的一些分支未被移除。�删除它们，使用："
 
-#: builtin/remote.c:896
+#: builtin/remote.c:901
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "�能移除�置�节 '%s'"
 
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " 新的（下一次获�将存储于 remotes/%s）"
 
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
 msgid " tracked"
 msgstr " 已跟踪"
 
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " 过时（使用 'git remote prune' �移除）"
 
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "无效的 branch.%s.merge，�能�基到一个以上的分支"
 
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "交互��基到远程 %s"
 
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "交互��基（��并�交）到远程 %s"
 
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "�基到远程 %s"
 
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
 #, c-format
 msgid " merges with remote %s"
 msgstr " 与远程 %s �并"
 
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
 #, c-format
 msgid "merges with remote %s"
 msgstr "与远程 %s �并"
 
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    以�和远程 %s\n"
 
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
 msgid "create"
 msgstr "创建"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
 msgid "delete"
 msgstr "删除"
 
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
 msgid "up to date"
 msgstr "最新"
 
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
 msgid "fast-forwardable"
 msgstr "�快进"
 
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
 msgid "local out of date"
 msgstr "本地已过时"
 
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s 强制推�至 %-*s (%s)"
 
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s 推�至 %-*s (%s)"
 
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s 强制推�至 %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s 推�至 %s"
 
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
 msgid "do not query remotes"
 msgstr "�查询远程"
 
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
 msgstr "* 远程 %s"
 
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  获�地�：%s"
 
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
 msgid "(no URL)"
 msgstr "(æ—  URL)"
 
@@ -20485,31 +20612,31 @@ msgstr "(æ—  URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  推�地�：%s"
 
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD 分支：%s"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
 msgid "(not queried)"
 msgstr "（未查询）"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
 msgid "(unknown)"
 msgstr "（未知）"
 
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD 分支（远程 HEAD 模糊，�能是下列中的一个）：\n"
 
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
@@ -20517,155 +20644,159 @@ msgstr[0] "  远程分支：%s"
 msgstr[1] "  远程分支：%s"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
 msgid " (status not queried)"
 msgstr "（状�未查询）"
 
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  为 'git pull' �置的本地分支："
 msgstr[1] "  为 'git pull' �置的本地分支："
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  本地引用将在 'git push' 时被镜�"
 
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  为 'git push' �置的本地引用%s："
 msgstr[1] "  为 'git push' �置的本地引用%s："
 
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "根�远程设置 refs/remotes/<�称>/HEAD"
 
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "删除 refs/remotes/<�称>/HEAD"
 
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
 msgid "Cannot determine remote HEAD"
 msgstr "无法确定远程 HEAD"
 
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
 
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
 #, c-format
 msgid "Could not delete %s"
 msgstr "无法删除 %s"
 
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "�是一个有效引用：%s"
 
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
 #, c-format
 msgid "Could not setup %s"
 msgstr "�能设置 %s"
 
 #  译者：注����导空格
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s 将�为悬空状��"
 
 #  译者：注����导空格
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s 已�为悬空状��"
 
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
 #, c-format
 msgid "Pruning %s"
 msgstr "修剪 %s"
 
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [将删除] %s"
 
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [已删除] %s"
 
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
 msgid "prune remotes after fetching"
 msgstr "抓��清除远程"
 
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
 #, c-format
 msgid "No such remote '%s'"
 msgstr "没有此远程 '%s'"
 
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
 msgid "add branch"
 msgstr "添加分支"
 
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
 msgid "no remote specified"
 msgstr "未指定远程"
 
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
 msgid "query push URLs rather than fetch URLs"
 msgstr "查询推� URL 地�，而�获� URL 地�"
 
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
 msgid "return all URLs"
 msgstr "返回所有 URL 地�"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "没有给远程仓库 '%s' 设定 URL"
 
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
 msgid "manipulate push URLs"
 msgstr "�作推� URLS"
 
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
 msgid "add URL"
 msgstr "添加 URL"
 
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
 msgid "delete URLs"
 msgstr "删除 URLS"
 
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete 无�义"
 
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "无效的旧 URL 匹�模版：%s"
 
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
 #, c-format
 msgid "No such URL found: %s"
 msgstr "未找到此 URL：%s"
 
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
 msgid "Will not delete all non-push URLs"
 msgstr "将�会删除所有�推� URL 地�"
 
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "冗长输出；必须置于�命令之�"
+
+#: builtin/repack.c:28
 msgid "git repack [<options>]"
 msgstr "git repack [<选项>]"
 
-#: builtin/repack.c:31
+#: builtin/repack.c:33
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -20673,139 +20804,144 @@ msgstr ""
 "增� repack 和 bitmap 索引�兼容。  使用 --no-write-bitmap-index\n"
 "或�用 pack.writebitmaps �置。"
 
-#: builtin/repack.c:198
+#: builtin/repack.c:201
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "无法开始 pack-objects ��新打包 promisor 对象"
 
-#: builtin/repack.c:270 builtin/repack.c:630
+#: 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:294
+#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "无法完� pack-objects ��新打包 promisor 对象"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "�能打开 %s 的索引"
 
-#: builtin/repack.c:368
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr "包 %s 太大，�在几何级数中考虑"
 
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: 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:460
+#: builtin/repack.c:498
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "无法打开临时文件 %s 进行写入"
+
+#: builtin/repack.c:516
+msgid "could not close refs snapshot tempfile"
+msgstr "�能关闭引用快照临时文件"
+
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "所有内容打包到一个包文件中"
 
-#: builtin/repack.c:462
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "和 -a 相�，并将��达的对象设为�散对象"
 
-#: builtin/repack.c:465
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "删除多余的包，�行 git-prune-packed"
 
-#: builtin/repack.c:467
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "� git-pack-objects 传递�数 --no-reuse-delta"
 
-#: builtin/repack.c:469
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "� git-pack-objects 传递�数 --no-reuse-object"
 
-#: builtin/repack.c:471
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "��行 git-update-server-info"
 
-#: builtin/repack.c:474
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "� git-pack-objects 传递�数 --local"
 
-#: builtin/repack.c:476
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "写 bitmap 索引"
 
-#: builtin/repack.c:478
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "� git-pack-objects 传递�数 --delta-islands"
 
-#: builtin/repack.c:479
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "近似日期"
 
-#: builtin/repack.c:480
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
 msgstr "使用 -A，��将早于给定时间的对象过期"
 
-#: builtin/repack.c:482
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "使用 -a ，�新对��达对象打包"
 
-#: builtin/repack.c:484
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr "用于增�压缩的窗�值"
 
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "字节"
 
-#: builtin/repack.c:486
+#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "和上�的相似，但�制内存大�而��目数"
 
-#: builtin/repack.c:488
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "�制最大增�深度"
 
-#: builtin/repack.c:490
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "�制最大线程数"
 
-#: builtin/repack.c:492
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "�个包文件的最大尺寸"
 
-#: builtin/repack.c:494
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr "对标记为 .keep 的包中的对象�新打包"
 
-#: builtin/repack.c:496
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "��对该包文件�新打包"
 
-#: builtin/repack.c:498
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "使用因� <n> 查找几何级数"
 
-#: builtin/repack.c:508
+#: builtin/repack.c:670
+msgid "write a multi-pack index of the resulting packs"
+msgstr "写入结果包的多包索引"
+
+#: builtin/repack.c:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "�能删除��仓库中的打包文件"
 
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable 和 -A �兼容"
-
-#: builtin/repack.c:527
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric 和 -A�-a �兼容"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "没有新的�打包。"
 
-#: builtin/repack.c:669
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "缺少需�的文件：%s"
 
-#: builtin/repack.c:671
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "�能删除：%s"
@@ -20888,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"
@@ -20988,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 �供一个模�"
 
@@ -21060,145 +21190,137 @@ msgstr "�能为 -l �供一个模�"
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "在索引中注册干净的解决方案"
 
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "没有路径的 'git rerere forget' 已�过时"
 
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
 #, c-format
 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:83
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "您没有一个有效的 HEAD。"
 
-#: builtin/reset.c:85
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "无法找到 HEAD 指�的树。"
 
-#: builtin/reset.c:91
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "无法找到 %s 指�的树。"
 
-#: builtin/reset.c:116
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD 现在�于 %s"
 
 #  译者：汉字之间无空格，故删除%s��空格
-#: builtin/reset.c:195
+#: builtin/reset.c:299
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "在�并过程中�能�%s�置�作。"
 
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: 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:297
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "�置 HEAD 和索引"
 
-#: builtin/reset.c:298
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "��置 HEAD"
 
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr "�置 HEAD�索引和工作区"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "�置 HEAD 但�存本地�更"
 
-#: builtin/reset.c:310
+#: builtin/reset.c:411
 msgid "record only the fact that removed paths will be added later"
 msgstr "将删除的路径标记为��添加"
 
-#: builtin/reset.c:344
+#: builtin/reset.c:445
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "无法将 '%s' 解�为一个有效的版本。"
 
-#: builtin/reset.c:352
+#: builtin/reset.c:453
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "无法将 '%s' 解�为一个有效的树对象。"
 
-#: builtin/reset.c:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch 与 --{hard�mixed�soft} 选项�兼容"
-
-#: builtin/reset.c:371
+#: builtin/reset.c:472
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
 
 #  译者：汉字之间无空格，故删除%s��空格
-#: builtin/reset.c:373
+#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "�能带路径进行%s�置。"
 
 #  译者：汉字之间无空格，故删除%s��空格
-#: builtin/reset.c:388
+#: builtin/reset.c:489
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "�能对纯仓库进行%s�置"
 
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr "-N �能和 --mixed �时使用"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "�置��消暂存的�更："
 
-#: builtin/reset.c:416
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -21210,30 +21332,27 @@ msgstr ""
 "�置�，枚举未暂存�更花费了 %.2f 秒。 您�以使用 '--quiet' ��此情况。\n"
 "将�置�� reset.quiet 设置为 true �使其�为默认值。\n"
 
-#: builtin/reset.c:434
+#: builtin/reset.c:541
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "�能�置索引文件至版本 '%s'。"
 
-#: builtin/reset.c:439
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "�能写入新的索引文件。"
 
-#: builtin/rev-list.c:538
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "�能�时使用 --exclude-promisor-objects 和 --missing 选项"
-
-#: builtin/rev-list.c:599
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "对象过滤需� --objects"
 
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr "rev-list �支�显示注解"
 
-#: builtin/rev-list.c:664
-msgid "marked counting is incompatible with --objects"
-msgstr "标记计数和 --objects �兼容"
+#: builtin/rev-list.c:679
+#, 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>...]"
@@ -21251,6 +21370,18 @@ msgstr "�到第一个�选项�数��止解�"
 msgid "output in stuck long form"
 msgstr "以固定长格�输出"
 
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "输入过早结�"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr "在 `--' 分隔符之�没有给出使用方法字符串"
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "需�一个�独的版本"
+
 #: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -21265,6 +21396,50 @@ msgstr ""
 "\n"
 "�次使用时执行 \"git rev-parse --parseopt -h\" �获得更多信�。"
 
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir 需�一个�数"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "�是一个git目录 '%s'"
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "--git-path 需�一个�数"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "-n 需�一个�数"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "--path-format 需�一个�数"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "未知的 --path-format �数：%s"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "--default 需�一个�数"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "--prefix 需�一个�数"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "未知的 --abbrev-ref 模�：%s"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "未知的 --show-object-format 模�：%s"
+
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<选项>] <�交�>..."
@@ -21339,15 +21514,19 @@ msgstr "追加�交�称"
 msgid "preserve initially empty commits"
 msgstr "�留�始化的空�交"
 
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "�许�交说明为空"
+
 #: builtin/revert.c:129
 msgid "keep redundant, empty commits"
 msgstr "��多余的�空的�交"
 
-#: builtin/revert.c:237
+#: builtin/revert.c:241
 msgid "revert failed"
 msgstr "还原失败"
 
-#: builtin/revert.c:250
+#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "拣选失败"
 
@@ -21393,68 +21572,69 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "如下文件有本地修改："
 msgstr[1] "如下文件有本地修改："
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "�列出删除的文件"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "�从索引区删除"
 
-#: builtin/rm.c:246
+#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "忽略文件更新状�检查"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "�许递归删除"
 
-#: builtin/rm.c:249
+#: builtin/rm.c:250
 msgid "exit with a zero status even if nothing matched"
 msgstr "�使没有匹�，也以零状�退出"
 
-#: builtin/rm.c:283
+#: builtin/rm.c:285
 msgid "No pathspec was given. Which files should I remove?"
 msgstr "没有�供路径规格。我应该删除哪些文件？"
 
-#: builtin/rm.c:310
+#: builtin/rm.c:315
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr "请将您的修改暂存到 .gitmodules 中或贮���继续"
 
-#: builtin/rm.c:331
+#: builtin/rm.c:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "未�供 -r 选项�会递归删除 '%s'"
 
-#: builtin/rm.c:379
+#: builtin/rm.c:385
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm：�能删除 %s"
 
 #: builtin/send-pack.c:20
 msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-"  --all and explicit <ref> specification are mutually exclusive."
+"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=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
-"  --all 和明确的 <引用> 互斥。"
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [<主机>:]<目录> (--all | <引用>...)"
 
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "远程�称"
 
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "使用无状�的 RPC �议"
 
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "从标准输入读�引用"
 
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "打��自远程 helper 的状�"
 
@@ -21511,21 +21691,21 @@ msgstr "字段"
 msgid "group by field"
 msgstr "按字段分组"
 
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
 msgid "too many arguments given outside repository"
 msgstr "仓库外执行�供了太多的�数"
 
 #: builtin/show-branch.c:13
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通�符>)...]"
+"                [--current] [--color[=<何时>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<版本> | <通�符>)...]"
 
 #: builtin/show-branch.c:17
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -21538,113 +21718,108 @@ msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "忽略 %s，无法处� %d 个以上的引用"
 msgstr[1] "忽略 %s，无法处� %d 个以上的引用"
 
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
 #, c-format
 msgid "no matching refs with %s"
 msgstr "没有和 %s 匹�的引用"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
 msgid "show remote-tracking and local branches"
 msgstr "显示远程跟踪的和本地的分支"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
 msgid "show remote-tracking branches"
 msgstr "显示远程跟踪的分支"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
 msgid "color '*!+-' corresponding to the branch"
 msgstr "�色 '*!+-' 到相应的分支"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
 msgid "show <n> more commits after the common ancestor"
 msgstr "显示共�祖先�的 <n> 个�交"
 
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
 msgid "synonym to more=-1"
 msgstr "和 more=-1 �义"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
 msgid "suppress naming strings"
 msgstr "�显示字符串命�"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
 msgid "include the current branch"
 msgstr "包括当�分支"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
 msgid "name commits with their object names"
 msgstr "以对象�字命��交"
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
 msgid "show possible merge bases"
 msgstr "显示�能�并的基线"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
 msgid "show refs unreachable from any other ref"
 msgstr "显示没有任何引用的的引用"
 
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
 msgid "show commits in topological order"
 msgstr "以拓扑顺�显示�交"
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
 msgid "show only commits not on the first branch"
 msgstr "�显示�在第一个分支上的�交"
 
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
 msgid "show merges reachable from only one tip"
 msgstr "显示仅一个分支�访问的�并�交"
 
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
 msgid "topologically sort, maintaining date order where possible"
 msgstr "拓扑方�排�，并尽�能地��日期顺�"
 
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "显示从起始点开始的 <n> �最近的引用日志记录"
 
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr "--reflog 和 --all�--remotes�--independent 或 --merge-base �兼容"
-
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "未�供分支，且 HEAD 无效"
 
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
 msgid "--reflog option needs one branch name"
 msgstr "选项 --reflog 需�一个分支�"
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "一次�能显示 %d 个�目。"
 msgstr[1] "一次�能显示 %d 个�目。"
 
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
 #, c-format
 msgid "no such ref %s"
 msgstr "无此引用 %s"
 
-#: builtin/show-branch.c:831
+#: 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:835
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' �是一个有效的引用。"
 
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "�能找到�交 %s（%s）"
@@ -21709,74 +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:227
+#: builtin/sparse-checkout.c:176
+#, c-format
+msgid ""
+"directory '%s' contains untracked files, but is not in the sparse-checkout "
+"cone"
+msgstr "目录 '%s' 包括了未跟踪文件，但�在稀�检出锥中"
+
+#: builtin/sparse-checkout.c:184
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "无法删除目录 '%s'"
+
+#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
 msgstr "无法为稀�检出文件创建目录"
 
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr "无法�级仓库格�以�用 worktreeConfig"
 
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "无法设置 extensions.worktreeConfig"
 
-#: builtin/sparse-checkout.c:290
+#: 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:310
+#: 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:312
+#: 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:340
-msgid "failed to modify sparse-index config"
-msgstr "无法修改 sparse-index �置"
-
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "无法打开 '%s'"
 
-#: builtin/sparse-checkout.c:419
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr "无法规范化路径 %s"
 
-#: builtin/sparse-checkout.c:431
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <模�>)"
-
-#: builtin/sparse-checkout.c:456
+#: builtin/sparse-checkout.c:557
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "无法为 C 语言风格的字符串 '%s' 去引�"
 
-#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "无法加载现存的稀�检出模�"
 
-#: builtin/sparse-checkout.c:579
+#: 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:594
-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 | <模�"
+">)"
+
+#: 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:613
+#: builtin/sparse-checkout.c:803
 msgid "git sparse-checkout disable"
 msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:644
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "刷新工作目录时出错"
 
@@ -21800,28 +22013,28 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <分支�> [<stash>]"
 
-#: builtin/stash.c:29 builtin/stash.c:70
-msgid "git stash clear"
-msgstr "git stash clear"
-
 #: 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 builtin/stash.c:87
+#: 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
@@ -21846,6 +22059,14 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <消�>]\n"
 "          [--] [<路径规格>...]]"
 
+#: builtin/stash.c:87
+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] [<消�>]"
+
 #: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
@@ -21869,7 +22090,7 @@ msgstr "%s �是一个有效的引用�"
 msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear �支��数"
 
-#: builtin/stash.c:431
+#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -21880,166 +22101,182 @@ msgstr ""
 "            %s -> %s\n"
 "         以腾出空间。\n"
 
-#: builtin/stash.c:492
+#: builtin/stash.c:508
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "无法在�并过程中应用贮�"
 
-#: builtin/stash.c:503
+#: builtin/stash.c:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "无法生�差异 %s^!."
 
-#: builtin/stash.c:510
+#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr "索引中有冲�。�试�用 --index。"
 
-#: builtin/stash.c:516
+#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "�能�存索引树"
 
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "无法从贮��目中��未跟踪文件"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "正在�并 %s 和 %s"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "索引未从贮�中��。"
 
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "无法从贮��目中��未跟踪文件"
+
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "�试�建索引"
 
-#: builtin/stash.c:635
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "丢弃了 %s（%s）"
 
-#: builtin/stash.c:638
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s：无法丢弃贮��目"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' �是一个贮�引用"
 
-#: builtin/stash.c:701
+#: builtin/stash.c:718
 msgid "The stash entry is kept in case you need it again."
 msgstr "贮��目被�留以备您�次需�。"
 
-#: builtin/stash.c:724
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "未指定分支�"
 
-#: builtin/stash.c:808
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "无法解�树"
 
-#: builtin/stash.c:819
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "无法解包目录树"
 
-#: builtin/stash.c:839
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "在贮�中包�未跟踪文件"
 
-#: builtin/stash.c:842
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "仅显示贮�中的未跟踪文件"
 
-#: builtin/stash.c:932 builtin/stash.c:969
+#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "无法用 %2$s 更新 %1$s"
 
-#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "贮�说明"
 
-#: builtin/stash.c:960
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" 需�一个 <�交> �数"
 
-#: builtin/stash.c:1175
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "没有暂存的修改"
+
+#: builtin/stash.c:1220
 msgid "No changes selected"
 msgstr "没有选择�更"
 
-#: builtin/stash.c:1275
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "您尚未建立�始�交"
 
-#: builtin/stash.c:1302
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "无法�存当�索引状�"
 
-#: builtin/stash.c:1311
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "无法�存未跟踪文件"
 
-#: builtin/stash.c:1322 builtin/stash.c:1331
+#: builtin/stash.c:1367 builtin/stash.c:1386
 msgid "Cannot save the current worktree state"
 msgstr "无法�存当�工作区状�"
 
-#: builtin/stash.c:1359
+#: 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:1408
+#: 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:1426
+#: 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:1441
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "没有��存的本地修改"
 
-#: builtin/stash.c:1448
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "无法�始化贮�"
 
-#: builtin/stash.c:1463
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "无法�存当�状�"
 
-#: builtin/stash.c:1468
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "�存工作目录和索引状� %s"
 
-#: builtin/stash.c:1558
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "无法删除工作区�更"
 
-#: builtin/stash.c:1597 builtin/stash.c:1662
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "��索引"
 
-#: builtin/stash.c:1599 builtin/stash.c:1664
+#: 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:1600 builtin/stash.c:1665
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "�默模�"
 
-#: builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "贮�中包�未跟踪文件"
 
-#: builtin/stash.c:1604 builtin/stash.c:1669
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "包�忽略的文件"
 
-#: builtin/stash.c:1704
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -22063,40 +22300,47 @@ msgstr "跳过和移除所有的注释行"
 msgid "prepend comment character and space to each line"
 msgstr "为�一行的行首添加注释符和空格"
 
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "期望一个完整的引用�称，�得到 %s"
 
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper print-default-remote �带�数"
 
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "无法从 url '%s' 剥离一个组件"
 
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr "无法找到�置 '%s'。�定这个仓库是其自身的官方上游。"
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr "相对路径的替代锚记（anchor）"
 
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:410
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
 
-#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
-msgstr "在 .gitmodules 中未找到�模组 '%s' 的 url"
+msgstr "在 .gitmodules 中未找到�模组路径 '%s' 的 url"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:520
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "进入 '%s'\n"
 
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -22105,7 +22349,7 @@ msgstr ""
 "对 %s 执行 run_command 返回�零值。\n"
 "."
 
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:545
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -22115,223 +22359,212 @@ msgstr ""
 "在递归 %s 的�模组执行 run_command 时返回�零值。\n"
 "."
 
-#: builtin/submodule--helper.c:566
+#: builtin/submodule--helper.c:561
 msgid "suppress output of entering each submodule command"
 msgstr "抑制进入�一个�模组命令的输出"
 
-#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
-#: builtin/submodule--helper.c:1488
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
 msgid "recurse into nested submodules"
 msgstr "递归进入嵌套�模组中"
 
-#: builtin/submodule--helper.c:573
+#: builtin/submodule--helper.c:568
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
 
-#: builtin/submodule--helper.c:600
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr "无法找到�置 '%s'。�定这个仓库是其自身的官方上游。"
-
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:642
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
-msgstr "无法为�模组 '%s' 注册 url"
+msgstr "无法为�模组路径 '%s' 注册 url"
 
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:646
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "�模组 '%s'（%s）已对路径 '%s' 注册\n"
 
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:656
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "警告：建议�模组 '%s' 使用命令更新模�\n"
 
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:663
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
-msgstr "无法为�模组 '%s' 注册更新模�"
+msgstr "无法为�模组路径 '%s' 注册更新模�"
 
-#: builtin/submodule--helper.c:710
+#: builtin/submodule--helper.c:685
 msgid "suppress output for initializing a submodule"
 msgstr "抑制�模组�始化的输出"
 
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<选项>] [<路径>]"
 
-#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "在 .gitmodules 中没有�现路径 '%s' 的�模组映射"
 
-#: builtin/submodule--helper.c:836
+#: builtin/submodule--helper.c:811
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "无法解��模组 '%s' 的 HEAD 引用"
 
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
+#: 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:887 builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "抑制�模组状�输出"
 
-#: builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:863
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr "使用存储在索引中的�交，而�存储在�模组 HEAD 中的�交"
 
-#: builtin/submodule--helper.c:894
+#: builtin/submodule--helper.c:869
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
 
-#: builtin/submodule--helper.c:918
+#: builtin/submodule--helper.c:893
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <路径>"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:965
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s（数�对象）->%s（�模组）"
 
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:968
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s（�模组）->%s（数�对象）"
 
-#: builtin/submodule--helper.c:1006
+#: builtin/submodule--helper.c:981
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1056
+#: builtin/submodule--helper.c:1031
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "�能从 '%s' 创建哈希对象"
 
-#: builtin/submodule--helper.c:1060
+#: builtin/submodule--helper.c:1035
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "�外的模� %o\n"
 
-#: builtin/submodule--helper.c:1301
+#: builtin/submodule--helper.c:1276
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr "使用存储在索引中的�交，而�存储在�模组 HEAD 中的�交"
 
-#: builtin/submodule--helper.c:1303
-msgid "to compare the commit in the index with that in the submodule HEAD"
+#: builtin/submodule--helper.c:1278
+msgid "compare the commit in the index with that in the submodule HEAD"
 msgstr "比较存储在索引和�模组 HEAD 中的�交"
 
-#: builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1280
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr "跳过设置了 'ignore_config' 为 'all' 的�模组"
 
-#: builtin/submodule--helper.c:1307
+#: builtin/submodule--helper.c:1282
 msgid "limit the summary size"
 msgstr "�制总结的大�"
 
-#: builtin/submodule--helper.c:1312
+#: builtin/submodule--helper.c:1287
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [<选项>] [<�交>] [--] [<路径>]"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1311
 msgid "could not fetch a revision for HEAD"
 msgstr "�能为 HEAD 获�一个版本"
 
-#: builtin/submodule--helper.c:1341
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached 和 --files 是互斥的"
-
-#: builtin/submodule--helper.c:1408
+#: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "为 '%s' �步�模组 url\n"
 
-#: builtin/submodule--helper.c:1414
+#: builtin/submodule--helper.c:1379
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "无法为�模组路径 '%s' 注册 url"
 
-#: builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c:1393
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "无法得到�模组 '%s' 的默认远程关�"
 
-#: builtin/submodule--helper.c:1439
+#: builtin/submodule--helper.c:1404
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "无法为�模组 '%s' 更新远程关�"
 
-#: builtin/submodule--helper.c:1486
+#: builtin/submodule--helper.c:1451
 msgid "suppress output of synchronizing submodule url"
 msgstr "抑制�模组 URL �步的输出"
 
-#: builtin/submodule--helper.c:1493
+#: builtin/submodule--helper.c:1458
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
 
-#: builtin/submodule--helper.c:1547
+#: 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:1559
+#: 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:1567
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "已清除目录 '%s'\n"
 
-#: builtin/submodule--helper.c:1569
+#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "无法移除�模组工作区 '%s'\n"
 
-#: builtin/submodule--helper.c:1580
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "�能创建空的�模组目录 %s"
 
-#: builtin/submodule--helper.c:1596
+#: 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:1625
+#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr "删除�模组工作区，�使包�本地修改"
 
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "将所有�模组�消注册"
 
-#: builtin/submodule--helper.c:1631
+#: 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:1645
+#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "如果您确实想�对所有�模组执行�消�始化，请使用 '--all'"
 
-#: builtin/submodule--helper.c:1714
+#: 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"
@@ -22343,46 +22576,67 @@ msgstr ""
 "Git �使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而�\n"
 "'--reference' �克隆。"
 
-#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756
+#: 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:1792
+#: builtin/submodule--helper.c:1740
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "�能识别 submodule.alternateErrorStrategy 的�值 '%s'"
 
-#: builtin/submodule--helper.c:1799
+#: builtin/submodule--helper.c:1747
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
-msgstr "�能识别 submodule.alternateLocaion 的�值 '%s'"
+msgstr "�能识别 submodule.alternateLocation 的�值 '%s'"
+
+#: 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:1813
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "无法克隆 '%s' 到�模组路径 '%s'"
+
+#: builtin/submodule--helper.c:1818
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "目录�空：'%s'"
+
+#: builtin/submodule--helper.c:1830
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "无法得到 '%s' 的�模组目录"
 
-#: builtin/submodule--helper.c:1823
+#: builtin/submodule--helper.c:1862
 msgid "where the new submodule will be cloned to"
 msgstr "新的�模组将�克隆的路径"
 
-#: builtin/submodule--helper.c:1826
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "新�模组的�称"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr "克隆�模组的 url 地�"
 
-#: builtin/submodule--helper.c:1837
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "浅克隆的深度"
 
-#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr "强制显示克隆进度"
 
-#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr "��许克隆到一个�空目录"
 
-#: builtin/submodule--helper.c:1849
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22391,186 +22645,356 @@ msgstr ""
 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
 "[--name <�字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>"
 
-#: builtin/submodule--helper.c:1874
-#, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr "拒�在�一个�模组的 git dir 中创建/使用 '%s'"
-
-#: builtin/submodule--helper.c:1885
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "无法克隆 '%s' 到�模组路径 '%s'"
-
-#: builtin/submodule--helper.c:1889
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "目录�空：'%s'"
-
-#: builtin/submodule--helper.c:1901
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "无法得到 '%s' 的�模组目录"
-
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:1925
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
-msgstr "�模组 '%2$s' 的更新模� '%1$s' 无效"
+msgstr "�模组路径 '%2$s' 的更新模� '%1$s' 无效"
 
-#: builtin/submodule--helper.c:1941
+#: builtin/submodule--helper.c:1929
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
-msgstr "为�模组 '%2$s' �置的更新模� '%1$s' 无效"
+msgstr "为�模组路径 '%2$s' �置的更新模� '%1$s' 无效"
 
-#: builtin/submodule--helper.c:2042
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
-msgstr "�模组 '%s' 尚未�始化"
+msgstr "�模组路径 '%s' 尚未�始化"
 
-#: builtin/submodule--helper.c:2046
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "也许您想�执行 'update --init'？"
 
-#: builtin/submodule--helper.c:2076
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "略过未�并的�模组 %s"
 
-#: builtin/submodule--helper.c:2105
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "略过�模组 '%s'"
 
-#: builtin/submodule--helper.c:2255
+#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "克隆 '%s' 失败。按计划�试"
 
-#: builtin/submodule--helper.c:2266
+#: builtin/submodule--helper.c:2268
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "第二次�试克隆 '%s' 失败，退出"
 
-#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574
+#: 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:2377
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "无法在�模组路径 '%2$s' 中�基 '%1$s'"
+
+#: 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:2385
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "在�模组路径 '%3$s' 中执行 '%1$s %2$s' 失败"
+
+#: builtin/submodule--helper.c:2409
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "�模组路径 '%s'：检出 '%s'\n"
+
+#: builtin/submodule--helper.c:2413
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "�模组路径 '%s'：�基至 '%s'\n"
+
+#: builtin/submodule--helper.c:2417
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "�模组路径 '%s'：�并入 '%s'\n"
+
+#: builtin/submodule--helper.c:2421
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "�模组路径 '%s'：'%s %s'\n"
+
+#: 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: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:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
 msgid "path into the working tree"
 msgstr "到工作区的路径"
 
-#: builtin/submodule--helper.c:2331
+#: 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:2335
+#: 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:2341
+#: builtin/submodule--helper.c:2518
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/submodule--helper.c:2344
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "并�任务"
 
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2523
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "�始克隆是�应该�守推�的浅克隆选项"
 
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "��输出克隆进度"
 
-#: builtin/submodule--helper.c:2358
+#: 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:2371
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "update �数�值错误"
 
-#: builtin/submodule--helper.c:2419
+#: builtin/submodule--helper.c:2566
+msgid "suppress output for update by rebase or merge"
+msgstr "抑制�基或�并更新的输出"
+
+#: builtin/submodule--helper.c:2567
+msgid "force checkout updates"
+msgstr "强制检出更新"
+
+#: builtin/submodule--helper.c:2569
+msgid "don't fetch new objects from the remote site"
+msgstr "��从远程地�获�新对象"
+
+#: builtin/submodule--helper.c:2571
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr "当仓库是新的克隆时，覆盖更新模�"
+
+#: builtin/submodule--helper.c:2572
+msgid "depth for shallow fetch"
+msgstr "浅获�的深度"
+
+#: builtin/submodule--helper.c:2582
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2583
+msgid "SHA1 expected by superproject"
+msgstr "上层项目期待的 SHA1"
+
+#: builtin/submodule--helper.c:2585
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2586
+msgid "SHA1 of submodule's HEAD"
+msgstr "�模�头指针的 SHA1"
+
+#: 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: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:2542
+#: builtin/submodule--helper.c:2781
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "无法获得�模组 '%s' 的仓库�柄"
 
-#: builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "在�模组中递归"
 
-#: builtin/submodule--helper.c:2581
+#: 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:2637
+#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "检查写入 .gitmodules 文件是�安全"
 
-#: builtin/submodule--helper.c:2640
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr "�消 .gitmodules 文件中的设置"
 
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <�称> [<值>]"
 
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <�称>"
 
-#: builtin/submodule--helper.c:2647
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2666 git-submodule.sh:150
-#, sh-format
+#: 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:2682
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr "抑制设置�模组 URL 的输出"
 
-#: builtin/submodule--helper.c:2686
+#: 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:2719
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr "设置默认跟踪分支为 master"
 
-#: builtin/submodule--helper.c:2721
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "设置默认跟踪分支"
 
-#: builtin/submodule--helper.c:2725
+#: 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:2726
+#: 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:2733
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "需� --branch 或 --default"
 
-#: builtin/submodule--helper.c:2736
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch 和 --default 是互斥的"
+#: builtin/submodule--helper.c:3038
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "�索引中添加�于 '%s' 的已存在的仓库\n"
+
+#: 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:3054
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):\n"
+msgstr "�现一个本地 git 目录 '%s' �其远程仓库：\n"
 
-#: builtin/submodule--helper.c:2793 git.c:449 git.c:724
+#: 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 ""
+"如果您想��用这个本地 git 目录而��新克隆自\n"
+"  %s\n"
+"使用 '--force' 选项。如果本地 git 目录�是正确的仓库，或者如果您�确定这里\n"
+"的�义，使用 '--name' 选项指定�外的�称。"
+
+#: builtin/submodule--helper.c:3073
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "为�模组 '%s' �新激活本地 git 目录\n"
+
+#: builtin/submodule--helper.c:3110
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "无法检出�模组 '%s'"
+
+#: builtin/submodule--helper.c:3149
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "无法添加�模组 '%s'"
+
+#: 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:3222
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "'%s' 已�存在于索引中"
+
+#: 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:3254
+msgid "branch of repository to add as submodule"
+msgstr "�添加为�模组的仓库的分支"
+
+#: builtin/submodule--helper.c:3255
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "�许添加一个被忽略的�模组路径"
+
+#: builtin/submodule--helper.c:3257
+msgid "print only error messages"
+msgstr "�打�错误消�"
+
+#: builtin/submodule--helper.c:3261
+msgid "borrow the objects from reference repositories"
+msgstr "从引用仓库中借用对象"
+
+#: 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:3270
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<选项>] [--] <仓库> [<路径>]"
+
+#: builtin/submodule--helper.c:3298
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "�能在工作区的顶级目录中使用相对路径"
+
+#: builtin/submodule--helper.c:3306
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "仓库 URL：'%s' 必须是�对路径或以 ./|../ 起始"
+
+#: builtin/submodule--helper.c:3341
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "'%s' �是一个有效的�模组�称"
+
+#: 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:2799
+#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' �是一个有效的 submodule--helper �命令"
@@ -22595,21 +23019,21 @@ msgstr "删除符�引用"
 msgid "shorten ref output"
 msgstr "缩短引用输出"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "原因"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr "更新的原因"
 
 #: builtin/tag.c:25
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+"        <tagname> [<head>]"
 msgstr ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <消�> | -F <文件>]\n"
-"\t\t<标签�> [<头>]"
+"        <标签�> [<头>]"
 
 #: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
@@ -22619,12 +23043,12 @@ msgstr "git tag -d <标签�>..."
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
 "[<pattern>...]"
 msgstr ""
 "git tag -l [-n[<数字>]] [--contains <�交>] [--no-contains <�交>] [--points-"
 "at <对象>]\n"
-"\t\t[--format=<格�>] [--merged <�交>] [--no-merged <�交>] [<模�>...]"
+"        [--format=<格�>] [--merged <�交>] [--no-merged <�交>] [<模�>...]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
@@ -22667,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"
@@ -22684,134 +23108,111 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c:274
 msgid "bad object type."
 msgstr "�的对象类型。"
 
-#: builtin/tag.c:328
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "无标签说明？"
 
-#: builtin/tag.c:335
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "标签说明被�留在 %s\n"
 
-#: builtin/tag.c:446
+#: builtin/tag.c:444
 msgid "list tag names"
 msgstr "列出标签�称"
 
-#: builtin/tag.c:448
+#: builtin/tag.c:446
 msgid "print <n> lines of each tag message"
 msgstr "�个标签信�打� <n> 行"
 
-#: builtin/tag.c:450
+#: builtin/tag.c:448
 msgid "delete tags"
 msgstr "删除标签"
 
-#: builtin/tag.c:451
+#: builtin/tag.c:449
 msgid "verify tags"
 msgstr "验�标签"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:451
 msgid "Tag creation options"
 msgstr "标签创建选项"
 
-#: builtin/tag.c:455
+#: builtin/tag.c:453
 msgid "annotated tag, needs a message"
 msgstr "附注标签，需�一个说明"
 
-#: builtin/tag.c:457
+#: builtin/tag.c:455
 msgid "tag message"
 msgstr "标签说明"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:457
 msgid "force edit of tag message"
 msgstr "强制编辑标签说明"
 
-#: builtin/tag.c:460
+#: builtin/tag.c:458
 msgid "annotated and GPG-signed tag"
 msgstr "附注并附加 GPG 签�的标签"
 
-#: builtin/tag.c:463
+#: builtin/tag.c:461
 msgid "use another key to sign the tag"
 msgstr "使用�外的�钥签�该标签"
 
-#: builtin/tag.c:464
+#: builtin/tag.c:462
 msgid "replace the tag if exists"
 msgstr "如果存在，替�现有的标签"
 
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "创建引用日志"
 
-#: builtin/tag.c:467
+#: builtin/tag.c:465
 msgid "Tag listing options"
 msgstr "标签列表选项"
 
-#: builtin/tag.c:468
+#: builtin/tag.c:466
 msgid "show tag list in columns"
 msgstr "以列的方�显示标签列表"
 
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
 msgid "print only tags that contain the commit"
 msgstr "�打�包�该�交的标签"
 
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that don't contain the commit"
 msgstr "�打��包�该�交的标签"
 
-#: builtin/tag.c:473
+#: builtin/tag.c:471
 msgid "print only tags that are merged"
 msgstr "�打�已��并的标签"
 
-#: builtin/tag.c:474
+#: builtin/tag.c:472
 msgid "print only tags that are not merged"
 msgstr "�打�尚未�并的标签"
 
-#: builtin/tag.c:478
+#: builtin/tag.c:476
 msgid "print only tags of the object"
 msgstr "�打�指�该对象的标签"
 
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column 和 -n �兼容"
-
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "-n 选项��许用在列表显示模�"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "--contains 选项��许用在列表显示模�"
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "--no-contains 选项��许用在列表显示模�"
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "--points-at 选项��许用在列表显示模�"
-
-#: builtin/tag.c:556
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "--merged 和 --no-merged 选项��许用在列表显示模�"
-
-#: builtin/tag.c:567
-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:592
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' �是一个有效的标签�称。"
 
-#: builtin/tag.c:597
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "标签 '%s' 已存在"
 
-#: builtin/tag.c:628
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "已更新标签 '%s'（曾为 %s）\n"
@@ -22823,211 +23224,206 @@ msgstr "展开对象中"
 #: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
-msgstr "创建目录 %s 失败"
-
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "创建文件 %s 失败"
+msgstr "无法创建目录 %s"
 
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
-msgstr "删除文件 %s 失败"
+msgstr "无法删除文件 %s"
 
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: 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:140
+#: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "在 '%s' 中测试 mtime "
 
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
 msgstr "添加一个新文件�，目录的状�信�未改�"
 
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
 msgid "directory stat info does not change after adding a new directory"
 msgstr "添加一个新目录�，目录的状�信�未改�"
 
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
 msgid "directory stat info changes after updating a file"
 msgstr "更新一个文件�，目录的状�信�被修改"
 
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr "在�目录中添加文件�，目录的状�信�被修改"
 
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
 msgid "directory stat info does not change after deleting a file"
 msgstr "删除一个文件�，目录的状�信�未改�"
 
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
 msgid "directory stat info does not change after deleting a directory"
 msgstr "删除一个目录�，目录的状�信�未改�"
 
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<选项>] [--] [<文件>...]"
 
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr "当索引需�更新时继续刷新"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "刷新：忽略�模组"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "�忽略新的文件"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "让文件替�目录（�之亦然）"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "通知文件从工作区丢失"
 
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "�使索引区包�未�并的�目也执行刷新"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "刷新统计信�"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<存�模�>,<对象>,<路径>"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "添加指定的�目到索引区"
 
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "把文件标记为 \"没有�更\""
 
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "清除 assumed-unchanged �"
 
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "把文件标记为 \"仅索引\""
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "清除 skip-worktree �"
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
 msgid "do not touch index-only entries"
 msgstr "��触碰仅索引�目"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr "�添加到索引区；�添加对象到对象库"
 
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr "�使存在工作区里，也删除路径"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "�带 --stdin：输入的行以 null 字符终止"
 
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "从标准输入中读�需�更新的路径列表"
 
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "从标准输入添加�目到索引区"
 
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "为指定文件�新生�第2和第3暂存区"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "�更新与 HEAD ��的�目"
 
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "忽略工作区丢失的文件"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "在标准输出显示�作"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(for porcelains) 忘记�存的未解决的冲�"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "以这�格�写入索引区"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "�用或�用索引拆分"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "�用/�用对未跟踪文件的缓存"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "测试文件系统是�支�未跟踪文件缓存"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "无需检测文件系统，�用对未跟踪文件的缓存"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "�使没有被标记为已更改，也�写出索引"
 
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "�用或�用文件系统监控"
 
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "标记文件为 fsmonitor 有效"
 
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "清除 fsmonitor 有效�"
 
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr ""
 "core.splitIndex 被设置为 false。如果您确实��用索引拆分，请删除或修改它。"
 
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr ""
 "core.splitIndex 被设置为 true。如果您确实��用索引拆分，请删除或修改它。"
 
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -23035,11 +23431,11 @@ msgstr ""
 "core.untrackedCache 被设置为 true。如果您确实��用未跟踪文件缓存，请删除或修"
 "改它。"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "缓存未跟踪文件被�用"
 
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -23047,25 +23443,25 @@ msgstr ""
 "core.untrackedCache 被设置为 false。如果您确实��用未跟踪文件缓存，请删除或"
 "修改它。"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "缓存未跟踪文件在 '%s' �用"
 
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr "core.fsmonitor 未设置；如果想��用 fsmonitor 请设置该选项"
 
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "fsmonitor 被�用"
 
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr "core.fsmonitor 已设置；如果想��用 fsmonitor 请移除该选项"
 
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "fsmonitor 被�用"
 
@@ -23081,19 +23477,19 @@ msgstr "git update-ref [<选项>]    <引用�> <新值> [<旧值>]"
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<选项>] --stdin [-z]"
 
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "删除引用"
 
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
 msgstr "更新 <引用�> 本身而�是它指�的引用"
 
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "标准输入有以 NUL 字符终止的�数"
 
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "从标准输入读�更新"
 
@@ -23109,19 +23505,19 @@ msgstr "从头开始更新文件信�"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<选项>] <目录>"
 
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
 msgid "quit after a single request/response exchange"
 msgstr "在一次�独的请求/�应之�退出"
 
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "在�始的引用广告�立�退出"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "为 git-http-backend �供 info/refs"
 
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "如果 <目录> �是一个 Git 目录，���试 <目录>/.git/"
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "�活动 <n> 秒钟�终止传输"
 
@@ -23157,63 +23553,58 @@ msgstr "git verify-tag [-v | --verbose] [--format=<格�>] <标签>..."
 msgid "print tag contents"
 msgstr "打�标签内容"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<选项>] <路径> [<�交>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<选项>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<选项>] <路径>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <工作区> <新路径>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<选项>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<选项>] <工作区>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <路径>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:935
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "删除 '%s' 失败"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "删除 %s/%s: %s"
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
 msgid "report pruned working trees"
 msgstr "报告清除的工作区"
 
-#: builtin/worktree.c:151
+#: builtin/worktree.c:150
 msgid "expire working trees older than <time>"
 msgstr "将早于 <时间> 的工作区过期"
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c:220
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' 已�存在"
 
-#: builtin/worktree.c:230
+#: builtin/worktree.c:229
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "无法使用的工作区目标 '%s'"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -23222,7 +23613,7 @@ msgstr ""
 "'%s' 是一个丢失但�定的工作区，\n"
 "使用 '%s -f -f' 覆盖，或用 'unlock' 和 'prune' 或 'remove' 清除"
 
-#: builtin/worktree.c:237
+#: builtin/worktree.c:236
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -23231,27 +23622,31 @@ msgstr ""
 "'%s' 是一个丢失但已�注册的工作区，\n"
 "使用 '%s -f' 覆盖，或用 'prune' 或 'remove' 清除"
 
-#: builtin/worktree.c:288
+#: builtin/worktree.c:287
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "�能创建目录 '%s'"
 
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+msgid "initializing"
+msgstr "�始化"
+
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "准备工作区（新分支 '%s'）"
 
-#: builtin/worktree.c:424
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "准备工作区（�置分支 '%s'，之�为 %s）"
 
-#: builtin/worktree.c:433
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "准备工作区（检出 '%s'）"
 
-#: builtin/worktree.c:439
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "准备工作区（分离头指针 %s）"
@@ -23276,82 +23671,78 @@ msgstr "生�新的工作区"
 msgid "keep the new working tree locked"
 msgstr "�定新工作区"
 
-#: builtin/worktree.c:493
+#: builtin/worktree.c:492 builtin/worktree.c:729
+msgid "reason for locking"
+msgstr "�定原因"
+
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "设置跟踪模�（�� git-branch(1)）"
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "�试为新分支�匹�一个远程跟踪分支"
 
-#: builtin/worktree.c:504
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b�-B 和 --detach 是互斥的"
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "由 --lock 添加"
 
-#: builtin/worktree.c:565
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "�能在创建新分支时使用选项 --[no-]track "
 
-#: builtin/worktree.c:682
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr "显示扩展的注释和原因（如果有）"
 
-#: builtin/worktree.c:684
+#: builtin/worktree.c:693
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr "�早于 <时间> 的工作区添添加“�修剪�注释"
 
-#: builtin/worktree.c:693
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose 和 --porcelain 互斥"
-
-#: builtin/worktree.c:720
-msgid "reason for locking"
-msgstr "�定原因"
-
-#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
-#: builtin/worktree.c:963
+#: 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:734 builtin/worktree.c:767
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "主工作区无法被加�或解�"
 
-#: builtin/worktree.c:739
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' 已被�定，原因：%s"
 
-#: builtin/worktree.c:741
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' 已被�定"
 
-#: builtin/worktree.c:769
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' 未被�定"
 
-#: builtin/worktree.c:810
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "�能移动或删除包��模组的工作区"
 
-#: builtin/worktree.c:818
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr "强制移动，�使工作区是�的或已�定"
 
-#: builtin/worktree.c:841 builtin/worktree.c:965
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' 是一个主工作区"
 
-#: builtin/worktree.c:846
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "无法从 '%s' 算出目标�称"
 
-#: builtin/worktree.c:859
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -23360,7 +23751,7 @@ msgstr ""
 "无法移动一个�定的工作区，�定原因：%s\n"
 "使用 'move -f -f' 覆盖或先解�"
 
-#: builtin/worktree.c:861
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -23368,36 +23759,36 @@ msgstr ""
 "无法移动一个�定的工作区，\n"
 "使用 'move -f -f' 覆盖或先解�"
 
-#: builtin/worktree.c:864
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "验�失败，无法移动工作区：%s"
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
-msgstr "移动 '%s' 到 '%s' 失败"
+msgstr "无法移动 '%s' 到 '%s'"
 
-#: builtin/worktree.c:915
+#: 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:919
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr "'%s' 包�修改或未跟踪的文件，使用 --force 删除"
 
-#: builtin/worktree.c:924
+#: 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:947
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr "强制删除，�使工作区是�的或已�定"
 
-#: builtin/worktree.c:970
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -23406,7 +23797,7 @@ msgstr ""
 "无法删除一个�定的工作区，�定原因：%s\n"
 "使用 'remove -f -f' 覆盖或先解�"
 
-#: builtin/worktree.c:972
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -23414,17 +23805,17 @@ msgstr ""
 "无法删除一个�定的工作区，\n"
 "使用 'remove -f -f' 覆盖或先解�"
 
-#: builtin/worktree.c:975
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "验�失败，无法删除工作区：%s"
 
-#: builtin/worktree.c:999
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "修�：%s：%s"
 
-#: builtin/worktree.c:1002
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "错误：%s：%s"
@@ -23475,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"
@@ -23505,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"
@@ -23539,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:833
+#: git.c:835
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "检测到别�循环：'%s'的扩展未终止：%s"
 
-#: git.c:883
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "�能作为内置命令处� %s"
 
-#: git.c:896
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -23570,33 +23951,25 @@ msgstr ""
 "用法：%s\n"
 "\n"
 
-#: git.c:916
+#: 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:928
+#: 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 "未处�的选项"
@@ -23620,149 +23993,113 @@ msgstr "test-tool serve-v2 [<选项>]"
 
 #: t/helper/test-serve-v2.c:19
 msgid "exit immediately after advertising capabilities"
-msgstr "对能力广告之�立�退出"
-
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "套接字/管�已在使用：'%s'"
+msgstr "通告能力之�立�退出"
 
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "�能�动�务于：'%s'"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "无法在��生�守护进程"
-
-#: t/helper/test-simple-ipc.c:356
-msgid "waitpid failed"
-msgstr "waitpid 失败"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "守护进程尚未上线"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "守护进程无法�动"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr "waitpid 迷惑了"
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "守护进程尚未关闭"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
 msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
 msgstr "test-helper simple-ipc is-active    [<�字>] [<选项>]"
 
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
 msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
 msgstr "test-helper simple-ipc run-daemon   [<�字>] [<线程>]"
 
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
 msgstr "test-helper simple-ipc start-daemon [<�字>] [<线程>] [<最大等待>]"
 
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
 msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
 msgstr "test-helper simple-ipc stop-daemon  [<�字>] [<最大等待>]"
 
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
 msgid "test-helper simple-ipc send         [<name>] [<token>]"
 msgstr "test-helper simple-ipc send         [<�字>] [<令牌>]"
 
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
 msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
 msgstr "test-helper simple-ipc sendbytes    [<�字>] [<字节数>] [<字节>]"
 
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
 msgid ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
-msgstr "test-helper simple-ipc multiple     [<�字>] [<线程>] [<字节计数>] [<批处�大�>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<�字>] [<线程>] [<字节计数>] [<批处�大"
+"å°�>]"
 
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
 msgid "name or pathname of unix domain socket"
 msgstr "unix 域套接字的�称或路径�"
 
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
 msgid "named-pipe name"
 msgstr "命�管�的�字"
 
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
 msgid "number of threads in server thread pool"
 msgstr "�务器线程池中的线程数"
 
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
 msgid "seconds to wait for daemon to start or stop"
 msgstr "等待守护进程�动或�止的秒数"
 
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
 msgid "number of bytes"
 msgstr "字节数目"
 
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
 msgid "number of requests per thread"
 msgstr "�个线程的请求数"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "byte"
 msgstr "字节"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "ballast character"
 msgstr "ballast character"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "token"
 msgstr "令牌"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "command token to send to the server"
 msgstr "��到�务器的命令令牌"
 
-#: http.c:399
+#: http.c:350
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "http.postbuffer 为负值，默认为 %d"
 
-#: http.c:420
+#: http.c:371
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "�支�委托控制，因为 cURL < 7.22.0"
 
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "�支�公钥文件�定，因为 cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "�支�公钥文件�定，因为 cURL < 7.39.0"
 
-#: http.c:910
+#: http.c:812
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "�支� CURLSSLOPT_NO_REVOKE，因为 cURL < 7.44.0"
 
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "�支��议�制，因为 cURL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "�支�的 SSL �端 '%s'。支�的 SSL �端："
 
-#: http.c:1139
+#: http.c:1023
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr "无法设置 SSL �端为 '%s'：cURL: cURL 没有使用 SSL �端构建"
 
-#: http.c:1143
+#: http.c:1027
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "无法将 SSL �端设置为 '%s'：已�设置"
 
-#: http.c:2035
+#: http.c:1876
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -23778,133 +24115,307 @@ msgstr ""
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "在 push-option �值中无效的引�：'%s'"
 
-#: remote-curl.c:307
+#: remote-curl.c:304
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs 无效：这是 git 仓库么？"
 
-#: remote-curl.c:408
+#: remote-curl.c:405
 msgid "invalid server response; expected service, got flush packet"
 msgstr "无效的�务端�应。预期�务，得到 flush 包"
 
-#: remote-curl.c:439
+#: remote-curl.c:436
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "无效的�务端�应，得到 '%s'"
 
-#: remote-curl.c:499
+#: remote-curl.c:496
 #, c-format
 msgid "repository '%s' not found"
 msgstr "仓库 '%s' 未找到"
 
-#: remote-curl.c:503
+#: remote-curl.c:500
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "'%s' 鉴�失败"
 
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "无法以 http.pinnedPubkey 设置访问 '%s'：%s"
+
+#: remote-curl.c:508
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "无法访问 '%s'：%s"
 
-#: remote-curl.c:513
+#: remote-curl.c:514
 #, c-format
 msgid "redirecting to %s"
 msgstr "�定�到 %s"
 
-#: remote-curl.c:642
+#: remote-curl.c:645
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "当没有设置温和处�文件结�符（EOF）时，�应该有文件结�符"
 
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr "远程�务器��了无状�分隔符"
+#: remote-curl.c:657
+msgid "remote server sent unexpected response end packet"
+msgstr "远程�务器���外的�应结�数�包"
 
-#: remote-curl.c:724
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr "无法倒回 rpc post 数� - �试增加 http.postBuffer"
 
-#: remote-curl.c:754
+#: remote-curl.c:755
 #, c-format
 msgid "remote-curl: bad line length character: %.4s"
 msgstr "remote-curl：错误的行宽字符：%.4s"
 
-#: remote-curl.c:756
+#: remote-curl.c:757
 msgid "remote-curl: unexpected response end packet"
 msgstr "remote-curl：�外�应结�包"
 
-#: remote-curl.c:832
+#: remote-curl.c:833
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC 失败。%s"
 
-#: remote-curl.c:872
+#: remote-curl.c:873
 msgid "cannot handle pushes this big"
 msgstr "�能处�这么大的推�"
 
-#: remote-curl.c:987
+#: remote-curl.c:986
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "�能压缩请求，zlib 压缩错误 %d"
 
-#: remote-curl.c:991
+#: remote-curl.c:990
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "�能压缩请求，zlib 结�错误 %d"
 
-#: remote-curl.c:1041
+#: remote-curl.c:1040
 #, c-format
 msgid "%d bytes of length header were received"
 msgstr "收到了 %d 字节长度的头信�"
 
-#: remote-curl.c:1043
+#: remote-curl.c:1042
 #, c-format
 msgid "%d bytes of body are still expected"
 msgstr "预期�然需� %d 个字节的正文"
 
-#: remote-curl.c:1132
+#: remote-curl.c:1131
 msgid "dumb http transport does not support shallow capabilities"
-msgstr "哑 http 传输�支� shalllow 能力"
+msgstr "哑 http 传输�支�浅克隆能力"
 
-#: remote-curl.c:1147
+#: remote-curl.c:1146
 msgid "fetch failed."
 msgstr "获�失败。"
 
-#: remote-curl.c:1193
+#: remote-curl.c:1192
 msgid "cannot fetch by sha1 over smart http"
 msgstr "无法通过智能 HTTP 获� sha1"
 
-#: remote-curl.c:1237 remote-curl.c:1243
+#: remote-curl.c:1236 remote-curl.c:1242
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "�议错误：期望 sha/ref，�得到 '%s'"
 
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1254 remote-curl.c:1372
 #, c-format
 msgid "http transport does not support %s"
 msgstr "http 传输�议�支� %s"
 
-#: remote-curl.c:1291
+#: remote-curl.c:1290
 msgid "git-http-push failed"
 msgstr "git-http-push 失败"
 
-#: remote-curl.c:1479
+#: remote-curl.c:1478
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl：用法：git remote-curl <远程> [<url>]"
 
-#: remote-curl.c:1511
+#: remote-curl.c:1510
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl：错误读��自 git 的命令�"
 
-#: remote-curl.c:1518
+#: remote-curl.c:1517
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl：�试没有本地仓库下获�"
 
-#: remote-curl.c:1559
+#: remote-curl.c:1558
 #, c-format
 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"
@@ -23921,11 +24432,11 @@ msgstr "�数"
 msgid "object filtering"
 msgstr "对象过滤"
 
-#: parse-options.h:184
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "到期时间"
 
-#: parse-options.h:198
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "空�作（��兼容）"
 
@@ -23954,11 +24465,11 @@ msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr "使用 --pathspec-from-file，路径表达�用空字符分隔"
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "key"
 msgstr "key"
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "排�的字段�"
 
@@ -24027,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 "查找尚未应用到上游的�交"
@@ -24100,7 +24611,7 @@ msgstr "将一个�交导出到 CVS 检出中"
 
 #: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
-msgstr "从�外一个人们爱�的�置管�系统中拯救你的数�"
+msgstr "从�外一个人们爱�的�置管�系统中拯救您的数�"
 
 #: command-list.h:84
 msgid "A CVS server emulator for Git"
@@ -24231,453 +24742,418 @@ 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"
 msgstr "Git 推�的工作�概览"
 
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "二分查找�行失败：没有�供命令。"
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "�行 $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"二分查找�行失败：\n"
-"命令 '$command' 的退出� $res �于 0 或大于等于 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "二分查找�能继续�行"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"二分查找�行失败：\n"
-"'bisect-state $state' 退出�为 $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "二分查找�行�功"
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -24716,529 +25192,66 @@ msgstr "�试和 $pretty_name 的简��并"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "简��并未生效，�试自动�并。"
 
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr "�能在工作区的顶级目录中使用相对路径"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "仓库 URL：'$repo' 必须是�对路径或以 ./|../ 起始"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' 已�存在于索引中"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' 已�存在于索引中且�是一个�模组"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' 没有检出的�交"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "添加�于 '$sm_path' 的现存仓库到索引"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "'$sm_path' 已存在且�是一个有效的 git 仓库"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr "本地�现 '$sm_name' 的一个 git 目录，与其对应的远程仓库："
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-"  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"如果您想��用这个本地 git 目录而��新克隆自\n"
-"  $realrepo\n"
-"使用 '--force' 选项。如果本地 git 目录�是正确的仓库\n"
-"或者您�确定这里的�义，使用 '--name' 选项选择�外的�称。"
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "激活本地 git 目录到�模组 '$sm_name'。"
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "�能检出�模组 '$sm_path'"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "无法添加�模组 '$sm_path'"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "无法注册�模组 '$sm_path'"
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中找到当�版本"
 
-#: git-submodule.sh:578
+#: git-submodule.sh:411
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "无法在�模组路径 '$sm_path' 中获�"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:416
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr "无法在�模组路径 '$sm_path' 中找到当�版本 ${remote_name}/${branch}"
 
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr "无法在�模组路径 '$displaypath' 中获�，�试直接获� $sha1："
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"获�了�模组路径 '$displaypath'，但是它没有包� $sha1。直接获�该�交失败。"
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "无法在�模组路径 '$displaypath' 中检出 '$sha1'"
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "�模组路径 '$displaypath'：检出 '$sha1'"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "无法在�模组路径 '$displaypath' 中�基 '$sha1'"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "�模组路径 '$displaypath'：�基至 '$sha1'"
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "无法�并 '$sha1' 到�模组路径 '$displaypath' 中"
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "�模组路径 '$displaypath'：已�并入 '$sha1'"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr "在�模组 '$displaypath' 中执行 '$command $sha1' 失败"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "�模组 '$displaypath'：'$command $sha1'"
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "无法递归进�模组路径 '$displaypath'"
 
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "已应用 autostash。"
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "�能存储 $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "�基中（$new_count/$total）"
-
-#: git-rebase--preserve-merges.sh:197
-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"
-
-#: git-rebase--preserve-merges.sh:260
-#, 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"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1：�是一个�以被拣选的�交"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "无效的�交�：$sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "�能写入当��交的替代 sha1"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "快进到 $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "�能快进到 $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "�能移动 HEAD 到 $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "拒�挤压一个�并：$sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "无法���并 $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "�能拣选 $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "这是�交说明 #${n}："
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "�交说明 #${n} 将被跳过："
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "这是一个 $count 个�交的组�。"
-msgstr[1] "这是一个 $count 个�交的组�。"
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "�能写入 $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "这是一个 2 个�交的组�。"
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "�能应用 $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, 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"
-"钩�执行失败，你�能需�在�写�交说明�解决这个问题。"
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "�止在 $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "没有父�交的情况下�能 '$squash_style'"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "执行：$rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "执行失败：$rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "并且修改索引和/或工作区"
-
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"您�以解决这个问题，然��行\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, 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"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "未知命令：$command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "�修改请使用命令 'git rebase --edit-todo'。"
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "�功�基并更新 $head_name。"
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "�能删除 CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, 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"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "在修补�交中查找作者信�时�到错误"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"您的工作区中有未�交的�更。请先�交然��次�行 'git rebase --continue'。"
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "�能�交暂存的修改。"
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "无法�行编辑器"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "�能检出 $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "没有 HEAD？"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "�能创建临时 $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "�能标记为交互�"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "�基 $shortrevisions 到 $shortonto（$todocount 个�交）"
-msgstr[1] "�基 $shortrevisions 到 $shortonto（$todocount 个�交）"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "注�空�交已被注释掉"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "�能对�写�交进行�始化"
-
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 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
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "�能�基：您有未暂存的�更。"
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr "�能�写分支：您有未暂存的�更。"
 
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "无法通过�基方�拉�：您有未暂存的�更。"
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "�能 $action：您有未暂存的�更。"
 
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "�能�基：您的索引中包�未�交的�更。"
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "无法通过�基方�拉�：您的索引中包�未�交的�更。"
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr "�能 $action：您的索引中包�未�交的�更。"
 
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "而且您的索引中包�未�交的�更。"
 
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr "您需�在工作区的顶级目录中�行这个命令。"
 
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr "�能确定 git 目录的�对路径"
 
@@ -25290,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
@@ -25310,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"
@@ -25324,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"
@@ -25338,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"
@@ -25352,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"
@@ -25366,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"
@@ -25380,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"
@@ -25394,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"
@@ -25408,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"
@@ -25422,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"
@@ -25444,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"
@@ -25544,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:138
+#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "本地时间和 GMT 有�到一分钟间隔\n"
 
-#: git-send-email.perl:145 git-send-email.perl:151
+#: 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:222
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "致命错误：命令 '%s' 已终止，退出代�为 %d"
 
-#: git-send-email.perl:235
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "编辑器�正常退出，终止所有�作"
 
-#: git-send-email.perl:321
+#: 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:326
+#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' 包�编辑的邮件。\n"
 
-#: git-send-email.perl:419
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases 和其它选项�兼容\n"
 
-#: git-send-email.perl:493
+#: 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"
@@ -25603,47 +25616,47 @@ msgstr ""
 "git-send-email 通过 sendemail.* 选项进行设置，注�字� 'e'。\n"
 "设置 sendemail.forbidSendmailVariables 为 false ��用这项检查。\n"
 
-#: git-send-email.perl:498 git-send-email.perl:700
+#: 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:501
+#: 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:514
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "未知的 --suppress-cc 字段：'%s'\n"
 
-#: git-send-email.perl:545
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "未知的 --confirm 设置：'%s'\n"
 
-#: git-send-email.perl:573
+#: 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:575
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "警告：�支� `:include:`：%s\n"
 
-#: git-send-email.perl:577
+#: 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:582
+#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "警告：�能识别的 sendmail 行：%s\n"
 
-#: git-send-email.perl:666
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -25658,12 +25671,12 @@ msgstr ""
 "    * 如果�义为一个文件，使用 \"./%s\"，或者\n"
 "    * 如果�义为一个范围，使用 --format-patch 选项。\n"
 
-#: git-send-email.perl:687
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "无法打开目录 %s: %s"
 
-#: git-send-email.perl:720
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -25673,17 +25686,17 @@ msgstr ""
 "未指定补�文件�\n"
 "\n"
 
-#: git-send-email.perl:733
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "在 %s 中没有标题行？"
 
-#: git-send-email.perl:743
+#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "为写入打开 %s 失败: %s"
 
-#: git-send-email.perl:754
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -25696,37 +25709,37 @@ msgstr ""
 "\n"
 "如果您�想��摘�，清除内容。\n"
 
-#: git-send-email.perl:778
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "无法打开 %s: %s"
 
-#: git-send-email.perl:795
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "无法打开 %s.final: %s"
 
-#: git-send-email.perl:838
+#: 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:873
+#: 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:928
+#: 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:933
+#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "�声明 8bit 为什么样的编�格� [UTF-8]？"
 
-#: git-send-email.perl:941
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -25738,20 +25751,20 @@ msgstr ""
 "\t%s\n"
 "包�模版标题 '*** SUBJECT HERE ***'。如果确实想���，使用�数 --force。\n"
 
-#: git-send-email.perl:960
+#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "邮件将���给�？"
 
-#: git-send-email.perl:978
+#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "致命错误：别� '%s' 扩展为它自己\n"
 
-#: git-send-email.perl:990
+#: 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:1048 git-send-email.perl:1056
+#: 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"
@@ -25759,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:1060
+#: 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:1377
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA 路径 \"%s\" �存在"
 
-#: git-send-email.perl:1460
+#: 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"
@@ -25793,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:1475
+#: 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:1478
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "���求的邮件回�"
 
-#: git-send-email.perl:1506
+#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "�求的 SMTP �务器未被正确定义。"
 
-#: git-send-email.perl:1553
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "�务器�支� STARTTLS�%s"
 
-#: git-send-email.perl:1558 git-send-email.perl:1562
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS 失败�%s"
 
-#: git-send-email.perl:1571
+#: 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:1589
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "无法�� %s\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "演习�� %s\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "正�� %s\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "演习�功。日志说：\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK。日志说：\n"
 
-#: git-send-email.perl:1606
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "结果："
 
-#: git-send-email.perl:1609
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "结果：OK\n"
 
-#: git-send-email.perl:1627
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "无法打开文件 %s"
 
-#: git-send-email.perl:1674 git-send-email.perl:1694
+#: 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:1680
+#: 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:1737
+#: 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:1772
+#: 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:1883
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) �能执行 '%s'"
 
-#: git-send-email.perl:1890
+#: 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:1894
+#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) 无法关闭管�至 '%s'"
 
-#: git-send-email.perl:1924
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "�能以 7bit 形���信�"
 
-#: git-send-email.perl:1932
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "无效的传�编�"
 
-#: git-send-email.perl:1966
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -25909,27 +25922,27 @@ msgstr ""
 "%s\n"
 "警告：补�未能��\n"
 
-#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039
+#: 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:1979
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
 "warning: no patches were sent\n"
 msgstr ""
-"致命错误：%s:%d 超过 998 字节\n"
+"致命错误：%s:%d 超过 998 字符\n"
 "警告：补�未能��\n"
 
-#: git-send-email.perl:1997
+#: 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:2001
+#: 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/zh_TW.po b/po/zh_TW.po
index 77a5d57ed8..60fe1235b6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,533 +1,265 @@
 # Chinese (traditional) translations for Git package
 # Git 套�軟體的�體中文翻譯。
-# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
-# Copyright (C) 2019,2020 Yi-Jyun Pan <pan93412@gmail.com>
+# Copyright (C) 2012-2021 Jiang Xin <worldhello.net AT gmail.com>
+# Copyright (C) 2019-2021 Yi-Jyun Pan <pan93412@gmail.com>
 # This file is distributed under the same license as the Git package.
-# Contributors (CN):
-#   - Fangyi Zhou <me AT fangyi.io>
-#   - Jiang Xin <worldhello.net AT gmail.com>
-#   - Lian Cheng <rhythm.mail AT gmail.com>
-#   - Ray Chen <oldsharp AT gmail.com>
-#   - Riku <lu.riku AT gmail.com>
-#   - Thynson <lanxingcan AT gmail.com>
-#   - ws3389 <willsmith3389 AT gmail.com>
-#   - Wang Sheng <wangsheng2008love AT 163.com>
-#   - �云 <lilydjwg AT gmail.com>
-#   - Yichao Yu <yyc1992 AT gmail.com>
-#   - Zhuang Ya <zhuangya AT me.com>
-#
-#  Git glossary for Chinese translators
-#  updated on 5/23/2020
 #
-# 原文				翻譯
-# 3 way merge			三方�併
-# ?				？
-# abbreviate			縮寫
-# abort				中止
-# Add				加入
-# all				所有
-# allow				�許
-# alternative			替代
-# Amend				修訂
-# annotate			附註
-# annotated tag			附註標籤
-# Apply				套用
-# argument			引數
-# argument			引數
-# Assume			�設
-# author			作者
-# bad				�良
-# Bare				祼
-# bare repo			祼版本庫
-# Bisect			二分法
-# Blame				究責
-# blob				blob
-# bloom filter			布隆�濾器
-# Branch			分支
-# branch			（動詞）建立分支
-# Branches			分支
-# browse			�覽
-# browser			�覽器
-# bug				臭蟲
-# Bug-ID			Bug-ID
-# cache				快�
-# certificate			憑證
-# Change			變更
-# change			變更
-# changed			已變更
-# changes			變更
-# Check help file		查看說明檔案
-# checkbox			核�方塊
-# Checkout			檢出
-# checksum			總和檢查碼
-# Cherry Pick			摘�
-# clean				清除
-# cleanup			清�
-# clear				清空
-# click				按一下
-# client			用戶端
-# clipboard			剪貼簿
-# Clone				複製
-# Close				關閉
-# Collapse			收�
-# Color				色彩
-# Combine			��
-# comment			評註
-# Commit			�交
-# committer			�交者
-# compare			比�
-# comparing			比�
-# Configure			設定
-# confirm			確�
-# Conflict			��
-# Context lines			情境列
-# context menu			快顯功能表
-# continue			繼續
-# continuous			�續性
-# copy				複製
-# Corrections			æ›´æ­£
-# Could not start		無法啟動
-# Create			建立
-# Creates			建立
-# Creating			建立中
-# Credential			憑證
-# Credential helper		憑證�助程�
-# Credentials			憑證
-# credentials			憑證
-# current			目�
-# custom			自訂
-# Customize			自訂
-# Daemon			守護程�
-# Date				日期
-# Default			�設
-# Delete			刪除
-# describe			describe
-# description			�述
-# Destination			目的地
-# detach			分離
-# detect			�測
-# Dialogs			�話框
-# Diff				差異
-# differences			差異
-# different			差異
-# dir				目錄
-# directory			目錄
-# Discard			丟棄
-# Display			顯示
-# double click			按兩下
-# edit				編輯
-# editor			編輯器
-# email				email
-# Enable			啟用
-# Error code			錯誤碼
-# explicitly			顯�
-# Export			匯出
-# expression			表示�
-# extension			擴充套件
-# external			外部
-# fast forward			快進
-# fast-forward			快進
-# fetch				��
-# FETCH_HEAD			FETCH_HEAD
-# file				檔案
-# files				檔案
-# filter			篩�
-# find				�尋
-# Finish			完�
-# folder			資料夾
-# folders			資料夾
-# follow			跟隨
-# Force				強制
-# from				自
-# Git				Git
-# Git for Windows		Git for Windows
-# hash				雜湊
-# HEAD				HEAD
-# highlight			標示
-# Hook				掛鉤
-# hunk				�塊
-# hunks				�塊
-# Ignore			忽略
-# Index				索引
-# Info				資訊
-# information			資訊
-# Init				�始化
-# initial checkout		�始簽出
-# Inline Diff			行內差異
-# inline diff			列內差異
-# is up to date			已最新
-# issue				議題
-# item				é …ç›®
-# items				é …ç›®
-# Keywords			關�字
-# label				標記
-# labels			標記
-# Last				最後
-# later				�後
-# limitation			�制
-# line				列
-# lines				列
-# local				本地端
-# Local				本地端
-# Log				記錄
-# Merge				�併
-# merge				�併
-# message			訊�
-# Message			訊�
-# modify			修改
-# Name				�稱
-# Note				註
-# note				註
-# Notes				註解
-# Open				é–‹å•Ÿ
-# Options			�項
-# Ordering			順�
-# ORIG_HEAD			ORIG_HEAD
-# Overlay			圖示覆蓋
-# pack				包�
-# Parent			父
-# patch				補綴
-# patched			補綴
-# paths				路徑
-# pick				�
-# position			�置
-# preview			�覽
-# process			處�
-# program			程�
-# Project			專案
-# Prune				剪除
-# Pull				拉�
-# Pull Request			拉�請求
-# Push				推�
-# rebase			�定基底
-# rebase			�定基底
-# recover			還原
-# recovered			還原
-# recursively			�迴
-# recycle bin			回收桶
-# redo				��
-# Ref				�照
-# ref				�照
-# reference			�照
-# RefLog			�照日誌
-# refmap			�照映射
-# refs				�照
-# refspec			�照�格
-# Remote			�端
-# remote branches		�端分支
-# Remote-tracking branches	�端跟蹤分支
-# remote-treacking branches	�端追蹤分支
-# remove			移除
-# removed			已移除
-# repo				版本庫
-# repositories			版本庫
-# Repository			版本庫
-# request			�求
-# Reset				�設
-# resolve			解決
-# rest				其餘的
-# Restore			還原
-# Revert			復原
-# reverted			已復原
-# review			檢閱
-# revision			修訂版
-# revisions			版本
-# script			指令稿
-# Scripts			指令稿
-# sections			部分
-# Show				顯示
-# sign				簽署
-# signed			已簽署
-# skip				略�
-# special			特殊
-# Squash			壓�
-# stage				æš«å­˜
-# stage				æš«å­˜
-# staged			已暫存
-# staging area			暫存�
-# Stash				收�
-# Status			狀態
-# subject			主旨
-# Submodule			�模組
-# Superproject			上層專案
-# Switch			切�
-# tag				（動詞）貼標籤
-# Tag				標籤
-# tagger			貼標籤者
-# tags				標籤
-# task				工作
-# thesaurus			�義字
-# three way			三方
-# Track				跟蹤
-# Tracked			跟蹤中
-# tracking			跟蹤
-# tree				樹
-# two				2
-# type				é¡žåž‹
-# unchanged			未變更
-# Undo				復原
-# Unified diff			單一差異
-# unified diff			統��差異
-# Unknown			未知
-# unstash			�消收�
-# Untracked			未跟蹤的
-# Unversioned			無版控
-# Update			æ›´æ–°
-# UpStream			上游
-# user				使用者
-# username			使用者�稱
-# vanilla			原
-# verify			核驗
-# view				檢視
-# viewer			檢視器
-# Warning			警告
-# whitespace			空白字元
-# whitespaces			空白字元
-# working			工作
-# working copy			工作複本
-# Working tree			工作目錄
-# You might need		您�能需�
+# Contributors (CN):
+# - Fangyi Zhou <me AT fangyi.io>
+# - Jiang Xin <worldhello.net AT gmail.com>
+# - Lian Cheng <rhythm.mail AT gmail.com>
+# - Ray Chen <oldsharp AT gmail.com>
+# - Riku <lu.riku AT gmail.com>
+# - Thynson <lanxingcan AT gmail.com>
+# - ws3389 <willsmith3389 AT gmail.com>
+# - Wang Sheng <wangsheng2008love AT 163.com>
+# - �云 <lilydjwg AT gmail.com>
+# - Yichao Yu <yyc1992 AT gmail.com>
+# - Zhuang Ya <zhuangya AT me.com>
 #
+# 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-05-17 16:02+0800\n"
-"PO-Revision-Date: 2021-05-23 15:30+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) <zh-l10n@lists.linux.org.tw>\n"
+"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
+"po/git-cli/zh_Hant/>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.4.3\n"
+"X-Generator: Poedit 3.0.1\n"
 "X-ZhConverter: �化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
 "zhconvert.org\n"
 
-#: add-interactive.c:376
+#: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "嗯（%s）？"
 
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
-#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
-#: builtin/rebase.c:1953
+#: 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 "無法讀�索引"
 
-#: add-interactive.c:584 git-add--interactive.perl:269
+#: add-interactive.c:588 git-add--interactive.perl:269
 #: git-add--interactive.perl:294
 msgid "binary"
 msgstr "二進�"
 
-#: add-interactive.c:642 git-add--interactive.perl:278
+#: add-interactive.c:646 git-add--interactive.perl:278
 #: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "ç„¡"
 
-#: add-interactive.c:643 git-add--interactive.perl:314
+#: add-interactive.c:647 git-add--interactive.perl:314
 #: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "未變更"
 
-#: add-interactive.c:680 git-add--interactive.perl:641
+#: add-interactive.c:684 git-add--interactive.perl:641
 msgid "Update"
 msgstr "æ›´æ–°"
 
-#: add-interactive.c:697 add-interactive.c:885
+#: add-interactive.c:701 add-interactive.c:889
 #, c-format
 msgid "could not stage '%s'"
 msgstr "無法暫存「%s�"
 
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "無法寫入索引"
 
-#: add-interactive.c:706 git-add--interactive.perl:626
+#: add-interactive.c:710 git-add--interactive.perl:626
 #, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "已更新 %d 個路徑\n"
 
-#: add-interactive.c:724 git-add--interactive.perl:676
+#: add-interactive.c:728 git-add--interactive.perl:676
 #, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "注�：%s �已��追蹤。\n"
 
-#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
-#: builtin/reset.c:145
+#: 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 失敗"
 
-#: add-interactive.c:759 git-add--interactive.perl:653
+#: add-interactive.c:763 git-add--interactive.perl:653
 msgid "Revert"
 msgstr "還原"
 
-#: add-interactive.c:775
+#: add-interactive.c:779
 msgid "Could not parse HEAD^{tree}"
 msgstr "�能解� HEAD^{樹}"
 
-#: add-interactive.c:813 git-add--interactive.perl:629
+#: add-interactive.c:817 git-add--interactive.perl:629
 #, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "還原了 %d 個路徑\n"
 
-#: add-interactive.c:864 git-add--interactive.perl:693
+#: add-interactive.c:868 git-add--interactive.perl:693
 #, c-format
 msgid "No untracked files.\n"
 msgstr "沒有未追蹤的檔案。\n"
 
-#: add-interactive.c:868 git-add--interactive.perl:687
+#: add-interactive.c:872 git-add--interactive.perl:687
 msgid "Add untracked"
 msgstr "新增未追蹤的"
 
-#: add-interactive.c:895 git-add--interactive.perl:623
+#: add-interactive.c:899 git-add--interactive.perl:623
 #, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "增加了 %d 個路徑\n"
 
-#: add-interactive.c:925
+#: add-interactive.c:929
 #, c-format
 msgid "ignoring unmerged: %s"
 msgstr "忽略未�併：%s"
 
-#: add-interactive.c:937 add-patch.c:1751 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:939 add-patch.c:1749 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:943 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "修補檔更新"
 
-#: add-interactive.c:982 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "檢視 diff"
 
-#: add-interactive.c:1010
+#: add-interactive.c:1014
 msgid "show paths with changes"
 msgstr "顯示有變更的路徑"
 
-#: add-interactive.c:1012
+#: add-interactive.c:1016
 msgid "add working tree state to the staged set of changes"
 msgstr "加入工作�狀態至暫存列表"
 
-#: add-interactive.c:1014
+#: add-interactive.c:1018
 msgid "revert staged set of changes back to the HEAD version"
 msgstr "還原修改的暫存集至 HEAD 版本"
 
-#: add-interactive.c:1016
+#: add-interactive.c:1020
 msgid "pick hunks and update selectively"
 msgstr "挑��塊並�擇性更新"
 
-#: add-interactive.c:1018
+#: add-interactive.c:1022
 msgid "view diff between HEAD and index"
 msgstr "檢視 HEAD �索引之間的差異"
 
-#: add-interactive.c:1020
+#: add-interactive.c:1024
 msgid "add contents of untracked files to the staged set of changes"
 msgstr "加入未追蹤檔案的內容至暫存列表"
 
-#: add-interactive.c:1028 add-interactive.c:1077
+#: add-interactive.c:1032 add-interactive.c:1081
 msgid "Prompt help:"
 msgstr "�示說明："
 
-#: add-interactive.c:1030
+#: add-interactive.c:1034
 msgid "select a single item"
 msgstr "�擇單一項目"
 
-#: add-interactive.c:1032
+#: add-interactive.c:1036
 msgid "select a range of items"
 msgstr "�擇項目範�"
 
-#: add-interactive.c:1034
+#: add-interactive.c:1038
 msgid "select multiple ranges"
 msgstr "�擇多個範�"
 
-#: add-interactive.c:1036 add-interactive.c:1081
+#: add-interactive.c:1040 add-interactive.c:1085
 msgid "select item based on unique prefix"
 msgstr "基於唯一�綴�擇項目"
 
-#: add-interactive.c:1038
+#: add-interactive.c:1042
 msgid "unselect specified items"
 msgstr "�消�擇指定項目"
 
-#: add-interactive.c:1040
+#: add-interactive.c:1044
 msgid "choose all items"
 msgstr "�擇所有項目"
 
-#: add-interactive.c:1042
+#: add-interactive.c:1046
 msgid "(empty) finish selecting"
 msgstr "（空）完���"
 
-#: add-interactive.c:1079
+#: add-interactive.c:1083
 msgid "select a numbered item"
 msgstr "�擇編號�的項目"
 
-#: add-interactive.c:1083
+#: add-interactive.c:1087
 msgid "(empty) select nothing"
 msgstr "（空）全���"
 
-#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** 指令 ***"
 
-#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "請�擇"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "staged"
 msgstr "快�"
 
-#: add-interactive.c:1144 git-add--interactive.perl:213
+#: add-interactive.c:1148 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "未快�"
 
-#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
-#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
-#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
-#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
+#: 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 "路徑"
 
-#: add-interactive.c:1151
+#: add-interactive.c:1155
 msgid "could not refresh index"
 msgstr "無法�新整�索引"
 
-#: add-interactive.c:1165 builtin/clean.c:781 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,?]? "
@@ -552,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,?]? "
@@ -592,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,?]? "
@@ -632,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,?]? "
@@ -672,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,?]? "
@@ -716,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,?]? "
@@ -750,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,?]? "
@@ -798,40 +530,42 @@ msgstr ""
 "a - 套用此�塊和本檔案中後�的全部�塊\n"
 "d - ��套用此�塊和本檔案中後�的全部�塊\n"
 
-#: add-patch.c:342
+#: add-patch.c:343
 #, c-format
 msgid "could not parse hunk header '%.*s'"
 msgstr "無法解��塊標頭 '%.*s'"
 
-#: add-patch.c:361 add-patch.c:365
+#: add-patch.c:362 add-patch.c:366
 #, c-format
 msgid "could not parse colored hunk header '%.*s'"
 msgstr "無法解�上色�的�塊標頭 '%.*s'"
 
-#: add-patch.c:419
+#: add-patch.c:420
 msgid "could not parse diff"
 msgstr "無法解�差異 (diff)"
 
-#: add-patch.c:438
+#: add-patch.c:439
 msgid "could not parse colored diff"
 msgstr "無法解�上色�的差異 (diff)"
 
-#: add-patch.c:452
+#: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
 msgstr "無法執行 '%s'"
 
-#: add-patch.c:611
+#: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
 msgstr "interactive.diffFilter 的輸出�符"
 
-#: add-patch.c:612
+#: add-patch.c:613
 msgid ""
 "Your filter must maintain a one-to-one correspondence\n"
 "between its input and output lines."
-msgstr "您的�濾器必須在其輸入�輸出行維�一�一的�應關係。"
+msgstr ""
+"您的�濾器必須在其輸入�輸出行\n"
+"維�一�一的�應關係。"
 
-#: add-patch.c:790
+#: add-patch.c:791
 #, c-format
 msgid ""
 "expected context line #%d in\n"
@@ -840,7 +574,7 @@ msgstr ""
 "應有上下文行 #%d 於\n"
 "%.*s"
 
-#: add-patch.c:805
+#: add-patch.c:806
 #, c-format
 msgid ""
 "hunks do not overlap:\n"
@@ -853,11 +587,11 @@ msgstr ""
 "\t�以下述�尾：\n"
 "%.*s"
 
-#: add-patch.c:1081 git-add--interactive.perl:1115
+#: add-patch.c:1082 git-add--interactive.perl:1115
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "手動�塊編輯模� -- 檢視底部的快速指�。\n"
 
-#: add-patch.c:1085
+#: add-patch.c:1086
 #, c-format
 msgid ""
 "---\n"
@@ -871,20 +605,21 @@ msgstr ""
 "以 %c 開始的行將被刪除。\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1099 git-add--interactive.perl:1129
+#: add-patch.c:1100 git-add--interactive.perl:1129
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
 "aborted and the hunk is left unchanged.\n"
 msgstr ""
-"如果未乾淨套用，您就有機會�新編輯。若刪掉此�塊的全部內容，則會中止\n"
+"如果未乾淨套用，您就有機會�新編輯。\n"
+"若刪掉此�塊的全部內容，則會中止\n"
 "本次編輯，�塊則�會被修改。\n"
 
-#: add-patch.c:1132
+#: add-patch.c:1133
 msgid "could not parse hunk header"
 msgstr "無法解��塊標頭"
 
-#: add-patch.c:1177
+#: add-patch.c:1178
 msgid "'git apply --cached' failed"
 msgstr "「git apply --cached�失敗"
 
@@ -900,24 +635,24 @@ 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:1246 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]? "
 
-#: add-patch.c:1289
+#: add-patch.c:1290
 msgid "The selected hunks do not apply to the index!"
 msgstr "��的�塊�會套用進索引�"
 
-#: add-patch.c:1290 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
-msgstr "無論如何都�套用到工作�嗎？"
+msgstr "無論如何都�套用到工作�嗎？ "
 
-#: add-patch.c:1297 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "未套用。\n"
 
-#: add-patch.c:1354
+#: add-patch.c:1355
 msgid ""
 "j - leave this hunk undecided, see next undecided hunk\n"
 "J - leave this hunk undecided, see next hunk\n"
@@ -934,77 +669,77 @@ msgstr ""
 "k - 維�此�塊未決狀態，檢視上一個未決定�塊\n"
 "K - 維�此�塊未決狀態，檢視上一個�塊\n"
 "g - �擇�跳轉至的�塊\n"
-"/ - 尋找符��供之正�表示�的�塊\n"
+"/ - 尋找符��供之常�表示�的�塊\n"
 "s - 分割目��塊為更�的�塊\n"
 "e - 手動編輯目��塊\n"
 "? - 顯示說明\n"
 
-#: add-patch.c:1516 add-patch.c:1526
+#: add-patch.c:1517 add-patch.c:1527
 msgid "No previous hunk"
 msgstr "沒有上一個�塊"
 
-#: add-patch.c:1521 add-patch.c:1531
+#: add-patch.c:1522 add-patch.c:1532
 msgid "No next hunk"
 msgstr "沒有下一個�塊"
 
-#: add-patch.c:1537
+#: add-patch.c:1538
 msgid "No other hunks to goto"
 msgstr "沒有其它�供跳轉的�塊"
 
-#: add-patch.c:1548 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:1549 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
-msgstr "跳轉到哪個�塊？"
+msgstr "跳轉到哪個�塊？ "
 
-#: add-patch.c:1560
+#: add-patch.c:1561
 #, c-format
 msgid "Invalid number: '%s'"
 msgstr "無效數字：'%s'"
 
-#: add-patch.c:1565
+#: add-patch.c:1566
 #, c-format
 msgid "Sorry, only %d hunk available."
 msgid_plural "Sorry, only %d hunks available."
 msgstr[0] "��起，�有 %d 個�用�塊。"
 
-#: add-patch.c:1574
+#: add-patch.c:1575
 msgid "No other hunks to search"
 msgstr "沒有其它�供尋找的�塊"
 
-#: add-patch.c:1580 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
-msgstr "使用正�表示��尋？"
+msgstr "使用常�表示��尋？ "
 
-#: add-patch.c:1595
+#: add-patch.c:1596
 #, c-format
 msgid "Malformed search regexp %s: %s"
-msgstr "錯誤的正�表示� %s：%s"
+msgstr "錯誤的常�表示� %s：%s"
 
-#: add-patch.c:1612
+#: add-patch.c:1613
 msgid "No hunk matches the given pattern"
 msgstr "沒有和�供模�相符�的�塊"
 
-#: add-patch.c:1619
+#: add-patch.c:1620
 msgid "Sorry, cannot split this hunk"
 msgstr "��起，�能分割這個�塊"
 
-#: add-patch.c:1623
+#: add-patch.c:1624
 #, c-format
 msgid "Split into %d hunks."
 msgstr "分割為 %d 個�塊。"
 
-#: add-patch.c:1627
+#: add-patch.c:1628
 msgid "Sorry, cannot edit this hunk"
 msgstr "��起，�能編輯這個�塊"
 
-#: add-patch.c:1679
+#: add-patch.c:1680
 msgid "'git apply' failed"
 msgstr "'git apply' 失敗"
 
-#: advice.c:145
+#: advice.c:78
 #, c-format
 msgid ""
 "\n"
@@ -1013,37 +748,37 @@ msgstr ""
 "\n"
 "請使用「git config advice.%s false�來�用此訊�"
 
-#: advice.c:161
+#: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%s�示：%.*s%s\n"
 
-#: advice.c:252
+#: advice.c:178
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "無法��，因為您有未�併的檔案。"
 
-#: advice.c:254
+#: advice.c:180
 msgid "Committing is not possible because you have unmerged files."
 msgstr "無法�交，因為您有未�併的檔案。"
 
-#: advice.c:256
+#: advice.c:182
 msgid "Merging is not possible because you have unmerged files."
 msgstr "無法�併，因為您有未�併的檔案。"
 
-#: advice.c:258
+#: advice.c:184
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "無法拉�，因為您有未�併的檔案。"
 
-#: advice.c:260
+#: advice.c:186
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "無法還原�交，因為您有未�併的檔案。"
 
-#: advice.c:262
+#: advice.c:188
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "無法 %s，因為您有未�併的檔案。"
 
-#: advice.c:270
+#: 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."
@@ -1051,36 +786,48 @@ msgstr ""
 "請在工作�改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n"
 "解決方案並�交。"
 
-#: advice.c:278
+#: advice.c:204
 msgid "Exiting because of an unresolved conflict."
 msgstr "因為存在未解決的��而離開。"
 
-#: advice.c:283 builtin/merge.c:1374
+#: advice.c:209 builtin/merge.c:1382
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "您尚未��您的�併（存在 MERGE_HEAD）。"
 
-#: advice.c:285
+#: advice.c:211
 msgid "Please, commit your changes before merging."
 msgstr "請在�併�先�交您的修改。"
 
-#: advice.c:286
+#: advice.c:212
 msgid "Exiting because of unfinished merge."
 msgstr "因為存在未完�的�併而離開。"
 
-#: advice.c:296
-#, fuzzy, c-format
+#: advice.c:217
+msgid "Not possible to fast-forward, aborting."
+msgstr "無法快轉，終止。"
+
+#: advice.c:227
+#, 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"
+"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 ""
+"下列路徑和（或）路徑�格\n"
+"符�稀�簽出定義外且存在的路徑，\n"
+"所以�會在索引中更新：\n"
 
-#: advice.c:303
+#: advice.c:234
 msgid ""
-"Disable or modify the sparsity rules if you intend to update such entries."
-msgstr "若有�更新這些項目，請�用或修改稀��則。"
+"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 ""
+"如果您執��更新這些項目，請試試以下任一方�：\n"
+"* 使用 --sparse �項。\n"
+"* �用或修改稀��則。"
 
-#: advice.c:310
+#: advice.c:242
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -1104,20 +851,20 @@ msgid ""
 msgstr ""
 "注�：正在切�到 '%s'。\n"
 "\n"
-"您正處於分離開頭指標狀態。您�以檢視��實驗性的修改��交，並且您�以在切"
-"�\n"
-"回一個分支時，�棄在此狀態下所�的�交而��分支造�影響。\n"
+"您正處於分離開頭指標狀態。您�以檢視�進行實驗性修改並�交，\n"
+"而且您�以在切�回一個分支時，\n"
+"�棄在此狀態下所�的�交而��分支造�影響。\n"
 "\n"
-"如果您想���建立分支來�留在此狀態下所�的�交，您�以��在 switch 指令\n"
-"中新增�數 -c 來實�（�在或�後）。例如：\n"
+"如果您想���建立分支來�留在此狀態下所�的�交，\n"
+"您�以�在或�後在 switch 指令使用 -c �項。例如：\n"
 "\n"
-"  git switch -c <新分支�>\n"
+"  git switch -c <新分支�稱>\n"
 "\n"
-"或者復原此動作：\n"
+"或者是復原此動作：\n"
 "\n"
 "  git switch -\n"
 "\n"
-"��將設定變數 advice.detachedHead 設定為 false 來關閉此建議\n"
+"將組態變數 advice.detachedHead 設定為 false，��關閉本建議\n"
 "\n"
 
 #: alias.c:50
@@ -1138,26 +885,38 @@ 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
 msgid "Cannot prepare timestamp regexp %s"
-msgstr "無法準備時間戳正�表示� %s"
+msgstr "無法準備時間戳常�表示� %s"
 
 #: apply.c:809
 #, c-format
@@ -1252,48 +1011,48 @@ msgstr "刪除的檔案 %s �有內容"
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** 警告：檔案 %s �為空檔案但並未刪除"
 
-#: apply.c:1977
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "二進�修補檔在第 %d 行�壞：%.*s"
 
-#: apply.c:2014
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "無法識別的二進�修補檔�於第 %d 行"
 
-#: apply.c:2176
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "修補檔案的第 %d 行�有垃圾資料"
 
-#: apply.c:2262
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "無法讀�符號連� %s"
 
-#: apply.c:2266
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "�能開啟或讀� %s"
 
-#: apply.c:2935
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "無效的行首字元：'%c'"
 
-#: apply.c:3056
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "�塊 #%d �功套用於 %d（�移 %d 行）。"
 
-#: apply.c:3068
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔�塊"
 
-#: apply.c:3074
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -1302,437 +1061,436 @@ msgstr ""
 "當查詢：\n"
 "%.*s"
 
-#: apply.c:3096
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "缺少 '%s' 的二進�修補檔資料"
 
-#: apply.c:3104
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "�能��套用一個缺少到 '%s' 的��資料�塊的二進�修補檔"
 
-#: apply.c:3151
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "�能在 '%s' 上套用沒有完整索引行的二進�修補檔"
 
-#: apply.c:3162
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "修補檔套用到 '%s'（%s），但是和目�內容�符�。"
 
-#: apply.c:3170
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "修補檔套用到空檔案 '%s'，但其並�空檔案"
 
-#: apply.c:3188
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "無法讀� '%2$s' 必需的目標檔案 %1$s"
 
-#: apply.c:3201
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "二進�修補檔未套用到 '%s'"
 
-#: apply.c:3208
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "到 '%s' 的二進�修補檔產生了�正確的�果（應為 %s，�為 %s）"
 
-#: apply.c:3229
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "打修補檔失敗：%s:%ld"
 
-#: apply.c:3352
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
-msgstr "�能檢出 %s"
+msgstr "�能簽出 %s"
 
-#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 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"
 
-#: apply.c:3412
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "讀��於符號連�中的 '%s'"
 
-#: apply.c:3441 apply.c:3687
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "路徑 %s 已經被�新命�/刪除"
 
-#: apply.c:3527 apply.c:3702
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s：�存在於索引中"
 
-#: apply.c:3536 apply.c:3710 apply.c:3954
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s：和索引�符�"
 
-#: apply.c:3571
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr "版本庫缺少用來進行三方�併所需�的資料物件。"
 
-#: apply.c:3574
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "正在進行三方�併⋯⋯\n"
 
-#: apply.c:3590 apply.c:3594
+#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "無法讀� '%s' 的目�內容"
 
-#: apply.c:3606
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "無法進行三方�併⋯⋯\n"
 
-#: apply.c:3620
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "套用修補檔到 '%s' 存在��。\n"
 
-#: apply.c:3625
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "�功套用修補檔到 '%s'。\n"
 
-#: apply.c:3642
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
-msgstr ""
+msgstr "回復至直接套用模�⋯⋯\n"
 
-#: apply.c:3654
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "移除修補檔�留下了檔案內容"
 
-#: apply.c:3727
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s：錯誤類型"
 
-#: apply.c:3729
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s 的類型是 %o，應為 %o"
 
-#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
-#: read-cache.c:1351
+#: 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:3952
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s：已經存在於索引中"
 
-#: apply.c:3956
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s：已經存在於工作�中"
 
-#: apply.c:3976
+#: 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:3981
+#: 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:4001
+#: apply.c:4025
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "�影響的檔案 '%s' �於符號連�中"
 
-#: apply.c:4005
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s：修補檔未套用"
 
-#: apply.c:4020
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "正在檢查修補檔 %s..."
 
-#: apply.c:4112
+#: apply.c:4136
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "�模組 %s 的 sha1 訊�缺少或無效"
 
-#: apply.c:4119
+#: apply.c:4143
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "%s 的模�變更，但它�在目� HEAD 中"
 
-#: apply.c:4122
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 訊�缺少或無效（%s）。"
 
-#: apply.c:4131
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "�能在暫時索引中新增 %s"
 
-#: apply.c:4141
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "�能把暫時索引寫入到 %s"
 
-#: apply.c:4279
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "�能從索引中移除 %s"
 
-#: apply.c:4313
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "�模組 %s �壞的修補檔"
 
-#: apply.c:4319
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "�能�建立檔案 '%s' 呼� stat"
 
-#: apply.c:4327
+#: apply.c:4351
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "�能為建立檔案 %s 建立後端儲存"
 
-#: apply.c:4333 apply.c:4478
+#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "無法為 %s 新增快��目"
 
-#: apply.c:4376 builtin/bisect--helper.c:523
+#: 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:4380
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "關閉檔案 '%s'"
 
-#: apply.c:4450
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "�能寫入檔案 '%s' 權� %o"
 
-#: apply.c:4548
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "�功套用修補檔 %s。"
 
-#: apply.c:4556
+#: apply.c:4580
 msgid "internal error"
 msgstr "內部錯誤"
 
-#: apply.c:4559
+#: 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:4570
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "截短 .rej 檔案�為 %.*s.rej"
 
-#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "�能開啟 %s"
 
-#: apply.c:4592
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "�功套用第 #%d 個�塊。"
 
-#: apply.c:4596
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "拒絕第 #%d 個�塊。"
 
-#: apply.c:4725
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "略�修補檔 '%s'。"
 
-#: apply.c:4733
-msgid "unrecognized input"
-msgstr "無法識別的輸入"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "輸入中沒有有效的修補檔內容（傳入「--allow-empty��許）"
 
-#: apply.c:4753
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "無法讀�索引檔案"
 
-#: apply.c:4910
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "�能開啟修補檔 '%s'：%s"
 
-#: apply.c:4937
+#: apply.c:4963
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "抑制下�有 %d 個空白字元誤用"
 
-#: apply.c:4943 apply.c:4958
+#: 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:4951
+#: 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:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
+#: 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:4995
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
 msgstr "��套用符��供路徑的變更"
 
-#: apply.c:4998
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "套用符��供路徑的變更"
 
-#: apply.c:5000 builtin/am.c:2317
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "數字"
 
-#: apply.c:5001
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "從傳統的 diff 路徑中移除指定數�的�導斜線"
 
-#: apply.c:5004
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "忽略修補檔中的新增的檔案"
 
-#: apply.c:5006
+#: apply.c:5032
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "�套用修補檔，而是顯示輸入的差異統計（diffstat）"
 
-#: apply.c:5010
+#: apply.c:5036
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "以�進�數顯示新增和刪除的行數"
 
-#: apply.c:5012
+#: apply.c:5038
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "�套用修補檔，而是顯示輸入的概�"
 
-#: apply.c:5014
+#: apply.c:5040
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "�套用修補檔，而是檢視修補檔是��套用"
 
-#: apply.c:5016
+#: apply.c:5042
 msgid "make sure the patch is applicable to the current index"
 msgstr "確�修補檔�以套用到目�索引"
 
-#: apply.c:5018
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "使用指令 `git add --intent-to-add` 標記新增檔案"
 
-#: apply.c:5020
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "套用修補檔而�修改工作�"
 
-#: apply.c:5022
+#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
 msgstr "接�修改工作�之外檔案的修補檔"
 
-#: apply.c:5025
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "還套用此修補檔（與 --stat/--summary/--check �項�時使用）"
 
-#: apply.c:5027
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr "嘗試三方�併。如果失敗，則回到正常修補檔 (patch) 模�"
 
-#: apply.c:5029
+#: apply.c:5055
 msgid "build a temporary index based on embedded index information"
 msgstr "建立一個暫時索引基於嵌入的索引訊�"
 
-#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "路徑以 NUL 字元分隔"
 
-#: apply.c:5034
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr "確�至少符� <n> 行上下文"
 
-#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296
+#: 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:3831
-#: builtin/rebase.c:1347
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
+#: builtin/rebase.c:1051
 msgid "action"
 msgstr "動作"
 
-#: apply.c:5036
+#: apply.c:5062
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "檢查新增和修改的行中間的空白字元濫用"
 
-#: apply.c:5039 apply.c:5042
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr "尋找上下文時忽略空白字元的變更"
 
-#: apply.c:5045
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "��套用修補檔"
 
-#: apply.c:5047
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "無需至少一行上下文"
 
-#: apply.c:5049
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "將拒絕的修補檔�塊儲存在�應的 *.rej 檔案中"
 
-#: apply.c:5051
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "�許�疊的修補檔�塊"
 
-#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
-#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
-#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
-msgid "be verbose"
-msgstr "詳細輸出"
-
-#: apply.c:5054
+#: apply.c:5080
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "�許�正確的檔案末尾�行符號"
 
-#: apply.c:5057
+#: apply.c:5083
 msgid "do not trust the line counts in the hunk headers"
 msgstr "�信任修補檔�塊的標頭訊�中的行號"
 
-#: apply.c:5059 builtin/am.c:2305
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "根目錄"
 
-#: apply.c:5060
+#: 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"
@@ -1743,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' �濾器報告了錯誤"
@@ -1767,7 +1525,7 @@ msgstr "路徑�是有效的 UTF-8：%s"
 msgid "path too long (%d chars, SHA1: %s): %s"
 msgstr "路徑太長（%d 字元，SHA1：%s）：%s"
 
-#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
 msgstr "壓縮錯誤 (%d)"
@@ -1795,156 +1553,152 @@ 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:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
-#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
-#: builtin/merge.c:1143
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
 msgstr "�能讀� '%s'"
 
-#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
+#: 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' 未符�任何檔案"
 
-#: archive.c:451
+#: archive.c:450
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "無此引用：%.*s"
 
-#: archive.c:457
+#: archive.c:456
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "�是一個有效的物件�：%s"
 
-#: archive.c:470
+#: archive.c:469
 #, c-format
 msgid "not a tree object: %s"
 msgstr "�是一個樹狀物件：%s"
 
-#: archive.c:482
+#: archive.c:481
 msgid "current working directory is untracked"
 msgstr "目�工作目錄未被追蹤"
 
-#: archive.c:523
+#: archive.c:522
 #, c-format
 msgid "File not found: %s"
 msgstr "找�到檔案：%s"
 
-#: archive.c:525
+#: archive.c:524
 #, c-format
 msgid "Not a regular file: %s"
 msgstr "�是一般檔案：%s"
 
-#: archive.c:552
+#: archive.c:551
 msgid "fmt"
 msgstr "格�"
 
-#: archive.c:552
+#: archive.c:551
 msgid "archive format"
 msgstr "歸檔格�"
 
-#: archive.c:553 builtin/log.c:1772
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "�綴"
 
-#: archive.c:554
+#: archive.c:553
 msgid "prepend prefix to each pathname in the archive"
 msgstr "為歸檔中�個路徑�加上�綴"
 
-#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
-#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
-#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
+#: 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: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 "檔案"
 
-#: archive.c:556
+#: archive.c:555
 msgid "add untracked file to archive"
 msgstr "將未追蹤檔案加入歸檔"
 
-#: archive.c:559 builtin/archive.c:90
+#: archive.c:558 builtin/archive.c:88
 msgid "write the archive to this file"
 msgstr "歸檔寫入此檔案"
 
-#: archive.c:561
+#: archive.c:560
 msgid "read .gitattributes in working directory"
 msgstr "讀�工作�中的 .gitattributes"
 
-#: archive.c:562
+#: archive.c:561
 msgid "report archived files on stderr"
 msgstr "在標準錯誤上報告歸檔檔案"
 
-#: archive.c:564
+#: archive.c:563
 msgid "set compression level"
 msgstr "設定壓縮級別"
 
-#: archive.c:567
+#: archive.c:566
 msgid "list supported archive formats"
 msgstr "列出支�的歸檔格�"
 
-#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
+#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "版本庫"
 
-#: archive.c:570 builtin/archive.c:92
+#: archive.c:569 builtin/archive.c:90
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "從�端版本庫（<版本庫>）擷�歸檔檔案"
 
-#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
-#: builtin/notes.c:498
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
+#: builtin/notes.c:496
 msgid "command"
 msgstr "指令"
 
-#: archive.c:572 builtin/archive.c:94
+#: archive.c:571 builtin/archive.c:92
 msgid "path to the remote git-upload-archive command"
 msgstr "�端 git-upload-archive 指令的路徑"
 
-#: archive.c:579
+#: archive.c:578
 msgid "Unexpected option --remote"
 msgstr "未知�數 --remote"
 
-#: archive.c:581
-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:583
+#: archive.c:582
 msgid "Unexpected option --output"
 msgstr "未知�數 --output"
 
-#: archive.c:585
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "--add-file 和 --remote �項�能�時使用"
-
-#: archive.c:607
+#: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "未知歸檔格� '%s'"
 
-#: archive.c:616
+#: archive.c:615
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "�數�支�此格� '%s'：-%d"
 
-#: attr.c:202
+#: attr.c:203
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s �是一個有效的屬性�"
 
-#: attr.c:363
+#: attr.c:364
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "��許 %s：%s:%d"
 
-#: attr.c:403
+#: attr.c:404
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1952,22 +1706,22 @@ msgstr ""
 "��模�在 git attributes 中被忽略\n"
 "當字串確定�以驚嘆號開始時，使用 '\\!'。"
 
-#: bisect.c:489
+#: bisect.c:488
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "檔案 '%s' 包�錯誤的引用格�：%s"
 
-#: bisect.c:699
+#: bisect.c:698
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "我們無法進行更多的二分�尋�\n"
 
-#: bisect.c:766
+#: bisect.c:764
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "�是一個有效的�交� %s"
 
-#: bisect.c:791
+#: bisect.c:789
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1976,7 +1730,7 @@ msgstr ""
 "�併基礎 %s 是壞的。\n"
 "這�味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n"
 
-#: bisect.c:796
+#: bisect.c:794
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1985,7 +1739,7 @@ msgstr ""
 "�併基礎 %s 是新的。\n"
 "介於 %s 和 [%s] 之間的屬性已經被修改。\n"
 
-#: bisect.c:801
+#: bisect.c:799
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1994,7 +1748,7 @@ msgstr ""
 "�併基礎 %s 是 %s。\n"
 "這�味著第一個 '%s' �交�於 %s 和 [%s] 之間。\n"
 
-#: bisect.c:809
+#: bisect.c:807
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -2005,7 +1759,7 @@ msgstr ""
 "這種情�下 git 二分�尋無法正常工作。\n"
 "您�能弄錯了 %s 和 %s 版本？\n"
 
-#: bisect.c:822
+#: bisect.c:820
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -2016,36 +1770,36 @@ msgstr ""
 "所以我們無法確�第一個 %s �交是�介於 %s 和 %s 之間。\n"
 "我們�舊繼續。"
 
-#: bisect.c:861
+#: bisect.c:859
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "二分�尋中：�併基礎必須是經�測試的\n"
 
-#: bisect.c:911
+#: bisect.c:909
 #, c-format
 msgid "a %s revision is needed"
 msgstr "需�一個 %s 版本"
 
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#: bisect.c:939
 #, c-format
 msgid "could not create file '%s'"
 msgstr "�能建立檔案 '%s'"
 
-#: bisect.c:987 builtin/merge.c:153
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "�能讀�檔案 '%s'"
 
-#: bisect.c:1027
+#: bisect.c:1025
 msgid "reading bisect refs failed"
 msgstr "讀�二分�尋引用失敗"
 
-#: bisect.c:1057
+#: bisect.c:1055
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s �時為 %s 和 %s\n"
 
-#: bisect.c:1066
+#: bisect.c:1064
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -2054,7 +1808,7 @@ msgstr ""
 "沒找到能夠測試的�交。\n"
 "�能是執行傳入的路徑引數是錯誤的？\n"
 
-#: bisect.c:1095
+#: bisect.c:1093
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -2063,7 +1817,7 @@ msgstr[0] "（大概 %d 步）"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1101
+#: bisect.c:1099
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -2081,11 +1835,12 @@ msgstr "�能將 --contents 和最終的�交物件�共用"
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse 和 --first-parent 共用，需�指定最新的�交"
 
-#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333
-#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411
-#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344
-#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646
-#: builtin/pack-objects.c:3661 builtin/shortlog.c:255
+#: 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 "版本�歷設定失敗"
 
@@ -2104,97 +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\" 。"
+"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"
@@ -2206,157 +1951,159 @@ msgid ""
 "\"git push -u\" to set the upstream config as you push."
 msgstr ""
 "\n"
-"如果您正計劃基於�端一個�存的上游分支開始你的工作，\n"
-"您�能需�執行 \"git fetch\" 來�得分支。\n"
+"如果您打算以�端�存的上游分支為基礎進行修改，\n"
+"您或許需�執行「git fetch��得分支。\n"
 "\n"
-"如果您正計劃推�一個能與�應�端分支建立追蹤的新的本機分支，\n"
-"您�能需�使用 \"git push -u\" 推�分支並設定和上游的關�。"
+"如果您打算將新建立的本機分支推�至�應的�端分支，\n"
+"且建立兩個分支間的追蹤關係，\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'"
+msgstr "'%s' 已經簽出到 '%s'"
 
-#: branch.c:389
+#: branch.c:494
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "工作� %s 的 HEAD 指�沒有被更新"
 
-#: bundle.c:41
+#: bundle.c:44
 #, c-format
 msgid "unrecognized bundle hash algorithm: %s"
 msgstr "無法識別的包雜湊演算法：%s"
 
-#: bundle.c:45
+#: bundle.c:48
 #, c-format
 msgid "unknown capability '%s'"
 msgstr "未知功能 '%s'"
 
-#: bundle.c:71
+#: bundle.c:74
 #, c-format
 msgid "'%s' does not look like a v2 or v3 bundle file"
 msgstr "'%s' ��是一個 v2 或 v3 版本的包檔案"
 
-#: bundle.c:110
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "無法識別的包頭：%s%s (%d)"
 
-#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
-#: builtin/commit.c:861
+#: 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'"
 msgstr "�能開啟 '%s'"
 
-#: bundle.c:189
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr "版本庫中缺少這些必備的�交："
 
-#: bundle.c:192
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
 msgstr "需�版本庫驗證一個包"
 
-#: bundle.c:243
+#: bundle.c:257
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "這個包中�有這 %d 個引用："
 
-#: bundle.c:250
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "這個包記錄一個完整歷�。"
 
-#: bundle.c:252
+#: bundle.c:266
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "這個包需�這 %d 個引用："
 
-#: bundle.c:319
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "無法複製 bundle �述符"
 
-#: bundle.c:326
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "�能生� pack-objects 進程"
 
-#: bundle.c:337
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "pack-objects 終止"
 
-#: bundle.c:386
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "引用 '%s' 被 rev-list �項排除"
 
-#: bundle.c:490
+#: bundle.c:504
 #, c-format
 msgid "unsupported bundle version %d"
 msgstr "�支�的包版本 %d"
 
-#: bundle.c:492
+#: bundle.c:506
 #, c-format
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "無法寫入 %2$s 演算法的包版本 %1$d"
 
-#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "無法識別的�數：%s"
 
-#: bundle.c:539
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "�能建立空包。"
 
-#: bundle.c:549
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "�能建立 '%s'"
 
-#: bundle.c:574
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "index-pack 終止"
 
-#: chunk-format.c:113
+#: chunk-format.c:117
 msgid "terminating chunk id appears earlier than expected"
 msgstr "終止�塊 id 出�的時間早於�期"
 
-#: chunk-format.c:122
+#: chunk-format.c:126
 #, c-format
 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
 msgstr "�正確的�塊�移 %<PRIx64> � %<PRIx64>"
 
-#: chunk-format.c:129
+#: chunk-format.c:133
 #, c-format
 msgid "duplicate chunk ID %<PRIx32> found"
 msgstr "找到�複的�塊 ID %<PRIx32>"
 
-#: chunk-format.c:143
+#: chunk-format.c:147
 #, c-format
 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"
 
-#: commit-graph.c:204 midx.c:47
+#: commit-graph.c:204 midx.c:51
 msgid "invalid hash version"
 msgstr "無效的雜湊版本"
 
@@ -2401,215 +2148,215 @@ msgstr "無效的�交圖形�：行 '%s' �是一個雜湊值"
 msgid "unable to find all commit-graph files"
 msgstr "無法找到所有�交圖形檔案"
 
-#: commit-graph.c:745 commit-graph.c:782
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "無效的�交�置。�交圖形�能已�壞"
 
-#: commit-graph.c:766
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "無法找到�交 %s"
 
-#: commit-graph.c:799
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "�交圖需�比目�更多的世代資料，但沒有相關資料"
 
-#: commit-graph.c:1075 builtin/am.c:1340
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "�能解��交 %s"
 
-#: commit-graph.c:1337 builtin/pack-objects.c:2897
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "無法�得物件 %s 類型"
 
-#: commit-graph.c:1368
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "正在載入�交圖中的已知�交"
 
-#: commit-graph.c:1385
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
-msgstr "正在擴展�交圖中的�以�得�交"
+msgstr "正在展開�交圖中的�以�得的�交"
 
-#: commit-graph.c:1405
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr "正在清除�交圖中的�交標記"
 
-#: commit-graph.c:1424
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "正在計算�交圖拓樸級別"
 
-#: commit-graph.c:1477
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr "正在計算�交圖世代數字"
 
-#: commit-graph.c:1558
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr "正在計算�交變更路徑的布隆�濾器"
 
-#: commit-graph.c:1635
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "正在收集引用�交"
 
-#: commit-graph.c:1660
+#: 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:1673
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "新增包 %s 發生錯誤"
 
-#: commit-graph.c:1677
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "為 %s 開啟索引發生錯誤"
 
-#: commit-graph.c:1714
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr "正在打包物件中尋找�交圖的�交"
 
-#: commit-graph.c:1732
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr "正在尋找�交圖中�外的邊"
 
-#: commit-graph.c:1781
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr "無法寫入正確數�的基礎圖形 ID"
 
-#: commit-graph.c:1812 midx.c:906
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "�能為 %s 建立先導目錄"
 
-#: commit-graph.c:1825
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "無法建立暫時的圖形層"
 
-#: commit-graph.c:1830
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "無法調整「%s�的共用權�"
 
-#: commit-graph.c:1887
+#: 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:1923
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr "無法開啟�交圖形�檔案"
 
-#: commit-graph.c:1939
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr "無法�新命�基礎�交圖形檔案"
 
-#: commit-graph.c:1959
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr "無法�新命�暫時�交圖形檔案"
 
-#: commit-graph.c:2092
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "正在掃��併�交"
 
-#: commit-graph.c:2136
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "正在�併�交圖形"
 
-#: commit-graph.c:2244
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
-msgstr "嘗試寫入�交圖形，但 “core.commitGraph� 已被�用。"
+msgstr "嘗試寫入�交圖形，但 “core.commitGraph� 已被�用"
 
-#: commit-graph.c:2351
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr "�交太多�能畫圖"
 
-#: commit-graph.c:2450
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr "�交圖檔案的總和檢查碼錯誤，�能已經�壞"
 
-#: commit-graph.c:2460
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "�交圖形的物件 ID 順��正確：%s 然後 %s"
 
-#: commit-graph.c:2470 commit-graph.c:2485
+#: 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:2477
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "無法從�交圖形中解��交 %s"
 
-#: commit-graph.c:2495
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "正在驗證�交圖中的�交"
 
-#: commit-graph.c:2510
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr "無法從�交圖形的物件庫中解��交 %s"
 
-#: commit-graph.c:2517
+#: 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:2527
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "�交 %s 的�交圖形父�交列表太長了"
 
-#: commit-graph.c:2536
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "%s 的�交圖形父�交是 %s != %s"
 
-#: commit-graph.c:2550
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "�交 %s 的�交圖形父�交列表�早終止"
 
-#: commit-graph.c:2555
+#: 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:2559
+#: 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:2576
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr "�交 %s 的�交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"
 
-#: commit-graph.c:2582
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr "�交圖形中�交 %s 的�交日期是 %<PRIuMAX> != %<PRIuMAX>"
 
-#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416
-#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 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"
 
-#: commit.c:54
+#: commit.c:55
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s �是一個�交�"
 
-#: commit.c:194
+#: commit.c:196
 msgid ""
 "Support for <GIT_DIR>/info/grafts is deprecated\n"
 "and will be removed in a future Git version.\n"
@@ -2629,27 +2376,27 @@ msgstr ""
 "設定 \"git config advice.graftFileDeprecated false\"\n"
 "�關閉本消�"
 
-#: commit.c:1237
+#: commit.c:1241
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "�交 %s 有一個��信的�稱來自 %s 的 GPG 簽�。"
 
-#: commit.c:1241
+#: commit.c:1245
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "�交 %s 有一個錯誤的�稱來自 %s 的 GPG 簽�。"
 
-#: commit.c:1244
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "�交 %s 沒有 GPG 簽�。"
 
-#: commit.c:1247
+#: commit.c:1251
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "�交 %s 有一個來自 %s 的好的 GPG 簽�。\n"
 
-#: commit.c:1501
+#: 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"
@@ -2663,7 +2410,7 @@ msgstr ""
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
 
-#: config.c:126
+#: config.c:125
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -2678,35 +2425,35 @@ msgstr ""
 "\t%2$s\n"
 "這�能是因為循環包�。"
 
-#: config.c:142
+#: config.c:141
 #, c-format
 msgid "could not expand include path '%s'"
-msgstr "無法擴展包�路徑 '%s'"
+msgstr "無法展開包�路徑 '%s'"
 
-#: config.c:153
+#: config.c:152
 msgid "relative config includes must come from files"
 msgstr "相�路徑的設定檔案引用必須來自於檔案"
 
-#: config.c:199
+#: config.c:201
 msgid "relative config include conditionals must come from files"
 msgstr "相�路徑的設定檔案�件引用必須來自於檔案"
 
-#: config.c:396
+#: config.c:398
 #, c-format
 msgid "invalid config format: %s"
 msgstr "無效的設定檔格�：%s"
 
-#: config.c:400
+#: config.c:402
 #, c-format
 msgid "missing environment variable name for configuration '%.*s'"
 msgstr "缺少「%.*s�組態設定的環境變數�稱"
 
-#: config.c:405
+#: config.c:407
 #, c-format
 msgid "missing environment variable '%s' for configuration '%.*s'"
 msgstr "缺少環境變數「%s�（於「%.*s�組態設定）"
 
-#: config.c:442
+#: config.c:443
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "��沒有包�一個�節�稱：%s"
@@ -2716,295 +2463,295 @@ msgstr "��沒有包�一個�節�稱：%s"
 msgid "key does not contain variable name: %s"
 msgstr "��沒有包�變數�：%s"
 
-#: config.c:472 sequencer.c:2785
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "無效��：%s"
 
-#: config.c:478
+#: config.c:475
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "無效��（有�行符號）：%s"
 
-#: config.c:511
+#: config.c:495
 msgid "empty config key"
 msgstr "空白設定�"
 
-#: config.c:529 config.c:541
+#: config.c:513 config.c:525
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "�設定�數：%s"
 
-#: config.c:555 config.c:572 config.c:579 config.c:588
+#: config.c:539 config.c:556 config.c:563 config.c:572
 #, c-format
 msgid "bogus format in %s"
 msgstr "%s 中格�錯誤"
 
-#: config.c:622
+#: config.c:606
 #, c-format
 msgid "bogus count in %s"
 msgstr "%s 中有�計數"
 
-#: config.c:626
+#: config.c:610
 #, c-format
 msgid "too many entries in %s"
 msgstr "%s 中的項目�多"
 
-#: config.c:636
+#: config.c:620
 #, c-format
 msgid "missing config key %s"
 msgstr "缺少 %s 設定�"
 
-#: config.c:644
+#: config.c:628
 #, c-format
 msgid "missing config value %s"
 msgstr "缺少 %s 設定值"
 
-#: config.c:995
+#: config.c:979
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "資料物件 %2$s 中錯誤的設定行 %1$d"
 
-#: config.c:999
+#: config.c:983
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "檔案 %2$s 中錯誤的設定行 %1$d"
 
-#: config.c:1003
+#: config.c:987
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "標準輸入中錯誤的設定行 %d"
 
-#: config.c:1007
+#: config.c:991
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "�模組資料物件 %2$s 中錯誤的設定行 %1$d"
 
-#: config.c:1011
+#: config.c:995
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "指令列 %2$s 中錯誤的設定行 %1$d"
 
-#: config.c:1015
+#: config.c:999
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "在 %2$s 中錯誤的設定行 %1$d"
 
-#: config.c:1152
+#: config.c:1136
 msgid "out of range"
 msgstr "超出範�"
 
-#: config.c:1152
+#: config.c:1136
 msgid "invalid unit"
 msgstr "無效的單�"
 
-#: config.c:1153
+#: config.c:1137
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "設定變數 '%2$s' 的數字�值 '%1$s' 設定錯誤：%3$s"
 
-#: config.c:1163
+#: config.c:1147
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "資料物件 %3$s 中設定變數 '%2$s' 錯誤的�值 '%1$s'：%4$s"
 
-#: config.c:1166
+#: config.c:1150
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "檔案 %3$s 中設定變數 '%2$s' 錯誤的�值 '%1$s'：%4$s"
 
-#: config.c:1169
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "標準輸入中設定變數 '%2$s' 錯誤的�值 '%1$s'：%3$s"
 
-#: config.c:1172
+#: config.c:1156
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr "�模組資料 %3$s 中設定變數 '%2$s' 錯誤的�值 '%1$s'：%4$s"
 
-#: config.c:1175
+#: config.c:1159
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的�值 '%1$s'：%4$s"
 
-#: config.c:1178
+#: config.c:1162
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的�值 '%1$s'：%4$s"
 
-#: config.c:1257
+#: config.c:1241
 #, c-format
 msgid "bad boolean config value '%s' for '%s'"
 msgstr "「%2$s�的「%1$s�布林設定值無效"
 
-#: config.c:1275
+#: config.c:1259
 #, c-format
 msgid "failed to expand user dir in: '%s'"
-msgstr "無法擴展使用者目錄：'%s'"
+msgstr "無法展開使用者目錄於：’%s’"
 
-#: config.c:1284
+#: config.c:1268
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%2$s' 的值 '%1$s' �是一個有效的時間戳"
 
-#: config.c:1377
+#: config.c:1361
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "縮寫長度超出範�：%d"
 
-#: config.c:1391 config.c:1402
+#: config.c:1375 config.c:1386
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "錯誤的 zlib 壓縮級別 %d"
 
-#: config.c:1494
+#: config.c:1476
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar 應該是一個字元"
 
-#: config.c:1527
+#: config.c:1509
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "無效的物件建立模�：%s"
 
-#: config.c:1599
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "%s 的�值格�錯誤"
 
-#: config.c:1625
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "%s 的�值格�錯誤：%s"
 
-#: config.c:1626
+#: config.c:1611
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "必須是其中之一：nothing�matching�simple�upstream 或 current"
 
-#: config.c:1687 builtin/pack-objects.c:3924
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "錯誤的打包壓縮級別 %d"
 
-#: config.c:1809
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "無法從資料物件 '%s' 載入設定"
 
-#: config.c:1812
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "引用 '%s' 沒有指�一個資料物件"
 
-#: config.c:1829
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "�能解�設定物件 '%s'"
 
-#: config.c:1873
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "解� %s 失敗"
 
-#: config.c:1929
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr "無法解�指令列中的設定"
 
-#: config.c:2293
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr "在讀�設定檔案時�到未知錯誤"
 
-#: config.c:2467
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "無效 %s：'%s'"
 
-#: config.c:2512
+#: config.c:2504
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "splitIndex.maxPercentChange 的�值 '%d' 應該介於 0 和 100 之間"
 
-#: config.c:2558
+#: config.c:2550
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "無法解�指令列設定中的 '%s'"
 
-#: config.c:2560
+#: 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:2644
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "無效的�節�稱 '%s'"
 
-#: config.c:2676
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s 有多個�值"
 
-#: config.c:2705
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "寫入新的設定檔案 %s 失敗"
 
-#: config.c:2957 config.c:3283
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "�能鎖定設定檔案 %s"
 
-#: config.c:2968
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "é–‹å•Ÿ %s"
 
-#: config.c:3005 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "無效模�：%s"
 
-#: config.c:3030
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "無效的設定檔案 %s"
 
-#: config.c:3043 config.c:3296
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "� %s 呼� fstat 失敗"
 
-#: config.c:3054
+#: config.c:3047
 #, c-format
-msgid "unable to mmap '%s'"
-msgstr "�能 mmap '%s'"
+msgid "unable to mmap '%s'%s"
+msgstr "無法 mmap '%s'%s"
 
-#: config.c:3063 config.c:3301
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "� %s 呼� chmod 失敗"
 
-#: config.c:3148 config.c:3398
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "�能寫入設定檔案 %s"
 
-#: config.c:3182
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "�能設定 '%s' 為 '%s'"
 
-#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#: 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:3274
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "無效的�節�稱：%s"
 
-#: config.c:3441
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "%s 的�值缺少"
@@ -3038,72 +2785,72 @@ msgstr "伺�器�支�特性 '%s'"
 msgid "expected flush after capabilities"
 msgstr "在能力之後應為一個 flush 包"
 
-#: connect.c:263
+#: connect.c:265
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "忽略第一行 '%s' 之後的能力欄�"
 
-#: connect.c:284
+#: connect.c:286
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "�定錯誤：�外的 capabilities^{}"
 
-#: connect.c:306
+#: connect.c:308
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "�定錯誤：�期淺複製 sha-1，�得到 '%s'"
 
-#: connect.c:308
+#: connect.c:310
 msgid "repository on the other end cannot be shallow"
 msgstr "�一端的版本庫�能是淺複製版本庫"
 
-#: connect.c:347
+#: connect.c:349
 msgid "invalid packet"
 msgstr "無效�包"
 
-#: connect.c:367
+#: connect.c:369
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "�定錯誤：�外的 '%s'"
 
-#: connect.c:497
+#: connect.c:499
 #, c-format
 msgid "unknown object format '%s' specified by server"
 msgstr "伺�器指定的「%s�物件格�無效"
 
-#: connect.c:526
+#: connect.c:528
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "無效的 ls-refs 回應：%s"
 
-#: connect.c:530
+#: connect.c:532
 msgid "expected flush after ref listing"
 msgstr "在引用列表之後應該有一個 flush 包"
 
-#: connect.c:533
+#: connect.c:535
 msgid "expected response end packet after ref listing"
 msgstr "在引用列表後�期�有回應���包"
 
-#: connect.c:666
+#: connect.c:670
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "�支� '%s' �定"
 
-#: connect.c:717
+#: connect.c:721
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "無法為 socket 設定 SO_KEEPALIVE"
 
-#: connect.c:757 connect.c:820
+#: connect.c:761 connect.c:824
 #, c-format
 msgid "Looking up %s ... "
 msgstr "尋找 %s ... "
 
-#: connect.c:761
+#: connect.c:765
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "無法尋找 %s（埠 %s）（%s）"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:765 connect.c:836
+#: connect.c:769 connect.c:840
 #, c-format
 msgid ""
 "done.\n"
@@ -3112,7 +2859,7 @@ msgstr ""
 "完�。\n"
 "連線到 %s（埠 %s）... "
 
-#: connect.c:787 connect.c:864
+#: connect.c:791 connect.c:868
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -3122,84 +2869,84 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:793 connect.c:870
+#: connect.c:797 connect.c:874
 msgid "done."
 msgstr "完�。"
 
-#: connect.c:824
+#: connect.c:828
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "無法尋找 %s（%s）"
 
-#: connect.c:830
+#: connect.c:834
 #, c-format
 msgid "unknown port %s"
 msgstr "未知埠 %s"
 
-#: connect.c:967 connect.c:1299
+#: connect.c:971 connect.c:1303
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "已阻止奇怪的主機�稱 '%s'"
 
-#: connect.c:969
+#: connect.c:973
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "已阻止奇怪的埠號 '%s'"
 
-#: connect.c:979
+#: connect.c:983
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "�能啟動代� %s"
 
-#: connect.c:1050
+#: connect.c:1054
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法"
 
-#: connect.c:1190
+#: connect.c:1194
 msgid "newline is forbidden in git:// hosts and repo paths"
 msgstr "git:// 主機�稱和版本庫路徑中�能有�行"
 
-#: connect.c:1247
+#: connect.c:1251
 msgid "ssh variant 'simple' does not support -4"
 msgstr "ssh 變體 'simple' �支� -4"
 
-#: connect.c:1259
+#: connect.c:1263
 msgid "ssh variant 'simple' does not support -6"
 msgstr "ssh 變體 'simple' �支� -6"
 
-#: connect.c:1276
+#: connect.c:1280
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "ssh 變體 'simple' �支�設定埠"
 
-#: connect.c:1388
+#: connect.c:1392
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "已阻止奇怪的路徑� '%s'"
 
-#: connect.c:1436
+#: connect.c:1440
 msgid "unable to fork"
 msgstr "無法 fork"
 
-#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "正在檢查連通性"
 
-#: connected.c:120
+#: connected.c:122
 msgid "Could not run 'git rev-list'"
 msgstr "�能執行 'git rev-list'"
 
-#: connected.c:144
+#: connected.c:146
 msgid "failed write to rev-list"
 msgstr "寫入 rev-list 失敗"
 
-#: connected.c:149
+#: connected.c:151
 msgid "failed to close rev-list's stdin"
 msgstr "關閉 rev-list 的標準輸入失敗"
 
 #: convert.c:183
 #, c-format
 msgid "illegal crlf_action %d"
-msgstr "�法的 crlf 動作 %d"
+msgstr "�法的 crlf_action %d"
 
 #: convert.c:196
 #, c-format
@@ -3298,23 +3045,23 @@ msgstr "�外的�濾類型"
 msgid "path name too long for external filter"
 msgstr "外部�濾器的路徑�太長"
 
-#: convert.c:934
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
 "been filtered"
 msgstr "外部�濾器 '%s' ���用，但並�所有路徑都已�濾"
 
-#: convert.c:1234
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false �是有效的工作�編碼"
 
-#: convert.c:1414 convert.c:1447
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s：clean �濾器 '%s' 失敗"
 
-#: convert.c:1490
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s：smudge �濾器 %s 失敗"
@@ -3332,17 +3079,17 @@ msgstr "拒絕使用缺少主機欄�的憑證"
 msgid "refusing to work with credential missing protocol field"
 msgstr "拒絕使用缺少通訊�定欄�的憑證"
 
-#: credential.c:394
+#: credential.c:395
 #, c-format
 msgid "url contains a newline in its %s component: %s"
 msgstr "URL 的 %s 部分有�行：%s"
 
-#: credential.c:438
+#: credential.c:439
 #, c-format
 msgid "url has no scheme: %s"
 msgstr "URL 沒有 Scheme：%s"
 
-#: credential.c:511
+#: credential.c:512
 #, c-format
 msgid "credential url cannot be parsed: %s"
 msgstr "無法解�憑證 URL：%s"
@@ -3418,74 +3165,74 @@ msgstr "壞的樹狀物件 %s"
 #: delta-islands.c:334
 #, c-format
 msgid "failed to load island regex for '%s': %s"
-msgstr "未能載入 '%s' 的資料島正�表示�：%s"
+msgstr "未能載入 '%s' 的資料島常�表示�：%s"
 
 #: delta-islands.c:390
 #, c-format
 msgid "island regex from config has too many capture groups (max=%d)"
-msgstr "來自 config 的資料島正�表示�有太多的��組（最多 %d 個）"
+msgstr "來自 config 的資料島常�表示�有太多的擷�群組（最多 %d 個）"
 
 #: delta-islands.c:467
 #, c-format
 msgid "Marked %d islands, done.\n"
 msgstr "已標記 %d 個資料島，��。\n"
 
-#: diff-merges.c:80
+#: diff-merges.c:70
 #, c-format
 msgid "unknown value for --diff-merges: %s"
 msgstr "--diff-merges 的值無效：%s"
 
-#: diff-lib.c:538
+#: diff-lib.c:561
 msgid "--merge-base does not work with ranges"
-msgstr "—merge-base 跟範�無法���作"
+msgstr "--merge-base 跟範�無法���作"
 
-#: diff-lib.c:540
+#: diff-lib.c:563
 msgid "--merge-base only works with commits"
 msgstr "--merge-base �能跟�交���能�作"
 
-#: diff-lib.c:557
+#: diff-lib.c:580
 msgid "unable to get HEAD"
 msgstr "�能�得 HEAD"
 
-#: diff-lib.c:564
+#: diff-lib.c:587
 msgid "no merge base found"
 msgstr "找�到�併基底"
 
-#: diff-lib.c:566
+#: diff-lib.c:589
 msgid "multiple merge bases found"
 msgstr "找到多個�併基底"
 
-#: diff-no-index.c:238
+#: diff-no-index.c:237
 msgid "git diff --no-index [<options>] <path> <path>"
 msgstr "git diff --no-index [<�項>] <路徑> <路徑>"
 
-#: diff-no-index.c:263
+#: diff-no-index.c:262
 msgid ""
 "Not a git repository. Use --no-index to compare two paths outside a working "
 "tree"
 msgstr "�是一個 git 版本庫。使用 --no-index 比較工作�之外的兩個路徑"
 
 #  譯者：請維��導空格
-#: diff.c:156
+#: diff.c:158
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  無法解� dirstat 截止（cut-off）百分比 '%s'\n"
 
 #  譯者：請維��導空格
-#: diff.c:161
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  未知的 dirstat �數 '%s'\n"
 
-#: diff.c:297
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
 msgstr ""
-"移動的�色設定必須是 'no'�'default'�'blocks'�'zebra'�'dimmed_zebra' 或 "
-"'plain'"
+"移動的�色設定必須是 'no'�'default'�'blocks'�'zebra'�'dimmed-"
+"zebra'�'plain'"
 
-#: diff.c:325
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3494,18 +3241,18 @@ msgstr ""
 "未知的 color-moved-ws 模� '%s'，�能的�值有 'ignore-space-change'�'ignore-"
 "space-at-eol'�'ignore-all-space'�'allow-indentation-change'"
 
-#: diff.c:333
+#: 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:410
+#: diff.c:412
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "設定變數 'diff.submodule' 未知的�值：'%s'"
 
-#: diff.c:470
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3514,35 +3261,48 @@ msgstr ""
 "發�設定變數 'diff.dirstat' 中的錯誤：\n"
 "%s"
 
-#: diff.c:4278
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "外部 diff 離開，�止在 %s"
 
-#: diff.c:4630
-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: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:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "「%s�和「%s��項�得�時使用，請使用「%s���「%s�"
 
-#: diff.c:4633
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G�-S 和 --find-object 是互斥的"
+#: diff.c:4601
+#, c-format
+msgid ""
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr "「%s�和「%s��項�得�時使用，請使用「%s���「%s��「%s�"
 
-#: diff.c:4712
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow 明確�求�跟一個路徑�格"
 
-#: diff.c:4760
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "無效的 --stat 值：%s"
 
-#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308
-#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#: 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:4797
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3551,200 +3311,200 @@ msgstr ""
 "無法解� --dirstat/-X �項的�數：\n"
 "%s"
 
-#: diff.c:4882
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"
 
-#: diff.c:4906
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "ws-error-highlight=%.*s 之後未知的值"
 
-#: diff.c:4920
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "�能解� '%s'"
 
-#: diff.c:4970 diff.c:4976
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s 期望 <n>/<m> 格�"
 
-#: diff.c:4988
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s 期望一個字元，得到 '%s'"
 
-#: diff.c:5009
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "壞的 --color-moved �數：%s"
 
-#: diff.c:5028
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "--color-moved-ws 中的無效模� '%s'"
 
-#: diff.c:5068
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
 "diff-algorithm �項有 \"myers\"�\"minimal\"�\"patience\" 和 \"histogram\""
 
-#: diff.c:5104 diff.c:5124
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "%s 的�數無效"
 
-#: diff.c:5228
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
-msgstr "傳入 -I 的正�表示�無效：「%s�"
+msgstr "傳入 -I 的常�表示�無效：「%s�"
 
-#: diff.c:5277
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "無法解� --submodule �項的�數：'%s'"
 
-#: diff.c:5333
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "壞的 --word-diff �數：%s"
 
-#: diff.c:5369
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "差異輸出格�化�項"
 
-#: diff.c:5371 diff.c:5377
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "生�修補檔"
 
-#: diff.c:5374 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "�顯示差異輸出"
 
-#: diff.c:5379 diff.c:5493 diff.c:5500
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5380 diff.c:5383
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "生�� <n> 行上下文的差異"
 
-#: diff.c:5385
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "生�原始格�的差異"
 
-#: diff.c:5388
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "和 '-p --raw' �義"
 
-#: diff.c:5392
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "和 '-p --stat' �義"
 
-#: diff.c:5396
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "機器�好的 --stat"
 
-#: diff.c:5399
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "�輸出 --stat 的最後一行"
 
-#: diff.c:5401 diff.c:5409
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<�數1,�數2>..."
 
-#: diff.c:5402
+#: diff.c:5371
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "輸出�個�目錄相�變更的分布"
 
-#: diff.c:5406
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "和 --dirstat=cumulative �義"
 
-#: diff.c:5410
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "是 --dirstat=files,param1,param2... 的�義詞"
 
-#: diff.c:5414
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr "如果變更中引入��定界符或空白錯誤，給出警告"
 
-#: diff.c:5417
+#: diff.c:5386
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "精簡摘�，例如建立��新命�和模�變更"
 
-#: diff.c:5420
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "�顯示變更檔案的檔案�"
 
-#: diff.c:5423
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "�顯示變更檔案的檔案�和狀態"
 
-#: diff.c:5425
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<寬度>[,<檔案�寬度>[,<次數>]]"
 
-#: diff.c:5426
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "生�差異統計（diffstat）"
 
-#: diff.c:5428 diff.c:5431 diff.c:5434
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<寬度>"
 
-#: diff.c:5429
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "使用�供的長度生�差異統計"
 
-#: diff.c:5432
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "使用�供的檔案�長度生�差異統計"
 
-#: diff.c:5435
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "使用�供的圖形長度生�差異統計"
 
-#: diff.c:5437
+#: diff.c:5406
 msgid "<count>"
 msgstr "<次數>"
 
-#: diff.c:5438
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "生�有�行數的差異統計"
 
-#: diff.c:5441
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "生�差異統計的簡潔摘�"
 
-#: diff.c:5444
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "輸出一個�以套用的二進�差異"
 
-#: diff.c:5447
+#: diff.c:5416
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr "在 \"index\" 行顯示完整的�後物件�稱"
 
-#: diff.c:5449
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "顯示帶�色的差異"
 
-#: diff.c:5450
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<é¡žåž‹>"
 
-#: diff.c:5451
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr "�於差異中的上下文�舊的和新的行，加亮顯示錯誤的空白字元"
 
-#: diff.c:5454
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3752,311 +3512,311 @@ msgstr ""
 "在 --raw 或者 --numstat 中，��路徑字元轉檔並使用 NUL 字元�為輸出欄�的分隔"
 "符"
 
-#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<�綴>"
 
-#: diff.c:5458
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
-msgstr "顯示�供的��綴�代 \"a/\""
+msgstr "顯示�供的來��綴，而� \"a/\""
 
-#: diff.c:5461
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
-msgstr "顯示�供的目標�綴�代 \"b/\""
+msgstr "顯示�供的目的地�綴�代 \"b/\""
 
-#: diff.c:5464
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr "輸出的�一行附加�綴"
 
-#: diff.c:5467
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
-msgstr "�顯示任何�和目標�綴"
+msgstr "�顯示任何來�和目的地�綴"
 
-#: diff.c:5470
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr "顯示指定行數的差異�塊間的上下文"
 
-#: diff.c:5474 diff.c:5479 diff.c:5484
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<å­—å…ƒ>"
 
-#: diff.c:5475
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "指定一個字元�代 '+' 來表示新的一行"
 
-#: diff.c:5480
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "指定一個字元�代 '-' 來表示舊的一行"
 
-#: diff.c:5485
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "指定一個字元�代 ' ' 來表示一行上下文"
 
-#: diff.c:5488
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "差異�新命��項"
 
-#: diff.c:5489
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5490
+#: diff.c:5459
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "將完全�寫的變更打破為��的刪除和建立"
 
-#: diff.c:5494
+#: diff.c:5463
 msgid "detect renames"
 msgstr "檢測�新命�"
 
-#: diff.c:5498
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "�略刪除變更的差異輸出"
 
-#: diff.c:5501
+#: diff.c:5470
 msgid "detect copies"
 msgstr "檢測複製"
 
-#: diff.c:5505
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
-msgstr "使用未修改的檔案�為發�複製的�"
+msgstr "使用未修改的檔案�為發�拷�的來�"
 
-#: diff.c:5507
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "�用�新命��測"
 
-#: diff.c:5510
+#: diff.c:5479
 msgid "use empty blobs as rename source"
-msgstr "使用空的資料物件�為�新命�的�"
+msgstr "使用空的資料物件�為�新命�的來�"
 
-#: diff.c:5512
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr "繼續列出檔案�新命�以外的歷�記錄"
 
-#: diff.c:5515
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr "如果�新命�/複製目標超��供的�制，�止�新命�/複製檢測"
 
-#: diff.c:5517
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "差異演算法�項"
 
-#: diff.c:5519
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "生�儘�能�的差異"
 
-#: diff.c:5522
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "行比較時忽略空白字元"
 
-#: diff.c:5525
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "忽略空白字元的變更"
 
-#: diff.c:5528
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "忽略行尾的空白字元變更"
 
-#: diff.c:5531
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "忽略行尾的Enter符（CR）"
 
-#: diff.c:5534
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "忽略整行都是空白的變更"
 
-#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<正則>"
 
-#: diff.c:5537
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr "忽略整行符� <regex> 的變更"
 
-#: diff.c:5540
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "啟發�轉�差異邊界以便閱讀"
 
-#: diff.c:5543
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "使用 \"patience diff\" 演算法生�差異"
 
-#: diff.c:5547
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "使用 \"histogram diff\" 演算法生�差異"
 
-#: diff.c:5549
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<演算法>"
 
-#: diff.c:5550
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "�擇一個差異演算法"
 
-#: diff.c:5552
+#: diff.c:5521
 msgid "<text>"
 msgstr "<文字>"
 
-#: diff.c:5553
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "使用 \"anchored diff\" 演算法生�差異"
 
-#: diff.c:5555 diff.c:5564 diff.c:5567
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<模�>"
 
-#: diff.c:5556
+#: diff.c:5525
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr "顯示單詞差異，使用 <模�> 分隔變更的單詞"
 
-#: diff.c:5559
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
-msgstr "使用 <正�表示�> 確定何為一個詞"
+msgstr "使用 <常�表示�> 確定何為一個詞"
 
-#: diff.c:5562
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"
 
-#: diff.c:5565
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "移動的程�碼行用��方�著色"
 
-#: diff.c:5568
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr "在 --color-moved 下如何忽略空白字元"
 
-#: diff.c:5571
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "其它差異�項"
 
-#: diff.c:5573
+#: diff.c:5542
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr "當從�目錄執行，排除目錄之外的變更並顯示相�路徑"
 
-#: diff.c:5577
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "把所有檔案當�文字處�"
 
-#: diff.c:5579
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "交�兩個輸入，�轉差異"
 
-#: diff.c:5581
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "有差異時離開碼為 1，�則為 0"
 
-#: diff.c:5583
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "�用本程�的所有輸出"
 
-#: diff.c:5585
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "�許執行一個外部的差異�助工具"
 
-#: diff.c:5587
+#: diff.c:5556
 msgid "run external text conversion filters when comparing binary files"
 msgstr "當比較二進�檔案時，執行外部的文字轉��濾器"
 
-#: diff.c:5589
+#: diff.c:5558
 msgid "<when>"
 msgstr "<何時>"
 
-#: diff.c:5590
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr "在生�差異時，忽略�模組的更改"
 
-#: diff.c:5593
+#: diff.c:5562
 msgid "<format>"
 msgstr "<格�>"
 
-#: diff.c:5594
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "指定�模組的差異如何顯示"
 
-#: diff.c:5598
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "隱�索引中 'git add -N' �目"
 
-#: diff.c:5601
+#: diff.c:5570
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "將索引中 'git add -N' �目當�真實的"
 
-#: diff.c:5603
+#: diff.c:5572
 msgid "<string>"
 msgstr "<字串>"
 
-#: diff.c:5604
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "尋找改變了指定字串出�次數的差異"
 
-#: diff.c:5607
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr "尋找改變指定正則符�出�次數的差異"
 
-#: diff.c:5610
+#: diff.c:5579
 msgid "show all changes in the changeset with -S or -G"
 msgstr "顯示使用 -S 或 -G 的變更集的所有變更"
 
-#: diff.c:5613
+#: diff.c:5582
 msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr "將 -S 的 <string> 當�擴展的 POSIX 正�表示�"
+msgstr "將 -S 的 <string> 當�延伸 POSIX 常�表示�"
 
-#: diff.c:5616
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr "控制輸出中的檔案顯示順�"
 
-#: diff.c:5617 diff.c:5620
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<路徑>"
 
-#: diff.c:5618
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "先顯示指定路徑的變更"
 
-#: diff.c:5621
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "略�輸出至指定路徑"
 
-#: diff.c:5623
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<物件 ID>"
 
-#: diff.c:5624
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "尋找改變指定物件出�次數的差異"
 
-#: diff.c:5626
+#: 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:5627
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "��差異類型�擇檔案"
 
-#: diff.c:5629
+#: diff.c:5598
 msgid "<file>"
 msgstr "<檔案>"
 
-#: diff.c:5630
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "輸出到一個指定的檔案"
 
-#: diff.c:6287
-msgid "inexact rename detection was skipped due to too many files."
-msgstr "因為檔案太多，略��嚴格的�新命�檢查。"
+#: diff.c:6257
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr "因為檔案太多，已略�詳細�新命��測。"
 
-#: diff.c:6290
+#: diff.c:6260
 msgid "only found copies from modified paths due to too many files."
 msgstr "因為檔案太多，�在修改的路徑中尋找複製。"
 
-#: diff.c:6293
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -4067,7 +3827,7 @@ msgstr "您å�¯èƒ½æƒ³è¦�將變數 %s 設定為至少 %d 並å†�次執行此指令ã
 msgid "failed to read orderfile '%s'"
 msgstr "讀�排�檔案 '%s' 失敗"
 
-#: diffcore-rename.c:1418
+#: diffcore-rename.c:1564
 msgid "Performing inexact rename detection"
 msgstr "正在進行�精確的�新命��測"
 
@@ -4076,59 +3836,67 @@ msgstr "正在進行�精確的�新命��測"
 msgid "No such path '%s' in the diff"
 msgstr "diff 中沒有「%s�路徑"
 
-#: dir.c:578
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "路徑�格 '%s' 未符�任何 git 已知檔案"
 
-#: dir.c:718 dir.c:747 dir.c:760
+#: dir.c:733 dir.c:762 dir.c:775
 #, c-format
 msgid "unrecognized pattern: '%s'"
 msgstr "無法識別樣�：「%s�"
 
-#: dir.c:777 dir.c:791
+#: dir.c:790 dir.c:804
 #, c-format
 msgid "unrecognized negative pattern: '%s'"
 msgstr "無法識別��模�：「%s�"
 
-#: dir.c:809
+#: dir.c:820
 #, c-format
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr "您的稀�檢出檔案�能有�題：「%s�樣��複"
+msgstr "您的稀�簽出檔案�能有�題：「%s�樣��複"
 
-#: dir.c:819
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "�用 cone 樣�符�模�"
 
-#: dir.c:1206
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "�能將 %s 用作排除檔案"
 
-#: dir.c:2314
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "�能開啟目錄 '%s'"
 
-#: dir.c:2614
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr "無法�得核心�稱和訊�"
 
-#: dir.c:2738
+#: dir.c:2844
 msgid "untracked cache is disabled on this system or location"
 msgstr "快�未追蹤檔案在本系統或�置中被�用"
 
-#: dir.c:3543
+#: dir.c:3112
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"無法猜到目錄�。\n"
+"請在指令列指定一個目錄"
+
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "版本庫 %s 中的索引檔案�壞"
 
-#: dir.c:3590 dir.c:3595
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr "�能為 %s 建立目錄"
 
-#: dir.c:3624
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "�能從 '%s' �移 git 目錄到 '%s'"
@@ -4147,293 +3915,354 @@ msgstr "�濾內容"
 msgid "could not stat file '%s'"
 msgstr "�能�檔案 '%s' 呼� stat"
 
-#: environment.c:152
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "錯誤的 git �字空間路徑 \"%s\""
 
-#: environment.c:335
-#, c-format
-msgid "could not set GIT_DIR to '%s'"
-msgstr "�能設定 GIT_DIR 為 '%s'"
-
 #: exec-cmd.c:363
 #, c-format
 msgid "too many args to run %s"
 msgstr "執行 %s 的�數太多"
 
-#: fetch-pack.c:182
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack：應為 shallow 列表"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"
 
-#: fetch-pack.c:196
+#: 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:216
+#: 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:227
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "無法寫到�端"
 
-#: fetch-pack.c:288
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc 需� multi_ack_detailed"
-
-#: fetch-pack.c:383 fetch-pack.c:1423
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "無效的 shallow 訊�：%s"
 
-#: fetch-pack.c:389 fetch-pack.c:1429
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "無效的 unshallow 訊�：%s"
 
-#: fetch-pack.c:391 fetch-pack.c:1431
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "物件未找到：%s"
 
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "物件中發生錯誤：%s"
 
-#: fetch-pack.c:396 fetch-pack.c:1436
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "未發� shallow：%s"
 
-#: fetch-pack.c:399 fetch-pack.c:1440
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "應為 shallow/unshallow，�得到 %s"
 
-#: fetch-pack.c:439
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "得到 %s %d %s"
 
-#: fetch-pack.c:456
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "無效�交 %s"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "放棄"
 
-#: fetch-pack.c:500 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "完�"
 
-#: fetch-pack.c:512
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "得到 %s (%d) %s"
 
-#: fetch-pack.c:548
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "標記 %s 為完�"
 
-#: fetch-pack.c:763
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "已經有 %s（%s）"
 
-#: fetch-pack.c:849
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack：無法�生 sideband 多路輸出"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "�定錯誤：壞的包頭"
 
-#: fetch-pack.c:951
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack：無法 fork %s 處�程�"
 
-#: fetch-pack.c:957
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack：無效的 index-pack 輸出"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "%s 失敗"
 
-#: fetch-pack.c:976
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "sideband 多路輸出發生錯誤"
 
-#: fetch-pack.c:1019
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "伺�器版本 %.*s"
 
-#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042
-#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058
+#: 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:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096
+#: 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:1029
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
-msgstr "伺�器�支� shalllow 用戶端"
+msgstr "伺�器�支� shallow 用戶端"
 
-#: fetch-pack.c:1089
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "伺�器�支� --shallow-since"
 
-#: fetch-pack.c:1094
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "伺�器�支� --shallow-exclude"
 
-#: fetch-pack.c:1098
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "伺�器�支� --deepen"
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
 msgstr "伺�器�支�此版本庫的物件格�"
 
-#: fetch-pack.c:1113
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "沒有共�的�交"
 
-#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
-msgstr "來�版本庫是淺版本庫 (shallow)。拒絕 clone。"
+msgstr "來�版本庫是淺版本庫 (shallow)。拒絕複製。"
 
-#: fetch-pack.c:1128 fetch-pack.c:1651
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack：�得失敗。"
 
-#: fetch-pack.c:1242
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "算法�一致：用戶端 %s；伺�器 %s"
 
-#: fetch-pack.c:1246
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "伺�器�支�「%s�算法"
 
-#: fetch-pack.c:1279
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
-msgstr "伺�器�支� shalllow 請求"
+msgstr "伺�器�支� shallow 請求"
 
-#: fetch-pack.c:1286
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "伺�器支� filter"
 
-#: fetch-pack.c:1329 fetch-pack.c:2034
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
 msgstr "無法將請求寫到�端"
 
-#: fetch-pack.c:1347
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "讀�節標題 '%s' 發生錯誤"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "�期 '%s'，得到 '%s'"
 
-#: fetch-pack.c:1387
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "�外的確�行：'%s'"
 
-#: fetch-pack.c:1392
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "處� ack 發生錯誤：%d"
 
-#: fetch-pack.c:1402
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr "�期在 'ready' 之後傳� packfile"
 
-#: fetch-pack.c:1404
+#: fetch-pack.c:1420
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "在沒有 'ready' �應該傳�其它�節"
 
-#: fetch-pack.c:1445
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "處�淺複製訊�發生錯誤：%d"
 
-#: fetch-pack.c:1494
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "�期 wanted-ref，得到 '%s'"
 
-#: fetch-pack.c:1499
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "�外的 wanted-ref：'%s'"
 
-#: fetch-pack.c:1504
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "處���得的引用發生錯誤：%d"
 
-#: fetch-pack.c:1534
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack: �期�有回應���包"
 
-#: fetch-pack.c:1930
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "沒有符�的�端分支"
 
-#: fetch-pack.c:1953 builtin/clone.c:697
+#: fetch-pack.c:1982 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
 msgstr "�端沒有傳�所有必需的物件"
 
-#: fetch-pack.c:2056
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "從�端收到��期的 ‘ready’"
 
-#: fetch-pack.c:2079
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "沒有這樣的�端引用 %s"
 
-#: fetch-pack.c:2082
+#: fetch-pack.c:2111
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "伺�器��許請求未公開的物件 %s"
 
-#: gpg-interface.c:273
+#: 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:276
+#: gpg-interface.c:332 gpg-interface.c:460
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "無法將分離�簽�寫入 '%s'"
 
-#: gpg-interface.c:470
+#: 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:480
+msgid ""
+"ssh-keygen -Y find-principals/verify is needed for ssh signature "
+"verification (available in openssh version 8.2p1+)"
+msgstr ""
+"SSH 簽�驗證需� ssh-keygen -Y find-principals/verify（�以在 openssh 8.2p1+ "
+"版本使用）"
+
+#: gpg-interface.c:536
+#, c-format
+msgid "ssh signing revocation file configured but not found: %s"
+msgstr "有設定 SSH 簽�廢止檔案，但找�到檔案本體：%s"
+
+#: gpg-interface.c:624
+#, c-format
+msgid "bad/incompatible signature '%s'"
+msgstr "簽�「%s��壞或者�相容"
+
+#: 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:829
+msgid ""
+"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
+msgstr "需�設定 user.signingkey 或 gpg.ssh.defaultKeyCommand 任一"
+
+#: 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:857
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
+msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s"
+
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr "gpg 無法為資料簽�"
 
+#: gpg-interface.c:967
+msgid "user.signingkey needs to be set for ssh signing"
+msgstr "需�設定 user.signingkey �能進行 SSH 簽�"
+
+#: gpg-interface.c:978
+#, c-format
+msgid "failed writing ssh signing key to '%s'"
+msgstr "無法將 SSH 簽�金鑰寫入「%s�"
+
+#: gpg-interface.c:996
+#, c-format
+msgid "failed writing ssh signing key buffer to '%s'"
+msgstr "無法將 SSH 簽�金鑰緩��寫入「%s�"
+
+#: 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:1026
+#, c-format
+msgid "failed reading ssh signing data buffer from '%s'"
+msgstr "無法從「%s�讀� SSH 簽�資料緩��"
+
 #: graph.c:98
 #, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr "忽略 log.graphColors 中無效的�色 '%.*s'"
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "已忽略 log.graphColors 中無效的 “%.*s� 色彩"
 
 #: grep.c:531
 msgid ""
@@ -4443,109 +4272,109 @@ msgstr ""
 "�供的模�包� NULL 字元（通� -f <檔案> �數）。�有 PCRE v2 下的 -P 支�此"
 "功能"
 
-#: grep.c:1893
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s'：無法讀� %s"
 
-#: grep.c:1910 setup.c:176 builtin/clone.c:416 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:1921
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s'：讀��完整"
 
-#: help.c:23
+#: help.c:24
 msgid "start a working area (see also: git help tutorial)"
 msgstr "開始一個工作�（�見：git help tutorial）"
 
-#: help.c:24
+#: help.c:25
 msgid "work on the current change (see also: git help everyday)"
 msgstr "在目�變更上工作（�見：git help everyday）"
 
-#: help.c:25
+#: help.c:26
 msgid "examine the history and state (see also: git help revisions)"
 msgstr "檢查歷�和狀態（�見：git help revisions）"
 
-#: help.c:26
+#: help.c:27
 msgid "grow, mark and tweak your common history"
 msgstr "擴展�標記和調校您的歷�記錄"
 
-#: help.c:27
+#: help.c:28
 msgid "collaborate (see also: git help workflows)"
 msgstr "��（�見：git help workflows）"
 
-#: help.c:31
+#: help.c:32
 msgid "Main Porcelain Commands"
 msgstr "主�的上層指令"
 
-#: help.c:32
+#: help.c:33
 msgid "Ancillary Commands / Manipulators"
 msgstr "輔助指令/動作者"
 
-#: help.c:33
+#: help.c:34
 msgid "Ancillary Commands / Interrogators"
 msgstr "輔助指令/詢�者"
 
-#: help.c:34
+#: help.c:35
 msgid "Interacting with Others"
 msgstr "與其它系統互動"
 
-#: help.c:35
+#: help.c:36
 msgid "Low-level Commands / Manipulators"
 msgstr "低級指令/動作者"
 
-#: help.c:36
+#: help.c:37
 msgid "Low-level Commands / Interrogators"
 msgstr "低級指令/詢�者"
 
-#: help.c:37
+#: help.c:38
 msgid "Low-level Commands / Syncing Repositories"
 msgstr "低級指令 / �步版本庫"
 
-#: help.c:38
+#: help.c:39
 msgid "Low-level Commands / Internal Helpers"
 msgstr "低級指令/內部�助工具"
 
-#: help.c:300
+#: help.c:313
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "在 '%s' 下�用的 git 指令"
 
-#: help.c:307
+#: help.c:320
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "在 $PATH 路徑中的其他地方�用的 git 指令"
 
-#: help.c:316
+#: help.c:329
 msgid "These are common Git commands used in various situations:"
 msgstr "這些是�種場�常見的 Git 指令："
 
-#: help.c:365 git.c:100
+#: help.c:378 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "�支�的指令列表類型 '%s'"
 
-#: help.c:405
+#: help.c:418
 msgid "The Git concept guides are:"
 msgstr "Git 概念嚮導有："
 
-#: help.c:429
+#: help.c:442
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr "執行　'git help <command>' 來檢視特定�指令"
 
-#: help.c:434
+#: help.c:447
 msgid "External commands"
 msgstr "外部指令"
 
-#: help.c:449
+#: help.c:462
 msgid "Command aliases"
 msgstr "指令別�"
 
-#: help.c:527
+#: help.c:543
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -4554,31 +4383,36 @@ msgstr ""
 "'%s' �是一個 git 指令，但�無法執行。\n"
 "�能是 git-%s ��？"
 
-#: help.c:543 help.c:631
+#: help.c:565 help.c:662
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git：'%s' �是一個 git 指令。�見 'git --help'。"
 
-#: help.c:591
+#: help.c:613
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "唉呀，您的系統中未發� Git 指令。"
 
-#: help.c:613
+#: help.c:635
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr "警告：您執行了一個並�存在的 Git 指令 '%s'。"
 
-#: help.c:618
+#: help.c:640
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "�定你想�的是 '%s' 並繼續。"
 
-#: help.c:623
+#: help.c:646
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "改執行「%s�[y/N]？ "
+
+#: help.c:654
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr "�定你想�的是 '%2$s'，在 %1$0.1f 秒�後繼續。"
 
-#: help.c:635
+#: help.c:666
 msgid ""
 "\n"
 "The most similar command is"
@@ -4589,16 +4423,16 @@ msgstr[0] ""
 "\n"
 "最類似的指令有"
 
-#: help.c:675
+#: help.c:706
 msgid "git version [<options>]"
 msgstr "git version [<�項>]"
 
-#: help.c:730
+#: help.c:761
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s：%s - %s"
 
-#: help.c:734
+#: help.c:765
 msgid ""
 "\n"
 "Did you mean this?"
@@ -4609,6 +4443,15 @@ msgstr[0] ""
 "\n"
 "您指的是這個嗎？"
 
+#: hook.c:27
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"因為沒有將掛鉤 '%s' 設定為�執行，掛鉤被忽略。您�以��\n"
+"設定 `git config advice.ignoredHook false` 來關閉這�警告。"
+
 #: ident.c:353
 msgid "Author identity unknown\n"
 msgstr "作者身分未知\n"
@@ -4640,7 +4483,8 @@ msgstr ""
 "  git config --global user.name \"Your Name\"\n"
 "\n"
 "來設定您帳號的�設身份標記。\n"
-"如果僅在本版本庫設定身份標記，則�略 --global �數。\n"
+"若��在這個版本庫設定身份標記，請�略 --global �數。\n"
+"\n"
 
 #: ident.c:397
 msgid "no email was given and auto-detection is disabled"
@@ -4670,7 +4514,7 @@ msgstr "��許空的姓�（�於 <%s>）"
 msgid "name consists only of disallowed characters: %s"
 msgstr "姓�中僅包��用字元：%s"
 
-#: ident.c:454 builtin/commit.c:647
+#: ident.c:454 builtin/commit.c:648
 #, c-format
 msgid "invalid date format: %s"
 msgstr "無效的日期格�：%s"
@@ -4685,13 +4529,13 @@ msgstr "sparse:path �濾器支�已被刪除"
 
 #: list-objects-filter-options.c:105
 #, c-format
-msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
 msgstr "“object:type=<type>� 的 “%s� �是有效的物件格�"
 
 #: list-objects-filter-options.c:124
 #, c-format
 msgid "invalid filter-spec '%s'"
-msgstr "無效的�濾器表�� '%s'"
+msgstr "無效的�濾器�格 '%s'"
 
 #: list-objects-filter-options.c:140
 #, c-format
@@ -4730,7 +4574,7 @@ msgstr "樹 %2$s 中的æ¢�ç›® '%1$s' 具有樹的屬性，但ä¸�是一個樹狀ç
 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
 msgstr "樹 %2$s 中的�目 '%1$s' 具有資料物件的屬性，但�是一個資料物件"
 
-#: list-objects.c:395
+#: list-objects.c:398
 #, c-format
 msgid "unable to load root tree for commit %s"
 msgstr "無法為�交 %s 載入根樹"
@@ -4748,10 +4592,11 @@ msgid ""
 msgstr ""
 "無法建立 '%s.lock'：%s。\n"
 "\n"
-"似乎�外一個 git 進程在這個版本庫中執行，例如：'git commit' 指令打\n"
-"開了一個編輯器。請確�所有進程都已經關閉然後�試。如果�然報錯，\n"
-"�能之�有一個 git 進程在這個版本庫中異常離開：\n"
-"手動刪除這個檔案�繼續。"
+"這個版本庫似乎有�一個 git 處�程�在執行，\n"
+"例如「git commit�命令開啟的編輯器。\n"
+"請確�所有處�程�都已經終止後��試一次。如果錯誤沒有消失，\n"
+"有�能是之�在這個版本庫執行的 git 處�程�當掉了。\n"
+"如果是這樣，請自行刪除這個檔案�繼續。"
 
 #: lockfile.c:160
 #, c-format
@@ -4763,7 +4608,12 @@ msgstr "�能建立 '%s.lock'：%s"
 msgid "invalid value '%s' for lsrefs.unborn"
 msgstr "lsrefs.unborn 的值「%s�無效"
 
-#: ls-refs.c:167
+#: ls-refs.c:174
+#, c-format
+msgid "unexpected line: '%s'"
+msgstr "�到��期橫列：「%s�"
+
+#: ls-refs.c:178
 msgid "expected flush after ls-refs arguments"
 msgstr "在 ls-refs 引數之後應該有一個 flush 包"
 
@@ -4771,37 +4621,37 @@ msgstr "在 ls-refs 引數之後應該有一個 flush 包"
 msgid "quoted CRLF detected"
 msgstr "�測到由�列�字元 (quoted) 所組�的 CRLF"
 
-#: mailinfo.c:1254 builtin/am.c:176 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�無效"
 
-#: merge-ort.c:1116 merge-recursive.c:1205
+#: merge-ort.c:1584 merge-recursive.c:1211
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
-msgstr "無法�併�模組 %s （沒有檢出）"
+msgstr "無法�併�模組 %s （沒有簽出）"
 
-#: merge-ort.c:1125 merge-recursive.c:1212
+#: merge-ort.c:1593 merge-recursive.c:1218
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "無法�併�模組 %s（�交�存在）"
 
-#: merge-ort.c:1134 merge-recursive.c:1219
+#: merge-ort.c:1602 merge-recursive.c:1225
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr "無法�併�模組 %s （�交未跟隨�併基礎）"
 
-#: merge-ort.c:1144 merge-ort.c:1151
+#: merge-ort.c:1612 merge-ort.c:1620
 #, c-format
 msgid "Note: Fast-forwarding submodule %s to %s"
 msgstr "注�：正在將 %s �模組快轉到 %s"
 
-#: merge-ort.c:1172
+#: merge-ort.c:1642
 #, c-format
 msgid "Failed to merge submodule %s"
 msgstr "無法�併 %s �模組"
 
-#: merge-ort.c:1179
+#: merge-ort.c:1649
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4810,7 +4660,7 @@ msgstr ""
 "無法�併 %s �模組，但有找到一個�行的�併方案：\n"
 "%s\n"
 
-#: merge-ort.c:1183 merge-recursive.c:1273
+#: merge-ort.c:1653 merge-recursive.c:1281
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -4820,13 +4670,13 @@ msgid ""
 "\n"
 "which will accept this suggestion.\n"
 msgstr ""
-"如果這個正確，將其新增到索引，例如使用指令：\n"
+"正確的話，就能直接加進索引，例如執行下述命令：\n"
 "\n"
 "  git update-index --cacheinfo 160000 %s \"%s\"\n"
 "\n"
-"以接�此建議。\n"
+"接�本建議。\n"
 
-#: merge-ort.c:1196
+#: merge-ort.c:1666
 #, c-format
 msgid ""
 "Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4835,21 +4685,21 @@ msgstr ""
 "無法�併 %s �模組，但有找到幾個�行的�併方案：\n"
 "%s"
 
-#: merge-ort.c:1415 merge-recursive.c:1362
+#: merge-ort.c:1887 merge-recursive.c:1372
 msgid "Failed to execute internal merge"
 msgstr "無法執行內部�併"
 
-#: merge-ort.c:1420 merge-recursive.c:1367
+#: merge-ort.c:1892 merge-recursive.c:1377
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "�能新增 %s 至物件庫"
 
-#: merge-ort.c:1427 merge-recursive.c:1400
+#: merge-ort.c:1899 merge-recursive.c:1410
 #, c-format
 msgid "Auto-merging %s"
 msgstr "自動�併 %s"
 
-#: merge-ort.c:1566 merge-recursive.c:2122
+#: merge-ort.c:2038 merge-recursive.c:2132
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4858,7 +4708,7 @@ msgstr ""
 "��（隱�目錄�新命�）：處於隱�目錄�新命�的�存檔案/目錄 %s，將以下路徑"
 "放在：%s。"
 
-#: merge-ort.c:1576 merge-recursive.c:2132
+#: merge-ort.c:2048 merge-recursive.c:2142
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4867,24 +4717,24 @@ msgstr ""
 "��（隱�目錄�新命�）：無法映射一個以上路徑到 %s，隱�目錄�新命�嘗試將這"
 "些路徑放置於此：%s"
 
-#: merge-ort.c:1634
-#, fuzzy, c-format
+#: merge-ort.c:2106
+#, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
 "renamed to multiple other directories, with no destination getting a "
 "majority of the files."
 msgstr ""
-"��（分割的目錄�新命�）：未知 %s 應�新命��什麼。其已�新命�為多個其他"
-"目錄，�沒有目的地�得檔案的主�部分。"
+"��（分割的目錄�新命�）：未知 %s �新命�的�置。它被�新命�為多個其他目"
+"錄，但沒有目的地�得��檔案。"
 
-#: merge-ort.c:1788 merge-recursive.c:2468
+#: merge-ort.c:2260 merge-recursive.c:2478
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
 "renamed."
 msgstr "警告：��套用 %s -> %s 的�新命�到 %s，因為 %s 本身已被�新命�。"
 
-#: merge-ort.c:1932 merge-recursive.c:3244
+#: merge-ort.c:2400 merge-recursive.c:3261
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4892,7 +4742,7 @@ msgid ""
 msgstr ""
 "路徑已更新：%s 新增到 %s，�於一個被�新命�到 %s 的目錄中，將其移動到 %s。"
 
-#: merge-ort.c:1939 merge-recursive.c:3251
+#: merge-ort.c:2407 merge-recursive.c:3268
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4901,7 +4751,7 @@ msgstr ""
 "路徑已更新：%1$s �新命�為 %3$s 中的 %2$s，而該目錄被�新命�到 %4$s 中，將"
 "其移動到 %5$s。"
 
-#: merge-ort.c:1952 merge-recursive.c:3247
+#: merge-ort.c:2420 merge-recursive.c:3264
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4910,7 +4760,7 @@ msgstr ""
 "��（檔案�置）：%s 新增到 %s，�於一個被�新命�為 %s 的目錄中，建議將其移"
 "動到 %s。"
 
-#: merge-ort.c:1960 merge-recursive.c:3254
+#: merge-ort.c:2428 merge-recursive.c:3271
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4919,14 +4769,14 @@ msgstr ""
 "��（檔案�置）：%1$s �新命�為 %3$s 中的 %2$s，而該目錄被�新命�到 %4$s "
 "中，建議將其移動到 %5$s。"
 
-#: merge-ort.c:2103
+#: merge-ort.c:2584
 #, c-format
 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
 msgstr ""
 "��（�新命�/�新命�）：%1$s 已�新命�為 %3$s 中的 %2$s 和 %5$s 中的 "
 "%4$s。"
 
-#: merge-ort.c:2198
+#: merge-ort.c:2679
 #, c-format
 msgid ""
 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4936,65 +4786,65 @@ msgstr ""
 "��（�新命�陷入相撞）：%s -> %s 這個�新命�有內容��並與其他路徑相撞，�"
 "能會因此出�巢狀��標記。"
 
-#: merge-ort.c:2217 merge-ort.c:2241
+#: merge-ort.c:2698 merge-ort.c:2722
 #, c-format
 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr ""
 "��（�新命�/刪除）：%1$s 已�新命�為 %3$s 中的 %2$s �在 %4$s 中被刪除。"
 
-#: merge-ort.c:2550 merge-recursive.c:3002
+#: merge-ort.c:3212 merge-recursive.c:3022
 #, c-format
 msgid "cannot read object %s"
 msgstr "�能讀�物件 %s"
 
-#: merge-ort.c:2553 merge-recursive.c:3005
+#: merge-ort.c:3215 merge-recursive.c:3025
 #, c-format
 msgid "object %s is not a blob"
 msgstr "物件 %s �是一個資料物件"
 
-#: merge-ort.c:2981
-#, fuzzy, c-format
+#: merge-ort.c:3644
+#, c-format
 msgid ""
 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
 "%s instead."
-msgstr "��（檔案/目錄）：目錄擋�來自 %2$s 的 %1$s。改移動到 %3$s。"
+msgstr "��（檔案/目錄）：目錄佔� %2$s 中 %1$s 的�置。改移動到 %3$s。"
 
-#: merge-ort.c:3055
-#, fuzzy, c-format
+#: merge-ort.c:3721
+#, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed both "
 "of them so each can be recorded somewhere."
 msgstr ""
-"��（類型有異）：�個來�的 %s 類型��。已經�新命�這兩個來�，這樣�個來"
-"�都�以分別記錄。"
+"��（類型有異）：兩方的 %s 類型皆��。已經�新命�這兩個來�，這樣就�以分"
+"別記錄這兩方檔案。"
 
-#: merge-ort.c:3062
-#, fuzzy, c-format
+#: merge-ort.c:3728
+#, c-format
 msgid ""
 "CONFLICT (distinct types): %s had different types on each side; renamed one "
 "of them so each can be recorded somewhere."
 msgstr ""
-"��（類型有異）：�個來�的 %s 類型��。已經�新命�其中一個來�，這樣�個"
-"來�都�以分別記錄。"
+"��（類型有異）：兩方的 %s 類型皆��。已經�新命�其中一個來�，這樣就�以"
+"分別記錄這兩方檔案。"
 
-#: merge-ort.c:3162 merge-recursive.c:3081
+#: merge-ort.c:3819 merge-recursive.c:3101
 msgid "content"
 msgstr "內容"
 
-#: merge-ort.c:3164 merge-recursive.c:3085
+#: merge-ort.c:3821 merge-recursive.c:3105
 msgid "add/add"
 msgstr "新增/新增"
 
-#: merge-ort.c:3166 merge-recursive.c:3130
+#: merge-ort.c:3823 merge-recursive.c:3150
 msgid "submodule"
 msgstr "�模組"
 
-#: merge-ort.c:3168 merge-recursive.c:3131
+#: merge-ort.c:3825 merge-recursive.c:3151
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "��（%s）：�併��於 %s"
 
-#: merge-ort.c:3198
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -5003,7 +4853,7 @@ msgstr ""
 "��（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹"
 "上。"
 
-#: merge-ort.c:3433
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5013,12 +4863,12 @@ 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:3730
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr "%s, %s, %s 樹的�併資訊收集失敗"
 
-#: merge-ort-wrappers.c:13 merge-recursive.c:3699
+#: merge-ort-wrappers.c:13 merge-recursive.c:3716
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -5027,103 +4877,103 @@ msgstr ""
 "您�下列檔案的本機修改將被�併動作覆蓋：\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "已經是最新的。"
 
-#: merge-recursive.c:356
+#: merge-recursive.c:353
 msgid "(bad commit)\n"
 msgstr "（壞�交）\n"
 
-#: merge-recursive.c:379
+#: merge-recursive.c:381
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "add_cacheinfo �路徑 '%s' 執行失敗，�併終止。"
 
-#: merge-recursive.c:388
+#: merge-recursive.c:390
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr "add_cacheinfo 無法�新整�路徑 '%s'，�併終止。"
 
-#: merge-recursive.c:876
+#: merge-recursive.c:881
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "建立路徑 '%s'%s 失敗"
 
-#: merge-recursive.c:887
+#: merge-recursive.c:892
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "刪除 %s 以便為�目錄留出空間\n"
 
-#: merge-recursive.c:901 merge-recursive.c:920
+#: merge-recursive.c:906 merge-recursive.c:925
 msgid ": perhaps a D/F conflict?"
 msgstr "：�能是一個目錄/檔案��？"
 
-#: merge-recursive.c:910
+#: merge-recursive.c:915
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "拒絕�棄 '%s' 中的未追蹤檔案"
 
-#: merge-recursive.c:951 builtin/cat-file.c:41
+#: merge-recursive.c:956 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "�能讀�物件 %s '%s'"
 
-#: merge-recursive.c:956
+#: merge-recursive.c:961
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "%s '%s' 應為資料物件"
 
-#: merge-recursive.c:981
+#: merge-recursive.c:986
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "開啟 '%s' 失敗：%s"
 
-#: merge-recursive.c:992
+#: merge-recursive.c:997
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "建立符號連� '%s' 失敗：%s"
 
-#: merge-recursive.c:997
+#: merge-recursive.c:1002
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "�知�如何處� %06o %s '%s'"
 
-#: merge-recursive.c:1227 merge-recursive.c:1239
+#: merge-recursive.c:1233 merge-recursive.c:1246
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "�模組 %s 快轉到如下�交："
 
-#: merge-recursive.c:1230 merge-recursive.c:1242
+#: merge-recursive.c:1236 merge-recursive.c:1249
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "快轉�模組 %s"
 
-#: merge-recursive.c:1265
+#: merge-recursive.c:1273
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr "無法�併�模組 %s （沒發��併跟隨的�交）"
 
-#: merge-recursive.c:1269
+#: merge-recursive.c:1277
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "無法�併�模組 %s（�快轉）"
 
-#: merge-recursive.c:1270
+#: merge-recursive.c:1278
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "找到�模組的一個�能的�併方案：\n"
 
-#: merge-recursive.c:1282
+#: merge-recursive.c:1290
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "無法�併�模組 %s （發�多個�併）"
 
-#: merge-recursive.c:1424
+#: merge-recursive.c:1434
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr "錯誤：拒絕�失未追蹤檔案 '%s'，而是寫入 %s。"
 
-#: merge-recursive.c:1496
+#: merge-recursive.c:1506
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5132,7 +4982,7 @@ msgstr ""
 "��（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
 "本被�留。"
 
-#: merge-recursive.c:1501
+#: merge-recursive.c:1511
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5141,7 +4991,7 @@ msgstr ""
 "��（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
 "%7$s 版本被�留。"
 
-#: merge-recursive.c:1508
+#: merge-recursive.c:1518
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5150,7 +5000,7 @@ msgstr ""
 "��（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
 "本�留在 %8$s 中。"
 
-#: merge-recursive.c:1513
+#: merge-recursive.c:1523
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5159,41 +5009,41 @@ msgstr ""
 "��（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
 "%7$s 版本�留在 %9$s 中。"
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "rename"
 msgstr "�新命�"
 
-#: merge-recursive.c:1548
+#: merge-recursive.c:1558
 msgid "renamed"
 msgstr "�新命�"
 
-#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
+#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "拒絕�失髒檔案 '%s'"
 
-#: merge-recursive.c:1609
+#: merge-recursive.c:1619
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr "拒絕在 '%s' 處失去未追蹤檔案，�使它存在於�新命�中。"
 
-#: merge-recursive.c:1667
+#: merge-recursive.c:1677
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "��（�新命�/新增）：在 %3$s 中�新命� %1$s->%2$s。在 %5$s 中新增 %4$s"
 
-#: merge-recursive.c:1698
+#: merge-recursive.c:1708
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s 是 %s 中的一個目錄而已 %s 為�被新增"
 
-#: merge-recursive.c:1703
+#: merge-recursive.c:1713
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr "拒絕�失未追蹤檔案 '%s'，而是新增為 %s"
 
-#: merge-recursive.c:1730
+#: merge-recursive.c:1740
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5202,18 +5052,18 @@ msgstr ""
 "��（�新命�/�新命�）：在分支 \"%3$s\" 中�新命� \"%1$s\"->\"%2$s\"，在"
 "分支 \"%6$s\" 中�新命� \"%4$s\"->\"%5$s\"%7$s"
 
-#: merge-recursive.c:1735
+#: merge-recursive.c:1745
 msgid " (left unresolved)"
 msgstr " （留下未解決）"
 
-#: merge-recursive.c:1827
+#: merge-recursive.c:1837
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "��（�新命�/�新命�）：在 %3$s 中�新命� %1$s->%2$s，在 %6$s 中�新命� "
 "%4$s->%5$s"
 
-#: merge-recursive.c:2090
+#: merge-recursive.c:2100
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5223,7 +5073,7 @@ msgstr ""
 "��（分割的目錄�新命�）：�清楚 %s 應該放在哪裡，因為目錄 %s 被�新命�到"
 "多個其它目錄，沒有目錄包�大部分檔案。"
 
-#: merge-recursive.c:2224
+#: merge-recursive.c:2234
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5232,78 +5082,78 @@ msgstr ""
 "��（�新命�/�新命�）：在 %3$s 中�新命�目錄 %1$s->%2$s，在 %6$s 中�新"
 "命�目錄 %4$s->%5$s"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modify"
 msgstr "修改"
 
-#: merge-recursive.c:3069
+#: merge-recursive.c:3089
 msgid "modified"
 msgstr "修改"
 
-#: merge-recursive.c:3108
+#: merge-recursive.c:3128
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "略� %s（已經��相��併）"
 
-#: merge-recursive.c:3161
+#: merge-recursive.c:3181
 #, c-format
 msgid "Adding as %s instead"
 msgstr "而是以 %s 為�新增"
 
-#: merge-recursive.c:3368
+#: merge-recursive.c:3385
 #, c-format
 msgid "Removing %s"
 msgstr "刪除 %s"
 
-#: merge-recursive.c:3391
+#: merge-recursive.c:3408
 msgid "file/directory"
 msgstr "檔案/目錄"
 
-#: merge-recursive.c:3396
+#: merge-recursive.c:3413
 msgid "directory/file"
 msgstr "目錄/檔案"
 
-#: merge-recursive.c:3403
+#: merge-recursive.c:3420
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr "��（%1$s）：在 %3$s 中有一個�為 %2$s 的目錄。以 %5$s 為�新增 %4$s"
 
-#: merge-recursive.c:3412
+#: merge-recursive.c:3429
 #, c-format
 msgid "Adding %s"
 msgstr "新增 %s"
 
-#: merge-recursive.c:3421
+#: merge-recursive.c:3438
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "��（add/add）：�併��於 %s"
 
-#: merge-recursive.c:3474
+#: merge-recursive.c:3491
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "無法�併樹 %s 和 %s"
 
-#: merge-recursive.c:3568
+#: merge-recursive.c:3585
 msgid "Merging:"
 msgstr "�併："
 
-#: merge-recursive.c:3581
+#: merge-recursive.c:3598
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "發� %u 個共�祖先："
 
-#: merge-recursive.c:3631
+#: merge-recursive.c:3648
 msgid "merge returned no commit"
 msgstr "�併未返回�交"
 
-#: merge-recursive.c:3796
+#: merge-recursive.c:3816
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "�能解�物件 '%s'"
 
-#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
-#: builtin/stash.c:473
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
+#: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr "�能寫入索引。"
 
@@ -5311,181 +5161,221 @@ msgstr "�能寫入索引。"
 msgid "failed to read the cache"
 msgstr "讀�快�失敗"
 
-#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
-#: builtin/stash.c:267
+#: 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 "無法寫新的索引檔案"
 
-#: midx.c:74
+#: midx.c:78
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "多包索引的物件 ID fanout 大�錯誤"
 
-#: midx.c:105
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "多包索引檔案 %s 太�"
 
-#: midx.c:121
+#: 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:126
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-index 版本 %d �能被識別"
 
-#: midx.c:131
+#: 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:148
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "多包索引缺少必需的包��塊"
 
-#: midx.c:150
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "多包索引缺少必需的物件 ID fanout �塊"
 
-#: midx.c:152
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "多包索引缺少必需的物件 ID 查詢�塊"
 
-#: midx.c:154
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "多包索引缺少必需的物件�移�塊"
 
-#: midx.c:170
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "多包索引包�無�：'%s' 在 '%s' 之�"
 
-#: midx.c:214
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "錯的 pack-int-id：%u（共有 %u 個包）"
 
-#: midx.c:264
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr "多包索引儲存一個64��移，但是 off_t 太�"
 
-#: midx.c:490
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "新增 packfile '%s' 失敗"
 
-#: midx.c:496
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "開啟包索引 '%s' 失敗"
 
-#: midx.c:564
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "在 packfile 中定�物件 %d 失敗"
 
-#: midx.c:880 builtin/index-pack.c:1535
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "無法儲存倒排索引檔案"
 
-#: midx.c:933
-msgid "Adding packfiles to multi-pack-index"
-msgstr "正在新增 packfile 至多包索引"
+#: midx.c:993
+#, c-format
+msgid "could not parse line: %s"
+msgstr "無法解�橫列：%s"
 
-#: midx.c:979
+#: midx.c:995
 #, c-format
-msgid "did not see pack-file %s to drop"
-msgstr "沒有看到��棄的包檔案 %s"
+msgid "malformed line: %s"
+msgstr "橫列格�錯誤：%s"
 
-#: midx.c:1024
+#: midx.c:1162
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "忽略�有的多包索引：總和檢查碼�符"
+
+#: midx.c:1187
+msgid "could not load pack"
+msgstr "無法載入包"
+
+#: midx.c:1193
+#, c-format
+msgid "could not open index for %s"
+msgstr "無法開啟 %s 的索引"
+
+#: midx.c:1204
+msgid "Adding packfiles to multi-pack-index"
+msgstr "正在新增 packfile 至多包索引"
+
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "未知�好包：「%s�"
 
-#: midx.c:1029
+#: midx.c:1292
+#, c-format
+msgid "cannot select preferred pack %s with no objects"
+msgstr "無法���好，沒有物件的 %s 包"
+
+#: midx.c:1324
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "沒有看到��棄的包檔案 %s"
+
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "�好包「%s�已經�期"
 
-#: midx.c:1045
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "沒有�索引的 pack 檔案。"
 
-#: midx.c:1125 builtin/clean.c:37
+#: midx.c:1420
+msgid "could not write multi-pack bitmap"
+msgstr "無法寫入多包�圖"
+
+#: midx.c:1430
+msgid "could not write multi-pack-index"
+msgstr "無法寫入多包索引"
+
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "刪除 %s 失敗"
 
-#: midx.c:1156
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "清��於 %s 的多包索引失敗"
 
-#: midx.c:1214
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr "有 multi-pack-index 檔案，但無法解�"
 
-#: midx.c:1222
+#: midx.c:1593
+msgid "incorrect checksum"
+msgstr "總和檢查碼�正確"
+
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "正在尋找引用的 packfile"
 
-#: midx.c:1237
+#: 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:1242
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "midx 沒有 oid"
 
-#: midx.c:1251
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr "正在驗證多包索引中的物件 ID 順�"
 
-#: midx.c:1260
+#: 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:1280
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "�� packfile 為物件排�"
 
-#: midx.c:1287
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "正在驗證物件�移"
 
-#: midx.c:1303
+#: midx.c:1677
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "為 oid[%d] = %s 載入包�目失敗"
 
-#: midx.c:1309
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "為 packfile %s 載入包索引失敗"
 
-#: midx.c:1318
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "oid[%d] = %s 錯誤的物件�移：%<PRIx64> != %<PRIx64>"
 
-#: midx.c:1343
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "正在計算引用物件"
 
-#: midx.c:1353
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
-msgstr "正在尋找並刪除沒有�考的 packfile"
+msgstr "正在尋找並刪除沒有引用的 packfile"
 
-#: midx.c:1544
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "�能開始 pack-objects"
 
-#: midx.c:1564
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "�能�� pack-objects"
 
@@ -5502,7 +5392,7 @@ msgstr "�能建立 lazy_name 執行緒：%s"
 #: name-hash.c:570
 #, c-format
 msgid "unable to join lazy_name thread: %s"
-msgstr "�能加入 lasy_name 執行緒：%s"
+msgstr "�能加入 lazy_name 執行緒：%s"
 
 #: notes-merge.c:277
 #, c-format
@@ -5543,270 +5433,271 @@ msgstr "拒絕� %s（在 refs/notes/ 之外）寫入註解"
 msgid "Bad %s value: '%s'"
 msgstr "壞的 %s 值：'%s'"
 
-#: object-file.c:526
+#: 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:577
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "無法�範化備用物件路徑：%s"
 
-#: object-file.c:649
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s：忽略備用物件庫，嵌套太深"
 
-#: object-file.c:656
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "無法�範化物件目錄: %s"
 
-#: object-file.c:699
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "無法 fdopen �代鎖檔案"
 
-#: object-file.c:717
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "無法讀�替代檔案"
 
-#: object-file.c:724
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr "無法將新的替代檔案移動到�"
 
-#: object-file.c:759
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "路徑 '%s' �存在"
 
-#: object-file.c:780
+#: object-file.c:762
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "尚�支�將�考版本庫 '%s' 作為一個連�檢出。"
+msgstr "尚�支�將引用版本庫 '%s' 作為一個連�簽出。"
 
-#: object-file.c:786
+#: object-file.c:768
 #, c-format
 msgid "reference repository '%s' is not a local repository."
-msgstr "�考版本庫 '%s' �是一個本機版本庫。"
+msgstr "引用版本庫 '%s' �是一個本機版本庫。"
 
-#: object-file.c:792
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
-msgstr "�考版本庫 '%s' 是一個淺複製"
+msgstr "引用版本庫 '%s' 是一個淺複製"
 
-#: object-file.c:800
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
-msgstr "�考版本庫 '%s' 已被移�"
+msgstr "引用版本庫 '%s' 已被移�"
+
+#: object-file.c:813
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "找�到符� %s 的物件目錄"
 
-#: object-file.c:860
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "解�備用引用時無效的行：%s"
 
-#: object-file.c:1010
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "嘗試 mmap %<PRIuMAX>，超�了最大值 %<PRIuMAX>"
 
-#: object-file.c:1031
-msgid "mmap failed"
-msgstr "mmap 失敗"
+#: object-file.c:1048
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap 失敗%s"
 
-#: object-file.c:1195
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "物件檔案 %s 為空"
 
-#: object-file.c:1330 object-file.c:2524
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "�壞的鬆散物件 '%s'"
 
-#: object-file.c:1332 object-file.c:2528
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "鬆散物件 '%s' 後�有垃圾資料"
 
-#: object-file.c:1374
+#: object-file.c:1457
+#, c-format
+msgid "unable to parse %s header"
+msgstr "無法解� %s 頭部"
+
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "無效的物件類型"
 
-#: object-file.c:1458
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "無法用 --allow-unknown-type �數解開 %s 標頭訊�"
-
-#: object-file.c:1461
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "無法解開 %s 頭部"
 
-#: object-file.c:1467
+#: object-file.c:1474
 #, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "無法用 --allow-unknown-type �數解� %s 標頭訊�"
-
-#: object-file.c:1470
-#, c-format
-msgid "unable to parse %s header"
-msgstr "無法解� %s 頭部"
+msgid "header for %s too long, exceeds %d bytes"
+msgstr "%s 的標頭�長，超出 %d �元組"
 
-#: object-file.c:1697
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr "讀�物件 %s 失敗"
 
-#: object-file.c:1701
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "找�到 %2$s 的替代 %1$s"
 
-#: object-file.c:1705
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "鬆散物件 %s（儲存在 %s）已�壞"
 
-#: object-file.c:1709
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "打包物件 %s（儲存在 %s）已�壞"
 
-#: object-file.c:1814
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "無法寫檔案 %s"
 
-#: object-file.c:1821
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "無法為 '%s' 設定權�"
 
-#: object-file.c:1828
+#: object-file.c:1835
 msgid "file write error"
 msgstr "檔案寫錯誤"
 
-#: object-file.c:1848
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr "關閉鬆散物件檔案時發生錯誤"
 
-#: object-file.c:1913
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr "權��足，無法在版本庫物件庫 %s 中新增物件"
 
-#: object-file.c:1915
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "無法建立暫存檔"
 
-#: object-file.c:1939
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "�能寫鬆散物件檔案"
 
-#: object-file.c:1945
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "�能壓縮新物件 %s（%d）"
 
-#: object-file.c:1949
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "在物件 %s 上呼� deflateEnd 失敗（%d）"
 
-#: object-file.c:1953
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
-msgstr "被 %s 的�穩定物件�資料�糊塗了"
+msgstr "被 %s 的�穩定物件來�資料混淆"
 
-#: object-file.c:1963 builtin/pack-objects.c:1097
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr "在 %s 上呼� utime() 失敗"
 
-#: object-file.c:2040
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "�能讀�物件 %s"
 
-#: object-file.c:2091
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "�壞的�交"
 
-#: object-file.c:2099
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "�壞的標籤"
 
-#: object-file.c:2199
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "索引 %s 時讀�錯誤"
 
-#: object-file.c:2202
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "索引 %s 時讀入�完整"
 
-#: object-file.c:2275 object-file.c:2285
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s：�入資料庫失敗"
 
-#: object-file.c:2291
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s：�支�的檔案類型"
 
-#: object-file.c:2315
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s �是一個有效的物件"
 
-#: object-file.c:2317
+#: object-file.c:2331
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s �是一個有效的 '%s' 物件"
 
-#: object-file.c:2344 builtin/index-pack.c:192
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "�能開啟 %s"
 
-#: object-file.c:2535 object-file.c:2588
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "%s 的雜湊值�符�（�期 %s）"
 
-#: object-file.c:2559
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "�能 mmap %s"
 
-#: object-file.c:2564
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "無法解壓縮 %s 的頭部"
 
-#: object-file.c:2570
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "無法解� %s 的頭部"
 
-#: object-file.c:2581
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "無法解壓縮 %s 的內容"
 
-#: object-name.c:486
+#: object-name.c:480
 #, c-format
 msgid "short object ID %s is ambiguous"
 msgstr "短物件 ID %s 存在歧義"
 
-#: object-name.c:497
+#: object-name.c:491
 msgid "The candidates are:"
 msgstr "候�者有："
 
-#: object-name.c:796
+#: object-name.c:790
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -5828,22 +5719,22 @@ msgstr ""
 "請檢查這些引用，並視需�刪除。執行\n"
 "「git config advice.objectNameWarning false�命令以關閉本訊�通知"
 
-#: object-name.c:916
+#: object-name.c:910
 #, c-format
 msgid "log for '%.*s' only goes back to %s"
 msgstr "'%.*s' 的日誌�能回到 %s"
 
-#: object-name.c:924
+#: object-name.c:918
 #, c-format
 msgid "log for '%.*s' only has %d entries"
 msgstr "'%.*s' 的日誌�有 %d 個項目"
 
-#: object-name.c:1702
+#: object-name.c:1696
 #, c-format
 msgid "path '%s' exists on disk, but not in '%.*s'"
 msgstr "�碟上存在 '%s' 路徑，但�存在於 '%.*s'"
 
-#: object-name.c:1708
+#: object-name.c:1702
 #, c-format
 msgid ""
 "path '%s' exists, but not '%s'\n"
@@ -5852,12 +5743,12 @@ msgstr ""
 "'%s' 路徑存在，但�是 '%s'\n"
 "�示：你在說 '%.*s:%s'，� '%.*s:./%s' 嗎？"
 
-#: object-name.c:1717
+#: object-name.c:1711
 #, c-format
 msgid "path '%s' does not exist in '%.*s'"
 msgstr "'%s' 路徑�存在於 '%.*s'"
 
-#: object-name.c:1745
+#: object-name.c:1739
 #, c-format
 msgid ""
 "path '%s' is in the index, but not at stage %d\n"
@@ -5866,7 +5757,7 @@ msgstr ""
 "'%s' 路徑在索引，但�在 %d 暫存�\n"
 "�示：你在說 ':%d:%s' 嗎？"
 
-#: object-name.c:1761
+#: object-name.c:1755
 #, c-format
 msgid ""
 "path '%s' is in the index, but not '%s'\n"
@@ -5875,21 +5766,21 @@ msgstr ""
 "'%s' 路徑在索引，但�是 '%s'\n"
 "�示：你在說 ':%d:%s'，� ':%d:%s' 嗎？"
 
-#: object-name.c:1769
+#: object-name.c:1763
 #, c-format
 msgid "path '%s' exists on disk, but not in the index"
 msgstr "�碟上存在 '%s' 路徑，但�在索引中"
 
-#: object-name.c:1771
+#: object-name.c:1765
 #, c-format
 msgid "path '%s' does not exist (neither on disk nor in the index)"
 msgstr "'%s' 路徑�存在 (既�存在�碟，也�存在索引)"
 
-#: object-name.c:1784
+#: object-name.c:1778
 msgid "relative path syntax can't be used outside working tree"
 msgstr "相�路徑與法�能用在工作�外"
 
-#: object-name.c:1922
+#: object-name.c:1916
 #, c-format
 msgid "invalid object name '%.*s'."
 msgstr "'%.*s' 物件�稱無效。"
@@ -5904,27 +5795,40 @@ msgstr "無效的物件類型 \"%s\""
 msgid "object %s is a %s, not a %s"
 msgstr "物件 %s 是一個 %s，�是一個 %s"
 
-#: object.c:232
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "物件 %s 有未知的類型 id %d"
 
-#: object.c:245
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "�能解�物件：%s"
 
-#: object.c:265 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "雜湊值與 %s �符�"
 
-#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251
+#: pack-bitmap.c:353
+msgid "multi-pack bitmap is missing required reverse index"
+msgstr "多包�圖缺少需�的��索引"
+
+#: pack-bitmap.c:429
+msgid "load_reverse_index: could not open pack"
+msgstr "load_reverse_index：無法開啟包"
+
+#: 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:1547 builtin/rev-list.c:92
+#: 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:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "無法�得 %s 的�碟用�"
@@ -5954,124 +5858,134 @@ msgstr "倒排索引檔案 %s 有�支�的版本 %<PRIu32>"
 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
 msgstr "倒排索引檔案 %s 有�支�的雜湊 ID %<PRIu32>"
 
-#: pack-write.c:250
+#: pack-write.c:251
 msgid "cannot both write and verify reverse index"
 msgstr "無法�時寫入和驗證倒排索引"
 
-#: pack-write.c:271
+#: pack-write.c:270
 #, c-format
 msgid "could not stat: %s"
 msgstr "無法 stat：%s"
 
-#: pack-write.c:283
+#: pack-write.c:282
 #, c-format
 msgid "failed to make %s readable"
 msgstr "無法讓 %s 能夠寫入"
 
-#: pack-write.c:522
+#: pack-write.c:520
 #, c-format
 msgid "could not write '%s' promisor file"
 msgstr "無法寫入「%s�promisor 檔案"
 
-#: packfile.c:625
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "�移�在 packfile ��之�（�壞的 .idx？）"
 
-#: packfile.c:1937
+#: packfile.c:657
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "包檔案 %s 無法映射%s"
+
+#: packfile.c:1924
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "�移�在 %s 的包索引開始之�（�壞的索引？）"
 
-#: packfile.c:1941
+#: 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
+#: 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.c:38
+#: 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"
 msgstr "%s 需�一個值"
 
-#: parse-options.c:73
+#: parse-options.c:93
 #, c-format
 msgid "%s is incompatible with %s"
 msgstr "%s 與 %s �相容"
 
-#: parse-options.c:78
+#: parse-options.c:98
 #, c-format
 msgid "%s : incompatible with something else"
 msgstr "%s：和其它的�相容"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#: parse-options.c:112 parse-options.c:116
 #, c-format
 msgid "%s takes no value"
 msgstr "%s ��值"
 
-#: parse-options.c:94
+#: parse-options.c:114
 #, c-format
 msgid "%s isn't available"
 msgstr "%s ��用"
 
-#: parse-options.c:217
+#: parse-options.c:237
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr "%s 期望一個�負整數和一個��的 k/m/g 後綴"
 
-#: parse-options.c:386
+#: parse-options.c:393
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "有歧義的�項：%s（�以是 --%s%s 或 --%s%s）"
 
-#: parse-options.c:420 parse-options.c:428
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr "你的��是 `--%s`（有兩個短線）嗎？"
 
-#: parse-options.c:668 parse-options.c:988
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "--%s 的別�"
 
-#: parse-options.c:879
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "未知�項 `%s'"
 
-#: parse-options.c:881
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "未知開關 `%c'"
 
-#: parse-options.c:883
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "字串中未知的� ascii 字元�項：`%s'"
 
-#: parse-options.c:907
+#: parse-options.c:920
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:926
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "用法：%s"
@@ -6079,98 +5993,122 @@ msgstr "用法：%s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:932
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "   或：%s"
 
+#. TRANSLATORS: You should only need to translate this format
+#. string if your language is a RTL language (e.g. Arabic,
+#. Hebrew etc.), not if it's a LTR language (e.g. German,
+#. Russian, Chinese etc.).
+#. *
+#. When a translated usage string has an embedded "\n" it's
+#. because options have wrapped to the next line. The line
+#. after the "\n" will then be padded to align with the
+#. command name, such as N_("git cmd [opt]\n<8
+#. spaces>[opt2]"), where the 8 spaces are the same length as
+#. "git cmd ".
+#. *
+#. This format string prints out that already-translated
+#. line. The "%*s" is whitespace padding to account for the
+#. padding at the start of the line that we add in this
+#. 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:970
+#, c-format
+msgid "%*s%s"
+msgstr "%*s%s"
+
 #  譯者：為�證在輸出中�齊，注�調整�中空格�
-#: parse-options.c:935
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:974
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-數字"
 
-#: path.c:915
+#: path.c:922
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "�能設定 %s 為組�寫"
 
-#: pathspec.c:151
+#: pathspec.c:150
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "跳脫字元 '\\' �能作為屬性值的最後一個字元"
 
-#: pathspec.c:169
+#: pathspec.c:168
 msgid "Only one 'attr:' specification is allowed."
 msgstr "��許一個 'attr:' �格。"
 
-#: pathspec.c:172
+#: pathspec.c:171
 msgid "attr spec must not be empty"
 msgstr "屬性�格�能為空"
 
-#: pathspec.c:215
+#: pathspec.c:214
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "無效的屬性� %s"
 
-#: pathspec.c:280
+#: pathspec.c:279
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr "全域的 'glob' 和 'noglob' 路徑�格設定�相容"
 
-#: pathspec.c:287
+#: pathspec.c:286
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr "全域的 'literal' 路徑�格設定和其它的全域路徑�格設定�相容"
 
-#: pathspec.c:327
+#: pathspec.c:326
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "路徑�格包�無效的神奇�綴"
 
-#: pathspec.c:348
+#: pathspec.c:347
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "在路徑�格 '%3$s' 中無效的神奇�綴 '%2$.*1$s'"
 
-#: pathspec.c:353
+#: pathspec.c:352
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "路徑�格 '%s' 的神奇�綴�尾少了一個 ')'"
 
-#: pathspec.c:391
+#: pathspec.c:390
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "路徑�格 '%2$s' 中包�未實�的神奇�綴 '%1$c'"
 
-#: pathspec.c:450
+#: pathspec.c:449
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s：'literal' 和 'glob' �相容"
 
-#: pathspec.c:466
+#: pathspec.c:465
 #, c-format
 msgid "%s: '%s' is outside repository at '%s'"
 msgstr "%s：'%s' 在�於 '%s' 的版本庫之外"
 
-#: pathspec.c:542
+#: pathspec.c:541
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s'（助記符：'%c'）"
 
-#: pathspec.c:552
+#: pathspec.c:551
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s：路徑�格神奇�綴�被此指令支�：%s"
 
-#: pathspec.c:619
+#: pathspec.c:618
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "路徑�格 '%s' �於符號連�中"
 
-#: pathspec.c:664
+#: pathspec.c:663
 #, c-format
 msgid "line is badly quoted: %s"
 msgstr "�行�應該被括號括�：%s"
@@ -6184,14 +6122,14 @@ msgid "unable to write delim packet"
 msgstr "無法寫 delim 包"
 
 #: pkt-line.c:106
-msgid "unable to write stateless separator packet"
-msgstr "無法寫入無狀態的分隔符號�包"
+msgid "unable to write response end packet"
+msgstr "無法寫入回應�尾�包"
 
 #: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr "flush 包寫錯誤"
 
-#: pkt-line.c:153 pkt-line.c:265
+#: pkt-line.c:153
 msgid "protocol error: impossibly long line"
 msgstr "�定錯誤：��能的長行"
 
@@ -6199,7 +6137,7 @@ msgstr "�定錯誤：��能的長行"
 msgid "packet write with format failed"
 msgstr "格�化包寫入錯誤"
 
-#: pkt-line.c:204
+#: pkt-line.c:204 pkt-line.c:252
 msgid "packet write failed - data exceeds max packet size"
 msgstr "寫�包失敗：資料超�了包的最大長度"
 
@@ -6208,25 +6146,25 @@ msgstr "寫�包失敗：資料超�了包的最大長度"
 msgid "packet write failed: %s"
 msgstr "�包寫入失敗：%s"
 
-#: pkt-line.c:328 pkt-line.c:329
+#: pkt-line.c:349 pkt-line.c:350
 msgid "read error"
 msgstr "讀�錯誤"
 
-#: pkt-line.c:339 pkt-line.c:340
+#: pkt-line.c:360 pkt-line.c:361
 msgid "the remote end hung up unexpectedly"
 msgstr "�端�外掛斷了"
 
-#: pkt-line.c:369 pkt-line.c:371
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "�定錯誤：錯誤的行長度字串：%.4s"
 
-#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
+#: 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:413 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "�端錯誤：%s"
@@ -6240,23 +6178,23 @@ msgstr "正在�新整�索引"
 msgid "unable to create threaded lstat: %s"
 msgstr "無法建立執行緒 lstat：%s"
 
-#: pretty.c:988
+#: pretty.c:1051
 msgid "unable to parse --pretty format"
 msgstr "�能解� --pretty 格�"
 
-#: promisor-remote.c:30
+#: promisor-remote.c:31
 msgid "promisor-remote: unable to fork off fetch subprocess"
 msgstr "promisor-remote: 無法 fork fetch �處�程�"
 
-#: promisor-remote.c:35 promisor-remote.c:37
+#: promisor-remote.c:38 promisor-remote.c:40
 msgid "promisor-remote: could not write to fetch subprocess"
 msgstr "promisor-remote: 無法寫入 fetch �處�程�"
 
-#: promisor-remote.c:41
+#: promisor-remote.c:44
 msgid "promisor-remote: could not close stdin to fetch subprocess"
 msgstr "promisor-remote: 無法關閉 fetch �處�程�的 stdin"
 
-#: promisor-remote.c:53
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "promisor �端�稱�能以 '/' 開始：%s"
@@ -6269,88 +6207,84 @@ msgstr "object-info：引數後�期�有 flush"
 msgid "Removing duplicate objects"
 msgstr "正在刪除�複物件"
 
-#: range-diff.c:78
+#: range-diff.c:67
 msgid "could not start `log`"
 msgstr "�能啟動 `log`"
 
-#: range-diff.c:80
+#: range-diff.c:69
 msgid "could not read `log` output"
 msgstr "�能讀� `log` 的輸出"
 
-#: range-diff.c:101 sequencer.c:5551
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "�能解��交 '%s'"
 
-#: range-diff.c:115
+#: range-diff.c:111
 #, c-format
 msgid ""
 "could not parse first line of `log` output: did not start with 'commit ': "
 "'%s'"
 msgstr "無法解�第一行「log�輸出：開頭�是「commit�：「%s�"
 
-#: range-diff.c:140
+#: range-diff.c:137
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "無法解� git 頭 '%.*s'"
 
-#: range-diff.c:306
+#: range-diff.c:304
 msgid "failed to generate diff"
 msgstr "生� diff 失敗"
 
-#: range-diff.c:558
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only 和 --right-only 互斥"
-
-#: range-diff.c:561 range-diff.c:563
+#: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "�能解� '%s' 的日誌"
 
-#: read-cache.c:708
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "將�會新增檔案別� '%s'（'%s' 已經存在於索引中）"
 
-#: read-cache.c:724
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr "�能在物件資料庫中建立空的資料物件"
 
-#: read-cache.c:746
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr "%s：�能新增一般檔案�符號連�或 git 目錄"
 
-#: read-cache.c:751
+#: read-cache.c:766 builtin/submodule--helper.c:3242
 #, c-format
 msgid "'%s' does not have a commit checked out"
-msgstr "'%s' 沒有檢出一個�交"
+msgstr "'%s' 沒有簽出一個�交"
 
-#: read-cache.c:803
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "無法索引檔案 '%s'"
 
-#: read-cache.c:822
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "無法在索引中新增 '%s'"
 
-#: read-cache.c:833
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "無法� %s 執行 stat"
 
-#: read-cache.c:1356
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' 看起來既是檔案�是目錄"
 
-#: read-cache.c:1571
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "�新整�索引"
 
-#: read-cache.c:1700
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6359,7 +6293,7 @@ msgstr ""
 "設定了 index.version，但是�值無效。\n"
 "使用版本 %i"
 
-#: read-cache.c:1710
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6368,144 +6302,144 @@ msgstr ""
 "設定了 GIT_INDEX_VERSION，但是�值無效。\n"
 "使用版本 %i"
 
-#: read-cache.c:1766
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "壞的簽� 0x%08x"
 
-#: read-cache.c:1769
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "壞的索引版本 %d"
 
-#: read-cache.c:1778
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "壞的索引檔案 sha1 簽�"
 
-#: read-cache.c:1812
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
-msgstr "索引使用�被支�的 %.4s 擴展"
+msgstr "索引使用�被支�的 %.4s 副檔�"
 
 #
-#: read-cache.c:1814
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
-msgstr "忽略 %.4s 擴展"
+msgstr "忽略 %.4s 副檔�"
 
-#: read-cache.c:1851
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "未知的索引�目格� 0x%08x"
 
-#: read-cache.c:1867
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "索引中�近路徑 '%s' 有錯誤的�稱欄�"
 
-#: read-cache.c:1924
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr "索引中有未排�的暫存�目"
 
-#: read-cache.c:1927
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "�併檔案 '%s' 有多個暫存�目"
 
-#: read-cache.c:1930
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "'%s' 的未排�暫存�目"
 
-#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991
-#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
-#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:332
+#: 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:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr "索引檔案�壞"
 
-#: read-cache.c:2180
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "無法建立 load_cache_entries 執行緒：%s"
 
-#: read-cache.c:2193
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "無法加入 load_cache_entries 執行緒：%s"
 
-#: read-cache.c:2226
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s：開啟索引檔案失敗"
 
-#: read-cache.c:2230
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s：�能�開啟的索引執行 stat 動作"
 
-#: read-cache.c:2234
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s：索引檔案比�期的�"
 
-#: read-cache.c:2238
+#: read-cache.c:2280
 #, c-format
-msgid "%s: unable to map index file"
-msgstr "%s：無法�索引檔案執行 map 動作"
+msgid "%s: unable to map index file%s"
+msgstr "%s：無法 map 索引檔案%s"
 
-#: read-cache.c:2280
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "無法建立 load_index_extensions 執行緒：%s"
 
-#: read-cache.c:2307
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "無法加入 load_index_extensions 執行緒：%s"
 
-#: read-cache.c:2345
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "無法�新整�共享索引 '%s'"
 
-#: read-cache.c:2392
+#: 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:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: 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:3138
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr "無法轉��稀�索引"
 
-#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "�能� '%s' 呼� stat"
 
-#: read-cache.c:3222
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "�能開啟 git 目錄：%s"
 
-#: read-cache.c:3234
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "無法刪除：%s"
 
-#: read-cache.c:3263
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "�能修復 '%s' 的權��"
 
-#: read-cache.c:3412
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s：�能�到暫存� #0"
@@ -6576,7 +6510,7 @@ msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "�定基底 %s 到 %s（%d 個�交）"
 
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218
+#: rebase-interactive.c:75
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -6584,7 +6518,7 @@ msgstr ""
 "\n"
 "��刪除任�一行。使用 'drop' 顯�地刪除一個�交。\n"
 
-#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+#: rebase-interactive.c:78
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -6592,7 +6526,7 @@ msgstr ""
 "\n"
 "如果您在這裡刪除一行，�應的�交將會�失。\n"
 
-#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+#: rebase-interactive.c:84
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -6606,7 +6540,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+#: rebase-interactive.c:89
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -6616,14 +6550,14 @@ msgstr ""
 "然而，如果您刪除全部內容，�定基底動作將會終止。\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816
-#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271
+#: 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'"
 msgstr "�能寫入 '%s'"
 
-#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
-#: builtin/rebase.c:253
+#: rebase-interactive.c:119
 #, c-format
 msgid "could not write '%s'."
 msgstr "�能寫入 '%s'。"
@@ -6653,14 +6587,12 @@ msgstr ""
 "��值有：ignore�warn�error。\n"
 "\n"
 
-#: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597
-#: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240
-#: builtin/rebase.c:265
+#: rebase.c:29
 #, c-format
-msgid "could not read '%s'."
-msgstr "�能讀� '%s'。"
+msgid "%s: 'preserve' superseded by 'merges'"
+msgstr "%s：「preserve�已經改�「merges�"
 
-#: ref-filter.c:42 wt-status.c:1978
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "�失"
 
@@ -6679,257 +6611,228 @@ msgstr "�後 %d"
 msgid "ahead %d, behind %d"
 msgstr "領先 %d，�後 %d"
 
-#: ref-filter.c:175
+#: ref-filter.c:235
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "期望的格�：%%(color:<�色>)"
 
-#: ref-filter.c:177
+#: ref-filter.c:237
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "無法識別的�色：%%(color:%s)"
 
-#: ref-filter.c:199
+#: ref-filter.c:259
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "期望整數值 refname:lstrip=%s"
 
-#: ref-filter.c:203
+#: ref-filter.c:263
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "期望整數值 refname:rstrip=%s"
 
-#: ref-filter.c:205
+#: 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"
 
-#: ref-filter.c:260
+#: ref-filter.c:320
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) �帶�數"
 
-#: ref-filter.c:282
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "無法識別的 %%(objectsize) �數：%s"
-
-#: ref-filter.c:290
+#: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) �帶�數"
 
-#: ref-filter.c:302
+#: ref-filter.c:364
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) �帶�數"
 
-#: ref-filter.c:315
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "無法識別的 %%(subject) 引數：%s"
-
-#: ref-filter.c:334
+#: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
 msgstr "�期是 %%(trailers:key=<value>)"
 
-#: ref-filter.c:336
+#: ref-filter.c:398
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "未知的 %%(trailers) �數：%s"
 
-#: ref-filter.c:367
+#: ref-filter.c:429
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "期望一個正數 contents:lines=%s"
 
-#: ref-filter.c:369
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "無法識別的 %%(contents) �數：%s"
-
-#: ref-filter.c:384
+#: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "%%(%2$s) 中的 '%1$s' �期是正數值"
 
-#: ref-filter.c:388
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "無法識別 %%(%2$s) 中的 '%1$s' �數"
-
-#: ref-filter.c:402
+#: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
 msgstr "無法識別的 email �項：%s"
 
-#: ref-filter.c:432
+#: ref-filter.c:506
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "期望的格�：%%(align:<寬度>,<�置>)"
 
-#: ref-filter.c:444
+#: ref-filter.c:518
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "無法識別的�置：%s"
 
-#: ref-filter.c:451
+#: ref-filter.c:525
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "無法識別的寬度：%s"
 
-#: ref-filter.c:460
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "無法識別的 %%(align) �數：%s"
-
-#: ref-filter.c:468
+#: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "元素 %%(align) 需�一個正數的寬度"
 
-#: ref-filter.c:486
+#: ref-filter.c:568
 #, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "無法識別的 %%(if) �數：%s"
+msgid "%%(rest) does not take arguments"
+msgstr "%%(rest) 未�引數"
 
-#: ref-filter.c:588
+#: ref-filter.c:680
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "格�錯誤的欄��：%.*s"
 
-#: ref-filter.c:615
+#: ref-filter.c:707
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "未知的欄��：%.*s"
 
-#: ref-filter.c:619
+#: ref-filter.c:711
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr "�是一個 git 版本庫，但是欄� '%.*s' 需�存�物件資料"
 
-#: ref-filter.c:743
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "格�：使用了 %%(if) 元素而沒有 %%(then) 元素"
-
-#: ref-filter.c:807
+#: 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:809
+#: ref-filter.c:912
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "格�：%%(then) 元素用了多次"
 
-#: ref-filter.c:811
+#: ref-filter.c:914
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "格�：%%(then) 元素用在了 %%(else) 之後"
 
-#: ref-filter.c:839
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "格�：使用了 %%(else) 元素而沒有 %%(if) 元素"
-
-#: ref-filter.c:841
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "格�：使用了 %%(else) 元素而沒有 %%(then) 元素"
-
-#: ref-filter.c:843
+#: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "格�：%%(else) 元素用了多次"
 
-#: ref-filter.c:858
+#: ref-filter.c:965
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "格�：使用了 %%(end) 元素�沒有它的�應元素"
 
-#: ref-filter.c:915
+#: ref-filter.c:1027
 #, c-format
 msgid "malformed format string %s"
 msgstr "錯誤的格�化字串 %s"
 
-#: ref-filter.c:1556
+#: ref-filter.c:1033
+#, c-format
+msgid "this command reject atom %%(%.*s)"
+msgstr "本命令拒絕 atom %%(%.*s)"
+
+#: ref-filter.c:1040
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "--format=%.*s �能和 --python�--shell�--tcl 一起使用"
+
+#: ref-filter.c:1706
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "（無分支，�定 %s 的基底）"
 
-#: ref-filter.c:1559
+#: ref-filter.c:1709
 #, c-format
 msgid "(no branch, rebasing detached HEAD %s)"
 msgstr "（無分支，�定 %s 分離開頭指標的基底）"
 
-#: ref-filter.c:1562
+#: ref-filter.c:1712
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "（無分支，二分�尋從 %s 開始）"
 
-#: ref-filter.c:1566
+#: ref-filter.c:1716
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "（開頭指標分離於 %s）"
 
-#: ref-filter.c:1569
+#: ref-filter.c:1719
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "（開頭指標分離自 %s）"
 
-#: ref-filter.c:1572
+#: ref-filter.c:1722
 msgid "(no branch)"
 msgstr "（無分支）"
 
-#: ref-filter.c:1604 ref-filter.c:1813
+#: ref-filter.c:1754 ref-filter.c:1972
 #, c-format
 msgid "missing object %s for %s"
 msgstr "缺少 %2$s 的物件 %1$s"
 
-#: ref-filter.c:1614
+#: ref-filter.c:1764
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"
 
-#: ref-filter.c:1997
+#: ref-filter.c:2155
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "格�錯誤的物件 '%s'"
 
-#: ref-filter.c:2086
+#: ref-filter.c:2245
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "忽略帶有錯誤�稱 %s 的引用"
 
-#: ref-filter.c:2091 refs.c:676
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "忽略�壞的引用 %s"
 
-#: ref-filter.c:2431
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "格�：缺少 %%(end) 元素"
 
-#: ref-filter.c:2525
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "格�錯誤的物件� %s"
 
-#: ref-filter.c:2530
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "�項 `%s' 必須指�一個�交"
 
-#: refs.c:264
+#: refs.c:261
 #, c-format
 msgid "%s does not point to a valid object!"
 msgstr "%s 沒有指�一個有效的物件�"
 
-#: refs.c:566
+#: refs.c:563
 #, c-format
 msgid ""
 "Using '%s' as the name for the initial branch. This default branch name\n"
@@ -6947,19 +6850,19 @@ msgstr ""
 "如果�設定所有新版本庫�使用的�始分支�稱，\n"
 "請呼�（會隱�這個警告）：\n"
 "\n"
-"\tgit config —global init.defaultBranch <name>\n"
+"\tgit config --global init.defaultBranch <name>\n"
 "\n"
-"除了 ‘master’ 外，常用的分支�稱有 ‘main’, ‘trunk’ 以�\n"
-"‘development’。剛建立的分支�以用這個命令�新命�：\n"
+"除了 “master� 外，常用的分支�稱有 “main�, “trunk� 以�\n"
+"“development�。剛建立的分支�以用這個命令�新命�：\n"
 "\n"
 "\tgit branch -m <name>\n"
 
-#: refs.c:588
+#: refs.c:585
 #, c-format
 msgid "could not retrieve `%s`"
 msgstr "無法擷�「%s�"
 
-#: refs.c:598
+#: refs.c:595
 #, c-format
 msgid "invalid branch name: %s = %s"
 msgstr "分支�稱無效：%s = %s"
@@ -6969,66 +6872,66 @@ msgstr "分支�稱無效：%s = %s"
 msgid "ignoring dangling symref %s"
 msgstr "忽略懸空符號引用 %s"
 
-#: refs.c:922
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "引用 %s 的日誌在 %s 之後有缺�"
 
-#: refs.c:929
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "引用 %s 的日誌�外終止於 %s"
 
-#: refs.c:994
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "%s 的日誌為空"
 
-#: refs.c:1086
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "拒絕更新有錯誤�稱 '%s' 的引用"
 
-#: refs.c:1157
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "�引用 '%s' 執行 update_ref 失敗：%s"
 
-#: refs.c:2051
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "��許�引用 '%s' 多次更新"
 
-#: refs.c:2131
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "在隔離環境中�止更新引用"
 
-#: refs.c:2142
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "引用更新被掛鉤拒絕"
 
-#: refs.c:2242 refs.c:2272
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' 已存在，無法建立 '%s'"
 
-#: refs.c:2248 refs.c:2283
+#: 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:1228
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr "無法刪除引用 %s"
 
-#: refs/files-backend.c:1242 refs/packed-backend.c:1542
-#: refs/packed-backend.c:1552
+#: 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:1245 refs/packed-backend.c:1555
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr "無法刪除引用：%s"
@@ -7036,61 +6939,61 @@ msgstr "無法刪除引用：%s"
 #: refspec.c:170
 #, c-format
 msgid "invalid refspec '%s'"
-msgstr "無效的引用表��：'%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 沒有符�"
+msgstr "來�引用�格 %s 沒有符�項目"
 
-#: remote.c:1088
+#: remote.c:1197
 #, c-format
 msgid "src refspec %s matches more than one"
-msgstr "�引用表�� %s 符�超�一個"
+msgstr "來�引用�格 %s 符�超�一個"
 
 #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
 #. <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"
@@ -7103,162 +7006,166 @@ msgid ""
 "\n"
 "Neither worked, so we gave up. You must fully qualify the ref."
 msgstr ""
-"您�供的目標�是一個完整的引用�稱（�以 \"refs/\" 開頭）。我們\n"
-"試著猜測您的想法：\n"
+"您�供的目的地�是完整的引用�稱（�以「refs/�開頭）。\n"
+"我們覺得您�能想�：\n"
 "\n"
-"- 在�端查詢和 '%s' 符�的引用。\n"
-"- 檢查�推�的 <src>（'%s'）是�是在 \"refs/{heads,tags}/\" 中的\n"
-"  引用。如果是，我們會在�應的�端新增 refs/{heads,tags}/ �綴。\n"
+"- 在�端查詢符�「%s�的引用。\n"
+"- 檢查�推�的 <src>（'%s'）是�是在「refs/{heads,tags}/�中的引用。\n"
+"  如果是，我們會在�應的�端新增 refs/{heads,tags}/ �綴。\n"
 "\n"
-"都�行，所以我們已放棄。您必須給出完整的引用。"
+"由於這些猜測都�正確，我們放棄了。您必須給出完整引用。"
 
-#: remote.c:1123
+#: remote.c:1232
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
 "Did you mean to create a new branch by pushing to\n"
 "'%s:refs/heads/%s'?"
 msgstr ""
-"引用表��的 <src> 是一個�交物件。您是想建立一個新的分支而�\n"
-"'%s:refs/heads/%s' 推�嗎？"
+"引用�格的 <src> 是個�交物件。\n"
+"您是想��推�至「%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"
 "Did you mean to create a new tag by pushing to\n"
 "'%s:refs/tags/%s'?"
 msgstr ""
-"引用表��的 <src> 是一個標籤物件。您是想建立一個新的標籤而�\n"
-"'%s:refs/tags/%s' 推�嗎？"
+"引用�格的 <src> 是個標籤物件。\n"
+"您是想��推�至「%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"
 "Did you mean to tag a new tree by pushing to\n"
 "'%s:refs/tags/%s'?"
 msgstr ""
-"引用表��的 <src> 是一個樹狀物件。您是想為這個樹狀物件建立標籤而�\n"
-"'%s:refs/tags/%s' 推�嗎？"
+"引用�格的 <src> 是個樹狀物件。\n"
+"您是想��推�至「%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"
 "Did you mean to tag a new blob by pushing to\n"
 "'%s:refs/tags/%s'?"
 msgstr ""
-"引用表��的 <src> 是一個資料物件。您是想為這個資料物件建立標籤而�\n"
-"'%s:refs/tags/%s' 推�嗎？"
+"引用�格的 <src> 是個資料 (blob) 物件。\n"
+"您是想��推�至「%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 符�超�一個"
+msgstr "目的地引用�格 %s 符�超�一個"
 
-#: remote.c:1204
+#: remote.c:1313
 #, c-format
 msgid "dst ref %s receives from more than one src"
-msgstr "目標引用 %s 接收超�一個�"
+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' 沒有本機追蹤分支"
+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'）"
+msgstr "推�沒有目的地（push.default 是 'nothing'）"
 
-#: remote.c:1814
+#: remote.c:1927
 msgid "cannot resolve 'simple' push to a single destination"
-msgstr "無法解� 'simple' 推�至一個單�的目標"
+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 ""
@@ -7266,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"
@@ -7283,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'"
@@ -7320,7 +7227,7 @@ msgstr "無法寫入 rerere 記錄"
 msgid "there were errors while writing '%s' (%s)"
 msgstr "寫入 '%s' (%s) 時發生錯誤"
 
-#: rerere.c:482
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "�新整� '%s' 失敗"
@@ -7365,8 +7272,8 @@ msgstr "�能刪除 stray '%s'"
 msgid "Recorded preimage for '%s'"
 msgstr "為 '%s' 記錄 preimage"
 
-#: rerere.c:865 submodule.c:2089 builtin/log.c:2000
-#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
+#: 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'"
@@ -7404,46 +7311,33 @@ msgstr "�能開啟 rr-cache 目錄"
 msgid "could not determine HEAD revision"
 msgstr "�能確定 HEAD 版本"
 
-#: reset.c:70 reset.c:76 sequencer.c:3669
+#: reset.c:70 reset.c:76 sequencer.c:3700
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "無法找到 %s 指�的樹"
 
-#: revision.c:2343
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "--unpacked=<packfile> 已��支�"
 
-#: revision.c:2683
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr "您的目�分支好�被�壞"
 
-#: revision.c:2686
+#: revision.c:2689
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "您的目�分支 '%s' 尚無任何�交"
 
-#: revision.c:2892
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L 尚�支� -p 和 -s 之外的差異格�"
 
-#: run-command.c:767
-msgid "open /dev/null failed"
-msgstr "�能開啟 /dev/null"
-
-#: run-command.c:1275
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "�能建立 async 執行緒：%s"
 
-#: run-command.c:1345
-#, c-format
-msgid ""
-"The '%s' hook was ignored because it's not set as executable.\n"
-"You can disable this warning with `git config advice.ignoredHook false`."
-msgstr ""
-"因為沒有將掛鉤 '%s' 設定為�執行，掛鉤被忽略。您�以��\n"
-"設定 `git config advice.ignoredHook false` 來關閉這�警告。"
-
 #: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr "讀��端解包狀態時收到�外的 flush 包"
@@ -7462,69 +7356,70 @@ msgstr "�端解包失敗：%s"
 msgid "failed to sign the push certificate"
 msgstr "為推�證書籤�失敗"
 
-#: send-pack.c:433
+#: send-pack.c:435
 msgid "send-pack: unable to fork off fetch subprocess"
 msgstr "send-pack：無法 fork 一個 fetch �處�程�"
 
-#: send-pack.c:455
+#: send-pack.c:457
 msgid "push negotiation failed; proceeding anyway with push"
 msgstr "push �商失敗。繼續使用 push 處�"
 
-#: send-pack.c:520
+#: send-pack.c:528
 msgid "the receiving end does not support this repository's hash algorithm"
 msgstr "接收端�支�此版本庫的雜湊算法"
 
-#: send-pack.c:529
+#: send-pack.c:537
 msgid "the receiving end does not support --signed push"
-msgstr "接收端�支�簽�推�"
+msgstr "接收端�支� --signed 推�"
 
-#: send-pack.c:531
+#: send-pack.c:539
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
-msgstr "未傳�推�證書，因為接收端�支�簽�推�"
+msgstr "未傳�推�證書，因為接收端�支� --signed 推�"
 
-#: send-pack.c:543
+#: send-pack.c:546
 msgid "the receiving end does not support --atomic push"
-msgstr "接收端�支�原�推�"
+msgstr "接收端�支� --atomic 推�"
 
-#: send-pack.c:548
+#: send-pack.c:551
 msgid "the receiving end does not support push options"
 msgstr "接收端�支�推��項"
 
-#: sequencer.c:196
+#: sequencer.c:197
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "無效的�交說明清�模� '%s'"
 
-#: sequencer.c:324
+#: sequencer.c:325
 #, c-format
 msgid "could not delete '%s'"
 msgstr "無法刪除 '%s'"
 
-#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#: 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'"
 
-#: sequencer.c:354
+#: sequencer.c:355
 msgid "revert"
 msgstr "復原"
 
-#: sequencer.c:356
+#: sequencer.c:357
 msgid "cherry-pick"
 msgstr "摘�"
 
-#: sequencer.c:358
+#: sequencer.c:359
 msgid "rebase"
 msgstr "rebase"
 
-#: sequencer.c:360
+#: sequencer.c:361
 #, c-format
 msgid "unknown action: %d"
 msgstr "未知動作：%d"
 
-#: sequencer.c:419
+#: sequencer.c:420
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -7532,52 +7427,81 @@ msgstr ""
 "��解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
 "指令標記修正後的檔案"
 
-#: sequencer.c:422
+#: sequencer.c:423
 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'"
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git cherry-pick --continue\".\n"
+"You can instead skip this commit with \"git cherry-pick --skip\".\n"
+"To abort and get back to the state before \"git cherry-pick\",\n"
+"run \"git cherry-pick --abort\"."
 msgstr ""
-"��解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
-"�修正後的檔案�標記，然後用 'git commit' �交"
+"解決��後，請使用\n"
+"\"git add/rm <pathspec>\" 標記路徑，�執行\n"
+"\"git cherry-pick --continue\"。\n"
+"亦�以使用 \"git cherry-pick --skip\" 略��交。\n"
+"若��消並返回 \"git cherry-pick\" �的狀態，\n"
+"請執行 \"git cherry-pick --abort\"。"
 
-#: sequencer.c:435 sequencer.c:3271
+#: sequencer.c:430
+msgid ""
+"After resolving the conflicts, mark them with\n"
+"\"git add/rm <pathspec>\", then run\n"
+"\"git revert --continue\".\n"
+"You can instead skip this commit with \"git revert --skip\".\n"
+"To abort and get back to the state before \"git revert\",\n"
+"run \"git revert --abort\"."
+msgstr ""
+"解決��後，請使用\n"
+"\"git add/rm <pathspec>\" 標記路徑，�執行\n"
+"\"git revert --continue\"。\n"
+"亦�以使用 \"git revert --skip\" 略��交。\n"
+"若��消並返回 \"git revert\" �的狀態，\n"
+"請執行 \"git revert --abort\"。"
+
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "�能鎖定 '%s'"
 
-#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
-#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#: 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'"
 
-#: sequencer.c:442
+#: sequencer.c:455
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "�能將�行符號寫入 '%s'"
 
-#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
-#: sequencer.c:3554
+#: 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:486
+#: 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."
 msgstr "您的本機修改將被%s覆蓋。"
 
-#: sequencer.c:490
+#: sequencer.c:503
 msgid "commit your changes or stash them to proceed."
 msgstr "�交您的修改或儲�後�繼續。"
 
-#: sequencer.c:522
+#: sequencer.c:535
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s：快轉"
 
-#: sequencer.c:561 builtin/tag.c:609
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "無效的清�模� %s"
@@ -7585,65 +7509,65 @@ msgstr "無效的清�模� %s"
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
 #.
-#: sequencer.c:671
+#: sequencer.c:685
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s：無法寫入新索引檔案"
 
-#: sequencer.c:685
+#: sequencer.c:699
 msgid "unable to update cache tree"
 msgstr "�能更新快�樹"
 
-#: sequencer.c:699
+#: sequencer.c:713
 msgid "could not resolve HEAD commit"
 msgstr "�能解� HEAD �交"
 
-#: sequencer.c:779
+#: sequencer.c:793
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "在 '%.*s' 中沒有 key"
 
-#: sequencer.c:790
+#: sequencer.c:804
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "無法為 '%s' 的值去引號"
 
-#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728
-#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910
+#: 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' 進行讀�"
 
-#: sequencer.c:837
+#: sequencer.c:851
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "已經給出 'GIT_AUTHOR_NAME'"
 
-#: sequencer.c:842
+#: sequencer.c:856
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "已經給出 'GIT_AUTHOR_EMAIL'"
 
-#: sequencer.c:847
+#: sequencer.c:861
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "已經給出 'GIT_AUTHOR_DATE'"
 
-#: sequencer.c:851
+#: sequencer.c:865
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "未知變數 '%s'"
 
-#: sequencer.c:856
+#: sequencer.c:870
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "缺少 'GIT_AUTHOR_NAME'"
 
-#: sequencer.c:858
+#: sequencer.c:872
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "缺少 'GIT_AUTHOR_EMAIL'"
 
-#: sequencer.c:860
+#: sequencer.c:874
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "缺少 'GIT_AUTHOR_DATE'"
 
-#: sequencer.c:925
+#: sequencer.c:939
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -7672,11 +7596,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1212
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "'prepare-commit-msg' 掛鉤失敗"
 
-#: sequencer.c:1218
+#: 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"
@@ -7690,17 +7614,17 @@ msgid ""
 "\n"
 "    git commit --amend --reset-author\n"
 msgstr ""
-"您的姓�和信件��基於登入�稱和主機�稱自動設定。請檢查它們正確\n"
-"與�。您�以�其進行設定以��出�本�示訊�。執行如下指令在編輯器\n"
-"中編輯您的設定檔案：\n"
+"您的姓�和信件��皆根據您的使用者�稱和主機�稱自動設定。\n"
+"請檢查是�正確。您�以自行設定，這樣便�會�出�這個�示訊�。\n"
+"執行如下指令，在編輯器中�循指引編輯您的設定檔案：\n"
 "\n"
 "    git config --global --edit\n"
 "\n"
-"設定完畢後，您�以用下�的指令來修正本次�交所使用的使用者身份：\n"
+"設定完畢後，您�以使用下述指令，修正這個�交的�交者身份：\n"
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1231
+#: 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"
@@ -7713,353 +7637,360 @@ msgid ""
 "\n"
 "    git commit --amend --reset-author\n"
 msgstr ""
-"您的姓�和信件��基於登入�稱和主機�稱自動設定。請檢查它們正確\n"
-"與�。您�以�其進行設定以��出�本�示訊�：\n"
+"您的姓�和信件��皆根據您的使用者�稱和主機�稱自動設定。\n"
+"請檢查是�正確。您�以自行設定，這樣便�會�出�這個�示訊�：\n"
 "\n"
 "    git config --global user.name \"Your Name\"\n"
 "    git config --global user.email you@example.com\n"
 "\n"
-"設定完畢後，您�以用下�的指令來修正本次�交所使用的使用者身份：\n"
+"設定完畢後，您�以使用下述指令，修正這個�交使用的�交者身份：\n"
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1273
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "無法找到新建立的�交"
 
-#: sequencer.c:1275
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr "�能解�新建立的�交"
 
-#: sequencer.c:1321
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr "建立�交後，�能解� HEAD"
 
-#: sequencer.c:1323
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "分離 HEAD"
 
 #  譯者：中文字串拼接，�刪除�導空格
-#: sequencer.c:1327
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (根�交)"
 
-#: sequencer.c:1348
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "�能解� HEAD"
 
-#: sequencer.c:1350
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s �是一個�交�"
 
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
 msgid "could not parse HEAD commit"
 msgstr "�能解� HEAD �交"
 
-#: sequencer.c:1410 sequencer.c:2295
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "�能解��交作者"
 
-#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
+#: 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:1454 sequencer.c:1574
+#: sequencer.c:1473 sequencer.c:1593
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "�能從 '%s' 讀��交說明"
 
-#: sequencer.c:1485 sequencer.c:1517
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "無效的作者身分 '%s'"
 
-#: sequencer.c:1491
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "作者資訊�壞：缺少日期資訊"
 
-#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909
-#: builtin/merge.c:934 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:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#: 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:1606
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "�能解��交 %s"
 
-#: sequencer.c:1611
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "�能解�父�交 %s"
 
-#: sequencer.c:1694 sequencer.c:1975
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "未知指令：%d"
 
-#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "這是第一個�交說明："
 
-#: sequencer.c:1737
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "這是�交說明 #%d："
 
-#: sequencer.c:1738
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "略�第 1 個�交說明："
 
-#: sequencer.c:1739
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "略�第 %d 個�交說明："
 
-#: sequencer.c:1740
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "這是整� %d 個�交的集��交。"
 
-#: sequencer.c:1887 sequencer.c:1944
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "�能寫 '%s'"
 
-#: sequencer.c:1934
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "需�一個 HEAD 來修復"
 
-#: sequencer.c:1936 sequencer.c:3581
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "�能讀� HEAD"
 
-#: sequencer.c:1938
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr "�能讀� HEAD 的�交說明"
 
-#: sequencer.c:1962
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "�能讀� %s 的�交說明"
 
-#: sequencer.c:2072
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "您的索引檔案未完��併。"
 
-#: sequencer.c:2079
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "�能修復根�交"
 
-#: sequencer.c:2098
+#: sequencer.c:2117
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "�交 %s 是一個�併�交但未�供 -m �項。"
 
-#: sequencer.c:2106 sequencer.c:2114
+#: sequencer.c:2125 sequencer.c:2133
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "�交 %s 沒有第 %d 個父�交"
 
-#: sequencer.c:2120
+#: 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:2139
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s：�能解�父�交 %s"
 
-#: sequencer.c:2205
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "�能將 '%s' �新命�為 '%s'"
 
-#: sequencer.c:2265
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "�能還原 %s... %s"
 
-#: sequencer.c:2266
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "�能套用 %s... %s"
 
-#: sequencer.c:2287
+#: sequencer.c:2306
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n"
 
-#: sequencer.c:2345
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s：無法讀�索引"
 
-#: sequencer.c:2352
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s：無法�新整�索引"
 
-#: sequencer.c:2425
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s �接��數：'%s'"
 
-#: sequencer.c:2434
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "缺少 %s 的�數"
 
-#: sequencer.c:2477
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "無法解� '%s'"
 
-#: sequencer.c:2538
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "無效行 %d：%.*s"
 
-#: sequencer.c:2549
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "沒有父�交的情�下�能 '%s'"
 
-#: sequencer.c:2635
+#: sequencer.c:2624 builtin/rebase.c:184
+#, c-format
+msgid "could not read '%s'."
+msgstr "�能讀� '%s'。"
+
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "正在�消一個進行中的��"
 
-#: sequencer.c:2644
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "正在�消一個進行中的還原"
 
-#: sequencer.c:2690
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "請用 'git rebase --edit-todo' 來修改。"
 
-#: sequencer.c:2692
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "��用的指令清單：'%s'"
 
-#: sequencer.c:2697
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "沒有解��交。"
 
-#: sequencer.c:2708
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "�能在還原�交中執行��。"
 
-#: sequencer.c:2710
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "�能在��中執行還原�交。"
 
-#: sequencer.c:2788
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "%s 的值無效：%s"
 
-#: sequencer.c:2897
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "��用的 squash-onto"
 
-#: sequencer.c:2917
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "格�錯誤的�項清單：'%s'"
 
-#: sequencer.c:3012 sequencer.c:4869
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "�供了空的�交集"
 
-#: sequencer.c:3029
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "一個還原動作已在進行"
 
-#: sequencer.c:3031
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3034
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "��動作已在進行"
 
-#: sequencer.c:3036
+#: sequencer.c:3057
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3050
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "�能建立�列目錄 '%s'"
 
-#: sequencer.c:3065
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "�能鎖定 HEAD"
 
-#: sequencer.c:3125 sequencer.c:4582
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
 msgstr "��或還原動作並未進行"
 
-#: sequencer.c:3127 sequencer.c:3138
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "�能解� HEAD"
 
-#: sequencer.c:3129 sequencer.c:3173
+#: sequencer.c:3150 sequencer.c:3194
 msgid "cannot abort from a branch yet to be born"
 msgstr "�能從尚未建立的分支終止"
 
-#: sequencer.c:3159 builtin/grep.c:759
+#: 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:3161
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "�能讀� '%s'：%s"
 
-#: sequencer.c:3162
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "�外的檔案��"
 
-#: sequencer.c:3168
+#: sequencer.c:3189
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "儲存���交�的 HEAD 檔案 '%s' �壞"
 
-#: sequencer.c:3179
+#: sequencer.c:3200
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "您好�移動了 HEAD。未能還原，檢查您的 HEAD�"
 
-#: sequencer.c:3220
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "沒有正在進行的還原"
 
-#: sequencer.c:3229
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "沒有正在進行的��"
 
-#: sequencer.c:3239
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "無法略�這個�交"
 
-#: sequencer.c:3246
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "沒有�略�的"
 
-#: sequencer.c:3249
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8068,16 +7999,16 @@ msgstr ""
 "您已經�交了嗎？\n"
 "試試 \"git %s --continue\""
 
-#: sequencer.c:3411 sequencer.c:4473
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "�能讀� HEAD"
 
-#: sequencer.c:3428
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "無法複製 '%s' 至 '%s'"
 
-#: sequencer.c:3436
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8096,28 +8027,28 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3446
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "�能套用 %s... %.*s"
 
-#: sequencer.c:3453
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "�能�併 %.*s"
 
-#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "�能複製 '%s' 至 '%s'"
 
-#: sequencer.c:3483
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "執行：%s\n"
 
 #  譯者：請維��導空格
-#: sequencer.c:3498
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8132,11 +8063,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3504
+#: sequencer.c:3520
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "並且修改索引和/或工作�\n"
 
-#: sequencer.c:3510
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8153,90 +8084,90 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3571
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "�法的標籤�稱：'%.*s'"
 
-#: sequencer.c:3625
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "寫�根�交"
 
-#: sequencer.c:3630
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "寫入 squash-onto"
 
-#: sequencer.c:3714
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "無法解� '%s'"
 
-#: sequencer.c:3747
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "沒有目�版本�能�併"
 
-#: sequencer.c:3769
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "無法解� '%.*s'"
 
-#: sequencer.c:3778
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "無�用�併：'%.*s'"
 
-#: sequencer.c:3790
+#: sequencer.c:3818
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "章魚�並�能在一個新的根�交上執行"
 
-#: sequencer.c:3806
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "�能�得 '%s' 的�交說明"
 
-#: sequencer.c:3989
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "甚至�能嘗試�併 '%.*s'"
 
-#: sequencer.c:4005
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "�併：無法寫入新索引檔案"
 
-#: sequencer.c:4079
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr "無法 autostash"
 
-#: sequencer.c:4082
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "�外的 stash 回應：'%s'"
 
-#: sequencer.c:4088
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "�能為 '%s' 建立目錄"
 
-#: sequencer.c:4091
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "建立了 autostash：%s\n"
 
-#: sequencer.c:4095
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "無法 reset --hard"
 
-#: sequencer.c:4120
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "已套用 autostash。\n"
 
-#: sequencer.c:4132
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "�能儲存 %s"
 
-#: sequencer.c:4135
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8247,29 +8178,29 @@ msgstr ""
 "您的修改安全地儲存在儲��中。\n"
 "您�以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
 
-#: sequencer.c:4140
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "因套用自動儲�而導致��。"
 
-#: sequencer.c:4141
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr "已有自動儲�；建立新儲�項目。"
 
-#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "�能分離開頭指標"
 
-#: sequencer.c:4249
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "�止在 HEAD\n"
 
-#: sequencer.c:4251
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "�止在 %s\n"
 
-#: sequencer.c:4259
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8289,58 +8220,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4305
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "正在�定基底 (%d/%d)%s"
 
-#: sequencer.c:4351
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "�止在 %s... %.*s\n"
 
-#: sequencer.c:4422
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "未知指令 %d"
 
-#: sequencer.c:4481
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "�能讀� orig-head"
 
-#: sequencer.c:4486
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "�能讀� 'onto'"
 
-#: sequencer.c:4500
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "�能更新 HEAD 為 %s"
 
-#: sequencer.c:4560
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "�功�定基底並更新 %s。\n"
 
-#: sequencer.c:4612
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
 msgstr "�能�定基底：您有未暫存的變更。"
 
-#: sequencer.c:4621
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "�能修補�存在的�交"
 
-#: sequencer.c:4623
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "無效檔案：'%s'"
 
-#: sequencer.c:4625
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "無效內容：'%s'"
 
-#: sequencer.c:4628
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8349,59 +8280,68 @@ msgstr ""
 "\n"
 "您的工作�中有未�交的變更。請先�交然後�次執行 'git rebase --continue'。"
 
-#: sequencer.c:4664 sequencer.c:4703
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "�能寫入檔案：'%s'"
 
-#: sequencer.c:4719
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "�能刪除 CHERRY_PICK_HEAD"
 
-#: sequencer.c:4726
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "�能�交暫存的修改。"
 
-#: sequencer.c:4846
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s：�能��一個%s"
 
-#: sequencer.c:4850
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s：錯誤的版本"
 
-#: sequencer.c:4885
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "�能作為�始�交還原�交"
 
-#: sequencer.c:5362
+#: sequencer.c:5189 sequencer.c:5418
+#, c-format
+msgid "skipped previously applied commit %s"
+msgstr "已略�先�套用的 %s �交"
+
+#: sequencer.c:5259 sequencer.c:5434
+msgid "use --reapply-cherry-picks to include skipped commits"
+msgstr "使用 --reapply-cherry-picks 以包�略��交"
+
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
 msgstr "make_script：有未能處�的�項"
 
-#: sequencer.c:5365
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script：準備版本時錯誤"
 
-#: sequencer.c:5615 sequencer.c:5632
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "無事��"
 
-#: sequencer.c:5651
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "無法略��必�的��"
 
-#: sequencer.c:5751
+#: 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"
@@ -8410,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"
@@ -8421,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"
@@ -8437,96 +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
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "該動作必須在一個工作�中執行"
 
-#: setup.c:661
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "期望 git 版本庫版本 <= %d，�得到 %d"
 
-#: setup.c:669
-msgid "unknown repository extensions found:"
-msgstr "發�未知的版本庫擴展："
+#: setup.c:730
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "找到未知的儲存庫擴充元件："
 
-#: setup.c:681
-msgid "repo version is 0, but v1-only extensions found:"
-msgstr "repo 的版本是 0，但找到�支� v1 的擴充元件："
+#: 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:700
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "開啟 '%s' 發生錯誤"
 
-#: setup.c:702
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "檔案太大，無法作為 .git 檔案：'%s'"
 
-#: setup.c:704
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "讀� %s 發生錯誤"
 
-#: setup.c:706
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "無效的 gitfile 格�：%s"
 
-#: setup.c:708
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "在 gitfile 中沒有路徑：%s"
 
-#: setup.c:710
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "�是一個 git 版本庫：%s"
 
-#: setup.c:812
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' 太大"
 
-#: setup.c:826
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "�是一個 git 版本庫：'%s'"
 
-#: setup.c:855 setup.c:857 setup.c:888
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "�能切�目錄到 '%s'"
 
-#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr "無法返回目�工作目錄"
 
-#: setup.c:987
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "�得 '%*s%s%s' 狀態（stat）失敗"
 
-#: setup.c:1225
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "�能讀�目�工作目錄"
 
-#: setup.c:1234 setup.c:1240
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "�能切�到 '%s'"
 
-#: setup.c:1245
+#: setup.c:1315
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "�是一個 git 版本庫（或者任何父目錄）：%s"
 
-#: setup.c:1251
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8535,7 +8477,7 @@ msgstr ""
 "�是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n"
 "�止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
 
-#: setup.c:1370
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8544,28 +8486,15 @@ msgstr ""
 "�數 core.sharedRepository 的檔案屬性值有�題（0%.3o）。\n"
 "檔案所有者必須始終�有讀寫權�。"
 
-#: setup.c:1417
-msgid "open /dev/null or dup failed"
-msgstr "�能開啟或者複製 /dev/null"
-
-#: setup.c:1432
+#: setup.c:1508
 msgid "fork failed"
 msgstr "fork 失敗"
 
-#: setup.c:1437 t/helper/test-simple-ipc.c:285
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "setsid 失敗"
 
-#: sparse-index.c:151
-msgid "attempting to use sparse-index without cone mode"
-msgstr "嘗試�在 cone 模�使用稀�索引"
-
-#: sparse-index.c:156
-#, fuzzy
-msgid "unable to update cache-tree, staying full"
-msgstr "無法更新快�樹：��用完狀態"
-
-#: sparse-index.c:239
+#: sparse-index.c:289
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr "索引項目是資料夾，但�是稀�資料夾（%08x）"
@@ -8620,13 +8549,13 @@ msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u �元組/秒"
 
-#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737
-#: builtin/rebase.c:866
+#: 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:1177
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "無法編輯 '%s'"
@@ -8650,7 +8579,7 @@ msgstr "忽略�能被解�為指令列�項的 '%s'：%s"
 msgid "invalid value for %s"
 msgstr "%s 的值無效"
 
-#: submodule-config.c:766
+#: submodule-config.c:767
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "�能更新 .gitmodules �目 %s"
@@ -8673,70 +8602,70 @@ msgstr "無法移除 %s 的 .gitmodules �目"
 msgid "staging updated .gitmodules failed"
 msgstr "將更新後 .gitmodules 新增暫存�失敗"
 
-#: submodule.c:328
+#: submodule.c:358
 #, c-format
 msgid "in unpopulated submodule '%s'"
-msgstr "�於未檢出的�模組 '%s'"
+msgstr "�於未簽出的�模組 '%s'"
 
-#: submodule.c:359
+#: submodule.c:389
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "路徑�格 '%s' 在�模組 '%.*s' 中"
 
-#: submodule.c:436
+#: submodule.c:466
 #, c-format
 msgid "bad --ignore-submodules argument: %s"
 msgstr "無效 --ignore-submodules �數：%s"
 
-#: submodule.c:818
+#: submodule.c:844
 #, c-format
 msgid ""
 "Submodule in commit %s at path: '%s' collides with a submodule named the "
 "same. Skipping it."
 msgstr "%s �交�於路徑：'%s' 的�模組與��的�模組��。略�。"
 
-#: submodule.c:921
+#: submodule.c:954
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "�模組�目 '%s'（%s）是一個 %s，�是一個�交"
 
-#: submodule.c:1006
+#: submodule.c:1042
 #, c-format
 msgid ""
 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
 "submodule %s"
 msgstr "無法在 %s �模組執行 'git rev-list <�交> --not --remotes -n 1' 命令"
 
-#: submodule.c:1129
+#: submodule.c:1165
 #, c-format
 msgid "process for submodule '%s' failed"
 msgstr "處� '%s' �模組失敗"
 
-#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "無法將 HEAD 解�為有效引用。"
 
-#: submodule.c:1169
+#: submodule.c:1205
 #, c-format
 msgid "Pushing submodule '%s'\n"
 msgstr "正在推� '%s' �模組\n"
 
-#: submodule.c:1172
+#: submodule.c:1208
 #, c-format
 msgid "Unable to push submodule '%s'\n"
 msgstr "無法推� '%s' �模組\n"
 
-#: submodule.c:1464
+#: submodule.c:1491
 #, c-format
 msgid "Fetching submodule %s%s\n"
 msgstr "正在抓� %s%s �模組\n"
 
-#: submodule.c:1498
+#: submodule.c:1525
 #, c-format
 msgid "Could not access submodule '%s'\n"
 msgstr "無法存��模組 '%s'\n"
 
-#: submodule.c:1653
+#: submodule.c:1680
 #, c-format
 msgid ""
 "Errors during submodule fetch:\n"
@@ -8745,77 +8674,77 @@ msgstr ""
 "抓��模組時發生錯誤：\n"
 "%s"
 
-#: submodule.c:1678
+#: submodule.c:1705
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "無法將 '%s' 識別為一個 git 版本庫"
 
-#: submodule.c:1695
+#: submodule.c:1722
 #, c-format
 msgid "Could not run 'git status --porcelain=2' in submodule %s"
 msgstr "無法在 %s �模組執行 'git status --porcelain=2'"
 
-#: submodule.c:1736
+#: submodule.c:1763
 #, c-format
 msgid "'git status --porcelain=2' failed in submodule %s"
 msgstr "%s �模組執行 'git status --porcelain=2' 失敗"
 
-#: submodule.c:1811
+#: submodule.c:1838
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "無法在�模組 '%s' 中啟動 'git status'"
 
-#: submodule.c:1824
+#: submodule.c:1851
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "無法在�模組 '%s' 中執行 'git status'"
 
-#: submodule.c:1839
+#: submodule.c:1868
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "無法在�模組 '%s' 中�消 core.worktree 的設定"
 
-#: submodule.c:1866 submodule.c:2176
+#: submodule.c:1895 submodule.c:2210
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "無法�迴�模組路徑 '%s'"
 
-#: submodule.c:1887
+#: submodule.c:1917
 msgid "could not reset submodule index"
 msgstr "無法�設�模組的索引"
 
-#: submodule.c:1929
+#: submodule.c:1959
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "�模組 '%s' 中有髒索引"
 
-#: submodule.c:1981
+#: submodule.c:2013
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "�模組 '%s' 無法被更新。"
 
-#: submodule.c:2049
+#: submodule.c:2081
 #, c-format
 msgid "submodule git dir '%s' is inside git dir '%.*s'"
 msgstr "「%s��模組 git 目錄在「%.*s�git 路徑中"
 
-#: submodule.c:2070
+#: submodule.c:2102
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr "�支��有多個工作�的�模組 '%s' 執行 relocate_gitdir"
 
-#: submodule.c:2082 submodule.c:2141
+#: submodule.c:2114 submodule.c:2174
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "�能查詢�模組 '%s' 的�稱"
 
-#: submodule.c:2086
+#: submodule.c:2118
 #, c-format
 msgid "refusing to move '%s' into an existing git dir"
 msgstr "拒絕移動「%s�至�存 git 目錄"
 
-#: submodule.c:2093
+#: submodule.c:2124
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -8826,11 +8755,11 @@ msgstr ""
 "'%s' �移至\n"
 "'%s'\n"
 
-#: submodule.c:2221
+#: submodule.c:2255
 msgid "could not start ls-files in .."
 msgstr "無法在 .. 中啟動 ls-files"
 
-#: submodule.c:2261
+#: submodule.c:2295
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree 返回未知返回值 %d"
@@ -8852,7 +8781,7 @@ msgid "unknown value '%s' for key '%s'"
 msgstr "� '%2$s' 的未知�值 '%1$s'"
 
 #: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
-#: builtin/remote.c:324
+#: builtin/remote.c:327
 #, c-format
 msgid "more than one %s"
 msgstr "多於一個 %s"
@@ -8867,11 +8796,11 @@ msgstr "簽� '%.*s' 的�為空"
 msgid "could not read input file '%s'"
 msgstr "�能讀�輸入檔案 '%s'"
 
-#: trailer.c:766 builtin/mktag.c:88
+#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
 msgid "could not read from stdin"
 msgstr "�能自標準輸入讀�"
 
-#: trailer.c:1024 wrapper.c:676
+#: trailer.c:1024 wrapper.c:684
 #, c-format
 msgid "could not stat %s"
 msgstr "�能� %s 呼� stat"
@@ -8917,7 +8846,7 @@ msgstr "未知的強制能力 %s，該�端�助工具�能需�新版本的
 
 #: transport-helper.c:220
 msgid "this remote helper should implement refspec capability"
-msgstr "�端�助工具需�實� refspec 能力"
+msgstr "�端�助工具需�實� refspec 引用�格能力"
 
 #: transport-helper.c:287 transport-helper.c:429
 #, c-format
@@ -8937,7 +8866,7 @@ msgstr "�能執行 fast-import"
 msgid "error while running fast-import"
 msgstr "執行 fast-import 發生錯誤"
 
-#: transport-helper.c:549 transport-helper.c:1247
+#: transport-helper.c:549 transport-helper.c:1251
 #, c-format
 msgid "could not read ref %s"
 msgstr "無法讀�引用 %s"
@@ -8955,7 +8884,7 @@ msgstr "�定�支�設定�端�務路徑"
 msgid "invalid remote service path"
 msgstr "無效的�端�務路徑"
 
-#: transport-helper.c:661 transport.c:1471
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "�定�支�該動作"
 
@@ -8964,7 +8893,7 @@ msgstr "�定�支�該動作"
 msgid "can't connect to subservice %s"
 msgstr "�能連線到��務 %s"
 
-#: transport-helper.c:693 transport.c:397
+#: transport-helper.c:693 transport.c:404
 msgid "--negotiate-only requires protocol v2"
 msgstr "--negotiate-only 需� v2 版�定"
 
@@ -8977,59 +8906,59 @@ msgstr "'option' 缺少�應的 'ok/error' 指令"
 msgid "expected ok/error, helper said '%s'"
 msgstr "�期 ok/error，�助工具說 '%s'"
 
-#: transport-helper.c:855
+#: transport-helper.c:859
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "�助工具報告 %s 的�外狀態"
 
-#: transport-helper.c:938
+#: transport-helper.c:942
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "�助工具 %s �支� dry-run"
 
-#: transport-helper.c:941
+#: transport-helper.c:945
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "�助工具 %s �支� --signed"
 
-#: transport-helper.c:944
+#: transport-helper.c:948
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "�助工具 %s �支� --signed=if-asked"
 
-#: transport-helper.c:949
+#: transport-helper.c:953
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "�助工具 %s �支� --atomic"
 
-#: transport-helper.c:953
+#: transport-helper.c:957
 #, c-format
 msgid "helper %s does not support --%s"
 msgstr "�助工具 %s �支� --%s"
 
-#: transport-helper.c:960
+#: transport-helper.c:964
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "�助工具 %s �支� 'push-option'"
 
-#: transport-helper.c:1060
+#: transport-helper.c:1064
 msgid "remote-helper doesn't support push; refspec needed"
-msgstr "remote-heper �支� push，需�引用表��"
+msgstr "remote-heper �支� push，需�引用�格"
 
-#: transport-helper.c:1065
+#: transport-helper.c:1069
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "�助工具 %s �支� 'force'"
 
-#: transport-helper.c:1112
+#: transport-helper.c:1116
 msgid "couldn't run fast-export"
 msgstr "無法執行 fast-export"
 
-#: transport-helper.c:1117
+#: transport-helper.c:1121
 msgid "error while running fast-export"
 msgstr "執行 fast-export 時發生錯誤"
 
-#: transport-helper.c:1142
+#: transport-helper.c:1146
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
@@ -9038,52 +8967,52 @@ msgstr ""
 "沒有共�的引用並且也沒有指定，什麼也�會�。\n"
 "您或許得指定一個分支。\n"
 
-#: transport-helper.c:1224
+#: transport-helper.c:1228
 #, c-format
 msgid "unsupported object format '%s'"
 msgstr "�支�的物件格�「%s�"
 
-#: transport-helper.c:1233
+#: transport-helper.c:1237
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "引用列表中格�錯誤的回應：%s"
 
-#: transport-helper.c:1385
+#: transport-helper.c:1389
 #, c-format
 msgid "read(%s) failed"
 msgstr "讀�（%s）失敗"
 
-#: transport-helper.c:1412
+#: transport-helper.c:1416
 #, c-format
 msgid "write(%s) failed"
 msgstr "寫（%s）失敗"
 
-#: transport-helper.c:1461
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed"
 msgstr "%s 執行緒失敗"
 
-#: transport-helper.c:1465
+#: transport-helper.c:1469
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "%s 執行緒等待失敗：%s"
 
-#: transport-helper.c:1484 transport-helper.c:1488
+#: transport-helper.c:1488 transport-helper.c:1492
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "�能啟動執行緒來複製資料：%s"
 
-#: transport-helper.c:1525
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed to wait"
 msgstr "%s 進程等待失敗"
 
-#: transport-helper.c:1529
+#: transport-helper.c:1533
 #, c-format
 msgid "%s process failed"
 msgstr "%s 進程失敗"
 
-#: transport-helper.c:1547 transport-helper.c:1556
+#: transport-helper.c:1551 transport-helper.c:1560
 msgid "can't start thread for copying data"
 msgstr "�能啟動執行緒來複製資料"
 
@@ -9097,53 +9026,53 @@ msgstr "將�設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n"
 msgid "could not read bundle '%s'"
 msgstr "無法讀� bundle '%s'"
 
-#: transport.c:220
+#: transport.c:227
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "傳輸：無效的深度�項 '%s'"
 
-#: transport.c:272
+#: transport.c:279
 msgid "see protocol.version in 'git help config' for more details"
 msgstr "檢視 'git help config' 中的 protocol.version �得更多訊�"
 
-#: transport.c:273
+#: transport.c:280
 msgid "server options require protocol version 2 or later"
 msgstr "�務端�項需�版本 2 �定或更高"
 
-#: transport.c:400
+#: transport.c:407
 msgid "server does not support wait-for-done"
 msgstr "伺�器�支�「等待完��(wait-for-done) 功能"
 
-#: transport.c:751
+#: transport.c:759
 msgid "could not parse transport.color.* config"
 msgstr "�能解� transport.color.* 設定"
 
-#: transport.c:826
+#: transport.c:834
 msgid "support for protocol v2 not implemented yet"
 msgstr "�定 v2 的支�尚未實�"
 
-#: transport.c:960
+#: transport.c:967
 #, c-format
 msgid "unknown value for config '%s': %s"
 msgstr "設定 '%s' 的�值未知：%s"
 
-#: transport.c:1026
+#: transport.c:1033
 #, c-format
 msgid "transport '%s' not allowed"
 msgstr "傳輸 '%s' ��許"
 
-#: transport.c:1079
+#: transport.c:1082
 msgid "git-over-rsync is no longer supported"
 msgstr "��支� git-over-rsync"
 
-#: transport.c:1181
+#: transport.c:1185
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
-msgstr "下列�模組路徑所包�的修改在任何�端�中都找�到：\n"
+msgstr "下列�模組路徑所包�的修改在任何�端來�中都找�到：\n"
 
-#: transport.c:1185
+#: transport.c:1189
 #, c-format
 msgid ""
 "\n"
@@ -9170,11 +9099,11 @@ msgstr ""
 "以推�至�端。\n"
 "\n"
 
-#: transport.c:1193
+#: transport.c:1197
 msgid "Aborting."
 msgstr "正在終止。"
 
-#: transport.c:1340
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr "�能推�全部需�的�模組"
 
@@ -9194,25 +9123,25 @@ 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 ""
-"您�下列檔案的本機修改將被檢出動作覆蓋：\n"
+"您�下列檔案的本機修改將被簽出動作覆蓋：\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"
 "%%s"
 msgstr ""
-"您�下列檔案的本機修改將被檢出動作覆蓋：\n"
+"您�下列檔案的本機修改將被簽出動作覆蓋：\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"
@@ -9221,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"
@@ -9230,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"
@@ -9239,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"
@@ -9248,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"
@@ -9257,25 +9186,34 @@ 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"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
-"工作�中下列未追蹤的檔案將會因為檢出動作而被刪除：\n"
+"工作�中下列未追蹤的檔案將會因為簽出動作而被刪除：\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"
 "%%s"
 msgstr ""
-"工作�中下列未追蹤的檔案將會因為檢出動作而被刪除：\n"
+"工作�中下列未追蹤的檔案將會因為簽出動作而被刪除：\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"
@@ -9284,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"
@@ -9293,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"
@@ -9302,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"
@@ -9311,27 +9249,27 @@ 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 "
 "checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
-"工作�中下列未追蹤的檔案將會因為檢出動作而被覆蓋：\n"
+"工作�中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n"
 "%%s請在切�分支�移動或刪除。"
 
-#: 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 ""
-"工作�中下列未追蹤的檔案將會因為檢出動作而被覆蓋：\n"
+"工作�中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\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"
@@ -9340,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"
@@ -9349,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"
@@ -9358,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"
@@ -9367,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"
@@ -9381,52 +9319,52 @@ 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 "
 "patterns:\n"
 "%s"
 msgstr ""
-"�使有稀�檢出樣�，以下路徑�是最新且�留下來：\n"
+"�使有稀�簽出樣�，以下路徑�是最新且�留下來：\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"
 "%s"
 msgstr ""
-"�使有稀�檢出樣�，以下路徑未�併且�留下來：\n"
+"�使有稀�簽出樣�，以下路徑未�併且�留下來：\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 "
 "patterns:\n"
 "%s"
 msgstr ""
-"�使有稀�檢出樣�，以下路徑已經存在而因此未更新：\n"
+"�使有稀�簽出樣�，以下路徑已經存在而因此未更新：\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"
@@ -9435,16 +9373,16 @@ msgstr ""
 "以下路徑發生碰撞（如：在��分大�寫的檔案系統上的�分大�寫的路徑），\n"
 "並且碰撞組中�有一個檔案存在工作�中：\n"
 
-#: unpack-trees.c:1519
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "正在更新索引旗標"
 
-#: unpack-trees.c:2608
+#: unpack-trees.c:2803
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr "工作�和未追蹤�交有�複項目：%s"
 
-#: upload-pack.c:1548
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "在 fetch 引數應為一個 flush 包"
 
@@ -9481,113 +9419,123 @@ msgstr "無效的 '..' 路徑�塊"
 msgid "Fetching objects"
 msgstr "正在抓�物件"
 
-#: worktree.c:238 builtin/am.c:2151
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr "讀� '%s' 失敗"
 
-#: worktree.c:304
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "在主工作�的 '%s' �是版本庫目錄"
 
-#: worktree.c:315
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "檔案 '%s' �包�工作�的絕�路徑"
 
-#: worktree.c:327
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' �存在"
 
-#: worktree.c:333
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' �是一個 .git 檔案，錯誤碼 %d"
 
-#: worktree.c:342
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' 沒有指回到 '%s'"
 
-#: worktree.c:608
+#: worktree.c:604
 msgid "not a directory"
 msgstr "�是目錄"
 
-#: worktree.c:617
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git �是檔案"
 
-#: worktree.c:619
+#: worktree.c:615
 msgid ".git file broken"
 msgstr ".git 檔案�毀"
 
-#: worktree.c:621
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr ".git 檔案�正確"
 
-#: worktree.c:727
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "�有效路徑"
 
-#: worktree.c:733
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr "無法定�版本庫；.git �是檔案"
 
-#: worktree.c:737
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
-msgstr "無法定�版本庫；.git 檔案未�考版本庫"
+msgstr "無法定�版本庫：.git 檔案未指�版本庫"
 
-#: worktree.c:741
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "無法定�版本庫；.git 檔案�壞"
 
-#: worktree.c:747
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "無法讀� gitdir"
 
-#: worktree.c:751
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "�正確的 gitdir"
 
-#: worktree.c:776
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "�有效目錄"
 
-#: worktree.c:782
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "找�到 gitdir 檔案"
 
-#: worktree.c:787 worktree.c:796
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "無法讀� gitdir 檔案 (%s)"
 
-#: worktree.c:806
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "讀��短（�期有 %<PRIuMAX> �元組，�讀到 %<PRIuMAX>）"
 
-#: worktree.c:814
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "gitdir 檔案無效"
 
-#: worktree.c:822
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "gitdir 檔案指�的�置�存在"
 
-#: wrapper.c:197 wrapper.c:367
+#: wrapper.c:151
+#, c-format
+msgid "could not setenv '%s'"
+msgstr "無法 setenv '%s'"
+
+#: wrapper.c:203
+#, c-format
+msgid "unable to create '%s'"
+msgstr "�能建立 '%s'"
+
+#: wrapper.c:205 wrapper.c:375
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "無法開啟 '%s' 進行讀寫"
 
-#: wrapper.c:398 wrapper.c:599
+#: wrapper.c:406 wrapper.c:607
 #, c-format
 msgid "unable to access '%s'"
 msgstr "�能存� '%s'"
 
-#: wrapper.c:607
+#: wrapper.c:615
 msgid "unable to get current working directory"
 msgstr "�能�得目�工作目錄"
 
@@ -9626,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:1075
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr "��交的變更："
 
-#: wt-status.c:234 wt-status.c:1084
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "尚未暫存以備�交的變更："
 
@@ -9736,21 +9684,21 @@ msgstr "修改的內容, "
 msgid "untracked content, "
 msgstr "未追蹤的內容, "
 
-#: wt-status.c:908
+#: 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:939
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "�模組已修改但尚未更新："
 
-#: wt-status.c:941
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "��交的�模組變更："
 
-#: wt-status.c:1023
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -9758,7 +9706,7 @@ msgstr ""
 "��改動或刪除上�的一行。\n"
 "其下所有內容都將被忽略。"
 
-#: wt-status.c:1115
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -9769,278 +9717,288 @@ msgstr ""
 "花了 %.2f 秒�計算出分支的領先/�後範�。\n"
 "為��，您�以使用 '--no-ahead-behind'。\n"
 
-#: wt-status.c:1145
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "您有尚未�併的路徑。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1148
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  （解決��並執行 \"git commit\"）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1150
+#: wt-status.c:1206
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  （使用 \"git merge --abort\" 終止�併）"
 
-#: wt-status.c:1154
+#: wt-status.c:1210
 msgid "All conflicts fixed but you are still merging."
 msgstr "所有��已解決但您�處於�併中。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1157
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  （使用 \"git commit\" ���併）"
 
-#: wt-status.c:1166
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr "您正處於 am 動作�程中。"
 
-#: wt-status.c:1169
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "目�的修補檔為空。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1173
+#: wt-status.c:1232
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  （解決��，然後執行 \"git am --continue\"）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1175
+#: wt-status.c:1234
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  （使用 \"git am --skip\" 略�此修補檔）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1177
+#: 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:1310
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo �失。"
 
-#: wt-status.c:1312
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "沒有指令被執行。"
 
-#: wt-status.c:1315
+#: 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:1326
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  （更多�見檔案 %s）"
 
-#: wt-status.c:1331
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "未剩下任何指令。"
 
-#: wt-status.c:1334
+#: 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:1342
+#: wt-status.c:1404
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  （使用 \"git rebase --edit-todo\" 來檢視和編輯）"
 
-#: wt-status.c:1354
+#: wt-status.c:1416
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "您在執行將分支 '%s' �定基底到 '%s' 的動作。"
 
-#: wt-status.c:1359
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "您在執行�定基底動作。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1372
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  （解決��，然後執行 \"git rebase --continue\"）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1374
+#: wt-status.c:1436
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  （使用 \"git rebase --skip\" 略�此修補檔）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1376
+#: wt-status.c:1438
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr "  （使用 \"git rebase --abort\" 以檢出原有分支）"
+msgstr "  （使用 \"git rebase --abort\" 以簽出原有分支）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1383
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  （所有��已解決：執行 \"git rebase --continue\"）"
 
-#: wt-status.c:1387
+#: 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:1392
+#: wt-status.c:1454
 msgid "You are currently splitting a commit during a rebase."
 msgstr "您在執行�定基底動作時分割�交。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1395
+#: wt-status.c:1457
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr "  （一旦您工作目錄�交乾淨後，執行 \"git rebase --continue\"）"
 
-#: wt-status.c:1399
+#: 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:1404
+#: wt-status.c:1466
 msgid "You are currently editing a commit during a rebase."
 msgstr "您在執行�定基底動作時編輯�交。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1407
+#: wt-status.c:1469
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  （使用 \"git commit --amend\" 修補目��交）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1409
+#: wt-status.c:1471
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  （當您�您的修改滿�後執行 \"git rebase --continue\"）"
 
-#: wt-status.c:1420
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "��動作正在進行中。"
 
-#: wt-status.c:1423
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "您在執行���交 %s 的動作。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1430
+#: wt-status.c:1492
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  （解決��並執行 \"git cherry-pick --continue\"）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1433
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  （執行 \"git cherry-pick --continue\" 以繼續）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1436
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  （所有��已解決：執行 \"git cherry-pick --continue\"）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1438
+#: wt-status.c:1500
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  （使用 \"git cherry-pick --skip\" 略�此修補檔）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1440
+#: wt-status.c:1502
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  （使用 \"git cherry-pick --abort\" 以�消��動作）"
 
-#: wt-status.c:1450
+#: wt-status.c:1512
 msgid "Revert currently in progress."
-msgstr "還原動作正在行中。"
+msgstr "還原動作正在進行中。"
 
-#: wt-status.c:1453
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "您在執行�轉�交 %s 的動作。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1459
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  （解決��並執行 \"git revert --continue\"）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1462
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  （執行 \"git revert --continue\" 以繼續）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1465
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  （所有��已解決：執行 \"git revert --continue\"）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1467
+#: wt-status.c:1529
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  （使用 \"git revert --skip\" 略�此修補檔）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1469
+#: wt-status.c:1531
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  （使用 \"git revert --abort\" 以�消�轉�交動作）"
 
-#: wt-status.c:1479
+#: wt-status.c:1541
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "您在執行從分支 '%s' 開始的二分�尋動作。"
 
-#: wt-status.c:1483
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "您在執行二分�尋動作。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1486
+#: wt-status.c:1548
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr "  （使用 \"git bisect reset\" 檢出原有分支）"
+msgstr "  （使用 \"git bisect reset\" 簽出原有分支）"
+
+#: wt-status.c:1559
+msgid "You are in a sparse checkout."
+msgstr "您正在稀�簽出的工作�中。"
 
-#: wt-status.c:1497
+#: wt-status.c:1562
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr "您處於稀�簽出狀態，包� %d%% 的追蹤檔案。"
 
-#: wt-status.c:1736
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "�於分支 "
 
-#: wt-status.c:1743
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "互動��定基底動作正在進行中；至 "
 
-#: wt-status.c:1745
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "�定基底動作正在進行中；至 "
 
-#: wt-status.c:1750
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "開頭指標分離於 "
 
-#: wt-status.c:1752
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "開頭指標分離自 "
 
-#: wt-status.c:1755
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "目��在任何分支上。"
 
-#: wt-status.c:1772
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "�始�交"
 
-#: wt-status.c:1773
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "尚無�交"
 
-#: wt-status.c:1787
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "未追蹤的檔案"
 
-#: wt-status.c:1789
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "忽略的檔案"
 
-#: wt-status.c:1793
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10050,120 +10008,120 @@ msgstr ""
 "耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能�高速度，\n"
 "但您需��心��忘了新增新檔案（�見 'git help status'）。"
 
-#: wt-status.c:1799
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "未追蹤的檔案沒有列出%s"
 
 #  譯者：中文字串拼接，�刪除�導空格
-#: wt-status.c:1801
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr " （使用 -u �數顯示未追蹤的檔案）"
 
-#: wt-status.c:1807
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "沒有修改"
 
-#: wt-status.c:1812
+#: 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:1816
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "修改尚未加入�交\n"
 
-#: wt-status.c:1820
+#: 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:1824
+#: wt-status.c:1894
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "�交為空，但是存在尚未追蹤的檔案\n"
 
 #  譯者：中文字串拼接，�刪除�導空格
-#: wt-status.c:1828
+#: 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:1832 wt-status.c:1838
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "無檔案��交\n"
 
 #  譯者：中文字串拼接，�刪除�導空格
-#: wt-status.c:1835
+#: wt-status.c:1905
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "無檔案��交（使用 -u 顯示未追蹤的檔案）\n"
 
 #  譯者：中文字串拼接，�刪除�導空格
-#: wt-status.c:1840
+#: wt-status.c:1910
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "沒有��交的檔案，工作�為乾淨狀態\n"
 
-#: wt-status.c:1945
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "尚無�交在 "
 
-#: wt-status.c:1949
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD（�分支）"
 
-#: wt-status.c:1980
+#: wt-status.c:2050
 msgid "different"
 msgstr "��"
 
 #  譯者：請維��尾空格
-#: wt-status.c:1982 wt-status.c:1990
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "�後 "
 
-#: wt-status.c:1985 wt-status.c:1988
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr "領先 "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2511
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "�能%s：您有未暫存的變更。"
 
-#: wt-status.c:2517
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr "�外，您的索引中包�未�交的變更。"
 
-#: wt-status.c:2519
+#: wt-status.c:2604
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "�能%s：您的索引中包�未�交的變更。"
 
-#: compat/simple-ipc/ipc-unix-socket.c:178
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr "無法傳� IPC 命令"
 
-#: compat/simple-ipc/ipc-unix-socket.c:185
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr "無法讀� IPC 回應"
 
-#: compat/simple-ipc/ipc-unix-socket.c:862
+#: 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:874
+#: compat/simple-ipc/ipc-unix-socket.c:904
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr "無法啟動「%s�的 worker[0]"
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "刪除 '%s' 失敗"
@@ -10172,131 +10130,136 @@ msgstr "刪除 '%s' 失敗"
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<�項>] [--] <路徑�格>..."
 
-#: builtin/add.c:61
+#: builtin/add.c:64
 #, c-format
 msgid "cannot chmod %cx '%s'"
 msgstr "無法 chmod %cx ‘%s’"
 
-#: builtin/add.c:99
+#: builtin/add.c:106
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "�外的差異狀態 %c"
 
-#: builtin/add.c:104 builtin/commit.c:297
+#: builtin/add.c:111 builtin/commit.c:298
 msgid "updating files failed"
 msgstr "更新檔案失敗"
 
-#: builtin/add.c:114
+#: builtin/add.c:121
 #, c-format
 msgid "remove '%s'\n"
 msgstr "刪除 '%s'\n"
 
-#: builtin/add.c:198
+#: builtin/add.c:205
 msgid "Unstaged changes after refreshing the index:"
 msgstr "�新整�索引之後尚未被暫存的變更："
 
-#: builtin/add.c:307 builtin/rev-parse.c:991
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "�能讀�索引"
 
-#: builtin/add.c:318
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "無法為寫入開啟 '%s'。"
-
-#: builtin/add.c:322
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "�能生�修補檔"
 
-#: builtin/add.c:325
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "編輯修補檔失敗"
 
-#: builtin/add.c:328
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "�能� '%s' 呼� stat"
 
-#: builtin/add.c:330
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "空修補檔。異常終止。"
 
-#: builtin/add.c:335
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "�能套用 '%s'"
 
-#: builtin/add.c:343
+#: builtin/add.c:348
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n"
 
-#: builtin/add.c:363 builtin/clean.c:904 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
-#: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190
+#: 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:366
+#: 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:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "互動�挑�資料�塊"
 
-#: builtin/add.c:368
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "編輯目�差異並套用"
 
-#: builtin/add.c:369
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "�許新增忽略的檔案"
 
-#: builtin/add.c:370
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "更新已追蹤的檔案"
 
-#: builtin/add.c:371
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "�已追蹤檔案（隱� -u）�新歸一�行符號"
 
-#: builtin/add.c:372
+#: builtin/add.c:377
 msgid "record only the fact that the path will be added later"
 msgstr "�記錄，該路徑�後�新增"
 
-#: builtin/add.c:373
+#: builtin/add.c:378
 msgid "add changes from all tracked and untracked files"
 msgstr "新增所有改變的已追蹤檔案和未追蹤檔案"
 
-#: builtin/add.c:376
+#: builtin/add.c:381
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "忽略工作�中移除的路徑（和 --no-all 相�）"
 
-#: builtin/add.c:378
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "�新增，��新整�索引"
 
-#: builtin/add.c:379
+#: builtin/add.c:384
 msgid "just skip files which cannot be added because of errors"
 msgstr "略�因發生錯誤�能新增的檔案"
 
-#: builtin/add.c:380
+#: builtin/add.c:385
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "檢查在測試執行模�下檔案（�使�存在）是�被忽略"
 
-#: builtin/add.c:382 builtin/update-index.c:1006
+#: 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:388 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "覆蓋列表裡檔案的�執行�"
 
-#: builtin/add.c:384
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "建立一個嵌入�版本庫時給予警告"
 
-#: builtin/add.c:386
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "`git stash -p` 的後端"
 
-#: builtin/add.c:404
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10325,12 +10288,12 @@ msgstr ""
 "\n"
 "�見 \"git help submodule\" �得更多訊�。"
 
-#: builtin/add.c:432
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "正在新增嵌入� git 版本庫：%s"
 
-#: builtin/add.c:451
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10340,51 +10303,27 @@ msgstr ""
 "如�關閉此訊�，請執行\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:460
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "新增檔案失敗"
 
-#: builtin/add.c:488
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run 和 --interactive/--patch �相容"
-
-#: builtin/add.c:490 builtin/commit.c:357
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file 與 --interactive/--patch �相容"
-
-#: builtin/add.c:507
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file 與 --edit �相容"
-
-#: builtin/add.c:519
-msgid "-A and -u are mutually incompatible"
-msgstr "-A 和 -u �項互斥"
-
-#: builtin/add.c:522
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "�項 --ignore-missing �能和 --dry-run �時使用"
-
-#: builtin/add.c:526
+#: builtin/add.c:548
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "�數 --chmod �值 '%s' 必須是 -x 或 +x"
 
-#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
-#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file 與 <路徑�格> �數�相容"
-
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
-#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643
-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:555
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "沒有指定檔案，也沒有檔案被新增。\n"
 
-#: builtin/add.c:557
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10394,105 +10333,111 @@ msgstr ""
 "如�關閉此訊�，請執行\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:364
+#: 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:454
+#: builtin/am.c:482
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' 被 applypatch-msg 掛鉤刪除"
 
-#: builtin/am.c:496
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "�法的輸入行：'%s'。"
 
-#: builtin/am.c:534
+#: builtin/am.c:562
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "從 '%s' 複製註解到 '%s' 時失敗"
 
-#: builtin/am.c:560
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "fseek 失敗"
 
-#: builtin/am.c:748
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "無法解�修補檔 '%s'"
 
-#: builtin/am.c:813
+#: builtin/am.c:841
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "一次�能有一個 StGIT 修補檔佇列被套用"
 
-#: builtin/am.c:861
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "無效的時間戳"
 
-#: builtin/am.c:866 builtin/am.c:878
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "無效的日期行"
 
-#: builtin/am.c:873
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "無效的時��移值"
 
-#: builtin/am.c:966
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "修補檔格��測失敗。"
 
-#: builtin/am.c:971 builtin/clone.c:414
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "建立目錄 '%s' 失敗"
 
-#: builtin/am.c:976
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "分割修補檔失敗。"
 
-#: builtin/am.c:1125
+#: builtin/am.c:1153
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "當您解決這一�題，執行 \"%s --continue\"。"
 
-#: builtin/am.c:1126
+#: builtin/am.c:1154
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "如果您想�略�這一修補檔，則執行 \"%s --skip\"。"
 
-#: builtin/am.c:1127
+#: 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:1222
+#: 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:1250
-msgid "Patch is empty."
-msgstr "修補檔為空。"
-
-#: builtin/am.c:1315
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "在�交 %s 中缺少作者行"
 
-#: builtin/am.c:1318
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "無效的身份標記：%.*s"
 
-#: builtin/am.c:1537
+#: builtin/am.c:1566
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "版本庫缺�必�的資料物件以進行三方�併。"
 
-#: builtin/am.c:1539
+#: builtin/am.c:1568
 msgid "Using index info to reconstruct a base tree..."
 msgstr "使用索引來�建一個（三方�併的）基礎目錄樹..."
 
-#: builtin/am.c:1558
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10500,24 +10445,24 @@ msgstr ""
 "您是�曾手動編輯�您的修補檔？\n"
 "無法套用修補檔到索引中的資料物件上。"
 
-#: builtin/am.c:1564
+#: builtin/am.c:1593
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "回�到基礎版本上修補�進行三方�併..."
 
-#: builtin/am.c:1590
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "無法�併變更。"
 
-#: builtin/am.c:1622
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "正套用到一個空歷�上"
 
-#: builtin/am.c:1674 builtin/am.c:1678
+#: builtin/am.c:1703 builtin/am.c:1707
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "無法繼續：%s �存在。"
 
-#: builtin/am.c:1696
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "�交內容為："
 
@@ -10526,39 +10471,57 @@ msgstr "�交內容為："
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1706
+#: 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:1752 builtin/commit.c:408
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "無法寫入索引檔案"
 
-#: builtin/am.c:1756
+#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "髒索引：�能套用修補檔（髒檔案：%s）"
 
-#: builtin/am.c:1796 builtin/am.c:1864
+#: 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:1813
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "沒有變更——修補檔已經套用�。"
 
-#: builtin/am.c:1819
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "打修補檔失敗於 %s %.*s"
 
-#: builtin/am.c:1823
+#: 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:1867
+#: 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"
@@ -10568,7 +10531,7 @@ msgstr ""
 "如果沒有什麼�新增到暫存�的，則很�能是其它�交已經引入了相�的變更。\n"
 "您也許想�略�這個修補檔。"
 
-#: builtin/am.c:1874
+#: 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 "
@@ -10579,175 +10542,183 @@ msgstr ""
 "您應該�已經��解決的�一個檔案執行 'git add' 來標記已經完�。 \n"
 "你�以� \"由他們刪除\" 的檔案執行 `git rm` 指令。"
 
-#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
-#: builtin/reset.c:355
+#: 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:2033
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "清空索引失敗"
 
-#: builtin/am.c:2077
+#: 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:2184
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "無效的 --patch-format 值：%s"
 
-#: builtin/am.c:2226
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr "無效的 --show-current-patch 值：%s"
 
-#: builtin/am.c:2230
+#: 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:2261
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<�項>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2262
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<�項>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2268
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "以互動�方�執行"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "�的�數 —— 無作用"
 
-#: builtin/am.c:2272
+#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
 msgstr "如果必�，�許使用三方�併"
 
-#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
-#: builtin/repack.c:472 builtin/stash.c:948
+#: 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:2275
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "在�交說明�尾加入 Signed-off-by"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "使用 utf8 字元集（�設）"
 
-#: builtin/am.c:2280
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "� git-mailinfo 傳� -k �數"
 
-#: builtin/am.c:2282
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "� git-mailinfo 傳� -b �數"
 
-#: builtin/am.c:2284
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "� git-mailinfo 傳� -m �數"
 
-#: builtin/am.c:2286
+#: builtin/am.c:2345
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "�� mbox 格�，� git-mailsplit 傳� --keep-cr �數"
 
-#: builtin/am.c:2289
+#: 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:2292
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "�棄�切線�的所有內容"
 
-#: builtin/am.c:2294
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "�� git-mailinfo 傳�"
 
-#: builtin/am.c:2297 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:2324
+#: 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:2314 builtin/commit.c:1505 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:906 builtin/merge.c:261
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487
-#: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172
-#: builtin/tag.c:447 parse-options.h:155 parse-options.h:176
+#: 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:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2320 builtin/branch.c:672 builtin/bugreport.c:137
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481
+#: 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:2321
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "修補檔的格�"
 
-#: builtin/am.c:2327
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
 msgstr "打修補檔失敗時顯示的錯誤訊�"
 
-#: builtin/am.c:2329
+#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
 msgstr "��解決後繼續套用修補檔"
 
-#: builtin/am.c:2332
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "和 --continue �義"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "略�目�修補檔"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr "還原原始分支並中止修補動作"
 
-#: builtin/am.c:2341
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
-msgstr "終止修補動作但�� HEAD �變。"
+msgstr "終止修補動作但�� HEAD �變"
 
-#: builtin/am.c:2345
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "顯示正在套用的修補檔"
 
-#: builtin/am.c:2350
+#: 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:2352
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr "用目�時間作為作者日期"
 
-#: builtin/am.c:2354 builtin/commit-tree.c:120 builtin/commit.c:1630
-#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537
-#: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462
+#: 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:2355 builtin/rebase.c:538 builtin/rebase.c:1396
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "使用 GPG 簽��交"
 
-#: builtin/am.c:2358
+#: 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:2376
+#: 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."
@@ -10755,16 +10726,16 @@ msgstr ""
 "�數 -b/--binary 已經很長時間��任何實質動作了，並且將被移除。\n"
 "請���使用它了。"
 
-#: builtin/am.c:2383
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr "讀�索引失敗"
 
-#: builtin/am.c:2398
+#: builtin/am.c:2463
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "之�的�定基底目錄 %s �然存在，但��供了 mbox。"
 
-#: builtin/am.c:2422
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -10773,11 +10744,11 @@ msgstr ""
 "發�了錯誤的 %s 目錄。\n"
 "使用 \"git am --abort\" 刪除它。"
 
-#: builtin/am.c:2428
+#: builtin/am.c:2493
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "解決動作未進行，我們�會繼續。"
 
-#: builtin/am.c:2438
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "互動�模�需�指令列上�供修補檔"
 
@@ -10785,44 +10756,35 @@ msgstr "互動�模�需�指令列上�供修補檔"
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<�項>] [<修補檔>...]"
 
-#: builtin/archive.c:17
-#, c-format
-msgid "could not create archive file '%s'"
-msgstr "�能建立歸檔檔案 '%s'"
-
-#: builtin/archive.c:20
+#: builtin/archive.c:18
 msgid "could not redirect output"
 msgstr "�能�定�輸出"
 
-#: builtin/archive.c:37
+#: builtin/archive.c:35
 msgid "git archive: Remote with no URL"
 msgstr "git archive：未�供�端 URL"
 
-#: builtin/archive.c:61
+#: builtin/archive.c:59
 msgid "git archive: expected ACK/NAK, got a flush packet"
 msgstr "git archive：期望是 ACK/NAK，�得到 flush 包"
 
-#: builtin/archive.c:64
+#: builtin/archive.c:62
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive：NACK %s"
 
-#: builtin/archive.c:65
+#: builtin/archive.c:63
 msgid "git archive: protocol error"
 msgstr "git archive：�定錯誤"
 
-#: builtin/archive.c:69
+#: builtin/archive.c:67
 msgid "git archive: expected a flush"
 msgstr "git archive：應有一個 flush 包"
 
-#: builtin/bisect--helper.c:23
+#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<�交>]"
 
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --bisect-next-check <好-術語> <壞-術語> [<術語>]"
-
 #: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
@@ -10860,72 +10822,85 @@ msgstr "git bisect--helper --bisect-replay <檔�>"
 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
 msgstr "git bisect--helper --bisect-skip [(<修訂版>|<範�>)...]"
 
-#: builtin/bisect--helper.c:107
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-visualize"
+msgstr "git bisect--helper --bisect-visualize"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-run <cmd>..."
+msgstr "git bisect--helper --bisect-run <cmd>..."
+
+#: builtin/bisect--helper.c:109
 #, c-format
 msgid "cannot open file '%s' in mode '%s'"
 msgstr "無法以 '%2$s' 模�開啟 '%1$s' 檔案"
 
-#: builtin/bisect--helper.c:114
+#: builtin/bisect--helper.c:116
 #, c-format
 msgid "could not write to file '%s'"
 msgstr "無法寫入 '%s' 檔案"
 
-#: builtin/bisect--helper.c:153
+#: builtin/bisect--helper.c:154
+#, c-format
+msgid "cannot open file '%s' for reading"
+msgstr "無法開啟「%s�檔案進行讀�"
+
+#: builtin/bisect--helper.c:170
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' �是一個有效的術語"
 
-#: builtin/bisect--helper.c:157
+#: builtin/bisect--helper.c:174
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "�能使用內建指令 '%s' 作為術語"
 
-#: builtin/bisect--helper.c:167
+#: builtin/bisect--helper.c:184
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "�能修改術語 '%s' 的�義"
 
-#: builtin/bisect--helper.c:177
+#: builtin/bisect--helper.c:194
 msgid "please use two different terms"
 msgstr "請使用兩個��的術語"
 
-#: builtin/bisect--helper.c:193
+#: builtin/bisect--helper.c:210
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "我們沒有在二分�尋。\n"
 
-#: builtin/bisect--helper.c:201
+#: builtin/bisect--helper.c:218
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "'%s' �是一個有效的�交"
 
-#: builtin/bisect--helper.c:210
+#: builtin/bisect--helper.c:227
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
-msgstr "�能檢出原始 HEAD '%s'。嘗試 'git bisect reset <�交>'。"
+msgstr "�能簽出原始 HEAD '%s'。嘗試 'git bisect reset <�交>'。"
 
-#: builtin/bisect--helper.c:254
+#: builtin/bisect--helper.c:271
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "壞的 bisect_write �數：%s"
 
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:276
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "無法�得版本 '%s' 的物件 ID"
 
-#: builtin/bisect--helper.c:271
+#: builtin/bisect--helper.c:288
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "無法開啟檔案 '%s'"
 
-#: builtin/bisect--helper.c:297
+#: builtin/bisect--helper.c:314
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "無效的指令：您目�正處於一個 %s/%s 二分�尋中"
 
-#: builtin/bisect--helper.c:324
+#: builtin/bisect--helper.c:341
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -10934,7 +10909,7 @@ msgstr ""
 "您需�給我至少一個 %s 和一個 %s 版本。\n"
 "為此您�以用 \"git bisect %s\" 和 \"git bisect %s\"。"
 
-#: builtin/bisect--helper.c:328
+#: builtin/bisect--helper.c:345
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -10945,7 +10920,7 @@ msgstr ""
 "然後需��供我至少一個 %s 和一個 %s 版本。\n"
 "為此您�以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。"
 
-#: builtin/bisect--helper.c:348
+#: builtin/bisect--helper.c:365
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "在�有一個 %s �交的情�下二分�尋"
@@ -10955,22 +10930,22 @@ msgstr "在�有一個 %s �交的情�下二分�尋"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:356
+#: builtin/bisect--helper.c:373
 msgid "Are you sure [Y/n]? "
 msgstr "您確�嗎[Y/n]？ "
 
-#: builtin/bisect--helper.c:417
+#: builtin/bisect--helper.c:434
 msgid "no terms defined"
 msgstr "未定義術語"
 
-#: builtin/bisect--helper.c:420
+#: builtin/bisect--helper.c:437
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
 "and %s for the new state.\n"
 msgstr "您目���舊狀態的術語是 %s，�新狀態的術語是 %s。\n"
 
-#: builtin/bisect--helper.c:430
+#: builtin/bisect--helper.c:447
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -10979,52 +10954,52 @@ msgstr ""
 "指令 'git bisect terms' 的�數 %s 無效。\n"
 "支�的�項有：--term-good|--term-old 和 --term-bad|--term-new。"
 
-#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
+#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
 msgid "revision walk setup failed\n"
 msgstr "版本�歷設定失敗\n"
 
-#: builtin/bisect--helper.c:519
+#: builtin/bisect--helper.c:536
 #, c-format
 msgid "could not open '%s' for appending"
 msgstr "無法開啟 '%s' 進行附加"
 
-#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
 msgid "'' is not a valid term"
 msgstr "'' �是一個有效的術語"
 
-#: builtin/bisect--helper.c:661
+#: builtin/bisect--helper.c:678
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "未識別的�項：'%s'"
 
-#: builtin/bisect--helper.c:665
+#: builtin/bisect--helper.c:682
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' 看起來�是一個有效的版本"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:713
 msgid "bad HEAD - I need a HEAD"
 msgstr "壞的 HEAD - 我需�一個 HEAD"
 
-#: builtin/bisect--helper.c:711
+#: builtin/bisect--helper.c:728
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
-msgstr "檢出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。"
+msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。"
 
-#: builtin/bisect--helper.c:732
+#: builtin/bisect--helper.c:749
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "�會在�了 cg-seek 的樹上�二分�尋"
 
-#: builtin/bisect--helper.c:735
+#: builtin/bisect--helper.c:752
 msgid "bad HEAD - strange symbolic ref"
 msgstr "壞的 HEAD - 奇怪的符號引用"
 
-#: builtin/bisect--helper.c:755
+#: builtin/bisect--helper.c:772
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "無效的引用：'%s'"
 
-#: builtin/bisect--helper.c:813
+#: builtin/bisect--helper.c:830
 msgid "You need to start by \"git bisect start\"\n"
 msgstr "您需�執行 \"git bisect start\" 來開始\n"
 
@@ -11033,104 +11008,149 @@ msgstr "您需�執行 \"git bisect start\" 來開始\n"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:824
+#: builtin/bisect--helper.c:841
 msgid "Do you want me to do it for you [Y/n]? "
 msgstr "您想讓我為您這樣�嗎[Y/n]？ "
 
-#: builtin/bisect--helper.c:842
+#: builtin/bisect--helper.c:859
 msgid "Please call `--bisect-state` with at least one argument"
-msgstr "�呼� `—bisect-state`，請傳入一個以上的引數"
+msgstr "�呼� `--bisect-state`，請傳入一個以上的引數"
 
-#: builtin/bisect--helper.c:855
+#: builtin/bisect--helper.c:872
 #, c-format
 msgid "'git bisect %s' can take only one argument."
 msgstr "'git bisect %s' �能有一個�數。"
 
-#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
+#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
 #, c-format
 msgid "Bad rev input: %s"
 msgstr "<修訂版> 輸入格�錯誤：%s"
 
-#: builtin/bisect--helper.c:887
+#: builtin/bisect--helper.c:904
 #, c-format
 msgid "Bad rev input (not a commit): %s"
 msgstr "修訂版輸入有誤（�是�交）：%s"
 
-#: builtin/bisect--helper.c:919
+#: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
 msgstr "我們沒有在二分�尋。"
 
-#: builtin/bisect--helper.c:969
+#: builtin/bisect--helper.c:986
 #, c-format
 msgid "'%s'?? what are you talking about?"
 msgstr "「%s�？？您在說什麼？"
 
-#: builtin/bisect--helper.c:981
+#: builtin/bisect--helper.c:998
 #, c-format
 msgid "cannot read file '%s' for replaying"
 msgstr "無法讀�「%s�檔案來�放"
 
-#: builtin/bisect--helper.c:1054
+#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
+msgid "bisect run failed: no command provided."
+msgstr "二分�尋執行失敗：沒有�供指令。"
+
+#: builtin/bisect--helper.c:1116
+#, c-format
+msgid "running %s\n"
+msgstr "正在執行 %s\n"
+
+#: builtin/bisect--helper.c:1120
+#, c-format
+msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
+msgstr "二分�尋執行失敗：「%2$s�返回的離開碼 %1$d �於 0 或 >= 128"
+
+#: builtin/bisect--helper.c:1136
+#, c-format
+msgid "cannot open file '%s' for writing"
+msgstr "無法開啟「%s�檔案進行寫入"
+
+#: builtin/bisect--helper.c:1152
+msgid "bisect run cannot continue any more"
+msgstr "二分�尋�能繼續執行"
+
+#: builtin/bisect--helper.c:1154
+#, c-format
+msgid "bisect run success"
+msgstr "二分�尋執行�功"
+
+#: builtin/bisect--helper.c:1157
+#, c-format
+msgid "bisect found first bad commit"
+msgstr "二分�尋發�到第一個有�題的�交"
+
+#: builtin/bisect--helper.c:1160
+#, c-format
+msgid ""
+"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
+"code %d"
+msgstr ""
+"二分�尋執行失敗：'git bisect--helper --bisect-state %s' 以錯誤代碼 %d 離開"
+
+#: builtin/bisect--helper.c:1192
 msgid "reset the bisection state"
 msgstr "清除二分�尋狀態"
 
-#: builtin/bisect--helper.c:1056
+#: builtin/bisect--helper.c:1194
 msgid "check whether bad or good terms exist"
 msgstr "檢查壞的或好的術語是�存在"
 
-#: builtin/bisect--helper.c:1058
+#: builtin/bisect--helper.c:1196
 msgid "print out the bisect terms"
 msgstr "列�二分�尋術語"
 
-#: builtin/bisect--helper.c:1060
+#: builtin/bisect--helper.c:1198
 msgid "start the bisect session"
 msgstr "啟動二分�尋�程"
 
-#: builtin/bisect--helper.c:1062
+#: builtin/bisect--helper.c:1200
 msgid "find the next bisection commit"
 msgstr "尋找下一個二分�尋�交"
 
-#: builtin/bisect--helper.c:1064
+#: builtin/bisect--helper.c:1202
 msgid "mark the state of ref (or refs)"
 msgstr "標記 ref (或 refs) 的狀態"
 
-#: builtin/bisect--helper.c:1066
+#: builtin/bisect--helper.c:1204
 msgid "list the bisection steps so far"
 msgstr "列出迄今的二分�尋步驟"
 
-#: builtin/bisect--helper.c:1068
+#: builtin/bisect--helper.c:1206
 msgid "replay the bisection process from the given file"
 msgstr "從指定檔案�放二分�尋�程"
 
-#: builtin/bisect--helper.c:1070
+#: builtin/bisect--helper.c:1208
 msgid "skip some commits for checkout"
-msgstr "略��檢出的部分�交"
+msgstr "略��簽出的部分�交"
 
-#: builtin/bisect--helper.c:1072
+#: builtin/bisect--helper.c:1210
+msgid "visualize the bisection"
+msgstr "視覺化二分�尋�程"
+
+#: builtin/bisect--helper.c:1212
+msgid "use <cmd>... to automatically bisect."
+msgstr "使用 <cmd>... 自動進行二分�尋。"
+
+#: builtin/bisect--helper.c:1214
 msgid "no log for BISECT_WRITE"
 msgstr "BISECT_WRITE 無日誌"
 
-#: builtin/bisect--helper.c:1087
+#: builtin/bisect--helper.c:1229
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset 無需�數或者需�一個�交"
 
-#: builtin/bisect--helper.c:1092
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check 需� 2 或 3 個�數"
-
-#: builtin/bisect--helper.c:1098
+#: builtin/bisect--helper.c:1234
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms 需� 0 或 1 個�數"
 
-#: builtin/bisect--helper.c:1107
+#: builtin/bisect--helper.c:1243
 msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next 需� 0 個引數"
 
-#: builtin/bisect--helper.c:1118
+#: builtin/bisect--helper.c:1254
 msgid "--bisect-log requires 0 arguments"
 msgstr "--bisect-log 需� 0 個引數"
 
-#: builtin/bisect--helper.c:1123
+#: builtin/bisect--helper.c:1259
 msgid "no logfile given"
 msgstr "未�供日誌檔案"
 
@@ -11142,151 +11162,153 @@ msgstr "git blame [<�項>] [<版本�項>] [<版本>] [--] <檔案>"
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<版本�項> 的檔案記錄在 git-rev-list(1) 中"
 
-#: builtin/blame.c:410
+#: builtin/blame.c:406
 #, c-format
 msgid "expecting a color: %s"
 msgstr "期望一個�色：%s"
 
-#: builtin/blame.c:417
+#: builtin/blame.c:413
 msgid "must end with a color"
 msgstr "必須以一個�色�尾"
 
-#: builtin/blame.c:728
+#: builtin/blame.c:724
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "設定 color.blame.repeatedLines 中的無效�色 '%s'"
 
-#: builtin/blame.c:746
+#: builtin/blame.c:742
 msgid "invalid value for blame.coloring"
 msgstr "設定 blame.coloring 中的無效�值"
 
-#: builtin/blame.c:845
+#: builtin/blame.c:841
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "�能找到�忽略的版本 %s"
 
-#: builtin/blame.c:867
+#: builtin/blame.c:863
 msgid "show blame entries as we find them, incrementally"
 msgstr "增��顯示發�的 blame �目"
 
-#: builtin/blame.c:868
+#: builtin/blame.c:864
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr "��顯示邊界�交的物件�稱（�設值: off）"
 
-#: builtin/blame.c:869
+#: builtin/blame.c:865
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr "�將根�交看作邊界（�設值：off）"
 
-#: builtin/blame.c:870
+#: builtin/blame.c:866
 msgid "show work cost statistics"
 msgstr "顯示工作�統計"
 
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
-#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
-#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
-#: builtin/push.c:575 builtin/send-pack.c:198
+#: 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 "強制顯示進度報告"
 
-#: builtin/blame.c:872
+#: builtin/blame.c:868
 msgid "show output score for blame entries"
 msgstr "顯示判斷 blame �目�移的得分診斷訊�"
 
-#: builtin/blame.c:873
+#: builtin/blame.c:869
 msgid "show original filename (Default: auto)"
 msgstr "顯示原始檔案�稱（�設值：auto）"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:870
 msgid "show original linenumber (Default: off)"
 msgstr "顯示原始檔案�稱（�設值：off）"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:871
 msgid "show in a format designed for machine consumption"
 msgstr "顯示���機器讀�的格�"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:872
 msgid "show porcelain format with per-line commit information"
 msgstr "顯示�一列��機器的�交說明"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:873
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr "使用和 git-annotate 相�的輸出模�（�設值：off）"
 
-#: builtin/blame.c:878
+#: builtin/blame.c:874
 msgid "show raw timestamp (Default: off)"
 msgstr "顯示原始時間戳（�設值：off）"
 
-#: builtin/blame.c:879
+#: builtin/blame.c:875
 msgid "show long commit SHA1 (Default: off)"
 msgstr "顯示較長的 SHA1 �交編號（�設值：off）"
 
-#: builtin/blame.c:880
+#: builtin/blame.c:876
 msgid "suppress author name and timestamp (Default: off)"
 msgstr "隱�作者�字�時間戳（�設值：off）"
 
-#: builtin/blame.c:881
+#: builtin/blame.c:877
 msgid "show author email instead of name (Default: off)"
 msgstr "顯示作者信箱而��稱（�設值：off）"
 
-#: builtin/blame.c:882
+#: builtin/blame.c:878
 msgid "ignore whitespace differences"
 msgstr "忽略空白差異"
 
-#: builtin/blame.c:883 builtin/log.c:1820
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "版本"
 
-#: builtin/blame.c:883
+#: builtin/blame.c:879
 msgid "ignore <rev> when blaming"
 msgstr "在執行 blame 動作時忽略 <修訂版>"
 
-#: builtin/blame.c:884
+#: builtin/blame.c:880
 msgid "ignore revisions from <file>"
 msgstr "忽略 <檔案> 中的修訂版"
 
-#: builtin/blame.c:885
+#: builtin/blame.c:881
 msgid "color redundant metadata from previous line differently"
-msgstr "使用�色間隔輸出與�一行��的�複元訊�"
+msgstr "使用�色間隔輸出與�一行��的�複中介資料"
 
-#: builtin/blame.c:886
+#: builtin/blame.c:882
 msgid "color lines by age"
 msgstr "�據時間著色"
 
-#: builtin/blame.c:887
+#: builtin/blame.c:883
 msgid "spend extra cycles to find better match"
 msgstr "循環更多次以找到更佳符�"
 
-#: builtin/blame.c:888
+#: builtin/blame.c:884
 msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "使用來自 <檔案> 的修訂集而�是呼� git-rev-list"
 
-#: builtin/blame.c:889
+#: builtin/blame.c:885
 msgid "use <file>'s contents as the final image"
 msgstr "將 <檔案> 的內容當�是最終 image"
 
-#: builtin/blame.c:890 builtin/blame.c:891
+#: builtin/blame.c:886 builtin/blame.c:887
 msgid "score"
 msgstr "得分"
 
-#: builtin/blame.c:890
+#: builtin/blame.c:886
 msgid "find line copies within and across files"
 msgstr "找到檔案內�跨檔案的複製列"
 
-#: builtin/blame.c:891
+#: builtin/blame.c:887
 msgid "find line movements within and across files"
 msgstr "找到檔案內�跨檔案的移動列"
 
-#: builtin/blame.c:892
+#: builtin/blame.c:888
 msgid "range"
 msgstr "range"
 
-#: builtin/blame.c:893
+#: builtin/blame.c:889
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr "�處�範�在 <開始>,<�尾> 的列，或是 :<函數�稱> 函數"
 
-#: builtin/blame.c:945
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
-msgstr "--progress �能和 --incremental 或 --porcelain �時使用"
+msgstr "--progress �能跟 --incremental 或 porcelain 格��時使用"
 
 #. TRANSLATORS: This string is used to tell us the
 #. maximum display width for a relative timestamp in
@@ -11296,17 +11318,17 @@ msgstr "--progress �能和 --incremental 或 --porcelain �時使用"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:996
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "4 年 11 個月�"
 
-#: builtin/blame.c:1112
+#: 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:1157
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "追蹤程�碼行"
 
@@ -11339,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"
@@ -11349,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"
@@ -11358,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"
@@ -11372,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 "更新設定檔案失敗"
 
@@ -11384,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�分支"
+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:440 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "�能解�格�化字串"
 
-#: builtin/branch.c:471
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "�能解� HEAD �交"
 
-#: builtin/branch.c:477
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) 指� refs/heads/ 之外"
 
-#: builtin/branch.c:492
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "分支 %s 正被�定基底到 %s"
 
-#: builtin/branch.c:496
+#: builtin/branch.c:501
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "分支 %s 正被二分�尋於 %s"
 
-#: builtin/branch.c:513
+#: builtin/branch.c:518
 msgid "cannot copy the current branch while not on any."
 msgstr "無法複製目�分支因為�處於任何分支上。"
 
-#: builtin/branch.c:515
+#: builtin/branch.c:520
 msgid "cannot rename the current branch while not on any."
 msgstr "無法�新命�目�分支因為�處於任何分支上。"
 
-#: builtin/branch.c:526
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "無效的分支�：'%s'"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "分支�新命�失敗"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "分支複製失敗"
 
-#: builtin/branch.c:561
+#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "已為錯誤命�的分支 '%s' 建立了一個副本"
 
-#: builtin/branch.c:564
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "已將錯誤命�的分支 '%s' �新命�"
 
-#: builtin/branch.c:570
+#: builtin/branch.c:575
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "分支�新命�為 %s，但 HEAD 沒有更新�"
 
-#: builtin/branch.c:579
+#: builtin/branch.c:584
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "分支被�新命�，但更新設定檔案失敗"
 
-#: builtin/branch.c:581
+#: builtin/branch.c:586
 msgid "Branch is copied, but update of config-file failed"
 msgstr "分支已複製，但更新設定檔案失敗"
 
-#: builtin/branch.c:597
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11487,209 +11509,205 @@ msgstr ""
 "  %s\n"
 "以 '%c' 開頭的行將被�濾。\n"
 
-#: builtin/branch.c:631
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "通用�項"
 
-#: builtin/branch.c:633
+#: builtin/branch.c:639
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "顯示雜湊值和主題，若�數出�兩次則顯示上游分支"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "�顯示訊�"
 
-#: builtin/branch.c:635
-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:637
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "��使用"
 
-#: builtin/branch.c:639 builtin/rebase.c:533
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "上游"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "改變上游訊�"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "�消上游資訊設定"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "使用彩色輸出"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "作用於�端追蹤分支"
 
-#: builtin/branch.c:644 builtin/branch.c:646
+#: builtin/branch.c:652 builtin/branch.c:654
 msgid "print only branches that contain the commit"
 msgstr "�列�包�該�交的分支"
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:653 builtin/branch.c:655
 msgid "print only branches that don't contain the commit"
 msgstr "�列��包�該�交的分支"
 
-#: builtin/branch.c:650
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "具體的 git-branch 動作："
 
-#: builtin/branch.c:651
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "列出�端追蹤�本機分支"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "刪除完全�併的分支"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "刪除分支（�使沒有�併）"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr "移動/�新命�一個分支，以�它的引用日誌"
 
-#: builtin/branch.c:656
+#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr "移動/�新命�一個分支，�使目標已存在"
 
-#: builtin/branch.c:657
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "複製一個分支和它的引用日誌"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "複製一個分支，�使目標已存在"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "列出分支�"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "顯示目�分支�"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "建立分支的引用日誌"
 
-#: builtin/branch.c:663
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "標記分支的�述"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "強制建立�移動/�新命��刪除"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "�列�已經�併的分支"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "�列�尚未�併的分支"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "以列的方�顯示分支"
 
-#: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415
-#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:477
+#: 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:670
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "�列�指�該物件的分支"
 
-#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+#: 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:672 builtin/for-each-ref.c:40 builtin/tag.c:482
+#: 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:695 builtin/clone.c:794
+#: builtin/branch.c:703 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 沒有�於 /refs/heads 之下�"
 
-#: builtin/branch.c:719
-msgid "--column and --verbose are incompatible"
-msgstr "--column 和 --verbose �相容"
-
-#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "必須�供分支�"
 
-#: builtin/branch.c:766
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "�能�分離開頭指標�供�述"
 
-#: builtin/branch.c:771
+#: builtin/branch.c:779
 msgid "cannot edit description of more than one branch"
 msgstr "�能為一個以上的分支編輯�述"
 
-#: builtin/branch.c:778
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "分支 '%s' 尚無�交。"
 
-#: builtin/branch.c:781
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "沒有分支 '%s'。"
 
-#: builtin/branch.c:796
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "為複製動作�供了太多的分支�"
 
-#: builtin/branch.c:805
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "為�新命�動作�供了太多的�數"
 
-#: builtin/branch.c:810
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr "為設定新上游�供了太多的�數"
 
-#: builtin/branch.c:814
+#: 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:817 builtin/branch.c:840
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "沒有此分支 '%s'"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "分支 '%s' �存在"
 
-#: builtin/branch.c:834
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "為�消上游設定動作�供了太多的�數"
 
-#: builtin/branch.c:838
+#: builtin/branch.c:846
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "在 HEAD 的上游未指�任何分支時無法�消設定。"
 
-#: builtin/branch.c:844
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "分支 '%s' 沒有上游訊�"
 
-#: builtin/branch.c:854
+#: 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>?"
@@ -11697,39 +11715,39 @@ msgstr ""
 "'git branch' 的 -a 和 -r �項�帶一個分支�。\n"
 "您是�想�使用：-a|-r --list <模�>？"
 
-#: builtin/branch.c:858
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
 msgstr ""
 "��支��項 '--set-upstream'。請使用 '--track' 或 '--set-upstream-to'。"
 
-#: builtin/bugreport.c:15
+#: builtin/bugreport.c:16
 msgid "git version:\n"
 msgstr "git 版本：\n"
 
-#: builtin/bugreport.c:21
+#: builtin/bugreport.c:22
 #, c-format
 msgid "uname() failed with error '%s' (%d)\n"
 msgstr "uname() 失敗，錯誤：「%s�(%d)\n"
 
-#: builtin/bugreport.c:31
+#: builtin/bugreport.c:32
 msgid "compiler info: "
 msgstr "編譯器資訊： "
 
-#: builtin/bugreport.c:34
+#: builtin/bugreport.c:35
 msgid "libc info: "
 msgstr "libc 資訊： "
 
-#: builtin/bugreport.c:80
+#: builtin/bugreport.c:49
 msgid "not run from a git repository - no hooks to show\n"
 msgstr "�是從 git 版本庫執行 - 沒有�顯示的掛鉤\n"
 
-#: builtin/bugreport.c:90
+#: builtin/bugreport.c:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory <檔案>] [-s|--suffix <格�>]"
 
-#: builtin/bugreport.c:97
+#: builtin/bugreport.c:69
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -11763,38 +11781,33 @@ msgstr ""
 "請檢閱臭蟲報告下方的剩餘部分。\n"
 "您�刪除任何您�想分享的地方。\n"
 
-#: builtin/bugreport.c:136
+#: builtin/bugreport.c:108
 msgid "specify a destination for the bugreport file"
 msgstr "請指定 bugreport 檔案的目的地"
 
-#: builtin/bugreport.c:138
+#: builtin/bugreport.c:110
 msgid "specify a strftime format suffix for the filename"
 msgstr "請指定檔案�稱的 strftime 格�後綴"
 
-#: builtin/bugreport.c:160
+#: builtin/bugreport.c:132
 #, c-format
 msgid "could not create leading directories for '%s'"
 msgstr "無法建立 '%s' 的�置目錄"
 
-#: builtin/bugreport.c:167
+#: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "系統資訊"
 
-#: builtin/bugreport.c:170
+#: builtin/bugreport.c:142
 msgid "Enabled Hooks"
 msgstr "啟用的掛鉤"
 
-#: builtin/bugreport.c:177
-#, c-format
-msgid "couldn't create a new file at '%s'"
-msgstr "��在「%s�建立新檔案"
-
-#: builtin/bugreport.c:180
+#: builtin/bugreport.c:149
 #, c-format
 msgid "unable to write to %s"
 msgstr "無法寫入 %s"
 
-#: builtin/bugreport.c:190
+#: builtin/bugreport.c:159
 #, c-format
 msgid "Created new report at '%s'.\n"
 msgstr "已在「%s�建立新報告。\n"
@@ -11809,33 +11822,33 @@ msgstr "git bundle verify [<�項>] <檔案>"
 
 #: builtin/bundle.c:17 builtin/bundle.c:33
 msgid "git bundle list-heads <file> [<refname>...]"
-msgstr "git bundle list-heads <檔案> [<�考�稱>...]"
+msgstr "git bundle list-heads <檔案> [<引用�稱>...]"
 
 #: builtin/bundle.c:18 builtin/bundle.c:38
 msgid "git bundle unbundle <file> [<refname>...]"
-msgstr "git bundle unbundle <檔案> [<�考�稱>...]"
+msgstr "git bundle unbundle <檔案> [<引用�稱>...]"
 
-#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+#: builtin/bundle.c:65 builtin/pack-objects.c:3876
 msgid "do not show progress meter"
 msgstr "�顯示進度表"
 
-#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
 msgid "show progress meter"
 msgstr "顯示進度表"
 
-#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+#: builtin/bundle.c:69 builtin/pack-objects.c:3880
 msgid "show progress meter during object writing phase"
 msgstr "在物件寫入階段顯示進度表"
 
-#: builtin/bundle.c:74 builtin/pack-objects.c:3754
+#: builtin/bundle.c:72 builtin/pack-objects.c:3883
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "當進度表顯示時類似於 --all-progress"
 
-#: builtin/bundle.c:76
+#: builtin/bundle.c:74
 msgid "specify bundle format version"
 msgstr "指定包格�版本"
 
-#: builtin/bundle.c:96
+#: builtin/bundle.c:94
 msgid "Need a repository to create a bundle."
 msgstr "需�一個版本庫來建立包。"
 
@@ -11843,25 +11856,25 @@ msgstr "需�一個版本庫來建立包。"
 msgid "do not show bundle details"
 msgstr "�顯示包 (bundle) 詳細資訊"
 
-#: builtin/bundle.c:122
+#: builtin/bundle.c:126
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s �以\n"
 
-#: builtin/bundle.c:163
+#: builtin/bundle.c:182
 msgid "Need a repository to unbundle."
-msgstr "需�一個版本庫來解包。"
+msgstr "需�版本庫�能拆分。"
 
-#: builtin/bundle.c:171 builtin/remote.c:1700
-msgid "be verbose; must be placed before a subcommand"
-msgstr "詳細輸出；必須置於�指令之�"
+#: builtin/bundle.c:185
+msgid "Unbundling objects"
+msgstr "正在解包物件"
 
-#: builtin/bundle.c:193 builtin/remote.c:1731
+#: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "未知�指令：%s"
 
-#: builtin/cat-file.c:598
+#: builtin/cat-file.c:622
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -11869,7 +11882,7 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>"
 
-#: builtin/cat-file.c:599
+#: builtin/cat-file.c:623
 msgid ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
@@ -11877,71 +11890,71 @@ msgstr ""
 "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
 "symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:620
+#: builtin/cat-file.c:644
 msgid "only one batch option may be specified"
 msgstr "�能指定一個批次處��項"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:662
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<類型> �以是其中之一：blob�tree�commit�tag"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:663
 msgid "show object type"
 msgstr "顯示物件類型"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:664
 msgid "show object size"
 msgstr "顯示物件大�"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:666
 msgid "exit with zero when there's no error"
 msgstr "當沒有錯誤時離開並返回零"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:667
 msgid "pretty-print object's content"
 msgstr "美觀地列�物件的內容"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:669
 msgid "for blob objects, run textconv on object's content"
 msgstr "�於資料物件，�其內容�文字轉�"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:671
 msgid "for blob objects, run filters on object's content"
 msgstr "�於資料物件，�其內容��濾"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:672
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:673
 msgid "use a specific path for --textconv/--filters"
 msgstr "�於 --textconv/--filters 使用一個特定的路徑"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:675
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "�許 -s 和 -t ��壞的物件生效"
 
-#: builtin/cat-file.c:652
+#: builtin/cat-file.c:676
 msgid "buffer --batch output"
 msgstr "緩� --batch 的輸出"
 
-#: builtin/cat-file.c:654
+#: builtin/cat-file.c:678
 msgid "show info and content of objects fed from the standard input"
 msgstr "顯示從標準輸入�供的物件的訊�和內容"
 
-#: builtin/cat-file.c:658
+#: builtin/cat-file.c:682
 msgid "show info about objects fed from the standard input"
 msgstr "顯示從標準輸入�供的物件的訊�"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:686
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr "跟隨樹內符號連�（和 --batch 或 --batch-check 共用）"
 
-#: builtin/cat-file.c:664
+#: builtin/cat-file.c:688
 msgid "show all objects with --batch or --batch-check"
 msgstr "使用 --batch 或 --batch-check �數顯示所有物件"
 
-#: builtin/cat-file.c:666
+#: builtin/cat-file.c:690
 msgid "do not order --batch-all-objects output"
 msgstr "��� --batch-all-objects 的輸出排�"
 
@@ -11961,7 +11974,7 @@ msgstr "報告設定在檔案上的所有屬性"
 msgid "use .gitattributes only from the index"
 msgstr "�使用索引中的 .gitattributes"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
 msgid "read file names from stdin"
 msgstr "從標準輸入讀出檔案�"
 
@@ -11969,8 +11982,8 @@ msgstr "從標準輸入讀出檔案�"
 msgid "terminate input and output records by a NUL character"
 msgstr "輸入和輸出的紀錄使用 NUL 字元終�"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
-#: builtin/worktree.c:491
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "�顯示進度報告"
 
@@ -12024,14 +12037,14 @@ msgid "no contacts specified"
 msgstr "未指定�繫��"
 
 #: builtin/checkout--worker.c:110
-#| msgid "git checkout [<options>] <branch>"
 msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<�項>]"
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1825
-#: builtin/submodule--helper.c:1828 builtin/submodule--helper.c:1836
-#: builtin/submodule--helper.c:2334 builtin/worktree.c:719
+#: 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 "字串"
 
@@ -12049,7 +12062,7 @@ msgstr "索引值應該�值 1 到 3 或者 all"
 
 #: builtin/checkout-index.c:187
 msgid "check out all files in the index"
-msgstr "檢出索引�的所有檔案"
+msgstr "簽出索引�的所有檔案"
 
 #: builtin/checkout-index.c:188
 msgid "force overwrite of existing files"
@@ -12061,7 +12074,7 @@ msgstr "存在或�在索引中的檔案都沒有警告"
 
 #: builtin/checkout-index.c:192
 msgid "don't checkout new files"
-msgstr "�檢出新檔案"
+msgstr "�簽出新檔案"
 
 #: builtin/checkout-index.c:194
 msgid "update stat information in the index file"
@@ -12095,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:414
+#: builtin/checkout.c:419
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "�新建立了 %d 個�併��"
 
-#: builtin/checkout.c:419
+#: 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:426
+#: 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:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: 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:462 builtin/checkout.c:465
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' �能和 %s �時使用"
-
-#: builtin/checkout.c:469
+#: builtin/checkout.c:474
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "�能�時更新路徑並切�到分支'%s'。"
 
-#: builtin/checkout.c:473
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "'%s' 或 '%s' 都沒有指定"
 
-#: builtin/checkout.c:477
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "未指定 '%2$s' 時，必須使用 '%1$s'"
 
-#: builtin/checkout.c:482 builtin/checkout.c:487
+#: 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:563 builtin/checkout.c:570
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "路徑 '%s' 未�併"
 
-#: builtin/checkout.c:739
+#: builtin/checkout.c:747
 msgid "you need to resolve your current index first"
 msgstr "您需�先解決目�索引的��"
 
-#: builtin/checkout.c:793
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12192,51 +12200,51 @@ msgstr ""
 "�能繼續，下列檔案有暫存的修改：\n"
 "%s"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:890
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "�能� '%s' 執行 reflog 動作：%s\n"
 
-#: builtin/checkout.c:928
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD 目��於"
 
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
+#: 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:936
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "�設分支 '%s'\n"
 
-#: builtin/checkout.c:939
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已經�於 '%s'\n"
 
-#: builtin/checkout.c:943
+#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切�並�設分支 '%s'\n"
 
-#: builtin/checkout.c:945 builtin/checkout.c:1376
+#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切�到一個新分支 '%s'\n"
 
-#: builtin/checkout.c:947
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切�到分支 '%s'\n"
 
 #  譯者：請維��導空格
-#: builtin/checkout.c:998
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... �其它 %d 個。\n"
 
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12253,7 +12261,7 @@ msgstr[0] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1023
+#: 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"
@@ -12274,19 +12282,19 @@ msgstr[0] ""
 " git branch <新分支�> %s\n"
 "\n"
 
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "在版本�歷時�到內部錯誤"
 
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "之�的 HEAD �置是"
 
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
 msgid "You are on a branch yet to be born"
 msgstr "您�於一個尚未�始化的分支"
 
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12295,7 +12303,7 @@ msgstr ""
 "'%s' 既�以是一個本機檔案，也�以是一個追蹤分支。\n"
 "請使用 --（和��的 --no-guess）來消除歧義"
 
-#: builtin/checkout.c:1191
+#: 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"
@@ -12306,7 +12314,7 @@ msgid ""
 "one remote, e.g. the 'origin' remote, consider setting\n"
 "checkout.defaultRemote=origin in your config."
 msgstr ""
-"如果您想�檢出一個�端追蹤分支，例如 'origin'，您�以\n"
+"如果您想�簽出一個�端追蹤分支，例如 'origin'，您�以\n"
 "使用 --track �項寫出全�：\n"
 "\n"
 "    git checkout --track origin/<name>\n"
@@ -12314,51 +12322,51 @@ msgstr ""
 "如果您總是喜歡使用模糊的簡短分支� <name>，而�喜歡如 'origin' 的�端\n"
 "版本庫�，�以在設定中設定 checkout.defaultRemote=origin。"
 
-#: builtin/checkout.c:1201
+#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' 符�多個 (%d) �端追蹤分支"
 
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "�期�有一個引用"
 
-#: builtin/checkout.c:1284
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "應�有一個引用，��供了 %d 個。"
 
-#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "無效引用：%s"
 
-#: builtin/checkout.c:1343 builtin/checkout.c:1709
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用�是一個樹：%s"
 
-#: builtin/checkout.c:1390
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "期望一個分支，得到標籤 '%s'"
 
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "期望一個分支，得到�端分支 '%s'"
 
-#: builtin/checkout.c:1393 builtin/checkout.c:1401
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "期望一個分支，得到 '%s'"
 
-#: builtin/checkout.c:1396
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "期望一個分支，得到�交 '%s'"
 
-#: builtin/checkout.c:1412
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12366,7 +12374,7 @@ msgstr ""
 "�能在�併時切�分支\n"
 "考慮使用 \"git merge --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1416
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12374,7 +12382,7 @@ msgstr ""
 "�能在 am 工作階段期間切�分支\n"
 "考慮使用 \"git am --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1420
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12382,7 +12390,7 @@ msgstr ""
 "�能在�定基底時切�分支\n"
 "考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1424
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12390,7 +12398,7 @@ msgstr ""
 "�能在��時切�分支\n"
 "考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1428
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12398,207 +12406,196 @@ msgstr ""
 "�能在還原時切�分支\n"
 "考慮使用 \"git revert --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr "您在執行二分�尋時切�分支"
 
-#: builtin/checkout.c:1439
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr "路徑�能和切�分支�時使用"
 
-#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: 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:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: 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:1467
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' �帶 <起始點>"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1487
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "�能切�分支到一個��交 '%s'"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "缺少分支或�交�數"
 
-#: builtin/checkout.c:1525
+#: builtin/checkout.c:1537
 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支執行三方�併"
 
-#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "風格"
 
-#: builtin/checkout.c:1527
-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:1539 builtin/worktree.c:488
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "HEAD 從指定的�交分離"
 
-#: builtin/checkout.c:1540
-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:1542
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
-msgstr "強制檢出（�棄本機修改）"
+msgstr "強制簽出（�棄本機修改）"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "新分支"
 
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "新的沒有父�交的分支"
 
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "更新忽略的檔案（�設）"
 
-#: builtin/checkout.c:1549
+#: builtin/checkout.c:1563
 msgid "do not check if another worktree is holding the given ref"
 msgstr "�檢查指定的引用是�被其他工作�所�用"
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
-msgstr "�尚未�併的檔案檢出我們的版本"
+msgstr "�尚未�併的檔案簽出我們的版本"
 
-#: builtin/checkout.c:1565
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
-msgstr "�尚未�併的檔案檢出他們的版本"
+msgstr "�尚未�併的檔案簽出他們的版本"
 
-#: builtin/checkout.c:1569
+#: builtin/checkout.c:1583
 msgid "do not limit pathspecs to sparse entries only"
-msgstr "�路徑��稀�檢出的�制"
+msgstr "�路徑��稀�簽出的�制"
 
-#: builtin/checkout.c:1624
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c�-%c 和 --orphan 是互斥的"
-
-#: builtin/checkout.c:1628
-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:1665
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track 需�一個分支�"
 
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "缺少分支�稱，請嘗試 -%c"
 
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "無法解� %s"
 
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "無效的路徑�格"
 
-#: builtin/checkout.c:1725
+#: 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:1729
+#: 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:1738
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file 與 --detach �相容"
-
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file 與 --patch �相容"
-
-#: builtin/checkout.c:1754
+#: 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 �相容。"
+"git checkout：在從索引簽出時，--ours/--theirs�--force 和 --merge �相容。"
 
-#: builtin/checkout.c:1759
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "您必須指定一個�復原的路徑"
 
-#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2720 builtin/worktree.c:484
+#: 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:1786
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
-msgstr "建立並檢出一個新的分支"
+msgstr "建立並簽出一個新的分支"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
-msgstr "建立/�設並檢出一個分支"
+msgstr "建立/�設並簽出一個分支"
 
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "為新的分支建立引用日誌"
 
-#: builtin/checkout.c:1791
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "二次猜測 'git checkout <無此分支>'（�設）"
 
-#: builtin/checkout.c:1792
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "使用疊加模�（�設）"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "建立並切�一個新分支"
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "建立/�設並切�一個分支"
 
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "二次猜測 'git switch <無此分支>'"
 
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "�棄本機修改"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
-msgstr "�檢出哪一個樹"
+msgstr "�簽出哪一個樹"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "復原索引"
 
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "復原工作�（�設）"
 
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "忽略未�併�目"
 
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "使用疊加模�"
 
@@ -12633,7 +12630,15 @@ msgstr "將忽略版本庫 %s\n"
 msgid "could not lstat %s\n"
 msgstr "�能� %s 呼� lstat\n"
 
-#: builtin/clean.c:302 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"
@@ -12646,7 +12651,7 @@ msgstr ""
 "foo        - ��唯一�綴�擇一個�項\n"
 "           - （空）什麼也��擇\n"
 
-#: builtin/clean.c:306 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12667,33 +12672,33 @@ msgstr ""
 "*          - �擇所有�項\n"
 "           - （空）���擇\n"
 
-#: builtin/clean.c:521 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:661
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "輸入範本以排除�目>> "
 
-#: builtin/clean.c:696
+#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "警告：無法找到和 %s 符�的�目"
 
-#: builtin/clean.c:717
+#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "�擇�刪除的�目"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:758
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "移除 %s [y/N]？ "
 
-#: builtin/clean.c:789
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12711,65 +12716,65 @@ msgstr ""
 "help                - 顯示本�助\n"
 "?                   - 顯示如何在�示符下�擇的�助"
 
-#: builtin/clean.c:825
+#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "將刪除如下�目："
 
-#: builtin/clean.c:841
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "沒有�清�的檔案，離開。"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "�列�刪除檔案的�稱"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:928
 msgid "force"
 msgstr "強制"
 
-#: builtin/clean.c:906
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "互動�清除"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "刪除整個目錄"
 
-#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
-#: builtin/grep.c:924 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: 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:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "模�"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "新增 <模�> 到忽略�則"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "也刪除忽略的檔案"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "�刪除忽略的檔案"
 
-#: builtin/clean.c:929
+#: 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:932
+#: 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:944
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x 和 -X �能�時使用"
 
@@ -12783,9 +12788,9 @@ msgstr "��複製淺版本庫"
 
 #: builtin/clone.c:98
 msgid "don't create a checkout"
-msgstr "�建立一個檢出"
+msgstr "�建立一個簽出"
 
-#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "建立一個純版本庫"
 
@@ -12815,29 +12820,31 @@ msgstr "在複製時�始化�模組"
 
 #: builtin/clone.c:115
 msgid "number of submodules cloned in parallel"
-msgstr "並發複製的�模組的數�"
+msgstr "並行複製的�模組數"
 
-#: builtin/clone.c:116 builtin/init-db.c:538
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "範本目錄"
 
-#: builtin/clone.c:117 builtin/init-db.c:539
+#: builtin/clone.c:117 builtin/init-db.c:540
 msgid "directory from which templates will be used"
 msgstr "範本目錄將被使用"
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832
-#: builtin/submodule--helper.c:2337
+#: 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 "�考版本庫"
+msgstr "引用版本庫"
 
-#: builtin/clone.c:123 builtin/submodule--helper.c:1834
-#: builtin/submodule--helper.c:2339
+#: 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:549
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3815 builtin/repack.c:495
-#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+#: 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 "�稱"
 
@@ -12847,14 +12854,14 @@ msgstr "使用 <�稱> 而�是 'origin' 去追蹤上游"
 
 #: builtin/clone.c:127
 msgid "checkout <branch> instead of the remote's HEAD"
-msgstr "檢出 <分支> 而�是�端 HEAD"
+msgstr "簽出 <分支> 而�是�端 HEAD"
 
 #: builtin/clone.c:129
 msgid "path to git-upload-pack on the remote"
 msgstr "�端 git-upload-pack 路徑"
 
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
+#: builtin/pull.c:212
 msgid "depth"
 msgstr "深度"
 
@@ -12862,42 +12869,42 @@ msgstr "深度"
 msgid "create a shallow clone of that depth"
 msgstr "建立一個指定深度的淺複製"
 
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
 msgid "time"
 msgstr "時間"
 
 #: builtin/clone.c:133
 msgid "create a shallow clone since a specific time"
-msgstr "從一個特定時間建立一個淺複製"
+msgstr "建立從指定時間到�在的淺複製"
 
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318
+#: 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:215
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
 msgid "deepen history of shallow clone, excluding rev"
-msgstr "深化淺複製的歷�，除了特定版本"
+msgstr "�得更多淺複製的�去歷�記錄，除了特定版本"
 
-#: builtin/clone.c:137 builtin/submodule--helper.c:1844
-#: builtin/submodule--helper.c:2353
+#: 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"
 
 #: builtin/clone.c:139
 msgid "don't clone any tags, and make later fetches not to follow them"
-msgstr "��複製任何標籤，並且後續�得動作也�下載它們"
+msgstr "��複製任何標籤，之後�得也��追蹤這些標籤"
 
 #: builtin/clone.c:141
 msgid "any cloned submodules will be shallow"
 msgstr "�模組將以淺下載模�複製"
 
-#: builtin/clone.c:142 builtin/init-db.c:547
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "git目錄"
 
-#: builtin/clone.c:143 builtin/init-db.c:548
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "git目錄和工作�分離"
 
@@ -12909,227 +12916,219 @@ 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/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+#: 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/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+#: 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:234
-#: builtin/push.c:585
+#: 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:237
-#: builtin/push.c:587
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
+#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "�使用 IPv6 ��"
 
 #: builtin/clone.c:154
 msgid "any cloned submodules will use their remote-tracking branch"
-msgstr "任何複製的�模組將使用它們的�端追蹤分支"
+msgstr "任何複製的�模組都將使用它們的�端追蹤分支"
 
 #: builtin/clone.c:156
 msgid "initialize sparse-checkout file to include only files at root"
-msgstr "�始化稀�檢出檔案，�包�根目錄中的檔案"
+msgstr "�始化稀�簽出檔案，�包�根目錄中的檔案"
 
-#: builtin/clone.c:292
-msgid ""
-"No directory name could be guessed.\n"
-"Please specify a directory on the command line"
-msgstr ""
-"無法猜到目錄�。\n"
-"請在指令列指定一個目錄"
-
-#: builtin/clone.c:345
+#: builtin/clone.c:231
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: �能為 '%s' 新增一個備用：%s\n"
 
-#: builtin/clone.c:418
+#: builtin/clone.c:304
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s 存在且�是一個目錄"
 
-#: builtin/clone.c:436
+#: builtin/clone.c:322
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "無法在 '%s' 上啟動疊代器"
 
-#: builtin/clone.c:467
+#: builtin/clone.c:353
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "建立連� '%s' 失敗"
 
-#: builtin/clone.c:471
+#: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "複製檔案至 '%s' 失敗"
 
-#: builtin/clone.c:476
+#: builtin/clone.c:362
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "無法在 '%s' 上疊代"
 
-#: builtin/clone.c:503
+#: builtin/clone.c:389
 #, c-format
 msgid "done.\n"
 msgstr "完�。\n"
 
-#: builtin/clone.c:517
+#: builtin/clone.c:403
 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 ""
-"複製�功，但是檢出失敗。\n"
-"您�以�� 'git status' 檢查哪些已被檢出，然後使用指令\n"
+"複製�功，但是簽出失敗。\n"
+"您�以�� 'git status' 檢查哪些已被簽出，然後使用指令\n"
 "'git restore --source=HEAD :/' �試\n"
 
-#: builtin/clone.c:594
+#: builtin/clone.c:480
 #, c-format
 msgid "Could not find remote branch %s to clone."
-msgstr "�能發��複製的�端分支 %s。"
+msgstr "找�到�複製的�端分支 %s。"
 
-#: builtin/clone.c:713
+#: builtin/clone.c:597
 #, c-format
 msgid "unable to update %s"
 msgstr "�能更新 %s"
 
-#: builtin/clone.c:761
+#: builtin/clone.c:645
 msgid "failed to initialize sparse-checkout"
-msgstr "無法�始化稀�檢出"
+msgstr "無法�始化稀�簽出"
 
-#: builtin/clone.c:784
+#: builtin/clone.c:668
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "�端 HEAD 指�一個�存在的引用，無法檢出。\n"
+msgstr "�端 HEAD 指�一個�存在的引用，無法簽出。\n"
 
-#: builtin/clone.c:816
+#: builtin/clone.c:701
 msgid "unable to checkout working tree"
-msgstr "�能檢出工作�"
+msgstr "�能簽出工作�"
 
-#: builtin/clone.c:894
+#: builtin/clone.c:779
 msgid "unable to write parameters to config file"
 msgstr "無法將�數寫入設定檔案"
 
-#: builtin/clone.c:957
+#: builtin/clone.c:842
 msgid "cannot repack to clean up"
 msgstr "無法執行 repack 來清�"
 
-#: builtin/clone.c:959
+#: builtin/clone.c:844
 msgid "cannot unlink temporary alternates file"
 msgstr "無法刪除暫時的 alternates 檔案"
 
-#: builtin/clone.c:1001 builtin/receive-pack.c:2491
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "太多�數。"
 
-#: builtin/clone.c:1005
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
-msgstr "您必須指定一個版本庫來複製。"
+msgstr "您必須指定�複製的版本庫。"
 
-#: builtin/clone.c:1018
+#: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare 和 --origin %s �項�相容。"
-
-#: builtin/clone.c:1021
-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:1035
+#: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "版本庫 '%s' �存在"
 
-#: builtin/clone.c:1039 builtin/fetch.c:2011
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "深度 %s �是一個正數"
 
-#: builtin/clone.c:1049
+#: builtin/clone.c:934
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
-msgstr "目標路徑 '%s' 已經存在，並且�是一個空目錄。"
+msgstr "目的地路徑 '%s' 已經存在，並且�是一個空目錄。"
 
-#: builtin/clone.c:1055
+#: builtin/clone.c:940
 #, c-format
 msgid "repository path '%s' already exists and is not an empty directory."
 msgstr "版本庫路徑 '%s' 已經存在，並且�是一個空目錄。"
 
-#: builtin/clone.c:1069
+#: builtin/clone.c:954
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "工作� '%s' 已經存在。"
 
-#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
-#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
+#: 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' 建立先導目錄"
 
-#: builtin/clone.c:1089
+#: builtin/clone.c:974
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "�能建立工作�目錄 '%s'"
 
-#: builtin/clone.c:1109
+#: builtin/clone.c:994
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "複製到純版本庫 '%s'...\n"
 
-#: builtin/clone.c:1111
+#: builtin/clone.c:996
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "正複製到 '%s'...\n"
 
-#: builtin/clone.c:1135
+#: builtin/clone.c:1025
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
-msgstr "clone --recursive 和 --reference 以� --reference-if-able �相容"
+msgstr "clone --recursive 與 --reference 和 --reference-if-able �相容"
 
-#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' �是一個有效的�端�稱"
 
-#: builtin/clone.c:1229
+#: builtin/clone.c:1121
 msgid "--depth is ignored in local clones; use file:// instead."
-msgstr "--depth 在本機複製時被忽略，請改用 file:// �定。"
+msgstr "本機複製會忽略 --depth。請改用 file:// 通訊�定。"
 
-#: builtin/clone.c:1231
+#: builtin/clone.c:1123
 msgid "--shallow-since is ignored in local clones; use file:// instead."
-msgstr "--shallow-since 在本機複製時被忽略，請改用 file:// �定。"
+msgstr "本機複製會忽略 --shallow-since。請改用 file:// �定。"
 
-#: builtin/clone.c:1233
+#: builtin/clone.c:1125
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
-msgstr "--shallow-exclude 在本機複製時被忽略，請改用 file:// �定。"
+msgstr "本機複製會忽略 --shallow-exclude。請改用 file:// �定。"
 
-#: builtin/clone.c:1235
+#: builtin/clone.c:1127
 msgid "--filter is ignored in local clones; use file:// instead."
-msgstr "--filter 在本機複製時被忽略，請改用 file:// �定。"
+msgstr "本機複製會忽略 --filter。請改用 file:// �定。"
 
-#: builtin/clone.c:1240
+#: builtin/clone.c:1132
 msgid "source repository is shallow, ignoring --local"
-msgstr "�版本庫是淺複製，忽略 --local"
+msgstr "來�版本庫是淺複製，忽略 --local"
 
-#: builtin/clone.c:1245
+#: builtin/clone.c:1137
 msgid "--local is ignored"
 msgstr "--local 被忽略"
 
-#: builtin/clone.c:1337 builtin/clone.c:1345
+#: builtin/clone.c:1216 builtin/clone.c:1276
+msgid "remote transport reported error"
+msgstr "�端傳輸回報錯誤"
+
+#: builtin/clone.c:1228 builtin/clone.c:1239
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "�端分支 %s 在上游 %s 未發�"
 
-#: builtin/clone.c:1348
+#: builtin/clone.c:1242
 msgid "You appear to have cloned an empty repository."
-msgstr "您似乎複製了一個空版本庫。"
+msgstr "您複製的版本庫似乎是空的。"
 
 #: builtin/column.c:10
 msgid "git column [<options>]"
@@ -13163,14 +13162,14 @@ msgstr "兩直行之間的填充空間"
 msgid "--command must be the first argument"
 msgstr "--command 必須是第一個�數"
 
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+#: builtin/commit-graph.c:13
 msgid ""
 "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
 msgstr ""
 "git commit-graph verify [--object-dir <物件目錄>] [--shallow] [--"
 "[no-]progress]"
 
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+#: builtin/commit-graph.c:16
 msgid ""
 "git commit-graph write [--object-dir <objdir>] [--append] [--"
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
@@ -13180,93 +13179,91 @@ msgstr ""
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
 
-#: builtin/commit-graph.c:64
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "找�到符� %s 的物件目錄"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
-#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "目錄"
 
-#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
-#: builtin/commit-graph.c:317
+#: builtin/commit-graph.c:52
 msgid "the object directory to store the graph"
 msgstr "儲存圖形的物件目錄"
 
-#: builtin/commit-graph.c:83
+#: builtin/commit-graph.c:73
 msgid "if the commit-graph is split, only verify the tip file"
 msgstr "如果�交圖形被分割，�驗證頭一個檔案"
 
-#: builtin/commit-graph.c:106
+#: builtin/commit-graph.c:100
 #, c-format
 msgid "Could not open commit-graph '%s'"
 msgstr "無法開啟�交圖形 '%s'"
 
-#: builtin/commit-graph.c:142
+#: builtin/commit-graph.c:137
 #, c-format
 msgid "unrecognized --split argument, %s"
 msgstr "無法識別的 --split �數，%s"
 
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:150
 #, c-format
 msgid "unexpected non-hex object ID: %s"
 msgstr "�期望的��六進�物件 ID：%s"
 
-#: builtin/commit-graph.c:160
+#: builtin/commit-graph.c:155
 #, c-format
 msgid "invalid object: %s"
 msgstr "物件無效：%s"
 
-#: builtin/commit-graph.c:213
+#: builtin/commit-graph.c:205
 msgid "start walk at all refs"
 msgstr "開始�歷所有引用"
 
-#: builtin/commit-graph.c:215
+#: builtin/commit-graph.c:207
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "從標準輸入中的包索引檔案列表中掃��交"
 
-#: builtin/commit-graph.c:217
+#: builtin/commit-graph.c:209
 msgid "start walk at commits listed by stdin"
 msgstr "從標準輸入中的�交開始掃�"
 
-#: builtin/commit-graph.c:219
+#: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
 msgstr "包� commit-graph 檔案中已有所有�交"
 
-#: builtin/commit-graph.c:221
+#: builtin/commit-graph.c:213
 msgid "enable computation for changed paths"
 msgstr "啟用已變更路徑的計算"
 
-#: builtin/commit-graph.c:224
+#: builtin/commit-graph.c:215
 msgid "allow writing an incremental commit-graph file"
 msgstr "�許寫一個增��交圖形檔案"
 
-#: builtin/commit-graph.c:228
+#: builtin/commit-graph.c:219
 msgid "maximum number of commits in a non-base split commit-graph"
 msgstr "在�基本分割�交圖形中的最大�交數"
 
-#: builtin/commit-graph.c:230
+#: builtin/commit-graph.c:221
 msgid "maximum ratio between two levels of a split commit-graph"
 msgstr "一個分割�交圖形的兩個級別之間的最大比率"
 
-#: builtin/commit-graph.c:232
+#: builtin/commit-graph.c:223
 msgid "only expire files older than a given date-time"
 msgstr "�將舊於指定日期與時間的檔案設為�期"
 
-#: builtin/commit-graph.c:234
+#: builtin/commit-graph.c:225
 msgid "maximum number of changed-path Bloom filters to compute"
 msgstr "變更路徑的布隆�濾器�計算的最大�"
 
-#: builtin/commit-graph.c:255
+#: builtin/commit-graph.c:251
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
 msgstr "�能�時使用 --reachable�--stdin-commits 或 --stdin-packs"
 
-#: builtin/commit-graph.c:287
+#: builtin/commit-graph.c:282
 msgid "Collecting commits from input"
 msgstr "正在從輸入收集�交"
 
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "未識別的�指令：%s"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -13280,70 +13277,65 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "忽略�複的父�交 %s"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
+#: 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"
 
-#: builtin/commit-tree.c:93
-#, c-format
-msgid "git commit-tree: failed to open '%s'"
-msgstr "git commit-tree：無法開啟 '%s'"
-
-#: builtin/commit-tree.c:96
+#: builtin/commit-tree.c:94
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
 msgstr "git commit-tree：無法讀� '%s'"
 
-#: builtin/commit-tree.c:98
+#: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
 msgstr "git commit-tree：無法關閉 '%s'"
 
-#: builtin/commit-tree.c:111
+#: builtin/commit-tree.c:109
 msgid "parent"
 msgstr "父�交"
 
-#: builtin/commit-tree.c:112
+#: builtin/commit-tree.c:110
 msgid "id of a parent commit object"
 msgstr "父�交物件 ID"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1614 builtin/merge.c:282
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1605
-#: builtin/tag.c:456
+#: 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:115 builtin/commit.c:1614
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "�交說明"
 
-#: builtin/commit-tree.c:118
+#: builtin/commit-tree.c:116
 msgid "read commit log message from file"
 msgstr "從檔案中讀��交說明"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299
-#: 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 "GPG �交簽�"
 
-#: builtin/commit-tree.c:133
+#: builtin/commit-tree.c:131
 msgid "must give exactly one tree"
 msgstr "必須精確地�供一個樹"
 
-#: builtin/commit-tree.c:140
+#: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
 msgstr "git commit-tree：讀�失敗"
 
-#: builtin/commit.c:41
+#: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
 msgstr "git commit [<�項>] [--] <路徑�格>..."
 
-#: builtin/commit.c:46
+#: builtin/commit.c:47
 msgid "git status [<options>] [--] <pathspec>..."
 msgstr "git status [<�項>] [--] <路徑�格>..."
 
-#: builtin/commit.c:51
+#: builtin/commit.c:52
 msgid ""
 "You asked to amend the most recent commit, but doing so would make\n"
 "it empty. You can repeat your command with --allow-empty, or you can\n"
@@ -13352,7 +13344,7 @@ msgstr ""
 "您�修補最近的�交，但這麼�會讓它�為空�交。您�以�複您的指令並帶上\n"
 "--allow-empty �項，或者您�用指令 \"git reset HEAD^\" 整個刪除該�交。\n"
 
-#: builtin/commit.c:56
+#: builtin/commit.c:57
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -13366,15 +13358,15 @@ msgstr ""
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:63
+#: builtin/commit.c:64
 msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr "�則，請使用 'git rebase --skip'\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:67
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "�則，請使用 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:69
+#: builtin/commit.c:70
 msgid ""
 "and then use:\n"
 "\n"
@@ -13395,115 +13387,149 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:324
+#: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
 msgstr "解包 HEAD 樹狀物件失敗"
 
-#: builtin/commit.c:360
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file 和 -a �時使用沒有�義"
-
-#: builtin/commit.c:374
+#: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "�數 --include/--only �跟路徑沒有�義。"
 
-#: builtin/commit.c:386
+#: builtin/commit.c:387
 msgid "unable to create temporary index"
 msgstr "�能建立暫時索引"
 
-#: builtin/commit.c:395
+#: builtin/commit.c:396
 msgid "interactive add failed"
 msgstr "互動�新增失敗"
 
-#: builtin/commit.c:410
+#: builtin/commit.c:411
 msgid "unable to update temporary index"
 msgstr "無法更新暫時索引"
 
-#: builtin/commit.c:412
+#: builtin/commit.c:413
 msgid "Failed to update main cache tree"
 msgstr "�能更新樹的主快�"
 
-#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
 msgid "unable to write new_index file"
 msgstr "無法寫 new_index 檔案"
 
-#: builtin/commit.c:489
+#: builtin/commit.c:490
 msgid "cannot do a partial commit during a merge."
 msgstr "在�併�程中�能�部分�交。"
 
-#: builtin/commit.c:491
+#: builtin/commit.c:492
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "在���程中�能�部分�交。"
 
-#: builtin/commit.c:493
+#: builtin/commit.c:494
 msgid "cannot do a partial commit during a rebase."
 msgstr "在�定基底�程中�能�部分�交。"
 
-#: builtin/commit.c:501
+#: builtin/commit.c:502
 msgid "cannot read the index"
 msgstr "無法讀�索引"
 
-#: builtin/commit.c:520
+#: builtin/commit.c:521
 msgid "unable to write temporary index file"
 msgstr "無法寫暫時索引檔案"
 
-#: builtin/commit.c:618
+#: builtin/commit.c:619
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "�交 '%s' 缺少作者訊�"
 
-#: builtin/commit.c:620
+#: builtin/commit.c:621
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "�交 '%s' 有格�錯誤的作者訊�"
 
-#: builtin/commit.c:639
+#: builtin/commit.c:640
 msgid "malformed --author parameter"
 msgstr "格�錯誤的 --author �數"
 
-#: builtin/commit.c:692
+#: builtin/commit.c:693
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "無法�擇一個未被目��交說明使用的備註字元"
 
-#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
+#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "�能查詢�交 %s"
 
-#: builtin/commit.c:758 builtin/shortlog.c:413
+#: builtin/commit.c:759 builtin/shortlog.c:416
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "（正從標準輸入中讀�日誌訊�）\n"
 
-#: builtin/commit.c:760
+#: builtin/commit.c:761
 msgid "could not read log from standard input"
 msgstr "�能從標準輸入中讀�日誌訊�"
 
-#: builtin/commit.c:764
+#: builtin/commit.c:765
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "�能讀�日誌檔案 '%s'"
 
-#: builtin/commit.c:801
+#: 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:813 builtin/commit.c:829
+#: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
 msgstr "�能讀� SQUASH_MSG"
 
-#: builtin/commit.c:820
+#: builtin/commit.c:821
 msgid "could not read MERGE_MSG"
 msgstr "�能讀� MERGE_MSG"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:881
 msgid "could not write commit template"
 msgstr "�能寫�交範本"
 
+#: builtin/commit.c:894
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr ""
+"請輸入�述您變更的�交訊�。\n"
+"開頭是「%c�的行皆會忽略。\n"
+
+#: builtin/commit.c:896
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"請輸入�述您變更的�交訊�。開頭是「%c�\n"
+"的行皆會忽略。�交訊�空白則�消本次�交作業。\n"
+
 #: builtin/commit.c:900
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+msgstr ""
+"請輸入�述您變更的�交訊�。會�留開頭是「%c�\n"
+"的行，但也�以自己移除掉這些行。\n"
+
+#: builtin/commit.c:904
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"請輸入�述您變更的�交訊�。會�留開頭是\n"
+"「%c�的行，但也�以自己移除掉這些行。\n"
+"�交訊�空白則�消本次�交作業。\n"
+
+#: builtin/commit.c:916
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
@@ -13517,7 +13543,7 @@ msgstr ""
 "\tgit update-ref -d MERGE_HEAD\n"
 "後�試。\n"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:921
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
@@ -13531,193 +13557,168 @@ msgstr ""
 "\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "後�試。\n"
 
-#: builtin/commit.c:915
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be ignored, and an empty message aborts the commit.\n"
-msgstr ""
-"請為您的變更輸入�交說明。以 '%c' 開始的行將被忽略，而一個空的�交\n"
-"說明將會終止�交。\n"
-
-#: builtin/commit.c:923
-#, c-format
-msgid ""
-"Please enter the commit message for your changes. Lines starting\n"
-"with '%c' will be kept; you may remove them yourself if you want to.\n"
-"An empty message aborts the commit.\n"
-msgstr ""
-"請為您的變更輸入�交說明。以 '%c' 開始的行將被�留，如果您原�\n"
-"也�以刪除它們。一個空的�交說明將會終止�交。\n"
-
 #  譯者：為�證在輸出中�齊，注�調整�中空格�
-#: builtin/commit.c:940
+#: builtin/commit.c:948
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s作者：  %.*s <%.*s>"
 
 #  譯者：為�證在輸出中�齊，注�調整�中空格�
-#: builtin/commit.c:948
+#: builtin/commit.c:956
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%s日期：  %s"
 
 #  譯者：為�證在輸出中�齊，注�調整�中空格�
-#: builtin/commit.c:955
+#: builtin/commit.c:963
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%s�交者：%.*s <%.*s>"
 
-#: builtin/commit.c:973
+#: builtin/commit.c:981
 msgid "Cannot read index"
 msgstr "無法讀�索引"
 
-#: builtin/commit.c:1018
+#: builtin/commit.c:1026
 msgid "unable to pass trailers to --trailers"
 msgstr "無法將尾部署�傳�至 --trailers"
 
-#: builtin/commit.c:1058
+#: builtin/commit.c:1066
 msgid "Error building trees"
 msgstr "無法建立樹狀物件"
 
-#: builtin/commit.c:1072 builtin/tag.c:319
+#: 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"
 
-#: builtin/commit.c:1116
+#: builtin/commit.c:1124
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author '%s' �是 '姓� <信箱>' 格�，且未能在�有作者中找到符�"
 
-#: builtin/commit.c:1130
+#: builtin/commit.c:1138
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "無效的忽略模� '%s'"
 
-#: builtin/commit.c:1148 builtin/commit.c:1441
+#: builtin/commit.c:1156 builtin/commit.c:1451
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "無效的未追蹤檔案�數 '%s'"
 
-#: builtin/commit.c:1188
-msgid "--long and -z are incompatible"
-msgstr "--long 和 -z �項�相容"
-
-#: builtin/commit.c:1219
+#: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "正在�併中——�能�新輸入。"
 
-#: builtin/commit.c:1221
+#: builtin/commit.c:1229
 msgid "You are in the middle of a cherry-pick -- cannot reword."
 msgstr "正在��中——�能�新輸入。"
 
-#: builtin/commit.c:1224
+#: 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:1226
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"--fixup 的 reword �項與 --patch/--interactive/--all/--include/--only 互斥"
+#: builtin/commit.c:1234
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "「%s�的改寫�項和「%s��得�時使用"
 
-#: builtin/commit.c:1245
+#: builtin/commit.c:1254
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "�時使用 --reset-author 和 --author 沒有�義"
 
-#: builtin/commit.c:1254
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "您沒有�修補的�交。"
 
-#: builtin/commit.c:1257
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "您正處於一個�併�程中 -- 無法修補�交。"
 
-#: builtin/commit.c:1259
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正處於一個���程中 -- 無法修補�交。"
 
-#: builtin/commit.c:1261
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "您正處於�定基底的�程中 -- 無法修訂。"
 
-#: builtin/commit.c:1264
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "�項 --squash 和 --fixup �能�時使用"
 
-#: builtin/commit.c:1274
+#: builtin/commit.c:1281
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "�能用一個 -c/-C/-F/--fixup �項。"
 
-#: builtin/commit.c:1276
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "�項 -m �能和 -c/-C/-F �時使用。"
 
-#: builtin/commit.c:1285
+#: 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:1303
+#: 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:1331
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "未知�項：--fixup=%s:%s"
 
-#: builtin/commit.c:1345
+#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "路徑 '%s ...' 和 -a �項�時使用沒有�義"
 
-#: builtin/commit.c:1476 builtin/commit.c:1642
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "以簡潔的格�顯示狀態"
 
-#: builtin/commit.c:1478 builtin/commit.c:1644
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "顯示分支訊�"
 
-#: builtin/commit.c:1480
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "顯示儲��訊�"
 
-#: builtin/commit.c:1482 builtin/commit.c:1646
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "計算完整的領先/�後值"
 
-#: builtin/commit.c:1484
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "版本"
 
-#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
-#: builtin/worktree.c:681
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "機器�讀的輸出"
 
-#: builtin/commit.c:1487 builtin/commit.c:1650
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr "以長格�顯示狀態（�設）"
 
-#: builtin/commit.c:1490 builtin/commit.c:1653
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "�目以 NUL 字元�尾"
 
-#: builtin/commit.c:1492 builtin/commit.c:1496 builtin/commit.c:1656
-#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
-#: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337
+#: 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:1493 builtin/commit.c:1656
+#: 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:1497
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -13725,202 +13726,201 @@ msgstr ""
 "顯示已忽略的檔案，��模�：traditional�matching�no。（�設值："
 "traditional）"
 
-#: builtin/commit.c:1499 parse-options.h:193
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "何時"
 
-#: builtin/commit.c:1500
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 "忽略�模組的更改，「何時�的���數：all�dirty�untracked。（�設值：all）"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "以列的方�顯示未追蹤的檔案"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "�檢測�新命�"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr "檢測�新命�，�以設定索引相似度"
 
-#: builtin/commit.c:1525
+#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "�支�已忽略和未追蹤檔案�數的組�"
 
-#: builtin/commit.c:1607
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "�交�功後�顯示概述訊�"
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "在�交說明範本裡顯示差異"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "�交說明�項"
 
-#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr "從檔案中讀��交說明"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "作者"
 
-#: builtin/commit.c:1612
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "�交時覆蓋作者"
 
-#: builtin/commit.c:1613 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "日期"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "�交時覆蓋日期"
 
-#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
-#: parse-options.h:329 ref-filter.h:90
+#: 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:1615
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr "�用並編輯指定�交的�交說明"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr "�用指定�交的�交說明"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1621
-#| msgid "amend previous commit"
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]commit"
 
-#: builtin/commit.c:1621
+#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr "使用 autosquash 格�化後的說明來 fixup 或是 amend/reword 指定�交"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1635
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "使用 autosquash 格�的�交說明用以壓縮至指定的�交"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1636
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "�在將該�交的作者改為我（和 -C/-c/--amend �數共用）"
 
-#: builtin/commit.c:1624 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "尾部署�"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "加入自訂尾部署�"
 
-#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
-#: builtin/pull.c:145 builtin/revert.c:110
+#: 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:1626
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "使用指定的範本檔案"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "強制編輯�交"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr "在�交說明範本裡包�狀態訊�"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "�交內容�項"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "�交所有改動的檔案"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "新增指定的檔案到索引�等待�交"
 
-#: builtin/commit.c:1637
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "互動�新增檔案"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "互動�新增變更"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "��交指定的檔案"
 
-#: builtin/commit.c:1640
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "繞� pre-commit 和 commit-msg 掛鉤"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "顯示將��交的內容"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "修改先�的�交"
 
-#: builtin/commit.c:1655
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "繞� post-rewrite 掛鉤"
 
-#: builtin/commit.c:1662
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "�許一個空�交"
 
-#: builtin/commit.c:1664
+#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr "�許空的�交說明"
 
-#: builtin/commit.c:1737
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "�壞的 MERGE_HEAD 檔案（%s）"
 
-#: builtin/commit.c:1744
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "�能讀� MERGE_MODE"
 
-#: builtin/commit.c:1765
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "�能讀��交說明：%s"
 
-#: builtin/commit.c:1772
+#: builtin/commit.c:1788
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "終止�交因為�交說明為空。\n"
 
-#: builtin/commit.c:1777
+#: builtin/commit.c:1793
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "終止�交；您未更改來自範本的�交說明。\n"
 
-#: builtin/commit.c:1788
+#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "�交說明內文空白，中止�交作業。\n"
 
-#: builtin/commit.c:1824
+#: 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"
@@ -13988,7 +13988,7 @@ msgstr "�得所有值：key [value-pattern]"
 
 #: builtin/config.c:140
 msgid "get values for regexp: name-regex [value-pattern]"
-msgstr "根據正�表示��得值：name-regex [value-pattern]"
+msgstr "根據常�表示��得值：name-regex [value-pattern]"
 
 #: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
@@ -14186,7 +14186,7 @@ msgid ""
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
 "section in \"git help worktree\" for details"
 msgstr ""
-"�能和多個工作�一起使用 --worktree，除�啟用 worktreeConfig 設定擴展。\n"
+"�能和多個工作�一起使用 --worktree，除�啟用 worktreeConfig 設定擴充部分。\n"
 "詳情請閱讀「git help worktree�的「CONFIGURATION FILE��節"
 
 #: builtin/config.c:743
@@ -14244,7 +14244,7 @@ msgid ""
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr ""
 "無法用一個值覆蓋多個值\n"
-"       使用一個正�表示��--add 或 --replace-all 來修改 %s。"
+"       使用一個常�表示��--add 或 --replace-all 來修改 %s。"
 
 #: builtin/config.c:943 builtin/config.c:954
 #, c-format
@@ -14280,7 +14280,7 @@ msgstr "除錯訊�輸出到標準錯誤"
 msgid "credential-cache--daemon unavailable; no unix socket support"
 msgstr "credential-cache--daemon 無法使用；缺少 unix socket 支�"
 
-#: builtin/credential-cache.c:154
+#: builtin/credential-cache.c:180
 msgid "credential-cache unavailable; no unix socket support"
 msgstr "credential-cache 無法使用；缺少 unix socket 支�"
 
@@ -14421,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 "顯示簡寫的�交號作為後備"
 
@@ -14437,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"
@@ -14476,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:684
+#: 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"
@@ -14504,111 +14493,103 @@ msgstr "%s...%s：多個�併基底，使用 %s"
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<�項>] [<�交> [<�交>]] [--] [<路徑>...]"
 
-#: builtin/difftool.c:261
-#, c-format
-msgid "failed: %d"
-msgstr "失敗：%d"
-
-#: builtin/difftool.c:303
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "無法讀�符號連� %s"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "無法讀�符號連�檔案 %s"
 
-#: builtin/difftool.c:313
+#: builtin/difftool.c:297
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "無法讀�符號連� %2$s 指�的物件 %1$s"
 
-#: builtin/difftool.c:413
+#: builtin/difftool.c:421
 msgid ""
-"combined diff formats('-c' and '--cc') are not supported in\n"
-"directory diff mode('-d' and '--dir-diff')."
+"combined diff formats ('-c' and '--cc') are not supported in\n"
+"directory diff mode ('-d' and '--dir-diff')."
 msgstr ""
-"�支�在目錄比較模�（'-d' 和 '--dir-diff'）中採用組�差異格�（'-c' 和 '--"
-"cc'）。"
+"�支�在目錄比較模�（'-d' 和 '--dir-diff'）中\n"
+"採用組�差異格�（'-c' 和 '--cc'）。"
 
-#: builtin/difftool.c:637
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "兩個檔案都被修改：'%s' 和 '%s'。"
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "工作�檔案被留了下來。"
 
-#: builtin/difftool.c:650
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "暫存檔存在於 '%s'。"
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "您�能想�清�或者復原它們。"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:645
+#, c-format
+msgid "failed: %d"
+msgstr "失敗：%d"
+
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "使用 `diff.guitool` 代替 `diff.tool`"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "執行一個全目錄差異比較"
 
-#: builtin/difftool.c:704
+#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "啟動差異比較工具之���示"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "在 dir-diff 模�中使用符號連�"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "工具"
 
-#: builtin/difftool.c:711
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "使用指定的差異比較工具"
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "顯示�以用在 `--tool` �數後的差異工具列表"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:706
 msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr "當執行 diff 工具返回�零離開碼時，使 'git-difftool' 離開"
 
-#: builtin/difftool.c:719
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "指定一個用於檢視差異的自訂指令"
 
-#: builtin/difftool.c:720
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "傳�給 `diff`"
 
-#: builtin/difftool.c:735
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool �求工作�或者 --no-index"
 
-#: builtin/difftool.c:742
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff 和 --no-index �相容"
-
-#: builtin/difftool.c:745
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui�--tool 和 --extcmd 互斥"
-
-#: builtin/difftool.c:753
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "沒有為 --tool=<工具> �數�供 <工具>"
 
-#: builtin/difftool.c:760
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "沒有為 --extcmd=<命令> �數�供 <命令>"
 
@@ -14616,7 +14597,7 @@ msgstr "沒有為 --extcmd=<命令> �數�供 <命令>"
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <�項> <環境變數>"
 
-#: builtin/env--helper.c:42 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:96
 msgid "type"
 msgstr "é¡žåž‹"
 
@@ -14631,136 +14612,128 @@ msgstr "安�模�，�使用 git_env_*() 的值作為離開碼"
 #: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
-msgstr "�項 `--default' 和 `type=bool` 期望一個布林值，�是 `%s`"
+msgstr "�項「--default��期收到「--type=bool�的布林值，而�「%s�"
 
 #: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
 "%s`"
-msgstr "�項 `--default' 和 `type=ulong` 期望一個無符號長整型，�是 `%s`"
+msgstr "�項「--default��期收到「--type=ulong�的無號 long 數值，而�「%s�"
 
 #: builtin/fast-export.c:29
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:868
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr "錯誤：除�指定 --mark-tags，�則無法匯出嵌套標籤。"
 
-#: builtin/fast-export.c:1177
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "--anonymize-map 的��能空白"
 
-#: builtin/fast-export.c:1197
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "在 <n> 個物件之後顯示進度"
 
-#: builtin/fast-export.c:1199
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "�擇如何處�簽�標籤"
 
-#: builtin/fast-export.c:1202
+#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr "�擇當標籤指�被�濾物件時該標籤的處�方�"
 
-#: builtin/fast-export.c:1205
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "�擇使用備用編碼處��交說明"
 
-#: builtin/fast-export.c:1208
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "把標記傾�到這個檔案"
 
-#: builtin/fast-export.c:1210
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "從這個檔案匯入標記"
 
-#: builtin/fast-export.c:1214
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "如果這個檔案存在，則從檔案匯入標記"
 
-#: builtin/fast-export.c:1216
+#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr "當標籤缺少標記者欄�時��有一個"
 
-#: builtin/fast-export.c:1218
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "�次�交都輸出整棵樹"
 
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "使用 done 功能終止串�"
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "略�資料物件資料的輸出"
 
-#: builtin/fast-export.c:1222 builtin/log.c:1823
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
-msgstr "�照�格"
+msgstr "引用�格"
 
-#: builtin/fast-export.c:1223
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "�匯出的引用套用引用�格"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "匿�輸出"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "from:to"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "在匿�輸出中將 <from> 轉�為 <to>"
 
-#: builtin/fast-export.c:1229
+#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
-msgstr "�物件 ID �考�在 fast-export 串�中的引用父物件"
+msgstr "�物件 ID 引用�在 fast-export 串�中的父物件"
 
-#: builtin/fast-export.c:1231
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr "顯示資料物件��交的原始物件 ID"
 
-#: builtin/fast-export.c:1233
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "為包�標記 ID 的標籤打上標記"
 
-#: builtin/fast-export.c:1256
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "缺少 --anonymize 的 --anonymize-map 沒有�義"
-
-#: builtin/fast-export.c:1271
-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' 功能"
@@ -14770,255 +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:185
+#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "從所有的�端抓�"
 
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: 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:188
+#: 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 "使用原�事務更新�考"
+msgstr "使用 atomic 事務更新引用"
 
-#: 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 "上傳包到�端的路徑"
 
-#: 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:195
+#: 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 "�模組�得的並發數"
+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/ 中"
+msgstr "修改引用�格 (refspec) 以便將所有引用 (refs) 放置在 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 "清除�端已經�存在的分支的追蹤分支"
 
-#: 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:122
+#: 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 檔案"
+msgstr "將�得的引用寫入 FETCH_HEAD 檔案"
 
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: 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: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 "深化淺複製的歷�"
+msgstr "�得淺複製的更多�去歷�記錄"
 
-#: 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 "基於時間來深化淺複製的歷�"
 
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: 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:224
+#: 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:226
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "引用映射"
 
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "指定�得動作的引用映射"
 
-#: 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 "報告我們��有從該物件開始�以�得的物件"
 
-#: builtin/fetch.c:210
-#, fuzzy
+#: builtin/fetch.c:211
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
-msgstr "��得包檔案。�之，輸出 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:243
+#: 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 "從標準輸入中接�引用表��"
+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:757
+#: builtin/fetch.c:766
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "設定變數 fetch.output 包�無效值 %s"
 
-#: builtin/fetch.c:856
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "物件 %s 未發�"
 
-#: builtin/fetch.c:860
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[最新]"
 
-#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[已拒絕]"
 
-#: builtin/fetch.c:874
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "目�分支下�能執行�得動作"
 
-#: builtin/fetch.c:884
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr "已在其他工作�簽出"
+
+#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr "[標籤更新]"
 
-#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
-#: builtin/fetch.c:956
+#: 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:889
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "會破壞�有的標籤"
 
-#: builtin/fetch.c:911
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[新標籤]"
 
-#: builtin/fetch.c:914
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[新分支]"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[新引用]"
 
-#: builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "強制更新"
 
-#: builtin/fetch.c:961
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "�快轉"
 
-#: builtin/fetch.c:1065
+#: 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:1069
+#: 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:1101
+#: builtin/fetch.c:1112
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s 未傳�所有必需的物件\n"
 
-#: builtin/fetch.c:1129
+#: builtin/fetch.c:1141
 #, c-format
-msgid "reject %s because shallow roots are not allowed to be updated"
-msgstr "拒絕 %s 因為淺複製��許被更新"
+msgid "rejected %s because shallow roots are not allowed to be updated"
+msgstr "已拒絕 %s，��許更新淺複製"
 
-#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "來自 %.*s\n"
 
-#: builtin/fetch.c:1228
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15028,141 +15004,152 @@ msgstr ""
 " 'git remote prune %s' 來刪除舊的�有��的分支"
 
 #  譯者：請維��導空格
-#: builtin/fetch.c:1327
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   （%s 將�為懸空狀態）"
 
 #  譯者：請維��導空格
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   （%s 已�為懸空狀態）"
 
-#: builtin/fetch.c:1360
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[已刪除]"
 
-#: builtin/fetch.c:1361 builtin/remote.c:1118
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "（無）"
 
-#: builtin/fetch.c:1384
+#: builtin/fetch.c:1405
+#, c-format
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "拒絕�得在「%2$s�簽出的「%1$s�分支"
+
+#: builtin/fetch.c:1425
 #, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "拒絕�得到�純版本庫的目�分支 %s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "�項「%s�的值「%s�� %s 無效"
 
-#: builtin/fetch.c:1403
+#: builtin/fetch.c:1428
 #, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "�項 \"%s\" 的值 \"%s\" �於 %s 是無效的"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "�項「%s�被 %s 忽略\n"
 
-#: builtin/fetch.c:1406
+#: builtin/fetch.c:1455
 #, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "�項 \"%s\" 為 %s 所忽略\n"
+msgid "the object %s does not exist"
+msgstr "%s 物件�存在"
 
-#: builtin/fetch.c:1618
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "檢測到多分支，和 --set-upstream �相容"
 
-#: builtin/fetch.c:1633
+#: 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:1635
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr "沒有為一個�端標籤設定上游"
 
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "未知的分支類型"
 
-#: builtin/fetch.c:1639
+#: 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:1768 builtin/fetch.c:1831
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "正在�得 %s\n"
 
-#: builtin/fetch.c:1778 builtin/fetch.c:1833 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:1790
+#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "無法�得 '%s'（離開碼：%d）\n"
 
-#: builtin/fetch.c:1894
-msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
-msgstr "未指定�端版本庫。請��一個 URL 或�端版本庫�指定，用以�得新�交。"
-
 #: builtin/fetch.c:1930
-msgid "You need to specify a tag name."
-msgstr "您需�指定一個標籤�稱。"
+msgid ""
+"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:1995
-msgid "Negative depth in --deepen is not supported"
-msgstr "--deepen �支�負數深度"
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "您需�指定標籤�稱"
 
-#: builtin/fetch.c:1997
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen 和 --depth 是互斥的"
+#: builtin/fetch.c:2032
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr "--negotiate-only 需�一或多個 --negotiate-tip=*"
 
-#: builtin/fetch.c:2002
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth 和 --unshallow �能�時使用"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
+msgstr "--deepen �支�負數深度"
 
-#: builtin/fetch.c:2004
+#: builtin/fetch.c:2045
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "�於一個完整的版本庫，�數 --unshallow 沒有�義"
 
-#: builtin/fetch.c:2021
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all �能帶一個版本庫�數"
 
-#: builtin/fetch.c:2023
+#: builtin/fetch.c:2064
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 帶引用�格沒有任何�義"
 
-#: builtin/fetch.c:2032
+#: 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:2039
-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:2055
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr "使用 --negotiate-only 時必須�供�端"
 
-#: builtin/fetch.c:2060
-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:2079
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
-msgstr "��以將 --filter 用於在 extensions.partialClone 中設定的�端版本庫"
+msgstr "��以將 --filter 用於在 extensions.partialclone 中設定的�端版本庫"
 
-#: builtin/fetch.c:2083
+#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
-msgstr "--stdin �能在擷� (fetch) 一個�端時使用"
+msgstr "--atomic �能在擷� (fetch) 一個�端時使用"
 
-#: builtin/fetch.c:2087
+#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "--stdin �能在�得一個�端時使用"
 
@@ -15171,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 "從檔案中讀�"
 
@@ -15207,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:483
+#: 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 "�列��包�該�交的引用"
 
@@ -15255,19 +15246,19 @@ msgstr "�列��包�該�交的引用"
 msgid "git for-each-repo --config=<config> <command-args>"
 msgstr "git for-each-repo --config=<設定> <命令引數>"
 
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
 msgid "config"
 msgstr "config"
 
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
 msgid "config key storing a list of repository paths"
 msgstr "儲存版本庫路徑清單的設定�"
 
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
 msgid "missing --config=<config>"
 msgstr "缺少 --config=<設定>"
 
-#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "未知"
 
@@ -15283,16 +15274,16 @@ msgstr "%s %s 錯誤：%s"
 msgid "warning in %s %s: %s"
 msgstr "%s %s 警告：%s"
 
-#: builtin/fsck.c:123 builtin/fsck.c:126
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "來自 %7s %s 的�壞的連�"
 
-#: builtin/fsck.c:135
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "連�中錯誤的物件類型"
 
-#: builtin/fsck.c:151
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -15301,211 +15292,221 @@ msgstr ""
 "�壞的連�來自於 %7s %s\n"
 "              到 %7s %s"
 
-#: builtin/fsck.c:263
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "缺少 %s %s"
 
-#: builtin/fsck.c:290
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "無法�得 %s %s"
 
-#: builtin/fsck.c:310
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "懸空 %s %s"
 
-#: builtin/fsck.c:320
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "�能建立 lost-found"
 
-#: builtin/fsck.c:331
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "�能完� '%s'"
 
-#: builtin/fsck.c:348
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "正在檢查 %s"
 
-#: builtin/fsck.c:386
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "正在檢查連通性（%d 個物件）"
 
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "正在檢查 %s %s"
 
-#: builtin/fsck.c:410
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "�壞的連�"
 
-#: builtin/fsck.c:419
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "æ ¹ %s"
 
-#: builtin/fsck.c:427
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "已標記 %s %s (%s) 於 %s"
 
-#: builtin/fsck.c:456
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s：物件�壞或�失"
 
-#: builtin/fsck.c:481
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s：無效的引用日誌�目 %s"
 
-#: builtin/fsck.c:495
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "正在檢查引用日誌 %s->%s"
 
-#: builtin/fsck.c:529
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s：無效的 sha1 指標 %s"
 
-#: builtin/fsck.c:536
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s：�是一個�交"
 
-#: builtin/fsck.c:590
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "注�：無�設引用"
 
-#: builtin/fsck.c:605
+#: builtin/fsck.c:621
+#, c-format
+msgid "%s: hash-path mismatch, found at: %s"
+msgstr "%s：雜湊路徑 (hash-path) �符，找到的�置：%s"
+
+#: builtin/fsck.c:624
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s：物件�壞或�失：%s"
 
-#: builtin/fsck.c:618
+#: builtin/fsck.c:628
+#, c-format
+msgid "%s: object is of unknown type '%s': %s"
+msgstr "%s：物件屬於「%s�未知類型：%s"
+
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s：�能解�物件：%s"
 
-#: builtin/fsck.c:638
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "壞的 sha1 檔案：%s"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "正在檢查物件目錄"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "正在檢查物件目錄"
 
-#: builtin/fsck.c:671
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "正在檢查 %s 連�"
 
-#: builtin/fsck.c:676 builtin/index-pack.c:866
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "無效的 %s"
 
-#: builtin/fsck.c:683
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s 指�奇怪的�西（%s）"
 
-#: builtin/fsck.c:689
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s：分離開頭指標的指��存在"
 
-#: builtin/fsck.c:693
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "注�：%s 指�一個尚未誕生的分支（%s）"
 
-#: builtin/fsck.c:705
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "正在檢查快�樹"
 
-#: builtin/fsck.c:710
+#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s：cache-tree 中無效的 sha1 指標"
 
-#: builtin/fsck.c:719
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "cache-tree 中�樹狀物件"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<�項>] [<物件>...]"
 
-#: builtin/fsck.c:756
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "顯示無法�得的物件"
 
-#: builtin/fsck.c:757
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "顯示懸空的物件"
 
-#: builtin/fsck.c:758
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "報告標籤"
 
-#: builtin/fsck.c:759
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "報告根節點"
 
-#: builtin/fsck.c:760
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "將索引亦作為檢查的頭節點"
 
-#: builtin/fsck.c:761
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "將引用日誌作為檢查的頭節點（�設）"
 
-#: builtin/fsck.c:762
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "也考慮包和備用物件"
 
-#: builtin/fsck.c:763
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "僅檢查連通性"
 
-#: builtin/fsck.c:764 builtin/mktag.c:75
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "啟用更嚴格的檢查"
 
-#: builtin/fsck.c:766
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "將懸空物件寫入 .git/lost-found 中"
 
-#: builtin/fsck.c:767 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "顯示進度"
 
-#: builtin/fsck.c:768
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "顯示�以�得物件的詳細�稱"
 
-#: builtin/fsck.c:827 builtin/index-pack.c:262
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "正在檢查物件"
 
-#: builtin/fsck.c:855
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s：物件缺少"
 
-#: builtin/fsck.c:866
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "無效的�數：期望 sha1，得到 '%s'"
@@ -15524,106 +15525,101 @@ 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:240 builtin/tag.c:573
-#, 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"
-"and remove %s.\n"
+"and remove %s\n"
 "Automatic cleanup will not be performed until the file is removed.\n"
 "\n"
 "%s"
 msgstr ""
-"最後一次 gc 動作報告如下訊�。請檢查原因並刪除 %s。\n"
-"在該檔案被刪除之�，自動清�將�會執行。\n"
+"最後一次 gc 動作回報如下資訊。請檢查原因並刪除 %s\n"
+"等到這個檔案刪除後，自動清��會繼續執行。\n"
 "\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:869
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "無法寫入�交圖形"
 
-#: builtin/gc.c:905
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "無法�先�得�端"
 
@@ -15635,131 +15631,171 @@ msgstr "無法啟動 ‘git pack-objects’ 處�程�"
 msgid "failed to finish 'git pack-objects' process"
 msgstr "無法完� ‘git pack-objects’ 處�程�"
 
-#: builtin/gc.c:1091
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "無法寫入多包索引"
 
-#: builtin/gc.c:1109
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "'git multi-pack-index expire' 失敗"
 
-#: builtin/gc.c:1170
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "'git multi-pack-index repack' 失敗"
 
-#: builtin/gc.c:1179
+#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr "略�增��新打包工作，因為 core.multiPackIndex 已被�用"
 
-#: builtin/gc.c:1283
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "已存在 '%s' 鎖定檔案，略�維護"
 
-#: builtin/gc.c:1313
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "作業 '%s' 失敗"
 
-#: builtin/gc.c:1395
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' �有效作業"
 
-#: builtin/gc.c:1400
+#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "�能多次�� '%s' 作業"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "基於版本庫狀態執行作業"
 
-#: builtin/gc.c:1416
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "frequency"
 
-#: builtin/gc.c:1417
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "�據頻率執行工作"
 
-#: builtin/gc.c:1420
+#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "��在 stderr 輸出進度或其他資訊"
 
-#: builtin/gc.c:1421
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "作業"
 
-#: builtin/gc.c:1422
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "執行指定作業"
 
-#: builtin/gc.c:1439
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "--auto 和 --schedule=<頻率> 請任�一"
 
-#: builtin/gc.c:1482
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "無法執行 ‘git config’"
 
-#: builtin/gc.c:1547
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "無法展開「%s�路徑"
 
-#: builtin/gc.c:1576
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "無法啟動 launchctl"
 
-#: builtin/gc.c:1613
+#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "無法建立「%s�的目錄"
 
-#: builtin/gc.c:1674
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "無法啟動載入 %s �務"
 
-#: builtin/gc.c:1745
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "無法建立暫存 XML 檔案"
 
-#: builtin/gc.c:1835
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "無法啟動 schtasks"
 
-#: builtin/gc.c:1879
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr "無法執行 “crontab -l�；您的系統�能�支� “cron�"
 
-#: builtin/gc.c:1896
+#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr "無法執行 “crontab�；您的系統�能�支� “cron�"
 
-#: builtin/gc.c:1900
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "無法開啟 ‘crontab’ 的標準輸入"
 
-#: builtin/gc.c:1942
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "“crontab� ���作"
 
-#: builtin/gc.c:1976
+#: builtin/gc.c:2191
+msgid "failed to start systemctl"
+msgstr "無法啟動 systemctl"
+
+#: builtin/gc.c:2201
+msgid "failed to run systemctl"
+msgstr "無法執行 systemctl"
+
+#: 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:2395
+#, c-format
+msgid "unrecognized --scheduler argument '%s'"
+msgstr "無法識別的 --scheduler 引數 '%s'"
+
+#: builtin/gc.c:2420
+msgid "neither systemd timers nor crontab are available"
+msgstr "�支� systemd 計時器或 crontab"
+
+#: builtin/gc.c:2435
+#, c-format
+msgid "%s scheduler is not available"
+msgstr "無法使用 %s 排程器"
+
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "其他處�程�正在排定背景維護工作"
 
-#: builtin/gc.c:2000
+#: builtin/gc.c:2471
+msgid "git maintenance start [--scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<scheduler>]"
+
+#: builtin/gc.c:2480
+msgid "scheduler"
+msgstr "scheduler"
+
+#: builtin/gc.c:2481
+msgid "scheduler to trigger git maintenance run"
+msgstr "�觸發 git maintenance run 的排程器"
+
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "無法將版本庫加至全域設定"
 
-#: builtin/gc.c:2010
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <�命令> [<�項>]"
 
-#: builtin/gc.c:2029
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "無效�命令：%s"
@@ -15768,12 +15804,12 @@ msgstr "無效�命令：%s"
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<�項>] [-e] <模�> [<版本>...] [[--] <路徑>...]"
 
-#: builtin/grep.c:223
+#: builtin/grep.c:239
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep：無法建立執行緒：%s"
 
-#: builtin/grep.c:277
+#: builtin/grep.c:293
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
@@ -15782,263 +15818,263 @@ msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
-#: builtin/pack-objects.c:2969
+#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
+#: builtin/pack-objects.c:3142
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "沒有執行緒支�，忽略 %s"
 
-#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "無法讀�樹（%s）"
 
-#: builtin/grep.c:658
+#: builtin/grep.c:672
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "無法抓�來自於 %s 類型的物件"
 
-#: builtin/grep.c:739
+#: builtin/grep.c:752
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "開關 `%c' 期望一個數字值"
 
-#: builtin/grep.c:838
+#: builtin/grep.c:851
 msgid "search in index instead of in the work tree"
 msgstr "在索引��尋而�是在工作�"
 
-#: builtin/grep.c:840
+#: builtin/grep.c:853
 msgid "find in contents not managed by git"
 msgstr "在未被 git 管�的內容中尋找"
 
 #  譯者：中文字串拼接，�刪除�導空格
-#: builtin/grep.c:842
+#: builtin/grep.c:855
 msgid "search in both tracked and untracked files"
 msgstr "在追蹤和未追蹤的檔案中�尋"
 
-#: builtin/grep.c:844
+#: builtin/grep.c:857
 msgid "ignore files specified via '.gitignore'"
 msgstr "忽略 '.gitignore' 包�的檔案"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:859
 msgid "recursively search in each submodule"
 msgstr "在�一個�模組中�迴�尋"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:862
 msgid "show non-matching lines"
 msgstr "顯示未符�的行"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:864
 msgid "case insensitive matching"
 msgstr "��分大�寫符�"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:866
 msgid "match patterns only at word boundaries"
 msgstr "�在單詞邊界符�模�"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:868
 msgid "process binary files as text"
 msgstr "把二進�檔案當�文字處�"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:870
 msgid "don't match patterns in binary files"
 msgstr "�在二進�檔案中符�模�"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:873
 msgid "process binary files with textconv filters"
 msgstr "用 textconv �濾器處�二進�檔案"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:875
 msgid "search in subdirectories (default)"
 msgstr "在�目錄中尋找（�設）"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:877
 msgid "descend at most <depth> levels"
 msgstr "最多以指定的深度�下尋找"
 
-#: builtin/grep.c:868
+#: builtin/grep.c:881
 msgid "use extended POSIX regular expressions"
-msgstr "使用擴展的 POSIX 正�表示�"
+msgstr "使用延伸的 POSIX 常�表示�"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:884
 msgid "use basic POSIX regular expressions (default)"
-msgstr "使用基本的 POSIX 正�表示�（�設）"
+msgstr "使用基本的 POSIX 常�表示�（�設）"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:887
 msgid "interpret patterns as fixed strings"
 msgstr "把模�解�為固定的字串"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:890
 msgid "use Perl-compatible regular expressions"
-msgstr "使用 Perl 相容的正�表示�"
+msgstr "使用 Perl 相容的常�表示�"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:893
 msgid "show line numbers"
 msgstr "顯示行號"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:894
 msgid "show column number of first match"
 msgstr "顯示第一個符�的列號"
 
-#: builtin/grep.c:882
+#: builtin/grep.c:895
 msgid "don't show filenames"
 msgstr "�顯示檔案�"
 
-#: builtin/grep.c:883
+#: builtin/grep.c:896
 msgid "show filenames"
 msgstr "顯示檔案�"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:898
 msgid "show filenames relative to top directory"
 msgstr "顯示相�於頂級目錄的檔案�"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:900
 msgid "show only filenames instead of matching lines"
 msgstr "�顯示檔案�而�顯示符�的行"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:902
 msgid "synonym for --files-with-matches"
 msgstr "和 --files-with-matches �義"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:905
 msgid "show only the names of files without match"
 msgstr "�顯示未符�的檔案�"
 
-#: builtin/grep.c:894
+#: builtin/grep.c:907
 msgid "print NUL after filenames"
 msgstr "在檔案�後輸出 NUL 字元"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:910
 msgid "show only matching parts of a line"
 msgstr "�顯示行中的符�的部分"
 
-#: builtin/grep.c:899
+#: builtin/grep.c:912
 msgid "show the number of matches instead of matching lines"
 msgstr "顯示總符�行數，而�顯示符�的行"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:913
 msgid "highlight matches"
 msgstr "高亮顯示符�項"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:915
 msgid "print empty line between matches from different files"
 msgstr "在��檔案的符�項之間列�空行"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:917
 msgid "show filename only once above matches from same file"
 msgstr "�在�一檔案的符�項的上�顯示一次檔案�"
 
-#: builtin/grep.c:907
+#: builtin/grep.c:920
 msgid "show <n> context lines before and after matches"
 msgstr "顯示符�項�後的 <n> 行上下文"
 
-#: builtin/grep.c:910
+#: builtin/grep.c:923
 msgid "show <n> context lines before matches"
 msgstr "顯示符�項� <n> 行上下文"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:925
 msgid "show <n> context lines after matches"
 msgstr "顯示符�項後 <n> 行上下文"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:927
 msgid "use <n> worker threads"
 msgstr "使用 <n> 個工作執行緒"
 
-#: builtin/grep.c:915
+#: builtin/grep.c:928
 msgid "shortcut for -C NUM"
 msgstr "快�� -C 數字"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:931
 msgid "show a line with the function name before matches"
 msgstr "在符�的��顯示一行函數�"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:933
 msgid "show the surrounding function"
 msgstr "顯示所在函數的�後內容"
 
-#: builtin/grep.c:923
+#: builtin/grep.c:936
 msgid "read patterns from file"
 msgstr "從檔案讀�模�"
 
-#: builtin/grep.c:925
+#: builtin/grep.c:938
 msgid "match <pattern>"
 msgstr "符� <模�>"
 
-#: builtin/grep.c:927
+#: builtin/grep.c:940
 msgid "combine patterns specified with -e"
 msgstr "組�用 -e �數設定的模�"
 
-#: builtin/grep.c:939
+#: builtin/grep.c:952
 msgid "indicate hit with exit status without output"
 msgstr "�輸出，而用離開碼標記命中狀態"
 
-#: builtin/grep.c:941
+#: builtin/grep.c:954
 msgid "show only matches from files that match all patterns"
 msgstr "�顯示符�所有模�的檔案中的符�"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "pager"
 msgstr "分�"
 
-#: builtin/grep.c:944
+#: builtin/grep.c:957
 msgid "show matching files in the pager"
 msgstr "分�顯示符�的檔案"
 
-#: builtin/grep.c:948
+#: builtin/grep.c:961
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "�許呼� grep(1)（本次組建忽略）"
 
-#: builtin/grep.c:1014
+#: builtin/grep.c:1027
 msgid "no pattern given"
 msgstr "未�供符�模�"
 
-#: builtin/grep.c:1050
+#: builtin/grep.c:1063
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index 或 --untracked �能和版本�時使用"
 
-#: builtin/grep.c:1058
+#: builtin/grep.c:1071
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "�能解�版本：%s"
 
-#: builtin/grep.c:1088
+#: builtin/grep.c:1101
 msgid "--untracked not supported with --recurse-submodules"
 msgstr "--untracked �支�與 --recurse-submodules 一起使用"
 
-#: builtin/grep.c:1092
+#: builtin/grep.c:1105
 msgid "invalid option combination, ignoring --threads"
 msgstr "無效的�項組�，忽略 --threads"
 
-#: builtin/grep.c:1095 builtin/pack-objects.c:3930
+#: builtin/grep.c:1108 builtin/pack-objects.c:4059
 msgid "no threads support, ignoring --threads"
 msgstr "沒有執行緒支�，忽略 --threads"
 
-#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
+#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "指定的執行緒數無效（%d）"
 
-#: builtin/grep.c:1132
+#: builtin/grep.c:1145
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager 僅用於工作�"
 
-#: builtin/grep.c:1158
+#: builtin/grep.c:1171
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached 或 --untracked �能與 --no-index �時使用"
 
-#: builtin/grep.c:1161
+#: builtin/grep.c:1174
 msgid "--untracked cannot be used with --cached"
 msgstr "--untracked �能與 --cached 一起使用"
 
-#: builtin/grep.c:1167
+#: builtin/grep.c:1180
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard �能用於已追蹤內容"
 
-#: builtin/grep.c:1175
+#: builtin/grep.c:1188
 msgid "both --cached and trees are given"
 msgstr "�時給出了 --cached 和樹狀物件"
 
-#: builtin/hash-object.c:85
+#: builtin/hash-object.c:83
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -16046,95 +16082,107 @@ msgstr ""
 "git hash-object [-t <類型>] [-w] [--path=<檔案> | --no-filters] [--stdin] "
 "[--] <檔案>..."
 
-#: builtin/hash-object.c:86
+#: builtin/hash-object.c:84
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:98
+#: builtin/hash-object.c:96
 msgid "object type"
 msgstr "物件類型"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:97
 msgid "write the object into the object database"
 msgstr "將物件寫入物件資料庫"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:99
 msgid "read the object from stdin"
 msgstr "從標準輸入讀�物件"
 
-#: builtin/hash-object.c:103
+#: builtin/hash-object.c:101
 msgid "store file as is without filters"
 msgstr "原樣儲存檔案�使用�濾器"
 
-#: builtin/hash-object.c:104
+#: builtin/hash-object.c:102
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr "�許�任�隨機垃圾資料�散列來建立�壞的物件以便除錯 Git"
 
-#: builtin/hash-object.c:105
+#: builtin/hash-object.c:103
 msgid "process file as it were from this path"
 msgstr "處�檔案並�設其來自於此路徑"
 
-#: builtin/help.c:47
+#: builtin/help.c:55
 msgid "print all available commands"
 msgstr "列�所有�用的指令"
 
-#: builtin/help.c:48
+#: builtin/help.c:57
 msgid "exclude guides"
 msgstr "排除嚮導"
 
-#: builtin/help.c:49
-msgid "print list of useful guides"
-msgstr "顯示有用的指�列表"
-
-#: builtin/help.c:50
-msgid "print all configuration variable names"
-msgstr "列�所有設定變數�稱"
-
-#: builtin/help.c:52
+#: builtin/help.c:58
 msgid "show man page"
 msgstr "顯示 man 手冊"
 
-#: builtin/help.c:53
+#: builtin/help.c:59
 msgid "show manual in web browser"
 msgstr "在 web �覽器中顯示手冊"
 
-#: builtin/help.c:55
+#: builtin/help.c:61
 msgid "show info page"
 msgstr "顯示 info 手冊"
 
-#: builtin/help.c:57
+#: builtin/help.c:63
 msgid "print command description"
 msgstr "列�指令�述"
 
-#: builtin/help.c:62
-msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
+#: builtin/help.c:65
+msgid "print list of useful guides"
+msgstr "顯示有用的指�列表"
+
+#: builtin/help.c:67
+msgid "print all configuration variable names"
+msgstr "列�所有設定變數�稱"
+
+#: builtin/help.c:78
+msgid ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<命令>]"
+
+#: builtin/help.c:80
+msgid "git help [-g|--guides]"
+msgstr "git help [-g|--guides]"
+
+#: builtin/help.c:81
+msgid "git help [-c|--config]"
+msgstr "git help [-c|--config]"
 
-#: builtin/help.c:163
+#: builtin/help.c:196
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "無法識別的�助格� '%s'"
 
-#: builtin/help.c:190
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "無法啟動 emacsclient。"
 
-#: builtin/help.c:203
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "無法解� emacsclient 版本。"
 
-#: builtin/help.c:211
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient 版本 '%d' 太�（< 22）。"
 
-#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
+#: 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:307
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16143,7 +16191,7 @@ msgstr ""
 "'%s'：�支�的 man 手冊檢視器的路徑。\n"
 "請使用 'man.<工具>.cmd'。"
 
-#: builtin/help.c:319
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16152,325 +16200,308 @@ msgstr ""
 "'%s': 支�的 man 手冊檢視器指令。\n"
 "請使用 'man.<工具>.path'。"
 
-#: builtin/help.c:436
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s'：未知的 man 檢視器。"
 
-#: builtin/help.c:453
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "沒有 man 檢視器處�此請求"
 
-#: builtin/help.c:461
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr "沒有 info 檢視器處�此請求"
 
-#: builtin/help.c:520 builtin/help.c:531 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:534 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:563 builtin/help.c:593
+#: builtin/help.c:580
+msgid "this option doesn't take any other arguments"
+msgstr "本�項��其他引數"
+
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "用法：%s%s"
 
-#: builtin/help.c:577
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "'git help config' �得更多訊�"
 
-#: builtin/index-pack.c:222
+#: builtin/index-pack.c:221
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "%s 的物件類型�符�"
 
-#: builtin/index-pack.c:242
+#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "未能�得�期的物件 %s"
 
-#: builtin/index-pack.c:245
+#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "物件 %s：應為類型 %s，�是 %s"
 
-#: builtin/index-pack.c:295
+#: builtin/index-pack.c:294
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "無法填充 %d �元組"
 
-#: builtin/index-pack.c:305
+#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr "�早的檔案��符（EOF）"
 
-#: builtin/index-pack.c:306
+#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "輸入上的讀錯誤"
 
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "用掉了超��用的�元組"
 
-#: builtin/index-pack.c:325 builtin/pack-objects.c:624
+#: builtin/index-pack.c:324 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr "包太大超�了目� off_t 的定義"
 
-#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "包超�了最大�許值"
 
-#: builtin/index-pack.c:343
-#, c-format
-msgid "unable to create '%s'"
-msgstr "�能建立 '%s'"
-
-#: builtin/index-pack.c:349
-#, c-format
-msgid "cannot open packfile '%s'"
-msgstr "無法開啟 packfile '%s'"
-
-#: builtin/index-pack.c:363
+#: builtin/index-pack.c:358
 msgid "pack signature mismatch"
 msgstr "包簽��符�"
 
-#: builtin/index-pack.c:365
+#: builtin/index-pack.c:360
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "�支�包版本 %<PRIu32>"
 
-#: builtin/index-pack.c:383
+#: builtin/index-pack.c:376
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "包中有錯誤的物件�於�移� %<PRIuMAX>：%s"
 
-#: builtin/index-pack.c:489
+#: builtin/index-pack.c:482
 #, c-format
 msgid "inflate returned %d"
 msgstr "解壓縮返回 %d"
 
-#: builtin/index-pack.c:538
+#: builtin/index-pack.c:531
 msgid "offset value overflow for delta base object"
 msgstr "�移值覆蓋了 delta 基準物件"
 
-#: builtin/index-pack.c:546
+#: builtin/index-pack.c:539
 msgid "delta base offset is out of bound"
 msgstr "delta 基準�移越界"
 
-#: builtin/index-pack.c:554
+#: builtin/index-pack.c:547
 #, c-format
 msgid "unknown object type %d"
 msgstr "未知物件類型 %d"
 
-#: builtin/index-pack.c:585
+#: builtin/index-pack.c:578
 msgid "cannot pread pack file"
 msgstr "無法讀�包檔案"
 
-#: builtin/index-pack.c:587
+#: builtin/index-pack.c:580
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "包檔案�早��，缺少 %<PRIuMAX> �元組"
 
-#: builtin/index-pack.c:613
+#: builtin/index-pack.c:606
 msgid "serious inflate inconsistency"
 msgstr "解壓縮嚴�的�一致"
 
-#: builtin/index-pack.c:758 builtin/index-pack.c:764 builtin/index-pack.c:788
-#: builtin/index-pack.c:827 builtin/index-pack.c:836
+#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
+#: builtin/index-pack.c:820 builtin/index-pack.c:829
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "發� %s 出� SHA1 ���"
 
-#: builtin/index-pack.c:761 builtin/pack-objects.c:171
-#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
+#: builtin/index-pack.c:754 builtin/pack-objects.c:292
+#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
 #, c-format
 msgid "unable to read %s"
 msgstr "�能讀 %s"
 
-#: builtin/index-pack.c:825
+#: builtin/index-pack.c:818
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "�能讀��存物件訊� %s"
 
-#: builtin/index-pack.c:833
+#: builtin/index-pack.c:826
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "�能讀��存物件 %s"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:840
 #, c-format
 msgid "invalid blob object %s"
 msgstr "無效的資料物件 %s"
 
-#: builtin/index-pack.c:850 builtin/index-pack.c:869
+#: builtin/index-pack.c:843 builtin/index-pack.c:862
 msgid "fsck error in packed object"
 msgstr "�打包物件 fsck 檢查發生錯誤"
 
-#: builtin/index-pack.c:871
+#: builtin/index-pack.c:864
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "%s 的所有�物件並�都�以�得"
 
-#: builtin/index-pack.c:932 builtin/index-pack.c:979
+#: builtin/index-pack.c:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
 msgstr "套用 delta 失敗"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Receiving objects"
 msgstr "接收物件中"
 
-#: builtin/index-pack.c:1162
+#: builtin/index-pack.c:1156
 msgid "Indexing objects"
 msgstr "索引物件中"
 
-#: builtin/index-pack.c:1196
+#: builtin/index-pack.c:1190
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "包��（SHA1 �符�）"
 
-#: builtin/index-pack.c:1201
+#: builtin/index-pack.c:1195
 msgid "cannot fstat packfile"
 msgstr "�能� packfile 呼� fstat"
 
-#: builtin/index-pack.c:1204
+#: builtin/index-pack.c:1198
 msgid "pack has junk at the end"
 msgstr "包的�尾有垃圾資料"
 
-#: builtin/index-pack.c:1216
+#: builtin/index-pack.c:1210
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "parse_pack_objects() 中�到���喻的�題"
 
-#: builtin/index-pack.c:1239
+#: builtin/index-pack.c:1233
 msgid "Resolving deltas"
 msgstr "處� delta 中"
 
-#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
+#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "�能建立執行緒：%s"
 
-#: builtin/index-pack.c:1283
+#: builtin/index-pack.c:1277
 msgid "confusion beyond insanity"
 msgstr "���喻"
 
-#: builtin/index-pack.c:1289
+#: builtin/index-pack.c:1283
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "完� %d 個本機物件"
 
-#: builtin/index-pack.c:1301
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "� %s 的尾部總和檢查出��外（�碟�壞？）"
 
-#: builtin/index-pack.c:1305
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "包有 %d 個未解決的 delta"
 
-#: builtin/index-pack.c:1329
+#: builtin/index-pack.c:1323
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "�能壓縮附加物件（%d）"
 
-#: builtin/index-pack.c:1425
+#: builtin/index-pack.c:1419
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "本機物件 %s 已�壞"
 
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1440
 #, c-format
 msgid "packfile name '%s' does not end with '.%s'"
 msgstr "packfile �稱「%s�的�尾�是「.%s�"
 
-#: builtin/index-pack.c:1470
+#: builtin/index-pack.c:1464
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "無法寫入 %s 檔案 '%s'"
 
-#: builtin/index-pack.c:1478
+#: builtin/index-pack.c:1472
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "無法關閉已寫入的 %s 檔案 '%s'"
 
-#: builtin/index-pack.c:1504
+#: builtin/index-pack.c:1489
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "無法將「*.%s�暫存檔的檔�更改為「%s�"
+
+#: builtin/index-pack.c:1514
 msgid "error while closing pack file"
 msgstr "關閉包檔案時發生錯誤"
 
-#: builtin/index-pack.c:1518
-msgid "cannot store pack file"
-msgstr "無法儲存包檔案"
-
-#: builtin/index-pack.c:1526
-msgid "cannot store index file"
-msgstr "無法儲存索引檔案"
-
-#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
+#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "壞的 pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1651
+#: builtin/index-pack.c:1643
 #, c-format
 msgid "Cannot open existing pack file '%s'"
-msgstr "無法開啟�存包檔案 '%s'"
+msgstr "無法開啟�有包檔案 '%s'"
 
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1645
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "無法為 %s 開啟包索引檔案"
 
-#: builtin/index-pack.c:1701
+#: builtin/index-pack.c:1693
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "� delta：%d 個物件"
 
-#: builtin/index-pack.c:1708
+#: builtin/index-pack.c:1700
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "�長 = %d: %lu 物件"
 
-#: builtin/index-pack.c:1750
+#: builtin/index-pack.c:1742
 msgid "Cannot come back to cwd"
 msgstr "無法返回目�工作目錄"
 
-#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
-#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
 #, c-format
 msgid "bad %s"
 msgstr "錯誤�項 %s"
 
-#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
 #, c-format
 msgid "unknown hash algorithm '%s'"
 msgstr "未知的「%s�雜湊算法"
 
-#: builtin/index-pack.c:1852
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin �能和 --stdin �時使用"
-
-#: builtin/index-pack.c:1854
+#: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin 需�一個 git 版本庫"
 
-#: builtin/index-pack.c:1856
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format �能和 --stdin �時使用"
-
-#: builtin/index-pack.c:1871
+#: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify 沒有�供 packfile �稱�數"
 
-#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
+#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "在打包物件中 fsck 檢查發生錯誤"
 
@@ -16514,56 +16545,56 @@ msgstr "沒有在 %s 中找到範本"
 msgid "not copying templates from '%s': %s"
 msgstr "沒有從 '%s' 複製範本：%s"
 
-#: builtin/init-db.c:262
+#: builtin/init-db.c:263
 #, c-format
 msgid "invalid initial branch name: '%s'"
 msgstr "無效的�始分支�稱：'%s'"
 
-#: builtin/init-db.c:353
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "�能處� %d 類型的檔案"
 
-#: builtin/init-db.c:356
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "�能移動 %s 至 %s"
 
-#: builtin/init-db.c:372
+#: builtin/init-db.c:373
 msgid "attempt to reinitialize repository with different hash"
 msgstr "嘗試以��的雜湊值�新�始化版本庫"
 
-#: builtin/init-db.c:396 builtin/init-db.c:399
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s 已經存在"
 
-#: builtin/init-db.c:431
+#: builtin/init-db.c:432
 #, c-format
 msgid "re-init: ignored --initial-branch=%s"
 msgstr "re-init: 忽略 --initial-branch=%s"
 
-#: builtin/init-db.c:462
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "�新�始化已存在的共享 Git 版本庫於 %s%s\n"
 
-#: builtin/init-db.c:463
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "�新�始化已存在的 Git 版本庫於 %s%s\n"
 
-#: builtin/init-db.c:467
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "已�始化空的共享 Git 版本庫於 %s%s\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "已�始化空的 Git 版本庫於 %s%s\n"
 
-#: builtin/init-db.c:517
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -16571,53 +16602,49 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權�>]] "
 "[<目錄>]"
 
-#: builtin/init-db.c:543
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "權�"
 
-#: builtin/init-db.c:544
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "指定 git 版本庫是多個使用者之間共享的"
 
-#: builtin/init-db.c:550
+#: builtin/init-db.c:551
 msgid "override the name of the initial branch"
 msgstr "覆蓋�始分支的�稱"
 
-#: builtin/init-db.c:551 builtin/verify-pack.c:74
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
 msgid "hash"
 msgstr "雜湊"
 
-#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75
+#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
 msgid "specify the hash algorithm to use"
 msgstr "指定�使用的雜湊算法"
 
-#: builtin/init-db.c:559
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir 和 --bare 互斥"
-
-#: builtin/init-db.c:590 builtin/init-db.c:595
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "�能建立目錄 %s"
 
-#: builtin/init-db.c:599 builtin/init-db.c:654
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "�能切�目錄到 %s"
 
-#: builtin/init-db.c:626
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr "��許 %s（或 --work-tree=<目錄>）而沒有指定 %s（或 --git-dir=<目錄>）"
 
-#: builtin/init-db.c:678
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "�能存�工作� '%s'"
 
-#: builtin/init-db.c:683
+#: builtin/init-db.c:684
 msgid "--separate-git-dir incompatible with bare repository"
 msgstr "--separate-git-dir 與純版本庫�相容"
 
@@ -16696,7 +16723,7 @@ msgstr "無效的 --decorate �項：%s"
 
 #: builtin/log.c:180
 msgid "show source"
-msgstr "顯示�"
+msgstr "顯示來�"
 
 #: builtin/log.c:181
 msgid "use mail map file"
@@ -16724,85 +16751,85 @@ msgstr "追蹤 <開始>,<��> 範�中橫列或 <檔案> 中> :<函數�稱
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<範�>:<檔案> 和 pathspec �能�時使用"
 
-#: builtin/log.c:303
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "最終輸出：%d %s\n"
 
-#: builtin/log.c:568
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: �壞的檔案"
 
-#: builtin/log.c:583 builtin/log.c:673
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr "�能讀�物件 %s"
 
-#: builtin/log.c:698
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "未知類型：%d"
 
-#: builtin/log.c:843
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s：從�述產生附函的模�無效"
 
-#: builtin/log.c:850
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers 沒有值"
 
-#: builtin/log.c:979
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "無法開啟修補檔案 %s"
 
-#: builtin/log.c:996
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "�需�一個範�"
 
-#: builtin/log.c:1006
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "�是一個範�"
 
-#: builtin/log.c:1170
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "附函需�信件��格�"
 
-#: builtin/log.c:1176
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "無法建立附函檔案"
 
-#: builtin/log.c:1263
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "�正常的 in-reply-to：%s"
 
-#: builtin/log.c:1290
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<�項>] [<從> | <版本範�>]"
 
-#: builtin/log.c:1348
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "兩個輸出目錄？"
 
-#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#: 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:1510 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:1519
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "�能找到準確的�併基礎"
 
-#: builtin/log.c:1529
+#: 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"
@@ -16812,416 +16839,408 @@ msgstr ""
 "git branch --set-upstream-to 來追蹤一個�端分支。或者你�以��\n"
 "�數 --base=<基礎�交> 手動指定一個基礎�交"
 
-#: builtin/log.c:1552
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "無法找到準確的�併基礎"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1587
 msgid "base commit should be the ancestor of revision list"
 msgstr "基礎�交應該是版本列表的祖先"
 
-#: builtin/log.c:1579
+#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr "基礎�交�應該出�在版本列表中"
 
-#: builtin/log.c:1637
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "無法得到修補檔 id"
 
-#: builtin/log.c:1700
+#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
 msgstr "無法推斷目�系列的 range-diff 起點"
 
-#: builtin/log.c:1702
+#: builtin/log.c:1720
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "將 '%s' 當作目�系列的 range-diff 起點"
 
-#: builtin/log.c:1746
+#: builtin/log.c:1764
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "使用 [PATCH n/m]，�使�有一個修補檔"
 
-#: builtin/log.c:1749
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "使用 [PATCH]，�使有多個修補檔"
 
-#: builtin/log.c:1753
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "列�修補檔到標準輸出"
 
-#: builtin/log.c:1755
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "生�一�附函"
 
-#: builtin/log.c:1757
+#: builtin/log.c:1775
 msgid "use simple number sequence for output file names"
 msgstr "使用簡單的數字�列作為輸出檔案�"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "後綴"
 
-#: builtin/log.c:1759
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "使用 <後綴> 代替 '.patch'"
 
-#: builtin/log.c:1761
+#: builtin/log.c:1779
 msgid "start numbering patches at <n> instead of 1"
 msgstr "修補檔以 <n> 開始編號，而�是1"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "reroll-count"
 
-#: builtin/log.c:1763
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "標記修補檔系列是第幾次�製"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "輸出檔�的最大長度"
 
-#: builtin/log.c:1767
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "從�述產生附函的模�"
 
-#: builtin/log.c:1771
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "基於分支�述產生部分附函"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "使用 [<�綴>] 代替 [PATCH]"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "把�果檔案儲存在 <目錄>"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "�刪除/新增 [PATCH]"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "�輸出二進�差異"
 
-#: builtin/log.c:1784
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr "在 From 標頭訊�中輸出全為零的雜湊值"
 
-#: builtin/log.c:1786
+#: builtin/log.c:1804
 msgid "don't include a patch matching a commit upstream"
 msgstr "�包�已在上游�交中的修補檔"
 
-#: builtin/log.c:1788
+#: builtin/log.c:1806
 msgid "show patch format instead of default (patch + stat)"
 msgstr "顯示純修補檔格�而��設的（修補檔+狀態）"
 
-#: builtin/log.c:1790
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "信件傳�"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1809
 msgid "header"
 msgstr "header"
 
-#: builtin/log.c:1792
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "新增信件頭"
 
-#: builtin/log.c:1793 builtin/log.c:1794
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "信件��"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "新增收件人"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "新增抄�"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "標記"
 
-#: builtin/log.c:1796
+#: builtin/log.c:1814
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "將 From ��設定為 <標記>（如若��供，則用�交者 ID �為��）"
 
-#: builtin/log.c:1798
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "信件標記"
 
-#: builtin/log.c:1799
+#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr "使第一�信件作為� <信件標記> 的回覆"
 
-#: builtin/log.c:1800 builtin/log.c:1803
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "邊界"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "附件方�新增修補檔"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "內�顯示修補檔"
 
-#: builtin/log.c:1808
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr "啟用信件線索，風格：淺，深"
 
-#: builtin/log.c:1810
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "簽�"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "新增一個簽�"
 
-#: builtin/log.c:1812
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "基礎�交"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr "為修補檔列表新增�置樹訊�"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "從檔案新增一個簽�"
 
-#: builtin/log.c:1817
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "��列�修補檔檔案�"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "在生�修補檔時顯示進度"
 
-#: builtin/log.c:1821
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "在附函或單個修補檔中顯示和 <rev> 的差異"
 
-#: builtin/log.c:1824
+#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異"
 
-#: builtin/log.c:1826 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:1913
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "包�無效的身份標記：%s"
 
-#: builtin/log.c:1928
-msgid "-n and -k are mutually exclusive"
-msgstr "-n 和 -k 互斥"
-
-#: builtin/log.c:1930
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc 和 -k 互斥"
-
-#: builtin/log.c:1938
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only 無�義"
 
-#: builtin/log.c:1940
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status 無�義"
 
-#: builtin/log.c:1942
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check 無�義"
 
-#: builtin/log.c:1964
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout�--output 和 --output-directory 互斥"
-
-#: builtin/log.c:2087
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff 需� --cover-letter 或單一修補檔"
 
-#: builtin/log.c:2091
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "版本間差異："
 
-#: builtin/log.c:2092
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "� v%d 的版本差異："
 
-#: builtin/log.c:2098
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor 需� --range-diff"
-
-#: builtin/log.c:2102
+#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff 需� --cover-letter 或單一修補檔"
 
-#: builtin/log.c:2110
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "範�差異："
 
-#: builtin/log.c:2111
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "� v%d 的範�差異："
 
-#: builtin/log.c:2122
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "無法讀�簽�檔案 '%s'"
 
-#: builtin/log.c:2158
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "生�修補檔"
 
-#: builtin/log.c:2202
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "無法建立輸出檔案"
 
-#: builtin/log.c:2261
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<上游> [<頭> [<�制>]]]"
 
-#: builtin/log.c:2315
+#: 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:563
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<�項>] [<檔案>...]"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:618
+msgid "separate paths with the NUL character"
+msgstr "用 NUL 字元分隔路徑"
+
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "用標籤標記檔案的狀態"
 
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "使用�寫字�表示 '�設未改變的' 檔案"
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "使用�寫字�表示 'fsmonitor clean' 檔案"
 
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "顯示快�的檔案（�設）"
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "顯示已刪除的檔案"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "顯示已修改的檔案"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "顯示其它檔案"
 
-#: builtin/ls-files.c:633
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "顯示忽略的檔案"
 
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
 msgstr "顯示暫存�內容的物件�稱"
 
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:639
 msgid "show files on the filesystem that need to be removed"
 msgstr "顯示檔案系統需�刪除的檔案"
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "�顯示「其他�目錄的�稱"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "顯示檔案�行符號格�"
 
-#: builtin/ls-files.c:644
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "�顯示空目錄"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "顯示未�併的檔案"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "顯示 resolve-undo 訊�"
 
-#: builtin/ls-files.c:651
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "符�排除檔案的模�"
 
-#: builtin/ls-files.c:654
-msgid "exclude patterns are read from <file>"
-msgstr "從 <檔案> 中讀�排除模�"
+#: builtin/ls-files.c:655
+msgid "read exclude patterns from <file>"
+msgstr "從 <檔案> 讀�排除模� (pattern)"
 
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "從 <檔案> 讀��外的�個目錄的排除模�"
 
-#: builtin/ls-files.c:659
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "新增標準的 git 排除"
 
-#: builtin/ls-files.c:663
+#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr "顯示相�於頂級目錄的檔案�"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "在�模組中�迴"
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:669
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "如果任何 <檔案> 都�在索引�，視為錯誤"
 
-#: builtin/ls-files.c:669
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "樹或�交"
 
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:671
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "��自從 <樹或�交> 之後刪除的路徑�然存在"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "顯示除錯資料"
 
-#: builtin/ls-files.c:674
+#: 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"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<repository> [<refs>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repository> [<refs>...]]"
 msgstr ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
-"                     [-q | --quiet] [--exit-code] [--get-url]\n"
-"                     [--symref] [<版本庫> [<引用>...]]"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<版本庫> [<引用>...]]"
 
 #: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "�列��端 URL"
 
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
 msgid "exec"
 msgstr "exec"
 
@@ -17291,7 +17310,6 @@ msgstr "列出整個樹；�僅僅目�目錄（隱� --full-name）"
 
 #. TRANSLATORS: keep <> in "<" mail ">" info.
 #: builtin/mailinfo.c:14
-#| msgid "git diff --no-index [<options>] <path> <path>"
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
 msgstr "git mailinfo [<�項>] <訊�> <修補檔> < mail >info"
 
@@ -17309,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"
@@ -17321,12 +17339,11 @@ msgstr "編碼"
 
 #: builtin/mailinfo.c:70
 msgid "re-code metadata to this encoding"
-msgstr "�新將中繼資料編碼為這個編碼方�"
+msgstr "�新將中介資料編碼為這個編碼方�"
 
 #: builtin/mailinfo.c:72
-#, fuzzy
 msgid "use scissors"
-msgstr "使用 scissors"
+msgstr "使用剪刀標記"
 
 #: builtin/mailinfo.c:73
 msgid "<action>"
@@ -17337,11 +17354,10 @@ msgid "action when quoted CR is found"
 msgstr "當找到�列� CR 字元時所�採�的行為"
 
 #: builtin/mailinfo.c:77
-#, fuzzy
 msgid "use headers in message's body"
-msgstr "在訊�本文部分使用標頭"
+msgstr "在訊�內文中使用標頭"
 
-#: builtin/mailsplit.c:241
+#: builtin/mailsplit.c:239
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "空的 mbox：'%s'"
@@ -17403,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 設定標籤"
 
@@ -17456,191 +17476,187 @@ msgstr "無法解�引用 '%s'"
 msgid "Merging %s with %s\n"
 msgstr "�併 %s 和 %s\n"
 
-#: builtin/merge.c:58
+#: builtin/merge.c:59
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<�項>] [<�交>...]"
 
-#: builtin/merge.c:59
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:60
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:123
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "開關 `m' 需�一個值"
 
-#: builtin/merge.c:146
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "�項 `%s' 需�一個值"
 
-#: builtin/merge.c:199
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "�能找到�併策略 '%s'。\n"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "�用的策略有："
 
-#: builtin/merge.c:205
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "�用的自訂策略有："
 
-#: builtin/merge.c:256 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 "在�併的最後�顯示差異統計"
 
-#: builtin/merge.c:259 builtin/pull.c:136
+#: builtin/merge.c:261 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "在�併的最後顯示差異統計"
 
-#: builtin/merge.c:260 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "（和 --stat �義）"
 
-#: builtin/merge.c:262 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 "在�併�交說明中新增（最多 <n> �）精簡�交記錄"
 
-#: builtin/merge.c:265 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr "建立一個單�的�交而�是�一次�併"
 
-#: builtin/merge.c:267 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "如果�併�功，執行一次�交（�設）"
 
-#: builtin/merge.c:269 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "在�交�編輯�交說明"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "�許快轉（�設）"
 
-#: builtin/merge.c:273 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "如果�能快轉就放棄�併"
 
-#: builtin/merge.c:277 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "驗證指定的�交是�包�一個有效的 GPG 簽�"
 
-#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
-#: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114
+#: 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:279 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "�使用的�併策略"
 
-#: builtin/merge.c:280 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "option=value"
 
-#: builtin/merge.c:281 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "所�的�併策略的�項"
 
-#: builtin/merge.c:283
+#: builtin/merge.c:285
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "�併的�交說明（���快轉��併）"
 
-#: builtin/merge.c:290
+#: 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:292
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort，但是�留索引和工作�"
 
-#: builtin/merge.c:294
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "繼續目�正在進行的�併"
 
-#: builtin/merge.c:296 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "�許�並�相關的歷�"
 
-#: builtin/merge.c:303
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "繞� pre-merge-commit 和 commit-msg 掛鉤"
 
-#: builtin/merge.c:320
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "�能執行儲�。"
 
-#: builtin/merge.c:325
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "儲�失敗"
 
-#: builtin/merge.c:330
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "�是一個有效物件：%s"
 
-#: builtin/merge.c:352 builtin/merge.c:369
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "讀�樹失敗"
 
 #  譯者：請維��導空格
-#: builtin/merge.c:400
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "已經是最新的。（無需壓縮 (squash)）"
 
-#: builtin/merge.c:414
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "壓縮�交 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:464
+#: 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:602
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "壞的 branch.%s.mergeoptions 字串：%s"
 
-#: builtin/merge.c:728
+#: builtin/merge.c:732
 msgid "Not handling anything other than two heads merge."
 msgstr "未處�兩個頭�併之外的任何動作。"
 
-#: builtin/merge.c:741
+#: builtin/merge.c:745
 #, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "merge-recursive 的未知�項：-X%s"
+msgid "unknown strategy option: -X%s"
+msgstr "未知的策略�項：-X%s"
 
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "�能寫 %s"
 
-#: builtin/merge.c:812
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "�能從 '%s' 讀�"
 
-#: builtin/merge.c:821
+#: 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:827
+#: 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"
@@ -17650,83 +17666,83 @@ msgstr ""
 "�併到主題分支。\n"
 "\n"
 
-#: builtin/merge.c:832
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "空的�交說明會終止�交。\n"
 
-#: builtin/merge.c:835
+#: 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:888
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "空�交說明。"
 
-#: builtin/merge.c:903
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "太棒了。\n"
 
-#: builtin/merge.c:964
+#: builtin/merge.c:970
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "自動�併失敗，修正��然後�交修正的�果。\n"
 
-#: builtin/merge.c:1003
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "沒有目�分支。"
 
-#: builtin/merge.c:1005
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "目�分支沒有�應的�端版本庫。"
 
-#: builtin/merge.c:1007
+#: builtin/merge.c:1013
 msgid "No default upstream defined for the current branch."
 msgstr "目�分支沒有定義�設的上游分支。"
 
-#: builtin/merge.c:1012
+#: builtin/merge.c:1018
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "�於 %s 沒有來自 %s 的�端追蹤分支"
 
-#: builtin/merge.c:1069
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "環境 '%2$s' 中存在壞的�值 '%1$s'"
 
-#: builtin/merge.c:1172
+#: builtin/merge.c:1177
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "�能在 %s 中�併：%s"
 
-#: builtin/merge.c:1206
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "�能�併"
 
-#: builtin/merge.c:1316
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort �帶�數"
 
-#: builtin/merge.c:1320
+#: builtin/merge.c:1328
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "沒有�終止的�併（MERGE_HEAD �失）。"
 
-#: builtin/merge.c:1338
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit �帶�數"
 
-#: builtin/merge.c:1351
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue �帶�數"
 
-#: builtin/merge.c:1355
+#: builtin/merge.c:1363
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "沒有進行中的�併（MERGE_HEAD �失）。"
 
-#: builtin/merge.c:1371
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17734,7 +17750,7 @@ msgstr ""
 "您尚未��您的�併（存在 MERGE_HEAD）。\n"
 "請在�併�先�交您的修改。"
 
-#: builtin/merge.c:1378
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17742,88 +17758,76 @@ msgstr ""
 "您尚未��您的��（存在 CHERRY_PICK_HEAD）。\n"
 "請在�併�先�交您的修改。"
 
-#: builtin/merge.c:1381
+#: builtin/merge.c:1389
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "您尚未��您的��（存在 CHERRY_PICK_HEAD）。"
 
-#: builtin/merge.c:1395
-msgid "You cannot combine --squash with --no-ff."
-msgstr "您�能將 --squash 和 --no-ff 組�使用。"
-
-#: builtin/merge.c:1397
-msgid "You cannot combine --squash with --commit."
-msgstr "您�能將 --squash 和 --commit 組�使用。"
-
-#: builtin/merge.c:1413
+#: builtin/merge.c:1421
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "未指定�交並且 merge.defaultToUpstream 未設定。"
 
-#: builtin/merge.c:1430
+#: builtin/merge.c:1438
 msgid "Squash commit into empty head not supported yet"
 msgstr "尚�支�到空分支的壓縮�交"
 
-#: builtin/merge.c:1432
+#: builtin/merge.c:1440
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "到空分支的�快轉��交沒有�義"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - �能被�併"
 
-#: builtin/merge.c:1439
+#: builtin/merge.c:1447
 msgid "Can merge only exactly one commit into empty head"
 msgstr "�能將一個�交�並到空分支上"
 
-#: builtin/merge.c:1520
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "拒絕�併無關的歷�"
 
-#: builtin/merge.c:1539
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "æ›´æ–° %s..%s\n"
 
-#: builtin/merge.c:1585
+#: builtin/merge.c:1601
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "嘗試�常�的索引內�併...\n"
 
-#: builtin/merge.c:1592
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "無。\n"
 
-#: builtin/merge.c:1623
-msgid "Not possible to fast-forward, aborting."
-msgstr "無法快轉，終止。"
-
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: builtin/merge.c:1667 builtin/merge.c:1733
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "將樹回滾至原始狀態...\n"
 
-#: builtin/merge.c:1655
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "嘗試�併策略 %s...\n"
 
-#: builtin/merge.c:1707
+#: builtin/merge.c:1723
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "沒有�併策略處�此�併。\n"
 
-#: builtin/merge.c:1709
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "使用策略 %s �併失敗。\n"
 
-#: builtin/merge.c:1718
+#: builtin/merge.c:1735
 #, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "使用 %s 以準備手動解決。\n"
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr "使用 %s 策略，準備自行解決。\n"
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "自動�併進展順利，按�求在�交��止\n"
@@ -17857,15 +17861,15 @@ msgstr "無法讀�有標籤的物件「%s�"
 msgid "object '%s' tagged as '%s', but is a '%s' type"
 msgstr "「%s�已標為「%s�，但�是「%s�類型"
 
-#: builtin/mktag.c:97
+#: builtin/mktag.c:98
 msgid "tag on stdin did not pass our strict fsck check"
 msgstr "stdin 上的標籤未通�我們的嚴格 fsck 檢查"
 
-#: builtin/mktag.c:100
+#: builtin/mktag.c:101
 msgid "tag on stdin did not refer to a valid object"
-msgstr "標準輸入上的標籤�考的�是有效物件"
+msgstr "標準輸入上的標籤指�的�是有效物件"
 
-#: builtin/mktag.c:103 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "無法寫標籤檔案"
 
@@ -17886,55 +17890,58 @@ msgid "allow creation of more than one tree"
 msgstr "�許建立一個以上的樹"
 
 #: builtin/multi-pack-index.c:10
-#| msgid ""
-#| "git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
-#| "size=<size>)"
-msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
-msgstr "git multi-pack-index [<�項>] write [--preferred-pack=<包>]"
-
-#: builtin/multi-pack-index.c:13
-#| msgid "git upload-pack [<options>] <dir>"
+msgid ""
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
+msgstr ""
+"git multi-pack-index [<�項>] write [--preferred-pack=<包>] [--refs-"
+"snapshot=<路徑>]"
+
+#: builtin/multi-pack-index.c:14
 msgid "git multi-pack-index [<options>] verify"
 msgstr "git multi-pack-index [<�項>] verify"
 
-#: builtin/multi-pack-index.c:16
-#| msgid "git upload-pack [<options>] <dir>"
+#: builtin/multi-pack-index.c:17
 msgid "git multi-pack-index [<options>] expire"
 msgstr "git multi-pack-index [<�項>] expire"
 
-#: builtin/multi-pack-index.c:19
-#| msgid ""
-#| "git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
-#| "size=<size>)"
+#: builtin/multi-pack-index.c:20
 msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<�項>] repack [--batch-size=<大�>]"
 
-#: builtin/multi-pack-index.c:54
+#: builtin/multi-pack-index.c:57
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr "包��� packfile 和包索引的物件目錄"
 
-#: builtin/multi-pack-index.c:69
+#: builtin/multi-pack-index.c:98
 msgid "preferred-pack"
 msgstr "�好包"
 
-#: builtin/multi-pack-index.c:70
+#: builtin/multi-pack-index.c:99
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr "計算多包�圖時��複使用的包"
 
-#: builtin/multi-pack-index.c:128
+#: builtin/multi-pack-index.c:100
+msgid "write multi-pack bitmap"
+msgstr "寫入多包�圖"
+
+#: builtin/multi-pack-index.c:105
+msgid "write multi-pack index containing only given indexes"
+msgstr "寫入�包�指定索引的多包索引"
+
+#: builtin/multi-pack-index.c:107
+msgid "refs snapshot for selecting bitmap commits"
+msgstr "用來���圖�交的引用快照"
+
+#: 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 "在 repack 期間，將較�尺寸的包檔案收集到大於此大�的批次中"
 
-#: builtin/multi-pack-index.c:180
-#, c-format
-msgid "unrecognized subcommand: %s"
-msgstr "未識別的�指令：%s"
-
 #: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
-msgstr "git mv [<�項>] <�>... <目標>"
+msgstr "git mv [<�項>] <來�>... <目的地>"
 
 #: builtin/mv.c:83
 #, c-format
@@ -17958,117 +17965,117 @@ msgstr "強制移動/�指令，�使目標存在"
 msgid "skip move/rename errors"
 msgstr "略�移動/�新命�錯誤"
 
-#: builtin/mv.c:170
+#: builtin/mv.c:172
 #, c-format
 msgid "destination '%s' is not a directory"
-msgstr "目標 '%s' �是一個目錄"
+msgstr "目的地「%s��是目錄"
 
-#: builtin/mv.c:181
+#: builtin/mv.c:184
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "檢查 '%s' 到 '%s' 的�新命�\n"
 
-#: builtin/mv.c:185
+#: builtin/mv.c:190
 msgid "bad source"
-msgstr "壞的�"
+msgstr "來��壞"
 
-#: builtin/mv.c:188
+#: builtin/mv.c:193
 msgid "can not move directory into itself"
 msgstr "�能將目錄移動到自身"
 
-#: builtin/mv.c:191
+#: builtin/mv.c:196
 msgid "cannot move directory over file"
 msgstr "�能將目錄移動到檔案"
 
-#: builtin/mv.c:200
+#: builtin/mv.c:205
 msgid "source directory is empty"
-msgstr "�目錄為空"
+msgstr "來�目錄空白"
 
-#: builtin/mv.c:225
+#: builtin/mv.c:231
 msgid "not under version control"
 msgstr "�在版本控制之下"
 
-#: builtin/mv.c:227
+#: builtin/mv.c:233
 msgid "conflicted"
 msgstr "��"
 
-#: builtin/mv.c:230
+#: builtin/mv.c:236
 msgid "destination exists"
-msgstr "目標已存在"
+msgstr "目的地已存在"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:244
 #, c-format
 msgid "overwriting '%s'"
 msgstr "覆蓋 '%s'"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:247
 msgid "Cannot overwrite"
 msgstr "�能覆蓋"
 
-#: builtin/mv.c:244
+#: builtin/mv.c:250
 msgid "multiple sources for the same target"
-msgstr "�一目標具有多個�"
+msgstr "�一目標具有多個來�"
 
-#: builtin/mv.c:246
+#: builtin/mv.c:252
 msgid "destination directory does not exist"
-msgstr "目標目錄�存在"
+msgstr "找�到目的地目錄"
 
-#: builtin/mv.c:253
+#: builtin/mv.c:280
 #, c-format
 msgid "%s, source=%s, destination=%s"
-msgstr "%s，�=%s，目標=%s"
+msgstr "%s，來�=%s，目的地=%s"
 
-#: builtin/mv.c:274
+#: builtin/mv.c:308
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "�新命� %s 至 %s\n"
 
-#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#: 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 "�輸出基於�考的�稱 (沒有物件�稱)"
+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 "��解�輸入中的標籤（內部使用）"
 
@@ -18086,7 +18093,7 @@ msgstr ""
 
 #: builtin/notes.c:30
 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
-msgstr "git notes [--ref <註解引用>] copy [-f] <�物件> <目標物件>"
+msgstr "git notes [--ref <註解引用>] copy [-f] <來�物件> <目標物件>"
 
 #: builtin/notes.c:31
 msgid ""
@@ -18139,11 +18146,11 @@ msgstr "git notes add [<�項>] [<物件>]"
 
 #: builtin/notes.c:54
 msgid "git notes copy [<options>] <from-object> <to-object>"
-msgstr "git notes copy [<�項>] <�物件> <目標物件>"
+msgstr "git notes copy [<�項>] <來�物件> <目標物件>"
 
 #: builtin/notes.c:55
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
-msgstr "git notes copy --stdin [<�物件> <目標物件>]..."
+msgstr "git notes copy --stdin [<來�物件> <目標物件>]..."
 
 #: builtin/notes.c:60
 msgid "git notes append [<options>] [<object>]"
@@ -18185,61 +18192,61 @@ 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:197
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr "請�� -m 或 -F �項為註解�供內容"
 
-#: builtin/notes.c:206
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "�能寫註解物件"
 
-#: builtin/notes.c:208
+#: builtin/notes.c:206
 #, c-format
 msgid "the note contents have been left in %s"
 msgstr "註解內容被留在 %s 中"
 
-#: builtin/notes.c:242 builtin/tag.c:576
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "�能開啟或讀� '%s'"
 
-#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
-#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
-#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
+#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
+#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
+#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
 #, c-format
 msgid "failed to resolve '%s' as a valid ref."
 msgstr "無法解� '%s' 為一個有效引用。"
 
-#: builtin/notes.c:265
+#: builtin/notes.c:263
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "讀�物件 '%s' 失敗。"
 
-#: builtin/notes.c:268
+#: builtin/notes.c:266
 #, c-format
 msgid "cannot read note data from non-blob object '%s'."
 msgstr "�能從�資料物件 '%s' 中讀�註解資料。"
 
-#: builtin/notes.c:309
+#: builtin/notes.c:307
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "格�錯誤的輸入行：'%s'。"
 
-#: builtin/notes.c:324
+#: builtin/notes.c:322
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "從 '%s' 複製註解到 '%s' 時失敗"
@@ -18247,89 +18254,89 @@ msgstr "從 '%s' 複製註解到 '%s' 時失敗"
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
 #.
-#: builtin/notes.c:356
+#: builtin/notes.c:354
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "拒絕� %2$s（在 refs/notes/ 之外）%1$s註解"
 
-#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
-#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
-#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
-#: builtin/prune-packed.c:25 builtin/tag.c:586
+#: 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:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr "太多�數"
 
-#: builtin/notes.c:389 builtin/notes.c:678
+#: builtin/notes.c:387 builtin/notes.c:676
 #, c-format
 msgid "no note found for object %s."
 msgstr "未發�物件 %s 的註解。"
 
-#: builtin/notes.c:410 builtin/notes.c:576
+#: builtin/notes.c:408 builtin/notes.c:574
 msgid "note contents as a string"
 msgstr "註解內容作為一個字串"
 
-#: builtin/notes.c:413 builtin/notes.c:579
+#: builtin/notes.c:411 builtin/notes.c:577
 msgid "note contents in a file"
 msgstr "註解內容到一個檔案中"
 
-#: builtin/notes.c:416 builtin/notes.c:582
+#: builtin/notes.c:414 builtin/notes.c:580
 msgid "reuse and edit specified note object"
 msgstr "�用和編輯指定的註解物件"
 
-#: builtin/notes.c:419 builtin/notes.c:585
+#: builtin/notes.c:417 builtin/notes.c:583
 msgid "reuse specified note object"
 msgstr "�用指定的註解物件"
 
-#: builtin/notes.c:422 builtin/notes.c:588
+#: builtin/notes.c:420 builtin/notes.c:586
 msgid "allow storing empty note"
 msgstr "�許儲存空白備註"
 
-#: builtin/notes.c:423 builtin/notes.c:496
+#: builtin/notes.c:421 builtin/notes.c:494
 msgid "replace existing notes"
 msgstr "�代已存在的註解"
 
-#: builtin/notes.c:448
+#: builtin/notes.c:446
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "�能新增註解。發�物件 %s 已存在註解。使用 '-f' 覆蓋�存註解"
 
-#: builtin/notes.c:463 builtin/notes.c:544
+#: builtin/notes.c:461 builtin/notes.c:542
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
 msgstr "覆蓋物件 %s �存註解\n"
 
-#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "刪除物件 %s 的註解\n"
 
-#: builtin/notes.c:497
+#: builtin/notes.c:495
 msgid "read objects from stdin"
 msgstr "從標準輸入讀�物件"
 
-#: builtin/notes.c:499
+#: builtin/notes.c:497
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "�新載入 <命令> 的設定（隱� --stdin）"
 
-#: builtin/notes.c:517
+#: builtin/notes.c:515
 msgid "too few arguments"
 msgstr "太少�數"
 
-#: builtin/notes.c:538
+#: builtin/notes.c:536
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr "�能複製註解。發�物件 %s 已存在註解。使用 '-f' 覆蓋�存註解"
 
-#: builtin/notes.c:550
+#: builtin/notes.c:548
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
-msgstr "�物件 %s 缺少註解。�能複製。"
+msgstr "來�物件 %s 缺少註解。�能複製。"
 
-#: builtin/notes.c:603
+#: builtin/notes.c:601
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -18338,97 +18345,97 @@ msgstr ""
 "�指令 'edit' 的�項 -m/-F/-c/-C 已棄用。\n"
 "請�用 'git notes add -f -m/-F/-c/-C'。\n"
 
-#: builtin/notes.c:698
+#: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "刪除引用 NOTES_MERGE_PARTIAL 失敗"
 
-#: builtin/notes.c:700
+#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "刪除引用 NOTES_MERGE_REF 失敗"
 
-#: builtin/notes.c:702
+#: builtin/notes.c:700
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "刪除 'git notes merge' 工作�失敗"
 
-#: builtin/notes.c:722
+#: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "讀�引用 NOTES_MERGE_PARTIAL 失敗"
 
-#: builtin/notes.c:724
+#: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
 msgstr "無法從 NOTES_MERGE_PARTIAL 中找到�交。"
 
-#: builtin/notes.c:726
+#: builtin/notes.c:724
 msgid "could not parse commit from NOTES_MERGE_PARTIAL."
 msgstr "無法從 NOTES_MERGE_PARTIAL 中解��交。"
 
-#: builtin/notes.c:739
+#: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "解� NOTES_MERGE_REF 失敗"
 
-#: builtin/notes.c:742
+#: builtin/notes.c:740
 msgid "failed to finalize notes merge"
 msgstr "無法完�註解�併"
 
-#: builtin/notes.c:768
+#: builtin/notes.c:766
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "未知的註解�併策略 %s"
 
-#: builtin/notes.c:784
+#: builtin/notes.c:782
 msgid "General options"
 msgstr "通用�項"
 
-#: builtin/notes.c:786
+#: builtin/notes.c:784
 msgid "Merge options"
 msgstr "�併�項"
 
-#: builtin/notes.c:788
+#: builtin/notes.c:786
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
 msgstr "使用指定的策略解決註解�� (manual/ours/theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:790
+#: builtin/notes.c:788
 msgid "Committing unmerged notes"
 msgstr "�交未�併的註解"
 
-#: builtin/notes.c:792
+#: builtin/notes.c:790
 msgid "finalize notes merge by committing unmerged notes"
 msgstr "���交未�併的註解來完�註解�併"
 
-#: builtin/notes.c:794
+#: builtin/notes.c:792
 msgid "Aborting notes merge resolution"
 msgstr "中止註解�併的方案"
 
-#: builtin/notes.c:796
+#: builtin/notes.c:794
 msgid "abort notes merge"
 msgstr "中止註解�併"
 
-#: builtin/notes.c:807
+#: builtin/notes.c:805
 msgid "cannot mix --commit, --abort or -s/--strategy"
 msgstr "�能混用 --commit�--abort 或 -s/--strategy"
 
-#: builtin/notes.c:812
+#: builtin/notes.c:810
 msgid "must specify a notes ref to merge"
 msgstr "必須指定一個註解引用來�併"
 
-#: builtin/notes.c:836
+#: builtin/notes.c:834
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "未知的 -s/--strategy：%s"
 
-#: builtin/notes.c:873
+#: 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:876
+#: builtin/notes.c:878
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "無法儲存連�到目�的註解引用（%s）"
 
-#: builtin/notes.c:878
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18438,56 +18445,56 @@ msgstr ""
 "自動�併說明失敗。修改 %s 中的��並且使用指令 'git notes merge --commit' �"
 "交�果，或者使用指令 'git notes merge --abort' 終止�併。\n"
 
-#: builtin/notes.c:897 builtin/tag.c:589
+#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "無法解� '%s' 為一個有效引用。"
 
-#: builtin/notes.c:900
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "物件 %s 沒有註解\n"
 
-#: builtin/notes.c:912
+#: builtin/notes.c:914
 msgid "attempt to remove non-existent note is not an error"
 msgstr "嘗試刪除�存在的註解�是一個錯誤"
 
-#: builtin/notes.c:915
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr "從標準輸入讀�物件�稱"
 
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr "�刪除，�顯示"
 
-#: builtin/notes.c:955
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "報告清除的註解"
 
-#: builtin/notes.c:998
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "註解引用"
 
-#: builtin/notes.c:999
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "從 <註解引用> 使用註解"
 
-#: builtin/notes.c:1034 builtin/stash.c:1739
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "未知�指令：%s"
 
-#: builtin/pack-objects.c:54
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects --stdout [<�項>...] [< <引用列表> | < <物件列表>]"
 
-#: builtin/pack-objects.c:55
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<�項>...] <�綴�稱> [< <引用列表> | < <物件列表>]"
 
-#: builtin/pack-objects.c:440
+#: builtin/pack-objects.c:572
 #, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
@@ -18495,106 +18502,110 @@ msgid ""
 msgstr ""
 "write_reuse_object：無法定� %1$s，�期在 %3$s 包中的 %2$<PRIuMAX> �移�"
 
-#: builtin/pack-objects.c:448
+#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "%s 錯的包物件 CRC"
 
-#: builtin/pack-objects.c:459
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "%s �壞的包物件"
 
-#: builtin/pack-objects.c:590
+#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "發�物件 %s �迴 delta"
 
-#: builtin/pack-objects.c:801
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "排�了 %u 個物件，�期 %<PRIu32> 個"
 
-#: builtin/pack-objects.c:896
+#: builtin/pack-objects.c:1036
 #, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr "�期 %2$s 包中的�移 %1$<PRIuMAX> 有物件"
 
-#: builtin/pack-objects.c:1015
+#: builtin/pack-objects.c:1160
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "�用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個"
 
-#: builtin/pack-objects.c:1028
+#: builtin/pack-objects.c:1173
 msgid "Writing objects"
 msgstr "寫入物件中"
 
-#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#: builtin/pack-objects.c:1235 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "� %s 呼� stat 失敗"
 
-#: builtin/pack-objects.c:1141
+#: builtin/pack-objects.c:1268
+msgid "failed to write bitmap index"
+msgstr "無法寫入�圖索引"
+
+#: builtin/pack-objects.c:1294
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "寫入 %<PRIu32> 個物件而�期 %<PRIu32> 個"
 
-#: builtin/pack-objects.c:1383
+#: builtin/pack-objects.c:1536
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "�用 bitmap 寫入，因為一些物件將�會被打包"
 
-#: builtin/pack-objects.c:1831
+#: builtin/pack-objects.c:1984
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "%s 壓縮中 delta 基準�移越界"
 
-#: builtin/pack-objects.c:1840
+#: builtin/pack-objects.c:1993
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "%s 的 delta 基準�移越界"
 
-#: builtin/pack-objects.c:2121
+#: builtin/pack-objects.c:2274
 msgid "Counting objects"
 msgstr "物件計數中"
 
-#: builtin/pack-objects.c:2266
+#: builtin/pack-objects.c:2439
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "無法解�物件 %s 標頭訊�"
 
-#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
-#: builtin/pack-objects.c:2362
+#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
+#: builtin/pack-objects.c:2535
 #, c-format
 msgid "object %s cannot be read"
 msgstr "物件 %s 無法讀�"
 
-#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
+#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "物件 %s �一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）"
 
-#: builtin/pack-objects.c:2376
+#: builtin/pack-objects.c:2549
 msgid "suboptimal pack - out of memory"
 msgstr "次優（suboptimal）打包 - 記憶體�足"
 
-#: builtin/pack-objects.c:2691
+#: builtin/pack-objects.c:2864
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "使用 %d 個執行緒進行壓縮"
 
-#: builtin/pack-objects.c:2830
+#: builtin/pack-objects.c:3003
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "無法為標籤 %s 壓縮物件"
 
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:3089
 msgid "Compressing objects"
 msgstr "壓縮物件中"
 
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:3095
 msgid "inconsistency with delta count"
 msgstr "�一致的差異計數"
 
-#: builtin/pack-objects.c:3001
+#: builtin/pack-objects.c:3174
 #, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
@@ -18603,23 +18614,24 @@ msgstr ""
 "uploadpack.blobpackfileuri 的值格�必須為 '<object-hash> <pack-hash> "
 "<uri>' (收到 '%s')"
 
-#: builtin/pack-objects.c:3004
+#: builtin/pack-objects.c:3177
 #, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
 msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定� (收到 '%s')"
 
-#: builtin/pack-objects.c:3039
+#: builtin/pack-objects.c:3212
 #, c-format
 msgid "could not get type of object %s in pack %s"
 msgstr "無法�得 %2$s 包中 %1$s 物件的類型"
 
-#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
+#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
+#: builtin/pack-objects.c:3365
 #, c-format
 msgid "could not find pack '%s'"
 msgstr "找�到「%s�包"
 
-#: builtin/pack-objects.c:3218
+#: builtin/pack-objects.c:3408
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -18628,7 +18640,7 @@ msgstr ""
 "�期邊界物件（edge object）ID，�得到垃圾資料：\n"
 " %s"
 
-#: builtin/pack-objects.c:3224
+#: builtin/pack-objects.c:3414
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -18637,246 +18649,242 @@ msgstr ""
 "�期物件 ID，�得到垃圾資料：\n"
 " %s"
 
-#: builtin/pack-objects.c:3322
+#: builtin/pack-objects.c:3507
 msgid "invalid value for --missing"
 msgstr "�項 --missing 的值無效"
 
-#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
+#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
 msgid "cannot open pack index"
 msgstr "無法開啟包檔案索引"
 
-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3541
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "無法檢查 %s 處的鬆散物件"
 
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3627
 msgid "unable to force loose object"
 msgstr "無法強制鬆散物件"
 
-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3757
 #, c-format
 msgid "not a rev '%s'"
 msgstr "�是一個版本 '%s'"
 
-#: builtin/pack-objects.c:3631
+#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "壞的版本 '%s'"
 
-#: builtin/pack-objects.c:3659
+#: builtin/pack-objects.c:3788
 msgid "unable to add recent objects"
 msgstr "無法新增最近的物件"
 
-#: builtin/pack-objects.c:3712
+#: builtin/pack-objects.c:3841
 #, c-format
 msgid "unsupported index version %s"
 msgstr "�支�的索引版本 %s"
 
-#: builtin/pack-objects.c:3716
+#: builtin/pack-objects.c:3845
 #, c-format
 msgid "bad index version '%s'"
 msgstr "壞的索引版本 '%s'"
 
-#: builtin/pack-objects.c:3755
+#: builtin/pack-objects.c:3884
 msgid "<version>[,<offset>]"
 msgstr "<版本>[,<�移>]"
 
-#: builtin/pack-objects.c:3756
+#: builtin/pack-objects.c:3885
 msgid "write the pack index file in the specified idx format version"
 msgstr "用指定的 idx 格�版本來寫包索引檔案"
 
-#: builtin/pack-objects.c:3759
+#: builtin/pack-objects.c:3888
 msgid "maximum size of each output pack file"
 msgstr "�個輸出包的最大尺寸"
 
-#: builtin/pack-objects.c:3761
+#: builtin/pack-objects.c:3890
 msgid "ignore borrowed objects from alternate object store"
 msgstr "忽略從備用物件儲存裡借用物件"
 
-#: builtin/pack-objects.c:3763
+#: builtin/pack-objects.c:3892
 msgid "ignore packed objects"
 msgstr "忽略包物件"
 
-#: builtin/pack-objects.c:3765
+#: builtin/pack-objects.c:3894
 msgid "limit pack window by objects"
 msgstr "�制打包視窗的物件數"
 
-#: builtin/pack-objects.c:3767
+#: builtin/pack-objects.c:3896
 msgid "limit pack window by memory in addition to object limit"
 msgstr "除物件數��制外設定打包視窗的記憶體�制"
 
-#: builtin/pack-objects.c:3769
+#: builtin/pack-objects.c:3898
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "打包�許的 delta �的最大長度"
 
-#: builtin/pack-objects.c:3771
+#: builtin/pack-objects.c:3900
 msgid "reuse existing deltas"
 msgstr "�用已存在的 deltas"
 
-#: builtin/pack-objects.c:3773
+#: builtin/pack-objects.c:3902
 msgid "reuse existing objects"
 msgstr "�用已存在的物件"
 
-#: builtin/pack-objects.c:3775
+#: builtin/pack-objects.c:3904
 msgid "use OFS_DELTA objects"
 msgstr "使用 OFS_DELTA 物件"
 
-#: builtin/pack-objects.c:3777
+#: builtin/pack-objects.c:3906
 msgid "use threads when searching for best delta matches"
 msgstr "使用執行緒查詢最佳 delta 符�"
 
-#: builtin/pack-objects.c:3779
+#: builtin/pack-objects.c:3908
 msgid "do not create an empty pack output"
 msgstr "�建立空的包輸出"
 
-#: builtin/pack-objects.c:3781
+#: builtin/pack-objects.c:3910
 msgid "read revision arguments from standard input"
 msgstr "從標準輸入讀�版本號�數"
 
-#: builtin/pack-objects.c:3783
+#: builtin/pack-objects.c:3912
 msgid "limit the objects to those that are not yet packed"
 msgstr "�制那些尚未打包的物件"
 
-#: builtin/pack-objects.c:3786
+#: builtin/pack-objects.c:3915
 msgid "include objects reachable from any reference"
 msgstr "包括�以從任何引用存�到的物件"
 
-#: builtin/pack-objects.c:3789
+#: builtin/pack-objects.c:3918
 msgid "include objects referred by reflog entries"
 msgstr "包括被引用日誌引用到的物件"
 
-#: builtin/pack-objects.c:3792
+#: builtin/pack-objects.c:3921
 msgid "include objects referred to by the index"
 msgstr "包括被索引引用到的物件"
 
-#: builtin/pack-objects.c:3795
+#: builtin/pack-objects.c:3924
 msgid "read packs from stdin"
 msgstr "從標準輸入中讀�包"
 
-#: builtin/pack-objects.c:3797
+#: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
 msgstr "輸出包到標準輸出"
 
-#: builtin/pack-objects.c:3799
+#: builtin/pack-objects.c:3928
 msgid "include tag objects that refer to objects to be packed"
 msgstr "包括那些引用了待打包物件的標籤物件"
 
-#: builtin/pack-objects.c:3801
+#: builtin/pack-objects.c:3930
 msgid "keep unreachable objects"
 msgstr "維�無法�得的物件"
 
-#: builtin/pack-objects.c:3803
+#: builtin/pack-objects.c:3932
 msgid "pack loose unreachable objects"
 msgstr "打包鬆散的無法�得物件"
 
-#: builtin/pack-objects.c:3805
+#: builtin/pack-objects.c:3934
 msgid "unpack unreachable objects newer than <time>"
 msgstr "將比�供 <時間> 新的無法存�的物件解包"
 
-#: builtin/pack-objects.c:3808
+#: builtin/pack-objects.c:3937
 msgid "use the sparse reachability algorithm"
 msgstr "使用稀��以�得性演算法"
 
-#: builtin/pack-objects.c:3810
+#: builtin/pack-objects.c:3939
 msgid "create thin packs"
 msgstr "建立精簡包"
 
-#: builtin/pack-objects.c:3812
+#: builtin/pack-objects.c:3941
 msgid "create packs suitable for shallow fetches"
 msgstr "建立��淺複製版本庫�得的包"
 
-#: builtin/pack-objects.c:3814
+#: builtin/pack-objects.c:3943
 msgid "ignore packs that have companion .keep file"
 msgstr "忽略�有 .keep 檔案的包"
 
-#: builtin/pack-objects.c:3816
+#: builtin/pack-objects.c:3945
 msgid "ignore this pack"
 msgstr "忽略該 pack"
 
-#: builtin/pack-objects.c:3818
+#: builtin/pack-objects.c:3947
 msgid "pack compression level"
 msgstr "打包壓縮級別"
 
-#: builtin/pack-objects.c:3820
+#: builtin/pack-objects.c:3949
 msgid "do not hide commits by grafts"
 msgstr "顯示被移�隱�的�交"
 
-#: builtin/pack-objects.c:3822
+#: builtin/pack-objects.c:3951
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "使用 bitmap 索引（如果有的話）以�高物件計數時的速度"
 
-#: builtin/pack-objects.c:3824
+#: builtin/pack-objects.c:3953
 msgid "write a bitmap index together with the pack index"
 msgstr "在建立包索引的�時建立 bitmap 索引"
 
-#: builtin/pack-objects.c:3828
+#: builtin/pack-objects.c:3957
 msgid "write a bitmap index if possible"
 msgstr "如果�能，寫 bitmap 索引"
 
-#: builtin/pack-objects.c:3832
+#: builtin/pack-objects.c:3961
 msgid "handling for missing objects"
 msgstr "處��失的物件"
 
-#: builtin/pack-objects.c:3835
+#: builtin/pack-objects.c:3964
 msgid "do not pack objects in promisor packfiles"
 msgstr "��打包 promisor packfile 中的物件"
 
-#: builtin/pack-objects.c:3837
+#: builtin/pack-objects.c:3966
 msgid "respect islands during delta compression"
-msgstr "在增�壓縮時�考資料島"
+msgstr "在差異壓縮時尊�資料島"
 
-#: builtin/pack-objects.c:3839
+#: builtin/pack-objects.c:3968
 msgid "protocol"
 msgstr "通訊�定"
 
-#: builtin/pack-objects.c:3840
+#: builtin/pack-objects.c:3969
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr "排除任何設定�，使用此通訊�定的 uploadpack.blobpackfileuri"
 
-#: builtin/pack-objects.c:3873
+#: builtin/pack-objects.c:4002
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "增��深度 %d 太深了，強制為 %d"
 
-#: builtin/pack-objects.c:3878
+#: builtin/pack-objects.c:4007
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d"
 
-#: builtin/pack-objects.c:3934
+#: builtin/pack-objects.c:4063
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr "�能使用 --max-pack-size 來組建傳輸用的包檔案"
 
-#: builtin/pack-objects.c:3936
+#: builtin/pack-objects.c:4065
 msgid "minimum pack size limit is 1 MiB"
 msgstr "最�的包檔案大�是 1 MiB"
 
-#: builtin/pack-objects.c:3941
+#: builtin/pack-objects.c:4070
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin �能用於建立一個�索引包"
 
-#: builtin/pack-objects.c:3944
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable 和 --unpack-unreachable �相容"
-
-#: builtin/pack-objects.c:3950
+#: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "�能在沒有 --stdout 的情�下使用 --filter"
 
-#: builtin/pack-objects.c:3952
+#: builtin/pack-objects.c:4081
 msgid "cannot use --filter with --stdin-packs"
 msgstr "無法將 --filter � --stdin-packs ��使用"
 
-#: builtin/pack-objects.c:3956
+#: builtin/pack-objects.c:4085
 msgid "cannot use internal rev list with --stdin-packs"
 msgstr "無法將內部版本清單與 --stdin-packs ��使用"
 
-#: builtin/pack-objects.c:4015
+#: builtin/pack-objects.c:4144
 msgid "Enumerating objects"
 msgstr "枚舉物件"
 
-#: builtin/pack-objects.c:4052
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -18919,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:152
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "�能在��版本庫中執行清�動作"
 
@@ -18944,61 +18952,65 @@ msgstr "%s 的值無效：%s"
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<�項>] [<版本庫> [<引用�格>...]]"
 
-#: builtin/pull.c:123
+#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
 msgstr "控制�模組的�迴�得"
 
-#: builtin/pull.c:127
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "和�併相關的�項"
 
-#: builtin/pull.c:130
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "使用�定基底動作�代�併動作以套用修改"
 
-#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "�許快轉�"
 
-#: builtin/pull.c:167 parse-options.h:340
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "控制 pre-merge-commit 和 commit-msg 掛鉤的使用"
+
+#: builtin/pull.c:171 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr "在動作�後執行自動儲�和彈出儲�"
 
-#: builtin/pull.c:183
+#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "和�得相關的�數"
 
-#: builtin/pull.c:193
+#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "強制覆蓋本機分支"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
-msgstr "並發拉�的�模組的數�"
+msgstr "並行拉�的�模組數�"
 
-#: builtin/pull.c:317
+#: builtin/pull.c:321
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "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."
 msgstr "在您剛剛�得到的引用中沒有�定基底動作的候�。"
 
-#: builtin/pull.c:447
+#: builtin/pull.c:451
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "在您剛剛�得到的引用中沒有�併動作的候�。"
 
-#: 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."
-msgstr "通常這�味著您�供了一�用字元引用�格但未能和�端符�。"
+msgstr "這通常表示您有�供�用字元引用�格，但�端沒有符�項目。"
 
-#: builtin/pull.c:451
+#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -19008,41 +19020,42 @@ msgstr ""
 "您�求從�端 '%s' 拉�，但是未指定一個分支。因為這�是目�\n"
 "分支�設的�端版本庫，您必須在指令列中指定一個分支�。"
 
-#: builtin/pull.c:456 builtin/rebase.c:1248
+#: builtin/pull.c:460 builtin/rebase.c:951
 msgid "You are not currently on a branch."
 msgstr "您目��在一個分支上。"
 
-#: 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 "請指定您��定基底到哪一個分支。"
 
-#: 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 "請指定您��併哪一個分支。"
 
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "詳見 git-pull(1)。"
 
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
-#: builtin/rebase.c:1254
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
+#: builtin/rebase.c:957
 msgid "<remote>"
 msgstr "<�端>"
 
-#: 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 "<分支>"
 
-#: builtin/pull.c:471 builtin/rebase.c:1246
+#: builtin/pull.c:475 builtin/rebase.c:949
 msgid "There is no tracking information for the current branch."
 msgstr "目�分支沒有追蹤訊�。"
 
-#: 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 "如果您想�為此分支建立追蹤訊�，您�以執行："
 
-#: builtin/pull.c:485
+#: builtin/pull.c:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -19051,22 +19064,22 @@ msgstr ""
 "您的設定中指定��併�端的引用 '%s'，\n"
 "但是沒有�得到這個引用。"
 
-#: builtin/pull.c:596
+#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "無法存��交 %s"
 
-#: builtin/pull.c:902
+#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "為�定基底動作忽略 --verify-signatures"
 
-#: builtin/pull.c:930
+#: builtin/pull.c:969
 msgid ""
-"Pulling without specifying how to reconcile divergent branches is\n"
-"discouraged. You can squelch this message by running one of the following\n"
-"commands sometime before your next pull:\n"
+"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"
@@ -19076,32 +19089,32 @@ msgid ""
 "or --ff-only on the command line to override the configured default per\n"
 "invocation.\n"
 msgstr ""
-"�建議在尚未指定�離分支的�併策略的情�下拉�。\n"
-"您�以在下一次呼� pull 命令�執行下述命令\n"
-"以隱�此訊�：\n"
+"您有�離的分支，需�指定調和分支的方�。\n"
+"您�以在下次拉��執行以下任一命令\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"
+"  git config pull.ff only       # �進行快轉\n"
 "\n"
 "您�以將「git config�改�「git config --global�以設定\n"
 "所有版本庫的�設�好設定。也�以�次在命令列呼�\n"
 "pull 命令時傳� --rebase�--no-rebase 或 --ff-only 覆蓋\n"
 "設定的�設值。\n"
 
-#: builtin/pull.c:991
+#: builtin/pull.c:1046
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "更新尚未誕生的分支，變更新增至索引。"
 
-#: builtin/pull.c:995
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "�定基底�拉�"
 
-#: builtin/pull.c:996
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "請�交或儲�它們。"
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19111,7 +19124,7 @@ msgstr ""
 "fetch 更新了目�的分支。快轉您的工作�\n"
 "至�交 %s。"
 
-#: builtin/pull.c:1027
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19128,15 +19141,23 @@ msgstr ""
 "$ git reset --hard\n"
 "復原之�的狀態。"
 
-#: builtin/pull.c:1042
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr "無法將多個分支�併到空分支。"
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "無法�定基底到多個分支。"
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1104
+msgid "Cannot fast-forward to multiple branches."
+msgstr "無法快轉至多個分支。"
+
+#: builtin/pull.c:1119
+msgid "Need to specify how to reconcile divergent branches."
+msgstr "需�指定如何調和�離的分支。"
+
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "本機�模組中有修改，無法�定基底"
 
@@ -19198,7 +19219,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<�端分支�字>\n"
 
-#: builtin/push.c:194
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -19211,12 +19232,17 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:202
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "目�分支 %s 有多個上游分支，拒絕推�。"
 
-#: builtin/push.c:205
+#: builtin/push.c:217
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr "您沒有為推�指定任何引用�格，並且 push.default 為 \"nothing\"。"
+
+#: builtin/push.c:243
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -19226,12 +19252,7 @@ msgstr ""
 "您正推�至�端 '%s'（其並�目�分支 '%s' 的上游），\n"
 "而沒有告訴我�推�什麼�更新哪個�端分支。"
 
-#: builtin/push.c:260
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "您沒有為推�指定任何引用�格，並且 push.default 為 \"nothing\"。"
-
-#: builtin/push.c:267
+#: builtin/push.c:258
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -19242,7 +19263,7 @@ msgstr ""
 "�次推��，先與�端變更�併（如 'git pull ...'）。詳見\n"
 "'git push --help' 中的 'Note about fast-forwards' �節。"
 
-#: builtin/push.c:273
+#: builtin/push.c:264
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -19250,10 +19271,10 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 "更新被拒絕，因為推�的一個分支的最新�交�後於其�應的�端分支。\n"
-"檢出該分支並整��端變更（如 'git pull ...'），然後�推�。詳見\n"
+"簽出該分支並整��端變更（如 'git pull ...'），然後�推�。詳見\n"
 "'git push --help' 中的 'Note about fast-forwards' �節。"
 
-#: builtin/push.c:279
+#: builtin/push.c:270
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -19266,11 +19287,11 @@ msgstr ""
 "（如 'git pull ...'）。\n"
 "詳見 'git push --help' 中的 'Note about fast-forwards' �節。"
 
-#: builtin/push.c:286
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "更新被拒絕，因為該標籤在�端已經存在。"
 
-#: builtin/push.c:289
+#: builtin/push.c:280
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -19279,7 +19300,7 @@ msgstr ""
 "如果�使用 '--force' �數，您�能更新一個指���交物件的�端引用，\n"
 "也�能更新�端引用讓其指�一個��交物件。\n"
 
-#: builtin/push.c:294
+#: builtin/push.c:285
 msgid ""
 "Updates were rejected because the tip of the remote-tracking\n"
 "branch has been updated since the last checkout. You may want\n"
@@ -19290,103 +19311,99 @@ msgstr ""
 "您�能會希望先將這些變更整�至本地（例如：‘git pull …’)\n"
 "最後�強制更新。\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "推�到 %s\n"
 
-#: builtin/push.c:371
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "推�一些引用到 '%s' 失敗"
 
-#: builtin/push.c:553
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "版本庫"
 
-#: builtin/push.c:554 builtin/send-pack.c:189
+#: builtin/push.c:545 builtin/send-pack.c:193
 msgid "push all refs"
 msgstr "推�所有引用"
 
-#: builtin/push.c:555 builtin/send-pack.c:191
+#: builtin/push.c:546 builtin/send-pack.c:195
 msgid "mirror all refs"
 msgstr "��所有引用"
 
-#: builtin/push.c:557
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "刪除引用"
 
-#: builtin/push.c:558
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "推�標籤（�能使用 --all or --mirror）"
 
-#: builtin/push.c:561 builtin/send-pack.c:192
+#: builtin/push.c:552 builtin/send-pack.c:196
 msgid "force updates"
 msgstr "強制更新"
 
-#: builtin/push.c:562 builtin/send-pack.c:204
+#: builtin/push.c:553 builtin/send-pack.c:208
 msgid "<refname>:<expect>"
 msgstr "<引用�>:<期望值>"
 
-#: builtin/push.c:563 builtin/send-pack.c:205
+#: builtin/push.c:554 builtin/send-pack.c:209
 msgid "require old value of ref to be at this value"
 msgstr "�求引用舊的�值為設定值"
 
-#: builtin/push.c:566 builtin/send-pack.c:208
+#: builtin/push.c:557 builtin/send-pack.c:212
 msgid "require remote updates to be integrated locally"
 msgstr "需�將�端更新整�進本地"
 
-#: builtin/push.c:569
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "控制�模組的�迴推�"
 
-#: builtin/push.c:570 builtin/send-pack.c:199
+#: builtin/push.c:561 builtin/send-pack.c:203
 msgid "use thin pack"
 msgstr "使用精簡打包"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
-#: builtin/send-pack.c:187
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
+#: builtin/send-pack.c:191
 msgid "receive pack program"
 msgstr "接收包程�"
 
-#: builtin/push.c:573
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "設定 git pull/status 的上游"
 
-#: builtin/push.c:576
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "清除本機刪除的引用"
 
-#: builtin/push.c:578
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "繞� pre-push 掛鉤"
 
-#: builtin/push.c:579
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "推�缺少但有關的標籤"
 
-#: builtin/push.c:581 builtin/send-pack.c:193
+#: builtin/push.c:572 builtin/send-pack.c:197
 msgid "GPG sign the push"
 msgstr "用 GPG 為推�簽�"
 
-#: builtin/push.c:583 builtin/send-pack.c:200
+#: builtin/push.c:574 builtin/send-pack.c:204
 msgid "request atomic transaction on remote side"
-msgstr "需��端支�原�事務"
-
-#: builtin/push.c:601
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete 與 --all�--mirror � --tags �相容"
+msgstr "需��端支� atomic 事務"
 
-#: builtin/push.c:603
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete 未接任何引用沒有�義"
 
-#: builtin/push.c:623
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "壞的版本庫 '%s'"
 
-#: builtin/push.c:624
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -19398,8 +19415,8 @@ msgid ""
 "\n"
 "    git push <name>\n"
 msgstr ""
-"沒有設定推�目標。\n"
-"或��指令列指定 URL，或用下�指令設定一個�端版本庫\n"
+"沒有設定推�目的地。\n"
+"請��命令列指定 URL，或者用下�指令設定�端版本庫\n"
 "\n"
 "    git remote add <�稱> <��>\n"
 "\n"
@@ -19407,27 +19424,15 @@ msgstr ""
 "\n"
 "    git push <�稱>\n"
 
-#: builtin/push.c:639
-msgid "--all and --tags are incompatible"
-msgstr "--all 和 --tags �相容"
-
-#: builtin/push.c:641
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all �能和引用�格�時使用"
 
-#: builtin/push.c:645
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror 和 --tags �相容"
-
-#: builtin/push.c:647
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror �能和引用�格�時使用"
 
-#: builtin/push.c:650
-msgid "--all and --mirror are incompatible"
-msgstr "--all 和 --mirror �相容"
-
-#: builtin/push.c:657
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "推��項�能有�行符號"
 
@@ -19479,82 +19484,82 @@ msgstr "需�兩個�交範�"
 #: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<�綴>) [-"
-"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<檔案>] (--empty | <樹狀物件1> [<樹狀物件2> [<樹狀物件3>]])"
+"u | -i]] [--no-sparse-checkout] [--index-output=<檔案>] (--empty | <樹狀物件"
+"1> [<樹狀物件2> [<樹狀物件3>]])"
 
-#: builtin/read-tree.c:124
+#: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
 msgstr "將索引�果寫入 <檔案>"
 
-#: builtin/read-tree.c:127
+#: builtin/read-tree.c:119
 msgid "only empty the index"
 msgstr "�是清空索引"
 
-#: builtin/read-tree.c:129
+#: builtin/read-tree.c:121
 msgid "Merging"
 msgstr "�併"
 
-#: builtin/read-tree.c:131
+#: builtin/read-tree.c:123
 msgid "perform a merge in addition to a read"
 msgstr "讀�之餘�執行一個�併"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:125
 msgid "3-way merge if no file level merging required"
 msgstr "如果沒有檔案級�併需�，執行三方�併"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:127
 msgid "3-way merge in presence of adds and removes"
 msgstr "存在新增和刪除時，也執行三方�併"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:129
 msgid "same as -m, but discard unmerged entries"
 msgstr "類似於 -m，但�棄未�併的�目"
 
-#: builtin/read-tree.c:138
+#: builtin/read-tree.c:130
 msgid "<subdirectory>/"
 msgstr "<�目錄>/"
 
-#: builtin/read-tree.c:139
+#: builtin/read-tree.c:131
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "讀�樹狀物件到索引的 <�目錄>/ 下"
 
-#: builtin/read-tree.c:142
+#: builtin/read-tree.c:134
 msgid "update working tree with merge result"
 msgstr "用�併的�果更新工作�"
 
-#: builtin/read-tree.c:144
+#: builtin/read-tree.c:136
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:137
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "�許忽略檔案中設定的檔案�以被覆蓋"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:140
 msgid "don't check the working tree after merging"
 msgstr "�併後�檢查工作�"
 
-#: builtin/read-tree.c:149
+#: builtin/read-tree.c:141
 msgid "don't update the index or the work tree"
 msgstr "�更新索引�和工作�"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:143
 msgid "skip applying sparse checkout filter"
-msgstr "略�套用稀�檢出�濾器"
+msgstr "略�套用稀�簽出�濾器"
 
-#: builtin/read-tree.c:153
+#: builtin/read-tree.c:145
 msgid "debug unpack-trees"
 msgstr "除錯 unpack-trees"
 
-#: builtin/read-tree.c:157
+#: builtin/read-tree.c:149
 msgid "suppress feedback messages"
 msgstr "抑制回饋訊�"
 
-#: builtin/read-tree.c:188
+#: builtin/read-tree.c:183
 msgid "You need to resolve your current index first"
 msgstr "您需�先解決目�索引的��"
 
@@ -19576,193 +19581,44 @@ msgstr ""
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
-#, c-format
-msgid "unusable todo list: '%s'"
-msgstr "��用的待辦列表：'%s'"
-
-#: builtin/rebase.c:311
+#: builtin/rebase.c:230
 #, c-format
 msgid "could not create temporary %s"
 msgstr "無法建立暫時的 %s"
 
-#: builtin/rebase.c:317
+#: builtin/rebase.c:236
 msgid "could not mark as interactive"
 msgstr "無法標記為互動�"
 
-#: builtin/rebase.c:370
+#: builtin/rebase.c:289
 msgid "could not generate todo list"
 msgstr "無法生�待辦列表"
 
-#: builtin/rebase.c:412
+#: builtin/rebase.c:331
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "使用 --upstream 或 --onto 必須�供一個基礎�交"
 
-#: builtin/rebase.c:481
-msgid "git rebase--interactive [<options>]"
-msgstr "git rebase--interactive [<�項>]"
-
-#: builtin/rebase.c:494 builtin/rebase.c:1389
-msgid "keep commits which start empty"
-msgstr "�留開頭是空白的�交"
-
-#: builtin/rebase.c:498 builtin/revert.c:128
-msgid "allow commits with empty messages"
-msgstr "�許�交說明為空"
-
-#: builtin/rebase.c:500
-msgid "rebase merge commits"
-msgstr "��併�交�定基底"
-
-#: builtin/rebase.c:502
-msgid "keep original branch points of cousins"
-msgstr "��兄弟�交的原始分支點"
-
-#: builtin/rebase.c:504
-msgid "move commits that begin with squash!/fixup!"
-msgstr "移動以 squash!/fixup! 開頭的�交"
-
-#: builtin/rebase.c:505
-msgid "sign commits"
-msgstr "簽��交"
-
-#: builtin/rebase.c:507 builtin/rebase.c:1328
-msgid "display a diffstat of what changed upstream"
-msgstr "顯示上游變化的差異統計"
-
-#: builtin/rebase.c:509
-msgid "continue rebase"
-msgstr "繼續�定基底"
-
-#: builtin/rebase.c:511
-msgid "skip commit"
-msgstr "略��交"
-
-#: builtin/rebase.c:512
-msgid "edit the todo list"
-msgstr "�定基底待辦列表"
-
-#: builtin/rebase.c:514
-msgid "show the current patch"
-msgstr "顯示目�修補檔"
-
-#: builtin/rebase.c:517
-msgid "shorten commit ids in the todo list"
-msgstr "縮短待辦列表中的�交號"
-
-#: builtin/rebase.c:519
-msgid "expand commit ids in the todo list"
-msgstr "擴展待辦列表中的�交號"
-
-#: builtin/rebase.c:521
-msgid "check the todo list"
-msgstr "檢查待辦列表"
-
-#: builtin/rebase.c:523
-msgid "rearrange fixup/squash lines"
-msgstr "�新排列 fixup/squash 行"
-
-#: builtin/rebase.c:525
-msgid "insert exec commands in todo list"
-msgstr "在待辦列表中�入 exec 執行指令"
-
-#: builtin/rebase.c:526
-msgid "onto"
-msgstr "onto"
-
-#: builtin/rebase.c:529
-msgid "restrict-revision"
-msgstr "restrict-revision"
-
-#: builtin/rebase.c:529
-msgid "restrict revision"
-msgstr "�制版本"
-
-#: builtin/rebase.c:531
-msgid "squash-onto"
-msgstr "squash-onto"
-
-#: builtin/rebase.c:532
-msgid "squash onto"
-msgstr "squash onto"
-
-#: builtin/rebase.c:534
-msgid "the upstream commit"
-msgstr "上游�交"
-
-#: builtin/rebase.c:536
-msgid "head-name"
-msgstr "head-name"
-
-#: builtin/rebase.c:536
-msgid "head name"
-msgstr "head �稱"
-
-#: builtin/rebase.c:541
-msgid "rebase strategy"
-msgstr "�定基底策略"
-
-#: builtin/rebase.c:542
-msgid "strategy-opts"
-msgstr "strategy-opts"
-
-#: builtin/rebase.c:543
-msgid "strategy options"
-msgstr "策略�項"
-
-#: builtin/rebase.c:544
-msgid "switch-to"
-msgstr "切�到"
-
-#: builtin/rebase.c:545
-msgid "the branch or commit to checkout"
-msgstr "�檢出的分支或�交"
-
-#: builtin/rebase.c:546
-msgid "onto-name"
-msgstr "onto-name"
-
-#: builtin/rebase.c:546
-msgid "onto name"
-msgstr "onto name"
-
-#: builtin/rebase.c:547
-msgid "cmd"
-msgstr "cmd"
-
-#: builtin/rebase.c:547
-msgid "the command to run"
-msgstr "�執行的指令"
-
-#: builtin/rebase.c:550 builtin/rebase.c:1422
-msgid "automatically re-schedule any `exec` that fails"
-msgstr "自動�新安排任何失敗的 `exec`"
-
-#: builtin/rebase.c:566
-msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr "�使用 --rebase-merges，則 --[no-]rebase-cousins 沒有效果"
-
-#: builtin/rebase.c:582
+#: builtin/rebase.c:390
 #, c-format
 msgid "%s requires the merge backend"
 msgstr "%s 需��併後端"
 
-#: builtin/rebase.c:625
+#: builtin/rebase.c:432
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "無法�得 'onto'：'%s'"
 
-#: builtin/rebase.c:642
+#: builtin/rebase.c:449
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "無效的原始 head：'%s'"
 
-#: builtin/rebase.c:667
+#: builtin/rebase.c:474
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "忽略無效的 allow_rerere_autoupdate：'%s'"
 
-#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:597
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -19775,7 +19631,7 @@ msgstr ""
 "\"git rebase --skip\" 指令略�這個�交。如果想�終止執行並回到\n"
 "\"git rebase\" 執行之�的狀態，執行 \"git rebase --abort\"。"
 
-#: builtin/rebase.c:896
+#: builtin/rebase.c:680
 #, c-format
 msgid ""
 "\n"
@@ -19793,14 +19649,14 @@ msgstr ""
 "\n"
 "因此 git 無法�其�定基底。"
 
-#: builtin/rebase.c:1222
+#: builtin/rebase.c:925
 #, c-format
 msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
 "\"."
 msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"�\"keep\" 跟 \"ask\"。"
 
-#: builtin/rebase.c:1240
+#: builtin/rebase.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -19817,7 +19673,7 @@ msgstr ""
 "    git rebase '<branch>'\n"
 "\n"
 
-#: builtin/rebase.c:1256
+#: builtin/rebase.c:959
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -19830,181 +19686,180 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<branch> %s\n"
 "\n"
 
-#: builtin/rebase.c:1286
+#: builtin/rebase.c:989
 msgid "exec commands cannot contain newlines"
 msgstr "exec 指令�能包��行符號"
 
-#: builtin/rebase.c:1290
+#: builtin/rebase.c:993
 msgid "empty exec command"
 msgstr "空的 exec 指令"
 
-#: builtin/rebase.c:1319
+#: builtin/rebase.c:1023
 msgid "rebase onto given branch instead of upstream"
 msgstr "�定基底到�供的分支而�上游"
 
-#: builtin/rebase.c:1321
+#: builtin/rebase.c:1025
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "使用上游和分支的�併基礎�為目�基礎"
 
-#: builtin/rebase.c:1323
+#: builtin/rebase.c:1027
 msgid "allow pre-rebase hook to run"
 msgstr "�許執行 pre-rebase 掛鉤"
 
-#: builtin/rebase.c:1325
+#: builtin/rebase.c:1029
 msgid "be quiet. implies --no-stat"
 msgstr "安�。暗示 --no-stat"
 
-#: builtin/rebase.c:1331
+#: builtin/rebase.c:1032
+msgid "display a diffstat of what changed upstream"
+msgstr "顯示上游變化的差異統計"
+
+#: builtin/rebase.c:1035
 msgid "do not show diffstat of what changed upstream"
 msgstr "�顯示上游變化的差異統計"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1038
 msgid "add a Signed-off-by trailer to each commit"
 msgstr "在�個�交�尾加入 Signed-off-by"
 
-#: builtin/rebase.c:1337
+#: builtin/rebase.c:1041
 msgid "make committer date match author date"
 msgstr "使�交日期與製作日期相符�"
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1043
 msgid "ignore author date and use current date"
 msgstr "忽略製作日期而使用日�日期"
 
-#: builtin/rebase.c:1341
+#: builtin/rebase.c:1045
 msgid "synonym of --reset-author-date"
 msgstr "和 --reset-author-date �義"
 
-#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#: builtin/rebase.c:1047 builtin/rebase.c:1051
 msgid "passed to 'git apply'"
 msgstr "傳�給 'git apply'"
 
-#: builtin/rebase.c:1345
+#: builtin/rebase.c:1049
 msgid "ignore changes in whitespace"
 msgstr "忽略空白字元中的變更"
 
-#: builtin/rebase.c:1349 builtin/rebase.c:1352
+#: builtin/rebase.c:1053 builtin/rebase.c:1056
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "��所有�交，�使未修改"
 
-#: builtin/rebase.c:1354
+#: builtin/rebase.c:1058
 msgid "continue"
 msgstr "繼續"
 
-#: builtin/rebase.c:1357
+#: builtin/rebase.c:1061
 msgid "skip current patch and continue"
 msgstr "略�目�修補檔並繼續"
 
 #  譯者：請維��導空格
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1063
 msgid "abort and check out the original branch"
-msgstr "終止並檢出原有分支"
+msgstr "終止並簽出原有分支"
 
-#: builtin/rebase.c:1362
+#: builtin/rebase.c:1066
 msgid "abort but keep HEAD where it is"
 msgstr "終止但�� HEAD �變"
 
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1067
 msgid "edit the todo list during an interactive rebase"
 msgstr "在互動��定基底中編輯待辦列表"
 
-#: builtin/rebase.c:1366
+#: builtin/rebase.c:1070
 msgid "show the patch file being applied or merged"
 msgstr "顯示正在套用或�併的修補檔案"
 
-#: builtin/rebase.c:1369
+#: builtin/rebase.c:1073
 msgid "use apply strategies to rebase"
 msgstr "使用套用策略進行�定基底"
 
-#: builtin/rebase.c:1373
+#: builtin/rebase.c:1077
 msgid "use merging strategies to rebase"
 msgstr "使用�併策略進行�定基底"
 
-#: builtin/rebase.c:1377
+#: builtin/rebase.c:1081
 msgid "let the user edit the list of commits to rebase"
 msgstr "讓使用者編輯��定基底的�交列表"
 
-#: builtin/rebase.c:1381
+#: builtin/rebase.c:1085
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "（已棄用）嘗試�建�併�交而�忽略它們"
 
-#: builtin/rebase.c:1386
+#: builtin/rebase.c:1090
 msgid "how to handle commits that become empty"
 msgstr "處�空白�交的方�"
 
-#: builtin/rebase.c:1393
+#: builtin/rebase.c:1093
+msgid "keep commits which start empty"
+msgstr "�留開頭是空白的�交"
+
+#: builtin/rebase.c:1097
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "在 -i 互動模�下，移動以 squash!/fixup! 開頭的�交"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1104
 msgid "add exec lines after each commit of the editable list"
 msgstr "�編輯列表的�一個�交下�增加一行 exec"
 
-#: builtin/rebase.c:1404
+#: builtin/rebase.c:1108
 msgid "allow rebasing commits with empty messages"
 msgstr "�許��空�交說明的�交�定基底"
 
-#: builtin/rebase.c:1408
+#: builtin/rebase.c:1112
 msgid "try to rebase merges instead of skipping them"
 msgstr "嘗試��併�交�定基底而�是忽略它們"
 
-#: builtin/rebase.c:1411
+#: builtin/rebase.c:1115
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "使用 'merge-base --fork-point' 來最佳化上游"
 
-#: builtin/rebase.c:1413
+#: builtin/rebase.c:1117
 msgid "use the given merge strategy"
 msgstr "使用�供的�併策略"
 
-#: builtin/rebase.c:1415 builtin/revert.c:115
+#: builtin/rebase.c:1119 builtin/revert.c:115
 msgid "option"
 msgstr "�項"
 
-#: builtin/rebase.c:1416
+#: builtin/rebase.c:1120
 msgid "pass the argument through to the merge strategy"
 msgstr "將�數傳�給�併策略"
 
-#: builtin/rebase.c:1419
+#: builtin/rebase.c:1123
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "將所有�以�得的�交�定基底到根�交"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1126
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "自動�新安排任何失敗的 `exec`"
+
+#: builtin/rebase.c:1128
 msgid "apply all changes, even those already present upstream"
 msgstr "�使已�供上游，�套用所有變更"
 
-#: builtin/rebase.c:1442
+#: builtin/rebase.c:1149
 msgid "It looks like 'git am' is in progress. Cannot rebase."
-msgstr "看起來 'git-am' 正在執行中。無法�定基底。"
-
-#: builtin/rebase.c:1483
-msgid ""
-"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr "git rebase --preserve-merges 被棄用。用 --rebase-merges 代替。"
-
-#: builtin/rebase.c:1488
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "�能將 '--keep-base' 和 '--onto' 組�使用"
-
-#: builtin/rebase.c:1490
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "�能將 '--keep-base' 和 '--root' 組�使用"
+msgstr "看起來 'git am' 正在執行中。無法�定基底。"
 
-#: builtin/rebase.c:1494
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "�能將 '--root' 和 '--fork-point' ��使用"
+#: builtin/rebase.c:1180
+msgid "--preserve-merges was replaced by --rebase-merges"
+msgstr "--preserve-merges 已經被 --rebase-merges �代"
 
-#: builtin/rebase.c:1497
+#: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "沒有正在進行的�定基底？"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1206
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "動作 --edit-todo �能用在互動��定基底�程中。"
 
-#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
+#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "�能讀� HEAD"
 
-#: builtin/rebase.c:1536
+#: builtin/rebase.c:1241
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -20012,16 +19867,16 @@ msgstr ""
 "您必須編輯所有的�併��，然後�� git add\n"
 "指令將它們標記為已解決"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1260
 msgid "could not discard worktree changes"
 msgstr "無法�棄工作�變更"
 
-#: builtin/rebase.c:1574
+#: builtin/rebase.c:1279
 #, c-format
 msgid "could not move back to %s"
 msgstr "無法移回 %s"
 
-#: builtin/rebase.c:1620
+#: builtin/rebase.c:1325
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -20040,141 +19895,131 @@ msgstr ""
 "\t%s\n"
 "然後��新執行。 為���失��資料，我已經�止目�動作。\n"
 
-#: builtin/rebase.c:1648
+#: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
 msgstr "開關 `C' 期望一個數字值"
 
-#: builtin/rebase.c:1690
+#: builtin/rebase.c:1395
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "未知模�：%s"
 
-#: builtin/rebase.c:1729
+#: builtin/rebase.c:1434
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy 需� --merge 或 --interactive"
 
-#: builtin/rebase.c:1759
-msgid "cannot combine apply options with merge options"
-msgstr "�能將 apply 套用�項與 merge �併�項一起使用"
+#: builtin/rebase.c:1463
+msgid "apply options and merge options cannot be used together"
+msgstr "套用�項與�併�項�得�時使用"
 
-#: builtin/rebase.c:1772
+#: builtin/rebase.c:1476
 #, c-format
 msgid "Unknown rebase backend: %s"
 msgstr "未知 rebase 後端：%s"
 
-#: builtin/rebase.c:1802
+#: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec 需� --exec 或 --interactive"
 
-#: builtin/rebase.c:1822
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "�能將 '--preserve-merges' 和 '--rebase-merges' �時使用"
-
-#: builtin/rebase.c:1826
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr ""
-"錯誤：�能將 '--preserve-merges' 和 '--reschedule-failed-exec' �時使用"
-
-#: builtin/rebase.c:1850
+#: builtin/rebase.c:1536
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "無效的上游 '%s'"
 
-#: builtin/rebase.c:1856
+#: builtin/rebase.c:1542
 msgid "Could not create new root commit"
 msgstr "�能建立新的根�交"
 
-#: builtin/rebase.c:1882
+#: builtin/rebase.c:1568
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "'%s'：�需�與分支的一個�併基礎"
 
-#: builtin/rebase.c:1885
+#: builtin/rebase.c:1571
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s'：�需�一個�併基礎"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1580
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "沒有指�一個有效的�交 '%s'"
 
-#: builtin/rebase.c:1921
+#: builtin/rebase.c:1607
 #, c-format
-msgid "fatal: no such branch/commit '%s'"
-msgstr "致命錯誤：無此分支/�交 '%s'"
+msgid "no such branch/commit '%s'"
+msgstr "沒有此分支/�交 '%s'"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:2415
+#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "沒有這樣的引用：%s"
 
-#: builtin/rebase.c:1940
+#: builtin/rebase.c:1629
 msgid "Could not resolve HEAD to a revision"
 msgstr "無法將 HEAD 解�為一個版本"
 
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1650
 msgid "Please commit or stash them."
 msgstr "請�交或儲�修改。"
 
-#: builtin/rebase.c:1997
+#: builtin/rebase.c:1686
 #, c-format
 msgid "could not switch to %s"
 msgstr "無法切�到 %s"
 
-#: builtin/rebase.c:2008
+#: builtin/rebase.c:1697
 msgid "HEAD is up to date."
 msgstr "HEAD 是最新的。"
 
-#: builtin/rebase.c:2010
+#: builtin/rebase.c:1699
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "目�分支 %s 是最新的。\n"
 
-#: builtin/rebase.c:2018
+#: builtin/rebase.c:1707
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD 是最新的，強制�定基底。"
 
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1709
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "目�分支 %s 是最新的，強制�定基底。\n"
 
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1717
 msgid "The pre-rebase hook refused to rebase."
 msgstr "pre-rebase 掛鉤拒絕了�定基底動作。"
 
-#: builtin/rebase.c:2035
+#: builtin/rebase.c:1724
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "到 %s 的變更：\n"
 
-#: builtin/rebase.c:2038
+#: builtin/rebase.c:1727
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "從 %s 到 %s 的變更：\n"
 
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:1752
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr "首先，還原開頭指標以便在其上�放您的工作...\n"
 
-#: builtin/rebase.c:2072
+#: builtin/rebase.c:1761
 msgid "Could not detach HEAD"
 msgstr "無法分離開頭指標"
 
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:1770
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "快轉 %s 到 %s。\n"
 
-#: builtin/receive-pack.c:34
+#: builtin/receive-pack.c:35
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <版本庫目錄>"
 
-#: builtin/receive-pack.c:1276
+#: 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"
@@ -20200,7 +20045,7 @@ msgstr ""
 "若��鎖此訊�且���設行為，設定 'receive.denyCurrentBranch'\n"
 "設定變數為 'refuse'。"
 
-#: builtin/receive-pack.c:1296
+#: 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"
@@ -20211,7 +20056,7 @@ msgid ""
 "\n"
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
-"�設�止刪除目�分支，因為下一次 'git clone' 將�會檢出任何檔案，\n"
+"�設�止刪除目�分支，因為下一次 'git clone' 將�會簽出任何檔案，\n"
 "導致困惑。\n"
 "\n"
 "您�以在�端版本庫中設定 'receive.denyDeleteCurrent' 設定變數為\n"
@@ -20219,13 +20064,13 @@ msgstr ""
 "\n"
 "若��鎖此訊�，您�以設定它為 'refuse'。"
 
-#: builtin/receive-pack.c:2479
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "�默模�"
 
-#: builtin/receive-pack.c:2493
-msgid "You must specify a directory."
-msgstr "您必須指定一個目錄。"
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "您必須指定目錄"
 
 #: builtin/reflog.c:17
 msgid ""
@@ -20249,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:699
+#: 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 ]"
 
@@ -20373,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"
@@ -20418,7 +20268,7 @@ msgstr "指定一個 master 分支並使用 --mirror �項沒有�義"
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "指定�追蹤的分支�在與�得���時使用�有�義"
 
-#: builtin/remote.c:195 builtin/remote.c:700
+#: builtin/remote.c:195 builtin/remote.c:705
 #, c-format
 msgid "remote %s already exists."
 msgstr "�端 %s 已經存在。"
@@ -20428,25 +20278,30 @@ msgstr "�端 %s 已經存在。"
 msgid "Could not setup master '%s'"
 msgstr "無法設定 master '%s'"
 
-#: builtin/remote.c:355
+#: builtin/remote.c:322
+#, c-format
+msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
+msgstr "branch.%s.rebase=%s 未處�。�設� 'true'"
+
+#: builtin/remote.c:366
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "無法得到引用�格 %s 的�得列表"
 
-#: builtin/remote.c:454 builtin/remote.c:462
+#: builtin/remote.c:460 builtin/remote.c:468
 msgid "(matching)"
 msgstr "（符�）"
 
-#: builtin/remote.c:466
+#: builtin/remote.c:472
 msgid "(delete)"
 msgstr "（刪除）"
 
-#: builtin/remote.c:655
+#: builtin/remote.c:660
 #, c-format
 msgid "could not set '%s'"
 msgstr "無法設定 '%s'"
 
-#: builtin/remote.c:660
+#: builtin/remote.c:665
 #, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
@@ -20457,17 +20312,17 @@ msgstr ""
 "\t%s:%d\n"
 "�命���存在的�端分支 '%s'"
 
-#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "沒有此�端版本庫：'%s'"
 
-#: builtin/remote.c:710
+#: builtin/remote.c:715
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "�能�新命�設定�節 '%s' 到 '%s'"
 
-#: builtin/remote.c:730
+#: builtin/remote.c:735
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -20478,17 +20333,17 @@ msgstr ""
 "\t%s\n"
 "\t如果必�請手動更新設定。"
 
-#: builtin/remote.c:770
+#: builtin/remote.c:775
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "刪除 '%s' 失敗"
 
-#: builtin/remote.c:804
+#: builtin/remote.c:809
 #, c-format
 msgid "creating '%s' failed"
 msgstr "建立 '%s' 失敗"
 
-#: builtin/remote.c:882
+#: builtin/remote.c:887
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -20497,118 +20352,118 @@ msgid_plural ""
 "to delete them, use:"
 msgstr[0] "注�：ref/remotes 層級之外的一個分支未被移除。�刪除它，使用："
 
-#: builtin/remote.c:896
+#: builtin/remote.c:901
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "�能移除設定�節 '%s'"
 
-#: builtin/remote.c:999
+#: builtin/remote.c:1009
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " 新的（下一次�得將儲存於 remotes/%s）"
 
-#: builtin/remote.c:1002
+#: builtin/remote.c:1012
 msgid " tracked"
 msgstr " 已追蹤"
 
-#: builtin/remote.c:1004
+#: builtin/remote.c:1014
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " �時（使用 'git remote prune' 來移除）"
 
-#: builtin/remote.c:1006
+#: builtin/remote.c:1016
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:1047
+#: builtin/remote.c:1057
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "無效的 branch.%s.merge，�能�定基底到一個以上的分支"
 
-#: builtin/remote.c:1056
+#: builtin/remote.c:1066
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "互動��定基底到�端 %s"
 
-#: builtin/remote.c:1058
+#: builtin/remote.c:1068
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "互動��定基底（��併�交）到�端 %s"
 
-#: builtin/remote.c:1061
+#: builtin/remote.c:1071
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "�定基底到�端 %s"
 
-#: builtin/remote.c:1065
+#: builtin/remote.c:1075
 #, c-format
 msgid " merges with remote %s"
 msgstr " 與�端 %s �併"
 
-#: builtin/remote.c:1068
+#: builtin/remote.c:1078
 #, c-format
 msgid "merges with remote %s"
 msgstr "與�端 %s �併"
 
-#: builtin/remote.c:1071
+#: builtin/remote.c:1081
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    以�和�端 %s\n"
 
-#: builtin/remote.c:1114
+#: builtin/remote.c:1124
 msgid "create"
 msgstr "建立"
 
-#: builtin/remote.c:1117
+#: builtin/remote.c:1127
 msgid "delete"
 msgstr "刪除"
 
-#: builtin/remote.c:1121
+#: builtin/remote.c:1131
 msgid "up to date"
 msgstr "最新"
 
-#: builtin/remote.c:1124
+#: builtin/remote.c:1134
 msgid "fast-forwardable"
 msgstr "�快轉"
 
-#: builtin/remote.c:1127
+#: builtin/remote.c:1137
 msgid "local out of date"
 msgstr "本機已�時"
 
-#: builtin/remote.c:1134
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s 強制推�至 %-*s (%s)"
 
-#: builtin/remote.c:1137
+#: builtin/remote.c:1147
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s 推�至 %-*s (%s)"
 
-#: builtin/remote.c:1141
+#: builtin/remote.c:1151
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s 強制推�至 %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1154
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s 推�至 %s"
 
-#: builtin/remote.c:1212
+#: builtin/remote.c:1222
 msgid "do not query remotes"
 msgstr "�查詢�端"
 
-#: builtin/remote.c:1239
+#: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
 msgstr "* �端 %s"
 
-#: builtin/remote.c:1240
+#: builtin/remote.c:1244
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  �得��：%s"
 
-#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
 msgid "(no URL)"
 msgstr "(ç„¡ URL)"
 
@@ -20616,185 +20471,189 @@ msgstr "(ç„¡ URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  推���：%s"
 
-#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD 分支：%s"
 
 #  譯者：中文字串拼接，�刪除�導空格
-#: builtin/remote.c:1259
+#: builtin/remote.c:1263
 msgid "(not queried)"
 msgstr "（未查詢）"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1265
 msgid "(unknown)"
 msgstr "（未知）"
 
-#: builtin/remote.c:1265
+#: builtin/remote.c:1269
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD 分支（�端 HEAD 模糊，�能是下列中的一個）：\n"
 
-#: builtin/remote.c:1277
+#: builtin/remote.c:1281
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  �端分支：%s"
 
 #  譯者：中文字串拼接，�刪除�導空格
-#: builtin/remote.c:1280 builtin/remote.c:1306
+#: builtin/remote.c:1284 builtin/remote.c:1310
 msgid " (status not queried)"
-msgstr "（狀態未查詢）"
+msgstr " （狀態未查詢）"
 
-#: builtin/remote.c:1289
+#: builtin/remote.c:1293
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  為 'git pull' 設定的本機分支："
 
-#: builtin/remote.c:1297
+#: builtin/remote.c:1301
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  本機引用將在 'git push' 時被��"
 
-#: builtin/remote.c:1303
+#: builtin/remote.c:1307
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  為 'git push' 設定的本機引用%s："
 
-#: builtin/remote.c:1324
+#: builtin/remote.c:1328
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "根據�端設定 refs/remotes/<�稱>/HEAD"
 
-#: builtin/remote.c:1326
+#: builtin/remote.c:1330
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "刪除 refs/remotes/<�稱>/HEAD"
 
-#: builtin/remote.c:1341
+#: builtin/remote.c:1344
 msgid "Cannot determine remote HEAD"
 msgstr "無法確定�端 HEAD"
 
-#: builtin/remote.c:1343
+#: builtin/remote.c:1346
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "多個�端 HEAD 分支。請明確地�擇一個用指令："
 
-#: builtin/remote.c:1353
+#: builtin/remote.c:1356
 #, c-format
 msgid "Could not delete %s"
 msgstr "無法刪除 %s"
 
-#: builtin/remote.c:1361
+#: builtin/remote.c:1364
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "�是一個有效引用：%s"
 
-#: builtin/remote.c:1363
+#: builtin/remote.c:1366
 #, c-format
 msgid "Could not setup %s"
 msgstr "�能設定 %s"
 
 #  譯者：請維��導空格
-#: builtin/remote.c:1381
+#: builtin/remote.c:1384
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s 將�為懸空狀態�"
 
 #  譯者：請維��導空格
-#: builtin/remote.c:1382
+#: builtin/remote.c:1385
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s 已�為懸空狀態�"
 
-#: builtin/remote.c:1392
+#: builtin/remote.c:1394
 #, c-format
 msgid "Pruning %s"
 msgstr "修剪 %s"
 
-#: builtin/remote.c:1393
+#: builtin/remote.c:1395
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: builtin/remote.c:1409
+#: builtin/remote.c:1411
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [將刪除] %s"
 
-#: builtin/remote.c:1412
+#: builtin/remote.c:1414
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [已刪除] %s"
 
-#: builtin/remote.c:1457
+#: builtin/remote.c:1459
 msgid "prune remotes after fetching"
 msgstr "抓�後清除�端"
 
-#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
 #, c-format
 msgid "No such remote '%s'"
 msgstr "沒有此�端 '%s'"
 
-#: builtin/remote.c:1539
+#: builtin/remote.c:1541
 msgid "add branch"
 msgstr "新增分支"
 
-#: builtin/remote.c:1546
+#: builtin/remote.c:1548
 msgid "no remote specified"
 msgstr "未指定�端"
 
-#: builtin/remote.c:1563
+#: builtin/remote.c:1565
 msgid "query push URLs rather than fetch URLs"
 msgstr "查詢推� URL ��，而��得 URL ��"
 
-#: builtin/remote.c:1565
+#: builtin/remote.c:1567
 msgid "return all URLs"
 msgstr "返回所有 URL ��"
 
-#: builtin/remote.c:1595
+#: builtin/remote.c:1597
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "沒有給�端版本庫 '%s' 設定 URL"
 
-#: builtin/remote.c:1621
+#: builtin/remote.c:1623
 msgid "manipulate push URLs"
 msgstr "動作推� URLS"
 
-#: builtin/remote.c:1623
+#: builtin/remote.c:1625
 msgid "add URL"
 msgstr "新增 URL"
 
-#: builtin/remote.c:1625
+#: builtin/remote.c:1627
 msgid "delete URLs"
 msgstr "刪除 URL"
 
-#: builtin/remote.c:1632
+#: builtin/remote.c:1634
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete 無�義"
 
-#: builtin/remote.c:1673
+#: builtin/remote.c:1675
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "無效的舊 URL 符�範本：%s"
 
-#: builtin/remote.c:1681
+#: builtin/remote.c:1683
 #, c-format
 msgid "No such URL found: %s"
 msgstr "未找到此 URL：%s"
 
-#: builtin/remote.c:1683
+#: builtin/remote.c:1685
 msgid "Will not delete all non-push URLs"
 msgstr "將�會刪除所有�推� URL ��"
 
-#: builtin/repack.c:26
+#: builtin/remote.c:1702
+msgid "be verbose; must be placed before a subcommand"
+msgstr "詳細輸出；必須置於�指令之�"
+
+#: builtin/repack.c:28
 msgid "git repack [<options>]"
 msgstr "git repack [<�項>]"
 
-#: builtin/repack.c:31
+#: builtin/repack.c:33
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -20802,140 +20661,144 @@ msgstr ""
 "增� repack 和 bitmap 索引�相容。  使用 --no-write-bitmap-index\n"
 "或�用 pack.writebitmaps 設定。"
 
-#: builtin/repack.c:198
+#: builtin/repack.c:201
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "無法開始 pack-objects 來�新打包 promisor 物件"
 
-#: builtin/repack.c:270 builtin/repack.c:630
+#: 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:294
+#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "無法完� pack-objects 來�新打包 promisor 物件"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "無法開啟 %s 的索引"
 
-#: builtin/repack.c:368
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr "%s 包太大，以致�能在等比數列中考慮"
 
-#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#: 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:460
+#: builtin/repack.c:498
+#, c-format
+msgid "could not open tempfile %s for writing"
+msgstr "無法開啟 '%s' 暫存檔進行寫入"
+
+#: builtin/repack.c:516
+msgid "could not close refs snapshot tempfile"
+msgstr "無法關閉 refs 的快照暫存檔"
+
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "所有內容打包到一個包檔案中"
 
-#: builtin/repack.c:462
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "和 -a 相�，並將無法�得的物件設為鬆散物件"
 
-#: builtin/repack.c:465
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "刪除多餘的包，執行 git-prune-packed"
 
-#: builtin/repack.c:467
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "� git-pack-objects 傳��數 --no-reuse-delta"
 
-#: builtin/repack.c:469
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "� git-pack-objects 傳��數 --no-reuse-object"
 
-#: builtin/repack.c:471
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "�執行 git-update-server-info"
 
-#: builtin/repack.c:474
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "� git-pack-objects 傳��數 --local"
 
-#: builtin/repack.c:476
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "寫 bitmap 索引"
 
-#: builtin/repack.c:478
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "� git-pack-objects 傳��數 --delta-islands"
 
-#: builtin/repack.c:479
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "近似日期"
 
-#: builtin/repack.c:480
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
 msgstr "使用 -A，��將早於�供時間的物件�期"
 
-#: builtin/repack.c:482
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "使用 -a ，�新�無法�得物件打包"
 
-#: builtin/repack.c:484
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr "用於增�壓縮的視窗值"
 
-#: builtin/repack.c:485 builtin/repack.c:491
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "�元組"
 
-#: builtin/repack.c:486
+#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "和上�的相似，但�制記憶體大�而��目數"
 
-#: builtin/repack.c:488
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "�制最大增�深度"
 
-#: builtin/repack.c:490
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "�制最大執行緒數"
 
-#: builtin/repack.c:492
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "�個 packfile 的最大尺寸"
 
-#: builtin/repack.c:494
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr "�標記為 .keep 的包中的物件�新打包"
 
-#: builtin/repack.c:496
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "���該包檔案�新打包"
 
-#: builtin/repack.c:498
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "尋找因數是 <N> 的等比數列"
 
-#: builtin/repack.c:508
+#: builtin/repack.c:670
+msgid "write a multi-pack index of the resulting packs"
+msgstr "寫入�果包的多包索引"
+
+#: builtin/repack.c:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "�能刪除��版本庫中的打包檔案"
 
-#: builtin/repack.c:512
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable 和 -A �相容"
-
-#: builtin/repack.c:527
-#| msgid "--long is incompatible with --abbrev=0"
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric 與 -A, -a �相容"
-
-#: builtin/repack.c:639
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "沒有新的�打包。"
 
-#: builtin/repack.c:669
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "缺少必�檔案：%s"
 
-#: builtin/repack.c:671
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "無法�消連�：%s"
@@ -21018,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"
@@ -21118,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 �供一個模�"
 
@@ -21190,146 +21047,138 @@ msgstr "�能為 -l �供一個模�"
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr "git rerere [clear | forget <路徑>... | status | remaining | diff | gc]"
 
-#: builtin/rerere.c:60
+#: builtin/rerere.c:58
 msgid "register clean resolutions in index"
 msgstr "在索引中註冊乾淨的解決方案"
 
-#: builtin/rerere.c:79
+#: builtin/rerere.c:77
 msgid "'git rerere forget' without paths is deprecated"
 msgstr "沒有路徑的 'git rerere forget' 已經�時"
 
-#: builtin/rerere.c:113
+#: builtin/rerere.c:111
 #, c-format
 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:83
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "您沒有一個有效的 HEAD。"
 
-#: builtin/reset.c:85
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "無法找到 HEAD 指�的樹。"
 
-#: builtin/reset.c:91
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "無法找到 %s 指�的樹。"
 
-#: builtin/reset.c:116
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD �在�於 %s"
 
 #  譯者：漢字之間無空格，故刪除%s�後空格
-#: builtin/reset.c:195
+#: builtin/reset.c:299
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "在�併�程中�能�%s�設動作。"
 
-#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
-#: builtin/stash.c:687
+#: 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:297
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "�設 HEAD 和索引"
 
-#: builtin/reset.c:298
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "��設 HEAD"
 
-#: builtin/reset.c:300 builtin/reset.c:302
+#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr "�設 HEAD�索引和工作�"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "�設 HEAD 但儲存本機變更"
 
-#: builtin/reset.c:310
+#: builtin/reset.c:411
 msgid "record only the fact that removed paths will be added later"
 msgstr "將刪除的路徑標記為�後新增"
 
-#: builtin/reset.c:344
+#: builtin/reset.c:445
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "無法將 '%s' 解�為一個有效的版本。"
 
-#: builtin/reset.c:352
+#: builtin/reset.c:453
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "無法將 '%s' 解�為一個有效的樹狀物件。"
 
-#: builtin/reset.c:361
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch 與 --{hard�mixed�soft} �項�相容"
-
-#: builtin/reset.c:371
+#: builtin/reset.c:472
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed 帶路徑已棄用，而是用 'git reset -- <路徑>'。"
 
 #  譯者：漢字之間無空格，故刪除%s�後空格
-#: builtin/reset.c:373
+#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "�能帶路徑進行%s�設。"
 
 #  譯者：漢字之間無空格，故刪除%s�後空格
-#: builtin/reset.c:388
+#: builtin/reset.c:489
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "�能�純版本庫進行%s�設"
 
-#: builtin/reset.c:392
-msgid "-N can only be used with --mixed"
-msgstr "-N �能和 --mixed �時使用"
-
-#: builtin/reset.c:413
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "�設後�消暫存的變更："
 
-#: builtin/reset.c:416
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -21341,30 +21190,27 @@ msgstr ""
 "�設後，枚舉未暫存變更花費了 %.2f 秒。 您�以使用 '--quiet' ��此情�。\n"
 "將設定變數 reset.quiet 設定為 true �使其�為�設值。\n"
 
-#: builtin/reset.c:434
+#: builtin/reset.c:541
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "�能�設索引檔案至版本 '%s'。"
 
-#: builtin/reset.c:439
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "�能寫入新的索引檔案。"
 
-#: builtin/rev-list.c:538
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "�能�時使用 --exclude-promisor-objects 和 --missing �項"
-
-#: builtin/rev-list.c:599
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "物件�濾需� --objects"
 
-#: builtin/rev-list.c:659
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr "rev-list �支�顯示註解"
 
-#: builtin/rev-list.c:664
-msgid "marked counting is incompatible with --objects"
-msgstr "--objects �相容標記計數 (marked counting)"
+#: builtin/rev-list.c:679
+#, 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>...]"
@@ -21382,6 +21228,18 @@ msgstr "�到第一個��項�數後�止解�"
 msgid "output in stuck long form"
 msgstr "以固定長格�輸出"
 
+#: builtin/rev-parse.c:438
+msgid "premature end of input"
+msgstr "輸入�早到��尾"
+
+#: builtin/rev-parse.c:442
+msgid "no usage string given before the `--' separator"
+msgstr "「--�分隔符號�未�供用法字串"
+
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "需�一個修訂版本"
+
 #: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
@@ -21396,6 +21254,50 @@ msgstr ""
 "\n"
 "�次使用時執行 \"git rev-parse --parseopt -h\" 來�得更多訊�。"
 
+#: builtin/rev-parse.c:712
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir 需� 1 個引數"
+
+#: builtin/rev-parse.c:715
+#, c-format
+msgid "not a gitdir '%s'"
+msgstr "'%s' �是 git 目錄"
+
+#: builtin/rev-parse.c:739
+msgid "--git-path requires an argument"
+msgstr "--git-path 需� 1 個引數"
+
+#: builtin/rev-parse.c:749
+msgid "-n requires an argument"
+msgstr "-n 需� 1 個引數"
+
+#: builtin/rev-parse.c:763
+msgid "--path-format requires an argument"
+msgstr "--path-format 需� 1 個引數"
+
+#: builtin/rev-parse.c:769
+#, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "傳入 --path-format 的引數未知：%s"
+
+#: builtin/rev-parse.c:776
+msgid "--default requires an argument"
+msgstr "--default 需� 1 個引數"
+
+#: builtin/rev-parse.c:782
+msgid "--prefix requires an argument"
+msgstr "--prefix 需� 1 個引數"
+
+#: builtin/rev-parse.c:851
+#, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "--abbrev-ref 的模�未知：%s"
+
+#: builtin/rev-parse.c:1023
+#, c-format
+msgid "unknown mode for --show-object-format: %s"
+msgstr "--show-object-format 的模�未知：%s"
+
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<�項>] <�交號>..."
@@ -21470,15 +21372,19 @@ msgstr "追加�交�稱"
 msgid "preserve initially empty commits"
 msgstr "�留�始化的空�交"
 
+#: builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "�許�交說明為空"
+
 #: builtin/revert.c:129
 msgid "keep redundant, empty commits"
 msgstr "��多餘的�空的�交"
 
-#: builtin/revert.c:237
+#: builtin/revert.c:241
 msgid "revert failed"
 msgstr "還原失敗"
 
-#: builtin/revert.c:250
+#: builtin/revert.c:254
 msgid "cherry-pick failed"
 msgstr "��失敗"
 
@@ -21506,7 +21412,7 @@ msgstr ""
 #: builtin/rm.c:217
 msgid "the following file has changes staged in the index:"
 msgid_plural "the following files have changes staged in the index:"
-msgstr[0] "下列檔案索引中有變更"
+msgstr[0] "下列檔案有暫存在索引的變更："
 
 #: builtin/rm.c:221 builtin/rm.c:230
 msgid ""
@@ -21521,68 +21427,69 @@ msgid "the following file has local modifications:"
 msgid_plural "the following files have local modifications:"
 msgstr[0] "如下檔案有本機修改："
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "do not list removed files"
 msgstr "�列出刪除的檔案"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "only remove from the index"
 msgstr "�從索引�刪除"
 
-#: builtin/rm.c:246
+#: builtin/rm.c:247
 msgid "override the up-to-date check"
 msgstr "忽略檔案更新狀態檢查"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "allow recursive removal"
 msgstr "�許�迴刪除"
 
-#: builtin/rm.c:249
+#: builtin/rm.c:250
 msgid "exit with a zero status even if nothing matched"
 msgstr "�使沒有符�，也以零狀態離開"
 
-#: builtin/rm.c:283
+#: builtin/rm.c:285
 msgid "No pathspec was given. Which files should I remove?"
 msgstr "沒有�供路徑�格。我該移除哪個檔案？"
 
-#: builtin/rm.c:310
+#: builtin/rm.c:315
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr "請將您的修改暫存到 .gitmodules 中或儲�後�繼續"
 
-#: builtin/rm.c:331
+#: builtin/rm.c:337
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "未�供 -r �項�會�迴刪除 '%s'"
 
-#: builtin/rm.c:379
+#: builtin/rm.c:385
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm：�能刪除 %s"
 
 #: builtin/send-pack.c:20
 msgid ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
-"[<ref>...]\n"
-"  --all and explicit <ref> specification are mutually exclusive."
+"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=<git-"
-"receive-pack>] [--verbose] [--thin] [--atomic] [<主機>:]<目錄> [<引用>...]\n"
-"  --all 和明確的 <引用> 互斥。"
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [<主機>:]<目錄> (--all | <引用>...)"
 
-#: builtin/send-pack.c:188
+#: builtin/send-pack.c:192
 msgid "remote name"
 msgstr "�端�稱"
 
-#: builtin/send-pack.c:201
+#: builtin/send-pack.c:205
 msgid "use stateless RPC protocol"
 msgstr "使用無狀態的 RPC �定"
 
-#: builtin/send-pack.c:202
+#: builtin/send-pack.c:206
 msgid "read refs from stdin"
 msgstr "從標準輸入讀�引用"
 
-#: builtin/send-pack.c:203
+#: builtin/send-pack.c:207
 msgid "print status from remote helper"
 msgstr "列�來自�端 helper 的狀態"
 
@@ -21639,21 +21546,22 @@ msgstr "欄�"
 msgid "group by field"
 msgstr "�欄�分組"
 
-#: builtin/shortlog.c:391
+#: builtin/shortlog.c:394
 msgid "too many arguments given outside repository"
 msgstr "版本庫外執行�供了太多的�數"
 
 #: builtin/show-branch.c:13
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<何時>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <�用字元>)...]"
+"                [--current] [--color[=<何時>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<版本> | <�用字元"
+">)...]"
 
 #: builtin/show-branch.c:17
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -21665,111 +21573,106 @@ msgid "ignoring %s; cannot handle more than %d ref"
 msgid_plural "ignoring %s; cannot handle more than %d refs"
 msgstr[0] "忽略 %s，無法處� %d 個以上的引用"
 
-#: builtin/show-branch.c:548
+#: builtin/show-branch.c:547
 #, c-format
 msgid "no matching refs with %s"
 msgstr "沒有和 %s 符�的引用"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:644
 msgid "show remote-tracking and local branches"
 msgstr "顯示�端追蹤的和本機的分支"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:646
 msgid "show remote-tracking branches"
 msgstr "顯示�端追蹤的分支"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:648
 msgid "color '*!+-' corresponding to the branch"
 msgstr "著色 '*!+-' 到相應的分支"
 
-#: builtin/show-branch.c:651
+#: builtin/show-branch.c:650
 msgid "show <n> more commits after the common ancestor"
 msgstr "顯示共�祖先後的 <n> 個�交"
 
-#: builtin/show-branch.c:653
+#: builtin/show-branch.c:652
 msgid "synonym to more=-1"
 msgstr "和 more=-1 �義"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
 msgid "suppress naming strings"
 msgstr "�顯示字串命�"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:655
 msgid "include the current branch"
 msgstr "包括目�分支"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:657
 msgid "name commits with their object names"
 msgstr "以物件�字命��交"
 
-#: builtin/show-branch.c:660
+#: builtin/show-branch.c:659
 msgid "show possible merge bases"
 msgstr "顯示�能�併的基礎"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:661
 msgid "show refs unreachable from any other ref"
 msgstr "顯示沒有任何引用的的引用"
 
-#: builtin/show-branch.c:664
+#: builtin/show-branch.c:663
 msgid "show commits in topological order"
 msgstr "以拓撲順�顯示�交"
 
-#: builtin/show-branch.c:667
+#: builtin/show-branch.c:666
 msgid "show only commits not on the first branch"
 msgstr "�顯示�在第一個分支上的�交"
 
-#: builtin/show-branch.c:669
+#: builtin/show-branch.c:668
 msgid "show merges reachable from only one tip"
 msgstr "顯示僅一個分支�存�的�併�交"
 
-#: builtin/show-branch.c:671
+#: builtin/show-branch.c:670
 msgid "topologically sort, maintaining date order where possible"
 msgstr "拓撲方�排�，並儘�能地��日期順�"
 
-#: builtin/show-branch.c:674
+#: builtin/show-branch.c:673
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "顯示從起始點開始的 <n> �最近的引用日誌記錄"
 
-#: builtin/show-branch.c:711
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr "--reflog 和 --all�--remotes�--independent 或 --merge-base �相容"
-
-#: builtin/show-branch.c:735
+#: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "未�供分支，且 HEAD 無效"
 
-#: builtin/show-branch.c:738
+#: builtin/show-branch.c:737
 msgid "--reflog option needs one branch name"
 msgstr "�項 --reflog 需�一個分支�"
 
-#: builtin/show-branch.c:741
+#: builtin/show-branch.c:740
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
 msgstr[0] "一次�能顯示 %d 個�目。"
 
-#: builtin/show-branch.c:745
+#: builtin/show-branch.c:744
 #, c-format
 msgid "no such ref %s"
 msgstr "無此引用 %s"
 
-#: builtin/show-branch.c:831
+#: 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:835
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' �是一個有效的引用。"
 
-#: builtin/show-branch.c:838
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "�能找到�交 %s（%s）"
@@ -21834,75 +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:227
+#: 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:184
+#, c-format
+msgid "failed to remove directory '%s'"
+msgstr "無法移除 '%s' 目錄"
+
+#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
-msgstr "無法建立稀�檢出檔案的目錄"
+msgstr "無法建立稀�簽出檔案的目錄"
 
-#: builtin/sparse-checkout.c:268
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr "無法�級版本庫格�，以致無法啟用 worktreeConfig"
 
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "無法設定 extensions.worktreeConfig 設定"
 
-#: builtin/sparse-checkout.c:290
-#| msgid "git sparse-checkout init [--cone]"
+#: 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:310
+#: 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 "以 cone 模��始化稀�簽出"
 
-#: builtin/sparse-checkout.c:312
+#: 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:340
-msgid "failed to modify sparse-index config"
-msgstr "無法修改稀�索引設定"
-
-#: builtin/sparse-checkout.c:361
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "無法開啟「%s�"
 
-#: builtin/sparse-checkout.c:419
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr "無法標準化路徑 %s"
 
-#: builtin/sparse-checkout.c:431
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <樣�>)"
-
-#: builtin/sparse-checkout.c:456
+#: builtin/sparse-checkout.c:557
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "無法去掉 '%s' C 樣�字串的引號"
 
-#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
-msgstr "無法載入�存的稀�檢出樣�"
+msgstr "無法載入�存的稀�簽出樣�"
+
+#: 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:579
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
 msgid "read patterns from standard in"
 msgstr "從標準輸入讀�樣�"
 
-#: builtin/sparse-checkout.c:594
-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:613
+#: 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:644
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "�新整�工作目錄時發生錯誤"
 
@@ -21926,29 +21866,29 @@ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <分支�> [<stash>]"
 
-#: builtin/stash.c:29 builtin/stash.c:70
-msgid "git stash clear"
-msgstr "git stash clear"
-
 #: 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 builtin/stash.c:87
+#: 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>]"
@@ -21972,6 +21912,14 @@ msgstr ""
 "          [-u|--include-untracked] [-a|--all] [-m|--message <消�>]\n"
 "          [--] [<路徑�格>...]]"
 
+#: builtin/stash.c:87
+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] [<消�>]"
+
 #: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
@@ -21995,7 +21943,7 @@ msgstr "%s �是一個有效的引用�"
 msgid "git stash clear with arguments is unimplemented"
 msgstr "尚未實作傳入�數的 git stash clear"
 
-#: builtin/stash.c:431
+#: builtin/stash.c:447
 #, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
@@ -22006,166 +21954,182 @@ msgstr ""
 "            %s -> %s\n"
 "         以騰出空間留給追蹤檔案。\n"
 
-#: builtin/stash.c:492
+#: builtin/stash.c:508
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "無法在�併�程套用儲�"
 
-#: builtin/stash.c:503
+#: builtin/stash.c:519
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "無法生�差異 %s^!."
 
-#: builtin/stash.c:510
+#: builtin/stash.c:526
 msgid "conflicts in index. Try without --index."
 msgstr "索引中有��。請試試看�用 --index。"
 
-#: builtin/stash.c:516
+#: builtin/stash.c:532
 msgid "could not save index tree"
 msgstr "�能儲存索引樹"
 
-#: builtin/stash.c:525
-msgid "could not restore untracked files from stash"
-msgstr "無法從儲��目中復原未追蹤檔案"
-
-#: builtin/stash.c:539
+#: builtin/stash.c:552
 #, c-format
 msgid "Merging %s with %s"
 msgstr "正在�併 %s 和 %s"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:562
 msgid "Index was not unstashed."
 msgstr "索引未從儲�中復原。"
 
-#: builtin/stash.c:591 builtin/stash.c:689
+#: builtin/stash.c:576
+msgid "could not restore untracked files from stash"
+msgstr "無法從儲��目中復原未追蹤檔案"
+
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "嘗試�建索引"
 
-#: builtin/stash.c:635
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "�棄了 %s（%s）"
 
-#: builtin/stash.c:638
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s：無法�棄儲��目"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' �是一個儲�引用"
 
-#: builtin/stash.c:701
+#: builtin/stash.c:718
 msgid "The stash entry is kept in case you need it again."
 msgstr "儲��目被�留以備您�次需�。"
 
-#: builtin/stash.c:724
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "未指定分支�"
 
-#: builtin/stash.c:808
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "無法解�樹"
 
-#: builtin/stash.c:819
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "無法解包樹"
 
-#: builtin/stash.c:839
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "在儲��包�未追蹤檔案"
 
-#: builtin/stash.c:842
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "�在儲��顯示未追蹤檔案"
 
-#: builtin/stash.c:932 builtin/stash.c:969
+#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "無法用 %2$s 更新 %1$s"
 
-#: builtin/stash.c:950 builtin/stash.c:1606 builtin/stash.c:1671
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "儲�說明"
 
-#: builtin/stash.c:960
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" 需�一個 <�交> �數"
 
-#: builtin/stash.c:1175
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "無暫存變更"
+
+#: builtin/stash.c:1220
 msgid "No changes selected"
 msgstr "沒有�擇變更"
 
-#: builtin/stash.c:1275
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "您尚未建立�始�交"
 
-#: builtin/stash.c:1302
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "無法儲存目�索引狀態"
 
-#: builtin/stash.c:1311
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "無法儲存未追蹤檔案"
 
-#: builtin/stash.c:1322 builtin/stash.c:1331
+#: builtin/stash.c:1367 builtin/stash.c:1386
 msgid "Cannot save the current worktree state"
 msgstr "無法儲存目�工作�狀態"
 
-#: builtin/stash.c:1359
+#: 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:1408
+#: 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:1426
+#: 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:1441
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "沒有�儲存的本機修改"
 
-#: builtin/stash.c:1448
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "無法�始化儲�"
 
-#: builtin/stash.c:1463
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "無法儲存目�狀態"
 
-#: builtin/stash.c:1468
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "儲存工作目錄和索引狀態 %s"
 
-#: builtin/stash.c:1558
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "無法刪除工作�變更"
 
-#: builtin/stash.c:1597 builtin/stash.c:1662
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "��索引"
 
-#: builtin/stash.c:1599 builtin/stash.c:1664
+#: 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:1600 builtin/stash.c:1665
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "�默模�"
 
-#: builtin/stash.c:1602 builtin/stash.c:1667
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "儲�中包�未追蹤檔案"
 
-#: builtin/stash.c:1604 builtin/stash.c:1669
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "包�忽略的檔案"
 
-#: builtin/stash.c:1704
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -22189,40 +22153,47 @@ msgstr "略�和移除所有的備註行"
 msgid "prepend comment character and space to each line"
 msgstr "為�一行的行首新增備註符和空格"
 
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "期望一個完整的引用�稱，�得到 %s"
 
-#: builtin/submodule--helper.c:64
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper print-default-remote �帶�數"
 
-#: builtin/submodule--helper.c:102
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "無法從 url '%s' �離一個元件"
 
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
+#: builtin/submodule--helper.c:211
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr "無法找到設定 '%s'。�定這個版本庫是其自身的官方上游。"
+
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr "相�路徑的替代錨記（anchor）"
 
-#: builtin/submodule--helper.c:415
+#: builtin/submodule--helper.c:410
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<路徑>] [<路徑>...]"
 
-#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
+#: builtin/submodule--helper.c:628
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "在 .gitmodules 中未找到�模組 '%s' 的 url"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:520
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "進入 '%s'\n"
 
-#: builtin/submodule--helper.c:528
+#: builtin/submodule--helper.c:523
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -22231,7 +22202,7 @@ msgstr ""
 "� %s 執行 run_command 返回�零值。\n"
 "."
 
-#: builtin/submodule--helper.c:550
+#: builtin/submodule--helper.c:545
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -22241,223 +22212,211 @@ msgstr ""
 "在�迴 %s 的�模組執行 run_command 時返回�零值。\n"
 "."
 
-#: builtin/submodule--helper.c:566
+#: builtin/submodule--helper.c:561
 msgid "suppress output of entering each submodule command"
 msgstr "隱��個�模組進入命令的輸出"
 
-#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
-#: builtin/submodule--helper.c:1488
+#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
+#: builtin/submodule--helper.c:1453
 msgid "recurse into nested submodules"
 msgstr "�迴進入嵌套�模組中"
 
-#: builtin/submodule--helper.c:573
+#: builtin/submodule--helper.c:568
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
 
-#: builtin/submodule--helper.c:600
-#, c-format
-msgid ""
-"could not look up configuration '%s'. Assuming this repository is its own "
-"authoritative upstream."
-msgstr "無法找到設定 '%s'。�定這個版本庫是其自身的官方上游。"
-
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:642
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "無法為�模組 '%s' 註冊 url"
 
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:646
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "�模組 '%s'（%s）已�路徑 '%s' 註冊\n"
 
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:656
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "警告：建議�模組 '%s' 使用指令更新模�\n"
 
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:663
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "無法為�模組 '%s' 註冊更新模�"
 
-#: builtin/submodule--helper.c:710
+#: builtin/submodule--helper.c:685
 msgid "suppress output for initializing a submodule"
 msgstr "隱��始化�模組的輸出"
 
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<�項>] [<路徑>]"
 
-#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
+#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "在 .gitmodules 中沒有發�路徑 '%s' 的�模組映射"
 
-#: builtin/submodule--helper.c:836
+#: builtin/submodule--helper.c:811
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "無法解��模組 '%s' 的 HEAD 引用"
 
-#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
+#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "�迴�模組 '%s' 失敗"
 
-#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "隱��模組的狀態輸出"
 
-#: builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:863
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr "使用儲存在索引中的�交，而�儲存在�模組 HEAD 中的�交"
 
-#: builtin/submodule--helper.c:894
+#: builtin/submodule--helper.c:869
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]"
 
-#: builtin/submodule--helper.c:918
+#: builtin/submodule--helper.c:893
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <路徑>"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:965
 #, c-format
 msgid "* %s %s(blob)->%s(submodule)"
 msgstr "* %s %s(blob)->%s(submodule)"
 
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:968
 #, c-format
 msgid "* %s %s(submodule)->%s(blob)"
 msgstr "* %s %s(submodule)->%s(blob)"
 
-#: builtin/submodule--helper.c:1006
+#: builtin/submodule--helper.c:981
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: builtin/submodule--helper.c:1056
+#: builtin/submodule--helper.c:1031
 #, c-format
 msgid "couldn't hash object from '%s'"
 msgstr "無法雜湊來自 '%s' 的物件"
 
-#: builtin/submodule--helper.c:1060
+#: builtin/submodule--helper.c:1035
 #, c-format
 msgid "unexpected mode %o\n"
 msgstr "��期的模� %o\n"
 
-#: builtin/submodule--helper.c:1301
+#: builtin/submodule--helper.c:1276
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr "使用儲存在索引中的�交而��模組 HEAD"
 
-#: builtin/submodule--helper.c:1303
-msgid "to compare the commit in the index with that in the submodule HEAD"
-msgstr "比較索引中的，和�模組 HEAD 中的�交"
+#: builtin/submodule--helper.c:1278
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "比較索引中�交與�模組 HEAD �交的差異"
 
-#: builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1280
 msgid "skip submodules with 'ignore_config' value set to 'all'"
 msgstr "'ignore_config' 值設為 'all' 時略��模組"
 
-#: builtin/submodule--helper.c:1307
+#: builtin/submodule--helper.c:1282
 msgid "limit the summary size"
 msgstr "�制摘�大�"
 
-#: builtin/submodule--helper.c:1312
+#: builtin/submodule--helper.c:1287
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 msgstr "git submodule--helper summary [<�項>] [<�交>] [--] [<路徑>]"
 
-#: builtin/submodule--helper.c:1336
+#: builtin/submodule--helper.c:1311
 msgid "could not fetch a revision for HEAD"
 msgstr "無法�得 HEAD 的版本"
 
-#: builtin/submodule--helper.c:1341
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached 和 --files 互斥"
-
-#: builtin/submodule--helper.c:1408
+#: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "為 '%s' �步�模組 url\n"
 
-#: builtin/submodule--helper.c:1414
+#: builtin/submodule--helper.c:1379
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "無法為�模組路徑 '%s' 註冊 url"
 
-#: builtin/submodule--helper.c:1428
+#: builtin/submodule--helper.c:1393
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "無法得到�模組 '%s' 的�設�端關�"
 
-#: builtin/submodule--helper.c:1439
+#: builtin/submodule--helper.c:1404
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "無法為�模組 '%s' 更新�端關�"
 
-#: builtin/submodule--helper.c:1486
+#: builtin/submodule--helper.c:1451
 msgid "suppress output of synchronizing submodule url"
 msgstr "隱��模組 URL �步的輸出"
 
-#: builtin/submodule--helper.c:1493
+#: builtin/submodule--helper.c:1458
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]"
 
-#: builtin/submodule--helper.c:1547
+#: 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:1559
+#: 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:1567
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "已清除目錄 '%s'\n"
 
-#: builtin/submodule--helper.c:1569
+#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "無法移除�模組工作� '%s'\n"
 
-#: builtin/submodule--helper.c:1580
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "�能建立空的�模組目錄 %s"
 
-#: builtin/submodule--helper.c:1596
+#: 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:1625
+#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr "�使有本機變更�移除�模組的工作�"
 
-#: builtin/submodule--helper.c:1626
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "�消註冊所有�模組"
 
-#: builtin/submodule--helper.c:1631
+#: 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:1645
+#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "如果您確定想��所有�模組執行�消�始化，請使用 '--all'"
 
-#: builtin/submodule--helper.c:1714
+#: 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"
@@ -22469,46 +22428,67 @@ msgstr ""
 "以�許 Git �用備用版本庫複製，亦�使用等效的 '--reference-if-able'\n"
 "而� '--reference' 複製。"
 
-#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756
+#: 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:1792
+#: builtin/submodule--helper.c:1740
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "�能識別 submodule.alternateErrorStrategy 的�值 '%s'"
 
-#: builtin/submodule--helper.c:1799
+#: builtin/submodule--helper.c:1747
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
-msgstr "�能識別 submodule.alternateLocaion 的�值 '%s'"
+msgstr "�能識別 submodule.alternateLocation 的�值 '%s'"
+
+#: 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:1813
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "無法複製 '%s' 到�模組路徑 '%s'"
+
+#: builtin/submodule--helper.c:1818
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "目錄�是空的：「%s�"
+
+#: builtin/submodule--helper.c:1830
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "無法得到 '%s' 的�模組目錄"
 
-#: builtin/submodule--helper.c:1823
+#: builtin/submodule--helper.c:1862
 msgid "where the new submodule will be cloned to"
 msgstr "新的�模組將�複製的路徑"
 
-#: builtin/submodule--helper.c:1826
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "新�模組的�稱"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr "複製�模組的 url ��"
 
-#: builtin/submodule--helper.c:1837
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "淺複製的深度"
 
-#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr "強制顯示複製進度"
 
-#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr "��許複製至�空白目錄"
 
-#: builtin/submodule--helper.c:1849
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22518,186 +22498,356 @@ msgstr ""
 ">] [--name <�字>] [--depth <深度>] [--single-branch] --url <url> --path <路"
 "徑>"
 
-#: builtin/submodule--helper.c:1874
-#, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr "拒絕在其他�模組的 git 路徑建立�使用「%s�"
-
-#: builtin/submodule--helper.c:1885
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "無法複製 '%s' 到�模組路徑 '%s'"
-
-#: builtin/submodule--helper.c:1889
-#, c-format
-msgid "directory not empty: '%s'"
-msgstr "目錄�是空的：「%s�"
-
-#: builtin/submodule--helper.c:1901
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "無法得到 '%s' 的�模組目錄"
-
-#: builtin/submodule--helper.c:1937
+#: 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:1941
+#: 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:2042
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "�模組 '%s' 尚未�始化"
 
-#: builtin/submodule--helper.c:2046
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "也許您想�執行 'update --init'？"
 
-#: builtin/submodule--helper.c:2076
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "略�未�併的�模組 %s"
 
-#: builtin/submodule--helper.c:2105
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "略��模組 '%s'"
 
-#: builtin/submodule--helper.c:2255
+#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
-msgstr "複製 '%s' 失敗。按計劃�試"
+msgstr "複製 '%s' 失敗。已排程�試作業"
 
-#: builtin/submodule--helper.c:2266
+#: builtin/submodule--helper.c:2268
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
-msgstr "第二次嘗試複製 '%s' 失敗，離開"
+msgstr "第二次嘗試複製 '%s' 失敗，中止作業"
+
+#: 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:2377
+#, c-format
+msgid "Unable to rebase '%s' in submodule path '%s'"
+msgstr "無法在「%2$s��模組路徑�定「%1$s�的基底"
+
+#: 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:2385
+#, c-format
+msgid "Execution of '%s %s' failed in submodule path '%s'"
+msgstr "「%s %s�在「%s��模組路徑執行失敗"
+
+#: builtin/submodule--helper.c:2409
+#, c-format
+msgid "Submodule path '%s': checked out '%s'\n"
+msgstr "�模組路徑「%s�：已簽出「%s�\n"
+
+#: builtin/submodule--helper.c:2413
+#, c-format
+msgid "Submodule path '%s': rebased into '%s'\n"
+msgstr "�模組路徑「%s�：已�定基底至「%s�\n"
+
+#: builtin/submodule--helper.c:2417
+#, c-format
+msgid "Submodule path '%s': merged in '%s'\n"
+msgstr "�模組路徑「%s�：已在「%s��併\n"
+
+#: builtin/submodule--helper.c:2421
+#, c-format
+msgid "Submodule path '%s': '%s %s'\n"
+msgstr "�模組路徑「%s�：「%s %s�\n"
 
-#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574
+#: 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: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:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
 msgid "path into the working tree"
 msgstr "到工作�的路徑"
 
-#: builtin/submodule--helper.c:2331
+#: 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:2335
+#: 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:2341
+#: builtin/submodule--helper.c:2518
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr "建立一個縮減至指定版本數的淺複製"
 
-#: builtin/submodule--helper.c:2344
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
-msgstr "並發任務"
+msgstr "並行任務"
 
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2523
 msgid "whether the initial clone should follow the shallow recommendation"
-msgstr "�始複製是�應該�守推薦的淺複製�項"
+msgstr "�始複製是�應該�循建議的淺複製�項"
 
-#: builtin/submodule--helper.c:2347
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "��輸出複製進度"
 
-#: builtin/submodule--helper.c:2358
+#: 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:2371
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "update �數�值錯誤"
 
-#: builtin/submodule--helper.c:2419
+#: builtin/submodule--helper.c:2566
+msgid "suppress output for update by rebase or merge"
+msgstr "隱� rebase 或 merge 觸發之更新的輸出"
+
+#: builtin/submodule--helper.c:2567
+msgid "force checkout updates"
+msgstr "強制簽出更新"
+
+#: builtin/submodule--helper.c:2569
+msgid "don't fetch new objects from the remote site"
+msgstr "�從�端站��得新物件"
+
+#: builtin/submodule--helper.c:2571
+msgid "overrides update mode in case the repository is a fresh clone"
+msgstr "如果版本庫是剛複製的，就覆蓋更新模�"
+
+#: builtin/submodule--helper.c:2572
+msgid "depth for shallow fetch"
+msgstr "淺 fetch 的深度"
+
+#: builtin/submodule--helper.c:2582
+msgid "sha1"
+msgstr "sha1"
+
+#: builtin/submodule--helper.c:2583
+msgid "SHA1 expected by superproject"
+msgstr "上層專案�期應是 SHA1"
+
+#: builtin/submodule--helper.c:2585
+msgid "subsha1"
+msgstr "subsha1"
+
+#: builtin/submodule--helper.c:2586
+msgid "SHA1 of submodule's HEAD"
+msgstr "�模組 HEAD 的 SHA1"
+
+#: 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: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:2542
+#: builtin/submodule--helper.c:2781
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "無法�得�模組 '%s' 的版本庫�柄"
 
-#: builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "在�模組中�迴"
 
-#: builtin/submodule--helper.c:2581
+#: 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:2637
+#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "檢查寫入 .gitmodules 檔案是�安全"
 
-#: builtin/submodule--helper.c:2640
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr "�消 .gitmodules 檔案中的設定"
 
-#: builtin/submodule--helper.c:2645
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <�稱> [<值>]"
 
-#: builtin/submodule--helper.c:2646
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <�稱>"
 
-#: builtin/submodule--helper.c:2647
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2666 git-submodule.sh:150
-#, sh-format
+#: 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:2682
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr "隱��模組設定 URL 的輸出"
 
-#: builtin/submodule--helper.c:2686
+#: 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:2719
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr "將�設的追蹤分支設為 master"
 
-#: builtin/submodule--helper.c:2721
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "設定�設追蹤分支"
 
-#: builtin/submodule--helper.c:2725
+#: 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:2726
+#: 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:2733
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "需� --branch 或 --default"
 
-#: builtin/submodule--helper.c:2736
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch 與 --default 互斥"
+#: builtin/submodule--helper.c:3038
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "正在將�於 '%s' 的�有版本庫加入至索引\n"
+
+#: 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:2793 git.c:449 git.c:724
+#: 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: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 ""
+"如果您想�直接使用這個本機 git 目錄，而��新複製自\n"
+"  %s\n"
+"請使用 '--force' �項。如果本機 git 目錄�是正確的版本庫\n"
+"�如您�太懂��，請使用 '--name' �項輸入其他�稱。"
+
+#: builtin/submodule--helper.c:3073
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "正在�新啟用「%s��模組的本機 Git 目錄\n"
+
+#: builtin/submodule--helper.c:3110
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "無法簽出「%s��模組"
+
+#: builtin/submodule--helper.c:3149
+#, c-format
+msgid "Failed to add submodule '%s'"
+msgstr "無法加入�模組「%s�"
+
+#: 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:3222
+#, c-format
+msgid "'%s' already exists in the index"
+msgstr "「%s�已在索引中"
+
+#: 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:3254
+msgid "branch of repository to add as submodule"
+msgstr "�加入為�模組的版本庫分支"
+
+#: builtin/submodule--helper.c:3255
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "�許加入忽略的�模組路徑"
+
+#: builtin/submodule--helper.c:3257
+msgid "print only error messages"
+msgstr "�輸出錯誤訊�"
+
+#: builtin/submodule--helper.c:3261
+msgid "borrow the objects from reference repositories"
+msgstr "從引用的版本庫借用物件"
+
+#: 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:3270
+msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
+msgstr "git submodule--helper add [<�項>] [--] <版本庫> [<路徑>]"
+
+#: builtin/submodule--helper.c:3298
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "�能在工作�的頂級目錄中使用相�路徑"
+
+#: builtin/submodule--helper.c:3306
+#, c-format
+msgid "repo URL: '%s' must be absolute or begin with ./|../"
+msgstr "版本庫 URL：「%s�必須是絕�路徑，或開頭是 ./|../"
+
+#: builtin/submodule--helper.c:3341
+#, c-format
+msgid "'%s' is not a valid submodule name"
+msgstr "「%s��是有效的�模組�稱"
+
+#: 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:2799
+#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' �是一個有效的 submodule--helper �指令"
@@ -22722,21 +22872,21 @@ msgstr "刪除符號引用"
 msgid "shorten ref output"
 msgstr "縮短引用輸出"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason"
 msgstr "原因"
 
-#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
 msgid "reason of the update"
 msgstr "更新的原因"
 
 #: builtin/tag.c:25
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+"        <tagname> [<head>]"
 msgstr ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <消�> | -F <檔案>]\n"
-"\t\t<標籤�> [<頭>]"
+"        <標籤�> [<head>]"
 
 #: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
@@ -22746,12 +22896,12 @@ msgstr "git tag -d <標籤�>..."
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"        [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
 "[<pattern>...]"
 msgstr ""
 "git tag -l [-n[<數字>]] [--contains <�交>] [--no-contains <�交>] [--points-"
 "at <物件>]\n"
-"\t\t[--format=<格�>] [--merged <�交>] [--no-merged <�交>] [<模�>...]"
+"        [--format=<格�>] [--merged <�交>] [--no-merged <�交>] [<模�>...]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
@@ -22794,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"
@@ -22811,134 +22961,111 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c:274
 msgid "bad object type."
 msgstr "壞的物件類型。"
 
-#: builtin/tag.c:328
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "無標籤說明？"
 
-#: builtin/tag.c:335
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "標籤說明被�留在 %s\n"
 
-#: builtin/tag.c:446
+#: builtin/tag.c:444
 msgid "list tag names"
 msgstr "列出標籤�稱"
 
-#: builtin/tag.c:448
+#: builtin/tag.c:446
 msgid "print <n> lines of each tag message"
 msgstr "�個標籤訊�列� <n> 行"
 
-#: builtin/tag.c:450
+#: builtin/tag.c:448
 msgid "delete tags"
 msgstr "刪除標籤"
 
-#: builtin/tag.c:451
+#: builtin/tag.c:449
 msgid "verify tags"
 msgstr "驗證標籤"
 
-#: builtin/tag.c:453
+#: builtin/tag.c:451
 msgid "Tag creation options"
 msgstr "標籤建立�項"
 
-#: builtin/tag.c:455
+#: builtin/tag.c:453
 msgid "annotated tag, needs a message"
 msgstr "附註標籤，需�一個說明"
 
-#: builtin/tag.c:457
+#: builtin/tag.c:455
 msgid "tag message"
 msgstr "標籤說明"
 
-#: builtin/tag.c:459
+#: builtin/tag.c:457
 msgid "force edit of tag message"
 msgstr "強制編輯標籤說明"
 
-#: builtin/tag.c:460
+#: builtin/tag.c:458
 msgid "annotated and GPG-signed tag"
 msgstr "附註並附加 GPG 簽�的標籤"
 
-#: builtin/tag.c:463
+#: builtin/tag.c:461
 msgid "use another key to sign the tag"
 msgstr "使用�外的�鑰簽�該標籤"
 
-#: builtin/tag.c:464
+#: builtin/tag.c:462
 msgid "replace the tag if exists"
 msgstr "如果存在，�代�有的標籤"
 
-#: builtin/tag.c:465 builtin/update-ref.c:505
+#: builtin/tag.c:463 builtin/update-ref.c:511
 msgid "create a reflog"
 msgstr "建立引用日誌"
 
-#: builtin/tag.c:467
+#: builtin/tag.c:465
 msgid "Tag listing options"
 msgstr "標籤列表�項"
 
-#: builtin/tag.c:468
+#: builtin/tag.c:466
 msgid "show tag list in columns"
 msgstr "以列的方�顯示標籤列表"
 
-#: builtin/tag.c:469 builtin/tag.c:471
+#: builtin/tag.c:467 builtin/tag.c:469
 msgid "print only tags that contain the commit"
 msgstr "�列�包�該�交的標籤"
 
-#: builtin/tag.c:470 builtin/tag.c:472
+#: builtin/tag.c:468 builtin/tag.c:470
 msgid "print only tags that don't contain the commit"
 msgstr "�列��包�該�交的標籤"
 
-#: builtin/tag.c:473
+#: builtin/tag.c:471
 msgid "print only tags that are merged"
 msgstr "�列�已經�併的標籤"
 
-#: builtin/tag.c:474
+#: builtin/tag.c:472
 msgid "print only tags that are not merged"
 msgstr "�列�尚未�併的標籤"
 
-#: builtin/tag.c:478
+#: builtin/tag.c:476
 msgid "print only tags of the object"
 msgstr "�列�指�該物件的標籤"
 
-#: builtin/tag.c:526
-msgid "--column and -n are incompatible"
-msgstr "--column 和 -n �相容"
-
-#: builtin/tag.c:548
-msgid "-n option is only allowed in list mode"
-msgstr "-n �項��許用在列表顯示模�"
-
-#: builtin/tag.c:550
-msgid "--contains option is only allowed in list mode"
-msgstr "--contains �項��許用在列表顯示模�"
-
-#: builtin/tag.c:552
-msgid "--no-contains option is only allowed in list mode"
-msgstr "--no-contains �項��許用在列表顯示模�"
-
-#: builtin/tag.c:554
-msgid "--points-at option is only allowed in list mode"
-msgstr "--points-at �項��許用在列表顯示模�"
-
-#: builtin/tag.c:556
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "--merged 和 --no-merged �項��許用在列表顯示模�"
-
-#: builtin/tag.c:567
-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:592
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' �是一個有效的標籤�稱。"
 
-#: builtin/tag.c:597
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "標籤 '%s' 已存在"
 
-#: builtin/tag.c:628
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "已更新標籤 '%s'（曾為 %s）\n"
@@ -22952,207 +23079,202 @@ msgstr "展開物件中"
 msgid "failed to create directory %s"
 msgstr "建立目錄 %s 失敗"
 
-#: builtin/update-index.c:100
-#, c-format
-msgid "failed to create file %s"
-msgstr "建立檔案 %s 失敗"
-
-#: builtin/update-index.c:108
+#: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
 msgstr "刪除檔案 %s 失敗"
 
-#: builtin/update-index.c:115 builtin/update-index.c:221
+#: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "刪除目錄 %s 失敗"
 
-#: builtin/update-index.c:140
+#: builtin/update-index.c:138
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "在 '%s' 中測試 mtime "
 
-#: builtin/update-index.c:154
+#: builtin/update-index.c:152
 msgid "directory stat info does not change after adding a new file"
 msgstr "新增一個新檔案後，目錄的狀態訊�未改變"
 
-#: builtin/update-index.c:167
+#: builtin/update-index.c:165
 msgid "directory stat info does not change after adding a new directory"
 msgstr "新增一個新目錄後，目錄的狀態訊�未改變"
 
-#: builtin/update-index.c:180
+#: builtin/update-index.c:178
 msgid "directory stat info changes after updating a file"
 msgstr "更新一個檔案後，目錄的狀態訊�被修改"
 
-#: builtin/update-index.c:191
+#: builtin/update-index.c:189
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr "在�目錄中新增檔案後，目錄的狀態訊�被修改"
 
-#: builtin/update-index.c:202
+#: builtin/update-index.c:200
 msgid "directory stat info does not change after deleting a file"
 msgstr "刪除一個檔案後，目錄的狀態訊�未改變"
 
-#: builtin/update-index.c:215
+#: builtin/update-index.c:213
 msgid "directory stat info does not change after deleting a directory"
 msgstr "刪除一個目錄後，目錄的狀態訊�未改變"
 
-#: builtin/update-index.c:222
+#: builtin/update-index.c:220
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:591
+#: builtin/update-index.c:589
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<�項>] [--] [<檔案>...]"
 
-#: builtin/update-index.c:976
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr "當索引需�更新時繼續�新整�"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "�新整�：忽略�模組"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "�忽略新的檔案"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "讓檔案�代目錄（�之亦然）"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "通知檔案從工作��失"
 
-#: builtin/update-index.c:988
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "�使索引�包�未�併的�目也執行�新整�"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "�新整�統計訊�"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "類似於 --refresh，但是忽略 assume-unchanged 設定"
 
-#: builtin/update-index.c:999
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<存�模�>,<物件>,<路徑>"
 
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "新增指定的�目到索引�"
 
-#: builtin/update-index.c:1010
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "把檔案標記為 \"沒有變更\""
 
-#: builtin/update-index.c:1013
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "清除 assumed-unchanged �"
 
-#: builtin/update-index.c:1016
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "把檔案標記為 \"僅索引\""
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "清除 skip-worktree �"
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1020
 msgid "do not touch index-only entries"
 msgstr "��建立�有索引的項目"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr "�新增到索引�；�新增物件到物件庫"
 
-#: builtin/update-index.c:1026
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr "�使存在工作�裡，也刪除路徑"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "攜帶 --stdin：輸入的行以 null 字元終止"
 
-#: builtin/update-index.c:1030
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "從標準輸入中讀�需�更新的路徑列表"
 
-#: builtin/update-index.c:1034
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "從標準輸入新增�目到索引�"
 
-#: builtin/update-index.c:1038
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "為指定檔案�新生�第2和第3暫存�"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "�更新與 HEAD ��的�目"
 
-#: builtin/update-index.c:1046
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "忽略工作��失的檔案"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "在標準輸出顯示動作"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(for porcelains) 忘記儲存的未解決的��"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "以這種格�寫入索引�"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "啟用或�用索引分割"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "啟用/�用�未追蹤檔案的快�"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "測試檔案系統是�支�未追蹤檔案快�"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "無需檢測檔案系統，啟用�未追蹤檔案的快�"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "�使沒有被標記為已更改，也�寫出索引"
 
-#: builtin/update-index.c:1067
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "啟用或�用檔案系統監控"
 
-#: builtin/update-index.c:1069
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "標記檔案為 fsmonitor 有效"
 
-#: builtin/update-index.c:1072
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "清除 fsmonitor 有效�"
 
-#: builtin/update-index.c:1175
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr "core.splitIndex 被設定為 false。如果您確定�啟用索引分割，請移除或修改"
 
-#: builtin/update-index.c:1184
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr "core.splitIndex 被設定為 true。如果您確定��用索引分割，請移除或修改"
 
-#: builtin/update-index.c:1196
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
@@ -23160,11 +23282,11 @@ msgstr ""
 "core.untrackedCache 被設定為 true。如果您確定��用未追蹤檔案的快�，請移除或"
 "修改"
 
-#: builtin/update-index.c:1200
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "快�未追蹤檔案被�用"
 
-#: builtin/update-index.c:1208
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
@@ -23172,25 +23294,25 @@ msgstr ""
 "core.untrackedCache 被設定為 false。如果您確定�啟用未追蹤檔案快�，請移除或"
 "修改"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "快�未追蹤檔案在 '%s' 啟用"
 
-#: builtin/update-index.c:1220
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr "core.fsmonitor 未設定；如果想�啟用 fsmonitor 請設定該�項"
 
-#: builtin/update-index.c:1224
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "fsmonitor 被啟用"
 
-#: builtin/update-index.c:1227
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr "core.fsmonitor 已設定；如果想��用 fsmonitor 請移除該�項"
 
-#: builtin/update-index.c:1231
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "fsmonitor 被�用"
 
@@ -23206,19 +23328,19 @@ msgstr "git update-ref [<�項>]    <引用�> <新值> [<舊值>]"
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<�項>] --stdin [-z]"
 
-#: builtin/update-ref.c:500
+#: builtin/update-ref.c:506
 msgid "delete the reference"
 msgstr "刪除引用"
 
-#: builtin/update-ref.c:502
+#: builtin/update-ref.c:508
 msgid "update <refname> not the one it points to"
 msgstr "更新 <引用�> 本身而�是它指�的引用"
 
-#: builtin/update-ref.c:503
+#: builtin/update-ref.c:509
 msgid "stdin has NUL-terminated arguments"
 msgstr "標準輸入有以 NUL 字元終止的�數"
 
-#: builtin/update-ref.c:504
+#: builtin/update-ref.c:510
 msgid "read updates from stdin"
 msgstr "從標準輸入讀�更新"
 
@@ -23234,19 +23356,19 @@ msgstr "從頭開始更新檔案訊�"
 msgid "git upload-pack [<options>] <dir>"
 msgstr "git upload-pack [<�項>] <目錄>"
 
-#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
 msgid "quit after a single request/response exchange"
 msgstr "在一次單�的請求/回應之後離開"
 
-#: builtin/upload-pack.c:25
-msgid "exit immediately after initial ref advertisement"
-msgstr "在�始的引用廣告後立�離開"
+#: builtin/upload-pack.c:26
+msgid "serve up the info/refs for git-http-backend"
+msgstr "為 git-http-backend �供 info/refs"
 
-#: builtin/upload-pack.c:27
+#: builtin/upload-pack.c:29
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr "如果 <目錄> �是一個 Git 目錄，��嘗試 <目錄>/.git/"
 
-#: builtin/upload-pack.c:29
+#: builtin/upload-pack.c:31
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "�活動 <n> 秒�後終止傳輸"
 
@@ -23282,63 +23404,58 @@ msgstr "git verify-tag [-v | --verbose] [--format=<格�>] <標籤>..."
 msgid "print tag contents"
 msgstr "列�標籤內容"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<�項>] <路徑> [<�交>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<�項>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<�項>] <路徑>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <工作�> <新路徑>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<�項>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<�項>] <工作�>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:25
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <路徑>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:935
-#, c-format
-msgid "failed to delete '%s'"
-msgstr "刪除 '%s' 失敗"
-
-#: builtin/worktree.c:74
+#: builtin/worktree.c:75
 #, c-format
 msgid "Removing %s/%s: %s"
 msgstr "移除 %s/%s: %s"
 
-#: builtin/worktree.c:149
+#: builtin/worktree.c:148
 msgid "report pruned working trees"
 msgstr "報告清除的工作�"
 
-#: builtin/worktree.c:151
+#: builtin/worktree.c:150
 msgid "expire working trees older than <time>"
 msgstr "將早於 <時間> 的工作��期"
 
-#: builtin/worktree.c:221
+#: builtin/worktree.c:220
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' 已經存在"
 
-#: builtin/worktree.c:230
+#: builtin/worktree.c:229
 #, c-format
 msgid "unusable worktree destination '%s'"
 msgstr "無法使用的工作目錄目的地「%s�"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:234
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
@@ -23347,7 +23464,7 @@ msgstr ""
 "'%s' 是個�失但被鎖定的工作�；\n"
 "使用 '%s -f -f' 覆蓋，或 'unlock' 和 'prune' 或 'remove' 清除"
 
-#: builtin/worktree.c:237
+#: builtin/worktree.c:236
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
@@ -23356,34 +23473,38 @@ msgstr ""
 "'%s' 是個�失但已註冊的工作�；\n"
 "使用 '%s -f' 覆蓋，或 'prune' 或 'remove' 清除"
 
-#: builtin/worktree.c:288
+#: builtin/worktree.c:287
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "�能建立目錄 '%s'"
 
-#: builtin/worktree.c:422 builtin/worktree.c:428
+#: builtin/worktree.c:309
+msgid "initializing"
+msgstr "正在�始化"
+
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "準備工作�（新分支 '%s'）"
 
-#: builtin/worktree.c:424
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "準備工作�（�設分支 '%s'，之�為 %s）"
 
-#: builtin/worktree.c:433
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
-msgstr "準備工作�（檢出 '%s'）"
+msgstr "準備工作�（簽出 '%s'）"
 
-#: builtin/worktree.c:439
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "準備工作�（分離開頭指標 %s）"
 
 #: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
-msgstr "檢出 <分支>，�使已經被檢出到其它工作�"
+msgstr "簽出 <分支>，�使已經被簽出到其它工作�"
 
 #: builtin/worktree.c:485
 msgid "create a new branch"
@@ -23401,82 +23522,78 @@ msgstr "生�新的工作�"
 msgid "keep the new working tree locked"
 msgstr "鎖定新工作�"
 
-#: builtin/worktree.c:493
+#: builtin/worktree.c:492 builtin/worktree.c:729
+msgid "reason for locking"
+msgstr "鎖定原因"
+
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "設定追蹤模�（�見 git-branch(1)）"
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "嘗試為新分支�符�一個�端追蹤分支"
 
-#: builtin/worktree.c:504
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b�-B 和 --detach 是互斥的"
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "已使用 --lock 加入"
 
-#: builtin/worktree.c:565
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "�能在建立新分支時使用 --[no-]track �項"
 
-#: builtin/worktree.c:682
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr "如果有則顯示延伸的註釋和原因"
 
-#: builtin/worktree.c:684
+#: builtin/worktree.c:693
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr "�舊於 <時間> 的工作�加上 ‘prunable’ 標示"
 
-#: builtin/worktree.c:693
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose 和 --porcelain 互斥"
-
-#: builtin/worktree.c:720
-msgid "reason for locking"
-msgstr "鎖定原因"
-
-#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
-#: builtin/worktree.c:963
+#: 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:734 builtin/worktree.c:767
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "主工作�無法被加鎖或解鎖"
 
-#: builtin/worktree.c:739
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' 已被鎖定，原因：%s"
 
-#: builtin/worktree.c:741
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' 已被鎖定"
 
-#: builtin/worktree.c:769
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' 未被鎖定"
 
-#: builtin/worktree.c:810
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "�能移動或刪除包��模組的工作�"
 
-#: builtin/worktree.c:818
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr "強制移動，�使工作�是髒的或已鎖定"
 
-#: builtin/worktree.c:841 builtin/worktree.c:965
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' 是一個主工作�"
 
-#: builtin/worktree.c:846
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
-msgstr "無法從 '%s' 算出目標�稱"
+msgstr "無法從 '%s' 算出目的地�稱"
 
-#: builtin/worktree.c:859
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -23485,7 +23602,7 @@ msgstr ""
 "無法移動一個鎖定的工作�，鎖定原因：%s\n"
 "使用 'move -f -f' 覆蓋或先解鎖"
 
-#: builtin/worktree.c:861
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -23493,36 +23610,36 @@ msgstr ""
 "無法移動一個鎖定的工作�，\n"
 "使用 'move -f -f' 覆蓋或先解鎖"
 
-#: builtin/worktree.c:864
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "驗證失敗，無法移動工作�：%s"
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "移動 '%s' 到 '%s' 失敗"
 
-#: builtin/worktree.c:915
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "在 '%s' 中執行 'git status' 失敗"
 
-#: builtin/worktree.c:919
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr "'%s' 包�修改或未追蹤的檔案，使用 --force 刪除"
 
-#: builtin/worktree.c:924
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d"
 
-#: builtin/worktree.c:947
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr "強制刪除，�使工作�是髒的或已鎖定"
 
-#: builtin/worktree.c:970
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -23531,7 +23648,7 @@ msgstr ""
 "無法刪除一個鎖定的工作�，鎖定原因：%s\n"
 "使用 'remove -f -f' 覆蓋或先解鎖"
 
-#: builtin/worktree.c:972
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -23539,17 +23656,17 @@ msgstr ""
 "無法刪除一個鎖定的工作�，\n"
 "使用 'remove -f -f' 覆蓋或先解鎖"
 
-#: builtin/worktree.c:975
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "驗證失敗，無法刪除工作�：%s"
 
-#: builtin/worktree.c:999
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "修復：%s：%s"
 
-#: builtin/worktree.c:1002
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "錯誤：%s：%s"
@@ -23600,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"
@@ -23630,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"
@@ -23643,7 +23750,7 @@ msgstr "未知�項：%s\n"
 #: git.c:375
 #, c-format
 msgid "while expanding alias '%s': '%s'"
-msgstr "在擴展別� '%s' 時：'%s'"
+msgstr "在展開別� '%s' 時：'%s'"
 
 #: git.c:384
 #, c-format
@@ -23664,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:833
+#: git.c:835
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr "檢測到別�循環：'%s'的擴展未終止：%s"
+msgstr "�測到別�循環：展開後的「%s�無窮無盡：%s"
 
-#: git.c:883
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "�能作為內建指令處� %s"
 
-#: git.c:896
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -23695,33 +23802,25 @@ msgstr ""
 "用法：%s\n"
 "\n"
 
-#: git.c:916
+#: 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:928
+#: 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 "未處��項"
@@ -23747,66 +23846,31 @@ msgstr "test-tool serve-v2 [<�項>]"
 msgid "exit immediately after advertising capabilities"
 msgstr "�能力廣告之後立�離開"
 
-#: t/helper/test-simple-ipc.c:262
-#, c-format
-msgid "socket/pipe already in use: '%s'"
-msgstr "通訊端 (socket) 或管� (pipe) 已在使用：「%s�"
-
-#: t/helper/test-simple-ipc.c:264
-#, c-format
-msgid "could not start server on: '%s'"
-msgstr "無法在下述�置啟動伺�器：「%s�"
-
-#: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331
-msgid "could not spawn daemon in the background"
-msgstr "無法在背景啟動 (spawn) 守護程�"
-
-#: t/helper/test-simple-ipc.c:356
-#| msgid "setsid failed"
-msgid "waitpid failed"
-msgstr "waitpid 失敗"
-
-#: t/helper/test-simple-ipc.c:376
-msgid "daemon not online yet"
-msgstr "守護程�尚未上線"
-
-#: t/helper/test-simple-ipc.c:406
-msgid "daemon failed to start"
-msgstr "無法啟動守護程�"
-
-#: t/helper/test-simple-ipc.c:410
-msgid "waitpid is confused"
-msgstr ""
-
-#: t/helper/test-simple-ipc.c:541
-msgid "daemon has not shutdown yet"
-msgstr "守護程�尚未關閉"
-
-#: t/helper/test-simple-ipc.c:682
+#: t/helper/test-simple-ipc.c:581
 msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
 msgstr "test-helper simple-ipc is-active    [<name>] [<options>]"
 
-#: t/helper/test-simple-ipc.c:683
+#: t/helper/test-simple-ipc.c:582
 msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
 msgstr "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
 
-#: t/helper/test-simple-ipc.c:684
+#: t/helper/test-simple-ipc.c:583
 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
 msgstr "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
 
-#: t/helper/test-simple-ipc.c:685
+#: t/helper/test-simple-ipc.c:584
 msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
 msgstr "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
 
-#: t/helper/test-simple-ipc.c:686
+#: t/helper/test-simple-ipc.c:585
 msgid "test-helper simple-ipc send         [<name>] [<token>]"
 msgstr "test-helper simple-ipc send         [<name>] [<token>]"
 
-#: t/helper/test-simple-ipc.c:687
+#: t/helper/test-simple-ipc.c:586
 msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
 msgstr "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
 
-#: t/helper/test-simple-ipc.c:688
+#: t/helper/test-simple-ipc.c:587
 msgid ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
@@ -23814,83 +23878,79 @@ msgstr ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
 
-#: t/helper/test-simple-ipc.c:696
+#: t/helper/test-simple-ipc.c:595
 msgid "name or pathname of unix domain socket"
 msgstr "Unix 網域通訊端的�稱或路徑�稱"
 
-#: t/helper/test-simple-ipc.c:698
+#: t/helper/test-simple-ipc.c:597
 msgid "named-pipe name"
 msgstr "有命�管�的�稱"
 
-#: t/helper/test-simple-ipc.c:700
+#: t/helper/test-simple-ipc.c:599
 msgid "number of threads in server thread pool"
 msgstr "伺�器執行緒集�的執行緒數�"
 
-#: t/helper/test-simple-ipc.c:701
+#: t/helper/test-simple-ipc.c:600
 msgid "seconds to wait for daemon to start or stop"
 msgstr "�等待守護程�啟動或�止多久（秒）"
 
-#: t/helper/test-simple-ipc.c:703
+#: t/helper/test-simple-ipc.c:602
 msgid "number of bytes"
 msgstr "�元組數"
 
-#: t/helper/test-simple-ipc.c:704
+#: t/helper/test-simple-ipc.c:603
 msgid "number of requests per thread"
 msgstr "�個執行緒的請求數"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "byte"
 msgstr "�元組"
 
-#: t/helper/test-simple-ipc.c:706
+#: t/helper/test-simple-ipc.c:605
 msgid "ballast character"
 msgstr "穩定 (ballast) 字元"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "token"
 msgstr "代符"
 
-#: t/helper/test-simple-ipc.c:707
+#: t/helper/test-simple-ipc.c:606
 msgid "command token to send to the server"
 msgstr "�傳�至伺�器的命令代符"
 
-#: http.c:399
+#: http.c:350
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "http.postbuffer 為負值，�設為 %d"
 
-#: http.c:420
+#: http.c:371
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "�支�委託控制，因為 cURL < 7.22.0"
 
-#: http.c:429
-msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "�支�公鑰檔案鎖定，因為 cURL < 7.44.0"
+#: http.c:380
+msgid "Public key pinning not supported with cURL < 7.39.0"
+msgstr "�支�公鑰檔案鎖定，因為 cURL < 7.39.0"
 
-#: http.c:910
+#: http.c:812
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "�支� CURLSSLOPT_NO_REVOKE，因為 cURL < 7.44.0"
 
-#: http.c:989
-msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "�支��定�制，因為 cURL < 7.19.4"
-
-#: http.c:1132
+#: http.c:1016
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "�支�的 SSL 後端 '%s'。支�的 SSL 後端："
 
-#: http.c:1139
+#: http.c:1023
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
-msgstr "無法設定 SSL 後端為 '%s'：cURL: cURL 沒有使用 SSL 後端組建"
+msgstr "無法將 SSL 後端設定為 '%s'：組建 cURL 時未加入 SSL 後端"
 
-#: http.c:1143
+#: http.c:1027
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "無法將 SSL 後端設定為 '%s'：已經設定"
 
-#: http.c:2035
+#: http.c:1876
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -23906,133 +23966,307 @@ msgstr ""
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "在 push-option �值中無效的引號：'%s'"
 
-#: remote-curl.c:307
+#: remote-curl.c:304
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs 無效：這是一個 git 版本庫嗎？"
 
-#: remote-curl.c:408
+#: remote-curl.c:405
 msgid "invalid server response; expected service, got flush packet"
 msgstr "無效的�務端回應。�期�務，得到 flush 包"
 
-#: remote-curl.c:439
+#: remote-curl.c:436
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "無效的�務端回應，得到 '%s'"
 
-#: remote-curl.c:499
+#: remote-curl.c:496
 #, c-format
 msgid "repository '%s' not found"
 msgstr "版本庫 '%s' 未找到"
 
-#: remote-curl.c:503
+#: remote-curl.c:500
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "'%s' 身份驗證失敗"
 
-#: remote-curl.c:507
+#: remote-curl.c:504
+#, c-format
+msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
+msgstr "無法� http.pinnedPubkey 之設定存�「%s�：%s"
+
+#: remote-curl.c:508
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "無法存� '%s'：%s"
 
-#: remote-curl.c:513
+#: remote-curl.c:514
 #, c-format
 msgid "redirecting to %s"
 msgstr "�定�到 %s"
 
-#: remote-curl.c:642
+#: remote-curl.c:645
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "當沒有設定溫和處�檔案��符（EOF）時，�應該有檔案��符"
 
-#: remote-curl.c:654
-msgid "remote server sent stateless separator"
-msgstr "�端伺�器傳�了無狀態的分隔符號"
+#: remote-curl.c:657
+msgid "remote server sent unexpected response end packet"
+msgstr "�端伺�器傳�了��期的回應���包"
 
-#: remote-curl.c:724
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer"
 
-#: remote-curl.c:754
+#: remote-curl.c:755
 #, c-format
 msgid "remote-curl: bad line length character: %.4s"
 msgstr "remote-curl: 錯誤的行長度字串：%.4s"
 
-#: remote-curl.c:756
+#: remote-curl.c:757
 msgid "remote-curl: unexpected response end packet"
 msgstr "remote-curl: ��期的回應���包"
 
-#: remote-curl.c:832
+#: remote-curl.c:833
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC 失敗。%s"
 
-#: remote-curl.c:872
+#: remote-curl.c:873
 msgid "cannot handle pushes this big"
 msgstr "�能處�這麼大的推�"
 
-#: remote-curl.c:987
+#: remote-curl.c:986
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "�能壓縮請求，zlib 壓縮錯誤 %d"
 
-#: remote-curl.c:991
+#: remote-curl.c:990
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "�能壓縮請求，zlib ��錯誤 %d"
 
-#: remote-curl.c:1041
+#: remote-curl.c:1040
 #, c-format
 msgid "%d bytes of length header were received"
 msgstr "收到了 %d �元組長度的標頭"
 
-#: remote-curl.c:1043
+#: remote-curl.c:1042
 #, c-format
 msgid "%d bytes of body are still expected"
 msgstr "�期��有 %d �元組的本文 (body)"
 
-#: remote-curl.c:1132
+#: remote-curl.c:1131
 msgid "dumb http transport does not support shallow capabilities"
-msgstr "啞 http 傳輸�支� shalllow 能力"
+msgstr "啞 http 傳輸�支� shallow 能力"
 
-#: remote-curl.c:1147
+#: remote-curl.c:1146
 msgid "fetch failed."
 msgstr "�得失敗。"
 
-#: remote-curl.c:1193
+#: remote-curl.c:1192
 msgid "cannot fetch by sha1 over smart http"
 msgstr "無法��智慧 HTTP �得 sha1"
 
-#: remote-curl.c:1237 remote-curl.c:1243
+#: remote-curl.c:1236 remote-curl.c:1242
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "�定錯誤：期望 sha/ref，�得到 '%s'"
 
-#: remote-curl.c:1255 remote-curl.c:1373
+#: remote-curl.c:1254 remote-curl.c:1372
 #, c-format
 msgid "http transport does not support %s"
 msgstr "http 傳輸�定�支� %s"
 
-#: remote-curl.c:1291
+#: remote-curl.c:1290
 msgid "git-http-push failed"
 msgstr "git-http-push 失敗"
 
-#: remote-curl.c:1479
+#: remote-curl.c:1478
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl：用法：git remote-curl <�端> [<url>]"
 
-#: remote-curl.c:1511
+#: remote-curl.c:1510
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl：錯誤讀�來自 git 的指令�"
 
-#: remote-curl.c:1518
+#: remote-curl.c:1517
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl：嘗試沒有本機版本庫下�得"
 
-#: remote-curl.c:1559
+#: remote-curl.c:1558
 #, c-format
 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"
@@ -24049,11 +24283,11 @@ msgstr "�數"
 msgid "object filtering"
 msgstr "物件�濾"
 
-#: parse-options.h:184
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "到期時間"
 
-#: parse-options.h:198
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "空動作（�後相容）"
 
@@ -24082,11 +24316,11 @@ msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr "如使用 --pathspec-from-file，則 <路徑�格> 元件會使用 NUL 字元分隔"
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "key"
 msgstr "key"
 
-#: ref-filter.h:99
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "排�的欄��"
 
@@ -24155,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 "尋找尚未套用到上游的�交"
@@ -24184,7 +24418,7 @@ msgstr "從工作�中刪除未追蹤檔案"
 
 #: command-list.h:72
 msgid "Clone a repository into a new directory"
-msgstr "複製版本庫到一個新目錄"
+msgstr "複製版本庫至新目錄"
 
 #: command-list.h:73
 msgid "Display data in columns"
@@ -24224,7 +24458,7 @@ msgstr "在�碟儲存密碼的�助工具"
 
 #: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
-msgstr "將一個�交匯出到 CVS 檢出中"
+msgstr "將一個�交匯出到 CVS 簽出中"
 
 #: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
@@ -24359,453 +24593,418 @@ 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 腳本設定程�碼"
+msgid "Initialize and modify the sparse-checkout"
+msgstr "�始化並修改稀�簽出"
 
 #: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
-msgstr "�始化並修改稀�檢出"
+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"
 msgstr "Git 推薦的工作�概覽"
 
-#: git-bisect.sh:68
-msgid "bisect run failed: no command provided."
-msgstr "二分�尋執行失敗：沒有�供指令。"
-
-#: git-bisect.sh:73
-#, sh-format
-msgid "running $command"
-msgstr "執行 $command"
-
-#: git-bisect.sh:80
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
-msgstr ""
-"二分�尋執行失敗：\n"
-"指令 '$command' 的離開碼 $res �於 0 或大於等於 128"
-
-#: git-bisect.sh:105
-msgid "bisect run cannot continue any more"
-msgstr "二分�尋�能繼續執行"
-
-#: git-bisect.sh:111
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect-state $state' exited with error code $res"
-msgstr ""
-"二分�尋執行失敗：\n"
-"‘bisect-state $state’ ��，錯誤碼 $res"
-
-#: git-bisect.sh:118
-msgid "bisect run success"
-msgstr "二分�尋執行�功"
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -24844,528 +25043,66 @@ msgstr "嘗試和 $pretty_name 的簡單�併"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "簡單�併未生效，嘗試自動�併。"
 
-#: git-submodule.sh:179
-msgid "Relative path can only be used from the toplevel of the working tree"
-msgstr "�能在工作�的頂級目錄中使用相�路徑"
-
-#: git-submodule.sh:189
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "版本庫 URL：'$repo' 必須是絕�路徑或以 ./|../ 起始"
-
-#: git-submodule.sh:208
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' 已經存在於索引中"
-
-#: git-submodule.sh:211
-#, sh-format
-msgid "'$sm_path' already exists in the index and is not a submodule"
-msgstr "'$sm_path' 已經存在於索引中且�是一個�模組"
-
-#: git-submodule.sh:218
-#, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' 沒有檢出的�交"
-
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "新增�於 '$sm_path' 的�存版本庫到索引"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "'$sm_path' 已存在且�是一個有效的 git 版本庫"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr "本機發� '$sm_name' 的一個 git 目錄，與其�應的�端版本庫："
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-"  $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"如果您想��用這個本機 git 目錄而��新複製自\n"
-"  $realrepo\n"
-"使用 '--force' �項。如果本機 git 目錄�是正確的版本庫\n"
-"或者您�確定這裡的�義，使用 '--name' �項�擇�外的�稱。"
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "啟動本機 git 目錄到�模組 '$sm_name'。"
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "�能檢出�模組 '$sm_path'"
-
-#: git-submodule.sh:284
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "無法新增�模組 '$sm_path'"
-
-#: git-submodule.sh:293
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "無法註冊�模組 '$sm_path'"
-
-#: git-submodule.sh:568
+#: git-submodule.sh:401
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "無法在�模組路徑 '$displaypath' 中找到目�版本"
 
-#: git-submodule.sh:578
+#: git-submodule.sh:411
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "無法在�模組路徑 '$sm_path' 中�得"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:416
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr "無法在�模組路徑 '$sm_path' 中找到目�版本 ${remote_name}/${branch}"
 
-#: git-submodule.sh:601
-#, sh-format
-msgid ""
-"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
-"$sha1:"
-msgstr "無法在�模組路徑 '$displaypath' 中�得，嘗試直接�得 $sha1："
-
-#: git-submodule.sh:607
-#, sh-format
-msgid ""
-"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
-"Direct fetching of that commit failed."
-msgstr ""
-"�得了�模組路徑 '$displaypath'，但是它沒有包� $sha1。直接�得該�交失敗。"
-
-#: git-submodule.sh:614
-#, sh-format
-msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "無法在�模組路徑 '$displaypath' 中檢出 '$sha1'"
-
-#: git-submodule.sh:615
-#, sh-format
-msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "�模組路徑 '$displaypath'：檢出 '$sha1'"
-
-#: git-submodule.sh:619
-#, sh-format
-msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr "無法在�模組路徑 '$displaypath' 中�定基底 '$sha1'"
-
-#: git-submodule.sh:620
-#, sh-format
-msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "�模組路徑 '$displaypath'：�定基底至 '$sha1'"
-
-#: git-submodule.sh:625
-#, sh-format
-msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "無法�併 '$sha1' 到�模組路徑 '$displaypath' 中"
-
-#: git-submodule.sh:626
-#, sh-format
-msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "�模組路徑 '$displaypath'：已�併入 '$sha1'"
-
-#: git-submodule.sh:631
-#, sh-format
-msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
-msgstr "在�模組 '$displaypath' 中執行 '$command $sha1' 失敗"
-
-#: git-submodule.sh:632
-#, sh-format
-msgid "Submodule path '$displaypath': '$command $sha1'"
-msgstr "�模組 '$displaypath'：'$command $sha1'"
-
-#: git-submodule.sh:663
+#: git-submodule.sh:464
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "無法�迴進�模組路徑 '$displaypath'"
 
-#: git-rebase--preserve-merges.sh:109
-msgid "Applied autostash."
-msgstr "已套用 autostash。"
-
-#: git-rebase--preserve-merges.sh:112
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "�能儲存 $stash_sha1"
-
-#: git-rebase--preserve-merges.sh:113
-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"
-
-#: git-rebase--preserve-merges.sh:191
-#, sh-format
-msgid "Rebasing ($new_count/$total)"
-msgstr "�定基底中（$new_count/$total）"
-
-#: git-rebase--preserve-merges.sh:197
-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"
-
-#: git-rebase--preserve-merges.sh:260
-#, 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"
-
-#: git-rebase--preserve-merges.sh:285
-#, sh-format
-msgid "$sha1: not a commit that can be picked"
-msgstr "$sha1：�是一個�以被��的�交"
-
-#: git-rebase--preserve-merges.sh:324
-#, sh-format
-msgid "Invalid commit name: $sha1"
-msgstr "無效的�交�：$sha1"
-
-#: git-rebase--preserve-merges.sh:354
-msgid "Cannot write current commit's replacement sha1"
-msgstr "�能寫入目��交的替代 sha1"
-
-#: git-rebase--preserve-merges.sh:405
-#, sh-format
-msgid "Fast-forward to $sha1"
-msgstr "快轉到 $sha1"
-
-#: git-rebase--preserve-merges.sh:407
-#, sh-format
-msgid "Cannot fast-forward to $sha1"
-msgstr "�能快轉到 $sha1"
-
-#: git-rebase--preserve-merges.sh:416
-#, sh-format
-msgid "Cannot move HEAD to $first_parent"
-msgstr "�能移動 HEAD 到 $first_parent"
-
-#: git-rebase--preserve-merges.sh:421
-#, sh-format
-msgid "Refusing to squash a merge: $sha1"
-msgstr "拒絕壓縮一個�併：$sha1"
-
-#: git-rebase--preserve-merges.sh:439
-#, sh-format
-msgid "Error redoing merge $sha1"
-msgstr "無法���併 $sha1"
-
-#: git-rebase--preserve-merges.sh:448
-#, sh-format
-msgid "Could not pick $sha1"
-msgstr "�能�� $sha1"
-
-#: git-rebase--preserve-merges.sh:457
-#, sh-format
-msgid "This is the commit message #${n}:"
-msgstr "這是�交說明 #${n}："
-
-#: git-rebase--preserve-merges.sh:462
-#, sh-format
-msgid "The commit message #${n} will be skipped:"
-msgstr "�交說明 #${n} 將被略�："
-
-#: git-rebase--preserve-merges.sh:473
-#, sh-format
-msgid "This is a combination of $count commit."
-msgid_plural "This is a combination of $count commits."
-msgstr[0] "這是一個 $count 個�交的組�。"
-
-#: git-rebase--preserve-merges.sh:482
-#, sh-format
-msgid "Cannot write $fixup_msg"
-msgstr "�能寫入 $fixup_msg"
-
-#: git-rebase--preserve-merges.sh:485
-msgid "This is a combination of 2 commits."
-msgstr "這是一個 2 個�交的組�。"
-
-#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
-#: git-rebase--preserve-merges.sh:572
-#, sh-format
-msgid "Could not apply $sha1... $rest"
-msgstr "�能套用 $sha1... $rest"
-
-#: git-rebase--preserve-merges.sh:601
-#, 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"
-"掛鉤執行失敗，你�能需�在�寫�交說明�解決這個�題。"
-
-#: git-rebase--preserve-merges.sh:616
-#, sh-format
-msgid "Stopped at $sha1_abbrev... $rest"
-msgstr "�止在 $sha1_abbrev... $rest"
-
-#: git-rebase--preserve-merges.sh:631
-#, sh-format
-msgid "Cannot '$squash_style' without a previous commit"
-msgstr "沒有父�交的情�下�能 '$squash_style'"
-
-#: git-rebase--preserve-merges.sh:673
-#, sh-format
-msgid "Executing: $rest"
-msgstr "執行：$rest"
-
-#: git-rebase--preserve-merges.sh:681
-#, sh-format
-msgid "Execution failed: $rest"
-msgstr "執行失敗：$rest"
-
-#: git-rebase--preserve-merges.sh:683
-msgid "and made changes to the index and/or the working tree"
-msgstr "並且修改索引和/或工作�"
-
-#  譯者：請維��導空格
-#: git-rebase--preserve-merges.sh:685
-msgid ""
-"You can fix the problem, and then run\n"
-"\n"
-"\tgit rebase --continue"
-msgstr ""
-"您�以解決這個�題，然後執行\n"
-"\n"
-"\tgit rebase --continue"
-
-#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:698
-#, 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"
-
-#: git-rebase--preserve-merges.sh:709
-#, sh-format
-msgid "Unknown command: $command $sha1 $rest"
-msgstr "未知指令：$command $sha1 $rest"
-
-#: git-rebase--preserve-merges.sh:710
-msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "�修改請使用指令 'git rebase --edit-todo'。"
-
-#: git-rebase--preserve-merges.sh:745
-#, sh-format
-msgid "Successfully rebased and updated $head_name."
-msgstr "�功�定基底並更新 $head_name。"
-
-#: git-rebase--preserve-merges.sh:802
-msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "�能刪除 CHERRY_PICK_HEAD"
-
-#: git-rebase--preserve-merges.sh:807
-#, 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"
-
-#: git-rebase--preserve-merges.sh:824
-msgid "Error trying to find the author identity to amend commit"
-msgstr "在修補�交中尋找作者訊�時�到錯誤"
-
-#: git-rebase--preserve-merges.sh:829
-msgid ""
-"You have uncommitted changes in your working tree. Please commit them\n"
-"first and then run 'git rebase --continue' again."
-msgstr ""
-"您的工作�中有未�交的變更。請先�交然後�次執行 'git rebase --continue'。"
-
-#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
-msgid "Could not commit staged changes."
-msgstr "�能�交暫存的修改。"
-
-#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
-msgid "Could not execute editor"
-msgstr "無法執行編輯器"
-
-#: git-rebase--preserve-merges.sh:890
-#, sh-format
-msgid "Could not checkout $switch_to"
-msgstr "�能檢出 $switch_to"
-
-#: git-rebase--preserve-merges.sh:897
-msgid "No HEAD?"
-msgstr "沒有 HEAD？"
-
-#: git-rebase--preserve-merges.sh:898
-#, sh-format
-msgid "Could not create temporary $state_dir"
-msgstr "�能建立暫時 $state_dir"
-
-#: git-rebase--preserve-merges.sh:901
-msgid "Could not mark as interactive"
-msgstr "�能標記為互動�"
-
-#: git-rebase--preserve-merges.sh:933
-#, sh-format
-msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-msgstr[0] "�定基底 $shortrevisions 到 $shortonto（$todocount 個�交）"
-
-#: git-rebase--preserve-merges.sh:945
-msgid "Note that empty commits are commented out"
-msgstr "注�空�交已被備註掉"
-
-#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
-msgid "Could not init rewritten commits"
-msgstr "�能��寫�交進行�始化"
-
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 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
-msgid "Cannot rebase: You have unstaged changes."
-msgstr "�能�定基底：您有未暫存的變更。"
-
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr "�能�寫分支：您有未暫存的變更。"
 
-#: git-sh-setup.sh:227
-msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "無法���定基底方�拉�：您有未暫存的變更。"
-
-#: git-sh-setup.sh:230
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "�能 $action：您有未暫存的變更。"
 
-#: git-sh-setup.sh:243
-msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "�能�定基底：您的索引中包�未�交的變更。"
-
-#: git-sh-setup.sh:246
-msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr "無法���定基底方�拉�：您的索引中包�未�交的變更。"
-
-#: git-sh-setup.sh:249
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr "�能 $action：您的索引中包�未�交的變更。"
 
-#: git-sh-setup.sh:253
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "而且您的索引中包�未�交的變更。"
 
-#: git-sh-setup.sh:373
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr "您需�在工作�的頂級目錄中執行這個指令。"
 
-#: git-sh-setup.sh:378
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr "�能確定 git 目錄的絕�路徑"
 
@@ -25436,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"
@@ -25450,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"
@@ -25464,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"
@@ -25478,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"
@@ -25492,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"
@@ -25506,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"
@@ -25520,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"
@@ -25534,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"
@@ -25548,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"
@@ -25561,7 +25298,7 @@ msgid ""
 "? - print help\n"
 msgstr ""
 "g - �擇跳轉到一個�塊\n"
-"/ - 尋找和�供正�表示�符�的�塊\n"
+"/ - 尋找和�供常�表示�符�的�塊\n"
 "j - 維�此�塊未決狀態，檢視下一個未決定�塊\n"
 "J - 維�此�塊未決狀態，檢視下一個�塊\n"
 "k - 維�此�塊未決狀態，檢視上一個未決定�塊\n"
@@ -25570,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"
+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"
@@ -25668,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:138
+#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "本機時間和 GMT 有�到一分�間隔\n"
 
-#: git-send-email.perl:145 git-send-email.perl:151
+#: 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:222
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "致命錯誤：命令「%s�中止，��碼：%d"
 
-#: git-send-email.perl:235
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "編輯器�正常離開，終止所有動作"
 
-#: git-send-email.perl:321
+#: 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:326
+#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' 包�編輯的信件。\n"
 
-#: git-send-email.perl:419
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases 和其它�項�相容\n"
 
-#: git-send-email.perl:493
+#: 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"
@@ -25727,47 +25464,47 @@ msgstr ""
 "git-send-email 已經以 sendemail.* �項設定 - 注�裡�的 'e'。\n"
 "請將 sendemail.forbidSendmailVariables 設為 false �用此檢查。\n"
 
-#: git-send-email.perl:498 git-send-email.perl:700
+#: 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:501
+#: 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:514
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "未知的 --suppress-cc 欄�：'%s'\n"
 
-#: git-send-email.perl:545
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "未知的 --confirm 設定：'%s'\n"
 
-#: git-send-email.perl:573
+#: 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:575
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "警告：�支� `:include:`：%s\n"
 
-#: git-send-email.perl:577
+#: 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:582
+#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "警告：�能識別的 sendmail 行：%s\n"
 
-#: git-send-email.perl:666
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -25782,12 +25519,12 @@ msgstr ""
 "    * 如果�義為一個檔案，使用 \"./%s\"，或者\n"
 "    * 如果�義為一個範�，使用 --format-patch �項。\n"
 
-#: git-send-email.perl:687
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "無法開啟目錄 %s: %s"
 
-#: git-send-email.perl:720
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -25797,17 +25534,17 @@ msgstr ""
 "未指定修補檔案�\n"
 "\n"
 
-#: git-send-email.perl:733
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "在 %s 中沒有標題行？"
 
-#: git-send-email.perl:743
+#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "為寫入開啟 %s 失敗: %s"
 
-#: git-send-email.perl:754
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -25820,37 +25557,37 @@ msgstr ""
 "\n"
 "如果您�想傳�摘�，清除內容。\n"
 
-#: git-send-email.perl:778
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "無法開啟 %s: %s"
 
-#: git-send-email.perl:795
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "無法開啟 %s.final: %s"
 
-#: git-send-email.perl:838
+#: 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:873
+#: 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:928
+#: 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:933
+#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "�宣告 8bit 為什麼樣的編碼格� [UTF-8]？ "
 
-#: git-send-email.perl:941
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -25862,20 +25599,20 @@ msgstr ""
 "\t%s\n"
 "包�範本標題 '*** SUBJECT HERE ***'。如果確定想�傳�，使用�數 --force。\n"
 
-#: git-send-email.perl:960
+#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "信件將�傳�給誰？"
 
-#: git-send-email.perl:978
+#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
-msgstr "致命錯誤：別� '%s' 擴展為它自己\n"
+msgstr "致命錯誤：別� '%s' 展開後還是自己\n"
 
-#: git-send-email.perl:990
+#: 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:1048 git-send-email.perl:1056
+#: 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"
@@ -25883,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:1060
+#: 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)："
+msgstr "如何處�這個��？([q]uit|[d]rop|[e]dit)： "
 
-#: git-send-email.perl:1377
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA 路徑 \"%s\" �存在"
 
-#: git-send-email.perl:1460
+#: 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"
@@ -25905,124 +25642,124 @@ msgid ""
 "    run 'git config --global sendemail.confirm auto'.\n"
 "\n"
 msgstr ""
-"    以上的抄�列表（Cc）已經用修補檔�交說明中發�的��進行\n"
-"    了擴展。�設 send-email 會給出�示。這個行為�以��\n"
+"    以上的 CC 清單已經用修補檔�交說明中發�的��進行展開。\n"
+"    �設 send-email 會給出�示。這個行為�以��\n"
 "    sendemail.confirm 設定設定。\n"
 "\n"
-"    更多訊�，執行 'git send-email --help'。\n"
-"    ���目�行為，但�顯示此訊�，執行 'git config --global\n"
+"    更多資訊，請執行 'git send-email --help'。\n"
+"    ���目�行為，但�顯示此訊�，請執行 'git config --global\n"
 "    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:1475
+#: 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:1478
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "傳��求的信件回復"
 
-#: git-send-email.perl:1506
+#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "�求的 SMTP 伺�器未被正確定義。"
 
-#: git-send-email.perl:1553
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "伺�器�支� STARTTLS�%s"
 
-#: git-send-email.perl:1558 git-send-email.perl:1562
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS 失敗�%s"
 
-#: git-send-email.perl:1571
+#: 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:1589
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "無法傳� %s\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "測試執行傳� %s\n"
 
-#: git-send-email.perl:1592
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "正傳� %s\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "測試執行�功。日誌說：\n"
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK。日誌說：\n"
 
-#: git-send-email.perl:1606
+#: git-send-email.perl:1724
 msgid "Result: "
-msgstr "�果："
+msgstr "�果： "
 
-#: git-send-email.perl:1609
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "�果：OK\n"
 
-#: git-send-email.perl:1627
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "無法開啟檔案 %s"
 
-#: git-send-email.perl:1674 git-send-email.perl:1694
+#: 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:1680
+#: 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:1737
+#: 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:1772
+#: 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:1883
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) �能執行 '%s'"
 
-#: git-send-email.perl:1890
+#: 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:1894
+#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) 無法關閉管�至 '%s'"
 
-#: git-send-email.perl:1924
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "�能以 7bit 形�傳�訊�"
 
-#: git-send-email.perl:1932
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "無效的傳�編碼"
 
-#: git-send-email.perl:1966
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -26033,12 +25770,12 @@ msgstr ""
 "%s\n"
 "警告：修補檔未能傳�\n"
 
-#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039
+#: 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:1979
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26047,16 +25784,868 @@ msgstr ""
 "致命錯誤：%s:%d 的字元數超� 998\n"
 "警告：修補檔未能傳�\n"
 
-#: git-send-email.perl:1997
+#: 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:2001
+#: git-send-email.perl:2130
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
-msgstr "您真的�傳� %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"
+#~ "entries outside the current sparse checkout:\n"
+#~ msgstr ""
+#~ "下列路徑�格�符�任何��路徑，\n"
+#~ "但符�目�稀�簽出外的索引項目：\n"
+
+#~ msgid ""
+#~ "Disable or modify the sparsity rules if you intend to update such entries."
+#~ msgstr "若有�更新這些項目，請�用或修改稀��則。"
+
+#~ msgid "could not set GIT_DIR to '%s'"
+#~ msgstr "�能設定 GIT_DIR 為 '%s'"
+
+#~ msgid "unable to unpack %s header with --allow-unknown-type"
+#~ msgstr "無法用 --allow-unknown-type �數解開 %s 標頭訊�"
+
+#~ 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 "無法更新快�樹，��完整"
+
+#~ msgid "Could not open '%s' for writing."
+#~ msgstr "無法為寫入開啟 '%s'。"
+
+#~ 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 個�數"
+
+#~ msgid "couldn't create a new file at '%s'"
+#~ msgstr "��在「%s�建立新檔案"
+
+#~ msgid "git commit-tree: failed to open '%s'"
+#~ msgstr "git commit-tree：無法開啟 '%s'"
+
+#~ msgid "cannot open packfile '%s'"
+#~ msgstr "無法開啟 packfile '%s'"
+
+#~ msgid "cannot store pack file"
+#~ msgstr "無法儲存包檔案"
+
+#~ msgid "cannot store index file"
+#~ msgstr "無法儲存索引檔案"
+
+#~ msgid "exclude patterns are read from <file>"
+#~ msgstr "從 <檔案> 中讀�排除模�"
+
+#~ msgid "Unknown option for merge-recursive: -X%s"
+#~ msgstr "merge-recursive 的未知�項：-X%s"
+
+#~ 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 "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 <�稱>"
+
+#~ msgid "failed to create file %s"
+#~ msgstr "建立檔案 %s 失敗"
+
+#~ msgid "exit immediately after initial ref advertisement"
+#~ msgstr "在�始的引用廣告後立�離開"
+
+#~ msgid "socket/pipe already in use: '%s'"
+#~ msgstr "通訊端 (socket) 或管� (pipe) 已在使用：「%s�"
+
+#~ msgid "could not start server on: '%s'"
+#~ msgstr "無法在下述�置啟動伺�器：「%s�"
+
+#~ msgid "could not spawn daemon in the background"
+#~ msgstr "無法在背景啟動 (spawn) 守護程�"
+
+#~ 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"
+
+#~ msgid "running $command"
+#~ msgstr "執行 $command"
+
+#~ msgid "'$sm_path' does not have a commit checked out"
+#~ msgstr "'$sm_path' 沒有簽出的�交"
+
+#~ msgid "Submodule path '$displaypath': '$command $sha1'"
+#~ msgstr "�模組 '$displaypath'：'$command $sha1'"
+
+#~ msgid "Applied autostash."
+#~ msgstr "已套用 autostash。"
+
+#~ 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"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "$sha1: not a commit that can be picked"
+#~ msgstr "$sha1：�是一個�以被��的�交"
+
+#~ msgid "Invalid commit name: $sha1"
+#~ msgstr "無效的�交�：$sha1"
+
+#~ msgid "Cannot write current commit's replacement sha1"
+#~ msgstr "�能寫入目��交的替代 sha1"
+
+#~ msgid "Fast-forward to $sha1"
+#~ msgstr "快轉到 $sha1"
+
+#~ msgid "Cannot fast-forward to $sha1"
+#~ msgstr "�能快轉到 $sha1"
+
+#~ msgid "Cannot move HEAD to $first_parent"
+#~ msgstr "�能移動 HEAD 到 $first_parent"
+
+#~ msgid "Refusing to squash a merge: $sha1"
+#~ msgstr "拒絕壓縮一個�併：$sha1"
+
+#~ msgid "Error redoing merge $sha1"
+#~ msgstr "無法���併 $sha1"
+
+#~ msgid "Could not pick $sha1"
+#~ msgstr "�能�� $sha1"
+
+#~ msgid "This is the commit message #${n}:"
+#~ msgstr "這是�交說明 #${n}："
+
+#~ msgid "The commit message #${n} will be skipped:"
+#~ msgstr "�交說明 #${n} 將被略�："
+
+#~ msgid "This is a combination of $count commit."
+#~ msgid_plural "This is a combination of $count commits."
+#~ msgstr[0] "這是一個 $count 個�交的組�。"
+
+#~ msgid "Cannot write $fixup_msg"
+#~ msgstr "�能寫入 $fixup_msg"
+
+#~ msgid "This is a combination of 2 commits."
+#~ msgstr "這是一個 2 個�交的組�。"
+
+#~ msgid "Could not apply $sha1... $rest"
+#~ msgstr "�能套用 $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 ""
+#~ "�能在�功�� $sha1... $rest 之後修補�交\n"
+#~ "這通常是因為空的�交說明，或者 pre-commit 掛鉤執行失敗。如果是 pre-"
+#~ "commit\n"
+#~ "掛鉤執行失敗，你�能需�在�寫�交說明�解決這個�題。"
+
+#~ msgid "Stopped at $sha1_abbrev... $rest"
+#~ msgstr "�止在 $sha1_abbrev... $rest"
+
+#~ msgid "Cannot '$squash_style' without a previous commit"
+#~ msgstr "沒有父�交的情�下�能 '$squash_style'"
+
+#~ msgid "Executing: $rest"
+#~ msgstr "執行：$rest"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "Unknown command: $command $sha1 $rest"
+#~ msgstr "未知指令：$command $sha1 $rest"
+
+#~ msgid "Please fix this using 'git rebase --edit-todo'."
+#~ msgstr "�修改請使用指令 'git rebase --edit-todo'。"
+
+#~ msgid "Successfully rebased and updated $head_name."
+#~ msgstr "�功�定基底並更新 $head_name。"
+
+#~ msgid "Could not remove CHERRY_PICK_HEAD"
+#~ msgstr "�能刪除 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 ""
+#~ "您已暫存了工作�的修改。如果這些修改�壓縮到�一個�交，執行：\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 "無法執行編輯器"
+
+#~ msgid "Could not checkout $switch_to"
+#~ msgstr "�能簽出 $switch_to"
+
+#~ msgid "No HEAD?"
+#~ msgstr "沒有 HEAD？"
+
+#~ msgid "Could not create temporary $state_dir"
+#~ msgstr "�能建立暫時 $state_dir"
+
+#~ msgid "Could not mark as interactive"
+#~ msgstr "�能標記為互動�"
+
+#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
+#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
+#~ msgstr[0] "�定基底 $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 "無法���定基底方�拉�：您的索引中包�未�交的變更。"
+
+#~ msgid "unable to write stateless separator packet"
+#~ msgstr "無法寫入無狀態的分隔符號�包"
+
+#~ 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 "�端伺�器傳�了無狀態的分隔符號"
 
 #~ msgid "--cached and --3way cannot be used together."
 #~ msgstr "--cached 和 --3way �能�時使用。"
@@ -26067,7 +26656,6 @@ msgstr "您真的�傳� %s？[y|N]："
 #~ msgid "one"
 #~ msgstr "一方"
 
-#, c-format
 #~ msgid "Already up to date!"
 #~ msgstr "已經是最新的�"
 
@@ -26087,7 +26675,6 @@ msgstr "您真的�傳� %s？[y|N]："
 #~ "� rebase.useBuiltin 的支�已被刪除�\n"
 #~ "詳見 'git help config' 中的�目。"
 
-#, perl-format
 #~ msgid "%s: patch contains a line longer than 998 characters"
 #~ msgstr "%s：修補檔包�一個超� 998 字元的行"
 
@@ -26100,11 +26687,9 @@ msgstr "您真的�傳� %s？[y|N]："
 #~ msgid "repository is shallow; skipping commit-graph"
 #~ msgstr "版本庫是淺複製；忽略�交圖形"
 
-#, c-format
 #~ msgid "commit-graph improper chunk offset %08x%08x"
 #~ msgstr "�交圖形�正確的�塊�移 %08x%08x"
 
-#, c-format
 #~ msgid "commit-graph chunk id %08x appears multiple times"
 #~ msgstr "�交圖形�塊 id %08x 出�了多次"
 
@@ -26155,11 +26740,9 @@ msgstr "您真的�傳� %s？[y|N]："
 #~ msgid "Force progress reporting"
 #~ msgstr "強制進度顯示"
 
-#, c-format
 #~ msgid "Error deleting remote-tracking branch '%s'"
 #~ msgstr "無法刪除�端追蹤分支 '%s'"
 
-#, c-format
 #~ msgid "Error deleting branch '%s'"
 #~ msgstr "無法刪除分支 '%s'"
 
@@ -26178,6 +26761,5 @@ msgstr "您真的�傳� %s？[y|N]："
 #~ msgid "too many params"
 #~ msgstr "太多�數"
 
-#, sh-format
 #~ msgid "Bad rev input: $arg"
 #~ msgstr "壞的輸入版本：$arg"
diff --git a/pretty.c b/pretty.c
index b1ecd039ce..ee6114e3f0 100644
--- a/pretty.c
+++ b/pretty.c
@@ -431,6 +431,52 @@ const char *show_ident_date(const struct ident_split *ident,
 	return show_date(date, tz, mode);
 }
 
+static inline void strbuf_add_with_color(struct strbuf *sb, const char *color,
+					 const char *buf, size_t buflen)
+{
+	strbuf_addstr(sb, color);
+	strbuf_add(sb, buf, buflen);
+	if (*color)
+		strbuf_addstr(sb, GIT_COLOR_RESET);
+}
+
+static void append_line_with_color(struct strbuf *sb, struct grep_opt *opt,
+				   const char *line, size_t linelen,
+				   int color, enum grep_context ctx,
+				   enum grep_header_field field)
+{
+	const char *buf, *eol, *line_color, *match_color;
+	regmatch_t match;
+	int eflags = 0;
+
+	buf = line;
+	eol = buf + linelen;
+
+	if (!opt || !want_color(color) || opt->invert)
+		goto end;
+
+	line_color = opt->colors[GREP_COLOR_SELECTED];
+	match_color = opt->colors[GREP_COLOR_MATCH_SELECTED];
+
+	while (grep_next_match(opt, buf, eol, ctx, &match, field, eflags)) {
+		if (match.rm_so == match.rm_eo)
+			break;
+
+		strbuf_add_with_color(sb, line_color, buf, match.rm_so);
+		strbuf_add_with_color(sb, match_color, buf + match.rm_so,
+				      match.rm_eo - match.rm_so);
+		buf += match.rm_eo;
+		eflags = REG_NOTBOL;
+	}
+
+	if (eflags)
+		strbuf_add_with_color(sb, line_color, buf, eol - buf);
+	else {
+end:
+		strbuf_add(sb, buf, eol - buf);
+	}
+}
+
 void pp_user_info(struct pretty_print_context *pp,
 		  const char *what, struct strbuf *sb,
 		  const char *line, const char *encoding)
@@ -496,9 +542,26 @@ void pp_user_info(struct pretty_print_context *pp,
 			strbuf_addch(sb, '\n');
 		strbuf_addf(sb, " <%.*s>\n", (int)maillen, mailbuf);
 	} else {
-		strbuf_addf(sb, "%s: %.*s%.*s <%.*s>\n", what,
-			    (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0, "    ",
-			    (int)namelen, namebuf, (int)maillen, mailbuf);
+		struct strbuf id = STRBUF_INIT;
+		enum grep_header_field field = GREP_HEADER_FIELD_MAX;
+		struct grep_opt *opt = pp->rev ? &pp->rev->grep_filter : NULL;
+
+		if (!strcmp(what, "Author"))
+			field = GREP_HEADER_AUTHOR;
+		else if (!strcmp(what, "Commit"))
+			field = GREP_HEADER_COMMITTER;
+
+		strbuf_addf(sb, "%s: ", what);
+		if (pp->fmt == CMIT_FMT_FULLER)
+			strbuf_addchars(sb, ' ', 4);
+
+		strbuf_addf(&id, "%.*s <%.*s>", (int)namelen, namebuf,
+			    (int)maillen, mailbuf);
+
+		append_line_with_color(sb, opt, id.buf, id.len, pp->color,
+				       GREP_CONTEXT_HEAD, field);
+		strbuf_addch(sb, '\n');
+		strbuf_release(&id);
 	}
 
 	switch (pp->fmt) {
@@ -1212,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;
 }
@@ -1432,8 +1533,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 			check_commit_signature(c->commit, &(c->signature_check));
 		switch (placeholder[1]) {
 		case 'G':
-			if (c->signature_check.gpg_output)
-				strbuf_addstr(sb, c->signature_check.gpg_output);
+			if (c->signature_check.output)
+				strbuf_addstr(sb, c->signature_check.output);
 			break;
 		case '?':
 			switch (c->signature_check.result) {
@@ -1735,6 +1836,10 @@ static size_t userformat_want_item(struct strbuf *sb, const char *placeholder,
 	case 'S':
 		w->source = 1;
 		break;
+	case 'd':
+	case 'D':
+		w->decorate = 1;
+		break;
 	}
 	return 0;
 }
@@ -1931,8 +2036,9 @@ static int pp_utf8_width(const char *start, const char *end)
 	return width;
 }
 
-static void strbuf_add_tabexpand(struct strbuf *sb, int tabwidth,
-				 const char *line, int linelen)
+static void strbuf_add_tabexpand(struct strbuf *sb, struct grep_opt *opt,
+				 int color, int tabwidth, const char *line,
+				 int linelen)
 {
 	const char *tab;
 
@@ -1949,7 +2055,9 @@ static void strbuf_add_tabexpand(struct strbuf *sb, int tabwidth,
 			break;
 
 		/* Output the data .. */
-		strbuf_add(sb, line, tab - line);
+		append_line_with_color(sb, opt, line, tab - line, color,
+				       GREP_CONTEXT_BODY,
+				       GREP_HEADER_FIELD_MAX);
 
 		/* .. and the de-tabified tab */
 		strbuf_addchars(sb, ' ', tabwidth - (width % tabwidth));
@@ -1964,7 +2072,8 @@ static void strbuf_add_tabexpand(struct strbuf *sb, int tabwidth,
 	 * worrying about width - there's nothing more to
 	 * align.
 	 */
-	strbuf_add(sb, line, linelen);
+	append_line_with_color(sb, opt, line, linelen, color, GREP_CONTEXT_BODY,
+			       GREP_HEADER_FIELD_MAX);
 }
 
 /*
@@ -1976,11 +2085,16 @@ static void pp_handle_indent(struct pretty_print_context *pp,
 			     struct strbuf *sb, int indent,
 			     const char *line, int linelen)
 {
+	struct grep_opt *opt = pp->rev ? &pp->rev->grep_filter : NULL;
+
 	strbuf_addchars(sb, ' ', indent);
 	if (pp->expand_tabs_in_log)
-		strbuf_add_tabexpand(sb, pp->expand_tabs_in_log, line, linelen);
+		strbuf_add_tabexpand(sb, opt, pp->color, pp->expand_tabs_in_log,
+				     line, linelen);
 	else
-		strbuf_add(sb, line, linelen);
+		append_line_with_color(sb, opt, line, linelen, pp->color,
+				       GREP_CONTEXT_BODY,
+				       GREP_HEADER_FIELD_MAX);
 }
 
 static int is_mboxrd_from(const char *line, int len)
@@ -1998,7 +2112,9 @@ void pp_remainder(struct pretty_print_context *pp,
 		  struct strbuf *sb,
 		  int indent)
 {
+	struct grep_opt *opt = pp->rev ? &pp->rev->grep_filter : NULL;
 	int first = 1;
+
 	for (;;) {
 		const char *line = *msg_p;
 		int linelen = get_one_line(line);
@@ -2019,14 +2135,17 @@ void pp_remainder(struct pretty_print_context *pp,
 		if (indent)
 			pp_handle_indent(pp, sb, indent, line, linelen);
 		else if (pp->expand_tabs_in_log)
-			strbuf_add_tabexpand(sb, pp->expand_tabs_in_log,
-					     line, linelen);
+			strbuf_add_tabexpand(sb, opt, pp->color,
+					     pp->expand_tabs_in_log, line,
+					     linelen);
 		else {
 			if (pp->fmt == CMIT_FMT_MBOXRD &&
 					is_mboxrd_from(line, linelen))
 				strbuf_addch(sb, '>');
 
-			strbuf_add(sb, line, linelen);
+			append_line_with_color(sb, opt, line, linelen,
+					       pp->color, GREP_CONTEXT_BODY,
+					       GREP_HEADER_FIELD_MAX);
 		}
 		strbuf_addch(sb, '\n');
 	}
diff --git a/pretty.h b/pretty.h
index f034609e4d..2f16acd213 100644
--- a/pretty.h
+++ b/pretty.h
@@ -65,12 +65,16 @@ static inline int cmit_fmt_is_mail(enum cmit_fmt fmt)
 	return (fmt == CMIT_FMT_EMAIL || fmt == CMIT_FMT_MBOXRD);
 }
 
+/*
+ * Examine the user-specified format given by "fmt" (or if NULL, the global one
+ * previously saved by get_commit_format()), and set flags based on which items
+ * the format will need when it is expanded.
+ */
 struct userformat_want {
 	unsigned notes:1;
 	unsigned source:1;
+	unsigned decorate:1;
 };
-
-/* Set the flag "w->notes" if there is placeholder %N in "fmt". */
 void userformat_find_requirements(const char *fmt, struct userformat_want *w);
 
 /*
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/protocol-caps.c b/protocol-caps.c
index 13a9e63a04..bbde91810a 100644
--- a/protocol-caps.c
+++ b/protocol-caps.c
@@ -69,13 +69,13 @@ static void send_info(struct repository *r, struct packet_writer *writer,
 			}
 		}
 
-		packet_writer_write(writer, "%s",
-				    strbuf_detach(&send_buffer, NULL));
+		packet_writer_write(writer, "%s", send_buffer.buf);
+		strbuf_reset(&send_buffer);
 	}
+	strbuf_release(&send_buffer);
 }
 
-int cap_object_info(struct repository *r, struct strvec *keys,
-		    struct packet_reader *request)
+int cap_object_info(struct repository *r, struct packet_reader *request)
 {
 	struct requested_info info;
 	struct packet_writer writer;
diff --git a/protocol-caps.h b/protocol-caps.h
index 0a9f49df11..15c4550360 100644
--- a/protocol-caps.h
+++ b/protocol-caps.h
@@ -2,9 +2,7 @@
 #define PROTOCOL_CAPS_H
 
 struct repository;
-struct strvec;
 struct packet_reader;
-int cap_object_info(struct repository *r, struct strvec *keys,
-		    struct packet_reader *request);
+int cap_object_info(struct repository *r, struct packet_reader *request);
 
 #endif /* PROTOCOL_CAPS_H */
diff --git a/protocol.c b/protocol.c
index 052d7edbb9..c53f7df5be 100644
--- a/protocol.c
+++ b/protocol.c
@@ -73,6 +73,8 @@ enum protocol_version determine_protocol_version_server(void)
 		string_list_clear(&list, 0);
 	}
 
+	trace2_data_intmax("transfer", NULL, "negotiated-version", version);
+
 	return version;
 }
 
diff --git a/quote.c b/quote.c
index 8a3a5e39eb..26719d21d1 100644
--- a/quote.c
+++ b/quote.c
@@ -471,6 +471,23 @@ void perl_quote_buf(struct strbuf *sb, const char *src)
 	strbuf_addch(sb, sq);
 }
 
+void perl_quote_buf_with_len(struct strbuf *sb, const char *src, size_t len)
+{
+	const char sq = '\'';
+	const char bq = '\\';
+	const char *c = src;
+	const char *end = src + len;
+
+	strbuf_addch(sb, sq);
+	while (c != end) {
+		if (*c == sq || *c == bq)
+			strbuf_addch(sb, bq);
+		strbuf_addch(sb, *c);
+		c++;
+	}
+	strbuf_addch(sb, sq);
+}
+
 void python_quote_buf(struct strbuf *sb, const char *src)
 {
 	const char sq = '\'';
diff --git a/quote.h b/quote.h
index 768cc6338e..87ff458b06 100644
--- a/quote.h
+++ b/quote.h
@@ -31,6 +31,7 @@ struct strbuf;
 
 void sq_quote_buf(struct strbuf *, const char *src);
 void sq_quote_argv(struct strbuf *, const char **argv);
+__attribute__((format (printf, 2, 3)))
 void sq_quotef(struct strbuf *, const char *fmt, ...);
 
 /*
@@ -94,6 +95,7 @@ char *quote_path(const char *in, const char *prefix, struct strbuf *out, unsigne
 
 /* quoting as a string literal for other languages */
 void perl_quote_buf(struct strbuf *sb, const char *src);
+void perl_quote_buf_with_len(struct strbuf *sb, const char *src, size_t len);
 void python_quote_buf(struct strbuf *sb, const char *src);
 void tcl_quote_buf(struct strbuf *sb, const char *src);
 void basic_regex_quote_buf(struct strbuf *sb, const char *src);
diff --git a/range-diff.c b/range-diff.c
index e9479794b4..30a4de5c2d 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -26,17 +26,6 @@ struct patch_util {
 	struct object_id oid;
 };
 
-static size_t find_end_of_line(char *buffer, unsigned long size)
-{
-	char *eol = memchr(buffer, '\n', size);
-
-	if (!eol)
-		return size;
-
-	*eol = '\0';
-	return eol + 1 - buffer;
-}
-
 /*
  * Reads the patches into a string list, with the `util` field being populated
  * as struct object_id (will need to be free()d).
@@ -49,7 +38,7 @@ static int read_patches(const char *range, struct string_list *list,
 	struct patch_util *util = NULL;
 	int in_header = 1;
 	char *line, *current_filename = NULL;
-	int offset, len;
+	ssize_t len;
 	size_t size;
 
 	strvec_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges",
@@ -86,11 +75,18 @@ static int read_patches(const char *range, struct string_list *list,
 
 	line = contents.buf;
 	size = contents.len;
-	for (offset = 0; size > 0; offset += len, size -= len, line += len) {
+	for (; size > 0; size -= len, line += len) {
 		const char *p;
+		char *eol;
+
+		eol = memchr(line, '\n', size);
+		if (eol) {
+			*eol = '\0';
+			len = eol + 1 - line;
+		} else {
+			len = size;
+		}
 
-		len = find_end_of_line(line, size);
-		line[len - 1] = '\0';
 		if (skip_prefix(line, "commit ", &p)) {
 			if (util) {
 				string_list_append(list, buf.buf)->util = util;
@@ -132,7 +128,8 @@ static int read_patches(const char *range, struct string_list *list,
 			strbuf_addch(&buf, '\n');
 			if (!util->diff_offset)
 				util->diff_offset = buf.len;
-			line[len - 1] = '\n';
+			if (eol)
+				*eol = '\n';
 			orig_len = len;
 			len = parse_git_diff_header(&root, &linenr, 0, line,
 						    len, size, &patch);
@@ -485,6 +482,7 @@ static void output(struct string_list *a, struct string_list *b,
 	else
 		diff_setup(&opts);
 
+	opts.no_free = 1;
 	if (!opts.output_format)
 		opts.output_format = DIFF_FORMAT_PATCH;
 	opts.flags.suppress_diff_headers = 1;
@@ -545,6 +543,8 @@ static void output(struct string_list *a, struct string_list *b,
 	strbuf_release(&buf);
 	strbuf_release(&dashes);
 	strbuf_release(&indent);
+	opts.no_free = 0;
+	diff_free(&opts);
 }
 
 int show_range_diff(const char *range1, const char *range2,
@@ -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/reachable.c b/reachable.c
index c59847257a..84e3d0d75e 100644
--- a/reachable.c
+++ b/reachable.c
@@ -159,24 +159,6 @@ int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
 				      FOR_EACH_OBJECT_LOCAL_ONLY);
 }
 
-static void *lookup_object_by_type(struct repository *r,
-				   const struct object_id *oid,
-				   enum object_type type)
-{
-	switch (type) {
-	case OBJ_COMMIT:
-		return lookup_commit(r, oid);
-	case OBJ_TREE:
-		return lookup_tree(r, oid);
-	case OBJ_TAG:
-		return lookup_tag(r, oid);
-	case OBJ_BLOB:
-		return lookup_blob(r, oid);
-	default:
-		die("BUG: unknown object type %d", type);
-	}
-}
-
 static int mark_object_seen(const struct object_id *oid,
 			     enum object_type type,
 			     int exclude,
diff --git a/read-cache.c b/read-cache.c
index ba2b012a6c..79b9b99ebf 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -27,6 +27,8 @@
 #include "progress.h"
 #include "sparse-index.h"
 #include "csum-file.h"
+#include "promisor-remote.h"
+#include "hook.h"
 
 /* Mask for the name length in ce_flags in the on-disk index */
 
@@ -67,6 +69,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;
@@ -550,7 +557,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;
 
@@ -569,7 +579,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];
@@ -585,7 +595,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);
 		}
 	}
 
@@ -594,7 +604,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)
@@ -737,7 +752,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
 	int intent_only = flags & ADD_CACHE_INTENT;
 	int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
 			  (intent_only ? ADD_CACHE_NEW_ONLY : 0));
-	int hash_flags = HASH_WRITE_OBJECT;
+	unsigned hash_flags = pretend ? 0 : HASH_WRITE_OBJECT;
 	struct object_id oid;
 
 	if (flags & ADD_CACHE_RENORMALIZE)
@@ -848,6 +863,19 @@ struct cache_entry *make_empty_transient_cache_entry(size_t len,
 	return xcalloc(1, cache_entry_size(len));
 }
 
+enum verify_path_result {
+	PATH_OK,
+	PATH_INVALID,
+	PATH_DIR_WITH_SEP,
+};
+
+static enum verify_path_result verify_path_internal(const char *, unsigned);
+
+int verify_path(const char *path, unsigned mode)
+{
+	return verify_path_internal(path, mode) == PATH_OK;
+}
+
 struct cache_entry *make_cache_entry(struct index_state *istate,
 				     unsigned int mode,
 				     const struct object_id *oid,
@@ -858,7 +886,7 @@ struct cache_entry *make_cache_entry(struct index_state *istate,
 	struct cache_entry *ce, *ret;
 	int len;
 
-	if (!verify_path(path, mode)) {
+	if (verify_path_internal(path, mode) == PATH_INVALID) {
 		error(_("invalid path '%s'"), path);
 		return NULL;
 	}
@@ -992,60 +1020,62 @@ static int verify_dotfile(const char *rest, unsigned mode)
 	return 1;
 }
 
-int verify_path(const char *path, unsigned mode)
+static enum verify_path_result verify_path_internal(const char *path,
+						    unsigned mode)
 {
 	char c = 0;
 
 	if (has_dos_drive_prefix(path))
-		return 0;
+		return PATH_INVALID;
 
 	if (!is_valid_path(path))
-		return 0;
+		return PATH_INVALID;
 
 	goto inside;
 	for (;;) {
 		if (!c)
-			return 1;
+			return PATH_OK;
 		if (is_dir_sep(c)) {
 inside:
 			if (protect_hfs) {
 
 				if (is_hfs_dotgit(path))
-					return 0;
+					return PATH_INVALID;
 				if (S_ISLNK(mode)) {
 					if (is_hfs_dotgitmodules(path))
-						return 0;
+						return PATH_INVALID;
 				}
 			}
 			if (protect_ntfs) {
 #if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
 				if (c == '\\')
-					return 0;
+					return PATH_INVALID;
 #endif
 				if (is_ntfs_dotgit(path))
-					return 0;
+					return PATH_INVALID;
 				if (S_ISLNK(mode)) {
 					if (is_ntfs_dotgitmodules(path))
-						return 0;
+						return PATH_INVALID;
 				}
 			}
 
 			c = *path++;
 			if ((c == '.' && !verify_dotfile(path, mode)) ||
 			    is_dir_sep(c))
-				return 0;
+				return PATH_INVALID;
 			/*
 			 * allow terminating directory separators for
 			 * sparse directory entries.
 			 */
 			if (c == '\0')
-				return S_ISDIR(mode);
+				return S_ISDIR(mode) ? PATH_DIR_WITH_SEP :
+						       PATH_INVALID;
 		} else if (c == '\\' && protect_ntfs) {
 			if (is_ntfs_dotgit(path))
-				return 0;
+				return PATH_INVALID;
 			if (S_ISLNK(mode)) {
 				if (is_ntfs_dotgitmodules(path))
-					return 0;
+					return PATH_INVALID;
 			}
 		}
 
@@ -1221,7 +1251,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
@@ -1310,9 +1340,6 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
 	int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
 	int new_only = option & ADD_CACHE_NEW_ONLY;
 
-	if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
-		cache_tree_invalidate_path(istate, ce->name);
-
 	/*
 	 * If this entry's path sorts after the last entry in the index,
 	 * we can avoid searching for it.
@@ -1321,7 +1348,14 @@ 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);
+
+	/*
+	 * Cache tree path should be invalidated only after index_name_stage_pos,
+	 * in case it expands a sparse index.
+	 */
+	if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
+		cache_tree_invalidate_path(istate, ce->name);
 
 	/* existing match? Just replace it. */
 	if (pos >= 0) {
@@ -1348,7 +1382,7 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
 
 	if (!ok_to_add)
 		return -1;
-	if (!verify_path(ce->name, ce->ce_mode))
+	if (verify_path_internal(ce->name, ce->ce_mode) == PATH_INVALID)
 		return error(_("invalid path '%s'"), ce->name);
 
 	if (!skip_df_check &&
@@ -1356,7 +1390,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;
@@ -1585,8 +1619,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 	 */
 	preload_index(istate, pathspec, 0);
 	trace2_region_enter("index", "refresh", NULL);
-	/* TODO: audit for interaction with sparse-index. */
-	ensure_full_index(istate);
+
 	for (i = 0; i < istate->cache_nr; i++) {
 		struct cache_entry *ce, *new_entry;
 		int cache_errno = 0;
@@ -1601,6 +1634,13 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 		if (ignore_skip_worktree && ce_skip_worktree(ce))
 			continue;
 
+		/*
+		 * If this entry is a sparse directory, then there isn't
+		 * any stat() information to update. Ignore the entry.
+		 */
+		if (S_ISSPARSEDIR(ce->ce_mode))
+			continue;
+
 		if (pathspec && !ce_path_match(istate, ce, pathspec, seen))
 			filtered = 1;
 
@@ -1937,13 +1977,22 @@ static void tweak_untracked_cache(struct index_state *istate)
 
 	prepare_repo_settings(r);
 
-	if (r->settings.core_untracked_cache  == UNTRACKED_CACHE_REMOVE) {
+	switch (r->settings.core_untracked_cache) {
+	case UNTRACKED_CACHE_REMOVE:
 		remove_untracked_cache(istate);
-		return;
-	}
-
-	if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE)
+		break;
+	case UNTRACKED_CACHE_WRITE:
 		add_untracked_cache(istate);
+		break;
+	case UNTRACKED_CACHE_KEEP:
+		/*
+		 * Either an explicit "core.untrackedCache=keep", the
+		 * default if "core.untrackedCache" isn't configured,
+		 * or a fallback on an unknown "core.untrackedCache"
+		 * value.
+		 */
+		break;
+	}
 }
 
 static void tweak_split_index(struct index_state *istate)
@@ -2321,9 +2370,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;
 
@@ -2384,9 +2441,21 @@ int read_index_from(struct index_state *istate, const char *path,
 	base_path = xstrfmt("%s/sharedindex.%s", gitdir, base_oid_hex);
 	trace2_region_enter_printf("index", "shared/do_read_index",
 				   the_repository, "%s", base_path);
-	ret = do_read_index(split_index->base, base_path, 1);
+	ret = do_read_index(split_index->base, base_path, 0);
 	trace2_region_leave_printf("index", "shared/do_read_index",
 				   the_repository, "%s", base_path);
+	if (!ret) {
+		char *path_copy = xstrdup(path);
+		const char *base_path2 = xstrfmt("%s/sharedindex.%s",
+						 dirname(path_copy),
+						 base_oid_hex);
+		free(path_copy);
+		trace2_region_enter_printf("index", "shared/do_read_index",
+					   the_repository, "%s", base_path2);
+		ret = do_read_index(split_index->base, base_path2, 1);
+		trace2_region_leave_printf("index", "shared/do_read_index",
+					   the_repository, "%s", base_path2);
+	}
 	if (!oideq(&split_index->base_oid, &split_index->base->oid))
 		die(_("broken index, expect %s in %s, got %s"),
 		    base_oid_hex, base_path,
@@ -2499,6 +2568,7 @@ int repo_index_has_changes(struct repository *repo,
 		opt.flags.exit_with_status = 1;
 		if (!sb)
 			opt.flags.quick = 1;
+		diff_setup_done(&opt);
 		do_diff_cache(&cmp, &opt);
 		diffcore_std(&opt);
 		for (i = 0; sb && i < diff_queued_diff.nr; i++) {
@@ -2710,7 +2780,7 @@ static int repo_verify_index(struct repository *repo)
 	return verify_index_from(repo->index, repo->index_file);
 }
 
-static int has_racy_timestamp(struct index_state *istate)
+int has_racy_timestamp(struct index_state *istate)
 {
 	int entries = istate->cache_nr;
 	int i;
@@ -2804,11 +2874,8 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 		}
 	}
 
-	if (!istate->version) {
+	if (!istate->version)
 		istate->version = get_index_format_default(the_repository);
-		if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0))
-			init_split_index(istate);
-	}
 
 	/* demote version 3 to version 2 when the latter suffices */
 	if (istate->version == 3 || istate->version == 2)
@@ -2947,6 +3014,9 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 	    !is_null_oid(&istate->split_index->base_oid)) {
 		struct strbuf sb = STRBUF_INIT;
 
+		if (istate->sparse_index)
+			die(_("cannot write split index for a sparse index"));
+
 		err = write_link_extension(&sb, istate) < 0 ||
 			write_index_ext_header(f, eoie_c, CACHE_EXT_LINK,
 					       sb.len) < 0;
@@ -3061,7 +3131,7 @@ static int do_write_locked_index(struct index_state *istate, struct lock_file *l
 	int ret;
 	int was_full = !istate->sparse_index;
 
-	ret = convert_to_sparse(istate);
+	ret = convert_to_sparse(istate, 0);
 
 	if (ret) {
 		warning(_("failed to convert to a sparse-index"));
@@ -3088,7 +3158,7 @@ static int do_write_locked_index(struct index_state *istate, struct lock_file *l
 	else
 		ret = close_lock_file_gently(lock);
 
-	run_hook_le(NULL, "post-index-change",
+	run_hooks_l("post-index-change",
 			istate->updated_workdir ? "1" : "0",
 			istate->updated_skipworktree ? "1" : "0", NULL);
 	istate->updated_workdir = 0;
@@ -3174,7 +3244,7 @@ static int write_shared_index(struct index_state *istate,
 	int ret, was_full = !istate->sparse_index;
 
 	move_cache_to_base_index(istate);
-	convert_to_sparse(istate);
+	convert_to_sparse(istate, 0);
 
 	trace2_region_enter_printf("index", "shared/do_write_index",
 				   the_repository, "%s", get_tempfile_path(*temp));
@@ -3235,7 +3305,7 @@ static int too_many_not_shared_entries(struct index_state *istate)
 int write_locked_index(struct index_state *istate, struct lock_file *lock,
 		       unsigned flags)
 {
-	int new_shared_index, ret;
+	int new_shared_index, ret, test_split_index_env;
 	struct split_index *si = istate->split_index;
 
 	if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
@@ -3250,7 +3320,10 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
 	if (istate->fsmonitor_last_update)
 		fill_fsmonitor_bitmap(istate);
 
-	if (!si || alternate_index_output ||
+	test_split_index_env = git_env_bool("GIT_TEST_SPLIT_INDEX", 0);
+
+	if ((!si && !test_split_index_env) ||
+	    alternate_index_output ||
 	    (istate->cache_changed & ~EXTMASK)) {
 		if (si)
 			oidclr(&si->base_oid);
@@ -3258,10 +3331,15 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
 		goto out;
 	}
 
-	if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0)) {
-		int v = si->base_oid.hash[0];
-		if ((v & 15) < 6)
+	if (test_split_index_env) {
+		if (!si) {
+			si = init_split_index(istate);
 			istate->cache_changed |= SPLIT_INDEX_ORDERED;
+		} else {
+			int v = si->base_oid.hash[0];
+			if ((v & 15) < 6)
+				istate->cache_changed |= SPLIT_INDEX_ORDERED;
+		}
 	}
 	if (too_many_not_shared_entries(istate))
 		istate->cache_changed |= SPLIT_INDEX_ORDERED;
@@ -3657,3 +3735,25 @@ static void write_ieot_extension(struct strbuf *sb, struct index_entry_offset_ta
 		strbuf_add(sb, &buffer, sizeof(uint32_t));
 	}
 }
+
+void prefetch_cache_entries(const struct index_state *istate,
+			    must_prefetch_predicate must_prefetch)
+{
+	int i;
+	struct oid_array to_fetch = OID_ARRAY_INIT;
+
+	for (i = 0; i < istate->cache_nr; i++) {
+		struct cache_entry *ce = istate->cache[i];
+
+		if (S_ISGITLINK(ce->ce_mode) || !must_prefetch(ce))
+			continue;
+		if (!oid_object_info_extended(the_repository, &ce->oid,
+					      NULL,
+					      OBJECT_INFO_FOR_PREFETCH))
+			continue;
+		oid_array_append(&to_fetch, &ce->oid);
+	}
+	promisor_remote_get_direct(the_repository,
+				   to_fetch.oid, to_fetch.nr);
+	oid_array_clear(&to_fetch);
+}
diff --git a/rebase-interactive.c b/rebase-interactive.c
index b6cbd16a17..87649d0c01 100644
--- a/rebase-interactive.c
+++ b/rebase-interactive.c
@@ -226,32 +226,3 @@ int todo_list_check_against_backup(struct repository *r, struct todo_list *todo_
 	todo_list_release(&backup);
 	return res;
 }
-
-int check_todo_list_from_file(struct repository *r)
-{
-	struct todo_list old_todo = TODO_LIST_INIT, new_todo = TODO_LIST_INIT;
-	int res = 0;
-
-	if (strbuf_read_file(&new_todo.buf, rebase_path_todo(), 0) < 0) {
-		res = error(_("could not read '%s'."), rebase_path_todo());
-		goto out;
-	}
-
-	if (strbuf_read_file(&old_todo.buf, rebase_path_todo_backup(), 0) < 0) {
-		res = error(_("could not read '%s'."), rebase_path_todo_backup());
-		goto out;
-	}
-
-	res = todo_list_parse_insn_buffer(r, old_todo.buf.buf, &old_todo);
-	if (!res)
-		res = todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo);
-	if (res)
-		fprintf(stderr, _(edit_todo_list_advice));
-	if (!res)
-		res = todo_list_check(&old_todo, &new_todo);
-out:
-	todo_list_release(&old_todo);
-	todo_list_release(&new_todo);
-
-	return res;
-}
diff --git a/rebase-interactive.h b/rebase-interactive.h
index dc2cf0ee12..7239c60f79 100644
--- a/rebase-interactive.h
+++ b/rebase-interactive.h
@@ -16,6 +16,4 @@ int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo);
 int todo_list_check_against_backup(struct repository *r,
 				   struct todo_list *todo_list);
 
-int check_todo_list_from_file(struct repository *r);
-
 #endif
diff --git a/rebase.c b/rebase.c
index f8137d859b..6775cddb28 100644
--- a/rebase.c
+++ b/rebase.c
@@ -1,5 +1,6 @@
 #include "rebase.h"
 #include "config.h"
+#include "gettext.h"
 
 /*
  * Parses textual value for pull.rebase, branch.<name>.rebase, etc.
@@ -20,12 +21,12 @@ enum rebase_type rebase_parse_value(const char *value)
 		return REBASE_FALSE;
 	else if (v > 0)
 		return REBASE_TRUE;
-	else if (!strcmp(value, "preserve") || !strcmp(value, "p"))
-		return REBASE_PRESERVE;
 	else if (!strcmp(value, "merges") || !strcmp(value, "m"))
 		return REBASE_MERGES;
 	else if (!strcmp(value, "interactive") || !strcmp(value, "i"))
 		return REBASE_INTERACTIVE;
+	else if (!strcmp(value, "preserve") || !strcmp(value, "p"))
+		error(_("%s: 'preserve' superseded by 'merges'"), value);
 	/*
 	 * Please update _git_config() in git-completion.bash when you
 	 * add new rebase modes.
diff --git a/rebase.h b/rebase.h
index cc723d4748..203b437282 100644
--- a/rebase.h
+++ b/rebase.h
@@ -5,7 +5,6 @@ enum rebase_type {
 	REBASE_INVALID = -1,
 	REBASE_FALSE = 0,
 	REBASE_TRUE,
-	REBASE_PRESERVE,
 	REBASE_MERGES,
 	REBASE_INTERACTIVE
 };
diff --git a/ref-filter.c b/ref-filter.c
index 4db0e40ff4..f7a2f17bfd 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -144,6 +144,7 @@ enum atom_type {
 	ATOM_BODY,
 	ATOM_TRAILERS,
 	ATOM_CONTENTS,
+	ATOM_RAW,
 	ATOM_UPSTREAM,
 	ATOM_PUSH,
 	ATOM_SYMREF,
@@ -156,6 +157,7 @@ enum atom_type {
 	ATOM_IF,
 	ATOM_THEN,
 	ATOM_ELSE,
+	ATOM_REST,
 };
 
 /*
@@ -190,6 +192,9 @@ static struct used_atom {
 			unsigned int nlines;
 		} contents;
 		struct {
+			enum { RAW_BARE, RAW_LENGTH } option;
+		} raw_data;
+		struct {
 			cmp_status cmp_status;
 			const char *str;
 		} if_then_else;
@@ -213,6 +218,7 @@ static int used_atom_cnt, need_tagged, need_symref;
  * Expand string, append it to strbuf *sb, then return error code ret.
  * Allow to save few lines of code.
  */
+__attribute__((format (printf, 3, 4)))
 static int strbuf_addf_ret(struct strbuf *sb, int ret, const char *fmt, ...)
 {
 	va_list ap;
@@ -222,7 +228,7 @@ static int strbuf_addf_ret(struct strbuf *sb, int ret, const char *fmt, ...)
 	return ret;
 }
 
-static int color_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int color_atom_parser(struct ref_format *format, struct used_atom *atom,
 			     const char *color_value, struct strbuf *err)
 {
 	if (!color_value)
@@ -260,7 +266,7 @@ static int refname_atom_parser_internal(struct refname_atom *atom, const char *a
 	return 0;
 }
 
-static int remote_ref_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int remote_ref_atom_parser(struct ref_format *format, struct used_atom *atom,
 				  const char *arg, struct strbuf *err)
 {
 	struct string_list params = STRING_LIST_INIT_DUP;
@@ -307,7 +313,7 @@ static int remote_ref_atom_parser(const struct ref_format *format, struct used_a
 	return 0;
 }
 
-static int objecttype_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int objecttype_atom_parser(struct ref_format *format, struct used_atom *atom,
 				  const char *arg, struct strbuf *err)
 {
 	if (arg)
@@ -319,7 +325,7 @@ static int objecttype_atom_parser(const struct ref_format *format, struct used_a
 	return 0;
 }
 
-static int objectsize_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int objectsize_atom_parser(struct ref_format *format, struct used_atom *atom,
 				  const char *arg, struct strbuf *err)
 {
 	if (!arg) {
@@ -335,11 +341,11 @@ static int objectsize_atom_parser(const struct ref_format *format, struct used_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;
 }
 
-static int deltabase_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int deltabase_atom_parser(struct ref_format *format, struct used_atom *atom,
 				 const char *arg, struct strbuf *err)
 {
 	if (arg)
@@ -351,7 +357,7 @@ static int deltabase_atom_parser(const struct ref_format *format, struct used_at
 	return 0;
 }
 
-static int body_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int body_atom_parser(struct ref_format *format, struct used_atom *atom,
 			    const char *arg, struct strbuf *err)
 {
 	if (arg)
@@ -360,7 +366,7 @@ static int body_atom_parser(const struct ref_format *format, struct used_atom *a
 	return 0;
 }
 
-static int subject_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int subject_atom_parser(struct ref_format *format, struct used_atom *atom,
 			       const char *arg, struct strbuf *err)
 {
 	if (!arg)
@@ -368,11 +374,11 @@ static int subject_atom_parser(const struct ref_format *format, struct used_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;
 }
 
-static int trailers_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int trailers_atom_parser(struct ref_format *format, struct used_atom *atom,
 				const char *arg, struct strbuf *err)
 {
 	atom->u.contents.trailer_opts.no_divider = 1;
@@ -398,7 +404,7 @@ static int trailers_atom_parser(const struct ref_format *format, struct used_ato
 	return 0;
 }
 
-static int contents_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int contents_atom_parser(struct ref_format *format, struct used_atom *atom,
 				const char *arg, struct strbuf *err)
 {
 	if (!arg)
@@ -422,11 +428,23 @@ static int contents_atom_parser(const struct ref_format *format, struct used_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;
+}
+
+static int raw_atom_parser(struct ref_format *format, struct used_atom *atom,
+				const char *arg, struct strbuf *err)
+{
+	if (!arg)
+		atom->u.raw_data.option = RAW_BARE;
+	else if (!strcmp(arg, "size"))
+		atom->u.raw_data.option = RAW_LENGTH;
+	else
+		return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "raw", arg);
 	return 0;
 }
 
-static int oid_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int oid_atom_parser(struct ref_format *format, struct used_atom *atom,
 			   const char *arg, struct strbuf *err)
 {
 	if (!arg)
@@ -441,11 +459,11 @@ static int oid_atom_parser(const struct ref_format *format, struct used_atom *at
 		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;
 }
 
-static int person_email_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int person_email_atom_parser(struct ref_format *format, struct used_atom *atom,
 				    const char *arg, struct strbuf *err)
 {
 	if (!arg)
@@ -459,7 +477,7 @@ static int person_email_atom_parser(const struct ref_format *format, struct used
 	return 0;
 }
 
-static int refname_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int refname_atom_parser(struct ref_format *format, struct used_atom *atom,
 			       const char *arg, struct strbuf *err)
 {
 	return refname_atom_parser_internal(&atom->u.refname, arg, atom->name, err);
@@ -476,7 +494,7 @@ static align_type parse_align_position(const char *s)
 	return -1;
 }
 
-static int align_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int align_atom_parser(struct ref_format *format, struct used_atom *atom,
 			     const char *arg, struct strbuf *err)
 {
 	struct align *align = &atom->u.align;
@@ -513,7 +531,7 @@ static int align_atom_parser(const struct ref_format *format, struct used_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;
 		}
@@ -528,7 +546,7 @@ static int align_atom_parser(const struct ref_format *format, struct used_atom *
 	return 0;
 }
 
-static int if_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int if_atom_parser(struct ref_format *format, struct used_atom *atom,
 			  const char *arg, struct strbuf *err)
 {
 	if (!arg) {
@@ -539,11 +557,20 @@ static int if_atom_parser(const struct ref_format *format, struct used_atom *ato
 	} 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;
+}
+
+static int rest_atom_parser(struct ref_format *format, struct used_atom *atom,
+			    const char *arg, struct strbuf *err)
+{
+	if (arg)
+		return strbuf_addf_ret(err, -1, _("%%(rest) does not take arguments"));
+	format->use_rest = 1;
 	return 0;
 }
 
-static int head_atom_parser(const struct ref_format *format, struct used_atom *atom,
+static int head_atom_parser(struct ref_format *format, struct used_atom *atom,
 			    const char *arg, struct strbuf *unused_err)
 {
 	atom->u.head = resolve_refdup("HEAD", RESOLVE_REF_READING, NULL, NULL);
@@ -554,7 +581,7 @@ static struct {
 	const char *name;
 	info_source source;
 	cmp_type cmp_type;
-	int (*parser)(const struct ref_format *format, struct used_atom *atom,
+	int (*parser)(struct ref_format *format, struct used_atom *atom,
 		      const char *arg, struct strbuf *err);
 } valid_atom[] = {
 	[ATOM_REFNAME] = { "refname", SOURCE_NONE, FIELD_STR, refname_atom_parser },
@@ -586,6 +613,7 @@ static struct {
 	[ATOM_BODY] = { "body", SOURCE_OBJ, FIELD_STR, body_atom_parser },
 	[ATOM_TRAILERS] = { "trailers", SOURCE_OBJ, FIELD_STR, trailers_atom_parser },
 	[ATOM_CONTENTS] = { "contents", SOURCE_OBJ, FIELD_STR, contents_atom_parser },
+	[ATOM_RAW] = { "raw", SOURCE_OBJ, FIELD_STR, raw_atom_parser },
 	[ATOM_UPSTREAM] = { "upstream", SOURCE_NONE, FIELD_STR, remote_ref_atom_parser },
 	[ATOM_PUSH] = { "push", SOURCE_NONE, FIELD_STR, remote_ref_atom_parser },
 	[ATOM_SYMREF] = { "symref", SOURCE_NONE, FIELD_STR, refname_atom_parser },
@@ -598,13 +626,14 @@ static struct {
 	[ATOM_IF] = { "if", SOURCE_NONE, FIELD_STR, if_atom_parser },
 	[ATOM_THEN] = { "then", SOURCE_NONE },
 	[ATOM_ELSE] = { "else", SOURCE_NONE },
+	[ATOM_REST] = { "rest", SOURCE_NONE, FIELD_STR, rest_atom_parser },
 	/*
 	 * Please update $__git_ref_fieldlist in git-completion.bash
 	 * when you add new atoms
 	 */
 };
 
-#define REF_FORMATTING_STATE_INIT  { 0, NULL }
+#define REF_FORMATTING_STATE_INIT  { 0 }
 
 struct ref_formatting_stack {
 	struct ref_formatting_stack *prev;
@@ -620,16 +649,23 @@ struct ref_formatting_state {
 
 struct atom_value {
 	const char *s;
+	ssize_t s_size;
 	int (*handler)(struct atom_value *atomv, struct ref_formatting_state *state,
 		       struct strbuf *err);
 	uintmax_t value; /* used for sorting when not FIELD_STR */
 	struct used_atom *atom;
 };
 
+#define ATOM_SIZE_UNSPECIFIED (-1)
+
+#define ATOM_VALUE_INIT { \
+	.s_size = ATOM_SIZE_UNSPECIFIED \
+}
+
 /*
  * Used to parse format string and sort specifiers
  */
-static int parse_ref_filter_atom(const struct ref_format *format,
+static int parse_ref_filter_atom(struct ref_format *format,
 				 const char *atom, const char *ep,
 				 struct strbuf *err)
 {
@@ -644,13 +680,6 @@ static int parse_ref_filter_atom(const struct ref_format *format,
 		return strbuf_addf_ret(err, -1, _("malformed field name: %.*s"),
 				       (int)(ep-atom), atom);
 
-	/* Do we have the atom already used elsewhere? */
-	for (i = 0; i < used_atom_cnt; i++) {
-		int len = strlen(used_atom[i].name);
-		if (len == ep - atom && !memcmp(used_atom[i].name, atom, len))
-			return i;
-	}
-
 	/*
 	 * If the atom name has a colon, strip it and everything after
 	 * it off - it specifies the format for this entry, and
@@ -660,6 +689,13 @@ static int parse_ref_filter_atom(const struct ref_format *format,
 	arg = memchr(sp, ':', ep - sp);
 	atom_len = (arg ? arg : ep) - sp;
 
+	/* Do we have the atom already used elsewhere? */
+	for (i = 0; i < used_atom_cnt; i++) {
+		int len = strlen(used_atom[i].name);
+		if (len == ep - atom && !memcmp(used_atom[i].name, atom, len))
+			return i;
+	}
+
 	/* Is the atom a valid one? */
 	for (i = 0; i < ARRAY_SIZE(valid_atom); i++) {
 		int len = strlen(valid_atom[i].name);
@@ -709,17 +745,23 @@ static int parse_ref_filter_atom(const struct ref_format *format,
 	return at;
 }
 
-static void quote_formatting(struct strbuf *s, const char *str, int quote_style)
+static void quote_formatting(struct strbuf *s, const char *str, ssize_t len, int quote_style)
 {
 	switch (quote_style) {
 	case QUOTE_NONE:
-		strbuf_addstr(s, str);
+		if (len < 0)
+			strbuf_addstr(s, str);
+		else
+			strbuf_add(s, str, len);
 		break;
 	case QUOTE_SHELL:
 		sq_quote_buf(s, str);
 		break;
 	case QUOTE_PERL:
-		perl_quote_buf(s, str);
+		if (len < 0)
+			perl_quote_buf(s, str);
+		else
+			perl_quote_buf_with_len(s, str, len);
 		break;
 	case QUOTE_PYTHON:
 		python_quote_buf(s, str);
@@ -740,9 +782,11 @@ static int append_atom(struct atom_value *v, struct ref_formatting_state *state,
 	 * encountered.
 	 */
 	if (!state->stack->prev)
-		quote_formatting(&state->stack->output, v->s, state->quote_style);
-	else
+		quote_formatting(&state->stack->output, v->s, v->s_size, state->quote_style);
+	else if (v->s_size < 0)
 		strbuf_addstr(&state->stack->output, v->s);
+	else
+		strbuf_add(&state->stack->output, v->s, v->s_size);
 	return 0;
 }
 
@@ -797,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) {
 		/*
@@ -842,43 +886,49 @@ static int if_atom_handler(struct atom_value *atomv, struct ref_formatting_state
 	return 0;
 }
 
-static int is_empty(const char *s)
+static int is_empty(struct strbuf *buf)
 {
-	while (*s != '\0') {
-		if (!isspace(*s))
-			return 0;
-		s++;
-	}
-	return 1;
-}
+	const char *cur = buf->buf;
+	const char *end = buf->buf + buf->len;
+
+	while (cur != end && (isspace(*cur)))
+		cur++;
+
+	return cur == end;
+ }
 
 static int then_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state,
 			     struct strbuf *err)
 {
 	struct ref_formatting_stack *cur = state->stack;
 	struct if_then_else *if_then_else = NULL;
+	size_t str_len = 0;
 
 	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)
 		return strbuf_addf_ret(err, -1, _("format: %%(then) atom used after %%(else)"));
 	if_then_else->then_atom_seen = 1;
+	if (if_then_else->str)
+		str_len = strlen(if_then_else->str);
 	/*
 	 * If the 'equals' or 'notequals' attribute is used then
 	 * perform the required comparison. If not, only non-empty
 	 * strings satisfy the 'if' condition.
 	 */
 	if (if_then_else->cmp_status == COMPARE_EQUAL) {
-		if (!strcmp(if_then_else->str, cur->output.buf))
+		if (str_len == cur->output.len &&
+		    !memcmp(if_then_else->str, cur->output.buf, cur->output.len))
 			if_then_else->condition_satisfied = 1;
 	} else if (if_then_else->cmp_status == COMPARE_UNEQUAL) {
-		if (strcmp(if_then_else->str, cur->output.buf))
+		if (str_len != cur->output.len ||
+		    memcmp(if_then_else->str, cur->output.buf, cur->output.len))
 			if_then_else->condition_satisfied = 1;
-	} else if (cur->output.len && !is_empty(cur->output.buf))
+	} else if (cur->output.len && !is_empty(&cur->output))
 		if_then_else->condition_satisfied = 1;
 	strbuf_reset(&cur->output);
 	return 0;
@@ -893,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;
@@ -924,7 +974,7 @@ static int end_atom_handler(struct atom_value *atomv, struct ref_formatting_stat
 	 * only on the topmost supporting atom.
 	 */
 	if (!current->prev->prev) {
-		quote_formatting(&s, current->output.buf, state->quote_style);
+		quote_formatting(&s, current->output.buf, current->output.len, state->quote_style);
 		strbuf_swap(&current->output, &s);
 	}
 	strbuf_release(&s);
@@ -954,6 +1004,11 @@ static const char *find_next(const char *cp)
 	return NULL;
 }
 
+static int reject_atom(enum atom_type atom_type)
+{
+	return atom_type == ATOM_REST;
+}
+
 /*
  * Make sure the format string is well formed, and parse out
  * the used atoms.
@@ -974,6 +1029,16 @@ int verify_ref_format(struct ref_format *format)
 		at = parse_ref_filter_atom(format, sp + 2, ep, &err);
 		if (at < 0)
 			die("%s", err.buf);
+		if (reject_atom(used_atom[at].atom_type))
+			die(_("this command reject atom %%(%.*s)"), (int)(ep - sp - 2), sp + 2);
+
+		if ((format->quote_style == QUOTE_PYTHON ||
+		     format->quote_style == QUOTE_SHELL ||
+		     format->quote_style == QUOTE_TCL) &&
+		     used_atom[at].atom_type == ATOM_RAW &&
+		     used_atom[at].u.raw_data.option == RAW_BARE)
+			die(_("--format=%.*s cannot be used with "
+			      "--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2);
 		cp = ep + 1;
 
 		if (skip_prefix(used_atom[at].name, "color:", &color))
@@ -1356,25 +1421,42 @@ static void append_lines(struct strbuf *out, const char *buf, unsigned long size
 }
 
 /* See grab_values */
-static void grab_sub_body_contents(struct atom_value *val, int deref, void *buf)
+static void grab_sub_body_contents(struct atom_value *val, int deref, struct expand_data *data)
 {
 	int i;
 	const char *subpos = NULL, *bodypos = NULL, *sigpos = NULL;
 	size_t sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0;
+	void *buf = data->content;
 
 	for (i = 0; i < used_atom_cnt; i++) {
 		struct used_atom *atom = &used_atom[i];
 		const char *name = atom->name;
 		struct atom_value *v = &val[i];
+		enum atom_type atom_type = atom->atom_type;
 
 		if (!!deref != (*name == '*'))
 			continue;
 		if (deref)
 			name++;
-		if (strcmp(name, "body") &&
-		    !starts_with(name, "subject") &&
-		    !starts_with(name, "trailers") &&
-		    !starts_with(name, "contents"))
+
+		if (atom_type == ATOM_RAW) {
+			unsigned long buf_size = data->size;
+
+			if (atom->u.raw_data.option == RAW_BARE) {
+				v->s = xmemdupz(buf, buf_size);
+				v->s_size = buf_size;
+			} else if (atom->u.raw_data.option == RAW_LENGTH) {
+				v->s = xstrfmt("%"PRIuMAX, (uintmax_t)buf_size);
+			}
+			continue;
+		}
+
+		if ((data->type != OBJ_TAG &&
+		     data->type != OBJ_COMMIT) ||
+		    (strcmp(name, "body") &&
+		     !starts_with(name, "subject") &&
+		     !starts_with(name, "trailers") &&
+		     !starts_with(name, "contents")))
 			continue;
 		if (!subpos)
 			find_subpos(buf,
@@ -1438,25 +1520,29 @@ static void fill_missing_values(struct atom_value *val)
  * pointed at by the ref itself; otherwise it is the object the
  * ref (which is a tag) refers to.
  */
-static void grab_values(struct atom_value *val, int deref, struct object *obj, void *buf)
+static void grab_values(struct atom_value *val, int deref, struct object *obj, struct expand_data *data)
 {
+	void *buf = data->content;
+
 	switch (obj->type) {
 	case OBJ_TAG:
 		grab_tag_values(val, deref, obj);
-		grab_sub_body_contents(val, deref, buf);
+		grab_sub_body_contents(val, deref, data);
 		grab_person("tagger", val, deref, buf);
 		break;
 	case OBJ_COMMIT:
 		grab_commit_values(val, deref, obj);
-		grab_sub_body_contents(val, deref, buf);
+		grab_sub_body_contents(val, deref, data);
 		grab_person("author", val, deref, buf);
 		grab_person("committer", val, deref, buf);
 		break;
 	case OBJ_TREE:
 		/* grab_tree_values(val, deref, obj, buf, sz); */
+		grab_sub_body_contents(val, deref, data);
 		break;
 	case OBJ_BLOB:
 		/* grab_blob_values(val, deref, obj, buf, sz); */
+		grab_sub_body_contents(val, deref, data);
 		break;
 	default:
 		die("Eh?  Object of type %d?", obj->type);
@@ -1678,7 +1764,7 @@ static int get_object(struct ref_array_item *ref, int deref, struct object **obj
 			return strbuf_addf_ret(err, -1, _("parse_object_buffer failed on %s for %s"),
 					       oid_to_hex(&oi->oid), ref->refname);
 		}
-		grab_values(ref->value, deref, *obj, oi->content);
+		grab_values(ref->value, deref, *obj, oi);
 	}
 
 	grab_common_values(ref->value, deref, oi);
@@ -1760,6 +1846,7 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)
 		const char *refname;
 		struct branch *branch = NULL;
 
+		v->s_size = ATOM_SIZE_UNSPECIFIED;
 		v->handler = append_atom;
 		v->atom = atom;
 
@@ -1863,6 +1950,12 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)
 			v->handler = else_atom_handler;
 			v->s = xstrdup("");
 			continue;
+		} else if (atom_type == ATOM_REST) {
+			if (ref->rest)
+				v->s = xstrdup(ref->rest);
+			else
+				v->s = xstrdup("");
+			continue;
 		} else
 			continue;
 
@@ -2007,8 +2100,7 @@ static int filter_pattern_match(struct ref_filter *filter, const char *refname)
  */
 static int for_each_fullref_in_pattern(struct ref_filter *filter,
 				       each_ref_fn cb,
-				       void *cb_data,
-				       int broken)
+				       void *cb_data)
 {
 	if (!filter->match_as_path) {
 		/*
@@ -2016,7 +2108,7 @@ static int for_each_fullref_in_pattern(struct ref_filter *filter,
 		 * prefixes like "refs/heads/" etc. are stripped off,
 		 * so we have to look at everything:
 		 */
-		return for_each_fullref_in("", cb, cb_data, broken);
+		return for_each_fullref_in("", cb, cb_data);
 	}
 
 	if (filter->ignore_case) {
@@ -2025,16 +2117,16 @@ static int for_each_fullref_in_pattern(struct ref_filter *filter,
 		 * so just return everything and let the caller
 		 * sort it out.
 		 */
-		return for_each_fullref_in("", cb, cb_data, broken);
+		return for_each_fullref_in("", cb, cb_data);
 	}
 
 	if (!filter->name_patterns[0]) {
 		/* no patterns; we have to look at everything */
-		return for_each_fullref_in("", cb, cb_data, broken);
+		return for_each_fullref_in("", cb, cb_data);
 	}
 
 	return for_each_fullref_in_prefixes(NULL, filter->name_patterns,
-					    cb, cb_data, broken);
+					    cb, cb_data);
 }
 
 /*
@@ -2080,6 +2172,7 @@ static struct ref_array_item *new_ref_array_item(const char *refname,
 
 	FLEX_ALLOC_STR(ref, refname, refname);
 	oidcpy(&ref->objectname, oid);
+	ref->rest = NULL;
 
 	return ref;
 }
@@ -2225,8 +2318,12 @@ void ref_array_clear(struct ref_array *array)
 	FREE_AND_NULL(array->items);
 	array->nr = array->alloc = 0;
 
-	for (i = 0; i < used_atom_cnt; i++)
-		free((char *)used_atom[i].name);
+	for (i = 0; i < used_atom_cnt; i++) {
+		struct used_atom *atom = &used_atom[i];
+		if (atom->atom_type == ATOM_HEAD)
+			free(atom->u.head);
+		free((char *)atom->name);
+	}
 	FREE_AND_NULL(used_atom);
 	used_atom_cnt = 0;
 
@@ -2307,13 +2404,10 @@ int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int
 {
 	struct ref_filter_cbdata ref_cbdata;
 	int ret = 0;
-	unsigned int broken = 0;
 
 	ref_cbdata.array = array;
 	ref_cbdata.filter = filter;
 
-	if (type & FILTER_REFS_INCLUDE_BROKEN)
-		broken = 1;
 	filter->kind = type & FILTER_REFS_KIND_MASK;
 
 	init_contains_cache(&ref_cbdata.contains_cache);
@@ -2330,13 +2424,13 @@ int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int
 		 * of filter_ref_kind().
 		 */
 		if (filter->kind == FILTER_REFS_BRANCHES)
-			ret = for_each_fullref_in("refs/heads/", ref_filter_handler, &ref_cbdata, broken);
+			ret = for_each_fullref_in("refs/heads/", ref_filter_handler, &ref_cbdata);
 		else if (filter->kind == FILTER_REFS_REMOTES)
-			ret = for_each_fullref_in("refs/remotes/", ref_filter_handler, &ref_cbdata, broken);
+			ret = for_each_fullref_in("refs/remotes/", ref_filter_handler, &ref_cbdata);
 		else if (filter->kind == FILTER_REFS_TAGS)
-			ret = for_each_fullref_in("refs/tags/", ref_filter_handler, &ref_cbdata, broken);
+			ret = for_each_fullref_in("refs/tags/", ref_filter_handler, &ref_cbdata);
 		else if (filter->kind & FILTER_REFS_ALL)
-			ret = for_each_fullref_in_pattern(filter, ref_filter_handler, &ref_cbdata, broken);
+			ret = for_each_fullref_in_pattern(filter, ref_filter_handler, &ref_cbdata);
 		if (!ret && (filter->kind & FILTER_REFS_DETACHED_HEAD))
 			head_ref(ref_filter_handler, &ref_cbdata);
 	}
@@ -2363,6 +2457,25 @@ static int compare_detached_head(struct ref_array_item *a, struct ref_array_item
 	return 0;
 }
 
+static int memcasecmp(const void *vs1, const void *vs2, size_t n)
+{
+	const char *s1 = vs1, *s2 = vs2;
+	const char *end = s1 + n;
+
+	for (; s1 < end; s1++, s2++) {
+		int diff = tolower(*s1) - tolower(*s2);
+		if (diff)
+			return diff;
+	}
+	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;
@@ -2383,10 +2496,29 @@ static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, stru
 	} else if (s->sort_flags & REF_SORTING_VERSION) {
 		cmp = versioncmp(va->s, vb->s);
 	} else if (cmp_type == FIELD_STR) {
-		int (*cmp_fn)(const char *, const char *);
-		cmp_fn = s->sort_flags & REF_SORTING_ICASE
-			? strcasecmp : strcmp;
-		cmp = cmp_fn(va->s, vb->s);
+		if (va->s_size < 0 && vb->s_size < 0) {
+			int (*cmp_fn)(const char *, const char *);
+			cmp_fn = s->sort_flags & REF_SORTING_ICASE
+				? strcasecmp : strcmp;
+			cmp = cmp_fn(va->s, vb->s);
+		} else {
+			size_t a_size = va->s_size < 0 ?
+					strlen(va->s) : va->s_size;
+			size_t b_size = vb->s_size < 0 ?
+					strlen(vb->s) : vb->s_size;
+			int (*cmp_fn)(const void *, const void *, size_t);
+			cmp_fn = s->sort_flags & REF_SORTING_ICASE
+				? memcasecmp : memcmp;
+
+			cmp = cmp_fn(va->s, vb->s, b_size > a_size ?
+				     a_size : b_size);
+			if (!cmp) {
+				if (a_size > b_size)
+					cmp = 1;
+				else if (a_size < b_size)
+					cmp = -1;
+			}
+		}
 	} else {
 		if (va->value < vb->value)
 			cmp = -1;
@@ -2456,9 +2588,9 @@ static void append_literal(const char *cp, const char *ep, struct ref_formatting
 }
 
 int format_ref_array_item(struct ref_array_item *info,
-			   const struct ref_format *format,
-			   struct strbuf *final_buf,
-			   struct strbuf *error_buf)
+			  struct ref_format *format,
+			  struct strbuf *final_buf,
+			  struct strbuf *error_buf)
 {
 	const char *cp, *sp, *ep;
 	struct ref_formatting_state state = REF_FORMATTING_STATE_INIT;
@@ -2485,7 +2617,7 @@ int format_ref_array_item(struct ref_array_item *info,
 		append_literal(cp, sp, &state);
 	}
 	if (format->need_color_reset_at_eol) {
-		struct atom_value resetv;
+		struct atom_value resetv = ATOM_VALUE_INIT;
 		resetv.s = GIT_COLOR_RESET;
 		if (append_atom(&resetv, &state, error_buf)) {
 			pop_stack_element(&state.stack);
@@ -2502,7 +2634,7 @@ int format_ref_array_item(struct ref_array_item *info,
 }
 
 void pretty_print_ref(const char *name, const struct object_id *oid,
-		      const struct ref_format *format)
+		      struct ref_format *format)
 {
 	struct ref_array_item *ref_item;
 	struct strbuf output = STRBUF_INIT;
@@ -2537,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";
 
@@ -2548,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;
 
@@ -2566,17 +2698,34 @@ 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);
+	string_list_clear(options, 0);
+	return sorting;
+}
 
-	parse_ref_sorting(opt->value, arg);
-	return 0;
+void ref_sorting_release(struct ref_sorting *sorting)
+{
+	while (sorting) {
+		struct ref_sorting *next = sorting->next;
+		free(sorting);
+		sorting = next;
+	}
 }
 
 int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset)
diff --git a/ref-filter.h b/ref-filter.h
index baf72a7189..aa0eea4ecf 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -13,7 +13,6 @@
 #define QUOTE_PYTHON 4
 #define QUOTE_TCL 8
 
-#define FILTER_REFS_INCLUDE_BROKEN 0x0001
 #define FILTER_REFS_TAGS           0x0002
 #define FILTER_REFS_BRANCHES       0x0004
 #define FILTER_REFS_REMOTES        0x0008
@@ -24,20 +23,18 @@
 #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 {
 	struct object_id objectname;
+	const char *rest;
 	int flag;
 	unsigned int kind;
 	const char *symref;
@@ -76,14 +73,16 @@ struct ref_format {
 	 * verify_ref_format() afterwards to finalize.
 	 */
 	const char *format;
+	const char *rest;
 	int quote_style;
+	int use_rest;
 	int use_color;
 
 	/* Internal state to ref-filter */
 	int need_color_reset_at_eol;
 };
 
-#define REF_FORMAT_INIT { NULL, 0, -1 }
+#define REF_FORMAT_INIT { .use_color = -1 }
 
 /*  Macros for checking --merged and --no-merged options */
 #define _OPT_MERGED_NO_MERGED(option, filter, h) \
@@ -95,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
@@ -116,15 +114,13 @@ void ref_array_sort(struct ref_sorting *sort, struct ref_array *array);
 void ref_sorting_set_sort_flags_all(struct ref_sorting *sorting, unsigned int mask, int on);
 /*  Based on the given format and quote_style, fill the strbuf */
 int format_ref_array_item(struct ref_array_item *info,
-			  const struct ref_format *format,
+			  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 */
@@ -137,7 +133,7 @@ void setup_ref_filter_porcelain_msg(void);
  * name must be a fully qualified refname.
  */
 void pretty_print_ref(const char *name, const struct object_id *oid,
-		      const struct ref_format *format);
+		      struct ref_format *format);
 
 /*
  * Push a single ref onto the array; this can be used to construct your own
diff --git a/reflog-walk.c b/reflog-walk.c
index e9cd328369..8ac4b284b6 100644
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -158,10 +158,9 @@ int add_reflog_for_walk(struct reflog_walk_info *info,
 		}
 		reflogs = read_complete_reflog(branch);
 		if (!reflogs || reflogs->nr == 0) {
-			struct object_id oid;
 			char *b;
 			int ret = dwim_log(branch, strlen(branch),
-					   &oid, &b);
+					   NULL, &b);
 			if (ret > 1)
 				free(b);
 			else if (ret == 1) {
diff --git a/refs.c b/refs.c
index 8b9f7c3a80..d680de3bc0 100644
--- a/refs.c
+++ b/refs.c
@@ -10,6 +10,7 @@
 #include "refs.h"
 #include "refs/refs-internal.h"
 #include "run-command.h"
+#include "hook.h"
 #include "object-store.h"
 #include "object.h"
 #include "tag.h"
@@ -33,11 +34,6 @@ static struct ref_storage_be *find_ref_storage_backend(const char *name)
 	return NULL;
 }
 
-int ref_storage_backend_exists(const char *name)
-{
-	return find_ref_storage_backend(name) != NULL;
-}
-
 /*
  * How to handle various characters in refnames:
  * 0: An acceptable character for refs
@@ -255,12 +251,13 @@ int refname_is_safe(const char *refname)
  * does not exist, emit a warning and return false.
  */
 int ref_resolves_to_object(const char *refname,
+			   struct repository *repo,
 			   const struct object_id *oid,
 			   unsigned int flags)
 {
 	if (flags & REF_ISBROKEN)
 		return 0;
-	if (!has_object_file(oid)) {
+	if (!repo_has_object_file(repo, oid)) {
 		error(_("%s does not point to a valid object!"), refname);
 		return 0;
 	}
@@ -294,20 +291,16 @@ 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))
+	struct ref_store *refs = get_main_ref_store(the_repository);
+
+	if (refs_resolve_ref_unsafe(refs, refname, resolve_flags,
+				    oid, flags))
 		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);
@@ -315,7 +308,8 @@ 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);
+	return !!refs_resolve_ref_unsafe(refs, refname, RESOLVE_REF_READING,
+					 NULL, NULL);
 }
 
 int ref_exists(const char *refname)
@@ -658,12 +652,13 @@ 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);
 
 		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,
+		r = refs_resolve_ref_unsafe(refs, fullref.buf,
+					    RESOLVE_REF_READING,
 					    this_result, &flag);
 		if (r) {
 			if (!refs_found++)
@@ -698,7 +693,7 @@ int repo_dwim_log(struct repository *r, const char *str, int len,
 		strbuf_addf(&path, *p, len, str);
 		ref = refs_resolve_ref_unsafe(refs, path.buf,
 					      RESOLVE_REF_READING,
-					      &hash, NULL);
+					      oid ? &hash : NULL, NULL);
 		if (!ref)
 			continue;
 		if (refs_reflog_exists(refs, path.buf))
@@ -710,7 +705,8 @@ int repo_dwim_log(struct repository *r, const char *str, int len,
 			continue;
 		if (!logs_found++) {
 			*log = xstrdup(it);
-			oidcpy(oid, &hash);
+			if (oid)
+				oidcpy(oid, &hash);
 		}
 		if (!warn_ambiguous_refs)
 			break;
@@ -797,7 +793,7 @@ int refs_delete_ref(struct ref_store *refs, const char *msg,
 	struct ref_transaction *transaction;
 	struct strbuf err = STRBUF_INIT;
 
-	transaction = ref_store_transaction_begin(refs, &err);
+	transaction = ref_store_transaction_begin(refs, 0, &err);
 	if (!transaction ||
 	    ref_transaction_delete(transaction, refname, old_oid,
 				   flags, msg, &err) ||
@@ -1002,6 +998,7 @@ int read_ref_at(struct ref_store *refs, const char *refname,
 }
 
 struct ref_transaction *ref_store_transaction_begin(struct ref_store *refs,
+						    unsigned int flags,
 						    struct strbuf *err)
 {
 	struct ref_transaction *tr;
@@ -1009,12 +1006,13 @@ struct ref_transaction *ref_store_transaction_begin(struct ref_store *refs,
 
 	CALLOC_ARRAY(tr, 1);
 	tr->ref_store = refs;
+	tr->flags = flags;
 	return tr;
 }
 
 struct ref_transaction *ref_transaction_begin(struct strbuf *err)
 {
-	return ref_store_transaction_begin(get_main_ref_store(the_repository), err);
+	return ref_store_transaction_begin(get_main_ref_store(the_repository), 0, err);
 }
 
 void ref_transaction_free(struct ref_transaction *transaction)
@@ -1080,9 +1078,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;
@@ -1091,6 +1090,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,
@@ -1145,7 +1151,7 @@ int refs_update_ref(struct ref_store *refs, const char *msg,
 	struct strbuf err = STRBUF_INIT;
 	int ret = 0;
 
-	t = ref_store_transaction_begin(refs, &err);
+	t = ref_store_transaction_begin(refs, 0, &err);
 	if (!t ||
 	    ref_transaction_update(t, refname, new_oid, old_oid, flags, msg,
 				   &err) ||
@@ -1375,32 +1381,13 @@ 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;
 
-	if (!refs_read_ref_full(refs, "HEAD", RESOLVE_REF_READING,
-				&oid, &flag))
+	if (refs_resolve_ref_unsafe(refs, "HEAD", RESOLVE_REF_READING,
+				    &oid, &flag))
 		return fn("HEAD", &oid, flag, cb_data);
 
 	return 0;
@@ -1413,14 +1400,21 @@ int head_ref(each_ref_fn fn, void *cb_data)
 
 struct ref_iterator *refs_ref_iterator_begin(
 		struct ref_store *refs,
-		const char *prefix, int trim, int flags)
+		const char *prefix, int trim,
+		enum do_for_each_ref_flags flags)
 {
 	struct ref_iterator *iter;
 
-	if (ref_paranoia < 0)
-		ref_paranoia = git_env_bool("GIT_REF_PARANOIA", 0);
-	if (ref_paranoia)
-		flags |= DO_FOR_EACH_INCLUDE_BROKEN;
+	if (!(flags & DO_FOR_EACH_INCLUDE_BROKEN)) {
+		static int ref_paranoia = -1;
+
+		if (ref_paranoia < 0)
+			ref_paranoia = git_env_bool("GIT_REF_PARANOIA", 1);
+		if (ref_paranoia) {
+			flags |= DO_FOR_EACH_INCLUDE_BROKEN;
+			flags |= DO_FOR_EACH_OMIT_DANGLING_SYMREFS;
+		}
+	}
 
 	iter = refs->be->iterator_begin(refs, prefix, flags);
 
@@ -1479,7 +1473,8 @@ static int do_for_each_ref_helper(struct repository *r,
 }
 
 static int do_for_each_ref(struct ref_store *refs, const char *prefix,
-			   each_ref_fn fn, int trim, int flags, void *cb_data)
+			   each_ref_fn fn, int trim,
+			   enum do_for_each_ref_flags flags, void *cb_data)
 {
 	struct ref_iterator *iter;
 	struct do_for_each_ref_help hp = { fn, cb_data };
@@ -1514,25 +1509,16 @@ int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)
 	return refs_for_each_ref_in(get_main_ref_store(the_repository), prefix, fn, cb_data);
 }
 
-int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken)
+int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data)
 {
-	unsigned int flag = 0;
-
-	if (broken)
-		flag = DO_FOR_EACH_INCLUDE_BROKEN;
 	return do_for_each_ref(get_main_ref_store(the_repository),
-			       prefix, fn, 0, flag, cb_data);
+			       prefix, fn, 0, 0, cb_data);
 }
 
 int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix,
-			     each_ref_fn fn, void *cb_data,
-			     unsigned int broken)
+			     each_ref_fn fn, void *cb_data)
 {
-	unsigned int flag = 0;
-
-	if (broken)
-		flag = DO_FOR_EACH_INCLUDE_BROKEN;
-	return do_for_each_ref(refs, prefix, fn, 0, flag, cb_data);
+	return do_for_each_ref(refs, prefix, fn, 0, 0, cb_data);
 }
 
 int for_each_replace_ref(struct repository *r, each_repo_ref_fn fn, void *cb_data)
@@ -1624,8 +1610,7 @@ static void find_longest_prefixes(struct string_list *out,
 
 int for_each_fullref_in_prefixes(const char *namespace,
 				 const char **patterns,
-				 each_ref_fn fn, void *cb_data,
-				 unsigned int broken)
+				 each_ref_fn fn, void *cb_data)
 {
 	struct string_list prefixes = STRING_LIST_INIT_DUP;
 	struct string_list_item *prefix;
@@ -1640,7 +1625,7 @@ int for_each_fullref_in_prefixes(const char *namespace,
 
 	for_each_string_list_item(prefix, &prefixes) {
 		strbuf_addstr(&buf, prefix->string);
-		ret = for_each_fullref_in(buf.buf, fn, cb_data, broken);
+		ret = for_each_fullref_in(buf.buf, fn, cb_data);
 		if (ret)
 			break;
 		strbuf_setlen(&buf, namespace_len);
@@ -1653,7 +1638,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;
@@ -1663,7 +1649,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);
@@ -1671,24 +1658,25 @@ 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);
+					   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)
 {
 	static struct strbuf sb_refname = STRBUF_INIT;
 	struct object_id unused_oid;
@@ -1704,10 +1692,8 @@ 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;
+		    !refname_is_safe(refname))
 			return NULL;
-		}
 
 		/*
 		 * dwim_ref() uses REF_ISBROKEN to distinguish between
@@ -1722,9 +1708,10 @@ 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;
+		int failure_errno;
 
-		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 */
@@ -1736,9 +1723,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);
@@ -1764,16 +1751,13 @@ 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;
+			    !refname_is_safe(refname))
 				return NULL;
-			}
 
 			*flags |= REF_ISBROKEN | REF_BAD_NAME;
 		}
 	}
 
-	errno = ELOOP;
 	return NULL;
 }
 
@@ -1875,7 +1859,8 @@ static struct ref_store *lookup_ref_store_map(struct hashmap *map,
  * Create, record, and return a ref_store instance for the specified
  * gitdir.
  */
-static struct ref_store *ref_store_init(const char *gitdir,
+static struct ref_store *ref_store_init(struct repository *repo,
+					const char *gitdir,
 					unsigned int flags)
 {
 	const char *be_name = "files";
@@ -1885,7 +1870,7 @@ static struct ref_store *ref_store_init(const char *gitdir,
 	if (!be)
 		BUG("reference backend %s is unknown", be_name);
 
-	refs = be->init(gitdir, flags);
+	refs = be->init(repo, gitdir, flags);
 	return refs;
 }
 
@@ -1897,7 +1882,7 @@ struct ref_store *get_main_ref_store(struct repository *r)
 	if (!r->gitdir)
 		BUG("attempting to get main_ref_store outside of repository");
 
-	r->refs_private = ref_store_init(r->gitdir, REF_STORE_ALL_CAPS);
+	r->refs_private = ref_store_init(r, r->gitdir, REF_STORE_ALL_CAPS);
 	r->refs_private = maybe_debug_wrap_ref_store(r->gitdir, r->refs_private);
 	return r->refs_private;
 }
@@ -1927,6 +1912,7 @@ struct ref_store *get_submodule_ref_store(const char *submodule)
 	struct ref_store *refs;
 	char *to_free = NULL;
 	size_t len;
+	struct repository *subrepo;
 
 	if (!submodule)
 		return NULL;
@@ -1952,8 +1938,19 @@ struct ref_store *get_submodule_ref_store(const char *submodule)
 	if (submodule_to_gitdir(&submodule_sb, submodule))
 		goto done;
 
-	/* assume that add_submodule_odb() has been called */
-	refs = ref_store_init(submodule_sb.buf,
+	subrepo = xmalloc(sizeof(*subrepo));
+	/*
+	 * NEEDSWORK: Make get_submodule_ref_store() work with arbitrary
+	 * superprojects other than the_repository. This probably should be
+	 * done by making it take a struct repository * parameter instead of a
+	 * submodule path.
+	 */
+	if (repo_submodule_init(subrepo, the_repository, submodule,
+				null_oid())) {
+		free(subrepo);
+		goto done;
+	}
+	refs = ref_store_init(subrepo, submodule_sb.buf,
 			      REF_STORE_READ | REF_STORE_ODB);
 	register_ref_store_map(&submodule_ref_stores, "submodule",
 			       refs, submodule);
@@ -1979,10 +1976,12 @@ struct ref_store *get_worktree_ref_store(const struct worktree *wt)
 		return refs;
 
 	if (wt->id)
-		refs = ref_store_init(git_common_path("worktrees/%s", wt->id),
+		refs = ref_store_init(the_repository,
+				      git_common_path("worktrees/%s", wt->id),
 				      REF_STORE_ALL_CAPS);
 	else
-		refs = ref_store_init(get_git_common_dir(),
+		refs = ref_store_init(the_repository,
+				      get_git_common_dir(),
 				      REF_STORE_ALL_CAPS);
 
 	if (refs)
@@ -1991,10 +1990,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 */
@@ -2066,6 +2067,9 @@ static int run_transaction_hook(struct ref_transaction *transaction,
 	const char *hook;
 	int ret = 0, i;
 
+	if (transaction->flags & REF_TRANSACTION_SKIP_HOOK)
+		return 0;
+
 	hook = find_hook("reference-transaction");
 	if (!hook)
 		return ret;
@@ -2091,8 +2095,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;
 		}
 	}
@@ -2126,7 +2133,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;
@@ -2227,6 +2234,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);
 
@@ -2238,7 +2252,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;
@@ -2347,16 +2362,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)
@@ -2370,19 +2384,19 @@ int delete_reflog(const char *refname)
 }
 
 int refs_reflog_expire(struct ref_store *refs,
-		       const char *refname, const struct object_id *oid,
+		       const char *refname,
 		       unsigned int flags,
 		       reflog_expiry_prepare_fn prepare_fn,
 		       reflog_expiry_should_prune_fn should_prune_fn,
 		       reflog_expiry_cleanup_fn cleanup_fn,
 		       void *policy_cb_data)
 {
-	return refs->be->reflog_expire(refs, refname, oid, flags,
+	return refs->be->reflog_expire(refs, refname, flags,
 				       prepare_fn, should_prune_fn,
 				       cleanup_fn, policy_cb_data);
 }
 
-int reflog_expire(const char *refname, const struct object_id *oid,
+int reflog_expire(const char *refname,
 		  unsigned int flags,
 		  reflog_expiry_prepare_fn prepare_fn,
 		  reflog_expiry_should_prune_fn should_prune_fn,
@@ -2390,7 +2404,7 @@ int reflog_expire(const char *refname, const struct object_id *oid,
 		  void *policy_cb_data)
 {
 	return refs_reflog_expire(get_main_ref_store(the_repository),
-				  refname, oid, flags,
+				  refname, flags,
 				  prepare_fn, should_prune_fn,
 				  cleanup_fn, policy_cb_data);
 }
diff --git a/refs.h b/refs.h
index 48970dfc7e..ff859d5951 100644
--- a/refs.h
+++ b/refs.h
@@ -68,6 +68,7 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
 				    int resolve_flags,
 				    struct object_id *oid,
 				    int *flags);
+
 const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
 			       struct object_id *oid, int *flags);
 
@@ -77,8 +78,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);
@@ -227,7 +226,7 @@ char *repo_default_branch_name(struct repository *r, int quiet);
  *         struct strbuf err = STRBUF_INIT;
  *         int ret = 0;
  *
- *         transaction = ref_store_transaction_begin(refs, &err);
+ *         transaction = ref_store_transaction_begin(refs, 0, &err);
  *         if (!transaction ||
  *             ref_transaction_update(...) ||
  *             ref_transaction_create(...) ||
@@ -342,10 +341,8 @@ int for_each_ref(each_ref_fn fn, void *cb_data);
 int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data);
 
 int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix,
-			     each_ref_fn fn, void *cb_data,
-			     unsigned int broken);
-int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
-			unsigned int broken);
+			     each_ref_fn fn, void *cb_data);
+int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data);
 
 /**
  * iterate all refs in "patterns" by partitioning patterns into disjoint sets
@@ -354,8 +351,7 @@ int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
  * callers should be prepared to ignore references that they did not ask for.
  */
 int for_each_fullref_in_prefixes(const char *namespace, const char **patterns,
-				 each_ref_fn fn, void *cb_data,
-				 unsigned int broken);
+				 each_ref_fn fn, void *cb_data);
 /**
  * iterate refs from the respective area.
  */
@@ -416,8 +412,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,
@@ -462,7 +458,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,
@@ -546,10 +564,16 @@ enum action_on_err {
 };
 
 /*
+ * Skip executing the reference-transaction hook.
+ */
+#define REF_TRANSACTION_SKIP_HOOK (1 << 0)
+
+/*
  * Begin a reference transaction.  The reference transaction must
  * be freed by calling ref_transaction_free().
  */
 struct ref_transaction *ref_store_transaction_begin(struct ref_store *refs,
+						    unsigned int flags,
 						    struct strbuf *err);
 struct ref_transaction *ref_transaction_begin(struct strbuf *err);
 
@@ -615,11 +639,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
@@ -785,8 +821,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,
 };
 
 /*
@@ -796,7 +831,7 @@ enum expire_reflog_flags {
  * expiration policy that is desired.
  *
  * reflog_expiry_prepare_fn -- Called once after the reference is
- *     locked.
+ *     locked. Called with the OID of the locked reference.
  *
  * reflog_expiry_should_prune_fn -- Called once for each entry in the
  *     existing reflog. It should return true iff that entry should be
@@ -816,28 +851,25 @@ typedef int reflog_expiry_should_prune_fn(struct object_id *ooid,
 typedef void reflog_expiry_cleanup_fn(void *cb_data);
 
 /*
- * Expire reflog entries for the specified reference. oid is the old
- * value of the reference. flags is a combination of the constants in
+ * Expire reflog entries for the specified reference.
+ * flags is a combination of the constants in
  * enum expire_reflog_flags. The three function pointers are described
  * above. On success, return zero.
  */
 int refs_reflog_expire(struct ref_store *refs,
 		       const char *refname,
-		       const struct object_id *oid,
 		       unsigned int flags,
 		       reflog_expiry_prepare_fn prepare_fn,
 		       reflog_expiry_should_prune_fn should_prune_fn,
 		       reflog_expiry_cleanup_fn cleanup_fn,
 		       void *policy_cb_data);
-int reflog_expire(const char *refname, const struct object_id *oid,
+int reflog_expire(const char *refname,
 		  unsigned int flags,
 		  reflog_expiry_prepare_fn prepare_fn,
 		  reflog_expiry_should_prune_fn should_prune_fn,
 		  reflog_expiry_cleanup_fn cleanup_fn,
 		  void *policy_cb_data);
 
-int ref_storage_backend_exists(const char *name);
-
 struct ref_store *get_main_ref_store(struct repository *r);
 
 /**
diff --git a/refs/debug.c b/refs/debug.c
index 7db4abccc3..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;
 }
 
@@ -232,21 +234,21 @@ debug_ref_iterator_begin(struct ref_store *ref_store, const char *prefix,
 	struct debug_ref_iterator *diter = xcalloc(1, sizeof(*diter));
 	base_ref_iterator_init(&diter->base, &debug_ref_iterator_vtable, 1);
 	diter->iter = res;
-	trace_printf_key(&trace_refs, "ref_iterator_begin: %s (0x%x)\n", prefix, flags);
+	trace_printf_key(&trace_refs, "ref_iterator_begin: \"%s\" (0x%x)\n",
+			 prefix, flags);
 	return &diter->base;
 }
 
 static int debug_read_raw_ref(struct ref_store *ref_store, const char *refname,
 			      struct object_id *oid, struct strbuf *referent,
-			      unsigned int *type)
+			      unsigned int *type, int *failure_errno)
 {
 	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
 	int res = 0;
 
 	oidcpy(oid, null_oid());
-	errno = 0;
 	res = drefs->refs->be->read_raw_ref(drefs->refs, refname, oid, referent,
-					    type);
+					    type, failure_errno);
 
 	if (res == 0) {
 		trace_printf_key(&trace_refs, "read_raw_ref: %s: %s (=> %s) type %x: %d\n",
@@ -254,7 +256,7 @@ static int debug_read_raw_ref(struct ref_store *ref_store, const char *refname,
 	} else {
 		trace_printf_key(&trace_refs,
 				 "read_raw_ref: %s: %d (errno %d)\n", refname,
-				 res, errno);
+				 res, *failure_errno);
 	}
 	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;
 }
@@ -364,8 +368,8 @@ struct debug_reflog_expiry_should_prune {
 };
 
 static void debug_reflog_expiry_prepare(const char *refname,
-				    const struct object_id *oid,
-				    void *cb_data)
+					const struct object_id *oid,
+					void *cb_data)
 {
 	struct debug_reflog_expiry_should_prune *prune = cb_data;
 	trace_printf_key(&trace_refs, "reflog_expire_prepare: %s\n", refname);
@@ -391,7 +395,7 @@ static void debug_reflog_expiry_cleanup(void *cb_data)
 }
 
 static int debug_reflog_expire(struct ref_store *ref_store, const char *refname,
-			       const struct object_id *oid, unsigned int flags,
+			       unsigned int flags,
 			       reflog_expiry_prepare_fn prepare_fn,
 			       reflog_expiry_should_prune_fn should_prune_fn,
 			       reflog_expiry_cleanup_fn cleanup_fn,
@@ -404,7 +408,7 @@ static int debug_reflog_expire(struct ref_store *ref_store, const char *refname,
 		.should_prune = should_prune_fn,
 		.cb_data = policy_cb_data,
 	};
-	int res = drefs->refs->be->reflog_expire(drefs->refs, refname, oid,
+	int res = drefs->refs->be->reflog_expire(drefs->refs, refname,
 						 flags, &debug_reflog_expiry_prepare,
 						 &debug_reflog_expiry_should_prune_fn,
 						 &debug_reflog_expiry_cleanup,
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 677b7e4cdd..f59589d6cc 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`.
  */
 
 /*
@@ -79,22 +78,20 @@ static void clear_loose_ref_cache(struct files_ref_store *refs)
  * Create a new submodule ref cache and add it to the internal
  * set of caches.
  */
-static struct ref_store *files_ref_store_create(const char *gitdir,
+static struct ref_store *files_ref_store_create(struct repository *repo,
+						const char *gitdir,
 						unsigned int flags)
 {
 	struct files_ref_store *refs = xcalloc(1, sizeof(*refs));
 	struct ref_store *ref_store = (struct ref_store *)refs;
 	struct strbuf sb = STRBUF_INIT;
 
-	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(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",
@@ -227,7 +224,7 @@ static void add_per_worktree_entries_to_dir(struct ref_dir *dir, const char *dir
 		pos = search_ref_dir(dir, prefix, prefix_len);
 		if (pos >= 0)
 			continue;
-		child_entry = create_dir_entry(dir->cache, prefix, prefix_len, 1);
+		child_entry = create_dir_entry(dir->cache, prefix, prefix_len);
 		add_entry_to_dir(dir, child_entry);
 	}
 }
@@ -278,7 +275,7 @@ static void loose_fill_ref_dir(struct ref_store *ref_store,
 			strbuf_addch(&refname, '/');
 			add_entry_to_dir(dir,
 					 create_dir_entry(dir->cache, refname.buf,
-							  refname.len, 1));
+							  refname.len));
 		} else {
 			if (!refs_resolve_ref_unsafe(&refs->base,
 						     refname.buf,
@@ -336,14 +333,14 @@ static struct ref_cache *get_loose_ref_cache(struct files_ref_store *refs)
 		 * lazily):
 		 */
 		add_entry_to_dir(get_ref_dir(refs->loose->root),
-				 create_dir_entry(refs->loose, "refs/", 5, 1));
+				 create_dir_entry(refs->loose, "refs/", 5));
 	}
 	return refs->loose;
 }
 
-static int files_read_raw_ref(struct ref_store *ref_store,
-			      const char *refname, struct object_id *oid,
-			      struct strbuf *referent, unsigned int *type)
+static int files_read_raw_ref(struct ref_store *ref_store, const char *refname,
+			      struct object_id *oid, struct strbuf *referent,
+			      unsigned int *type, int *failure_errno)
 {
 	struct files_ref_store *refs =
 		files_downcast(ref_store, REF_STORE_READ, "read_raw_ref");
@@ -354,8 +351,8 @@ static int files_read_raw_ref(struct ref_store *ref_store,
 	struct stat st;
 	int fd;
 	int ret = -1;
-	int save_errno;
 	int remaining_retries = 3;
+	int myerr = 0;
 
 	*type = 0;
 	strbuf_reset(&sb_path);
@@ -382,11 +379,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;
@@ -397,7 +396,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
@@ -419,14 +419,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;
@@ -439,7 +440,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
@@ -447,27 +449,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:
-	save_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 = save_errno;
+	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 +491,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;
@@ -531,7 +536,6 @@ static void unlock_ref(struct ref_lock *lock)
 static int lock_raw_ref(struct files_ref_store *refs,
 			const char *refname, int mustexist,
 			const struct string_list *extras,
-			const struct string_list *skip,
 			struct ref_lock **lock_p,
 			struct strbuf *referent,
 			unsigned int *type,
@@ -541,6 +545,7 @@ static int lock_raw_ref(struct files_ref_store *refs,
 	struct strbuf ref_file = STRBUF_INIT;
 	int attempts_remaining = 3;
 	int ret = TRANSACTION_GENERIC_ERROR;
+	int failure_errno;
 
 	assert(err);
 	files_assert_main_repository(refs, "lock_raw_ref");
@@ -568,7 +573,7 @@ retry:
 		 * reason to expect this error to be transitory.
 		 */
 		if (refs_verify_refname_available(&refs->base, refname,
-						  extras, skip, err)) {
+						  extras, NULL, err)) {
 			if (mustexist) {
 				/*
 				 * To the user the relevant error is
@@ -611,7 +616,9 @@ retry:
 	if (hold_lock_file_for_update_timeout(
 			    &lock->lk, ref_file.buf, LOCK_NO_DEREF,
 			    get_files_ref_lock_timeout_ms()) < 0) {
-		if (errno == ENOENT && --attempts_remaining > 0) {
+		int myerr = errno;
+		errno = 0;
+		if (myerr == ENOENT && --attempts_remaining > 0) {
 			/*
 			 * Maybe somebody just deleted one of the
 			 * directories leading to ref_file.  Try
@@ -619,7 +626,7 @@ retry:
 			 */
 			goto retry;
 		} else {
-			unable_to_lock_message(ref_file.buf, errno, err);
+			unable_to_lock_message(ref_file.buf, myerr, err);
 			goto error_return;
 		}
 	}
@@ -629,9 +636,9 @@ retry:
 	 * fear that its value will change.
 	 */
 
-	if (files_read_raw_ref(&refs->base, refname,
-			       &lock->old_oid, referent, type)) {
-		if (errno == ENOENT) {
+	if (files_read_raw_ref(&refs->base, refname, &lock->old_oid, referent,
+			       type, &failure_errno)) {
+		if (failure_errno == ENOENT) {
 			if (mustexist) {
 				/* Garden variety missing reference. */
 				strbuf_addf(err, "unable to resolve reference '%s'",
@@ -655,7 +662,7 @@ retry:
 				 *   reference named "refs/foo/bar/baz".
 				 */
 			}
-		} else if (errno == EISDIR) {
+		} else if (failure_errno == EISDIR) {
 			/*
 			 * There is a directory in the way. It might have
 			 * contained references that have been deleted. If
@@ -673,7 +680,7 @@ retry:
 							  REMOVE_DIR_EMPTY_ONLY)) {
 				if (refs_verify_refname_available(
 						    &refs->base, refname,
-						    extras, skip, err)) {
+						    extras, NULL, err)) {
 					/*
 					 * The error message set by
 					 * verify_refname_available() is OK.
@@ -693,13 +700,13 @@ retry:
 					goto error_return;
 				}
 			}
-		} else if (errno == EINVAL && (*type & REF_ISBROKEN)) {
+		} else if (failure_errno == EINVAL && (*type & REF_ISBROKEN)) {
 			strbuf_addf(err, "unable to resolve reference '%s': "
 				    "reference broken", refname);
 			goto error_return;
 		} else {
 			strbuf_addf(err, "unable to resolve reference '%s': %s",
-				    refname, strerror(errno));
+				    refname, strerror(failure_errno));
 			goto error_return;
 		}
 
@@ -710,7 +717,7 @@ retry:
 		 */
 		if (refs_verify_refname_available(
 				    refs->packed_ref_store, refname,
-				    extras, skip, err))
+				    extras, NULL, err))
 			goto error_return;
 	}
 
@@ -730,6 +737,7 @@ struct files_ref_iterator {
 	struct ref_iterator base;
 
 	struct ref_iterator *iter0;
+	struct repository *repo;
 	unsigned int flags;
 };
 
@@ -744,8 +752,14 @@ static int files_ref_iterator_advance(struct ref_iterator *ref_iterator)
 		    ref_type(iter->iter0->refname) != REF_TYPE_PER_WORKTREE)
 			continue;
 
+		if ((iter->flags & DO_FOR_EACH_OMIT_DANGLING_SYMREFS) &&
+		    (iter->iter0->flags & REF_ISSYMREF) &&
+		    (iter->iter0->flags & REF_ISBROKEN))
+			continue;
+
 		if (!(iter->flags & DO_FOR_EACH_INCLUDE_BROKEN) &&
 		    !ref_resolves_to_object(iter->iter0->refname,
+					    iter->repo,
 					    iter->iter0->oid,
 					    iter->iter0->flags))
 			continue;
@@ -824,7 +838,7 @@ static struct ref_iterator *files_ref_iterator_begin(
 	 */
 
 	loose_iter = cache_ref_iterator_begin(get_loose_ref_cache(refs),
-					      prefix, 1);
+					      prefix, ref_store->repo, 1);
 
 	/*
 	 * The packed-refs file might contain broken references, for
@@ -848,45 +862,119 @@ static struct ref_iterator *files_ref_iterator_begin(
 	base_ref_iterator_init(ref_iterator, &files_ref_iterator_vtable,
 			       overlay_iter->ordered);
 	iter->iter0 = overlay_iter;
+	iter->repo = ref_store->repo;
 	iter->flags = flags;
 
 	return ref_iterator;
 }
 
 /*
- * Verify that the reference locked by lock has the value old_oid
- * (unless it is NULL).  Fail if the reference doesn't exist and
- * mustexist is set. Return 0 on success. On error, write an error
- * message to err, set errno, and return a negative value.
+ * Callback function for raceproof_create_file(). This function is
+ * expected to do something that makes dirname(path) permanent despite
+ * the fact that other processes might be cleaning up empty
+ * directories at the same time. Usually it will create a file named
+ * path, but alternatively it could create another file in that
+ * directory, or even chdir() into that directory. The function should
+ * return 0 if the action was completed successfully. On error, it
+ * should return a nonzero result and set errno.
+ * raceproof_create_file() treats two errno values specially:
+ *
+ * - ENOENT -- dirname(path) does not exist. In this case,
+ *             raceproof_create_file() tries creating dirname(path)
+ *             (and any parent directories, if necessary) and calls
+ *             the function again.
+ *
+ * - EISDIR -- the file already exists and is a directory. In this
+ *             case, raceproof_create_file() removes the directory if
+ *             it is empty (and recursively any empty directories that
+ *             it contains) and calls the function again.
+ *
+ * Any other errno causes raceproof_create_file() to fail with the
+ * callback's return value and errno.
+ *
+ * Obviously, this function should be OK with being called again if it
+ * fails with ENOENT or EISDIR. In other scenarios it will not be
+ * called again.
+ */
+typedef int create_file_fn(const char *path, void *cb);
+
+/*
+ * Create a file in dirname(path) by calling fn, creating leading
+ * directories if necessary. Retry a few times in case we are racing
+ * with another process that is trying to clean up the directory that
+ * contains path. See the documentation for create_file_fn for more
+ * details.
+ *
+ * Return the value and set the errno that resulted from the most
+ * recent call of fn. fn is always called at least once, and will be
+ * called more than once if it returns ENOENT or EISDIR.
  */
-static int verify_lock(struct ref_store *ref_store, struct ref_lock *lock,
-		       const struct object_id *old_oid, int mustexist,
-		       struct strbuf *err)
+static int raceproof_create_file(const char *path, create_file_fn fn, void *cb)
 {
-	assert(err);
+	/*
+	 * The number of times we will try to remove empty directories
+	 * in the way of path. This is only 1 because if another
+	 * process is racily creating directories that conflict with
+	 * us, we don't want to fight against them.
+	 */
+	int remove_directories_remaining = 1;
 
-	if (refs_read_ref_full(ref_store, lock->ref_name,
-			       mustexist ? RESOLVE_REF_READING : 0,
-			       &lock->old_oid, NULL)) {
-		if (old_oid) {
-			int save_errno = errno;
-			strbuf_addf(err, "can't verify ref '%s'", lock->ref_name);
-			errno = save_errno;
-			return -1;
-		} else {
-			oidclr(&lock->old_oid);
-			return 0;
-		}
-	}
-	if (old_oid && !oideq(&lock->old_oid, old_oid)) {
-		strbuf_addf(err, "ref '%s' is at %s but expected %s",
-			    lock->ref_name,
-			    oid_to_hex(&lock->old_oid),
-			    oid_to_hex(old_oid));
-		errno = EBUSY;
-		return -1;
+	/*
+	 * The number of times that we will try to create the
+	 * directories containing path. We are willing to attempt this
+	 * more than once, because another process could be trying to
+	 * clean up empty directories at the same time as we are
+	 * trying to create them.
+	 */
+	int create_directories_remaining = 3;
+
+	/* A scratch copy of path, filled lazily if we need it: */
+	struct strbuf path_copy = STRBUF_INIT;
+
+	int ret, save_errno;
+
+	/* Sanity check: */
+	assert(*path);
+
+retry_fn:
+	ret = fn(path, cb);
+	save_errno = errno;
+	if (!ret)
+		goto out;
+
+	if (errno == EISDIR && remove_directories_remaining-- > 0) {
+		/*
+		 * A directory is in the way. Maybe it is empty; try
+		 * to remove it:
+		 */
+		if (!path_copy.len)
+			strbuf_addstr(&path_copy, path);
+
+		if (!remove_dir_recursively(&path_copy, REMOVE_DIR_EMPTY_ONLY))
+			goto retry_fn;
+	} else if (errno == ENOENT && create_directories_remaining-- > 0) {
+		/*
+		 * Maybe the containing directory didn't exist, or
+		 * maybe it was just deleted by a process that is
+		 * racing with us to clean up empty directories. Try
+		 * to create it:
+		 */
+		enum scld_error scld_result;
+
+		if (!path_copy.len)
+			strbuf_addstr(&path_copy, path);
+
+		do {
+			scld_result = safe_create_leading_directories(path_copy.buf);
+			if (scld_result == SCLD_OK)
+				goto retry_fn;
+		} while (scld_result == SCLD_VANISHED && create_directories_remaining-- > 0);
 	}
-	return 0;
+
+out:
+	strbuf_release(&path_copy);
+	errno = save_errno;
+	return ret;
 }
 
 static int remove_empty_directories(struct strbuf *path)
@@ -910,67 +998,20 @@ static int create_reflock(const char *path, void *cb)
 
 /*
  * Locks a ref returning the lock on success and NULL on failure.
- * On failure errno is set to something meaningful.
  */
 static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs,
 					   const char *refname,
-					   const struct object_id *old_oid,
-					   const struct string_list *extras,
-					   const struct string_list *skip,
-					   unsigned int flags, int *type,
 					   struct strbuf *err)
 {
 	struct strbuf ref_file = STRBUF_INIT;
 	struct ref_lock *lock;
-	int last_errno = 0;
-	int mustexist = (old_oid && !is_null_oid(old_oid));
-	int resolve_flags = RESOLVE_REF_NO_RECURSE;
-	int resolved;
 
 	files_assert_main_repository(refs, "lock_ref_oid_basic");
 	assert(err);
 
 	CALLOC_ARRAY(lock, 1);
 
-	if (mustexist)
-		resolve_flags |= RESOLVE_REF_READING;
-	if (flags & REF_DELETING)
-		resolve_flags |= RESOLVE_REF_ALLOW_BAD_NAME;
-
 	files_ref_path(refs, &ref_file, refname);
-	resolved = !!refs_resolve_ref_unsafe(&refs->base,
-					     refname, resolve_flags,
-					     &lock->old_oid, type);
-	if (!resolved && errno == EISDIR) {
-		/*
-		 * we are trying to lock foo but we used to
-		 * have foo/bar which now does not exist;
-		 * it is normal for the empty directory 'foo'
-		 * to remain.
-		 */
-		if (remove_empty_directories(&ref_file)) {
-			last_errno = errno;
-			if (!refs_verify_refname_available(
-					    &refs->base,
-					    refname, extras, skip, err))
-				strbuf_addf(err, "there are still refs under '%s'",
-					    refname);
-			goto error_return;
-		}
-		resolved = !!refs_resolve_ref_unsafe(&refs->base,
-						     refname, resolve_flags,
-						     &lock->old_oid, type);
-	}
-	if (!resolved) {
-		last_errno = errno;
-		if (last_errno != ENOTDIR ||
-		    !refs_verify_refname_available(&refs->base, refname,
-						   extras, skip, err))
-			strbuf_addf(err, "unable to resolve reference '%s': %s",
-				    refname, strerror(last_errno));
-
-		goto error_return;
-	}
 
 	/*
 	 * If the ref did not exist and we are creating it, make sure
@@ -980,23 +1021,19 @@ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs,
 	 */
 	if (is_null_oid(&lock->old_oid) &&
 	    refs_verify_refname_available(refs->packed_ref_store, refname,
-					  extras, skip, err)) {
-		last_errno = ENOTDIR;
+					  NULL, NULL, err))
 		goto error_return;
-	}
 
 	lock->ref_name = xstrdup(refname);
 
 	if (raceproof_create_file(ref_file.buf, create_reflock, &lock->lk)) {
-		last_errno = errno;
 		unable_to_lock_message(ref_file.buf, errno, err);
 		goto error_return;
 	}
 
-	if (verify_lock(&refs->base, lock, old_oid, mustexist, err)) {
-		last_errno = errno;
-		goto error_return;
-	}
+	if (!refs_resolve_ref_unsafe(&refs->base, lock->ref_name, 0,
+				     &lock->old_oid, NULL))
+		oidclr(&lock->old_oid);
 	goto out;
 
  error_return:
@@ -1005,7 +1042,6 @@ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs,
 
  out:
 	strbuf_release(&ref_file);
-	errno = last_errno;
 	return lock;
 }
 
@@ -1078,7 +1114,8 @@ static void prune_ref(struct files_ref_store *refs, struct ref_to_prune *r)
 	if (check_refname_format(r->name, 0))
 		return;
 
-	transaction = ref_store_transaction_begin(&refs->base, &err);
+	transaction = ref_store_transaction_begin(&refs->base,
+						  REF_TRANSACTION_SKIP_HOOK, &err);
 	if (!transaction)
 		goto cleanup;
 	ref_transaction_add_update(
@@ -1132,7 +1169,7 @@ static int should_pack_ref(const char *refname,
 		return 0;
 
 	/* Do not pack broken refs: */
-	if (!ref_resolves_to_object(refname, oid, ref_flags))
+	if (!ref_resolves_to_object(refname, the_repository, oid, ref_flags))
 		return 0;
 
 	return 1;
@@ -1149,13 +1186,15 @@ static int files_pack_refs(struct ref_store *ref_store, unsigned int flags)
 	struct strbuf err = STRBUF_INIT;
 	struct ref_transaction *transaction;
 
-	transaction = ref_store_transaction_begin(refs->packed_ref_store, &err);
+	transaction = ref_store_transaction_begin(refs->packed_ref_store,
+						  REF_TRANSACTION_SKIP_HOOK, &err);
 	if (!transaction)
 		return -1;
 
 	packed_refs_lock(refs->packed_ref_store, LOCK_DIE_ON_ERROR, &err);
 
-	iter = cache_ref_iterator_begin(get_loose_ref_cache(refs), NULL, 0);
+	iter = cache_ref_iterator_begin(get_loose_ref_cache(refs), NULL,
+					the_repository, 0);
 	while ((ok = ref_iterator_advance(iter)) == ITER_OK) {
 		/*
 		 * If the loose reference can be packed, add an entry
@@ -1205,6 +1244,7 @@ static int files_delete_refs(struct ref_store *ref_store, const char *msg,
 {
 	struct files_ref_store *refs =
 		files_downcast(ref_store, REF_STORE_WRITE, "delete_refs");
+	struct ref_transaction *transaction = NULL;
 	struct strbuf err = STRBUF_INIT;
 	int i, result = 0;
 
@@ -1214,10 +1254,15 @@ static int files_delete_refs(struct ref_store *ref_store, const char *msg,
 	if (packed_refs_lock(refs->packed_ref_store, 0, &err))
 		goto error;
 
-	if (refs_delete_refs(refs->packed_ref_store, msg, refnames, flags)) {
-		packed_refs_unlock(refs->packed_ref_store);
+	transaction = ref_store_transaction_begin(refs->packed_ref_store,
+						  REF_TRANSACTION_SKIP_HOOK, &err);
+	if (!transaction)
+		goto error;
+
+	result = packed_refs_delete_refs(refs->packed_ref_store,
+					 transaction, msg, refnames, flags);
+	if (result)
 		goto error;
-	}
 
 	packed_refs_unlock(refs->packed_ref_store);
 
@@ -1228,6 +1273,7 @@ static int files_delete_refs(struct ref_store *ref_store, const char *msg,
 			result |= error(_("could not remove reference %s"), refname);
 	}
 
+	ref_transaction_free(transaction);
 	strbuf_release(&err);
 	return result;
 
@@ -1244,6 +1290,7 @@ error:
 	else
 		error(_("could not delete references: %s"), err.buf);
 
+	ref_transaction_free(transaction);
 	strbuf_release(&err);
 	return -1;
 }
@@ -1309,12 +1356,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)
@@ -1343,7 +1420,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)) {
 		ret = error("refname %s not found", oldrefname);
 		goto out;
 	}
@@ -1387,9 +1464,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) &&
 	    refs_delete_ref(&refs->base, NULL, newrefname,
 			    NULL, REF_NO_DEREF)) {
 		if (errno == EISDIR) {
@@ -1415,8 +1492,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
 
 	logmoved = log;
 
-	lock = lock_ref_oid_basic(refs, newrefname, NULL, NULL, NULL,
-				  REF_NO_DEREF, 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);
@@ -1427,7 +1503,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);
@@ -1438,8 +1514,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
 	goto out;
 
  rollback:
-	lock = lock_ref_oid_basic(refs, oldrefname, NULL, NULL, NULL,
-				  REF_NO_DEREF, 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);
@@ -1448,7 +1523,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);
@@ -1569,7 +1644,7 @@ static int log_ref_setup(struct files_ref_store *refs,
 			goto error;
 		}
 	} else {
-		*logfd = open(logfile, O_APPEND | O_WRONLY, 0666);
+		*logfd = open(logfile, O_APPEND | O_WRONLY);
 		if (*logfd < 0) {
 			if (errno == ENOENT || errno == EISDIR) {
 				/*
@@ -1598,15 +1673,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)
@@ -1684,26 +1758,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 ||
@@ -1803,9 +1882,10 @@ static void update_symref_reflog(struct files_ref_store *refs,
 {
 	struct strbuf err = STRBUF_INIT;
 	struct object_id new_oid;
+
 	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) &&
 	    files_log_ref_write(refs, refname, &lock->old_oid,
 				&new_oid, logmsg, 0, &err)) {
 		error("%s", err.buf);
@@ -1846,9 +1926,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,
-				  NULL, NULL, REF_NO_DEREF, NULL,
-				  &err);
+	lock = lock_ref_oid_basic(refs, refname, &err);
 	if (!lock) {
 		error("%s", err.buf);
 		strbuf_release(&err);
@@ -2092,9 +2170,9 @@ 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)) {
 			error("bad ref for %s", diter->path.buf);
 			continue;
 		}
@@ -2112,7 +2190,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");
 }
@@ -2416,7 +2494,7 @@ static int lock_ref_for_update(struct files_ref_store *refs,
 	}
 
 	ret = lock_raw_ref(refs, update->refname, mustexist,
-			   affected_refnames, NULL,
+			   affected_refnames,
 			   &lock, &referent,
 			   &update->type, err);
 	if (ret) {
@@ -2438,9 +2516,9 @@ 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)) {
+			if (!refs_resolve_ref_unsafe(&refs->base,
+						     referent.buf, 0,
+						     &lock->old_oid, NULL)) {
 				if (update->flags & REF_HAVE_OLD) {
 					strbuf_addf(err, "cannot lock ref '%s': "
 						    "error reading reference",
@@ -2496,8 +2574,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);
 
 			/*
@@ -2681,7 +2761,8 @@ static int files_transaction_prepare(struct ref_store *ref_store,
 			 */
 			if (!packed_transaction) {
 				packed_transaction = ref_store_transaction_begin(
-						refs->packed_ref_store, err);
+						refs->packed_ref_store,
+						REF_TRANSACTION_SKIP_HOOK, err);
 				if (!packed_transaction) {
 					ret = TRANSACTION_GENERIC_ERROR;
 					goto cleanup;
@@ -2952,7 +3033,8 @@ static int files_initial_transaction_commit(struct ref_store *ref_store,
 				 &affected_refnames))
 		BUG("initial ref transaction called with existing refs");
 
-	packed_transaction = ref_store_transaction_begin(refs->packed_ref_store, err);
+	packed_transaction = ref_store_transaction_begin(refs->packed_ref_store,
+							 REF_TRANSACTION_SKIP_HOOK, err);
 	if (!packed_transaction) {
 		ret = TRANSACTION_GENERIC_ERROR;
 		goto cleanup;
@@ -3000,11 +3082,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,
@@ -3012,33 +3095,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, const struct object_id *oid,
-			       unsigned int flags,
+			       const char *refname,
+			       unsigned int expire_flags,
 			       reflog_expiry_prepare_fn prepare_fn,
 			       reflog_expiry_should_prune_fn should_prune_fn,
 			       reflog_expiry_cleanup_fn cleanup_fn,
@@ -3052,11 +3129,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;
 
@@ -3065,14 +3143,26 @@ 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, oid,
-				  NULL, NULL, REF_NO_DEREF,
-				  &type, &err);
+	lock = lock_ref_oid_basic(refs, refname, &err);
 	if (!lock) {
 		error("cannot lock ref '%s': %s", refname, err.buf);
 		strbuf_release(&err);
 		return -1;
 	}
+	oid = &lock->old_oid;
+
+	/*
+	 * When refs are deleted, their reflog is deleted before the
+	 * ref itself is deleted. This is because there is no separate
+	 * lock for reflog; instead we take a lock on the ref with
+	 * lock_ref_oid_basic().
+	 *
+	 * If a race happens and the reflog doesn't exist after we've
+	 * acquired the lock that's OK. We've got nothing more to do;
+	 * We were asked to delete the reflog, but someone else
+	 * deleted it! The caller doesn't care that we deleted it,
+	 * just that it is deleted. So we can return successfully.
+	 */
 	if (!refs_reflog_exists(ref_store, refname)) {
 		unlock_ref(lock);
 		return 0;
@@ -3080,7 +3170,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
@@ -3107,7 +3197,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
@@ -3115,9 +3205,18 @@ 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 type;
+			const char *ref;
+
+			ref = refs_resolve_ref_unsafe(&refs->base, refname,
+						      RESOLVE_REF_NO_RECURSE,
+						      NULL, &type);
+			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 f8aa97d799..27dd8c3922 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -193,19 +193,20 @@ static int release_snapshot(struct snapshot *snapshot)
 	}
 }
 
-struct ref_store *packed_ref_store_create(const char *path,
+struct ref_store *packed_ref_store_create(struct repository *repo,
+					  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->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;
 }
 
@@ -724,9 +725,9 @@ static struct snapshot *get_snapshot(struct packed_ref_store *refs)
 	return refs->snapshot;
 }
 
-static int packed_read_raw_ref(struct ref_store *ref_store,
-			       const char *refname, struct object_id *oid,
-			       struct strbuf *referent, unsigned int *type)
+static int packed_read_raw_ref(struct ref_store *ref_store, const char *refname,
+			       struct object_id *oid, struct strbuf *referent,
+			       unsigned int *type, int *failure_errno)
 {
 	struct packed_ref_store *refs =
 		packed_downcast(ref_store, REF_STORE_READ, "read_raw_ref");
@@ -739,7 +740,7 @@ static int packed_read_raw_ref(struct ref_store *ref_store,
 
 	if (!rec) {
 		/* refname is not a packed reference. */
-		errno = ENOENT;
+		*failure_errno = ENOENT;
 		return -1;
 	}
 
@@ -776,6 +777,7 @@ struct packed_ref_iterator {
 	struct object_id oid, peeled;
 	struct strbuf refname_buf;
 
+	struct repository *repo;
 	unsigned int flags;
 };
 
@@ -864,8 +866,8 @@ static int packed_ref_iterator_advance(struct ref_iterator *ref_iterator)
 			continue;
 
 		if (!(iter->flags & DO_FOR_EACH_INCLUDE_BROKEN) &&
-		    !ref_resolves_to_object(iter->base.refname, &iter->oid,
-					    iter->flags))
+		    !ref_resolves_to_object(iter->base.refname, iter->repo,
+					    &iter->oid, iter->flags))
 			continue;
 
 		return ITER_OK;
@@ -883,6 +885,9 @@ static int packed_ref_iterator_peel(struct ref_iterator *ref_iterator,
 	struct packed_ref_iterator *iter =
 		(struct packed_ref_iterator *)ref_iterator;
 
+	if (iter->repo != the_repository)
+		BUG("peeling for non-the_repository is not supported");
+
 	if ((iter->base.flags & REF_KNOWS_PEELED)) {
 		oidcpy(peeled, &iter->peeled);
 		return is_null_oid(&iter->peeled) ? -1 : 0;
@@ -954,6 +959,7 @@ static struct ref_iterator *packed_ref_iterator_begin(
 
 	iter->base.oid = &iter->oid;
 
+	iter->repo = ref_store->repo;
 	iter->flags = flags;
 
 	if (prefix && *prefix)
@@ -1347,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;
 
@@ -1357,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.
@@ -1514,15 +1521,10 @@ static int packed_initial_transaction_commit(struct ref_store *ref_store,
 static int packed_delete_refs(struct ref_store *ref_store, const char *msg,
 			     struct string_list *refnames, unsigned int flags)
 {
-	struct packed_ref_store *refs =
-		packed_downcast(ref_store, REF_STORE_WRITE, "delete_refs");
 	struct strbuf err = STRBUF_INIT;
 	struct ref_transaction *transaction;
-	struct string_list_item *item;
 	int ret;
 
-	(void)refs; /* We need the check above, but don't use the variable */
-
 	if (!refnames->nr)
 		return 0;
 
@@ -1532,10 +1534,30 @@ static int packed_delete_refs(struct ref_store *ref_store, const char *msg,
 	 * updates into a single transaction.
 	 */
 
-	transaction = ref_store_transaction_begin(ref_store, &err);
+	transaction = ref_store_transaction_begin(ref_store, 0, &err);
 	if (!transaction)
 		return -1;
 
+	ret = packed_refs_delete_refs(ref_store, transaction,
+				      msg, refnames, flags);
+
+	ref_transaction_free(transaction);
+	return ret;
+}
+
+int packed_refs_delete_refs(struct ref_store *ref_store,
+			    struct ref_transaction *transaction,
+			    const char *msg,
+			    struct string_list *refnames,
+			    unsigned int flags)
+{
+	struct strbuf err = STRBUF_INIT;
+	struct string_list_item *item;
+	int ret;
+
+	/* Assert that the ref store refers to a packed backend. */
+	packed_downcast(ref_store, REF_STORE_WRITE, "delete_refs");
+
 	for_each_string_list_item(item, refnames) {
 		if (ref_transaction_delete(transaction, item->string, NULL,
 					   flags, msg, &err)) {
@@ -1555,7 +1577,6 @@ static int packed_delete_refs(struct ref_store *ref_store, const char *msg,
 			error(_("could not delete references: %s"), err.buf);
 	}
 
-	ref_transaction_free(transaction);
 	strbuf_release(&err);
 	return ret;
 }
@@ -1600,6 +1621,7 @@ static int packed_for_each_reflog_ent(struct ref_store *ref_store,
 				      const char *refname,
 				      each_reflog_ent_fn fn, void *cb_data)
 {
+	BUG("packed reference store does not support reflogs");
 	return 0;
 }
 
@@ -1608,18 +1630,19 @@ static int packed_for_each_reflog_ent_reverse(struct ref_store *ref_store,
 					      each_reflog_ent_fn fn,
 					      void *cb_data)
 {
+	BUG("packed reference store does not support reflogs");
 	return 0;
 }
 
 static int packed_reflog_exists(struct ref_store *ref_store,
 			       const char *refname)
 {
+	BUG("packed reference store does not support reflogs");
 	return 0;
 }
 
 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");
 }
@@ -1627,17 +1650,19 @@ static int packed_create_reflog(struct ref_store *ref_store,
 static int packed_delete_reflog(struct ref_store *ref_store,
 			       const char *refname)
 {
+	BUG("packed reference store does not support reflogs");
 	return 0;
 }
 
 static int packed_reflog_expire(struct ref_store *ref_store,
-				const char *refname, const struct object_id *oid,
+				const char *refname,
 				unsigned int flags,
 				reflog_expiry_prepare_fn prepare_fn,
 				reflog_expiry_should_prune_fn should_prune_fn,
 				reflog_expiry_cleanup_fn cleanup_fn,
 				void *policy_cb_data)
 {
+	BUG("packed reference store does not support reflogs");
 	return 0;
 }
 
diff --git a/refs/packed-backend.h b/refs/packed-backend.h
index a01a0aff9c..52e0490753 100644
--- a/refs/packed-backend.h
+++ b/refs/packed-backend.h
@@ -1,7 +1,9 @@
 #ifndef REFS_PACKED_BACKEND_H
 #define REFS_PACKED_BACKEND_H
 
+struct repository;
 struct ref_transaction;
+struct string_list;
 
 /*
  * Support for storing references in a `packed-refs` file.
@@ -12,7 +14,8 @@ struct ref_transaction;
  * even among packed refs.
  */
 
-struct ref_store *packed_ref_store_create(const char *path,
+struct ref_store *packed_ref_store_create(struct repository *repo,
+					  const char *gitdir,
 					  unsigned int store_flags);
 
 /*
@@ -25,6 +28,12 @@ int packed_refs_lock(struct ref_store *ref_store, int flags, struct strbuf *err)
 void packed_refs_unlock(struct ref_store *ref_store);
 int packed_refs_is_locked(struct ref_store *ref_store);
 
+int packed_refs_delete_refs(struct ref_store *ref_store,
+			    struct ref_transaction *transaction,
+			    const char *msg,
+			    struct string_list *refnames,
+			    unsigned int flags);
+
 /*
  * Return true if `transaction` really needs to be carried out against
  * the specified packed_ref_store, or false if it can be skipped
diff --git a/refs/ref-cache.c b/refs/ref-cache.c
index 49d732f6db..be4aa5e098 100644
--- a/refs/ref-cache.c
+++ b/refs/ref-cache.c
@@ -49,7 +49,7 @@ struct ref_cache *create_ref_cache(struct ref_store *refs,
 
 	ret->ref_store = refs;
 	ret->fill_ref_dir = fill_ref_dir;
-	ret->root = create_dir_entry(ret, "", 0, 1);
+	ret->root = create_dir_entry(ret, "", 0);
 	return ret;
 }
 
@@ -86,14 +86,13 @@ static void clear_ref_dir(struct ref_dir *dir)
 }
 
 struct ref_entry *create_dir_entry(struct ref_cache *cache,
-				   const char *dirname, size_t len,
-				   int incomplete)
+				   const char *dirname, size_t len)
 {
 	struct ref_entry *direntry;
 
 	FLEX_ALLOC_MEM(direntry, name, dirname, len);
 	direntry->u.subdir.cache = cache;
-	direntry->flag = REF_DIR | (incomplete ? REF_INCOMPLETE : 0);
+	direntry->flag = REF_DIR | REF_INCOMPLETE;
 	return direntry;
 }
 
@@ -144,30 +143,19 @@ int search_ref_dir(struct ref_dir *dir, const char *refname, size_t len)
 /*
  * Search for a directory entry directly within dir (without
  * recursing).  Sort dir if necessary.  subdirname must be a directory
- * name (i.e., end in '/').  If mkdir is set, then create the
- * directory if it is missing; otherwise, return NULL if the desired
+ * name (i.e., end in '/'). Returns NULL if the desired
  * directory cannot be found.  dir must already be complete.
  */
 static struct ref_dir *search_for_subdir(struct ref_dir *dir,
-					 const char *subdirname, size_t len,
-					 int mkdir)
+					 const char *subdirname, size_t len)
 {
 	int entry_index = search_ref_dir(dir, subdirname, len);
 	struct ref_entry *entry;
-	if (entry_index == -1) {
-		if (!mkdir)
-			return NULL;
-		/*
-		 * Since dir is complete, the absence of a subdir
-		 * means that the subdir really doesn't exist;
-		 * therefore, create an empty record for it but mark
-		 * the record complete.
-		 */
-		entry = create_dir_entry(dir->cache, subdirname, len, 0);
-		add_entry_to_dir(dir, entry);
-	} else {
-		entry = dir->entries[entry_index];
-	}
+
+	if (entry_index == -1)
+		return NULL;
+
+	entry = dir->entries[entry_index];
 	return get_ref_dir(entry);
 }
 
@@ -176,18 +164,17 @@ static struct ref_dir *search_for_subdir(struct ref_dir *dir,
  * tree that should hold refname. If refname is a directory name
  * (i.e., it ends in '/'), then return that ref_dir itself. dir must
  * represent the top-level directory and must already be complete.
- * Sort ref_dirs and recurse into subdirectories as necessary. If
- * mkdir is set, then create any missing directories; otherwise,
+ * Sort ref_dirs and recurse into subdirectories as necessary. Will
  * return NULL if the desired directory cannot be found.
  */
 static struct ref_dir *find_containing_dir(struct ref_dir *dir,
-					   const char *refname, int mkdir)
+					   const char *refname)
 {
 	const char *slash;
 	for (slash = strchr(refname, '/'); slash; slash = strchr(slash + 1, '/')) {
 		size_t dirnamelen = slash - refname + 1;
 		struct ref_dir *subdir;
-		subdir = search_for_subdir(dir, refname, dirnamelen, mkdir);
+		subdir = search_for_subdir(dir, refname, dirnamelen);
 		if (!subdir) {
 			dir = NULL;
 			break;
@@ -202,7 +189,7 @@ struct ref_entry *find_ref_entry(struct ref_dir *dir, const char *refname)
 {
 	int entry_index;
 	struct ref_entry *entry;
-	dir = find_containing_dir(dir, refname, 0);
+	dir = find_containing_dir(dir, refname);
 	if (!dir)
 		return NULL;
 	entry_index = search_ref_dir(dir, refname, strlen(refname));
@@ -212,50 +199,6 @@ struct ref_entry *find_ref_entry(struct ref_dir *dir, const char *refname)
 	return (entry->flag & REF_DIR) ? NULL : entry;
 }
 
-int remove_entry_from_dir(struct ref_dir *dir, const char *refname)
-{
-	int refname_len = strlen(refname);
-	int entry_index;
-	struct ref_entry *entry;
-	int is_dir = refname[refname_len - 1] == '/';
-	if (is_dir) {
-		/*
-		 * refname represents a reference directory.  Remove
-		 * the trailing slash; otherwise we will get the
-		 * directory *representing* refname rather than the
-		 * one *containing* it.
-		 */
-		char *dirname = xmemdupz(refname, refname_len - 1);
-		dir = find_containing_dir(dir, dirname, 0);
-		free(dirname);
-	} else {
-		dir = find_containing_dir(dir, refname, 0);
-	}
-	if (!dir)
-		return -1;
-	entry_index = search_ref_dir(dir, refname, refname_len);
-	if (entry_index == -1)
-		return -1;
-	entry = dir->entries[entry_index];
-
-	MOVE_ARRAY(&dir->entries[entry_index],
-		   &dir->entries[entry_index + 1], dir->nr - entry_index - 1);
-	dir->nr--;
-	if (dir->sorted > entry_index)
-		dir->sorted--;
-	free_ref_entry(entry);
-	return dir->nr;
-}
-
-int add_ref_entry(struct ref_dir *dir, struct ref_entry *ref)
-{
-	dir = find_containing_dir(dir, ref->name, 1);
-	if (!dir)
-		return -1;
-	add_entry_to_dir(dir, ref);
-	return 0;
-}
-
 /*
  * Emit a warning and return true iff ref1 and ref2 have the same name
  * and the same oid. Die if they have the same name but different
@@ -435,6 +378,8 @@ struct cache_ref_iterator {
 	 * on from there.)
 	 */
 	struct cache_ref_iterator_level *levels;
+
+	struct repository *repo;
 };
 
 static int cache_ref_iterator_advance(struct ref_iterator *ref_iterator)
@@ -491,6 +436,11 @@ static int cache_ref_iterator_advance(struct ref_iterator *ref_iterator)
 static int cache_ref_iterator_peel(struct ref_iterator *ref_iterator,
 				   struct object_id *peeled)
 {
+	struct cache_ref_iterator *iter =
+		(struct cache_ref_iterator *)ref_iterator;
+
+	if (iter->repo != the_repository)
+		BUG("peeling for non-the_repository is not supported");
 	return peel_object(ref_iterator->oid, peeled) ? -1 : 0;
 }
 
@@ -513,6 +463,7 @@ static struct ref_iterator_vtable cache_ref_iterator_vtable = {
 
 struct ref_iterator *cache_ref_iterator_begin(struct ref_cache *cache,
 					      const char *prefix,
+					      struct repository *repo,
 					      int prime_dir)
 {
 	struct ref_dir *dir;
@@ -522,7 +473,7 @@ struct ref_iterator *cache_ref_iterator_begin(struct ref_cache *cache,
 
 	dir = get_ref_dir(cache->root);
 	if (prefix && *prefix)
-		dir = find_containing_dir(dir, prefix, 0);
+		dir = find_containing_dir(dir, prefix);
 	if (!dir)
 		/* There's nothing to iterate over. */
 		return empty_ref_iterator_begin();
@@ -547,5 +498,7 @@ struct ref_iterator *cache_ref_iterator_begin(struct ref_cache *cache,
 		level->prefix_state = PREFIX_CONTAINS_DIR;
 	}
 
+	iter->repo = repo;
+
 	return ref_iterator;
 }
diff --git a/refs/ref-cache.h b/refs/ref-cache.h
index 3bfb89d2b3..850d9d3744 100644
--- a/refs/ref-cache.h
+++ b/refs/ref-cache.h
@@ -169,8 +169,7 @@ struct ref_dir *get_ref_dir(struct ref_entry *entry);
  * "refs/heads/") or "" for the top-level directory.
  */
 struct ref_entry *create_dir_entry(struct ref_cache *cache,
-				   const char *dirname, size_t len,
-				   int incomplete);
+				   const char *dirname, size_t len);
 
 struct ref_entry *create_ref_entry(const char *refname,
 				   const struct object_id *oid, int flag);
@@ -200,29 +199,6 @@ void free_ref_cache(struct ref_cache *cache);
 void add_entry_to_dir(struct ref_dir *dir, struct ref_entry *entry);
 
 /*
- * Remove the entry with the given name from dir, recursing into
- * subdirectories as necessary.  If refname is the name of a directory
- * (i.e., ends with '/'), then remove the directory and its contents.
- * If the removal was successful, return the number of entries
- * remaining in the directory entry that contained the deleted entry.
- * If the name was not found, return -1.  Please note that this
- * function only deletes the entry from the cache; it does not delete
- * it from the filesystem or ensure that other cache entries (which
- * might be symbolic references to the removed entry) are updated.
- * Nor does it remove any containing dir entries that might be made
- * empty by the removal.  dir must represent the top-level directory
- * and must already be complete.
- */
-int remove_entry_from_dir(struct ref_dir *dir, const char *refname);
-
-/*
- * Add a ref_entry to the ref_dir (unsorted), recursing into
- * subdirectories as necessary.  dir must represent the top-level
- * directory.  Return 0 on success.
- */
-int add_ref_entry(struct ref_dir *dir, struct ref_entry *ref);
-
-/*
  * Find the value entry with the given name in dir, sorting ref_dirs
  * and recursing into subdirectories as necessary.  If the name is not
  * found or it corresponds to a directory entry, return NULL.
@@ -238,6 +214,7 @@ struct ref_entry *find_ref_entry(struct ref_dir *dir, const char *refname);
  */
 struct ref_iterator *cache_ref_iterator_begin(struct ref_cache *cache,
 					      const char *prefix,
+					      struct repository *repo,
 					      int prime_dir);
 
 #endif /* REFS_REF_CACHE_H */
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 3155708345..6e15db3ca4 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -66,6 +66,7 @@ int refname_is_safe(const char *refname);
  * referred-to object does not exist, emit a warning and return false.
  */
 int ref_resolves_to_object(const char *refname,
+			   struct repository *repo,
 			   const struct object_id *oid,
 			   unsigned int flags);
 
@@ -149,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
@@ -212,6 +213,7 @@ struct ref_transaction {
 	size_t nr;
 	enum ref_transaction_state state;
 	void *backend_data;
+	unsigned int flags;
 };
 
 /*
@@ -228,25 +230,39 @@ const char *find_descendant_ref(const char *dirname,
 				const struct string_list *extras,
 				const struct string_list *skip);
 
+/* We allow "recursive" symbolic refs. Only within reason, though */
+#define SYMREF_MAXDEPTH 5
+
 /*
- * 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).
+ * These flags are passed to refs_ref_iterator_begin() (and do_for_each_ref(),
+ * which feeds it).
  */
-int refs_rename_ref_available(struct ref_store *refs,
-			      const char *old_refname,
-			      const char *new_refname);
+enum do_for_each_ref_flags {
+	/*
+	 * Include broken references in a do_for_each_ref*() iteration, which
+	 * would normally be omitted. This includes both refs that point to
+	 * missing objects (a true repository corruption), ones with illegal
+	 * names (which we prefer not to expose to callers), as well as
+	 * dangling symbolic refs (i.e., those that point to a non-existent
+	 * ref; this is not a corruption, but as they have no valid oid, we
+	 * omit them from normal iteration results).
+	 */
+	DO_FOR_EACH_INCLUDE_BROKEN = (1 << 0),
 
-/* We allow "recursive" symbolic refs. Only within reason, though */
-#define SYMREF_MAXDEPTH 5
+	/*
+	 * Only include per-worktree refs in a do_for_each_ref*() iteration.
+	 * Normally this will be used with a files ref_store, since that's
+	 * where all reference backends will presumably store their
+	 * per-worktree refs.
+	 */
+	DO_FOR_EACH_PER_WORKTREE_ONLY = (1 << 1),
 
-/* Include broken references in a do_for_each_ref*() iteration: */
-#define DO_FOR_EACH_INCLUDE_BROKEN 0x01
+	/*
+	 * Omit dangling symrefs from output; this only has an effect with
+	 * INCLUDE_BROKEN, since they are otherwise not included at all.
+	 */
+	DO_FOR_EACH_OMIT_DANGLING_SYMREFS = (1 << 2),
+};
 
 /*
  * Reference iterators
@@ -349,16 +365,12 @@ int is_empty_ref_iterator(struct ref_iterator *ref_iterator);
  * Return an iterator that goes over each reference in `refs` for
  * which the refname begins with prefix. If trim is non-zero, then
  * trim that many characters off the beginning of each refname.
- * The output is ordered by refname. The following flags are supported:
- *
- * DO_FOR_EACH_INCLUDE_BROKEN: include broken references in
- *         the iteration.
- *
- * DO_FOR_EACH_PER_WORKTREE_ONLY: only produce REF_TYPE_PER_WORKTREE refs.
+ * The output is ordered by refname.
  */
 struct ref_iterator *refs_ref_iterator_begin(
 		struct ref_store *refs,
-		const char *prefix, int trim, int flags);
+		const char *prefix, int trim,
+		enum do_for_each_ref_flags flags);
 
 /*
  * A callback function used to instruct merge_ref_iterator how to
@@ -446,10 +458,8 @@ void base_ref_iterator_free(struct ref_iterator *iter);
 /*
  * backend-specific implementation of ref_iterator_advance. For symrefs, the
  * function should set REF_ISSYMREF, and it should also dereference the symref
- * to provide the OID referent. If DO_FOR_EACH_INCLUDE_BROKEN is set, symrefs
- * with non-existent referents and refs pointing to non-existent object names
- * should also be returned. If DO_FOR_EACH_PER_WORKTREE_ONLY, only
- * REF_TYPE_PER_WORKTREE refs should be returned.
+ * to provide the OID referent. It should respect do_for_each_ref_flags
+ * that were passed to refs_ref_iterator_begin().
  */
 typedef int ref_iterator_advance_fn(struct ref_iterator *ref_iterator);
 
@@ -498,14 +508,6 @@ int do_for_each_repo_ref_iterator(struct repository *r,
 				  struct ref_iterator *iter,
 				  each_repo_ref_fn fn, void *cb_data);
 
-/*
- * Only include per-worktree refs in a do_for_each_ref*() iteration.
- * Normally this will be used with a files ref_store, since that's
- * where all reference backends will presumably store their
- * per-worktree refs.
- */
-#define DO_FOR_EACH_PER_WORKTREE_ONLY 0x02
-
 struct ref_store;
 
 /* refs backends */
@@ -525,7 +527,8 @@ struct ref_store;
  * should call base_ref_store_init() to initialize the shared part of
  * the ref_store and to record the ref_store for later lookup.
  */
-typedef struct ref_store *ref_store_init_fn(const char *gitdir,
+typedef struct ref_store *ref_store_init_fn(struct repository *repo,
+					    const char *gitdir,
 					    unsigned int flags);
 
 typedef int ref_init_db_fn(struct ref_store *refs, struct strbuf *err);
@@ -590,10 +593,10 @@ 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, const struct object_id *oid,
+			     const char *refname,
 			     unsigned int flags,
 			     reflog_expiry_prepare_fn prepare_fn,
 			     reflog_expiry_should_prune_fn should_prune_fn,
@@ -620,11 +623,15 @@ typedef int reflog_expire_fn(struct ref_store *ref_store,
  * properly-formatted or even safe reference name. NEITHER INPUT NOR
  * OUTPUT REFERENCE NAMES ARE VALIDATED WITHIN THIS FUNCTION.
  *
- * Return 0 on success. If the ref doesn't exist, set errno to ENOENT
- * and return -1. If the ref exists but is neither a symbolic ref nor
- * an object ID, it is broken; set REF_ISBROKEN in type, set errno to
- * EINVAL, and return -1. If there is another error reading the ref,
- * set errno appropriately and return -1.
+ * Return 0 on success, or -1 on failure. If the ref exists but is neither a
+ * symbolic ref nor an object ID, it is broken. In this case set REF_ISBROKEN in
+ * type, and return -1 (failure_errno should not be ENOENT)
+ *
+ * failure_errno provides errno codes that are interpreted beyond error
+ * reporting. The following error codes have special meaning:
+ *    * ENOENT: the ref doesn't exist
+ *    * EISDIR: ref name is a directory
+ *    * ENOTDIR: ref prefix is not a directory
  *
  * Backend-specific flags might be set in type as well, regardless of
  * outcome.
@@ -638,9 +645,9 @@ typedef int reflog_expire_fn(struct ref_store *ref_store,
  * - in all other cases, referent will be untouched, and therefore
  *   refname will still be valid and unchanged.
  */
-typedef int read_raw_ref_fn(struct ref_store *ref_store,
-			    const char *refname, struct object_id *oid,
-			    struct strbuf *referent, unsigned int *type);
+typedef int read_raw_ref_fn(struct ref_store *ref_store, const char *refname,
+			    struct object_id *oid, struct strbuf *referent,
+			    unsigned int *type, int *failure_errno);
 
 struct ref_storage_be {
 	struct ref_storage_be *next;
@@ -683,22 +690,29 @@ struct ref_store {
 	/* The backend describing this ref_store's storage scheme: */
 	const struct ref_storage_be *be;
 
-	/* The gitdir that this ref_store applies to: */
+	struct repository *repo;
+
+	/*
+	 * The gitdir that this ref_store applies to. Note that this is not
+	 * necessarily repo->gitdir if the repo has multiple worktrees.
+	 */
 	char *gitdir;
 };
 
 /*
- * 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..2170748c5e
--- /dev/null
+++ b/reftable/block.c
@@ -0,0 +1,445 @@
+/*
+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);
+	int err = 0;
+	uint16_t restart_count = 0;
+	uint32_t restart_start = 0;
+	uint8_t *restart_bytes = NULL;
+	uint8_t *uncompressed = NULL;
+
+	if (!reftable_is_block_type(typ)) {
+		err =  REFTABLE_FORMAT_ERROR;
+		goto done;
+	}
+
+	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.
+		 */
+		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)) {
+			err = REFTABLE_ZLIB_ERROR;
+			goto done;
+		}
+
+		if (dst_len + block_header_skip != sz) {
+			err = REFTABLE_FORMAT_ERROR;
+			goto done;
+		}
+
+		/* We're done with the input data. */
+		reftable_block_done(block);
+		block->data = uncompressed;
+		uncompressed = NULL;
+		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;
+
+done:
+	reftable_free(uncompressed);
+	return err;
+}
+
+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_release(&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..fa2ee092ec
--- /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_record rec = {
+		.type = BLOCK_TYPE_REF,
+	};
+	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));
+
+	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));
+
+		rec.u.ref.refname = name;
+		rec.u.ref.value_type = REFTABLE_REF_VAL1;
+		rec.u.ref.value.val1 = hash;
+
+		names[i] = xstrdup(name);
+		n = block_writer_add(&bw, &rec);
+		rec.u.ref.refname = NULL;
+		rec.u.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], rec.u.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], rec.u.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)], rec.u.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..2605371c28
--- /dev/null
+++ b/reftable/blocksource.c
@@ -0,0 +1,150 @@
+/*
+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) {
+		close(fd);
+		return REFTABLE_IO_ERROR;
+	}
+
+	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..b27d152e89
--- /dev/null
+++ b/reftable/generic.c
@@ -0,0 +1,176 @@
+/*
+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 "constants.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_record rec = { .type = BLOCK_TYPE_REF,
+				       .u.ref = {
+					       .refname = (char *)name,
+				       } };
+	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_record rec = { .type = BLOCK_TYPE_LOG,
+				       .u.log = {
+					       .refname = (char *)name,
+					       .update_index = ~((uint64_t)0),
+				       } };
+	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 = {
+		.type = BLOCK_TYPE_REF,
+		.u.ref = *ref,
+	};
+	int err = iterator_next(it, &rec);
+	*ref = rec.u.ref;
+	return err;
+}
+
+int reftable_iterator_next_log(struct reftable_iterator *it,
+			       struct reftable_log_record *log)
+{
+	struct reftable_record rec = {
+		.type = BLOCK_TYPE_LOG,
+		.u.log = *log,
+	};
+	int err = iterator_next(it, &rec);
+	*log = rec.u.log;
+	return err;
+}
+
+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..a8d174c040
--- /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->u.ref;
+	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->u.ref;
+
+	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..2a6efa110d
--- /dev/null
+++ b/reftable/merged.c
@@ -0,0 +1,361 @@
+/*
+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_release(&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 pq_entry e = {
+		.rec = reftable_new_record(mi->typ),
+		.index = idx,
+	};
+	int err = iterator_next(&mi->stack[idx], &e.rec);
+	if (err < 0)
+		return err;
+
+	if (err > 0) {
+		reftable_iterator_destroy(&mi->stack[idx]);
+		reftable_record_release(&e.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_release(&top.rec);
+	}
+
+	reftable_record_copy_from(rec, &entry.rec, hash_size(mi->hash_id));
+	reftable_record_release(&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_record rec = {
+		.type = BLOCK_TYPE_REF,
+		.u.ref = {
+			.refname = (char *)name,
+		},
+	};
+	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_record rec = { .type = BLOCK_TYPE_LOG,
+				       .u.log = {
+					       .refname = (char *)name,
+					       .update_index = update_index,
+				       } };
+	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..96ca6dd37b
--- /dev/null
+++ b/reftable/pq.c
@@ -0,0 +1,106 @@
+/*
+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_release(&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..7de5e886f3
--- /dev/null
+++ b/reftable/pq_test.c
@@ -0,0 +1,79 @@
+/*
+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 };
+	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 pq_entry e = { .rec = { .type = BLOCK_TYPE_REF,
+					       .u.ref = {
+						       .refname = names[i],
+					       } } };
+		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_record *rec = &e.rec;
+		merged_iter_pqueue_check(pq);
+
+		EXPECT(reftable_record_type(rec) == BLOCK_TYPE_REF);
+		if (last) {
+			EXPECT(strcmp(last, rec->u.ref.refname) < 0);
+		}
+		// this is names[i], so don't dealloc.
+		last = rec->u.ref.refname;
+		rec->u.ref.refname = NULL;
+		reftable_record_release(rec);
+	}
+	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..00906e7a2d
--- /dev/null
+++ b/reftable/reader.c
@@ -0,0 +1,811 @@
+/*
+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) {
+		rec->u.ref.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)
+		goto done;
+
+	block_size = extract_block_size(block.data, &block_typ, next_off,
+					r->version);
+	if (block_size < 0) {
+		err = block_size;
+		goto done;
+	}
+	if (want_typ != BLOCK_TYPE_ANY && block_typ != want_typ) {
+		err = 1;
+		goto done;
+	}
+
+	if (block_size > guess_block_size) {
+		reftable_block_done(&block);
+		err = reader_get_block(r, &block, next_off, block_size);
+		if (err < 0) {
+			goto done;
+		}
+	}
+
+	err = block_reader_init(br, &block, header_off, r->block_size,
+				hash_size(r->hash_id));
+done:
+	reftable_block_done(&block);
+
+	return err;
+}
+
+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_release(&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_record want_index = {
+		.type = BLOCK_TYPE_INDEX, .u.idx = { .last_key = STRBUF_INIT }
+	};
+	struct reftable_record index_result = {
+		.type = BLOCK_TYPE_INDEX,
+		.u.idx = { .last_key = STRBUF_INIT },
+	};
+	struct table_iter index_iter = TABLE_ITER_INIT;
+	struct table_iter next = TABLE_ITER_INIT;
+	int err = 0;
+
+	reftable_record_key(rec, &want_index.u.idx.last_key);
+	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);
+	while (1) {
+		err = table_iter_next(&index_iter, &index_result);
+		table_iter_block_done(&index_iter);
+		if (err != 0)
+			goto done;
+
+		err = reader_table_iter_at(r, &next, index_result.u.idx.offset,
+					   0);
+		if (err != 0)
+			goto done;
+
+		err = block_iter_seek(&next.bi, &want_index.u.idx.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);
+	reftable_record_release(&index_result);
+	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_record rec = {
+		.type = BLOCK_TYPE_REF,
+		.u.ref = {
+			.refname = (char *)name,
+		},
+	};
+	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_record rec = { .type = BLOCK_TYPE_LOG,
+				       .u.log = {
+					       .refname = (char *)name,
+					       .update_index = update_index,
+				       } };
+	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)
+{
+	if (!r)
+		return;
+	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_record want = {
+		.type = BLOCK_TYPE_OBJ,
+		.u.obj = {
+			.hash_prefix = oid,
+			.hash_prefix_len = r->object_id_len,
+		},
+	};
+	struct reftable_iterator oit = { NULL };
+	struct reftable_record got = {
+		.type = BLOCK_TYPE_OBJ,
+		.u.obj = { 0 },
+	};
+	int err = 0;
+	struct indexed_table_ref_iter *itr = NULL;
+
+	/* Look through the reverse index. */
+	err = reader_seek(r, &oit, &want);
+	if (err != 0)
+		goto done;
+
+	/* read out the reftable_obj_record */
+	err = iterator_next(&oit, &got);
+	if (err < 0)
+		goto done;
+
+	if (err > 0 || memcmp(want.u.obj.hash_prefix, got.u.obj.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.u.obj.offsets,
+					 got.u.obj.offset_len);
+	if (err < 0)
+		goto done;
+	got.u.obj.offsets = NULL;
+	iterator_from_indexed_table_ref_iter(it, itr);
+
+done:
+	reftable_iterator_destroy(&oit);
+	reftable_record_release(&got);
+	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..605ba0f9fd
--- /dev/null
+++ b/reftable/readwrite_test.c
@@ -0,0 +1,752 @@
+/*
+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_log_zlib_corruption(void)
+{
+	struct reftable_write_options opts = {
+		.block_size = 256,
+	};
+	struct reftable_iterator it = { 0 };
+	struct reftable_reader rd = { 0 };
+	struct reftable_block_source source = { 0 };
+	struct strbuf buf = STRBUF_INIT;
+	struct reftable_writer *w =
+		reftable_new_writer(&strbuf_add_void, &buf, &opts);
+	const struct reftable_stats *stats = NULL;
+	uint8_t hash1[GIT_SHA1_RAWSZ] = { 1 };
+	uint8_t hash2[GIT_SHA1_RAWSZ] = { 2 };
+	char message[100] = { 0 };
+	int err, i, n;
+
+	struct reftable_log_record log = {
+		.refname = "refname",
+		.value_type = REFTABLE_LOG_UPDATE,
+		.value = {
+			.update = {
+				.new_hash = hash1,
+				.old_hash = hash2,
+				.name = "My Name",
+				.email = "myname@invalid",
+				.message = message,
+			},
+		},
+	};
+
+	for (i = 0; i < sizeof(message) - 1; i++)
+		message[i] = (uint8_t)(rand() % 64 + ' ');
+
+	reftable_writer_set_limits(w, 1, 1);
+
+	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;
+
+	/* corrupt the data. */
+	buf.buf[50] ^= 0x99;
+
+	block_source_from_strbuf(&source, &buf);
+
+	err = init_reader(&rd, &source, "file.log");
+	EXPECT_ERR(err);
+
+	err = reftable_reader_seek_log(&rd, &it, "refname");
+	EXPECT(err == REFTABLE_ZLIB_ERROR);
+
+	reftable_iterator_destroy(&it);
+
+	/* cleanup. */
+	strbuf_release(&buf);
+	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]);
+	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_log_zlib_corruption);
+	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..fbaa1fbef5
--- /dev/null
+++ b/reftable/record.c
@@ -0,0 +1,1314 @@
+/*
+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"
+
+static struct reftable_record_vtable *
+reftable_record_vtable(struct reftable_record *rec);
+static void *reftable_record_data(struct reftable_record *rec);
+
+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(const 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(const 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;
+	}
+}
+
+static void reftable_ref_record_print_sz(const struct reftable_ref_record *ref,
+					 int hash_size)
+{
+	char hex[GIT_MAX_HEXSZ + 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);
+		printf("val 2 %s", hex);
+		hex_format(hex, ref->value.val2.target_value,
+			   hash_size);
+		printf("(T %s)", hex);
+		break;
+	case REFTABLE_REF_VAL1:
+		hex_format(hex, ref->value.val1, hash_size);
+		printf("val 1 %s", hex);
+		break;
+	case REFTABLE_REF_DELETION:
+		printf("delete");
+		break;
+	}
+	printf("}\n");
+}
+
+void reftable_ref_record_print(const struct reftable_ref_record *ref,
+			       uint32_t hash_id) {
+	reftable_ref_record_print_sz(ref, hash_size(hash_id));
+}
+
+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 int reftable_ref_record_equal_void(const void *a,
+					  const void *b, int hash_size)
+{
+	struct reftable_ref_record *ra = (struct reftable_ref_record *) a;
+	struct reftable_ref_record *rb = (struct reftable_ref_record *) b;
+	return reftable_ref_record_equal(ra, rb, hash_size);
+}
+
+static void reftable_ref_record_print_void(const void *rec,
+					   int hash_size)
+{
+	reftable_ref_record_print_sz((struct reftable_ref_record *) rec, hash_size);
+}
+
+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,
+	.equal = &reftable_ref_record_equal_void,
+	.print = &reftable_ref_record_print_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_print(const void *rec, int hash_size)
+{
+	const struct reftable_obj_record *obj = rec;
+	char hex[GIT_MAX_HEXSZ + 1] = { 0 };
+	struct strbuf offset_str = STRBUF_INIT;
+	int i;
+
+	for (i = 0; i < obj->offset_len; i++)
+		strbuf_addf(&offset_str, "%" PRIu64 " ", obj->offsets[i]);
+	hex_format(hex, obj->hash_prefix, obj->hash_prefix_len);
+	printf("prefix %s (len %d), offsets [%s]\n",
+	       hex, obj->hash_prefix_len, offset_str.buf);
+	strbuf_release(&offset_str);
+}
+
+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->hash_prefix = reftable_malloc(src->hash_prefix_len);
+	obj->hash_prefix_len = src->hash_prefix_len;
+	if (src->hash_prefix_len)
+		memcpy(obj->hash_prefix, src->hash_prefix, obj->hash_prefix_len);
+
+	obj->offsets = reftable_malloc(src->offset_len * sizeof(uint64_t));
+	obj->offset_len = src->offset_len;
+	COPY_ARRAY(obj->offsets, src->offsets, src->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 int reftable_obj_record_equal_void(const void *a, const void *b, int hash_size)
+{
+	struct reftable_obj_record *ra = (struct reftable_obj_record *) a;
+	struct reftable_obj_record *rb = (struct reftable_obj_record *) b;
+
+	if (ra->hash_prefix_len != rb->hash_prefix_len
+	    || ra->offset_len != rb->offset_len)
+		return 0;
+
+	if (ra->hash_prefix_len &&
+	    memcmp(ra->hash_prefix, rb->hash_prefix, ra->hash_prefix_len))
+		return 0;
+	if (ra->offset_len &&
+	    memcmp(ra->offsets, rb->offsets, ra->offset_len * sizeof(uint64_t)))
+		return 0;
+
+	return 1;
+}
+
+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,
+	.equal = &reftable_obj_record_equal_void,
+	.print = &reftable_obj_record_print,
+};
+
+static void reftable_log_record_print_sz(struct reftable_log_record *log,
+					 int hash_size)
+{
+	char hex[GIT_MAX_HEXSZ + 1] = { 0 };
+
+	switch (log->value_type) {
+	case REFTABLE_LOG_DELETION:
+		printf("log{%s(%" PRIu64 ") delete\n", 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.name : "",
+		       log->value.update.email ? log->value.update.email : "",
+		       log->value.update.time,
+		       log->value.update.tz_offset);
+		hex_format(hex, log->value.update.old_hash, hash_size);
+		printf("%s => ", hex);
+		hex_format(hex, log->value.update.new_hash, hash_size);
+		printf("%s\n\n%s\n}\n", hex,
+		       log->value.update.message ? log->value.update.message : "");
+		break;
+	}
+}
+
+void reftable_log_record_print(struct reftable_log_record *log,
+				      uint32_t hash_id)
+{
+	reftable_log_record_print_sz(log, hash_size(hash_id));
+}
+
+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);
+}
+
+static int reftable_log_record_equal_void(const void *a,
+					  const void *b, int hash_size)
+{
+	return reftable_log_record_equal((struct reftable_log_record *) a,
+					 (struct reftable_log_record *) b,
+					 hash_size);
+}
+
+int reftable_log_record_equal(const struct reftable_log_record *a,
+			      const 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 void reftable_log_record_print_void(const void *rec, int hash_size)
+{
+	reftable_log_record_print_sz((struct reftable_log_record*)rec, hash_size);
+}
+
+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,
+	.equal = &reftable_log_record_equal_void,
+	.print = &reftable_log_record_print_void,
+};
+
+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 int reftable_index_record_equal(const void *a, const void *b, int hash_size)
+{
+	struct reftable_index_record *ia = (struct reftable_index_record *) a;
+	struct reftable_index_record *ib = (struct reftable_index_record *) b;
+
+	return ia->offset == ib->offset && !strbuf_cmp(&ia->last_key, &ib->last_key);
+}
+
+static void reftable_index_record_print(const void *rec, int hash_size)
+{
+	const struct reftable_index_record *idx = rec;
+	/* TODO: escape null chars? */
+	printf("\"%s\" %" PRIu64 "\n", idx->last_key.buf, idx->offset);
+}
+
+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,
+	.equal = &reftable_index_record_equal,
+	.print = &reftable_index_record_print,
+};
+
+void reftable_record_key(struct reftable_record *rec, struct strbuf *dest)
+{
+	reftable_record_vtable(rec)->key(reftable_record_data(rec), dest);
+}
+
+uint8_t reftable_record_type(struct reftable_record *rec)
+{
+	return rec->type;
+}
+
+int reftable_record_encode(struct reftable_record *rec, struct string_view dest,
+			   int hash_size)
+{
+	return reftable_record_vtable(rec)->encode(reftable_record_data(rec),
+						   dest, hash_size);
+}
+
+void reftable_record_copy_from(struct reftable_record *rec,
+			       struct reftable_record *src, int hash_size)
+{
+	assert(src->type == rec->type);
+
+	reftable_record_vtable(rec)->copy_from(reftable_record_data(rec),
+					       reftable_record_data(src),
+					       hash_size);
+}
+
+uint8_t reftable_record_val_type(struct reftable_record *rec)
+{
+	return reftable_record_vtable(rec)->val_type(reftable_record_data(rec));
+}
+
+int reftable_record_decode(struct reftable_record *rec, struct strbuf key,
+			   uint8_t extra, struct string_view src, int hash_size)
+{
+	return reftable_record_vtable(rec)->decode(reftable_record_data(rec),
+						   key, extra, src, hash_size);
+}
+
+void reftable_record_release(struct reftable_record *rec)
+{
+	reftable_record_vtable(rec)->release(reftable_record_data(rec));
+}
+
+int reftable_record_is_deletion(struct reftable_record *rec)
+{
+	return reftable_record_vtable(rec)->is_deletion(
+		reftable_record_data(rec));
+}
+
+int reftable_record_equal(struct reftable_record *a, struct reftable_record *b, int hash_size)
+{
+	if (a->type != b->type)
+		return 0;
+	return reftable_record_vtable(a)->equal(
+		reftable_record_data(a), reftable_record_data(b), hash_size);
+}
+
+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(const struct reftable_ref_record *a,
+			      const struct reftable_ref_record *b, int hash_size)
+{
+	assert(hash_size > 0);
+	if (!null_streq(a->refname, b->refname))
+		return 0;
+
+	if (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;
+}
+
+static void *reftable_record_data(struct reftable_record *rec)
+{
+	switch (rec->type) {
+	case BLOCK_TYPE_REF:
+		return &rec->u.ref;
+	case BLOCK_TYPE_LOG:
+		return &rec->u.log;
+	case BLOCK_TYPE_INDEX:
+		return &rec->u.idx;
+	case BLOCK_TYPE_OBJ:
+		return &rec->u.obj;
+	}
+	abort();
+}
+
+static struct reftable_record_vtable *
+reftable_record_vtable(struct reftable_record *rec)
+{
+	switch (rec->type) {
+	case BLOCK_TYPE_REF:
+		return &reftable_ref_record_vtable;
+	case BLOCK_TYPE_LOG:
+		return &reftable_log_record_vtable;
+	case BLOCK_TYPE_INDEX:
+		return &reftable_index_record_vtable;
+	case BLOCK_TYPE_OBJ:
+		return &reftable_obj_record_vtable;
+	}
+	abort();
+}
+
+struct reftable_record reftable_new_record(uint8_t typ)
+{
+	struct reftable_record clean = {
+		.type = typ,
+	};
+
+	/* the following is involved, but the naive solution (just return
+	 * `clean` as is, except for BLOCK_TYPE_INDEX), returns a garbage
+	 * clean.u.obj.offsets pointer on Windows VS CI.  Go figure.
+	 */
+	switch (typ) {
+	case BLOCK_TYPE_OBJ:
+	{
+		struct reftable_obj_record obj = { 0 };
+		clean.u.obj = obj;
+		break;
+	}
+	case BLOCK_TYPE_INDEX:
+	{
+		struct reftable_index_record idx = {
+			.last_key = STRBUF_INIT,
+		};
+		clean.u.idx = idx;
+		break;
+	}
+	case BLOCK_TYPE_REF:
+	{
+		struct reftable_ref_record ref = { 0 };
+		clean.u.ref = ref;
+		break;
+	}
+	case BLOCK_TYPE_LOG:
+	{
+		struct reftable_log_record log = { 0 };
+		clean.u.log = log;
+		break;
+	}
+	}
+	return clean;
+}
+
+void reftable_record_print(struct reftable_record *rec, int hash_size)
+{
+	printf("'%c': ", rec->type);
+	reftable_record_vtable(rec)->print(reftable_record_data(rec), hash_size);
+}
diff --git a/reftable/record.h b/reftable/record.h
new file mode 100644
index 0000000000..fd80cd451d
--- /dev/null
+++ b/reftable/record.h
@@ -0,0 +1,140 @@
+/*
+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);
+
+	/* Are two records equal? This assumes they have the same type. Returns 0 for non-equal. */
+	int (*equal)(const void *a, const void *b, int hash_size);
+
+	/* Print on stdout, for debugging. */
+	void (*print)(const void *rec, int hash_size);
+};
+
+/* returns true for recognized block types. Block start with the block type. */
+int reftable_is_block_type(uint8_t typ);
+
+/* return an initialized record for the given type */
+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;
+};
+
+/* record is a generic wrapper for different types of records. It is normally
+ * created on the stack, or embedded within another struct. If the type is
+ * known, a fresh instance can be initialized explicitly. Otherwise, use
+ * reftable_new_record() to initialize generically (as the index_record is not
+ * valid as 0-initialized structure)
+ */
+struct reftable_record {
+	uint8_t type;
+	union {
+		struct reftable_ref_record ref;
+		struct reftable_log_record log;
+		struct reftable_obj_record obj;
+		struct reftable_index_record idx;
+	} u;
+};
+
+/* see struct record_vtable */
+int reftable_record_equal(struct reftable_record *a, struct reftable_record *b, int hash_size);
+void reftable_record_print(struct reftable_record *rec, int hash_size);
+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);
+
+/* frees and zeroes out the embedded record */
+void reftable_record_release(struct reftable_record *rec);
+
+/* 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..f91ea5e883
--- /dev/null
+++ b/reftable/record_test.c
@@ -0,0 +1,417 @@
+/*
+  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 = { 0 };
+	uint8_t typ;
+
+	typ = reftable_record_type(rec);
+	copy = reftable_new_record(typ);
+	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);
+	EXPECT(reftable_record_equal(rec, &copy, GIT_SHA1_RAWSZ));
+
+	puts("testing print coverage:\n");
+	reftable_record_print(&copy, GIT_SHA1_RAWSZ);
+
+	reftable_record_release(&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_record in = {
+			.type = BLOCK_TYPE_REF,
+		};
+		struct reftable_record out = { .type = BLOCK_TYPE_REF };
+		struct strbuf key = STRBUF_INIT;
+		uint8_t buffer[1024] = { 0 };
+		struct string_view dest = {
+			.buf = buffer,
+			.len = sizeof(buffer),
+		};
+		int n, m;
+
+		in.u.ref.value_type = i;
+		switch (i) {
+		case REFTABLE_REF_DELETION:
+			break;
+		case REFTABLE_REF_VAL1:
+			in.u.ref.value.val1 = reftable_malloc(GIT_SHA1_RAWSZ);
+			set_hash(in.u.ref.value.val1, 1);
+			break;
+		case REFTABLE_REF_VAL2:
+			in.u.ref.value.val2.value =
+				reftable_malloc(GIT_SHA1_RAWSZ);
+			set_hash(in.u.ref.value.val2.value, 1);
+			in.u.ref.value.val2.target_value =
+				reftable_malloc(GIT_SHA1_RAWSZ);
+			set_hash(in.u.ref.value.val2.target_value, 2);
+			break;
+		case REFTABLE_REF_SYMREF:
+			in.u.ref.value.symref = xstrdup("target");
+			break;
+		}
+		in.u.ref.refname = xstrdup("refs/heads/master");
+
+		test_copy(&in);
+
+		EXPECT(reftable_record_val_type(&in) == i);
+
+		reftable_record_key(&in, &key);
+		n = reftable_record_encode(&in, dest, GIT_SHA1_RAWSZ);
+		EXPECT(n > 0);
+
+		/* decode into a non-zero reftable_record to test for leaks. */
+		m = reftable_record_decode(&out, key, i, dest, GIT_SHA1_RAWSZ);
+		EXPECT(n == m);
+
+		EXPECT(reftable_ref_record_equal(&in.u.ref, &out.u.ref,
+						 GIT_SHA1_RAWSZ));
+		reftable_record_release(&in);
+
+		strbuf_release(&key);
+		reftable_record_release(&out);
+	}
+}
+
+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[] = {
+		{
+			.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,
+		},
+		{
+			.refname = xstrdup("branch"),
+			.update_index = 33,
+			.value_type = REFTABLE_LOG_UPDATE,
+			.value = {
+				.update = {
+					.old_hash = reftable_malloc(GIT_SHA1_RAWSZ),
+					.new_hash = reftable_malloc(GIT_SHA1_RAWSZ),
+					/* rest of fields left empty. */
+				},
+			},
+		}
+	};
+	set_test_hash(in[0].value.update.new_hash, 1);
+	set_test_hash(in[0].value.update.old_hash, 2);
+	set_test_hash(in[2].value.update.new_hash, 3);
+	set_test_hash(in[2].value.update.old_hash, 4);
+	for (i = 0; i < ARRAY_SIZE(in); i++) {
+		struct reftable_record rec = { .type = BLOCK_TYPE_LOG };
+		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_record out = {
+			.type = BLOCK_TYPE_LOG,
+			.u.log = {
+				.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"),
+					},
+				},
+			},
+		};
+		int n, m, valtype;
+
+		rec.u.log = in[i];
+
+		test_copy(&rec);
+
+		reftable_record_key(&rec, &key);
+
+		n = reftable_record_encode(&rec, dest, GIT_SHA1_RAWSZ);
+		EXPECT(n >= 0);
+		valtype = reftable_record_val_type(&rec);
+		m = reftable_record_decode(&out, key, valtype, dest,
+					   GIT_SHA1_RAWSZ);
+		EXPECT(n == m);
+
+		EXPECT(reftable_log_record_equal(&in[i], &out.u.log,
+						 GIT_SHA1_RAWSZ));
+		reftable_log_record_release(&in[i]);
+		strbuf_release(&key);
+		reftable_record_release(&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++) {
+		uint8_t buffer[1024] = { 0 };
+		struct string_view dest = {
+			.buf = buffer,
+			.len = sizeof(buffer),
+		};
+		struct reftable_record in = {
+			.type = BLOCK_TYPE_OBJ,
+			.u.obj = recs[i],
+		};
+		struct strbuf key = STRBUF_INIT;
+		struct reftable_record out = { .type = BLOCK_TYPE_OBJ };
+		int n, m;
+		uint8_t extra;
+
+		test_copy(&in);
+		reftable_record_key(&in, &key);
+		n = reftable_record_encode(&in, dest, GIT_SHA1_RAWSZ);
+		EXPECT(n > 0);
+		extra = reftable_record_val_type(&in);
+		m = reftable_record_decode(&out, key, extra, dest,
+					   GIT_SHA1_RAWSZ);
+		EXPECT(n == m);
+
+		EXPECT(reftable_record_equal(&in, &out, GIT_SHA1_RAWSZ));
+		strbuf_release(&key);
+		reftable_record_release(&out);
+	}
+}
+
+static void test_reftable_index_record_roundtrip(void)
+{
+	struct reftable_record in = {
+		.type = BLOCK_TYPE_INDEX,
+		.u.idx = {
+			.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 out = {
+		.type = BLOCK_TYPE_INDEX,
+		.u.idx = { .last_key = STRBUF_INIT },
+	};
+	int n, m;
+	uint8_t extra;
+
+	strbuf_addstr(&in.u.idx.last_key, "refs/heads/master");
+	reftable_record_key(&in, &key);
+	test_copy(&in);
+
+	EXPECT(0 == strbuf_cmp(&key, &in.u.idx.last_key));
+	n = reftable_record_encode(&in, dest, GIT_SHA1_RAWSZ);
+	EXPECT(n > 0);
+
+	extra = reftable_record_val_type(&in);
+	m = reftable_record_decode(&out, key, extra, dest, GIT_SHA1_RAWSZ);
+	EXPECT(m == n);
+
+	EXPECT(reftable_record_equal(&in, &out, GIT_SHA1_RAWSZ));
+
+	reftable_record_release(&out);
+	strbuf_release(&key);
+	strbuf_release(&in.u.idx.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..67104f8fbf
--- /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(const 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(const 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(const 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(const struct reftable_ref_record *a,
+			      const 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(const struct reftable_log_record *a,
+			      const 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/stack.c b/reftable/stack.c
new file mode 100644
index 0000000000..ddbdf1b9c8
--- /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 = -1;
+	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 = -1;
+
+	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 = -1;
+	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 = -1;
+	}
+	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..19fe4e2008
--- /dev/null
+++ b/reftable/stack_test.c
@@ -0,0 +1,979 @@
+/*
+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);
+	(void) 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_ERR(err);
+		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..18f9207dfe
--- /dev/null
+++ b/reftable/system.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 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.*/
+
+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..944c2329ab
--- /dev/null
+++ b/reftable/writer.c
@@ -0,0 +1,700 @@
+/*
+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)
+{
+	if (!w)
+		return;
+	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 = {
+		.type = BLOCK_TYPE_REF,
+		.u.ref = *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;
+
+	rec.u.ref.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 = {
+		.type = BLOCK_TYPE_LOG,
+		.u.log = *log,
+	};
+	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;
+	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 = {
+				.type = BLOCK_TYPE_INDEX,
+				.u.idx = 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_record
+		rec = { .type = BLOCK_TYPE_OBJ,
+			.u.obj = {
+				.hash_prefix = (uint8_t *)entry->hash.buf,
+				.hash_prefix_len = arg->w->stats.object_id_len,
+				.offsets = entry->offsets,
+				.offset_len = entry->offset_len,
+			} };
+	if (arg->err < 0)
+		goto done;
+
+	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;
+
+	rec.u.obj.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 9d432c299a..0dabef2dd7 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -185,8 +185,6 @@ static int set_option(const char *name, const char *value)
 						 strbuf_detach(&unquoted, NULL));
 		}
 		return 0;
-
-#if LIBCURL_VERSION_NUM >= 0x070a08
 	} else if (!strcmp(name, "family")) {
 		if (!strcmp(value, "ipv4"))
 			git_curl_ipresolve = CURL_IPRESOLVE_V4;
@@ -197,7 +195,6 @@ static int set_option(const char *name, const char *value)
 		else
 			return -1;
 		return 0;
-#endif /* LIBCURL_VERSION_NUM >= 0x070a08 */
 	} else if (!strcmp(name, "from-promisor")) {
 		options.from_promisor = 1;
 		return 0;
@@ -502,6 +499,10 @@ static struct discovery *discover_refs(const char *service, int for_push)
 		show_http_message(&type, &charset, &buffer);
 		die(_("Authentication failed for '%s'"),
 		    transport_anonymize_url(url.buf));
+	case HTTP_NOMATCHPUBLICKEY:
+		show_http_message(&type, &charset, &buffer);
+		die(_("unable to access '%s' with http.pinnedPubkey configuration: %s"),
+		    transport_anonymize_url(url.buf), curl_errorstr);
 	default:
 		show_http_message(&type, &charset, &buffer);
 		die(_("unable to access '%s': %s"),
@@ -653,7 +654,7 @@ static int rpc_read_from_out(struct rpc_state *rpc, int options,
 			memcpy(buf - 4, "0000", 4);
 			break;
 		case PACKET_READ_RESPONSE_END:
-			die(_("remote server sent stateless separator"));
+			die(_("remote server sent unexpected response end packet"));
 		}
 	}
 
@@ -709,7 +710,6 @@ static size_t rpc_out(void *ptr, size_t eltsize,
 	return avail;
 }
 
-#ifndef NO_CURL_IOCTL
 static curlioerr rpc_ioctl(CURL *handle, int cmd, void *clientp)
 {
 	struct rpc_state *rpc = clientp;
@@ -730,7 +730,6 @@ static curlioerr rpc_ioctl(CURL *handle, int cmd, void *clientp)
 		return CURLIOE_UNKNOWNCMD;
 	}
 }
-#endif
 
 struct check_pktline_state {
 	char len_buf[4];
@@ -858,7 +857,7 @@ static int probe_rpc(struct rpc_state *rpc, struct slot_results *results)
 	curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE, 4);
 	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, headers);
 	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
-	curl_easy_setopt(slot->curl, CURLOPT_FILE, &buf);
+	curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &buf);
 
 	err = run_slot(slot, results);
 
@@ -949,10 +948,8 @@ retry:
 		rpc->initial_buffer = 1;
 		curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, rpc_out);
 		curl_easy_setopt(slot->curl, CURLOPT_INFILE, rpc);
-#ifndef NO_CURL_IOCTL
 		curl_easy_setopt(slot->curl, CURLOPT_IOCTLFUNCTION, rpc_ioctl);
 		curl_easy_setopt(slot->curl, CURLOPT_IOCTLDATA, rpc);
-#endif
 		if (options.verbosity > 1) {
 			fprintf(stderr, "POST %s (chunked)\n", rpc->service_name);
 			fflush(stderr);
@@ -1023,7 +1020,7 @@ retry:
 	rpc_in_data.slot = slot;
 	rpc_in_data.check_pktline = stateless_connect;
 	memset(&rpc_in_data.pktline_state, 0, sizeof(rpc_in_data.pktline_state));
-	curl_easy_setopt(slot->curl, CURLOPT_FILE, &rpc_in_data);
+	curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, &rpc_in_data);
 	curl_easy_setopt(slot->curl, CURLOPT_FAILONERROR, 0);
 
 
@@ -1064,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);
@@ -1091,7 +1088,7 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads,
 		rpc->protocol_header = NULL;
 
 	while (!err) {
-		int n = packet_read(rpc->out, NULL, NULL, rpc->buf, rpc->alloc, 0);
+		int n = packet_read(rpc->out, rpc->buf, rpc->alloc, 0);
 		if (!n)
 			break;
 		rpc->pos = 0;
@@ -1485,8 +1482,8 @@ int cmd_main(int argc, const char **argv)
 	options.verbosity = 1;
 	options.progress = !!isatty(2);
 	options.thin = 1;
-	string_list_init(&options.deepen_not, 1);
-	string_list_init(&options.push_options, 1);
+	string_list_init_dup(&options.deepen_not);
+	string_list_init_dup(&options.push_options);
 
 	/*
 	 * Just report "remote-curl" here (folding all the various aliases
diff --git a/remote.c b/remote.c
index dfb863d808..c97c626eaa 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,27 +102,21 @@ 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, *replaced;
+	struct remote *ret;
 	struct remotes_hash_key lookup;
 	struct hashmap_entry lookup_entry, *e;
 
 	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);
-	replaced = hashmap_put_entry(&remotes_hash, ret, ent);
-	assert(replaced == NULL);  /* no previous entry overwritten */
+	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,51 @@ 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);
+		const char *head_ref = refs_resolve_ref_unsafe(
+			get_main_ref_store(repo), "HEAD", 0, NULL, &flag);
 		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 +532,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 +546,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 +612,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 +678,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;
 }
@@ -1111,7 +1219,7 @@ static void show_push_unqualified_ref_name_error(const char *dst_value,
 		"Neither worked, so we gave up. You must fully qualify the ref."),
 	      dst_value, matched_src_name);
 
-	if (!advice_push_unqualified_ref_name)
+	if (!advice_enabled(ADVICE_PUSH_UNQUALIFIED_REF_NAME))
 		return;
 
 	if (get_oid(matched_src_name, &oid))
@@ -1642,7 +1750,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 +1770,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 +1791,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 +1868,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 +1933,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;
 }
 
@@ -2118,7 +2234,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb,
 		strbuf_addf(sb,
 			_("Your branch is based on '%s', but the upstream is gone.\n"),
 			base);
-		if (advice_status_hints)
+		if (advice_enabled(ADVICE_STATUS_HINTS))
 			strbuf_addstr(sb,
 				_("  (use \"git branch --unset-upstream\" to fixup)\n"));
 	} else if (!sti) {
@@ -2129,7 +2245,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb,
 		strbuf_addf(sb,
 			    _("Your branch and '%s' refer to different commits.\n"),
 			    base);
-		if (advice_status_hints)
+		if (advice_enabled(ADVICE_STATUS_HINTS))
 			strbuf_addf(sb, _("  (use \"%s\" for details)\n"),
 				    "git status --ahead-behind");
 	} else if (!theirs) {
@@ -2138,7 +2254,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb,
 			   "Your branch is ahead of '%s' by %d commits.\n",
 			   ours),
 			base, ours);
-		if (advice_status_hints)
+		if (advice_enabled(ADVICE_STATUS_HINTS))
 			strbuf_addstr(sb,
 				_("  (use \"git push\" to publish your local commits)\n"));
 	} else if (!ours) {
@@ -2149,7 +2265,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb,
 			       "and can be fast-forwarded.\n",
 			   theirs),
 			base, theirs);
-		if (advice_status_hints)
+		if (advice_enabled(ADVICE_STATUS_HINTS))
 			strbuf_addstr(sb,
 				_("  (use \"git pull\" to update your local branch)\n"));
 	} else {
@@ -2162,7 +2278,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb,
 			       "respectively.\n",
 			   ours + theirs),
 			base, ours, theirs);
-		if (advice_status_hints)
+		if (advice_enabled(ADVICE_STATUS_HINTS))
 			strbuf_addstr(sb,
 				_("  (use \"git pull\" to merge the remote branch into yours)\n"));
 	}
@@ -2403,7 +2519,7 @@ struct reflog_commit_array {
 	size_t nr, alloc;
 };
 
-#define REFLOG_COMMIT_ARRAY_INIT { NULL, 0, 0 }
+#define REFLOG_COMMIT_ARRAY_INIT { 0 }
 
 /* Append a commit to the array. */
 static void append_commit(struct reflog_commit_array *arr,
@@ -2585,3 +2701,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 0cfe8b787d..b4fbd16cdc 100644
--- a/repo-settings.c
+++ b/repo-settings.c
@@ -3,81 +3,97 @@
 #include "repository.h"
 #include "midx.h"
 
-#define UPDATE_DEFAULT_BOOL(s,v) do { if (s == -1) { s = v; } } while(0)
+static void repo_cfg_bool(struct repository *r, const char *key, int *dest,
+			  int def)
+{
+	if (repo_config_get_bool(r, key, dest))
+		*dest = def;
+}
 
 void prepare_repo_settings(struct repository *r)
 {
+	int experimental;
 	int value;
 	char *strval;
+	int manyfiles;
+
+	if (!r->gitdir)
+		BUG("Cannot add settings for uninitialized repository");
 
-	if (r->settings.initialized)
+	if (r->settings.initialized++)
 		return;
 
 	/* Defaults */
-	memset(&r->settings, -1, sizeof(r->settings));
+	r->settings.index_version = -1;
+	r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
+	r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_CONSECUTIVE;
+
+	/* Booleans config or default, cascades to other settings */
+	repo_cfg_bool(r, "feature.manyfiles", &manyfiles, 0);
+	repo_cfg_bool(r, "feature.experimental", &experimental, 0);
+
+	/* Defaults modified by feature.* */
+	if (experimental) {
+		r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_SKIPPING;
+	}
+	if (manyfiles) {
+		r->settings.index_version = 4;
+		r->settings.core_untracked_cache = UNTRACKED_CACHE_WRITE;
+	}
+
+	/* Boolean config or default, does not cascade (simple)  */
+	repo_cfg_bool(r, "core.commitgraph", &r->settings.core_commit_graph, 1);
+	repo_cfg_bool(r, "commitgraph.readchangedpaths", &r->settings.commit_graph_read_changed_paths, 1);
+	repo_cfg_bool(r, "gc.writecommitgraph", &r->settings.gc_write_commit_graph, 1);
+	repo_cfg_bool(r, "fetch.writecommitgraph", &r->settings.fetch_write_commit_graph, 0);
+	repo_cfg_bool(r, "pack.usesparse", &r->settings.pack_use_sparse, 1);
+	repo_cfg_bool(r, "core.multipackindex", &r->settings.core_multi_pack_index, 1);
+	repo_cfg_bool(r, "index.sparse", &r->settings.sparse_index, 0);
 
-	if (!repo_config_get_bool(r, "core.commitgraph", &value))
-		r->settings.core_commit_graph = value;
-	if (!repo_config_get_bool(r, "commitgraph.readchangedpaths", &value))
-		r->settings.commit_graph_read_changed_paths = value;
-	if (!repo_config_get_bool(r, "gc.writecommitgraph", &value))
-		r->settings.gc_write_commit_graph = value;
-	UPDATE_DEFAULT_BOOL(r->settings.core_commit_graph, 1);
-	UPDATE_DEFAULT_BOOL(r->settings.commit_graph_read_changed_paths, 1);
-	UPDATE_DEFAULT_BOOL(r->settings.gc_write_commit_graph, 1);
+	/*
+	 * The GIT_TEST_MULTI_PACK_INDEX variable is special in that
+	 * either it *or* the config sets
+	 * r->settings.core_multi_pack_index if true. We don't take
+	 * the environment variable if it exists (even if false) over
+	 * any config, as in most other cases.
+	 */
+	if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0))
+		r->settings.core_multi_pack_index = 1;
 
+	/*
+	 * Non-boolean config
+	 */
 	if (!repo_config_get_int(r, "index.version", &value))
 		r->settings.index_version = value;
-	if (!repo_config_get_maybe_bool(r, "core.untrackedcache", &value)) {
-		if (value == 0)
-			r->settings.core_untracked_cache = UNTRACKED_CACHE_REMOVE;
-		else
-			r->settings.core_untracked_cache = UNTRACKED_CACHE_WRITE;
-	} else if (!repo_config_get_string(r, "core.untrackedcache", &strval)) {
-		if (!strcasecmp(strval, "keep"))
-			r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
 
+	if (!repo_config_get_string(r, "core.untrackedcache", &strval)) {
+		int v = git_parse_maybe_bool(strval);
+
+		/*
+		 * If it's set to "keep", or some other non-boolean
+		 * value then "v < 0". Then we do nothing and keep it
+		 * at the default of UNTRACKED_CACHE_KEEP.
+		 */
+		if (v >= 0)
+			r->settings.core_untracked_cache = v ?
+				UNTRACKED_CACHE_WRITE : UNTRACKED_CACHE_REMOVE;
 		free(strval);
 	}
 
 	if (!repo_config_get_string(r, "fetch.negotiationalgorithm", &strval)) {
+		int fetch_default = r->settings.fetch_negotiation_algorithm;
 		if (!strcasecmp(strval, "skipping"))
 			r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_SKIPPING;
 		else if (!strcasecmp(strval, "noop"))
 			r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_NOOP;
+		else if (!strcasecmp(strval, "consecutive"))
+			r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_CONSECUTIVE;
+		else if (!strcasecmp(strval, "default"))
+			r->settings.fetch_negotiation_algorithm = fetch_default;
 		else
-			r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_DEFAULT;
-	}
-
-	if (!repo_config_get_bool(r, "pack.usesparse", &value))
-		r->settings.pack_use_sparse = value;
-	UPDATE_DEFAULT_BOOL(r->settings.pack_use_sparse, 1);
-
-	value = git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0);
-	if (value || !repo_config_get_bool(r, "core.multipackindex", &value))
-		r->settings.core_multi_pack_index = value;
-	UPDATE_DEFAULT_BOOL(r->settings.core_multi_pack_index, 1);
-
-	if (!repo_config_get_bool(r, "feature.manyfiles", &value) && value) {
-		UPDATE_DEFAULT_BOOL(r->settings.index_version, 4);
-		UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_WRITE);
+			die("unknown fetch negotiation algorithm '%s'", strval);
 	}
 
-	if (!repo_config_get_bool(r, "fetch.writecommitgraph", &value))
-		r->settings.fetch_write_commit_graph = value;
-	UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 0);
-
-	if (!repo_config_get_bool(r, "feature.experimental", &value) && value)
-		UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING);
-
-	/* Hack for test programs like test-dump-untracked-cache */
-	if (ignore_untracked_cache_config)
-		r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
-	else
-		UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_KEEP);
-
-	UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_DEFAULT);
-
 	/*
 	 * This setting guards all index reads to require a full index
 	 * over a sparse index. After suitable guards are placed in the
@@ -85,11 +101,4 @@ void prepare_repo_settings(struct repository *r)
 	 * removed.
 	 */
 	r->settings.command_requires_full_index = 1;
-
-	/*
-	 * Initialize this as off.
-	 */
-	r->settings.sparse_index = 0;
-	if (!repo_config_get_bool(r, "index.sparse", &value) && value)
-		r->settings.sparse_index = 1;
 }
diff --git a/repository.c b/repository.c
index b2bf44c6fa..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;
@@ -190,19 +195,15 @@ error:
 
 int repo_submodule_init(struct repository *subrepo,
 			struct repository *superproject,
-			const struct submodule *sub)
+			const char *path,
+			const struct object_id *treeish_name)
 {
 	struct strbuf gitdir = STRBUF_INIT;
 	struct strbuf worktree = STRBUF_INIT;
 	int ret = 0;
 
-	if (!sub) {
-		ret = -1;
-		goto out;
-	}
-
-	strbuf_repo_worktree_path(&gitdir, superproject, "%s/.git", sub->path);
-	strbuf_repo_worktree_path(&worktree, superproject, "%s", sub->path);
+	strbuf_repo_worktree_path(&gitdir, superproject, "%s/.git", path);
+	strbuf_repo_worktree_path(&worktree, superproject, "%s", path);
 
 	if (repo_init(subrepo, gitdir.buf, worktree.buf)) {
 		/*
@@ -212,9 +213,15 @@ int repo_submodule_init(struct repository *subrepo,
 		 * in the superproject's 'modules' directory.  In this case the
 		 * submodule would not have a worktree.
 		 */
+		const struct submodule *sub =
+			submodule_from_path(superproject, treeish_name, path);
+		if (!sub) {
+			ret = -1;
+			goto out;
+		}
+
 		strbuf_reset(&gitdir);
-		strbuf_repo_git_path(&gitdir, superproject,
-				     "modules/%s", sub->name);
+		submodule_name_to_gitdir(&gitdir, superproject, sub->name);
 
 		if (repo_init(subrepo, gitdir.buf, NULL)) {
 			ret = -1;
@@ -225,7 +232,7 @@ int repo_submodule_init(struct repository *subrepo,
 	subrepo->submodule_prefix = xstrfmt("%s%s/",
 					    superproject->submodule_prefix ?
 					    superproject->submodule_prefix :
-					    "", sub->path);
+					    "", path);
 
 out:
 	strbuf_release(&gitdir);
@@ -268,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 3740c93bc0..ca837cb9e9 100644
--- a/repository.h
+++ b/repository.h
@@ -11,20 +11,18 @@ struct pathspec;
 struct raw_object_store;
 struct submodule_cache;
 struct promisor_remote_config;
+struct remote_state;
 
 enum untracked_cache_setting {
-	UNTRACKED_CACHE_UNSET = -1,
-	UNTRACKED_CACHE_REMOVE = 0,
-	UNTRACKED_CACHE_KEEP = 1,
-	UNTRACKED_CACHE_WRITE = 2
+	UNTRACKED_CACHE_KEEP,
+	UNTRACKED_CACHE_REMOVE,
+	UNTRACKED_CACHE_WRITE,
 };
 
 enum fetch_negotiation_setting {
-	FETCH_NEGOTIATION_UNSET = -1,
-	FETCH_NEGOTIATION_NONE = 0,
-	FETCH_NEGOTIATION_DEFAULT = 1,
-	FETCH_NEGOTIATION_SKIPPING = 2,
-	FETCH_NEGOTIATION_NOOP = 3,
+	FETCH_NEGOTIATION_CONSECUTIVE,
+	FETCH_NEGOTIATION_SKIPPING,
+	FETCH_NEGOTIATION_NOOP,
 };
 
 struct repo_settings {
@@ -34,6 +32,8 @@ struct repo_settings {
 	int commit_graph_read_changed_paths;
 	int gc_write_commit_graph;
 	int fetch_write_commit_graph;
+	int command_requires_full_index;
+	int sparse_index;
 
 	int index_version;
 	enum untracked_cache_setting core_untracked_cache;
@@ -42,9 +42,6 @@ struct repo_settings {
 	enum fetch_negotiation_setting fetch_negotiation_algorithm;
 
 	int core_multi_pack_index;
-
-	unsigned command_requires_full_index:1,
-		 sparse_index:1;
 };
 
 struct repository {
@@ -131,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;
 
@@ -162,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,
@@ -172,15 +173,18 @@ void initialize_the_repository(void);
 int repo_init(struct repository *r, const char *gitdir, const char *worktree);
 
 /*
- * Initialize the repository 'subrepo' as the submodule given by the
- * struct submodule 'sub' in parent repository 'superproject'.
- * Return 0 upon success and a non-zero value upon failure, which may happen
- * if the submodule is not found, or 'sub' is NULL.
+ * Initialize the repository 'subrepo' as the submodule at the given path. If
+ * the submodule's gitdir cannot be found at <path>/.git, this function calls
+ * submodule_from_path() to try to find it. treeish_name is only used if
+ * submodule_from_path() needs to be called; see its documentation for more
+ * information.
+ * Return 0 upon success and a non-zero value upon failure.
  */
-struct submodule;
+struct object_id;
 int repo_submodule_init(struct repository *subrepo,
 			struct repository *superproject,
-			const struct submodule *sub);
+			const char *path,
+			const struct object_id *treeish_name);
 void repo_clear(struct repository *repo);
 
 /*
diff --git a/rerere.c b/rerere.c
index d83d58df4f..d26627c593 100644
--- a/rerere.c
+++ b/rerere.c
@@ -609,19 +609,20 @@ static int try_merge(struct index_state *istate,
 		     const struct rerere_id *id, const char *path,
 		     mmfile_t *cur, mmbuffer_t *result)
 {
-	int ret;
+	enum ll_merge_result ret;
 	mmfile_t base = {NULL, 0}, other = {NULL, 0};
 
 	if (read_mmfile(&base, rerere_path(id, "preimage")) ||
-	    read_mmfile(&other, rerere_path(id, "postimage")))
-		ret = 1;
-	else
+	    read_mmfile(&other, rerere_path(id, "postimage"))) {
+		ret = LL_MERGE_CONFLICT;
+	} else {
 		/*
 		 * A three-way merge. Note that this honors user-customizable
 		 * low-level merge driver settings.
 		 */
 		ret = ll_merge(result, path, &base, NULL, cur, "", &other, "",
 			       istate, NULL);
+	}
 
 	free(base.ptr);
 	free(other.ptr);
diff --git a/reset.c b/reset.c
index 4bea758053..e3383a9334 100644
--- a/reset.c
+++ b/reset.c
@@ -7,38 +7,108 @@
 #include "tree-walk.h"
 #include "tree.h"
 #include "unpack-trees.h"
+#include "hook.h"
 
-int reset_head(struct repository *r, struct object_id *oid, const char *action,
-	       const char *switch_to_branch, unsigned flags,
-	       const char *reflog_orig_head, const char *reflog_head,
-	       const char *default_reflog_action)
+static int update_refs(const struct reset_head_opts *opts,
+		       const struct object_id *oid,
+		       const struct object_id *head)
 {
-	unsigned detach_head = flags & RESET_HEAD_DETACH;
-	unsigned reset_hard = flags & RESET_HEAD_HARD;
-	unsigned run_hook = flags & RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
-	unsigned refs_only = flags & RESET_HEAD_REFS_ONLY;
-	unsigned update_orig_head = flags & RESET_ORIG_HEAD;
-	struct object_id head_oid;
+	unsigned detach_head = opts->flags & RESET_HEAD_DETACH;
+	unsigned run_hook = opts->flags & RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
+	unsigned update_orig_head = opts->flags & RESET_ORIG_HEAD;
+	const struct object_id *orig_head = opts->orig_head;
+	const char *switch_to_branch = opts->branch;
+	const char *reflog_branch = opts->branch_msg;
+	const char *reflog_head = opts->head_msg;
+	const char *reflog_orig_head = opts->orig_head_msg;
+	const char *default_reflog_action = opts->default_reflog_action;
+	struct object_id *old_orig = NULL, oid_old_orig;
+	struct strbuf msg = STRBUF_INIT;
+	const char *reflog_action;
+	size_t prefix_len;
+	int ret;
+
+	if ((update_orig_head && !reflog_orig_head) || !reflog_head) {
+		if (!default_reflog_action)
+			BUG("default_reflog_action must be given when reflog messages are omitted");
+		reflog_action = getenv(GIT_REFLOG_ACTION_ENVIRONMENT);
+		strbuf_addf(&msg, "%s: ", reflog_action ? reflog_action :
+							  default_reflog_action);
+	}
+	prefix_len = msg.len;
+
+	if (update_orig_head) {
+		if (!get_oid("ORIG_HEAD", &oid_old_orig))
+			old_orig = &oid_old_orig;
+		if (head) {
+			if (!reflog_orig_head) {
+				strbuf_addstr(&msg, "updating ORIG_HEAD");
+				reflog_orig_head = msg.buf;
+			}
+			update_ref(reflog_orig_head, "ORIG_HEAD",
+				   orig_head ? orig_head : head,
+				   old_orig, 0, UPDATE_REFS_MSG_ON_ERR);
+		} else if (old_orig)
+			delete_ref(NULL, "ORIG_HEAD", old_orig, 0);
+	}
+
+	if (!reflog_head) {
+		strbuf_setlen(&msg, prefix_len);
+		strbuf_addstr(&msg, "updating HEAD");
+		reflog_head = msg.buf;
+	}
+	if (!switch_to_branch)
+		ret = update_ref(reflog_head, "HEAD", oid, head,
+				 detach_head ? REF_NO_DEREF : 0,
+				 UPDATE_REFS_MSG_ON_ERR);
+	else {
+		ret = update_ref(reflog_branch ? reflog_branch : reflog_head,
+				 switch_to_branch, oid, NULL, 0,
+				 UPDATE_REFS_MSG_ON_ERR);
+		if (!ret)
+			ret = create_symref("HEAD", switch_to_branch,
+					    reflog_head);
+	}
+	if (!ret && run_hook)
+		run_hooks_l("post-checkout",
+			    oid_to_hex(head ? head : null_oid()),
+			    oid_to_hex(oid), "1", NULL);
+	strbuf_release(&msg);
+	return ret;
+}
+
+int reset_head(struct repository *r, const struct reset_head_opts *opts)
+{
+	const struct object_id *oid = opts->oid;
+	const char *switch_to_branch = opts->branch;
+	unsigned reset_hard = opts->flags & RESET_HEAD_HARD;
+	unsigned refs_only = opts->flags & RESET_HEAD_REFS_ONLY;
+	unsigned update_orig_head = opts->flags & RESET_ORIG_HEAD;
+	struct object_id *head = NULL, head_oid;
 	struct tree_desc desc[2] = { { NULL }, { NULL } };
 	struct lock_file lock = LOCK_INIT;
-	struct unpack_trees_options unpack_tree_opts;
+	struct unpack_trees_options unpack_tree_opts = { 0 };
 	struct tree *tree;
-	const char *reflog_action;
-	struct strbuf msg = STRBUF_INIT;
-	size_t prefix_len;
-	struct object_id *orig = NULL, oid_orig,
-		*old_orig = NULL, oid_old_orig;
+	const char *action;
 	int ret = 0, nr = 0;
 
 	if (switch_to_branch && !starts_with(switch_to_branch, "refs/"))
 		BUG("Not a fully qualified branch: '%s'", switch_to_branch);
 
+	if (opts->orig_head_msg && !update_orig_head)
+		BUG("ORIG_HEAD reflog message given without updating ORIG_HEAD");
+
+	if (opts->branch_msg && !opts->branch)
+		BUG("branch reflog message given without a branch");
+
 	if (!refs_only && repo_hold_locked_index(r, &lock, LOCK_REPORT_ON_ERROR) < 0) {
 		ret = -1;
 		goto leave_reset_head;
 	}
 
-	if ((!oid || !reset_hard) && get_oid("HEAD", &head_oid)) {
+	if (!get_oid("HEAD", &head_oid)) {
+		head = &head_oid;
+	} else if (!oid || !reset_hard) {
 		ret = error(_("could not determine HEAD revision"));
 		goto leave_reset_head;
 	}
@@ -47,9 +117,9 @@ int reset_head(struct repository *r, struct object_id *oid, const char *action,
 		oid = &head_oid;
 
 	if (refs_only)
-		goto reset_head_refs;
+		return update_refs(opts, oid, head);
 
-	memset(&unpack_tree_opts, 0, sizeof(unpack_tree_opts));
+	action = reset_hard ? "reset" : "checkout";
 	setup_unpack_trees_porcelain(&unpack_tree_opts, action);
 	unpack_tree_opts.head_idx = 1;
 	unpack_tree_opts.src_index = r->index;
@@ -57,9 +127,10 @@ int reset_head(struct repository *r, struct object_id *oid, const char *action,
 	unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge;
 	unpack_tree_opts.update = 1;
 	unpack_tree_opts.merge = 1;
+	unpack_tree_opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
 	init_checkout_metadata(&unpack_tree_opts.meta, switch_to_branch, oid, NULL);
-	if (!detach_head)
-		unpack_tree_opts.reset = 1;
+	if (reset_hard)
+		unpack_tree_opts.reset = UNPACK_RESET_PROTECT_UNTRACKED;
 
 	if (repo_read_index_unmerged(r) < 0) {
 		ret = error(_("could not read index"));
@@ -90,50 +161,12 @@ int reset_head(struct repository *r, struct object_id *oid, const char *action,
 		goto leave_reset_head;
 	}
 
-reset_head_refs:
-	reflog_action = getenv(GIT_REFLOG_ACTION_ENVIRONMENT);
-	strbuf_addf(&msg, "%s: ", reflog_action ? reflog_action : default_reflog_action);
-	prefix_len = msg.len;
-
-	if (update_orig_head) {
-		if (!get_oid("ORIG_HEAD", &oid_old_orig))
-			old_orig = &oid_old_orig;
-		if (!get_oid("HEAD", &oid_orig)) {
-			orig = &oid_orig;
-			if (!reflog_orig_head) {
-				strbuf_addstr(&msg, "updating ORIG_HEAD");
-				reflog_orig_head = msg.buf;
-			}
-			update_ref(reflog_orig_head, "ORIG_HEAD", orig,
-				   old_orig, 0, UPDATE_REFS_MSG_ON_ERR);
-		} else if (old_orig)
-			delete_ref(NULL, "ORIG_HEAD", old_orig, 0);
-	}
-
-	if (!reflog_head) {
-		strbuf_setlen(&msg, prefix_len);
-		strbuf_addstr(&msg, "updating HEAD");
-		reflog_head = msg.buf;
-	}
-	if (!switch_to_branch)
-		ret = update_ref(reflog_head, "HEAD", oid, orig,
-				 detach_head ? REF_NO_DEREF : 0,
-				 UPDATE_REFS_MSG_ON_ERR);
-	else {
-		ret = update_ref(reflog_head, switch_to_branch, oid,
-				 NULL, 0, UPDATE_REFS_MSG_ON_ERR);
-		if (!ret)
-			ret = create_symref("HEAD", switch_to_branch,
-					    reflog_head);
-	}
-	if (run_hook)
-		run_hook_le(NULL, "post-checkout",
-			    oid_to_hex(orig ? orig : null_oid()),
-			    oid_to_hex(oid), "1", NULL);
+	if (oid != &head_oid || update_orig_head || switch_to_branch)
+		ret = update_refs(opts, oid, head);
 
 leave_reset_head:
-	strbuf_release(&msg);
 	rollback_lock_file(&lock);
+	clear_unpack_trees_porcelain(&unpack_tree_opts);
 	while (nr)
 		free((void *)desc[--nr].buffer);
 	return ret;
diff --git a/reset.h b/reset.h
index 12f83c78e2..a28f81829d 100644
--- a/reset.h
+++ b/reset.h
@@ -6,15 +6,55 @@
 
 #define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION"
 
+/* Request a detached checkout */
 #define RESET_HEAD_DETACH (1<<0)
+/* Request a reset rather than a checkout */
 #define RESET_HEAD_HARD (1<<1)
+/* Run the post-checkout hook */
 #define RESET_HEAD_RUN_POST_CHECKOUT_HOOK (1<<2)
+/* Only update refs, do not touch the worktree */
 #define RESET_HEAD_REFS_ONLY (1<<3)
+/* Update ORIG_HEAD as well as HEAD */
 #define RESET_ORIG_HEAD (1<<4)
 
-int reset_head(struct repository *r, struct object_id *oid, const char *action,
-	       const char *switch_to_branch, unsigned flags,
-	       const char *reflog_orig_head, const char *reflog_head,
-	       const char *default_reflog_action);
+struct reset_head_opts {
+	/*
+	 * The commit to checkout/reset to. Defaults to HEAD.
+	 */
+	const struct object_id *oid;
+	/*
+	 * Optional value to set ORIG_HEAD. Defaults to HEAD.
+	 */
+	const struct object_id *orig_head;
+	/*
+	 * Optional branch to switch to.
+	 */
+	const char *branch;
+	/*
+	 * Flags defined above.
+	 */
+	unsigned flags;
+	/*
+	 * Optional reflog message for branch, defaults to head_msg.
+	 */
+	const char *branch_msg;
+	/*
+	 * Optional reflog message for HEAD, if this omitted but oid or branch
+	 * are given then default_reflog_action must be given.
+	 */
+	const char *head_msg;
+	/*
+	 * Optional reflog message for ORIG_HEAD, if this omitted and flags
+	 * contains RESET_ORIG_HEAD then default_reflog_action must be given.
+	 */
+	const char *orig_head_msg;
+	/*
+	 * Action to use in default reflog messages, only required if a ref is
+	 * being updated and the reflog messages above are omitted.
+	 */
+	const char *default_reflog_action;
+};
+
+int reset_head(struct repository *r, const struct reset_head_opts *opts);
 
 #endif
diff --git a/revision.c b/revision.c
index cddd0542a6..4c55c55880 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);
 }
@@ -249,7 +254,7 @@ struct commit_stack {
 	struct commit **items;
 	size_t nr, alloc;
 };
-#define COMMIT_STACK_INIT { NULL, 0, 0 }
+#define COMMIT_STACK_INIT { 0 }
 
 static void commit_stack_push(struct commit_stack *stack, struct commit *commit)
 {
@@ -268,7 +273,7 @@ static void commit_stack_clear(struct commit_stack *stack)
 	stack->nr = stack->alloc = 0;
 }
 
-static void mark_one_parent_uninteresting(struct commit *commit,
+static void mark_one_parent_uninteresting(struct rev_info *revs, struct commit *commit,
 					  struct commit_stack *pending)
 {
 	struct commit_list *l;
@@ -285,20 +290,26 @@ static void mark_one_parent_uninteresting(struct commit *commit,
 	 * wasn't uninteresting), in which case we need
 	 * to mark its parents recursively too..
 	 */
-	for (l = commit->parents; l; l = l->next)
+	for (l = commit->parents; l; l = l->next) {
 		commit_stack_push(pending, l->item);
+		if (revs && revs->exclude_first_parent_only)
+			break;
+	}
 }
 
-void mark_parents_uninteresting(struct commit *commit)
+void mark_parents_uninteresting(struct rev_info *revs, struct commit *commit)
 {
 	struct commit_stack pending = COMMIT_STACK_INIT;
 	struct commit_list *l;
 
-	for (l = commit->parents; l; l = l->next)
-		mark_one_parent_uninteresting(l->item, &pending);
+	for (l = commit->parents; l; l = l->next) {
+		mark_one_parent_uninteresting(revs, l->item, &pending);
+		if (revs && revs->exclude_first_parent_only)
+			break;
+	}
 
 	while (pending.nr > 0)
-		mark_one_parent_uninteresting(commit_stack_pop(&pending),
+		mark_one_parent_uninteresting(revs, commit_stack_pop(&pending),
 					      &pending);
 
 	commit_stack_clear(&pending);
@@ -360,20 +371,18 @@ static struct object *get_reference(struct rev_info *revs, const char *name,
 				    unsigned int flags)
 {
 	struct object *object;
+	struct commit *commit;
 
 	/*
-	 * If the repository has commit graphs, repo_parse_commit() avoids
-	 * reading the object buffer, so use it whenever possible.
+	 * If the repository has commit graphs, we try to opportunistically
+	 * look up the object ID in those graphs. Like this, we can avoid
+	 * parsing commit data from disk.
 	 */
-	if (oid_object_info(revs->repo, oid, NULL) == OBJ_COMMIT) {
-		struct commit *c = lookup_commit(revs->repo, oid);
-		if (!repo_parse_commit(revs->repo, c))
-			object = (struct object *) c;
-		else
-			object = NULL;
-	} else {
+	commit = lookup_commit_in_graph(revs->repo, oid);
+	if (commit)
+		object = &commit->object;
+	else
 		object = parse_object(revs->repo, oid);
-	}
 
 	if (!object) {
 		if (revs->ignore_missing)
@@ -438,7 +447,7 @@ static struct commit *handle_commit(struct rev_info *revs,
 		if (repo_parse_commit(revs->repo, commit) < 0)
 			die("unable to parse commit %s", name);
 		if (flags & UNINTERESTING) {
-			mark_parents_uninteresting(commit);
+			mark_parents_uninteresting(revs, commit);
 
 			if (!revs->topo_order || !generation_numbers_enabled(the_repository))
 				revs->limited = 1;
@@ -1121,7 +1130,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit,
 			if (repo_parse_commit_gently(revs->repo, p, 1) < 0)
 				continue;
 			if (p->parents)
-				mark_parents_uninteresting(p);
+				mark_parents_uninteresting(revs, p);
 			if (p->object.flags & SEEN)
 				continue;
 			p->object.flags |= (SEEN | NOT_USER_GIVEN);
@@ -1129,6 +1138,8 @@ static int process_parents(struct rev_info *revs, struct commit *commit,
 				commit_list_insert_by_date(p, list);
 			if (queue)
 				prio_queue_put(queue, p);
+			if (revs->exclude_first_parent_only)
+				break;
 		}
 		return 0;
 	}
@@ -1419,7 +1430,7 @@ static int limit_list(struct rev_info *revs)
 		if (process_parents(revs, commit, &original_list, NULL) < 0)
 			return -1;
 		if (obj->flags & UNINTERESTING) {
-			mark_parents_uninteresting(commit);
+			mark_parents_uninteresting(revs, commit);
 			slop = still_interesting(original_list, date, slop, &interesting_cache);
 			if (slop)
 				continue;
@@ -1534,7 +1545,7 @@ static int handle_one_ref(const char *path, const struct object_id *oid,
 
 	object = get_reference(cb->all_revs, path, oid, cb->all_flags);
 	add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
-	add_pending_oid(cb->all_revs, path, oid, cb->all_flags);
+	add_pending_object(cb->all_revs, object, path);
 	return 0;
 }
 
@@ -2220,6 +2231,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 		return argcount;
 	} else if (!strcmp(arg, "--first-parent")) {
 		revs->first_parent_only = 1;
+	} else if (!strcmp(arg, "--exclude-first-parent-only")) {
+		revs->exclude_first_parent_only = 1;
 	} else if (!strcmp(arg, "--ancestry-path")) {
 		revs->ancestry_path = 1;
 		revs->simplify_history = 0;
@@ -2297,11 +2310,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;
@@ -2310,12 +2323,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")) {
@@ -2421,9 +2434,11 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 		revs->pretty_given = 1;
 		revs->abbrev_commit = 1;
 	} else if (!strcmp(arg, "--graph")) {
-		revs->topo_order = 1;
-		revs->rewrite_parents = 1;
+		graph_clear(revs->graph);
 		revs->graph = graph_init(revs);
+	} else if (!strcmp(arg, "--no-graph")) {
+		graph_clear(revs->graph);
+		revs->graph = NULL;
 	} else if (!strcmp(arg, "--encode-email-headers")) {
 		revs->encode_email_headers = 1;
 	} else if (!strcmp(arg, "--no-encode-email-headers")) {
@@ -2495,7 +2510,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);
@@ -2520,8 +2535,6 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 			unkv[(*unkc)++] = arg;
 		return opts;
 	}
-	if (revs->graph && revs->track_linear)
-		die("--show-linear-break and --graph are incompatible");
 
 	return 1;
 }
@@ -2540,13 +2553,24 @@ void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
 	ctx->argc -= n;
 }
 
+void revision_opts_finish(struct rev_info *revs)
+{
+	if (revs->graph && revs->track_linear)
+		die(_("options '%s' and '%s' cannot be used together"), "--show-linear-break", "--graph");
+
+	if (revs->graph) {
+		revs->topo_order = 1;
+		revs->rewrite_parents = 1;
+	}
+}
+
 static int for_each_bisect_ref(struct ref_store *refs, each_ref_fn fn,
 			       void *cb_data, const char *term)
 {
 	struct strbuf bisect_refs = STRBUF_INIT;
 	int status;
 	strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
-	status = refs_for_each_fullref_in(refs, bisect_refs.buf, fn, cb_data, 0);
+	status = refs_for_each_fullref_in(refs, bisect_refs.buf, fn, cb_data);
 	strbuf_release(&bisect_refs);
 	return status;
 }
@@ -2561,8 +2585,7 @@ static int for_each_good_bisect_ref(struct ref_store *refs, each_ref_fn fn, void
 	return for_each_bisect_ref(refs, fn, cb_data, term_good);
 }
 
-static int handle_revision_pseudo_opt(const char *submodule,
-				      struct rev_info *revs,
+static int handle_revision_pseudo_opt(struct rev_info *revs,
 				      const char **argv, int *flags)
 {
 	const char *arg = argv[0];
@@ -2570,7 +2593,7 @@ static int handle_revision_pseudo_opt(const char *submodule,
 	struct ref_store *refs;
 	int argcount;
 
-	if (submodule) {
+	if (revs->repo != the_repository) {
 		/*
 		 * We need some something like get_submodule_worktrees()
 		 * before we can go through all worktrees of a submodule,
@@ -2579,9 +2602,8 @@ static int handle_revision_pseudo_opt(const char *submodule,
 		 */
 		if (!revs->single_worktree)
 			BUG("--single-worktree cannot be used together with submodule");
-		refs = get_submodule_ref_store(submodule);
-	} else
-		refs = get_main_ref_store(revs->repo);
+	}
+	refs = get_main_ref_store(revs->repo);
 
 	/*
 	 * NOTE!
@@ -2651,16 +2673,17 @@ static int handle_revision_pseudo_opt(const char *submodule,
 	} else if (!strcmp(arg, "--not")) {
 		*flags ^= UNINTERESTING | BOTTOM;
 	} else if (!strcmp(arg, "--no-walk")) {
-		revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
+		revs->no_walk = 1;
 	} else if (skip_prefix(arg, "--no-walk=", &optarg)) {
 		/*
 		 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
 		 * not allowed, since the argument is optional.
 		 */
+		revs->no_walk = 1;
 		if (!strcmp(optarg, "sorted"))
-			revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
+			revs->unsorted_input = 0;
 		else if (!strcmp(optarg, "unsorted"))
-			revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
+			revs->unsorted_input = 1;
 		else
 			return error("invalid argument to --no-walk");
 	} else if (!strcmp(arg, "--do-walk")) {
@@ -2699,12 +2722,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 {
 	int i, flags, left, seen_dashdash, revarg_opt;
 	struct strvec prune_data = STRVEC_INIT;
-	const char *submodule = NULL;
 	int seen_end_of_options = 0;
 
-	if (opt)
-		submodule = opt->submodule;
-
 	/* First, search for "--" */
 	if (opt && opt->assume_dashdash) {
 		seen_dashdash = 1;
@@ -2733,7 +2752,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 		if (!seen_end_of_options && *arg == '-') {
 			int opts;
 
-			opts = handle_revision_pseudo_opt(submodule,
+			opts = handle_revision_pseudo_opt(
 						revs, argv + i,
 						&flags);
 			if (opts > 0) {
@@ -2787,6 +2806,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 			break;
 		}
 	}
+	revision_opts_finish(revs);
 
 	if (prune_data.nr) {
 		/*
@@ -2869,24 +2889,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)))
@@ -3347,7 +3367,7 @@ static void explore_walk_step(struct rev_info *revs)
 		return;
 
 	if (c->object.flags & UNINTERESTING)
-		mark_parents_uninteresting(c);
+		mark_parents_uninteresting(revs, c);
 
 	for (p = c->parents; p; p = p->next)
 		test_flag_and_insert(&info->explore_queue, p->item, TOPO_WALK_EXPLORED);
@@ -3584,7 +3604,7 @@ int prepare_revision_walk(struct rev_info *revs)
 
 	if (!revs->reflog_info)
 		prepare_to_use_bloom_filter(revs);
-	if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
+	if (!revs->unsorted_input)
 		commit_list_sort_by_date(&revs->commits);
 	if (revs->no_walk)
 		return 0;
@@ -3785,7 +3805,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 fbb068da9f..b9c2421687 100644
--- a/revision.h
+++ b/revision.h
@@ -79,10 +79,6 @@ struct rev_cmdline_info {
 	} *rev;
 };
 
-#define REVISION_WALK_WALK 0
-#define REVISION_WALK_NO_WALK_SORTED 1
-#define REVISION_WALK_NO_WALK_UNSORTED 2
-
 struct oidset;
 struct topo_walk_info;
 
@@ -129,7 +125,8 @@ struct rev_info {
 	/* Traversal flags */
 	unsigned int	dense:1,
 			prune:1,
-			no_walk:2,
+			no_walk:1,
+			unsorted_input:1,
 			remove_empty_trees:1,
 			simplify_history:1,
 			show_pulls:1,
@@ -161,6 +158,7 @@ struct rev_info {
 			bisect:1,
 			ancestry_path:1,
 			first_parent_only:1,
+			exclude_first_parent_only:1,
 			line_level_traverse:1,
 			tree_blobs_in_commit_order:1,
 
@@ -198,7 +196,8 @@ struct rev_info {
 			combine_merges:1,
 			combined_all_paths:1,
 			dense_combined_merges:1,
-			first_parent_merges:1;
+			first_parent_merges:1,
+			remerge_diff:1;
 
 	/* Format info */
 	int		show_notes;
@@ -249,8 +248,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;
@@ -320,6 +317,9 @@ struct rev_info {
 
 	/* misc. flags related to '--no-kept-objects' */
 	unsigned keep_pack_cache_flags;
+
+	/* Location where temporary objects for remerge-diff are written. */
+	struct tmp_objdir *remerge_objdir;
 };
 
 int ref_excluded(struct string_list *, const char *path);
@@ -339,7 +339,6 @@ extern volatile show_early_output_fn_t show_early_output;
 struct setup_revision_opt {
 	const char *def;
 	void (*tweak)(struct rev_info *, struct setup_revision_opt *);
-	const char *submodule;	/* TODO: drop this and use rev_info->repo */
 	unsigned int	assume_dashdash:1,
 			allow_exclude_promisor_objects:1;
 	unsigned revarg_opt;
@@ -378,6 +377,7 @@ void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
 #define REVARG_COMMITTISH 02
 int handle_revision_arg(const char *arg, struct rev_info *revs,
 			int flags, unsigned revarg_opt);
+void revision_opts_finish(struct rev_info *revs);
 
 /**
  * Reset the flags used by the revision walking api. You can use this to do
@@ -404,7 +404,7 @@ const char *get_revision_mark(const struct rev_info *revs,
 void put_revision_mark(const struct rev_info *revs,
 		       const struct commit *commit);
 
-void mark_parents_uninteresting(struct commit *commit);
+void mark_parents_uninteresting(struct rev_info *revs, struct commit *commit);
 void mark_tree_uninteresting(struct repository *r, struct tree *tree);
 void mark_trees_uninteresting_sparse(struct repository *r, struct oidset *trees);
 
diff --git a/run-command.c b/run-command.c
index f72e72cce7..a8501e38ce 100644
--- a/run-command.c
+++ b/run-command.c
@@ -8,6 +8,8 @@
 #include "string-list.h"
 #include "quote.h"
 #include "config.h"
+#include "packfile.h"
+#include "hook.h"
 
 void child_process_init(struct child_process *child)
 {
@@ -210,9 +212,9 @@ static char *locate_in_PATH(const char *file)
 	return NULL;
 }
 
-static int exists_in_PATH(const char *file)
+int exists_in_PATH(const char *command)
 {
-	char *r = locate_in_PATH(file);
+	char *r = locate_in_PATH(command);
 	int found = r != NULL;
 	free(r);
 	return found;
@@ -338,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";
@@ -370,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");
@@ -390,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);
@@ -403,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");
 
 	/*
@@ -413,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);
 	}
 
 	/*
@@ -550,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
@@ -574,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;
@@ -653,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);
@@ -674,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.
@@ -727,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;
@@ -740,6 +723,9 @@ fail_pipe:
 
 	fflush(NULL);
 
+	if (cmd->close_object_store)
+		close_object_store(the_repository->objects);
+
 #ifndef GIT_WINDOWS_NATIVE
 {
 	int notify_pipe[2];
@@ -753,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;
 	}
 
@@ -761,13 +747,11 @@ fail_pipe:
 		notify_pipe[0] = notify_pipe[1] = -1;
 
 	if (cmd->no_stdin || cmd->no_stdout || cmd->no_stderr) {
-		null_fd = open("/dev/null", O_RDWR | O_CLOEXEC);
-		if (null_fd < 0)
-			die_errno(_("open /dev/null failed"));
+		null_fd = xopen("/dev/null", O_RDWR | O_CLOEXEC);
 		set_cloexec(null_fd);
 	}
 
-	childenv = prep_childenv(cmd->env);
+	childenv = prep_childenv(cmd->env_array.v);
 	atfork_prepare(&as);
 
 	/*
@@ -865,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);
 
@@ -882,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;
@@ -899,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)
@@ -926,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)
@@ -989,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();
@@ -998,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;
 }
@@ -1036,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;
@@ -1044,8 +1028,10 @@ int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir,
 	cmd.use_shell = opt & RUN_USING_SHELL ? 1 : 0;
 	cmd.clean_on_exit = opt & RUN_CLEAN_ON_EXIT ? 1 : 0;
 	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);
 }
@@ -1078,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);
@@ -1095,7 +1083,7 @@ static NORETURN void die_async(const char *err, va_list params)
 static int async_die_is_recursing(void)
 {
 	void *ret = pthread_getspecific(async_die_counter);
-	pthread_setspecific(async_die_counter, (void *)1);
+	pthread_setspecific(async_die_counter, &async_die_counter); /* set to any non-NULL valid pointer */
 	return ret != NULL;
 }
 
@@ -1319,72 +1307,6 @@ int async_with_fork(void)
 #endif
 }
 
-const char *find_hook(const char *name)
-{
-	static struct strbuf path = STRBUF_INIT;
-
-	strbuf_reset(&path);
-	strbuf_git_path(&path, "hooks/%s", name);
-	if (access(path.buf, X_OK) < 0) {
-		int err = errno;
-
-#ifdef STRIP_EXTENSION
-		strbuf_addstr(&path, STRIP_EXTENSION);
-		if (access(path.buf, X_OK) >= 0)
-			return path.buf;
-		if (errno == EACCES)
-			err = errno;
-#endif
-
-		if (err == EACCES && advice_ignored_hook) {
-			static struct string_list advise_given = STRING_LIST_INIT_DUP;
-
-			if (!string_list_lookup(&advise_given, name)) {
-				string_list_insert(&advise_given, name);
-				advise(_("The '%s' hook was ignored because "
-					 "it's not set as executable.\n"
-					 "You can disable this warning with "
-					 "`git config advice.ignoredHook false`."),
-				       path.buf);
-			}
-		}
-		return NULL;
-	}
-	return path.buf;
-}
-
-int run_hook_ve(const char *const *env, const char *name, va_list args)
-{
-	struct child_process hook = CHILD_PROCESS_INIT;
-	const char *p;
-
-	p = find_hook(name);
-	if (!p)
-		return 0;
-
-	strvec_push(&hook.args, p);
-	while ((p = va_arg(args, const char *)))
-		strvec_push(&hook.args, p);
-	hook.env = env;
-	hook.no_stdin = 1;
-	hook.stdout_to_stderr = 1;
-	hook.trace2_hook_name = name;
-
-	return run_command(&hook);
-}
-
-int run_hook_le(const char *const *env, const char *name, ...)
-{
-	va_list args;
-	int ret;
-
-	va_start(args, name);
-	ret = run_hook_ve(env, name, args);
-	va_end(args);
-
-	return ret;
-}
-
 struct io_pump {
 	/* initialized by caller */
 	int fd;
@@ -1886,6 +1808,7 @@ int run_auto_maintenance(int quiet)
 		return 0;
 
 	maint.git_cmd = 1;
+	maint.close_object_store = 1;
 	strvec_pushl(&maint.args, "maintenance", "run", "--auto", NULL);
 	strvec_push(&maint.args, quiet ? "--quiet" : "--no-quiet");
 
@@ -1903,3 +1826,132 @@ void prepare_other_repo_env(struct strvec *env_array, const char *new_git_dir)
 	}
 	strvec_pushf(env_array, "%s=%s", GIT_DIR_ENVIRONMENT, new_git_dir);
 }
+
+enum start_bg_result start_bg_command(struct child_process *cmd,
+				      start_bg_wait_cb *wait_cb,
+				      void *cb_data,
+				      unsigned int timeout_sec)
+{
+	enum start_bg_result sbgr = SBGR_ERROR;
+	int ret;
+	int wait_status;
+	pid_t pid_seen;
+	time_t time_limit;
+
+	/*
+	 * We do not allow clean-on-exit because the child process
+	 * should persist in the background and possibly/probably
+	 * after this process exits.  So we don't want to kill the
+	 * child during our atexit routine.
+	 */
+	if (cmd->clean_on_exit)
+		BUG("start_bg_command() does not allow non-zero clean_on_exit");
+
+	if (!cmd->trace2_child_class)
+		cmd->trace2_child_class = "background";
+
+	ret = start_command(cmd);
+	if (ret) {
+		/*
+		 * We assume that if `start_command()` fails, we
+		 * either get a complete `trace2_child_start() /
+		 * trace2_child_exit()` pair or it fails before the
+		 * `trace2_child_start()` is emitted, so we do not
+		 * need to worry about it here.
+		 *
+		 * We also assume that `start_command()` does not add
+		 * us to the cleanup list.  And that it calls
+		 * calls `child_process_clear()`.
+		 */
+		sbgr = SBGR_ERROR;
+		goto done;
+	}
+
+	time(&time_limit);
+	time_limit += timeout_sec;
+
+wait:
+	pid_seen = waitpid(cmd->pid, &wait_status, WNOHANG);
+
+	if (!pid_seen) {
+		/*
+		 * The child is currently running.  Ask the callback
+		 * if the child is ready to do work or whether we
+		 * should keep waiting for it to boot up.
+		 */
+		ret = (*wait_cb)(cmd, cb_data);
+		if (!ret) {
+			/*
+			 * The child is running and "ready".
+			 */
+			trace2_child_ready(cmd, "ready");
+			sbgr = SBGR_READY;
+			goto done;
+		} else if (ret > 0) {
+			/*
+			 * The callback said to give it more time to boot up
+			 * (subject to our timeout limit).
+			 */
+			time_t now;
+
+			time(&now);
+			if (now < time_limit)
+				goto wait;
+
+			/*
+			 * Our timeout has expired.  We don't try to
+			 * kill the child, but rather let it continue
+			 * (hopefully) trying to startup.
+			 */
+			trace2_child_ready(cmd, "timeout");
+			sbgr = SBGR_TIMEOUT;
+			goto done;
+		} else {
+			/*
+			 * The cb gave up on this child.  It is still running,
+			 * but our cb got an error trying to probe it.
+			 */
+			trace2_child_ready(cmd, "error");
+			sbgr = SBGR_CB_ERROR;
+			goto done;
+		}
+	}
+
+	else if (pid_seen == cmd->pid) {
+		int child_code = -1;
+
+		/*
+		 * The child started, but exited or was terminated
+		 * before becoming "ready".
+		 *
+		 * We try to match the behavior of `wait_or_whine()`
+		 * WRT the handling of WIFSIGNALED() and WIFEXITED()
+		 * and convert the child's status to a return code for
+		 * tracing purposes and emit the `trace2_child_exit()`
+		 * event.
+		 *
+		 * We do not want the wait_or_whine() error message
+		 * because we will be called by client-side library
+		 * routines.
+		 */
+		if (WIFEXITED(wait_status))
+			child_code = WEXITSTATUS(wait_status);
+		else if (WIFSIGNALED(wait_status))
+			child_code = WTERMSIG(wait_status) + 128;
+		trace2_child_exit(cmd, child_code);
+
+		sbgr = SBGR_DIED;
+		goto done;
+	}
+
+	else if (pid_seen < 0 && errno == EINTR)
+		goto wait;
+
+	trace2_child_exit(cmd, -1);
+	sbgr = SBGR_ERROR;
+
+done:
+	child_process_clear(cmd);
+	invalidate_lstat_cache();
+	return sbgr;
+}
diff --git a/run-command.h b/run-command.h
index af1296769f..07bed6c31b 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;
@@ -134,6 +130,14 @@ struct child_process {
 	 */
 	unsigned use_shell:1;
 
+	/**
+	 * Release any open file handles to the object store before running
+	 * the command; This is necessary e.g. when the spawned process may
+	 * want to repack because that would delete `.pack` files (and on
+	 * Windows, you cannot delete files that are still in use).
+	 */
+	unsigned close_object_store:1;
+
 	unsigned stdout_to_stderr:1;
 	unsigned clean_on_exit:1;
 	unsigned wait_after_clean:1;
@@ -183,6 +187,18 @@ void child_process_clear(struct child_process *);
 int is_executable(const char *name);
 
 /**
+ * Check if the command exists on $PATH. This emulates the path search that
+ * execvp would perform, without actually executing the command so it
+ * can be used before fork() to prepare to run a command using
+ * execve() or after execvp() to diagnose why it failed.
+ *
+ * The caller should ensure that command contains no directory separators.
+ *
+ * Returns 1 if it is found in $PATH or 0 if the command could not be found.
+ */
+int exists_in_PATH(const char *command);
+
+/**
  * Start a sub-process. Takes a pointer to a `struct child_process`
  * that specifies the details and returns pipe FDs (if requested).
  * See below for details.
@@ -205,41 +221,18 @@ int finish_command_in_signal(struct child_process *);
 int run_command(struct child_process *);
 
 /*
- * Returns the path to the hook file, or NULL if the hook is missing
- * or disabled. Note that this points to static storage that will be
- * overwritten by further calls to find_hook and run_hook_*.
- */
-const char *find_hook(const char *name);
-
-/**
- * Run a hook.
- * The first argument is a pathname to an index file, or NULL
- * if the hook uses the default index file or no index is needed.
- * The second argument is the name of the hook.
- * The further arguments correspond to the hook arguments.
- * The last argument has to be NULL to terminate the arguments list.
- * If the hook does not exist or is not executable, the return
- * value will be zero.
- * If it is executable, the hook will be executed and the exit
- * status of the hook is returned.
- * On execution, .stdout_to_stderr and .no_stdin will be set.
- */
-LAST_ARG_MUST_BE_NULL
-int run_hook_le(const char *const *env, const char *name, ...);
-int run_hook_ve(const char *const *env, const char *name, va_list args);
-
-/*
  * Trigger an auto-gc
  */
 int run_auto_maintenance(int quiet);
 
-#define RUN_COMMAND_NO_STDIN 1
-#define RUN_GIT_CMD	     2	/*If this is to be git sub-command */
-#define RUN_COMMAND_STDOUT_TO_STDERR 4
-#define RUN_SILENT_EXEC_FAILURE 8
-#define RUN_USING_SHELL 16
-#define RUN_CLEAN_ON_EXIT 32
-#define RUN_WAIT_AFTER_CLEAN 64
+#define RUN_COMMAND_NO_STDIN		(1<<0)
+#define RUN_GIT_CMD			(1<<1)
+#define RUN_COMMAND_STDOUT_TO_STDERR	(1<<2)
+#define RUN_SILENT_EXEC_FAILURE		(1<<3)
+#define RUN_USING_SHELL			(1<<4)
+#define RUN_CLEAN_ON_EXIT		(1<<5)
+#define RUN_WAIT_AFTER_CLEAN		(1<<6)
+#define RUN_CLOSE_OBJECT_STORE		(1<<7)
 
 /**
  * Convenience functions that encapsulate a sequence of
@@ -496,4 +489,61 @@ int run_processes_parallel_tr2(int n, get_next_task_fn, start_failure_fn,
  */
 void prepare_other_repo_env(struct strvec *env_array, const char *new_git_dir);
 
+/**
+ * Possible return values for start_bg_command().
+ */
+enum start_bg_result {
+	/* child process is "ready" */
+	SBGR_READY = 0,
+
+	/* child process could not be started */
+	SBGR_ERROR,
+
+	/* callback error when testing for "ready" */
+	SBGR_CB_ERROR,
+
+	/* timeout expired waiting for child to become "ready" */
+	SBGR_TIMEOUT,
+
+	/* child process exited or was signalled before becomming "ready" */
+	SBGR_DIED,
+};
+
+/**
+ * Callback used by start_bg_command() to ask whether the
+ * child process is ready or needs more time to become "ready".
+ *
+ * The callback will receive the cmd and cb_data arguments given to
+ * start_bg_command().
+ *
+ * Returns 1 is child needs more time (subject to the requested timeout).
+ * Returns 0 if child is "ready".
+ * Returns -1 on any error and cause start_bg_command() to also error out.
+ */
+typedef int(start_bg_wait_cb)(const struct child_process *cmd, void *cb_data);
+
+/**
+ * Start a command in the background.  Wait long enough for the child
+ * to become "ready" (as defined by the provided callback).  Capture
+ * immediate errors (like failure to start) and any immediate exit
+ * status (such as a shutdown/signal before the child became "ready")
+ * and return this like start_command().
+ *
+ * We run a custom wait loop using the provided callback to wait for
+ * the child to start and become "ready".  This is limited by the given
+ * timeout value.
+ *
+ * If the child does successfully start and become "ready", we orphan
+ * it into the background.
+ *
+ * The caller must not call finish_command().
+ *
+ * The opaque cb_data argument will be forwarded to the callback for
+ * any instance data that it might require.  This may be NULL.
+ */
+enum start_bg_result start_bg_command(struct child_process *cmd,
+				      start_bg_wait_cb *wait_cb,
+				      void *cb_data,
+				      unsigned int timeout_sec);
+
 #endif
diff --git a/send-pack.c b/send-pack.c
index 5a79e0e711..bc0fcdbb00 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -341,13 +341,13 @@ static int generate_push_cert(struct strbuf *req_buf,
 {
 	const struct ref *ref;
 	struct string_list_item *item;
-	char *signing_key = xstrdup(get_signing_key());
+	char *signing_key_id = xstrdup(get_signing_key_id());
 	const char *cp, *np;
 	struct strbuf cert = STRBUF_INIT;
 	int update_seen = 0;
 
 	strbuf_addstr(&cert, "certificate version 0.1\n");
-	strbuf_addf(&cert, "pusher %s ", signing_key);
+	strbuf_addf(&cert, "pusher %s ", signing_key_id);
 	datestamp(&cert);
 	strbuf_addch(&cert, '\n');
 	if (args->url && *args->url) {
@@ -374,7 +374,7 @@ static int generate_push_cert(struct strbuf *req_buf,
 	if (!update_seen)
 		goto free_return;
 
-	if (sign_buffer(&cert, &cert, signing_key))
+	if (sign_buffer(&cert, &cert, get_signing_key()))
 		die(_("failed to sign the push certificate"));
 
 	packet_buf_write(req_buf, "push-cert%c%s", 0, cap_string);
@@ -386,7 +386,7 @@ static int generate_push_cert(struct strbuf *req_buf,
 	packet_buf_write(req_buf, "push-cert-end\n");
 
 free_return:
-	free(signing_key);
+	free(signing_key_id);
 	strbuf_release(&cert);
 	return update_seen;
 }
@@ -425,8 +425,10 @@ static void get_commons_through_negotiation(const char *url,
 	child.no_stdin = 1;
 	child.out = -1;
 	strvec_pushl(&child.args, "fetch", "--negotiate-only", NULL);
-	for (ref = remote_refs; ref; ref = ref->next)
-		strvec_pushf(&child.args, "--negotiation-tip=%s", oid_to_hex(&ref->new_oid));
+	for (ref = remote_refs; ref; ref = ref->next) {
+		if (!is_null_oid(&ref->new_oid))
+			strvec_pushf(&child.args, "--negotiation-tip=%s", oid_to_hex(&ref->new_oid));
+	}
 	strvec_push(&child.args, url);
 
 	if (start_command(&child))
diff --git a/sequencer.c b/sequencer.c
index 0bec01cf38..9b697158c5 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -8,6 +8,7 @@
 #include "sequencer.h"
 #include "tag.h"
 #include "run-command.h"
+#include "hook.h"
 #include "exec-cmd.h"
 #include "utf8.h"
 #include "cache-tree.h"
@@ -403,7 +404,7 @@ static void print_advice(struct repository *r, int show_hint,
 	char *msg = getenv("GIT_CHERRY_PICK_HELP");
 
 	if (msg) {
-		fprintf(stderr, "%s\n", msg);
+		advise("%s\n", msg);
 		/*
 		 * A conflict has occurred but the porcelain
 		 * (typically rebase --interactive) wants to take care
@@ -418,10 +419,22 @@ static void print_advice(struct repository *r, int show_hint,
 		if (opts->no_commit)
 			advise(_("after resolving the conflicts, mark the corrected paths\n"
 				 "with 'git add <paths>' or 'git rm <paths>'"));
+		else if (opts->action == REPLAY_PICK)
+			advise(_("After resolving the conflicts, mark them with\n"
+				 "\"git add/rm <pathspec>\", then run\n"
+				 "\"git cherry-pick --continue\".\n"
+				 "You can instead skip this commit with \"git cherry-pick --skip\".\n"
+				 "To abort and get back to the state before \"git cherry-pick\",\n"
+				 "run \"git cherry-pick --abort\"."));
+		else if (opts->action == REPLAY_REVERT)
+			advise(_("After resolving the conflicts, mark them with\n"
+				 "\"git add/rm <pathspec>\", then run\n"
+				 "\"git revert --continue\".\n"
+				 "You can instead skip this commit with \"git revert --skip\".\n"
+				 "To abort and get back to the state before \"git revert\",\n"
+				 "run \"git revert --abort\"."));
 		else
-			advise(_("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'"));
+			BUG("unexpected pick action in print_advice()");
 	}
 }
 
@@ -486,7 +499,7 @@ static int error_dirty_index(struct repository *repo, struct replay_opts *opts)
 	error(_("your local changes would be overwritten by %s."),
 		_(action_name(opts)));
 
-	if (advice_commit_before_merge)
+	if (advice_enabled(ADVICE_COMMIT_BEFORE_MERGE))
 		advise(_("commit your changes or stash them to proceed."));
 	return -1;
 }
@@ -636,7 +649,7 @@ static int do_recursive_merge(struct repository *r,
 	for (i = 0; i < opts->xopts_nr; i++)
 		parse_merge_opt(&o, opts->xopts[i]);
 
-	if (opts->strategy && !strcmp(opts->strategy, "ort")) {
+	if (!opts->strategy || !strcmp(opts->strategy, "ort")) {
 		memset(&result, 0, sizeof(result));
 		merge_incore_nonrecursive(&o, base_tree, head_tree, next_tree,
 					    &result);
@@ -652,6 +665,7 @@ static int do_recursive_merge(struct repository *r,
 		merge_switch_to_result(&o, head_tree, &result, 1, show_output);
 		clean = result.clean;
 	} else {
+		ensure_full_index(r->index);
 		clean = merge_trees(&o, head_tree, next_tree, base_tree);
 		if (is_rebase_i(opts) && clean <= 0)
 			fputs(o.obuf.buf, stdout);
@@ -983,7 +997,10 @@ static int run_git_commit(const char *defmsg,
 
 	cmd.git_cmd = 1;
 
-	if (is_rebase_i(opts) && read_env_script(&cmd.env_array)) {
+	if (is_rebase_i(opts) &&
+	    ((opts->committer_date_is_author_date && !opts->ignore_date) ||
+	     !(!defmsg && (flags & AMEND_MSG))) &&
+	    read_env_script(&cmd.env_array)) {
 		const char *gpg_opt = gpg_sign_opt_quoted(opts);
 
 		return error(_(staged_changes_advice),
@@ -1147,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";
@@ -1241,7 +1254,7 @@ N_("Your name and email address were configured automatically based\n"
 
 static const char *implicit_ident_advice(void)
 {
-	char *user_config = expand_user_path("~/.gitconfig", 0);
+	char *user_config = interpolate_path("~/.gitconfig", 0);
 	char *xdg_config = xdg_config_home("config");
 	int config_exists = file_exists(user_config) || file_exists(xdg_config);
 
@@ -1267,6 +1280,7 @@ 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;
 
 	commit = lookup_commit(r, oid);
 	if (!commit)
@@ -1293,7 +1307,7 @@ void print_commit_summary(struct repository *r,
 	if (!committer_ident_sufficiently_given()) {
 		strbuf_addstr(&format, "\n Committer: ");
 		strbuf_addbuf_percentquote(&format, &committer_ident);
-		if (advice_implicit_identity) {
+		if (advice_enabled(ADVICE_IMPLICIT_IDENTITY)) {
 			strbuf_addch(&format, '\n');
 			strbuf_addstr(&format, implicit_ident_advice());
 		}
@@ -1316,9 +1330,10 @@ 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);
+	refs = get_main_ref_store(the_repository);
+	head = refs_resolve_ref_unsafe(refs, "HEAD", 0, NULL, NULL);
 	if (!head)
-		die_errno(_("unable to resolve HEAD after creating commit"));
+		die(_("unable to resolve HEAD after creating commit"));
 	if (!strcmp(head, "HEAD"))
 		head = _("detached HEAD");
 	else
@@ -1445,7 +1460,7 @@ static int try_to_commit(struct repository *r,
 		}
 	}
 
-	if (find_hook("prepare-commit-msg")) {
+	if (hook_exists("prepare-commit-msg")) {
 		res = run_prepare_commit_msg_hook(r, msg, hook_commit);
 		if (res)
 			goto out;
@@ -2065,7 +2080,7 @@ static int do_pick_commit(struct repository *r,
 		/*
 		 * We do not intend to commit immediately.  We just want to
 		 * merge the differences in, so let's compute the tree
-		 * that represents the "current" state for merge-recursive
+		 * that represents the "current" state for the merge machinery
 		 * to work on.
 		 */
 		if (write_index_as_tree(&head, r->index, r->index_file, 0, NULL))
@@ -2346,6 +2361,7 @@ static int read_and_refresh_cache(struct repository *r,
 			_(action_name(opts)));
 	}
 	refresh_index(r->index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL);
+
 	if (index_fd >= 0) {
 		if (write_locked_index(r->index, &index_lock,
 				       COMMIT_LOCK | SKIP_IF_UNCHANGED)) {
@@ -2353,6 +2369,13 @@ static int read_and_refresh_cache(struct repository *r,
 				_(action_name(opts)));
 		}
 	}
+
+	/*
+	 * If we are resolving merges in any way other than "ort", then
+	 * expand the sparse index.
+	 */
+	if (opts->strategy && strcmp(opts->strategy, "ort"))
+		ensure_full_index(r->index);
 	return 0;
 }
 
@@ -2671,7 +2694,6 @@ static int read_populate_todo(struct repository *r,
 			      struct todo_list *todo_list,
 			      struct replay_opts *opts)
 {
-	struct stat st;
 	const char *todo_file = get_todo_path(opts);
 	int res;
 
@@ -2679,11 +2701,6 @@ static int read_populate_todo(struct repository *r,
 	if (strbuf_read_file_or_whine(&todo_list->buf, todo_file) < 0)
 		return -1;
 
-	res = stat(todo_file, &st);
-	if (res)
-		return error(_("could not stat '%s'"), todo_file);
-	fill_stat_data(&todo_list->stat, &st);
-
 	res = todo_list_parse_insn_buffer(r, todo_list->buf.buf, todo_list);
 	if (res) {
 		if (is_rebase_i(opts))
@@ -3041,7 +3058,7 @@ static int create_seq_dir(struct repository *r)
 	}
 	if (in_progress_error) {
 		error("%s", in_progress_error);
-		if (advice_sequencer_in_use)
+		if (advice_enabled(ADVICE_SEQUENCER_IN_USE))
 			advise(in_progress_advice,
 				advise_skip ? "--skip | " : "");
 		return -1;
@@ -3245,7 +3262,7 @@ int sequencer_skip(struct repository *r, struct replay_opts *opts)
 give_advice:
 	error(_("there is nothing to skip"));
 
-	if (advice_resolve_conflict) {
+	if (advice_enabled(ADVICE_RESOLVE_CONFLICT)) {
 		advise(_("have you committed already?\n"
 			 "try \"git %s --continue\""),
 			 action == REPLAY_REVERT ? "revert" : "cherry-pick");
@@ -3476,17 +3493,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)
@@ -3516,11 +3528,10 @@ static int do_exec(struct repository *r, const char *command_line)
 		status = 1;
 	}
 
-	strvec_clear(&child_env);
-
 	return status;
 }
 
+__attribute__((format (printf, 2, 3)))
 static int safe_append(const char *filename, const char *fmt, ...)
 {
 	va_list ap;
@@ -3573,7 +3584,7 @@ static int do_label(struct repository *r, const char *name, int len)
 	strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name);
 	strbuf_addf(&msg, "rebase (label) '%.*s'", len, name);
 
-	transaction = ref_store_transaction_begin(refs, &err);
+	transaction = ref_store_transaction_begin(refs, 0, &err);
 	if (!transaction) {
 		error("%s", err.buf);
 		ret = -1;
@@ -3598,8 +3609,27 @@ static int do_label(struct repository *r, const char *name, int len)
 	return ret;
 }
 
+__attribute__((format (printf, 3, 4)))
 static const char *reflog_message(struct replay_opts *opts,
-	const char *sub_action, const char *fmt, ...);
+	const char *sub_action, const char *fmt, ...)
+{
+	va_list ap;
+	static struct strbuf buf = STRBUF_INIT;
+	char *reflog_action = getenv(GIT_REFLOG_ACTION);
+
+	va_start(ap, fmt);
+	strbuf_reset(&buf);
+	strbuf_addstr(&buf, reflog_action ? reflog_action : action_name(opts));
+	if (sub_action)
+		strbuf_addf(&buf, " (%s)", sub_action);
+	if (fmt) {
+		strbuf_addstr(&buf, ": ");
+		strbuf_vaddf(&buf, fmt, ap);
+	}
+	va_end(ap);
+
+	return buf.buf;
+}
 
 static int do_reset(struct repository *r,
 		    const char *name, int len,
@@ -3608,9 +3638,9 @@ static int do_reset(struct repository *r,
 	struct strbuf ref_name = STRBUF_INIT;
 	struct object_id oid;
 	struct lock_file lock = LOCK_INIT;
-	struct tree_desc desc;
+	struct tree_desc desc = { 0 };
 	struct tree *tree;
-	struct unpack_trees_options unpack_tree_opts;
+	struct unpack_trees_options unpack_tree_opts = { 0 };
 	int ret = 0;
 
 	if (repo_hold_locked_index(r, &lock, LOCK_REPORT_ON_ERROR) < 0)
@@ -3642,14 +3672,11 @@ static int do_reset(struct repository *r,
 		strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name);
 		if (get_oid(ref_name.buf, &oid) &&
 		    get_oid(ref_name.buf + strlen("refs/rewritten/"), &oid)) {
-			error(_("could not read '%s'"), ref_name.buf);
-			rollback_lock_file(&lock);
-			strbuf_release(&ref_name);
-			return -1;
+			ret = error(_("could not read '%s'"), ref_name.buf);
+			goto cleanup;
 		}
 	}
 
-	memset(&unpack_tree_opts, 0, sizeof(unpack_tree_opts));
 	setup_unpack_trees_porcelain(&unpack_tree_opts, "reset");
 	unpack_tree_opts.head_idx = 1;
 	unpack_tree_opts.src_index = r->index;
@@ -3657,27 +3684,22 @@ static int do_reset(struct repository *r,
 	unpack_tree_opts.fn = oneway_merge;
 	unpack_tree_opts.merge = 1;
 	unpack_tree_opts.update = 1;
+	unpack_tree_opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */
 	init_checkout_metadata(&unpack_tree_opts.meta, name, &oid, NULL);
 
 	if (repo_read_index_unmerged(r)) {
-		rollback_lock_file(&lock);
-		strbuf_release(&ref_name);
-		return error_resolve_conflict(_(action_name(opts)));
+		ret = error_resolve_conflict(_(action_name(opts)));
+		goto cleanup;
 	}
 
 	if (!fill_tree_descriptor(r, &desc, &oid)) {
-		error(_("failed to find tree of %s"), oid_to_hex(&oid));
-		rollback_lock_file(&lock);
-		free((void *)desc.buffer);
-		strbuf_release(&ref_name);
-		return -1;
+		ret = error(_("failed to find tree of %s"), oid_to_hex(&oid));
+		goto cleanup;
 	}
 
 	if (unpack_trees(1, &desc, &unpack_tree_opts)) {
-		rollback_lock_file(&lock);
-		free((void *)desc.buffer);
-		strbuf_release(&ref_name);
-		return -1;
+		ret = -1;
+		goto cleanup;
 	}
 
 	tree = parse_tree_indirect(&oid);
@@ -3685,14 +3707,17 @@ static int do_reset(struct repository *r,
 
 	if (write_locked_index(r->index, &lock, COMMIT_LOCK) < 0)
 		ret = error(_("could not write index"));
-	free((void *)desc.buffer);
 
 	if (!ret)
 		ret = update_ref(reflog_message(opts, "reset", "'%.*s'",
 						len, name), "HEAD", &oid,
 				 NULL, 0, UPDATE_REFS_MSG_ON_ERR);
-
+cleanup:
+	free((void *)desc.buffer);
+	if (ret < 0)
+		rollback_lock_file(&lock);
 	strbuf_release(&ref_name);
+	clear_unpack_trees_porcelain(&unpack_tree_opts);
 	return ret;
 }
 
@@ -3719,10 +3744,9 @@ static struct commit *lookup_label(const char *label, int len,
 static int do_merge(struct repository *r,
 		    struct commit *commit,
 		    const char *arg, int arg_len,
-		    int flags, struct replay_opts *opts)
+		    int flags, int *check_todo, struct replay_opts *opts)
 {
-	int run_commit_flags = (flags & TODO_EDIT_MERGE_MSG) ?
-		EDIT_MSG | VERIFY_MSG : 0;
+	int run_commit_flags = 0;
 	struct strbuf ref_name = STRBUF_INIT;
 	struct commit *head_commit, *merge_commit, *i;
 	struct commit_list *bases, *j, *reversed = NULL;
@@ -3796,6 +3820,45 @@ static int do_merge(struct repository *r,
 		goto leave_merge;
 	}
 
+	/*
+	 * If HEAD is not identical to the first parent of the original merge
+	 * commit, we cannot fast-forward.
+	 */
+	can_fast_forward = opts->allow_ff && commit && commit->parents &&
+		oideq(&commit->parents->item->object.oid,
+		      &head_commit->object.oid);
+
+	/*
+	 * If any merge head is different from the original one, we cannot
+	 * fast-forward.
+	 */
+	if (can_fast_forward) {
+		struct commit_list *p = commit->parents->next;
+
+		for (j = to_merge; j && p; j = j->next, p = p->next)
+			if (!oideq(&j->item->object.oid,
+				   &p->item->object.oid)) {
+				can_fast_forward = 0;
+				break;
+			}
+		/*
+		 * If the number of merge heads differs from the original merge
+		 * commit, we cannot fast-forward.
+		 */
+		if (j || p)
+			can_fast_forward = 0;
+	}
+
+	if (can_fast_forward) {
+		rollback_lock_file(&lock);
+		ret = fast_forward_to(r, &commit->object.oid,
+				      &head_commit->object.oid, 0, opts);
+		if (flags & TODO_EDIT_MERGE_MSG)
+			goto fast_forward_edit;
+
+		goto leave_merge;
+	}
+
 	if (commit) {
 		const char *encoding = get_commit_output_encoding();
 		const char *message = logmsg_reencode(commit, NULL, encoding);
@@ -3845,46 +3908,6 @@ static int do_merge(struct repository *r,
 		}
 	}
 
-	/*
-	 * If HEAD is not identical to the first parent of the original merge
-	 * commit, we cannot fast-forward.
-	 */
-	can_fast_forward = opts->allow_ff && commit && commit->parents &&
-		oideq(&commit->parents->item->object.oid,
-		      &head_commit->object.oid);
-
-	/*
-	 * If any merge head is different from the original one, we cannot
-	 * fast-forward.
-	 */
-	if (can_fast_forward) {
-		struct commit_list *p = commit->parents->next;
-
-		for (j = to_merge; j && p; j = j->next, p = p->next)
-			if (!oideq(&j->item->object.oid,
-				   &p->item->object.oid)) {
-				can_fast_forward = 0;
-				break;
-			}
-		/*
-		 * If the number of merge heads differs from the original merge
-		 * commit, we cannot fast-forward.
-		 */
-		if (j || p)
-			can_fast_forward = 0;
-	}
-
-	if (can_fast_forward) {
-		rollback_lock_file(&lock);
-		ret = fast_forward_to(r, &commit->object.oid,
-				      &head_commit->object.oid, 0, opts);
-		if (flags & TODO_EDIT_MERGE_MSG) {
-			run_commit_flags |= AMEND_MSG;
-			goto fast_forward_edit;
-		}
-		goto leave_merge;
-	}
-
 	if (strategy || to_merge->next) {
 		/* Octopus merge */
 		struct child_process cmd = CHILD_PROCESS_INIT;
@@ -3915,7 +3938,10 @@ static int do_merge(struct repository *r,
 				strvec_pushf(&cmd.args,
 					     "-X%s", opts->xopts[k]);
 		}
-		strvec_push(&cmd.args, "--no-edit");
+		if (!(flags & TODO_EDIT_MERGE_MSG))
+			strvec_push(&cmd.args, "--no-edit");
+		else
+			strvec_push(&cmd.args, "--edit");
 		strvec_push(&cmd.args, "--no-ff");
 		strvec_push(&cmd.args, "--no-log");
 		strvec_push(&cmd.args, "--no-stat");
@@ -3968,7 +3994,7 @@ static int do_merge(struct repository *r,
 	o.branch2 = ref_name.buf;
 	o.buffer_output = 2;
 
-	if (opts->strategy && !strcmp(opts->strategy, "ort")) {
+	if (!opts->strategy || !strcmp(opts->strategy, "ort")) {
 		/*
 		 * TODO: Should use merge_incore_recursive() and
 		 * merge_switch_to_result(), skipping the call to
@@ -4015,10 +4041,17 @@ static int do_merge(struct repository *r,
 		 * value (a negative one would indicate that the `merge`
 		 * command needs to be rescheduled).
 		 */
-	fast_forward_edit:
 		ret = !!run_git_commit(git_path_merge_msg(r), opts,
 				       run_commit_flags);
 
+	if (!ret && flags & TODO_EDIT_MERGE_MSG) {
+	fast_forward_edit:
+		*check_todo = 1;
+		run_commit_flags |= AMEND_MSG | EDIT_MSG | VERIFY_MSG;
+		ret = !!run_git_commit(NULL, opts, run_commit_flags);
+	}
+
+
 leave_merge:
 	strbuf_release(&ref_name);
 	rollback_lock_file(&lock);
@@ -4052,8 +4085,7 @@ static enum todo_command peek_command(struct todo_list *todo_list, int offset)
 	return -1;
 }
 
-void create_autostash(struct repository *r, const char *path,
-		      const char *default_reflog_action)
+void create_autostash(struct repository *r, const char *path)
 {
 	struct strbuf buf = STRBUF_INIT;
 	struct lock_file lock_file = LOCK_INIT;
@@ -4068,6 +4100,7 @@ void create_autostash(struct repository *r, const char *path,
 	if (has_unstaged_changes(r, 1) ||
 	    has_uncommitted_changes(r, 1)) {
 		struct child_process stash = CHILD_PROCESS_INIT;
+		struct reset_head_opts ropts = { .flags = RESET_HEAD_HARD };
 		struct object_id oid;
 
 		strvec_pushl(&stash.args,
@@ -4089,11 +4122,8 @@ void create_autostash(struct repository *r, const char *path,
 			    path);
 		write_file(path, "%s", oid_to_hex(&oid));
 		printf(_("Created autostash: %s\n"), buf.buf);
-		if (reset_head(r, NULL, "reset --hard",
-			       NULL, RESET_HEAD_HARD, NULL, NULL,
-			       default_reflog_action) < 0)
+		if (reset_head(r, &ropts) < 0)
 			die(_("could not reset --hard"));
-
 		if (discard_index(r->index) < 0 ||
 			repo_read_index(r) < 0)
 			die(_("could not read index"));
@@ -4178,63 +4208,26 @@ int apply_autostash_oid(const char *stash_oid)
 	return apply_save_autostash_oid(stash_oid, 1);
 }
 
-static const char *reflog_message(struct replay_opts *opts,
-	const char *sub_action, const char *fmt, ...)
-{
-	va_list ap;
-	static struct strbuf buf = STRBUF_INIT;
-	char *reflog_action = getenv(GIT_REFLOG_ACTION);
-
-	va_start(ap, fmt);
-	strbuf_reset(&buf);
-	strbuf_addstr(&buf, reflog_action ? reflog_action : action_name(opts));
-	if (sub_action)
-		strbuf_addf(&buf, " (%s)", sub_action);
-	if (fmt) {
-		strbuf_addstr(&buf, ": ");
-		strbuf_vaddf(&buf, fmt, ap);
-	}
-	va_end(ap);
-
-	return buf.buf;
-}
-
-static int run_git_checkout(struct repository *r, struct replay_opts *opts,
-			    const char *commit, const char *action)
-{
-	struct child_process cmd = CHILD_PROCESS_INIT;
-	int ret;
-
-	cmd.git_cmd = 1;
-
-	strvec_push(&cmd.args, "checkout");
-	strvec_push(&cmd.args, commit);
-	strvec_pushf(&cmd.env_array, GIT_REFLOG_ACTION "=%s", action);
-
-	if (opts->verbose)
-		ret = run_command(&cmd);
-	else
-		ret = run_command_silent_on_success(&cmd);
-
-	if (!ret)
-		discard_index(r->index);
-
-	return ret;
-}
-
 static int checkout_onto(struct repository *r, struct replay_opts *opts,
 			 const char *onto_name, const struct object_id *onto,
 			 const struct object_id *orig_head)
 {
-	const char *action = reflog_message(opts, "start", "checkout %s", onto_name);
-
-	if (run_git_checkout(r, opts, oid_to_hex(onto), action)) {
+	struct reset_head_opts ropts = {
+		.oid = onto,
+		.orig_head = orig_head,
+		.flags = RESET_HEAD_DETACH | RESET_ORIG_HEAD |
+				RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
+		.head_msg = reflog_message(opts, "start", "checkout %s",
+					   onto_name),
+		.default_reflog_action = "rebase"
+	};
+	if (reset_head(r, &ropts)) {
 		apply_autostash(rebase_path_autostash());
 		sequencer_remove_state(opts);
 		return error(_("could not detach HEAD"));
 	}
 
-	return update_ref(NULL, "ORIG_HEAD", orig_head, NULL, 0, UPDATE_REFS_MSG_ON_ERR);
+	return 0;
 }
 
 static int stopped_at_head(struct repository *r)
@@ -4255,6 +4248,30 @@ static int stopped_at_head(struct repository *r)
 
 }
 
+static int reread_todo_if_changed(struct repository *r,
+				  struct todo_list *todo_list,
+				  struct replay_opts *opts)
+{
+	int offset;
+	struct strbuf buf = STRBUF_INIT;
+
+	if (strbuf_read_file_or_whine(&buf, get_todo_path(opts)) < 0)
+		return -1;
+	offset = get_item_line_offset(todo_list, todo_list->current + 1);
+	if (buf.len != todo_list->buf.len - offset ||
+	    memcmp(buf.buf, todo_list->buf.buf + offset, buf.len)) {
+		/* Reread the todo file if it has changed. */
+		todo_list_release(todo_list);
+		if (read_populate_todo(r, todo_list, opts))
+			return -1; /* message was printed */
+		/* `current` will be incremented on return */
+		todo_list->current = -1;
+	}
+	strbuf_release(&buf);
+
+	return 0;
+}
+
 static const char rescheduled_advice[] =
 N_("Could not execute the todo command\n"
 "\n"
@@ -4406,9 +4423,8 @@ static int pick_commits(struct repository *r,
 			if ((res = do_reset(r, arg, item->arg_len, opts)))
 				reschedule = 1;
 		} else if (item->command == TODO_MERGE) {
-			if ((res = do_merge(r, item->commit,
-					    arg, item->arg_len,
-					    item->flags, opts)) < 0)
+			if ((res = do_merge(r, item->commit, arg, item->arg_len,
+					    item->flags, &check_todo, opts)) < 0)
 				reschedule = 1;
 			else if (item->commit)
 				record_in_rewritten(&item->commit->object.oid,
@@ -4434,20 +4450,9 @@ static int pick_commits(struct repository *r,
 							item->commit,
 							arg, item->arg_len,
 							opts, res, 0);
-		} else if (is_rebase_i(opts) && check_todo && !res) {
-			struct stat st;
-
-			if (stat(get_todo_path(opts), &st)) {
-				res = error_errno(_("could not stat '%s'"),
-						  get_todo_path(opts));
-			} else if (match_stat_data(&todo_list->stat, &st)) {
-				/* Reread the todo file if it has changed. */
-				todo_list_release(todo_list);
-				if (read_populate_todo(r, todo_list, opts))
-					res = -1; /* message was printed */
-				/* `current` will be incremented below */
-				todo_list->current = -1;
-			}
+		} else if (is_rebase_i(opts) && check_todo && !res &&
+			   reread_todo_if_changed(r, todo_list, opts)) {
+			return -1;
 		}
 
 		todo_list->current++;
@@ -4717,6 +4722,9 @@ static int commit_staged_changes(struct repository *r,
 		    refs_delete_ref(get_main_ref_store(r), "",
 				    "CHERRY_PICK_HEAD", NULL, 0))
 			return error(_("could not remove CHERRY_PICK_HEAD"));
+		if (unlink(git_path_merge_msg(r)) && errno != ENOENT)
+			return error_errno(_("could not remove '%s'"),
+					   git_path_merge_msg(r));
 		if (!final_fixup)
 			return 0;
 	}
@@ -5100,6 +5108,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 	int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
 	int rebase_cousins = flags & TODO_LIST_REBASE_COUSINS;
 	int root_with_onto = flags & TODO_LIST_ROOT_WITH_ONTO;
+	int skipped_commit = 0;
 	struct strbuf buf = STRBUF_INIT, oneline = STRBUF_INIT;
 	struct strbuf label = STRBUF_INIT;
 	struct commit_list *commits = NULL, **tail = &commits, *iter;
@@ -5150,8 +5159,13 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 		oidset_insert(&interesting, &commit->object.oid);
 
 		is_empty = is_original_commit_empty(commit);
-		if (!is_empty && (commit->object.flags & PATCHSAME))
+		if (!is_empty && (commit->object.flags & PATCHSAME)) {
+			if (flags & TODO_LIST_WARN_SKIPPED_CHERRY_PICKS)
+				warning(_("skipped previously applied commit %s"),
+					short_commit_name(commit));
+			skipped_commit = 1;
 			continue;
+		}
 		if (is_empty && !keep_empty)
 			continue;
 
@@ -5215,6 +5229,9 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 		oidcpy(&entry->entry.oid, &commit->object.oid);
 		oidmap_put(&commit2todo, entry);
 	}
+	if (skipped_commit)
+		advise_if_enabled(ADVICE_SKIPPED_CHERRY_PICKS,
+				  _("use --reapply-cherry-picks to include skipped commits"));
 
 	/*
 	 * Second phase:
@@ -5335,6 +5352,7 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
 	const char *insn = flags & TODO_LIST_ABBREVIATE_CMDS ? "p" : "pick";
 	int rebase_merges = flags & TODO_LIST_REBASE_MERGES;
 	int reapply_cherry_picks = flags & TODO_LIST_REAPPLY_CHERRY_PICKS;
+	int skipped_commit = 0;
 
 	repo_init_revisions(r, &revs, NULL);
 	revs.verbose_header = 1;
@@ -5370,8 +5388,13 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
 	while ((commit = get_revision(&revs))) {
 		int is_empty = is_original_commit_empty(commit);
 
-		if (!is_empty && (commit->object.flags & PATCHSAME))
+		if (!is_empty && (commit->object.flags & PATCHSAME)) {
+			if (flags & TODO_LIST_WARN_SKIPPED_CHERRY_PICKS)
+				warning(_("skipped previously applied commit %s"),
+					short_commit_name(commit));
+			skipped_commit = 1;
 			continue;
+		}
 		if (is_empty && !keep_empty)
 			continue;
 		strbuf_addf(out, "%s %s ", insn,
@@ -5381,6 +5404,9 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
 			strbuf_addf(out, " %c empty", comment_line_char);
 		strbuf_addch(out, '\n');
 	}
+	if (skipped_commit)
+		advise_if_enabled(ADVICE_SKIPPED_CHERRY_PICKS,
+				  _("use --reapply-cherry-picks to include skipped commits"));
 	return 0;
 }
 
@@ -5388,8 +5414,8 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
  * Add commands after pick and (series of) squash/fixup commands
  * in the todo list.
  */
-void todo_list_add_exec_commands(struct todo_list *todo_list,
-				 struct string_list *commands)
+static void todo_list_add_exec_commands(struct todo_list *todo_list,
+					struct string_list *commands)
 {
 	struct strbuf *buf = &todo_list->buf;
 	size_t base_offset = buf->len;
@@ -5442,7 +5468,7 @@ 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/sequencer.h b/sequencer.h
index d57d8ea23d..da64473636 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -116,10 +116,11 @@ struct todo_list {
 	struct todo_item *items;
 	int nr, alloc, current;
 	int done_nr, total_nr;
-	struct stat_data stat;
 };
 
-#define TODO_LIST_INIT { STRBUF_INIT }
+#define TODO_LIST_INIT { \
+	.buf = STRBUF_INIT, \
+}
 
 int todo_list_parse_insn_buffer(struct repository *r, char *buf,
 				struct todo_list *todo_list);
@@ -156,12 +157,11 @@ int sequencer_remove_state(struct replay_opts *opts);
  */
 #define TODO_LIST_ROOT_WITH_ONTO (1U << 6)
 #define TODO_LIST_REAPPLY_CHERRY_PICKS (1U << 7)
+#define TODO_LIST_WARN_SKIPPED_CHERRY_PICKS (1U << 8)
 
 int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
 			  const char **argv, unsigned flags);
 
-void todo_list_add_exec_commands(struct todo_list *todo_list,
-				 struct string_list *commands);
 int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
 		    const char *shortrevisions, const char *onto_name,
 		    struct commit *onto, const struct object_id *orig_head,
@@ -197,8 +197,7 @@ void commit_post_rewrite(struct repository *r,
 			 const struct commit *current_head,
 			 const struct object_id *new_head);
 
-void create_autostash(struct repository *r, const char *path,
-		      const char *default_reflog_action);
+void create_autostash(struct repository *r, const char *path);
 int save_autostash(const char *path);
 int apply_autostash(const char *path);
 int apply_autostash_oid(const char *stash_oid);
diff --git a/serve.c b/serve.c
index aa8209f147..b3fe9b5126 100644
--- a/serve.c
+++ b/serve.c
@@ -9,7 +9,8 @@
 #include "serve.h"
 #include "upload-pack.h"
 
-static int advertise_sid;
+static int advertise_sid = -1;
+static int client_hash_algo = GIT_HASH_SHA1;
 
 static int always_advertise(struct repository *r,
 			    struct strbuf *value)
@@ -33,8 +34,22 @@ static int object_format_advertise(struct repository *r,
 	return 1;
 }
 
+static void object_format_receive(struct repository *r,
+				  const char *algo_name)
+{
+	if (!algo_name)
+		die("object-format capability requires an argument");
+
+	client_hash_algo = hash_algo_by_name(algo_name);
+	if (client_hash_algo == GIT_HASH_UNKNOWN)
+		die("unknown object format '%s'", algo_name);
+}
+
 static int session_id_advertise(struct repository *r, struct strbuf *value)
 {
+	if (advertise_sid == -1 &&
+	    git_config_get_bool("transfer.advertisesid", &advertise_sid))
+		advertise_sid = 0;
 	if (!advertise_sid)
 		return 0;
 	if (value)
@@ -42,6 +57,14 @@ static int session_id_advertise(struct repository *r, struct strbuf *value)
 	return 1;
 }
 
+static void session_id_receive(struct repository *r,
+			       const char *client_sid)
+{
+	if (!client_sid)
+		client_sid = "";
+	trace2_data_string("transfer", NULL, "client-sid", client_sid);
+}
+
 struct protocol_capability {
 	/*
 	 * The name of the capability.  The server uses this name when
@@ -60,34 +83,70 @@ struct protocol_capability {
 
 	/*
 	 * Function called when a client requests the capability as a command.
-	 * The function will be provided the capabilities requested via 'keys'
-	 * as well as a struct packet_reader 'request' which the command should
+	 * Will be provided a struct packet_reader 'request' which it should
 	 * use to read the command specific part of the request.  Every command
 	 * MUST read until a flush packet is seen before sending a response.
 	 *
 	 * This field should be NULL for capabilities which are not commands.
 	 */
-	int (*command)(struct repository *r,
-		       struct strvec *keys,
-		       struct packet_reader *request);
+	int (*command)(struct repository *r, struct packet_reader *request);
+
+	/*
+	 * Function called when a client requests the capability as a
+	 * non-command. This may be NULL if the capability does nothing.
+	 *
+	 * For a capability of the form "foo=bar", the value string points to
+	 * the content after the "=" (i.e., "bar"). For simple capabilities
+	 * (just "foo"), it is NULL.
+	 */
+	void (*receive)(struct repository *r, const char *value);
 };
 
 static struct protocol_capability capabilities[] = {
-	{ "agent", agent_advertise, NULL },
-	{ "ls-refs", ls_refs_advertise, ls_refs },
-	{ "fetch", upload_pack_advertise, upload_pack_v2 },
-	{ "server-option", always_advertise, NULL },
-	{ "object-format", object_format_advertise, NULL },
-	{ "session-id", session_id_advertise, NULL },
-	{ "object-info", always_advertise, cap_object_info },
+	{
+		.name = "agent",
+		.advertise = agent_advertise,
+	},
+	{
+		.name = "ls-refs",
+		.advertise = ls_refs_advertise,
+		.command = ls_refs,
+	},
+	{
+		.name = "fetch",
+		.advertise = upload_pack_advertise,
+		.command = upload_pack_v2,
+	},
+	{
+		.name = "server-option",
+		.advertise = always_advertise,
+	},
+	{
+		.name = "object-format",
+		.advertise = object_format_advertise,
+		.receive = object_format_receive,
+	},
+	{
+		.name = "session-id",
+		.advertise = session_id_advertise,
+		.receive = session_id_receive,
+	},
+	{
+		.name = "object-info",
+		.advertise = always_advertise,
+		.command = cap_object_info,
+	},
 };
 
-static void advertise_capabilities(void)
+void protocol_v2_advertise_capabilities(void)
 {
 	struct strbuf capability = STRBUF_INIT;
 	struct strbuf value = STRBUF_INIT;
 	int i;
 
+	/* serve by default supports v2 */
+	packet_write_fmt(1, "version 2\n");
+
 	for (i = 0; i < ARRAY_SIZE(capabilities); i++) {
 		struct protocol_capability *c = &capabilities[i];
 
@@ -112,7 +171,7 @@ static void advertise_capabilities(void)
 	strbuf_release(&value);
 }
 
-static struct protocol_capability *get_capability(const char *key)
+static struct protocol_capability *get_capability(const char *key, const char **value)
 {
 	int i;
 
@@ -122,31 +181,46 @@ static struct protocol_capability *get_capability(const char *key)
 	for (i = 0; i < ARRAY_SIZE(capabilities); i++) {
 		struct protocol_capability *c = &capabilities[i];
 		const char *out;
-		if (skip_prefix(key, c->name, &out) && (!*out || *out == '='))
+		if (!skip_prefix(key, c->name, &out))
+			continue;
+		if (!*out) {
+			*value = NULL;
 			return c;
+		}
+		if (*out++ == '=') {
+			*value = out;
+			return c;
+		}
 	}
 
 	return NULL;
 }
 
-static int is_valid_capability(const char *key)
+static int receive_client_capability(const char *key)
 {
-	const struct protocol_capability *c = get_capability(key);
+	const char *value;
+	const struct protocol_capability *c = get_capability(key, &value);
 
-	return c && c->advertise(the_repository, NULL);
+	if (!c || c->command || !c->advertise(the_repository, NULL))
+		return 0;
+
+	if (c->receive)
+		c->receive(the_repository, value);
+	return 1;
 }
 
-static int is_command(const char *key, struct protocol_capability **command)
+static int parse_command(const char *key, struct protocol_capability **command)
 {
 	const char *out;
 
 	if (skip_prefix(key, "command=", &out)) {
-		struct protocol_capability *cmd = get_capability(out);
+		const char *value;
+		struct protocol_capability *cmd = get_capability(out, &value);
 
 		if (*command)
 			die("command '%s' requested after already requesting command '%s'",
 			    out, (*command)->name);
-		if (!cmd || !cmd->advertise(the_repository, NULL) || !cmd->command)
+		if (!cmd || !cmd->advertise(the_repository, NULL) || !cmd->command || value)
 			die("invalid command '%s'", out);
 
 		*command = cmd;
@@ -156,42 +230,6 @@ static int is_command(const char *key, struct protocol_capability **command)
 	return 0;
 }
 
-int has_capability(const struct strvec *keys, const char *capability,
-		   const char **value)
-{
-	int i;
-	for (i = 0; i < keys->nr; i++) {
-		const char *out;
-		if (skip_prefix(keys->v[i], capability, &out) &&
-		    (!*out || *out == '=')) {
-			if (value) {
-				if (*out == '=')
-					out++;
-				*value = out;
-			}
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-static void check_algorithm(struct repository *r, struct strvec *keys)
-{
-	int client = GIT_HASH_SHA1, server = hash_algo_by_ptr(r->hash_algo);
-	const char *algo_name;
-
-	if (has_capability(keys, "object-format", &algo_name)) {
-		client = hash_algo_by_name(algo_name);
-		if (client == GIT_HASH_UNKNOWN)
-			die("unknown object format '%s'", algo_name);
-	}
-
-	if (client != server)
-		die("mismatched object format: server %s; client %s\n",
-		    r->hash_algo->name, hash_algos[client].name);
-}
-
 enum request_state {
 	PROCESS_REQUEST_KEYS,
 	PROCESS_REQUEST_DONE,
@@ -201,9 +239,8 @@ static int process_request(void)
 {
 	enum request_state state = PROCESS_REQUEST_KEYS;
 	struct packet_reader reader;
-	struct strvec keys = STRVEC_INIT;
+	int seen_capability_or_command = 0;
 	struct protocol_capability *command = NULL;
-	const char *client_sid;
 
 	packet_reader_init(&reader, 0, NULL, 0,
 			   PACKET_READ_CHOMP_NEWLINE |
@@ -223,10 +260,9 @@ static int process_request(void)
 		case PACKET_READ_EOF:
 			BUG("Should have already died when seeing EOF");
 		case PACKET_READ_NORMAL:
-			/* collect request; a sequence of keys and values */
-			if (is_command(reader.line, &command) ||
-			    is_valid_capability(reader.line))
-				strvec_push(&keys, reader.line);
+			if (parse_command(reader.line, &command) ||
+			    receive_client_capability(reader.line))
+				seen_capability_or_command = 1;
 			else
 				die("unknown capability '%s'", reader.line);
 
@@ -238,7 +274,7 @@ static int process_request(void)
 			 * If no command and no keys were given then the client
 			 * wanted to terminate the connection.
 			 */
-			if (!keys.nr)
+			if (!seen_capability_or_command)
 				return 1;
 
 			/*
@@ -258,47 +294,33 @@ static int process_request(void)
 			state = PROCESS_REQUEST_DONE;
 			break;
 		case PACKET_READ_RESPONSE_END:
-			BUG("unexpected stateless separator packet");
+			BUG("unexpected response end packet");
 		}
 	}
 
 	if (!command)
 		die("no command requested");
 
-	check_algorithm(the_repository, &keys);
-
-	if (has_capability(&keys, "session-id", &client_sid))
-		trace2_data_string("transfer", NULL, "client-sid", client_sid);
+	if (client_hash_algo != hash_algo_by_ptr(the_repository->hash_algo))
+		die("mismatched object format: server %s; client %s\n",
+		    the_repository->hash_algo->name,
+		    hash_algos[client_hash_algo].name);
 
-	command->command(the_repository, &keys, &reader);
+	command->command(the_repository, &reader);
 
-	strvec_clear(&keys);
 	return 0;
 }
 
-/* Main serve loop for protocol version 2 */
-void serve(struct serve_options *options)
+void protocol_v2_serve_loop(int stateless_rpc)
 {
-	git_config_get_bool("transfer.advertisesid", &advertise_sid);
-
-	if (options->advertise_capabilities || !options->stateless_rpc) {
-		/* serve by default supports v2 */
-		packet_write_fmt(1, "version 2\n");
-
-		advertise_capabilities();
-		/*
-		 * If only the list of capabilities was requested exit
-		 * immediately after advertising capabilities
-		 */
-		if (options->advertise_capabilities)
-			return;
-	}
+	if (!stateless_rpc)
+		protocol_v2_advertise_capabilities();
 
 	/*
 	 * If stateless-rpc was requested then exit after
 	 * a single request/response exchange
 	 */
-	if (options->stateless_rpc) {
+	if (stateless_rpc) {
 		process_request();
 	} else {
 		for (;;)
diff --git a/serve.h b/serve.h
index fc2683e24d..f946cf904a 100644
--- a/serve.h
+++ b/serve.h
@@ -1,15 +1,7 @@
 #ifndef SERVE_H
 #define SERVE_H
 
-struct strvec;
-int has_capability(const struct strvec *keys, const char *capability,
-		   const char **value);
-
-struct serve_options {
-	unsigned advertise_capabilities;
-	unsigned stateless_rpc;
-};
-#define SERVE_OPTIONS_INIT { 0 }
-void serve(struct serve_options *options);
+void protocol_v2_advertise_capabilities(void);
+void protocol_v2_serve_loop(int stateless_rpc);
 
 #endif /* SERVE_H */
diff --git a/server-info.c b/server-info.c
index de0aa4498c..7701d7c20a 100644
--- a/server-info.c
+++ b/server-info.c
@@ -27,6 +27,7 @@ static int uic_is_stale(const struct update_info_ctx *uic)
 	return uic->old_fp == NULL;
 }
 
+__attribute__((format (printf, 2, 3)))
 static int uic_printf(struct update_info_ctx *uic, const char *fmt, ...)
 {
 	va_list ap;
diff --git a/setup.c b/setup.c
index eb9367ca5c..af3b8c09ab 100644
--- a/setup.c
+++ b/setup.c
@@ -12,6 +12,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
@@ -432,6 +433,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;
@@ -1330,6 +1394,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
 		setenv(GIT_PREFIX_ENVIRONMENT, "", 1);
 	}
 
+	setup_original_cwd();
 
 	strbuf_release(&dir);
 	strbuf_release(&gitdir);
@@ -1423,11 +1488,9 @@ const char *resolve_gitdir_gently(const char *suspect, int *return_error_code)
 /* if any standard file descriptor is missing open it to /dev/null */
 void sanitize_stdfds(void)
 {
-	int fd = open("/dev/null", O_RDWR, 0);
-	while (fd != -1 && fd < 2)
-		fd = dup(fd);
-	if (fd == -1)
-		die_errno(_("open /dev/null or dup failed"));
+	int fd = xopen("/dev/null", O_RDWR);
+	while (fd < 2)
+		fd = xdup(fd);
 	if (fd > 2)
 		close(fd);
 }
diff --git a/shallow.c b/shallow.c
index 9ed18eb884..71e5876f37 100644
--- a/shallow.c
+++ b/shallow.c
@@ -603,7 +603,7 @@ static int mark_uninteresting(const char *refname, const struct object_id *oid,
 	if (!commit)
 		return 0;
 	commit->object.flags |= UNINTERESTING;
-	mark_parents_uninteresting(commit);
+	mark_parents_uninteresting(NULL, commit);
 	return 0;
 }
 
diff --git a/shallow.h b/shallow.h
index 5b4a96dcd6..aba6ff5829 100644
--- a/shallow.h
+++ b/shallow.h
@@ -23,7 +23,9 @@ int is_repository_shallow(struct repository *r);
 struct shallow_lock {
 	struct lock_file lock;
 };
-#define SHALLOW_LOCK_INIT { LOCK_INIT }
+#define SHALLOW_LOCK_INIT { \
+	.lock = LOCK_INIT, \
+}
 
 /* commit $GIT_DIR/shallow and reset stat-validity checks */
 int commit_shallow_file(struct repository *r, struct shallow_lock *lk);
diff --git a/simple-ipc.h b/simple-ipc.h
index 2c48a5ee00..a849d9f841 100644
--- a/simple-ipc.h
+++ b/simple-ipc.h
@@ -5,13 +5,6 @@
  * See Documentation/technical/api-simple-ipc.txt
  */
 
-#ifdef SUPPORTS_SIMPLE_IPC
-#include "pkt-line.h"
-
-/*
- * Simple IPC Client Side API.
- */
-
 enum ipc_active_state {
 	/*
 	 * The pipe/socket exists and the daemon is waiting for connections.
@@ -43,6 +36,13 @@ enum ipc_active_state {
 	IPC_STATE__OTHER_ERROR,
 };
 
+#ifdef SUPPORTS_SIMPLE_IPC
+#include "pkt-line.h"
+
+/*
+ * Simple IPC Client Side API.
+ */
+
 struct ipc_client_connect_options {
 	/*
 	 * Spin under timeout if the server is running but can't
@@ -65,11 +65,7 @@ struct ipc_client_connect_options {
 	unsigned int uds_disallow_chdir:1;
 };
 
-#define IPC_CLIENT_CONNECT_OPTIONS_INIT { \
-	.wait_if_busy = 0, \
-	.wait_if_not_found = 0, \
-	.uds_disallow_chdir = 0, \
-}
+#define IPC_CLIENT_CONNECT_OPTIONS_INIT { 0 }
 
 /*
  * Determine if a server is listening on this named pipe or socket using
@@ -107,7 +103,8 @@ void ipc_client_close_connection(struct ipc_client_connection *connection);
  */
 int ipc_client_send_command_to_connection(
 	struct ipc_client_connection *connection,
-	const char *message, struct strbuf *answer);
+	const char *message, size_t message_len,
+	struct strbuf *answer);
 
 /*
  * Used by the client to synchronously connect and send and receive a
@@ -119,7 +116,8 @@ int ipc_client_send_command_to_connection(
  */
 int ipc_client_send_command(const char *path,
 			    const struct ipc_client_connect_options *options,
-			    const char *message, struct strbuf *answer);
+			    const char *message, size_t message_len,
+			    struct strbuf *answer);
 
 /*
  * Simple IPC Server Side API.
@@ -144,6 +142,7 @@ typedef int (ipc_server_reply_cb)(struct ipc_server_reply_data *,
  */
 typedef int (ipc_server_application_cb)(void *application_data,
 					const char *request,
+					size_t request_len,
 					ipc_server_reply_cb *reply_cb,
 					struct ipc_server_reply_data *reply_data);
 
diff --git a/sparse-index.c b/sparse-index.c
index affc4048f2..fdbe97b976 100644
--- a/sparse-index.c
+++ b/sparse-index.c
@@ -33,19 +33,14 @@ static int convert_to_sparse_rec(struct index_state *istate,
 {
 	int i, can_convert = 1;
 	int start_converted = num_converted;
-	enum pattern_match_result match;
-	int dtype = DT_UNKNOWN;
 	struct strbuf child_path = STRBUF_INIT;
-	struct pattern_list *pl = istate->sparse_checkout_patterns;
 
 	/*
 	 * Is the current path outside of the sparse cone?
 	 * Then check if the region can be replaced by a sparse
 	 * directory entry (everything is sparse and merged).
 	 */
-	match = path_matches_pattern_list(ct_path, ct_pathlen,
-					  NULL, &dtype, pl, istate);
-	if (match != NOT_MATCHED)
+	if (path_in_sparse_checkout(ct_path, istate))
 		can_convert = 0;
 
 	for (i = start; can_convert && i < end; i++) {
@@ -104,57 +99,104 @@ static int convert_to_sparse_rec(struct index_state *istate,
 
 int set_sparse_index_config(struct repository *repo, int enable)
 {
-	int res;
-	char *config_path = repo_git_path(repo, "config.worktree");
-	res = git_config_set_in_file_gently(config_path,
-					    "index.sparse",
-					    enable ? "true" : NULL);
-	free(config_path);
-
+	int res = repo_config_set_worktree_gently(repo,
+						  "index.sparse",
+						  enable ? "true" : "false");
 	prepare_repo_settings(repo);
 	repo->settings.sparse_index = enable;
 	return res;
 }
 
-int convert_to_sparse(struct index_state *istate)
+static int index_has_unmerged_entries(struct index_state *istate)
 {
-	int test_env;
-	if (istate->split_index || istate->sparse_index ||
-	    !core_apply_sparse_checkout || !core_sparse_checkout_cone)
+	int i;
+	for (i = 0; i < istate->cache_nr; i++) {
+		if (ce_stage(istate->cache[i]))
+			return 1;
+	}
+
+	return 0;
+}
+
+static int is_sparse_index_allowed(struct index_state *istate, int flags)
+{
+	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.
+		 */
+		if (istate->split_index || git_env_bool("GIT_TEST_SPLIT_INDEX", 0))
+			return 0;
+		/*
+		 * The GIT_TEST_SPARSE_INDEX environment variable triggers the
+		 * index.sparse config variable to be on.
+		 */
+		test_env = git_env_bool("GIT_TEST_SPARSE_INDEX", -1);
+		if (test_env >= 0)
+			set_sparse_index_config(istate->repo, test_env);
+
+		/*
+		 * Only convert to sparse if index.sparse is set.
+		 */
+		prepare_repo_settings(istate->repo);
+		if (!istate->repo->settings.sparse_index)
+			return 0;
+	}
+
+	if (init_sparse_checkout_patterns(istate))
+		return 0;
+
 	/*
-	 * The GIT_TEST_SPARSE_INDEX environment variable triggers the
-	 * index.sparse config variable to be on.
+	 * We need cone-mode patterns to use sparse-index. If a user edits
+	 * their sparse-checkout file manually, then we can detect during
+	 * parsing that they are not actually using cone-mode patterns and
+	 * hence we need to abort this conversion _without error_. Warnings
+	 * already exist in the pattern parsing to inform the user of their
+	 * bad patterns.
 	 */
-	test_env = git_env_bool("GIT_TEST_SPARSE_INDEX", -1);
-	if (test_env >= 0)
-		set_sparse_index_config(istate->repo, test_env);
+	if (!istate->sparse_checkout_patterns->use_cone_patterns)
+		return 0;
 
+	return 1;
+}
+
+int convert_to_sparse(struct index_state *istate, int flags)
+{
 	/*
-	 * Only convert to sparse if index.sparse is set.
+	 * If the index is already sparse, empty, or otherwise
+	 * cannot be converted to sparse, do not convert.
 	 */
-	prepare_repo_settings(istate->repo);
-	if (!istate->repo->settings.sparse_index)
+	if (istate->sparse_index || !istate->cache_nr ||
+	    !is_sparse_index_allowed(istate, flags))
 		return 0;
 
-	if (!istate->sparse_checkout_patterns) {
-		istate->sparse_checkout_patterns = xcalloc(1, sizeof(struct pattern_list));
-		if (get_sparse_checkout_patterns(istate->sparse_checkout_patterns) < 0)
-			return 0;
-	}
+	/*
+	 * NEEDSWORK: If we have unmerged entries, then stay full.
+	 * Unmerged entries prevent the cache-tree extension from working.
+	 */
+	if (index_has_unmerged_entries(istate))
+		return 0;
 
-	if (!istate->sparse_checkout_patterns->use_cone_patterns) {
-		warning(_("attempting to use sparse-index without cone mode"));
-		return -1;
-	}
+	if (!cache_tree_fully_valid(istate->cache_tree)) {
+		/* Clear and recompute the cache-tree */
+		cache_tree_free(&istate->cache_tree);
 
-	if (cache_tree_update(istate, 0)) {
-		warning(_("unable to update cache-tree, staying full"));
-		return -1;
+		/*
+		 * 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);
@@ -168,6 +210,10 @@ int convert_to_sparse(struct index_state *istate)
 	cache_tree_free(&istate->cache_tree);
 	cache_tree_update(istate, 0);
 
+	istate->fsmonitor_has_run_once = 0;
+	FREE_AND_NULL(istate->fsmonitor_dirty);
+	FREE_AND_NULL(istate->fsmonitor_last_update);
+
 	istate->sparse_index = 1;
 	trace2_region_leave("index", "convert_to_sparse", istate->repo);
 	return 0;
@@ -195,7 +241,7 @@ static int add_path_to_index(const struct object_id *oid,
 	strbuf_addstr(base, path);
 
 	ce = make_cache_entry(istate, mode, oid, base->buf, 0, 0);
-	ce->ce_flags |= CE_SKIP_WORKTREE;
+	ce->ce_flags |= CE_SKIP_WORKTREE | CE_EXTENDED;
 	set_index_entry(istate, istate->cache_nr++, ce);
 
 	strbuf_setlen(base, len);
@@ -259,11 +305,15 @@ void ensure_full_index(struct index_state *istate)
 
 	/* Copy back into original index. */
 	memcpy(&istate->name_hash, &full->name_hash, sizeof(full->name_hash));
+	memcpy(&istate->dir_hash, &full->dir_hash, sizeof(full->dir_hash));
 	istate->sparse_index = 0;
 	free(istate->cache);
 	istate->cache = full->cache;
 	istate->cache_nr = full->cache_nr;
 	istate->cache_alloc = full->cache_alloc;
+	istate->fsmonitor_has_run_once = 0;
+	FREE_AND_NULL(istate->fsmonitor_dirty);
+	FREE_AND_NULL(istate->fsmonitor_last_update);
 
 	strbuf_release(&base);
 	free(full);
@@ -275,6 +325,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 1115a0d7dd..656bd835b2 100644
--- a/sparse-index.h
+++ b/sparse-index.h
@@ -2,7 +2,9 @@
 #define SPARSE_INDEX_H__
 
 struct index_state;
-int convert_to_sparse(struct index_state *istate);
+#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/split-index.c b/split-index.c
index 8e52e891c3..9d0ccc30d0 100644
--- a/split-index.c
+++ b/split-index.c
@@ -5,6 +5,9 @@
 struct split_index *init_split_index(struct index_state *istate)
 {
 	if (!istate->split_index) {
+		if (istate->sparse_index)
+			die(_("cannot use split index with a sparse index"));
+
 		CALLOC_ARRAY(istate->split_index, 1);
 		istate->split_index->refcount = 1;
 	}
diff --git a/stable-qsort.c b/stable-qsort.c
index 6cbaf39f7b..7ff12467cd 100644
--- a/stable-qsort.c
+++ b/stable-qsort.c
@@ -48,15 +48,9 @@ void git_stable_qsort(void *b, size_t n, size_t s,
 		      int (*cmp)(const void *, const void *))
 {
 	const size_t size = st_mult(n, s);
-	char buf[1024];
-
-	if (size < sizeof(buf)) {
-		/* The temporary array fits on the small on-stack buffer. */
-		msort_with_tmp(b, n, s, cmp, buf);
-	} else {
-		/* It's somewhat large, so malloc it.  */
-		char *tmp = xmalloc(size);
-		msort_with_tmp(b, n, s, cmp, tmp);
-		free(tmp);
-	}
+	char *tmp;
+
+	tmp = xmalloc(size);
+	msort_with_tmp(b, n, s, cmp, tmp);
+	free(tmp);
 }
diff --git a/strbuf.c b/strbuf.c
index c8a5789694..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++;
@@ -1059,15 +1071,21 @@ void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm,
 	strbuf_setlen(sb, sb->len + len);
 }
 
-void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,
-			      int abbrev_len)
+void strbuf_repo_add_unique_abbrev(struct strbuf *sb, struct repository *repo,
+				   const struct object_id *oid, int abbrev_len)
 {
 	int r;
 	strbuf_grow(sb, GIT_MAX_HEXSZ + 1);
-	r = find_unique_abbrev_r(sb->buf + sb->len, oid, abbrev_len);
+	r = repo_find_unique_abbrev_r(repo, sb->buf + sb->len, oid, abbrev_len);
 	strbuf_setlen(sb, sb->len + r);
 }
 
+void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,
+			      int abbrev_len)
+{
+	strbuf_repo_add_unique_abbrev(sb, the_repository, oid, abbrev_len);
+}
+
 /*
  * Returns the length of a line, without trailing spaces.
  *
diff --git a/strbuf.h b/strbuf.h
index a86dcaaf44..76965a17d4 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -70,7 +70,7 @@ struct strbuf {
 };
 
 extern char strbuf_slopbuf[];
-#define STRBUF_INIT  { .alloc = 0, .len = 0, .buf = strbuf_slopbuf }
+#define STRBUF_INIT  { .buf = strbuf_slopbuf }
 
 /*
  * Predeclare this here, since cache.h includes this file before it defines the
@@ -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';
@@ -263,6 +263,7 @@ static inline void strbuf_insertstr(struct strbuf *sb, size_t pos,
 void strbuf_vinsertf(struct strbuf *sb, size_t pos, const char *fmt,
 		     va_list ap);
 
+__attribute__((format (printf, 3, 4)))
 void strbuf_insertf(struct strbuf *sb, size_t pos, const char *fmt, ...);
 
 /**
@@ -633,8 +634,10 @@ void strbuf_list_free(struct strbuf **list);
  * Add the abbreviation, as generated by find_unique_abbrev, of `sha1` to
  * the strbuf `sb`.
  */
-void strbuf_add_unique_abbrev(struct strbuf *sb,
-			      const struct object_id *oid,
+struct repository;
+void strbuf_repo_add_unique_abbrev(struct strbuf *sb, struct repository *repo,
+				   const struct object_id *oid, int abbrev_len);
+void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,
 			      int abbrev_len);
 
 /**
diff --git a/streaming.c b/streaming.c
index 5f480ad50c..fe54665d86 100644
--- a/streaming.c
+++ b/streaming.c
@@ -223,19 +223,24 @@ static int open_istream_loose(struct git_istream *st, struct repository *r,
 			      const struct object_id *oid,
 			      enum object_type *type)
 {
+	struct object_info oi = OBJECT_INFO_INIT;
+	oi.sizep = &st->size;
+	oi.typep = type;
+
 	st->u.loose.mapped = map_loose_object(r, oid, &st->u.loose.mapsize);
 	if (!st->u.loose.mapped)
 		return -1;
-	if ((unpack_loose_header(&st->z,
-				 st->u.loose.mapped,
-				 st->u.loose.mapsize,
-				 st->u.loose.hdr,
-				 sizeof(st->u.loose.hdr)) < 0) ||
-	    (parse_loose_header(st->u.loose.hdr, &st->size) < 0)) {
-		git_inflate_end(&st->z);
-		munmap(st->u.loose.mapped, st->u.loose.mapsize);
-		return -1;
+	switch (unpack_loose_header(&st->z, st->u.loose.mapped,
+				    st->u.loose.mapsize, st->u.loose.hdr,
+				    sizeof(st->u.loose.hdr), NULL)) {
+	case ULHR_OK:
+		break;
+	case ULHR_BAD:
+	case ULHR_TOO_LONG:
+		goto error;
 	}
+	if (parse_loose_header(st->u.loose.hdr, &oi) < 0 || *type < 0)
+		goto error;
 
 	st->u.loose.hdr_used = strlen(st->u.loose.hdr) + 1;
 	st->u.loose.hdr_avail = st->z.total_out;
@@ -244,6 +249,10 @@ static int open_istream_loose(struct git_istream *st, struct repository *r,
 	st->read = read_istream_loose;
 
 	return 0;
+error:
+	git_inflate_end(&st->z);
+	munmap(st->u.loose.mapped, st->u.loose.mapsize);
+	return -1;
 }
 
 
diff --git a/string-list.c b/string-list.c
index 43576ad126..549fc416d6 100644
--- a/string-list.c
+++ b/string-list.c
@@ -13,14 +13,6 @@ void string_list_init_dup(struct string_list *list)
 	memcpy(list, &blank, sizeof(*list));
 }
 
-void string_list_init(struct string_list *list, int strdup_strings)
-{
-	if (strdup_strings)
-		string_list_init_dup(list);
-	else
-		string_list_init_nodup(list);
-}
-
 /* if there is no exact match, point to the index where the entry could be
  * inserted */
 static int get_entry_index(const struct string_list *list, const char *string,
diff --git a/string-list.h b/string-list.h
index 0d6b469239..267d6e5769 100644
--- a/string-list.h
+++ b/string-list.h
@@ -104,11 +104,6 @@ struct string_list {
 void string_list_init_nodup(struct string_list *list);
 void string_list_init_dup(struct string_list *list);
 
-/**
- * TODO remove: For compatibility with any in-flight older API users
- */
-void string_list_init(struct string_list *list, int strdup_strings);
-
 /** Callback function type for for_each_string_list */
 typedef int (*string_list_each_func_t)(struct string_list_item *, void *);
 
diff --git a/strvec.h b/strvec.h
index fdcad75b45..9f55c8766b 100644
--- a/strvec.h
+++ b/strvec.h
@@ -29,11 +29,13 @@ extern const char *empty_strvec[];
  */
 struct strvec {
 	const char **v;
-	int nr;
-	int alloc;
+	size_t nr;
+	size_t alloc;
 };
 
-#define STRVEC_INIT { empty_strvec, 0, 0 }
+#define STRVEC_INIT { \
+	.v = empty_strvec, \
+}
 
 /**
  * Initialize an array. This is no different than assigning from
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/submodule-config.c b/submodule-config.c
index 2026120fb3..c9f54bc72d 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -7,6 +7,7 @@
 #include "strbuf.h"
 #include "object-store.h"
 #include "parse-options.h"
+#include "tree-walk.h"
 
 /*
  * submodule cache lookup structure
@@ -649,9 +650,10 @@ static void config_from_gitmodules(config_fn_t fn, struct repository *repo, void
 			config_source.file = file;
 		} else if (repo_get_oid(repo, GITMODULES_INDEX, &oid) >= 0 ||
 			   repo_get_oid(repo, GITMODULES_HEAD, &oid) >= 0) {
+			config_source.repo = repo;
 			config_source.blob = oidstr = xstrdup(oid_to_hex(&oid));
 			if (repo != the_repository)
-				add_to_alternates_memory(repo->objects->odb->path);
+				add_submodule_odb_by_path(repo->objects->odb->path);
 		} else {
 			goto out;
 		}
@@ -702,7 +704,7 @@ void gitmodules_config_oid(const struct object_id *commit_oid)
 
 	if (gitmodule_oid_from_commit(commit_oid, &oid, &rev)) {
 		git_config_from_blob_oid(gitmodules_cb, rev.buf,
-					 &oid, the_repository);
+					 the_repository, &oid, the_repository);
 	}
 	strbuf_release(&rev);
 
@@ -725,6 +727,66 @@ const struct submodule *submodule_from_path(struct repository *r,
 	return config_from(r->submodule_cache, treeish_name, path, lookup_path);
 }
 
+/**
+ * Used internally by submodules_of_tree(). Recurses into 'treeish_name'
+ * and appends submodule entries to 'out'. The submodule_cache expects
+ * a root-level treeish_name and paths, so keep track of these values
+ * with 'root_tree' and 'prefix'.
+ */
+static void traverse_tree_submodules(struct repository *r,
+				     const struct object_id *root_tree,
+				     char *prefix,
+				     const struct object_id *treeish_name,
+				     struct submodule_entry_list *out)
+{
+	struct tree_desc tree;
+	struct submodule_tree_entry *st_entry;
+	struct name_entry *name_entry;
+	char *tree_path = NULL;
+
+	name_entry = xmalloc(sizeof(*name_entry));
+
+	fill_tree_descriptor(r, &tree, treeish_name);
+	while (tree_entry(&tree, name_entry)) {
+		if (prefix)
+			tree_path =
+				mkpathdup("%s/%s", prefix, name_entry->path);
+		else
+			tree_path = xstrdup(name_entry->path);
+
+		if (S_ISGITLINK(name_entry->mode) &&
+		    is_tree_submodule_active(r, root_tree, tree_path)) {
+			st_entry = xmalloc(sizeof(*st_entry));
+			st_entry->name_entry = xmalloc(sizeof(*st_entry->name_entry));
+			*st_entry->name_entry = *name_entry;
+			st_entry->submodule =
+				submodule_from_path(r, root_tree, tree_path);
+			st_entry->repo = xmalloc(sizeof(*st_entry->repo));
+			if (repo_submodule_init(st_entry->repo, r, tree_path,
+						root_tree))
+				FREE_AND_NULL(st_entry->repo);
+
+			ALLOC_GROW(out->entries, out->entry_nr + 1,
+				   out->entry_alloc);
+			out->entries[out->entry_nr++] = *st_entry;
+		} else if (S_ISDIR(name_entry->mode))
+			traverse_tree_submodules(r, root_tree, tree_path,
+						 &name_entry->oid, out);
+		free(tree_path);
+	}
+}
+
+void submodules_of_tree(struct repository *r,
+			const struct object_id *treeish_name,
+			struct submodule_entry_list *out)
+{
+	CALLOC_ARRAY(out->entries, 0);
+	out->entry_nr = 0;
+	out->entry_alloc = 0;
+
+	traverse_tree_submodules(r, treeish_name, NULL, treeish_name, out);
+}
+
 void submodule_free(struct repository *r)
 {
 	if (r->submodule_cache)
diff --git a/submodule-config.h b/submodule-config.h
index c11e22cf50..fa229a8b97 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -6,6 +6,7 @@
 #include "hashmap.h"
 #include "submodule.h"
 #include "strbuf.h"
+#include "tree-walk.h"
 
 /**
  * The submodule config cache API allows to read submodule
@@ -45,10 +46,6 @@ struct submodule {
 	struct object_id gitmodules_oid;
 	int recommend_shallow;
 };
-
-#define SUBMODULE_INIT { NULL, NULL, NULL, RECURSE_SUBMODULES_NONE, \
-	NULL, NULL, SUBMODULE_UPDATE_STRATEGY_INIT, { { 0 } }, -1 };
-
 struct submodule_cache;
 struct repository;
 
@@ -105,4 +102,37 @@ int check_submodule_name(const char *name);
 void fetch_config_from_gitmodules(int *max_children, int *recurse_submodules);
 void update_clone_config_from_gitmodules(int *max_jobs);
 
+/*
+ * Submodule entry that contains relevant information about a
+ * submodule in a tree.
+ */
+struct submodule_tree_entry {
+	/* The submodule's tree entry. */
+	struct name_entry *name_entry;
+	/*
+	 * A struct repository corresponding to the submodule. May be
+	 * NULL if the submodule has not been updated.
+	 */
+	struct repository *repo;
+	/*
+	 * A struct submodule containing the submodule config in the
+	 * tree's .gitmodules.
+	 */
+	const struct submodule *submodule;
+};
+
+struct submodule_entry_list {
+	struct submodule_tree_entry *entries;
+	int entry_nr;
+	int entry_alloc;
+};
+
+/**
+ * Given a treeish, return all submodules in the tree and its subtrees,
+ * but excluding nested submodules. Callers that require nested
+ * submodules are expected to recurse into the submodules themselves.
+ */
+void submodules_of_tree(struct repository *r,
+			const struct object_id *treeish_name,
+			struct submodule_entry_list *ret);
 #endif /* SUBMODULE_CONFIG_H */
diff --git a/submodule.c b/submodule.c
index 8e611fe1db..5ace18a7d9 100644
--- a/submodule.c
+++ b/submodule.c
@@ -165,6 +165,8 @@ void stage_updated_gitmodules(struct index_state *istate)
 		die(_("staging updated .gitmodules failed"));
 }
 
+static struct string_list added_submodule_odb_paths = STRING_LIST_INIT_NODUP;
+
 /* TODO: remove this function, use repo_submodule_init instead. */
 int add_submodule_odb(const char *path)
 {
@@ -178,12 +180,35 @@ int add_submodule_odb(const char *path)
 		ret = -1;
 		goto done;
 	}
-	add_to_alternates_memory(objects_directory.buf);
+	string_list_insert(&added_submodule_odb_paths,
+			   strbuf_detach(&objects_directory, NULL));
 done:
 	strbuf_release(&objects_directory);
 	return ret;
 }
 
+void add_submodule_odb_by_path(const char *path)
+{
+	string_list_insert(&added_submodule_odb_paths, xstrdup(path));
+}
+
+int register_all_submodule_odb_as_alternates(void)
+{
+	int i;
+	int ret = added_submodule_odb_paths.nr;
+
+	for (i = 0; i < added_submodule_odb_paths.nr; i++)
+		add_to_alternates_memory(added_submodule_odb_paths.items[i].string);
+	if (ret) {
+		string_list_clear(&added_submodule_odb_paths, 0);
+		trace2_data_intmax("submodule", the_repository,
+				   "register_all_submodule_odb_as_alternates/registered", ret);
+		if (git_env_bool("GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB", 0))
+			BUG("register_all_submodule_odb_as_alternates() called");
+	}
+	return ret;
+}
+
 void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
 					     const char *path)
 {
@@ -237,7 +262,14 @@ int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
 /*
  * Determine if a submodule has been initialized at a given 'path'
  */
-int is_submodule_active(struct repository *repo, const char *path)
+/*
+ * NEEDSWORK: Emit a warning if submodule.active exists, but is valueless,
+ * ie, the config looks like: "[submodule] active\n".
+ * Since that is an invalid pathspec, we should inform the user.
+ */
+int is_tree_submodule_active(struct repository *repo,
+			     const struct object_id *treeish_name,
+			     const char *path)
 {
 	int ret = 0;
 	char *key = NULL;
@@ -245,7 +277,7 @@ int is_submodule_active(struct repository *repo, const char *path)
 	const struct string_list *sl;
 	const struct submodule *module;
 
-	module = submodule_from_path(repo, null_oid(), path);
+	module = submodule_from_path(repo, treeish_name, path);
 
 	/* early return if there isn't a path->module mapping */
 	if (!module)
@@ -287,6 +319,11 @@ int is_submodule_active(struct repository *repo, const char *path)
 	return ret;
 }
 
+int is_submodule_active(struct repository *repo, const char *path)
+{
+	return is_tree_submodule_active(repo, null_oid(), path);
+}
+
 int is_submodule_populated_gently(const char *path, int *return_error_code)
 {
 	int ret = 0;
@@ -497,9 +534,6 @@ static void prepare_submodule_repo_env_in_gitdir(struct strvec *out)
 /*
  * Initialize a repository struct for a submodule based on the provided 'path'.
  *
- * Unlike repo_submodule_init, this tolerates submodules not present
- * in .gitmodules. This function exists only to preserve historical behavior,
- *
  * Returns the repository struct on success,
  * NULL when the submodule is not present.
  */
@@ -697,8 +731,20 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path,
 		strvec_push(&cp.args, oid_to_hex(new_oid));
 
 	prepare_submodule_repo_env(&cp.env_array);
-	if (start_command(&cp))
+
+	if (!is_directory(path)) {
+		/* fall back to absorbed git dir, if any */
+		if (!sub)
+			goto done;
+		cp.dir = sub->gitdir;
+		strvec_push(&cp.env_array, GIT_DIR_ENVIRONMENT "=.");
+		strvec_push(&cp.env_array, GIT_WORK_TREE_ENVIRONMENT "=.");
+	}
+
+	if (start_command(&cp)) {
 		diff_emit_submodule_error(o, "(diff failed)\n");
+		goto done;
+	}
 
 	while (strbuf_getwholeline_fd(&sb, cp.out, '\n') != EOF)
 		diff_emit_submodule_pipethrough(o, sb.buf, sb.len);
@@ -891,23 +937,33 @@ struct has_commit_data {
 static int check_has_commit(const struct object_id *oid, void *data)
 {
 	struct has_commit_data *cb = data;
+	struct repository subrepo;
+	enum object_type type;
 
-	enum object_type type = oid_object_info(cb->repo, oid, NULL);
+	if (repo_submodule_init(&subrepo, cb->repo, cb->path, null_oid())) {
+		cb->result = 0;
+		goto cleanup;
+	}
+
+	type = oid_object_info(&subrepo, oid, NULL);
 
 	switch (type) {
 	case OBJ_COMMIT:
-		return 0;
+		goto cleanup;
 	case OBJ_BAD:
 		/*
 		 * Object is missing or invalid. If invalid, an error message
 		 * has already been printed.
 		 */
 		cb->result = 0;
-		return 0;
+		goto cleanup;
 	default:
 		die(_("submodule entry '%s' (%s) is a %s, not a commit"),
 		    cb->path, oid_to_hex(oid), type_name(type));
 	}
+cleanup:
+	repo_clear(&subrepo);
+	return 0;
 }
 
 static int submodule_has_commits(struct repository *r,
@@ -1281,9 +1337,11 @@ struct submodule_parallel_fetch {
 
 	struct strbuf submodules_with_errors;
 };
-#define SPF_INIT {0, STRVEC_INIT, NULL, NULL, 0, 0, 0, 0, \
-		  STRING_LIST_INIT_DUP, \
-		  NULL, 0, 0, STRBUF_INIT}
+#define SPF_INIT { \
+	.args = STRVEC_INIT, \
+	.changed_submodule_names = STRING_LIST_INIT_DUP, \
+	.submodules_with_errors = STRBUF_INIT, \
+}
 
 static int get_fetch_recurse_config(const struct submodule *submodule,
 				    struct submodule_parallel_fetch *spf)
@@ -1381,24 +1439,13 @@ static void fetch_task_release(struct fetch_task *p)
 }
 
 static struct repository *get_submodule_repo_for(struct repository *r,
-						 const struct submodule *sub)
+						 const char *path)
 {
 	struct repository *ret = xmalloc(sizeof(*ret));
 
-	if (repo_submodule_init(ret, r, sub)) {
-		/*
-		 * No entry in .gitmodules? Technically not a submodule,
-		 * but historically we supported repositories that happen to be
-		 * in-place where a gitlink is. Keep supporting them.
-		 */
-		struct strbuf gitdir = STRBUF_INIT;
-		strbuf_repo_worktree_path(&gitdir, r, "%s/.git", sub->path);
-		if (repo_init(ret, gitdir.buf, NULL)) {
-			strbuf_release(&gitdir);
-			free(ret);
-			return NULL;
-		}
-		strbuf_release(&gitdir);
+	if (repo_submodule_init(ret, r, path, null_oid())) {
+		free(ret);
+		return NULL;
 	}
 
 	return ret;
@@ -1440,7 +1487,7 @@ static int get_next_submodule(struct child_process *cp,
 			continue;
 		}
 
-		task->repo = get_submodule_repo_for(spf->r, task->sub);
+		task->repo = get_submodule_repo_for(spf->r, task->sub->path);
 		if (task->repo) {
 			struct strbuf submodule_prefix = STRBUF_INIT;
 			child_process_init(cp);
@@ -1819,14 +1866,16 @@ out:
 
 void submodule_unset_core_worktree(const struct submodule *sub)
 {
-	char *config_path = xstrfmt("%s/modules/%s/config",
-				    get_git_dir(), sub->name);
+	struct strbuf config_path = STRBUF_INIT;
 
-	if (git_config_set_in_file_gently(config_path, "core.worktree", NULL))
+	submodule_name_to_gitdir(&config_path, the_repository, sub->name);
+	strbuf_addstr(&config_path, "/config");
+
+	if (git_config_set_in_file_gently(config_path.buf, "core.worktree", NULL))
 		warning(_("Could not unset core.worktree setting in submodule '%s'"),
 			  sub->path);
 
-	free(config_path);
+	strbuf_release(&config_path);
 }
 
 static const char *get_super_prefix_or_empty(void)
@@ -1866,6 +1915,7 @@ static void submodule_reset_index(const char *path)
 
 	strvec_pushf(&cp.args, "--super-prefix=%s%s/",
 		     get_super_prefix_or_empty(), path);
+	/* TODO: determine if this might overwright untracked files */
 	strvec_pushl(&cp.args, "read-tree", "-u", "--reset", NULL);
 
 	strvec_push(&cp.args, empty_tree_oid_hex());
@@ -1922,20 +1972,22 @@ int submodule_move_head(const char *path,
 				absorb_git_dir_into_superproject(path,
 					ABSORB_GITDIR_RECURSE_SUBMODULES);
 		} else {
-			char *gitdir = xstrfmt("%s/modules/%s",
-				    get_git_dir(), sub->name);
-			connect_work_tree_and_git_dir(path, gitdir, 0);
-			free(gitdir);
+			struct strbuf gitdir = STRBUF_INIT;
+			submodule_name_to_gitdir(&gitdir, the_repository,
+						 sub->name);
+			connect_work_tree_and_git_dir(path, gitdir.buf, 0);
+			strbuf_release(&gitdir);
 
 			/* make sure the index is clean as well */
 			submodule_reset_index(path);
 		}
 
 		if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
-			char *gitdir = xstrfmt("%s/modules/%s",
-				    get_git_dir(), sub->name);
-			connect_work_tree_and_git_dir(path, gitdir, 1);
-			free(gitdir);
+			struct strbuf gitdir = STRBUF_INIT;
+			submodule_name_to_gitdir(&gitdir, the_repository,
+						 sub->name);
+			connect_work_tree_and_git_dir(path, gitdir.buf, 1);
+			strbuf_release(&gitdir);
 		}
 	}
 
@@ -2050,7 +2102,7 @@ int validate_submodule_git_dir(char *git_dir, const char *submodule_name)
 static void relocate_single_git_dir_into_superproject(const char *path)
 {
 	char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL;
-	char *new_git_dir;
+	struct strbuf new_gitdir = STRBUF_INIT;
 	const struct submodule *sub;
 
 	if (submodule_uses_worktrees(path))
@@ -2068,14 +2120,13 @@ static void relocate_single_git_dir_into_superproject(const char *path)
 	if (!sub)
 		die(_("could not lookup name for submodule '%s'"), path);
 
-	new_git_dir = git_pathdup("modules/%s", sub->name);
-	if (validate_submodule_git_dir(new_git_dir, sub->name) < 0)
+	submodule_name_to_gitdir(&new_gitdir, the_repository, sub->name);
+	if (validate_submodule_git_dir(new_gitdir.buf, sub->name) < 0)
 		die(_("refusing to move '%s' into an existing git dir"),
 		    real_old_git_dir);
-	if (safe_create_leading_directories_const(new_git_dir) < 0)
-		die(_("could not create directory '%s'"), new_git_dir);
-	real_new_git_dir = real_pathdup(new_git_dir, 1);
-	free(new_git_dir);
+	if (safe_create_leading_directories_const(new_gitdir.buf) < 0)
+		die(_("could not create directory '%s'"), new_gitdir.buf);
+	real_new_git_dir = real_pathdup(new_gitdir.buf, 1);
 
 	fprintf(stderr, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"),
 		get_super_prefix_or_empty(), path,
@@ -2086,6 +2137,7 @@ static void relocate_single_git_dir_into_superproject(const char *path)
 	free(old_git_dir);
 	free(real_old_git_dir);
 	free(real_new_git_dir);
+	strbuf_release(&new_gitdir);
 }
 
 /*
@@ -2105,6 +2157,7 @@ void absorb_git_dir_into_superproject(const char *path,
 	/* Not populated? */
 	if (!sub_git_dir) {
 		const struct submodule *sub;
+		struct strbuf sub_gitdir = STRBUF_INIT;
 
 		if (err_code == READ_GITFILE_ERR_STAT_FAILED) {
 			/* unpopulated as expected */
@@ -2126,8 +2179,9 @@ void absorb_git_dir_into_superproject(const char *path,
 		sub = submodule_from_path(the_repository, null_oid(), path);
 		if (!sub)
 			die(_("could not lookup name for submodule '%s'"), path);
-		connect_work_tree_and_git_dir(path,
-			git_path("modules/%s", sub->name), 0);
+		submodule_name_to_gitdir(&sub_gitdir, the_repository, sub->name);
+		connect_work_tree_and_git_dir(path, sub_gitdir.buf, 0);
+		strbuf_release(&sub_gitdir);
 	} else {
 		/* Is it already absorbed into the superprojects git dir? */
 		char *real_sub_git_dir = real_pathdup(sub_git_dir, 1);
@@ -2278,9 +2332,36 @@ int submodule_to_gitdir(struct strbuf *buf, const char *submodule)
 			goto cleanup;
 		}
 		strbuf_reset(buf);
-		strbuf_git_path(buf, "%s/%s", "modules", sub->name);
+		submodule_name_to_gitdir(buf, the_repository, sub->name);
 	}
 
 cleanup:
 	return ret;
 }
+
+void submodule_name_to_gitdir(struct strbuf *buf, struct repository *r,
+			      const char *submodule_name)
+{
+	/*
+	 * NEEDSWORK: The current way of mapping a submodule's name to
+	 * its location in .git/modules/ has problems with some naming
+	 * schemes. For example, if a submodule is named "foo" and
+	 * another is named "foo/bar" (whether present in the same
+	 * superproject commit or not - the problem will arise if both
+	 * superproject commits have been checked out at any point in
+	 * time), or if two submodule names only have different cases in
+	 * a case-insensitive filesystem.
+	 *
+	 * There are several solutions, including encoding the path in
+	 * some way, introducing a submodule.<name>.gitdir config in
+	 * .git/config (not .gitmodules) that allows overriding what the
+	 * gitdir of a submodule would be (and teach Git, upon noticing
+	 * a clash, to automatically determine a non-clashing name and
+	 * to write such a config), or introducing a
+	 * submodule.<name>.gitdir config in .gitmodules that repo
+	 * administrators can explicitly set. Nothing has been decided,
+	 * so for now, just append the name at the end of the path.
+	 */
+	strbuf_repo_git_path(buf, r, "modules/");
+	strbuf_addstr(buf, submodule_name);
+}
diff --git a/submodule.h b/submodule.h
index 84640c49c1..784ceffc0e 100644
--- a/submodule.h
+++ b/submodule.h
@@ -37,7 +37,9 @@ struct submodule_update_strategy {
 	enum submodule_update_type type;
 	const char *command;
 };
-#define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL}
+#define SUBMODULE_UPDATE_STRATEGY_INIT { \
+	.type = SM_UPDATE_UNSPECIFIED, \
+}
 
 int is_gitmodules_unmerged(struct index_state *istate);
 int is_writing_gitmodules_ok(void);
@@ -52,6 +54,9 @@ int git_default_submodule_config(const char *var, const char *value, void *cb);
 struct option;
 int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
 						     const char *arg, int unset);
+int is_tree_submodule_active(struct repository *repo,
+			     const struct object_id *treeish_name,
+			     const char *path);
 int is_submodule_active(struct repository *repo, const char *path);
 /*
  * Determine if a submodule has been populated at a given 'path' by checking if
@@ -97,7 +102,15 @@ int submodule_uses_gitfile(const char *path);
 #define SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED (1<<2)
 int bad_to_remove_submodule(const char *path, unsigned flags);
 
+/*
+ * Call add_submodule_odb() to add the submodule at the given path to a list.
+ * When register_all_submodule_odb_as_alternates() is called, the object stores
+ * of all submodules in that list will be added as alternates in
+ * the_repository.
+ */
 int add_submodule_odb(const char *path);
+void add_submodule_odb_by_path(const char *path);
+int register_all_submodule_odb_as_alternates(void);
 
 /*
  * Checks if there are submodule changes in a..b. If a is the null OID,
@@ -125,6 +138,13 @@ int push_unpushed_submodules(struct repository *r,
 int submodule_to_gitdir(struct strbuf *buf, const char *submodule);
 
 /*
+ * Given a submodule name, create a path to where the submodule's gitdir lives
+ * inside of the provided repository's 'modules' directory.
+ */
+void submodule_name_to_gitdir(struct strbuf *buf, struct repository *r,
+			      const char *submodule_name);
+
+/*
  * Make sure that no submodule's git dir is nested in a sibling submodule's.
  */
 int validate_submodule_git_dir(char *git_dir, const char *submodule_name);
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/.gitattributes b/t/.gitattributes
index dafa17c3e6..9930e28351 100644
--- a/t/.gitattributes
+++ b/t/.gitattributes
@@ -1,6 +1,5 @@
 t[0-9][0-9][0-9][0-9]/* -whitespace
 /chainlint/*.expect eol=lf
-/lib-diff/* eol=lf
 /t0110/url-* binary
 /t3206/* eol=lf
 /t3900/*.txt eol=lf
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 9e70122302..f48e0542cd 100644
--- a/t/README
+++ b/t/README
@@ -366,6 +366,13 @@ excluded as so much relies on it, but this might change in the future.
 GIT_TEST_SPLIT_INDEX=<boolean> forces split-index mode on the whole
 test suite. Accept any boolean values that are accepted by git-config.
 
+GIT_TEST_PASSING_SANITIZE_LEAK=<boolean> when compiled with
+SANITIZE=leak will run only those tests that have whitelisted
+themselves as passing with no memory leaks. Tests can be whitelisted
+by setting "TEST_PASSES_SANITIZE_LEAK=true" before sourcing
+"test-lib.sh" itself at the top of the test script. This test mode is
+used by the "linux-leaks" CI target.
+
 GIT_TEST_PROTOCOL_VERSION=<n>, when set, makes 'protocol.version'
 default to n.
 
@@ -425,6 +432,10 @@ GIT_TEST_MULTI_PACK_INDEX=<boolean>, when true, forces the multi-pack-
 index to be written after every 'git repack' command, and overrides the
 'core.multiPackIndex' setting to true.
 
+GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=<boolean>, when true, sets the
+'--bitmap' option on all invocations of 'git multi-pack-index write',
+and ignores pack-objects' '--write-bitmap-index'.
+
 GIT_TEST_SIDEBAND_ALL=<boolean>, when true, overrides the
 'uploadpack.allowSidebandAll' setting to true, and when false, forces
 fetch-pack to not request sideband-all (even if the server advertises
@@ -448,6 +459,19 @@ GIT_TEST_CHECKOUT_WORKERS=<n> overrides the 'checkout.workers' setting
 to <n> and 'checkout.thresholdForParallelism' to 0, forcing the
 execution of the parallel-checkout code.
 
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=<boolean>, when true, makes
+registering submodule ODBs as alternates a fatal action. Support for
+this environment variable can be removed once the migration to
+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
 ------------
 
@@ -753,7 +777,8 @@ Test harness library
 --------------------
 
 There are a handful helper functions defined in the test harness
-library for your script to use.
+library for your script to use. Some of them are listed below;
+see test-lib-functions.sh for the full list and their options.
 
  - test_expect_success [<prereq>] <message> <script>
 
@@ -799,10 +824,12 @@ library for your script to use.
    argument.  This is primarily meant for use during the
    development of a new test script.
 
- - debug <git-command>
+ - debug [options] <git-command>
 
    Run a git command inside a debugger. This is primarily meant for
-   use when debugging a failing test script.
+   use when debugging a failing test script. With '-t', use your
+   original TERM instead of test-lib.sh's "dumb", so that your
+   debugger interface has colors.
 
  - test_done
 
@@ -989,7 +1016,7 @@ library for your script to use.
 	EOF
 
 
- - test_pause
+ - test_pause [options]
 
 	This command is useful for writing and debugging tests and must be
 	removed before submitting. It halts the execution of the test and
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-advise.c b/t/helper/test-advise.c
index a7043df1d3..cb881139f7 100644
--- a/t/helper/test-advise.c
+++ b/t/helper/test-advise.c
@@ -16,7 +16,7 @@ int cmd__advise_if_enabled(int argc, const char **argv)
 	 * selected here and in t0018 where this command is being
 	 * executed.
 	 */
-	advise_if_enabled(ADVICE_NESTED_TAG, argv[1]);
+	advise_if_enabled(ADVICE_NESTED_TAG, "%s", argv[1]);
 
 	return 0;
 }
diff --git a/t/helper/test-bitmap.c b/t/helper/test-bitmap.c
index 134a1e9d76..ff35f5999b 100644
--- a/t/helper/test-bitmap.c
+++ b/t/helper/test-bitmap.c
@@ -7,6 +7,11 @@ static int bitmap_list_commits(void)
 	return test_bitmap_commits(the_repository);
 }
 
+static int bitmap_dump_hashes(void)
+{
+	return test_bitmap_hashes(the_repository);
+}
+
 int cmd__bitmap(int argc, const char **argv)
 {
 	setup_git_directory();
@@ -16,9 +21,12 @@ int cmd__bitmap(int argc, const char **argv)
 
 	if (!strcmp(argv[1], "list-commits"))
 		return bitmap_list_commits();
+	if (!strcmp(argv[1], "dump-hashes"))
+		return bitmap_dump_hashes();
 
 usage:
-	usage("\ttest-tool bitmap list-commits");
+	usage("\ttest-tool bitmap list-commits\n"
+	      "\ttest-tool bitmap dump-hashes");
 
 	return -1;
 }
diff --git a/t/helper/test-csprng.c b/t/helper/test-csprng.c
new file mode 100644
index 0000000000..65d14973c5
--- /dev/null
+++ b/t/helper/test-csprng.c
@@ -0,0 +1,29 @@
+#include "test-tool.h"
+#include "git-compat-util.h"
+
+
+int cmd__csprng(int argc, const char **argv)
+{
+	unsigned long count;
+	unsigned char buf[1024];
+
+	if (argc > 2) {
+		fprintf(stderr, "usage: %s [<size>]\n", argv[0]);
+		return 2;
+	}
+
+	count = (argc == 2) ? strtoul(argv[1], NULL, 0) : -1L;
+
+	while (count) {
+		unsigned long chunk = count < sizeof(buf) ? count : sizeof(buf);
+		if (csprng_bytes(buf, chunk) < 0) {
+			perror("failed to read");
+			return 5;
+		}
+		if (fwrite(buf, chunk, 1, stdout) != chunk)
+			return 1;
+		count -= chunk;
+	}
+
+	return 0;
+}
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-dump-untracked-cache.c b/t/helper/test-dump-untracked-cache.c
index cf0f2c7228..99010614f6 100644
--- a/t/helper/test-dump-untracked-cache.c
+++ b/t/helper/test-dump-untracked-cache.c
@@ -45,8 +45,10 @@ int cmd__dump_untracked_cache(int ac, const char **av)
 	struct untracked_cache *uc;
 	struct strbuf base = STRBUF_INIT;
 
-	/* Hack to avoid modifying the untracked cache when we read it */
-	ignore_untracked_cache_config = 1;
+	/* Set core.untrackedCache=keep before setup_git_directory() */
+	xsetenv("GIT_CONFIG_COUNT", "1", 1);
+	xsetenv("GIT_CONFIG_KEY_0", "core.untrackedCache", 1);
+	xsetenv("GIT_CONFIG_VALUE_0", "keep", 1);
 
 	setup_git_directory();
 	if (read_cache() < 0)
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-getcwd.c b/t/helper/test-getcwd.c
new file mode 100644
index 0000000000..d680038a78
--- /dev/null
+++ b/t/helper/test-getcwd.c
@@ -0,0 +1,26 @@
+#include "test-tool.h"
+#include "git-compat-util.h"
+#include "parse-options.h"
+
+static const char *getcwd_usage[] = {
+	"test-tool getcwd",
+	NULL
+};
+
+int cmd__getcwd(int argc, const char **argv)
+{
+	struct option options[] = {
+		OPT_END()
+	};
+	char *cwd;
+
+	argc = parse_options(argc, argv, "test-tools", options, getcwd_usage, 0);
+	if (argc > 0)
+		usage_with_options(getcwd_usage, options);
+
+	cwd = xgetcwd();
+	puts(cwd);
+	free(cwd);
+
+	return 0;
+}
diff --git a/t/helper/test-mergesort.c b/t/helper/test-mergesort.c
index c5cffaa4b7..ebf68f7de8 100644
--- a/t/helper/test-mergesort.c
+++ b/t/helper/test-mergesort.c
@@ -2,6 +2,12 @@
 #include "cache.h"
 #include "mergesort.h"
 
+static uint32_t minstd_rand(uint32_t *state)
+{
+	*state = (uint64_t)*state * 48271 % 2147483647;
+	return *state;
+}
+
 struct line {
 	char *text;
 	struct line *next;
@@ -23,14 +29,12 @@ static int compare_strings(const void *a, const void *b)
 	return strcmp(x->text, y->text);
 }
 
-int cmd__mergesort(int argc, const char **argv)
+static int sort_stdin(void)
 {
 	struct line *line, *p = NULL, *lines = NULL;
 	struct strbuf sb = STRBUF_INIT;
 
-	for (;;) {
-		if (strbuf_getwholeline(&sb, stdin, '\n'))
-			break;
+	while (!strbuf_getline(&sb, stdin)) {
 		line = xmalloc(sizeof(struct line));
 		line->text = strbuf_detach(&sb, NULL);
 		if (p) {
@@ -46,8 +50,362 @@ int cmd__mergesort(int argc, const char **argv)
 	lines = llist_mergesort(lines, get_next, set_next, compare_strings);
 
 	while (lines) {
-		printf("%s", lines->text);
+		puts(lines->text);
 		lines = lines->next;
 	}
 	return 0;
 }
+
+static void dist_sawtooth(int *arr, int n, int m)
+{
+	int i;
+	for (i = 0; i < n; i++)
+		arr[i] = i % m;
+}
+
+static void dist_rand(int *arr, int n, int m)
+{
+	int i;
+	uint32_t seed = 1;
+	for (i = 0; i < n; i++)
+		arr[i] = minstd_rand(&seed) % m;
+}
+
+static void dist_stagger(int *arr, int n, int m)
+{
+	int i;
+	for (i = 0; i < n; i++)
+		arr[i] = (i * m + i) % n;
+}
+
+static void dist_plateau(int *arr, int n, int m)
+{
+	int i;
+	for (i = 0; i < n; i++)
+		arr[i] = (i < m) ? i : m;
+}
+
+static void dist_shuffle(int *arr, int n, int m)
+{
+	int i, j, k;
+	uint32_t seed = 1;
+	for (i = j = 0, k = 1; i < n; i++)
+		arr[i] = minstd_rand(&seed) % m ? (j += 2) : (k += 2);
+}
+
+#define DIST(name) { #name, dist_##name }
+
+static struct dist {
+	const char *name;
+	void (*fn)(int *arr, int n, int m);
+} dist[] = {
+	DIST(sawtooth),
+	DIST(rand),
+	DIST(stagger),
+	DIST(plateau),
+	DIST(shuffle),
+};
+
+static const struct dist *get_dist_by_name(const char *name)
+{
+	int i;
+	for (i = 0; i < ARRAY_SIZE(dist); i++) {
+	       if (!strcmp(dist[i].name, name))
+		       return &dist[i];
+	}
+	return NULL;
+}
+
+static void mode_copy(int *arr, int n)
+{
+	/* nothing */
+}
+
+static void mode_reverse(int *arr, int n)
+{
+	int i, j;
+	for (i = 0, j = n - 1; i < j; i++, j--)
+		SWAP(arr[i], arr[j]);
+}
+
+static void mode_reverse_1st_half(int *arr, int n)
+{
+	mode_reverse(arr, n / 2);
+}
+
+static void mode_reverse_2nd_half(int *arr, int n)
+{
+	int half = n / 2;
+	mode_reverse(arr + half, n - half);
+}
+
+static int compare_ints(const void *av, const void *bv)
+{
+	const int *ap = av, *bp = bv;
+	int a = *ap, b = *bp;
+	return (a > b) - (a < b);
+}
+
+static void mode_sort(int *arr, int n)
+{
+	QSORT(arr, n, compare_ints);
+}
+
+static void mode_dither(int *arr, int n)
+{
+	int i;
+	for (i = 0; i < n; i++)
+		arr[i] += i % 5;
+}
+
+static void unriffle(int *arr, int n, int *tmp)
+{
+	int i, j;
+	COPY_ARRAY(tmp, arr, n);
+	for (i = j = 0; i < n; i += 2)
+		arr[j++] = tmp[i];
+	for (i = 1; i < n; i += 2)
+		arr[j++] = tmp[i];
+}
+
+static void unriffle_recursively(int *arr, int n, int *tmp)
+{
+	if (n > 1) {
+		int half = n / 2;
+		unriffle(arr, n, tmp);
+		unriffle_recursively(arr, half, tmp);
+		unriffle_recursively(arr + half, n - half, tmp);
+	}
+}
+
+static void mode_unriffle(int *arr, int n)
+{
+	int *tmp;
+	ALLOC_ARRAY(tmp, n);
+	unriffle_recursively(arr, n, tmp);
+	free(tmp);
+}
+
+static unsigned int prev_pow2(unsigned int n)
+{
+	unsigned int pow2 = 1;
+	while (pow2 * 2 < n)
+		pow2 *= 2;
+	return pow2;
+}
+
+static void unriffle_recursively_skewed(int *arr, int n, int *tmp)
+{
+	if (n > 1) {
+		int pow2 = prev_pow2(n);
+		int rest = n - pow2;
+		unriffle(arr + pow2 - rest, rest * 2, tmp);
+		unriffle_recursively_skewed(arr, pow2, tmp);
+		unriffle_recursively_skewed(arr + pow2, rest, tmp);
+	}
+}
+
+static void mode_unriffle_skewed(int *arr, int n)
+{
+	int *tmp;
+	ALLOC_ARRAY(tmp, n);
+	unriffle_recursively_skewed(arr, n, tmp);
+	free(tmp);
+}
+
+#define MODE(name) { #name, mode_##name }
+
+static struct mode {
+	const char *name;
+	void (*fn)(int *arr, int n);
+} mode[] = {
+	MODE(copy),
+	MODE(reverse),
+	MODE(reverse_1st_half),
+	MODE(reverse_2nd_half),
+	MODE(sort),
+	MODE(dither),
+	MODE(unriffle),
+	MODE(unriffle_skewed),
+};
+
+static const struct mode *get_mode_by_name(const char *name)
+{
+	int i;
+	for (i = 0; i < ARRAY_SIZE(mode); i++) {
+	       if (!strcmp(mode[i].name, name))
+		       return &mode[i];
+	}
+	return NULL;
+}
+
+static int generate(int argc, const char **argv)
+{
+	const struct dist *dist = NULL;
+	const struct mode *mode = NULL;
+	int i, n, m, *arr;
+
+	if (argc != 4)
+		return 1;
+
+	dist = get_dist_by_name(argv[0]);
+	mode = get_mode_by_name(argv[1]);
+	n = strtol(argv[2], NULL, 10);
+	m = strtol(argv[3], NULL, 10);
+	if (!dist || !mode)
+		return 1;
+
+	ALLOC_ARRAY(arr, n);
+	dist->fn(arr, n, m);
+	mode->fn(arr, n);
+	for (i = 0; i < n; i++)
+		printf("%08x\n", arr[i]);
+	free(arr);
+	return 0;
+}
+
+static struct stats {
+	int get_next, set_next, compare;
+} stats;
+
+struct number {
+	int value, rank;
+	struct number *next;
+};
+
+static void *get_next_number(const void *a)
+{
+	stats.get_next++;
+	return ((const struct number *)a)->next;
+}
+
+static void set_next_number(void *a, void *b)
+{
+	stats.set_next++;
+	((struct number *)a)->next = b;
+}
+
+static int compare_numbers(const void *av, const void *bv)
+{
+	const struct number *an = av, *bn = bv;
+	int a = an->value, b = bn->value;
+	stats.compare++;
+	return (a > b) - (a < b);
+}
+
+static void clear_numbers(struct number *list)
+{
+	while (list) {
+		struct number *next = list->next;
+		free(list);
+		list = next;
+	}
+}
+
+static int test(const struct dist *dist, const struct mode *mode, int n, int m)
+{
+	int *arr;
+	size_t i;
+	struct number *curr, *list, **tail;
+	int is_sorted = 1;
+	int is_stable = 1;
+	const char *verdict;
+	int result = -1;
+
+	ALLOC_ARRAY(arr, n);
+	dist->fn(arr, n, m);
+	mode->fn(arr, n);
+	for (i = 0, tail = &list; i < n; i++) {
+		curr = xmalloc(sizeof(*curr));
+		curr->value = arr[i];
+		curr->rank = i;
+		*tail = curr;
+		tail = &curr->next;
+	}
+	*tail = NULL;
+
+	stats.get_next = stats.set_next = stats.compare = 0;
+	list = llist_mergesort(list, get_next_number, set_next_number,
+			       compare_numbers);
+
+	QSORT(arr, n, compare_ints);
+	for (i = 0, curr = list; i < n && curr; i++, curr = curr->next) {
+		if (arr[i] != curr->value)
+			is_sorted = 0;
+		if (curr->next && curr->value == curr->next->value &&
+		    curr->rank >= curr->next->rank)
+			is_stable = 0;
+	}
+	if (i < n) {
+		verdict = "too short";
+	} else if (curr) {
+		verdict = "too long";
+	} else if (!is_sorted) {
+		verdict = "not sorted";
+	} else if (!is_stable) {
+		verdict = "unstable";
+	} else {
+		verdict = "OK";
+		result = 0;
+	}
+
+	printf("%-9s %-16s %8d %8d %8d %8d %8d %s\n",
+	       dist->name, mode->name, n, m, stats.get_next, stats.set_next,
+	       stats.compare, verdict);
+
+	clear_numbers(list);
+	free(arr);
+
+	return result;
+}
+
+/*
+ * A version of the qsort certification program from "Engineering a Sort
+ * Function" by Bentley and McIlroy, Software—Practice and Experience,
+ * Volume 23, Issue 11, 1249–1265 (November 1993).
+ */
+static int run_tests(int argc, const char **argv)
+{
+	const char *argv_default[] = { "100", "1023", "1024", "1025" };
+	if (!argc)
+		return run_tests(ARRAY_SIZE(argv_default), argv_default);
+	printf("%-9s %-16s %8s %8s %8s %8s %8s %s\n",
+	       "distribut", "mode", "n", "m", "get_next", "set_next",
+	       "compare", "verdict");
+	while (argc--) {
+		int i, j, m, n = strtol(*argv++, NULL, 10);
+		for (i = 0; i < ARRAY_SIZE(dist); i++) {
+			for (j = 0; j < ARRAY_SIZE(mode); j++) {
+				for (m = 1; m < 2 * n; m *= 2) {
+					if (test(&dist[i], &mode[j], n, m))
+						return 1;
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+int cmd__mergesort(int argc, const char **argv)
+{
+	int i;
+	const char *sep;
+
+	if (argc == 6 && !strcmp(argv[1], "generate"))
+		return generate(argc - 2, argv + 2);
+	if (argc == 2 && !strcmp(argv[1], "sort"))
+		return sort_stdin();
+	if (argc > 1 && !strcmp(argv[1], "test"))
+		return run_tests(argc - 2, argv + 2);
+	fprintf(stderr, "usage: test-tool mergesort generate <distribution> <mode> <n> <m>\n");
+	fprintf(stderr, "   or: test-tool mergesort sort\n");
+	fprintf(stderr, "   or: test-tool mergesort test [<n>...]\n");
+	fprintf(stderr, "\n");
+	for (i = 0, sep = "distributions: "; i < ARRAY_SIZE(dist); i++, sep = ", ")
+		fprintf(stderr, "%s%s", sep, dist[i].name);
+	fprintf(stderr, "\n");
+	for (i = 0, sep = "modes: "; i < ARRAY_SIZE(mode); i++, sep = ", ")
+		fprintf(stderr, "%s%s", sep, mode[i].name);
+	fprintf(stderr, "\n");
+	return 129;
+}
diff --git a/t/helper/test-oid-array.c b/t/helper/test-oid-array.c
index b16cd0b11b..d1324d086a 100644
--- a/t/helper/test-oid-array.c
+++ b/t/helper/test-oid-array.c
@@ -35,5 +35,9 @@ int cmd__oid_array(int argc, const char **argv)
 		else
 			die("unknown command: %s", line.buf);
 	}
+
+	strbuf_release(&line);
+	oid_array_clear(&array);
+
 	return 0;
 }
diff --git a/t/helper/test-oidtree.c b/t/helper/test-oidtree.c
new file mode 100644
index 0000000000..d48a409f4e
--- /dev/null
+++ b/t/helper/test-oidtree.c
@@ -0,0 +1,52 @@
+#include "test-tool.h"
+#include "cache.h"
+#include "oidtree.h"
+
+static enum cb_next print_oid(const struct object_id *oid, void *data)
+{
+	puts(oid_to_hex(oid));
+	return CB_CONTINUE;
+}
+
+int cmd__oidtree(int argc, const char **argv)
+{
+	struct oidtree ot;
+	struct strbuf line = STRBUF_INIT;
+	int nongit_ok;
+	int algo = GIT_HASH_UNKNOWN;
+
+	oidtree_init(&ot);
+	setup_git_directory_gently(&nongit_ok);
+
+	while (strbuf_getline(&line, stdin) != EOF) {
+		const char *arg;
+		struct object_id oid;
+
+		if (skip_prefix(line.buf, "insert ", &arg)) {
+			if (get_oid_hex_any(arg, &oid) == GIT_HASH_UNKNOWN)
+				die("insert not a hexadecimal oid: %s", arg);
+			algo = oid.algo;
+			oidtree_insert(&ot, &oid);
+		} else if (skip_prefix(line.buf, "contains ", &arg)) {
+			if (get_oid_hex(arg, &oid))
+				die("contains not a hexadecimal oid: %s", arg);
+			printf("%d\n", oidtree_contains(&ot, &oid));
+		} else if (skip_prefix(line.buf, "each ", &arg)) {
+			char buf[GIT_MAX_HEXSZ + 1] = { '0' };
+			memset(&oid, 0, sizeof(oid));
+			memcpy(buf, arg, strlen(arg));
+			buf[hash_algos[algo].hexsz] = '\0';
+			get_oid_hex_any(buf, &oid);
+			oid.algo = algo;
+			oidtree_each(&ot, &oid, strlen(arg), print_oid, NULL);
+		} else if (!strcmp(line.buf, "clear")) {
+			oidtree_clear(&ot);
+		} else {
+			die("unknown command: %s", line.buf);
+		}
+	}
+
+	strbuf_release(&line);
+
+	return 0;
+}
diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index 2051ce57db..48d3cf6692 100644
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -14,7 +14,6 @@ static int dry_run = 0, quiet = 0;
 static char *string = NULL;
 static char *file = NULL;
 static int ambiguous;
-static struct string_list list = STRING_LIST_INIT_NODUP;
 
 static struct {
 	int called;
@@ -107,6 +106,8 @@ int cmd__parse_options(int argc, const char **argv)
 		NULL
 	};
 	struct string_list expect = STRING_LIST_INIT_NODUP;
+	struct string_list list = STRING_LIST_INIT_NODUP;
+
 	struct option options[] = {
 		OPT_BOOL(0, "yes", &boolean, "get a boolean"),
 		OPT_BOOL('D', "no-doubt", &boolean, "begins with 'no-'"),
@@ -134,7 +135,6 @@ int cmd__parse_options(int argc, const char **argv)
 		OPT_NOOP_NOARG(0, "obsolete"),
 		OPT_STRING_LIST(0, "list", &list, "str", "add str to list"),
 		OPT_GROUP("Magic arguments"),
-		OPT_ARGUMENT("quux", NULL, "means --quux"),
 		OPT_NUMBER_CALLBACK(&integer, "set integer to NUM",
 			number_callback),
 		{ OPTION_COUNTUP, '+', NULL, &boolean, NULL, "same as -b",
@@ -186,5 +186,9 @@ int cmd__parse_options(int argc, const char **argv)
 	for (i = 0; i < argc; i++)
 		show(&expect, &ret, "arg %02d: %s", i, argv[i]);
 
+	expect.strdup_strings = 1;
+	string_list_clear(&expect, 0);
+	string_list_clear(&list, 0);
+
 	return ret;
 }
diff --git a/t/helper/test-pkt-line.c b/t/helper/test-pkt-line.c
index 5e638f0b97..c5e052e537 100644
--- a/t/helper/test-pkt-line.c
+++ b/t/helper/test-pkt-line.c
@@ -26,6 +26,16 @@ static void pack(int argc, const char **argv)
 	}
 }
 
+static void pack_raw_stdin(void)
+{
+	struct strbuf sb = STRBUF_INIT;
+
+	if (strbuf_read(&sb, 0, 0) < 0)
+		die_errno("failed to read from stdin");
+	packet_write(1, sb.buf, sb.len);
+	strbuf_release(&sb);
+}
+
 static void unpack(void)
 {
 	struct packet_reader reader;
@@ -110,6 +120,8 @@ int cmd__pkt_line(int argc, const char **argv)
 
 	if (!strcmp(argv[1], "pack"))
 		pack(argc - 2, argv + 2);
+	else if (!strcmp(argv[1], "pack-raw-stdin"))
+		pack_raw_stdin();
 	else if (!strcmp(argv[1], "unpack"))
 		unpack();
 	else if (!strcmp(argv[1], "unpack-sideband"))
diff --git a/t/helper/test-prio-queue.c b/t/helper/test-prio-queue.c
index f4028442e3..133b5e6f4a 100644
--- a/t/helper/test-prio-queue.c
+++ b/t/helper/test-prio-queue.c
@@ -46,5 +46,7 @@ int cmd__prio_queue(int argc, const char **argv)
 		}
 	}
 
+	clear_prio_queue(&pq);
+
 	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 7c2eb11a8e..27072ba94d 100644
--- a/t/helper/test-read-midx.c
+++ b/t/helper/test-read-midx.c
@@ -3,6 +3,7 @@
 #include "midx.h"
 #include "repository.h"
 #include "object-store.h"
+#include "pack-bitmap.h"
 
 static int read_midx_file(const char *object_dir, int show_objects)
 {
@@ -54,18 +55,59 @@ 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;
+}
+
+static int read_midx_checksum(const char *object_dir)
+{
+	struct multi_pack_index *m;
+
+	setup_git_directory();
+	m = load_multi_pack_index(object_dir, 1);
+	if (!m)
+		return 1;
+	printf("%s\n", hash_to_hex(get_midx_checksum(m)));
+	return 0;
+}
+
+static int read_midx_preferred_pack(const char *object_dir)
+{
+	struct multi_pack_index *midx = NULL;
+	struct bitmap_index *bitmap = NULL;
+
+	setup_git_directory();
+
+	midx = load_multi_pack_index(object_dir, 1);
+	if (!midx)
+		return 1;
+
+	bitmap = prepare_bitmap_git(the_repository);
+	if (!bitmap)
+		return 1;
+	if (!bitmap_is_midx(bitmap)) {
+		free_bitmap_index(bitmap);
+		return 1;
+	}
+
+	printf("%s\n", midx->pack_names[midx_preferred_pack(bitmap)]);
+	free_bitmap_index(bitmap);
 	return 0;
 }
 
 int cmd__read_midx(int argc, const char **argv)
 {
 	if (!(argc == 2 || argc == 3))
-		usage("read-midx [--show-objects] <object-dir>");
+		usage("read-midx [--show-objects|--checksum|--preferred-pack] <object-dir>");
 
 	if (!strcmp(argv[1], "--show-objects"))
 		return read_midx_file(argv[2], 1);
+	else if (!strcmp(argv[1], "--checksum"))
+		return read_midx_checksum(argv[2]);
+	else if (!strcmp(argv[1], "--preferred-pack"))
+		return read_midx_preferred_pack(argv[2]);
 	return read_midx_file(argv[1], 0);
 }
diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c
index b314b81a45..9646d85fc8 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,7 +177,7 @@ 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;
 
@@ -151,9 +208,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 +238,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 +264,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 +279,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..1f0a28cbb6
--- /dev/null
+++ b/t/helper/test-reftable.c
@@ -0,0 +1,22 @@
+#include "reftable/reftable-tests.h"
+#include "test-tool.h"
+
+int cmd__reftable(int argc, const char **argv)
+{
+	/* test from simple to complex. */
+	basics_test_main(argc, argv);
+	record_test_main(argc, argv);
+	block_test_main(argc, argv);
+	tree_test_main(argc, argv);
+	pq_test_main(argc, argv);
+	readwrite_test_main(argc, argv);
+	merged_test_main(argc, argv);
+	stack_test_main(argc, argv);
+	refname_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 7ae03dc712..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;
@@ -60,8 +60,10 @@ struct testsuite {
 	int next;
 	int quiet, immediate, verbose, verbose_log, trace, write_junit_xml;
 };
-#define TESTSUITE_INIT \
-	{ STRING_LIST_INIT_DUP, STRING_LIST_INIT_DUP, -1, 0, 0, 0, 0, 0, 0 }
+#define TESTSUITE_INIT { \
+	.tests = STRING_LIST_INIT_DUP, \
+	.failed = STRING_LIST_INIT_DUP, \
+}
 
 static int next_test(struct child_process *cp, struct strbuf *err, void *cb,
 		     void **task_cb)
@@ -142,9 +144,6 @@ static int testsuite(int argc, const char **argv)
 		OPT_END()
 	};
 
-	memset(&suite, 0, sizeof(suite));
-	suite.tests.strdup_strings = suite.failed.strdup_strings = 1;
-
 	argc = parse_options(argc, argv, NULL, options,
 			testsuite_usage, PARSE_OPT_STOP_AT_NON_OPTION);
 
@@ -275,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");
@@ -397,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)
@@ -409,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-serve-v2.c b/t/helper/test-serve-v2.c
index aee35e5aef..28e905afc3 100644
--- a/t/helper/test-serve-v2.c
+++ b/t/helper/test-serve-v2.c
@@ -10,12 +10,12 @@ static char const * const serve_usage[] = {
 
 int cmd__serve_v2(int argc, const char **argv)
 {
-	struct serve_options opts = SERVE_OPTIONS_INIT;
-
+	int stateless_rpc = 0;
+	int advertise_capabilities = 0;
 	struct option options[] = {
-		OPT_BOOL(0, "stateless-rpc", &opts.stateless_rpc,
+		OPT_BOOL(0, "stateless-rpc", &stateless_rpc,
 			 N_("quit after a single request/response exchange")),
-		OPT_BOOL(0, "advertise-capabilities", &opts.advertise_capabilities,
+		OPT_BOOL(0, "advertise-capabilities", &advertise_capabilities,
 			 N_("exit immediately after advertising capabilities")),
 		OPT_END()
 	};
@@ -25,7 +25,11 @@ int cmd__serve_v2(int argc, const char **argv)
 	argc = parse_options(argc, argv, prefix, options, serve_usage,
 			     PARSE_OPT_KEEP_DASHDASH |
 			     PARSE_OPT_KEEP_UNKNOWN);
-	serve(&opts);
+
+	if (advertise_capabilities)
+		protocol_v2_advertise_capabilities();
+	else
+		protocol_v2_serve_loop(stateless_rpc);
 
 	return 0;
 }
diff --git a/t/helper/test-simple-ipc.c b/t/helper/test-simple-ipc.c
index 42040ef81b..28365ff85b 100644
--- a/t/helper/test-simple-ipc.c
+++ b/t/helper/test-simple-ipc.c
@@ -9,6 +9,7 @@
 #include "parse-options.h"
 #include "thread-utils.h"
 #include "strvec.h"
+#include "run-command.h"
 
 #ifndef SUPPORTS_SIMPLE_IPC
 int cmd__simple_ipc(int argc, const char **argv)
@@ -112,7 +113,7 @@ static int app__slow_command(ipc_server_reply_cb *reply_cb,
 /*
  * The client sent a command followed by a (possibly very) large buffer.
  */
-static int app__sendbytes_command(const char *received,
+static int app__sendbytes_command(const char *received, size_t received_len,
 				  ipc_server_reply_cb *reply_cb,
 				  struct ipc_server_reply_data *reply_data)
 {
@@ -123,6 +124,13 @@ static int app__sendbytes_command(const char *received,
 	int errs = 0;
 	int ret;
 
+	/*
+	 * The test is setup to send:
+	 *     "sendbytes" SP <n * char>
+	 */
+	if (received_len < strlen("sendbytes "))
+		BUG("received_len is short in app__sendbytes_command");
+
 	if (skip_prefix(received, "sendbytes ", &p))
 		len_ballast = strlen(p);
 
@@ -160,7 +168,7 @@ static ipc_server_application_cb test_app_cb;
  * by this application.
  */
 static int test_app_cb(void *application_data,
-		       const char *command,
+		       const char *command, size_t command_len,
 		       ipc_server_reply_cb *reply_cb,
 		       struct ipc_server_reply_data *reply_data)
 {
@@ -173,7 +181,7 @@ static int test_app_cb(void *application_data,
 	if (application_data != (void*)&my_app_data)
 		BUG("application_cb: application_data pointer wrong");
 
-	if (!strcmp(command, "quit")) {
+	if (command_len == 4 && !strncmp(command, "quit", 4)) {
 		/*
 		 * The client sent a "quit" command.  This is an async
 		 * request for the server to shutdown.
@@ -193,22 +201,23 @@ static int test_app_cb(void *application_data,
 		return SIMPLE_IPC_QUIT;
 	}
 
-	if (!strcmp(command, "ping")) {
+	if (command_len == 4 && !strncmp(command, "ping", 4)) {
 		const char *answer = "pong";
 		return reply_cb(reply_data, answer, strlen(answer));
 	}
 
-	if (!strcmp(command, "big"))
+	if (command_len == 3 && !strncmp(command, "big", 3))
 		return app__big_command(reply_cb, reply_data);
 
-	if (!strcmp(command, "chunk"))
+	if (command_len == 5 && !strncmp(command, "chunk", 5))
 		return app__chunk_command(reply_cb, reply_data);
 
-	if (!strcmp(command, "slow"))
+	if (command_len == 4 && !strncmp(command, "slow", 4))
 		return app__slow_command(reply_cb, reply_data);
 
-	if (starts_with(command, "sendbytes "))
-		return app__sendbytes_command(command, reply_cb, reply_data);
+	if (command_len >= 10 && starts_with(command, "sendbytes "))
+		return app__sendbytes_command(command, command_len,
+					      reply_cb, reply_data);
 
 	return app__unhandled_command(command, reply_cb, reply_data);
 }
@@ -259,186 +268,72 @@ static int daemon__run_server(void)
 	 */
 	ret = ipc_server_run(cl_args.path, &opts, test_app_cb, (void*)&my_app_data);
 	if (ret == -2)
-		error(_("socket/pipe already in use: '%s'"), cl_args.path);
+		error("socket/pipe already in use: '%s'", cl_args.path);
 	else if (ret == -1)
-		error_errno(_("could not start server on: '%s'"), cl_args.path);
+		error_errno("could not start server on: '%s'", cl_args.path);
 
 	return ret;
 }
 
-#ifndef GIT_WINDOWS_NATIVE
-/*
- * This is adapted from `daemonize()`.  Use `fork()` to directly create and
- * run the daemon in a child process.
- */
-static int spawn_server(pid_t *pid)
-{
-	struct ipc_server_opts opts = {
-		.nr_threads = cl_args.nr_threads,
-	};
-
-	*pid = fork();
+static start_bg_wait_cb bg_wait_cb;
 
-	switch (*pid) {
-	case 0:
-		if (setsid() == -1)
-			error_errno(_("setsid failed"));
-		close(0);
-		close(1);
-		close(2);
-		sanitize_stdfds();
+static int bg_wait_cb(const struct child_process *cp, void *cb_data)
+{
+	int s = ipc_get_active_state(cl_args.path);
 
-		return ipc_server_run(cl_args.path, &opts, test_app_cb,
-				      (void*)&my_app_data);
+	switch (s) {
+	case IPC_STATE__LISTENING:
+		/* child is "ready" */
+		return 0;
 
-	case -1:
-		return error_errno(_("could not spawn daemon in the background"));
+	case IPC_STATE__NOT_LISTENING:
+	case IPC_STATE__PATH_NOT_FOUND:
+		/* give child more time */
+		return 1;
 
 	default:
-		return 0;
+	case IPC_STATE__INVALID_PATH:
+	case IPC_STATE__OTHER_ERROR:
+		/* all the time in world won't help */
+		return -1;
 	}
 }
-#else
-/*
- * Conceptually like `daemonize()` but different because Windows does not
- * have `fork(2)`.  Spawn a normal Windows child process but without the
- * limitations of `start_command()` and `finish_command()`.
- */
-static int spawn_server(pid_t *pid)
-{
-	char test_tool_exe[MAX_PATH];
-	struct strvec args = STRVEC_INIT;
-	int in, out;
-
-	GetModuleFileNameA(NULL, test_tool_exe, MAX_PATH);
-
-	in = open("/dev/null", O_RDONLY);
-	out = open("/dev/null", O_WRONLY);
-
-	strvec_push(&args, test_tool_exe);
-	strvec_push(&args, "simple-ipc");
-	strvec_push(&args, "run-daemon");
-	strvec_pushf(&args, "--name=%s", cl_args.path);
-	strvec_pushf(&args, "--threads=%d", cl_args.nr_threads);
 
-	*pid = mingw_spawnvpe(args.v[0], args.v, NULL, NULL, in, out, out);
-	close(in);
-	close(out);
-
-	strvec_clear(&args);
-
-	if (*pid < 0)
-		return error(_("could not spawn daemon in the background"));
-
-	return 0;
-}
-#endif
-
-/*
- * This is adapted from `wait_or_whine()`.  Watch the child process and
- * let it get started and begin listening for requests on the socket
- * before reporting our success.
- */
-static int wait_for_server_startup(pid_t pid_child)
+static int daemon__start_server(void)
 {
-	int status;
-	pid_t pid_seen;
-	enum ipc_active_state s;
-	time_t time_limit, now;
+	struct child_process cp = CHILD_PROCESS_INIT;
+	enum start_bg_result sbgr;
 
-	time(&time_limit);
-	time_limit += cl_args.max_wait_sec;
+	strvec_push(&cp.args, "test-tool");
+	strvec_push(&cp.args, "simple-ipc");
+	strvec_push(&cp.args, "run-daemon");
+	strvec_pushf(&cp.args, "--name=%s", cl_args.path);
+	strvec_pushf(&cp.args, "--threads=%d", cl_args.nr_threads);
 
-	for (;;) {
-		pid_seen = waitpid(pid_child, &status, WNOHANG);
-
-		if (pid_seen == -1)
-			return error_errno(_("waitpid failed"));
-
-		else if (pid_seen == 0) {
-			/*
-			 * The child is still running (this should be
-			 * the normal case).  Try to connect to it on
-			 * the socket and see if it is ready for
-			 * business.
-			 *
-			 * If there is another daemon already running,
-			 * our child will fail to start (possibly
-			 * after a timeout on the lock), but we don't
-			 * care (who responds) if the socket is live.
-			 */
-			s = ipc_get_active_state(cl_args.path);
-			if (s == IPC_STATE__LISTENING)
-				return 0;
+	cp.no_stdin = 1;
+	cp.no_stdout = 1;
+	cp.no_stderr = 1;
 
-			time(&now);
-			if (now > time_limit)
-				return error(_("daemon not online yet"));
+	sbgr = start_bg_command(&cp, bg_wait_cb, NULL, cl_args.max_wait_sec);
 
-			continue;
-		}
+	switch (sbgr) {
+	case SBGR_READY:
+		return 0;
 
-		else if (pid_seen == pid_child) {
-			/*
-			 * The new child daemon process shutdown while
-			 * it was starting up, so it is not listening
-			 * on the socket.
-			 *
-			 * Try to ping the socket in the odd chance
-			 * that another daemon started (or was already
-			 * running) while our child was starting.
-			 *
-			 * Again, we don't care who services the socket.
-			 */
-			s = ipc_get_active_state(cl_args.path);
-			if (s == IPC_STATE__LISTENING)
-				return 0;
+	default:
+	case SBGR_ERROR:
+	case SBGR_CB_ERROR:
+		return error("daemon failed to start");
 
-			/*
-			 * We don't care about the WEXITSTATUS() nor
-			 * any of the WIF*(status) values because
-			 * `cmd__simple_ipc()` does the `!!result`
-			 * trick on all function return values.
-			 *
-			 * So it is sufficient to just report the
-			 * early shutdown as an error.
-			 */
-			return error(_("daemon failed to start"));
-		}
+	case SBGR_TIMEOUT:
+		return error("daemon not online yet");
 
-		else
-			return error(_("waitpid is confused"));
+	case SBGR_DIED:
+		return error("daemon terminated");
 	}
 }
 
 /*
- * This process will start a simple-ipc server in a background process and
- * wait for it to become ready.  This is like `daemonize()` but gives us
- * more control and better error reporting (and makes it easier to write
- * unit tests).
- */
-static int daemon__start_server(void)
-{
-	pid_t pid_child;
-	int ret;
-
-	/*
-	 * Run the actual daemon in a background process.
-	 */
-	ret = spawn_server(&pid_child);
-	if (pid_child <= 0)
-		return ret;
-
-	/*
-	 * Let the parent wait for the child process to get started
-	 * and begin listening for requests on the socket.
-	 */
-	ret = wait_for_server_startup(pid_child);
-
-	return ret;
-}
-
-/*
  * This process will run a quick probe to see if a simple-ipc server
  * is active on this path.
  *
@@ -488,7 +383,9 @@ static int client__send_ipc(void)
 	options.wait_if_busy = 1;
 	options.wait_if_not_found = 0;
 
-	if (!ipc_client_send_command(cl_args.path, &options, command, &buf)) {
+	if (!ipc_client_send_command(cl_args.path, &options,
+				     command, strlen(command),
+				     &buf)) {
 		if (buf.len) {
 			printf("%s\n", buf.buf);
 			fflush(stdout);
@@ -538,7 +435,7 @@ static int client__stop_server(void)
 
 		time(&now);
 		if (now > time_limit)
-			return error(_("daemon has not shutdown yet"));
+			return error("daemon has not shutdown yet");
 	}
 }
 
@@ -556,7 +453,9 @@ static int do_sendbytes(int bytecount, char byte, const char *path,
 	strbuf_addstr(&buf_send, "sendbytes ");
 	strbuf_addchars(&buf_send, byte, bytecount);
 
-	if (!ipc_client_send_command(path, options, buf_send.buf, &buf_resp)) {
+	if (!ipc_client_send_command(path, options,
+				     buf_send.buf, buf_send.len,
+				     &buf_resp)) {
 		strbuf_rtrim(&buf_resp);
 		printf("sent:%c%08d %s\n", byte, bytecount, buf_resp.buf);
 		fflush(stdout);
diff --git a/t/helper/test-submodule-nested-repo-config.c b/t/helper/test-submodule-nested-repo-config.c
index e3f11ff5a7..dc1c14bde3 100644
--- a/t/helper/test-submodule-nested-repo-config.c
+++ b/t/helper/test-submodule-nested-repo-config.c
@@ -11,15 +11,13 @@ static void die_usage(const char **argv, const char *msg)
 int cmd__submodule_nested_repo_config(int argc, const char **argv)
 {
 	struct repository subrepo;
-	const struct submodule *sub;
 
 	if (argc < 3)
 		die_usage(argv, "Wrong number of arguments.");
 
 	setup_git_directory();
 
-	sub = submodule_from_path(the_repository, null_oid(), argv[1]);
-	if (repo_submodule_init(&subrepo, the_repository, sub)) {
+	if (repo_submodule_init(&subrepo, the_repository, argv[1], null_oid())) {
 		die_usage(argv, "Submodule not found.");
 	}
 
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 b21e8f1519..e6ec69cf32 100644
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -20,6 +20,7 @@ static struct test_cmd cmds[] = {
 	{ "chmtime", cmd__chmtime },
 	{ "config", cmd__config },
 	{ "crontab", cmd__crontab },
+	{ "csprng", cmd__csprng },
 	{ "ctype", cmd__ctype },
 	{ "date", cmd__date },
 	{ "delta", cmd__delta },
@@ -33,6 +34,7 @@ static struct test_cmd cmds[] = {
 	{ "fast-rebase", cmd__fast_rebase },
 	{ "genrandom", cmd__genrandom },
 	{ "genzeros", cmd__genzeros },
+	{ "getcwd", cmd__getcwd },
 	{ "hashmap", cmd__hashmap },
 	{ "hash-speed", cmd__hash_speed },
 	{ "index-version", cmd__index_version },
@@ -43,6 +45,7 @@ static struct test_cmd cmds[] = {
 	{ "mktemp", cmd__mktemp },
 	{ "oid-array", cmd__oid_array },
 	{ "oidmap", cmd__oidmap },
+	{ "oidtree", cmd__oidtree },
 	{ "online-cpus", cmd__online_cpus },
 	{ "parse-options", cmd__parse_options },
 	{ "parse-pathspec-file", cmd__parse_pathspec_file },
@@ -51,13 +54,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 f845ced4b3..20756eefdd 100644
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -10,6 +10,7 @@ int cmd__bloom(int argc, const char **argv);
 int cmd__chmtime(int argc, const char **argv);
 int cmd__config(int argc, const char **argv);
 int cmd__crontab(int argc, const char **argv);
+int cmd__csprng(int argc, const char **argv);
 int cmd__ctype(int argc, const char **argv);
 int cmd__date(int argc, const char **argv);
 int cmd__delta(int argc, const char **argv);
@@ -19,10 +20,12 @@ 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);
 int cmd__genzeros(int argc, const char **argv);
+int cmd__getcwd(int argc, const char **argv);
 int cmd__hashmap(int argc, const char **argv);
 int cmd__hash_speed(int argc, const char **argv);
 int cmd__index_version(int argc, const char **argv);
@@ -32,6 +35,7 @@ int cmd__match_trees(int argc, const char **argv);
 int cmd__mergesort(int argc, const char **argv);
 int cmd__mktemp(int argc, const char **argv);
 int cmd__oidmap(int argc, const char **argv);
+int cmd__oidtree(int argc, const char **argv);
 int cmd__online_cpus(int argc, const char **argv);
 int cmd__parse_options(int argc, const char **argv);
 int cmd__parse_pathspec_file(int argc, const char** argv);
@@ -47,6 +51,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-bitmap.sh b/t/lib-bitmap.sh
index fe3f98be24..a95537e759 100644
--- a/t/lib-bitmap.sh
+++ b/t/lib-bitmap.sh
@@ -1,3 +1,9 @@
+# Helpers for scripts testing bitmap functionality; see t5310 for
+# example usage.
+
+objdir=.git/objects
+midx=$objdir/pack/multi-pack-index
+
 # Compare a file containing rev-list bitmap traversal output to its non-bitmap
 # counterpart. You can't just use test_cmp for this, because the two produce
 # subtly different output:
@@ -24,3 +30,422 @@ test_bitmap_traversal () {
 	test_cmp "$1.normalized" "$2.normalized" &&
 	rm -f "$1.normalized" "$2.normalized"
 }
+
+# To ensure the logic for "maximal commits" is exercised, make
+# the repository a bit more complicated.
+#
+#    other                         second
+#      *                             *
+# (99 commits)                  (99 commits)
+#      *                             *
+#      |\                           /|
+#      | * octo-other  octo-second * |
+#      |/|\_________  ____________/|\|
+#      | \          \/  __________/  |
+#      |  | ________/\ /             |
+#      *  |/          * merge-right  *
+#      | _|__________/ \____________ |
+#      |/ |                         \|
+# (l1) *  * merge-left               * (r1)
+#      | / \________________________ |
+#      |/                           \|
+# (l2) *                             * (r2)
+#       \___________________________ |
+#                                   \|
+#                                    * (base)
+#
+# We only push bits down the first-parent history, which
+# makes some of these commits unimportant!
+#
+# The important part for the maximal commit algorithm is how
+# the bitmasks are extended. Assuming starting bit positions
+# for second (bit 0) and other (bit 1), the bitmasks at the
+# end should be:
+#
+#      second: 1       (maximal, selected)
+#       other: 01      (maximal, selected)
+#      (base): 11 (maximal)
+#
+# This complicated history was important for a previous
+# version of the walk that guarantees never walking a
+# commit multiple times. That goal might be important
+# again, so preserve this complicated case. For now, this
+# test will guarantee that the bitmaps are computed
+# correctly, even with the repeat calculations.
+setup_bitmap_history() {
+	test_expect_success 'setup repo with moderate-sized history' '
+		test_commit_bulk --id=file 10 &&
+		git branch -M second &&
+		git checkout -b other HEAD~5 &&
+		test_commit_bulk --id=side 10 &&
+
+		# add complicated history setup, including merges and
+		# ambiguous merge-bases
+
+		git checkout -b merge-left other~2 &&
+		git merge second~2 -m "merge-left" &&
+
+		git checkout -b merge-right second~1 &&
+		git merge other~1 -m "merge-right" &&
+
+		git checkout -b octo-second second &&
+		git merge merge-left merge-right -m "octopus-second" &&
+
+		git checkout -b octo-other other &&
+		git merge merge-left merge-right -m "octopus-other" &&
+
+		git checkout other &&
+		git merge octo-other -m "pull octopus" &&
+
+		git checkout second &&
+		git merge octo-second -m "pull octopus" &&
+
+		# Remove these branches so they are not selected
+		# as bitmap tips
+		git branch -D merge-left &&
+		git branch -D merge-right &&
+		git branch -D octo-other &&
+		git branch -D octo-second &&
+
+		# add padding to make these merges less interesting
+		# and avoid having them selected for bitmaps
+		test_commit_bulk --id=file 100 &&
+		git checkout other &&
+		test_commit_bulk --id=side 100 &&
+		git checkout second &&
+
+		bitmaptip=$(git rev-parse second) &&
+		blob=$(echo tagged-blob | git hash-object -w --stdin) &&
+		git tag tagged-blob $blob
+	'
+}
+
+rev_list_tests_head () {
+	test_expect_success "counting commits via bitmap ($state, $branch)" '
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	'
+
+	test_expect_success "counting partial commits via bitmap ($state, $branch)" '
+		git rev-list --count $branch~5..$branch >expect &&
+		git rev-list --use-bitmap-index --count $branch~5..$branch >actual &&
+		test_cmp expect actual
+	'
+
+	test_expect_success "counting commits with limit ($state, $branch)" '
+		git rev-list --count -n 1 $branch >expect &&
+		git rev-list --use-bitmap-index --count -n 1 $branch >actual &&
+		test_cmp expect actual
+	'
+
+	test_expect_success "counting non-linear history ($state, $branch)" '
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	'
+
+	test_expect_success "counting commits with limiting ($state, $branch)" '
+		git rev-list --count $branch -- 1.t >expect &&
+		git rev-list --use-bitmap-index --count $branch -- 1.t >actual &&
+		test_cmp expect actual
+	'
+
+	test_expect_success "counting objects via bitmap ($state, $branch)" '
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	'
+
+	test_expect_success "enumerate commits ($state, $branch)" '
+		git rev-list --use-bitmap-index $branch >actual &&
+		git rev-list $branch >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	'
+
+	test_expect_success "enumerate --objects ($state, $branch)" '
+		git rev-list --objects --use-bitmap-index $branch >actual &&
+		git rev-list --objects $branch >expect &&
+		test_bitmap_traversal expect actual
+	'
+
+	test_expect_success "bitmap --objects handles non-commit objects ($state, $branch)" '
+		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+		grep $blob actual
+	'
+}
+
+rev_list_tests () {
+	state=$1
+
+	for branch in "second" "other"
+	do
+		rev_list_tests_head
+	done
+}
+
+basic_bitmap_tests () {
+	tip="$1"
+	test_expect_success 'rev-list --test-bitmap verifies bitmaps' "
+		git rev-list --test-bitmap "${tip:-HEAD}"
+	"
+
+	rev_list_tests 'full bitmap'
+
+	test_expect_success 'clone from bitmapped repository' '
+		rm -fr clone.git &&
+		git clone --no-local --bare . clone.git &&
+		git rev-parse HEAD >expect &&
+		git --git-dir=clone.git rev-parse HEAD >actual &&
+		test_cmp expect actual
+	'
+
+	test_expect_success 'partial clone from bitmapped repository' '
+		test_config uploadpack.allowfilter true &&
+		rm -fr partial-clone.git &&
+		git clone --no-local --bare --filter=blob:none . partial-clone.git &&
+		(
+			cd partial-clone.git &&
+			pack=$(echo objects/pack/*.pack) &&
+			git verify-pack -v "$pack" >have &&
+			awk "/blob/ { print \$1 }" <have >blobs &&
+			# we expect this single blob because of the direct ref
+			git rev-parse refs/tags/tagged-blob >expect &&
+			test_cmp expect blobs
+		)
+	'
+
+	test_expect_success 'setup further non-bitmapped commits' '
+		test_commit_bulk --id=further 10
+	'
+
+	rev_list_tests 'partial bitmap'
+
+	test_expect_success 'fetch (partial bitmap)' '
+		git --git-dir=clone.git fetch origin second:second &&
+		git rev-parse HEAD >expect &&
+		git --git-dir=clone.git rev-parse HEAD >actual &&
+		test_cmp expect actual
+	'
+
+	test_expect_success 'enumerating progress counts pack-reused objects' '
+		count=$(git rev-list --objects --all --count) &&
+		git repack -adb &&
+
+		# check first with only reused objects; confirm that our
+		# progress showed the right number, and also that we did
+		# pack-reuse as expected.  Check only the final "done"
+		# line of the meter (there may be an arbitrary number of
+		# intermediate lines ending with CR).
+		GIT_PROGRESS_DELAY=0 \
+			git pack-objects --all --stdout --progress \
+			</dev/null >/dev/null 2>stderr &&
+		grep "Enumerating objects: $count, done" stderr &&
+		grep "pack-reused $count" stderr &&
+
+		# now the same but with one non-reused object
+		git commit --allow-empty -m "an extra commit object" &&
+		GIT_PROGRESS_DELAY=0 \
+			git pack-objects --all --stdout --progress \
+			</dev/null >/dev/null 2>stderr &&
+		grep "Enumerating objects: $((count+1)), done" stderr &&
+		grep "pack-reused $count" stderr
+	'
+}
+
+# have_delta <obj> <expected_base>
+#
+# Note that because this relies on cat-file, it might find _any_ copy of an
+# object in the repository. The caller is responsible for making sure
+# there's only one (e.g., via "repack -ad", or having just fetched a copy).
+have_delta () {
+	echo $2 >expect &&
+	echo $1 | git cat-file --batch-check="%(deltabase)" >actual &&
+	test_cmp expect actual
+}
+
+midx_checksum () {
+	test-tool read-midx --checksum "$1"
+}
+
+# midx_pack_source <obj>
+midx_pack_source () {
+	test-tool read-midx --show-objects .git/objects | grep "^$1 " | cut -f2
+}
+
+test_rev_exists () {
+	commit="$1"
+	kind="$2"
+
+	test_expect_success "reverse index exists ($kind)" '
+		GIT_TRACE2_EVENT=$(pwd)/event.trace \
+			git rev-list --test-bitmap "$commit" &&
+
+		if test "rev" = "$kind"
+		then
+			test_path_is_file $midx-$(midx_checksum $objdir).rev
+		fi &&
+		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
+	'
+}
+
+midx_bitmap_core () {
+	rev_kind="${1:-midx}"
+
+	setup_bitmap_history
+
+	test_expect_success 'create single-pack midx with bitmaps' '
+		git repack -ad &&
+		git multi-pack-index write --bitmap &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
+	'
+
+	test_rev_exists HEAD "$rev_kind"
+
+	basic_bitmap_tests
+
+	test_expect_success 'create new additional packs' '
+		for i in $(test_seq 1 16)
+		do
+			test_commit "$i" &&
+			git repack -d || return 1
+		done &&
+
+		git checkout -b other2 HEAD~8 &&
+		for i in $(test_seq 1 8)
+		do
+			test_commit "side-$i" &&
+			git repack -d || return 1
+		done &&
+		git checkout second
+	'
+
+	test_expect_success 'create multi-pack midx with bitmaps' '
+		git multi-pack-index write --bitmap &&
+
+		ls $objdir/pack/pack-*.pack >packs &&
+		test_line_count = 25 packs &&
+
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
+	'
+
+	test_rev_exists HEAD "$rev_kind"
+
+	basic_bitmap_tests
+
+	test_expect_success '--no-bitmap is respected when bitmaps exist' '
+		git multi-pack-index write --bitmap &&
+
+		test_commit respect--no-bitmap &&
+		git repack -d &&
+
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+		git multi-pack-index write --no-bitmap &&
+
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-$(midx_checksum $objdir).bitmap &&
+		test_path_is_missing $midx-$(midx_checksum $objdir).rev
+	'
+
+	test_expect_success 'setup midx with base from later pack' '
+		# Write a and b so that "a" is a delta on top of base "b", since Git
+		# prefers to delete contents out of a base rather than add to a shorter
+		# object.
+		test_seq 1 128 >a &&
+		test_seq 1 130 >b &&
+
+		git add a b &&
+		git commit -m "initial commit" &&
+
+		a=$(git rev-parse HEAD:a) &&
+		b=$(git rev-parse HEAD:b) &&
+
+		# In the first pack, "a" is stored as a delta to "b".
+		p1=$(git pack-objects .git/objects/pack/pack <<-EOF
+		$a
+		$b
+		EOF
+		) &&
+
+		# In the second pack, "a" is missing, and "b" is not a delta nor base to
+		# any other object.
+		p2=$(git pack-objects .git/objects/pack/pack <<-EOF
+		$b
+		$(git rev-parse HEAD)
+		$(git rev-parse HEAD^{tree})
+		EOF
+		) &&
+
+		git prune-packed &&
+		# Use the second pack as the preferred source, so that "b" occurs
+		# earlier in the MIDX object order, rendering "a" unusable for pack
+		# reuse.
+		git multi-pack-index write --bitmap --preferred-pack=pack-$p2.idx &&
+
+		have_delta $a $b &&
+		test $(midx_pack_source $a) != $(midx_pack_source $b)
+	'
+
+	rev_list_tests 'full bitmap with backwards delta'
+
+	test_expect_success 'clone with bitmaps enabled' '
+		git clone --no-local --bare . clone-reverse-delta.git &&
+		test_when_finished "rm -fr clone-reverse-delta.git" &&
+
+		git rev-parse HEAD >expect &&
+		git --git-dir=clone-reverse-delta.git rev-parse HEAD >actual &&
+		test_cmp expect actual
+	'
+
+	test_expect_success 'changing the preferred pack does not corrupt bitmaps' '
+		rm -fr repo &&
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+
+			test_commit A &&
+			test_commit B &&
+
+			git rev-list --objects --no-object-names HEAD^ >A.objects &&
+			git rev-list --objects --no-object-names HEAD^.. >B.objects &&
+
+			A=$(git pack-objects $objdir/pack/pack <A.objects) &&
+			B=$(git pack-objects $objdir/pack/pack <B.objects) &&
+
+			cat >indexes <<-EOF &&
+			pack-$A.idx
+			pack-$B.idx
+			EOF
+
+			git multi-pack-index write --bitmap --stdin-packs \
+				--preferred-pack=pack-$A.pack <indexes &&
+			git rev-list --test-bitmap A &&
+
+			git multi-pack-index write --bitmap --stdin-packs \
+				--preferred-pack=pack-$B.pack <indexes &&
+			git rev-list --test-bitmap A
+		)
+	'
+}
+
+midx_bitmap_partial_tests () {
+	rev_kind="${1:-midx}"
+
+	test_expect_success 'setup partial bitmaps' '
+		test_commit packed &&
+		git repack &&
+		test_commit loose &&
+		git multi-pack-index write --bitmap 2>err &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
+	'
+
+	test_rev_exists HEAD~ "$rev_kind"
+
+	basic_bitmap_tests HEAD~
+}
diff --git a/t/lib-diff-data.sh b/t/lib-diff-data.sh
new file mode 100644
index 0000000000..c64ec18324
--- /dev/null
+++ b/t/lib-diff-data.sh
@@ -0,0 +1,22 @@
+COPYING_test_data () {
+	cat <<\EOF
+
+ Note that the only valid version of the GPL as far as this project
+ is concerned is _this_ particular version of the license (ie v2, not
+ v2.2 or v3.x or whatever), unless explicitly otherwise stated.
+
+ HOWEVER, in order to allow a migration to GPLv3 if that seems like
+ a good idea, I also ask that people involved with the project make
+ their preferences known. In particular, if you trust me to make that
+ decision, you might note so in your copyright message, ie something
+ like
+
+	This file is licensed under the GPL v2, or a later version
+	at the discretion of Linus.
+
+  might avoid issues. But we can also just decide to synchronize and
+  contact all copyright holders on record if/when the occasion arises.
+
+			Linus Torvalds
+EOF
+}
diff --git a/t/lib-diff.sh b/t/lib-diff.sh
index 2de880f7a5..c4606bd4b7 100644
--- a/t/lib-diff.sh
+++ b/t/lib-diff.sh
@@ -1,3 +1,5 @@
+. "$TEST_DIRECTORY"/lib-diff-data.sh
+
 :
 
 sanitize_diff_raw='/^:/s/ '"\($OID_REGEX\)"' '"\($OID_REGEX\)"' \([A-Z]\)[0-9]*	/ \1 \2 \3#	/'
diff --git a/t/lib-diff/COPYING b/t/lib-diff/COPYING
deleted file mode 100644
index 6ff87c4664..0000000000
--- a/t/lib-diff/COPYING
+++ /dev/null
@@ -1,361 +0,0 @@
-
- Note that the only valid version of the GPL as far as this project
- is concerned is _this_ particular version of the license (ie v2, not
- v2.2 or v3.x or whatever), unless explicitly otherwise stated.
-
- HOWEVER, in order to allow a migration to GPLv3 if that seems like
- a good idea, I also ask that people involved with the project make
- their preferences known. In particular, if you trust me to make that
- decision, you might note so in your copyright message, ie something
- like
-
-	This file is licensed under the GPL v2, or a later version
-	at the discretion of Linus.
-
-  might avoid issues. But we can also just decide to synchronize and
-  contact all copyright holders on record if/when the occasion arises.
-
-			Linus Torvalds
-
-----------------------------------------
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/t/lib-diff/README b/t/lib-diff/README
deleted file mode 100644
index 548142c327..0000000000
--- a/t/lib-diff/README
+++ /dev/null
@@ -1,46 +0,0 @@
-////////////////////////////////////////////////////////////////
-
-	GIT - the stupid content tracker
-
-////////////////////////////////////////////////////////////////
-
-"git" can mean anything, depending on your mood.
-
- - random three-letter combination that is pronounceable, and not
-   actually used by any common UNIX command.  The fact that it is a
-   mispronunciation of "get" may or may not be relevant.
- - stupid. contemptible and despicable. simple. Take your pick from the
-   dictionary of slang.
- - "global information tracker": you're in a good mood, and it actually
-   works for you. Angels sing, and a light suddenly fills the room.
- - "goddamn idiotic truckload of sh*t": when it breaks
-
-Git is a fast, scalable, distributed revision control system with an
-unusually rich command set that provides both high-level operations
-and full access to internals.
-
-Git is an Open Source project covered by the GNU General Public License.
-It was originally written by Linus Torvalds with help of a group of
-hackers around the net. It is currently maintained by Junio C Hamano.
-
-Please read the file INSTALL for installation instructions.
-See Documentation/tutorial.txt to get started, then see
-Documentation/everyday.txt for a useful minimum set of commands,
-and "man git-commandname" for documentation of each command.
-CVS users may also want to read Documentation/cvs-migration.txt.
-
-Many Git online resources are accessible from http://git.or.cz/
-including full documentation and Git related tools.
-
-The user discussion and development of Git take place on the Git
-mailing list -- everyone is welcome to post bug reports, feature
-requests, comments and patches to git@vger.kernel.org. To subscribe
-to the list, send an email with just "subscribe git" in the body to
-majordomo@vger.kernel.org. The mailing list archives are available at
-http://marc.theaimsgroup.com/?l=git and other archival sites.
-
-The messages titled "A note from the maintainer", "What's in
-git.git (stable)" and "What's cooking in git.git (topics)" and
-the discussion following them on the mailing list give a good
-reference for project status, development direction and
-remaining tasks.
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 9fc5241228..3e7ee1386a 100644
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -87,6 +87,88 @@ test_lazy_prereq RFC1991 '
 	echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null
 '
 
+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"
+
+GPGSSH_GOOD_SIGNATURE_TRUSTED='Good "git" signature for'
+GPGSSH_GOOD_SIGNATURE_UNTRUSTED='Good "git" signature with'
+GPGSSH_KEY_NOT_TRUSTED="No principal matched"
+GPGSSH_BAD_SIGNATURE="Signature verification failed"
+
+test_lazy_prereq GPGSSH '
+	ssh_version=$(ssh-keygen -Y find-principals -n "git" 2>&1)
+	test $? != 127 || exit 1
+	echo $ssh_version | grep -q "find-principals:missing signature file"
+	test $? = 0 || 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 &&
+	ssh-keygen -t rsa -b 2048 -N "" -C "git rsa2048 key" -f "${GPGSSH_KEY_SECONDARY}" >/dev/null &&
+	ssh-keygen -t ed25519 -N "${GPGSSH_KEY_PASSPHRASE}" -C "git ed25519 encrypted key" -f "${GPGSSH_KEY_WITH_PASSPHRASE}" >/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() {
 	perl -ne '
 		/^-----END PGP/ and $in_pgp = 0;
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index d2edfa4c50..782891908d 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -131,6 +131,7 @@ prepare_httpd() {
 	cp "$TEST_PATH"/passwd "$HTTPD_ROOT_PATH"
 	install_script incomplete-length-upload-pack-v2-http.sh
 	install_script incomplete-body-upload-pack-v2-http.sh
+	install_script error-no-report.sh
 	install_script broken-smart-http.sh
 	install_script error-smart-http.sh
 	install_script error.sh
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index afa91e38b0..497b9b9d92 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -81,8 +81,6 @@ PassEnv GIT_TRACE
 PassEnv GIT_CONFIG_NOSYSTEM
 PassEnv GIT_TEST_SIDEBAND_ALL
 
-SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0
-
 Alias /dumb/ www/
 Alias /auth/dumb/ www/auth/dumb/
 
@@ -117,8 +115,14 @@ Alias /auth/dumb/ www/auth/dumb/
 	SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
 	SetEnv GIT_HTTP_EXPORT_ALL
 </LocationMatch>
+<LocationMatch /smart_v0/>
+	SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
+	SetEnv GIT_HTTP_EXPORT_ALL
+	SetEnv GIT_PROTOCOL
+</LocationMatch>
 ScriptAlias /smart/incomplete_length/git-upload-pack incomplete-length-upload-pack-v2-http.sh/
 ScriptAlias /smart/incomplete_body/git-upload-pack incomplete-body-upload-pack-v2-http.sh/
+ScriptAlias /smart/no_report/git-receive-pack error-no-report.sh/
 ScriptAliasMatch /error_git_upload_pack/(.*)/git-upload-pack error.sh/
 ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1
 ScriptAlias /broken_smart/ broken-smart-http.sh/
@@ -134,6 +138,9 @@ ScriptAliasMatch /one_time_perl/(.*) apply-one-time-perl.sh/$1
 <Files incomplete-body-upload-pack-v2-http.sh>
 	Options ExecCGI
 </Files>
+<Files error-no-report.sh>
+	Options ExecCGI
+</Files>
 <Files broken-smart-http.sh>
 	Options ExecCGI
 </Files>
diff --git a/t/lib-httpd/error-no-report.sh b/t/lib-httpd/error-no-report.sh
new file mode 100644
index 0000000000..39ff75bbc4
--- /dev/null
+++ b/t/lib-httpd/error-no-report.sh
@@ -0,0 +1,6 @@
+echo "Content-Type: application/x-git-receive-pack-result"
+echo
+printf '0013\001000eunpack ok\n'
+printf '0015\002skipping report\n'
+printf '0009\0010000'
+printf '0000'
diff --git a/t/lib-midx.sh b/t/lib-midx.sh
new file mode 100644
index 0000000000..1261994744
--- /dev/null
+++ b/t/lib-midx.sh
@@ -0,0 +1,8 @@
+# test_midx_consistent <objdir>
+test_midx_consistent () {
+	ls $1/pack/pack-*.idx | xargs -n 1 basename | sort >expect &&
+	test-tool read-midx $1 | grep ^pack-.*\.idx$ | sort >actual &&
+
+	test_cmp expect actual &&
+	git multi-pack-index --object-dir=$1 verify
+}
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/lib-read-tree-m-3way.sh b/t/lib-read-tree-m-3way.sh
index 168329adbc..2da25b3144 100644
--- a/t/lib-read-tree-m-3way.sh
+++ b/t/lib-read-tree-m-3way.sh
@@ -3,21 +3,21 @@
 mkdir Z
 for a in N D M
 do
-    for b in N D M
-    do
-        p=$a$b
+	for b in N D M
+	do
+		p=$a$b
 	echo This is $p from the original tree. >$p
 	echo This is Z/$p from the original tree. >Z/$p
-	test_expect_success \
-	    "adding test file $p and Z/$p" \
-	    'git update-index --add $p &&
-	    git update-index --add Z/$p'
+	test_expect_success "adding test file $p and Z/$p" '
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    '
     done
 done
 echo This is SS from the original tree. >SS
-test_expect_success \
-    'adding test file SS' \
-    'git update-index --add SS'
+test_expect_success 'adding test file SS' '
+	git update-index --add SS
+'
 cat >TT <<\EOF
 This is a trivial merge sample text.
 Branch A is expected to upcase this word, here.
@@ -30,12 +30,12 @@ At the very end, here comes another line, that is
 the word, expected to be upcased by Branch B.
 This concludes the trivial merge sample file.
 EOF
-test_expect_success \
-    'adding test file TT' \
-    'git update-index --add TT'
-test_expect_success \
-    'prepare initial tree' \
-    'tree_O=$(git write-tree)'
+test_expect_success 'adding test file TT' '
+	git update-index --add TT
+'
+test_expect_success 'prepare initial tree' '
+	tree_O=$(git write-tree)
+'
 
 ################################################################
 # Branch A and B makes the changes according to the above matrix.
@@ -45,48 +45,48 @@ test_expect_success \
 
 to_remove=$(echo D? Z/D?)
 rm -f $to_remove
-test_expect_success \
-    'change in branch A (removal)' \
-    'git update-index --remove $to_remove'
+test_expect_success 'change in branch A (removal)' '
+	git update-index --remove $to_remove
+'
 
 for p in M? Z/M?
 do
-    echo This is modified $p in the branch A. >$p
-    test_expect_success \
-	'change in branch A (modification)' \
-        "git update-index $p"
+	echo This is modified $p in the branch A. >$p
+	test_expect_success 'change in branch A (modification)' '
+		git update-index $p
+	'
 done
 
 for p in AN AA Z/AN Z/AA
 do
-    echo This is added $p in the branch A. >$p
-    test_expect_success \
-	'change in branch A (addition)' \
-	"git update-index --add $p"
+	echo This is added $p in the branch A. >$p
+	test_expect_success 'change in branch A (addition)' '
+		git update-index --add $p
+	'
 done
 
 echo This is SS from the modified tree. >SS
 echo This is LL from the modified tree. >LL
-test_expect_success \
-    'change in branch A (addition)' \
-    'git update-index --add LL &&
-     git update-index SS'
+test_expect_success 'change in branch A (addition)' '
+	git update-index --add LL &&
+	git update-index SS
+'
 mv TT TT-
 sed -e '/Branch A/s/word/WORD/g' <TT- >TT
 rm -f TT-
-test_expect_success \
-    'change in branch A (edit)' \
-    'git update-index TT'
+test_expect_success 'change in branch A (edit)' '
+	git update-index TT
+'
 
 mkdir DF
 echo Branch A makes a file at DF/DF, creating a directory DF. >DF/DF
-test_expect_success \
-    'change in branch A (change file to directory)' \
-    'git update-index --add DF/DF'
+test_expect_success 'change in branch A (change file to directory)' '
+	git update-index --add DF/DF
+'
 
-test_expect_success \
-    'recording branch A tree' \
-    'tree_A=$(git write-tree)'
+test_expect_success 'recording branch A tree' '
+	tree_A=$(git write-tree)
+'
 
 ################################################################
 # Branch B
@@ -94,65 +94,65 @@ test_expect_success \
 
 rm -rf [NDMASLT][NDMASLT] Z DF
 mkdir Z
-test_expect_success \
-    'reading original tree and checking out' \
-    'git read-tree $tree_O &&
-     git checkout-index -a'
+test_expect_success 'reading original tree and checking out' '
+	git read-tree $tree_O &&
+	git checkout-index -a
+'
 
 to_remove=$(echo ?D Z/?D)
 rm -f $to_remove
-test_expect_success \
-    'change in branch B (removal)' \
-    "git update-index --remove $to_remove"
+test_expect_success 'change in branch B (removal)' '
+	git update-index --remove $to_remove
+'
 
 for p in ?M Z/?M
 do
-    echo This is modified $p in the branch B. >$p
-    test_expect_success \
-	'change in branch B (modification)' \
-	"git update-index $p"
+	echo This is modified $p in the branch B. >$p
+	test_expect_success 'change in branch B (modification)' '
+		git update-index $p
+	'
 done
 
 for p in NA AA Z/NA Z/AA
 do
-    echo This is added $p in the branch B. >$p
-    test_expect_success \
-	'change in branch B (addition)' \
-	"git update-index --add $p"
+	echo This is added $p in the branch B. >$p
+	test_expect_success 'change in branch B (addition)' '
+		git update-index --add $p
+	'
 done
 echo This is SS from the modified tree. >SS
 echo This is LL from the modified tree. >LL
-test_expect_success \
-    'change in branch B (addition and modification)' \
-    'git update-index --add LL &&
-     git update-index SS'
+test_expect_success 'change in branch B (addition and modification)' '
+	git update-index --add LL &&
+	git update-index SS
+'
 mv TT TT-
 sed -e '/Branch B/s/word/WORD/g' <TT- >TT
 rm -f TT-
-test_expect_success \
-    'change in branch B (modification)' \
-    'git update-index TT'
+test_expect_success 'change in branch B (modification)' '
+	git update-index TT
+'
 
 echo Branch B makes a file at DF. >DF
-test_expect_success \
-    'change in branch B (addition of a file to conflict with directory)' \
-    'git update-index --add DF'
-
-test_expect_success \
-    'recording branch B tree' \
-    'tree_B=$(git write-tree)'
-
-test_expect_success \
-    'keep contents of 3 trees for easy access' \
-    'rm -f .git/index &&
-     git read-tree $tree_O &&
-     mkdir .orig-O &&
-     git checkout-index --prefix=.orig-O/ -f -q -a &&
-     rm -f .git/index &&
-     git read-tree $tree_A &&
-     mkdir .orig-A &&
-     git checkout-index --prefix=.orig-A/ -f -q -a &&
-     rm -f .git/index &&
-     git read-tree $tree_B &&
-     mkdir .orig-B &&
-     git checkout-index --prefix=.orig-B/ -f -q -a'
+test_expect_success 'change in branch B (addition of a file to conflict with directory)' '
+	git update-index --add DF
+'
+
+test_expect_success 'recording branch B tree' '
+	tree_B=$(git write-tree)
+'
+
+test_expect_success 'keep contents of 3 trees for easy access' '
+	rm -f .git/index &&
+	git read-tree $tree_O &&
+	mkdir .orig-O &&
+	git checkout-index --prefix=.orig-O/ -f -q -a &&
+	rm -f .git/index &&
+	git read-tree $tree_A &&
+	mkdir .orig-A &&
+	git checkout-index --prefix=.orig-A/ -f -q -a &&
+	rm -f .git/index &&
+	git read-tree $tree_B &&
+	mkdir .orig-B &&
+	git checkout-index --prefix=.orig-B/ -f -q -a
+'
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index dc75b83451..ec6b9b107d 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -151,3 +151,59 @@ test_editor_unchanged () {
 	EOF
 	test_cmp expect actual
 }
+
+# Set up an editor for testing reword commands
+# Checks that there are no uncommitted changes when rewording and that the
+# todo-list is reread after each
+set_reword_editor () {
+	>reword-actual &&
+	>reword-oid &&
+
+	# Check rewording keeps the original authorship
+	GIT_AUTHOR_NAME="Reword Author"
+	GIT_AUTHOR_EMAIL="reword.author@example.com"
+	GIT_AUTHOR_DATE=@123456
+
+	write_script reword-sequence-editor.sh <<-\EOF &&
+	todo="$(cat "$1")" &&
+	echo "exec git log -1 --pretty=format:'%an <%ae> %at%n%B%n' \
+		>>reword-actual" >"$1" &&
+	printf "%s\n" "$todo" >>"$1"
+	EOF
+
+	write_script reword-editor.sh <<-EOF &&
+	# Save the oid of the first reworded commit so we can check rebase
+	# fast-forwards to it. Also check that we do not write .git/MERGE_MSG
+	# when fast-forwarding
+	if ! test -s reword-oid
+	then
+		git rev-parse HEAD >reword-oid &&
+		if test -f .git/MERGE_MSG
+		then
+			echo 1>&2 "error: .git/MERGE_MSG exists"
+			exit 1
+		fi
+	fi &&
+	# There should be no uncommited changes
+	git diff --exit-code HEAD &&
+	# The todo-list should be re-read after a reword
+	GIT_SEQUENCE_EDITOR="\"$PWD/reword-sequence-editor.sh\"" \
+		git rebase --edit-todo &&
+	echo edited >>"\$1"
+	EOF
+
+	test_set_editor "$PWD/reword-editor.sh"
+}
+
+# Check the results of a rebase after calling set_reword_editor
+# Pass the commits that were reworded in the order that they were picked
+# Expects the first pick to be a fast-forward
+check_reworded_commits () {
+	test_cmp_rev "$(cat reword-oid)" "$1^{commit}" &&
+	git log --format="%an <%ae> %at%n%B%nedited%n" --no-walk=unsorted "$@" \
+		>reword-expected &&
+	test_cmp reword-expected reword-actual &&
+	git log --format="%an <%ae> %at%n%B" -n $# --first-parent --reverse \
+		>reword-log &&
+	test_cmp reword-expected reword-log
+}
diff --git a/t/lib-subtest.sh b/t/lib-subtest.sh
new file mode 100644
index 0000000000..56ee927f0c
--- /dev/null
+++ b/t/lib-subtest.sh
@@ -0,0 +1,95 @@
+write_sub_test_lib_test () {
+	name="$1" # stdin is the body of the test code
+	mkdir "$name" &&
+	write_script "$name/$name.sh" "$TEST_SHELL_PATH" <<-EOF &&
+	test_description='A test of test-lib.sh itself'
+
+	# Point to the t/test-lib.sh, which isn't in ../ as usual
+	. "\$TEST_DIRECTORY"/test-lib.sh
+	EOF
+	cat >>"$name/$name.sh"
+}
+
+_run_sub_test_lib_test_common () {
+	cmp_op="$1" want_code="$2" name="$3" # stdin is the body of the test code
+	shift 3
+
+	# intercept pseudo-options at the front of the argument list that we
+	# will not pass to child script
+	skip=
+	while test $# -gt 0
+	do
+		case "$1" in
+		--skip=*)
+			skip=${1#--*=}
+			shift
+			;;
+		*)
+			break
+			;;
+		esac
+	done
+
+	(
+		cd "$name" &&
+
+		# Pretend we're not running under a test harness, whether we
+		# are or not. The test-lib output depends on the setting of
+		# this variable, so we need a stable setting under which to run
+		# the sub-test.
+		sane_unset HARNESS_ACTIVE &&
+
+		export TEST_DIRECTORY &&
+		# The child test re-sources GIT-BUILD-OPTIONS and may thus
+		# override the test output directory. We thus pass it as an
+		# explicit override to the child.
+		TEST_OUTPUT_DIRECTORY_OVERRIDE=$(pwd) &&
+		export TEST_OUTPUT_DIRECTORY_OVERRIDE &&
+		GIT_SKIP_TESTS=$skip &&
+		export GIT_SKIP_TESTS &&
+		sane_unset GIT_TEST_FAIL_PREREQS &&
+		./"$name.sh" "$@" >out 2>err;
+		ret=$? &&
+		test "$ret" "$cmp_op" "$want_code"
+	)
+}
+
+write_and_run_sub_test_lib_test () {
+	name="$1" descr="$2" # stdin is the body of the test code
+	write_sub_test_lib_test "$@" || return 1
+	_run_sub_test_lib_test_common -eq 0 "$@"
+}
+
+write_and_run_sub_test_lib_test_err () {
+	name="$1" descr="$2" # stdin is the body of the test code
+	write_sub_test_lib_test "$@" || return 1
+	_run_sub_test_lib_test_common -eq 1 "$@"
+}
+
+run_sub_test_lib_test () {
+	_run_sub_test_lib_test_common -eq 0 "$@"
+}
+
+run_sub_test_lib_test_err () {
+	_run_sub_test_lib_test_common -eq 1 "$@"
+}
+
+_check_sub_test_lib_test_common () {
+	name="$1" &&
+	sed -e 's/^> //' -e 's/Z$//' >"$name"/expect.out &&
+	test_cmp "$name"/expect.out "$name"/out
+}
+
+check_sub_test_lib_test () {
+	name="$1" # stdin is the expected output from the test
+	_check_sub_test_lib_test_common "$name" &&
+	test_must_be_empty "$name"/err
+}
+
+check_sub_test_lib_test_err () {
+	name="$1" # stdin is the expected output from the test
+	_check_sub_test_lib_test_common "$name" &&
+	# expected error output is in descriptor 3
+	sed -e 's/^> //' -e 's/Z$//' <&3 >"$name"/expect.err &&
+	test_cmp "$name"/expect.err "$name"/err
+}
diff --git a/t/oid-info/oid b/t/oid-info/oid
index a754970523..7547d2c790 100644
--- a/t/oid-info/oid
+++ b/t/oid-info/oid
@@ -27,3 +27,5 @@ numeric		sha1:0123456789012345678901234567890123456789
 numeric		sha256:0123456789012345678901234567890123456789012345678901234567890123
 deadbeef	sha1:deadbeefdeadbeefdeadbeefdeadbeefdeadbeef
 deadbeef	sha256:deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef
+deadbeef_short	sha1:deadbeefdeadbeefdeadbeefdeadbeefdeadbee
+deadbeef_short	sha256:deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbee
diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl
index 14e4cda287..575d2000cc 100755
--- a/t/perf/aggregate.perl
+++ b/t/perf/aggregate.perl
@@ -17,8 +17,8 @@ sub get_times {
 		my $rt = ((defined $1 ? $1 : 0.0)*60+$2)*60+$3;
 		return ($rt, $4, $5);
 	# size
-	} elsif ($line =~ /^\d+$/) {
-		return $&;
+	} elsif ($line =~ /^\s*(\d+)$/) {
+		return $1;
 	} else {
 		die "bad input line: $line";
 	}
@@ -58,6 +58,7 @@ sub usage {
   Options:
     --codespeed          * Format output for Codespeed
     --reponame    <str>  * Send given reponame to codespeed
+    --results-dir <str>  * Directory where test results are located
     --sort-by     <str>  * Sort output (only "regression" criteria is supported)
     --subsection  <str>  * Use results from given subsection
 
@@ -91,11 +92,13 @@ sub sane_backticks {
 
 my (@dirs, %dirnames, %dirabbrevs, %prefixes, @tests,
     $codespeed, $sortby, $subsection, $reponame);
+my $resultsdir = "test-results";
 
 Getopt::Long::Configure qw/ require_order /;
 
 my $rc = GetOptions("codespeed"     => \$codespeed,
 		    "reponame=s"    => \$reponame,
+		    "results-dir=s" => \$resultsdir,
 		    "sort-by=s"     => \$sortby,
 		    "subsection=s"  => \$subsection);
 usage() unless $rc;
@@ -137,8 +140,6 @@ if (not @tests) {
 	@tests = glob "p????-*.sh";
 }
 
-my $resultsdir = "test-results";
-
 if (! $subsection and
     exists $ENV{GIT_PERF_SUBSECTION} and
     $ENV{GIT_PERF_SUBSECTION} ne "") {
diff --git a/t/perf/config b/t/perf/config
new file mode 100644
index 0000000000..b92768b039
--- /dev/null
+++ b/t/perf/config
@@ -0,0 +1,2 @@
+[gc]
+	auto = 0
diff --git a/t/perf/lib-bitmap.sh b/t/perf/lib-bitmap.sh
new file mode 100644
index 0000000000..63d3bc7cec
--- /dev/null
+++ b/t/perf/lib-bitmap.sh
@@ -0,0 +1,69 @@
+# Helper functions for testing bitmap performance; see p5310.
+
+test_full_bitmap () {
+	test_perf 'simulated clone' '
+		git pack-objects --stdout --all </dev/null >/dev/null
+	'
+
+	test_perf 'simulated fetch' '
+		have=$(git rev-list HEAD~100 -1) &&
+		{
+			echo HEAD &&
+			echo ^$have
+		} | git pack-objects --revs --stdout >/dev/null
+	'
+
+	test_perf 'pack to file (bitmap)' '
+		git pack-objects --use-bitmap-index --all pack1b </dev/null >/dev/null
+	'
+
+	test_perf 'rev-list (commits)' '
+		git rev-list --all --use-bitmap-index >/dev/null
+	'
+
+	test_perf 'rev-list (objects)' '
+		git rev-list --all --use-bitmap-index --objects >/dev/null
+	'
+
+	test_perf 'rev-list with tag negated via --not --all (objects)' '
+		git rev-list perf-tag --not --all --use-bitmap-index --objects >/dev/null
+	'
+
+	test_perf 'rev-list with negative tag (objects)' '
+		git rev-list HEAD --not perf-tag --use-bitmap-index --objects >/dev/null
+	'
+
+	test_perf 'rev-list count with blob:none' '
+		git rev-list --use-bitmap-index --count --objects --all \
+			--filter=blob:none >/dev/null
+	'
+
+	test_perf 'rev-list count with blob:limit=1k' '
+		git rev-list --use-bitmap-index --count --objects --all \
+			--filter=blob:limit=1k >/dev/null
+	'
+
+	test_perf 'rev-list count with tree:0' '
+		git rev-list --use-bitmap-index --count --objects --all \
+			--filter=tree:0 >/dev/null
+	'
+
+	test_perf 'simulated partial clone' '
+		git pack-objects --stdout --all --filter=blob:none </dev/null >/dev/null
+	'
+}
+
+test_partial_bitmap () {
+	test_perf 'clone (partial bitmap)' '
+		git pack-objects --stdout --all </dev/null >/dev/null
+	'
+
+	test_perf 'pack to file (partial bitmap)' '
+		git pack-objects --use-bitmap-index --all pack2b </dev/null >/dev/null
+	'
+
+	test_perf 'rev-list with tree filter (partial bitmap)' '
+		git rev-list --use-bitmap-index --count --objects --all \
+			--filter=tree:0 >/dev/null
+	'
+}
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/p0071-sort.sh b/t/perf/p0071-sort.sh
index 6e924f5fa3..ed366e2e12 100755
--- a/t/perf/p0071-sort.sh
+++ b/t/perf/p0071-sort.sh
@@ -11,16 +11,42 @@ test_expect_success 'setup' '
 	git cat-file --batch >unsorted
 '
 
-test_perf 'sort(1)' '
-	sort <unsorted >expect
+test_perf 'sort(1) unsorted' '
+	sort <unsorted >sorted
 '
 
-test_perf 'string_list_sort()' '
-	test-tool string-list sort <unsorted >actual
+test_expect_success 'reverse' '
+	sort -r <unsorted >reversed
 '
 
-test_expect_success 'string_list_sort() sorts like sort(1)' '
-	test_cmp_bin expect actual
-'
+for file in sorted reversed
+do
+	test_perf "sort(1) $file" "
+		sort <$file >actual
+	"
+done
+
+for file in unsorted sorted reversed
+do
+
+	test_perf "string_list_sort() $file" "
+		test-tool string-list sort <$file >actual
+	"
+
+	test_expect_success "string_list_sort() $file sorts like sort(1)" "
+		test_cmp_bin sorted actual
+	"
+done
+
+for file in unsorted sorted reversed
+do
+	test_perf "llist_mergesort() $file" "
+		test-tool mergesort sort <$file >actual
+	"
+
+	test_expect_success "llist_mergesort() $file sorts like sort(1)" "
+		test_cmp_bin sorted actual
+	"
+done
 
 test_done
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 94513c9774..2a7106b949 100755
--- a/t/perf/p2000-sparse-operations.sh
+++ b/t/perf/p2000-sparse-operations.sh
@@ -6,7 +6,7 @@ test_description="test performance of Git operations using the index"
 
 test_perf_default_repo
 
-SPARSE_CONE=f2/f4/f1
+SPARSE_CONE=f2/f4
 
 test_expect_success 'setup repo and indexes' '
 	git reset --hard HEAD &&
@@ -27,7 +27,7 @@ test_expect_success 'setup repo and indexes' '
 	OLD_COMMIT=$(git rev-parse HEAD) &&
 	OLD_TREE=$(git rev-parse HEAD^{tree}) &&
 
-	for i in $(test_seq 1 4)
+	for i in $(test_seq 1 3)
 	do
 		cat >in <<-EOF &&
 			100755 blob $BLOB	a
@@ -43,45 +43,57 @@ test_expect_success 'setup repo and indexes' '
 	done &&
 
 	git sparse-checkout init --cone &&
-	git branch -f wide $OLD_COMMIT &&
-	git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . full-index-v3 &&
+	git sparse-checkout set $SPARSE_CONE &&
+	git checkout -b wide $OLD_COMMIT &&
+
+	for l2 in f1 f2 f3 f4
+	do
+		echo more bogus >>$SPARSE_CONE/$l2/a &&
+		git commit -a -m "edit $SPARSE_CONE/$l2/a" || return 1
+	done &&
+
+	git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . full-v3 &&
 	(
-		cd full-index-v3 &&
+		cd full-v3 &&
 		git sparse-checkout init --cone &&
 		git sparse-checkout set $SPARSE_CONE &&
 		git config index.version 3 &&
-		git update-index --index-version=3
+		git update-index --index-version=3 &&
+		git checkout HEAD~4
 	) &&
-	git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . full-index-v4 &&
+	git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . full-v4 &&
 	(
-		cd full-index-v4 &&
+		cd full-v4 &&
 		git sparse-checkout init --cone &&
 		git sparse-checkout set $SPARSE_CONE &&
 		git config index.version 4 &&
-		git update-index --index-version=4
+		git update-index --index-version=4 &&
+		git checkout HEAD~4
 	) &&
-	git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . sparse-index-v3 &&
+	git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . sparse-v3 &&
 	(
-		cd sparse-index-v3 &&
+		cd sparse-v3 &&
 		git sparse-checkout init --cone --sparse-index &&
 		git sparse-checkout set $SPARSE_CONE &&
 		git config index.version 3 &&
-		git update-index --index-version=3
+		git update-index --index-version=3 &&
+		git checkout HEAD~4
 	) &&
-	git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . sparse-index-v4 &&
+	git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . sparse-v4 &&
 	(
-		cd sparse-index-v4 &&
+		cd sparse-v4 &&
 		git sparse-checkout init --cone --sparse-index &&
 		git sparse-checkout set $SPARSE_CONE &&
 		git config index.version 4 &&
-		git update-index --index-version=4
+		git update-index --index-version=4 &&
+		git checkout HEAD~4
 	)
 '
 
 test_perf_on_all () {
 	command="$@"
-	for repo in full-index-v3 full-index-v4 \
-		    sparse-index-v3 sparse-index-v4
+	for repo in full-v3 full-v4 \
+		    sparse-v3 sparse-v4
 	do
 		test_perf "$command ($repo)" "
 			(
@@ -97,5 +109,15 @@ test_perf_on_all git status
 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_perf_on_all git checkout-index -f --all
+test_perf_on_all git update-index --add --remove $SPARSE_CONE/a
 
 test_done
diff --git a/t/perf/p3400-rebase.sh b/t/perf/p3400-rebase.sh
index 7a0bb29448..e6b0277729 100755
--- a/t/perf/p3400-rebase.sh
+++ b/t/perf/p3400-rebase.sh
@@ -18,11 +18,11 @@ test_expect_success 'setup rebasing on top of a lot of changes' '
 		test_tick &&
 		git commit -m commit$i unrelated-file$i &&
 		echo change$i >unrelated-file$i &&
-		test_seq 1000 | tac >>unrelated-file$i &&
+		test_seq 1000 | sort -nr >>unrelated-file$i &&
 		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/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh
index 452be01056..7ad4f237bc 100755
--- a/t/perf/p5310-pack-bitmaps.sh
+++ b/t/perf/p5310-pack-bitmaps.sh
@@ -2,6 +2,7 @@
 
 test_description='Tests pack performance using bitmaps'
 . ./perf-lib.sh
+. "${TEST_DIRECTORY}/perf/lib-bitmap.sh"
 
 test_perf_large_repo
 
@@ -25,56 +26,7 @@ test_perf 'repack to disk' '
 	git repack -ad
 '
 
-test_perf 'simulated clone' '
-	git pack-objects --stdout --all </dev/null >/dev/null
-'
-
-test_perf 'simulated fetch' '
-	have=$(git rev-list HEAD~100 -1) &&
-	{
-		echo HEAD &&
-		echo ^$have
-	} | git pack-objects --revs --stdout >/dev/null
-'
-
-test_perf 'pack to file (bitmap)' '
-	git pack-objects --use-bitmap-index --all pack1b </dev/null >/dev/null
-'
-
-test_perf 'rev-list (commits)' '
-	git rev-list --all --use-bitmap-index >/dev/null
-'
-
-test_perf 'rev-list (objects)' '
-	git rev-list --all --use-bitmap-index --objects >/dev/null
-'
-
-test_perf 'rev-list with tag negated via --not --all (objects)' '
-	git rev-list perf-tag --not --all --use-bitmap-index --objects >/dev/null
-'
-
-test_perf 'rev-list with negative tag (objects)' '
-	git rev-list HEAD --not perf-tag --use-bitmap-index --objects >/dev/null
-'
-
-test_perf 'rev-list count with blob:none' '
-	git rev-list --use-bitmap-index --count --objects --all \
-		--filter=blob:none >/dev/null
-'
-
-test_perf 'rev-list count with blob:limit=1k' '
-	git rev-list --use-bitmap-index --count --objects --all \
-		--filter=blob:limit=1k >/dev/null
-'
-
-test_perf 'rev-list count with tree:0' '
-	git rev-list --use-bitmap-index --count --objects --all \
-		--filter=tree:0 >/dev/null
-'
-
-test_perf 'simulated partial clone' '
-	git pack-objects --stdout --all --filter=blob:none </dev/null >/dev/null
-'
+test_full_bitmap
 
 test_expect_success 'create partial bitmap state' '
 	# pick a commit to represent the repo tip in the past
@@ -97,17 +49,6 @@ test_expect_success 'create partial bitmap state' '
 	git update-ref HEAD $orig_tip
 '
 
-test_perf 'clone (partial bitmap)' '
-	git pack-objects --stdout --all </dev/null >/dev/null
-'
-
-test_perf 'pack to file (partial bitmap)' '
-	git pack-objects --use-bitmap-index --all pack2b </dev/null >/dev/null
-'
-
-test_perf 'rev-list with tree filter (partial bitmap)' '
-	git rev-list --use-bitmap-index --count --objects --all \
-		--filter=tree:0 >/dev/null
-'
+test_partial_bitmap
 
 test_done
diff --git a/t/perf/p5326-multi-pack-bitmaps.sh b/t/perf/p5326-multi-pack-bitmaps.sh
new file mode 100755
index 0000000000..f2fa228f16
--- /dev/null
+++ b/t/perf/p5326-multi-pack-bitmaps.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+test_description='Tests performance using midx bitmaps'
+. ./perf-lib.sh
+. "${TEST_DIRECTORY}/perf/lib-bitmap.sh"
+
+test_perf_large_repo
+
+# we need to create the tag up front such that it is covered by the repack and
+# thus by generated bitmaps.
+test_expect_success 'create tags' '
+	git tag --message="tag pointing to HEAD" perf-tag HEAD
+'
+
+test_expect_success 'start with bitmapped pack' '
+	git repack -adb
+'
+
+test_perf 'setup multi-pack index' '
+	git multi-pack-index write --bitmap
+'
+
+test_expect_success 'drop pack bitmap' '
+	rm -f .git/objects/pack/pack-*.bitmap
+'
+
+test_full_bitmap
+
+test_expect_success 'create partial bitmap state' '
+	# pick a commit to represent the repo tip in the past
+	cutoff=$(git rev-list HEAD~100 -1) &&
+	orig_tip=$(git rev-parse HEAD) &&
+
+	# now pretend we have just one tip
+	rm -rf .git/logs .git/refs/* .git/packed-refs &&
+	git update-ref HEAD $cutoff &&
+
+	# and then repack, which will leave us with a nice
+	# big bitmap pack of the "old" history, and all of
+	# the new history will be loose, as if it had been pushed
+	# up incrementally and exploded via unpack-objects
+	git repack -Ad &&
+	git multi-pack-index write --bitmap &&
+
+	# and now restore our original tip, as if the pushes
+	# had happened
+	git update-ref HEAD $orig_tip
+'
+
+test_partial_bitmap
+
+test_done
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 601d9f67dd..407252bac7 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -27,6 +27,10 @@ TEST_NO_MALLOC_CHECK=t
 
 . ../test-lib.sh
 
+unset GIT_CONFIG_NOSYSTEM
+GIT_CONFIG_SYSTEM="$TEST_DIRECTORY/perf/config"
+export GIT_CONFIG_SYSTEM
+
 if test -n "$GIT_TEST_INSTALLED" -a -z "$PERF_SET_GIT_TEST_INSTALLED"
 then
 	error "Do not use GIT_TEST_INSTALLED with the perf tests.
@@ -45,7 +49,7 @@ export TEST_DIRECTORY TRASH_DIRECTORY GIT_BUILD_DIR GIT_TEST_CMP
 MODERN_GIT=$GIT_BUILD_DIR/bin-wrappers/git
 export MODERN_GIT
 
-perf_results_dir=$TEST_OUTPUT_DIRECTORY/test-results
+perf_results_dir=$TEST_RESULTS_DIR
 test -n "$GIT_PERF_SUBSECTION" && perf_results_dir="$perf_results_dir/$GIT_PERF_SUBSECTION"
 mkdir -p "$perf_results_dir"
 rm -f "$perf_results_dir"/$(basename "$0" .sh).subtests
@@ -157,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_ $*"
@@ -230,6 +234,7 @@ test_perf_ () {
 		test_ok_ "$1"
 	fi
 	"$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".result
+	rm test_time.*
 }
 
 test_perf () {
@@ -253,7 +258,10 @@ test_size () {
 # and does it after running everything)
 test_at_end_hook_ () {
 	if test -z "$GIT_PERF_AGGREGATING_LATER"; then
-		( cd "$TEST_DIRECTORY"/perf && ./aggregate.perl $(basename "$0") )
+		(
+			cd "$TEST_DIRECTORY"/perf &&
+			./aggregate.perl --results-dir="$TEST_RESULTS_DIR" $(basename "$0")
+		)
 	fi
 }
 
diff --git a/t/perf/run b/t/perf/run
index c7b86104e1..55219aa405 100755
--- a/t/perf/run
+++ b/t/perf/run
@@ -74,7 +74,7 @@ set_git_test_installed () {
 	mydir=$1
 
 	mydir_abs=$(cd $mydir && pwd)
-	mydir_abs_wrappers="$mydir_abs_wrappers/bin-wrappers"
+	mydir_abs_wrappers="$mydir_abs/bin-wrappers"
 	if test -d "$mydir_abs_wrappers"
 	then
 		GIT_TEST_INSTALLED=$mydir_abs_wrappers
@@ -188,10 +188,10 @@ run_subsection () {
 
 	if test -z "$GIT_PERF_SEND_TO_CODESPEED"
 	then
-		./aggregate.perl $codespeed_opt "$@"
+		./aggregate.perl --results-dir="$TEST_RESULTS_DIR" $codespeed_opt "$@"
 	else
-		json_res_file="test-results/$GIT_PERF_SUBSECTION/aggregate.json"
-		./aggregate.perl --codespeed "$@" | tee "$json_res_file"
+		json_res_file=""$TEST_RESULTS_DIR"/$GIT_PERF_SUBSECTION/aggregate.json"
+		./aggregate.perl --results-dir="$TEST_RESULTS_DIR" --codespeed "$@" | tee "$json_res_file"
 		send_data_url="$GIT_PERF_SEND_TO_CODESPEED/result/add/json/"
 		curl -v --request POST --data-urlencode "json=$(cat "$json_res_file")" "$send_data_url"
 	fi
@@ -203,10 +203,17 @@ get_var_from_env_or_config "GIT_PERF_SEND_TO_CODESPEED" "perf" "sendToCodespeed"
 cd "$(dirname $0)"
 . ../../GIT-BUILD-OPTIONS
 
-mkdir -p test-results
-get_subsections "perf" >test-results/run_subsections.names
+if test -n "$TEST_OUTPUT_DIRECTORY"
+then
+	TEST_RESULTS_DIR="$TEST_OUTPUT_DIRECTORY/test-results"
+else
+	TEST_RESULTS_DIR=test-results
+fi
+
+mkdir -p "$TEST_RESULTS_DIR"
+get_subsections "perf" >"$TEST_RESULTS_DIR"/run_subsections.names
 
-if test $(wc -l <test-results/run_subsections.names) -eq 0
+if test $(wc -l <"$TEST_RESULTS_DIR"/run_subsections.names) -eq 0
 then
 	if test -n "$GIT_PERF_SUBSECTION"
 	then
@@ -222,10 +229,10 @@ then
 	)
 elif test -n "$GIT_PERF_SUBSECTION"
 then
-	egrep "^$GIT_PERF_SUBSECTION\$" test-results/run_subsections.names >/dev/null ||
+	egrep "^$GIT_PERF_SUBSECTION\$" "$TEST_RESULTS_DIR"/run_subsections.names >/dev/null ||
 		die "subsection '$GIT_PERF_SUBSECTION' not found in '$GIT_PERF_CONFIG_FILE'"
 
-	egrep "^$GIT_PERF_SUBSECTION\$" test-results/run_subsections.names | while read -r subsec
+	egrep "^$GIT_PERF_SUBSECTION\$" "$TEST_RESULTS_DIR"/run_subsections.names | while read -r subsec
 	do
 		(
 			GIT_PERF_SUBSECTION="$subsec"
@@ -243,5 +250,5 @@ else
 			echo "======== Run for subsection '$GIT_PERF_SUBSECTION' ========"
 			run_subsection "$@"
 		)
-	done <test-results/run_subsections.names
+	done <"$TEST_RESULTS_DIR"/run_subsections.names
 fi
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 2c6e34b947..b007f0efef 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -19,6 +19,7 @@ modification *should* take notice and update the test vectors here.
 '
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-subtest.sh
 
 try_local_xy () {
 	local x="local" y="alsolocal" &&
@@ -66,73 +67,8 @@ test_expect_success 'success is reported like this' '
 	:
 '
 
-_run_sub_test_lib_test_common () {
-	neg="$1" name="$2" descr="$3" # stdin is the body of the test code
-	shift 3
-	mkdir "$name" &&
-	(
-		# Pretend we're not running under a test harness, whether we
-		# are or not. The test-lib output depends on the setting of
-		# this variable, so we need a stable setting under which to run
-		# the sub-test.
-		sane_unset HARNESS_ACTIVE &&
-		cd "$name" &&
-		write_script "$name.sh" "$TEST_SHELL_PATH" <<-EOF &&
-		test_description='$descr (run in sub test-lib)
-
-		This is run in a sub test-lib so that we do not get incorrect
-		passing metrics
-		'
-
-		# Point to the t/test-lib.sh, which isn't in ../ as usual
-		. "\$TEST_DIRECTORY"/test-lib.sh
-		EOF
-		cat >>"$name.sh" &&
-		export TEST_DIRECTORY &&
-		TEST_OUTPUT_DIRECTORY=$(pwd) &&
-		export TEST_OUTPUT_DIRECTORY &&
-		sane_unset GIT_TEST_FAIL_PREREQS &&
-		if test -z "$neg"
-		then
-			./"$name.sh" "$@" >out 2>err
-		else
-			! ./"$name.sh" "$@" >out 2>err
-		fi
-	)
-}
-
-run_sub_test_lib_test () {
-	_run_sub_test_lib_test_common '' "$@"
-}
-
-run_sub_test_lib_test_err () {
-	_run_sub_test_lib_test_common '!' "$@"
-}
-
-check_sub_test_lib_test () {
-	name="$1" # stdin is the expected output from the test
-	(
-		cd "$name" &&
-		test_must_be_empty err &&
-		sed -e 's/^> //' -e 's/Z$//' >expect &&
-		test_cmp expect out
-	)
-}
-
-check_sub_test_lib_test_err () {
-	name="$1" # stdin is the expected output from the test
-	# expected error output is in descriptor 3
-	(
-		cd "$name" &&
-		sed -e 's/^> //' -e 's/Z$//' >expect.out &&
-		test_cmp expect.out out &&
-		sed -e 's/^> //' -e 's/Z$//' <&3 >expect.err &&
-		test_cmp expect.err err
-	)
-}
-
-test_expect_success 'pretend we have a fully passing test suite' '
-	run_sub_test_lib_test full-pass "3 passing tests" <<-\EOF &&
+test_expect_success 'subtest: 3 passing tests' '
+	write_and_run_sub_test_lib_test full-pass <<-\EOF &&
 	for i in 1 2 3
 	do
 		test_expect_success "passing test #$i" "true"
@@ -148,9 +84,8 @@ test_expect_success 'pretend we have a fully passing test suite' '
 	EOF
 '
 
-test_expect_success 'pretend we have a partially passing test suite' '
-	run_sub_test_lib_test_err \
-		partial-pass "2/3 tests passing" <<-\EOF &&
+test_expect_success 'subtest: 2/3 tests passing' '
+	write_and_run_sub_test_lib_test_err partial-pass <<-\EOF &&
 	test_expect_success "passing test #1" "true"
 	test_expect_success "failing test #2" "false"
 	test_expect_success "passing test #3" "true"
@@ -166,8 +101,8 @@ test_expect_success 'pretend we have a partially passing test suite' '
 	EOF
 '
 
-test_expect_success 'pretend we have a known breakage' '
-	run_sub_test_lib_test failing-todo "A failing TODO test" <<-\EOF &&
+test_expect_success 'subtest: a failing TODO test' '
+	write_and_run_sub_test_lib_test failing-todo <<-\EOF &&
 	test_expect_success "passing test" "true"
 	test_expect_failure "pretend we have a known breakage" "false"
 	test_done
@@ -181,8 +116,8 @@ test_expect_success 'pretend we have a known breakage' '
 	EOF
 '
 
-test_expect_success 'pretend we have fixed a known breakage' '
-	run_sub_test_lib_test passing-todo "A passing TODO test" <<-\EOF &&
+test_expect_success 'subtest: a passing TODO test' '
+	write_and_run_sub_test_lib_test passing-todo <<-\EOF &&
 	test_expect_failure "pretend we have fixed a known breakage" "true"
 	test_done
 	EOF
@@ -193,9 +128,8 @@ test_expect_success 'pretend we have fixed a known breakage' '
 	EOF
 '
 
-test_expect_success 'pretend we have fixed one of two known breakages (run in sub test-lib)' '
-	run_sub_test_lib_test partially-passing-todos \
-		"2 TODO tests, one passing" <<-\EOF &&
+test_expect_success 'subtest: 2 TODO tests, one passin' '
+	write_and_run_sub_test_lib_test partially-passing-todos <<-\EOF &&
 	test_expect_failure "pretend we have a known breakage" "false"
 	test_expect_success "pretend we have a passing test" "true"
 	test_expect_failure "pretend we have fixed another known breakage" "true"
@@ -212,9 +146,8 @@ test_expect_success 'pretend we have fixed one of two known breakages (run in su
 	EOF
 '
 
-test_expect_success 'pretend we have a pass, fail, and known breakage' '
-	run_sub_test_lib_test_err \
-		mixed-results1 "mixed results #1" <<-\EOF &&
+test_expect_success 'subtest: mixed results: pass, failure and a TODO test' '
+	write_and_run_sub_test_lib_test_err mixed-results1 <<-\EOF &&
 	test_expect_success "passing test" "true"
 	test_expect_success "failing test" "false"
 	test_expect_failure "pretend we have a known breakage" "false"
@@ -231,9 +164,8 @@ test_expect_success 'pretend we have a pass, fail, and known breakage' '
 	EOF
 '
 
-test_expect_success 'pretend we have a mix of all possible results' '
-	run_sub_test_lib_test_err \
-		mixed-results2 "mixed results #2" <<-\EOF &&
+test_expect_success 'subtest: mixed results: a mixture of all possible results' '
+	write_and_run_sub_test_lib_test_err mixed-results2 <<-\EOF &&
 	test_expect_success "passing test" "true"
 	test_expect_success "passing test" "true"
 	test_expect_success "passing test" "true"
@@ -267,9 +199,8 @@ test_expect_success 'pretend we have a mix of all possible results' '
 	EOF
 '
 
-test_expect_success 'test --verbose' '
-	run_sub_test_lib_test_err \
-		t1234-verbose "test verbose" --verbose <<-\EOF &&
+test_expect_success 'subtest: --verbose option' '
+	write_and_run_sub_test_lib_test_err t1234-verbose --verbose <<-\EOF &&
 	test_expect_success "passing test" true
 	test_expect_success "test with output" "echo foo"
 	test_expect_success "failing test" false
@@ -294,19 +225,14 @@ test_expect_success 'test --verbose' '
 	EOF
 '
 
-test_expect_success 'test --verbose-only' '
+test_expect_success 'subtest: --verbose-only option' '
 	run_sub_test_lib_test_err \
-		t2345-verbose-only-2 "test verbose-only=2" \
-		--verbose-only=2 <<-\EOF &&
-	test_expect_success "passing test" true
-	test_expect_success "test with output" "echo foo"
-	test_expect_success "failing test" false
-	test_done
-	EOF
-	check_sub_test_lib_test t2345-verbose-only-2 <<-\EOF
+		t1234-verbose \
+		--verbose-only=2 &&
+	check_sub_test_lib_test t1234-verbose <<-\EOF
 	> ok 1 - passing test
 	> Z
-	> expecting success of 2345.2 '\''test with output'\'': echo foo
+	> expecting success of 1234.2 '\''test with output'\'': echo foo
 	> foo
 	> ok 2 - test with output
 	> Z
@@ -317,18 +243,11 @@ test_expect_success 'test --verbose-only' '
 	EOF
 '
 
-test_expect_success 'GIT_SKIP_TESTS' '
+test_expect_success 'subtest: skip one with GIT_SKIP_TESTS' '
 	(
-		GIT_SKIP_TESTS="git.2" && export GIT_SKIP_TESTS &&
-		run_sub_test_lib_test git-skip-tests-basic \
-			"GIT_SKIP_TESTS" <<-\EOF &&
-		for i in 1 2 3
-		do
-			test_expect_success "passing test #$i" "true"
-		done
-		test_done
-		EOF
-		check_sub_test_lib_test git-skip-tests-basic <<-\EOF
+		run_sub_test_lib_test full-pass \
+			--skip="full.2" &&
+		check_sub_test_lib_test full-pass <<-\EOF
 		> ok 1 - passing test #1
 		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
 		> ok 3 - passing test #3
@@ -338,11 +257,10 @@ test_expect_success 'GIT_SKIP_TESTS' '
 	)
 '
 
-test_expect_success 'GIT_SKIP_TESTS several tests' '
+test_expect_success 'subtest: skip several with GIT_SKIP_TESTS' '
 	(
-		GIT_SKIP_TESTS="git.2 git.5" && export GIT_SKIP_TESTS &&
-		run_sub_test_lib_test git-skip-tests-several \
-			"GIT_SKIP_TESTS several tests" <<-\EOF &&
+		write_and_run_sub_test_lib_test git-skip-tests-several \
+			--skip="git.2 git.5" <<-\EOF &&
 		for i in 1 2 3 4 5 6
 		do
 			test_expect_success "passing test #$i" "true"
@@ -362,18 +280,11 @@ test_expect_success 'GIT_SKIP_TESTS several tests' '
 	)
 '
 
-test_expect_success 'GIT_SKIP_TESTS sh pattern' '
+test_expect_success 'subtest: sh pattern skipping with GIT_SKIP_TESTS' '
 	(
-		GIT_SKIP_TESTS="git.[2-5]" && export GIT_SKIP_TESTS &&
-		run_sub_test_lib_test git-skip-tests-sh-pattern \
-			"GIT_SKIP_TESTS sh pattern" <<-\EOF &&
-		for i in 1 2 3 4 5 6
-		do
-			test_expect_success "passing test #$i" "true"
-		done
-		test_done
-		EOF
-		check_sub_test_lib_test git-skip-tests-sh-pattern <<-\EOF
+		run_sub_test_lib_test git-skip-tests-several \
+			--skip="git.[2-5]" &&
+		check_sub_test_lib_test git-skip-tests-several <<-\EOF
 		> ok 1 - passing test #1
 		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
 		> ok 3 # skip passing test #3 (GIT_SKIP_TESTS)
@@ -386,35 +297,23 @@ test_expect_success 'GIT_SKIP_TESTS sh pattern' '
 	)
 '
 
-test_expect_success 'GIT_SKIP_TESTS entire suite' '
+test_expect_success 'subtest: skip entire test suite with GIT_SKIP_TESTS' '
 	(
 		GIT_SKIP_TESTS="git" && export GIT_SKIP_TESTS &&
-		run_sub_test_lib_test git-skip-tests-entire-suite \
-			"GIT_SKIP_TESTS entire suite" <<-\EOF &&
-		for i in 1 2 3
-		do
-			test_expect_success "passing test #$i" "true"
-		done
-		test_done
-		EOF
-		check_sub_test_lib_test git-skip-tests-entire-suite <<-\EOF
+		run_sub_test_lib_test git-skip-tests-several \
+			--skip="git" &&
+		check_sub_test_lib_test git-skip-tests-several <<-\EOF
 		> 1..0 # SKIP skip all tests in git
 		EOF
 	)
 '
 
-test_expect_success 'GIT_SKIP_TESTS does not skip unmatched suite' '
+test_expect_success 'subtest: GIT_SKIP_TESTS does not skip unmatched suite' '
 	(
 		GIT_SKIP_TESTS="notgit" && export GIT_SKIP_TESTS &&
-		run_sub_test_lib_test git-skip-tests-unmatched-suite \
-			"GIT_SKIP_TESTS does not skip unmatched suite" <<-\EOF &&
-		for i in 1 2 3
-		do
-			test_expect_success "passing test #$i" "true"
-		done
-		test_done
-		EOF
-		check_sub_test_lib_test git-skip-tests-unmatched-suite <<-\EOF
+		run_sub_test_lib_test full-pass \
+			--skip="notfull" &&
+		check_sub_test_lib_test full-pass <<-\EOF
 		> ok 1 - passing test #1
 		> ok 2 - passing test #2
 		> ok 3 - passing test #3
@@ -424,16 +323,9 @@ test_expect_success 'GIT_SKIP_TESTS does not skip unmatched suite' '
 	)
 '
 
-test_expect_success '--run basic' '
-	run_sub_test_lib_test run-basic \
-		"--run basic" --run="1,3,5" <<-\EOF &&
-	for i in 1 2 3 4 5 6
-	do
-		test_expect_success "passing test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test run-basic <<-\EOF
+test_expect_success 'subtest: --run basic' '
+	run_sub_test_lib_test git-skip-tests-several --run="1,3,5" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 # skip passing test #2 (--run)
 	> ok 3 - passing test #3
@@ -445,16 +337,10 @@ test_expect_success '--run basic' '
 	EOF
 '
 
-test_expect_success '--run with a range' '
-	run_sub_test_lib_test run-range \
-		"--run with a range" --run="1-3" <<-\EOF &&
-	for i in 1 2 3 4 5 6
-	do
-		test_expect_success "passing test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test run-range <<-\EOF
+test_expect_success 'subtest: --run with a range' '
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="1-3" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 - passing test #2
 	> ok 3 - passing test #3
@@ -466,16 +352,10 @@ test_expect_success '--run with a range' '
 	EOF
 '
 
-test_expect_success '--run with two ranges' '
-	run_sub_test_lib_test run-two-ranges \
-		"--run with two ranges" --run="1-2,5-6" <<-\EOF &&
-	for i in 1 2 3 4 5 6
-	do
-		test_expect_success "passing test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test run-two-ranges <<-\EOF
+test_expect_success 'subtest: --run with two ranges' '
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="1-2,5-6" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 - passing test #2
 	> ok 3 # skip passing test #3 (--run)
@@ -487,16 +367,10 @@ test_expect_success '--run with two ranges' '
 	EOF
 '
 
-test_expect_success '--run with a left open range' '
-	run_sub_test_lib_test run-left-open-range \
-		"--run with a left open range" --run="-3" <<-\EOF &&
-	for i in 1 2 3 4 5 6
-	do
-		test_expect_success "passing test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test run-left-open-range <<-\EOF
+test_expect_success 'subtest: --run with a left open range' '
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="-3" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 - passing test #2
 	> ok 3 - passing test #3
@@ -508,16 +382,10 @@ test_expect_success '--run with a left open range' '
 	EOF
 '
 
-test_expect_success '--run with a right open range' '
-	run_sub_test_lib_test run-right-open-range \
-		"--run with a right open range" --run="4-" <<-\EOF &&
-	for i in 1 2 3 4 5 6
-	do
-		test_expect_success "passing test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test run-right-open-range <<-\EOF
+test_expect_success 'subtest: --run with a right open range' '
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="4-" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
 	> ok 1 # skip passing test #1 (--run)
 	> ok 2 # skip passing test #2 (--run)
 	> ok 3 # skip passing test #3 (--run)
@@ -529,16 +397,10 @@ test_expect_success '--run with a right open range' '
 	EOF
 '
 
-test_expect_success '--run with basic negation' '
-	run_sub_test_lib_test run-basic-neg \
-		"--run with basic negation" --run="!3" <<-\EOF &&
-	for i in 1 2 3 4 5 6
-	do
-		test_expect_success "passing test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test run-basic-neg <<-\EOF
+test_expect_success 'subtest: --run with basic negation' '
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="!3" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 - passing test #2
 	> ok 3 # skip passing test #3 (--run)
@@ -550,16 +412,10 @@ test_expect_success '--run with basic negation' '
 	EOF
 '
 
-test_expect_success '--run with two negations' '
-	run_sub_test_lib_test run-two-neg \
-		"--run with two negations" --run="!3,!6" <<-\EOF &&
-	for i in 1 2 3 4 5 6
-	do
-		test_expect_success "passing test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test run-two-neg <<-\EOF
+test_expect_success 'subtest: --run with two negations' '
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="!3,!6" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 - passing test #2
 	> ok 3 # skip passing test #3 (--run)
@@ -571,16 +427,10 @@ test_expect_success '--run with two negations' '
 	EOF
 '
 
-test_expect_success '--run a range and negation' '
-	run_sub_test_lib_test run-range-and-neg \
-		"--run a range and negation" --run="-4,!2" <<-\EOF &&
-	for i in 1 2 3 4 5 6
-	do
-		test_expect_success "passing test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test run-range-and-neg <<-\EOF
+test_expect_success 'subtest: --run a range and negation' '
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="-4,!2" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 # skip passing test #2 (--run)
 	> ok 3 - passing test #3
@@ -592,16 +442,10 @@ test_expect_success '--run a range and negation' '
 	EOF
 '
 
-test_expect_success '--run range negation' '
-	run_sub_test_lib_test run-range-neg \
-		"--run range negation" --run="!1-3" <<-\EOF &&
-	for i in 1 2 3 4 5 6
-	do
-		test_expect_success "passing test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test run-range-neg <<-\EOF
+test_expect_success 'subtest: --run range negation' '
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="!1-3" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
 	> ok 1 # skip passing test #1 (--run)
 	> ok 2 # skip passing test #2 (--run)
 	> ok 3 # skip passing test #3 (--run)
@@ -613,17 +457,10 @@ test_expect_success '--run range negation' '
 	EOF
 '
 
-test_expect_success '--run include, exclude and include' '
-	run_sub_test_lib_test run-inc-neg-inc \
-		"--run include, exclude and include" \
-		--run="1-5,!1-3,2" <<-\EOF &&
-	for i in 1 2 3 4 5 6
-	do
-		test_expect_success "passing test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test run-inc-neg-inc <<-\EOF
+test_expect_success 'subtest: --run include, exclude and include' '
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="1-5,!1-3,2" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
 	> ok 1 # skip passing test #1 (--run)
 	> ok 2 - passing test #2
 	> ok 3 # skip passing test #3 (--run)
@@ -635,17 +472,10 @@ test_expect_success '--run include, exclude and include' '
 	EOF
 '
 
-test_expect_success '--run include, exclude and include, comma separated' '
-	run_sub_test_lib_test run-inc-neg-inc-comma \
-		"--run include, exclude and include, comma separated" \
-		--run=1-5,!1-3,2 <<-\EOF &&
-	for i in 1 2 3 4 5 6
-	do
-		test_expect_success "passing test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test run-inc-neg-inc-comma <<-\EOF
+test_expect_success 'subtest: --run include, exclude and include, comma separated' '
+	run_sub_test_lib_test git-skip-tests-several \
+		--run=1-5,!1-3,2 &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
 	> ok 1 # skip passing test #1 (--run)
 	> ok 2 - passing test #2
 	> ok 3 # skip passing test #3 (--run)
@@ -657,17 +487,10 @@ test_expect_success '--run include, exclude and include, comma separated' '
 	EOF
 '
 
-test_expect_success '--run exclude and include' '
-	run_sub_test_lib_test run-neg-inc \
-		"--run exclude and include" \
-		--run="!3-,5" <<-\EOF &&
-	for i in 1 2 3 4 5 6
-	do
-		test_expect_success "passing test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test run-neg-inc <<-\EOF
+test_expect_success 'subtest: --run exclude and include' '
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="!3-,5" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 - passing test #2
 	> ok 3 # skip passing test #3 (--run)
@@ -679,17 +502,10 @@ test_expect_success '--run exclude and include' '
 	EOF
 '
 
-test_expect_success '--run empty selectors' '
-	run_sub_test_lib_test run-empty-sel \
-		"--run empty selectors" \
-		--run="1,,3,,,5" <<-\EOF &&
-	for i in 1 2 3 4 5 6
-	do
-		test_expect_success "passing test #$i" "true"
-	done
-	test_done
-	EOF
-	check_sub_test_lib_test run-empty-sel <<-\EOF
+test_expect_success 'subtest: --run empty selectors' '
+	run_sub_test_lib_test git-skip-tests-several \
+		--run="1,,3,,,5" &&
+	check_sub_test_lib_test git-skip-tests-several <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 # skip passing test #2 (--run)
 	> ok 3 - passing test #3
@@ -701,9 +517,8 @@ test_expect_success '--run empty selectors' '
 	EOF
 '
 
-test_expect_success '--run substring selector' '
-	run_sub_test_lib_test run-substring-selector \
-		"--run empty selectors" \
+test_expect_success 'subtest: --run substring selector' '
+	write_and_run_sub_test_lib_test run-substring-selector \
 		--run="relevant" <<-\EOF &&
 	test_expect_success "relevant test" "true"
 	for i in 1 2 3 4 5 6
@@ -725,9 +540,8 @@ test_expect_success '--run substring selector' '
 	EOF
 '
 
-test_expect_success '--run keyword selection' '
-	run_sub_test_lib_test_err run-inv-range-start \
-		"--run invalid range start" \
+test_expect_success 'subtest: --run keyword selection' '
+	write_and_run_sub_test_lib_test_err run-inv-range-start \
 		--run="a-5" <<-\EOF &&
 	test_expect_success "passing test #1" "true"
 	test_done
@@ -740,14 +554,10 @@ test_expect_success '--run keyword selection' '
 	EOF_ERR
 '
 
-test_expect_success '--run invalid range end' '
-	run_sub_test_lib_test_err run-inv-range-end \
-		"--run invalid range end" \
-		--run="1-z" <<-\EOF &&
-	test_expect_success "passing test #1" "true"
-	test_done
-	EOF
-	check_sub_test_lib_test_err run-inv-range-end \
+test_expect_success 'subtest: --run invalid range end' '
+	run_sub_test_lib_test_err run-inv-range-start \
+		--run="1-z" &&
+	check_sub_test_lib_test_err run-inv-range-start \
 		<<-\EOF_OUT 3<<-EOF_ERR
 	> FATAL: Unexpected exit with code 1
 	EOF_OUT
@@ -755,8 +565,8 @@ test_expect_success '--run invalid range end' '
 	EOF_ERR
 '
 
-test_expect_success 'tests respect prerequisites' '
-	run_sub_test_lib_test prereqs "tests respect prereqs" <<-\EOF &&
+test_expect_success 'subtest: tests respect prerequisites' '
+	write_and_run_sub_test_lib_test prereqs <<-\EOF &&
 
 	test_set_prereq HAVEIT
 	test_expect_success HAVEIT "prereq is satisfied" "true"
@@ -785,8 +595,8 @@ test_expect_success 'tests respect prerequisites' '
 	EOF
 '
 
-test_expect_success 'tests respect lazy prerequisites' '
-	run_sub_test_lib_test lazy-prereqs "respect lazy prereqs" <<-\EOF &&
+test_expect_success 'subtest: tests respect lazy prerequisites' '
+	write_and_run_sub_test_lib_test lazy-prereqs <<-\EOF &&
 
 	test_lazy_prereq LAZY_TRUE true
 	test_expect_success LAZY_TRUE "lazy prereq is satisifed" "true"
@@ -809,8 +619,8 @@ test_expect_success 'tests respect lazy prerequisites' '
 	EOF
 '
 
-test_expect_success 'nested lazy prerequisites' '
-	run_sub_test_lib_test nested-lazy "nested lazy prereqs" <<-\EOF &&
+test_expect_success 'subtest: nested lazy prerequisites' '
+	write_and_run_sub_test_lib_test nested-lazy <<-\EOF &&
 
 	test_lazy_prereq NESTED_INNER "
 		>inner &&
@@ -835,9 +645,9 @@ test_expect_success 'nested lazy prerequisites' '
 	EOF
 '
 
-test_expect_success 'lazy prereqs do not turn off tracing' '
-	run_sub_test_lib_test lazy-prereq-and-tracing \
-		"lazy prereqs and -x" -v -x <<-\EOF &&
+test_expect_success 'subtest: lazy prereqs do not turn off tracing' '
+	write_and_run_sub_test_lib_test lazy-prereq-and-tracing \
+		-v -x <<-\EOF &&
 	test_lazy_prereq LAZY true
 
 	test_expect_success lazy "test_have_prereq LAZY && echo trace"
@@ -848,8 +658,8 @@ test_expect_success 'lazy prereqs do not turn off tracing' '
 	grep "echo trace" lazy-prereq-and-tracing/err
 '
 
-test_expect_success 'tests clean up after themselves' '
-	run_sub_test_lib_test cleanup "test with cleanup" <<-\EOF &&
+test_expect_success 'subtest: tests clean up after themselves' '
+	write_and_run_sub_test_lib_test cleanup <<-\EOF &&
 	clean=no
 	test_expect_success "do cleanup" "
 		test_when_finished clean=yes
@@ -868,9 +678,9 @@ test_expect_success 'tests clean up after themselves' '
 	EOF
 '
 
-test_expect_success 'tests clean up even on failures' '
-	run_sub_test_lib_test_err \
-		failing-cleanup "Failing tests with cleanup commands" <<-\EOF &&
+test_expect_success 'subtest: tests clean up even on failures' '
+	write_and_run_sub_test_lib_test_err \
+		failing-cleanup <<-\EOF &&
 	test_expect_success "tests clean up even after a failure" "
 		touch clean-after-failure &&
 		test_when_finished rm clean-after-failure &&
@@ -897,9 +707,9 @@ test_expect_success 'tests clean up even on failures' '
 	EOF
 '
 
-test_expect_success 'test_atexit is run' '
-	run_sub_test_lib_test_err \
-		atexit-cleanup "Run atexit commands" -i <<-\EOF &&
+test_expect_success 'subtest: test_atexit is run' '
+	write_and_run_sub_test_lib_test_err \
+		atexit-cleanup -i <<-\EOF &&
 	test_expect_success "tests clean up even after a failure" "
 		> ../../clean-atexit &&
 		test_atexit rm ../../clean-atexit &&
@@ -1249,28 +1059,29 @@ P=$(test_oid root)
 
 test_expect_success 'git commit-tree records the correct tree in a commit' '
 	commit0=$(echo NO | git commit-tree $P) &&
-	tree=$(git show --pretty=raw $commit0 |
-		 sed -n -e "s/^tree //p" -e "/^author /q") &&
+	git show --pretty=raw $commit0 >out &&
+	tree=$(sed -n -e "s/^tree //p" -e "/^author /q" out) &&
 	test "z$tree" = "z$P"
 '
 
 test_expect_success 'git commit-tree records the correct parent in a commit' '
 	commit1=$(echo NO | git commit-tree $P -p $commit0) &&
-	parent=$(git show --pretty=raw $commit1 |
-		sed -n -e "s/^parent //p" -e "/^author /q") &&
+	git show --pretty=raw $commit1 >out &&
+	parent=$(sed -n -e "s/^parent //p" -e "/^author /q" out) &&
 	test "z$commit0" = "z$parent"
 '
 
 test_expect_success 'git commit-tree omits duplicated parent in a commit' '
 	commit2=$(echo NO | git commit-tree $P -p $commit0 -p $commit0) &&
-	     parent=$(git show --pretty=raw $commit2 |
-		sed -n -e "s/^parent //p" -e "/^author /q" |
-		sort -u) &&
+	git show --pretty=raw $commit2 >out &&
+	cat >match.sed <<-\EOF &&
+	s/^parent //p
+	/^author /q
+	EOF
+	parent=$(sed -n -f match.sed out | sort -u) &&
 	test "z$commit0" = "z$parent" &&
-	numparent=$(git show --pretty=raw $commit2 |
-		sed -n -e "s/^parent //p" -e "/^author /q" |
-		wc -l) &&
-	test $numparent = 1
+	git show --pretty=raw $commit2 >out &&
+	test_stdout_line_count = 1 sed -n -f match.sed out
 '
 
 test_expect_success 'update-index D/F conflict' '
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index acd662e403..d479303efa 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -2,10 +2,12 @@
 
 test_description='git init'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 check_config () {
-	if test -d "$1" && test -f "$1/config" && test -d "$1/refs"
+	if test_path_is_dir "$1" &&
+	   test_path_is_file "$1/config" && test_path_is_dir "$1/refs"
 	then
 		: happy
 	else
@@ -330,7 +332,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' '
@@ -356,7 +358,10 @@ test_lazy_prereq GETCWD_IGNORES_PERMS '
 	chmod 100 $base ||
 	BUG "cannot prepare $base"
 
-	(cd $base/dir && /bin/pwd -P)
+	(
+		cd $base/dir &&
+		test-tool getcwd
+	)
 	status=$?
 
 	chmod 700 $base &&
diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh
index 8440e6add1..76052cb562 100755
--- a/t/t0002-gitfile.sh
+++ b/t/t0002-gitfile.sh
@@ -7,6 +7,7 @@ Verify that plumbing commands work when .git is a file
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 objpath() {
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index 1e4c672b84..b9ed612af1 100755
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -2,6 +2,7 @@
 
 test_description=gitattributes
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 attr_check_basic () {
diff --git a/t/t0004-unwritable.sh b/t/t0004-unwritable.sh
index e3137d638e..2e9d652d82 100755
--- a/t/t0004-unwritable.sh
+++ b/t/t0004-unwritable.sh
@@ -2,6 +2,7 @@
 
 test_description='detect unwritable repository and fail correctly'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -18,27 +19,66 @@ test_expect_success setup '
 test_expect_success POSIXPERM,SANITY 'write-tree should notice unwritable repository' '
 	test_when_finished "chmod 775 .git/objects .git/objects/??" &&
 	chmod a-w .git/objects .git/objects/?? &&
-	test_must_fail git write-tree
+	test_must_fail git write-tree 2>out.write-tree
 '
 
-test_expect_success POSIXPERM,SANITY 'commit should notice unwritable repository' '
+test_lazy_prereq WRITE_TREE_OUT 'test -e "$TRASH_DIRECTORY"/out.write-tree'
+test_expect_success WRITE_TREE_OUT 'write-tree output on unwritable repository' '
+	cat >expect <<-\EOF &&
+	error: insufficient permission for adding an object to repository database .git/objects
+	fatal: git-write-tree: error building trees
+	EOF
+	test_cmp expect out.write-tree
+'
+
+test_expect_success POSIXPERM,SANITY,!SANITIZE_LEAK 'commit should notice unwritable repository' '
 	test_when_finished "chmod 775 .git/objects .git/objects/??" &&
 	chmod a-w .git/objects .git/objects/?? &&
-	test_must_fail git commit -m second
+	test_must_fail git commit -m second 2>out.commit
+'
+
+test_lazy_prereq COMMIT_OUT 'test -e "$TRASH_DIRECTORY"/out.commit'
+test_expect_success COMMIT_OUT 'commit output on unwritable repository' '
+	cat >expect <<-\EOF &&
+	error: insufficient permission for adding an object to repository database .git/objects
+	error: Error building trees
+	EOF
+	test_cmp expect out.commit
 '
 
 test_expect_success POSIXPERM,SANITY 'update-index should notice unwritable repository' '
 	test_when_finished "chmod 775 .git/objects .git/objects/??" &&
 	echo 6O >file &&
 	chmod a-w .git/objects .git/objects/?? &&
-	test_must_fail git update-index file
+	test_must_fail git update-index file 2>out.update-index
+'
+
+test_lazy_prereq UPDATE_INDEX_OUT 'test -e "$TRASH_DIRECTORY"/out.update-index'
+test_expect_success UPDATE_INDEX_OUT 'update-index output on unwritable repository' '
+	cat >expect <<-\EOF &&
+	error: insufficient permission for adding an object to repository database .git/objects
+	error: file: failed to insert into database
+	fatal: Unable to process path file
+	EOF
+	test_cmp expect out.update-index
 '
 
 test_expect_success POSIXPERM,SANITY 'add should notice unwritable repository' '
 	test_when_finished "chmod 775 .git/objects .git/objects/??" &&
 	echo b >file &&
 	chmod a-w .git/objects .git/objects/?? &&
-	test_must_fail git add file
+	test_must_fail git add file 2>out.add
+'
+
+test_lazy_prereq ADD_OUT 'test -e "$TRASH_DIRECTORY"/out.add'
+test_expect_success ADD_OUT 'add output on unwritable repository' '
+	cat >expect <<-\EOF &&
+	error: insufficient permission for adding an object to repository database .git/objects
+	error: file: failed to insert into database
+	error: unable to index file '\''file'\''
+	fatal: updating files failed
+	EOF
+	test_cmp expect out.add
 '
 
 test_done
diff --git a/t/t0005-signals.sh b/t/t0005-signals.sh
index 4c214bd11c..eba75a2490 100755
--- a/t/t0005-signals.sh
+++ b/t/t0005-signals.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='signals work as we expect'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 cat >expect <<EOF
@@ -46,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 88b9ae8158..e56f4b9ac5 100755
--- a/t/t0007-git-var.sh
+++ b/t/t0007-git-var.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='basic sanity checks for git var'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'get GIT_AUTHOR_IDENT' '
@@ -25,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 a594b4aa7d..5575dade8e 100755
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -2,6 +2,7 @@
 
 test_description=check-ignore
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 init_vars () {
@@ -199,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 &&
@@ -802,6 +803,49 @@ test_expect_success 'existing directory and file' '
 	grep top-level-dir actual
 '
 
+test_expect_success 'exact prefix matching (with root)' '
+	test_when_finished rm -r a &&
+	mkdir -p a/git a/git-foo &&
+	touch a/git/foo a/git-foo/bar &&
+	echo /git/ >a/.gitignore &&
+	git check-ignore a/git a/git/foo a/git-foo a/git-foo/bar >actual &&
+	cat >expect <<-\EOF &&
+	a/git
+	a/git/foo
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'exact prefix matching (without root)' '
+	test_when_finished rm -r a &&
+	mkdir -p a/git a/git-foo &&
+	touch a/git/foo a/git-foo/bar &&
+	echo git/ >a/.gitignore &&
+	git check-ignore a/git a/git/foo a/git-foo a/git-foo/bar >actual &&
+	cat >expect <<-\EOF &&
+	a/git
+	a/git/foo
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'directories and ** matches' '
+	cat >.gitignore <<-\EOF &&
+	data/**
+	!data/**/
+	!data/**/*.txt
+	EOF
+	git check-ignore file \
+		data/file data/data1/file1 data/data1/file1.txt \
+		data/data2/file2 data/data2/file2.txt >actual &&
+	cat >expect <<-\EOF &&
+	data/file
+	data/data1/file1
+	data/data2/file2
+	EOF
+	test_cmp expect actual
+'
+
 ############################################################################
 #
 # test whitespace handling
diff --git a/t/t0009-prio-queue.sh b/t/t0009-prio-queue.sh
index 3941ad2528..eea99107a4 100755
--- a/t/t0009-prio-queue.sh
+++ b/t/t0009-prio-queue.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='basic tests for priority queue implementation'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 cat >expect <<'EOF'
diff --git a/t/t0010-racy-git.sh b/t/t0010-racy-git.sh
index 5657c5a87b..837c8b7228 100755
--- a/t/t0010-racy-git.sh
+++ b/t/t0010-racy-git.sh
@@ -2,6 +2,7 @@
 
 test_description='racy GIT'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # This test can give false success if your machine is sufficiently
diff --git a/t/t0011-hashmap.sh b/t/t0011-hashmap.sh
index 5343ffd3f9..1cb6aa6824 100755
--- a/t/t0011-hashmap.sh
+++ b/t/t0011-hashmap.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='test hashmap and string hash functions'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_hashmap() {
@@ -218,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 &&
@@ -229,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/t0012-help.sh b/t/t0012-help.sh
index 5679e29c62..cbd725ccac 100755
--- a/t/t0012-help.sh
+++ b/t/t0012-help.sh
@@ -34,6 +34,18 @@ test_expect_success 'basic help commands' '
 	git help -a >/dev/null
 '
 
+test_expect_success 'invalid usage' '
+	test_expect_code 129 git help -g add &&
+	test_expect_code 129 git help -a -c &&
+
+	test_expect_code 129 git help -g add &&
+	test_expect_code 129 git help -a -g &&
+
+	test_expect_code 129 git help -g -c &&
+	test_expect_code 129 git help --config-for-completion add &&
+	test_expect_code 129 git help --config-sections-for-completion add
+'
+
 test_expect_success "works for commands and guides by default" '
 	configure_help &&
 	git help status &&
@@ -73,14 +85,72 @@ test_expect_success 'git help -g' '
 	test_i18ngrep "^   tutorial   " help.output
 '
 
+test_expect_success 'git help fails for non-existing html pages' '
+	configure_help &&
+	mkdir html-empty &&
+	test_must_fail git -c help.htmlpath=html-empty help status &&
+	test_must_be_empty test-browser.log
+'
+
+test_expect_success 'git help succeeds without git.html' '
+	configure_help &&
+	mkdir html-with-docs &&
+	touch html-with-docs/git-status.html &&
+	git -c help.htmlpath=html-with-docs help status &&
+	echo "html-with-docs/git-status.html" >expect &&
+	test_cmp expect test-browser.log
+'
+
+test_expect_success 'git help -c' '
+	git help -c >help.output &&
+	cat >expect <<-\EOF &&
+
+	'\''git help config'\'' for more information
+	EOF
+	grep -v -E \
+		-e "^[^.]+\.[^.]+$" \
+		-e "^[^.]+\.[^.]+\.[^.]+$" \
+		help.output >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git help --config-for-completion' '
+	git help -c >human &&
+	grep -E \
+	     -e "^[^.]+\.[^.]+$" \
+	     -e "^[^.]+\.[^.]+\.[^.]+$" human |
+	     sed -e "s/\*.*//" -e "s/<.*//" |
+	     sort -u >human.munged &&
+
+	git help --config-for-completion >vars &&
+	test_cmp human.munged vars
+'
+
+test_expect_success 'git help --config-sections-for-completion' '
+	git help -c >human &&
+	grep -E \
+	     -e "^[^.]+\.[^.]+$" \
+	     -e "^[^.]+\.[^.]+\.[^.]+$" human |
+	     sed -e "s/\..*//" |
+	     sort -u >human.munged &&
+
+	git help --config-sections-for-completion >sections &&
+	test_cmp human.munged sections
+'
+
 test_expect_success 'generate builtin list' '
+	mkdir -p sub &&
 	git --list-cmds=builtins >builtins
 '
 
 while read builtin
 do
 	test_expect_success "$builtin can handle -h" '
-		test_expect_code 129 git $builtin -h >output 2>&1 &&
+		(
+			GIT_CEILING_DIRECTORIES=$(pwd) &&
+			export GIT_CEILING_DIRECTORIES &&
+			test_expect_code 129 git -C sub $builtin -h >output 2>&1
+		) &&
 		test_i18ngrep usage output
 	'
 done <builtins
diff --git a/t/t0013-sha1dc.sh b/t/t0013-sha1dc.sh
index 419f31a8f7..9ad76080aa 100755
--- a/t/t0013-sha1dc.sh
+++ b/t/t0013-sha1dc.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='test sha1 collision detection'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 TEST_DATA="$TEST_DIRECTORY/t0013"
 
diff --git a/t/t0015-hash.sh b/t/t0015-hash.sh
index 291e9061f3..086822fc45 100755
--- a/t/t0015-hash.sh
+++ b/t/t0015-hash.sh
@@ -15,7 +15,7 @@ test_expect_success 'test basic SHA-1 hash values' '
 	grep c12252ceda8be8994d5fa0290a47231c1d16aae3 actual &&
 	printf "abcdefghijklmnopqrstuvwxyz" | test-tool sha1 >actual &&
 	grep 32d10c7b8cf96570ca04ce37f2a19d84240d3a89 actual &&
-	perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;" | \
+	perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;" |
 		test-tool sha1 >actual &&
 	grep 34aa973cd4c4daa4f61eeb2bdbad27316534016f actual &&
 	printf "blob 0\0" | test-tool sha1 >actual &&
@@ -38,10 +38,10 @@ test_expect_success 'test basic SHA-256 hash values' '
 	printf "abcdefghijklmnopqrstuvwxyz" | test-tool sha256 >actual &&
 	grep 71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73 actual &&
 	# Try to exercise the chunking code by turning autoflush on.
-	perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;" | \
+	perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;" |
 		test-tool sha256 >actual &&
 	grep cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0 actual &&
-	perl -e "$| = 1; print q{abcdefghijklmnopqrstuvwxyz} for 1..100000;" | \
+	perl -e "$| = 1; print q{abcdefghijklmnopqrstuvwxyz} for 1..100000;" |
 		test-tool sha256 >actual &&
 	grep e406ba321ca712ad35a698bf0af8d61fc4dc40eca6bdcea4697962724ccbde35 actual &&
 	printf "blob 0\0" | test-tool sha256 >actual &&
diff --git a/t/t0016-oidmap.sh b/t/t0016-oidmap.sh
index 31f8276ba8..0faef1f4f1 100755
--- a/t/t0016-oidmap.sh
+++ b/t/t0016-oidmap.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='test oidmap'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # This purposefully is very similar to t0011-hashmap.sh
diff --git a/t/t0017-env-helper.sh b/t/t0017-env-helper.sh
index 4a159f99e4..2e42fba956 100755
--- a/t/t0017-env-helper.sh
+++ b/t/t0017-env-helper.sh
@@ -2,6 +2,7 @@
 
 test_description='test env--helper'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 
diff --git a/t/t0018-advice.sh b/t/t0018-advice.sh
index 39e5e4b34f..c13057a4ca 100755
--- a/t/t0018-advice.sh
+++ b/t/t0018-advice.sh
@@ -2,6 +2,7 @@
 
 test_description='Test advise_if_enabled functionality'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'advice should be printed when config variable is unset' '
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 b5749f327d..bad37abad2 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -6,6 +6,7 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
 
 TEST_ROOT="$PWD"
 PATH=$TEST_ROOT:$PATH
@@ -75,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 &&
@@ -117,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 &&
@@ -138,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"
@@ -158,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 &&
 
@@ -284,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
 '
@@ -302,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 &&
@@ -642,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 &&
@@ -681,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
 	)
 '
@@ -1061,4 +1062,74 @@ test_expect_success PERL,SYMLINKS,CASE_INSENSITIVE_FS \
 	)
 '
 
+test_expect_success PERL 'setup for progress tests' '
+	git init progress &&
+	(
+		cd progress &&
+		git config filter.delay.process "rot13-filter.pl delay-progress.log clean smudge delay" &&
+		git config filter.delay.required true &&
+
+		echo "*.a filter=delay" >.gitattributes &&
+		touch test-delay10.a &&
+		git add . &&
+		git commit -m files
+	)
+'
+
+test_delayed_checkout_progress () {
+	if test "$1" = "!"
+	then
+		local expect_progress=N &&
+		shift
+	else
+		local expect_progress=
+	fi &&
+
+	if test $# -lt 1
+	then
+		BUG "no command given to test_delayed_checkout_progress"
+	fi &&
+
+	(
+		cd progress &&
+		GIT_PROGRESS_DELAY=0 &&
+		export GIT_PROGRESS_DELAY &&
+		rm -f *.a delay-progress.log &&
+
+		"$@" 2>err &&
+		grep "IN: smudge test-delay10.a .* \\[DELAYED\\]" delay-progress.log &&
+		if test "$expect_progress" = N
+		then
+			! grep "Filtering content" err
+		else
+			grep "Filtering content" err
+		fi
+	)
+}
+
+for mode in pathspec branch
+do
+	case "$mode" in
+	pathspec) opt='.' ;;
+	branch) opt='-f HEAD' ;;
+	esac
+
+	test_expect_success PERL,TTY "delayed checkout shows progress by default on tty ($mode checkout)" '
+		test_delayed_checkout_progress test_terminal git checkout $opt
+	'
+
+	test_expect_success PERL "delayed checkout ommits progress on non-tty ($mode checkout)" '
+		test_delayed_checkout_progress ! git checkout $opt
+	'
+
+	test_expect_success PERL,TTY "delayed checkout ommits progress with --quiet ($mode checkout)" '
+		test_delayed_checkout_progress ! test_terminal git checkout --quiet $opt
+	'
+
+	test_expect_success PERL,TTY "delayed checkout honors --[no]-progress ($mode checkout)" '
+		test_delayed_checkout_progress ! test_terminal git checkout --no-progress $opt &&
+		test_delayed_checkout_progress test_terminal git checkout --quiet --progress $opt
+	'
+done
+
 test_done
diff --git a/t/t0022-crlf-rename.sh b/t/t0022-crlf-rename.sh
index 7af3fbcc7b..c1a331e9e9 100755
--- a/t/t0022-crlf-rename.sh
+++ b/t/t0022-crlf-rename.sh
@@ -2,6 +2,7 @@
 
 test_description='ignore CR in CRLF sequence while computing similiarity'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh
index 4e9fa3cd68..a34de56420 100755
--- a/t/t0024-crlf-archive.sh
+++ b/t/t0024-crlf-archive.sh
@@ -2,6 +2,7 @@
 
 test_description='respect crlf in git archive'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t0025-crlf-renormalize.sh b/t/t0025-crlf-renormalize.sh
index e13363ade5..81447978b7 100755
--- a/t/t0025-crlf-renormalize.sh
+++ b/t/t0025-crlf-renormalize.sh
@@ -2,6 +2,7 @@
 
 test_description='CRLF renormalization'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t0026-eol-config.sh b/t/t0026-eol-config.sh
index c5203e232c..f426a185bb 100755
--- a/t/t0026-eol-config.sh
+++ b/t/t0026-eol-config.sh
@@ -2,6 +2,7 @@
 
 test_description='CRLF conversion'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 has_cr() {
@@ -14,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/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index 4a5c5c602c..c5f7ac63b0 100755
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@ -597,6 +597,12 @@ do
 	# auto: core.autocrlf=false and core.eol unset(or native) uses native eol
 	checkout_files     auto  "$id" ""     false   ""       $NL   CRLF  CRLF_mix_LF  LF_mix_CR    LF_nul
 	checkout_files     auto  "$id" ""     false   native   $NL   CRLF  CRLF_mix_LF  LF_mix_CR    LF_nul
+	# core.autocrlf false, .gitattributes sets eol
+	checkout_files     ""    "$id" "lf"   false   ""       LF    CRLF  CRLF_mix_LF  LF_mix_CR    LF_nul
+	checkout_files     ""    "$id" "crlf" false   ""       CRLF  CRLF  CRLF         CRLF_mix_CR  CRLF_nul
+	# core.autocrlf true, .gitattributes sets eol
+	checkout_files     ""    "$id" "lf"   true    ""       LF    CRLF  CRLF_mix_LF  LF_mix_CR    LF_nul
+	checkout_files     ""    "$id" "crlf" true    ""       CRLF  CRLF  CRLF         CRLF_mix_CR  CRLF_nul
 done
 
 # The rest of the tests are unique; do the usual linting.
diff --git a/t/t0029-core-unsetenvvars.sh b/t/t0029-core-unsetenvvars.sh
index 24ce46a6ea..b138e1d9cb 100755
--- a/t/t0029-core-unsetenvvars.sh
+++ b/t/t0029-core-unsetenvvars.sh
@@ -2,6 +2,7 @@
 
 test_description='test the Windows-only core.unsetenvvars setting'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 if ! test_have_prereq MINGW
diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh
index 0c24a0f9a3..ae1ca380c1 100755
--- a/t/t0030-stripspace.sh
+++ b/t/t0030-stripspace.sh
@@ -5,6 +5,7 @@
 
 test_description='git stripspace'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 t40='A quick brown fox jumps over the lazy do'
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/t0040-parse-options.sh b/t/t0040-parse-options.sh
index ad4746d899..ed2fb620a9 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -5,6 +5,7 @@
 
 test_description='our own option parser'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 cat >expect <<\EOF
@@ -37,7 +38,6 @@ String options
     --list <str>          add str to list
 
 Magic arguments
-    --quux                means --quux
     -NUM                  set integer to NUM
     +                     same as -b
     --ambiguous           positive ambiguity
@@ -169,9 +169,45 @@ test_expect_success 'long options' '
 '
 
 test_expect_success 'missing required value' '
-	test_expect_code 129 test-tool parse-options -s &&
-	test_expect_code 129 test-tool parse-options --string &&
-	test_expect_code 129 test-tool parse-options --file
+	cat >expect <<-\EOF &&
+	error: switch `s'\'' requires a value
+	EOF
+	test_expect_code 129 test-tool parse-options -s 2>actual &&
+	test_cmp expect actual &&
+
+	cat >expect <<-\EOF &&
+	error: option `string'\'' requires a value
+	EOF
+	test_expect_code 129 test-tool parse-options --string 2>actual &&
+	test_cmp expect actual &&
+
+	cat >expect <<-\EOF &&
+	error: option `file'\'' requires a value
+	EOF
+	test_expect_code 129 test-tool parse-options --file 2>actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'superfluous value provided: boolean' '
+	cat >expect <<-\EOF &&
+	error: option `yes'\'' takes no value
+	EOF
+	test_expect_code 129 test-tool parse-options --yes=hi 2>actual &&
+	test_cmp expect actual &&
+
+	cat >expect <<-\EOF &&
+	error: option `no-yes'\'' takes no value
+	EOF
+	test_expect_code 129 test-tool parse-options --no-yes=hi 2>actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'superfluous value provided: cmdmode' '
+	cat >expect <<-\EOF &&
+	error: option `mode1'\'' takes no value
+	EOF
+	test_expect_code 129 test-tool parse-options --mode1=hi 2>actual &&
+	test_cmp expect actual
 '
 
 cat >expect <<\EOF
@@ -263,10 +299,6 @@ test_expect_success 'detect possible typos' '
 	test_cmp typo.err output.err
 '
 
-test_expect_success 'keep some options as arguments' '
-	test-tool parse-options --expect="arg 00: --quux" --quux
-'
-
 cat >expect <<\EOF
 Callback: "four", 0
 boolean: 5
diff --git a/t/t0051-windows-named-pipe.sh b/t/t0051-windows-named-pipe.sh
index 10ac92d225..412f413360 100755
--- a/t/t0051-windows-named-pipe.sh
+++ b/t/t0051-windows-named-pipe.sh
@@ -3,8 +3,13 @@
 test_description='Windows named pipes'
 
 . ./test-lib.sh
+if ! test_have_prereq MINGW
+then
+	skip_all='skipping Windows-specific tests'
+	test_done
+fi
 
-test_expect_success MINGW 'o_append write to named pipe' '
+test_expect_success 'o_append write to named pipe' '
 	GIT_TRACE="$(pwd)/expect" git status >/dev/null 2>&1 &&
 	{ test-tool windows-named-pipe t0051 >actual 2>&1 & } &&
 	pid=$! &&
diff --git a/t/t0052-simple-ipc.sh b/t/t0052-simple-ipc.sh
index ff98be31a5..1a36a53574 100755
--- a/t/t0052-simple-ipc.sh
+++ b/t/t0052-simple-ipc.sh
@@ -2,6 +2,7 @@
 
 test_description='simple command server'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test-tool simple-ipc SUPPORTS_SIMPLE_IPC || {
diff --git a/t/t0055-beyond-symlinks.sh b/t/t0055-beyond-symlinks.sh
index 0c6ff567a1..6bada37022 100755
--- a/t/t0055-beyond-symlinks.sh
+++ b/t/t0055-beyond-symlinks.sh
@@ -2,6 +2,7 @@
 
 test_description='update-index and add refuse to add beyond symlinks'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success SYMLINKS setup '
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index de4960783f..71a5d370cc 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -216,7 +216,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 &&
@@ -224,7 +224,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")"
 '
 
@@ -525,4 +525,30 @@ test_expect_success MINGW 'is_valid_path() on Windows' '
 		"PRN./abc"
 '
 
+test_lazy_prereq RUNTIME_PREFIX '
+	test true = "$RUNTIME_PREFIX"
+'
+
+test_lazy_prereq CAN_EXEC_IN_PWD '
+	cp "$GIT_EXEC_PATH"/git$X ./ &&
+	./git rev-parse
+'
+
+test_expect_success RUNTIME_PREFIX,CAN_EXEC_IN_PWD 'RUNTIME_PREFIX works' '
+	mkdir -p pretend/bin pretend/libexec/git-core &&
+	echo "echo HERE" | write_script pretend/libexec/git-core/git-here &&
+	cp "$GIT_EXEC_PATH"/git$X pretend/bin/ &&
+	GIT_EXEC_PATH= ./pretend/bin/git here >actual &&
+	echo HERE >expect &&
+	test_cmp expect actual'
+
+test_expect_success RUNTIME_PREFIX,CAN_EXEC_IN_PWD '%(prefix)/ works' '
+	mkdir -p pretend/bin &&
+	cp "$GIT_EXEC_PATH"/git$X pretend/bin/ &&
+	git config yes.path "%(prefix)/yes" &&
+	GIT_EXEC_PATH= ./pretend/bin/git config --path yes.path >actual &&
+	echo "$(pwd)/pretend/yes" >expect &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh
index 7d599675e3..ee281909bc 100755
--- a/t/t0061-run-command.sh
+++ b/t/t0061-run-command.sh
@@ -5,6 +5,7 @@
 
 test_description='Test run command'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 cat >hello-script <<-EOF
diff --git a/t/t0063-string-list.sh b/t/t0063-string-list.sh
index c6ee9f66b1..46d4839194 100755
--- a/t/t0063-string-list.sh
+++ b/t/t0063-string-list.sh
@@ -5,6 +5,7 @@
 
 test_description='Test string list functionality'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_split () {
diff --git a/t/t0064-oid-array.sh b/t/t0064-oid-array.sh
index 2e5438ccda..88c89e8f48 100755
--- a/t/t0064-oid-array.sh
+++ b/t/t0064-oid-array.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='basic tests for the oid array implementation'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 echoid () {
diff --git a/t/t0065-strcmp-offset.sh b/t/t0065-strcmp-offset.sh
index 91fa639c4a..94e34c83ed 100755
--- a/t/t0065-strcmp-offset.sh
+++ b/t/t0065-strcmp-offset.sh
@@ -2,6 +2,7 @@
 
 test_description='Test strcmp_offset functionality'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 while read s1 s2 expect
diff --git a/t/t0066-dir-iterator.sh b/t/t0066-dir-iterator.sh
index 92910e4e6c..63a1a45cd3 100755
--- a/t/t0066-dir-iterator.sh
+++ b/t/t0066-dir-iterator.sh
@@ -2,6 +2,7 @@
 
 test_description='Test the dir-iterator functionality'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t0067-parse_pathspec_file.sh b/t/t0067-parse_pathspec_file.sh
index 7bab49f361..0188d0423a 100755
--- a/t/t0067-parse_pathspec_file.sh
+++ b/t/t0067-parse_pathspec_file.sh
@@ -2,6 +2,7 @@
 
 test_description='Test parse_pathspec_file()'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'one item from stdin' '
diff --git a/t/t0069-oidtree.sh b/t/t0069-oidtree.sh
new file mode 100755
index 0000000000..889db50818
--- /dev/null
+++ b/t/t0069-oidtree.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+test_description='basic tests for the oidtree implementation'
+TEST_PASSES_SANITIZE_LEAK=true
+. ./test-lib.sh
+
+maxhexsz=$(test_oid hexsz)
+echoid () {
+	prefix="${1:+$1 }"
+	shift
+	while test $# -gt 0
+	do
+		shortoid="$1"
+		shift
+		difference=$(($maxhexsz - ${#shortoid}))
+		printf "%s%s%0${difference}d\\n" "$prefix" "$shortoid" "0"
+	done
+}
+
+test_expect_success 'oidtree insert and contains' '
+	cat >expect <<-\EOF &&
+		0
+		0
+		0
+		1
+		1
+		0
+	EOF
+	{
+		echoid insert 444 1 2 3 4 5 a b c d e &&
+		echoid contains 44 441 440 444 4440 4444 &&
+		echo clear
+	} | test-tool oidtree >actual &&
+	test_cmp expect actual
+'
+
+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 &&
+		echo clear
+	} | test-tool oidtree >actual &&
+	test_cmp expect actual
+'
+
+test_done
diff --git a/t/t0071-sort.sh b/t/t0071-sort.sh
new file mode 100755
index 0000000000..6f9a501c72
--- /dev/null
+++ b/t/t0071-sort.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+test_description='verify sort functions'
+
+TEST_PASSES_SANITIZE_LEAK=true
+. ./test-lib.sh
+
+test_expect_success 'llist_mergesort()' '
+	test-tool mergesort test
+'
+
+test_done
diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
index 9bf66c9e68..9067572648 100755
--- a/t/t0090-cache-tree.sh
+++ b/t/t0090-cache-tree.sh
@@ -195,6 +195,7 @@ test_expect_success 'reset --hard gives cache-tree' '
 
 test_expect_success 'reset --hard without index gives cache-tree' '
 	rm -f .git/index &&
+	git clean -fd &&
 	git reset --hard &&
 	test_cache_tree
 '
diff --git a/t/t0091-bugreport.sh b/t/t0091-bugreport.sh
index 526304ff95..eeedbfa919 100755
--- a/t/t0091-bugreport.sh
+++ b/t/t0091-bugreport.sh
@@ -2,6 +2,7 @@
 
 test_description='git bugreport'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # Headers "[System Info]" will be followed by a non-empty line if we put some
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/t0210-trace2-normal.sh b/t/t0210-trace2-normal.sh
index 0cf3a63b75..37c359bd5a 100755
--- a/t/t0210-trace2-normal.sh
+++ b/t/t0210-trace2-normal.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='test trace2 facility (normal target)'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # Turn off any inherited trace2 settings for this test.
diff --git a/t/t0210/scrub_normal.perl b/t/t0210/scrub_normal.perl
index c65d1a815e..7cc4de392a 100644
--- a/t/t0210/scrub_normal.perl
+++ b/t/t0210/scrub_normal.perl
@@ -42,6 +42,12 @@ while (<>) {
 	# so just omit it for testing purposes.
 	# print "cmd_path _EXE_\n";
     }
+    elsif ($line =~ m/^cmd_ancestry/) {
+	# 'cmd_ancestry' is not implemented everywhere, so for portability's
+	# sake, skip it when parsing normal.
+	#
+	# print "$line";
+    }
     else {
 	print "$line";
     }
diff --git a/t/t0211-trace2-perf.sh b/t/t0211-trace2-perf.sh
index 6ee8ee3b67..22d0845544 100755
--- a/t/t0211-trace2-perf.sh
+++ b/t/t0211-trace2-perf.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='test trace2 facility (perf target)'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # Turn off any inherited trace2 settings for this test.
diff --git a/t/t0211/scrub_perf.perl b/t/t0211/scrub_perf.perl
index 351af7844e..d164b750ff 100644
--- a/t/t0211/scrub_perf.perl
+++ b/t/t0211/scrub_perf.perl
@@ -44,6 +44,11 @@ while (<>) {
 	# $tokens[$col_rest] = "_EXE_";
 	goto SKIP_LINE;
     }
+    elsif ($tokens[$col_event] =~ m/cmd_ancestry/) {
+	# 'cmd_ancestry' is platform-specific and not implemented everywhere,
+	# so skip it.
+	goto SKIP_LINE;
+    }
     elsif ($tokens[$col_event] =~ m/child_exit/) {
 	$tokens[$col_rest] =~ s/ pid:\d* / pid:_PID_ /;
     }
diff --git a/t/t0212-trace2-event.sh b/t/t0212-trace2-event.sh
index 1529155cf0..6d3374ff77 100755
--- a/t/t0212-trace2-event.sh
+++ b/t/t0212-trace2-event.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='test trace2 facility'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # Turn off any inherited trace2 settings for this test.
diff --git a/t/t0212/parse_events.perl b/t/t0212/parse_events.perl
index 6584bb5634..b6408560c0 100644
--- a/t/t0212/parse_events.perl
+++ b/t/t0212/parse_events.perl
@@ -132,7 +132,10 @@ while (<>) {
 	# just omit it for testing purposes.
 	# $processes->{$sid}->{'path'} = "_EXE_";
     }
-    
+    elsif ($event eq 'cmd_ancestry') {
+	# 'cmd_ancestry' is platform-specific and not implemented everywhere, so
+	# just skip it for testing purposes.
+    }
     elsif ($event eq 'cmd_name') {
 	$processes->{$sid}->{'name'} = $line->{'name'};
 	$processes->{$sid}->{'hierarchy'} = $line->{'hierarchy'};
diff --git a/t/t0301-credential-cache.sh b/t/t0301-credential-cache.sh
index ebd5fa5249..698b7159f0 100755
--- a/t/t0301-credential-cache.sh
+++ b/t/t0301-credential-cache.sh
@@ -9,6 +9,21 @@ test -z "$NO_UNIX_SOCKETS" || {
 	test_done
 }
 
+uname_s=$(uname -s)
+case $uname_s in
+*MINGW*)
+	test_path_is_socket () {
+		# `test -S` cannot detect Win10's Unix sockets
+		test_path_exists "$1"
+	}
+	;;
+*)
+	test_path_is_socket () {
+		test -S "$1"
+	}
+	;;
+esac
+
 # don't leave a stale daemon running
 test_atexit 'git credential-cache exit'
 
@@ -21,7 +36,7 @@ test_expect_success 'socket defaults to ~/.cache/git/credential/socket' '
 		rmdir -p .cache/git/credential/
 	" &&
 	test_path_is_missing "$HOME/.git-credential-cache" &&
-	test -S "$HOME/.cache/git/credential/socket"
+	test_path_is_socket "$HOME/.cache/git/credential/socket"
 '
 
 XDG_CACHE_HOME="$HOME/xdg"
@@ -31,7 +46,7 @@ helper_test cache
 
 test_expect_success "use custom XDG_CACHE_HOME if set and default sockets are not created" '
 	test_when_finished "git credential-cache exit" &&
-	test -S "$XDG_CACHE_HOME/git/credential/socket" &&
+	test_path_is_socket "$XDG_CACHE_HOME/git/credential/socket" &&
 	test_path_is_missing "$HOME/.git-credential-cache/socket" &&
 	test_path_is_missing "$HOME/.cache/git/credential/socket"
 '
@@ -48,7 +63,7 @@ test_expect_success 'credential-cache --socket option overrides default location
 	username=store-user
 	password=store-pass
 	EOF
-	test -S "$HOME/dir/socket"
+	test_path_is_socket "$HOME/dir/socket"
 '
 
 test_expect_success "use custom XDG_CACHE_HOME even if xdg socket exists" '
@@ -62,7 +77,7 @@ test_expect_success "use custom XDG_CACHE_HOME even if xdg socket exists" '
 	username=store-user
 	password=store-pass
 	EOF
-	test -S "$HOME/.cache/git/credential/socket" &&
+	test_path_is_socket "$HOME/.cache/git/credential/socket" &&
 	XDG_CACHE_HOME="$HOME/xdg" &&
 	export XDG_CACHE_HOME &&
 	check approve cache <<-\EOF &&
@@ -71,7 +86,7 @@ test_expect_success "use custom XDG_CACHE_HOME even if xdg socket exists" '
 	username=store-user
 	password=store-pass
 	EOF
-	test -S "$XDG_CACHE_HOME/git/credential/socket"
+	test_path_is_socket "$XDG_CACHE_HOME/git/credential/socket"
 '
 
 test_expect_success 'use user socket if user directory exists' '
@@ -79,14 +94,15 @@ test_expect_success 'use user socket if user directory exists' '
 		git credential-cache exit &&
 		rmdir \"\$HOME/.git-credential-cache/\"
 	" &&
-	mkdir -p -m 700 "$HOME/.git-credential-cache/" &&
+	mkdir -p "$HOME/.git-credential-cache/" &&
+	chmod 700 "$HOME/.git-credential-cache/" &&
 	check approve cache <<-\EOF &&
 	protocol=https
 	host=example.com
 	username=store-user
 	password=store-pass
 	EOF
-	test -S "$HOME/.git-credential-cache/socket"
+	test_path_is_socket "$HOME/.git-credential-cache/socket"
 '
 
 test_expect_success SYMLINKS 'use user socket if user directory is a symlink to a directory' '
@@ -103,7 +119,7 @@ test_expect_success SYMLINKS 'use user socket if user directory is a symlink to
 	username=store-user
 	password=store-pass
 	EOF
-	test -S "$HOME/.git-credential-cache/socket"
+	test_path_is_socket "$HOME/.git-credential-cache/socket"
 '
 
 helper_test_timeout cache --timeout=1
diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
index a211a66c67..f17abd298c 100755
--- a/t/t0410-partial-clone.sh
+++ b/t/t0410-partial-clone.sh
@@ -4,6 +4,13 @@ test_description='partial clone'
 
 . ./test-lib.sh
 
+# missing promisor objects cause repacks which write bitmaps to fail
+GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0
+# When enabled, some commands will write commit-graphs. This causes fsck
+# to fail when delete_object() is called because fsck will attempt to
+# verify the out-of-sync commit graph.
+GIT_TEST_COMMIT_GRAPH=0
+
 delete_object () {
 	rm $1/.git/objects/$(echo $2 | sed -e 's|^..|&/|')
 }
@@ -319,7 +326,7 @@ test_expect_success 'rev-list stops traversal at missing and promised commit' '
 
 	git -C repo config core.repositoryformatversion 1 &&
 	git -C repo config extensions.partialclone "arbitrary string" &&
-	GIT_TEST_COMMIT_GRAPH=0 git -C repo -c core.commitGraph=false rev-list --exclude-promisor-objects --objects bar >out &&
+	git -C repo rev-list --exclude-promisor-objects --objects bar >out &&
 	grep $(git -C repo rev-parse bar) out &&
 	! grep $FOO out
 '
@@ -462,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
 '
 
@@ -536,7 +543,13 @@ test_expect_success 'gc does not repack promisor objects if there are none' '
 repack_and_check () {
 	rm -rf repo2 &&
 	cp -r repo repo2 &&
-	git -C repo2 repack $1 -d &&
+	if test x"$1" = "x--must-fail"
+	then
+		shift
+		test_must_fail git -C repo2 repack $1 -d
+	else
+		git -C repo2 repack $1 -d
+	fi &&
 	git -C repo2 fsck &&
 
 	git -C repo2 cat-file -e $2 &&
@@ -561,6 +574,7 @@ test_expect_success 'repack -d does not irreversibly delete promisor objects' '
 	printf "$THREE\n" | pack_as_from_promisor &&
 	delete_object repo "$ONE" &&
 
+	repack_and_check --must-fail -ab "$TWO" "$THREE" &&
 	repack_and_check -a "$TWO" "$THREE" &&
 	repack_and_check -A "$TWO" "$THREE" &&
 	repack_and_check -l "$TWO" "$THREE"
diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh
index 013c5a7bc3..0e8c0dfbbe 100755
--- a/t/t1000-read-tree-m-3way.sh
+++ b/t/t1000-read-tree-m-3way.sh
@@ -71,6 +71,8 @@ In addition:
  DF: a special case, where A makes a directory and B makes a file.
 
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-read-tree.sh
 . "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh
index 1057a96b24..d1115528cb 100755
--- a/t/t1001-read-tree-m-2way.sh
+++ b/t/t1001-read-tree-m-2way.sh
@@ -20,6 +20,8 @@ In the test, these paths are used:
 	rezrov  - in H, deleted in M
 	yomin   - not in H or M
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-read-tree.sh
 
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/t1003-read-tree-prefix.sh b/t/t1003-read-tree-prefix.sh
index b6111cd150..e0db2066f3 100755
--- a/t/t1003-read-tree-prefix.sh
+++ b/t/t1003-read-tree-prefix.sh
@@ -6,6 +6,7 @@
 test_description='git read-tree --prefix test.
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
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 18b3779ccb..145eee11df 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -4,6 +4,98 @@ test_description='git cat-file'
 
 . ./test-lib.sh
 
+test_cmdmode_usage () {
+	test_expect_code 129 "$@" 2>err &&
+	grep "^error:.*is incompatible with" err
+}
+
+for switches in \
+	'-e -p' \
+	'-p -t' \
+	'-t -s' \
+	'-s --textconv' \
+	'--textconv --filters' \
+	'--batch-all-objects -e'
+do
+	test_expect_success "usage: cmdmode $switches" '
+		test_cmdmode_usage git cat-file $switches
+	'
+done
+
+test_incompatible_usage () {
+	test_expect_code 129 "$@" 2>err &&
+	grep -E "^(fatal|error):.*(requires|incompatible with|needs)" err
+}
+
+for opt in --batch --batch-check
+do
+	test_expect_success "usage: incompatible options: --path with $opt" '
+		test_incompatible_usage git cat-file --path=foo $opt
+	'
+done
+
+test_missing_usage () {
+	test_expect_code 129 "$@" 2>err &&
+	grep -E "^fatal:.*required" err
+}
+
+short_modes="-e -p -t -s"
+cw_modes="--textconv --filters"
+
+for opt in $cw_modes
+do
+	test_expect_success "usage: $opt requires another option" '
+		test_missing_usage git cat-file $opt
+	'
+done
+
+for opt in $short_modes
+do
+	test_expect_success "usage: $opt requires another option" '
+		test_missing_usage git cat-file $opt
+	'
+
+	for opt2 in --batch \
+		--batch-check \
+		--follow-symlinks \
+		"--path=foo HEAD:some-path.txt"
+	do
+		test_expect_success "usage: incompatible options: $opt and $opt2" '
+			test_incompatible_usage git cat-file $opt $opt2
+		'
+	done
+done
+
+test_too_many_arguments () {
+	test_expect_code 129 "$@" 2>err &&
+	grep -E "^fatal: too many arguments$" err
+}
+
+for opt in $short_modes $cw_modes
+do
+	args="one two three"
+	test_expect_success "usage: too many arguments: $opt $args" '
+		test_too_many_arguments git cat-file $opt $args
+	'
+
+	for opt2 in --buffer --follow-symlinks
+	do
+		test_expect_success "usage: incompatible arguments: $opt with batch option $opt2" '
+			test_incompatible_usage git cat-file $opt $opt2
+		'
+	done
+done
+
+for opt in --buffer \
+	--follow-symlinks \
+	--batch-all-objects
+do
+	test_expect_success "usage: bad option combination: $opt without batch mode" '
+		test_incompatible_usage git cat-file $opt &&
+		test_incompatible_usage git cat-file $opt commit HEAD
+	'
+done
+
 echo_without_newline () {
     printf '%s' "$*"
 }
@@ -211,14 +303,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 +318,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 +375,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
@@ -315,39 +407,237 @@ test_expect_success '%(deltabase) reports packed delta bases' '
 	}
 '
 
-bogus_type="bogus"
-bogus_content="bogus"
-bogus_size=$(strlen "$bogus_content")
-bogus_sha1=$(echo_without_newline "$bogus_content" | git hash-object -t $bogus_type --literally -w --stdin)
+test_expect_success 'setup bogus data' '
+	bogus_short_type="bogus" &&
+	bogus_short_content="bogus" &&
+	bogus_short_size=$(strlen "$bogus_short_content") &&
+	bogus_short_sha1=$(echo_without_newline "$bogus_short_content" | git hash-object -t $bogus_short_type --literally -w --stdin) &&
+
+	bogus_long_type="abcdefghijklmnopqrstuvwxyz1234679" &&
+	bogus_long_content="bogus" &&
+	bogus_long_size=$(strlen "$bogus_long_content") &&
+	bogus_long_sha1=$(echo_without_newline "$bogus_long_content" | git hash-object -t $bogus_long_type --literally -w --stdin)
+'
+
+for arg1 in '' --allow-unknown-type
+do
+	for arg2 in -s -t -p
+	do
+		if test "$arg1" = "--allow-unknown-type" && test "$arg2" = "-p"
+		then
+			continue
+		fi
+
+
+		test_expect_success "cat-file $arg1 $arg2 error on bogus short OID" '
+			cat >expect <<-\EOF &&
+			fatal: invalid object type
+			EOF
+
+			if test "$arg1" = "--allow-unknown-type"
+			then
+				git cat-file $arg1 $arg2 $bogus_short_sha1
+			else
+				test_must_fail git cat-file $arg1 $arg2 $bogus_short_sha1 >out 2>actual &&
+				test_must_be_empty out &&
+				test_cmp expect actual
+			fi
+		'
+
+		test_expect_success "cat-file $arg1 $arg2 error on bogus full OID" '
+			if test "$arg2" = "-p"
+			then
+				cat >expect <<-EOF
+				error: header for $bogus_long_sha1 too long, exceeds 32 bytes
+				fatal: Not a valid object name $bogus_long_sha1
+				EOF
+			else
+				cat >expect <<-EOF
+				error: header for $bogus_long_sha1 too long, exceeds 32 bytes
+				fatal: git cat-file: could not get object info
+				EOF
+			fi &&
+
+			if test "$arg1" = "--allow-unknown-type"
+			then
+				git cat-file $arg1 $arg2 $bogus_short_sha1
+			else
+				test_must_fail git cat-file $arg1 $arg2 $bogus_long_sha1 >out 2>actual &&
+				test_must_be_empty out &&
+				test_cmp expect actual
+			fi
+		'
+
+		test_expect_success "cat-file $arg1 $arg2 error on missing short OID" '
+			cat >expect.err <<-EOF &&
+			fatal: Not a valid object name $(test_oid deadbeef_short)
+			EOF
+			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef_short) >out 2>err.actual &&
+			test_must_be_empty out
+		'
+
+		test_expect_success "cat-file $arg1 $arg2 error on missing full OID" '
+			if test "$arg2" = "-p"
+			then
+				cat >expect.err <<-EOF
+				fatal: Not a valid object name $(test_oid deadbeef)
+				EOF
+			else
+				cat >expect.err <<-\EOF
+				fatal: git cat-file: could not get object info
+				EOF
+			fi &&
+			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef) >out 2>err.actual &&
+			test_must_be_empty out &&
+			test_cmp expect.err err.actual
+		'
+	done
+done
+
+test_expect_success '-e is OK with a broken object without --allow-unknown-type' '
+	git cat-file -e $bogus_short_sha1
+'
+
+test_expect_success '-e can not be combined with --allow-unknown-type' '
+	test_expect_code 128 git cat-file -e --allow-unknown-type $bogus_short_sha1
+'
+
+test_expect_success '-p cannot print a broken object even with --allow-unknown-type' '
+	test_must_fail git cat-file -p $bogus_short_sha1 &&
+	test_expect_code 128 git cat-file -p --allow-unknown-type $bogus_short_sha1
+'
+
+test_expect_success '<type> <hash> does not work with objects of broken types' '
+	cat >err.expect <<-\EOF &&
+	fatal: invalid object type "bogus"
+	EOF
+	test_must_fail git cat-file $bogus_short_type $bogus_short_sha1 2>err.actual &&
+	test_cmp err.expect err.actual
+'
+
+test_expect_success 'broken types combined with --batch and --batch-check' '
+	echo $bogus_short_sha1 >bogus-oid &&
+
+	cat >err.expect <<-\EOF &&
+	fatal: invalid object type
+	EOF
+
+	test_must_fail git cat-file --batch <bogus-oid 2>err.actual &&
+	test_cmp err.expect err.actual &&
+
+	test_must_fail git cat-file --batch-check <bogus-oid 2>err.actual &&
+	test_cmp err.expect err.actual
+'
+
+test_expect_success 'the --batch and --batch-check options do not combine with --allow-unknown-type' '
+	test_expect_code 128 git cat-file --batch --allow-unknown-type <bogus-oid &&
+	test_expect_code 128 git cat-file --batch-check --allow-unknown-type <bogus-oid
+'
+
+test_expect_success 'the --allow-unknown-type option does not consider replacement refs' '
+	cat >expect <<-EOF &&
+	$bogus_short_type
+	EOF
+	git cat-file -t --allow-unknown-type $bogus_short_sha1 >actual &&
+	test_cmp expect actual &&
+
+	# Create it manually, as "git replace" will die on bogus
+	# types.
+	head=$(git rev-parse --verify HEAD) &&
+	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
+	EOF
+	git cat-file -t --allow-unknown-type $bogus_short_sha1 >actual &&
+	test_cmp expect actual
+'
 
 test_expect_success "Type of broken object is correct" '
-	echo $bogus_type >expect &&
-	git cat-file -t --allow-unknown-type $bogus_sha1 >actual &&
+	echo $bogus_short_type >expect &&
+	git cat-file -t --allow-unknown-type $bogus_short_sha1 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success "Size of broken object is correct" '
-	echo $bogus_size >expect &&
-	git cat-file -s --allow-unknown-type $bogus_sha1 >actual &&
+	echo $bogus_short_size >expect &&
+	git cat-file -s --allow-unknown-type $bogus_short_sha1 >actual &&
 	test_cmp expect actual
 '
-bogus_type="abcdefghijklmnopqrstuvwxyz1234679"
-bogus_content="bogus"
-bogus_size=$(strlen "$bogus_content")
-bogus_sha1=$(echo_without_newline "$bogus_content" | git hash-object -t $bogus_type --literally -w --stdin)
+
+test_expect_success 'clean up broken object' '
+	rm .git/objects/$(test_oid_to_path $bogus_short_sha1)
+'
 
 test_expect_success "Type of broken object is correct when type is large" '
-	echo $bogus_type >expect &&
-	git cat-file -t --allow-unknown-type $bogus_sha1 >actual &&
+	echo $bogus_long_type >expect &&
+	git cat-file -t --allow-unknown-type $bogus_long_sha1 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success "Size of large broken object is correct when type is large" '
-	echo $bogus_size >expect &&
-	git cat-file -s --allow-unknown-type $bogus_sha1 >actual &&
+	echo $bogus_long_size >expect &&
+	git cat-file -s --allow-unknown-type $bogus_long_sha1 >actual &&
 	test_cmp expect actual
 '
 
+test_expect_success 'clean up broken object' '
+	rm .git/objects/$(test_oid_to_path $bogus_long_sha1)
+'
+
+test_expect_success 'cat-file -t and -s on corrupt loose object' '
+	git init --bare corrupt-loose.git &&
+	(
+		cd corrupt-loose.git &&
+
+		# Setup and create the empty blob and its path
+		empty_path=$(git rev-parse --git-path objects/$(test_oid_to_path "$EMPTY_BLOB")) &&
+		git hash-object -w --stdin </dev/null &&
+
+		# Create another blob and its path
+		echo other >other.blob &&
+		other_blob=$(git hash-object -w --stdin <other.blob) &&
+		other_path=$(git rev-parse --git-path objects/$(test_oid_to_path "$other_blob")) &&
+
+		# Before the swap the size is 0
+		cat >out.expect <<-EOF &&
+		0
+		EOF
+		git cat-file -s "$EMPTY_BLOB" >out.actual 2>err.actual &&
+		test_must_be_empty err.actual &&
+		test_cmp out.expect out.actual &&
+
+		# Swap the two to corrupt the repository
+		mv -f "$other_path" "$empty_path" &&
+		test_must_fail git fsck 2>err.fsck &&
+		grep "hash-path mismatch" err.fsck &&
+
+		# confirm that cat-file is reading the new swapped-in
+		# blob...
+		cat >out.expect <<-EOF &&
+		blob
+		EOF
+		git cat-file -t "$EMPTY_BLOB" >out.actual 2>err.actual &&
+		test_must_be_empty err.actual &&
+		test_cmp out.expect out.actual &&
+
+		# ... since it has a different size now.
+		cat >out.expect <<-EOF &&
+		6
+		EOF
+		git cat-file -s "$EMPTY_BLOB" >out.actual 2>err.actual &&
+		test_must_be_empty err.actual &&
+		test_cmp out.expect out.actual &&
+
+		# So far "cat-file" has been happy to spew the found
+		# content out as-is. Try to make it zlib-invalid.
+		mv -f other.blob "$empty_path" &&
+		test_must_fail git fsck 2>err.fsck &&
+		grep "^error: inflate: data stream error (" err.fsck
+	)
+'
+
 # Tests for git cat-file --follow-symlinks
 test_expect_success 'prep for symlink tests' '
 	echo_without_newline "$hello_content" >morx &&
@@ -608,4 +898,70 @@ test_expect_success 'cat-file --batch="batman" with --batch-all-objects will wor
 	cmp expect actual
 '
 
+test_expect_success 'set up replacement object' '
+	orig=$(git rev-parse HEAD) &&
+	git cat-file commit $orig >orig &&
+	{
+		cat orig &&
+		echo extra
+	} >fake &&
+	fake=$(git hash-object -t commit -w fake) &&
+	orig_size=$(git cat-file -s $orig) &&
+	fake_size=$(git cat-file -s $fake) &&
+	git replace $orig $fake
+'
+
+test_expect_success 'cat-file --batch respects replace objects' '
+	git cat-file --batch >actual <<-EOF &&
+	$orig
+	EOF
+	{
+		echo "$orig commit $fake_size" &&
+		cat fake &&
+		echo
+	} >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'cat-file --batch-check respects replace objects' '
+	git cat-file --batch-check >actual <<-EOF &&
+	$orig
+	EOF
+	echo "$orig commit $fake_size" >expect &&
+	test_cmp expect actual
+'
+
+# Pull the entry for object with oid "$1" out of the output of
+# "cat-file --batch", including its object content (which requires
+# parsing and reading a set amount of bytes, hence perl).
+extract_batch_output () {
+    perl -ne '
+	BEGIN { $oid = shift }
+	if (/^$oid \S+ (\d+)$/) {
+	    print;
+	    read STDIN, my $buf, $1;
+	    print $buf;
+	    print "\n";
+	}
+    ' "$@"
+}
+
+test_expect_success 'cat-file --batch-all-objects --batch ignores replace' '
+	git cat-file --batch-all-objects --batch >actual.raw &&
+	extract_batch_output $orig <actual.raw >actual &&
+	{
+		echo "$orig commit $orig_size" &&
+		cat orig &&
+		echo
+	} >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'cat-file --batch-all-objects --batch-check ignores replace' '
+	git cat-file --batch-all-objects --batch-check >actual.raw &&
+	grep ^$orig actual.raw >actual &&
+	echo "$orig commit $orig_size" >expect &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t1007-hash-object.sh b/t/t1007-hash-object.sh
index 64b340f227..ac5ad8c740 100755
--- a/t/t1007-hash-object.sh
+++ b/t/t1007-hash-object.sh
@@ -2,6 +2,7 @@
 
 test_description="git hash-object"
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 echo_without_newline() {
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/t1009-read-tree-new-index.sh b/t/t1009-read-tree-new-index.sh
index 2935f68f8d..fc179ac5dd 100755
--- a/t/t1009-read-tree-new-index.sh
+++ b/t/t1009-read-tree-new-index.sh
@@ -5,6 +5,7 @@ test_description='test read-tree into a fresh index file'
 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/t1010-mktree.sh b/t/t1010-mktree.sh
index b946f87686..3c08194526 100755
--- a/t/t1010-mktree.sh
+++ b/t/t1010-mktree.sh
@@ -2,13 +2,14 @@
 
 test_description='git mktree'
 
+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/t1012-read-tree-df.sh b/t/t1012-read-tree-df.sh
index 57f0770df1..cde93d22cd 100755
--- a/t/t1012-read-tree-df.sh
+++ b/t/t1012-read-tree-df.sh
@@ -2,6 +2,7 @@
 
 test_description='read-tree D/F conflict corner cases'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-read-tree.sh
 
diff --git a/t/t1013-read-tree-submodule.sh b/t/t1013-read-tree-submodule.sh
index b6df7444c0..bfc90d4cf2 100755
--- a/t/t1013-read-tree-submodule.sh
+++ b/t/t1013-read-tree-submodule.sh
@@ -6,7 +6,6 @@ test_description='read-tree can handle submodules'
 . "$TEST_DIRECTORY"/lib-submodule-update.sh
 
 KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
-KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1
 
 test_submodule_switch_recursing_with_args "read-tree -u -m"
 
diff --git a/t/t1014-read-tree-confusing.sh b/t/t1014-read-tree-confusing.sh
index da3376b3bb..8ea8d36818 100755
--- a/t/t1014-read-tree-confusing.sh
+++ b/t/t1014-read-tree-confusing.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='check that read-tree rejects confusing paths'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'create base tree' '
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
new file mode 100755
index 0000000000..a9953b6a71
--- /dev/null
+++ b/t/t1022-read-tree-partial-clone.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+test_description='git read-tree in partial clones'
+
+TEST_NO_CREATE_REPO=1
+
+. ./test-lib.sh
+
+test_expect_success 'read-tree in partial clone prefetches in one batch' '
+	test_when_finished "rm -rf server client trace" &&
+
+	git init server &&
+	echo foo >server/one &&
+	echo bar >server/two &&
+	git -C server add one two &&
+	git -C server commit -m "initial commit" &&
+	TREE=$(git -C server rev-parse HEAD^{tree}) &&
+
+	git -C server config uploadpack.allowfilter 1 &&
+	git -C server config uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:none "file://$(pwd)/server" client &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client read-tree $TREE &&
+
+	# "done" marks the end of negotiation (once per fetch). Expect that
+	# only one fetch occurs.
+	grep "fetch> done" trace >donelines &&
+	test_line_count = 1 donelines
+'
+
+test_done
diff --git a/t/t1050-large.sh b/t/t1050-large.sh
index 4bab6a513c..4f3aa17c99 100755
--- a/t/t1050-large.sh
+++ b/t/t1050-large.sh
@@ -17,6 +17,14 @@ test_expect_success setup '
 	export GIT_ALLOC_LIMIT
 '
 
+test_expect_success 'enter "large" codepath, with small core.bigFileThreshold' '
+	test_when_finished "rm -rf repo" &&
+
+	git init --bare repo &&
+	echo large | git -C repo hash-object -w --stdin &&
+	git -C repo -c core.bigfilethreshold=4 fsck
+'
+
 # add a large file with different settings
 while read expect config
 do
@@ -43,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
 '
 
@@ -107,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 &&
 
@@ -120,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 38fc8340f5..502d42d183 100755
--- a/t/t1091-sparse-checkout-builtin.sh
+++ b/t/t1091-sparse-checkout-builtin.sh
@@ -5,6 +5,9 @@ test_description='sparse checkout builtin tests'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+GIT_TEST_SPLIT_INDEX=false
+export GIT_TEST_SPLIT_INDEX
+
 . ./test-lib.sh
 
 list_files() {
@@ -41,7 +44,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
@@ -71,6 +82,12 @@ test_expect_success 'git sparse-checkout init' '
 	check_files repo a
 '
 
+test_expect_success 'git sparse-checkout init in empty repo' '
+	test_when_finished rm -rf empty-repo blank-template &&
+	git init --template= empty-repo &&
+	git -C empty-repo sparse-checkout init
+'
+
 test_expect_success 'git sparse-checkout list after init' '
 	git -C repo sparse-checkout list >actual &&
 	cat >expect <<-\EOF &&
@@ -103,6 +120,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 --worktree 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 &&
@@ -126,9 +155,9 @@ test_expect_success 'interaction with clone --no-checkout (unborn index)' '
 '
 
 test_expect_success 'set enables config' '
-	git init empty-config &&
+	git init worktree-config &&
 	(
-		cd empty-config &&
+		cd worktree-config &&
 		test_commit test file &&
 		test_path_is_missing .git/config.worktree &&
 		git sparse-checkout set nothing &&
@@ -165,12 +194,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 &&
@@ -179,6 +210,21 @@ test_expect_success 'add to sparse-checkout' '
 	check_files repo "a folder1 folder2"
 '
 
+test_expect_success 'worktree: add copies sparse-checkout patterns' '
+	cat repo/.git/info/sparse-checkout >old &&
+	test_when_finished cp old repo/.git/info/sparse-checkout &&
+	test_when_finished git -C repo worktree remove ../worktree &&
+	git -C repo sparse-checkout set --no-cone "/*" &&
+	git -C repo worktree add --quiet ../worktree 2>err &&
+	test_must_be_empty err &&
+	new="$(git -C worktree rev-parse --git-path info/sparse-checkout)" &&
+	test_path_is_file "$new" &&
+	test_cmp repo/.git/info/sparse-checkout "$new" &&
+	git -C worktree sparse-checkout set --cone &&
+	test_cmp_config -C worktree true core.sparseCheckoutCone &&
+	test_must_fail git -C repo core.sparseCheckoutCone
+'
+
 test_expect_success 'cone mode: match patterns' '
 	git -C repo config --worktree core.sparseCheckoutCone true &&
 	rm -rf repo/a repo/folder1 repo/folder2 &&
@@ -208,14 +254,29 @@ test_expect_success 'sparse-checkout disable' '
 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
+	test_cmp_config -C repo false index.sparse
 '
 
 test_expect_success 'cone mode: init and set' '
@@ -406,7 +467,7 @@ test_expect_success 'sparse-checkout (init|set|disable) warns with unmerged stat
 	git -C unmerged sparse-checkout disable
 '
 
-test_expect_success 'sparse-checkout reapply' '
+test_expect_failure 'sparse-checkout reapply' '
 	git clone repo tweak &&
 
 	echo dirty >tweak/deep/deeper2/a &&
@@ -438,6 +499,8 @@ test_expect_success 'sparse-checkout reapply' '
 	test_i18ngrep "warning.*The following paths are unmerged" err &&
 	test_path_is_file tweak/folder1/a &&
 
+	# NEEDSWORK: We are asking to update a file outside of the
+	# sparse-checkout cone, but this is no longer allowed.
 	git -C tweak add folder1/a &&
 	git -C tweak sparse-checkout reapply 2>err &&
 	test_must_be_empty err &&
@@ -476,13 +539,13 @@ test_expect_success 'interaction with submodules' '
 '
 
 test_expect_success 'different sparse-checkouts with worktrees' '
+	git -C repo sparse-checkout set --cone deep folder1 &&
 	git -C repo worktree add --detach ../worktree &&
-	check_files worktree "a deep folder1 folder2" &&
-	git -C worktree sparse-checkout init --cone &&
-	git -C repo sparse-checkout set folder1 &&
-	git -C worktree sparse-checkout set deep/deeper1 &&
-	check_files repo a folder1 &&
-	check_files worktree a deep
+	check_files worktree "a deep folder1" &&
+	git -C repo sparse-checkout set --cone folder1 &&
+	git -C worktree sparse-checkout set --cone deep/deeper1 &&
+	check_files repo "a folder1" &&
+	check_files worktree "a deep"
 '
 
 test_expect_success 'set using filename keeps file on-disk' '
@@ -579,7 +642,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
 '
 
@@ -642,4 +705,84 @@ test_expect_success MINGW 'cone mode replaces backslashes with slashes' '
 	check_files repo/deep a deeper1
 '
 
+test_expect_success 'cone mode clears ignored subdirectories' '
+	rm repo/.git/info/sparse-checkout &&
+
+	git -C repo sparse-checkout init --cone &&
+	git -C repo sparse-checkout set deep/deeper1 &&
+
+	cat >repo/.gitignore <<-\EOF &&
+	obj/
+	*.o
+	EOF
+
+	git -C repo add .gitignore &&
+	git -C repo commit -m ".gitignore" &&
+
+	mkdir -p repo/obj repo/folder1/obj repo/deep/deeper2/obj &&
+	for file in folder1/obj/a obj/a folder1/file.o folder1.o \
+		    deep/deeper2/obj/a deep/deeper2/file.o file.o
+	do
+		echo ignored >repo/$file || return 1
+	done &&
+
+	git -C repo status --porcelain=v2 >out &&
+	test_must_be_empty out &&
+
+	git -C repo sparse-checkout reapply &&
+	test_path_is_missing repo/folder1 &&
+	test_path_is_missing repo/deep/deeper2 &&
+	test_path_is_dir repo/obj &&
+	test_path_is_file repo/file.o &&
+
+	git -C repo status --porcelain=v2 >out &&
+	test_must_be_empty out &&
+
+	git -C repo sparse-checkout set deep/deeper2 &&
+	test_path_is_missing repo/deep/deeper1 &&
+	test_path_is_dir repo/deep/deeper2 &&
+	test_path_is_dir repo/obj &&
+	test_path_is_file repo/file.o &&
+
+	>repo/deep/deeper2/ignored.o &&
+	>repo/deep/deeper2/untracked &&
+
+	# When an untracked file is in the way, all untracked files
+	# (even ignored files) are preserved.
+	git -C repo sparse-checkout set folder1 2>err &&
+	grep "contains untracked files" err &&
+	test_path_is_file repo/deep/deeper2/ignored.o &&
+	test_path_is_file repo/deep/deeper2/untracked &&
+
+	# The rest of the cone matches expectation
+	test_path_is_missing repo/deep/deeper1 &&
+	test_path_is_dir repo/obj &&
+	test_path_is_file repo/file.o &&
+
+	git -C repo status --porcelain=v2 >out &&
+	echo "? deep/deeper2/untracked" >expect &&
+	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 d028b73eba..f3a059e5af 100755
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -17,30 +17,47 @@ test_expect_success 'setup' '
 		echo "after folder1" >g &&
 		echo "after x" >z &&
 		mkdir folder1 folder2 deep x &&
-		mkdir deep/deeper1 deep/deeper2 &&
+		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 &&
 		cp a folder2 &&
 		cp a x &&
 		cp a deep &&
+		cp a deep/before &&
 		cp a deep/deeper1 &&
 		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 &&
+		touch deep/deeper1/0/0/0 &&
+		>folder1- &&
+		>folder1.x &&
+		>folder10 &&
+		cp -r deep/deeper1/0 folder1 &&
+		cp -r deep/deeper1/0 folder2 &&
+		echo >>folder1/0/0/0 &&
+		echo >>folder2/0/1 &&
 		git add . &&
 		git commit -m "initial commit" &&
 		git checkout -b base &&
 		for dir in folder1 folder2 deep
 		do
-			git checkout -b update-$dir &&
+			git checkout -b update-$dir base &&
 			echo "updated $dir" >$dir/a &&
 			git commit -a -m "update $dir" || return 1
 		done &&
 
 		git checkout -b rename-base base &&
-		echo >folder1/larger-content <<-\EOF &&
+		cat >folder1/larger-content <<-\EOF &&
 		matching
 		lines
 		help
@@ -56,11 +73,17 @@ test_expect_success 'setup' '
 		mv folder1/a folder2/b &&
 		mv folder1/larger-content folder2/edited-content &&
 		echo >>folder2/edited-content &&
+		echo >>folder2/0/1 &&
+		echo stuff >>deep/deeper1/a &&
 		git add . &&
 		git commit -m "rename folder1/... to folder2/..." &&
 
 		git checkout -b rename-out-to-in rename-base &&
 		mv folder1/a deep/deeper1/b &&
+		echo more stuff >>deep/deeper1/a &&
+		rm folder2/0/1 &&
+		mkdir folder2/0/1 &&
+		echo >>folder2/0/1/1 &&
 		mv folder1/larger-content deep/deeper1/edited-content &&
 		echo >>deep/deeper1/edited-content &&
 		git add . &&
@@ -68,13 +91,47 @@ test_expect_success 'setup' '
 
 		git checkout -b rename-in-to-out rename-base &&
 		mv deep/deeper1/a folder1/b &&
+		echo >>folder2/0/1 &&
+		rm -rf folder1/0/0 &&
+		echo >>folder1/0/0 &&
 		mv deep/deeper1/larger-content folder1/edited-content &&
 		echo >>folder1/edited-content &&
 		git add . &&
 		git commit -m "rename deep/deeper1/... to folder1/..." &&
 
+		git checkout -b df-conflict-1 base &&
+		rm -rf folder1 &&
+		echo content >folder1 &&
+		git add . &&
+		git commit -m "dir to file" &&
+
+		git checkout -b df-conflict-2 base &&
+		rm -rf folder2 &&
+		echo content >folder2 &&
+		git add . &&
+		git commit -m "dir to file" &&
+
+		git checkout -b fd-conflict base &&
+		rm a &&
+		mkdir a &&
+		echo content >a/a &&
+		git add . &&
+		git commit -m "file to dir" &&
+
+		for side in left right
+		do
+			git checkout -b merge-$side base &&
+			echo $side >>deep/deeper2/a &&
+			echo $side >>folder1/a &&
+			echo $side >>folder2/a &&
+			git add . &&
+			git commit -m "$side" || return 1
+		done &&
+
 		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 &&
@@ -136,48 +193,55 @@ test_sparse_match () {
 	test_cmp sparse-checkout-err sparse-index-err
 }
 
+test_sparse_unstaged () {
+	file=$1 &&
+	for repo in sparse-checkout sparse-index
+	do
+		# Skip "unmerged" paths
+		git -C $repo diff --staged --diff-filter=u -- "$file" >diff &&
+		test_must_be_empty diff || return 1
+	done
+}
+
 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' '
@@ -196,6 +260,14 @@ test_expect_success 'status with options' '
 	test_all_match git status --porcelain=v2 -uno
 '
 
+test_expect_success 'status reports sparse-checkout' '
+	init_repos &&
+	git -C sparse-checkout status >full &&
+	git -C sparse-index status >sparse &&
+	test_i18ngrep "You are in a sparse checkout with " full &&
+	test_i18ngrep "You are in a sparse checkout." sparse
+'
+
 test_expect_success 'add, commit, checkout' '
 	init_repos &&
 
@@ -232,6 +304,99 @@ 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 &&
+
+	run_on_sparse mkdir folder1 &&
+	run_on_sparse ../edit-contents folder1/a &&
+	run_on_sparse ../edit-contents folder1/newfile &&
+	test_sparse_match test_must_fail git add folder1/a &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder1/a &&
+	test_sparse_match test_must_fail git add folder1/newfile &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder1/newfile
+'
+
+test_expect_success 'commit including unstaged changes' '
+	init_repos &&
+
+	write_script edit-file <<-\EOF &&
+	echo $1 >$2
+	EOF
+
+	run_on_all ../edit-file 1 a &&
+	run_on_all ../edit-file 1 deep/a &&
+
+	test_all_match git commit -m "-a" -a &&
+	test_all_match git status --porcelain=v2 &&
+
+	run_on_all ../edit-file 2 a &&
+	run_on_all ../edit-file 2 deep/a &&
+
+	test_all_match git commit -m "--include" --include deep/a &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m "--include" --include a &&
+	test_all_match git status --porcelain=v2 &&
+
+	run_on_all ../edit-file 3 a &&
+	run_on_all ../edit-file 3 deep/a &&
+
+	test_all_match git commit -m "--amend" -a --amend &&
+	test_all_match git status --porcelain=v2
+'
+
+test_expect_success 'status/add: outside sparse cone' '
+	init_repos &&
+
+	# folder1 is at HEAD, but outside the sparse cone
+	run_on_sparse mkdir folder1 &&
+	cp initial-repo/folder1/a sparse-checkout/folder1/a &&
+	cp initial-repo/folder1/a sparse-index/folder1/a &&
+
+	test_sparse_match git status &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+	run_on_sparse ../edit-contents folder1/a &&
+	run_on_all ../edit-contents folder1/new &&
+
+	test_sparse_match git status --porcelain=v2 &&
+
+	# Adding the path outside of the sparse-checkout cone should fail.
+	test_sparse_match test_must_fail git add folder1/a &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder1/a &&
+	test_sparse_match test_must_fail git add --refresh folder1/a &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder1/a &&
+	test_sparse_match test_must_fail git add folder1/new &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder1/new &&
+	test_sparse_match git add --sparse folder1/a &&
+	test_sparse_match git add --sparse folder1/new &&
+
+	test_all_match git add --sparse . &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m folder1/new &&
+	test_all_match git rev-parse HEAD^{tree} &&
+
+	run_on_all ../edit-contents folder1/newer &&
+	test_all_match git add --sparse folder1/ &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m folder1/newer &&
+	test_all_match git rev-parse HEAD^{tree}
+'
+
 test_expect_success 'checkout and reset --hard' '
 	init_repos &&
 
@@ -247,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 &&
@@ -256,21 +421,48 @@ 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
 '
 
-test_expect_success 'diff with renames' '
+# NEEDSWORK: sparse-checkout behaves differently from full-checkout when
+# running this test with 'df-conflict-2' after 'df-conflict-1'.
+test_expect_success 'diff with renames and conflicts' '
 	init_repos &&
 
-	for branch in rename-out-to-out rename-out-to-in rename-in-to-out
+	for branch in rename-out-to-out \
+		      rename-out-to-in \
+		      rename-in-to-out \
+		      df-conflict-1 \
+		      fd-conflict
 	do
 		test_all_match git checkout rename-base &&
 		test_all_match git checkout $branch -- . &&
-		test_all_match git diff --staged --no-renames &&
-		test_all_match git diff --staged --find-renames || return 1
+		test_all_match git status --porcelain=v2 &&
+		test_all_match git diff --cached --no-renames &&
+		test_all_match git diff --cached --find-renames || return 1
+	done
+'
+
+test_expect_success 'diff with directory/file conflicts' '
+	init_repos &&
+
+	for branch in rename-out-to-out \
+		      rename-out-to-in \
+		      rename-in-to-out \
+		      df-conflict-1 \
+		      df-conflict-2 \
+		      fd-conflict
+	do
+		git -C full-checkout reset --hard &&
+		test_sparse_match git reset --hard &&
+		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 --cached --no-renames &&
+		test_all_match git diff --cached --find-renames || return 1
 	done
 '
 
@@ -291,55 +483,408 @@ 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
 '
 
-# TODO: reset currently does not behave as expected when in a
-# sparse-checkout.
-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
 '
 
-# Ensure that sparse-index behaves identically to
-# sparse-checkout with a full index.
-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 'merge' '
+test_expect_success 'checkout and reset (keep)' '
 	init_repos &&
 
-	test_all_match git checkout -b merge update-deep &&
-	test_all_match git merge -m "folder1" update-folder1 &&
-	test_all_match git rev-parse HEAD^{tree} &&
-	test_all_match git merge -m "folder2" 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 --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_all_match git ls-files -s -- folder1 &&
+
+	test_sparse_match git reset update-folder2 -- folder2/a &&
+	git -C full-checkout reset update-folder2 -- folder2/a &&
+	test_all_match git ls-files -s -- 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 'update-index modify outside sparse definition' '
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+
+	# Create & modify folder1/a
+	# Note that this setup is a manual way of reaching the erroneous
+	# condition in which a `skip-worktree` enabled, outside-of-cone file
+	# exists on disk. It is used here to ensure `update-index` is stable
+	# and behaves predictably if such a condition occurs.
+	run_on_sparse mkdir -p folder1 &&
+	run_on_sparse cp ../initial-repo/folder1/a folder1/a &&
+	run_on_all ../edit-contents folder1/a &&
+
+	# If file has skip-worktree enabled, update-index does not modify the
+	# index entry
+	test_sparse_match git update-index folder1/a &&
+	test_sparse_match git status --porcelain=v2 &&
+	test_must_be_empty sparse-checkout-out &&
+
+	# When skip-worktree is disabled (even on files outside sparse cone), file
+	# is updated in the index
+	test_sparse_match git update-index --no-skip-worktree folder1/a &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git update-index folder1/a &&
+	test_all_match git status --porcelain=v2
+'
+
+test_expect_success 'update-index --add outside sparse definition' '
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+
+	# Create folder1, add new file
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all ../edit-contents folder1/b &&
+
+	# The *untracked* out-of-cone file is added to the index because it does
+	# not have a `skip-worktree` bit to signal that it should be ignored
+	# (unlike in `git add`, which will fail due to the file being outside
+	# the sparse checkout definition).
+	test_all_match git update-index --add folder1/b &&
+	test_all_match git status --porcelain=v2
+'
+
+# NEEDSWORK: `--remove`, unlike the rest of `update-index`, does not ignore
+# `skip-worktree` entries by default and will remove them from the index.
+# The `--ignore-skip-worktree-entries` flag must be used in conjunction with
+# `--remove` to ignore the `skip-worktree` entries and prevent their removal
+# from the index.
+test_expect_success 'update-index --remove outside sparse definition' '
+	init_repos &&
+
+	# When --ignore-skip-worktree-entries is _not_ specified:
+	# out-of-cone, not-on-disk files are removed from the index
+	test_sparse_match git update-index --remove folder1/a &&
+	cat >expect <<-EOF &&
+	D	folder1/a
+	EOF
+	test_sparse_match git diff --cached --name-status &&
+	test_cmp expect sparse-checkout-out &&
+
+	# Reset the state
+	test_all_match git reset --hard &&
+
+	# When --ignore-skip-worktree-entries is specified, out-of-cone
+	# (skip-worktree) files are ignored
+	test_sparse_match git update-index --remove --ignore-skip-worktree-entries folder1/a &&
+	test_sparse_match git diff --cached --name-status &&
+	test_must_be_empty sparse-checkout-out &&
+
+	# Reset the state
+	test_all_match git reset --hard &&
+
+	# --force-remove supercedes --ignore-skip-worktree-entries, removing
+	# a skip-worktree file from the index (and disk) when both are specified
+	# with --remove
+	test_sparse_match git update-index --force-remove --ignore-skip-worktree-entries folder1/a &&
+	cat >expect <<-EOF &&
+	D	folder1/a
+	EOF
+	test_sparse_match git diff --cached --name-status &&
+	test_cmp expect sparse-checkout-out
+'
+
+test_expect_success 'update-index with directories' '
+	init_repos &&
+
+	# update-index will exit silently when provided with a directory name
+	# containing a trailing slash
+	test_all_match git update-index deep/ folder1/ &&
+	grep "Ignoring path deep/" sparse-checkout-err &&
+	grep "Ignoring path folder1/" sparse-checkout-err &&
+
+	# When update-index is given a directory name WITHOUT a trailing slash, it will
+	# behave in different ways depending on the status of the directory on disk:
+	# * if it exists, the command exits with an error ("add individual files instead")
+	# * if it does NOT exist (e.g., in a sparse-checkout), it is assumed to be a
+	#   file and either triggers an error ("does not exist  and --remove not passed")
+	#   or is ignored completely (when using --remove)
+	test_all_match test_must_fail git update-index deep &&
+	run_on_all test_must_fail git update-index folder1 &&
+	test_must_fail git -C full-checkout update-index --remove folder1 &&
+	test_sparse_match git update-index --remove folder1 &&
+	test_all_match git status --porcelain=v2
+'
+
+test_expect_success 'update-index --again file outside sparse definition' '
+	init_repos &&
+
+	test_all_match git checkout -b test-reupdate &&
+
+	# Update HEAD without modifying the index to introduce a difference in
+	# folder1/a
+	test_sparse_match git reset --soft update-folder1 &&
+
+	# Because folder1/a differs in the index vs HEAD,
+	# `git update-index --no-skip-worktree --again` will effectively perform
+	# `git update-index --no-skip-worktree folder1/a` and remove the skip-worktree
+	# flag from folder1/a
+	test_sparse_match git update-index --no-skip-worktree --again &&
+	test_sparse_match git status --porcelain=v2 &&
+
+	cat >expect <<-EOF &&
+	D	folder1/a
+	EOF
+	test_sparse_match git diff --name-status &&
+	test_cmp expect sparse-checkout-out
+'
+
+test_expect_success 'update-index --cacheinfo' '
+	init_repos &&
+
+	deep_a_oid=$(git -C full-checkout rev-parse update-deep:deep/a) &&
+	folder2_oid=$(git -C full-checkout rev-parse update-folder2:folder2) &&
+	folder1_a_oid=$(git -C full-checkout rev-parse update-folder1:folder1/a) &&
+
+	test_all_match git update-index --cacheinfo 100644 $deep_a_oid deep/a &&
+	test_all_match git status --porcelain=v2 &&
+
+	# Cannot add sparse directory, even in sparse index case
+	test_all_match test_must_fail git update-index --add --cacheinfo 040000 $folder2_oid folder2/ &&
+
+	# Sparse match only: the new outside-of-cone entry is added *without* skip-worktree,
+	# so `git status` reports it as "deleted" in the worktree
+	test_sparse_match git update-index --add --cacheinfo 100644 $folder1_a_oid folder1/a &&
+	test_sparse_match git status --porcelain=v2 &&
+	cat >expect <<-EOF &&
+	MD folder1/a
+	EOF
+	test_sparse_match git status --short -- folder1/a &&
+	test_cmp expect sparse-checkout-out &&
+
+	# To return folder1/a to "normal" for a sparse checkout (ignored &
+	# outside-of-cone), add the skip-worktree flag.
+	test_sparse_match git update-index --skip-worktree folder1/a &&
+	cat >expect <<-EOF &&
+	S folder1/a
+	EOF
+	test_sparse_match git ls-files -t -- folder1/a &&
+	test_cmp expect sparse-checkout-out
+'
+
+test_expect_success 'merge, cherry-pick, and rebase' '
+	init_repos &&
+
+	for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"
+	do
+		test_all_match git checkout -B temp update-deep &&
+		test_all_match git $OPERATION update-folder1 &&
+		test_all_match git rev-parse HEAD^{tree} &&
+		test_all_match git $OPERATION update-folder2 &&
+		test_all_match git rev-parse HEAD^{tree} || return 1
+	done
+'
+
+test_expect_success 'merge with conflict outside cone' '
+	init_repos &&
+
+	test_all_match git checkout -b merge-tip merge-left &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match test_must_fail git merge -m merge merge-right &&
+	test_all_match git status --porcelain=v2 &&
+
+	# Resolve the conflict in different ways:
+	# 1. Revert to the base
+	test_all_match git checkout base -- deep/deeper2/a &&
+	test_all_match git status --porcelain=v2 &&
+
+	# 2. Add the file with conflict markers
+	test_sparse_match test_must_fail git add folder1/a &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder1/a &&
+	test_all_match git add --sparse folder1/a &&
+	test_all_match git status --porcelain=v2 &&
+
+	# 3. Rename the file to another sparse filename and
+	#    accept conflict markers as resolved content.
+	run_on_all mv folder2/a folder2/z &&
+	test_sparse_match test_must_fail git add folder2 &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder2/z &&
+	test_all_match git add --sparse folder2 &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git merge --continue &&
+	test_all_match git status --porcelain=v2 &&
 	test_all_match git rev-parse HEAD^{tree}
 '
 
+test_expect_success 'cherry-pick/rebase with conflict outside cone' '
+	init_repos &&
+
+	for OPERATION in cherry-pick rebase
+	do
+		test_all_match git checkout -B tip &&
+		test_all_match git reset --hard merge-left &&
+		test_all_match git status --porcelain=v2 &&
+		test_all_match test_must_fail git $OPERATION merge-right &&
+		test_all_match git status --porcelain=v2 &&
+
+		# Resolve the conflict in different ways:
+		# 1. Revert to the base
+		test_all_match git checkout base -- deep/deeper2/a &&
+		test_all_match git status --porcelain=v2 &&
+
+		# 2. Add the file with conflict markers
+		# NEEDSWORK: Even though the merge conflict removed the
+		# SKIP_WORKTREE bit from the index entry for folder1/a, we should
+		# warn that this is a problematic add.
+		test_sparse_match test_must_fail git add folder1/a &&
+		grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+		test_sparse_unstaged folder1/a &&
+		test_all_match git add --sparse folder1/a &&
+		test_all_match git status --porcelain=v2 &&
+
+		# 3. Rename the file to another sparse filename and
+		#    accept conflict markers as resolved content.
+		# NEEDSWORK: This mode now fails, because folder2/z is
+		# outside of the sparse-checkout cone and does not match an
+		# existing index entry with the SKIP_WORKTREE bit cleared.
+		run_on_all mv folder2/a folder2/z &&
+		test_sparse_match test_must_fail git add folder2 &&
+		grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+		test_sparse_unstaged folder2/z &&
+		test_all_match git add --sparse folder2 &&
+		test_all_match git status --porcelain=v2 &&
+
+		test_all_match git $OPERATION --continue &&
+		test_all_match git status --porcelain=v2 &&
+		test_all_match git rev-parse HEAD^{tree} || return 1
+	done
+'
+
 test_expect_success 'merge with outside renames' '
 	init_repos &&
 
@@ -352,6 +897,96 @@ test_expect_success 'merge with outside renames' '
 	done
 '
 
+# Sparse-index fails to convert the index in the
+# final 'git cherry-pick' command.
+test_expect_success 'cherry-pick with conflicts' '
+	init_repos &&
+
+	write_script edit-conflict <<-\EOF &&
+	echo $1 >conflict
+	EOF
+
+	test_all_match git checkout -b to-cherry-pick &&
+	run_on_all ../edit-conflict ABC &&
+	test_all_match git add conflict &&
+	test_all_match git commit -m "conflict to pick" &&
+
+	test_all_match git checkout -B base HEAD~1 &&
+	run_on_all ../edit-conflict DEF &&
+	test_all_match git add conflict &&
+	test_all_match git commit -m "conflict in base" &&
+
+	test_all_match test_must_fail git cherry-pick to-cherry-pick
+'
+
+test_expect_success 'checkout-index inside sparse definition' '
+	init_repos &&
+
+	run_on_all rm -f deep/a &&
+	test_all_match git checkout-index -- deep/a &&
+	test_all_match git status --porcelain=v2 &&
+
+	echo test >>new-a &&
+	run_on_all cp ../new-a a &&
+	test_all_match test_must_fail git checkout-index -- a &&
+	test_all_match git checkout-index -f -- a &&
+	test_all_match git status --porcelain=v2
+'
+
+test_expect_success 'checkout-index outside sparse definition' '
+	init_repos &&
+
+	# Without --ignore-skip-worktree-bits, outside-of-cone files will trigger
+	# an error
+	test_sparse_match test_must_fail git checkout-index -- folder1/a &&
+	test_i18ngrep "folder1/a has skip-worktree enabled" sparse-checkout-err &&
+	test_path_is_missing folder1/a &&
+
+	# With --ignore-skip-worktree-bits, outside-of-cone files are checked out
+	test_sparse_match git checkout-index --ignore-skip-worktree-bits -- folder1/a &&
+	test_cmp sparse-checkout/folder1/a sparse-index/folder1/a &&
+	test_cmp sparse-checkout/folder1/a full-checkout/folder1/a &&
+
+	run_on_sparse rm -rf folder1 &&
+	echo test >new-a &&
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all cp ../new-a folder1/a &&
+
+	test_all_match test_must_fail git checkout-index --ignore-skip-worktree-bits -- folder1/a &&
+	test_all_match git checkout-index -f --ignore-skip-worktree-bits -- folder1/a &&
+	test_cmp sparse-checkout/folder1/a sparse-index/folder1/a &&
+	test_cmp sparse-checkout/folder1/a full-checkout/folder1/a
+'
+
+test_expect_success 'checkout-index with folders' '
+	init_repos &&
+
+	# Inside checkout definition
+	test_all_match test_must_fail git checkout-index -f -- deep/ &&
+
+	# Outside checkout definition
+	# Note: although all tests fail (as expected), the messaging differs. For
+	# non-sparse index checkouts, the error is that the "file" does not appear
+	# in the index; for sparse checkouts, the error is explicitly that the
+	# entry is a sparse directory.
+	run_on_all test_must_fail git checkout-index -f -- folder1/ &&
+	test_cmp full-checkout-err sparse-checkout-err &&
+	! test_cmp full-checkout-err sparse-index-err &&
+	grep "is a sparse directory" sparse-index-err
+'
+
+test_expect_success 'checkout-index --all' '
+	init_repos &&
+
+	test_all_match git checkout-index --all &&
+	test_sparse_match test_path_is_missing folder1 &&
+
+	# --ignore-skip-worktree-bits will cause `skip-worktree` files to be
+	# checked out, causing the outside-of-cone `folder1` to exist on-disk
+	test_all_match git checkout-index --ignore-skip-worktree-bits --all &&
+	test_all_match test_path_exists folder1
+'
+
 test_expect_success 'clean' '
 	init_repos &&
 
@@ -361,23 +996,42 @@ test_expect_success 'clean' '
 	test_all_match git commit -m "ignore bogus files" &&
 
 	run_on_sparse mkdir folder1 &&
+	run_on_all mkdir -p deep/untracked-deep &&
 	run_on_all touch folder1/bogus &&
+	run_on_all touch folder1/untracked &&
+	run_on_all touch deep/untracked-deep/bogus &&
+	run_on_all touch deep/untracked-deep/untracked &&
 
 	test_all_match git status --porcelain=v2 &&
 	test_all_match git clean -f &&
 	test_all_match git status --porcelain=v2 &&
 	test_sparse_match ls &&
 	test_sparse_match ls folder1 &&
+	run_on_all test_path_exists folder1/bogus &&
+	run_on_all test_path_is_missing folder1/untracked &&
+	run_on_all test_path_exists deep/untracked-deep/bogus &&
+	run_on_all test_path_exists deep/untracked-deep/untracked &&
+
+	test_all_match git clean -fd &&
+	test_all_match git status --porcelain=v2 &&
+	test_sparse_match ls &&
+	test_sparse_match ls folder1 &&
+	run_on_all test_path_exists folder1/bogus &&
+	run_on_all test_path_exists deep/untracked-deep/bogus &&
+	run_on_all test_path_is_missing deep/untracked-deep/untracked &&
 
 	test_all_match git clean -xf &&
 	test_all_match git status --porcelain=v2 &&
 	test_sparse_match ls &&
 	test_sparse_match ls folder1 &&
+	run_on_all test_path_is_missing folder1/bogus &&
+	run_on_all test_path_exists deep/untracked-deep/bogus &&
 
 	test_all_match git clean -xdf &&
 	test_all_match git status --porcelain=v2 &&
 	test_sparse_match ls &&
 	test_sparse_match ls folder1 &&
+	run_on_all test_path_is_missing deep/untracked-deep/bogus &&
 
 	test_sparse_match test_path_is_dir folder1
 '
@@ -385,6 +1039,7 @@ test_expect_success 'clean' '
 test_expect_success 'submodule handling' '
 	init_repos &&
 
+	test_sparse_match git sparse-checkout add modules &&
 	test_all_match mkdir modules &&
 	test_all_match touch modules/a &&
 	test_all_match git add modules &&
@@ -394,23 +1049,479 @@ test_expect_success 'submodule handling' '
 	test_all_match git commit -m "add submodule" &&
 
 	# having a submodule prevents "modules" from collapse
-	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
+	test_sparse_match git sparse-checkout set deep/deeper1 &&
+	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 -c core.fsmonitor="" status -uno &&
+		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 &&
+
+	if test "$1" = "!"
+	then
+		shift &&
+		test_must_fail env \
+			GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+			git -C sparse-index "$@" || return 1
+	else
+		GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+			git -C sparse-index "$@" || return 1
+	fi &&
+	test_region ! index ensure_full_index trace2.txt
+}
+
+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 &&
+	echo >>sparse-index/a &&
+	ensure_not_expanded commit --include a -m a &&
+	echo >>sparse-index/deep/deeper1/a &&
+	ensure_not_expanded commit --include deep/deeper1/a -m deeper &&
+	ensure_not_expanded checkout rename-out-to-out &&
+	ensure_not_expanded checkout - &&
+	ensure_not_expanded switch rename-out-to-out &&
+	ensure_not_expanded switch - &&
+	ensure_not_expanded reset --hard &&
+	ensure_not_expanded checkout rename-out-to-out -- deep/deeper1 &&
+	ensure_not_expanded reset --hard &&
+	ensure_not_expanded restore -s rename-out-to-out -- deep/deeper1 &&
+
+	echo >>sparse-index/README.md &&
+	ensure_not_expanded add -A &&
+	echo >>sparse-index/extra.txt &&
+	ensure_not_expanded add extra.txt &&
+	echo >>sparse-index/untracked.txt &&
+	ensure_not_expanded add . &&
+
+	ensure_not_expanded checkout-index -f a &&
+	ensure_not_expanded checkout-index -f --all &&
+	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 clean -fd &&
+
+	ensure_not_expanded checkout -f update-deep &&
+	test_config -C sparse-index pull.twohead ort &&
+	(
+		sane_unset GIT_TEST_MERGE_ALGORITHM &&
+		for OPERATION in "merge -m merge" cherry-pick rebase
+		do
+			ensure_not_expanded merge -m merge update-folder1 &&
+			ensure_not_expanded merge -m merge update-folder2 || return 1
+		done
+	)
+'
+
+test_expect_success 'sparse-index is not expanded: merge conflict in cone' '
+	init_repos &&
+
+	for side in right left
+	do
+		git -C sparse-index checkout -b expand-$side base &&
+		echo $side >sparse-index/deep/a &&
+		git -C sparse-index commit -a -m "$side" || return 1
+	done &&
+
+	(
+		sane_unset GIT_TEST_MERGE_ALGORITHM &&
+		git -C sparse-index config pull.twohead ort &&
+		ensure_not_expanded ! merge -m merged expand-right
+	)
+'
+
+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: update-index' '
+	init_repos &&
+
+	deep_a_oid=$(git -C full-checkout rev-parse update-deep:deep/a) &&
+	ensure_not_expanded update-index --cacheinfo 100644 $deep_a_oid deep/a &&
+
+	echo "test" >sparse-index/README.md &&
+	echo "test2" >sparse-index/a &&
+	rm -f sparse-index/deep/a &&
+
+	ensure_not_expanded update-index --add README.md &&
+	ensure_not_expanded update-index a &&
+	ensure_not_expanded update-index --remove deep/a &&
+
+	ensure_not_expanded reset --soft update-deep &&
+	ensure_not_expanded update-index --add --remove --again
+'
+
+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' '
+	init_repos &&
+
+	test_all_match git checkout rename-out-to-in &&
+
+	# Sparse checkouts do not agree with full checkouts about
+	# how to report a directory/file conflict during a reset.
+	# This command would fail with test_all_match because the
+	# full checkout reports "T folder1/0/1" while a sparse
+	# checkout reports "D folder1/0/1". This matches because
+	# the sparse checkouts skip "adding" the other side of
+	# the conflict.
+	test_sparse_match git reset --mixed HEAD~1 &&
+	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 git ls-files --stage &&
+	test_sparse_match git status --porcelain=v2
+'
+
+test_expect_success 'add everything with deep new file' '
+	init_repos &&
+
+	run_on_sparse git sparse-checkout set deep/deeper1/deepest &&
+
+	run_on_all touch deep/deeper1/x &&
+	test_all_match git add . &&
+	test_all_match git status --porcelain=v2
+'
+
+# NEEDSWORK: 'git checkout' behaves incorrectly in the case of
+# directory/file conflicts, even without sparse-checkout. Use this
+# test only as a documentation of the incorrect behavior, not a
+# measure of how it _should_ behave.
+test_expect_success 'checkout behaves oddly with df-conflict-1' '
+	init_repos &&
+
+	test_sparse_match git sparse-checkout disable &&
+
+	write_script edit-content <<-\EOF &&
+	echo content >>folder1/larger-content
+	git add folder1
+	EOF
+
+	run_on_all ../edit-content &&
+	test_all_match git status --porcelain=v2 &&
+
+	git -C sparse-checkout sparse-checkout init --cone &&
+	git -C sparse-index sparse-checkout init --cone --sparse-index &&
+
+	test_all_match git status --porcelain=v2 &&
+
+	# This checkout command should fail, because we have a staged
+	# change to folder1/larger-content, but the destination changes
+	# folder1 to a file.
+	git -C full-checkout checkout df-conflict-1 \
+		1>full-checkout-out \
+		2>full-checkout-err &&
+	git -C sparse-checkout checkout df-conflict-1 \
+		1>sparse-checkout-out \
+		2>sparse-checkout-err &&
+	git -C sparse-index checkout df-conflict-1 \
+		1>sparse-index-out \
+		2>sparse-index-err &&
+
+	# Instead, the checkout deletes the folder1 file and adds the
+	# folder1/larger-content file, leaving all other paths that were
+	# in folder1/ as deleted (without any warning).
+	cat >expect <<-EOF &&
+	D	folder1
+	A	folder1/larger-content
+	EOF
+	test_cmp expect full-checkout-out &&
+	test_cmp expect sparse-checkout-out &&
+
+	# The sparse-index reports no output
+	test_must_be_empty sparse-index-out &&
+
+	# stderr: Switched to branch df-conflict-1
+	test_cmp full-checkout-err sparse-checkout-err &&
+	test_cmp full-checkout-err sparse-checkout-err
+'
+
+# NEEDSWORK: 'git checkout' behaves incorrectly in the case of
+# directory/file conflicts, even without sparse-checkout. Use this
+# test only as a documentation of the incorrect behavior, not a
+# measure of how it _should_ behave.
+test_expect_success 'checkout behaves oddly with df-conflict-2' '
+	init_repos &&
+
+	test_sparse_match git sparse-checkout disable &&
+
+	write_script edit-content <<-\EOF &&
+	echo content >>folder2/larger-content
+	git add folder2
+	EOF
+
+	run_on_all ../edit-content &&
+	test_all_match git status --porcelain=v2 &&
+
+	git -C sparse-checkout sparse-checkout init --cone &&
+	git -C sparse-index sparse-checkout init --cone --sparse-index &&
+
+	test_all_match git status --porcelain=v2 &&
+
+	# This checkout command should fail, because we have a staged
+	# change to folder1/larger-content, but the destination changes
+	# folder1 to a file.
+	git -C full-checkout checkout df-conflict-2 \
+		1>full-checkout-out \
+		2>full-checkout-err &&
+	git -C sparse-checkout checkout df-conflict-2 \
+		1>sparse-checkout-out \
+		2>sparse-checkout-err &&
+	git -C sparse-index checkout df-conflict-2 \
+		1>sparse-index-out \
+		2>sparse-index-err &&
+
+	# The full checkout deviates from the df-conflict-1 case here!
+	# It drops the change to folder1/larger-content and leaves the
+	# folder1 path as-is on disk. The sparse-index behaves the same.
+	test_must_be_empty full-checkout-out &&
+	test_must_be_empty sparse-index-out &&
+
+	# In the sparse-checkout case, the checkout deletes the folder1
+	# file and adds the folder1/larger-content file, leaving all other
+	# paths that were in folder1/ as deleted (without any warning).
+	cat >expect <<-EOF &&
+	D	folder2
+	A	folder2/larger-content
+	EOF
+	test_cmp expect sparse-checkout-out &&
+
+	# Switched to branch df-conflict-1
+	test_cmp full-checkout-err sparse-checkout-err &&
+	test_cmp full-checkout-err sparse-index-err
+'
+
 test_done
diff --git a/t/t1100-commit-tree-options.sh b/t/t1100-commit-tree-options.sh
index ae66ba5bab..0f37a43fd3 100755
--- a/t/t1100-commit-tree-options.sh
+++ b/t/t1100-commit-tree-options.sh
@@ -12,6 +12,7 @@ Also make sure that command line parser understands the normal
 "flags first and then non flag arguments" command line.
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 cat >expected <<EOF
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 9ff46f3b04..7dd9b325d9 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 &&
@@ -2387,4 +2388,122 @@ test_expect_success '--get and --get-all with --fixed-value' '
 	test_must_fail git config --file=config --get-regexp --fixed-value fixed+ non-existent
 '
 
+test_expect_success 'includeIf.hasconfig:remote.*.url' '
+	git init hasremoteurlTest &&
+	test_when_finished "rm -rf hasremoteurlTest" &&
+
+	cat >include-this <<-\EOF &&
+	[user]
+		this = this-is-included
+	EOF
+	cat >dont-include-that <<-\EOF &&
+	[user]
+		that = that-is-not-included
+	EOF
+	cat >>hasremoteurlTest/.git/config <<-EOF &&
+	[includeIf "hasconfig:remote.*.url:foourl"]
+		path = "$(pwd)/include-this"
+	[includeIf "hasconfig:remote.*.url:barurl"]
+		path = "$(pwd)/dont-include-that"
+	[remote "foo"]
+		url = foourl
+	EOF
+
+	echo this-is-included >expect-this &&
+	git -C hasremoteurlTest config --get user.this >actual-this &&
+	test_cmp expect-this actual-this &&
+
+	test_must_fail git -C hasremoteurlTest config --get user.that
+'
+
+test_expect_success 'includeIf.hasconfig:remote.*.url respects last-config-wins' '
+	git init hasremoteurlTest &&
+	test_when_finished "rm -rf hasremoteurlTest" &&
+
+	cat >include-two-three <<-\EOF &&
+	[user]
+		two = included-config
+		three = included-config
+	EOF
+	cat >>hasremoteurlTest/.git/config <<-EOF &&
+	[remote "foo"]
+		url = foourl
+	[user]
+		one = main-config
+		two = main-config
+	[includeIf "hasconfig:remote.*.url:foourl"]
+		path = "$(pwd)/include-two-three"
+	[user]
+		three = main-config
+	EOF
+
+	echo main-config >expect-main-config &&
+	echo included-config >expect-included-config &&
+
+	git -C hasremoteurlTest config --get user.one >actual &&
+	test_cmp expect-main-config actual &&
+
+	git -C hasremoteurlTest config --get user.two >actual &&
+	test_cmp expect-included-config actual &&
+
+	git -C hasremoteurlTest config --get user.three >actual &&
+	test_cmp expect-main-config actual
+'
+
+test_expect_success 'includeIf.hasconfig:remote.*.url globs' '
+	git init hasremoteurlTest &&
+	test_when_finished "rm -rf hasremoteurlTest" &&
+
+	printf "[user]\ndss = yes\n" >double-star-start &&
+	printf "[user]\ndse = yes\n" >double-star-end &&
+	printf "[user]\ndsm = yes\n" >double-star-middle &&
+	printf "[user]\nssm = yes\n" >single-star-middle &&
+	printf "[user]\nno = no\n" >no &&
+
+	cat >>hasremoteurlTest/.git/config <<-EOF &&
+	[remote "foo"]
+		url = https://foo/bar/baz
+	[includeIf "hasconfig:remote.*.url:**/baz"]
+		path = "$(pwd)/double-star-start"
+	[includeIf "hasconfig:remote.*.url:**/nomatch"]
+		path = "$(pwd)/no"
+	[includeIf "hasconfig:remote.*.url:https:/**"]
+		path = "$(pwd)/double-star-end"
+	[includeIf "hasconfig:remote.*.url:nomatch:/**"]
+		path = "$(pwd)/no"
+	[includeIf "hasconfig:remote.*.url:https:/**/baz"]
+		path = "$(pwd)/double-star-middle"
+	[includeIf "hasconfig:remote.*.url:https:/**/nomatch"]
+		path = "$(pwd)/no"
+	[includeIf "hasconfig:remote.*.url:https://*/bar/baz"]
+		path = "$(pwd)/single-star-middle"
+	[includeIf "hasconfig:remote.*.url:https://*/baz"]
+		path = "$(pwd)/no"
+	EOF
+
+	git -C hasremoteurlTest config --get user.dss &&
+	git -C hasremoteurlTest config --get user.dse &&
+	git -C hasremoteurlTest config --get user.dsm &&
+	git -C hasremoteurlTest config --get user.ssm &&
+	test_must_fail git -C hasremoteurlTest config --get user.no
+'
+
+test_expect_success 'includeIf.hasconfig:remote.*.url forbids remote url in such included files' '
+	git init hasremoteurlTest &&
+	test_when_finished "rm -rf hasremoteurlTest" &&
+
+	cat >include-with-url <<-\EOF &&
+	[remote "bar"]
+		url = barurl
+	EOF
+	cat >>hasremoteurlTest/.git/config <<-EOF &&
+	[includeIf "hasconfig:remote.*.url:foourl"]
+		path = "$(pwd)/include-with-url"
+	EOF
+
+	# test with any Git command
+	test_must_fail git -C hasremoteurlTest status 2>err &&
+	grep "fatal: remote URLs cannot be configured in file directly or indirectly included by includeIf.hasconfig:remote.*.url" err
+'
+
 test_done
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/t1305-config-include.sh b/t/t1305-config-include.sh
index ccbb116c01..5cde79ef8c 100755
--- a/t/t1305-config-include.sh
+++ b/t/t1305-config-include.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 test_description='test config file include directives'
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # Force setup_explicit_git_dir() to run until the end. This is needed
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 4506cd435b..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
@@ -1598,6 +1598,40 @@ test_expect_success 'transaction cannot restart ongoing transaction' '
 	test_must_fail git show-ref --verify refs/heads/restart
 '
 
+test_expect_success PIPE 'transaction flushes status updates' '
+	mkfifo in out &&
+	(git update-ref --stdin <in >out &) &&
+
+	exec 9>in &&
+	exec 8<out &&
+	test_when_finished "exec 9>&-" &&
+	test_when_finished "exec 8<&-" &&
+
+	echo "start" >&9 &&
+	echo "start: ok" >expected &&
+	read line <&8 &&
+	echo "$line" >actual &&
+	test_cmp expected actual &&
+
+	echo "create refs/heads/flush $A" >&9 &&
+
+	echo prepare >&9 &&
+	echo "prepare: ok" >expected &&
+	read line <&8 &&
+	echo "$line" >actual &&
+	test_cmp expected actual &&
+
+	# This must now fail given that we have locked the ref.
+	test_must_fail git update-ref refs/heads/flush $B 2>stderr &&
+	grep "fatal: update_ref failed for ref ${SQ}refs/heads/flush${SQ}: cannot lock ref" stderr &&
+
+	echo commit >&9 &&
+	echo "commit: ok" >expected &&
+	read line <&8 &&
+	echo "$line" >actual &&
+	test_cmp expected actual
+'
+
 test_expect_success 'directory not created deleting packed ref' '
 	git branch d1/d2/r1 HEAD &&
 	git pack-refs --all &&
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 a237d9880e..51f8291628 100755
--- a/t/t1405-main-ref-store.sh
+++ b/t/t1405-main-ref-store.sh
@@ -9,12 +9,17 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 RUN="test-tool ref-store main"
 
-test_expect_success 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' '
-	test_commit one &&
+
+test_expect_success 'setup' '
+	test_commit one
+'
+
+test_expect_success REFFILES 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' '
 	N=`find .git/refs -type f | wc -l` &&
 	test "$N" != 0 &&
-	$RUN pack-refs 3 &&
-	N=`find .git/refs -type f | wc -l`
+	$RUN pack-refs PACK_REFS_PRUNE,PACK_REFS_ALL &&
+	N=`find .git/refs -type f` &&
+	test -z "$N"
 '
 
 test_expect_success 'create_symref(FOO, refs/heads/main)' '
@@ -29,13 +34,18 @@ 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 --
 '
 
+# In reftable, we keep the reflogs around for deleted refs.
+test_expect_success !REFFILES 'delete-reflog(FOO, refs/tags/new-tag)' '
+	$RUN delete-reflog FOO &&
+	$RUN delete-reflog refs/tags/new-tag
+'
+
 test_expect_success 'rename_refs(main, new-main)' '
 	git rev-parse main >expected &&
 	$RUN rename-ref refs/heads/main refs/heads/new-main &&
@@ -83,13 +93,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)' '
@@ -98,12 +108,12 @@ test_expect_success 'reflog_exists(HEAD)' '
 
 test_expect_success 'delete_reflog(HEAD)' '
 	$RUN delete-reflog HEAD &&
-	! test -f .git/logs/HEAD
+	test_must_fail git reflog exists HEAD
 '
 
-test_expect_success 'create-reflog(HEAD)' '
-	$RUN create-reflog HEAD 1 &&
-	test -f .git/logs/HEAD
+test_expect_success REFFILES 'create-reflog(HEAD)' '
+	$RUN create-reflog HEAD &&
+	git reflog exists HEAD
 '
 
 test_expect_success 'delete_ref(refs/heads/foo)' '
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 27b9080251..68f69bb543 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -341,7 +341,7 @@ test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' '
 # Each line is 114 characters, so we need 75 to still have a few before the
 # last 8K. The 89-character padding on the final entry lines up our
 # newline exactly.
-test_expect_success SHA1 'parsing reverse reflogs at BUFSIZ boundaries' '
+test_expect_success REFFILES,SHA1 'parsing reverse reflogs at BUFSIZ boundaries' '
 	git checkout -b reflogskip &&
 	zf=$(test_oid zero_2) &&
 	ident="abc <xyz> 0000000001 +0000" &&
@@ -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 &&
@@ -374,7 +374,9 @@ test_expect_failure 'reflog with non-commit entries displays all entries' '
 	test_line_count = 3 actual
 '
 
-test_expect_success 'reflog expire operates on symref not referrent' '
+# This test takes a lock on an individual ref; this is not supported in
+# reftable.
+test_expect_success REFFILES 'reflog expire operates on symref not referrent' '
 	git branch --create-reflog the_symref &&
 	git branch --create-reflog referrent &&
 	git update-ref referrent HEAD &&
@@ -416,7 +418,8 @@ test_expect_success 'expire with multiple worktrees' '
 		test_commit -C link-wt foobar &&
 		test_tick &&
 		git reflog expire --verbose --all --expire=$test_tick &&
-		test_must_be_empty .git/worktrees/link-wt/logs/HEAD
+		test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD >actual &&
+		test_must_be_empty actual
 	)
 '
 
diff --git a/t/t1416-ref-transaction-hooks.sh b/t/t1416-ref-transaction-hooks.sh
index 6c941027a8..4e1e84a91f 100755
--- a/t/t1416-ref-transaction-hooks.sh
+++ b/t/t1416-ref-transaction-hooks.sh
@@ -136,4 +136,54 @@ test_expect_success 'interleaving hook calls succeed' '
 	test_cmp expect target-repo.git/actual
 '
 
+test_expect_success 'hook does not get called on packing refs' '
+	# Pack references first such that we are in a known state.
+	git pack-refs --all &&
+
+	write_script .git/hooks/reference-transaction <<-\EOF &&
+		echo "$@" >>actual
+		cat >>actual
+	EOF
+	rm -f actual &&
+
+	git update-ref refs/heads/unpacked-ref $POST_OID &&
+	git pack-refs --all &&
+
+	# We only expect a single hook invocation, which is the call to
+	# git-update-ref(1).
+	cat >expect <<-EOF &&
+		prepared
+		$ZERO_OID $POST_OID refs/heads/unpacked-ref
+		committed
+		$ZERO_OID $POST_OID refs/heads/unpacked-ref
+	EOF
+
+	test_cmp expect actual
+'
+
+test_expect_success 'deleting packed ref calls hook once' '
+	# Create a reference and pack it.
+	git update-ref refs/heads/to-be-deleted $POST_OID &&
+	git pack-refs --all &&
+
+	write_script .git/hooks/reference-transaction <<-\EOF &&
+		echo "$@" >>actual
+		cat >>actual
+	EOF
+	rm -f actual &&
+
+	git update-ref -d refs/heads/to-be-deleted $POST_OID &&
+
+	# We only expect a single hook invocation, which is the logical
+	# deletion.
+	cat >expect <<-EOF &&
+		prepared
+		$POST_OID $ZERO_OID refs/heads/to-be-deleted
+		committed
+		$POST_OID $ZERO_OID refs/heads/to-be-deleted
+	EOF
+
+	test_cmp expect actual
+'
+
 test_done
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 b1839e0877..ff1c967d55 100755
--- a/t/t1430-bad-ref-name.sh
+++ b/t/t1430-bad-ref-name.sh
@@ -4,11 +4,13 @@ test_description='Test handling of ref names that check-ref-format rejects'
 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 '
 	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"' '
@@ -42,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 &&
@@ -59,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 &&
@@ -89,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 &&
@@ -97,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 &&
@@ -108,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 &&
@@ -118,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 &&
@@ -138,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 &&
@@ -147,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 &&
@@ -159,24 +162,24 @@ 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 &&
 	! grep -e "broken\.\.\.symref" output &&
 	test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
-	test_i18ngrep "ignoring broken ref refs/heads/badname" error &&
+	test_i18ngrep ! "ignoring broken ref refs/heads/badname" error &&
 	test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error
 '
 
 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 &&
@@ -186,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 &&
@@ -197,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 &&
@@ -208,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 &&
@@ -219,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 &&
@@ -228,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 &&
@@ -237,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 &&
@@ -249,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 &&
@@ -258,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 &&
@@ -267,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 &&
@@ -276,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 5071ac63a5..de50c0ea01 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -48,24 +48,70 @@ remove_object () {
 	rm "$(sha1_file "$1")"
 }
 
-test_expect_success 'object with bad sha1' '
-	sha=$(echo blob | git hash-object -w --stdin) &&
-	old=$(test_oid_to_path "$sha") &&
-	new=$(dirname $old)/$(test_oid ff_2) &&
-	sha="$(dirname $new)$(basename $new)" &&
-	mv .git/objects/$old .git/objects/$new &&
-	test_when_finished "remove_object $sha" &&
-	git update-index --add --cacheinfo 100644 $sha foo &&
-	test_when_finished "git read-tree -u --reset HEAD" &&
-	tree=$(git write-tree) &&
-	test_when_finished "remove_object $tree" &&
-	cmt=$(echo bogus | git commit-tree $tree) &&
-	test_when_finished "remove_object $cmt" &&
-	git update-ref refs/heads/bogus $cmt &&
-	test_when_finished "git update-ref -d refs/heads/bogus" &&
+test_expect_success 'object with hash mismatch' '
+	git init --bare hash-mismatch &&
+	(
+		cd hash-mismatch &&
 
-	test_must_fail git fsck 2>out &&
-	test_i18ngrep "$sha.*corrupt" out
+		oid=$(echo blob | git hash-object -w --stdin) &&
+		oldoid=$oid &&
+		old=$(test_oid_to_path "$oid") &&
+		new=$(dirname $old)/$(test_oid ff_2) &&
+		oid="$(dirname $new)$(basename $new)" &&
+
+		mv objects/$old objects/$new &&
+		git update-index --add --cacheinfo 100644 $oid foo &&
+		tree=$(git write-tree) &&
+		cmt=$(echo bogus | git commit-tree $tree) &&
+		git update-ref refs/heads/bogus $cmt &&
+
+		test_must_fail git fsck 2>out &&
+		grep "$oldoid: hash-path mismatch, found at: .*$new" out
+	)
+'
+
+test_expect_success 'object with hash and type mismatch' '
+	git init --bare hash-type-mismatch &&
+	(
+		cd hash-type-mismatch &&
+
+		oid=$(echo blob | git hash-object -w --stdin -t garbage --literally) &&
+		oldoid=$oid &&
+		old=$(test_oid_to_path "$oid") &&
+		new=$(dirname $old)/$(test_oid ff_2) &&
+		oid="$(dirname $new)$(basename $new)" &&
+
+		mv objects/$old objects/$new &&
+		git update-index --add --cacheinfo 100644 $oid foo &&
+		tree=$(git write-tree) &&
+		cmt=$(echo bogus | git commit-tree $tree) &&
+		git update-ref refs/heads/bogus $cmt &&
+
+
+		test_must_fail git fsck 2>out &&
+		grep "^error: $oldoid: hash-path mismatch, found at: .*$new" out &&
+		grep "^error: $oldoid: object is of unknown type '"'"'garbage'"'"'" out
+	)
+'
+
+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 +w $oidf &&
+		echo extra garbage >>$oidf &&
+
+		cat >expect.error <<-EOF &&
+		error: garbage at end of loose object '\''$oid'\''
+		error: unable to unpack contents of ./$oidf
+		error: $oid: object corrupt or missing: ./$oidf
+		EOF
+		test_must_fail git fsck 2>actual &&
+		grep ^error: actual >error &&
+		test_cmp expect.error error
+	)
 '
 
 test_expect_success 'branch pointing to non-commit' '
@@ -865,4 +911,21 @@ test_expect_success 'detect corrupt index file in fsck' '
 	test_i18ngrep "bad index file" errors
 '
 
+test_expect_success 'fsck error and recovery on invalid object type' '
+	git init --bare garbage-type &&
+	(
+		cd garbage-type &&
+
+		garbage_blob=$(git hash-object --stdin -w -t garbage --literally </dev/null) &&
+
+		cat >err.expect <<-\EOF &&
+		fatal: invalid object type
+		EOF
+		test_must_fail git fsck >out 2>err &&
+		grep -e "^error" -e "^fatal" err >errors &&
+		test_line_count = 1 errors &&
+		grep "$garbage_blob: object is of unknown type '"'"'garbage'"'"':" err
+	)
+'
+
 test_done
diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh
index b29563fc99..284fe18e72 100755
--- a/t/t1502-rev-parse-parseopt.sh
+++ b/t/t1502-rev-parse-parseopt.sh
@@ -282,4 +282,58 @@ test_expect_success 'test --parseopt --stuck-long and short option with unset op
 	test_cmp expect output
 '
 
+test_expect_success 'test --parseopt help output: "wrapped" options normal "or:" lines' '
+	sed -e "s/^|//" >spec <<-\EOF &&
+	|cmd [--some-option]
+	|    [--another-option]
+	|cmd [--yet-another-option]
+	|--
+	|h,help    show the help
+	EOF
+
+	sed -e "s/^|//" >expect <<-\END_EXPECT &&
+	|cat <<\EOF
+	|usage: cmd [--some-option]
+	|   or:     [--another-option]
+	|   or: cmd [--yet-another-option]
+	|
+	|    -h, --help            show the help
+	|
+	|EOF
+	END_EXPECT
+
+	test_must_fail git rev-parse --parseopt -- -h >out <spec >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'test --parseopt help output: multi-line blurb after empty line' '
+	sed -e "s/^|//" >spec <<-\EOF &&
+	|cmd [--some-option]
+	|    [--another-option]
+	|
+	|multi
+	|line
+	|blurb
+	|--
+	|h,help    show the help
+	EOF
+
+	sed -e "s/^|//" >expect <<-\END_EXPECT &&
+	|cat <<\EOF
+	|usage: cmd [--some-option]
+	|   or:     [--another-option]
+	|
+	|    multi
+	|    line
+	|    blurb
+	|
+	|    -h, --help            show the help
+	|
+	|EOF
+	END_EXPECT
+
+	test_must_fail git rev-parse --parseopt -- -h >out <spec >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh
index bf08102391..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()
@@ -142,7 +143,7 @@ test_expect_success 'main@{n} for various n' '
 	test_must_fail git rev-parse --verify main@{$Np1}
 '
 
-test_expect_success SYMLINKS 'ref resolution not confused by broken symlinks' '
+test_expect_success SYMLINKS,REFFILES 'ref resolution not confused by broken symlinks' '
 	ln -s does-not-exist .git/refs/heads/broken &&
 	test_must_fail git rev-parse --verify broken
 '
diff --git a/t/t1504-ceiling-dirs.sh b/t/t1504-ceiling-dirs.sh
index 3d51615e42..0fafcf9dde 100755
--- a/t/t1504-ceiling-dirs.sh
+++ b/t/t1504-ceiling-dirs.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='test GIT_CEILING_DIRECTORIES'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_prefix() {
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/t1510-repo-setup.sh b/t/t1510-repo-setup.sh
index bbfe05b8e4..591505a39c 100755
--- a/t/t1510-repo-setup.sh
+++ b/t/t1510-repo-setup.sh
@@ -43,6 +43,7 @@ A few rules for repo setup:
 # This test heavily relies on the standard error of nested function calls.
 test_untraceable=UnfortunatelyYes
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 here=$(pwd)
diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index 7891a6becf..98cefe3b70 100755
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -25,6 +25,87 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
 
+test_cmp_failed_rev_parse () {
+	dir=$1
+	rev=$2
+
+	cat >expect &&
+	test_must_fail git -C "$dir" rev-parse "$rev" 2>actual.raw &&
+	sed "s/\($rev\)[0-9a-f]*/\1.../" <actual.raw >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success 'ambiguous blob output' '
+	git init --bare blob.prefix &&
+	(
+		cd blob.prefix &&
+
+		# Both start with "dead..", under both SHA-1 and SHA-256
+		echo brocdnra | git hash-object -w --stdin &&
+		echo brigddsv | git hash-object -w --stdin &&
+
+		# Both start with "beef.."
+		echo 1agllotbh | git hash-object -w --stdin &&
+		echo 1bbfctrkc | git hash-object -w --stdin
+	) &&
+
+	test_must_fail git -C blob.prefix rev-parse dead &&
+	test_cmp_failed_rev_parse blob.prefix beef <<-\EOF
+	error: short object ID beef... is ambiguous
+	hint: The candidates are:
+	hint:   beef... blob
+	hint:   beef... blob
+	fatal: ambiguous argument '\''beef...'\'': unknown revision or path not in the working tree.
+	Use '\''--'\'' to separate paths from revisions, like this:
+	'\''git <command> [<revision>...] -- [<file>...]'\''
+	EOF
+'
+
+test_expect_success 'ambiguous loose bad object parsed as OBJ_BAD' '
+	git init --bare blob.bad &&
+	(
+		cd blob.bad &&
+
+		# Both have the prefix "bad0"
+		echo xyzfaowcoh | git hash-object -t bad -w --stdin --literally &&
+		echo xyzhjpyvwl | git hash-object -t bad -w --stdin --literally
+	) &&
+
+	test_cmp_failed_rev_parse blob.bad bad0 <<-\EOF
+	error: short object ID bad0... is ambiguous
+	fatal: invalid object type
+	EOF
+'
+
+test_expect_success POSIXPERM 'ambigous zlib corrupt loose blob' '
+	git init --bare blob.corrupt &&
+	(
+		cd blob.corrupt &&
+
+		# Both have the prefix "cafe"
+		echo bnkxmdwz | git hash-object -w --stdin &&
+		oid=$(echo bmwsjxzi | git hash-object -w --stdin) &&
+
+		oidf=objects/$(test_oid_to_path "$oid") &&
+		chmod 755 $oidf &&
+		echo broken >$oidf
+	) &&
+
+	test_cmp_failed_rev_parse blob.corrupt cafe <<-\EOF
+	error: short object ID cafe... is ambiguous
+	error: inflate: data stream error (incorrect header check)
+	error: unable to unpack cafe... header
+	error: inflate: data stream error (incorrect header check)
+	error: unable to unpack cafe... header
+	hint: The candidates are:
+	hint:   cafe... [bad object]
+	hint:   cafe... blob
+	fatal: ambiguous argument '\''cafe...'\'': unknown revision or path not in the working tree.
+	Use '\''--'\'' to separate paths from revisions, like this:
+	'\''git <command> [<revision>...] -- [<file>...]'\''
+	EOF
+'
+
 if ! test_have_prereq SHA1
 then
 	skip_all='not using SHA-1 for objects'
@@ -34,10 +115,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 +282,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 +462,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 c9b9e718b8..010989f90e 100755
--- a/t/t1600-index.sh
+++ b/t/t1600-index.sh
@@ -2,8 +2,11 @@
 
 test_description='index file specific tests'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
+sane_unset GIT_TEST_SPLIT_INDEX
+
 test_expect_success 'setup' '
 	echo 1 >a
 '
@@ -13,7 +16,8 @@ test_expect_success 'bogus GIT_INDEX_VERSION issues warning' '
 		rm -f .git/index &&
 		GIT_INDEX_VERSION=2bogus &&
 		export GIT_INDEX_VERSION &&
-		git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
+		git add a 2>err &&
+		sed "s/[0-9]//" err >actual.err &&
 		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
 			warning: GIT_INDEX_VERSION set, but the value is invalid.
 			Using version Z
@@ -27,7 +31,8 @@ test_expect_success 'out of bounds GIT_INDEX_VERSION issues warning' '
 		rm -f .git/index &&
 		GIT_INDEX_VERSION=1 &&
 		export GIT_INDEX_VERSION &&
-		git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
+		git add a 2>err &&
+		sed "s/[0-9]//" err >actual.err &&
 		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
 			warning: GIT_INDEX_VERSION set, but the value is invalid.
 			Using version Z
@@ -50,7 +55,8 @@ test_expect_success 'out of bounds index.version issues warning' '
 		sane_unset GIT_INDEX_VERSION &&
 		rm -f .git/index &&
 		git config --add index.version 1 &&
-		git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
+		git add a 2>err &&
+		sed "s/[0-9]//" err >actual.err &&
 		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
 			warning: index.version set, but the value is invalid.
 			Using version Z
@@ -79,7 +85,7 @@ test_index_version () {
 		else
 			unset GIT_INDEX_VERSION
 		fi &&
-		git add a 2>&1 &&
+		git add a &&
 		echo $EXPECTED_OUTPUT_VERSION >expect &&
 		test-tool index-version <.git/index >actual &&
 		test_cmp expect actual
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index 986baa612e..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 &&
 
@@ -510,4 +510,38 @@ test_expect_success 'do not refresh null base index' '
 	)
 '
 
+test_expect_success 'reading split index at alternate location' '
+	git init reading-alternate-location &&
+	(
+		cd reading-alternate-location &&
+		>file-in-alternate &&
+		git update-index --split-index --add file-in-alternate
+	) &&
+	echo file-in-alternate >expect &&
+
+	# Should be able to find the shared index both right next to
+	# the specified split index file ...
+	GIT_INDEX_FILE=./reading-alternate-location/.git/index \
+	git ls-files --cached >actual &&
+	test_cmp expect actual &&
+
+	# ... and, for backwards compatibility, in the current GIT_DIR
+	# as well.
+	mv -v ./reading-alternate-location/.git/sharedindex.* .git &&
+	GIT_INDEX_FILE=./reading-alternate-location/.git/index \
+	git ls-files --cached >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'GIT_TEST_SPLIT_INDEX works' '
+	git init git-test-split-index &&
+	(
+		cd git-test-split-index &&
+		>file &&
+		GIT_TEST_SPLIT_INDEX=1 git update-index --add file &&
+		ls -l .git/sharedindex.* >actual &&
+		test_line_count = 1 actual
+	)
+'
+
 test_done
diff --git a/t/t1800-hook.sh b/t/t1800-hook.sh
new file mode 100755
index 0000000000..29718aa991
--- /dev/null
+++ b/t/t1800-hook.sh
@@ -0,0 +1,134 @@
+#!/bin/sh
+
+test_description='git-hook command'
+
+TEST_PASSES_SANITIZE_LEAK=true
+. ./test-lib.sh
+
+test_expect_success 'git hook usage' '
+	test_expect_code 129 git hook &&
+	test_expect_code 129 git hook run &&
+	test_expect_code 129 git hook run -h &&
+	test_expect_code 129 git hook run --unknown 2>err &&
+	grep "unknown option" err
+'
+
+test_expect_success 'git hook run: nonexistent hook' '
+	cat >stderr.expect <<-\EOF &&
+	error: cannot find a hook named test-hook
+	EOF
+	test_expect_code 1 git hook run test-hook 2>stderr.actual &&
+	test_cmp stderr.expect stderr.actual
+'
+
+test_expect_success 'git hook run: nonexistent hook with --ignore-missing' '
+	git hook run --ignore-missing does-not-exist 2>stderr.actual &&
+	test_must_be_empty stderr.actual
+'
+
+test_expect_success 'git hook run: basic' '
+	write_script .git/hooks/test-hook <<-EOF &&
+	echo Test hook
+	EOF
+
+	cat >expect <<-\EOF &&
+	Test hook
+	EOF
+	git hook run test-hook 2>actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git hook run: stdout and stderr both write to our stderr' '
+	write_script .git/hooks/test-hook <<-EOF &&
+	echo >&1 Will end up on stderr
+	echo >&2 Will end up on stderr
+	EOF
+
+	cat >stderr.expect <<-\EOF &&
+	Will end up on stderr
+	Will end up on stderr
+	EOF
+	git hook run test-hook >stdout.actual 2>stderr.actual &&
+	test_cmp stderr.expect stderr.actual &&
+	test_must_be_empty stdout.actual
+'
+
+test_expect_success 'git hook run: exit codes are passed along' '
+	write_script .git/hooks/test-hook <<-EOF &&
+	exit 1
+	EOF
+
+	test_expect_code 1 git hook run test-hook &&
+
+	write_script .git/hooks/test-hook <<-EOF &&
+	exit 2
+	EOF
+
+	test_expect_code 2 git hook run test-hook &&
+
+	write_script .git/hooks/test-hook <<-EOF &&
+	exit 128
+	EOF
+
+	test_expect_code 128 git hook run test-hook &&
+
+	write_script .git/hooks/test-hook <<-EOF &&
+	exit 129
+	EOF
+
+	test_expect_code 129 git hook run test-hook
+'
+
+test_expect_success 'git hook run arg u ments without -- is not allowed' '
+	test_expect_code 129 git hook run test-hook arg u ments
+'
+
+test_expect_success 'git hook run -- pass arguments' '
+	write_script .git/hooks/test-hook <<-\EOF &&
+	echo $1
+	echo $2
+	EOF
+
+	cat >expect <<-EOF &&
+	arg
+	u ments
+	EOF
+
+	git hook run test-hook -- arg "u ments" 2>actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git hook run -- out-of-repo runs excluded' '
+	write_script .git/hooks/test-hook <<-EOF &&
+	echo Test hook
+	EOF
+
+	nongit test_must_fail git hook run test-hook
+'
+
+test_expect_success 'git -c core.hooksPath=<PATH> hook run' '
+	mkdir my-hooks &&
+	write_script my-hooks/test-hook <<-\EOF &&
+	echo Hook ran $1 >>actual
+	EOF
+
+	cat >expect <<-\EOF &&
+	Test hook
+	Hook ran one
+	Hook ran two
+	Hook ran three
+	Hook ran four
+	EOF
+
+	# Test various ways of specifying the path. See also
+	# t1350-config-hooks-path.sh
+	>actual &&
+	git hook run test-hook -- ignored 2>>actual &&
+	git -c core.hooksPath=my-hooks hook run test-hook -- one 2>>actual &&
+	git -c core.hooksPath=my-hooks/ hook run test-hook -- two 2>>actual &&
+	git -c core.hooksPath="$PWD/my-hooks" hook run test-hook -- three 2>>actual &&
+	git -c core.hooksPath="$PWD/my-hooks/" hook run test-hook -- four 2>>actual &&
+	test_cmp expect actual
+'
+
+test_done
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/t2002-checkout-cache-u.sh b/t/t2002-checkout-cache-u.sh
index 70361c806e..fc95cf9048 100755
--- a/t/t2002-checkout-cache-u.sh
+++ b/t/t2002-checkout-cache-u.sh
@@ -8,6 +8,7 @@ test_description='git checkout-index -u test.
 With -u flag, git checkout-index internally runs the equivalent of
 git update-index --refresh on the checked out entry.'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success \
diff --git a/t/t2003-checkout-cache-mkdir.sh b/t/t2003-checkout-cache-mkdir.sh
index ff163cf675..f0fd441d81 100755
--- a/t/t2003-checkout-cache-mkdir.sh
+++ b/t/t2003-checkout-cache-mkdir.sh
@@ -10,6 +10,7 @@ also verifies that such leading path may contain symlinks, unlike
 the GIT controlled paths.
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t2004-checkout-cache-temp.sh b/t/t2004-checkout-cache-temp.sh
index a9352b08a8..b16d69ca4a 100755
--- a/t/t2004-checkout-cache-temp.sh
+++ b/t/t2004-checkout-cache-temp.sh
@@ -8,6 +8,7 @@ test_description='git checkout-index --temp test.
 With --temp flag, git checkout-index writes to temporary merge files
 rather than the tracked path.'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -56,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
 '
 
@@ -84,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/t2005-checkout-index-symlinks.sh b/t/t2005-checkout-index-symlinks.sh
index 9fa5610474..112682a45a 100755
--- a/t/t2005-checkout-index-symlinks.sh
+++ b/t/t2005-checkout-index-symlinks.sh
@@ -8,6 +8,7 @@ test_description='git checkout-index on filesystem w/o symlinks test.
 This tests that git checkout-index creates a symbolic link as a plain
 file if core.symlinks is false.'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success \
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 70d69263e6..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' '
@@ -48,6 +50,7 @@ test_expect_success 'checkout commit with dir must not remove untracked a/b' '
 
 test_expect_success SYMLINKS 'the symlink remained' '
 
+	test_when_finished "rm a/b" &&
 	test -h a/b
 '
 
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/t2050-git-dir-relative.sh b/t/t2050-git-dir-relative.sh
index 21f4659a9d..1f193cde96 100755
--- a/t/t2050-git-dir-relative.sh
+++ b/t/t2050-git-dir-relative.sh
@@ -12,6 +12,7 @@ into the subdir while keeping the worktree location,
 and tries commits from the top and the subdir, checking
 that the commit-hook still gets called.'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 COMMIT_FILE="$(pwd)/output"
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/t2081-parallel-checkout-collisions.sh b/t/t2081-parallel-checkout-collisions.sh
index f6fcfc0c1e..6acdb89d12 100755
--- a/t/t2081-parallel-checkout-collisions.sh
+++ b/t/t2081-parallel-checkout-collisions.sh
@@ -11,6 +11,7 @@ The tests in this file exercise parallel checkout's collision detection code in
 both these mechanics.
 "
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-parallel-checkout.sh"
 
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/t2108-update-index-refresh-racy.sh b/t/t2108-update-index-refresh-racy.sh
new file mode 100755
index 0000000000..bc5f2886fa
--- /dev/null
+++ b/t/t2108-update-index-refresh-racy.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+test_description='update-index refresh tests related to racy timestamps'
+
+TEST_PASSES_SANITIZE_LEAK=true
+. ./test-lib.sh
+
+reset_files () {
+	echo content >file &&
+	echo content >other &&
+	test_set_magic_mtime file &&
+	test_set_magic_mtime other
+}
+
+update_assert_changed () {
+	test_set_magic_mtime .git/index &&
+	test_might_fail git update-index "$1" &&
+	! test_is_magic_mtime .git/index
+}
+
+test_expect_success 'setup' '
+	reset_files &&
+	# we are calling reset_files() a couple of times during tests;
+	# test-tool chmtime does not change the ctime; to not weaken
+	# or even break our tests, disable ctime-checks entirely
+	git config core.trustctime false &&
+	git add file other &&
+	git commit -m "initial import"
+'
+
+test_expect_success '--refresh has no racy timestamps to fix' '
+	reset_files &&
+	# set the index time far enough to the future;
+	# it must be at least 3 seconds for VFAT
+	test_set_magic_mtime .git/index +60 &&
+	git update-index --refresh &&
+	test_is_magic_mtime .git/index +60
+'
+
+test_expect_success '--refresh should fix racy timestamp' '
+	reset_files &&
+	update_assert_changed --refresh
+'
+
+test_expect_success '--really-refresh should fix racy timestamp' '
+	reset_files &&
+	update_assert_changed --really-refresh
+'
+
+test_expect_success '--refresh should fix racy timestamp if other file needs update' '
+	reset_files &&
+	echo content2 >other &&
+	test_set_magic_mtime other &&
+	update_assert_changed --refresh
+'
+
+test_expect_success '--refresh should fix racy timestamp if racy file needs update' '
+	reset_files &&
+	echo content2 >file &&
+	test_set_magic_mtime file &&
+	update_assert_changed --refresh
+'
+
+test_done
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 45ca35d60a..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 '
@@ -129,12 +130,15 @@ test_expect_success 'add -n -u should not add but just report' '
 		echo "remove '\''top'\''"
 	) >expect &&
 	before=$(git ls-files -s check top) &&
+	git count-objects -v >objects_before &&
 	echo changed >>check &&
 	rm -f top &&
 	git add -n -u >actual &&
 	after=$(git ls-files -s check top) &&
+	git count-objects -v >objects_after &&
 
 	test "$before" = "$after" &&
+	test_cmp objects_before objects_after &&
 	test_cmp expect actual
 
 '
@@ -147,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 &&
@@ -170,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/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh
index c8de6d8a19..b40eeb263f 100755
--- a/t/t2300-cd-to-toplevel.sh
+++ b/t/t2300-cd-to-toplevel.sh
@@ -2,6 +2,7 @@
 
 test_description='cd_to_toplevel'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 EXEC_PATH="$(git --exec-path)"
diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh
index 96dfca1554..43139af08f 100755
--- a/t/t2400-worktree-add.sh
+++ b/t/t2400-worktree-add.sh
@@ -67,11 +67,25 @@ test_expect_success '"add" worktree' '
 '
 
 test_expect_success '"add" worktree with lock' '
-	git rev-parse HEAD >expect &&
 	git worktree add --detach --lock here-with-lock main &&
+	test_when_finished "git worktree unlock here-with-lock || :" &&
 	test -f .git/worktrees/here-with-lock/locked
 '
 
+test_expect_success '"add" worktree with lock and reason' '
+	lock_reason="why not" &&
+	git worktree add --detach --lock --reason "$lock_reason" here-with-lock-reason main &&
+	test_when_finished "git worktree unlock here-with-lock-reason || :" &&
+	test -f .git/worktrees/here-with-lock-reason/locked &&
+	echo "$lock_reason" >expect &&
+	test_cmp expect .git/worktrees/here-with-lock-reason/locked
+'
+
+test_expect_success '"add" worktree with reason but no lock' '
+	test_must_fail git worktree add --detach --reason "why not" here-with-reason-only main &&
+	test_path_is_missing .git/worktrees/here-with-reason-only/locked
+'
+
 test_expect_success '"add" worktree from a subdir' '
 	(
 		mkdir sub &&
@@ -151,8 +165,62 @@ test_expect_success '"add" default branch of a bare repo' '
 	(
 		git clone --bare . bare2 &&
 		cd bare2 &&
-		git worktree add ../there3 main
-	)
+		git worktree add ../there3 main &&
+		cd ../there3 &&
+		# Simple check that a Git command does not
+		# immediately fail with the current setup
+		git status
+	) &&
+	cat >expect <<-EOF &&
+	init.t
+	EOF
+	ls there3 >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '"add" to bare repo with worktree config' '
+	(
+		git clone --bare . bare3 &&
+		cd bare3 &&
+		git config extensions.worktreeconfig true &&
+
+		# Add config values that are erroneous to have in
+		# a config.worktree file outside of the main
+		# working tree, to check that Git filters them out
+		# when copying config during "git worktree add".
+		git config --worktree core.bare true &&
+		git config --worktree core.worktree "$(pwd)" &&
+
+		# We want to check that bogus.key is copied
+		git config --worktree bogus.key value &&
+		git config --unset core.bare &&
+		git worktree add ../there4 main &&
+		cd ../there4 &&
+
+		# Simple check that a Git command does not
+		# immediately fail with the current setup
+		git status &&
+		git worktree add --detach ../there5 &&
+		cd ../there5 &&
+		git status
+	) &&
+
+	# the worktree has the arbitrary value copied.
+	test_cmp_config -C there4 value bogus.key &&
+	test_cmp_config -C there5 value bogus.key &&
+
+	# however, core.bare and core.worktree were removed.
+	test_must_fail git -C there4 config core.bare &&
+	test_must_fail git -C there4 config core.worktree &&
+
+	cat >expect <<-EOF &&
+	init.t
+	EOF
+
+	ls there4 >actual &&
+	test_cmp expect actual &&
+	ls there5 >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'checkout with grafts' '
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 fedcefe8de..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
 '
@@ -230,7 +230,7 @@ test_expect_success 'broken main worktree still at the top' '
 		EOF
 		cd linked &&
 		echo "worktree $(pwd)" >expected &&
-		echo "ref: .broken" >../.git/HEAD &&
+		(cd ../ && test-tool ref-store main create-symref HEAD .broken ) &&
 		git worktree list --porcelain >out &&
 		head -n 3 out >actual &&
 		test_cmp ../expected actual &&
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/t2500-untracked-overwriting.sh b/t/t2500-untracked-overwriting.sh
new file mode 100755
index 0000000000..5c0bf4d21f
--- /dev/null
+++ b/t/t2500-untracked-overwriting.sh
@@ -0,0 +1,244 @@
+#!/bin/sh
+
+test_description='Test handling of overwriting untracked files'
+
+. ./test-lib.sh
+
+test_setup_reset () {
+	git init reset_$1 &&
+	(
+		cd reset_$1 &&
+		test_commit init &&
+
+		git branch stable &&
+		git branch work &&
+
+		git checkout work &&
+		test_commit foo &&
+
+		git checkout stable
+	)
+}
+
+test_expect_success 'reset --hard will nuke untracked files/dirs' '
+	test_setup_reset hard &&
+	(
+		cd reset_hard &&
+		git ls-tree -r stable &&
+		git log --all --name-status --oneline &&
+		git ls-tree -r work &&
+
+		mkdir foo.t &&
+		echo precious >foo.t/file &&
+		echo foo >expect &&
+
+		git reset --hard work &&
+
+		# check that untracked directory foo.t/ was nuked
+		test_path_is_file foo.t &&
+		test_cmp expect foo.t
+	)
+'
+
+test_expect_success 'reset --merge will preserve untracked files/dirs' '
+	test_setup_reset merge &&
+	(
+		cd reset_merge &&
+
+		mkdir foo.t &&
+		echo precious >foo.t/file &&
+		cp foo.t/file expect &&
+
+		test_must_fail git reset --merge work 2>error &&
+		test_cmp expect foo.t/file &&
+		grep "Updating .foo.t. would lose untracked files" error
+	)
+'
+
+test_expect_success 'reset --keep will preserve untracked files/dirs' '
+	test_setup_reset keep &&
+	(
+		cd reset_keep &&
+
+		mkdir foo.t &&
+		echo precious >foo.t/file &&
+		cp foo.t/file expect &&
+
+		test_must_fail git reset --merge work 2>error &&
+		test_cmp expect foo.t/file &&
+		grep "Updating.*foo.t.*would lose untracked files" error
+	)
+'
+
+test_setup_checkout_m () {
+	git init checkout &&
+	(
+		cd checkout &&
+		test_commit init &&
+
+		test_write_lines file has some >filler &&
+		git add filler &&
+		git commit -m filler &&
+
+		git branch stable &&
+
+		git switch -c work &&
+		echo stuff >notes.txt &&
+		test_write_lines file has some words >filler &&
+		git add notes.txt filler &&
+		git commit -m filler &&
+
+		git checkout stable
+	)
+}
+
+test_expect_success 'checkout -m does not nuke untracked file' '
+	test_setup_checkout_m &&
+	(
+		cd checkout &&
+
+		# Tweak filler
+		test_write_lines this file has some >filler &&
+		# Make an untracked file, save its contents in "expect"
+		echo precious >notes.txt &&
+		cp notes.txt expect &&
+
+		test_must_fail git checkout -m work &&
+		test_cmp expect notes.txt
+	)
+'
+
+test_setup_sequencing () {
+	git init sequencing_$1 &&
+	(
+		cd sequencing_$1 &&
+		test_commit init &&
+
+		test_write_lines this file has some words >filler &&
+		git add filler &&
+		git commit -m filler &&
+
+		mkdir -p foo/bar &&
+		test_commit foo/bar/baz &&
+
+		git branch simple &&
+		git branch fooey &&
+
+		git checkout fooey &&
+		git rm foo/bar/baz.t &&
+		echo stuff >>filler &&
+		git add -u &&
+		git commit -m "changes" &&
+
+		git checkout simple &&
+		echo items >>filler &&
+		echo newstuff >>newfile &&
+		git add filler newfile &&
+		git commit -m another
+	)
+}
+
+test_expect_success 'git rebase --abort and untracked files' '
+	test_setup_sequencing rebase_abort_and_untracked &&
+	(
+		cd sequencing_rebase_abort_and_untracked &&
+		git checkout fooey &&
+		test_must_fail git rebase simple &&
+
+		cat init.t &&
+		git rm init.t &&
+		echo precious >init.t &&
+		cp init.t expect &&
+		git status --porcelain &&
+		test_must_fail git rebase --abort &&
+		test_cmp expect init.t
+	)
+'
+
+test_expect_success 'git rebase fast forwarding and untracked files' '
+	test_setup_sequencing rebase_fast_forward_and_untracked &&
+	(
+		cd sequencing_rebase_fast_forward_and_untracked &&
+		git checkout init &&
+		echo precious >filler &&
+		cp filler expect &&
+		test_must_fail git rebase init simple &&
+		test_cmp expect filler
+	)
+'
+
+test_expect_failure 'git rebase --autostash and untracked files' '
+	test_setup_sequencing rebase_autostash_and_untracked &&
+	(
+		cd sequencing_rebase_autostash_and_untracked &&
+		git checkout simple &&
+		git rm filler &&
+		mkdir filler &&
+		echo precious >filler/file &&
+		cp filler/file expect &&
+		git rebase --autostash init &&
+		test_path_is_file filler/file
+	)
+'
+
+test_expect_failure 'git stash and untracked files' '
+	test_setup_sequencing stash_and_untracked_files &&
+	(
+		cd sequencing_stash_and_untracked_files &&
+		git checkout simple &&
+		git rm filler &&
+		mkdir filler &&
+		echo precious >filler/file &&
+		cp filler/file expect &&
+		git status --porcelain &&
+		git stash push &&
+		git status --porcelain &&
+		test_path_is_file filler/file
+	)
+'
+
+test_expect_success 'git am --abort and untracked dir vs. unmerged file' '
+	test_setup_sequencing am_abort_and_untracked &&
+	(
+		cd sequencing_am_abort_and_untracked &&
+		git format-patch -1 --stdout fooey >changes.mbox &&
+		test_must_fail git am --3way changes.mbox &&
+
+		# Delete the conflicted file; we will stage and commit it later
+		rm filler &&
+
+		# Put an unrelated untracked directory there
+		mkdir filler &&
+		echo foo >filler/file1 &&
+		echo bar >filler/file2 &&
+
+		test_must_fail git am --abort 2>errors &&
+		test_path_is_dir filler &&
+		grep "Updating .filler. would lose untracked files in it" errors
+	)
+'
+
+test_expect_success 'git am --skip and untracked dir vs deleted file' '
+	test_setup_sequencing am_skip_and_untracked &&
+	(
+		cd sequencing_am_skip_and_untracked &&
+		git checkout fooey &&
+		git format-patch -1 --stdout simple >changes.mbox &&
+		test_must_fail git am --3way changes.mbox &&
+
+		# Delete newfile
+		rm newfile &&
+
+		# Put an unrelated untracked directory there
+		mkdir newfile &&
+		echo foo >newfile/file1 &&
+		echo bar >newfile/file2 &&
+
+		# Change our mind about resolutions, just skip this patch
+		test_must_fail git am --skip 2>errors &&
+		test_path_is_dir newfile &&
+		grep "Updating .newfile. would lose untracked files in it" errors
+	)
+'
+
+test_done
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/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh
index 740ce56eab..11af4552f7 100755
--- a/t/t3000-ls-files-others.sh
+++ b/t/t3000-ls-files-others.sh
@@ -15,6 +15,8 @@ filesystem.
     path3/file3 - a file in a directory
     path4       - an empty directory
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup ' '
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index 516c95ea0e..48cec4e5f8 100755
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -8,6 +8,7 @@ test_description='git ls-files --others --exclude
 This test runs git ls-files --others and tests --exclude patterns.
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 rm -fr one three
@@ -102,7 +103,7 @@ test_expect_success \
        >output &&
      test_cmp expect output'
 
-test_expect_success 'restore gitignore' '
+test_expect_success !SANITIZE_LEAK 'restore gitignore' '
 	git checkout --ignore-skip-worktree-bits $allignores &&
 	rm .git/index
 '
@@ -125,7 +126,7 @@ cat > expect << EOF
 #	three/
 EOF
 
-test_expect_success 'git status honors core.excludesfile' \
+test_expect_success !SANITIZE_LEAK 'git status honors core.excludesfile' \
 	'test_cmp expect output'
 
 test_expect_success 'trailing slash in exclude allows directory match(1)' '
diff --git a/t/t3002-ls-files-dashpath.sh b/t/t3002-ls-files-dashpath.sh
index 8704b04e1b..54d22a45df 100755
--- a/t/t3002-ls-files-dashpath.sh
+++ b/t/t3002-ls-files-dashpath.sh
@@ -12,6 +12,8 @@ filesystem.
     -foo	- a file with a funny name.
     --		- another file with a funny name.
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success \
diff --git a/t/t3003-ls-files-exclude.sh b/t/t3003-ls-files-exclude.sh
index c41c4f046a..7933dff9b3 100755
--- a/t/t3003-ls-files-exclude.sh
+++ b/t/t3003-ls-files-exclude.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='ls-files --exclude does not affect index files'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'create repo with file' '
diff --git a/t/t3004-ls-files-basic.sh b/t/t3004-ls-files-basic.sh
index 9fd5a1f188..a16e25c79b 100755
--- a/t/t3004-ls-files-basic.sh
+++ b/t/t3004-ls-files-basic.sh
@@ -6,6 +6,7 @@ This test runs git ls-files with various unusual or malformed
 command-line arguments.
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'ls-files in empty repository' '
diff --git a/t/t3005-ls-files-relative.sh b/t/t3005-ls-files-relative.sh
index 727e9ae1a4..fbfa210a50 100755
--- a/t/t3005-ls-files-relative.sh
+++ b/t/t3005-ls-files-relative.sh
@@ -5,6 +5,7 @@ test_description='ls-files tests with relative paths
 This test runs git ls-files with various relative path arguments.
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'prepare' '
@@ -38,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 &&
@@ -53,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/t3006-ls-files-long.sh b/t/t3006-ls-files-long.sh
index e109c3fbfb..2aaf91ebc8 100755
--- a/t/t3006-ls-files-long.sh
+++ b/t/t3006-ls-files-long.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='overly long paths'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t3008-ls-files-lazy-init-name-hash.sh b/t/t3008-ls-files-lazy-init-name-hash.sh
index 85f3704958..51d3dffaa6 100755
--- a/t/t3008-ls-files-lazy-init-name-hash.sh
+++ b/t/t3008-ls-files-lazy-init-name-hash.sh
@@ -2,6 +2,7 @@
 
 test_description='Test the lazy init name hash with various folder structures'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 if test 1 -eq $(test-tool online-cpus)
diff --git a/t/t3020-ls-files-error-unmatch.sh b/t/t3020-ls-files-error-unmatch.sh
index 124e73b8e6..2cbcbc0721 100755
--- a/t/t3020-ls-files-error-unmatch.sh
+++ b/t/t3020-ls-files-error-unmatch.sh
@@ -9,6 +9,8 @@ This test runs git ls-files --error-unmatch to ensure it correctly
 returns an error when a non-existent path is provided on the command
 line.
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
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 56ea4bda13..f9539968e4 100755
--- a/t/t3070-wildmatch.sh
+++ b/t/t3070-wildmatch.sh
@@ -2,6 +2,7 @@
 
 test_description='wildmatch tests'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # Disable expensive chain-lint tests; all of the tests in this script
@@ -192,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/t3100-ls-tree-restrict.sh b/t/t3100-ls-tree-restrict.sh
index 18baf49a49..436de44971 100755
--- a/t/t3100-ls-tree-restrict.sh
+++ b/t/t3100-ls-tree-restrict.sh
@@ -16,6 +16,8 @@ This test runs git ls-tree with the following in a tree.
 The new path restriction code should do the right thing for path2 and
 path2/baz.  Also path0/ should snow nothing.
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success \
diff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh
index 12bf31022a..05fde64225 100755
--- a/t/t3101-ls-tree-dirname.sh
+++ b/t/t3101-ls-tree-dirname.sh
@@ -19,6 +19,8 @@ This test runs git ls-tree with the following in a tree.
 Test the handling of multiple directories which have matching file
 entries.  Also test odd filename and missing entries handling.
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t3102-ls-tree-wildcards.sh b/t/t3102-ls-tree-wildcards.sh
index 1e16c6b8ea..3942db2290 100755
--- a/t/t3102-ls-tree-wildcards.sh
+++ b/t/t3102-ls-tree-wildcards.sh
@@ -2,6 +2,7 @@
 
 test_description='ls-tree with(out) globs'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t3103-ls-tree-misc.sh b/t/t3103-ls-tree-misc.sh
index 14520913af..d18ba1bd84 100755
--- a/t/t3103-ls-tree-misc.sh
+++ b/t/t3103-ls-tree-misc.sh
@@ -7,6 +7,7 @@ Miscellaneous tests for git ls-tree.
 
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index cc4b10236e..7a0ff75ba8 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -42,6 +42,23 @@ test_expect_success 'git branch abc should create a branch' '
 	git branch abc && test_path_is_file .git/refs/heads/abc
 '
 
+test_expect_success 'git branch abc should fail when abc exists' '
+	test_must_fail git branch abc
+'
+
+test_expect_success 'git branch --force abc should fail when abc is checked out' '
+	test_when_finished git switch main &&
+	git switch abc &&
+	test_must_fail git branch --force abc HEAD~1
+'
+
+test_expect_success 'git branch --force abc should succeed when abc exists' '
+	git rev-parse HEAD~1 >expect &&
+	git branch --force abc HEAD~1 &&
+	git rev-parse abc >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'git branch a/b/c should create a branch' '
 	git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c
 '
@@ -168,6 +185,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 +755,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 +912,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 +996,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
@@ -1272,6 +1318,19 @@ test_expect_success 'attempt to delete a branch merged to its base' '
 	test_must_fail git branch -d my10
 '
 
+test_expect_success 'branch --delete --force removes dangling branch' '
+	git checkout main &&
+	test_commit unstable &&
+	hash=$(git rev-parse HEAD) &&
+	objpath=$(echo $hash | sed -e "s|^..|.git/objects/&/|") &&
+	git branch --no-track dangling &&
+	mv $objpath $objpath.x &&
+	test_when_finished "mv $objpath.x $objpath" &&
+	git branch --delete --force dangling &&
+	git for-each-ref refs/heads/dangling >actual &&
+	test_must_be_empty actual
+'
+
 test_expect_success 'use --edit-description' '
 	write_script editor <<-\EOF &&
 		echo "New contents" >"$1"
@@ -1405,8 +1464,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 5325b9f67a..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
 
@@ -340,6 +337,10 @@ test_expect_success 'git branch --format option' '
 	test_cmp expect actual
 '
 
+test_expect_success 'git branch with --format=%(rest) must fail' '
+	test_must_fail git branch --format="%(rest)" >actual
+'
+
 test_expect_success 'worktree colors correct' '
 	cat >expect <<-EOF &&
 	* <GREEN>(HEAD detached from fromtag)<RESET>
diff --git a/t/t3205-branch-color.sh b/t/t3205-branch-color.sh
index 08bd906173..0b61da92b3 100755
--- a/t/t3205-branch-color.sh
+++ b/t/t3205-branch-color.sh
@@ -1,9 +1,7 @@
 #!/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
 
 test_expect_success 'set up some sample branches' '
diff --git a/t/t3207-branch-submodule.sh b/t/t3207-branch-submodule.sh
new file mode 100755
index 0000000000..0d93f7516c
--- /dev/null
+++ b/t/t3207-branch-submodule.sh
@@ -0,0 +1,292 @@
+#!/bin/sh
+
+test_description='git branch submodule tests'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-rebase.sh
+
+pwd=$(pwd)
+
+# Creates a clean test environment in "pwd" by copying the repo setup
+# from test_dirs.
+reset_test () {
+	rm -fr super &&
+	rm -fr sub-sub-upstream &&
+	rm -fr sub-upstream &&
+	cp -r test_dirs/* .
+}
+
+# Tests that the expected branch does not exist
+test_no_branch () {
+	DIR=$1 &&
+	BRANCH_NAME=$2 &&
+	test_must_fail git -C "$DIR" rev-parse "$BRANCH_NAME" 2>err &&
+	grep "ambiguous argument .$BRANCH_NAME." err
+}
+
+test_expect_success 'setup superproject and submodule' '
+	mkdir test_dirs &&
+	(
+		cd test_dirs &&
+		git init super &&
+		test_commit -C super foo &&
+		git init sub-sub-upstream &&
+		test_commit -C sub-sub-upstream foo &&
+		git init sub-upstream &&
+		# Submodule in a submodule
+		git -C sub-upstream submodule add "${pwd}/test_dirs/sub-sub-upstream" sub-sub &&
+		git -C sub-upstream commit -m "add submodule" &&
+		# Regular submodule
+		git -C super submodule add "${pwd}/test_dirs/sub-upstream" sub &&
+		# Submodule in a subdirectory
+		git -C super submodule add "${pwd}/test_dirs/sub-sub-upstream" second/sub &&
+		git -C super commit -m "add submodule" &&
+		git -C super config submodule.propagateBranches true &&
+		git -C super/sub submodule update --init
+	) &&
+	reset_test
+'
+
+# Test the argument parsing
+test_expect_success '--recurse-submodules should create branches' '
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git branch --recurse-submodules branch-a &&
+		git rev-parse branch-a &&
+		git -C sub rev-parse branch-a &&
+		git -C sub/sub-sub rev-parse branch-a &&
+		git -C second/sub rev-parse branch-a
+	)
+'
+
+test_expect_success '--recurse-submodules should die if submodule.propagateBranches is false' '
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		echo "fatal: branch with --recurse-submodules can only be used if submodule.propagateBranches is enabled" >expected &&
+		test_must_fail git -c submodule.propagateBranches=false branch --recurse-submodules branch-a 2>actual &&
+		test_cmp expected actual
+	)
+'
+
+test_expect_success '--recurse-submodules should fail when not creating branches' '
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git branch --recurse-submodules branch-a &&
+		echo "fatal: --recurse-submodules can only be used to create branches" >expected &&
+		test_must_fail git branch --recurse-submodules -D branch-a 2>actual &&
+		test_cmp expected actual &&
+		# Assert that the branches were not deleted
+		git rev-parse branch-a &&
+		git -C sub rev-parse branch-a
+	)
+'
+
+test_expect_success 'should respect submodule.recurse when creating branches' '
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git -c submodule.recurse=true branch branch-a &&
+		git rev-parse branch-a &&
+		git -C sub rev-parse branch-a
+	)
+'
+
+test_expect_success 'should ignore submodule.recurse when not creating branches' '
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git branch --recurse-submodules branch-a &&
+		git -c submodule.recurse=true branch -D branch-a &&
+		test_no_branch . branch-a &&
+		git -C sub rev-parse branch-a
+	)
+'
+
+# Test branch creation behavior
+test_expect_success 'should create branches based off commit id in superproject' '
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git branch --recurse-submodules branch-a &&
+		git checkout --recurse-submodules branch-a &&
+		git -C sub rev-parse HEAD >expected &&
+		# Move the tip of sub:branch-a so that it no longer matches the commit in super:branch-a
+		git -C sub checkout branch-a &&
+		test_commit -C sub bar &&
+		# Create a new branch-b branch with start-point=branch-a
+		git branch --recurse-submodules branch-b branch-a &&
+		git rev-parse branch-b &&
+		git -C sub rev-parse branch-b >actual &&
+		# Assert that the commit id of sub:second-branch matches super:branch-a and not sub:branch-a
+		test_cmp expected actual
+	)
+'
+
+test_expect_success 'should not create any branches if branch is not valid for all repos' '
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git -C sub branch branch-a &&
+		test_must_fail git branch --recurse-submodules branch-a 2>actual &&
+		test_no_branch . branch-a &&
+		grep "submodule .sub.: fatal: a branch named .branch-a. already exists" actual
+	)
+'
+
+test_expect_success 'should create branches if branch exists and --force is given' '
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git -C sub rev-parse HEAD >expected &&
+		test_commit -C sub baz &&
+		# branch-a in sub now points to a newer commit.
+		git -C sub branch branch-a HEAD &&
+		git -C sub rev-parse branch-a >actual-old-branch-a &&
+		git branch --recurse-submodules --force branch-a &&
+		git rev-parse branch-a &&
+		git -C sub rev-parse branch-a >actual-new-branch-a &&
+		test_cmp expected actual-new-branch-a &&
+		# assert that branch --force actually moved the sub
+		# branch
+		! test_cmp expected actual-old-branch-a
+	)
+'
+
+test_expect_success 'should create branch when submodule is not in HEAD:.gitmodules' '
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git branch branch-a &&
+		git checkout -b branch-b &&
+		git submodule add ../sub-upstream sub2 &&
+		git -C sub2 submodule update --init &&
+		# branch-b now has a committed submodule not in branch-a
+		git commit -m "add second submodule" &&
+		git checkout branch-a &&
+		git branch --recurse-submodules branch-c branch-b &&
+		git checkout --recurse-submodules branch-c &&
+		git -C sub2 rev-parse branch-c &&
+		git -C sub2/sub-sub rev-parse branch-c
+	)
+'
+
+test_expect_success 'should not create branches in inactive submodules' '
+	test_when_finished "reset_test" &&
+	test_config -C super submodule.sub.active false &&
+	(
+		cd super &&
+		git branch --recurse-submodules branch-a &&
+		git rev-parse branch-a &&
+		test_no_branch sub branch-a
+	)
+'
+
+test_expect_success 'should set up tracking of local branches with track=always' '
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git -c branch.autoSetupMerge=always branch --recurse-submodules branch-a main &&
+		git -C sub rev-parse main &&
+		test_cmp_config -C sub . branch.branch-a.remote &&
+		test_cmp_config -C sub refs/heads/main branch.branch-a.merge
+	)
+'
+
+test_expect_success 'should set up tracking of local branches with explicit track' '
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git branch --track --recurse-submodules branch-a main &&
+		git -C sub rev-parse main &&
+		test_cmp_config -C sub . branch.branch-a.remote &&
+		test_cmp_config -C sub refs/heads/main branch.branch-a.merge
+	)
+'
+
+test_expect_success 'should not set up unnecessary tracking of local branches' '
+	test_when_finished "reset_test" &&
+	(
+		cd super &&
+		git branch --recurse-submodules branch-a main &&
+		git -C sub rev-parse main &&
+		test_cmp_config -C sub "" --default "" branch.branch-a.remote &&
+		test_cmp_config -C sub "" --default "" branch.branch-a.merge
+	)
+'
+
+reset_remote_test () {
+	rm -fr super-clone &&
+	reset_test
+}
+
+test_expect_success 'setup tests with remotes' '
+	(
+		cd test_dirs &&
+		(
+			cd super &&
+			git branch branch-a &&
+			git checkout -b branch-b &&
+			git submodule add ../sub-upstream sub2 &&
+			# branch-b now has a committed submodule not in branch-a
+			git commit -m "add second submodule"
+		) &&
+		git clone --branch main --recurse-submodules super super-clone &&
+		git -C super-clone config submodule.propagateBranches true
+	) &&
+	reset_remote_test
+'
+
+test_expect_success 'should get fatal error upon branch creation when submodule is not in .git/modules' '
+	test_when_finished "reset_remote_test" &&
+	(
+		cd super-clone &&
+		# This should succeed because super-clone has sub in .git/modules
+		git branch --recurse-submodules branch-a origin/branch-a &&
+		# This should fail because super-clone does not have sub2 .git/modules
+		test_must_fail git branch --recurse-submodules branch-b origin/branch-b 2>actual &&
+		grep "fatal: submodule .sub2.: unable to find submodule" actual &&
+		test_no_branch . branch-b &&
+		test_no_branch sub branch-b &&
+		# User can fix themselves by initializing the submodule
+		git checkout origin/branch-b &&
+		git submodule update --init --recursive &&
+		git branch --recurse-submodules branch-b origin/branch-b
+	)
+'
+
+test_expect_success 'should set up tracking of remote-tracking branches' '
+	test_when_finished "reset_remote_test" &&
+	(
+		cd super-clone &&
+		git branch --recurse-submodules branch-a origin/branch-a &&
+		test_cmp_config origin branch.branch-a.remote &&
+		test_cmp_config refs/heads/branch-a branch.branch-a.merge &&
+		# "origin/branch-a" does not exist for "sub", but it matches the refspec
+		# so tracking should be set up
+		test_cmp_config -C sub origin branch.branch-a.remote &&
+		test_cmp_config -C sub refs/heads/branch-a branch.branch-a.merge &&
+		test_cmp_config -C sub/sub-sub origin branch.branch-a.remote &&
+		test_cmp_config -C sub/sub-sub refs/heads/branch-a branch.branch-a.merge
+	)
+'
+
+test_expect_success 'should not fail when unable to set up tracking in submodule' '
+	test_when_finished "reset_remote_test" &&
+	(
+		cd super-clone &&
+		git remote rename origin ex-origin &&
+		git branch --recurse-submodules branch-a ex-origin/branch-a &&
+		test_cmp_config ex-origin branch.branch-a.remote &&
+		test_cmp_config refs/heads/branch-a branch.branch-a.merge &&
+		test_cmp_config -C sub "" --default "" branch.branch-a.remote &&
+		test_cmp_config -C sub "" --default "" branch.branch-a.merge
+	)
+'
+
+test_done
diff --git a/t/t3211-peel-ref.sh b/t/t3211-peel-ref.sh
index 37b9d26f4b..9cbc34fc58 100755
--- a/t/t3211-peel-ref.sh
+++ b/t/t3211-peel-ref.sh
@@ -4,6 +4,7 @@ test_description='tests for the peel_ref optimization of packed-refs'
 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 'create annotated tag in refs/tags' '
diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh
index f5bf16abcd..d3ac826283 100755
--- a/t/t3300-funny-names.sh
+++ b/t/t3300-funny-names.sh
@@ -9,6 +9,7 @@ This test tries pathnames with funny characters in the working
 tree, index, and tree objects.
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 HT='	'
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 052516e6c6..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' '
@@ -46,8 +47,9 @@ test_expect_success 'create some new worktrees' '
 test_expect_success 'merge z into y fails and sets NOTES_MERGE_REF' '
 	git config core.notesRef refs/notes/y &&
 	test_must_fail git notes merge z &&
-	echo "ref: refs/notes/y" >expect &&
-	test_cmp expect .git/NOTES_MERGE_REF
+	echo "refs/notes/y" >expect &&
+	git symbolic-ref NOTES_MERGE_REF >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'merge z into y while mid-merge in another workdir fails' '
@@ -57,7 +59,7 @@ test_expect_success 'merge z into y while mid-merge in another workdir fails' '
 		test_must_fail git notes merge z 2>err &&
 		test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err
 	) &&
-	test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF
+	test_must_fail git -C worktree symbolic-ref NOTES_MERGE_REF
 '
 
 test_expect_success 'merge z into x while mid-merge on y succeeds' '
@@ -68,8 +70,9 @@ test_expect_success 'merge z into x while mid-merge on y succeeds' '
 		test_i18ngrep "Automatic notes merge failed" out &&
 		grep -v "A notes merge into refs/notes/x is already in-progress in" out
 	) &&
-	echo "ref: refs/notes/x" >expect &&
-	test_cmp expect .git/worktrees/worktree2/NOTES_MERGE_REF
+	echo "refs/notes/x" >expect &&
+	git -C worktree2 symbolic-ref NOTES_MERGE_REF >actual &&
+	test_cmp expect actual
 '
 
 test_done
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 0bb88aa982..71b1735e1d 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -406,4 +406,35 @@ test_expect_success 'refuse to switch to branch checked out elsewhere' '
 	test_i18ngrep "already checked out" err
 '
 
+test_expect_success MINGW,SYMLINKS_WINDOWS 'rebase when .git/logs is a symlink' '
+	git checkout main &&
+	mv .git/logs actual_logs &&
+	cmd //c "mklink /D .git\logs ..\actual_logs" &&
+	git rebase -f HEAD^ &&
+	test -L .git/logs &&
+	rm .git/logs &&
+	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/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index e26762d0b2..f6e4864497 100755
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
@@ -20,6 +20,7 @@ test_expect_success setup '
 	git add hello &&
 	git commit -m "hello" &&
 	git branch skip-reference &&
+	git tag hello &&
 
 	echo world >> hello &&
 	git commit -a -m "hello world" &&
@@ -36,7 +37,8 @@ test_expect_success setup '
 	test_tick &&
 	GIT_AUTHOR_NAME="Another Author" \
 		GIT_AUTHOR_EMAIL="another.author@example.com" \
-		git commit --amend --no-edit -m amended-goodbye &&
+		git commit --amend --no-edit -m amended-goodbye \
+			--reset-author &&
 	test_tick &&
 	git tag amended-goodbye &&
 
@@ -51,7 +53,7 @@ test_expect_success setup '
 	'
 
 test_expect_success 'rebase with git am -3 (default)' '
-	test_must_fail git rebase main
+	test_must_fail git rebase --apply main
 '
 
 test_expect_success 'rebase --skip can not be used with other options' '
@@ -95,6 +97,13 @@ test_expect_success 'moved back to branch correctly' '
 
 test_debug 'gitk --all & sleep 1'
 
+test_expect_success 'skipping final pick removes .git/MERGE_MSG' '
+	test_must_fail git rebase --onto hello reverted-goodbye^ \
+		reverted-goodbye &&
+	git rebase --skip &&
+	test_path_is_missing .git/MERGE_MSG
+'
+
 test_expect_success 'correct advice upon picking empty commit' '
 	test_when_finished "git rebase --abort" &&
 	test_must_fail git rebase -i --onto goodbye \
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 66bcbbf952..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
 
@@ -297,6 +295,7 @@ test_expect_success 'abort with error when new base cannot be checked out' '
 		output &&
 	test_i18ngrep "file1" output &&
 	test_path_is_missing .git/rebase-merge &&
+	rm file1 &&
 	git reset --hard HEAD^
 '
 
@@ -351,82 +350,6 @@ test_expect_success 'retain authorship when squashing' '
 	git show HEAD | grep "^Author: Twerp Snog"
 '
 
-test_expect_success REBASE_P '-p handles "no changes" gracefully' '
-	HEAD=$(git rev-parse HEAD) &&
-	git rebase -i -p HEAD^ &&
-	git update-index --refresh &&
-	git diff-files --quiet &&
-	git diff-index --quiet --cached HEAD -- &&
-	test $HEAD = $(git rev-parse HEAD)
-'
-
-test_expect_failure REBASE_P 'exchange two commits with -p' '
-	git checkout H &&
-	(
-		set_fake_editor &&
-		FAKE_LINES="2 1" git rebase -i -p HEAD~2
-	) &&
-	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
-	test G = $(git cat-file commit HEAD | sed -ne \$p)
-'
-
-test_expect_success REBASE_P 'preserve merges with -p' '
-	git checkout -b to-be-preserved primary^ &&
-	: > unrelated-file &&
-	git add unrelated-file &&
-	test_tick &&
-	git commit -m "unrelated" &&
-	git checkout -b another-branch primary &&
-	echo B > file1 &&
-	test_tick &&
-	git commit -m J file1 &&
-	test_tick &&
-	git merge to-be-preserved &&
-	echo C > file1 &&
-	test_tick &&
-	git commit -m K file1 &&
-	echo D > file1 &&
-	test_tick &&
-	git commit -m L1 file1 &&
-	git checkout HEAD^ &&
-	echo 1 > unrelated-file &&
-	test_tick &&
-	git commit -m L2 unrelated-file &&
-	test_tick &&
-	git merge another-branch &&
-	echo E > file1 &&
-	test_tick &&
-	git commit -m M file1 &&
-	git checkout -b to-be-rebased &&
-	test_tick &&
-	git rebase -i -p --onto branch1 primary &&
-	git update-index --refresh &&
-	git diff-files --quiet &&
-	git diff-index --quiet --cached HEAD -- &&
-	test_cmp_rev HEAD~6 branch1 &&
-	test_cmp_rev HEAD~4^2 to-be-preserved &&
-	test_cmp_rev HEAD^^2^ HEAD^^^ &&
-	test $(git show HEAD~5:file1) = B &&
-	test $(git show HEAD~3:file1) = C &&
-	test $(git show HEAD:file1) = E &&
-	test $(git show HEAD:unrelated-file) = 1
-'
-
-test_expect_success REBASE_P 'edit ancestor with -p' '
-	(
-		set_fake_editor &&
-		FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3
-	) &&
-	echo 2 > unrelated-file &&
-	test_tick &&
-	git commit -m L2-modified --amend unrelated-file &&
-	git rebase --continue &&
-	git update-index --refresh &&
-	git diff-files --quiet &&
-	git diff-index --quiet --cached HEAD -- &&
-	test $(git show HEAD:unrelated-file) = 2
-'
-
 test_expect_success '--continue tries to commit' '
 	git reset --hard D &&
 	test_tick &&
@@ -839,6 +762,19 @@ test_expect_success 'reword' '
 	git show HEAD~2 | grep "C changed"
 '
 
+test_expect_success 'no uncommited changes when rewording the todo list is reloaded' '
+	git checkout E &&
+	test_when_finished "git checkout @{-1}" &&
+	(
+		set_fake_editor &&
+		GIT_SEQUENCE_EDITOR="\"$PWD/fake-editor.sh\"" &&
+		export GIT_SEQUENCE_EDITOR &&
+		set_reword_editor &&
+		FAKE_LINES="reword 1 reword 2" git rebase -i C
+	) &&
+	check_reworded_commits D E
+'
+
 test_expect_success 'rebase -i can copy notes' '
 	git config notes.rewrite.rebase true &&
 	git config notes.rewriteRef "refs/notes/*" &&
@@ -888,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 &&
@@ -1403,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/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index 77a313f62e..d17b450e81 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -105,6 +105,29 @@ test_expect_success 'GIT_REFLOG_ACTION' '
 	test_cmp expect actual
 '
 
+test_expect_success 'rebase --apply reflog' '
+	git checkout -b reflog-apply start &&
+	old_head_reflog="$(git log -g --format=%gs -1 HEAD)" &&
+
+	git rebase --apply Y &&
+
+	git log -g --format=%gs -4 HEAD >actual &&
+	cat >expect <<-EOF &&
+	rebase finished: returning to refs/heads/reflog-apply
+	rebase: Z
+	rebase: checkout Y
+	$old_head_reflog
+	EOF
+	test_cmp expect actual &&
+
+	git log -g --format=%gs -2 reflog-apply >actual &&
+	cat >expect <<-EOF &&
+	rebase finished: refs/heads/reflog-apply onto $(git rev-parse Y)
+	branch: Created from start
+	EOF
+	test_cmp expect actual
+'
+
 test_expect_success 'rebase -i onto unrelated history' '
 	git init unrelated &&
 	test_commit -C unrelated 1 &&
diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh
index 7c381fbc89..ebbaed147a 100755
--- a/t/t3407-rebase-abort.sh
+++ b/t/t3407-rebase-abort.sh
@@ -7,77 +7,77 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
 
-### Test that we handle space characters properly
-work_dir="$(pwd)/test dir"
-
 test_expect_success setup '
-	mkdir -p "$work_dir" &&
-	cd "$work_dir" &&
-	git init &&
-	echo a > a &&
-	git add a &&
-	git commit -m a &&
+	test_commit a a a &&
 	git branch to-rebase &&
 
-	echo b > a &&
-	git commit -a -m b &&
-	echo c > a &&
-	git commit -a -m c &&
+	test_commit --annotate b a b &&
+	test_commit --annotate c a c &&
 
 	git checkout to-rebase &&
-	echo d > a &&
-	git commit -a -m "merge should fail on this" &&
-	echo e > a &&
-	git commit -a -m "merge should fail on this, too" &&
-	git branch pre-rebase
+	test_commit "merge should fail on this" a d d &&
+	test_commit --annotate "merge should fail on this, too" a e pre-rebase
 '
 
+# Check that HEAD is equal to "pre-rebase" and the current branch is
+# "to-rebase"
+check_head() {
+	test_cmp_rev HEAD pre-rebase^{commit} &&
+	test "$(git symbolic-ref HEAD)" = refs/heads/to-rebase
+}
+
 testrebase() {
 	type=$1
-	dotest=$2
+	state_dir=$2
 
 	test_expect_success "rebase$type --abort" '
-		cd "$work_dir" &&
 		# Clean up the state from the previous one
 		git reset --hard pre-rebase &&
 		test_must_fail git rebase$type main &&
-		test_path_is_dir "$dotest" &&
+		test_path_is_dir "$state_dir" &&
 		git rebase --abort &&
-		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
-		test ! -d "$dotest"
+		check_head &&
+		test_path_is_missing "$state_dir"
 	'
 
 	test_expect_success "rebase$type --abort after --skip" '
-		cd "$work_dir" &&
 		# Clean up the state from the previous one
 		git reset --hard pre-rebase &&
 		test_must_fail git rebase$type main &&
-		test_path_is_dir "$dotest" &&
+		test_path_is_dir "$state_dir" &&
 		test_must_fail git rebase --skip &&
-		test $(git rev-parse HEAD) = $(git rev-parse main) &&
+		test_cmp_rev HEAD main &&
 		git rebase --abort &&
-		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
-		test ! -d "$dotest"
+		check_head &&
+		test_path_is_missing "$state_dir"
 	'
 
 	test_expect_success "rebase$type --abort after --continue" '
-		cd "$work_dir" &&
 		# Clean up the state from the previous one
 		git reset --hard pre-rebase &&
 		test_must_fail git rebase$type main &&
-		test_path_is_dir "$dotest" &&
+		test_path_is_dir "$state_dir" &&
 		echo c > a &&
 		echo d >> a &&
 		git add a &&
 		test_must_fail git rebase --continue &&
-		test $(git rev-parse HEAD) != $(git rev-parse main) &&
+		test_cmp_rev ! HEAD main &&
+		git rebase --abort &&
+		check_head &&
+		test_path_is_missing "$state_dir"
+	'
+
+	test_expect_success "rebase$type --abort when checking out a tag" '
+		test_when_finished "git symbolic-ref HEAD refs/heads/to-rebase" &&
+		git reset --hard a -- &&
+		test_must_fail git rebase$type --onto b c pre-rebase &&
+		test_cmp_rev HEAD b^{commit} &&
 		git rebase --abort &&
-		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
-		test ! -d "$dotest"
+		test_cmp_rev HEAD pre-rebase^{commit} &&
+		! git symbolic-ref HEAD
 	'
 
 	test_expect_success "rebase$type --abort does not update reflog" '
-		cd "$work_dir" &&
 		# Clean up the state from the previous one
 		git reset --hard pre-rebase &&
 		git reflog show to-rebase > reflog_before &&
@@ -89,7 +89,6 @@ testrebase() {
 	'
 
 	test_expect_success 'rebase --abort can not be used with other options' '
-		cd "$work_dir" &&
 		# Clean up the state from the previous one
 		git reset --hard pre-rebase &&
 		test_must_fail git rebase$type main &&
@@ -97,33 +96,21 @@ testrebase() {
 		test_must_fail git rebase --abort -v &&
 		git rebase --abort
 	'
+
+	test_expect_success "rebase$type --quit" '
+		test_when_finished "git symbolic-ref HEAD refs/heads/to-rebase" &&
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type main &&
+		test_path_is_dir $state_dir &&
+		head_before=$(git rev-parse HEAD) &&
+		git rebase --quit &&
+		test_cmp_rev HEAD $head_before &&
+		test_path_is_missing .git/rebase-apply
+	'
 }
 
 testrebase " --apply" .git/rebase-apply
 testrebase " --merge" .git/rebase-merge
 
-test_expect_success 'rebase --apply --quit' '
-	cd "$work_dir" &&
-	# Clean up the state from the previous one
-	git reset --hard pre-rebase &&
-	test_must_fail git rebase --apply main &&
-	test_path_is_dir .git/rebase-apply &&
-	head_before=$(git rev-parse HEAD) &&
-	git rebase --quit &&
-	test $(git rev-parse HEAD) = $head_before &&
-	test ! -d .git/rebase-apply
-'
-
-test_expect_success 'rebase --merge --quit' '
-	cd "$work_dir" &&
-	# Clean up the state from the previous one
-	git reset --hard pre-rebase &&
-	test_must_fail git rebase --merge main &&
-	test_path_is_dir .git/rebase-merge &&
-	head_before=$(git rev-parse HEAD) &&
-	git rebase --quit &&
-	test $(git rev-parse HEAD) = $head_before &&
-	test ! -d .git/rebase-merge
-'
-
 test_done
diff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh
index ab0960e6d9..cde3562e3a 100755
--- a/t/t3408-rebase-multi-line.sh
+++ b/t/t3408-rebase-multi-line.sh
@@ -55,14 +55,4 @@ test_expect_success rebase '
 	test_cmp expect actual
 
 '
-test_expect_success REBASE_P rebasep '
-
-	git checkout side-merge &&
-	git rebase -p side &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	git cat-file commit side-merge-original | sed -e "1,/^\$/d" >expect &&
-	test_cmp expect actual
-
-'
-
 test_done
diff --git a/t/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/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh
deleted file mode 100755
index ec8062a66a..0000000000
--- a/t/t3409-rebase-preserve-merges.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-#
-# Copyright(C) 2008 Stephen Habermann & Andreas Ericsson
-#
-test_description='git rebase -p should preserve merges
-
-Run "git rebase -p" and check that merges are properly carried along
-'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
-. ./test-lib.sh
-
-if ! test_have_prereq REBASE_P; then
-	skip_all='skipping git rebase -p tests, as asked for'
-	test_done
-fi
-
-GIT_AUTHOR_EMAIL=bogus_email_address
-export GIT_AUTHOR_EMAIL
-
-# Clone 2 (conflicting merge):
-#
-# A1--A2--B3   <-- origin/main
-#  \       \
-#   B1------M  <-- topic
-#    \
-#     B2       <-- origin/topic
-#
-# Clone 3 (no-ff merge):
-#
-# A1--A2--B3   <-- origin/main
-#  \
-#   B1------M  <-- topic
-#    \     /
-#     \--A3    <-- topic2
-#      \
-#       B2     <-- origin/topic
-#
-# Clone 4 (same as Clone 3)
-
-test_expect_success 'setup for merge-preserving rebase' \
-	'echo First > A &&
-	git add A &&
-	git commit -m "Add A1" &&
-	git checkout -b topic &&
-	echo Second > B &&
-	git add B &&
-	git commit -m "Add B1" &&
-	git checkout -f main &&
-	echo Third >> A &&
-	git commit -a -m "Modify A2" &&
-	echo Fifth > B &&
-	git add B &&
-	git commit -m "Add different B" &&
-
-	git clone ./. clone2 &&
-	(
-		cd clone2 &&
-		git checkout -b topic origin/topic &&
-		test_must_fail git merge origin/main &&
-		echo Resolved >B &&
-		git add B &&
-		git commit -m "Merge origin/main into topic"
-	) &&
-
-	git clone ./. clone3 &&
-	(
-		cd clone3 &&
-		git checkout -b topic2 origin/topic &&
-		echo Sixth > A &&
-		git commit -a -m "Modify A3" &&
-		git checkout -b topic origin/topic &&
-		git merge --no-ff topic2
-	) &&
-
-	git clone ./. clone4 &&
-	(
-		cd clone4 &&
-		git checkout -b topic2 origin/topic &&
-		echo Sixth > A &&
-		git commit -a -m "Modify A3" &&
-		git checkout -b topic origin/topic &&
-		git merge --no-ff topic2
-	) &&
-
-	git checkout topic &&
-	echo Fourth >> B &&
-	git commit -a -m "Modify B2"
-'
-
-test_expect_success '--continue works after a conflict' '
-	(
-	cd clone2 &&
-	git fetch &&
-	test_must_fail git rebase -p origin/topic &&
-	test 2 = $(git ls-files B | wc -l) &&
-	echo Resolved again > B &&
-	test_must_fail git rebase --continue &&
-	grep "^@@@ " .git/rebase-merge/patch &&
-	git add B &&
-	git rebase --continue &&
-	test 1 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
-	test 1 = $(git rev-list --all --pretty=oneline | grep "Add different" | wc -l) &&
-	test 1 = $(git rev-list --all --pretty=oneline | grep "Merge origin" | wc -l)
-	)
-'
-
-test_expect_success 'rebase -p preserves no-ff merges' '
-	(
-	cd clone3 &&
-	git fetch &&
-	git rebase -p origin/topic &&
-	test 3 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
-	test 1 = $(git rev-list --all --pretty=oneline | grep "Merge branch" | wc -l)
-	)
-'
-
-test_expect_success 'rebase -p ignores merge.log config' '
-	(
-	cd clone4 &&
-	git fetch &&
-	git -c merge.log=1 rebase -p origin/topic &&
-	echo >expected &&
-	git log --format="%b" -1 >current &&
-	test_cmp expected current
-	)
-'
-
-test_done
diff --git a/t/t3410-rebase-preserve-dropped-merges.sh b/t/t3410-rebase-preserve-dropped-merges.sh
deleted file mode 100755
index 2e29866993..0000000000
--- a/t/t3410-rebase-preserve-dropped-merges.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2008 Stephen Haberman
-#
-
-test_description='git rebase preserve merges
-
-This test runs git rebase with preserve merges and ensures commits
-dropped by the --cherry-pick flag have their childrens parents
-rewritten.
-'
-. ./test-lib.sh
-
-if ! test_have_prereq REBASE_P; then
-	skip_all='skipping git rebase -p tests, as asked for'
-	test_done
-fi
-
-# set up two branches like this:
-#
-# A - B - C - D - E
-#   \
-#     F - G - H
-#       \
-#         I
-#
-# where B, D and G touch the same file.
-
-test_expect_success 'setup' '
-	test_commit A file1 &&
-	test_commit B file1 1 &&
-	test_commit C file2 &&
-	test_commit D file1 2 &&
-	test_commit E file3 &&
-	git checkout A &&
-	test_commit F file4 &&
-	test_commit G file1 3 &&
-	test_commit H file5 &&
-	git checkout F &&
-	test_commit I file6
-'
-
-# A - B - C - D - E
-#   \             \ \
-#     F - G - H -- L \        -->   L
-#       \            |               \
-#         I -- G2 -- J -- K           I -- K
-# G2 = same changes as G
-test_expect_success 'skip same-resolution merges with -p' '
-	git checkout H &&
-	test_must_fail git merge E &&
-	test_commit L file1 23 &&
-	git checkout I &&
-	test_commit G2 file1 3 &&
-	test_must_fail git merge E &&
-	test_commit J file1 23 &&
-	test_commit K file7 file7 &&
-	git rebase -i -p L &&
-	test $(git rev-parse HEAD^^) = $(git rev-parse L) &&
-	test "23" = "$(cat file1)" &&
-	test "I" = "$(cat file6)" &&
-	test "file7" = "$(cat file7)"
-'
-
-# A - B - C - D - E
-#   \             \ \
-#     F - G - H -- L2 \        -->   L2
-#       \             |                \
-#         I -- G3 --- J2 -- K2           I -- G3 -- K2
-# G2 = different changes as G
-test_expect_success 'keep different-resolution merges with -p' '
-	git checkout H &&
-	test_must_fail git merge E &&
-	test_commit L2 file1 23 &&
-	git checkout I &&
-	test_commit G3 file1 4 &&
-	test_must_fail git merge E &&
-	test_commit J2 file1 24 &&
-	test_commit K2 file7 file7 &&
-	test_must_fail git rebase -i -p L2 &&
-	echo 234 > file1 &&
-	git add file1 &&
-	git rebase --continue &&
-	test $(git rev-parse HEAD^^^) = $(git rev-parse L2) &&
-	test "234" = "$(cat file1)" &&
-	test "I" = "$(cat file6)" &&
-	test "file7" = "$(cat file7)"
-'
-
-test_done
diff --git a/t/t3411-rebase-preserve-around-merges.sh b/t/t3411-rebase-preserve-around-merges.sh
deleted file mode 100755
index fb45e7bf7b..0000000000
--- a/t/t3411-rebase-preserve-around-merges.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2008 Stephen Haberman
-#
-
-test_description='git rebase preserve merges
-
-This test runs git rebase with -p and tries to squash a commit from after
-a merge to before the merge.
-'
-. ./test-lib.sh
-
-if ! test_have_prereq REBASE_P; then
-	skip_all='skipping git rebase -p tests, as asked for'
-	test_done
-fi
-
-. "$TEST_DIRECTORY"/lib-rebase.sh
-
-set_fake_editor
-
-# set up two branches like this:
-#
-# A1 - B1 - D1 - E1 - F1
-#       \        /
-#        -- C1 --
-
-test_expect_success 'setup' '
-	test_commit A1 &&
-	test_commit B1 &&
-	test_commit C1 &&
-	git reset --hard B1 &&
-	test_commit D1 &&
-	test_merge E1 C1 &&
-	test_commit F1
-'
-
-# Should result in:
-#
-# A1 - B1 - D2 - E2
-#       \        /
-#        -- C1 --
-#
-test_expect_success 'squash F1 into D1' '
-	FAKE_LINES="1 squash 4 2 3" git rebase -i -p B1 &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse C1)" &&
-	test "$(git rev-parse HEAD~2)" = "$(git rev-parse B1)" &&
-	git tag E2
-'
-
-# Start with:
-#
-# A1 - B1 - D2 - E2
-#  \
-#   G1 ---- L1 ---- M1
-#    \             /
-#     H1 -- J1 -- K1
-#      \         /
-#        -- I1 --
-#
-# And rebase G1..M1 onto E2
-
-test_expect_success 'rebase two levels of merge' '
-	git checkout A1 &&
-	test_commit G1 &&
-	test_commit H1 &&
-	test_commit I1 &&
-	git checkout -b branch3 H1 &&
-	test_commit J1 &&
-	test_merge K1 I1 &&
-	git checkout -b branch2 G1 &&
-	test_commit L1 &&
-	test_merge M1 K1 &&
-	GIT_EDITOR=: git rebase -i -p E2 &&
-	test "$(git rev-parse HEAD~3)" = "$(git rev-parse E2)" &&
-	test "$(git rev-parse HEAD~2)" = "$(git rev-parse HEAD^2^2~2)" &&
-	test "$(git rev-parse HEAD^2^1^1)" = "$(git rev-parse HEAD^2^2^1)"
-'
-
-test_done
diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh
index fda62c65bd..1e9f7833dd 100755
--- a/t/t3412-rebase-root.sh
+++ b/t/t3412-rebase-root.sh
@@ -11,7 +11,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 log_with_names () {
 	git rev-list --topo-order --parents --pretty="tformat:%s" HEAD |
-	git name-rev --stdin --name-only --refs=refs/heads/$1
+	git name-rev --annotate-stdin --name-only --refs=refs/heads/$1
 }
 
 
@@ -89,17 +89,6 @@ test_expect_success 'pre-rebase got correct input (4)' '
 	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work4
 '
 
-test_expect_success REBASE_P 'rebase -i -p with linear history' '
-	git checkout -b work5 other &&
-	git rebase -i -p --root --onto main &&
-	git log --pretty=tformat:"%s" > rebased5 &&
-	test_cmp expect rebased5
-'
-
-test_expect_success REBASE_P 'pre-rebase got correct input (5)' '
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
-'
-
 test_expect_success 'set up merge history' '
 	git checkout other^ &&
 	git checkout -b side &&
@@ -123,13 +112,6 @@ commit work6~4
 1
 EOF
 
-test_expect_success REBASE_P 'rebase -i -p with merge' '
-	git checkout -b work6 other &&
-	git rebase -i -p --root --onto main &&
-	log_with_names work6 > rebased6 &&
-	test_cmp expect-side rebased6
-'
-
 test_expect_success 'set up second root and merge' '
 	git symbolic-ref HEAD refs/heads/third &&
 	rm .git/index &&
@@ -158,13 +140,6 @@ commit work7~5
 1
 EOF
 
-test_expect_success REBASE_P 'rebase -i -p with two roots' '
-	git checkout -b work7 other &&
-	git rebase -i -p --root --onto main &&
-	log_with_names work7 > rebased7 &&
-	test_cmp expect-third rebased7
-'
-
 test_expect_success 'setup pre-rebase hook that fails' '
 	mkdir -p .git/hooks &&
 	cat >.git/hooks/pre-rebase <<EOF &&
@@ -264,21 +239,9 @@ commit conflict3~6
 1
 EOF
 
-test_expect_success REBASE_P 'rebase -i -p --root with conflict (first part)' '
-	git checkout -b conflict3 other &&
-	test_must_fail git rebase -i -p --root --onto main &&
-	git ls-files -u | grep "B$"
-'
-
 test_expect_success 'fix the conflict' '
 	echo 3 > B &&
 	git add B
 '
 
-test_expect_success REBASE_P 'rebase -i -p --root with conflict (second part)' '
-	git rebase --continue &&
-	log_with_names conflict3 >out &&
-	test_cmp expect-conflict-p out
-'
-
 test_done
diff --git a/t/t3414-rebase-preserve-onto.sh b/t/t3414-rebase-preserve-onto.sh
deleted file mode 100755
index 72e04b5386..0000000000
--- a/t/t3414-rebase-preserve-onto.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2009 Greg Price
-#
-
-test_description='git rebase -p should respect --onto
-
-In a rebase with --onto, we should rewrite all the commits that
-aren'"'"'t on top of $ONTO, even if they are on top of $UPSTREAM.
-'
-. ./test-lib.sh
-
-if ! test_have_prereq REBASE_P; then
-	skip_all='skipping git rebase -p tests, as asked for'
-	test_done
-fi
-
-. "$TEST_DIRECTORY"/lib-rebase.sh
-
-# Set up branches like this:
-# A1---B1---E1---F1---G1
-#  \    \             /
-#   \    \--C1---D1--/
-#    H1
-
-test_expect_success 'setup' '
-	test_commit A1 &&
-	test_commit B1 &&
-	test_commit C1 &&
-	test_commit D1 &&
-	git reset --hard B1 &&
-	test_commit E1 &&
-	test_commit F1 &&
-	test_merge G1 D1 &&
-	git reset --hard A1 &&
-	test_commit H1
-'
-
-# Now rebase merge G1 from both branches' base B1, both should move:
-# A1---B1---E1---F1---G1
-#  \    \             /
-#   \    \--C1---D1--/
-#    \
-#     H1---E2---F2---G2
-#      \             /
-#       \--C2---D2--/
-
-test_expect_success 'rebase from B1 onto H1' '
-	git checkout G1 &&
-	git rebase -p --onto H1 B1 &&
-	test "$(git rev-parse HEAD^1^1^1)" = "$(git rev-parse H1)" &&
-	test "$(git rev-parse HEAD^2^1^1)" = "$(git rev-parse H1)"
-'
-
-# On the other hand if rebase from E1 which is within one branch,
-# then the other branch stays:
-# A1---B1---E1---F1---G1
-#  \    \             /
-#   \    \--C1---D1--/
-#    \             \
-#     H1-----F3-----G3
-
-test_expect_success 'rebase from E1 onto H1' '
-	git checkout G1 &&
-	git rebase -p --onto H1 E1 &&
-	test "$(git rev-parse HEAD^1^1)" = "$(git rev-parse H1)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse D1)"
-'
-
-# And the same if we rebase from a commit in the second-parent branch.
-# A1---B1---E1---F1----G1
-#  \    \          \   /
-#   \    \--C1---D1-\-/
-#    \               \
-#     H1------D3------G4
-
-test_expect_success 'rebase from C1 onto H1' '
-	git checkout G1 &&
-	git rev-list --first-parent --pretty=oneline C1..G1 &&
-	git rebase -p --onto H1 C1 &&
-	test "$(git rev-parse HEAD^2^1)" = "$(git rev-parse H1)" &&
-	test "$(git rev-parse HEAD^1)" = "$(git rev-parse F1)"
-'
-
-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/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
index f4c2ee02bc..130e2f9b55 100755
--- a/t/t3418-rebase-continue.sh
+++ b/t/t3418-rebase-continue.sh
@@ -21,7 +21,7 @@ test_expect_success 'setup' '
 	git checkout main
 '
 
-test_expect_success 'interactive rebase --continue works with touched file' '
+test_expect_success 'merge based rebase --continue with works with touched file' '
 	rm -fr .git/rebase-* &&
 	git reset --hard &&
 	git checkout main &&
@@ -31,12 +31,22 @@ test_expect_success 'interactive rebase --continue works with touched file' '
 	git rebase --continue
 '
 
-test_expect_success 'non-interactive rebase --continue works with touched file' '
+test_expect_success 'merge based rebase --continue removes .git/MERGE_MSG' '
+	git checkout -f --detach topic &&
+
+	test_must_fail git rebase --onto main HEAD^ &&
+	git read-tree --reset -u HEAD &&
+	test_path_is_file .git/MERGE_MSG &&
+	git rebase --continue &&
+	test_path_is_missing .git/MERGE_MSG
+'
+
+test_expect_success 'apply based rebase --continue works with touched file' '
 	rm -fr .git/rebase-* &&
 	git reset --hard &&
 	git checkout main &&
 
-	test_must_fail git rebase --onto main main topic &&
+	test_must_fail git rebase --apply --onto main main topic &&
 	echo "Resolved" >F2 &&
 	git add F2 &&
 	test-tool chmtime =-60 F1 &&
@@ -109,20 +119,6 @@ test_expect_success 'rebase -i --continue handles merge strategy and options' '
 	test -f funny.was.run
 '
 
-test_expect_success REBASE_P 'rebase passes merge strategy options correctly' '
-	rm -fr .git/rebase-* &&
-	git reset --hard commit-new-file-F3-on-topic-branch &&
-	test_commit theirs-to-merge &&
-	git reset --hard HEAD^ &&
-	test_commit some-commit &&
-	test_tick &&
-	git merge --no-ff theirs-to-merge &&
-	FAKE_LINES="1 edit 2 3" git rebase -i -f -p -m \
-		-s recursive --strategy-option=theirs HEAD~2 &&
-	test_commit force-change &&
-	git rebase --continue
-'
-
 test_expect_success 'rebase -r passes merge strategy options correctly' '
 	rm -fr .git/rebase-* &&
 	git reset --hard commit-new-file-F3-on-topic-branch &&
@@ -254,11 +250,10 @@ test_rerere_autoupdate () {
 	'
 }
 
-test_rerere_autoupdate
+test_rerere_autoupdate --apply
 test_rerere_autoupdate -m
 GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR
 test_rerere_autoupdate -i
-test_have_prereq !REBASE_P || test_rerere_autoupdate --preserve-merges
 unset GIT_SEQUENCE_EDITOR
 
 test_expect_success 'the todo command "break" works' '
@@ -313,4 +308,30 @@ test_expect_success 'there is no --no-reschedule-failed-exec in an ongoing rebas
 	test_expect_code 129 git rebase --edit-todo --no-reschedule-failed-exec
 '
 
+test_orig_head_helper () {
+	test_when_finished 'git rebase --abort &&
+		git checkout topic &&
+		git reset --hard commit-new-file-F2-on-topic-branch' &&
+	git update-ref -d ORIG_HEAD &&
+	test_must_fail git rebase "$@" &&
+	test_cmp_rev ORIG_HEAD commit-new-file-F2-on-topic-branch
+}
+
+test_orig_head () {
+	type=$1
+	test_expect_success "rebase $type sets ORIG_HEAD correctly" '
+		git checkout topic &&
+		git reset --hard commit-new-file-F2-on-topic-branch &&
+		test_orig_head_helper $type main
+	'
+
+	test_expect_success "rebase $type <upstream> <branch> sets ORIG_HEAD correctly" '
+		git checkout main &&
+		test_orig_head_helper $type main topic
+	'
+}
+
+test_orig_head --apply
+test_orig_head --merge
+
 test_done
diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh
index 4a9204b4b6..62d86d557d 100755
--- a/t/t3421-rebase-topology-linear.sh
+++ b/t/t3421-rebase-topology-linear.sh
@@ -29,7 +29,6 @@ test_run_rebase () {
 test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
 
 test_expect_success 'setup branches and remote tracking' '
 	git tag -l >tags &&
@@ -53,7 +52,6 @@ test_run_rebase () {
 test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
 
 test_run_rebase () {
 	result=$1
@@ -70,7 +68,6 @@ test_run_rebase success --apply
 test_run_rebase success --fork-point
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
 
 test_run_rebase () {
 	result=$1
@@ -87,7 +84,6 @@ test_run_rebase success --apply
 test_run_rebase success --fork-point
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
 
 test_run_rebase () {
 	result=$1
@@ -102,7 +98,6 @@ test_run_rebase success --apply
 test_run_rebase success --fork-point
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
 
 #       f
 #      /
@@ -142,7 +137,6 @@ test_run_rebase () {
 test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
 
 test_run_rebase () {
 	result=$1
@@ -157,7 +151,6 @@ test_run_rebase () {
 test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
 
 test_run_rebase () {
 	result=$1
@@ -172,7 +165,6 @@ test_run_rebase () {
 test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
 
 test_run_rebase () {
 	result=$1
@@ -187,7 +179,6 @@ test_run_rebase () {
 test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
 
 # a---b---c---j!
 #      \
@@ -215,7 +206,6 @@ test_run_rebase () {
 test_run_rebase failure --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
 
 test_run_rebase () {
 	result=$1
@@ -229,7 +219,6 @@ test_run_rebase () {
 }
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
 
 test_run_rebase () {
 	result=$1
@@ -243,7 +232,6 @@ test_run_rebase () {
 }
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
 test_run_rebase success --rebase-merges
 
 #       m
@@ -283,7 +271,6 @@ test_run_rebase () {
 test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
 
 test_run_rebase () {
 	result=$1
@@ -298,7 +285,6 @@ test_run_rebase () {
 test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
 
 test_run_rebase () {
 	result=$1
@@ -313,7 +299,6 @@ test_run_rebase () {
 test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
 
 test_run_rebase () {
 	result=$1
@@ -329,7 +314,6 @@ test_run_rebase () {
 test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
 
 test_run_rebase () {
 	result=$1
@@ -344,7 +328,6 @@ test_run_rebase () {
 test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
 
 test_run_rebase () {
 	result=$1
@@ -358,7 +341,6 @@ test_run_rebase () {
 test_run_rebase success ''
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase failure -p
 
 test_run_rebase () {
 	result=$1
@@ -373,6 +355,5 @@ test_run_rebase () {
 test_run_rebase success ''
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
 
 test_done
diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh
index c8234062c6..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' '
@@ -63,15 +65,4 @@ test_rebase_am_only () {
 test_rebase_am_only --whitespace=fix
 test_rebase_am_only -C4
 
-test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' '
-	git checkout B^0 &&
-	test_must_fail git rebase --preserve-merges --signoff A
-'
-
-test_expect_success REBASE_P \
-	'--preserve-merges incompatible with --rebase-merges' '
-	git checkout B^0 &&
-	test_must_fail git rebase --preserve-merges --rebase-merges A
-'
-
 test_done
diff --git a/t/t3425-rebase-topology-merges.sh b/t/t3425-rebase-topology-merges.sh
index e42faa44e7..63acc1ea4d 100755
--- a/t/t3425-rebase-topology-merges.sh
+++ b/t/t3425-rebase-topology-merges.sh
@@ -106,155 +106,4 @@ test_run_rebase success 'd n o e' --apply
 test_run_rebase success 'd n o e' -m
 test_run_rebase success 'd n o e' -i
 
-if ! test_have_prereq REBASE_P; then
-	skip_all='skipping git rebase -p tests, as asked for'
-	test_done
-fi
-
-test_expect_success "rebase -p is no-op in non-linear history" "
-	reset_rebase &&
-	git rebase -p d w &&
-	test_cmp_rev w HEAD
-"
-
-test_expect_success "rebase -p is no-op when base inside second parent" "
-	reset_rebase &&
-	git rebase -p e w &&
-	test_cmp_rev w HEAD
-"
-
-test_expect_failure "rebase -p --root on non-linear history is a no-op" "
-	reset_rebase &&
-	git rebase -p --root w &&
-	test_cmp_rev w HEAD
-"
-
-test_expect_success "rebase -p re-creates merge from side branch" "
-	reset_rebase &&
-	git rebase -p z w &&
-	test_cmp_rev z HEAD^ &&
-	test_cmp_rev w^2 HEAD^2
-"
-
-test_expect_success "rebase -p re-creates internal merge" "
-	reset_rebase &&
-	git rebase -p c w &&
-	test_cmp_rev c HEAD~4 &&
-	test_cmp_rev HEAD^2^ HEAD~3 &&
-	test_revision_subjects 'd n e o w' HEAD~3 HEAD~2 HEAD^2 HEAD^ HEAD
-"
-
-test_expect_success "rebase -p can re-create two branches on onto" "
-	reset_rebase &&
-	git rebase -p --onto c d w &&
-	test_cmp_rev c HEAD~3 &&
-	test_cmp_rev c HEAD^2^ &&
-	test_revision_subjects 'n e o w' HEAD~2 HEAD^2 HEAD^ HEAD
-"
-
-#       f
-#      /
-# a---b---c---g---h
-#      \
-#       d---gp--i
-#        \       \
-#         e-------u
-#
-# gp = cherry-picked g
-# h = reverted g
-test_expect_success 'setup of non-linear-history for patch-equivalence tests' '
-	git checkout e &&
-	test_merge u i
-'
-
-test_expect_success "rebase -p re-creates history around dropped commit matching upstream" "
-	reset_rebase &&
-	git rebase -p h u &&
-	test_cmp_rev h HEAD~3 &&
-	test_cmp_rev HEAD^2^ HEAD~2 &&
-	test_revision_subjects 'd i e u' HEAD~2 HEAD^2 HEAD^ HEAD
-"
-
-test_expect_success "rebase -p --onto in merged history drops patches in upstream" "
-	reset_rebase &&
-	git rebase -p --onto f h u &&
-	test_cmp_rev f HEAD~3 &&
-	test_cmp_rev HEAD^2^ HEAD~2 &&
-	test_revision_subjects 'd i e u' HEAD~2 HEAD^2 HEAD^ HEAD
-"
-
-test_expect_success "rebase -p --onto in merged history does not drop patches in onto" "
-	reset_rebase &&
-	git rebase -p --onto h f u &&
-	test_cmp_rev h HEAD~3 &&
-	test_cmp_rev HEAD^2~2 HEAD~2 &&
-	test_revision_subjects 'd gp i e u' HEAD~2 HEAD^2^ HEAD^2 HEAD^ HEAD
-"
-
-# a---b---c---g---h
-#      \
-#       d---gp--s
-#        \   \ /
-#         \   X
-#          \ / \
-#           e---t
-#
-# gp = cherry-picked g
-# h = reverted g
-test_expect_success 'setup of non-linear-history for dropping whole side' '
-	git checkout gp &&
-	test_merge s e &&
-	git checkout e &&
-	test_merge t gp
-'
-
-test_expect_failure "rebase -p drops merge commit when entire first-parent side is dropped" "
-	reset_rebase &&
-	git rebase -p h s &&
-	test_cmp_rev h HEAD~2 &&
-	test_linear_range 'd e' h..
-"
-
-test_expect_success "rebase -p drops merge commit when entire second-parent side is dropped" "
-	reset_rebase &&
-	git rebase -p h t &&
-	test_cmp_rev h HEAD~2 &&
-	test_linear_range 'd e' h..
-"
-
-# a---b---c
-#      \
-#       d---e
-#        \   \
-#         n---r
-#          \
-#           o
-#
-# r = tree-same with n
-test_expect_success 'setup of non-linear-history for empty commits' '
-	git checkout n &&
-	git merge --no-commit e &&
-	git reset n . &&
-	git commit -m r &&
-	git reset --hard &&
-	git clean -f &&
-	git tag r
-'
-
-test_expect_success "rebase -p re-creates empty internal merge commit" "
-	reset_rebase &&
-	git rebase -p c r &&
-	test_cmp_rev c HEAD~3 &&
-	test_cmp_rev HEAD^2^ HEAD~2 &&
-	test_revision_subjects 'd e n r' HEAD~2 HEAD^2 HEAD^ HEAD
-"
-
-test_expect_success "rebase -p re-creates empty merge commit" "
-	reset_rebase &&
-	git rebase -p o r &&
-	test_cmp_rev e HEAD^2 &&
-	test_cmp_rev o HEAD^ &&
-	test_revision_subjects 'r' HEAD
-"
-
 test_done
diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index e78c7e3796..48b76f8232 100755
--- a/t/t3427-rebase-subtree.sh
+++ b/t/t3427-rebase-subtree.sh
@@ -36,11 +36,10 @@ commit_message() {
 # where the root commit adds three files: topic_1.t, topic_2.t and topic_3.t.
 #
 # This commit history is then rebased onto `topic_3` with the
-# `-Xsubtree=files_subtree` option in three different ways:
+# `-Xsubtree=files_subtree` option in two different ways:
 #
-# 1. using `--preserve-merges`
-# 2. using `--preserve-merges` and --keep-empty
-# 3. without specifying a rebase backend
+# 1. without specifying a rebase backend
+# 2. using the `--rebase-merges` backend
 
 test_expect_success 'setup' '
 	test_commit README &&
@@ -69,25 +68,6 @@ test_expect_success 'setup' '
 	git commit -m "Empty commit" --allow-empty
 '
 
-# FAILURE: Does not preserve topic_4.
-test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '
-	reset_rebase &&
-	git checkout -b rebase-preserve-merges to-rebase &&
-	git rebase -Xsubtree=files_subtree --preserve-merges --onto files-main main &&
-	verbose test "$(commit_message HEAD~)" = "topic_4" &&
-	verbose test "$(commit_message HEAD)" = "files_subtree/topic_5"
-'
-
-# FAILURE: Does not preserve topic_4.
-test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '
-	reset_rebase &&
-	git checkout -b rebase-keep-empty to-rebase &&
-	git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-main main &&
-	verbose test "$(commit_message HEAD~2)" = "topic_4" &&
-	verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
-	verbose test "$(commit_message HEAD)" = "Empty commit"
-'
-
 test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '
 	reset_rebase &&
 	git checkout -b rebase-onto to-rebase &&
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/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index 6748070df5..43c82d9a33 100755
--- a/t/t3430-rebase-merges.sh
+++ b/t/t3430-rebase-merges.sh
@@ -172,19 +172,39 @@ test_expect_success 'failed `merge <branch>` does not crash' '
 	grep "^Merge branch ${SQ}G${SQ}$" .git/rebase-merge/message
 '
 
-test_expect_success 'fast-forward merge -c still rewords' '
-	git checkout -b fast-forward-merge-c H &&
+test_expect_success 'merge -c commits before rewording and reloads todo-list' '
+	cat >script-from-scratch <<-\EOF &&
+	merge -c E B
+	merge -c H G
+	EOF
+
+	git checkout -b merge-c H &&
 	(
-		set_fake_editor &&
-		FAKE_COMMIT_MESSAGE=edited \
-			GIT_SEQUENCE_EDITOR="echo merge -c H G >" \
-			git rebase -ir @^
+		set_reword_editor &&
+		GIT_SEQUENCE_EDITOR="\"$PWD/replace-editor.sh\"" \
+			git rebase -i -r D
 	) &&
-	echo edited >expected &&
-	git log --pretty=format:%B -1 >actual &&
-	test_cmp expected actual
+	check_reworded_commits E H
 '
 
+test_expect_success 'merge -c rewords when a strategy is given' '
+	git checkout -b merge-c-with-strategy H &&
+	write_script git-merge-override <<-\EOF &&
+	echo overridden$1 >G.t
+	git add G.t
+	EOF
+
+	PATH="$PWD:$PATH" \
+	GIT_SEQUENCE_EDITOR="echo merge -c H G >" \
+	GIT_EDITOR="echo edited >>" \
+		git rebase --no-ff -ir -s override -Xxopt E &&
+	test_write_lines overridden--xopt >expect &&
+	test_cmp expect G.t &&
+	test_write_lines H "" edited "" >expect &&
+	git log --format=%B -1 >actual &&
+	test_cmp expect actual
+
+'
 test_expect_success 'with a branch tip that was cherry-picked already' '
 	git checkout -b already-upstream main &&
 	base="$(git rev-parse --verify HEAD)" &&
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/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh
index ec10766858..5f8ba2c739 100755
--- a/t/t3435-rebase-gpg-sign.sh
+++ b/t/t3435-rebase-gpg-sign.sh
@@ -65,6 +65,7 @@ test_rebase_gpg_sign ! true  -i --gpg-sign --no-gpg-sign
 test_rebase_gpg_sign   false -i --no-gpg-sign --gpg-sign
 
 test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' '
+	test_when_finished "git clean -f" &&
 	git reset --hard merged &&
 	git config commit.gpgsign true &&
 	git rebase -p --no-gpg-sign --onto=one fork-point main &&
diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh
index 4d106642ba..94671d3c46 100755
--- a/t/t3436-rebase-more-options.sh
+++ b/t/t3436-rebase-more-options.sh
@@ -82,6 +82,20 @@ test_expect_success '--committer-date-is-author-date works with merge backend' '
 	test_ctime_is_atime -1
 '
 
+test_expect_success '--committer-date-is-author-date works when rewording' '
+	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_MESSAGE=edited \
+			FAKE_LINES="reword 1" \
+			git rebase -i --committer-date-is-author-date HEAD^
+	) &&
+	test_write_lines edited "" >expect &&
+	git log --format="%B" -1 >actual &&
+	test_cmp expect actual &&
+	test_ctime_is_atime -1
+'
+
 test_expect_success '--committer-date-is-author-date works with rebase -r' '
 	git checkout side &&
 	GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 &&
@@ -155,6 +169,21 @@ test_expect_success '--reset-author-date with --committer-date-is-author-date wo
 	test_atime_is_ignored -2
 '
 
+test_expect_success 'reset-author-date with --committer-date-is-author-date works when rewording' '
+	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_MESSAGE=edited \
+			FAKE_LINES="reword 1" \
+			git rebase -i --committer-date-is-author-date \
+				--reset-author-date HEAD^
+	) &&
+	test_write_lines edited "" >expect &&
+	git log --format="%B" -1 >actual &&
+	test_cmp expect actual &&
+	test_atime_is_ignored -1
+'
+
 test_expect_success '--reset-author-date --committer-date-is-author-date works when forking merge' '
 	GIT_SEQUENCE_EDITOR="echo \"merge -C $(git rev-parse HEAD) commit3\">" \
 		PATH="./test-bin:$PATH" git rebase -i --strategy=test \
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 9d100cd188..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 &&
@@ -158,4 +158,20 @@ test_expect_success 'cherry-pick works with dirty renamed file' '
 	grep -q "^modified$" renamed
 '
 
+test_expect_success 'advice from failed revert' '
+	test_commit --no-tag "add dream" dream dream &&
+	dream_oid=$(git rev-parse --short HEAD) &&
+	cat <<-EOF >expected &&
+	error: could not revert $dream_oid... add dream
+	hint: After resolving the conflicts, mark them with
+	hint: "git add/rm <pathspec>", then run
+	hint: "git revert --continue".
+	hint: You can instead skip this commit with "git revert --skip".
+	hint: To abort and get back to the state before "git revert",
+	hint: run "git revert --abort".
+	EOF
+	test_commit --append --no-tag "double-add dream" dream dream &&
+	test_must_fail git revert HEAD^ 2>actual &&
+	test_cmp expected actual
+'
 test_done
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 014001b8f3..979e843c65 100755
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -47,20 +47,23 @@ test_expect_success 'failed cherry-pick does not advance HEAD' '
 	test "$head" = "$newhead"
 '
 
-test_expect_success 'advice from failed cherry-pick' "
+test_expect_success 'advice from failed cherry-pick' '
 	pristine_detach initial &&
 
-	picked=\$(git rev-parse --short picked) &&
+	picked=$(git rev-parse --short picked) &&
 	cat <<-EOF >expected &&
-	error: could not apply \$picked... picked
-	hint: after resolving the conflicts, mark the corrected paths
-	hint: with 'git add <paths>' or 'git rm <paths>'
-	hint: and commit the result with 'git commit'
+	error: could not apply $picked... picked
+	hint: After resolving the conflicts, mark them with
+	hint: "git add/rm <pathspec>", then run
+	hint: "git cherry-pick --continue".
+	hint: You can instead skip this commit with "git cherry-pick --skip".
+	hint: To abort and get back to the state before "git cherry-pick",
+	hint: run "git cherry-pick --abort".
 	EOF
 	test_must_fail git cherry-pick picked 2>actual &&
 
 	test_cmp expected actual
-"
+'
 
 test_expect_success 'advice from failed cherry-pick --no-commit' "
 	pristine_detach initial &&
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/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 49010aa946..3b0fa66c33 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -238,6 +238,7 @@ test_expect_success 'allow skipping commit but not abort for a new history' '
 '
 
 test_expect_success 'allow skipping stopped cherry-pick because of untracked file modifications' '
+	test_when_finished "rm unrelated" &&
 	pristine_detach initial &&
 	git rm --cached unrelated &&
 	git commit -m "untrack unrelated" &&
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 7de21f8bcf..a2a0c820fe 100755
--- a/t/t3601-rm-pathspec-file.sh
+++ b/t/t3601-rm-pathspec-file.sh
@@ -2,6 +2,7 @@
 
 test_description='rm --pathspec-from-file'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_tick
@@ -66,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/t3602-rm-sparse-checkout.sh b/t/t3602-rm-sparse-checkout.sh
index e9e9a15c74..034ec01091 100755
--- a/t/t3602-rm-sparse-checkout.sh
+++ b/t/t3602-rm-sparse-checkout.sh
@@ -11,12 +11,15 @@ test_expect_success 'setup' "
 	git commit -m files &&
 
 	cat >sparse_error_header <<-EOF &&
-	The following pathspecs didn't match any eligible path, but they do match index
-	entries outside the current sparse checkout:
+	The following paths and/or pathspecs matched paths that exist
+	outside of your sparse-checkout definition, so will not be
+	updated in the index:
 	EOF
 
 	cat >sparse_hint <<-EOF &&
-	hint: Disable or modify the sparsity rules if you intend to update such entries.
+	hint: If you intend to update such entries, try one of the following:
+	hint: * Use the --sparse option.
+	hint: * Disable or modify the sparsity rules.
 	hint: Disable this message with \"git config advice.updateSparsePath false\"
 	EOF
 
@@ -39,7 +42,29 @@ test_expect_success 'recursive rm does not remove sparse entries' '
 	git sparse-checkout set sub/dir &&
 	git rm -r sub &&
 	git status --porcelain -uno >actual &&
-	echo "D  sub/dir/e" >expected &&
+	cat >expected <<-\EOF &&
+	D  sub/dir/e
+	EOF
+	test_cmp expected actual &&
+
+	git rm --sparse -r sub &&
+	git status --porcelain -uno >actual2 &&
+	cat >expected2 <<-\EOF &&
+	D  sub/d
+	D  sub/dir/e
+	EOF
+	test_cmp expected2 actual2
+'
+
+test_expect_success 'recursive rm --sparse removes sparse entries' '
+	git reset --hard &&
+	git sparse-checkout set "sub/dir" &&
+	git rm --sparse -r sub &&
+	git status --porcelain -uno >actual &&
+	cat >expected <<-\EOF &&
+	D  sub/d
+	D  sub/dir/e
+	EOF
 	test_cmp expected actual
 '
 
@@ -75,4 +100,40 @@ test_expect_success 'do not warn about sparse entries with --ignore-unmatch' '
 	git ls-files --error-unmatch b
 '
 
+test_expect_success 'refuse to rm a non-skip-worktree path outside sparse cone' '
+	git reset --hard &&
+	git sparse-checkout set a &&
+	git update-index --no-skip-worktree b &&
+	test_must_fail git rm b 2>stderr &&
+	test_cmp b_error_and_hint stderr &&
+	git rm --sparse b 2>stderr &&
+	test_must_be_empty stderr &&
+	test_path_is_missing b
+'
+
+test_expect_success 'can remove files from non-sparse dir' '
+	git reset --hard &&
+	git sparse-checkout disable &&
+	mkdir -p w x/y &&
+	test_commit w/f &&
+	test_commit x/y/f &&
+
+	git sparse-checkout set w !/x y/ &&
+	git rm w/f.t x/y/f.t 2>stderr &&
+	test_must_be_empty stderr
+'
+
+test_expect_success 'refuse to remove non-skip-worktree file from sparse dir' '
+	git reset --hard &&
+	git sparse-checkout disable &&
+	mkdir -p x/y/z &&
+	test_commit x/y/z/f &&
+	git sparse-checkout set !/x y/ !x/y/z &&
+
+	git update-index --no-skip-worktree x/y/z/f.t &&
+	test_must_fail git rm x/y/z/f.t 2>stderr &&
+	echo x/y/z/f.t | cat sparse_error_header - sparse_hint >expect &&
+	test_cmp expect stderr
+'
+
 test_done
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 4086e1ebbc..b1f90ba325 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -5,6 +5,7 @@
 
 test_description='Test of git add, including the -- option.'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # Test the file mode "$1" of the file "$2" in the index.
@@ -140,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 &&
@@ -176,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/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 207714655f..94537a6b40 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -326,7 +326,9 @@ test_expect_success 'correct message when there is nothing to do' '
 test_expect_success 'setup again' '
 	git reset --hard &&
 	test_chmod +x file &&
-	echo content >>file
+	echo content >>file &&
+	test_write_lines A B C D>file2 &&
+	git add file2
 '
 
 # Write the patch file with a new line at the top and bottom
@@ -341,13 +343,27 @@ test_expect_success 'setup patch' '
 	 content
 	+lastline
 	\ No newline at end of file
+	diff --git a/file2 b/file2
+	index 8422d40..35b930a 100644
+	--- a/file2
+	+++ b/file2
+	@@ -1,4 +1,5 @@
+	-A
+	+Z
+	 B
+	+Y
+	 C
+	-D
+	+X
 	EOF
 '
 
 # Expected output, diff is similar to the patch but w/ diff at the top
 test_expect_success 'setup expected' '
 	echo diff --git a/file b/file >expected &&
-	cat patch |sed "/^index/s/ 100644/ 100755/" >>expected &&
+	sed -e "/^index 180b47c/s/ 100644/ 100755/" \
+	    -e /1,5/s//1,4/ \
+	    -e /Y/d patch >>expected &&
 	cat >expected-output <<-\EOF
 	--- a/file
 	+++ b/file
@@ -366,6 +382,28 @@ test_expect_success 'setup expected' '
 	 content
 	+lastline
 	\ No newline at end of file
+	--- a/file2
+	+++ b/file2
+	@@ -1,4 +1,5 @@
+	-A
+	+Z
+	 B
+	+Y
+	 C
+	-D
+	+X
+	@@ -1,2 +1,2 @@
+	-A
+	+Z
+	 B
+	@@ -2,2 +2,3 @@
+	 B
+	+Y
+	 C
+	@@ -3,2 +4,2 @@
+	 C
+	-D
+	+X
 	EOF
 '
 
@@ -373,9 +411,9 @@ test_expect_success 'setup expected' '
 test_expect_success 'add first line works' '
 	git commit -am "clear local changes" &&
 	git apply patch &&
-	printf "%s\n" s y y | git add -p file 2>error |
-		sed -n -e "s/^([1-2]\/[1-2]) Stage this hunk[^@]*\(@@ .*\)/\1/" \
-		       -e "/^[-+@ \\\\]"/p  >output &&
+	test_write_lines s y y s y n y | git add -p 2>error >raw-output &&
+	sed -n -e "s/^([1-9]\/[1-9]) Stage this hunk[^@]*\(@@ .*\)/\1/" \
+	       -e "/^[-+@ \\\\]"/p raw-output >output &&
 	test_must_be_empty error &&
 	git diff --cached >diff &&
 	diff_cmp expected diff &&
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 2b1fd0d0ee..81f3384eee 100755
--- a/t/t3705-add-sparse-checkout.sh
+++ b/t/t3705-add-sparse-checkout.sh
@@ -19,6 +19,7 @@ setup_sparse_entry () {
 	fi &&
 	git add sparse_entry &&
 	git update-index --skip-worktree sparse_entry &&
+	git commit --allow-empty -m "ensure sparse_entry exists at HEAD" &&
 	SPARSE_ENTRY_BLOB=$(git rev-parse :sparse_entry)
 }
 
@@ -36,14 +37,22 @@ setup_gitignore () {
 	EOF
 }
 
+test_sparse_entry_unstaged () {
+	git diff --staged -- sparse_entry >diff &&
+	test_must_be_empty diff
+}
+
 test_expect_success 'setup' "
 	cat >sparse_error_header <<-EOF &&
-	The following pathspecs didn't match any eligible path, but they do match index
-	entries outside the current sparse checkout:
+	The following paths and/or pathspecs matched paths that exist
+	outside of your sparse-checkout definition, so will not be
+	updated in the index:
 	EOF
 
 	cat >sparse_hint <<-EOF &&
-	hint: Disable or modify the sparsity rules if you intend to update such entries.
+	hint: If you intend to update such entries, try one of the following:
+	hint: * Use the --sparse option.
+	hint: * Disable or modify the sparsity rules.
 	hint: Disable this message with \"git config advice.updateSparsePath false\"
 	EOF
 
@@ -55,6 +64,7 @@ test_expect_success 'git add does not remove sparse entries' '
 	setup_sparse_entry &&
 	rm sparse_entry &&
 	test_must_fail git add sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
 	test_cmp error_and_hint stderr &&
 	test_sparse_entry_unchanged
 '
@@ -73,6 +83,7 @@ test_expect_success 'git add . does not remove sparse entries' '
 	rm sparse_entry &&
 	setup_gitignore &&
 	test_must_fail git add . 2>stderr &&
+	test_sparse_entry_unstaged &&
 
 	cat sparse_error_header >expect &&
 	echo . >>expect &&
@@ -88,6 +99,7 @@ do
 		setup_sparse_entry &&
 		echo modified >sparse_entry &&
 		test_must_fail git add $opt sparse_entry 2>stderr &&
+		test_sparse_entry_unstaged &&
 		test_cmp error_and_hint stderr &&
 		test_sparse_entry_unchanged
 	'
@@ -98,6 +110,7 @@ test_expect_success 'git add --refresh does not update sparse entries' '
 	git ls-files --debug sparse_entry | grep mtime >before &&
 	test-tool chmtime -60 sparse_entry &&
 	test_must_fail git add --refresh sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
 	test_cmp error_and_hint stderr &&
 	git ls-files --debug sparse_entry | grep mtime >after &&
 	test_cmp before after
@@ -106,6 +119,7 @@ test_expect_success 'git add --refresh does not update sparse entries' '
 test_expect_success 'git add --chmod does not update sparse entries' '
 	setup_sparse_entry &&
 	test_must_fail git add --chmod=+x sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
 	test_cmp error_and_hint stderr &&
 	test_sparse_entry_unchanged &&
 	! test -x sparse_entry
@@ -116,6 +130,7 @@ test_expect_success 'git add --renormalize does not update sparse entries' '
 	setup_sparse_entry "LINEONE\r\nLINETWO\r\n" &&
 	echo "sparse_entry text=auto" >.gitattributes &&
 	test_must_fail git add --renormalize sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
 	test_cmp error_and_hint stderr &&
 	test_sparse_entry_unchanged
 '
@@ -124,6 +139,7 @@ test_expect_success 'git add --dry-run --ignore-missing warn on sparse path' '
 	setup_sparse_entry &&
 	rm sparse_entry &&
 	test_must_fail git add --dry-run --ignore-missing sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
 	test_cmp error_and_hint stderr &&
 	test_sparse_entry_unchanged
 '
@@ -145,11 +161,74 @@ test_expect_success 'do not warn when pathspec matches dense entries' '
 	git ls-files --error-unmatch dense_entry
 '
 
+test_expect_success 'git add fails outside of sparse-checkout definition' '
+	test_when_finished git sparse-checkout disable &&
+	test_commit a &&
+	git sparse-checkout init &&
+	git sparse-checkout set a &&
+	echo >>sparse_entry &&
+
+	git update-index --no-skip-worktree sparse_entry &&
+	test_must_fail git add sparse_entry &&
+	test_sparse_entry_unstaged &&
+
+	test_must_fail git add --chmod=+x sparse_entry &&
+	test_sparse_entry_unstaged &&
+
+	test_must_fail git add --renormalize sparse_entry &&
+	test_sparse_entry_unstaged &&
+
+	# Avoid munging CRLFs to avoid an error message
+	git -c core.autocrlf=input add --sparse sparse_entry 2>stderr &&
+	test_must_be_empty stderr &&
+	git ls-files --stage >actual &&
+	grep "^100644 .*sparse_entry\$" actual &&
+
+	git add --sparse --chmod=+x sparse_entry 2>stderr &&
+	test_must_be_empty stderr &&
+	git ls-files --stage >actual &&
+	grep "^100755 .*sparse_entry\$" actual &&
+
+	git reset &&
+
+	# This will print a message over stderr on Windows.
+	git add --sparse --renormalize sparse_entry &&
+	git status --porcelain >actual &&
+	grep "^M  sparse_entry\$" actual
+'
+
 test_expect_success 'add obeys advice.updateSparsePath' '
 	setup_sparse_entry &&
 	test_must_fail git -c advice.updateSparsePath=false add sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
 	test_cmp sparse_entry_error stderr
 
 '
 
+test_expect_success 'add allows sparse entries with --sparse' '
+	git sparse-checkout set a &&
+	echo modified >sparse_entry &&
+	test_must_fail git add sparse_entry &&
+	test_sparse_entry_unchanged &&
+	git add --sparse sparse_entry 2>stderr &&
+	test_must_be_empty stderr
+'
+
+test_expect_success 'can add files from non-sparse dir' '
+	git sparse-checkout set w !/x y/ &&
+	mkdir -p w x/y &&
+	touch w/f x/y/f &&
+	git add w/f x/y/f 2>stderr &&
+	test_must_be_empty stderr
+'
+
+test_expect_success 'refuse to add non-skip-worktree file from sparse dir' '
+	git sparse-checkout set !/x y/ !x/y/z &&
+	mkdir -p x/y/z &&
+	touch x/y/z/f &&
+	test_must_fail git add x/y/z/f 2>stderr &&
+	echo x/y/z/f | cat sparse_error_header - sparse_hint >expect &&
+	test_cmp expect stderr
+'
+
 test_done
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/t3902-quoted.sh b/t/t3902-quoted.sh
index f528008c36..72a5a565e9 100755
--- a/t/t3902-quoted.sh
+++ b/t/t3902-quoted.sh
@@ -5,6 +5,7 @@
 
 test_description='quoted output'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 FN='濱野'
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 873aa56e35..b149e2af44 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
@@ -1242,7 +1272,6 @@ test_expect_success 'stash works when user.name and user.email are not set' '
 	>2 &&
 	git add 2 &&
 	test_config user.useconfigonly true &&
-	test_config stash.usebuiltin true &&
 	(
 		sane_unset GIT_AUTHOR_NAME &&
 		sane_unset GIT_AUTHOR_EMAIL &&
@@ -1293,18 +1322,86 @@ test_expect_success 'stash handles skip-worktree entries nicely' '
 	git rev-parse --verify refs/stash:A.t
 '
 
-test_expect_success 'stash -c stash.useBuiltin=false warning ' '
-	expected="stash.useBuiltin support has been removed" &&
+test_expect_success 'git stash succeeds despite directory/file change' '
+	test_create_repo directory_file_switch_v1 &&
+	(
+		cd directory_file_switch_v1 &&
+		test_commit init &&
+
+		test_write_lines this file has some words >filler &&
+		git add filler &&
+		git commit -m filler &&
+
+		git rm filler &&
+		mkdir filler &&
+		echo contents >filler/file &&
+		git stash push
+	)
+'
+
+test_expect_success 'git stash can pop file -> directory saved changes' '
+	test_create_repo directory_file_switch_v2 &&
+	(
+		cd directory_file_switch_v2 &&
+		test_commit init &&
+
+		test_write_lines this file has some words >filler &&
+		git add filler &&
+		git commit -m filler &&
+
+		git rm filler &&
+		mkdir filler &&
+		echo contents >filler/file &&
+		cp filler/file expect &&
+		git stash push --include-untracked &&
+		git stash apply --index &&
+		test_cmp expect filler/file
+	)
+'
 
-	git -c stash.useBuiltin=false stash 2>err &&
-	test_i18ngrep "$expected" err &&
-	env GIT_TEST_STASH_USE_BUILTIN=false git stash 2>err &&
-	test_i18ngrep "$expected" err &&
+test_expect_success 'git stash can pop directory -> file saved changes' '
+	test_create_repo directory_file_switch_v3 &&
+	(
+		cd directory_file_switch_v3 &&
+		test_commit init &&
+
+		mkdir filler &&
+		test_write_lines some words >filler/file1 &&
+		test_write_lines and stuff >filler/file2 &&
+		git add filler &&
+		git commit -m filler &&
+
+		git rm -rf filler &&
+		echo contents >filler &&
+		cp filler expect &&
+		git stash push --include-untracked &&
+		git stash apply --index &&
+		test_cmp expect filler
+	)
+'
+
+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 -c stash.useBuiltin=true stash 2>err &&
-	test_must_be_empty err &&
-	env GIT_TEST_STASH_USE_BUILTIN=true git stash 2>err &&
-	test_must_be_empty err
+		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/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh
index dd2cdcc114..5390eec4e3 100755
--- a/t/t3905-stash-include-untracked.sh
+++ b/t/t3905-stash-include-untracked.sh
@@ -422,4 +422,10 @@ test_expect_success 'stash show --{include,only}-untracked on stashes without un
 	test_must_be_empty actual
 '
 
+test_expect_success 'stash -u ignores sub-repository' '
+	test_when_finished "rm -rf sub-repo" &&
+	git init sub-repo &&
+	git stash -u
+'
+
 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/t4002-diff-basic.sh b/t/t4002-diff-basic.sh
index 6a9f010197..ea52e5b91b 100755
--- a/t/t4002-diff-basic.sh
+++ b/t/t4002-diff-basic.sh
@@ -6,6 +6,8 @@
 test_description='Test diff raw-output.
 
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 . "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh
diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh
index db07ff3eb1..181e9683a7 100755
--- a/t/t4003-diff-rename-1.sh
+++ b/t/t4003-diff-rename-1.sh
@@ -6,12 +6,14 @@
 test_description='More rename detection
 
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
 
 test_expect_success \
     'prepare reference tree' \
-    'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+    'COPYING_test_data >COPYING &&
      echo frotz >rezrov &&
     git update-index --add COPYING rezrov &&
     tree=$(git write-tree) &&
@@ -99,7 +101,7 @@ test_expect_success \
 
 test_expect_success \
     'prepare work tree once again' \
-    'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+    'COPYING_test_data >COPYING &&
      git update-index --add --remove COPYING COPYING.1'
 
 # tree has COPYING and rezrov.  work tree has COPYING and COPYING.1,
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 8647906132..5c756dc243 100755
--- a/t/t4005-diff-rename-2.sh
+++ b/t/t4005-diff-rename-2.sh
@@ -5,11 +5,13 @@
 
 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
 
 test_expect_success 'setup reference tree' '
-	cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+	COPYING_test_data >COPYING &&
 	echo frotz >rezrov &&
 	git update-index --add COPYING rezrov &&
 	tree=$(git write-tree) &&
@@ -64,7 +66,7 @@ test_expect_success 'validate output from rename/copy detection (#2)' '
 # nows how to say Copy.
 
 test_expect_success 'validate output from rename/copy detection (#3)' '
-	cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+	COPYING_test_data >COPYING &&
 	git update-index --add --remove COPYING COPYING.1 &&
 
 	cat <<-EOF >expected &&
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 cbb9c62f53..b86165cbac 100755
--- a/t/t4007-rename-3.sh
+++ b/t/t4007-rename-3.sh
@@ -6,18 +6,19 @@
 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
 
 test_expect_success 'prepare reference tree' '
 	mkdir path0 path1 &&
-	cp "$TEST_DIRECTORY"/lib-diff/COPYING path0/COPYING &&
+	COPYING_test_data >path0/COPYING &&
 	git update-index --add path0/COPYING &&
 	tree=$(git write-tree) &&
-	echo $tree
+	blob=$(git rev-parse :path0/COPYING)
 '
 
-blob=$(git hash-object "$TEST_DIRECTORY/lib-diff/COPYING")
 test_expect_success 'prepare work tree' '
 	cp path0/COPYING path1/COPYING &&
 	git update-index --add --remove path0/COPYING path1/COPYING
diff --git a/t/t4008-diff-break-rewrite.sh b/t/t4008-diff-break-rewrite.sh
index 2299f27511..562aaf3a2a 100755
--- a/t/t4008-diff-break-rewrite.sh
+++ b/t/t4008-diff-break-rewrite.sh
@@ -25,8 +25,8 @@ Further, with -B and -M together, these should turn into two renames.
 . "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
 
 test_expect_success setup '
-	cat "$TEST_DIRECTORY"/lib-diff/README >file0 &&
-	cat "$TEST_DIRECTORY"/lib-diff/COPYING >file1 &&
+	echo some dissimilar content >file0 &&
+	COPYING_test_data >file1 &&
 	blob0_id=$(git hash-object file0) &&
 	blob1_id=$(git hash-object file1) &&
 	git update-index --add file0 file1 &&
diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh
index b1da807f16..3480781dab 100755
--- a/t/t4009-diff-rename-4.sh
+++ b/t/t4009-diff-rename-4.sh
@@ -6,12 +6,14 @@
 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
 
 test_expect_success \
     'prepare reference tree' \
-    'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+    'COPYING_test_data >COPYING &&
      echo frotz >rezrov &&
     git update-index --add COPYING rezrov &&
     orig=$(git hash-object COPYING) &&
@@ -81,7 +83,7 @@ test_expect_success \
 
 test_expect_success \
     'prepare work tree once again' \
-    'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
+    'COPYING_test_data >COPYING &&
      git update-index --add --remove COPYING COPYING.1'
 
 git diff-index -z -C --find-copies-harder $tree >current
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 7fadc985cc..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 &&
@@ -65,14 +65,14 @@ test_expect_success setup '
 	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
 
 	git checkout master &&
-	git pull -s ours . side &&
+	git pull -s ours --no-rebase . side &&
 
 	GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
 	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 &&
@@ -455,8 +455,8 @@ diff-tree --stat --compact-summary initial mode
 diff-tree -R --stat --compact-summary initial mode
 EOF
 
-test_expect_success 'log -m matches log -m -p' '
-	git log -m -p master >result &&
+test_expect_success 'log -m matches pure log' '
+	git log master >result &&
 	process_diffs result >expected &&
 	git log -m >result &&
 	process_diffs result >actual &&
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/t4016-diff-quote.sh b/t/t4016-diff-quote.sh
index 876271d682..5a8d887683 100755
--- a/t/t4016-diff-quote.sh
+++ b/t/t4016-diff-quote.sh
@@ -6,6 +6,7 @@
 test_description='Quoting paths in diff output.
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 P0='pathname'
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/t4018/java-class-member-function b/t/t4018/java-class-member-function
index 298bc7a71b..3b95f68b3b 100644
--- a/t/t4018/java-class-member-function
+++ b/t/t4018/java-class-member-function
@@ -3,6 +3,10 @@ public class Beer
 	int special;
 	public static void main(String RIGHT[])
 	{
+		someMethodCall();
+		someOtherMethod("17")
+			.doThat();
+		// Whatever
 		System.out.print("ChangeMe");
 	}
 }
diff --git a/t/t4018/java-enum-constant b/t/t4018/java-enum-constant
new file mode 100644
index 0000000000..a1931c8379
--- /dev/null
+++ b/t/t4018/java-enum-constant
@@ -0,0 +1,6 @@
+private enum RIGHT {
+    ONE,
+    TWO,
+    THREE,
+    ChangeMe
+}
diff --git a/t/t4018/java-method-return-generic-bounded b/t/t4018/java-method-return-generic-bounded
new file mode 100644
index 0000000000..66dd78c379
--- /dev/null
+++ b/t/t4018/java-method-return-generic-bounded
@@ -0,0 +1,9 @@
+class MyExample {
+    public <T extends Bar & Foo<T>, R> Map<T, R[]> foo(String[] RIGHT) {
+        someMethodCall();
+        someOtherMethod()
+            .doThat();
+        // Whatever...
+        return (List<T>) Arrays.asList("ChangeMe");
+    }
+}
diff --git a/t/t4018/java-method-return-generic-wildcard b/t/t4018/java-method-return-generic-wildcard
new file mode 100644
index 0000000000..96e9e5f2c1
--- /dev/null
+++ b/t/t4018/java-method-return-generic-wildcard
@@ -0,0 +1,9 @@
+class MyExample {
+    public List<? extends Comparable> foo(String[] RIGHT) {
+        someMethodCall();
+        someOtherMethod()
+            .doThat();
+        // Whatever...
+        return Arrays.asList("ChangeMe");
+    }
+}
diff --git a/t/t4018/java-nested-field b/t/t4018/java-nested-field
new file mode 100644
index 0000000000..d92d3ec688
--- /dev/null
+++ b/t/t4018/java-nested-field
@@ -0,0 +1,6 @@
+class MyExample {
+    private static class RIGHT {
+        // change an inner class field
+        String inner = "ChangeMe";
+    }
+}
diff --git a/t/t4018/php-enum b/t/t4018/php-enum
new file mode 100644
index 0000000000..91a69c1a2b
--- /dev/null
+++ b/t/t4018/php-enum
@@ -0,0 +1,4 @@
+enum RIGHT: string
+{
+    case Foo = 'ChangeMe';
+}
diff --git a/t/t4019-diff-wserror.sh b/t/t4019-diff-wserror.sh
index c6135c7548..d2b3109c2d 100755
--- a/t/t4019-diff-wserror.sh
+++ b/t/t4019-diff-wserror.sh
@@ -2,6 +2,7 @@
 
 test_description='diff whitespace error detection'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -286,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/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh
index 6d1c3d949c..1c89050a97 100755
--- a/t/t4022-diff-rewrite.sh
+++ b/t/t4022-diff-rewrite.sh
@@ -3,15 +3,17 @@
 test_description='rewrite diff'
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
 
 test_expect_success setup '
 
-	cat "$TEST_DIRECTORY"/../COPYING >test &&
+	COPYING_test_data >test.data &&
+	cp test.data test &&
 	git add test &&
 	tr \
 	  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
 	  "nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
-	  <"$TEST_DIRECTORY"/../COPYING >test &&
+	  <test.data >test &&
 	echo "to be deleted" >test2 &&
 	blob=$(git hash-object test2) &&
 	blob=$(git rev-parse --short $blob) &&
diff --git a/t/t4023-diff-rename-typechange.sh b/t/t4023-diff-rename-typechange.sh
index 8c9823765e..7cb9909293 100755
--- a/t/t4023-diff-rename-typechange.sh
+++ b/t/t4023-diff-rename-typechange.sh
@@ -3,25 +3,26 @@
 test_description='typechange rename detection'
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
 
 test_expect_success setup '
 
 	rm -f foo bar &&
-	cat "$TEST_DIRECTORY"/../COPYING >foo &&
+	COPYING_test_data >foo &&
 	test_ln_s_add linklink bar &&
 	git add foo &&
 	git commit -a -m Initial &&
 	git tag one &&
 
 	git rm -f foo bar &&
-	cat "$TEST_DIRECTORY"/../COPYING >bar &&
+	COPYING_test_data >bar &&
 	test_ln_s_add linklink foo &&
 	git add bar &&
 	git commit -a -m Second &&
 	git tag two &&
 
 	git rm -f foo bar &&
-	cat "$TEST_DIRECTORY"/../COPYING >foo &&
+	COPYING_test_data >foo &&
 	git add foo &&
 	git commit -a -m Third &&
 	git tag three &&
@@ -35,7 +36,7 @@ test_expect_success setup '
 	# This is purely for sanity check
 
 	git rm -f foo bar &&
-	cat "$TEST_DIRECTORY"/../COPYING >foo &&
+	COPYING_test_data >foo &&
 	cat "$TEST_DIRECTORY"/../Makefile >bar &&
 	git add foo bar &&
 	git commit -a -m Fifth &&
@@ -43,7 +44,7 @@ test_expect_success setup '
 
 	git rm -f foo bar &&
 	cat "$TEST_DIRECTORY"/../Makefile >foo &&
-	cat "$TEST_DIRECTORY"/../COPYING >bar &&
+	COPYING_test_data >bar &&
 	git add foo bar &&
 	git commit -a -m Sixth &&
 	git tag six
@@ -54,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
@@ -65,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
@@ -77,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 35578f2bb9..5397cb7d42 100755
--- a/t/t4025-hunk-header.sh
+++ b/t/t4025-hunk-header.sh
@@ -2,6 +2,7 @@
 
 test_description='diff hunk header truncation'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 N='日本語'
@@ -13,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 c0b642c1ab..cc3f60d468 100755
--- a/t/t4026-color.sh
+++ b/t/t4026-color.sh
@@ -4,6 +4,8 @@
 #
 
 test_description='Test diff/status color escape codes'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 ESC=$(printf '\033')
@@ -58,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"
@@ -94,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/t4034/cpp/expect b/t/t4034/cpp/expect
index 37d1ea2587..dc500ae092 100644
--- a/t/t4034/cpp/expect
+++ b/t/t4034/cpp/expect
@@ -1,36 +1,35 @@
 <BOLD>diff --git a/pre b/post<RESET>
-<BOLD>index 23d5c8a..7e8c026 100644<RESET>
+<BOLD>index a1a09b7..f1b6f3c 100644<RESET>
 <BOLD>--- a/pre<RESET>
 <BOLD>+++ b/post<RESET>
-<CYAN>@@ -1,19 +1,19 @@<RESET>
-Foo() : x(0<RED>&&1<RESET><GREEN>&42<RESET>) { <GREEN>bar(x);<RESET> }
+<CYAN>@@ -1,30 +1,30 @@<RESET>
+Foo() : x(0<RED>&&1<RESET><GREEN>&42<RESET>) { <RED>foo0<RESET><GREEN>bar<RESET>(x.<RED>find<RESET><GREEN>Find<RESET>); }
 cout<<"Hello World<RED>!<RESET><GREEN>?<RESET>\n"<<endl;
-<GREEN>(<RESET>1<GREEN>) (<RESET>-1e10<GREEN>) (<RESET>0xabcdef<GREEN>)<RESET> '<RED>x<RESET><GREEN>y<RESET>'
-[<RED>a<RESET><GREEN>x<RESET>] <RED>a<RESET><GREEN>x<RESET>-><RED>b a<RESET><GREEN>y x<RESET>.<RED>b<RESET><GREEN>y<RESET>
-!<RED>a<RESET><GREEN>x<RESET> ~<RED>a a<RESET><GREEN>x x<RESET>++ <RED>a<RESET><GREEN>x<RESET>-- <RED>a<RESET><GREEN>x<RESET>*<RED>b a<RESET><GREEN>y x<RESET>&<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>*<RED>b a<RESET><GREEN>y x<RESET>/<RED>b a<RESET><GREEN>y x<RESET>%<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>+<RED>b a<RESET><GREEN>y x<RESET>-<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET><<<RED>b a<RESET><GREEN>y x<RESET>>><RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET><<RED>b a<RESET><GREEN>y x<RESET><=<RED>b a<RESET><GREEN>y x<RESET>><RED>b a<RESET><GREEN>y x<RESET>>=<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>==<RED>b a<RESET><GREEN>y x<RESET>!=<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>&<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>^<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>|<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>&&<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>||<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>?<RED>b<RESET><GREEN>y<RESET>:z
-<RED>a<RESET><GREEN>x<RESET>=<RED>b a<RESET><GREEN>y x<RESET>+=<RED>b a<RESET><GREEN>y x<RESET>-=<RED>b a<RESET><GREEN>y x<RESET>*=<RED>b a<RESET><GREEN>y x<RESET>/=<RED>b a<RESET><GREEN>y x<RESET>%=<RED>b a<RESET><GREEN>y x<RESET><<=<RED>b a<RESET><GREEN>y x<RESET>>>=<RED>b a<RESET><GREEN>y x<RESET>&=<RED>b a<RESET><GREEN>y x<RESET>^=<RED>b a<RESET><GREEN>y x<RESET>|=<RED>b<RESET>
-<RED>a<RESET><GREEN>y<RESET>
-<GREEN>x<RESET>,y
-<RED>a<RESET><GREEN>x<RESET>::<RED>b<RESET><GREEN>y<RESET>
+<GREEN>(<RESET>1 <RED>-<RESET><GREEN>+<RESET>1e10 0xabcdef<GREEN>)<RESET> '<RED>x<RESET><GREEN>2<RESET>'
+// long double<RESET>
+<RED>3.141592653e-10l<RESET><GREEN>3.141592654e+10l<RESET>
+// float<RESET>
+<RED>120E5f<RESET><GREEN>120E6f<RESET>
+// hex<RESET>
+<RED>0xdead<RESET><GREEN>0xdeaf<RESET>'1<RED>eaF<RESET><GREEN>eaf<RESET>+<RED>8ULL<RESET><GREEN>7ULL<RESET>
+// octal<RESET>
+<RED>01234567<RESET><GREEN>01234560<RESET>
+// binary<RESET>
+<RED>0b1000<RESET><GREEN>0b1100<RESET>+e1
+// expression<RESET>
+1.5-e+<RED>2<RESET><GREEN>3<RESET>+f
+// another one<RESET>
+str.e+<RED>65<RESET><GREEN>75<RESET>
+[a] b<RED>-><RESET><GREEN>->*<RESET>v d<RED>.<RESET><GREEN>.*<RESET>e
+<GREEN>~<RESET>!a <GREEN>!<RESET>~b c<RED>++<RESET><GREEN>+<RESET> d<RED>--<RESET><GREEN>-<RESET> e*<GREEN>*<RESET>f g<RED>&<RESET><GREEN>&&<RESET>h
+a<RED>*<RESET><GREEN>*=<RESET>b c<RED>/<RESET><GREEN>/=<RESET>d e<RED>%<RESET><GREEN>%=<RESET>f
+a<RED>+<RESET><GREEN>++<RESET>b c<RED>-<RESET><GREEN>--<RESET>d
+a<RED><<<RESET><GREEN><<=<RESET>b c<RED>>><RESET><GREEN>>>=<RESET>d
+a<RED><<RESET><GREEN><=<RESET>b c<RED><=<RESET><GREEN><<RESET>d e<RED>><RESET><GREEN>>=<RESET>f g<RED>>=<RESET><GREEN>><RESET>h i<RED><=<RESET><GREEN><=><RESET>j
+a<RED>==<RESET><GREEN>!=<RESET>b c<RED>!=<RESET><GREEN>=<RESET>d
+a<RED>^<RESET><GREEN>^=<RESET>b c<RED>|<RESET><GREEN>|=<RESET>d e<RED>&&<RESET><GREEN>&=<RESET>f
+a<RED>||<RESET><GREEN>|<RESET>b
+a?<GREEN>:<RESET>b
+a<RED>=<RESET><GREEN>==<RESET>b c<RED>+=<RESET><GREEN>+<RESET>d e<RED>-=<RESET><GREEN>-<RESET>f g<RED>*=<RESET><GREEN>*<RESET>h i<RED>/=<RESET><GREEN>/<RESET>j k<RED>%=<RESET><GREEN>%<RESET>l m<RED><<=<RESET><GREEN><<<RESET>n o<RED>>>=<RESET><GREEN>>><RESET>p q<RED>&=<RESET><GREEN>&<RESET>r s<RED>^=<RESET><GREEN>^<RESET>t u<RED>|=<RESET><GREEN>|<RESET>v
+a,b<RESET>
+a<RED>::<RESET><GREEN>:<RESET>b
diff --git a/t/t4034/cpp/post b/t/t4034/cpp/post
index 7e8c026cef..f1b6f3c228 100644
--- a/t/t4034/cpp/post
+++ b/t/t4034/cpp/post
@@ -1,19 +1,30 @@
-Foo() : x(0&42) { bar(x); }
+Foo() : x(0&42) { bar(x.Find); }
 cout<<"Hello World?\n"<<endl;
-(1) (-1e10) (0xabcdef) 'y'
-[x] x->y x.y
-!x ~x x++ x-- x*y x&y
-x*y x/y x%y
-x+y x-y
-x<<y x>>y
-x<y x<=y x>y x>=y
-x==y x!=y
-x&y
-x^y
-x|y
-x&&y
-x||y
-x?y:z
-x=y x+=y x-=y x*=y x/=y x%=y x<<=y x>>=y x&=y x^=y x|=y
-x,y
-x::y
+(1 +1e10 0xabcdef) '2'
+// long double
+3.141592654e+10l
+// float
+120E6f
+// hex
+0xdeaf'1eaf+7ULL
+// octal
+01234560
+// binary
+0b1100+e1
+// expression
+1.5-e+3+f
+// another one
+str.e+75
+[a] b->*v d.*e
+~!a !~b c+ d- e**f g&&h
+a*=b c/=d e%=f
+a++b c--d
+a<<=b c>>=d
+a<=b c<d e>=f g>h i<=>j
+a!=b c=d
+a^=b c|=d e&=f
+a|b
+a?:b
+a==b c+d e-f g*h i/j k%l m<<n o>>p q&r s^t u|v
+a,b
+a:b
diff --git a/t/t4034/cpp/pre b/t/t4034/cpp/pre
index 23d5c8adf5..a1a09b7712 100644
--- a/t/t4034/cpp/pre
+++ b/t/t4034/cpp/pre
@@ -1,19 +1,30 @@
-Foo():x(0&&1){}
+Foo():x(0&&1){ foo0( x.find); }
 cout<<"Hello World!\n"<<endl;
 1 -1e10 0xabcdef 'x'
-[a] a->b a.b
-!a ~a a++ a-- a*b a&b
-a*b a/b a%b
-a+b a-b
-a<<b a>>b
-a<b a<=b a>b a>=b
-a==b a!=b
-a&b
-a^b
-a|b
-a&&b
+// long double
+3.141592653e-10l
+// float
+120E5f
+// hex
+0xdead'1eaF+8ULL
+// octal
+01234567
+// binary
+0b1000+e1
+// expression
+1.5-e+2+f
+// another one
+str.e+65
+[a] b->v d.e
+!a ~b c++ d-- e*f g&h
+a*b c/d e%f
+a+b c-d
+a<<b c>>d
+a<b c<=d e>f g>=h i<=j
+a==b c!=d
+a^b c|d e&&f
 a||b
-a?b:z
-a=b a+=b a-=b a*=b a/=b a%=b a<<=b a>>=b a&=b a^=b a|=b
-a,y
+a?b
+a=b c+=d e-=f g*=h i/=j k%=l m<<=n o>>=p q&=r s^=t u|=v
+a,b
 a::b
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/t4045-diff-relative.sh b/t/t4045-diff-relative.sh
index 61ba5f707f..fab351b48a 100755
--- a/t/t4045-diff-relative.sh
+++ b/t/t4045-diff-relative.sh
@@ -162,4 +162,57 @@ check_diff_relative_option subdir file2 true --no-relative --relative
 check_diff_relative_option . file2 false --no-relative --relative=subdir
 check_diff_relative_option . file2 true --no-relative --relative=subdir
 
+test_expect_success 'setup diff --relative unmerged' '
+	test_commit zero file0 &&
+	test_commit base subdir/file0 &&
+	git switch -c br1 &&
+	test_commit one file0 &&
+	test_commit sub1 subdir/file0 &&
+	git switch -c br2 base &&
+	test_commit two file0 &&
+	git switch -c br3 &&
+	test_commit sub3 subdir/file0
+'
+
+test_expect_success 'diff --relative without change in subdir' '
+	git switch br2 &&
+	test_when_finished "git merge --abort" &&
+	test_must_fail git merge one &&
+	git -C subdir diff --relative >out &&
+	test_must_be_empty out &&
+	git -C subdir diff --relative --name-only >out &&
+	test_must_be_empty out
+'
+
+test_expect_success 'diff --relative --name-only with change in subdir' '
+	git switch br3 &&
+	test_when_finished "git merge --abort" &&
+	test_must_fail git merge sub1 &&
+	test_write_lines file0 file0 >expected &&
+	git -C subdir diff --relative --name-only >out &&
+	test_cmp expected out
+'
+
+test_expect_failure 'diff --relative with change in subdir' '
+	git switch br3 &&
+	br1_blob=$(git rev-parse --short --verify br1:subdir/file0) &&
+	br3_blob=$(git rev-parse --short --verify br3:subdir/file0) &&
+	test_when_finished "git merge --abort" &&
+	test_must_fail git merge br1 &&
+	cat >expected <<-EOF &&
+	diff --cc file0
+	index $br3_blob,$br1_blob..0000000
+	--- a/file0
+	+++ b/file0
+	@@@ -1,1 -1,1 +1,5 @@@
+	++<<<<<<< HEAD
+	 +sub3
+	++=======
+	+ sub1
+	++>>>>>>> br1
+	EOF
+	git -C subdir diff --relative >out &&
+	test_cmp expected out
+'
+
 test_done
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/t4060-diff-submodule-option-diff-format.sh b/t/t4060-diff-submodule-option-diff-format.sh
index dc7b242697..d86e38abd8 100755
--- a/t/t4060-diff-submodule-option-diff-format.sh
+++ b/t/t4060-diff-submodule-option-diff-format.sh
@@ -361,7 +361,6 @@ test_expect_success 'typechanged submodule(submodule->blob)' '
 rm -f sm1 &&
 test_create_repo sm1 &&
 head6=$(add_file sm1 foo6 foo7)
-fullhead6=$(cd sm1; git rev-parse --verify HEAD)
 test_expect_success 'nonexistent commit' '
 	git diff-index -p --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
@@ -704,10 +703,26 @@ test_expect_success 'path filter' '
 	diff_cmp expected actual
 '
 
-commit_file sm2
+cat >.gitmodules <<-EOF
+[submodule "sm2"]
+	path = sm2
+	url = bogus_url
+EOF
+git add .gitmodules
+commit_file sm2 .gitmodules
+
 test_expect_success 'given commit' '
 	git diff-index -p --submodule=diff HEAD^ >actual &&
 	cat >expected <<-EOF &&
+	diff --git a/.gitmodules b/.gitmodules
+	new file mode 100644
+	index 1234567..89abcde
+	--- /dev/null
+	+++ b/.gitmodules
+	@@ -0,0 +1,3 @@
+	+[submodule "sm2"]
+	+path = sm2
+	+url = bogus_url
 	Submodule sm1 $head7...0000000 (submodule deleted)
 	Submodule sm2 0000000...$head9 (new submodule)
 	diff --git a/sm2/foo8 b/sm2/foo8
@@ -729,15 +744,21 @@ test_expect_success 'given commit' '
 '
 
 test_expect_success 'setup .git file for sm2' '
-	(cd sm2 &&
-	 REAL="$(pwd)/../.real" &&
-	 mv .git "$REAL" &&
-	 echo "gitdir: $REAL" >.git)
+	git submodule absorbgitdirs sm2
 '
 
 test_expect_success 'diff --submodule=diff with .git file' '
 	git diff --submodule=diff HEAD^ >actual &&
 	cat >expected <<-EOF &&
+	diff --git a/.gitmodules b/.gitmodules
+	new file mode 100644
+	index 1234567..89abcde
+	--- /dev/null
+	+++ b/.gitmodules
+	@@ -0,0 +1,3 @@
+	+[submodule "sm2"]
+	+path = sm2
+	+url = bogus_url
 	Submodule sm1 $head7...0000000 (submodule deleted)
 	Submodule sm2 0000000...$head9 (new submodule)
 	diff --git a/sm2/foo8 b/sm2/foo8
@@ -758,9 +779,67 @@ test_expect_success 'diff --submodule=diff with .git file' '
 	diff_cmp expected actual
 '
 
+mv sm2 sm2-bak
+
+test_expect_success 'deleted submodule with .git file' '
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 $head9...0000000 (submodule deleted)
+	diff --git a/sm2/foo8 b/sm2/foo8
+	deleted file mode 100644
+	index 1234567..89abcde
+	--- a/sm2/foo8
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	deleted file mode 100644
+	index 1234567..89abcde
+	--- a/sm2/foo9
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo9
+	EOF
+	diff_cmp expected actual
+'
+
+echo submodule-to-blob>sm2
+
+test_expect_success 'typechanged(submodule->blob) submodule with .git file' '
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 $head9...0000000 (submodule deleted)
+	diff --git a/sm2/foo8 b/sm2/foo8
+	deleted file mode 100644
+	index 1234567..89abcde
+	--- a/sm2/foo8
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	deleted file mode 100644
+	index 1234567..89abcde
+	--- a/sm2/foo9
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo9
+	diff --git a/sm2 b/sm2
+	new file mode 100644
+	index 1234567..89abcde
+	--- /dev/null
+	+++ b/sm2
+	@@ -0,0 +1 @@
+	+submodule-to-blob
+	EOF
+	diff_cmp expected actual
+'
+
+rm sm2
+mv sm2-bak sm2
+
 test_expect_success 'setup nested submodule' '
-	git submodule add -f ./sm2 &&
-	git commit -a -m "add sm2" &&
 	git -C sm2 submodule add ../sm2 nested &&
 	git -C sm2 commit -a -m "nested sub" &&
 	head10=$(git -C sm2 rev-parse --short --verify HEAD)
@@ -791,6 +870,7 @@ test_expect_success 'diff --submodule=diff with moved nested submodule HEAD' '
 
 test_expect_success 'diff --submodule=diff recurses into nested submodules' '
 	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
 	Submodule sm2 contains modified content
 	Submodule sm2 $head9..$head10:
 	diff --git a/sm2/.gitmodules b/sm2/.gitmodules
@@ -830,4 +910,67 @@ test_expect_success 'diff --submodule=diff recurses into nested submodules' '
 	diff_cmp expected actual
 '
 
+(cd sm2; commit_file nested)
+commit_file sm2
+head12=$(cd sm2; git rev-parse --short --verify HEAD)
+
+mv sm2 sm2-bak
+
+test_expect_success 'diff --submodule=diff recurses into deleted nested submodules' '
+	cat >expected <<-EOF &&
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 $head12...0000000 (submodule deleted)
+	diff --git a/sm2/.gitmodules b/sm2/.gitmodules
+	deleted file mode 100644
+	index 3a816b8..0000000
+	--- a/sm2/.gitmodules
+	+++ /dev/null
+	@@ -1,3 +0,0 @@
+	-[submodule "nested"]
+	-	path = nested
+	-	url = ../sm2
+	diff --git a/sm2/foo8 b/sm2/foo8
+	deleted file mode 100644
+	index db9916b..0000000
+	--- a/sm2/foo8
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo8
+	diff --git a/sm2/foo9 b/sm2/foo9
+	deleted file mode 100644
+	index 9c3b4f6..0000000
+	--- a/sm2/foo9
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo9
+	Submodule nested $head11...0000000 (submodule deleted)
+	diff --git a/sm2/nested/file b/sm2/nested/file
+	deleted file mode 100644
+	index ca281f5..0000000
+	--- a/sm2/nested/file
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-nested content
+	diff --git a/sm2/nested/foo8 b/sm2/nested/foo8
+	deleted file mode 100644
+	index db9916b..0000000
+	--- a/sm2/nested/foo8
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo8
+	diff --git a/sm2/nested/foo9 b/sm2/nested/foo9
+	deleted file mode 100644
+	index 9c3b4f6..0000000
+	--- a/sm2/nested/foo9
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo9
+	EOF
+	git diff --submodule=diff >actual 2>err &&
+	test_must_be_empty err &&
+	diff_cmp expected actual
+'
+
+mv sm2-bak sm2
+
 test_done
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/t4069-remerge-diff.sh b/t/t4069-remerge-diff.sh
new file mode 100755
index 0000000000..35f94957fc
--- /dev/null
+++ b/t/t4069-remerge-diff.sh
@@ -0,0 +1,291 @@
+#!/bin/sh
+
+test_description='remerge-diff handling'
+
+. ./test-lib.sh
+
+# This test is ort-specific
+if test "${GIT_TEST_MERGE_ALGORITHM}" != ort
+then
+	skip_all="GIT_TEST_MERGE_ALGORITHM != ort"
+	test_done
+fi
+
+test_expect_success 'setup basic merges' '
+	test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git commit -m base &&
+
+	git branch feature_a &&
+	git branch feature_b &&
+	git branch feature_c &&
+
+	git branch ab_resolution &&
+	git branch bc_resolution &&
+
+	git checkout feature_a &&
+	test_write_lines 1 2 three 4 5 6 7 eight 9 >numbers &&
+	git commit -a -m change_a &&
+
+	git checkout feature_b &&
+	test_write_lines 1 2 tres 4 5 6 7 8 9 >numbers &&
+	git commit -a -m change_b &&
+
+	git checkout feature_c &&
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers &&
+	git commit -a -m change_c &&
+
+	git checkout bc_resolution &&
+	git merge --ff-only feature_b &&
+	# no conflict
+	git merge feature_c &&
+
+	git checkout ab_resolution &&
+	git merge --ff-only feature_a &&
+	# conflicts!
+	test_must_fail git merge feature_b &&
+	# Resolve conflict...and make another change elsewhere
+	test_write_lines 1 2 drei 4 5 6 7 acht 9 >numbers &&
+	git add numbers &&
+	git merge --continue
+'
+
+test_expect_success 'remerge-diff on a clean merge' '
+	git log -1 --oneline bc_resolution >expect &&
+	git show --oneline --remerge-diff bc_resolution >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'remerge-diff with both a resolved conflict and an unrelated change' '
+	git log -1 --oneline ab_resolution >tmp &&
+	cat <<-EOF >>tmp &&
+	diff --git a/numbers b/numbers
+	remerge CONFLICT (content): Merge conflict in numbers
+	index a1fb731..6875544 100644
+	--- a/numbers
+	+++ b/numbers
+	@@ -1,13 +1,9 @@
+	 1
+	 2
+	-<<<<<<< b0ed5cb (change_a)
+	-three
+	-=======
+	-tres
+	->>>>>>> 6cd3f82 (change_b)
+	+drei
+	 4
+	 5
+	 6
+	 7
+	-eight
+	+acht
+	 9
+	EOF
+	# Hashes above are sha1; rip them out so test works with sha256
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+	git show --oneline --remerge-diff ab_resolution >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'setup non-content conflicts' '
+	git switch --orphan base &&
+
+	test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
+	test_write_lines a b c d e f g h i >letters &&
+	test_write_lines in the way >content &&
+	git add numbers letters content &&
+	git commit -m base &&
+
+	git branch side1 &&
+	git branch side2 &&
+
+	git checkout side1 &&
+	test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
+	git mv letters letters_side1 &&
+	git mv content file_or_directory &&
+	git add numbers &&
+	git commit -m side1 &&
+
+	git checkout side2 &&
+	git rm numbers &&
+	git mv letters letters_side2 &&
+	mkdir file_or_directory &&
+	echo hello >file_or_directory/world &&
+	git add file_or_directory/world &&
+	git commit -m side2 &&
+
+	git checkout -b resolution side1 &&
+	test_must_fail git merge side2 &&
+	test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git add letters_side1 &&
+	git rm letters &&
+	git rm letters_side2 &&
+	git add file_or_directory~HEAD &&
+	git mv file_or_directory~HEAD wanted_content &&
+	git commit -m resolved
+'
+
+test_expect_success 'remerge-diff with non-content conflicts' '
+	git log -1 --oneline resolution >tmp &&
+	cat <<-EOF >>tmp &&
+	diff --git a/file_or_directory~HASH (side1) b/wanted_content
+	similarity index 100%
+	rename from file_or_directory~HASH (side1)
+	rename to wanted_content
+	remerge CONFLICT (file/directory): directory in the way of file_or_directory from HASH (side1); moving it to file_or_directory~HASH (side1) instead.
+	diff --git a/letters b/letters
+	remerge CONFLICT (rename/rename): letters renamed to letters_side1 in HASH (side1) and to letters_side2 in HASH (side2).
+	diff --git a/letters_side2 b/letters_side2
+	deleted file mode 100644
+	index b236ae5..0000000
+	--- a/letters_side2
+	+++ /dev/null
+	@@ -1,9 +0,0 @@
+	-a
+	-b
+	-c
+	-d
+	-e
+	-f
+	-g
+	-h
+	-i
+	diff --git a/numbers b/numbers
+	remerge CONFLICT (modify/delete): numbers deleted in HASH (side2) and modified in HASH (side1).  Version HASH (side1) of numbers left in tree.
+	EOF
+	# We still have some sha1 hashes above; rip them out so test works
+	# with sha256
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+	git show --oneline --remerge-diff resolution >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'remerge-diff w/ diff-filter=U: all conflict headers, no diff content' '
+	git log -1 --oneline resolution >tmp &&
+	cat <<-EOF >>tmp &&
+	diff --git a/file_or_directory~HASH (side1) b/file_or_directory~HASH (side1)
+	remerge CONFLICT (file/directory): directory in the way of file_or_directory from HASH (side1); moving it to file_or_directory~HASH (side1) instead.
+	diff --git a/letters b/letters
+	remerge CONFLICT (rename/rename): letters renamed to letters_side1 in HASH (side1) and to letters_side2 in HASH (side2).
+	diff --git a/numbers b/numbers
+	remerge CONFLICT (modify/delete): numbers deleted in HASH (side2) and modified in HASH (side1).  Version HASH (side1) of numbers left in tree.
+	EOF
+	# We still have some sha1 hashes above; rip them out so test works
+	# with sha256
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+	git show --oneline --remerge-diff --diff-filter=U resolution >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'remerge-diff w/ diff-filter=R: relevant file + conflict header' '
+	git log -1 --oneline resolution >tmp &&
+	cat <<-EOF >>tmp &&
+	diff --git a/file_or_directory~HASH (side1) b/wanted_content
+	similarity index 100%
+	rename from file_or_directory~HASH (side1)
+	rename to wanted_content
+	remerge CONFLICT (file/directory): directory in the way of file_or_directory from HASH (side1); moving it to file_or_directory~HASH (side1) instead.
+	EOF
+	# We still have some sha1 hashes above; rip them out so test works
+	# with sha256
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+	git show --oneline --remerge-diff --diff-filter=R resolution >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'remerge-diff w/ pathspec: limits to relevant file including conflict header' '
+	git log -1 --oneline resolution >tmp &&
+	cat <<-EOF >>tmp &&
+	diff --git a/letters b/letters
+	remerge CONFLICT (rename/rename): letters renamed to letters_side1 in HASH (side1) and to letters_side2 in HASH (side2).
+	diff --git a/letters_side2 b/letters_side2
+	deleted file mode 100644
+	index b236ae5..0000000
+	--- a/letters_side2
+	+++ /dev/null
+	@@ -1,9 +0,0 @@
+	-a
+	-b
+	-c
+	-d
+	-e
+	-f
+	-g
+	-h
+	-i
+	EOF
+	# We still have some sha1 hashes above; rip them out so test works
+	# with sha256
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+	git show --oneline --remerge-diff resolution -- "letters*" >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'setup non-content conflicts' '
+	git switch --orphan newbase &&
+
+	test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git commit -m base &&
+
+	git branch newside1 &&
+	git branch newside2 &&
+
+	git checkout newside1 &&
+	test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git commit -m side1 &&
+
+	git checkout newside2 &&
+	test_write_lines 1 2 drei 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git commit -m side2 &&
+
+	git checkout -b newresolution newside1 &&
+	test_must_fail git merge newside2 &&
+	git checkout --theirs numbers &&
+	git add -u numbers &&
+	git commit -m resolved
+'
+
+test_expect_success 'remerge-diff turns off history simplification' '
+	git log -1 --oneline newresolution >tmp &&
+	cat <<-EOF >>tmp &&
+	diff --git a/numbers b/numbers
+	remerge CONFLICT (content): Merge conflict in numbers
+	index 070e9e7..5335e78 100644
+	--- a/numbers
+	+++ b/numbers
+	@@ -1,10 +1,6 @@
+	 1
+	 2
+	-<<<<<<< 96f1e45 (side1)
+	-three
+	-=======
+	 drei
+	->>>>>>> 4fd522f (side2)
+	 4
+	 5
+	 6
+	EOF
+	# We still have some sha1 hashes above; rip them out so test works
+	# with sha256
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
+
+	git show --oneline --remerge-diff newresolution -- numbers >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
+'
+
+test_done
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/t4103-apply-binary.sh b/t/t4103-apply-binary.sh
index fad6d3f542..d370ecfe0d 100755
--- a/t/t4103-apply-binary.sh
+++ b/t/t4103-apply-binary.sh
@@ -158,4 +158,27 @@ test_expect_success 'apply binary -p0 diff' '
 	test -z "$(git diff --name-status binary -- file3)"
 '
 
+test_expect_success 'reject truncated binary diff' '
+	do_reset &&
+
+	# this length is calculated to get us very close to
+	# the 8192-byte strbuf we will use to read in the patch.
+	test-tool genrandom foo 6205 >file1 &&
+	git diff --binary >patch &&
+
+	# truncate the patch at the second "literal" line,
+	# but exclude the trailing newline. We must use perl
+	# for this, since tools like "sed" cannot reliably
+	# produce output without the trailing newline.
+	perl -pe "
+		if (/^literal/ && \$count++ >= 1) {
+			chomp;
+			print;
+			exit 0;
+		}
+	" <patch >patch.trunc &&
+
+	do_reset &&
+	test_must_fail git apply patch.trunc
+'
 test_done
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 65147efdea..c558282bc0 100755
--- a/t/t4108-apply-threeway.sh
+++ b/t/t4108-apply-threeway.sh
@@ -230,4 +230,67 @@ test_expect_success 'apply with --3way --cached and conflicts' '
 	test_cmp expect.diff actual.diff
 '
 
+test_expect_success 'apply binary file patch' '
+	git reset --hard main &&
+	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
+	git add bin.png &&
+	git commit -m "add binary file" &&
+
+	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+
+	git diff --binary >bin.diff &&
+	git reset --hard &&
+
+	# Apply must succeed.
+	git apply bin.diff
+'
+
+test_expect_success 'apply binary file patch with 3way' '
+	git reset --hard main &&
+	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
+	git add bin.png &&
+	git commit -m "add binary file" &&
+
+	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+
+	git diff --binary >bin.diff &&
+	git reset --hard &&
+
+	# Apply must succeed.
+	git apply --3way --index bin.diff
+'
+
+test_expect_success 'apply full-index patch with 3way' '
+	git reset --hard main &&
+	cp "$TEST_DIRECTORY/test-binary-1.png" bin.png &&
+	git add bin.png &&
+	git commit -m "add binary file" &&
+
+	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+
+	git diff --full-index >bin.diff &&
+	git reset --hard &&
+
+	# Apply must succeed.
+	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 9d8d3c72e7..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 &&
@@ -23,7 +20,13 @@ test_expect_success setup '
 		test_tick &&
 		git commit -a -m $i || return 1
 	done &&
+	git branch changes &&
 	git format-patch --no-numbered initial &&
+	git checkout -b conflicting initial &&
+	echo different >>file-1 &&
+	echo whatever >new-file &&
+	git add file-1 new-file &&
+	git commit -m different &&
 	git checkout -b side initial &&
 	echo local change >file-2-expect
 '
@@ -37,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
 	'
 
@@ -191,4 +191,37 @@ test_expect_success 'am --abort leaves index stat info alone' '
 	git diff-files --exit-code --quiet
 '
 
+test_expect_success 'git am --abort return failed exit status when it fails' '
+	test_when_finished "rm -rf file-2/ && git reset --hard && git am --abort" &&
+	git checkout changes &&
+	git format-patch -1 --stdout conflicting >changes.mbox &&
+	test_must_fail git am --3way changes.mbox &&
+
+	git rm file-2 &&
+	mkdir file-2 &&
+	echo precious >file-2/somefile &&
+	test_must_fail git am --abort &&
+	test_path_is_dir file-2/
+'
+
+test_expect_success 'git am --abort cleans relevant files' '
+	git checkout changes &&
+	git format-patch -1 --stdout conflicting >changes.mbox &&
+	test_must_fail git am --3way changes.mbox &&
+
+	test_path_is_file new-file &&
+	echo further changes >>file-1 &&
+	echo change other file >>file-2 &&
+
+	# Abort, and expect the files touched by am to be reverted
+	git am --abort &&
+
+	test_path_is_missing new-file &&
+
+	# Files not involved in am operation are left modified
+	git diff --name-only changes >actual &&
+	test_write_lines file-2 >expect &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 39e746fbcb..544f0aa82e 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -120,48 +120,61 @@ 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 'multiple --diff-filter bits' '
+
+	git log -M --pretty="format:%s" --diff-filter=R HEAD >expect &&
+	git log -M --pretty="format:%s" --diff-filter=Ra HEAD >actual &&
+	test_cmp expect actual &&
+	git log -M --pretty="format:%s" --diff-filter=aR HEAD >actual &&
+	test_cmp expect actual &&
+	git log -M --pretty="format:%s" \
+		--diff-filter=a --diff-filter=R HEAD >actual &&
+	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 +189,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 +263,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
@@ -449,6 +462,57 @@ test_expect_success !FAIL_PREREQS 'log with various grep.patternType configurati
 	)
 '
 
+test_expect_success 'log --author' '
+	cat >expect <<-\EOF &&
+	Author: <BOLD;RED>A U<RESET> Thor <author@example.com>
+	EOF
+	git log -1 --color=always --author="A U" >log &&
+	grep Author log >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'log --committer' '
+	cat >expect <<-\EOF &&
+	Commit:     C O Mitter <committer@<BOLD;RED>example<RESET>.com>
+	EOF
+	git log -1 --color=always --pretty=fuller --committer="example" >log &&
+	grep "Commit:" log >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'log -i --grep with color' '
+	cat >expect <<-\EOF &&
+	    <BOLD;RED>Sec<RESET>ond
+	    <BOLD;RED>sec<RESET>ond
+	EOF
+	git log --color=always -i --grep=^sec >log &&
+	grep -i sec log >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '-c color.grep.selected log --grep' '
+	cat >expect <<-\EOF &&
+	    <GREEN>th<RESET><BOLD;RED>ir<RESET><GREEN>d<RESET>
+	EOF
+	git -c color.grep.selected="green" log --color=always --grep=ir >log &&
+	grep ir log >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '-c color.grep.matchSelected log --grep' '
+	cat >expect <<-\EOF &&
+	    <BLUE>i<RESET>n<BLUE>i<RESET>t<BLUE>i<RESET>al
+	EOF
+	git -c color.grep.matchSelected="blue" log --color=always --grep=i >log &&
+	grep al log >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
+'
+
 cat > expect <<EOF
 * Second
 * sixth
@@ -608,7 +672,7 @@ EOF
 
 test_expect_success 'log --graph with full output' '
 	git log --graph --date-order --pretty=short |
-		git name-rev --name-only --stdin |
+		git name-rev --name-only --annotate-stdin |
 		sed "s/Merge:.*/Merge: A B/;s/ *\$//" >actual &&
 	test_cmp expect actual
 '
@@ -901,6 +965,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 &&
@@ -1583,6 +1684,75 @@ test_expect_success 'log --graph with --name-only' '
 	test_cmp_graph --name-only tangle..reach
 '
 
+test_expect_success '--no-graph countermands --graph' '
+	git log >expect &&
+	git log --graph --no-graph >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--graph countermands --no-graph' '
+	git log --graph >expect &&
+	git log --no-graph --graph >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--no-graph does not unset --topo-order' '
+	git log --topo-order >expect &&
+	git log --topo-order --no-graph >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--no-graph does not unset --parents' '
+	git log --parents >expect &&
+	git log --parents --no-graph >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--reverse and --graph conflict' '
+	test_must_fail git log --reverse --graph 2>stderr &&
+	test_i18ngrep "cannot be used together" stderr
+'
+
+test_expect_success '--reverse --graph --no-graph works' '
+	git log --reverse >expect &&
+	git log --reverse --graph --no-graph >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--show-linear-break and --graph conflict' '
+	test_must_fail git log --show-linear-break --graph 2>stderr &&
+	test_i18ngrep "cannot be used together" stderr
+'
+
+test_expect_success '--show-linear-break --graph --no-graph works' '
+	git log --show-linear-break >expect &&
+	git log --show-linear-break --graph --no-graph >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--no-walk and --graph conflict' '
+	test_must_fail git log --no-walk --graph 2>stderr &&
+	test_i18ngrep "cannot be used together" stderr
+'
+
+test_expect_success '--no-walk --graph --no-graph works' '
+	git log --no-walk >expect &&
+	git log --no-walk --graph --no-graph >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--walk-reflogs and --graph conflict' '
+	test_must_fail git log --walk-reflogs --graph 2>stderr &&
+	(test_i18ngrep "cannot combine" stderr ||
+		test_i18ngrep "cannot be used together" stderr)
+'
+
+test_expect_success '--walk-reflogs --graph --no-graph works' '
+	git log --walk-reflogs >expect &&
+	git log --walk-reflogs --graph --no-graph >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'dotdot is a parent directory' '
 	mkdir -p a/b &&
 	( echo sixth && echo fifth ) >expect &&
@@ -1616,6 +1786,34 @@ test_expect_success GPGSM 'setup signed branch x509' '
 	git commit -S -m signed_commit
 '
 
+test_expect_success GPGSSH 'setup sshkey signed branch' '
+	test_config gpg.format ssh &&
+	test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+	test_when_finished "git reset --hard && git checkout main" &&
+	git checkout -b signed-ssh main &&
+	echo foo >foo &&
+	git add foo &&
+	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 &&
@@ -1628,6 +1826,13 @@ test_expect_success GPGSM 'log OpenPGP fingerprint' '
 	test_cmp expect actual
 '
 
+test_expect_success GPGSSH 'log ssh key fingerprint' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	ssh-keygen -lf  "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2\" | \"}" >expect &&
+	git log -n1 --format="%GF | %GP" signed-ssh >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success GPG 'log --graph --show-signature' '
 	git log --graph --show-signature -n1 signed >actual &&
 	grep "^| gpg: Signature made" actual &&
@@ -1640,6 +1845,37 @@ test_expect_success GPGSM 'log --graph --show-signature x509' '
 	grep "^| gpgsm: Good signature" actual
 '
 
+test_expect_success GPGSSH 'log --graph --show-signature ssh' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git log --graph --show-signature -n1 signed-ssh >actual &&
+	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 &&
@@ -1915,6 +2151,20 @@ test_expect_success '--exclude-promisor-objects does not BUG-crash' '
 	test_must_fail git log --exclude-promisor-objects source-a
 '
 
+test_expect_success 'log --decorate includes all levels of tag annotated tags' '
+	git checkout -b branch &&
+	git commit --allow-empty -m "new commit" &&
+	git tag lightweight HEAD &&
+	git tag -m annotated annotated HEAD &&
+	git tag -m double-0 double-0 HEAD &&
+	git tag -m double-1 double-1 double-0 &&
+	cat >expect <<-\EOF &&
+	HEAD -> branch, tag: lightweight, tag: double-1, tag: double-0, tag: annotated
+	EOF
+	git log -1 --format="%D" >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'log --end-of-options' '
        git update-ref refs/heads/--source HEAD &&
        git log --end-of-options --source >actual &&
@@ -1922,4 +2172,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..a730c0db98 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,9 +36,9 @@ 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" &&
-	test_line_count -gt 0 patch-id_"$patch_name"
+	git patch-id "$@" >patch-id.output &&
+	sed "s/ .*//" patch-id.output >patch-id_"$patch_name" &&
+	test_line_count -eq 1 patch-id_"$patch_name"
 }
 
 get_top_diff () {
@@ -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
 '
 
@@ -160,40 +166,67 @@ test_expect_success 'patch-id respects config from subdir' '
 	)
 '
 
-cat >nonl <<\EOF
-diff --git i/a w/a
-index e69de29..2e65efe 100644
---- i/a
-+++ w/a
-@@ -0,0 +1 @@
-+a
-\ No newline at end of file
-diff --git i/b w/b
-index e69de29..6178079 100644
---- i/b
-+++ w/b
-@@ -0,0 +1 @@
-+b
-EOF
-
-cat >withnl <<\EOF
-diff --git i/a w/a
-index e69de29..7898192 100644
---- i/a
-+++ w/a
-@@ -0,0 +1 @@
-+a
-diff --git i/b w/b
-index e69de29..6178079 100644
---- i/b
-+++ w/b
-@@ -0,0 +1 @@
-+b
-EOF
-
 test_expect_success 'patch-id handles no-nl-at-eof markers' '
-	cat nonl | calc_patch_id nonl &&
-	cat withnl | calc_patch_id withnl &&
+	cat >nonl <<-\EOF &&
+	diff --git i/a w/a
+	index e69de29..2e65efe 100644
+	--- i/a
+	+++ w/a
+	@@ -0,0 +1 @@
+	+a
+	\ No newline at end of file
+	diff --git i/b w/b
+	index e69de29..6178079 100644
+	--- i/b
+	+++ w/b
+	@@ -0,0 +1 @@
+	+b
+	EOF
+	cat >withnl <<-\EOF &&
+	diff --git i/a w/a
+	index e69de29..7898192 100644
+	--- i/a
+	+++ w/a
+	@@ -0,0 +1 @@
+	+a
+	diff --git i/b w/b
+	index e69de29..6178079 100644
+	--- i/b
+	+++ w/b
+	@@ -0,0 +1 @@
+	+b
+	EOF
+	calc_patch_id nonl <nonl &&
+	calc_patch_id withnl <withnl &&
 	test_cmp patch-id_nonl patch-id_withnl
 '
+
+test_expect_success 'patch-id handles diffs with one line of before/after' '
+	cat >diffu1 <<-\EOF &&
+	diff --git a/bar b/bar
+	index bdaf90f..31051f6 100644
+	--- a/bar
+	+++ b/bar
+	@@ -2 +2,2 @@
+	 b
+	+c
+	diff --git a/car b/car
+	index 00750ed..2ae5e34 100644
+	--- a/car
+	+++ b/car
+	@@ -1 +1,2 @@
+	 3
+	+d
+	diff --git a/foo b/foo
+	index e439850..7146eb8 100644
+	--- a/foo
+	+++ b/foo
+	@@ -2 +2,2 @@
+	 a
+	+e
+	EOF
+	calc_patch_id diffu1 <diffu1 &&
+	test_config patchid.stable true &&
+	calc_patch_id diffu1stable <diffu1
+'
 test_done
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/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
index e59601e5fe..c52c8a21fa 100755
--- a/t/t4300-merge-tree.sh
+++ b/t/t4300-merge-tree.sh
@@ -4,6 +4,8 @@
 #
 
 test_description='git merge-tree'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
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 5c5e53f0be..2fd845187e 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -34,6 +34,110 @@ test_expect_success 'setup' '
 	} >expect
 '
 
+test_expect_success 'setup pack-object <stdin' '
+	git init pack-object-stdin &&
+	test_commit -C pack-object-stdin one &&
+	test_commit -C pack-object-stdin two
+
+'
+
+test_expect_success 'pack-object <stdin parsing: basic [|--revs]' '
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+	EOF
+
+	git -C pack-object-stdin pack-objects basic-stdin <in &&
+	idx=$(echo pack-object-stdin/basic-stdin-*.idx) &&
+	git show-index <"$idx" >actual &&
+	test_line_count = 1 actual &&
+
+	git -C pack-object-stdin pack-objects --revs basic-stdin-revs <in &&
+	idx=$(echo pack-object-stdin/basic-stdin-revs-*.idx) &&
+	git show-index <"$idx" >actual &&
+	test_line_count = 3 actual
+'
+
+test_expect_success 'pack-object <stdin parsing: [|--revs] bad line' '
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+	garbage
+	$(git -C pack-object-stdin rev-parse two)
+	EOF
+
+	sed "s/^> //g" >err.expect <<-EOF &&
+	fatal: expected object ID, got garbage:
+	>  garbage
+
+	EOF
+	test_must_fail git -C pack-object-stdin pack-objects bad-line-stdin <in 2>err.actual &&
+	test_cmp err.expect err.actual &&
+
+	cat >err.expect <<-EOF &&
+	fatal: bad revision '"'"'garbage'"'"'
+	EOF
+	test_must_fail git -C pack-object-stdin pack-objects --revs bad-line-stdin-revs <in 2>err.actual &&
+	test_cmp err.expect err.actual
+'
+
+test_expect_success 'pack-object <stdin parsing: [|--revs] empty line' '
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+
+	$(git -C pack-object-stdin rev-parse two)
+	EOF
+
+	sed -e "s/^> //g" -e "s/Z$//g" >err.expect <<-EOF &&
+	fatal: expected object ID, got garbage:
+	>  Z
+
+	EOF
+	test_must_fail git -C pack-object-stdin pack-objects empty-line-stdin <in 2>err.actual &&
+	test_cmp err.expect err.actual &&
+
+	git -C pack-object-stdin pack-objects --revs empty-line-stdin-revs <in &&
+	idx=$(echo pack-object-stdin/empty-line-stdin-revs-*.idx) &&
+	git show-index <"$idx" >actual &&
+	test_line_count = 3 actual
+'
+
+test_expect_success 'pack-object <stdin parsing: [|--revs] with --stdin' '
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+	$(git -C pack-object-stdin rev-parse two)
+	EOF
+
+	# There is the "--stdin-packs is incompatible with --revs"
+	# test below, but we should make sure that the revision.c
+	# --stdin is not picked up
+	cat >err.expect <<-EOF &&
+	fatal: disallowed abbreviated or ambiguous option '"'"'stdin'"'"'
+	EOF
+	test_must_fail git -C pack-object-stdin pack-objects stdin-with-stdin-option --stdin <in 2>err.actual &&
+	test_cmp err.expect err.actual &&
+
+	test_must_fail git -C pack-object-stdin pack-objects --stdin --revs stdin-with-stdin-option-revs 2>err.actual <in &&
+	test_cmp err.expect err.actual
+'
+
+test_expect_success 'pack-object <stdin parsing: --stdin-packs handles garbage' '
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+	$(git -C pack-object-stdin rev-parse two)
+	EOF
+
+	# That we get "two" and not "one" has to do with OID
+	# ordering. It happens to be the same here under SHA-1 and
+	# SHA-256. See commentary in pack-objects.c
+	cat >err.expect <<-EOF &&
+	fatal: could not find pack '"'"'$(git -C pack-object-stdin rev-parse two)'"'"'
+	EOF
+	test_must_fail git \
+		-C pack-object-stdin \
+		pack-objects stdin-with-stdin-option --stdin-packs \
+		<in 2>err.actual &&
+	test_cmp err.expect err.actual
+'
+
 # usage: check_deltas <stderr_from_pack_objects> <cmp_op> <nr_deltas>
 # e.g.: check_deltas stderr -gt 0
 check_deltas() {
@@ -243,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 &&
@@ -257,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 &&
@@ -290,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 &&
@@ -304,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 &&
@@ -490,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/t5304-prune.sh b/t/t5304-prune.sh
index 7cabb85ca6..8ae314af58 100755
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -291,6 +291,7 @@ test_expect_success 'prune: handle HEAD reflog in multiple worktrees' '
 		cat ../expected >blob &&
 		git add blob &&
 		git commit -m "second commit in third" &&
+		git clean -f && # Remove untracked left behind by deleting index
 		git reset --hard HEAD^
 	) &&
 	git prune --expire=now &&
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 b02838750e..f775fc1ce6 100755
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -1,13 +1,14 @@
 #!/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-bundle.sh
 . "$TEST_DIRECTORY"/lib-bitmap.sh
 
+# t5310 deals only with single-pack bitmaps, so don't write MIDX bitmaps in
+# their place.
+GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0
+
 objpath () {
 	echo ".git/objects/$(echo "$1" | sed -e 's|\(..\)|\1/|')"
 }
@@ -25,97 +26,14 @@ has_any () {
 	grep -Ff "$1" "$2"
 }
 
-# To ensure the logic for "maximal commits" is exercised, make
-# the repository a bit more complicated.
-#
-#    other                         second
-#      *                             *
-# (99 commits)                  (99 commits)
-#      *                             *
-#      |\                           /|
-#      | * octo-other  octo-second * |
-#      |/|\_________  ____________/|\|
-#      | \          \/  __________/  |
-#      |  | ________/\ /             |
-#      *  |/          * merge-right  *
-#      | _|__________/ \____________ |
-#      |/ |                         \|
-# (l1) *  * merge-left               * (r1)
-#      | / \________________________ |
-#      |/                           \|
-# (l2) *                             * (r2)
-#       \___________________________ |
-#                                   \|
-#                                    * (base)
-#
-# We only push bits down the first-parent history, which
-# makes some of these commits unimportant!
-#
-# The important part for the maximal commit algorithm is how
-# the bitmasks are extended. Assuming starting bit positions
-# for second (bit 0) and other (bit 1), the bitmasks at the
-# end should be:
-#
-#      second: 1       (maximal, selected)
-#       other: 01      (maximal, selected)
-#      (base): 11 (maximal)
-#
-# This complicated history was important for a previous
-# version of the walk that guarantees never walking a
-# commit multiple times. That goal might be important
-# again, so preserve this complicated case. For now, this
-# test will guarantee that the bitmaps are computed
-# correctly, even with the repeat calculations.
-
-test_expect_success 'setup repo with moderate-sized history' '
-	test_commit_bulk --id=file 10 &&
-	git branch -M second &&
-	git checkout -b other HEAD~5 &&
-	test_commit_bulk --id=side 10 &&
-
-	# add complicated history setup, including merges and
-	# ambiguous merge-bases
-
-	git checkout -b merge-left other~2 &&
-	git merge second~2 -m "merge-left" &&
-
-	git checkout -b merge-right second~1 &&
-	git merge other~1 -m "merge-right" &&
-
-	git checkout -b octo-second second &&
-	git merge merge-left merge-right -m "octopus-second" &&
-
-	git checkout -b octo-other other &&
-	git merge merge-left merge-right -m "octopus-other" &&
-
-	git checkout other &&
-	git merge octo-other -m "pull octopus" &&
-
-	git checkout second &&
-	git merge octo-second -m "pull octopus" &&
-
-	# Remove these branches so they are not selected
-	# as bitmap tips
-	git branch -D merge-left &&
-	git branch -D merge-right &&
-	git branch -D octo-other &&
-	git branch -D octo-second &&
-
-	# add padding to make these merges less interesting
-	# and avoid having them selected for bitmaps
-	test_commit_bulk --id=file 100 &&
-	git checkout other &&
-	test_commit_bulk --id=side 100 &&
-	git checkout second &&
-
-	bitmaptip=$(git rev-parse second) &&
-	blob=$(echo tagged-blob | git hash-object -w --stdin) &&
-	git tag tagged-blob $blob &&
-	git config repack.writebitmaps true
+setup_bitmap_history
+
+test_expect_success 'setup writing bitmaps during repack' '
+	git config repack.writeBitmaps true
 '
 
 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 &&
@@ -123,109 +41,7 @@ test_expect_success 'full repack creates bitmaps' '
 	grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 '
 
-test_expect_success 'rev-list --test-bitmap verifies bitmaps' '
-	git rev-list --test-bitmap HEAD
-'
-
-rev_list_tests_head () {
-	test_expect_success "counting commits via bitmap ($state, $branch)" '
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	'
-
-	test_expect_success "counting partial commits via bitmap ($state, $branch)" '
-		git rev-list --count $branch~5..$branch >expect &&
-		git rev-list --use-bitmap-index --count $branch~5..$branch >actual &&
-		test_cmp expect actual
-	'
-
-	test_expect_success "counting commits with limit ($state, $branch)" '
-		git rev-list --count -n 1 $branch >expect &&
-		git rev-list --use-bitmap-index --count -n 1 $branch >actual &&
-		test_cmp expect actual
-	'
-
-	test_expect_success "counting non-linear history ($state, $branch)" '
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	'
-
-	test_expect_success "counting commits with limiting ($state, $branch)" '
-		git rev-list --count $branch -- 1.t >expect &&
-		git rev-list --use-bitmap-index --count $branch -- 1.t >actual &&
-		test_cmp expect actual
-	'
-
-	test_expect_success "counting objects via bitmap ($state, $branch)" '
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	'
-
-	test_expect_success "enumerate commits ($state, $branch)" '
-		git rev-list --use-bitmap-index $branch >actual &&
-		git rev-list $branch >expect &&
-		test_bitmap_traversal --no-confirm-bitmaps expect actual
-	'
-
-	test_expect_success "enumerate --objects ($state, $branch)" '
-		git rev-list --objects --use-bitmap-index $branch >actual &&
-		git rev-list --objects $branch >expect &&
-		test_bitmap_traversal expect actual
-	'
-
-	test_expect_success "bitmap --objects handles non-commit objects ($state, $branch)" '
-		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
-		grep $blob actual
-	'
-}
-
-rev_list_tests () {
-	state=$1
-
-	for branch in "second" "other"
-	do
-		rev_list_tests_head
-	done
-}
-
-rev_list_tests 'full bitmap'
-
-test_expect_success 'clone from bitmapped repository' '
-	git clone --no-local --bare . clone.git &&
-	git rev-parse HEAD >expect &&
-	git --git-dir=clone.git rev-parse HEAD >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'partial clone from bitmapped repository' '
-	test_config uploadpack.allowfilter true &&
-	git clone --no-local --bare --filter=blob:none . partial-clone.git &&
-	(
-		cd partial-clone.git &&
-		pack=$(echo objects/pack/*.pack) &&
-		git verify-pack -v "$pack" >have &&
-		awk "/blob/ { print \$1 }" <have >blobs &&
-		# we expect this single blob because of the direct ref
-		git rev-parse refs/tags/tagged-blob >expect &&
-		test_cmp expect blobs
-	)
-'
-
-test_expect_success 'setup further non-bitmapped commits' '
-	test_commit_bulk --id=further 10
-'
-
-rev_list_tests 'partial bitmap'
-
-test_expect_success 'fetch (partial bitmap)' '
-	git --git-dir=clone.git fetch origin second:second &&
-	git rev-parse HEAD >expect &&
-	git --git-dir=clone.git rev-parse HEAD >actual &&
-	test_cmp expect actual
-'
+basic_bitmap_tests
 
 test_expect_success 'incremental repack fails when bitmaps are requested' '
 	test_commit more-1 &&
@@ -412,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 &&
@@ -461,40 +277,6 @@ test_expect_success 'truncated bitmap fails gracefully (cache)' '
 	test_i18ngrep corrupted.bitmap.index stderr
 '
 
-test_expect_success 'enumerating progress counts pack-reused objects' '
-	count=$(git rev-list --objects --all --count) &&
-	git repack -adb &&
-
-	# check first with only reused objects; confirm that our progress
-	# showed the right number, and also that we did pack-reuse as expected.
-	# Check only the final "done" line of the meter (there may be an
-	# arbitrary number of intermediate lines ending with CR).
-	GIT_PROGRESS_DELAY=0 \
-		git pack-objects --all --stdout --progress \
-		</dev/null >/dev/null 2>stderr &&
-	grep "Enumerating objects: $count, done" stderr &&
-	grep "pack-reused $count" stderr &&
-
-	# now the same but with one non-reused object
-	git commit --allow-empty -m "an extra commit object" &&
-	GIT_PROGRESS_DELAY=0 \
-		git pack-objects --all --stdout --progress \
-		</dev/null >/dev/null 2>stderr &&
-	grep "Enumerating objects: $((count+1)), done" stderr &&
-	grep "pack-reused $count" stderr
-'
-
-# have_delta <obj> <expected_base>
-#
-# Note that because this relies on cat-file, it might find _any_ copy of an
-# object in the repository. The caller is responsible for making sure
-# there's only one (e.g., via "repack -ad", or having just fetched a copy).
-have_delta () {
-	echo $2 >expect &&
-	echo $1 | git cat-file --batch-check="%(deltabase)" >actual &&
-	test_cmp expect actual
-}
-
 # Create a state of history with these properties:
 #
 #  - refs that allow a client to fetch some new history, while sharing some old
@@ -615,4 +397,32 @@ test_expect_success 'pack.preferBitmapTips' '
 	)
 '
 
+test_expect_success 'complains about multiple pack bitmaps' '
+	rm -fr repo &&
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit base &&
+
+		git repack -adb &&
+		bitmap="$(ls .git/objects/pack/pack-*.bitmap)" &&
+		mv "$bitmap" "$bitmap.bak" &&
+
+		test_commit other &&
+		git repack -ab &&
+
+		mv "$bitmap.bak" "$bitmap" &&
+
+		find .git/objects/pack -type f -name "*.pack" >packs &&
+		find .git/objects/pack -type f -name "*.bitmap" >bitmaps &&
+		test_line_count = 2 packs &&
+		test_line_count = 2 bitmaps &&
+
+		git rev-list --use-bitmap-index HEAD 2>err &&
+		grep "ignoring extra bitmap file" err
+	)
+'
+
 test_done
diff --git a/t/t5312-prune-corruption.sh b/t/t5312-prune-corruption.sh
index 11423b3cb2..9d8e249ae8 100755
--- a/t/t5312-prune-corruption.sh
+++ b/t/t5312-prune-corruption.sh
@@ -7,6 +7,9 @@ if we see, for example, a ref with a bogus name, it is OK either to
 bail out or to proceed using it as a reachable tip, but it is _not_
 OK to proceed as if it did not exist. Otherwise we might silently
 delete objects that cannot be recovered.
+
+Note that we do assert command failure in these cases, because that is
+what currently happens. If that changes, these tests should be revisited.
 '
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
@@ -18,39 +21,58 @@ test_expect_success 'disable reflogs' '
 	git reflog expire --expire=all --all
 '
 
+create_bogus_ref () {
+	test-tool ref-store main update-ref msg "refs/heads/bogus..name" $bogus $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/bogus..name"
+}
+
 test_expect_success 'create history reachable only from a bogus-named ref' '
 	test_tick && git commit --allow-empty -m main &&
 	base=$(git rev-parse HEAD) &&
 	test_tick && git commit --allow-empty -m bogus &&
 	bogus=$(git rev-parse HEAD) &&
 	git cat-file commit $bogus >saved &&
-	echo $bogus >.git/refs/heads/bogus..name &&
 	git reset --hard HEAD^
 '
 
 test_expect_success 'pruning does not drop bogus object' '
 	test_when_finished "git hash-object -w -t commit saved" &&
-	test_might_fail git prune --expire=now &&
-	verbose git cat-file -e $bogus
+	create_bogus_ref &&
+	test_must_fail git prune --expire=now &&
+	git cat-file -e $bogus
 '
 
 test_expect_success 'put bogus object into pack' '
 	git tag reachable $bogus &&
 	git repack -ad &&
 	git tag -d reachable &&
-	verbose git cat-file -e $bogus
+	git cat-file -e $bogus
+'
+
+test_expect_success 'non-destructive repack bails on bogus ref' '
+	create_bogus_ref &&
+	test_must_fail git repack -adk
 '
 
+test_expect_success 'GIT_REF_PARANOIA=0 overrides safety' '
+	create_bogus_ref &&
+	GIT_REF_PARANOIA=0 git repack -adk
+'
+
+
 test_expect_success 'destructive repack keeps packed object' '
-	test_might_fail git repack -Ad --unpack-unreachable=now &&
-	verbose git cat-file -e $bogus &&
-	test_might_fail git repack -ad &&
-	verbose git cat-file -e $bogus
+	create_bogus_ref &&
+	test_must_fail git repack -Ad --unpack-unreachable=now &&
+	git cat-file -e $bogus &&
+	test_must_fail git repack -ad &&
+	git cat-file -e $bogus
 '
 
-# subsequent tests will have different corruptions
-test_expect_success 'clean up bogus ref' '
-	rm .git/refs/heads/bogus..name
+test_expect_success 'destructive repack not confused by dangling symref' '
+	test_when_finished "git symbolic-ref -d refs/heads/dangling" &&
+	git symbolic-ref refs/heads/dangling refs/heads/does-not-exist &&
+	git repack -ad &&
+	test_must_fail git cat-file -e $bogus
 '
 
 # We create two new objects here, "one" and "two". Our
@@ -77,8 +99,8 @@ test_expect_success 'create history with missing tip commit' '
 
 test_expect_success 'pruning with a corrupted tip does not drop history' '
 	test_when_finished "git hash-object -w -t commit saved" &&
-	test_might_fail git prune --expire=now &&
-	verbose git cat-file -e $recoverable
+	test_must_fail git prune --expire=now &&
+	git cat-file -e $recoverable
 '
 
 test_expect_success 'pack-refs does not silently delete broken loose ref' '
@@ -91,7 +113,7 @@ test_expect_success 'pack-refs does not silently delete broken loose ref' '
 # we do not want to count on running pack-refs to
 # actually pack it, as it is perfectly reasonable to
 # skip processing a broken ref
-test_expect_success 'create packed-refs file with broken ref' '
+test_expect_success REFFILES 'create packed-refs file with broken ref' '
 	rm -f .git/refs/heads/main &&
 	cat >.git/packed-refs <<-EOF &&
 	$missing refs/heads/main
@@ -102,13 +124,13 @@ test_expect_success 'create packed-refs file with broken ref' '
 	test_cmp expect actual
 '
 
-test_expect_success 'pack-refs does not silently delete broken packed ref' '
+test_expect_success REFFILES 'pack-refs does not silently delete broken packed ref' '
 	git pack-refs --all --prune &&
 	git rev-parse refs/heads/main >actual &&
 	test_cmp expect actual
 '
 
-test_expect_success 'pack-refs does not drop broken refs during deletion' '
+test_expect_success REFFILES  'pack-refs does not drop broken refs during deletion' '
 	git update-ref -d refs/heads/other &&
 	git rev-parse refs/heads/main >actual &&
 	test_cmp expect actual
diff --git a/t/t5316-pack-delta-depth.sh b/t/t5316-pack-delta-depth.sh
index bbe2e69c75..e9045009a1 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_TRACE2_EVENT=$PWD/trace \
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 af88f805aa..edb728f77c 100755
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -5,6 +5,25 @@ test_description='commit graph'
 
 GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=0
 
+test_expect_success 'usage' '
+	test_expect_code 129 git commit-graph write blah 2>err &&
+	test_expect_code 129 git commit-graph write verify
+'
+
+test_expect_success 'usage shown without sub-command' '
+	test_expect_code 129 git commit-graph 2>err &&
+	! grep error: err
+'
+
+test_expect_success 'usage shown with an error on unknown sub-command' '
+	cat >expect <<-\EOF &&
+	error: unrecognized subcommand: unknown
+	EOF
+	test_expect_code 129 git commit-graph unknown 2>stderr &&
+	grep error stderr >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'setup full repo' '
 	mkdir full &&
 	cd "$TRASH_DIRECTORY/full" &&
@@ -45,14 +64,14 @@ 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
 '
 
 graph_git_two_modes() {
-	git -c core.commitGraph=true $1 >output
-	git -c core.commitGraph=false $1 >expect
+	git -c core.commitGraph=true $1 >output &&
+	git -c core.commitGraph=false $1 >expect &&
 	test_cmp expect output
 }
 
@@ -128,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 &&
@@ -366,6 +385,7 @@ test_expect_success 'replace-objects invalidates commit-graph' '
 		git commit-graph write --reachable &&
 		test_path_is_file .git/objects/info/commit-graph &&
 		git replace HEAD~1 HEAD~2 &&
+		graph_git_two_modes "commit-graph verify" &&
 		git -c core.commitGraph=false log >expect &&
 		git -c core.commitGraph=true log >actual &&
 		test_cmp expect actual &&
@@ -674,12 +694,33 @@ test_expect_success 'detect incorrect chunk count' '
 		$GRAPH_CHUNK_LOOKUP_OFFSET
 '
 
-test_expect_success 'git fsck (checks commit-graph)' '
+test_expect_success 'git fsck (checks commit-graph when config set to true)' '
 	cd "$TRASH_DIRECTORY/full" &&
 	git fsck &&
 	corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
 		"incorrect checksum" &&
 	cp commit-graph-pre-write-test $objdir/info/commit-graph &&
+	test_must_fail git -c core.commitGraph=true fsck
+'
+
+test_expect_success 'git fsck (ignores commit-graph when config set to false)' '
+	cd "$TRASH_DIRECTORY/full" &&
+	git fsck &&
+	corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
+		"incorrect checksum" &&
+	cp commit-graph-pre-write-test $objdir/info/commit-graph &&
+	git -c core.commitGraph=false fsck
+'
+
+test_expect_success 'git fsck (checks commit-graph when config unset)' '
+	cd "$TRASH_DIRECTORY/full" &&
+	test_when_finished "git config core.commitGraph true" &&
+
+	git fsck &&
+	corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
+		"incorrect checksum" &&
+	test_unconfig core.commitGraph &&
+	cp commit-graph-pre-write-test $objdir/info/commit-graph &&
 	test_must_fail git fsck
 '
 
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 7609f1ea64..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
 '
@@ -168,18 +168,33 @@ test_expect_success 'write midx with two packs' '
 
 compare_results_with_midx "two packs"
 
+test_expect_success 'write midx with --stdin-packs' '
+	rm -fr $objdir/pack/multi-pack-index &&
+
+	idx="$(find $objdir/pack -name "test-2-*.idx")" &&
+	basename "$idx" >in &&
+
+	git multi-pack-index write --stdin-packs <in &&
+
+	test-tool read-midx $objdir | grep "\.idx$" >packs &&
+
+	test_cmp packs in
+'
+
+compare_results_with_midx "mixed mode (one pack + extra)"
+
 test_expect_success 'write progress off for redirected stderr' '
 	git multi-pack-index --object-dir=$objdir write 2>err &&
 	test_line_count = 0 err
 '
 
 test_expect_success 'write force progress on for stderr' '
-	GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir --progress write 2>err &&
+	GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir write --progress 2>err &&
 	test_file_not_empty err
 '
 
 test_expect_success 'write with the --no-progress option' '
-	GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir --no-progress write 2>err &&
+	GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir write --no-progress 2>err &&
 	test_line_count = 0 err
 '
 
@@ -188,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
 '
 
@@ -201,6 +216,34 @@ test_expect_success 'write midx with twelve packs' '
 
 compare_results_with_midx "twelve packs"
 
+test_expect_success 'multi-pack-index *.rev cleanup with --object-dir' '
+	git init repo &&
+	git clone -s repo alternate &&
+
+	test_when_finished "rm -rf repo alternate" &&
+
+	(
+		cd repo &&
+		test_commit base &&
+		git repack -d
+	) &&
+
+	ours="alternate/.git/objects/pack/multi-pack-index-123.rev" &&
+	theirs="repo/.git/objects/pack/multi-pack-index-abc.rev" &&
+	touch "$ours" "$theirs" &&
+
+	(
+		cd alternate &&
+		git multi-pack-index --object-dir ../repo/.git/objects write
+	) &&
+
+	# writing a midx in "repo" should not remove the .rev file in the
+	# alternate
+	test_path_is_file repo/.git/objects/pack/multi-pack-index &&
+	test_path_is_file $ours &&
+	test_path_is_missing $theirs
+'
+
 test_expect_success 'warn on improper hash version' '
 	git init --object-format=sha1 sha1 &&
 	(
@@ -277,6 +320,23 @@ test_expect_success 'midx picks objects from preferred pack' '
 	)
 '
 
+test_expect_success 'preferred packs must be non-empty' '
+	test_when_finished rm -rf preferred.git &&
+	git init preferred.git &&
+	(
+		cd preferred.git &&
+
+		test_commit base &&
+		git repack -ad &&
+
+		empty="$(git pack-objects $objdir/pack/pack </dev/null)" &&
+
+		test_must_fail git multi-pack-index write \
+			--preferred-pack=pack-$empty.pack 2>err &&
+		grep "with no objects" err
+	)
+'
+
 test_expect_success 'verify multi-pack-index success' '
 	git multi-pack-index verify --object-dir=$objdir
 '
@@ -407,7 +467,10 @@ test_expect_success 'verify incorrect offset' '
 test_expect_success 'git-fsck incorrect offset' '
 	corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \
 		"incorrect object offset" \
-		"git -c core.multipackindex=true fsck"
+		"git -c core.multiPackIndex=true fsck" &&
+	test_unconfig core.multiPackIndex &&
+	test_must_fail git fsck &&
+	git -c core.multiPackIndex=false fsck
 '
 
 test_expect_success 'corrupt MIDX is not reused' '
@@ -419,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' '
@@ -429,12 +494,12 @@ test_expect_success 'repack progress off for redirected stderr' '
 '
 
 test_expect_success 'repack force progress on for stderr' '
-	GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir --progress repack 2>err &&
+	GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir repack --progress 2>err &&
 	test_file_not_empty err
 '
 
 test_expect_success 'repack with the --no-progress option' '
-	GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir --no-progress repack 2>err &&
+	GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir repack --no-progress 2>err &&
 	test_line_count = 0 err
 '
 
@@ -487,7 +552,8 @@ test_expect_success 'repack preserves multi-pack-index when creating packs' '
 compare_results_with_midx "after repack"
 
 test_expect_success 'multi-pack-index and pack-bitmap' '
-	git -c repack.writeBitmaps=true repack -ad &&
+	GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+		git -c repack.writeBitmaps=true repack -ad &&
 	git multi-pack-index write &&
 	git rev-list --test-bitmap HEAD
 '
@@ -530,14 +596,22 @@ 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) &&
 	idx64=objects64/pack/test-64-$pack64.idx &&
 	chmod u+w $idx64 &&
 	corrupt_data $idx64 $(test_oid idxoff) "\02" &&
-	midx64=$(git multi-pack-index --object-dir=objects64 write) &&
+	# objects64 is not a real repository, but can serve as an alternate
+	# anyway so we can write a MIDX into it
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+		( cd ../objects64 && pwd ) >.git/objects/info/alternates &&
+		midx64=$(git multi-pack-index --object-dir=../objects64 write)
+	) &&
 	midx_read_expect 1 63 5 objects64 " large-offsets"
 '
 
@@ -566,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 &&
@@ -618,7 +692,7 @@ test_expect_success 'expire progress off for redirected stderr' '
 test_expect_success 'expire force progress on for stderr' '
 	(
 		cd dup &&
-		GIT_PROGRESS_DELAY=0 git multi-pack-index --progress expire 2>err &&
+		GIT_PROGRESS_DELAY=0 git multi-pack-index expire --progress 2>err &&
 		test_file_not_empty err
 	)
 '
@@ -626,7 +700,7 @@ test_expect_success 'expire force progress on for stderr' '
 test_expect_success 'expire with the --no-progress option' '
 	(
 		cd dup &&
-		GIT_PROGRESS_DELAY=0 git multi-pack-index --no-progress expire 2>err &&
+		GIT_PROGRESS_DELAY=0 git multi-pack-index expire --no-progress 2>err &&
 		test_line_count = 0 err
 	)
 '
@@ -837,4 +911,14 @@ test_expect_success 'load reverse index when missing .idx, .pack' '
 	)
 '
 
+test_expect_success 'usage shown without sub-command' '
+	test_expect_code 129 git multi-pack-index 2>err &&
+	! test_i18ngrep "unrecognized subcommand" err
+'
+
+test_expect_success 'complains when run outside of a repository' '
+	nongit test_must_fail git multi-pack-index write 2>err &&
+	grep "not a git repository" err
+'
+
 test_done
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/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh
index 8b01793845..8dbbcc5e51 100755
--- a/t/t5323-pack-redundant.sh
+++ b/t/t5323-pack-redundant.sh
@@ -114,9 +114,9 @@ test_expect_success 'setup main repo' '
 	create_commits_in "$main_repo" A B C D E F G H I J K L M N O P Q R
 '
 
-test_expect_success 'master: pack-redundant works with no packfile' '
+test_expect_success 'main: pack-redundant works with no packfile' '
 	(
-		cd "$master_repo" &&
+		cd "$main_repo" &&
 		cat >expect <<-EOF &&
 			fatal: Zero packs found!
 			EOF
diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh
index 587226ed10..847b809710 100755
--- a/t/t5324-split-commit-graph.sh
+++ b/t/t5324-split-commit-graph.sh
@@ -55,8 +55,8 @@ test_expect_success 'create commits and write commit-graph' '
 '
 
 graph_git_two_modes() {
-	git -c core.commitGraph=true $1 >output
-	git -c core.commitGraph=false $1 >expect
+	git ${2:+ -C "$2"} -c core.commitGraph=true $1 >output &&
+	git ${2:+ -C "$2"} -c core.commitGraph=false $1 >expect &&
 	test_cmp expect output
 }
 
@@ -64,12 +64,13 @@ graph_git_behavior() {
 	MSG=$1
 	BRANCH=$2
 	COMPARE=$3
+	DIR=$4
 	test_expect_success "check normal git operations: $MSG" '
-		graph_git_two_modes "log --oneline $BRANCH" &&
-		graph_git_two_modes "log --topo-order $BRANCH" &&
-		graph_git_two_modes "log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "branch -vv" &&
-		graph_git_two_modes "merge-base -a $BRANCH $COMPARE"
+		graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
+		graph_git_two_modes "branch -vv" "$DIR" &&
+		graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
 	'
 }
 
@@ -187,7 +188,10 @@ test_expect_success 'create fork and chain across alternate' '
 	)
 '
 
-graph_git_behavior 'alternate: commit 13 vs 6' commits/13 commits/6
+if test -d fork
+then
+	graph_git_behavior 'alternate: commit 13 vs 6' commits/13 origin/commits/6 "fork"
+fi
 
 test_expect_success 'test merge stragety constants' '
 	git clone . merge-2 &&
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/t5326-multi-pack-bitmaps.sh b/t/t5326-multi-pack-bitmaps.sh
new file mode 100755
index 0000000000..4fe57414c1
--- /dev/null
+++ b/t/t5326-multi-pack-bitmaps.sh
@@ -0,0 +1,310 @@
+#!/bin/sh
+
+test_description='exercise basic multi-pack bitmap functionality'
+. ./test-lib.sh
+. "${TEST_DIRECTORY}/lib-bitmap.sh"
+
+# We'll be writing our own midx and bitmaps, so avoid getting confused by the
+# automatic ones.
+GIT_TEST_MULTI_PACK_INDEX=0
+GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0
+
+# This test exercise multi-pack bitmap functionality where the object order is
+# stored and read from a special chunk within the MIDX, so use the default
+# behavior here.
+sane_unset GIT_TEST_MIDX_WRITE_REV
+sane_unset GIT_TEST_MIDX_READ_RIDX
+
+midx_bitmap_core
+
+bitmap_reuse_tests() {
+	from=$1
+	to=$2
+
+	test_expect_success "setup pack reuse tests ($from -> $to)" '
+		rm -fr repo &&
+		git init repo &&
+		(
+			cd repo &&
+			test_commit_bulk 16 &&
+			git tag old-tip &&
+
+			git config core.multiPackIndex true &&
+			if test "MIDX" = "$from"
+			then
+				git repack -Ad &&
+				git multi-pack-index write --bitmap
+			else
+				git repack -Adb
+			fi
+		)
+	'
+
+	test_expect_success "build bitmap from existing ($from -> $to)" '
+		(
+			cd repo &&
+			test_commit_bulk --id=further 16 &&
+			git tag new-tip &&
+
+			if test "MIDX" = "$to"
+			then
+				git repack -d &&
+				git multi-pack-index write --bitmap
+			else
+				git repack -Adb
+			fi
+		)
+	'
+
+	test_expect_success "verify resulting bitmaps ($from -> $to)" '
+		(
+			cd repo &&
+			git for-each-ref &&
+			git rev-list --test-bitmap refs/tags/old-tip &&
+			git rev-list --test-bitmap refs/tags/new-tip
+		)
+	'
+}
+
+bitmap_reuse_tests 'pack' 'MIDX'
+bitmap_reuse_tests 'MIDX' 'pack'
+bitmap_reuse_tests 'MIDX' 'MIDX'
+
+test_expect_success 'missing object closure fails gracefully' '
+	rm -fr repo &&
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit loose &&
+		test_commit packed &&
+
+		# Do not pass "--revs"; we want a pack without the "loose"
+		# commit.
+		git pack-objects $objdir/pack/pack <<-EOF &&
+		$(git rev-parse packed)
+		EOF
+
+		test_must_fail git multi-pack-index write --bitmap 2>err &&
+		grep "doesn.t have full closure" err &&
+		test_path_is_missing $midx
+	)
+'
+
+midx_bitmap_partial_tests
+
+test_expect_success 'removing a MIDX clears stale bitmaps' '
+	rm -fr repo &&
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+		test_commit base &&
+		git repack &&
+		git multi-pack-index write --bitmap &&
+
+		# Write a MIDX and bitmap; remove the MIDX but leave the bitmap.
+		stale_bitmap=$midx-$(midx_checksum $objdir).bitmap &&
+		rm $midx &&
+
+		# Then write a new MIDX.
+		test_commit new &&
+		git repack &&
+		git multi-pack-index write --bitmap &&
+
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+		test_path_is_missing $stale_bitmap
+	)
+'
+
+test_expect_success 'pack.preferBitmapTips' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit_bulk --message="%s" 103 &&
+
+		git log --format="%H" >commits.raw &&
+		sort <commits.raw >commits &&
+
+		git log --format="create refs/tags/%s %H" HEAD >refs &&
+		git update-ref --stdin <refs &&
+
+		git multi-pack-index write --bitmap &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+		test-tool bitmap list-commits | sort >bitmaps &&
+		comm -13 bitmaps commits >before &&
+		test_line_count = 1 before &&
+
+		perl -ne "printf(\"create refs/tags/include/%d \", $.); print" \
+			<before | git update-ref --stdin &&
+
+		rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+		rm -fr $midx &&
+
+		git -c pack.preferBitmapTips=refs/tags/include \
+			multi-pack-index write --bitmap &&
+		test-tool bitmap list-commits | sort >bitmaps &&
+		comm -13 bitmaps commits >after &&
+
+		! test_cmp before after
+	)
+'
+
+test_expect_success 'writing a bitmap with --refs-snapshot' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit one &&
+		test_commit two &&
+
+		git rev-parse one >snapshot &&
+
+		git repack -ad &&
+
+		# First, write a MIDX which see both refs/tags/one and
+		# refs/tags/two (causing both of those commits to receive
+		# bitmaps).
+		git multi-pack-index write --bitmap &&
+
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+		test-tool bitmap list-commits | sort >bitmaps &&
+		grep "$(git rev-parse one)" bitmaps &&
+		grep "$(git rev-parse two)" bitmaps &&
+
+		rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+		rm -fr $midx &&
+
+		# Then again, but with a refs snapshot which only sees
+		# refs/tags/one.
+		git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
+
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+		test-tool bitmap list-commits | sort >bitmaps &&
+		grep "$(git rev-parse one)" bitmaps &&
+		! grep "$(git rev-parse two)" bitmaps
+	)
+'
+
+test_expect_success 'write a bitmap with --refs-snapshot (preferred tips)' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit_bulk --message="%s" 103 &&
+
+		git log --format="%H" >commits.raw &&
+		sort <commits.raw >commits &&
+
+		git log --format="create refs/tags/%s %H" HEAD >refs &&
+		git update-ref --stdin <refs &&
+
+		git multi-pack-index write --bitmap &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+		test-tool bitmap list-commits | sort >bitmaps &&
+		comm -13 bitmaps commits >before &&
+		test_line_count = 1 before &&
+
+		(
+			grep -vf before commits.raw &&
+			# mark missing commits as preferred
+			sed "s/^/+/" before
+		) >snapshot &&
+
+		rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+		rm -fr $midx &&
+
+		git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
+		test-tool bitmap list-commits | sort >bitmaps &&
+		comm -13 bitmaps commits >after &&
+
+		! test_cmp before after
+	)
+'
+
+test_expect_success 'hash-cache values are propagated from pack bitmaps' '
+	rm -fr repo &&
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit base &&
+		test_commit base2 &&
+		git repack -adb &&
+
+		test-tool bitmap dump-hashes >pack.raw &&
+		test_file_not_empty pack.raw &&
+		sort pack.raw >pack.hashes &&
+
+		test_commit new &&
+		git repack &&
+		git multi-pack-index write --bitmap &&
+
+		test-tool bitmap dump-hashes >midx.raw &&
+		sort midx.raw >midx.hashes &&
+
+		# ensure that every namehash in the pack bitmap can be found in
+		# the midx bitmap (i.e., that there are no oid-namehash pairs
+		# unique to the pack bitmap).
+		comm -23 pack.hashes midx.hashes >dropped.hashes &&
+		test_must_be_empty dropped.hashes
+	)
+'
+
+test_expect_success 'no .bitmap is written without any objects' '
+	rm -fr repo &&
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		empty="$(git pack-objects $objdir/pack/pack </dev/null)" &&
+		cat >packs <<-EOF &&
+		pack-$empty.idx
+		EOF
+
+		git multi-pack-index write --bitmap --stdin-packs \
+			<packs 2>err &&
+
+		grep "bitmap without any objects" err &&
+
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-$(midx_checksum $objdir).bitmap
+	)
+'
+
+test_expect_success 'graceful fallback when missing reverse index' '
+	rm -fr repo &&
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit base &&
+
+		# write a pack and MIDX bitmap containing base
+		git repack -adb &&
+		git multi-pack-index write --bitmap &&
+
+		GIT_TEST_MIDX_READ_RIDX=0 \
+			git rev-list --use-bitmap-index HEAD 2>err &&
+		! grep "ignoring extra bitmap file" err
+	)
+'
+
+test_done
diff --git a/t/t5327-multi-pack-bitmaps-rev.sh b/t/t5327-multi-pack-bitmaps-rev.sh
new file mode 100755
index 0000000000..d30ba632c8
--- /dev/null
+++ b/t/t5327-multi-pack-bitmaps-rev.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+test_description='exercise basic multi-pack bitmap functionality (.rev files)'
+
+. ./test-lib.sh
+. "${TEST_DIRECTORY}/lib-bitmap.sh"
+
+# We'll be writing our own midx and bitmaps, so avoid getting confused by the
+# automatic ones.
+GIT_TEST_MULTI_PACK_INDEX=0
+GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0
+
+# Unlike t5326, this test exercise multi-pack bitmap functionality where the
+# object order is stored in a separate .rev file.
+GIT_TEST_MIDX_WRITE_REV=1
+GIT_TEST_MIDX_READ_RIDX=0
+export GIT_TEST_MIDX_WRITE_REV
+export GIT_TEST_MIDX_READ_RIDX
+
+midx_bitmap_core rev
+midx_bitmap_partial_tests rev
+
+test_done
diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh
index 1ec9e23be7..d118181690 100755
--- a/t/t5403-post-checkout-hook.sh
+++ b/t/t5403-post-checkout-hook.sh
@@ -49,23 +49,60 @@ test_expect_success 'post-checkout receives the right args when not switching br
 	test $old = $new && test $flag = 0
 '
 
-test_expect_success 'post-checkout is triggered on rebase' '
-	test_when_finished "rm -f .git/post-checkout.args" &&
-	git checkout -b rebase-test main &&
-	rm -f .git/post-checkout.args &&
-	git rebase rebase-on-me &&
-	read old new flag <.git/post-checkout.args &&
-	test $old != $new && test $flag = 1
-'
+test_rebase () {
+	args="$*" &&
+	test_expect_success "post-checkout is triggered on rebase $args" '
+		test_when_finished "rm -f .git/post-checkout.args" &&
+		git checkout -B rebase-test main &&
+		rm -f .git/post-checkout.args &&
+		git rebase $args rebase-on-me &&
+		read old new flag <.git/post-checkout.args &&
+		test_cmp_rev main $old &&
+		test_cmp_rev rebase-on-me $new &&
+		test $flag = 1
+	'
+
+	test_expect_success "post-checkout is triggered on rebase $args with fast-forward" '
+		test_when_finished "rm -f .git/post-checkout.args" &&
+		git checkout -B ff-rebase-test rebase-on-me^ &&
+		rm -f .git/post-checkout.args &&
+		git rebase $args rebase-on-me &&
+		read old new flag <.git/post-checkout.args &&
+		test_cmp_rev rebase-on-me^ $old &&
+		test_cmp_rev rebase-on-me $new &&
+		test $flag = 1
+	'
+
+	test_expect_success "rebase $args fast-forward branch checkout runs post-checkout hook" '
+		test_when_finished "test_might_fail git rebase --abort" &&
+		test_when_finished "rm -f .git/post-checkout.args" &&
+		git update-ref refs/heads/rebase-fast-forward three &&
+		git checkout two  &&
+		rm -f .git/post-checkout.args &&
+		git rebase $args HEAD rebase-fast-forward  &&
+		read old new flag <.git/post-checkout.args &&
+		test_cmp_rev two $old &&
+		test_cmp_rev three $new &&
+		test $flag = 1
+	'
+
+	test_expect_success "rebase $args checkout does not remove untracked files" '
+		test_when_finished "test_might_fail git rebase --abort" &&
+		test_when_finished "rm -f .git/post-checkout.args" &&
+		git update-ref refs/heads/rebase-fast-forward three &&
+		git checkout two &&
+		rm -f .git/post-checkout.args &&
+		echo untracked >three.t &&
+		test_when_finished "rm three.t" &&
+		test_must_fail git rebase $args HEAD rebase-fast-forward 2>err &&
+		grep "untracked working tree files would be overwritten by checkout" err &&
+		test_path_is_missing .git/post-checkout.args
 
-test_expect_success 'post-checkout is triggered on rebase with fast-forward' '
-	test_when_finished "rm -f .git/post-checkout.args" &&
-	git checkout -b ff-rebase-test rebase-on-me^ &&
-	rm -f .git/post-checkout.args &&
-	git rebase rebase-on-me &&
-	read old new flag <.git/post-checkout.args &&
-	test $old != $new && test $flag = 1
 '
+}
+
+test_rebase --apply &&
+test_rebase --merge
 
 test_expect_success 'post-checkout hook is triggered by clone' '
 	mkdir -p templates/hooks &&
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/t5411/once-0010-report-status-v1.sh b/t/t5411/once-0010-report-status-v1.sh
index 1233a46eac..297b10925d 100644
--- a/t/t5411/once-0010-report-status-v1.sh
+++ b/t/t5411/once-0010-report-status-v1.sh
@@ -28,10 +28,10 @@ test_expect_success "proc-receive: report status v1" '
 		if test -z "$GIT_DEFAULT_HASH" || test "$GIT_DEFAULT_HASH" = "sha1"
 		then
 			printf "%s %s refs/heads/main\0report-status\n" \
-				$A $B | packetize
+				$A $B | packetize_raw
 		else
 			printf "%s %s refs/heads/main\0report-status object-format=$GIT_DEFAULT_HASH\n" \
-				$A $B | packetize
+				$A $B | packetize_raw
 		fi &&
 		printf "%s %s refs/for/main/topic1\n" \
 			$ZERO_OID $A | packetize &&
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 8a5d3492c7..ee6d2dde9f 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
@@ -927,7 +927,8 @@ test_expect_success 'fetching deepen' '
 	)
 '
 
-test_expect_success 'use ref advertisement to prune "have" lines sent' '
+test_negotiation_algorithm_default () {
+	test_when_finished rm -rf clientv0 clientv2 &&
 	rm -rf server client &&
 	git init server &&
 	test_commit -C server both_have_1 &&
@@ -946,7 +947,7 @@ test_expect_success 'use ref advertisement to prune "have" lines sent' '
 	rm -f trace &&
 	cp -r client clientv0 &&
 	GIT_TRACE_PACKET="$(pwd)/trace" git -C clientv0 \
-		fetch origin server_has both_have_2 &&
+		"$@" fetch origin server_has both_have_2 &&
 	grep "have $(git -C client rev-parse client_has)" trace &&
 	grep "have $(git -C client rev-parse both_have_2)" trace &&
 	! grep "have $(git -C client rev-parse both_have_2^)" trace &&
@@ -954,10 +955,27 @@ test_expect_success 'use ref advertisement to prune "have" lines sent' '
 	rm -f trace &&
 	cp -r client clientv2 &&
 	GIT_TRACE_PACKET="$(pwd)/trace" git -C clientv2 -c protocol.version=2 \
-		fetch origin server_has both_have_2 &&
+		"$@" fetch origin server_has both_have_2 &&
 	grep "have $(git -C client rev-parse client_has)" trace &&
 	grep "have $(git -C client rev-parse both_have_2)" trace &&
 	! grep "have $(git -C client rev-parse both_have_2^)" trace
+}
+
+test_expect_success 'use ref advertisement to prune "have" lines sent' '
+	test_negotiation_algorithm_default
+'
+
+test_expect_success 'same as last but with config overrides' '
+	test_negotiation_algorithm_default \
+		-c feature.experimental=true \
+		-c fetch.negotiationAlgorithm=consecutive
+'
+
+test_expect_success 'ensure bogus fetch.negotiationAlgorithm yields error' '
+	test_when_finished rm -rf clientv0 &&
+	cp -r client clientv0 &&
+	test_must_fail git -C clientv0 --fetch.negotiationAlgorithm=bogus \
+		       fetch origin server_has both_have_2
 '
 
 test_expect_success 'filtering by size' '
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 e83b2a6506..ef0da0a63b 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 &&
@@ -167,6 +164,17 @@ test_expect_success 'fetch --prune --tags with refspec prunes based on refspec'
 	git rev-parse sometag
 '
 
+test_expect_success REFFILES 'fetch --prune fails to delete branches' '
+	cd "$D" &&
+	git clone . prune-fail &&
+	cd prune-fail &&
+	git update-ref refs/remotes/origin/extrabranch main &&
+	: this will prevent --prune from locking packed-refs for deleting refs, but adding loose refs still succeeds  &&
+	>.git/packed-refs.new &&
+
+	test_must_fail git fetch --prune origin
+'
+
 test_expect_success 'fetch --atomic works with a single branch' '
 	test_when_finished "rm -rf \"$D\"/atomic" &&
 
@@ -550,7 +558,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
 
@@ -1214,6 +1222,19 @@ test_expect_success '--negotiation-tip understands abbreviated SHA-1' '
 	check_negotiation_tip
 '
 
+test_expect_success '--negotiation-tip rejects missing OIDs' '
+	setup_negotiation_tip server server 0 &&
+	test_must_fail git -C client fetch \
+		--negotiation-tip=alpha_1 \
+		--negotiation-tip=$(test_oid zero) \
+		origin alpha_s beta_s 2>err &&
+	cat >fatal-expect <<-EOF &&
+	fatal: the object $(test_oid zero) does not exist
+EOF
+	grep fatal: err >fatal-actual &&
+	test_cmp fatal-expect fatal-actual
+'
+
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 
diff --git a/t/t5511-refspec.sh b/t/t5511-refspec.sh
index be025b90f9..fc55681a3f 100755
--- a/t/t5511-refspec.sh
+++ b/t/t5511-refspec.sh
@@ -2,6 +2,7 @@
 
 test_description='refspec parsing'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_refspec () {
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 0916f76302..3137eb8d4d 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -201,6 +201,7 @@ test_expect_success 'push with negotiation' '
 	# Without negotiation
 	mk_empty testrepo &&
 	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
+	test_commit -C testrepo unrelated_commit &&
 	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
 	echo now pushing without negotiation &&
 	GIT_TRACE2_EVENT="$(pwd)/event" git -c protocol.version=2 push testrepo refs/heads/main:refs/remotes/origin/main &&
@@ -210,6 +211,7 @@ test_expect_success 'push with negotiation' '
 	rm event &&
 	mk_empty testrepo &&
 	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
+	test_commit -C testrepo unrelated_commit &&
 	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
 	GIT_TRACE2_EVENT="$(pwd)/event" git -c protocol.version=2 -c push.negotiate=1 push testrepo refs/heads/main:refs/remotes/origin/main &&
 	grep_wrote 2 event # 1 commit, 1 tree
@@ -219,6 +221,7 @@ test_expect_success 'push with negotiation proceeds anyway even if negotiation f
 	rm event &&
 	mk_empty testrepo &&
 	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
+	test_commit -C testrepo unrelated_commit &&
 	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
 	GIT_TEST_PROTOCOL_VERSION=0 GIT_TRACE2_EVENT="$(pwd)/event" \
 		git -c push.negotiate=1 push testrepo refs/heads/main:refs/remotes/origin/main 2>err &&
@@ -226,6 +229,18 @@ test_expect_success 'push with negotiation proceeds anyway even if negotiation f
 	test_i18ngrep "push negotiation failed" err
 '
 
+test_expect_success 'push with negotiation does not attempt to fetch submodules' '
+	mk_empty submodule_upstream &&
+	test_commit -C submodule_upstream submodule_commit &&
+	git submodule add ./submodule_upstream submodule &&
+	mk_empty testrepo &&
+	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
+	test_commit -C testrepo unrelated_commit &&
+	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
+	git -c submodule.recurse=true -c protocol.version=2 -c push.negotiate=1 push testrepo refs/heads/main:refs/remotes/origin/main 2>err &&
+	! grep "Fetching submodule" err
+'
+
 test_expect_success 'push without wildcard' '
 	mk_empty testrepo &&
 
@@ -538,6 +553,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 &&
@@ -659,10 +683,10 @@ test_expect_success 'push does not update local refs on failure' '
 
 test_expect_success 'allow deleting an invalid remote ref' '
 
-	mk_test testrepo heads/main &&
+	mk_test testrepo heads/branch &&
 	rm -f testrepo/.git/objects/??/* &&
-	git push testrepo :refs/heads/main &&
-	(cd testrepo && test_must_fail git rev-parse --verify refs/heads/main)
+	git push testrepo :refs/heads/branch &&
+	(cd testrepo && test_must_fail git rev-parse --verify refs/heads/branch)
 
 '
 
@@ -703,25 +727,26 @@ test_expect_success 'pushing valid refs triggers post-receive and post-update ho
 '
 
 test_expect_success 'deleting dangling ref triggers hooks with correct args' '
-	mk_test_with_hooks testrepo heads/main &&
+	mk_test_with_hooks testrepo heads/branch &&
+	orig=$(git -C testrepo rev-parse refs/heads/branch) &&
 	rm -f testrepo/.git/objects/??/* &&
-	git push testrepo :refs/heads/main &&
+	git push testrepo :refs/heads/branch &&
 	(
 		cd testrepo/.git &&
 		cat >pre-receive.expect <<-EOF &&
-		$ZERO_OID $ZERO_OID refs/heads/main
+		$orig $ZERO_OID refs/heads/branch
 		EOF
 
 		cat >update.expect <<-EOF &&
-		refs/heads/main $ZERO_OID $ZERO_OID
+		refs/heads/branch $orig $ZERO_OID
 		EOF
 
 		cat >post-receive.expect <<-EOF &&
-		$ZERO_OID $ZERO_OID refs/heads/main
+		$orig $ZERO_OID refs/heads/branch
 		EOF
 
 		cat >post-update.expect <<-EOF &&
-		refs/heads/main
+		refs/heads/branch
 		EOF
 
 		test_cmp pre-receive.expect pre-receive.actual &&
@@ -1312,10 +1337,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 &&
@@ -1765,7 +1787,46 @@ 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_expect_success 'refuse to push a hidden ref, and make sure do not pollute the repository' '
+	mk_empty testrepo &&
+	git -C testrepo config receive.hiderefs refs/hidden &&
+	git -C testrepo config receive.unpackLimit 1 &&
+	test_must_fail git push testrepo HEAD:refs/hidden/foo &&
+	test_dir_is_empty testrepo/.git/objects/pack
+'
+
 test_done
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index e2c0c51022..081808009b 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -136,12 +136,12 @@ test_expect_success 'the default remote . should not break explicit pull' '
 	git reset --hard HEAD^ &&
 	echo file >expect &&
 	test_cmp expect file &&
-	git pull . second &&
+	git pull --no-rebase . second &&
 	echo modified >expect &&
 	test_cmp expect file &&
 	git reflog -1 >reflog.actual &&
 	sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
-	echo "OBJID HEAD@{0}: pull . second: Fast-forward" >reflog.expected &&
+	echo "OBJID HEAD@{0}: pull --no-rebase . second: Fast-forward" >reflog.expected &&
 	test_cmp reflog.expected reflog.fuzzy
 '
 
@@ -226,7 +226,7 @@ test_expect_success 'fail if the index has unresolved entries' '
 	test_commit modified2 file &&
 	git ls-files -u >unmerged &&
 	test_must_be_empty unmerged &&
-	test_must_fail git pull . second &&
+	test_must_fail git pull --no-rebase . second &&
 	git ls-files -u >unmerged &&
 	test_file_not_empty unmerged &&
 	cp file expected &&
@@ -330,6 +330,19 @@ test_expect_success '--rebase --autostash fast forward' '
 	test_cmp_rev HEAD to-rebase-ff
 '
 
+test_expect_success '--rebase with rebase.autostash succeeds on ff' '
+	test_when_finished "rm -fr src dst actual" &&
+	git init src &&
+	test_commit -C src "initial" file "content" &&
+	git clone src dst &&
+	test_commit -C src --printf "more_content" file "more content\ncontent\n" &&
+	echo "dirty" >>dst/file &&
+	test_config -C dst rebase.autostash true &&
+	git -C dst pull --rebase >actual 2>&1 &&
+	grep -q "Fast-forward" actual &&
+	grep -q "Applied autostash." actual
+'
+
 test_expect_success '--rebase with conflicts shows advice' '
 	test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
 	git checkout -b seq &&
@@ -409,37 +422,37 @@ test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
 
 test_expect_success 'pull succeeds with dirty working directory and merge.autostash set' '
 	test_config merge.autostash true &&
-	test_pull_autostash 2
+	test_pull_autostash 2 --no-rebase
 '
 
 test_expect_success 'pull --autostash & merge.autostash=true' '
 	test_config merge.autostash true &&
-	test_pull_autostash 2 --autostash
+	test_pull_autostash 2 --autostash --no-rebase
 '
 
 test_expect_success 'pull --autostash & merge.autostash=false' '
 	test_config merge.autostash false &&
-	test_pull_autostash 2 --autostash
+	test_pull_autostash 2 --autostash --no-rebase
 '
 
 test_expect_success 'pull --autostash & merge.autostash unset' '
 	test_unconfig merge.autostash &&
-	test_pull_autostash 2 --autostash
+	test_pull_autostash 2 --autostash --no-rebase
 '
 
 test_expect_success 'pull --no-autostash & merge.autostash=true' '
 	test_config merge.autostash true &&
-	test_pull_autostash_fail --no-autostash
+	test_pull_autostash_fail --no-autostash --no-rebase
 '
 
 test_expect_success 'pull --no-autostash & merge.autostash=false' '
 	test_config merge.autostash false &&
-	test_pull_autostash_fail --no-autostash
+	test_pull_autostash_fail --no-autostash --no-rebase
 '
 
 test_expect_success 'pull --no-autostash & merge.autostash unset' '
 	test_unconfig merge.autostash &&
-	test_pull_autostash_fail --no-autostash
+	test_pull_autostash_fail --no-autostash --no-rebase
 '
 
 test_expect_success 'pull.rebase' '
@@ -546,15 +559,6 @@ test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '
 	test_cmp expect actual
 '
 
-test_expect_success REBASE_P \
-	'pull.rebase=preserve rebases and merges keep-merge' '
-	git reset --hard before-preserve-rebase &&
-	test_config pull.rebase preserve &&
-	git pull . copy &&
-	test_cmp_rev HEAD^^ copy &&
-	test_cmp_rev HEAD^2 keep-merge
-'
-
 test_expect_success 'pull.rebase=interactive' '
 	write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
 	echo I was here >fake.out &&
@@ -598,7 +602,7 @@ test_expect_success '--rebase=false create a new merge commit' '
 
 test_expect_success '--rebase=true rebases and flattens keep-merge' '
 	git reset --hard before-preserve-rebase &&
-	test_config pull.rebase preserve &&
+	test_config pull.rebase merges &&
 	git pull --rebase=true . copy &&
 	test_cmp_rev HEAD^^ copy &&
 	echo file3 >expect &&
@@ -606,23 +610,14 @@ test_expect_success '--rebase=true rebases and flattens keep-merge' '
 	test_cmp expect actual
 '
 
-test_expect_success REBASE_P \
-	'--rebase=preserve rebases and merges keep-merge' '
-	git reset --hard before-preserve-rebase &&
-	test_config pull.rebase true &&
-	git pull --rebase=preserve . copy &&
-	test_cmp_rev HEAD^^ copy &&
-	test_cmp_rev HEAD^2 keep-merge
-'
-
 test_expect_success '--rebase=invalid fails' '
 	git reset --hard before-preserve-rebase &&
 	test_must_fail git pull --rebase=invalid . copy
 '
 
-test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '
+test_expect_success '--rebase overrides pull.rebase=merges and flattens keep-merge' '
 	git reset --hard before-preserve-rebase &&
-	test_config pull.rebase preserve &&
+	test_config pull.rebase merges &&
 	git pull --rebase . copy &&
 	test_cmp_rev HEAD^^ copy &&
 	echo file3 >expect &&
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index 63a688bdbf..66cfcb09c5 100755
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -113,7 +113,7 @@ test_expect_success 'git pull --force' '
 	git pull two &&
 	test_commit A &&
 	git branch -f origin &&
-	git pull --all --force
+	git pull --no-rebase --all --force
 	)
 '
 
@@ -179,7 +179,7 @@ test_expect_success 'git pull --allow-unrelated-histories' '
 	(
 		cd dst &&
 		test_must_fail git pull ../src side &&
-		git pull --allow-unrelated-histories ../src side
+		git pull --no-rebase --allow-unrelated-histories ../src side
 	)
 '
 
@@ -228,4 +228,28 @@ test_expect_success 'git pull --no-signoff flag cancels --signoff flag' '
 	test_must_be_empty actual
 '
 
+test_expect_success 'git pull --no-verify flag passed to merge' '
+	test_when_finished "rm -fr src dst actual" &&
+	git init src &&
+	test_commit -C src one &&
+	git clone src dst &&
+	write_script dst/.git/hooks/commit-msg <<-\EOF &&
+	false
+	EOF
+	test_commit -C src two &&
+	git -C dst pull --no-ff --no-verify
+'
+
+test_expect_success 'git pull --no-verify --verify passed to merge' '
+	test_when_finished "rm -fr src dst actual" &&
+	git init src &&
+	test_commit -C src one &&
+	git clone src dst &&
+	write_script dst/.git/hooks/commit-msg <<-\EOF &&
+	false
+	EOF
+	test_commit -C src two &&
+	test_must_fail git -C dst pull --no-ff --no-verify --verify
+'
+
 test_done
diff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh
index c278adaa5a..b2be3605f5 100755
--- a/t/t5524-pull-msg.sh
+++ b/t/t5524-pull-msg.sh
@@ -28,7 +28,7 @@ test_expect_success setup '
 test_expect_success pull '
 (
 	cd cloned &&
-	git pull --log &&
+	git pull --no-rebase --log &&
 	git log -2 &&
 	git cat-file commit HEAD >result &&
 	grep Dollar result
@@ -41,7 +41,7 @@ test_expect_success '--log=1 limits shortlog length' '
 	git reset --hard HEAD^ &&
 	test "$(cat afile)" = original &&
 	test "$(cat bfile)" = added &&
-	git pull --log=1 &&
+	git pull --no-rebase --log=1 &&
 	git log -3 &&
 	git cat-file commit HEAD >result &&
 	grep Dollar result &&
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index ed11569d8d..840c89cc8b 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -3,8 +3,8 @@
 
 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
 
 . ./test-lib.sh
 
diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh
index d573ca496a..3f58b515ce 100755
--- a/t/t5531-deep-submodule-push.sh
+++ b/t/t5531-deep-submodule-push.sh
@@ -5,6 +5,9 @@ test_description='test push with submodules'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
index bba768f5de..24d374adba 100755
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@ -137,6 +137,53 @@ test_expect_success GPG 'signed push sends push certificate' '
 	test_cmp expect dst/push-cert-status
 '
 
+test_expect_success GPGSSH 'ssh signed push sends push certificate' '
+	prepare_dst &&
+	mkdir -p dst/.git/hooks &&
+	git -C dst config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git -C dst config receive.certnonceseed sekrit &&
+	write_script dst/.git/hooks/post-receive <<-\EOF &&
+	# discard the update list
+	cat >/dev/null
+	# record the push certificate
+	if test -n "${GIT_PUSH_CERT-}"
+	then
+		git cat-file blob $GIT_PUSH_CERT >../push-cert
+	fi &&
+
+	cat >../push-cert-status <<E_O_F
+	SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
+	KEY=${GIT_PUSH_CERT_KEY-nokey}
+	STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
+	NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
+	NONCE=${GIT_PUSH_CERT_NONCE-nononce}
+	E_O_F
+
+	EOF
+
+	test_config gpg.format ssh &&
+	test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+	FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2;}") &&
+	git push --signed dst noop ff +noff &&
+
+	(
+		cat <<-\EOF &&
+		SIGNER=principal with number 1
+		KEY=FINGERPRINT
+		STATUS=G
+		NONCE_STATUS=OK
+		EOF
+		sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
+	) | sed -e "s|FINGERPRINT|$FINGERPRINT|" >expect &&
+
+	noop=$(git rev-parse noop) &&
+	ff=$(git rev-parse ff) &&
+	noff=$(git rev-parse noff) &&
+	grep "$noop $ff refs/heads/ff" dst/push-cert &&
+	grep "$noop $noff refs/heads/noff" dst/push-cert &&
+	test_cmp expect dst/push-cert-status
+'
+
 test_expect_success GPG 'inconsistent push options in signed push not allowed' '
 	# First, invoke receive-pack with dummy input to obtain its preamble.
 	prepare_dst &&
@@ -276,6 +323,60 @@ test_expect_success GPGSM 'fail without key and heed user.signingkey x509' '
 	test_cmp expect dst/push-cert-status
 '
 
+test_expect_success GPGSSH 'fail without key and heed user.signingkey ssh' '
+	test_config gpg.format ssh &&
+	prepare_dst &&
+	mkdir -p dst/.git/hooks &&
+	git -C dst config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git -C dst config receive.certnonceseed sekrit &&
+	write_script dst/.git/hooks/post-receive <<-\EOF &&
+	# discard the update list
+	cat >/dev/null
+	# record the push certificate
+	if test -n "${GIT_PUSH_CERT-}"
+	then
+		git cat-file blob $GIT_PUSH_CERT >../push-cert
+	fi &&
+
+	cat >../push-cert-status <<E_O_F
+	SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
+	KEY=${GIT_PUSH_CERT_KEY-nokey}
+	STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
+	NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
+	NONCE=${GIT_PUSH_CERT_NONCE-nononce}
+	E_O_F
+
+	EOF
+
+	test_config user.email hasnokey@nowhere.com &&
+	test_config gpg.format ssh &&
+	test_config user.signingkey "" &&
+	(
+		sane_unset GIT_COMMITTER_EMAIL &&
+		test_must_fail git push --signed dst noop ff +noff
+	) &&
+	test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+	FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2;}") &&
+	git push --signed dst noop ff +noff &&
+
+	(
+		cat <<-\EOF &&
+		SIGNER=principal with number 1
+		KEY=FINGERPRINT
+		STATUS=G
+		NONCE_STATUS=OK
+		EOF
+		sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
+	) | sed -e "s|FINGERPRINT|$FINGERPRINT|" >expect &&
+
+	noop=$(git rev-parse noop) &&
+	ff=$(git rev-parse ff) &&
+	noff=$(git rev-parse noff) &&
+	grep "$noop $ff refs/heads/ff" dst/push-cert &&
+	grep "$noop $noff refs/heads/noff" dst/push-cert &&
+	test_cmp expect dst/push-cert-status
+'
+
 test_expect_success GPG 'failed atomic push does not execute GPG' '
 	prepare_dst &&
 	git -C dst config receive.certnonceseed sekrit &&
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/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index c024fa2818..8ca50f8b18 100755
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -509,4 +509,20 @@ test_expect_success 'colorize errors/hints' '
 	test_i18ngrep ! "^hint: " decoded
 '
 
+test_expect_success 'report error server does not provide ref status' '
+	git init "$HTTPD_DOCUMENT_ROOT_PATH/no_report" &&
+	git -C "$HTTPD_DOCUMENT_ROOT_PATH/no_report" config http.receivepack true &&
+	test_must_fail git push --porcelain \
+		$HTTPD_URL_USER_PASS/smart/no_report \
+		HEAD:refs/tags/will-fail >actual &&
+	test_must_fail git -C "$HTTPD_DOCUMENT_ROOT_PATH/no_report" \
+		rev-parse --verify refs/tags/will-fail &&
+	cat >expect <<-EOF &&
+	To $HTTPD_URL/smart/no_report
+	!	HEAD:refs/tags/will-fail	[remote failure] (remote failed to report status)
+	Done
+	EOF
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh
index 58c7add7ee..214228349a 100755
--- a/t/t5545-push-options.sh
+++ b/t/t5545-push-options.sh
@@ -5,6 +5,9 @@ test_description='pushing to a repository using push options'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
 . ./test-lib.sh
 
 mk_repo_pair () {
diff --git a/t/t5549-fetch-push-http.sh b/t/t5549-fetch-push-http.sh
new file mode 100755
index 0000000000..2cdebcb735
--- /dev/null
+++ b/t/t5549-fetch-push-http.sh
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+test_description='fetch/push functionality using the HTTP protocol'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-httpd.sh
+start_httpd
+
+SERVER="$HTTPD_DOCUMENT_ROOT_PATH/server"
+URI="$HTTPD_URL/smart/server"
+
+grep_wrote () {
+	object_count=$1
+	file_name=$2
+	grep 'write_pack_file/wrote.*"value":"'$1'"' $2
+}
+
+setup_client_and_server () {
+	git init client &&
+	test_when_finished 'rm -rf client' &&
+	test_commit -C client first_commit &&
+	test_commit -C client second_commit &&
+
+	git init "$SERVER" &&
+	test_when_finished 'rm -rf "$SERVER"' &&
+	test_config -C "$SERVER" http.receivepack true &&
+	test_commit -C "$SERVER" unrelated_commit &&
+	git -C client push "$URI" first_commit:refs/remotes/origin/first_commit &&
+	git -C "$SERVER" config receive.hideRefs refs/remotes/origin/first_commit
+}
+
+test_expect_success 'push without negotiation (for comparing object counts with the next test)' '
+	setup_client_and_server &&
+
+	GIT_TRACE2_EVENT="$(pwd)/event" git -C client -c protocol.version=2 \
+		push "$URI" refs/heads/main:refs/remotes/origin/main &&
+	test_when_finished "rm -f event" &&
+	grep_wrote 6 event # 2 commits, 2 trees, 2 blobs
+'
+
+test_expect_success 'push with negotiation' '
+	setup_client_and_server &&
+
+	GIT_TRACE2_EVENT="$(pwd)/event" git -C client -c protocol.version=2 -c push.negotiate=1 \
+		push "$URI" refs/heads/main:refs/remotes/origin/main &&
+	test_when_finished "rm -f event" &&
+	grep_wrote 3 event # 1 commit, 1 tree, 1 blob
+'
+
+test_expect_success 'push with negotiation proceeds anyway even if negotiation fails' '
+	setup_client_and_server &&
+
+	# Use protocol v0 to make negotiation fail (because protocol v0 does
+	# not support the "wait-for-done" capability, which is required for
+	# push negotiation)
+	GIT_TEST_PROTOCOL_VERSION=0 GIT_TRACE2_EVENT="$(pwd)/event" git -C client -c push.negotiate=1 \
+		push "$URI" refs/heads/main:refs/remotes/origin/main 2>err &&
+	test_when_finished "rm -f event" &&
+	grep_wrote 6 event && # 2 commits, 2 trees, 2 blobs
+
+	cat >warning-expect <<-EOF &&
+	warning: --negotiate-only requires protocol v2
+	warning: push negotiation failed; proceeding anyway with push
+EOF
+	grep warning: err >warning-actual &&
+	test_cmp warning-expect warning-actual
+'
+
+test_done
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/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index 4f87d90c5b..f92c79c132 100755
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -196,8 +196,8 @@ test_expect_success 'GIT_TRACE_CURL redacts auth details' '
 
 	# Ensure that there is no "Basic" followed by a base64 string, but that
 	# the auth details are redacted
-	! grep "Authorization: Basic [0-9a-zA-Z+/]" trace &&
-	grep "Authorization: Basic <redacted>" trace
+	! grep -i "Authorization: Basic [0-9a-zA-Z+/]" trace &&
+	grep -i "Authorization: Basic <redacted>" trace
 '
 
 test_expect_success 'GIT_CURL_VERBOSE redacts auth details' '
@@ -208,8 +208,8 @@ test_expect_success 'GIT_CURL_VERBOSE redacts auth details' '
 
 	# Ensure that there is no "Basic" followed by a base64 string, but that
 	# the auth details are redacted
-	! grep "Authorization: Basic [0-9a-zA-Z+/]" trace &&
-	grep "Authorization: Basic <redacted>" trace
+	! grep -i "Authorization: Basic [0-9a-zA-Z+/]" trace &&
+	grep -i "Authorization: Basic <redacted>" trace
 '
 
 test_expect_success 'GIT_TRACE_CURL does not redact auth details if GIT_TRACE_REDACT=0' '
@@ -219,7 +219,7 @@ test_expect_success 'GIT_TRACE_CURL does not redact auth details if GIT_TRACE_RE
 		git clone --bare "$HTTPD_URL/auth/smart/repo.git" redact-auth &&
 	expect_askpass both user@host &&
 
-	grep "Authorization: Basic [0-9a-zA-Z+/]" trace
+	grep -i "Authorization: Basic [0-9a-zA-Z+/]" trace
 '
 
 test_expect_success 'disable dumb http on server' '
@@ -474,10 +474,10 @@ test_expect_success 'cookies are redacted by default' '
 	GIT_TRACE_CURL=true \
 		git -c "http.cookieFile=$(pwd)/cookies" clone \
 		$HTTPD_URL/smart/repo.git clone 2>err &&
-	grep "Cookie:.*Foo=<redacted>" err &&
-	grep "Cookie:.*Bar=<redacted>" err &&
-	! grep "Cookie:.*Foo=1" err &&
-	! grep "Cookie:.*Bar=2" err
+	grep -i "Cookie:.*Foo=<redacted>" err &&
+	grep -i "Cookie:.*Bar=<redacted>" err &&
+	! grep -i "Cookie:.*Foo=1" err &&
+	! grep -i "Cookie:.*Bar=2" err
 '
 
 test_expect_success 'empty values of cookies are also redacted' '
@@ -486,7 +486,7 @@ test_expect_success 'empty values of cookies are also redacted' '
 	GIT_TRACE_CURL=true \
 		git -c "http.cookieFile=$(pwd)/cookies" clone \
 		$HTTPD_URL/smart/repo.git clone 2>err &&
-	grep "Cookie:.*Foo=<redacted>" err
+	grep -i "Cookie:.*Foo=<redacted>" err
 '
 
 test_expect_success 'GIT_TRACE_REDACT=0 disables cookie redaction' '
@@ -496,8 +496,8 @@ test_expect_success 'GIT_TRACE_REDACT=0 disables cookie redaction' '
 	GIT_TRACE_REDACT=0 GIT_TRACE_CURL=true \
 		git -c "http.cookieFile=$(pwd)/cookies" clone \
 		$HTTPD_URL/smart/repo.git clone 2>err &&
-	grep "Cookie:.*Foo=1" err &&
-	grep "Cookie:.*Bar=2" err
+	grep -i "Cookie:.*Foo=1" err &&
+	grep -i "Cookie:.*Bar=2" err
 '
 
 test_expect_success 'GIT_TRACE_CURL_NO_DATA prevents data from being traced' '
@@ -558,4 +558,13 @@ test_expect_success 'http auth forgets bogus credentials' '
 	expect_askpass both user@host
 '
 
+test_expect_success 'client falls back from v2 to v0 to match server' '
+	GIT_TRACE_PACKET=$PWD/trace \
+	GIT_TEST_PROTOCOL_VERSION=2 \
+	git clone $HTTPD_URL/smart_v0/repo.git repo-v0 &&
+	# check for v0; there the HEAD symref is communicated in the capability
+	# line; v2 uses a different syntax on each ref advertisement line
+	grep symref=HEAD:refs/heads/ trace
+'
+
 test_done
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 b1d614ce18..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' '
@@ -108,27 +119,27 @@ test_expect_success 'setup commit on main and other pull' '
 
 test_expect_success 'pull --set-upstream upstream main sets branch main but not other' '
 	clear_config main other &&
-	git pull --set-upstream upstream main &&
+	git pull --no-rebase --set-upstream upstream main &&
 	check_config main upstream refs/heads/main &&
 	check_config_missing other
 '
 
 test_expect_success 'pull --set-upstream main:other2 does not set the branch other2' '
 	clear_config other2 &&
-	git pull --set-upstream upstream main:other2 &&
+	git pull --no-rebase --set-upstream upstream main:other2 &&
 	check_config_missing other2
 '
 
 test_expect_success 'pull --set-upstream upstream other sets branch main' '
 	clear_config main other &&
-	git pull --set-upstream upstream other &&
+	git pull --no-rebase --set-upstream upstream other &&
 	check_config main upstream refs/heads/other &&
 	check_config_missing other
 '
 
 test_expect_success 'pull --set-upstream upstream tag does not set the tag' '
 	clear_config three &&
-	git pull --tags --set-upstream upstream three &&
+	git pull --no-rebase --tags --set-upstream upstream three &&
 	check_config_missing three
 '
 
@@ -144,16 +155,16 @@ test_expect_success 'pull --set-upstream http://nosuchdomain.example.com fails w
 
 test_expect_success 'pull --set-upstream upstream HEAD sets branch HEAD' '
 	clear_config main other &&
-	git pull --set-upstream upstream HEAD &&
+	git pull --no-rebase --set-upstream upstream HEAD &&
 	check_config main upstream HEAD &&
 	git checkout other &&
-	git pull --set-upstream upstream HEAD &&
+	git pull --no-rebase --set-upstream upstream HEAD &&
 	check_config other upstream HEAD
 '
 
 test_expect_success 'pull --set-upstream upstream with more than one branch does nothing' '
 	clear_config main three &&
-	git pull --set-upstream upstream main three &&
+	git pull --no-rebase --set-upstream upstream main three &&
 	check_config_missing main &&
 	check_config_missing three
 '
@@ -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
new file mode 100755
index 0000000000..b1cfe8b7db
--- /dev/null
+++ b/t/t5555-http-smart-common.sh
@@ -0,0 +1,162 @@
+#!/bin/sh
+
+test_description='test functionality common to smart fetch & push'
+
+TEST_PASSES_SANITIZE_LEAK=true
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	test_commit --no-tag initial
+'
+
+test_expect_success 'git upload-pack --http-backend-info-refs and --advertise-refs are aliased' '
+	git upload-pack --http-backend-info-refs . >expected 2>err.expected &&
+	git upload-pack --advertise-refs . >actual 2>err.actual &&
+	test_cmp err.expected err.actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'git receive-pack --http-backend-info-refs and --advertise-refs are aliased' '
+	git receive-pack --http-backend-info-refs . >expected 2>err.expected &&
+	git receive-pack --advertise-refs . >actual 2>err.actual &&
+	test_cmp err.expected err.actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'git upload-pack --advertise-refs' '
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD) HEAD
+	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
+	0000
+	EOF
+
+	# We only care about GIT_PROTOCOL, not GIT_TEST_PROTOCOL_VERSION
+	sane_unset GIT_PROTOCOL &&
+	GIT_TEST_PROTOCOL_VERSION=2 \
+	git upload-pack --advertise-refs . >out 2>err &&
+
+	test-tool pkt-line unpack <out >actual &&
+	test_must_be_empty err &&
+	test_cmp actual expect &&
+
+	# The --advertise-refs alias works
+	git upload-pack --advertise-refs . >out 2>err &&
+
+	test-tool pkt-line unpack <out >actual &&
+	test_must_be_empty err &&
+	test_cmp actual expect
+'
+
+test_expect_success 'git upload-pack --advertise-refs: v0' '
+	# With no specified protocol
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD) HEAD
+	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
+	0000
+	EOF
+
+	git upload-pack --advertise-refs . >out 2>err &&
+	test-tool pkt-line unpack <out >actual &&
+	test_must_be_empty err &&
+	test_cmp actual expect &&
+
+	# With explicit v0
+	GIT_PROTOCOL=version=0 \
+	git upload-pack --advertise-refs . >out 2>err &&
+	test-tool pkt-line unpack <out >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp actual expect
+
+'
+
+test_expect_success 'git receive-pack --advertise-refs: v0' '
+	# With no specified protocol
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
+	0000
+	EOF
+
+	git receive-pack --advertise-refs . >out 2>err &&
+	test-tool pkt-line unpack <out >actual &&
+	test_must_be_empty err &&
+	test_cmp actual expect &&
+
+	# With explicit v0
+	GIT_PROTOCOL=version=0 \
+	git receive-pack --advertise-refs . >out 2>err &&
+	test-tool pkt-line unpack <out >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp actual expect
+
+'
+
+test_expect_success 'git upload-pack --advertise-refs: v1' '
+	# With no specified protocol
+	cat >expect <<-EOF &&
+	version 1
+	$(git rev-parse HEAD) HEAD
+	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
+	0000
+	EOF
+
+	GIT_PROTOCOL=version=1 \
+	git upload-pack --advertise-refs . >out &&
+
+	test-tool pkt-line unpack <out >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp actual expect
+'
+
+test_expect_success 'git receive-pack --advertise-refs: v1' '
+	# With no specified protocol
+	cat >expect <<-EOF &&
+	version 1
+	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
+	0000
+	EOF
+
+	GIT_PROTOCOL=version=1 \
+	git receive-pack --advertise-refs . >out &&
+
+	test-tool pkt-line unpack <out >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp actual expect
+'
+
+test_expect_success 'git upload-pack --advertise-refs: v2' '
+	cat >expect <<-EOF &&
+	version 2
+	agent=FAKE
+	ls-refs=unborn
+	fetch=shallow wait-for-done
+	server-option
+	object-format=$(test_oid algo)
+	object-info
+	0000
+	EOF
+
+	GIT_PROTOCOL=version=2 \
+	GIT_USER_AGENT=FAKE \
+	git upload-pack --advertise-refs . >out 2>err &&
+
+	test-tool pkt-line unpack <out >actual &&
+	test_must_be_empty err &&
+	test_cmp actual expect
+'
+
+test_expect_success 'git receive-pack --advertise-refs: v2' '
+	# There is no v2 yet for receive-pack, implicit v0
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD) $(git symbolic-ref HEAD)
+	0000
+	EOF
+
+	GIT_PROTOCOL=version=2 \
+	git receive-pack --advertise-refs . >out 2>err &&
+
+	test-tool pkt-line unpack <out >actual &&
+	test_must_be_empty err &&
+	test_cmp actual expect
+'
+
+test_done
diff --git a/t/t5562-http-backend-content-length.sh b/t/t5562-http-backend-content-length.sh
index e5d3d15ba8..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 &&
+			"$ZERO_OID" "$hash_next" "$(test_oid algo)" | packetize_raw &&
 		printf 0000 &&
 		echo "$hash_next" | git pack-objects --stdout
 	} >push_body &&
diff --git a/t/t5562/invoke-with-content-length.pl b/t/t5562/invoke-with-content-length.pl
index 0943474af2..718dd9b49d 100644
--- a/t/t5562/invoke-with-content-length.pl
+++ b/t/t5562/invoke-with-content-length.pl
@@ -13,11 +13,6 @@ my $body_data;
 defined read($body_fh, $body_data, $body_size) or die "Cannot read $body_filename: $!";
 close($body_fh);
 
-my $exited = 0;
-$SIG{"CHLD"} = sub {
-        $exited = 1;
-};
-
 # write data
 my $pid = open(my $out, "|-", @command);
 {
@@ -29,8 +24,13 @@ my $pid = open(my $out, "|-", @command);
 }
 print $out $body_data or die "Cannot write data: $!";
 
-sleep 60; # is interrupted by SIGCHLD
-if (!$exited) {
-        close($out);
+$SIG{ALRM} = sub {
+        kill 'KILL', $pid;
         die "Command did not exit after reading whole body";
+};
+alarm 60;
+
+my $ret = waitpid($pid, 0);
+if ($ret != $pid) {
+        die "confusing return from waitpid: $ret";
 }
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index 82c31ab6cd..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
+		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/t5572-pull-submodule.sh b/t/t5572-pull-submodule.sh
index 4f92a116e1..fa6b4cca65 100755
--- a/t/t5572-pull-submodule.sh
+++ b/t/t5572-pull-submodule.sh
@@ -2,6 +2,9 @@
 
 test_description='pull can handle submodules'
 
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-submodule-update.sh
 
diff --git a/t/t5580-unc-paths.sh b/t/t5580-unc-paths.sh
index cd803ae8bf..cd7604fff9 100755
--- a/t/t5580-unc-paths.sh
+++ b/t/t5580-unc-paths.sh
@@ -4,6 +4,7 @@ test_description='various Windows-only path tests'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 if test_have_prereq CYGWIN
diff --git a/t/t5582-fetch-negative-refspec.sh b/t/t5582-fetch-negative-refspec.sh
index e5d2e79ad3..7a80e47c2b 100755
--- a/t/t5582-fetch-negative-refspec.sh
+++ b/t/t5582-fetch-negative-refspec.sh
@@ -105,7 +105,6 @@ test_expect_success "fetch with negative pattern refspec does not expand prefix"
 '
 
 test_expect_success "fetch with negative refspec avoids duplicate conflict" '
-	cd "$D" &&
 	(
 		cd one &&
 		git branch dups/a &&
diff --git a/t/t5600-clone-fail-cleanup.sh b/t/t5600-clone-fail-cleanup.sh
index 5bf10261d3..34b3df4027 100755
--- a/t/t5600-clone-fail-cleanup.sh
+++ b/t/t5600-clone-fail-cleanup.sh
@@ -35,7 +35,9 @@ test_expect_success 'create a repo to clone' '
 '
 
 test_expect_success 'create objects in repo for later corruption' '
-	test_commit -C foo file
+	test_commit -C foo file &&
+	git -C foo checkout --detach &&
+	test_commit -C foo detached
 '
 
 # source repository given to git clone should be relative to the
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/t5604-clone-reference.sh b/t/t5604-clone-reference.sh
index e845d621f6..24340e6d56 100755
--- a/t/t5604-clone-reference.sh
+++ b/t/t5604-clone-reference.sh
@@ -87,7 +87,7 @@ test_expect_success 'updating origin' '
 '
 
 test_expect_success 'pulling changes from origin' '
-	git -C C pull origin
+	git -C C pull --no-rebase origin
 '
 
 # the 2 local objects are commit and tree from the merge
@@ -96,7 +96,7 @@ test_expect_success 'that alternate to origin gets used' '
 '
 
 test_expect_success 'pulling changes from origin' '
-	git -C D pull origin
+	git -C D pull --no-rebase origin
 '
 
 # the 5 local objects are expected; file3 blob, commit in A to add it
diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh
index 3a595c0f82..8f676d6b0c 100755
--- a/t/t5606-clone-options.sh
+++ b/t/t5606-clone-options.sh
@@ -16,6 +16,18 @@ test_expect_success 'setup' '
 
 '
 
+test_expect_success 'submodule.stickyRecursiveClone flag manipulates submodule.recurse value' '
+
+	test_config_global submodule.stickyRecursiveClone true &&
+	git clone --recurse-submodules parent clone_recurse_true &&
+	test_cmp_config -C clone_recurse_true true submodule.recurse &&
+
+	test_config_global submodule.stickyRecursiveClone false &&
+	git clone --recurse-submodules parent clone_recurse_false &&
+	test_expect_code 1 git -C clone_recurse_false config --get submodule.recurse
+
+'
+
 test_expect_success 'clone -o' '
 
 	git clone -o foo parent clone-o &&
@@ -34,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
 
 '
 
@@ -42,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/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh
index f4c383cd5c..51705aa86a 100755
--- a/t/t5607-clone-bundle.sh
+++ b/t/t5607-clone-bundle.sh
@@ -29,11 +29,21 @@ test_expect_success '"verify" needs a worktree' '
 
 test_expect_success 'annotated tags can be excluded by rev-list options' '
 	git bundle create bundle --all --since=7.Apr.2005.15:14:00.-0700 &&
-	git ls-remote bundle > output &&
-	grep tag output &&
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD)	HEAD
+	$(git rev-parse tag)	refs/tags/tag
+	$(git rev-parse main)	refs/heads/main
+	EOF
+	git ls-remote bundle >actual &&
+	test_cmp expect actual &&
+
 	git bundle create bundle --all --since=7.Apr.2005.15:16:00.-0700 &&
-	git ls-remote bundle > output &&
-	! grep tag output
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD)	HEAD
+	$(git rev-parse main)	refs/heads/main
+	EOF
+	git ls-remote bundle >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'die if bundle file cannot be created' '
@@ -43,39 +53,66 @@ test_expect_success 'die if bundle file cannot be created' '
 
 test_expect_success 'bundle --stdin' '
 	echo main | git bundle create stdin-bundle.bdl --stdin &&
-	git ls-remote stdin-bundle.bdl >output &&
-	grep main output
+	cat >expect <<-EOF &&
+	$(git rev-parse main)	refs/heads/main
+	EOF
+	git ls-remote stdin-bundle.bdl >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'bundle --stdin <rev-list options>' '
 	echo main | git bundle create hybrid-bundle.bdl --stdin tag &&
-	git ls-remote hybrid-bundle.bdl >output &&
-	grep main output
+	cat >expect <<-EOF &&
+	$(git rev-parse main)	refs/heads/main
+	EOF
+	git ls-remote stdin-bundle.bdl >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'empty bundle file is rejected' '
-	: >empty-bundle &&
+	>empty-bundle &&
 	test_must_fail git fetch empty-bundle
 '
 
 # This triggers a bug in older versions where the resulting line (with
 # --pretty=oneline) was longer than a 1024-char buffer.
 test_expect_success 'ridiculously long subject in boundary' '
-	: >file4 &&
+	>file4 &&
 	test_tick &&
 	git add file4 &&
 	printf "%01200d\n" 0 | git commit -F - &&
 	test_commit fifth &&
 	git bundle create long-subject-bundle.bdl HEAD^..HEAD &&
-	git bundle list-heads long-subject-bundle.bdl >heads &&
-	test -s heads &&
+	cat >expect <<-EOF &&
+	$(git rev-parse main) HEAD
+	EOF
+	git bundle list-heads long-subject-bundle.bdl >actual &&
+	test_cmp expect actual &&
+
 	git fetch long-subject-bundle.bdl &&
-	sed -n "/^-/{p;q;}" long-subject-bundle.bdl >boundary &&
-	grep "^-$OID_REGEX " boundary
+
+	algo=$(test_oid algo) &&
+	if test "$algo" != sha1
+	then
+		echo "@object-format=sha256"
+	fi >expect &&
+	cat >>expect <<-EOF &&
+	-$(git log --pretty=format:"%H %s" -1 HEAD^)
+	$(git rev-parse HEAD) HEAD
+	EOF
+
+	if test "$algo" = sha1
+	then
+		head -n 3 long-subject-bundle.bdl
+	else
+		head -n 4 long-subject-bundle.bdl
+	fi | grep -v "^#" >actual &&
+
+	test_cmp expect actual
 '
 
 test_expect_success 'prerequisites with an empty commit message' '
-	: >file1 &&
+	>file1 &&
 	git add file1 &&
 	test_tick &&
 	git commit --allow-empty-message -m "" &&
@@ -103,7 +140,11 @@ test_expect_success 'fetch SHA-1 from bundle' '
 
 test_expect_success 'git bundle uses expected default format' '
 	git bundle create bundle HEAD^.. &&
-	head -n1 bundle | grep "^# v$(test_oid version) git bundle$"
+	cat >expect <<-EOF &&
+	# v$(test_oid version) git bundle
+	EOF
+	head -n1 bundle >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'git bundle v3 has expected contents' '
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/t5615-alternate-env.sh b/t/t5615-alternate-env.sh
index b4905b822c..83513e46a3 100755
--- a/t/t5615-alternate-env.sh
+++ b/t/t5615-alternate-env.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='handling of alternates in environment variables'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 check_obj () {
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/t5700-protocol-v1.sh b/t/t5700-protocol-v1.sh
index 468bd3e13e..6c8d4c6cf1 100755
--- a/t/t5700-protocol-v1.sh
+++ b/t/t5700-protocol-v1.sh
@@ -149,6 +149,21 @@ test_expect_success 'push with file:// using protocol v1' '
 	grep "push< version 1" log
 '
 
+test_expect_success 'cloning branchless tagless but not refless remote' '
+	rm -rf server client &&
+
+	git -c init.defaultbranch=main init server &&
+	echo foo >server/foo.txt &&
+	git -C server add foo.txt &&
+	git -C server commit -m "message" &&
+	git -C server update-ref refs/notbranch/alsonottag HEAD &&
+	git -C server checkout --detach &&
+	git -C server branch -D main &&
+	git -C server symbolic-ref HEAD refs/heads/nonexistentbranch &&
+
+	git -c protocol.version=1 clone "file://$(pwd)/server" client
+'
+
 # Test protocol v1 with 'ssh://' transport
 #
 test_expect_success 'setup ssh wrapper' '
diff --git a/t/t5701-git-serve.sh b/t/t5701-git-serve.sh
index 930721f053..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' '
@@ -72,6 +73,37 @@ test_expect_success 'request invalid command' '
 	test_i18ngrep "invalid command" err
 '
 
+test_expect_success 'request capability as command' '
+	test-tool pkt-line pack >in <<-EOF &&
+	command=agent
+	object-format=$(test_oid algo)
+	0000
+	EOF
+	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+	grep invalid.command.*agent err
+'
+
+test_expect_success 'request command as capability' '
+	test-tool pkt-line pack >in <<-EOF &&
+	command=ls-refs
+	object-format=$(test_oid algo)
+	fetch
+	0000
+	EOF
+	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+	grep unknown.capability err
+'
+
+test_expect_success 'requested command is command=value' '
+	test-tool pkt-line pack >in <<-EOF &&
+	command=ls-refs=whatever
+	object-format=$(test_oid algo)
+	0000
+	EOF
+	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+	grep invalid.command.*ls-refs=whatever err
+'
+
 test_expect_success 'wrong object-format' '
 	test-tool pkt-line pack >in <<-EOF &&
 	command=fetch
@@ -116,6 +148,19 @@ test_expect_success 'basics of ls-refs' '
 	test_cmp expect actual
 '
 
+test_expect_success 'ls-refs complains about unknown options' '
+	test-tool pkt-line pack >in <<-EOF &&
+	command=ls-refs
+	object-format=$(test_oid algo)
+	0001
+	no-such-arg
+	0000
+	EOF
+
+	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+	grep unexpected.line.*no-such-arg err
+'
+
 test_expect_success 'basic ref-prefixes' '
 	test-tool pkt-line pack >in <<-EOF &&
 	command=ls-refs
@@ -158,6 +203,37 @@ test_expect_success 'refs/heads prefix' '
 	test_cmp expect actual
 '
 
+test_expect_success 'ignore very large set of prefixes' '
+	# generate a large number of ref-prefixes that we expect
+	# to match nothing; the value here exceeds TOO_MANY_PREFIXES
+	# from ls-refs.c.
+	{
+		echo command=ls-refs &&
+		echo object-format=$(test_oid algo) &&
+		echo 0001 &&
+		perl -le "print \"ref-prefix refs/heads/\$_\" for (1..65536)" &&
+		echo 0000
+	} |
+	test-tool pkt-line pack >in &&
+
+	# and then confirm that we see unmatched prefixes anyway (i.e.,
+	# that the prefix was not applied).
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD) HEAD
+	$(git rev-parse refs/heads/dev) refs/heads/dev
+	$(git rev-parse refs/heads/main) refs/heads/main
+	$(git rev-parse refs/heads/release) refs/heads/release
+	$(git rev-parse refs/tags/annotated-tag) refs/tags/annotated-tag
+	$(git rev-parse refs/tags/one) refs/tags/one
+	$(git rev-parse refs/tags/two) refs/tags/two
+	0000
+	EOF
+
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'peel parameter' '
 	test-tool pkt-line pack >in <<-EOF &&
 	command=ls-refs
diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index 78de1ff2ad..00ce9aec23 100755
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -27,9 +27,9 @@ test_expect_success 'list refs with git:// using protocol v2' '
 		ls-remote --symref "$GIT_DAEMON_URL/parent" >actual &&
 
 	# Client requested to use protocol v2
-	grep "git> .*\\\0\\\0version=2\\\0$" log &&
+	grep "ls-remote> .*\\\0\\\0version=2\\\0$" log &&
 	# Server responded using protocol v2
-	grep "git< version 2" log &&
+	grep "ls-remote< version 2" log &&
 
 	git ls-remote --symref "$GIT_DAEMON_URL/parent" >expect &&
 	test_cmp expect actual
@@ -151,7 +151,7 @@ test_expect_success 'list refs with file:// using protocol v2' '
 		ls-remote --symref "file://$(pwd)/file_parent" >actual &&
 
 	# Server responded using protocol v2
-	grep "git< version 2" log &&
+	grep "ls-remote< version 2" log &&
 
 	git ls-remote --symref "file://$(pwd)/file_parent" >expect &&
 	test_cmp expect actual
@@ -237,6 +237,19 @@ test_expect_success '...but not if explicitly forbidden by config' '
 	! grep "refs/heads/mydefaultbranch" file_empty_child/.git/HEAD
 '
 
+test_expect_success 'bare clone propagates empty default branch' '
+	test_when_finished "rm -rf file_empty_parent file_empty_child.git" &&
+
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=mydefaultbranch init file_empty_parent &&
+
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=main -c protocol.version=2 \
+		clone --bare \
+		"file://$(pwd)/file_empty_parent" file_empty_child.git &&
+	grep "refs/heads/mydefaultbranch" file_empty_child.git/HEAD
+'
+
 test_expect_success 'fetch with file:// using protocol v2' '
 	test_when_finished "rm -f log" &&
 
@@ -606,7 +619,7 @@ test_expect_success 'usage: --negotiate-only without --negotiation-tip' '
 	setup_negotiate_only "$SERVER" "$URI" &&
 
 	cat >err.expect <<-\EOF &&
-	fatal: --negotiate-only needs one or more --negotiate-tip=*
+	fatal: --negotiate-only needs one or more --negotiation-tip=*
 	EOF
 
 	test_must_fail git -c protocol.version=2 -C client fetch \
@@ -615,6 +628,18 @@ test_expect_success 'usage: --negotiate-only without --negotiation-tip' '
 	test_cmp err.expect err.actual
 '
 
+test_expect_success 'usage: --negotiate-only with --recurse-submodules' '
+	cat >err.expect <<-\EOF &&
+	fatal: options '\''--negotiate-only'\'' and '\''--recurse-submodules'\'' cannot be used together
+	EOF
+
+	test_must_fail git -c protocol.version=2 -C client fetch \
+		--negotiate-only \
+		--recurse-submodules \
+		origin 2>err.actual &&
+	test_cmp err.expect err.actual
+'
+
 test_expect_success 'file:// --negotiate-only' '
 	SERVER="server" &&
 	URI="file://$(pwd)/server" &&
@@ -734,7 +759,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 \
@@ -929,7 +954,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 &&
@@ -1094,6 +1119,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 e9e471621d..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 () {
@@ -40,6 +37,30 @@ write_command () {
 	fi
 }
 
+# Write a complete fetch command to stdout, suitable for use with `test-tool
+# pkt-line`. "want-ref", "want", and "have" lines are read from stdin.
+#
+# Examples:
+#
+# write_fetch_command <<-EOF
+# want-ref refs/heads/main
+# have $(git rev-parse a)
+# EOF
+#
+# write_fetch_command <<-EOF
+# want $(git rev-parse b)
+# have $(git rev-parse a)
+# EOF
+#
+write_fetch_command () {
+	write_command fetch &&
+	echo "0001" &&
+	echo "no-progress" &&
+	cat &&
+	echo "done" &&
+	echo "0000"
+}
+
 # c(o/foo) d(o/bar)
 #        \ /
 #         b   e(baz)  f(main)
@@ -77,15 +98,11 @@ test_expect_success 'config controls ref-in-want advertisement' '
 '
 
 test_expect_success 'invalid want-ref line' '
-	test-tool pkt-line pack >in <<-EOF &&
-	$(write_command fetch)
-	0001
-	no-progress
+	write_fetch_command >pkt <<-EOF &&
 	want-ref refs/heads/non-existent
-	done
-	0000
 	EOF
 
+	test-tool pkt-line pack <pkt >in &&
 	test_must_fail test-tool serve-v2 --stateless-rpc 2>out <in &&
 	grep "unknown ref" out
 '
@@ -97,16 +114,11 @@ test_expect_success 'basic want-ref' '
 	EOF
 	git rev-parse f >expected_commits &&
 
-	oid=$(git rev-parse a) &&
-	test-tool pkt-line pack >in <<-EOF &&
-	$(write_command fetch)
-	0001
-	no-progress
+	write_fetch_command >pkt <<-EOF &&
 	want-ref refs/heads/main
-	have $oid
-	done
-	0000
+	have $(git rev-parse a)
 	EOF
+	test-tool pkt-line pack <pkt >in &&
 
 	test-tool serve-v2 --stateless-rpc >out <in &&
 	check_output
@@ -121,17 +133,12 @@ test_expect_success 'multiple want-ref lines' '
 	EOF
 	git rev-parse c d >expected_commits &&
 
-	oid=$(git rev-parse b) &&
-	test-tool pkt-line pack >in <<-EOF &&
-	$(write_command fetch)
-	0001
-	no-progress
+	write_fetch_command >pkt <<-EOF &&
 	want-ref refs/heads/o/foo
 	want-ref refs/heads/o/bar
-	have $oid
-	done
-	0000
+	have $(git rev-parse b)
 	EOF
+	test-tool pkt-line pack <pkt >in &&
 
 	test-tool serve-v2 --stateless-rpc >out <in &&
 	check_output
@@ -144,16 +151,12 @@ test_expect_success 'mix want and want-ref' '
 	EOF
 	git rev-parse e f >expected_commits &&
 
-	test-tool pkt-line pack >in <<-EOF &&
-	$(write_command fetch)
-	0001
-	no-progress
+	write_fetch_command >pkt <<-EOF &&
 	want-ref refs/heads/main
 	want $(git rev-parse e)
 	have $(git rev-parse a)
-	done
-	0000
 	EOF
+	test-tool pkt-line pack <pkt >in &&
 
 	test-tool serve-v2 --stateless-rpc >out <in &&
 	check_output
@@ -166,16 +169,11 @@ test_expect_success 'want-ref with ref we already have commit for' '
 	EOF
 	>expected_commits &&
 
-	oid=$(git rev-parse c) &&
-	test-tool pkt-line pack >in <<-EOF &&
-	$(write_command fetch)
-	0001
-	no-progress
+	write_fetch_command >pkt <<-EOF &&
 	want-ref refs/heads/o/foo
-	have $oid
-	done
-	0000
+	have $(git rev-parse c)
 	EOF
+	test-tool pkt-line pack <pkt >in &&
 
 	test-tool serve-v2 --stateless-rpc >out <in &&
 	check_output
@@ -298,6 +296,141 @@ test_expect_success 'fetching with wildcard that matches multiple refs' '
 	grep "want-ref refs/heads/o/bar" log
 '
 
+REPO="$(pwd)/repo-ns"
+
+test_expect_success 'setup namespaced repo' '
+	(
+		git init -b main "$REPO" &&
+		cd "$REPO" &&
+		test_commit a &&
+		test_commit b &&
+		git checkout a &&
+		test_commit c &&
+		git checkout a &&
+		test_commit d &&
+		git update-ref refs/heads/ns-no b &&
+		git update-ref refs/namespaces/ns/refs/heads/ns-yes c &&
+		git update-ref refs/namespaces/ns/refs/heads/hidden d
+	) &&
+	git -C "$REPO" config uploadpack.allowRefInWant true
+'
+
+test_expect_success 'with namespace: want-ref is considered relative to namespace' '
+	wanted_ref=refs/heads/ns-yes &&
+
+	oid=$(git -C "$REPO" rev-parse "refs/namespaces/ns/$wanted_ref") &&
+	cat >expected_refs <<-EOF &&
+	$oid $wanted_ref
+	EOF
+	cat >expected_commits <<-EOF &&
+	$oid
+	$(git -C "$REPO" rev-parse a)
+	EOF
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref $wanted_ref
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	GIT_NAMESPACE=ns test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
+	check_output
+'
+
+test_expect_success 'with namespace: want-ref outside namespace is unknown' '
+	wanted_ref=refs/heads/ns-no &&
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref $wanted_ref
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	test_must_fail env GIT_NAMESPACE=ns \
+		test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
+	grep "unknown ref" out
+'
+
+# Cross-check refs/heads/ns-no indeed exists
+test_expect_success 'without namespace: want-ref outside namespace succeeds' '
+	wanted_ref=refs/heads/ns-no &&
+
+	oid=$(git -C "$REPO" rev-parse $wanted_ref) &&
+	cat >expected_refs <<-EOF &&
+	$oid $wanted_ref
+	EOF
+	cat >expected_commits <<-EOF &&
+	$oid
+	$(git -C "$REPO" rev-parse a)
+	EOF
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref $wanted_ref
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
+	check_output
+'
+
+test_expect_success 'with namespace: hideRefs is matched, relative to namespace' '
+	wanted_ref=refs/heads/hidden &&
+	git -C "$REPO" config transfer.hideRefs $wanted_ref &&
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref $wanted_ref
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	test_must_fail env GIT_NAMESPACE=ns \
+		test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
+	grep "unknown ref" out
+'
+
+# Cross-check refs/heads/hidden indeed exists
+test_expect_success 'with namespace: want-ref succeeds if hideRefs is removed' '
+	wanted_ref=refs/heads/hidden &&
+	git -C "$REPO" config --unset transfer.hideRefs $wanted_ref &&
+
+	oid=$(git -C "$REPO" rev-parse "refs/namespaces/ns/$wanted_ref") &&
+	cat >expected_refs <<-EOF &&
+	$oid $wanted_ref
+	EOF
+	cat >expected_commits <<-EOF &&
+	$oid
+	$(git -C "$REPO" rev-parse a)
+	EOF
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref $wanted_ref
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	GIT_NAMESPACE=ns test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
+	check_output
+'
+
+test_expect_success 'without namespace: relative hideRefs does not match' '
+	wanted_ref=refs/namespaces/ns/refs/heads/hidden &&
+	git -C "$REPO" config transfer.hideRefs refs/heads/hidden &&
+
+	oid=$(git -C "$REPO" rev-parse $wanted_ref) &&
+	cat >expected_refs <<-EOF &&
+	$oid $wanted_ref
+	EOF
+	cat >expected_commits <<-EOF &&
+	$oid
+	$(git -C "$REPO" rev-parse a)
+	EOF
+
+	write_fetch_command >pkt <<-EOF &&
+	want-ref $wanted_ref
+	EOF
+	test-tool pkt-line pack <pkt >in &&
+
+	test-tool -C "$REPO" serve-v2 --stateless-rpc >out <in &&
+	check_output
+'
+
+
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 
diff --git a/t/t5704-protocol-violations.sh b/t/t5704-protocol-violations.sh
index 5c941949b9..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' '
@@ -32,4 +34,19 @@ test_expect_success 'extra delim packet in v2 fetch args' '
 	test_i18ngrep "expected flush after fetch arguments" err
 '
 
+test_expect_success 'bogus symref in v0 capabilities' '
+	test_commit foo &&
+	oid=$(git rev-parse HEAD) &&
+	dst=refs/heads/foo &&
+	{
+		printf "%s HEAD\0symref object-format=%s symref=HEAD:%s\n" \
+			"$oid" "$GIT_DEFAULT_HASH" "$dst" |
+			test-tool pkt-line pack-raw-stdin &&
+		printf "0000"
+	} >input &&
+	git ls-remote --symref --upload-pack="cat input; read junk;:" . >actual &&
+	printf "ref: %s\tHEAD\n%s\tHEAD\n" "$dst" "$oid" >expect &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t5705-session-id-in-capabilities.sh b/t/t5705-session-id-in-capabilities.sh
index f1d189d5bc..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" \
@@ -73,6 +71,17 @@ do
 		grep \"key\":\"server-sid\" tr2-client-events &&
 		grep \"key\":\"client-sid\" tr2-server-events
 	'
+
+	test_expect_success "client & server log negotiated version (v${PROTO})" '
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		cp -r "$LOCAL_PRISTINE" local &&
+		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+		git -c protocol.version=$PROTO -C local fetch \
+			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
+			origin &&
+		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-client-events &&
+		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-server-events
+	'
 done
 
 test_done
diff --git a/t/t6001-rev-list-graft.sh b/t/t6001-rev-list-graft.sh
index 90d93f77fa..7294147334 100755
--- a/t/t6001-rev-list-graft.sh
+++ b/t/t6001-rev-list-graft.sh
@@ -23,7 +23,8 @@ test_expect_success setup '
 	git commit -a -m "Third in one history." &&
 	A2=$(git rev-parse --verify HEAD) &&
 
-	rm -f .git/refs/heads/main .git/index &&
+	git update-ref -d refs/heads/main &&
+	rm -f .git/index &&
 
 	echo >fileA fileA again &&
 	echo >subdir/fileB fileB again &&
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/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh
index aebe4b69e1..6f3e543977 100755
--- a/t/t6007-rev-list-cherry-pick-file.sh
+++ b/t/t6007-rev-list-cherry-pick-file.sh
@@ -58,7 +58,7 @@ EOF
 
 test_expect_success '--left-right' '
 	git rev-list --left-right B...C > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
 	test_cmp expect actual.named
 '
@@ -78,14 +78,14 @@ EOF
 
 test_expect_success '--cherry-pick bar does not come up empty' '
 	git rev-list --left-right --cherry-pick B...C -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
 	test_cmp expect actual.named
 '
 
 test_expect_success 'bar does not come up empty' '
 	git rev-list --left-right B...C -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
 	test_cmp expect actual.named
 '
@@ -97,14 +97,14 @@ EOF
 
 test_expect_success '--cherry-pick bar does not come up empty (II)' '
 	git rev-list --left-right --cherry-pick F...E -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
 	test_cmp expect actual.named
 '
 
 test_expect_success 'name-rev multiple --refs combine inclusive' '
 	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
-	git name-rev --stdin --name-only --refs="*tags/F" --refs="*tags/E" \
+	git name-rev --annotate-stdin --name-only --refs="*tags/F" --refs="*tags/E" \
 		<actual >actual.named &&
 	test_cmp expect actual.named
 '
@@ -116,7 +116,7 @@ EOF
 test_expect_success 'name-rev --refs excludes non-matched patterns' '
 	git rev-list --left-right --right-only --cherry-pick F...E -- bar >>expect &&
 	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
-	git name-rev --stdin --name-only --refs="*tags/F" \
+	git name-rev --annotate-stdin --name-only --refs="*tags/F" \
 		<actual >actual.named &&
 	test_cmp expect actual.named
 '
@@ -128,14 +128,14 @@ EOF
 test_expect_success 'name-rev --exclude excludes matched patterns' '
 	git rev-list --left-right --right-only --cherry-pick F...E -- bar >>expect &&
 	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" --exclude="*E" \
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" --exclude="*E" \
 		<actual >actual.named &&
 	test_cmp expect actual.named
 '
 
 test_expect_success 'name-rev --no-refs clears the refs list' '
 	git rev-list --left-right --cherry-pick F...E -- bar >expect &&
-	git name-rev --stdin --name-only --refs="*tags/F" --refs="*tags/E" --no-refs --refs="*tags/G" \
+	git name-rev --annotate-stdin --name-only --refs="*tags/F" --refs="*tags/E" --no-refs --refs="*tags/G" \
 		<expect >actual &&
 	test_cmp expect actual
 '
@@ -149,7 +149,7 @@ EOF
 
 test_expect_success '--cherry-mark' '
 	git rev-list --cherry-mark F...E -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
 	test_cmp expect actual.named
 '
@@ -163,7 +163,7 @@ EOF
 
 test_expect_success '--cherry-mark --left-right' '
 	git rev-list --cherry-mark --left-right F...E -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
 	test_cmp expect actual.named
 '
@@ -174,14 +174,14 @@ EOF
 
 test_expect_success '--cherry-pick --right-only' '
 	git rev-list --cherry-pick --right-only F...E -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
 	test_cmp expect actual.named
 '
 
 test_expect_success '--cherry-pick --left-only' '
 	git rev-list --cherry-pick --left-only E...F -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
 	test_cmp expect actual.named
 '
@@ -193,7 +193,7 @@ EOF
 
 test_expect_success '--cherry' '
 	git rev-list --cherry F...E -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
 		< actual > actual.named &&
 	test_cmp expect actual.named
 '
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/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh
index 4f7fa8b6c0..63fcccec32 100755
--- a/t/t6012-rev-list-simplify.sh
+++ b/t/t6012-rev-list-simplify.sh
@@ -12,17 +12,16 @@ note () {
 }
 
 unnote () {
-	git name-rev --tags --stdin | sed -e "s|$OID_REGEX (tags/\([^)]*\)) |\1 |g"
+	git name-rev --tags --annotate-stdin | sed -e "s|$OID_REGEX (tags/\([^)]*\)) |\1 |g"
 }
 
 #
-# Create a test repo with interesting commit graph:
+# Create a test repo with an interesting commit graph:
 #
-# A--B----------G--H--I--K--L
-#  \  \           /     /
-#   \  \         /     /
-#    C------E---F     J
-#        \_/
+# A-----B-----G--H--I--K--L
+#  \     \      /     /
+#   \     \    /     /
+#    C--D--E--F     J
 #
 # The commits are laid out from left-to-right starting with
 # the root commit A and terminating at the tip commit L.
@@ -142,6 +141,13 @@ check_result 'I B A' --author-date-order -- file
 check_result 'H' --first-parent -- another-file
 check_result 'H' --first-parent --topo-order -- another-file
 
+check_result 'L K I H G B A' --first-parent L
+check_result 'F E D C' --exclude-first-parent-only F ^L
+check_result '' F ^L
+check_result 'L K I H G J' L ^F
+check_result 'L K I H G B J' --exclude-first-parent-only L ^F
+check_result 'L K I H G B' --exclude-first-parent-only --first-parent L ^F
+
 check_result 'E C B A' --full-history E -- lost
 test_expect_success 'full history simplification without parent' '
 	printf "%s\n" E C B A >expect &&
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/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index a1baf4e451..1be85d064e 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -962,4 +962,22 @@ test_expect_success 'bisect handles annotated tags' '
 	grep "$bad is the first bad commit" output
 '
 
+test_expect_success 'bisect run fails with exit code equals or greater than 128' '
+	write_script test_script.sh <<-\EOF &&
+	exit 128
+	EOF
+	test_must_fail git bisect run ./test_script.sh &&
+	write_script test_script.sh <<-\EOF &&
+	exit 255
+	EOF
+	test_must_fail git bisect run ./test_script.sh
+'
+
+test_expect_success 'bisect visualize with a filename with dash and space' '
+	echo "My test line" >>"./-hello 2" &&
+	git add -- "./-hello 2" &&
+	git commit --quiet -m "Add test line" -- "./-hello 2" &&
+	git bisect visualize -p -- "-hello 2"
+'
+
 test_done
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index e33d512ec1..2500acc2ef 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -132,7 +132,7 @@ tagger T A Gger <> 0 +0000
 EOF
 
 test_expect_success 'tag replaced commit' '
-     git mktag <tag.sig >.git/refs/tags/mytag
+     git update-ref refs/tags/mytag $(git mktag <tag.sig)
 '
 
 test_expect_success '"git fsck" works' '
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/t6111-rev-list-treesame.sh b/t/t6111-rev-list-treesame.sh
index e07b6070e0..90ff141640 100755
--- a/t/t6111-rev-list-treesame.sh
+++ b/t/t6111-rev-list-treesame.sh
@@ -23,7 +23,8 @@ note () {
 }
 
 unnote () {
-	git name-rev --tags --stdin | sed -e "s|$OID_REGEX (tags/\([^)]*\))\([ 	]\)|\1\2|g"
+	git name-rev --tags --annotate-stdin | \
+	sed -e "s|$OID_REGEX (tags/\([^)]*\))\([ 	]\)|\1\2|g"
 }
 
 test_expect_success setup '
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 1a501ee09e..9781b92aed 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -107,7 +107,8 @@ test_expect_success 'describe --contains defaults to HEAD without commit-ish' '
 check_describe tags/A --all A^0
 
 test_expect_success 'renaming tag A to Q locally produces a warning' "
-	mv .git/refs/tags/A .git/refs/tags/Q &&
+	git update-ref refs/tags/Q $(git rev-parse refs/tags/A) &&
+	git update-ref -d refs/tags/A &&
 	git describe HEAD 2>err >out &&
 	cat >expected <<-\EOF &&
 	warning: tag 'Q' is externally known as 'A'
@@ -135,7 +136,8 @@ test_expect_success 'abbrev=0 will not break misplaced tag (2)' '
 '
 
 test_expect_success 'rename tag Q back to A' '
-	mv .git/refs/tags/Q .git/refs/tags/A
+	git update-ref refs/tags/A $(git rev-parse refs/tags/Q) &&
+	git update-ref -d refs/tags/Q
 '
 
 test_expect_success 'pack tag refs' 'git pack-refs'
@@ -260,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 &&
@@ -268,19 +270,24 @@ test_expect_success 'name-rev --all' '
 	test_cmp expect actual
 '
 
-test_expect_success 'name-rev --stdin' '
+test_expect_success 'name-rev --annotate-stdin' '
 	>expect.unsorted &&
 	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 &&
+	git rev-list --all | git name-rev --annotate-stdin >actual.unsorted &&
 	sort <actual.unsorted >actual &&
 	test_cmp expect actual
 '
 
+test_expect_success 'name-rev --stdin deprecated' "
+	git rev-list --all | git name-rev --stdin 2>actual &&
+	grep -E 'warning: --stdin is deprecated' actual
+"
+
 test_expect_success 'describe --contains with the exact tags' '
 	echo "A^0" >expect &&
 	tag_object=$(git rev-parse refs/tags/A) &&
@@ -388,9 +395,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 44f55d93fe..5a221f8ef1 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -81,6 +81,36 @@ test_expect_success GPG 'set up a signed tag' '
 	git tag -s -m signed-tag-msg signed-good-tag left
 '
 
+test_expect_success GPGSSH 'created ssh signed commit and tag' '
+	test_config gpg.format ssh &&
+	git checkout -b signed-ssh &&
+	touch file &&
+	git add file &&
+	git commit -m "ssh signed" -S"${GPGSSH_KEY_PRIMARY}" &&
+	git tag -s -u"${GPGSSH_KEY_PRIMARY}" -m signed-ssh-tag-msg signed-good-ssh-tag left &&
+	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 &&
 
@@ -94,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
 '
@@ -103,12 +134,77 @@ 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
 '
 
+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 &&
+	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
+'
+
+test_expect_success GPGSSH 'message for merging local tag signed by unknown ssh key' '
+	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 &&
+	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 &&
 
@@ -491,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 &&
@@ -545,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 &&
@@ -562,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 9e0214076b..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
@@ -59,18 +56,25 @@ test_atom() {
 	# Automatically test "contents:size" atom after testing "contents"
 	if test "$2" = "contents"
 	then
-		case $(git cat-file -t "$ref") in
-		tag)
-			# We cannot use $3 as it expects sanitize_pgp to run
-			expect=$(git cat-file tag $ref | tail -n +6 | wc -c) ;;
-		tree | blob)
-			expect='' ;;
-		commit)
-			expect=$(printf '%s' "$3" | wc -c) ;;
-		esac
-		# Leave $expect unquoted to lose possible leading whitespaces
-		echo $expect >expected
+		# for commit leg, $3 is changed there
+		expect=$(printf '%s' "$3" | wc -c)
 		test_expect_${4:-success} $PREREQ "basic atom: $1 contents:size" '
+			type=$(git cat-file -t "$ref") &&
+			case $type in
+			tag)
+				# We cannot use $3 as it expects sanitize_pgp to run
+				git cat-file tag $ref >out &&
+				expect=$(tail -n +6 out | wc -c) &&
+				rm -f out ;;
+			tree | blob)
+				expect="" ;;
+			commit)
+				: "use the calculated expect" ;;
+			*)
+				BUG "unknown object type" ;;
+			esac &&
+			# Leave $expect unquoted to lose possible leading whitespaces
+			echo $expect >expected &&
 			git for-each-ref --format="%(contents:size)" "$ref" >actual &&
 			test_cmp expected actual
 		'
@@ -130,6 +134,8 @@ test_atom head parent:short=10 ''
 test_atom head numparent 0
 test_atom head object ''
 test_atom head type ''
+test_atom head raw "$(git cat-file commit refs/heads/main)
+"
 test_atom head '*objectname' ''
 test_atom head '*objecttype' ''
 test_atom head author 'A U Thor <author@example.com> 1151968724 +0200'
@@ -221,6 +227,15 @@ test_atom tag contents 'Tagging at 1151968727
 '
 test_atom tag HEAD ' '
 
+test_expect_success 'basic atom: refs/tags/testtag *raw' '
+	git cat-file commit refs/tags/testtag^{} >expected &&
+	git for-each-ref --format="%(*raw)" refs/tags/testtag >actual &&
+	sanitize_pgp <expected >expected.clean &&
+	echo >>expected.clean &&
+	sanitize_pgp <actual >actual.clean &&
+	test_cmp expected.clean actual.clean
+'
+
 test_expect_success 'Check invalid atoms names are errors' '
 	test_must_fail git for-each-ref --format="%(INVALID)" refs/heads
 '
@@ -401,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
@@ -686,6 +706,15 @@ test_atom refs/tags/signed-empty contents:body ''
 test_atom refs/tags/signed-empty contents:signature "$sig"
 test_atom refs/tags/signed-empty contents "$sig"
 
+test_expect_success GPG 'basic atom: refs/tags/signed-empty raw' '
+	git cat-file tag refs/tags/signed-empty >expected &&
+	git for-each-ref --format="%(raw)" refs/tags/signed-empty >actual &&
+	sanitize_pgp <expected >expected.clean &&
+	echo >>expected.clean &&
+	sanitize_pgp <actual >actual.clean &&
+	test_cmp expected.clean actual.clean
+'
+
 test_atom refs/tags/signed-short subject 'subject line'
 test_atom refs/tags/signed-short subject:sanitize 'subject-line'
 test_atom refs/tags/signed-short contents:subject 'subject line'
@@ -695,6 +724,15 @@ test_atom refs/tags/signed-short contents:signature "$sig"
 test_atom refs/tags/signed-short contents "subject line
 $sig"
 
+test_expect_success GPG 'basic atom: refs/tags/signed-short raw' '
+	git cat-file tag refs/tags/signed-short >expected &&
+	git for-each-ref --format="%(raw)" refs/tags/signed-short >actual &&
+	sanitize_pgp <expected >expected.clean &&
+	echo >>expected.clean &&
+	sanitize_pgp <actual >actual.clean &&
+	test_cmp expected.clean actual.clean
+'
+
 test_atom refs/tags/signed-long subject 'subject line'
 test_atom refs/tags/signed-long subject:sanitize 'subject-line'
 test_atom refs/tags/signed-long contents:subject 'subject line'
@@ -708,6 +746,15 @@ test_atom refs/tags/signed-long contents "subject line
 body contents
 $sig"
 
+test_expect_success GPG 'basic atom: refs/tags/signed-long raw' '
+	git cat-file tag refs/tags/signed-long >expected &&
+	git for-each-ref --format="%(raw)" refs/tags/signed-long >actual &&
+	sanitize_pgp <expected >expected.clean &&
+	echo >>expected.clean &&
+	sanitize_pgp <actual >actual.clean &&
+	test_cmp expected.clean actual.clean
+'
+
 test_expect_success 'set up refs pointing to tree and blob' '
 	git update-ref refs/mytrees/first refs/heads/main^{tree} &&
 	git update-ref refs/myblobs/first refs/heads/main:one
@@ -720,6 +767,16 @@ test_atom refs/mytrees/first contents:body ""
 test_atom refs/mytrees/first contents:signature ""
 test_atom refs/mytrees/first contents ""
 
+test_expect_success 'basic atom: refs/mytrees/first raw' '
+	git cat-file tree refs/mytrees/first >expected &&
+	echo >>expected &&
+	git for-each-ref --format="%(raw)" refs/mytrees/first >actual &&
+	test_cmp expected actual &&
+	git cat-file -s refs/mytrees/first >expected &&
+	git for-each-ref --format="%(raw:size)" refs/mytrees/first >actual &&
+	test_cmp expected actual
+'
+
 test_atom refs/myblobs/first subject ""
 test_atom refs/myblobs/first contents:subject ""
 test_atom refs/myblobs/first body ""
@@ -727,6 +784,186 @@ test_atom refs/myblobs/first contents:body ""
 test_atom refs/myblobs/first contents:signature ""
 test_atom refs/myblobs/first contents ""
 
+test_expect_success 'basic atom: refs/myblobs/first raw' '
+	git cat-file blob refs/myblobs/first >expected &&
+	echo >>expected &&
+	git for-each-ref --format="%(raw)" refs/myblobs/first >actual &&
+	test_cmp expected actual &&
+	git cat-file -s refs/myblobs/first >expected &&
+	git for-each-ref --format="%(raw:size)" refs/myblobs/first >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'set up refs pointing to binary blob' '
+	printf "a\0b\0c" >blob1 &&
+	printf "a\0c\0b" >blob2 &&
+	printf "\0a\0b\0c" >blob3 &&
+	printf "abc" >blob4 &&
+	printf "\0 \0 \0 " >blob5 &&
+	printf "\0 \0a\0 " >blob6 &&
+	printf "  " >blob7 &&
+	>blob8 &&
+	obj=$(git hash-object -w blob1) &&
+	git update-ref refs/myblobs/blob1 "$obj" &&
+	obj=$(git hash-object -w blob2) &&
+	git update-ref refs/myblobs/blob2 "$obj" &&
+	obj=$(git hash-object -w blob3) &&
+	git update-ref refs/myblobs/blob3 "$obj" &&
+	obj=$(git hash-object -w blob4) &&
+	git update-ref refs/myblobs/blob4 "$obj" &&
+	obj=$(git hash-object -w blob5) &&
+	git update-ref refs/myblobs/blob5 "$obj" &&
+	obj=$(git hash-object -w blob6) &&
+	git update-ref refs/myblobs/blob6 "$obj" &&
+	obj=$(git hash-object -w blob7) &&
+	git update-ref refs/myblobs/blob7 "$obj" &&
+	obj=$(git hash-object -w blob8) &&
+	git update-ref refs/myblobs/blob8 "$obj"
+'
+
+test_expect_success 'Verify sorts with raw' '
+	cat >expected <<-EOF &&
+	refs/myblobs/blob8
+	refs/myblobs/blob5
+	refs/myblobs/blob6
+	refs/myblobs/blob3
+	refs/myblobs/blob7
+	refs/mytrees/first
+	refs/myblobs/first
+	refs/myblobs/blob1
+	refs/myblobs/blob2
+	refs/myblobs/blob4
+	refs/heads/main
+	EOF
+	git for-each-ref --format="%(refname)" --sort=raw \
+		refs/heads/main refs/myblobs/ refs/mytrees/first >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'Verify sorts with raw:size' '
+	cat >expected <<-EOF &&
+	refs/myblobs/blob8
+	refs/myblobs/first
+	refs/myblobs/blob7
+	refs/heads/main
+	refs/myblobs/blob4
+	refs/myblobs/blob1
+	refs/myblobs/blob2
+	refs/myblobs/blob3
+	refs/myblobs/blob5
+	refs/myblobs/blob6
+	refs/mytrees/first
+	EOF
+	git for-each-ref --format="%(refname)" --sort=raw:size \
+		refs/heads/main refs/myblobs/ refs/mytrees/first >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'validate raw atom with %(if:equals)' '
+	cat >expected <<-EOF &&
+	not equals
+	not equals
+	not equals
+	not equals
+	not equals
+	not equals
+	refs/myblobs/blob4
+	not equals
+	not equals
+	not equals
+	not equals
+	not equals
+	EOF
+	git for-each-ref --format="%(if:equals=abc)%(raw)%(then)%(refname)%(else)not equals%(end)" \
+		refs/myblobs/ refs/heads/ >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'validate raw atom with %(if:notequals)' '
+	cat >expected <<-EOF &&
+	refs/heads/ambiguous
+	refs/heads/main
+	refs/heads/newtag
+	refs/myblobs/blob1
+	refs/myblobs/blob2
+	refs/myblobs/blob3
+	equals
+	refs/myblobs/blob5
+	refs/myblobs/blob6
+	refs/myblobs/blob7
+	refs/myblobs/blob8
+	refs/myblobs/first
+	EOF
+	git for-each-ref --format="%(if:notequals=abc)%(raw)%(then)%(refname)%(else)equals%(end)" \
+		refs/myblobs/ refs/heads/ >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'empty raw refs with %(if)' '
+	cat >expected <<-EOF &&
+	refs/myblobs/blob1 not empty
+	refs/myblobs/blob2 not empty
+	refs/myblobs/blob3 not empty
+	refs/myblobs/blob4 not empty
+	refs/myblobs/blob5 not empty
+	refs/myblobs/blob6 not empty
+	refs/myblobs/blob7 empty
+	refs/myblobs/blob8 empty
+	refs/myblobs/first not empty
+	EOF
+	git for-each-ref --format="%(refname) %(if)%(raw)%(then)not empty%(else)empty%(end)" \
+		refs/myblobs/ >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success '%(raw) with --python must fail' '
+	test_must_fail git for-each-ref --format="%(raw)" --python
+'
+
+test_expect_success '%(raw) with --tcl must fail' '
+	test_must_fail git for-each-ref --format="%(raw)" --tcl
+'
+
+test_expect_success '%(raw) with --perl' '
+	git for-each-ref --format="\$name= %(raw);
+print \"\$name\"" refs/myblobs/blob1 --perl | perl >actual &&
+	cmp blob1 actual &&
+	git for-each-ref --format="\$name= %(raw);
+print \"\$name\"" refs/myblobs/blob3 --perl | perl >actual &&
+	cmp blob3 actual &&
+	git for-each-ref --format="\$name= %(raw);
+print \"\$name\"" refs/myblobs/blob8 --perl | perl >actual &&
+	cmp blob8 actual &&
+	git for-each-ref --format="\$name= %(raw);
+print \"\$name\"" refs/myblobs/first --perl | perl >actual &&
+	cmp one actual &&
+	git cat-file tree refs/mytrees/first > expected &&
+	git for-each-ref --format="\$name= %(raw);
+print \"\$name\"" refs/mytrees/first --perl | perl >actual &&
+	cmp expected actual
+'
+
+test_expect_success '%(raw) with --shell must fail' '
+	test_must_fail git for-each-ref --format="%(raw)" --shell
+'
+
+test_expect_success '%(raw) with --shell and --sort=raw must fail' '
+	test_must_fail git for-each-ref --format="%(raw)" --sort=raw --shell
+'
+
+test_expect_success '%(raw:size) with --shell' '
+	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
+'
+
+test_expect_success 'for-each-ref --format compare with cat-file --batch' '
+	git rev-parse refs/mytrees/first | git cat-file --batch >expected &&
+	git for-each-ref --format="%(objectname) %(objecttype) %(objectsize)
+%(raw)" refs/mytrees/first >actual &&
+	test_cmp expected actual
+'
+
 test_expect_success 'set up multiple-sort tags' '
 	for when in 100000 200000
 	do
@@ -781,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 &&
@@ -980,6 +1238,10 @@ test_expect_success 'basic atom: head contents:trailers' '
 	test_cmp expect actual.clean
 '
 
+test_expect_success 'basic atom: rest must fail' '
+	test_must_fail git for-each-ref --format="%(rest)" refs/heads/main
+'
+
 test_expect_success 'trailer parsing not fooled by --- line' '
 	git commit --allow-empty -F - <<-\EOF &&
 	this is the subject
@@ -1073,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/t6402-merge-rename.sh b/t/t6402-merge-rename.sh
index 3da2896e3b..3a32b1a45c 100755
--- a/t/t6402-merge-rename.sh
+++ b/t/t6402-merge-rename.sh
@@ -103,7 +103,7 @@ test_expect_success 'setup' '
 test_expect_success 'pull renaming branch into unrenaming one' \
 '
 	git show-branch &&
-	test_expect_code 1 git pull . white &&
+	test_expect_code 1 git pull --no-rebase . white &&
 	git ls-files -s &&
 	test_stdout_line_count = 3 git ls-files -u B &&
 	test_stdout_line_count = 1 git ls-files -s N &&
@@ -119,7 +119,7 @@ test_expect_success 'pull renaming branch into another renaming one' \
 	rm -f B &&
 	git reset --hard &&
 	git checkout red &&
-	test_expect_code 1 git pull . white &&
+	test_expect_code 1 git pull --no-rebase . white &&
 	test_stdout_line_count = 3 git ls-files -u B &&
 	test_stdout_line_count = 1 git ls-files -s N &&
 	sed -ne "/^g/{
@@ -133,7 +133,7 @@ test_expect_success 'pull unrenaming branch into renaming one' \
 '
 	git reset --hard &&
 	git show-branch &&
-	test_expect_code 1 git pull . main &&
+	test_expect_code 1 git pull --no-rebase . main &&
 	test_stdout_line_count = 3 git ls-files -u B &&
 	test_stdout_line_count = 1 git ls-files -s N &&
 	sed -ne "/^g/{
@@ -147,7 +147,7 @@ test_expect_success 'pull conflicting renames' \
 '
 	git reset --hard &&
 	git show-branch &&
-	test_expect_code 1 git pull . blue &&
+	test_expect_code 1 git pull --no-rebase . blue &&
 	test_stdout_line_count = 1 git ls-files -u A &&
 	test_stdout_line_count = 1 git ls-files -u B &&
 	test_stdout_line_count = 1 git ls-files -u C &&
@@ -163,7 +163,7 @@ test_expect_success 'interference with untracked working tree file' '
 	git reset --hard &&
 	git show-branch &&
 	echo >A this file should not matter &&
-	test_expect_code 1 git pull . white &&
+	test_expect_code 1 git pull --no-rebase . white &&
 	test_path_is_file A
 '
 
@@ -173,7 +173,7 @@ test_expect_success 'interference with untracked working tree file' '
 	git show-branch &&
 	rm -f A &&
 	echo >A this file should not matter &&
-	test_expect_code 1 git pull . red &&
+	test_expect_code 1 git pull --no-rebase . red &&
 	test_path_is_file A
 '
 
@@ -183,7 +183,7 @@ test_expect_success 'interference with untracked working tree file' '
 	git checkout -f main &&
 	git tag -f anchor &&
 	git show-branch &&
-	git pull . yellow &&
+	git pull --no-rebase . yellow &&
 	test_path_is_missing M &&
 	git reset --hard anchor
 '
@@ -210,7 +210,7 @@ test_expect_success 'updated working tree file should prevent the merge' '
 	echo >>M one line addition &&
 	cat M >M.saved &&
 	git update-index M &&
-	test_expect_code 128 git pull . yellow &&
+	test_expect_code 128 git pull --no-rebase . yellow &&
 	test_cmp M M.saved &&
 	rm -f M.saved
 '
@@ -222,7 +222,7 @@ test_expect_success 'interference with untracked working tree file' '
 	git tag -f anchor &&
 	git show-branch &&
 	echo >M this file should not matter &&
-	git pull . main &&
+	git pull --no-rebase . main &&
 	test_path_is_file M &&
 	! {
 		git ls-files -s |
diff --git a/t/t6404-recursive-merge.sh b/t/t6404-recursive-merge.sh
index eaf48e941e..b8735c6db4 100755
--- a/t/t6404-recursive-merge.sh
+++ b/t/t6404-recursive-merge.sh
@@ -108,8 +108,13 @@ test_expect_success 'refuse to merge binary files' '
 	printf "\0\0" >binary-file &&
 	git add binary-file &&
 	git commit -m binary2 &&
-	test_must_fail git merge F >merge.out 2>merge.err &&
-	grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge.err
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_must_fail git merge F >merge_output
+	else
+		test_must_fail git merge F 2>merge_output
+	fi &&
+	grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge_output
 '
 
 test_expect_success 'mark rename/delete as unmerged' '
diff --git a/t/t6406-merge-attr.sh b/t/t6406-merge-attr.sh
index 8494645837..99abefd44b 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
@@ -221,8 +221,13 @@ test_expect_success 'binary files with union attribute' '
 	printf "two\0" >bin.txt &&
 	git commit -am two &&
 
-	test_must_fail git merge bin-main 2>stderr &&
-	grep -i "warning.*cannot merge.*HEAD vs. bin-main" stderr
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_must_fail git merge bin-main >output
+	else
+		test_must_fail git merge bin-main 2>output
+	fi &&
+	grep -i "warning.*cannot merge.*HEAD vs. bin-main" output
 '
 
 test_done
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 d406b2343c..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
 
 '
@@ -100,7 +100,7 @@ test_expect_success 'merge update' '
 	git checkout -b topic_2 &&
 	git commit -m "update git-gui" &&
 	cd ../git &&
-	git pull -s subtree gui topic_2 &&
+	git pull --no-rebase -s subtree gui topic_2 &&
 	git ls-files -s >actual &&
 	(
 		echo "100644 $o3 0	git-gui/git-gui.sh" &&
@@ -129,7 +129,7 @@ test_expect_success 'initial ambiguous subtree' '
 test_expect_success 'merge using explicit' '
 	cd ../git &&
 	git reset --hard topic_2 &&
-	git pull -Xsubtree=git-gui gui topic_2 &&
+	git pull --no-rebase -Xsubtree=git-gui gui topic_2 &&
 	git ls-files -s >actual &&
 	(
 		echo "100644 $o3 0	git-gui/git-gui.sh" &&
@@ -142,7 +142,7 @@ test_expect_success 'merge using explicit' '
 test_expect_success 'merge2 using explicit' '
 	cd ../git &&
 	git reset --hard topic_2 &&
-	git pull -Xsubtree=git-gui2 gui topic_2 &&
+	git pull --no-rebase -Xsubtree=git-gui2 gui topic_2 &&
 	git ls-files -s >actual &&
 	(
 		echo "100644 $o1 0	git-gui/git-gui.sh" &&
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/t6415-merge-dir-to-symlink.sh b/t/t6415-merge-dir-to-symlink.sh
index 2ce104aca7..2655e295f5 100755
--- a/t/t6415-merge-dir-to-symlink.sh
+++ b/t/t6415-merge-dir-to-symlink.sh
@@ -25,7 +25,8 @@ test_expect_success 'checkout does not clobber untracked symlink' '
 	git reset --hard main &&
 	git rm --cached a/b &&
 	git commit -m "untracked symlink remains" &&
-	test_must_fail git checkout start^0
+	test_must_fail git checkout start^0 &&
+	git clean -fd    # Do not leave the untracked symlink in the way
 '
 
 test_expect_success 'a/b-2/c/d is kept when clobbering symlink b' '
@@ -34,7 +35,8 @@ test_expect_success 'a/b-2/c/d is kept when clobbering symlink b' '
 	git rm --cached a/b &&
 	git commit -m "untracked symlink remains" &&
 	git checkout -f start^0 &&
-	test_path_is_file a/b-2/c/d
+	test_path_is_file a/b-2/c/d &&
+	git clean -fd    # Do not leave the untracked symlink in the way
 '
 
 test_expect_success 'checkout should not have deleted a/b-2/c/d' '
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 ac9aee9a66..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 &&
@@ -69,11 +66,11 @@ test_expect_success 'binary file with -Xours/-Xtheirs' '
 '
 
 test_expect_success 'pull passes -X to underlying merge' '
-	git reset --hard main && git pull -s recursive -Xours . side &&
-	git reset --hard main && git pull -s recursive -X ours . side &&
-	git reset --hard main && git pull -s recursive -Xtheirs . side &&
-	git reset --hard main && git pull -s recursive -X theirs . side &&
-	git reset --hard main && test_must_fail git pull -s recursive -X bork . side
+	git reset --hard main && git pull --no-rebase -s recursive -Xours . side &&
+	git reset --hard main && git pull --no-rebase -s recursive -X ours . side &&
+	git reset --hard main && git pull --no-rebase -s recursive -Xtheirs . side &&
+	git reset --hard main && git pull --no-rebase -s recursive -X theirs . side &&
+	git reset --hard main && test_must_fail git pull --no-rebase -s recursive -X bork . side
 '
 
 test_expect_success SYMLINKS 'symlink with -Xours/-Xtheirs' '
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/t6423-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh
index 4af4fb0038..5b81a130e9 100755
--- a/t/t6423-merge-rename-directories.sh
+++ b/t/t6423-merge-rename-directories.sh
@@ -4797,7 +4797,7 @@ test_setup_12f () {
 	)
 }
 
-test_expect_merge_algorithm failure failure '12f: Trivial directory resolve, caching, all kinds of fun' '
+test_expect_merge_algorithm failure success '12f: Trivial directory resolve, caching, all kinds of fun' '
 	test_setup_12f &&
 	(
 		cd 12f &&
diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index 5e3779ebc9..89dd544f38 100755
--- a/t/t6424-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
@@ -132,6 +132,7 @@ test_expect_success 'merge-recursive, when index==head but head!=HEAD' '
 
 	# Make index match B
 	git diff C B -- | git apply --cached &&
+	test_when_finished "git clean -fd" &&  # Do not leave untracked around
 	# Merge B & F, with B as "head"
 	git merge-recursive A -- B F > out &&
 	test_i18ngrep "Already up to date" out
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/t6429-merge-sequence-rename-caching.sh b/t/t6429-merge-sequence-rename-caching.sh
index 035edc40b1..f2bc8a7d2a 100755
--- a/t/t6429-merge-sequence-rename-caching.sh
+++ b/t/t6429-merge-sequence-rename-caching.sh
@@ -697,4 +697,71 @@ test_expect_success 'caching renames only on upstream side, part 2' '
 	)
 '
 
+#
+# The following testcase just creates two simple renames (slightly modified
+# on both sides but without conflicting changes), and a directory full of
+# files that are otherwise uninteresting.  The setup is as follows:
+#
+#   base:     unrelated/<BUNCH OF FILES>
+#             numbers
+#             values
+#   upstream: modify: numbers
+#             modify: values
+#   topic:    add: unrelated/foo
+#             modify: numbers
+#             modify: values
+#             rename: numbers -> sequence
+#             rename: values -> progression
+#
+# This is a trivial rename case, but we're curious what happens with a very
+# low renameLimit interacting with the restart optimization trying to notice
+# that unrelated/ looks like a trivial merge candidate.
+#
+test_expect_success 'avoid assuming we detected renames' '
+	git init redo-weirdness &&
+	(
+		cd redo-weirdness &&
+
+		mkdir unrelated &&
+		for i in $(test_seq 1 10)
+		do
+			>unrelated/$i
+		done &&
+		test_seq  2 10 >numbers &&
+		test_seq 12 20 >values &&
+		git add numbers values unrelated/ &&
+		git commit -m orig &&
+
+		git branch upstream &&
+		git branch topic &&
+
+		git switch upstream &&
+		test_seq  1 10 >numbers &&
+		test_seq 11 20 >values &&
+		git add numbers &&
+		git commit -m "Some tweaks" &&
+
+		git switch topic &&
+
+		>unrelated/foo &&
+		test_seq  2 12 >numbers &&
+		test_seq 12 22 >values &&
+		git add numbers values unrelated/ &&
+		git mv numbers sequence &&
+		git mv values progression &&
+		git commit -m A &&
+
+		#
+		# Actual testing
+		#
+
+		git switch --detach topic^0 &&
+
+		test_must_fail git -c merge.renameLimit=1 rebase upstream &&
+
+		git ls-files -u >actual &&
+		! test_file_is_empty actual
+	)
+'
+
 test_done
diff --git a/t/t6430-merge-recursive.sh b/t/t6430-merge-recursive.sh
index ffcc01fe65..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...
@@ -718,7 +718,9 @@ test_expect_success 'merge-recursive remembers the names of all base trees' '
 	# merge-recursive prints in reverse order, but we do not care
 	sort <trees >expect &&
 	sed -n "s/^virtual //p" out | sort >actual &&
-	test_cmp expect actual
+	test_cmp expect actual &&
+
+	git clean -fd
 '
 
 test_expect_success 'merge-recursive internal merge resolves to the sameness' '
diff --git a/t/t6436-merge-overwrite.sh b/t/t6436-merge-overwrite.sh
index 84b4aacf49..c0b7bd7c3f 100755
--- a/t/t6436-merge-overwrite.sh
+++ b/t/t6436-merge-overwrite.sh
@@ -68,7 +68,8 @@ test_expect_success 'will not overwrite removed file' '
 	git commit -m "rm c1.c" &&
 	cp important c1.c &&
 	test_must_fail git merge c1a &&
-	test_cmp important c1.c
+	test_cmp important c1.c &&
+	rm c1.c  # Do not leave untracked file in way of future tests
 '
 
 test_expect_success 'will not overwrite re-added file' '
diff --git a/t/t6437-submodule-merge.sh b/t/t6437-submodule-merge.sh
index e5e89c2045..178413c22f 100755
--- a/t/t6437-submodule-merge.sh
+++ b/t/t6437-submodule-merge.sh
@@ -5,6 +5,9 @@ test_description='merging with submodules'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-merge.sh
 
diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
index 10c7ae7f09..c2021267f2 100755
--- a/t/t6500-gc.sh
+++ b/t/t6500-gc.sh
@@ -241,7 +241,7 @@ test_expect_success 'background auto gc respects lock for all operations' '
 
 	# create a ref whose loose presence we can use to detect a pack-refs run
 	git update-ref refs/heads/should-be-loose HEAD &&
-	test_path_is_file .git/refs/heads/should-be-loose &&
+	(ls -1 .git/refs/heads .git/reftable >expect || true) &&
 
 	# now fake a concurrent gc that holds the lock; we can use our
 	# shell pid so that it looks valid.
@@ -258,7 +258,8 @@ test_expect_success 'background auto gc respects lock for all operations' '
 
 	# our gc should exit zero without doing anything
 	run_and_wait_for_auto_gc &&
-	test_path_is_file .git/refs/heads/should-be-loose
+	(ls -1 .git/refs/heads .git/reftable >actual || true) &&
+	test_cmp expect actual
 '
 
 # DO NOT leave a detached auto gc process running near the end of the
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/t7001-mv.sh b/t/t7001-mv.sh
index 25bb9bbb89..963356ba5f 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -2,10 +2,11 @@
 
 test_description='git mv in subdirs'
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
 
 test_expect_success 'prepare reference tree' '
 	mkdir path0 path1 &&
-	cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+	COPYING_test_data >path0/COPYING &&
 	git add path0/COPYING &&
 	git commit -m add -a
 '
@@ -107,7 +108,7 @@ test_expect_success 'clean up' '
 '
 
 test_expect_success 'adding another file' '
-	cp "$TEST_DIRECTORY"/../README.md path0/README &&
+	COPYING_test_data | tr A-Za-z N-ZA-Mn-za-m >path0/README &&
 	git add path0/README &&
 	git commit -m add2 -a
 '
diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh
new file mode 100755
index 0000000000..1d3d2aca21
--- /dev/null
+++ b/t/t7002-mv-sparse-checkout.sh
@@ -0,0 +1,209 @@
+#!/bin/sh
+
+test_description='git mv in sparse working trees'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' "
+	mkdir -p sub/dir sub/dir2 &&
+	touch a b c sub/d sub/dir/e sub/dir2/e &&
+	git add -A &&
+	git commit -m files &&
+
+	cat >sparse_error_header <<-EOF &&
+	The following paths and/or pathspecs matched paths that exist
+	outside of your sparse-checkout definition, so will not be
+	updated in the index:
+	EOF
+
+	cat >sparse_hint <<-EOF
+	hint: If you intend to update such entries, try one of the following:
+	hint: * Use the --sparse option.
+	hint: * Disable or modify the sparsity rules.
+	hint: Disable this message with \"git config advice.updateSparsePath false\"
+	EOF
+"
+
+test_expect_success 'mv refuses to move sparse-to-sparse' '
+	test_when_finished rm -f e &&
+	git reset --hard &&
+	git sparse-checkout set a &&
+	touch b &&
+	test_must_fail git mv b e 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo b >>expect &&
+	echo e >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse b e 2>stderr &&
+	test_must_be_empty stderr
+'
+
+test_expect_success 'mv refuses to move sparse-to-sparse, ignores failure' '
+	test_when_finished rm -f b c e &&
+	git reset --hard &&
+	git sparse-checkout set a &&
+
+	# tracked-to-untracked
+	touch b &&
+	git mv -k b e 2>stderr &&
+	test_path_exists b &&
+	test_path_is_missing e &&
+	cat sparse_error_header >expect &&
+	echo b >>expect &&
+	echo e >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+
+	git mv --sparse b e 2>stderr &&
+	test_must_be_empty stderr &&
+	test_path_is_missing b &&
+	test_path_exists e &&
+
+	# tracked-to-tracked
+	git reset --hard &&
+	touch b &&
+	git mv -k b c 2>stderr &&
+	test_path_exists b &&
+	test_path_is_missing c &&
+	cat sparse_error_header >expect &&
+	echo b >>expect &&
+	echo c >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+
+	git mv --sparse b c 2>stderr &&
+	test_must_be_empty stderr &&
+	test_path_is_missing b &&
+	test_path_exists c
+'
+
+test_expect_success 'mv refuses to move non-sparse-to-sparse' '
+	test_when_finished rm -f b c e &&
+	git reset --hard &&
+	git sparse-checkout set a &&
+
+	# tracked-to-untracked
+	test_must_fail git mv a e 2>stderr &&
+	test_path_exists a &&
+	test_path_is_missing e &&
+	cat sparse_error_header >expect &&
+	echo e >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse a e 2>stderr &&
+	test_must_be_empty stderr &&
+	test_path_is_missing a &&
+	test_path_exists e &&
+
+	# tracked-to-tracked
+	rm e &&
+	git reset --hard &&
+	test_must_fail git mv a c 2>stderr &&
+	test_path_exists a &&
+	test_path_is_missing c &&
+	cat sparse_error_header >expect &&
+	echo c >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse a c 2>stderr &&
+	test_must_be_empty stderr &&
+	test_path_is_missing a &&
+	test_path_exists c
+'
+
+test_expect_success 'mv refuses to move sparse-to-non-sparse' '
+	test_when_finished rm -f b c e &&
+	git reset --hard &&
+	git sparse-checkout set a e &&
+
+	# tracked-to-untracked
+	touch b &&
+	test_must_fail git mv b e 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo b >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse b e 2>stderr &&
+	test_must_be_empty stderr
+'
+
+test_expect_success 'recursive mv refuses to move (possible) sparse' '
+	test_when_finished rm -rf b c e sub2 &&
+	git reset --hard &&
+	# Without cone mode, "sub" and "sub2" do not match
+	git sparse-checkout set sub/dir sub2/dir &&
+
+	# Add contained contents to ensure we avoid non-existence errors
+	mkdir sub/dir2 &&
+	touch sub/d sub/dir2/e &&
+
+	test_must_fail git mv sub sub2 2>stderr &&
+	cat sparse_error_header >expect &&
+	cat >>expect <<-\EOF &&
+	sub/d
+	sub2/d
+	sub/dir2/e
+	sub2/dir2/e
+	EOF
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse sub sub2 2>stderr &&
+	test_must_be_empty stderr &&
+	git commit -m "moved sub to sub2" &&
+	git rev-parse HEAD~1:sub >expect &&
+	git rev-parse HEAD:sub2 >actual &&
+	test_cmp expect actual &&
+	git reset --hard HEAD~1
+'
+
+test_expect_success 'recursive mv refuses to move sparse' '
+	git reset --hard &&
+	# Use cone mode so "sub/" matches the sparse-checkout patterns
+	git sparse-checkout init --cone &&
+	git sparse-checkout set sub/dir sub2/dir &&
+
+	# Add contained contents to ensure we avoid non-existence errors
+	mkdir sub/dir2 &&
+	touch sub/dir2/e &&
+
+	test_must_fail git mv sub sub2 2>stderr &&
+	cat sparse_error_header >expect &&
+	cat >>expect <<-\EOF &&
+	sub/dir2/e
+	sub2/dir2/e
+	EOF
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse sub sub2 2>stderr &&
+	test_must_be_empty stderr &&
+	git commit -m "moved sub to sub2" &&
+	git rev-parse HEAD~1:sub >expect &&
+	git rev-parse HEAD:sub2 >actual &&
+	test_cmp expect actual &&
+	git reset --hard HEAD~1
+'
+
+test_expect_success 'can move files to non-sparse dir' '
+	git reset --hard &&
+	git sparse-checkout init --no-cone &&
+	git sparse-checkout set a b c w !/x y/ &&
+	mkdir -p w x/y &&
+
+	git mv a w/new-a 2>stderr &&
+	git mv b x/y/new-b 2>stderr &&
+	test_must_be_empty stderr
+'
+
+test_expect_success 'refuse to move file to non-skip-worktree sparse path' '
+	git reset --hard &&
+	git sparse-checkout init --no-cone &&
+	git sparse-checkout set a !/x y/ !x/y/z &&
+	mkdir -p x/y/z &&
+
+	test_must_fail git mv a x/y/z/new-a 2>stderr &&
+	echo x/y/z/new-a | cat sparse_error_header - sparse_hint >expect &&
+	test_cmp expect stderr
+'
+
+test_done
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 2f72c5c688..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^ &&
@@ -1998,6 +2001,10 @@ test_expect_success '--format should list tags as per format given' '
 	test_cmp expect actual
 '
 
+test_expect_success 'git tag -l with --format="%(rest)" must fail' '
+	test_must_fail git tag -l --format="%(rest)" "v1*"
+'
+
 test_expect_success "set up color tests" '
 	echo "<RED>v1.0<RESET>" >expect.color &&
 	echo "v1.0" >expect.bare &&
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/t7030-verify-tag.sh b/t/t7030-verify-tag.sh
index 3cefde9602..10faa64515 100755
--- a/t/t7030-verify-tag.sh
+++ b/t/t7030-verify-tag.sh
@@ -194,6 +194,10 @@ test_expect_success GPG 'verifying tag with --format' '
 	test_cmp expect actual
 '
 
+test_expect_success GPG 'verifying tag with --format="%(rest)" must fail' '
+	test_must_fail git verify-tag --format="%(rest)" "fourth-signed"
+'
+
 test_expect_success GPG 'verifying a forged tag with --format should fail silently' '
 	test_must_fail git verify-tag --format="tagname : %(tag)" $(cat forged1.tag) >actual-forged &&
 	test_must_be_empty actual-forged
diff --git a/t/t7031-verify-tag-signed-ssh.sh b/t/t7031-verify-tag-signed-ssh.sh
new file mode 100755
index 0000000000..1cb36b9ab8
--- /dev/null
+++ b/t/t7031-verify-tag-signed-ssh.sh
@@ -0,0 +1,203 @@
+#!/bin/sh
+
+test_description='signed tag tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY/lib-gpg.sh"
+
+test_expect_success GPGSSH 'create signed tags ssh' '
+	test_when_finished "test_unconfig commit.gpgsign" &&
+	test_config gpg.format ssh &&
+	test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+
+	echo 1 >file && git add file &&
+	test_tick && git commit -m initial &&
+	git tag -s -m initial initial &&
+	git branch side &&
+
+	echo 2 >file && test_tick && git commit -a -m second &&
+	git tag -s -m second second &&
+
+	git checkout side &&
+	echo 3 >elif && git add elif &&
+	test_tick && git commit -m "third on side" &&
+
+	git checkout main &&
+	test_tick && git merge -S side &&
+	git tag -s -m merge merge &&
+
+	echo 4 >file && test_tick && git commit -a -S -m "fourth unsigned" &&
+	git tag -a -m fourth-unsigned fourth-unsigned &&
+
+	test_tick && git commit --amend -S -m "fourth signed" &&
+	git tag -s -m fourth fourth-signed &&
+
+	echo 5 >file && test_tick && git commit -a -m "fifth" &&
+	git tag fifth-unsigned &&
+
+	git config commit.gpgsign true &&
+	echo 6 >file && test_tick && git commit -a -m "sixth" &&
+	git tag -a -m sixth sixth-unsigned &&
+
+	test_tick && git rebase -f HEAD^^ && git tag -s -m 6th sixth-signed HEAD^ &&
+	git tag -m seventh -s seventh-signed &&
+
+	echo 8 >file && test_tick && git commit -a -m eighth &&
+	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}" &&
+	(
+		for tag in initial second merge fourth-signed sixth-signed seventh-signed
+		do
+			git verify-tag $tag 2>actual &&
+			grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+			! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+			echo $tag OK || exit 1
+		done
+	) &&
+	(
+		for tag in fourth-unsigned fifth-unsigned sixth-unsigned
+		do
+			test_must_fail git verify-tag $tag 2>actual &&
+			! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+			! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+			echo $tag OK || exit 1
+		done
+	) &&
+	(
+		for tag in eighth-signed-alt
+		do
+			test_must_fail git verify-tag $tag 2>actual &&
+			grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+			! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+			grep "${GPGSSH_KEY_NOT_TRUSTED}" actual &&
+			echo $tag OK || exit 1
+		done
+	)
+'
+
+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 &&
+	sed -e "/^tag / s/seventh/7th forged/" raw >forged1 &&
+	git hash-object -w -t tag forged1 >forged1.tag &&
+	test_must_fail git verify-tag $(cat forged1.tag) 2>actual1 &&
+	grep "${GPGSSH_BAD_SIGNATURE}" actual1 &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual1 &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual1
+'
+
+test_expect_success GPGSSH 'verify ssh signatures with --raw' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	(
+		for tag in initial second merge fourth-signed sixth-signed seventh-signed
+		do
+			git verify-tag --raw $tag 2>actual &&
+			grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+			! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+			echo $tag OK || exit 1
+		done
+	) &&
+	(
+		for tag in fourth-unsigned fifth-unsigned sixth-unsigned
+		do
+			test_must_fail git verify-tag --raw $tag 2>actual &&
+			! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+			! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+			echo $tag OK || exit 1
+		done
+	) &&
+	(
+		for tag in eighth-signed-alt
+		do
+			test_must_fail git verify-tag --raw $tag 2>actual &&
+			grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+			! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+			echo $tag OK || exit 1
+		done
+	)
+'
+
+test_expect_success GPGSSH 'verify signatures with --raw ssh' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git verify-tag --raw sixth-signed 2>actual &&
+	grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+	! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+	echo sixth-signed OK
+'
+
+test_expect_success GPGSSH 'verify multiple tags ssh' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	tags="seventh-signed sixth-signed" &&
+	for i in $tags
+	do
+		git verify-tag -v --raw $i || return 1
+	done >expect.stdout 2>expect.stderr.1 &&
+	grep "^${GPGSSH_GOOD_SIGNATURE_TRUSTED}" <expect.stderr.1 >expect.stderr &&
+	git verify-tag -v --raw $tags >actual.stdout 2>actual.stderr.1 &&
+	grep "^${GPGSSH_GOOD_SIGNATURE_TRUSTED}" <actual.stderr.1 >actual.stderr &&
+	test_cmp expect.stdout actual.stdout &&
+	test_cmp expect.stderr actual.stderr
+'
+
+test_expect_success GPGSSH 'verifying tag with --format - ssh' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	cat >expect <<-\EOF &&
+	tagname : fourth-signed
+	EOF
+	git verify-tag --format="tagname : %(tag)" "fourth-signed" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'verifying a forged tag with --format should fail silently - ssh' '
+	test_must_fail git verify-tag --format="tagname : %(tag)" $(cat forged1.tag) >actual-forged &&
+	test_must_be_empty actual-forged
+'
+
+test_done
diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh
index 4613882caf..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
@@ -373,10 +384,7 @@ test_expect_success 'verify upstream fields in branch header' '
 
 		## Test upstream-gone case. Fake this by pointing
 		## origin/initial-branch at a non-existing commit.
-		OLD=$(git rev-parse origin/initial-branch) &&
-		NEW=$ZERO_OID &&
-		mv .git/packed-refs .git/old-packed-refs &&
-		sed "s/$OLD/$NEW/g" <.git/old-packed-refs >.git/packed-refs &&
+		git update-ref -d refs/remotes/origin/initial-branch &&
 
 		HUF=$(git rev-parse HEAD) &&
 
diff --git a/t/t7101-reset-empty-subdirs.sh b/t/t7101-reset-empty-subdirs.sh
index bfce05ac5d..638bb04e21 100755
--- a/t/t7101-reset-empty-subdirs.sh
+++ b/t/t7101-reset-empty-subdirs.sh
@@ -4,11 +4,14 @@
 #
 
 test_description='git reset should cull empty subdirs'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
 
 test_expect_success 'creating initial files' '
      mkdir path0 &&
-     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+     COPYING_test_data >path0/COPYING &&
      git add path0/COPYING &&
      git commit -m add -a
 '
@@ -16,10 +19,10 @@ test_expect_success 'creating initial files' '
 test_expect_success 'creating second files' '
      mkdir path1 &&
      mkdir path1/path2 &&
-     cp "$TEST_DIRECTORY"/../COPYING path1/path2/COPYING &&
-     cp "$TEST_DIRECTORY"/../COPYING path1/COPYING &&
-     cp "$TEST_DIRECTORY"/../COPYING COPYING &&
-     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING-TOO &&
+     COPYING_test_data >path1/path2/COPYING &&
+     COPYING_test_data >path1/COPYING &&
+     COPYING_test_data >COPYING &&
+     COPYING_test_data >path0/COPYING-TOO &&
      git add path1/path2/COPYING &&
      git add path1/COPYING &&
      git add COPYING &&
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/t7104-reset-hard.sh b/t/t7104-reset-hard.sh
index 7948ec392b..cf9697eba9 100755
--- a/t/t7104-reset-hard.sh
+++ b/t/t7104-reset-hard.sh
@@ -2,6 +2,7 @@
 
 test_description='reset --hard unmerged'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
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/t7112-reset-submodule.sh b/t/t7112-reset-submodule.sh
index 19830d9036..a3e2413bc3 100755
--- a/t/t7112-reset-submodule.sh
+++ b/t/t7112-reset-submodule.sh
@@ -6,7 +6,6 @@ test_description='reset can handle submodules'
 . "$TEST_DIRECTORY"/lib-submodule-update.sh
 
 KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
-KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1
 
 test_submodule_switch_recursing_with_args "reset --keep"
 
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 7f6e23a4bb..61ad47b0c1 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -585,6 +585,7 @@ test_expect_success 'checkout --conflict=diff3' '
 '
 
 test_expect_success 'failing checkout -b should not break working tree' '
+	git clean -fd &&  # Remove untracked files in the way
 	git reset --hard main &&
 	git symbolic-ref HEAD refs/heads/main &&
 	test_must_fail git checkout -b renamer side^ &&
@@ -657,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 a924fdb7a6..e7cec2e457 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -51,7 +51,7 @@ test_expect_success 'submodule update aborts on missing gitmodules url' '
 
 test_expect_success 'add aborts on repository with no commits' '
 	cat >expect <<-\EOF &&
-	'"'repo-no-commits'"' does not have a commit checked out
+	fatal: '"'repo-no-commits'"' does not have a commit checked out
 	EOF
 	git init repo-no-commits &&
 	test_must_fail git submodule add ../a ./repo-no-commits 2>actual &&
@@ -196,6 +196,17 @@ test_expect_success 'submodule add to .gitignored path with --force' '
 	)
 '
 
+test_expect_success 'submodule add to path with tracked content fails' '
+	(
+		cd addtest &&
+		echo "fatal: '\''dir-tracked'\'' already exists in the index" >expect &&
+		mkdir dir-tracked &&
+		test_commit foo dir-tracked/bar &&
+		test_must_fail git submodule add "$submodurl" dir-tracked >actual 2>&1 &&
+		test_cmp expect actual
+	)
+'
+
 test_expect_success 'submodule add to reconfigure existing submodule with --force' '
 	(
 		cd addtest-ignore &&
@@ -1171,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/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index f4f61fe554..11cccbb333 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -448,7 +448,7 @@ test_expect_success 'fsck detects command in .gitmodules' '
 '
 
 cat << EOF >expect
-Execution of 'false $submodulesha1' failed in submodule path 'submodule'
+fatal: Execution of 'false $submodulesha1' failed in submodule path 'submodule'
 EOF
 
 test_expect_success 'submodule update - command in .git/config catches failure' '
@@ -465,7 +465,7 @@ test_expect_success 'submodule update - command in .git/config catches failure'
 '
 
 cat << EOF >expect
-Execution of 'false $submodulesha1' failed in submodule path '../submodule'
+fatal: Execution of 'false $submodulesha1' failed in submodule path '../submodule'
 EOF
 
 test_expect_success 'submodule update - command in .git/config catches failure -- subdirectory' '
@@ -484,7 +484,7 @@ test_expect_success 'submodule update - command in .git/config catches failure -
 
 test_expect_success 'submodule update - command run for initial population of submodule' '
 	cat >expect <<-EOF &&
-	Execution of '\''false $submodulesha1'\'' failed in submodule path '\''submodule'\''
+	fatal: Execution of '\''false $submodulesha1'\'' failed in submodule path '\''submodule'\''
 	EOF
 	rm -rf super/submodule &&
 	test_must_fail git -C super submodule update 2>actual &&
@@ -493,8 +493,8 @@ test_expect_success 'submodule update - command run for initial population of su
 '
 
 cat << EOF >expect
-Execution of 'false $submodulesha1' failed in submodule path '../super/submodule'
-Failed to recurse into submodule path '../super'
+fatal: Execution of 'false $submodulesha1' failed in submodule path '../super/submodule'
+fatal: Failed to recurse into submodule path '../super'
 EOF
 
 test_expect_success 'recursive submodule update - command in .git/config catches failure -- subdirectory' '
diff --git a/t/t7418-submodule-sparse-gitmodules.sh b/t/t7418-submodule-sparse-gitmodules.sh
index 3f7f271883..f87e524d6d 100755
--- a/t/t7418-submodule-sparse-gitmodules.sh
+++ b/t/t7418-submodule-sparse-gitmodules.sh
@@ -12,6 +12,9 @@ The test setup uses a sparse checkout, however the same scenario can be set up
 also by committing .gitmodules and then just removing it from the filesystem.
 '
 
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
 . ./test-lib.sh
 
 test_expect_success 'sparse checkout setup which hides .gitmodules' '
diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh
index 7d02f79c0d..91964653a0 100755
--- a/t/t7500-commit-template-squash-signoff.sh
+++ b/t/t7500-commit-template-squash-signoff.sh
@@ -270,7 +270,7 @@ EOF
 
 test_expect_success 'commit --fixup provides correct one-line commit message' '
 	commit_for_rebase_autosquash_setup &&
-	git commit --fixup HEAD~1 &&
+	EDITOR="echo ignored >>" git commit --fixup HEAD~1 &&
 	commit_msg_is "fixup! target message subject line"
 '
 
@@ -281,6 +281,13 @@ test_expect_success 'commit --fixup -m"something" -m"extra"' '
 
 extra"
 '
+test_expect_success 'commit --fixup --edit' '
+	commit_for_rebase_autosquash_setup &&
+	EDITOR="printf \"something\nextra\" >>" git commit --fixup HEAD~1 --edit &&
+	commit_msg_is "fixup! target message subject linesomething
+extra"
+'
+
 get_commit_msg () {
 	rev="$1" &&
 	git log -1 --pretty=format:"%B" "$rev"
@@ -352,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
 '
@@ -414,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
 	"
@@ -428,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
 '
@@ -498,7 +506,7 @@ test_expect_success 'invalid message options when using --fixup' '
 cat >expected-template <<EOF
 
 # Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
+# with '#' will be ignored.
 #
 # Author:    A U Thor <author@example.com>
 #
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/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
index 4e7592522a..bba58f0480 100755
--- a/t/t7504-commit-msg-hook.sh
+++ b/t/t7504-commit-msg-hook.sh
@@ -133,6 +133,14 @@ test_expect_success '--no-verify with failing hook' '
 
 '
 
+test_expect_success '-n followed by --verify with failing hook' '
+
+	echo "even more" >> file &&
+	git add file &&
+	test_must_fail git commit -n --verify -m "even more"
+
+'
+
 test_expect_success '--no-verify with failing hook (editor)' '
 
 	echo "more stuff" >> file &&
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index 7a8194ce72..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 &&
 
@@ -250,7 +250,6 @@ test_rebase () {
 }
 
 test_rebase success
-test_have_prereq !REBASE_P || test_rebase success -p
 
 test_expect_success 'with hook (cherry-pick)' '
 	test_when_finished "git checkout -f main" &&
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 2b72451ba3..2b7ef6c41a 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -882,7 +882,7 @@ test_expect_success 'status shows detached HEAD properly after checking out non-
 	git clone upstream downstream &&
 	git -C downstream checkout @{u} &&
 	git -C downstream status >actual &&
-	test_i18ngrep "HEAD detached at [0-9a-f]\\+" actual
+	grep -E "HEAD detached at [0-9a-f]+" actual
 '
 
 test_expect_success 'setup status submodule summary' '
@@ -1647,13 +1647,33 @@ test_expect_success '"Initial commit" should not be noted in commit template' '
 '
 
 test_expect_success '--no-optional-locks prevents index update' '
-	test-tool chmtime =1234567890 .git/index &&
+	test_set_magic_mtime .git/index &&
 	git --no-optional-locks status &&
-	test-tool chmtime --get .git/index >out &&
-	grep ^1234567890 out &&
+	test_is_magic_mtime .git/index &&
 	git status &&
-	test-tool chmtime --get .git/index >out &&
-	! grep ^1234567890 out
+	! test_is_magic_mtime .git/index
+'
+
+test_expect_success 'racy timestamps will be fixed for clean worktree' '
+	echo content >racy-dirty &&
+	echo content >racy-racy &&
+	git add racy* &&
+	git commit -m "racy test files" &&
+	# let status rewrite the index, if necessary; after that we expect
+	# no more index writes unless caused by racy timestamps; note that
+	# timestamps may already be racy now (depending on previous tests)
+	git status &&
+	test_set_magic_mtime .git/index &&
+	git status &&
+	! test_is_magic_mtime .git/index
+'
+
+test_expect_success 'racy timestamps will be fixed for dirty worktree' '
+	echo content2 >racy-dirty &&
+	git status &&
+	test_set_magic_mtime .git/index &&
+	git status &&
+	! test_is_magic_mtime .git/index
 '
 
 test_done
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 8df5a74f1d..8593b7e3cb 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -110,6 +110,13 @@ test_expect_success GPG 'verify and show signatures' '
 	)
 '
 
+test_expect_success GPG 'verify-commit exits failure on unknown signature' '
+	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
+'
+
 test_expect_success GPG 'verify-commit exits success on untrusted signature' '
 	git verify-commit eighth-signed-alt 2>actual &&
 	grep "Good signature from" actual &&
@@ -203,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 &&
@@ -338,6 +345,8 @@ test_expect_success GPG 'show double signature with custom format' '
 '
 
 
+# NEEDSWORK: This test relies on the test_tick commit/author dates from the first
+# 'create signed commits' test even though it creates its own
 test_expect_success GPG 'verify-commit verifies multiply signed commits' '
 	git init multiply-signed &&
 	cd multiply-signed &&
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/t7517-per-repo-email.sh b/t/t7517-per-repo-email.sh
index 405420ae4d..163ae80468 100755
--- a/t/t7517-per-repo-email.sh
+++ b/t/t7517-per-repo-email.sh
@@ -75,19 +75,6 @@ test_expect_success 'noop interactive rebase does not care about ident' '
 	git rebase -i HEAD^
 '
 
-test_expect_success REBASE_P \
-	'fast-forward rebase does not care about ident (preserve)' '
-	git checkout -B tmp side-without-commit &&
-	git rebase -p main
-'
-
-test_expect_success REBASE_P \
-	'non-fast-forward rebase refuses to write commits (preserve)' '
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -B tmp side-with-commit &&
-	test_must_fail git rebase -p main
-'
-
 test_expect_success 'author.name overrides user.name' '
 	test_config user.name user &&
 	test_config user.email user@example.com &&
diff --git a/t/t7518-ident-corner-cases.sh b/t/t7518-ident-corner-cases.sh
index 905957bd0a..fffdb6ff2e 100755
--- a/t/t7518-ident-corner-cases.sh
+++ b/t/t7518-ident-corner-cases.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='corner cases in ident strings'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # confirm that we do not segfault _and_ that we do not say "(null)", as
diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
index 637391c6ce..a6308acf00 100755
--- a/t/t7519-status-fsmonitor.sh
+++ b/t/t7519-status-fsmonitor.sh
@@ -73,6 +73,7 @@ test_expect_success 'setup' '
 	expect*
 	actual*
 	marker*
+	trace2*
 	EOF
 '
 
@@ -247,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
@@ -383,4 +384,60 @@ test_expect_success 'status succeeds after staging/unstaging' '
 	)
 '
 
+# Usage:
+# check_sparse_index_behavior [!]
+# If "!" is supplied, then we verify that we do not call ensure_full_index
+# 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 -C sparse status --porcelain=v2 >actual &&
+	test_region $1 index ensure_full_index trace2.txt &&
+	test_region fsm_hook query trace2.txt &&
+	test_cmp expect actual &&
+	rm trace2.txt
+}
+
+test_expect_success 'status succeeds with sparse index' '
+	(
+		sane_unset GIT_TEST_SPLIT_INDEX &&
+
+		git clone . full &&
+		git clone --sparse . sparse &&
+		git -C sparse sparse-checkout init --cone --sparse-index &&
+		git -C sparse sparse-checkout set dir1 dir2 &&
+
+		write_script .git/hooks/fsmonitor-test <<-\EOF &&
+			printf "last_update_token\0"
+		EOF
+		git -C full config core.fsmonitor ../.git/hooks/fsmonitor-test &&
+		git -C sparse config core.fsmonitor ../.git/hooks/fsmonitor-test &&
+		check_sparse_index_behavior ! &&
+
+		write_script .git/hooks/fsmonitor-test <<-\EOF &&
+			printf "last_update_token\0"
+			printf "dir1/modified\0"
+		EOF
+		check_sparse_index_behavior ! &&
+
+		git -C sparse sparse-checkout add dir1a &&
+
+		for repo in full sparse
+		do
+			cp -r $repo/dir1 $repo/dir1a &&
+			git -C $repo add dir1a &&
+			git -C $repo commit -m "add dir1a" || return 1
+		done &&
+		git -C sparse sparse-checkout set dir1 dir2 &&
+
+		# This one modifies outside the sparse-checkout definition
+		# and hence we expect to expand the sparse-index.
+		write_script .git/hooks/fsmonitor-test <<-\EOF &&
+			printf "last_update_token\0"
+			printf "dir1a/modified\0"
+		EOF
+		check_sparse_index_behavior
+	)
+'
+
 test_done
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
new file mode 100755
index 0000000000..f47e995179
--- /dev/null
+++ b/t/t7528-signed-commit-ssh.sh
@@ -0,0 +1,462 @@
+#!/bin/sh
+
+test_description='ssh signed commit tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+GNUPGHOME_NOT_USED=$GNUPGHOME
+. "$TEST_DIRECTORY/lib-gpg.sh"
+
+test_expect_success GPGSSH 'create signed commits' '
+	test_oid_cache <<-\EOF &&
+	header sha1:gpgsig
+	header sha256:gpgsig-sha256
+	EOF
+
+	test_when_finished "test_unconfig commit.gpgsign" &&
+	test_config gpg.format ssh &&
+	test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+
+	echo 1 >file && git add file &&
+	test_tick && git commit -S -m initial &&
+	git tag initial &&
+	git branch side &&
+
+	echo 2 >file && test_tick && git commit -a -S -m second &&
+	git tag second &&
+
+	git checkout side &&
+	echo 3 >elif && git add elif &&
+	test_tick && git commit -m "third on side" &&
+
+	git checkout main &&
+	test_tick && git merge -S side &&
+	git tag merge &&
+
+	echo 4 >file && test_tick && git commit -a -m "fourth unsigned" &&
+	git tag fourth-unsigned &&
+
+	test_tick && git commit --amend -S -m "fourth signed" &&
+	git tag fourth-signed &&
+
+	git config commit.gpgsign true &&
+	echo 5 >file && test_tick && git commit -a -m "fifth signed" &&
+	git tag fifth-signed &&
+
+	git config commit.gpgsign false &&
+	echo 6 >file && test_tick && git commit -a -m "sixth" &&
+	git tag sixth-unsigned &&
+
+	git config commit.gpgsign true &&
+	echo 7 >file && test_tick && git commit -a -m "seventh" --no-gpg-sign &&
+	git tag seventh-unsigned &&
+
+	test_tick && git rebase -f HEAD^^ && git tag sixth-signed HEAD^ &&
+	git tag seventh-signed &&
+
+	echo 8 >file && test_tick && git commit -a -m eighth -S"${GPGSSH_KEY_UNTRUSTED}" &&
+	git tag eighth-signed-alt &&
+
+	# commit.gpgsign is still on but this must not be signed
+	echo 9 | git commit-tree HEAD^{tree} >oid &&
+	test_line_count = 1 oid &&
+	git tag ninth-unsigned $(cat oid) &&
+	# explicit -S of course must sign.
+	echo 10 | git commit-tree -S HEAD^{tree} >oid &&
+	test_line_count = 1 oid &&
+	git tag tenth-signed $(cat oid) &&
+
+	# --gpg-sign[=<key-id>] must sign.
+	echo 11 | git commit-tree --gpg-sign HEAD^{tree} >oid &&
+	test_line_count = 1 oid &&
+	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) &&
+
+	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' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	test_config gpg.mintrustlevel UNDEFINED &&
+	(
+		for commit in initial second merge fourth-signed \
+			fifth-signed sixth-signed seventh-signed tenth-signed \
+			eleventh-signed
+		do
+			git verify-commit $commit &&
+			git show --pretty=short --show-signature $commit >actual &&
+			grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+			! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+			echo $commit OK || exit 1
+		done
+	) &&
+	(
+		for commit in merge^2 fourth-unsigned sixth-unsigned \
+			seventh-unsigned ninth-unsigned
+		do
+			test_must_fail git verify-commit $commit &&
+			git show --pretty=short --show-signature $commit >actual &&
+			! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+			! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+			echo $commit OK || exit 1
+		done
+	) &&
+	(
+		for commit in eighth-signed-alt twelfth-signed-alt
+		do
+			git show --pretty=short --show-signature $commit >actual &&
+			grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+			! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+			grep "${GPGSSH_KEY_NOT_TRUSTED}" actual &&
+			echo $commit OK || exit 1
+		done
+	)
+'
+
+test_expect_success GPGSSH 'verify-commit exits failure on untrusted signature' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	test_must_fail git verify-commit eighth-signed-alt 2>actual &&
+	grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+	! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+	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 &&
+	git verify-commit sixth-signed
+'
+
+test_expect_success GPGSSH 'verify-commit exits success with low minTrustLevel' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	test_config gpg.minTrustLevel marginal &&
+	git verify-commit sixth-signed
+'
+
+test_expect_success GPGSSH 'verify-commit exits failure with high minTrustLevel' '
+	test_config gpg.minTrustLevel ultimate &&
+	test_must_fail git verify-commit eighth-signed-alt
+'
+
+test_expect_success GPGSSH 'verify signatures with --raw' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	(
+		for commit in initial second merge fourth-signed fifth-signed sixth-signed seventh-signed
+		do
+			git verify-commit --raw $commit 2>actual &&
+			grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+			! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+			echo $commit OK || exit 1
+		done
+	) &&
+	(
+		for commit in merge^2 fourth-unsigned sixth-unsigned seventh-unsigned
+		do
+			test_must_fail git verify-commit --raw $commit 2>actual &&
+			! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+			! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+			echo $commit OK || exit 1
+		done
+	) &&
+	(
+		for commit in eighth-signed-alt
+		do
+			test_must_fail git verify-commit --raw $commit 2>actual &&
+			grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
+			! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
+			echo $commit OK || exit 1
+		done
+	)
+'
+
+test_expect_success GPGSSH 'proper header is used for hash algorithm' '
+	git cat-file commit fourth-signed >output &&
+	grep "^$(test_oid header) -----BEGIN SSH SIGNATURE-----" output
+'
+
+test_expect_success GPGSSH 'show signed commit with signature' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git show -s initial >commit &&
+	git show -s --show-signature initial >show &&
+	git verify-commit -v initial >verify.1 2>verify.2 &&
+	git cat-file commit initial >cat &&
+	grep -v -e "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" -e "Warning: " show >show.commit &&
+	grep -e "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" -e "Warning: " show >show.gpg &&
+	grep -v "^ " cat | grep -v "^gpgsig.* " >cat.commit &&
+	test_cmp show.commit commit &&
+	test_cmp show.gpg verify.2 &&
+	test_cmp cat.commit verify.1
+'
+
+test_expect_success GPGSSH 'detect fudged signature' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git cat-file commit seventh-signed >raw &&
+	sed -e "s/^seventh/7th forged/" raw >forged1 &&
+	git hash-object -w -t commit forged1 >forged1.commit &&
+	test_must_fail git verify-commit $(cat forged1.commit) &&
+	git show --pretty=short --show-signature $(cat forged1.commit) >actual1 &&
+	grep "${GPGSSH_BAD_SIGNATURE}" actual1 &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual1 &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual1
+'
+
+test_expect_success GPGSSH 'detect fudged signature with NUL' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git cat-file commit seventh-signed >raw &&
+	cat raw >forged2 &&
+	echo Qwik | tr "Q" "\000" >>forged2 &&
+	git hash-object -w -t commit forged2 >forged2.commit &&
+	test_must_fail git verify-commit $(cat forged2.commit) &&
+	git show --pretty=short --show-signature $(cat forged2.commit) >actual2 &&
+	grep "${GPGSSH_BAD_SIGNATURE}" actual2 &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual2
+'
+
+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 -f fourth-signed^0 &&
+	git commit --amend -S --no-edit &&
+	git verify-commit HEAD &&
+	git show -s --show-signature HEAD >actual &&
+	grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+	! grep "${GPGSSH_BAD_SIGNATURE}" actual
+'
+
+test_expect_success GPGSSH 'show good signature with custom format' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2;}") &&
+	cat >expect.tmpl <<-\EOF &&
+	G
+	FINGERPRINT
+	principal with number 1
+	FINGERPRINT
+
+	EOF
+	sed "s|FINGERPRINT|$FINGERPRINT|g" expect.tmpl >expect &&
+	git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'show bad signature with custom format' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	cat >expect <<-\EOF &&
+	B
+
+
+
+
+	EOF
+	git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat forged1.commit) >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'show untrusted signature with custom format' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	cat >expect.tmpl <<-\EOF &&
+	U
+	FINGERPRINT
+
+	FINGERPRINT
+
+	EOF
+	git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
+	FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_UNTRUSTED}" | awk "{print \$2;}") &&
+	sed "s|FINGERPRINT|$FINGERPRINT|g" expect.tmpl >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'show untrusted signature with undefined trust level' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	cat >expect.tmpl <<-\EOF &&
+	undefined
+	FINGERPRINT
+
+	FINGERPRINT
+
+	EOF
+	git log -1 --format="%GT%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
+	FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_UNTRUSTED}" | awk "{print \$2;}") &&
+	sed "s|FINGERPRINT|$FINGERPRINT|g" expect.tmpl >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'show untrusted signature with ultimate trust level' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	cat >expect.tmpl <<-\EOF &&
+	fully
+	FINGERPRINT
+	principal with number 1
+	FINGERPRINT
+
+	EOF
+	git log -1 --format="%GT%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual &&
+	FINGERPRINT=$(ssh-keygen -lf "${GPGSSH_KEY_PRIMARY}" | awk "{print \$2;}") &&
+	sed "s|FINGERPRINT|$FINGERPRINT|g" expect.tmpl >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'show lack of signature with custom format' '
+	cat >expect <<-\EOF &&
+	N
+
+
+
+
+	EOF
+	git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" seventh-unsigned >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success GPGSSH 'log.showsignature behaves like --show-signature' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	test_config log.showsignature true &&
+	git show initial >actual &&
+	grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH 'check config gpg.format values' '
+	test_config gpg.format ssh &&
+	test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
+	test_config gpg.format ssh &&
+	git commit -S --amend -m "success" &&
+	test_config gpg.format OpEnPgP &&
+	test_must_fail git commit -S --amend -m "fail"
+'
+
+test_expect_failure GPGSSH 'detect fudged commit with double signature (TODO)' '
+	sed -e "/gpgsig/,/END PGP/d" forged1 >double-base &&
+	sed -n -e "/gpgsig/,/END PGP/p" forged1 | \
+		sed -e "s/^$(test_oid header)//;s/^ //" | gpg --dearmor >double-sig1.sig &&
+	gpg -o double-sig2.sig -u 29472784 --detach-sign double-base &&
+	cat double-sig1.sig double-sig2.sig | gpg --enarmor >double-combined.asc &&
+	sed -e "s/^\(-.*\)ARMORED FILE/\1SIGNATURE/;1s/^/$(test_oid header) /;2,\$s/^/ /" \
+		double-combined.asc > double-gpgsig &&
+	sed -e "/committer/r double-gpgsig" double-base >double-commit &&
+	git hash-object -w -t commit double-commit >double-commit.commit &&
+	test_must_fail git verify-commit $(cat double-commit.commit) &&
+	git show --pretty=short --show-signature $(cat double-commit.commit) >double-actual &&
+	grep "BAD signature from" double-actual &&
+	grep "Good signature from" double-actual
+'
+
+test_expect_failure GPGSSH 'show double signature with custom format (TODO)' '
+	cat >expect <<-\EOF &&
+	E
+
+
+
+
+	EOF
+	git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat double-commit.commit) >actual &&
+	test_cmp expect actual
+'
+
+
+test_expect_failure GPGSSH 'verify-commit verifies multiply signed commits (TODO)' '
+	git init multiply-signed &&
+	cd multiply-signed &&
+	test_commit first &&
+	echo 1 >second &&
+	git add second &&
+	tree=$(git write-tree) &&
+	parent=$(git rev-parse HEAD^{commit}) &&
+	git commit --gpg-sign -m second &&
+	git cat-file commit HEAD &&
+	# Avoid trailing whitespace.
+	sed -e "s/^Q//" -e "s/^Z/ /" >commit <<-EOF &&
+	Qtree $tree
+	Qparent $parent
+	Qauthor A U Thor <author@example.com> 1112912653 -0700
+	Qcommitter C O Mitter <committer@example.com> 1112912653 -0700
+	Qgpgsig -----BEGIN PGP SIGNATURE-----
+	QZ
+	Q iHQEABECADQWIQRz11h0S+chaY7FTocTtvUezd5DDQUCX/uBDRYcY29tbWl0dGVy
+	Q QGV4YW1wbGUuY29tAAoJEBO29R7N3kMNd+8AoK1I8mhLHviPH+q2I5fIVgPsEtYC
+	Q AKCTqBh+VabJceXcGIZuF0Ry+udbBQ==
+	Q =tQ0N
+	Q -----END PGP SIGNATURE-----
+	Qgpgsig-sha256 -----BEGIN PGP SIGNATURE-----
+	QZ
+	Q iHQEABECADQWIQRz11h0S+chaY7FTocTtvUezd5DDQUCX/uBIBYcY29tbWl0dGVy
+	Q QGV4YW1wbGUuY29tAAoJEBO29R7N3kMN/NEAn0XO9RYSBj2dFyozi0JKSbssYMtO
+	Q AJwKCQ1BQOtuwz//IjU8TiS+6S4iUw==
+	Q =pIwP
+	Q -----END PGP SIGNATURE-----
+	Q
+	Qsecond
+	EOF
+	head=$(git hash-object -t commit -w commit) &&
+	git reset --hard $head &&
+	git verify-commit $head 2>actual &&
+	grep "Good signature from" actual &&
+	! grep "BAD signature from" actual
+'
+
+test_done
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 1cbc9715a8..f0f6fda150 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -122,6 +122,8 @@ test_expect_success 'setup' '
 	c0=$(git rev-parse HEAD) &&
 	cp file.1 file &&
 	git add file &&
+	cp file.1 other &&
+	git add other &&
 	test_tick &&
 	git commit -m "commit 1" &&
 	git tag c1 &&
@@ -711,6 +713,16 @@ test_expect_success 'fast-forward merge with --autostash' '
 	test_cmp result.1-5 file
 '
 
+test_expect_success 'failed fast-forward merge with --autostash' '
+	git reset --hard c0 &&
+	git merge-file file file.orig file.5 &&
+	cp file.5 other &&
+	test_when_finished "rm other" &&
+	test_must_fail git merge --autostash c1 2>err &&
+	test_i18ngrep "Applied autostash." err &&
+	test_cmp file.5 file
+'
+
 test_expect_success 'octopus merge with --autostash' '
 	git reset --hard c1 &&
 	git merge-file file file.orig file.3 &&
@@ -721,6 +733,14 @@ test_expect_success 'octopus merge with --autostash' '
 	test_cmp result.1-3-5-9 file
 '
 
+test_expect_success 'failed merge (exit 2) with --autostash' '
+	git reset --hard c1 &&
+	git merge-file file file.orig file.5 &&
+	test_must_fail git merge -s recursive --autostash c2 c3 2>err &&
+	test_i18ngrep "Applied autostash." err &&
+	test_cmp result.1-5 file
+'
+
 test_expect_success 'conflicted merge with --autostash, --abort restores stash' '
 	git reset --hard c3 &&
 	cp file.1 file &&
@@ -947,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/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index 52e8ccc933..bd238d89b0 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -2,7 +2,7 @@
 
 test_description='git merge
 
-Testing pull.* configuration parsing.'
+Testing pull.* configuration parsing and other things.'
 
 . ./test-lib.sh
 
@@ -27,120 +27,324 @@ test_expect_success 'setup' '
 	git tag c3
 '
 
-test_expect_success 'pull.rebase not set' '
+test_expect_success 'pull.rebase not set, ff possible' '
 	git reset --hard c0 &&
 	git pull . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set and pull.ff=true' '
 	git reset --hard c0 &&
 	test_config pull.ff true &&
 	git pull . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set and pull.ff=false' '
 	git reset --hard c0 &&
 	test_config pull.ff false &&
 	git pull . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set and pull.ff=only' '
 	git reset --hard c0 &&
 	test_config pull.ff only &&
 	git pull . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set and --rebase given' '
 	git reset --hard c0 &&
 	git pull --rebase . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set and --no-rebase given' '
 	git reset --hard c0 &&
 	git pull --no-rebase . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set and --ff given' '
 	git reset --hard c0 &&
 	git pull --ff . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set and --no-ff given' '
 	git reset --hard c0 &&
 	git pull --no-ff . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set and --ff-only given' '
 	git reset --hard c0 &&
 	git pull --ff-only . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set (not-fast-forward)' '
 	git reset --hard c2 &&
-	git -c color.advice=always pull . c1 2>err &&
+	test_must_fail git -c color.advice=always pull . c1 2>err &&
 	test_decode_color <err >decoded &&
 	test_i18ngrep "<YELLOW>hint: " decoded &&
-	test_i18ngrep "Pulling without specifying how to reconcile" decoded
+	test_i18ngrep "You have divergent branches" decoded
 '
 
 test_expect_success 'pull.rebase not set and pull.ff=true (not-fast-forward)' '
 	git reset --hard c2 &&
 	test_config pull.ff true &&
 	git pull . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set and pull.ff=false (not-fast-forward)' '
 	git reset --hard c2 &&
 	test_config pull.ff false &&
 	git pull . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set and pull.ff=only (not-fast-forward)' '
 	git reset --hard c2 &&
 	test_config pull.ff only &&
 	test_must_fail git pull . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set and --rebase given (not-fast-forward)' '
 	git reset --hard c2 &&
 	git pull --rebase . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set and --no-rebase given (not-fast-forward)' '
 	git reset --hard c2 &&
 	git pull --no-rebase . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set and --ff given (not-fast-forward)' '
 	git reset --hard c2 &&
 	git pull --ff . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set and --no-ff given (not-fast-forward)' '
 	git reset --hard c2 &&
 	git pull --no-ff . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
 '
 
 test_expect_success 'pull.rebase not set and --ff-only given (not-fast-forward)' '
 	git reset --hard c2 &&
 	test_must_fail git pull --ff-only . c1 2>err &&
-	test_i18ngrep ! "Pulling without specifying how to reconcile" err
+	test_i18ngrep ! "You have divergent branches" err
+'
+
+test_does_rebase () {
+	git reset --hard c2 &&
+	git "$@" . c1 &&
+	# Check that we actually did a rebase
+	git rev-list --count HEAD >actual &&
+	git rev-list --merges --count HEAD >>actual &&
+	test_write_lines 3 0 >expect &&
+	test_cmp expect actual &&
+	rm actual expect
+}
+
+# Prefers merge over fast-forward
+test_does_merge_when_ff_possible () {
+	git reset --hard c0 &&
+	git "$@" . c1 &&
+	# Check that we actually did a merge
+	git rev-list --count HEAD >actual &&
+	git rev-list --merges --count HEAD >>actual &&
+	test_write_lines 3 1 >expect &&
+	test_cmp expect actual &&
+	rm actual expect
+}
+
+# Prefers fast-forward over merge or rebase
+test_does_fast_forward () {
+	git reset --hard c0 &&
+	git "$@" . c1 &&
+
+	# Check that we did not get any merges
+	git rev-list --count HEAD >actual &&
+	git rev-list --merges --count HEAD >>actual &&
+	test_write_lines 2 0 >expect &&
+	test_cmp expect actual &&
+
+	# Check that we ended up at c1
+	git rev-parse HEAD >actual &&
+	git rev-parse c1^{commit} >expect &&
+	test_cmp actual expect &&
+
+	# Remove temporary files
+	rm actual expect
+}
+
+# Doesn't fail when fast-forward not possible; does a merge
+test_falls_back_to_full_merge () {
+	git reset --hard c2 &&
+	git "$@" . c1 &&
+	# Check that we actually did a merge
+	git rev-list --count HEAD >actual &&
+	git rev-list --merges --count HEAD >>actual &&
+	test_write_lines 4 1 >expect &&
+	test_cmp expect actual &&
+	rm actual expect
+}
+
+# Attempts fast forward, which is impossible, and bails
+test_attempts_fast_forward () {
+	git reset --hard c2 &&
+	test_must_fail git "$@" . c1 2>err &&
+	test_i18ngrep "Not possible to fast-forward, aborting" err
+}
+
+#
+# Group 1: Interaction of --ff-only with --[no-]rebase
+# (And related interaction of pull.ff=only with pull.rebase)
+#
+test_expect_success '--ff-only overrides --rebase' '
+	test_attempts_fast_forward pull --rebase --ff-only
+'
+
+test_expect_success '--ff-only overrides --rebase even if first' '
+	test_attempts_fast_forward pull --ff-only --rebase
+'
+
+test_expect_success '--ff-only overrides --no-rebase' '
+	test_attempts_fast_forward pull --ff-only --no-rebase
+'
+
+test_expect_success 'pull.ff=only overrides pull.rebase=true' '
+	test_attempts_fast_forward -c pull.ff=only -c pull.rebase=true pull
+'
+
+test_expect_success 'pull.ff=only overrides pull.rebase=false' '
+	test_attempts_fast_forward -c pull.ff=only -c pull.rebase=false pull
+'
+
+# Group 2: --rebase=[!false] overrides --no-ff and --ff
+# (And related interaction of pull.rebase=!false and pull.ff=!only)
+test_expect_success '--rebase overrides --no-ff' '
+	test_does_rebase pull --rebase --no-ff
+'
+
+test_expect_success '--rebase overrides --ff' '
+	test_does_rebase pull --rebase --ff
+'
+
+test_expect_success '--rebase fast-forwards when possible' '
+	test_does_fast_forward pull --rebase --ff
+'
+
+test_expect_success 'pull.rebase=true overrides pull.ff=false' '
+	test_does_rebase -c pull.rebase=true -c pull.ff=false pull
+'
+
+test_expect_success 'pull.rebase=true overrides pull.ff=true' '
+	test_does_rebase -c pull.rebase=true -c pull.ff=true pull
+'
+
+# Group 3: command line flags take precedence over config
+test_expect_success '--ff-only takes precedence over pull.rebase=true' '
+	test_attempts_fast_forward -c pull.rebase=true pull --ff-only
+'
+
+test_expect_success '--ff-only takes precedence over pull.rebase=false' '
+	test_attempts_fast_forward -c pull.rebase=false pull --ff-only
+'
+
+test_expect_success '--no-rebase takes precedence over pull.ff=only' '
+	test_falls_back_to_full_merge -c pull.ff=only pull --no-rebase
+'
+
+test_expect_success '--rebase takes precedence over pull.ff=only' '
+	test_does_rebase -c pull.ff=only pull --rebase
+'
+
+test_expect_success '--rebase overrides pull.ff=true' '
+	test_does_rebase -c pull.ff=true pull --rebase
+'
+
+test_expect_success '--rebase overrides pull.ff=false' '
+	test_does_rebase -c pull.ff=false pull --rebase
+'
+
+test_expect_success '--rebase overrides pull.ff unset' '
+	test_does_rebase pull --rebase
+'
+
+# Group 4: --no-rebase heeds pull.ff=!only or explict --ff or --no-ff
+
+test_expect_success '--no-rebase works with --no-ff' '
+	test_does_merge_when_ff_possible pull --no-rebase --no-ff
+'
+
+test_expect_success '--no-rebase works with --ff' '
+	test_does_fast_forward pull --no-rebase --ff
+'
+
+test_expect_success '--no-rebase does ff if pull.ff unset' '
+	test_does_fast_forward pull --no-rebase
+'
+
+test_expect_success '--no-rebase heeds pull.ff=true' '
+	test_does_fast_forward -c pull.ff=true pull --no-rebase
+'
+
+test_expect_success '--no-rebase heeds pull.ff=false' '
+	test_does_merge_when_ff_possible -c pull.ff=false pull --no-rebase
+'
+
+# Group 5: pull.rebase=!false in combination with --no-ff or --ff
+test_expect_success 'pull.rebase=true and --no-ff' '
+	test_does_rebase -c pull.rebase=true pull --no-ff
+'
+
+test_expect_success 'pull.rebase=true and --ff' '
+	test_does_rebase -c pull.rebase=true pull --ff
+'
+
+test_expect_success 'pull.rebase=false and --no-ff' '
+	test_does_merge_when_ff_possible -c pull.rebase=false pull --no-ff
+'
+
+test_expect_success 'pull.rebase=false and --ff, ff possible' '
+	test_does_fast_forward -c pull.rebase=false pull --ff
+'
+
+test_expect_success 'pull.rebase=false and --ff, ff not possible' '
+	test_falls_back_to_full_merge -c pull.rebase=false pull --ff
+'
+
+# End of groupings for conflicting merge vs. rebase flags/options
+
+test_expect_success 'Multiple heads warns about inability to fast forward' '
+	git reset --hard c1 &&
+	test_must_fail git pull . c2 c3 2>err &&
+	test_i18ngrep "You have divergent branches" err
+'
+
+test_expect_success 'Multiple can never be fast forwarded' '
+	git reset --hard c0 &&
+	test_must_fail git -c pull.ff=only pull . c1 c2 c3 2>err &&
+	test_i18ngrep ! "You have divergent branches" err &&
+	# In addition to calling out "cannot fast-forward", we very much
+	# want the "multiple branches" piece to be called out to users.
+	test_i18ngrep "Cannot fast-forward to multiple branches" err
+'
+
+test_expect_success 'Cannot rebase with multiple heads' '
+	git reset --hard c0 &&
+	test_must_fail git -c pull.rebase=true pull . c1 c2 c3 2>err &&
+	test_i18ngrep ! "You have divergent branches" err &&
+	test_i18ngrep "Cannot rebase onto multiple branches." err
 '
 
 test_expect_success 'merge c1 with c2' '
@@ -183,6 +387,26 @@ test_expect_success 'pull prevents non-fast-forward with "only" in pull.ff' '
 	test_must_fail git pull . c3
 '
 
+test_expect_success 'already-up-to-date pull succeeds with unspecified pull.ff' '
+	git reset --hard c1 &&
+	git pull . c0 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+'
+
+test_expect_success 'already-up-to-date pull succeeds with "only" in pull.ff' '
+	git reset --hard c1 &&
+	test_config pull.ff only &&
+	git pull . c0 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+'
+
+test_expect_success 'already-up-to-date pull/rebase succeeds with "only" in pull.ff' '
+	git reset --hard c1 &&
+	test_config pull.ff only &&
+	git -c pull.rebase=true pull . c0 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
+'
+
 test_expect_success 'merge c1 with c2 (ours in pull.twohead)' '
 	git reset --hard c1 &&
 	git config pull.twohead ours &&
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 98948955ae..4887ca705b 100755
--- a/t/t7603-merge-reduce-heads.sh
+++ b/t/t7603-merge-reduce-heads.sh
@@ -68,7 +68,7 @@ test_expect_success 'merge c1 with c2, c3, c4, c5' '
 
 test_expect_success 'pull c2, c3, c4, c5 into c1' '
 	git reset --hard c1 &&
-	git pull . c2 c3 c4 c5 &&
+	git pull --no-rebase . c2 c3 c4 c5 &&
 	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
 	test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
 	test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
@@ -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/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh
index cd4f9607dc..eca7555101 100755
--- a/t/t7604-merge-custom-message.sh
+++ b/t/t7604-merge-custom-message.sh
@@ -4,6 +4,7 @@ test_description='git merge
 
 Testing merge when using a custom message for the merge commit.'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 create_merge_msgs() {
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index 25b235c063..5922fb5bdd 100755
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -3,6 +3,9 @@
 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 &&
@@ -63,13 +66,14 @@ test_expect_success 'objects in packs marked .keep are not repacked' '
 
 test_expect_success 'writing bitmaps via command-line can duplicate .keep objects' '
 	# build on $oid, $packid, and .keep state from previous
-	git repack -Adbl &&
+	GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 git repack -Adbl &&
 	test_has_duplicate_object true
 '
 
 test_expect_success 'writing bitmaps via config can duplicate .keep objects' '
 	# build on $oid, $packid, and .keep state from previous
-	git -c repack.writebitmaps=true repack -Adl &&
+	GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+		git -c repack.writebitmaps=true repack -Adl &&
 	test_has_duplicate_object true
 '
 
@@ -114,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
@@ -189,7 +193,9 @@ test_expect_success 'repack --keep-pack' '
 
 test_expect_success 'bitmaps are created by default in bare repos' '
 	git clone --bare .git bare.git &&
-	git -C bare.git repack -ad &&
+	rm -f bare.git/objects/pack/*.bitmap &&
+	GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+		git -C bare.git repack -ad &&
 	bitmap=$(ls bare.git/objects/pack/*.bitmap) &&
 	test_path_is_file "$bitmap"
 '
@@ -200,7 +206,8 @@ test_expect_success 'incremental repack does not complain' '
 '
 
 test_expect_success 'bitmaps can be disabled on bare repos' '
-	git -c repack.writeBitmaps=false -C bare.git repack -ad &&
+	GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+		git -c repack.writeBitmaps=false -C bare.git repack -ad &&
 	bitmap=$(ls bare.git/objects/pack/*.bitmap || :) &&
 	test -z "$bitmap"
 '
@@ -211,7 +218,8 @@ test_expect_success 'no bitmaps created if .keep files present' '
 	keep=${pack%.pack}.keep &&
 	test_when_finished "rm -f \"\$keep\"" &&
 	>"$keep" &&
-	git -C bare.git repack -ad 2>stderr &&
+	GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+		git -C bare.git repack -ad 2>stderr &&
 	test_must_be_empty stderr &&
 	find bare.git/objects/pack/ -type f -name "*.bitmap" >actual &&
 	test_must_be_empty actual
@@ -222,10 +230,155 @@ test_expect_success 'auto-bitmaps do not complain if unavailable' '
 	blob=$(test-tool genrandom big $((1024*1024)) |
 	       git -C bare.git hash-object -w --stdin) &&
 	git -C bare.git update-ref refs/tags/big $blob &&
-	git -C bare.git repack -ad 2>stderr &&
+	GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
+		git -C bare.git repack -ad 2>stderr &&
 	test_must_be_empty stderr &&
 	find bare.git/objects/pack -type f -name "*.bitmap" >actual &&
 	test_must_be_empty actual
 '
 
+objdir=.git/objects
+midx=$objdir/pack/multi-pack-index
+
+test_expect_success 'setup for --write-midx tests' '
+	git init midx &&
+	(
+		cd midx &&
+		git config core.multiPackIndex true &&
+
+		test_commit base
+	)
+'
+
+test_expect_success '--write-midx unchanged' '
+	(
+		cd midx &&
+		GIT_TEST_MULTI_PACK_INDEX=0 git repack &&
+		test_path_is_missing $midx &&
+		test_path_is_missing $midx-*.bitmap &&
+
+		GIT_TEST_MULTI_PACK_INDEX=0 git repack --write-midx &&
+
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-*.bitmap &&
+		test_midx_consistent $objdir
+	)
+'
+
+test_expect_success '--write-midx with a new pack' '
+	(
+		cd midx &&
+		test_commit loose &&
+
+		GIT_TEST_MULTI_PACK_INDEX=0 git repack --write-midx &&
+
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-*.bitmap &&
+		test_midx_consistent $objdir
+	)
+'
+
+test_expect_success '--write-midx with -b' '
+	(
+		cd midx &&
+		GIT_TEST_MULTI_PACK_INDEX=0 git repack -mb &&
+
+		test_path_is_file $midx &&
+		test_path_is_file $midx-*.bitmap &&
+		test_midx_consistent $objdir
+	)
+'
+
+test_expect_success '--write-midx with -d' '
+	(
+		cd midx &&
+		test_commit repack &&
+
+		GIT_TEST_MULTI_PACK_INDEX=0 git repack -Ad --write-midx &&
+
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-*.bitmap &&
+		test_midx_consistent $objdir
+	)
+'
+
+test_expect_success 'cleans up MIDX when appropriate' '
+	(
+		cd midx &&
+
+		test_commit repack-2 &&
+		GIT_TEST_MULTI_PACK_INDEX=0 git repack -Adb --write-midx &&
+
+		checksum=$(midx_checksum $objdir) &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$checksum.bitmap &&
+
+		test_commit repack-3 &&
+		GIT_TEST_MULTI_PACK_INDEX=0 git repack -Adb --write-midx &&
+
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-$checksum.bitmap &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+		test_commit repack-4 &&
+		GIT_TEST_MULTI_PACK_INDEX=0 git repack -Adb &&
+
+		find $objdir/pack -type f -name "multi-pack-index*" >files &&
+		test_must_be_empty files
+	)
+'
+
+test_expect_success '--write-midx with preferred bitmap tips' '
+	git init midx-preferred-tips &&
+	test_when_finished "rm -fr midx-preferred-tips" &&
+	(
+		cd midx-preferred-tips &&
+
+		test_commit_bulk --message="%s" 103 &&
+
+		git log --format="%H" >commits.raw &&
+		sort <commits.raw >commits &&
+
+		git log --format="create refs/tags/%s/%s %H" HEAD >refs &&
+		git update-ref --stdin <refs &&
+
+		git repack --write-midx --write-bitmap-index &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+
+		test-tool bitmap list-commits | sort >bitmaps &&
+		comm -13 bitmaps commits >before &&
+		test_line_count = 1 before &&
+
+		rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+		rm -fr $midx &&
+
+		# instead of constructing the snapshot ourselves (c.f., the test
+		# "write a bitmap with --refs-snapshot (preferred tips)" in
+		# t5326), mark the missing commit as preferred by adding it to
+		# the pack.preferBitmapTips configuration.
+		git for-each-ref --format="%(refname:rstrip=1)" \
+			--points-at="$(cat before)" >missing &&
+		git config pack.preferBitmapTips "$(cat missing)" &&
+		git repack --write-midx --write-bitmap-index &&
+
+		test-tool bitmap list-commits | sort >bitmaps &&
+		comm -13 bitmaps commits >after &&
+
+		! test_cmp before after
+	)
+'
+
+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/t7703-repack-geometric.sh b/t/t7703-repack-geometric.sh
index 5ccaa440e0..bdbbcbf1ec 100755
--- a/t/t7703-repack-geometric.sh
+++ b/t/t7703-repack-geometric.sh
@@ -15,7 +15,7 @@ test_expect_success '--geometric with no packs' '
 	(
 		cd geometric &&
 
-		git repack --geometric 2 >out &&
+		git repack --write-midx --geometric 2 >out &&
 		test_i18ngrep "Nothing new to pack" out
 	)
 '
@@ -180,4 +180,26 @@ test_expect_success '--geometric ignores kept packs' '
 	)
 '
 
+test_expect_success '--geometric chooses largest MIDX preferred pack' '
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
+	(
+		cd geometric &&
+
+		# These packs already form a geometric progression.
+		test_commit_bulk --start=1 1 && # 3 objects
+		test_commit_bulk --start=2 2 && # 6 objects
+		ls $objdir/pack/pack-*.idx >before &&
+		test_commit_bulk --start=4 4 && # 12 objects
+		ls $objdir/pack/pack-*.idx >after &&
+
+		git repack --geometric 2 -dbm &&
+
+		comm -3 before after | xargs -n 1 basename >expect &&
+		test-tool read-midx --preferred-pack $objdir >actual &&
+
+		test_cmp expect actual
+	)
+'
+
 test_done
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index a173f564bc..096456292c 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -453,6 +453,13 @@ run_dir_diff_test 'difftool --dir-diff' '
 	grep "^file$" output
 '
 
+run_dir_diff_test 'difftool --dir-diff avoids repeated slashes in TMPDIR' '
+	TMPDIR="${TMPDIR:-/tmp}////" \
+		git difftool --dir-diff $symlinks --extcmd echo branch >output &&
+	grep -v // output >actual &&
+	test_line_count = 1 actual
+'
+
 run_dir_diff_test 'difftool --dir-diff ignores --prompt' '
 	git difftool --dir-diff $symlinks --prompt --extcmd ls branch >output &&
 	grep "^sub$" output &&
@@ -674,7 +681,6 @@ test_expect_success SYMLINKS 'difftool --dir-diff handles modified symlinks' '
 	rm c &&
 	ln -s d c &&
 	cat >expect <<-EOF &&
-		b
 		c
 
 		c
@@ -710,7 +716,6 @@ test_expect_success SYMLINKS 'difftool --dir-diff handles modified symlinks' '
 	# Deleted symlinks
 	rm -f c &&
 	cat >expect <<-EOF &&
-		b
 		c
 
 	EOF
@@ -723,6 +728,71 @@ test_expect_success SYMLINKS 'difftool --dir-diff handles modified symlinks' '
 	test_cmp expect actual
 '
 
+test_expect_success SYMLINKS 'difftool --dir-diff writes symlinks as raw text' '
+	# Start out on a branch called "branch-init".
+	git init -b branch-init symlink-files &&
+	(
+		cd symlink-files &&
+		# This test ensures that symlinks are written as raw text.
+		# The "cat" tools output link and file contents.
+		git config difftool.cat-left-link.cmd "cat \"\$LOCAL/link\"" &&
+		git config difftool.cat-left-a.cmd "cat \"\$LOCAL/file-a\"" &&
+		git config difftool.cat-right-link.cmd "cat \"\$REMOTE/link\"" &&
+		git config difftool.cat-right-b.cmd "cat \"\$REMOTE/file-b\"" &&
+
+		# Record the empty initial state so that we can come back here
+		# later and not have to consider the any cases where difftool
+		# will create symlinks back into the worktree.
+		test_tick &&
+		git commit --allow-empty -m init &&
+
+		# Create a file called "file-a" with a symlink pointing to it.
+		git switch -c branch-a &&
+		echo a >file-a &&
+		ln -s file-a link &&
+		git add file-a link &&
+		test_tick &&
+		git commit -m link-to-file-a &&
+
+		# Create a file called "file-b" and point the symlink to it.
+		git switch -c branch-b &&
+		echo b >file-b &&
+		rm link &&
+		ln -s file-b link &&
+		git add file-b link &&
+		git rm file-a &&
+		test_tick &&
+		git commit -m link-to-file-b &&
+
+		# Checkout the initial branch so that the --symlinks behavior is
+		# not activated. The two directories should be completely
+		# independent with no symlinks pointing back here.
+		git switch branch-init &&
+
+		# The left link must be "file-a" and "file-a" must contain "a".
+		echo file-a >expect &&
+		git difftool --symlinks --dir-diff --tool cat-left-link \
+			branch-a branch-b >actual &&
+		test_cmp expect actual &&
+
+		echo a >expect &&
+		git difftool --symlinks --dir-diff --tool cat-left-a \
+			branch-a branch-b >actual &&
+		test_cmp expect actual &&
+
+		# The right link must be "file-b" and "file-b" must contain "b".
+		echo file-b >expect &&
+		git difftool --symlinks --dir-diff --tool cat-right-link \
+			branch-a branch-b >actual &&
+		test_cmp expect actual &&
+
+		echo b >expect &&
+		git difftool --symlinks --dir-diff --tool cat-right-b \
+			branch-a branch-b >actual &&
+		test_cmp expect actual
+	)
+'
+
 test_expect_success 'add -N and difftool -d' '
 	test_when_finished git reset --hard &&
 
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/t7811-grep-open.sh b/t/t7811-grep-open.sh
index a98785da79..1dd07141a7 100755
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -3,6 +3,7 @@
 test_description='git grep --open-files-in-pager
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-pager.sh
 unset PAGER GIT_PAGER
@@ -114,8 +115,8 @@ test_expect_success 'modified file' '
 	unrelated
 	EOF
 
+	test_when_finished "git reset --hard" &&
 	echo "enum grep_pat_token" >unrelated &&
-	test_when_finished "git checkout HEAD unrelated" &&
 	GIT_PAGER=./less git grep -F -O "enum grep_pat_token" >out &&
 	test_cmp expect actual &&
 	test_must_be_empty out
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/t7813-grep-icase-iso.sh b/t/t7813-grep-icase-iso.sh
index 701e08a8e5..1227885737 100755
--- a/t/t7813-grep-icase-iso.sh
+++ b/t/t7813-grep-icase-iso.sh
@@ -2,6 +2,7 @@
 
 test_description='grep icase on non-English locales'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./lib-gettext.sh
 
 test_expect_success GETTEXT_ISO_LOCALE 'setup' '
diff --git a/t/t7814-grep-recurse-submodules.sh b/t/t7814-grep-recurse-submodules.sh
index 828cb3ba58..058e5d0c96 100755
--- a/t/t7814-grep-recurse-submodules.sh
+++ b/t/t7814-grep-recurse-submodules.sh
@@ -8,6 +8,9 @@ submodules.
 
 . ./test-lib.sh
 
+GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
+export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
+
 test_expect_success 'setup directory structure and submodule' '
 	echo "(1|2)d(3|4)" >a &&
 	mkdir b &&
@@ -438,4 +441,107 @@ test_expect_success 'grep --recurse-submodules with --cached ignores worktree mo
 	test_must_fail git grep --recurse-submodules --cached "A modified line in submodule" >actual 2>&1 &&
 	test_must_be_empty actual
 '
+
+test_expect_failure 'grep --textconv: superproject .gitattributes does not affect submodules' '
+	reset_and_clean &&
+	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+	echo "a diff=d2x" >.gitattributes &&
+
+	cat >expect <<-\EOF &&
+	a:(1|2)x(3|4)
+	EOF
+	git grep --textconv --recurse-submodules x >actual &&
+	test_cmp expect actual
+'
+
+test_expect_failure 'grep --textconv: superproject .gitattributes (from index) does not affect submodules' '
+	reset_and_clean &&
+	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+	echo "a diff=d2x" >.gitattributes &&
+	git add .gitattributes &&
+	rm .gitattributes &&
+
+	cat >expect <<-\EOF &&
+	a:(1|2)x(3|4)
+	EOF
+	git grep --textconv --recurse-submodules x >actual &&
+	test_cmp expect actual
+'
+
+test_expect_failure 'grep --textconv: superproject .git/info/attributes does not affect submodules' '
+	reset_and_clean &&
+	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+	super_attr="$(git rev-parse --git-path info/attributes)" &&
+	test_when_finished "rm -f \"$super_attr\"" &&
+	echo "a diff=d2x" >"$super_attr" &&
+
+	cat >expect <<-\EOF &&
+	a:(1|2)x(3|4)
+	EOF
+	git grep --textconv --recurse-submodules x >actual &&
+	test_cmp expect actual
+'
+
+# Note: what currently prevents this test from passing is not that the
+# .gitattributes file from "./submodule" is being ignored, but that it is being
+# propagated to the nested "./submodule/sub" files.
+#
+test_expect_failure 'grep --textconv correctly reads submodule .gitattributes' '
+	reset_and_clean &&
+	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+	echo "a diff=d2x" >submodule/.gitattributes &&
+
+	cat >expect <<-\EOF &&
+	submodule/a:(1|2)x(3|4)
+	EOF
+	git grep --textconv --recurse-submodules x >actual &&
+	test_cmp expect actual
+'
+
+test_expect_failure 'grep --textconv correctly reads submodule .gitattributes (from index)' '
+	reset_and_clean &&
+	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+	echo "a diff=d2x" >submodule/.gitattributes &&
+	git -C submodule add .gitattributes &&
+	rm submodule/.gitattributes &&
+
+	cat >expect <<-\EOF &&
+	submodule/a:(1|2)x(3|4)
+	EOF
+	git grep --textconv --recurse-submodules x >actual &&
+	test_cmp expect actual
+'
+
+test_expect_failure 'grep --textconv correctly reads submodule .git/info/attributes' '
+	reset_and_clean &&
+	test_config_global diff.d2x.textconv "sed -e \"s/d/x/\"" &&
+
+	submodule_attr="$(git -C submodule rev-parse --path-format=absolute --git-path info/attributes)" &&
+	test_when_finished "rm -f \"$submodule_attr\"" &&
+	echo "a diff=d2x" >"$submodule_attr" &&
+
+	cat >expect <<-\EOF &&
+	submodule/a:(1|2)x(3|4)
+	EOF
+	git grep --textconv --recurse-submodules x >actual &&
+	test_cmp expect actual
+'
+
+test_expect_failure 'grep saves textconv cache in the appropriate repository' '
+	reset_and_clean &&
+	test_config_global diff.d2x_cached.textconv "sed -e \"s/d/x/\"" &&
+	test_config_global diff.d2x_cached.cachetextconv true &&
+	echo "a diff=d2x_cached" >submodule/.gitattributes &&
+
+	# We only read/write to the textconv cache when grepping from an OID,
+	# as the working tree file might have modifications.
+	git grep --textconv --cached --recurse-submodules x &&
+
+	super_textconv_cache="$(git rev-parse --git-path refs/notes/textconv/d2x_cached)" &&
+	sub_textconv_cache="$(git -C submodule rev-parse \
+			--path-format=absolute --git-path refs/notes/textconv/d2x_cached)" &&
+	test_path_is_missing "$super_textconv_cache" &&
+	test_path_is_file "$sub_textconv_cache"
+'
+
 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/t7816-grep-binary-pattern.sh b/t/t7816-grep-binary-pattern.sh
index 9d67a5fc4c..fdb2355649 100755
--- a/t/t7816-grep-binary-pattern.sh
+++ b/t/t7816-grep-binary-pattern.sh
@@ -2,6 +2,7 @@
 
 test_description='git grep with a binary pattern files'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./lib-gettext.sh
 
 nul_match_internal () {
diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
index 58f46c77e6..74aa638475 100755
--- a/t/t7900-maintenance.sh
+++ b/t/t7900-maintenance.sh
@@ -20,6 +20,17 @@ test_xmllint () {
 	fi
 }
 
+test_lazy_prereq SYSTEMD_ANALYZE '
+	systemd-analyze verify /lib/systemd/system/basic.target
+'
+
+test_systemd_analyze_verify () {
+	if test_have_prereq SYSTEMD_ANALYZE
+	then
+		systemd-analyze verify "$@"
+	fi
+}
+
 test_expect_success 'help text' '
 	test_expect_code 129 git maintenance -h 2>err &&
 	test_i18ngrep "usage: git maintenance <subcommand>" err &&
@@ -265,7 +276,7 @@ test_expect_success 'incremental-repack task' '
 
 	# Delete refs that have not been repacked in these packs.
 	git for-each-ref --format="delete %(refname)" \
-		refs/prefetch refs/tags >refs &&
+		refs/prefetch refs/tags refs/remotes >refs &&
 	git update-ref --stdin <refs &&
 
 	# Replace the object directory with this pack layout.
@@ -274,6 +285,10 @@ test_expect_success 'incremental-repack task' '
 	ls $packDir/*.pack >packs-before &&
 	test_line_count = 3 packs-before &&
 
+	# make sure we do not have any broken refs that were
+	# missed in the deletion above
+	git for-each-ref &&
+
 	# the job repacks the two into a new pack, but does not
 	# delete the old ones.
 	git maintenance run --task=incremental-repack &&
@@ -321,15 +336,15 @@ test_expect_success EXPENSIVE 'incremental-repack 2g limit' '
 		 --no-progress --batch-size=2147483647 <run-2g.txt
 '
 
-test_expect_success 'maintenance.incremental-repack.auto' '
+run_incremental_repack_and_verify () {
+	test_commit A &&
 	git repack -adk &&
-	git config core.multiPackIndex true &&
 	git multi-pack-index write &&
 	GIT_TRACE2_EVENT="$(pwd)/midx-init.txt" git \
 		-c maintenance.incremental-repack.auto=1 \
 		maintenance run --auto --task=incremental-repack 2>/dev/null &&
 	test_subcommand ! git multi-pack-index write --no-progress <midx-init.txt &&
-	test_commit A &&
+	test_commit B &&
 	git pack-objects --revs .git/objects/pack/pack <<-\EOF &&
 	HEAD
 	^HEAD~1
@@ -338,7 +353,7 @@ test_expect_success 'maintenance.incremental-repack.auto' '
 		-c maintenance.incremental-repack.auto=2 \
 		maintenance run --auto --task=incremental-repack 2>/dev/null &&
 	test_subcommand ! git multi-pack-index write --no-progress <trace-A &&
-	test_commit B &&
+	test_commit C &&
 	git pack-objects --revs .git/objects/pack/pack <<-\EOF &&
 	HEAD
 	^HEAD~1
@@ -347,6 +362,26 @@ test_expect_success 'maintenance.incremental-repack.auto' '
 		-c maintenance.incremental-repack.auto=2 \
 		maintenance run --auto --task=incremental-repack 2>/dev/null &&
 	test_subcommand git multi-pack-index write --no-progress <trace-B
+}
+
+test_expect_success 'maintenance.incremental-repack.auto' '
+	rm -rf incremental-repack-true &&
+	git init incremental-repack-true &&
+	(
+		cd incremental-repack-true &&
+		git config core.multiPackIndex true &&
+		run_incremental_repack_and_verify
+	)
+'
+
+test_expect_success 'maintenance.incremental-repack.auto (when config is unset)' '
+	rm -rf incremental-repack-unset &&
+	git init incremental-repack-unset &&
+	(
+		cd incremental-repack-unset &&
+		test_unconfig core.multiPackIndex &&
+		run_incremental_repack_and_verify
+	)
 '
 
 test_expect_success 'pack-refs task' '
@@ -492,8 +527,21 @@ test_expect_success !MINGW 'register and unregister with regex metacharacters' '
 		maintenance.repo "$(pwd)/$META"
 '
 
+test_expect_success 'start --scheduler=<scheduler>' '
+	test_expect_code 129 git maintenance start --scheduler=foo 2>err &&
+	test_i18ngrep "unrecognized --scheduler argument" err &&
+
+	test_expect_code 129 git maintenance start --no-scheduler 2>err &&
+	test_i18ngrep "unknown option" err &&
+
+	test_expect_code 128 \
+		env GIT_TEST_MAINT_SCHEDULER="launchctl:true,schtasks:true" \
+		git maintenance start --scheduler=crontab 2>err &&
+	test_i18ngrep "fatal: crontab scheduler is not available" err
+'
+
 test_expect_success 'start from empty cron table' '
-	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start &&
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start --scheduler=crontab &&
 
 	# start registers the repo
 	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
@@ -516,7 +564,7 @@ test_expect_success 'stop from existing schedule' '
 
 test_expect_success 'start preserves existing schedule' '
 	echo "Important information!" >cron.txt &&
-	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start &&
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start --scheduler=crontab &&
 	grep "Important information!" cron.txt
 '
 
@@ -545,7 +593,7 @@ test_expect_success 'start and stop macOS maintenance' '
 	EOF
 
 	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start &&
+	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
 
 	# start registers the repo
 	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
@@ -582,6 +630,23 @@ test_expect_success 'start and stop macOS maintenance' '
 	test_line_count = 0 actual
 '
 
+test_expect_success 'use launchctl list to prevent extra work' '
+	# ensure we are registered
+	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
+
+	# do it again on a fresh args file
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
+
+	ls "$HOME/Library/LaunchAgents" >actual &&
+	cat >expect <<-\EOF &&
+	list org.git-scm.git.hourly
+	list org.git-scm.git.daily
+	list org.git-scm.git.weekly
+	EOF
+	test_cmp expect args
+'
+
 test_expect_success 'start and stop Windows maintenance' '
 	write_script print-args <<-\EOF &&
 	echo $* >>args
@@ -596,7 +661,7 @@ test_expect_success 'start and stop Windows maintenance' '
 	EOF
 
 	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance start &&
+	GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance start --scheduler=schtasks &&
 
 	# start registers the repo
 	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
@@ -619,6 +684,83 @@ test_expect_success 'start and stop Windows maintenance' '
 	test_cmp expect args
 '
 
+test_expect_success 'start and stop Linux/systemd maintenance' '
+	write_script print-args <<-\EOF &&
+	printf "%s\n" "$*" >>args
+	EOF
+
+	XDG_CONFIG_HOME="$PWD" &&
+	export XDG_CONFIG_HOME &&
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args" git maintenance start --scheduler=systemd-timer &&
+
+	# start registers the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	test_systemd_analyze_verify "systemd/user/git-maintenance@.service" &&
+
+	printf -- "--user enable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+	test_cmp expect args &&
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args" git maintenance stop &&
+
+	# stop does not unregister the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	test_path_is_missing "systemd/user/git-maintenance@.timer" &&
+	test_path_is_missing "systemd/user/git-maintenance@.service" &&
+
+	printf -- "--user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+	test_cmp expect args
+'
+
+test_expect_success 'start and stop when several schedulers are available' '
+	write_script print-args <<-\EOF &&
+	printf "%s\n" "$*" | sed "s:gui/[0-9][0-9]*:gui/[UID]:; s:\(schtasks /create .* /xml\).*:\1:;" >>args
+	EOF
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=systemd-timer &&
+	printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+		hourly daily weekly >expect &&
+	printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
+		hourly daily weekly >>expect &&
+	printf -- "systemctl --user enable --now git-maintenance@%s.timer\n" hourly daily weekly >>expect &&
+	test_cmp expect args &&
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=launchctl &&
+	printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+	printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
+		hourly daily weekly >>expect &&
+	for frequency in hourly daily weekly
+	do
+		PLIST="$pfx/Library/LaunchAgents/org.git-scm.git.$frequency.plist" &&
+		echo "launchctl bootout gui/[UID] $PLIST" >>expect &&
+		echo "launchctl bootstrap gui/[UID] $PLIST" >>expect || return 1
+	done &&
+	test_cmp expect args &&
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=schtasks &&
+	printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+	printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+		hourly daily weekly >>expect &&
+	printf "schtasks /create /tn Git Maintenance (%s) /f /xml\n" \
+		hourly daily weekly >>expect &&
+	test_cmp expect args &&
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance stop &&
+	printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+	printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+		hourly daily weekly >>expect &&
+	printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
+		hourly daily weekly >>expect &&
+	test_cmp expect args
+'
+
 test_expect_success 'register preserves existing strategy' '
 	git config maintenance.strategy none &&
 	git maintenance register &&
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/t8007-cat-file-textconv.sh b/t/t8007-cat-file-textconv.sh
index eacd49ade6..b067983ba1 100755
--- a/t/t8007-cat-file-textconv.sh
+++ b/t/t8007-cat-file-textconv.sh
@@ -19,6 +19,48 @@ test_expect_success 'setup ' '
 	GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
 '
 
+test_expect_success 'usage: <bad rev>' '
+	cat >expect <<-\EOF &&
+	fatal: Not a valid object name HEAD2
+	EOF
+	test_must_fail git cat-file --textconv HEAD2 2>actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'usage: <bad rev>:<bad path>' '
+	cat >expect <<-\EOF &&
+	fatal: invalid object name '\''HEAD2'\''.
+	EOF
+	test_must_fail git cat-file --textconv HEAD2:two.bin 2>actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'usage: <rev>:<bad path>' '
+	cat >expect <<-\EOF &&
+	fatal: path '\''two.bin'\'' does not exist in '\''HEAD'\''
+	EOF
+	test_must_fail git cat-file --textconv HEAD:two.bin 2>actual &&
+	test_cmp expect actual
+'
+
+
+test_expect_success 'usage: <rev> with no <path>' '
+	cat >expect <<-\EOF &&
+	fatal: <object>:<path> required, only <object> '\''HEAD'\'' given
+	EOF
+	test_must_fail git cat-file --textconv HEAD 2>actual &&
+	test_cmp expect actual
+'
+
+
+test_expect_success 'usage: <bad rev>:<good (in HEAD) path>' '
+	cat >expect <<-\EOF &&
+	fatal: invalid object name '\''HEAD2'\''.
+	EOF
+	test_must_fail git cat-file --textconv HEAD2:one.bin 2>actual &&
+	test_cmp expect actual
+'
+
 cat >expected <<EOF
 bin: test version 2
 EOF
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/t9001-send-email.sh b/t/t9001-send-email.sh
index 57fc10e7f8..84d0f40d76 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -539,7 +539,7 @@ test_expect_success $PREREQ "--validate respects relative core.hooksPath path" '
 	test_path_is_file my-hooks.ran &&
 	cat >expect <<-EOF &&
 	fatal: longline.patch: rejected by sendemail-validate hook
-	fatal: command '"'"'my-hooks/sendemail-validate'"'"' died with exit code 1
+	fatal: command '"'"'git hook run --ignore-missing sendemail-validate -- <patch>'"'"' died with exit code 1
 	warning: no patches were sent
 	EOF
 	test_cmp expect actual
@@ -558,7 +558,7 @@ test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" '
 	test_path_is_file my-hooks.ran &&
 	cat >expect <<-EOF &&
 	fatal: longline.patch: rejected by sendemail-validate hook
-	fatal: command '"'"'$hooks_path/sendemail-validate'"'"' died with exit code 1
+	fatal: command '"'"'git hook run --ignore-missing sendemail-validate -- <patch>'"'"' died with exit code 1
 	warning: no patches were sent
 	EOF
 	test_cmp expect actual
@@ -1533,6 +1533,21 @@ test_expect_success $PREREQ 'sendemail.8bitEncoding works' '
 	test_cmp content-type-decl actual
 '
 
+test_expect_success $PREREQ 'sendemail.8bitEncoding in .git/config overrides --global .gitconfig' '
+	clean_fake_sendmail &&
+	git config sendemail.assume8bitEncoding UTF-8 &&
+	test_when_finished "rm -rf home" &&
+	mkdir home &&
+	git config -f home/.gitconfig sendemail.assume8bitEncoding "bogus too" &&
+	echo bogus |
+	env HOME="$(pwd)/home" DEBUG=1 \
+	git send-email --from=author@example.com --to=nobody@example.com \
+			--smtp-server="$(pwd)/fake.sendmail" \
+			email-using-8bit >stdout &&
+	egrep "Content|MIME" msgtxt1 >actual &&
+	test_cmp content-type-decl actual
+'
+
 test_expect_success $PREREQ '--8bit-encoding overrides sendemail.8bitEncoding' '
 	clean_fake_sendmail &&
 	git config sendemail.assume8bitEncoding "bogus too" &&
@@ -2198,7 +2213,7 @@ test_expect_success $PREREQ 'leading and trailing whitespaces are removed' '
 
 test_expect_success $PREREQ 'test using command name with --sendmail-cmd' '
 	clean_fake_sendmail &&
-	PATH="$(pwd):$PATH" \
+	PATH="$PWD:$PATH" \
 	git send-email \
 		--from="Example <nobody@example.com>" \
 		--to=nobody@example.com \
@@ -2227,6 +2242,51 @@ test_expect_success $PREREQ 'test shell expression with --sendmail-cmd' '
 	test_path_is_file commandline1
 '
 
+test_expect_success $PREREQ 'set up in-reply-to/references patches' '
+	cat >has-reply.patch <<-\EOF &&
+	From: A U Thor <author@example.com>
+	Subject: patch with in-reply-to
+	Message-ID: <patch.with.in.reply.to@example.com>
+	In-Reply-To: <replied.to@example.com>
+	References: <replied.to@example.com>
+
+	This is the body.
+	EOF
+	cat >no-reply.patch <<-\EOF
+	From: A U Thor <author@example.com>
+	Subject: patch without in-reply-to
+	Message-ID: <patch.without.in.reply.to@example.com>
+
+	This is the body.
+	EOF
+'
+
+test_expect_success $PREREQ 'patch reply headers correct with --no-thread' '
+	clean_fake_sendmail &&
+	git send-email \
+		--no-thread \
+		--to=nobody@example.com \
+		--smtp-server="$(pwd)/fake.sendmail" \
+		has-reply.patch no-reply.patch &&
+	grep "In-Reply-To: <replied.to@example.com>" msgtxt1 &&
+	grep "References: <replied.to@example.com>" msgtxt1 &&
+	! grep replied.to@example.com msgtxt2
+'
+
+test_expect_success $PREREQ 'cmdline in-reply-to used with --no-thread' '
+	clean_fake_sendmail &&
+	git send-email \
+		--no-thread \
+		--in-reply-to="<cmdline.reply@example.com>" \
+		--to=nobody@example.com \
+		--smtp-server="$(pwd)/fake.sendmail" \
+		has-reply.patch no-reply.patch &&
+	grep "In-Reply-To: <cmdline.reply@example.com>" msgtxt1 &&
+	grep "References: <cmdline.reply@example.com>" msgtxt1 &&
+	grep "In-Reply-To: <cmdline.reply@example.com>" msgtxt2 &&
+	grep "References: <cmdline.reply@example.com>" msgtxt2
+'
+
 test_expect_success $PREREQ 'invoke hook' '
 	mkdir -p .git/hooks &&
 
diff --git a/t/t9002-column.sh b/t/t9002-column.sh
index 89983527b6..6d3dbde3fe 100755
--- a/t/t9002-column.sh
+++ b/t/t9002-column.sh
@@ -42,6 +42,24 @@ EOF
 	test_cmp expected actual
 '
 
+test_expect_success '--nl' '
+	cat >expected <<\EOF &&
+oneZ
+twoZ
+threeZ
+fourZ
+fiveZ
+sixZ
+sevenZ
+eightZ
+nineZ
+tenZ
+elevenZ
+EOF
+	git column --nl="Z$LF" --mode=plain <lista >actual &&
+	test_cmp expected actual
+'
+
 test_expect_success '80 columns' '
 	cat >expected <<\EOF &&
 one    two    three  four   five   six    seven  eight  nine   ten    eleven
diff --git a/t/t9102-git-svn-deep-rmdir.sh b/t/t9102-git-svn-deep-rmdir.sh
index 66cd51102c..946ef85eb9 100755
--- a/t/t9102-git-svn-deep-rmdir.sh
+++ b/t/t9102-git-svn-deep-rmdir.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 test_description='git svn rmdir'
+
 . ./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/t9128-git-svn-cmd-branch.sh b/t/t9128-git-svn-cmd-branch.sh
index 4e95f791db..783e3ba0c5 100755
--- a/t/t9128-git-svn-cmd-branch.sh
+++ b/t/t9128-git-svn-cmd-branch.sh
@@ -4,6 +4,7 @@
 #
 
 test_description='git svn partial-rebuild tests'
+
 . ./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..d8128430a8 100755
--- a/t/t9167-git-svn-cmd-branch-subproject.sh
+++ b/t/t9167-git-svn-cmd-branch-subproject.sh
@@ -4,6 +4,7 @@
 #
 
 test_description='git svn branch for subproject clones'
+
 . ./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/t9351-fast-export-anonymize.sh b/t/t9351-fast-export-anonymize.sh
index 1c6e6fcdaf..77047e250d 100755
--- a/t/t9351-fast-export-anonymize.sh
+++ b/t/t9351-fast-export-anonymize.sh
@@ -18,7 +18,8 @@ test_expect_success 'setup simple repo' '
 	git update-index --add --cacheinfo 160000,$fake_commit,link1 &&
 	git update-index --add --cacheinfo 160000,$fake_commit,link2 &&
 	git commit -m "add gitlink" &&
-	git tag -m "annotated tag" mytag
+	git tag -m "annotated tag" mytag &&
+	git tag -m "annotated tag with long message" longtag
 '
 
 test_expect_success 'export anonymized stream' '
@@ -55,7 +56,8 @@ test_expect_success 'stream retains other as refname' '
 
 test_expect_success 'stream omits other refnames' '
 	! grep main stream &&
-	! grep mytag stream
+	! grep mytag stream &&
+	! grep longtag stream
 '
 
 test_expect_success 'stream omits identities' '
@@ -118,9 +120,9 @@ test_expect_success 'identical gitlinks got identical oid' '
 	test_line_count = 1 commits
 '
 
-test_expect_success 'tag points to branch tip' '
+test_expect_success 'all tags point to branch tip' '
 	git rev-parse $other_branch >expect &&
-	git for-each-ref --format="%(*objectname)" | grep . >actual &&
+	git for-each-ref --format="%(*objectname)" | grep . | uniq >actual &&
 	test_cmp expect actual
 '
 
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index 2d29d486ee..210ddf09e3 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -36,6 +36,13 @@ CVSWORK="$PWD/cvswork"
 CVS_SERVER=git-cvsserver
 export CVSROOT CVS_SERVER
 
+if perl -e 'exit(1) if not defined crypt("", "cv")'
+then
+	PWDHASH='lac2ItudM3.KM'
+else
+	PWDHASH='$2b$10$t8fGvE/a9eLmfOLzsZme2uOa2QtoMYwIxq9wZA6aBKtF1Yb7FJIzi'
+fi
+
 rm -rf "$CVSWORK" "$SERVERDIR"
 test_expect_success 'setup' '
   git config push.default matching &&
@@ -54,7 +61,7 @@ test_expect_success 'setup' '
   GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
   GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log" &&
   GIT_DIR="$SERVERDIR" git config gitcvs.authdb "$SERVERDIR/auth.db" &&
-  echo cvsuser:cvGVEarMLnhlA > "$SERVERDIR/auth.db"
+  echo "cvsuser:$PWDHASH" >"$SERVERDIR/auth.db"
 '
 
 # note that cvs doesn't accept absolute pathnames
@@ -331,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 &&
@@ -343,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)' \
@@ -375,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 &&
@@ -585,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 cb057ef161..24117cb901 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 ()
@@ -540,6 +537,15 @@ test_expect_success '__gitcomp - expand/narrow all negative options' '
 	EOF
 '
 
+test_expect_success '__gitcomp - equal skip' '
+	test_gitcomp "--option=" "--option=" <<-\EOF &&
+
+	EOF
+	test_gitcomp "option=" "option=" <<-\EOF
+
+	EOF
+'
+
 test_expect_success '__gitcomp - doesnt fail because of invalid variable name' '
 	__gitcomp "$invalid_variable_name"
 '
@@ -870,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= &&
@@ -1043,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 &&
@@ -1438,6 +1444,144 @@ test_expect_success 'git checkout - with --detach, complete only references' '
 	EOF
 '
 
+test_expect_success 'setup sparse-checkout tests' '
+	# set up sparse-checkout repo
+	git init sparse-checkout &&
+	(
+		cd sparse-checkout &&
+		mkdir -p folder1/0/1 folder2/0 folder3 &&
+		touch folder1/0/1/t.txt &&
+		touch folder2/0/t.txt &&
+		touch folder3/t.txt &&
+		git add . &&
+		git commit -am "Initial commit"
+	)
+'
+
+test_expect_success 'sparse-checkout completes subcommands' '
+	test_completion "git sparse-checkout " <<-\EOF
+	list Z
+	init Z
+	set Z
+	add Z
+	reapply Z
+	disable Z
+	EOF
+'
+
+test_expect_success 'cone mode sparse-checkout completes directory names' '
+	# initialize sparse-checkout definitions
+	git -C sparse-checkout sparse-checkout set --cone folder1/0 folder3 &&
+
+	# test tab completion
+	(
+		cd sparse-checkout &&
+		test_completion "git sparse-checkout set f" <<-\EOF
+		folder1/
+		folder2/
+		folder3/
+		EOF
+	) &&
+
+	(
+		cd sparse-checkout &&
+		test_completion "git sparse-checkout set folder1/" <<-\EOF
+		folder1/0/
+		EOF
+	) &&
+
+	(
+		cd sparse-checkout &&
+		test_completion "git sparse-checkout set folder1/0/" <<-\EOF
+		folder1/0/1/
+		EOF
+	) &&
+
+	(
+		cd sparse-checkout/folder1 &&
+		test_completion "git sparse-checkout add 0" <<-\EOF
+		0/
+		EOF
+	)
+'
+
+test_expect_success 'cone mode sparse-checkout completes directory names with spaces and accents' '
+	# reset sparse-checkout
+	git -C sparse-checkout sparse-checkout disable &&
+	(
+		cd sparse-checkout &&
+		mkdir "directory with spaces" &&
+		mkdir "directory-with-áccent" &&
+		>"directory with spaces/randomfile" &&
+		>"directory-with-áccent/randomfile" &&
+		git add . &&
+		git commit -m "Add directory with spaces and directory with accent" &&
+		git sparse-checkout set --cone "directory with spaces" \
+			"directory-with-áccent" &&
+		test_completion "git sparse-checkout add dir" <<-\EOF &&
+		directory with spaces/
+		directory-with-áccent/
+		EOF
+		rm -rf "directory with spaces" &&
+		rm -rf "directory-with-áccent" &&
+		git add . &&
+		git commit -m "Remove directory with spaces and directory with accent"
+	)
+'
+
+# use FUNNYNAMES to avoid running on Windows, which doesn't permit backslashes or tabs in paths
+test_expect_success FUNNYNAMES 'cone mode sparse-checkout completes directory names with backslashes and tabs' '
+	# reset sparse-checkout
+	git -C sparse-checkout sparse-checkout disable &&
+	(
+		cd sparse-checkout &&
+		mkdir "directory\with\backslashes" &&
+		mkdir "$(printf "directory\twith\ttabs")" &&
+		>"directory\with\backslashes/randomfile" &&
+		>"$(printf "directory\twith\ttabs")/randomfile" &&
+		git add . &&
+		git commit -m "Add directory with backslashes and directory with tabs" &&
+		git sparse-checkout set --cone "directory\with\backslashes" \
+			"$(printf "directory\twith\ttabs")" &&
+		test_completion "git sparse-checkout add dir" <<-\EOF &&
+		directory\with\backslashes/
+		directory	with	tabs/
+		EOF
+		rm -rf "directory\with\backslashes" &&
+		rm -rf "$(printf "directory\twith\ttabs")" &&
+		git add . &&
+		git commit -m "Remove directory with backslashes and directory with tabs"
+	)
+'
+
+test_expect_success 'non-cone mode sparse-checkout uses bash completion' '
+	# reset sparse-checkout repo to non-cone mode
+	git -C sparse-checkout sparse-checkout disable &&
+	git -C sparse-checkout sparse-checkout set --no-cone &&
+
+	(
+		cd sparse-checkout &&
+		# expected to be empty since we have not configured
+		# custom completion for non-cone mode
+		test_completion "git sparse-checkout set f" <<-\EOF
+
+		EOF
+	)
+'
+
+test_expect_success 'git sparse-checkout set --cone completes directory names' '
+	git -C sparse-checkout sparse-checkout disable &&
+
+	(
+		cd sparse-checkout &&
+		test_completion "git sparse-checkout set --cone f" <<-\EOF
+		folder1/
+		folder2/
+		folder3/
+		EOF
+	)
+'
+
 test_expect_success 'git switch - with -d, complete all references' '
 	test_completion "git switch -d " <<-\EOF
 	HEAD Z
@@ -2139,6 +2283,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 "
 '
 
@@ -2380,28 +2527,86 @@ test_expect_success 'git clone --config= - value' '
 	EOF
 '
 
+test_expect_success 'options with value' '
+	test_completion "git merge -X diff-algorithm=" <<-\EOF
+
+	EOF
+'
+
 test_expect_success 'sourcing the completion script clears cached commands' '
-	__git_compute_all_commands &&
-	verbose test -n "$__git_all_commands" &&
-	. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
-	verbose test -z "$__git_all_commands"
+	(
+		__git_compute_all_commands &&
+		verbose test -n "$__git_all_commands" &&
+		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+		verbose test -z "$__git_all_commands"
+	)
 '
 
 test_expect_success 'sourcing the completion script clears cached merge strategies' '
-	__git_compute_merge_strategies &&
-	verbose test -n "$__git_merge_strategies" &&
-	. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
-	verbose test -z "$__git_merge_strategies"
+	(
+		__git_compute_merge_strategies &&
+		verbose test -n "$__git_merge_strategies" &&
+		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+		verbose test -z "$__git_merge_strategies"
+	)
 '
 
 test_expect_success 'sourcing the completion script clears cached --options' '
-	__gitcomp_builtin checkout &&
-	verbose test -n "$__gitcomp_builtin_checkout" &&
-	__gitcomp_builtin notes_edit &&
-	verbose test -n "$__gitcomp_builtin_notes_edit" &&
-	. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
-	verbose test -z "$__gitcomp_builtin_checkout" &&
-	verbose test -z "$__gitcomp_builtin_notes_edit"
+	(
+		__gitcomp_builtin checkout &&
+		verbose test -n "$__gitcomp_builtin_checkout" &&
+		__gitcomp_builtin notes_edit &&
+		verbose test -n "$__gitcomp_builtin_notes_edit" &&
+		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+		verbose test -z "$__gitcomp_builtin_checkout" &&
+		verbose test -z "$__gitcomp_builtin_notes_edit"
+	)
+'
+
+test_expect_success 'option aliases are not shown by default' '
+	test_completion "git clone --recurs" "--recurse-submodules "
+'
+
+test_expect_success 'option aliases are shown with GIT_COMPLETION_SHOW_ALL' '
+	(
+		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+		GIT_COMPLETION_SHOW_ALL=1 && export GIT_COMPLETION_SHOW_ALL &&
+		test_completion "git clone --recurs" <<-\EOF
+		--recurse-submodules Z
+		--recursive Z
+		EOF
+	)
+'
+
+test_expect_success 'plumbing commands are excluded without GIT_COMPLETION_SHOW_ALL_COMMANDS' '
+	(
+		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+		sane_unset GIT_TESTING_PORCELAIN_COMMAND_LIST &&
+
+		# Just mainporcelain, not plumbing commands
+		run_completion "git c" &&
+		grep checkout out &&
+		! grep cat-file out
+	)
+'
+
+test_expect_success 'all commands are shown with GIT_COMPLETION_SHOW_ALL_COMMANDS (also main non-builtin)' '
+	(
+		. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
+		GIT_COMPLETION_SHOW_ALL_COMMANDS=1 &&
+		export GIT_COMPLETION_SHOW_ALL_COMMANDS &&
+		sane_unset GIT_TESTING_PORCELAIN_COMMAND_LIST &&
+
+		# Both mainporcelain and plumbing commands
+		run_completion "git c" &&
+		grep checkout out &&
+		grep cat-file out &&
+
+		# Check "gitk", a "main" command, but not a built-in + more plumbing
+		run_completion "git g" &&
+		grep gitk out &&
+		grep get-tar-commit-id out
+	)
 '
 
 test_expect_success '__git_complete' '
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index ce41596514..85385d2ede 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -137,33 +137,110 @@ test_tick () {
 # Stop execution and start a shell. This is useful for debugging tests.
 #
 # Be sure to remove all invocations of this command before submitting.
+# WARNING: the shell invoked by this helper does not have the same environment
+# as the one running the tests (shell variables and functions are not
+# available, and the options below further modify the environment). As such,
+# commands copied from a test script might behave differently than when
+# running the test.
+#
+# Usage: test_pause [options]
+#   -t
+#	Use your original TERM instead of test-lib.sh's "dumb".
+#	This usually restores color output in the invoked shell.
+#   -s
+#	Invoke $SHELL instead of $TEST_SHELL_PATH.
+#   -h
+#	Use your original HOME instead of test-lib.sh's "$TRASH_DIRECTORY".
+#	This allows you to use your regular shell environment and Git aliases.
+#	CAUTION: running commands copied from a test script into the paused shell
+#	might result in files in your HOME being overwritten.
+#   -a
+#	Shortcut for -t -s -h
 
 test_pause () {
-	"$SHELL_PATH" <&6 >&5 2>&7
+	PAUSE_TERM=$TERM &&
+	PAUSE_SHELL=$TEST_SHELL_PATH &&
+	PAUSE_HOME=$HOME &&
+	while test $# != 0
+	do
+		case "$1" in
+		-t)
+			PAUSE_TERM="$USER_TERM"
+			;;
+		-s)
+			PAUSE_SHELL="$SHELL"
+			;;
+		-h)
+			PAUSE_HOME="$USER_HOME"
+			;;
+		-a)
+			PAUSE_TERM="$USER_TERM"
+			PAUSE_SHELL="$SHELL"
+			PAUSE_HOME="$USER_HOME"
+			;;
+		*)
+			break
+			;;
+		esac
+		shift
+	done &&
+	TERM="$PAUSE_TERM" HOME="$PAUSE_HOME" "$PAUSE_SHELL" <&6 >&5 2>&7
 }
 
 # Wrap git with a debugger. Adding this to a command can make it easier
 # to understand what is going on in a failing test.
 #
+# Usage: debug [options] <git command>
+#   -d <debugger>
+#   --debugger=<debugger>
+#	Use <debugger> instead of GDB
+#   -t
+#	Use your original TERM instead of test-lib.sh's "dumb".
+#	This usually restores color output in the debugger.
+#	WARNING: the command being debugged might behave differently than when
+#	running the test.
+#
 # Examples:
 #     debug git checkout master
 #     debug --debugger=nemiver git $ARGS
 #     debug -d "valgrind --tool=memcheck --track-origins=yes" git $ARGS
 debug () {
-	case "$1" in
-	-d)
-		GIT_DEBUGGER="$2" &&
-		shift 2
-		;;
-	--debugger=*)
-		GIT_DEBUGGER="${1#*=}" &&
-		shift 1
-		;;
-	*)
-		GIT_DEBUGGER=1
-		;;
-	esac &&
-	GIT_DEBUGGER="${GIT_DEBUGGER}" "$@" <&6 >&5 2>&7
+	GIT_DEBUGGER=1 &&
+	DEBUG_TERM=$TERM &&
+	while test $# != 0
+	do
+		case "$1" in
+		-t)
+			DEBUG_TERM="$USER_TERM"
+			;;
+		-d)
+			GIT_DEBUGGER="$2" &&
+			shift
+			;;
+		--debugger=*)
+			GIT_DEBUGGER="${1#*=}"
+			;;
+		*)
+			break
+			;;
+		esac
+		shift
+	done &&
+
+	dotfiles=".gdbinit .lldbinit"
+
+	for dotfile in $dotfiles
+	do
+		dotfile="$USER_HOME/$dotfile" &&
+		test -f "$dotfile" && cp "$dotfile" "$HOME" || :
+	done &&
+
+	TERM="$DEBUG_TERM" GIT_DEBUGGER="${GIT_DEBUGGER}" "$@" <&6 >&5 2>&7 &&
+
+	for dotfile in $dotfiles
+	do
+		rm -f "$HOME/$dotfile"
+	done
 }
 
 # Usage: test_commit [options] <message> [<file> [<contents> [<tag>]]]
@@ -603,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
@@ -1479,46 +1567,24 @@ nongit () {
 	)
 } 7>&2 2>&4
 
-# convert function arguments or stdin (if not arguments given) to pktline
-# representation. If multiple arguments are given, they are separated by
-# whitespace and put in a single packet. Note that data containing NULs must be
-# given on stdin, and that empty input becomes an empty packet, not a flush
-# packet (for that you can just print 0000 yourself).
+# These functions are historical wrappers around "test-tool pkt-line"
+# for older tests. Use "test-tool pkt-line" itself in new tests.
 packetize () {
 	if test $# -gt 0
 	then
 		packet="$*"
 		printf '%04x%s' "$((4 + ${#packet}))" "$packet"
 	else
-		perl -e '
-			my $packet = do { local $/; <STDIN> };
-			printf "%04x%s", 4 + length($packet), $packet;
-		'
+		test-tool pkt-line pack
 	fi
 }
 
-# Parse the input as a series of pktlines, writing the result to stdout.
-# Sideband markers are removed automatically, and the output is routed to
-# stderr if appropriate.
-#
-# NUL bytes are converted to "\\0" for ease of parsing with text tools.
+packetize_raw () {
+	test-tool pkt-line pack-raw-stdin
+}
+
 depacketize () {
-	perl -e '
-		while (read(STDIN, $len, 4) == 4) {
-			if ($len eq "0000") {
-				print "FLUSH\n";
-			} else {
-				read(STDIN, $buf, hex($len) - 4);
-				$buf =~ s/\0/\\0/g;
-				if ($buf =~ s/^[\x2\x3]//) {
-					print STDERR $buf;
-				} else {
-					$buf =~ s/^\x1//;
-					print $buf;
-				}
-			}
-		}
-	'
+	test-tool pkt-line unpack
 }
 
 # Converts base-16 data into base-8. The output is given as a sequence of
@@ -1694,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>...
@@ -1740,3 +1840,36 @@ test_region () {
 test_readlink () {
 	perl -le 'print readlink($_) for @ARGV' "$@"
 }
+
+# Set mtime to a fixed "magic" timestamp in mid February 2009, before we
+# run an operation that may or may not touch the file.  If the file was
+# touched, its timestamp will not accidentally have such an old timestamp,
+# as long as your filesystem clock is reasonably correct.  To verify the
+# timestamp, follow up with test_is_magic_mtime.
+#
+# An optional increment to the magic timestamp may be specified as second
+# argument.
+test_set_magic_mtime () {
+	local inc=${2:-0} &&
+	local mtime=$((1234567890 + $inc)) &&
+	test-tool chmtime =$mtime "$1" &&
+	test_is_magic_mtime "$1" $inc
+}
+
+# Test whether the given file has the "magic" mtime set.  This is meant to
+# be used in combination with test_set_magic_mtime.
+#
+# An optional increment to the magic timestamp may be specified as second
+# argument.  Usually, this should be the same increment which was used for
+# the associated test_set_magic_mtime.
+test_is_magic_mtime () {
+	local inc=${2:-0} &&
+	local mtime=$((1234567890 + $inc)) &&
+	echo $mtime >.git/test-mtime-expect &&
+	test-tool chmtime --get "$1" >.git/test-mtime-actual &&
+	test_cmp .git/test-mtime-expect .git/test-mtime-actual
+	local ret=$?
+	rm -f .git/test-mtime-expect
+	rm -f .git/test-mtime-actual
+	return $ret
+}
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 9e26860544..e4716b0b86 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -57,6 +57,15 @@ fi
 . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
 export PERL_PATH SHELL_PATH
 
+# In t0000, we need to override test directories of nested testcases. In case
+# the developer has TEST_OUTPUT_DIRECTORY part of his build options, then we'd
+# reset this value to instead contain what the developer has specified. We thus
+# have this knob to allow overriding the directory.
+if test -n "${TEST_OUTPUT_DIRECTORY_OVERRIDE}"
+then
+	TEST_OUTPUT_DIRECTORY="${TEST_OUTPUT_DIRECTORY_OVERRIDE}"
+fi
+
 # Disallow the use of abbreviated options in the test suite by default
 if test -z "${GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS}"
 then
@@ -400,6 +409,12 @@ then
 	verbose=t
 fi
 
+# Since bash 5.0, checkwinsize is enabled by default which does
+# update the COLUMNS variable every time a non-builtin command
+# completes, even for non-interactive shells.
+# Disable that since we are aiming for repeatability.
+test -n "$BASH_VERSION" && shopt -u checkwinsize 2>/dev/null
+
 # For repeatability, reset the environment to known value.
 # TERM is sanitized below, after saving color control sequences.
 LANG=C
@@ -434,6 +449,8 @@ unset VISUAL EMAIL LANGUAGE $("$PERL_PATH" -e '
 unset XDG_CACHE_HOME
 unset XDG_CONFIG_HOME
 unset GITPERLLIB
+unset GIT_TRACE2_PARENT_NAME
+unset GIT_TRACE2_PARENT_SID
 TEST_AUTHOR_LOCALNAME=author
 TEST_AUTHOR_DOMAIN=example.com
 GIT_AUTHOR_EMAIL=${TEST_AUTHOR_LOCALNAME}@${TEST_AUTHOR_DOMAIN}
@@ -461,6 +478,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
@@ -474,6 +498,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" ||
@@ -519,7 +550,7 @@ SQ=\'
 # when case-folding filenames
 u200c=$(printf '\342\200\214')
 
-export _x05 _x35 _x40 _z40 LF u200c EMPTY_TREE EMPTY_BLOB ZERO_OID OID_REGEX
+export _x05 _x35 LF u200c EMPTY_TREE EMPTY_BLOB ZERO_OID OID_REGEX
 
 # Each test should start with something like this, after copyright notices:
 #
@@ -570,20 +601,46 @@ else
 	}
 fi
 
+USER_TERM="$TERM"
 TERM=dumb
-export TERM
+export TERM USER_TERM
 
-error () {
-	say_color error "error: $*"
+# 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
 	exit 1
 }
 
+error () {
+	say_color error "error: $*"
+	_error_exit
+}
+
 BUG () {
 	error >&7 "bug in the test script: $*"
 }
 
+BAIL_OUT () {
+	test $# -ne 1 && BUG "1 param"
+
+	# Do not change "Bail out! " string. It's part of TAP syntax:
+	# https://testanything.org/tap-specification.html
+	local bail_out="Bail out! "
+	local message="$1"
+
+	say_color >&5 error $bail_out "$message"
+	_error_exit
+}
+
 say () {
 	say_color info "$*"
 }
@@ -592,9 +649,7 @@ if test -n "$HARNESS_ACTIVE"
 then
 	if test "$verbose" = t || test -n "$verbose_only"
 	then
-		printf 'Bail out! %s\n' \
-		 'verbose mode forbidden under TAP harness; try --verbose-log'
-		exit 1
+		BAIL_OUT 'verbose mode forbidden under TAP harness; try --verbose-log'
 	fi
 fi
 
@@ -607,9 +662,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
@@ -639,6 +691,8 @@ test_fixed=0
 test_broken=0
 test_success=0
 
+test_missing_prereq=
+
 test_external_has_tap=0
 
 die () {
@@ -704,7 +758,7 @@ test_failure_ () {
 	say_color error "not ok $test_count - $1"
 	shift
 	printf '%s\n' "$*" | sed -e 's/^/#	/'
-	test "$immediate" = "" || { finalize_junit_xml; GIT_EXIT_OK=t; exit 1; }
+	test "$immediate" = "" || _error_exit
 }
 
 test_known_broken_ok_ () {
@@ -1039,6 +1093,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
@@ -1145,6 +1207,7 @@ test_done () {
 		fixed $test_fixed
 		broken $test_broken
 		failed $test_failure
+		missing_prereq $test_missing_prereq
 
 		EOF
 	fi
@@ -1328,7 +1391,8 @@ fi
 GIT_TEMPLATE_DIR="$GIT_BUILD_DIR"/templates/blt
 GIT_CONFIG_NOSYSTEM=1
 GIT_ATTR_NOSYSTEM=1
-export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_ATTR_NOSYSTEM
+GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/.."
+export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_ATTR_NOSYSTEM GIT_CEILING_DIRECTORIES
 
 if test -z "$GIT_TEST_CMP"
 then
@@ -1364,13 +1428,46 @@ then
 	test_done
 fi
 
+# skip non-whitelisted tests when compiled with SANITIZE=leak
+if test -n "$SANITIZE_LEAK"
+then
+	if test_bool_env GIT_TEST_PASSING_SANITIZE_LEAK false
+	then
+		# We need to see it in "git env--helper" (via
+		# test_bool_env)
+		export TEST_PASSES_SANITIZE_LEAK
+
+		if ! test_bool_env TEST_PASSES_SANITIZE_LEAK false
+		then
+			skip_all="skipping $this_test under GIT_TEST_PASSING_SANITIZE_LEAK=true"
+			test_done
+		fi
+	fi
+elif test_bool_env GIT_TEST_PASSING_SANITIZE_LEAK false
+then
+	BAIL_OUT "GIT_TEST_PASSING_SANITIZE_LEAK=true has no effect except when compiled with SANITIZE=leak"
+fi
+
 # Last-minute variable setup
+USER_HOME="$HOME"
 HOME="$TRASH_DIRECTORY"
 GNUPGHOME="$HOME/gnupg-home-not-used"
-export HOME GNUPGHOME
+export HOME GNUPGHOME USER_HOME
+
+# "rm -rf" existing trash directory, even if a previous run left it
+# with bad permissions.
+remove_trash_directory () {
+	dir="$1"
+	if ! rm -rf "$dir" 2>/dev/null
+	then
+		chmod -R u+rwx "$dir"
+		rm -rf "$dir"
+	fi
+	! test -d "$dir"
+}
 
 # Test repository
-rm -fr "$TRASH_DIRECTORY" || {
+remove_trash_directory "$TRASH_DIRECTORY" || {
 	GIT_EXIT_OK=t
 	echo >&5 "FATAL: Cannot prepare test area"
 	exit 1
@@ -1407,10 +1504,9 @@ then
 fi
 
 # Convenience
-# A regexp to match 5, 35 and 40 hexdigits
+# A regexp to match 5 and 35 hexdigits
 _x05='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 _x35="$_x05$_x05$_x05$_x05$_x05$_x05$_x05"
-_x40="$_x35$_x05"
 
 test_oid_init
 
@@ -1419,7 +1515,6 @@ OID_REGEX=$(echo $ZERO_OID | sed -e 's/0/[0-9a-f]/g')
 OIDPATH_REGEX=$(test_oid_to_path $ZERO_OID | sed -e 's/0/[0-9a-f]/g')
 EMPTY_TREE=$(test_oid empty_tree)
 EMPTY_BLOB=$(test_oid empty_blob)
-_z40=$ZERO_OID
 
 # Provide an implementation of the 'yes' utility; the upper bound
 # limit is there to help Windows that cannot stop this loop from
@@ -1518,6 +1613,7 @@ test -z "$NO_PYTHON" && test_set_prereq PYTHON
 test -n "$USE_LIBPCRE2" && test_set_prereq PCRE
 test -n "$USE_LIBPCRE2" && test_set_prereq LIBPCRE2
 test -z "$NO_GETTEXT" && test_set_prereq GETTEXT
+test -n "$SANITIZE_LEAK" && test_set_prereq SANITIZE_LEAK
 
 if test -z "$GIT_TEST_CHECK_CACHE_TREE"
 then
@@ -1536,6 +1632,12 @@ test_lazy_prereq SYMLINKS '
 	ln -s x y && test -h y
 '
 
+test_lazy_prereq SYMLINKS_WINDOWS '
+	# test whether symbolic links are enabled on Windows
+	test_have_prereq MINGW &&
+	cmd //c "mklink y x" &> /dev/null && test -h y
+'
+
 test_lazy_prereq FILEMODE '
 	test "$(git config --bool core.filemode)" = true
 '
@@ -1665,6 +1767,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)"
 '
@@ -1687,10 +1793,6 @@ test_lazy_prereq SHA1 '
 	esac
 '
 
-test_lazy_prereq REBASE_P '
-	test -z "$GIT_TEST_SKIP_REBASE_P"
-'
-
 # Ensure that no test accidentally triggers a Git command
 # that runs the actual maintenance scheduler, affecting a user's
 # system permanently.
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..adf6033549 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;
 }
 
@@ -72,6 +79,11 @@ static void remove_tmp_objdir_on_signal(int signo)
 	raise(signo);
 }
 
+void tmp_objdir_discard_objects(struct tmp_objdir *t)
+{
+	remove_dir_recursively(&t->path, REMOVE_DIR_KEEP_TOPLEVEL);
+}
+
 /*
  * These env_* functions are for setting up the child environment; the
  * "replace" variant overrides the value of any existing variable with that
@@ -121,7 +133,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 +141,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 +286,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 +316,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..76efc7edee 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
@@ -46,9 +47,37 @@ int tmp_objdir_migrate(struct tmp_objdir *);
 int tmp_objdir_destroy(struct tmp_objdir *);
 
 /*
+ * Remove all objects from the temporary object directory, while leaving it
+ * around so more objects can be added.
+ */
+void tmp_objdir_discard_objects(struct tmp_objdir *);
+
+/*
  * Add the temporary object directory as an alternate object store in the
  * current process.
  */
 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/trace.h b/trace.h
index 0dbbad0e41..e25984051a 100644
--- a/trace.h
+++ b/trace.h
@@ -89,7 +89,7 @@ struct trace_key {
 
 extern struct trace_key trace_default_key;
 
-#define TRACE_KEY_INIT(name) { "GIT_TRACE_" #name, 0, 0, 0 }
+#define TRACE_KEY_INIT(name) { .key = "GIT_TRACE_" #name }
 extern struct trace_key trace_perf_key;
 extern struct trace_key trace_setup_key;
 
diff --git a/trace2.c b/trace2.c
index 256120c7fd..b2d471526f 100644
--- a/trace2.c
+++ b/trace2.c
@@ -260,6 +260,19 @@ void trace2_cmd_path_fl(const char *file, int line, const char *pathname)
 			tgt_j->pfn_command_path_fl(file, line, pathname);
 }
 
+void trace2_cmd_ancestry_fl(const char *file, int line, const char **parent_names)
+{
+	struct tr2_tgt *tgt_j;
+	int j;
+
+	if (!trace2_enabled)
+		return;
+
+	for_each_wanted_builtin (j, tgt_j)
+		if (tgt_j->pfn_command_ancestry_fl)
+			tgt_j->pfn_command_ancestry_fl(file, line, parent_names);
+}
+
 void trace2_cmd_name_fl(const char *file, int line, const char *name)
 {
 	struct tr2_tgt *tgt_j;
@@ -381,6 +394,37 @@ void trace2_child_exit_fl(const char *file, int line, struct child_process *cmd,
 						 us_elapsed_child);
 }
 
+void trace2_child_ready_fl(const char *file, int line,
+			   struct child_process *cmd,
+			   const char *ready)
+{
+	struct tr2_tgt *tgt_j;
+	int j;
+	uint64_t us_now;
+	uint64_t us_elapsed_absolute;
+	uint64_t us_elapsed_child;
+
+	if (!trace2_enabled)
+		return;
+
+	us_now = getnanotime() / 1000;
+	us_elapsed_absolute = tr2tls_absolute_elapsed(us_now);
+
+	if (cmd->trace2_child_us_start)
+		us_elapsed_child = us_now - cmd->trace2_child_us_start;
+	else
+		us_elapsed_child = 0;
+
+	for_each_wanted_builtin (j, tgt_j)
+		if (tgt_j->pfn_child_ready_fl)
+			tgt_j->pfn_child_ready_fl(file, line,
+						  us_elapsed_absolute,
+						  cmd->trace2_child_id,
+						  cmd->pid,
+						  ready,
+						  us_elapsed_child);
+}
+
 int trace2_exec_fl(const char *file, int line, const char *exe,
 		   const char **argv)
 {
diff --git a/trace2.h b/trace2.h
index ede18c2e06..0cc7b5f531 100644
--- a/trace2.h
+++ b/trace2.h
@@ -134,6 +134,16 @@ void trace2_cmd_path_fl(const char *file, int line, const char *pathname);
 #define trace2_cmd_path(p) trace2_cmd_path_fl(__FILE__, __LINE__, (p))
 
 /*
+ * Emit an 'ancestry' event with the process name of the current process's
+ * parent process.
+ * This gives post-processors a way to determine what invoked the command and
+ * learn more about usage patterns.
+ */
+void trace2_cmd_ancestry_fl(const char *file, int line, const char **parent_names);
+
+#define trace2_cmd_ancestry(v) trace2_cmd_ancestry_fl(__FILE__, __LINE__, (v))
+
+/*
  * Emit a 'cmd_name' event with the canonical name of the command.
  * This gives post-processors a simple field to identify the command
  * without having to parse the argv.
@@ -244,6 +254,31 @@ void trace2_child_exit_fl(const char *file, int line, struct child_process *cmd,
 	trace2_child_exit_fl(__FILE__, __LINE__, (cmd), (code))
 
 /**
+ * Emits a "child_ready" message containing the "child-id" and a flag
+ * indicating whether the child was considered "ready" when we
+ * released it.
+ *
+ * This function should be called after starting a daemon process in
+ * the background (and after giving it sufficient time to boot
+ * up) to indicate that we no longer control or own it.
+ *
+ * The "ready" argument should contain one of { "ready", "timeout",
+ * "error" } to indicate the state of the running daemon when we
+ * released it.
+ *
+ * If the daemon process fails to start or it exits or is terminated
+ * while we are still waiting for it, the caller should emit a
+ * regular "child_exit" to report the normal process exit information.
+ *
+ */
+void trace2_child_ready_fl(const char *file, int line,
+			   struct child_process *cmd,
+			   const char *ready);
+
+#define trace2_child_ready(cmd, ready) \
+	trace2_child_ready_fl(__FILE__, __LINE__, (cmd), (ready))
+
+/**
  * Emit an 'exec' event prior to calling one of exec(), execv(),
  * execvp(), and etc.  On Unix-derived systems, this will be the
  * last event emitted for the current process, unless the exec
@@ -340,7 +375,7 @@ void trace2_def_repo_fl(const char *file, int line, struct repository *repo);
  * being started, such as "read_recursive" or "do_read_index".
  *
  * The `repo` field, if set, will be used to get the "repo-id", so that
- * recursive oerations can be attributed to the correct repository.
+ * recursive operations can be attributed to the correct repository.
  */
 void trace2_region_enter_fl(const char *file, int line, const char *category,
 			    const char *label, const struct repository *repo, ...);
@@ -492,13 +527,7 @@ enum trace2_process_info_reason {
 	TRACE2_PROCESS_INFO_EXIT,
 };
 
-#if defined(GIT_WINDOWS_NATIVE)
 void trace2_collect_process_info(enum trace2_process_info_reason reason);
-#else
-#define trace2_collect_process_info(reason) \
-	do {                                \
-	} while (0)
-#endif
 
 const char *trace2_session_id(void);
 
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.h b/trace2/tr2_tgt.h
index 7b90469212..65f94e1574 100644
--- a/trace2/tr2_tgt.h
+++ b/trace2/tr2_tgt.h
@@ -27,6 +27,8 @@ typedef void(tr2_tgt_evt_error_va_fl_t)(const char *file, int line,
 
 typedef void(tr2_tgt_evt_command_path_fl_t)(const char *file, int line,
 					    const char *command_path);
+typedef void(tr2_tgt_evt_command_ancestry_fl_t)(const char *file, int line,
+						const char **parent_names);
 typedef void(tr2_tgt_evt_command_name_fl_t)(const char *file, int line,
 					    const char *name,
 					    const char *hierarchy);
@@ -43,6 +45,10 @@ typedef void(tr2_tgt_evt_child_exit_fl_t)(const char *file, int line,
 					  uint64_t us_elapsed_absolute, int cid,
 					  int pid, int code,
 					  uint64_t us_elapsed_child);
+typedef void(tr2_tgt_evt_child_ready_fl_t)(const char *file, int line,
+					   uint64_t us_elapsed_absolute,
+					   int cid, int pid, const char *ready,
+					   uint64_t us_elapsed_child);
 
 typedef void(tr2_tgt_evt_thread_start_fl_t)(const char *file, int line,
 					    uint64_t us_elapsed_absolute);
@@ -108,11 +114,13 @@ struct tr2_tgt {
 	tr2_tgt_evt_atexit_t                    *pfn_atexit;
 	tr2_tgt_evt_error_va_fl_t               *pfn_error_va_fl;
 	tr2_tgt_evt_command_path_fl_t           *pfn_command_path_fl;
+	tr2_tgt_evt_command_ancestry_fl_t	*pfn_command_ancestry_fl;
 	tr2_tgt_evt_command_name_fl_t           *pfn_command_name_fl;
 	tr2_tgt_evt_command_mode_fl_t           *pfn_command_mode_fl;
 	tr2_tgt_evt_alias_fl_t                  *pfn_alias_fl;
 	tr2_tgt_evt_child_start_fl_t            *pfn_child_start_fl;
 	tr2_tgt_evt_child_exit_fl_t             *pfn_child_exit_fl;
+	tr2_tgt_evt_child_ready_fl_t            *pfn_child_ready_fl;
 	tr2_tgt_evt_thread_start_fl_t           *pfn_thread_start_fl;
 	tr2_tgt_evt_thread_exit_fl_t            *pfn_thread_exit_fl;
 	tr2_tgt_evt_exec_fl_t                   *pfn_exec_fl;
diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c
index 6353e8ad91..bd17ecdc32 100644
--- a/trace2/tr2_tgt_event.c
+++ b/trace2/tr2_tgt_event.c
@@ -20,7 +20,7 @@ static struct tr2_dst tr2dst_event = { TR2_SYSENV_EVENT, 0, 0, 0, 0 };
  * a new field to an existing event, do not require an increment to the EVENT
  * format version.
  */
-#define TR2_EVENT_VERSION "2"
+#define TR2_EVENT_VERSION "3"
 
 /*
  * Region nesting limit for messages written to the event target.
@@ -261,6 +261,26 @@ static void fn_command_path_fl(const char *file, int line, const char *pathname)
 	jw_release(&jw);
 }
 
+static void fn_command_ancestry_fl(const char *file, int line, const char **parent_names)
+{
+	const char *event_name = "cmd_ancestry";
+	const char *parent_name = NULL;
+	struct json_writer jw = JSON_WRITER_INIT;
+
+	jw_object_begin(&jw, 0);
+	event_fmt_prepare(event_name, file, line, NULL, &jw);
+	jw_object_inline_begin_array(&jw, "ancestry");
+
+	while ((parent_name = *parent_names++))
+		jw_array_string(&jw, parent_name);
+
+	jw_end(&jw); /* 'ancestry' array */
+	jw_end(&jw); /* event object */
+
+	tr2_dst_write_line(&tr2dst_event, &jw.json);
+	jw_release(&jw);
+}
+
 static void fn_command_name_fl(const char *file, int line, const char *name,
 			       const char *hierarchy)
 {
@@ -334,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);
 
@@ -363,6 +383,27 @@ static void fn_child_exit_fl(const char *file, int line,
 	jw_release(&jw);
 }
 
+static void fn_child_ready_fl(const char *file, int line,
+			      uint64_t us_elapsed_absolute, int cid, int pid,
+			      const char *ready, uint64_t us_elapsed_child)
+{
+	const char *event_name = "child_ready";
+	struct json_writer jw = JSON_WRITER_INIT;
+	double t_rel = (double)us_elapsed_child / 1000000.0;
+
+	jw_object_begin(&jw, 0);
+	event_fmt_prepare(event_name, file, line, NULL, &jw);
+	jw_object_intmax(&jw, "child_id", cid);
+	jw_object_intmax(&jw, "pid", pid);
+	jw_object_string(&jw, "ready", ready);
+	jw_object_double(&jw, "t_rel", 6, t_rel);
+	jw_end(&jw);
+
+	tr2_dst_write_line(&tr2dst_event, &jw.json);
+
+	jw_release(&jw);
+}
+
 static void fn_thread_start_fl(const char *file, int line,
 			       uint64_t us_elapsed_absolute)
 {
@@ -584,11 +625,13 @@ struct tr2_tgt tr2_tgt_event = {
 	fn_atexit,
 	fn_error_va_fl,
 	fn_command_path_fl,
+	fn_command_ancestry_fl,
 	fn_command_name_fl,
 	fn_command_mode_fl,
 	fn_alias_fl,
 	fn_child_start_fl,
 	fn_child_exit_fl,
+	fn_child_ready_fl,
 	fn_thread_start_fl,
 	fn_thread_exit_fl,
 	fn_exec_fl,
diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c
index 31b602c171..6e429a3fb9 100644
--- a/trace2/tr2_tgt_normal.c
+++ b/trace2/tr2_tgt_normal.c
@@ -160,6 +160,24 @@ static void fn_command_path_fl(const char *file, int line, const char *pathname)
 	strbuf_release(&buf_payload);
 }
 
+static void fn_command_ancestry_fl(const char *file, int line, const char **parent_names)
+{
+	const char *parent_name = NULL;
+	struct strbuf buf_payload = STRBUF_INIT;
+
+	/* cmd_ancestry parent <- grandparent <- great-grandparent */
+	strbuf_addstr(&buf_payload, "cmd_ancestry ");
+	while ((parent_name = *parent_names++)) {
+		strbuf_addstr(&buf_payload, parent_name);
+		/* if we'll write another one after this, add a delimiter */
+		if (parent_names && *parent_names)
+			strbuf_addstr(&buf_payload, " <- ");
+	}
+
+	normal_io_write_fl(file, line, &buf_payload);
+	strbuf_release(&buf_payload);
+}
+
 static void fn_command_name_fl(const char *file, int line, const char *name,
 			       const char *hierarchy)
 {
@@ -214,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);
@@ -233,6 +251,19 @@ static void fn_child_exit_fl(const char *file, int line,
 	strbuf_release(&buf_payload);
 }
 
+static void fn_child_ready_fl(const char *file, int line,
+			      uint64_t us_elapsed_absolute, int cid, int pid,
+			      const char *ready, uint64_t us_elapsed_child)
+{
+	struct strbuf buf_payload = STRBUF_INIT;
+	double elapsed = (double)us_elapsed_child / 1000000.0;
+
+	strbuf_addf(&buf_payload, "child_ready[%d] pid:%d ready:%s elapsed:%.6f",
+		    cid, pid, ready, elapsed);
+	normal_io_write_fl(file, line, &buf_payload);
+	strbuf_release(&buf_payload);
+}
+
 static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute,
 		       int exec_id, const char *exe, const char **argv)
 {
@@ -306,11 +337,13 @@ struct tr2_tgt tr2_tgt_normal = {
 	fn_atexit,
 	fn_error_va_fl,
 	fn_command_path_fl,
+	fn_command_ancestry_fl,
 	fn_command_name_fl,
 	fn_command_mode_fl,
 	fn_alias_fl,
 	fn_child_start_fl,
 	fn_child_exit_fl,
+	fn_child_ready_fl,
 	NULL, /* thread_start */
 	NULL, /* thread_exit */
 	fn_exec_fl,
diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c
index a8018f18cc..2ff9cf7083 100644
--- a/trace2/tr2_tgt_perf.c
+++ b/trace2/tr2_tgt_perf.c
@@ -253,6 +253,21 @@ static void fn_command_path_fl(const char *file, int line, const char *pathname)
 	strbuf_release(&buf_payload);
 }
 
+static void fn_command_ancestry_fl(const char *file, int line, const char **parent_names)
+{
+	const char *event_name = "cmd_ancestry";
+	struct strbuf buf_payload = STRBUF_INIT;
+
+	strbuf_addstr(&buf_payload, "ancestry:[");
+	/* It's not an argv but the rules are basically the same. */
+	sq_append_quote_argv_pretty(&buf_payload, parent_names);
+	strbuf_addch(&buf_payload, ']');
+
+	perf_io_write_fl(file, line, event_name, NULL, NULL, NULL, NULL,
+			 &buf_payload);
+	strbuf_release(&buf_payload);
+}
+
 static void fn_command_name_fl(const char *file, int line, const char *name,
 			       const char *hierarchy)
 {
@@ -320,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,
@@ -345,6 +360,20 @@ static void fn_child_exit_fl(const char *file, int line,
 	strbuf_release(&buf_payload);
 }
 
+static void fn_child_ready_fl(const char *file, int line,
+			      uint64_t us_elapsed_absolute, int cid, int pid,
+			      const char *ready, uint64_t us_elapsed_child)
+{
+	const char *event_name = "child_ready";
+	struct strbuf buf_payload = STRBUF_INIT;
+
+	strbuf_addf(&buf_payload, "[ch%d] pid:%d ready:%s", cid, pid, ready);
+
+	perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
+			 &us_elapsed_child, NULL, &buf_payload);
+	strbuf_release(&buf_payload);
+}
+
 static void fn_thread_start_fl(const char *file, int line,
 			       uint64_t us_elapsed_absolute)
 {
@@ -532,11 +561,13 @@ struct tr2_tgt tr2_tgt_perf = {
 	fn_atexit,
 	fn_error_va_fl,
 	fn_command_path_fl,
+	fn_command_ancestry_fl,
 	fn_command_name_fl,
 	fn_command_mode_fl,
 	fn_alias_fl,
 	fn_child_start_fl,
 	fn_child_exit_fl,
+	fn_child_ready_fl,
 	fn_thread_start_fl,
 	fn_thread_exit_fl,
 	fn_exec_fl,
diff --git a/trace2/tr2_tls.c b/trace2/tr2_tls.c
index 067c23755f..7da94aba52 100644
--- a/trace2/tr2_tls.c
+++ b/trace2/tr2_tls.c
@@ -95,6 +95,7 @@ void tr2tls_unset_self(void)
 
 	pthread_setspecific(tr2tls_key, NULL);
 
+	strbuf_release(&ctx->thread_name);
 	free(ctx->array_us_start);
 	free(ctx);
 }
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-helper.c b/transport-helper.c
index 4be035edb8..a0297b0986 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -671,8 +671,8 @@ static int connect_helper(struct transport *transport, const char *name,
 static struct ref *get_refs_list_using_list(struct transport *transport,
 					    int for_push);
 
-static int fetch(struct transport *transport,
-		 int nr_heads, struct ref **to_fetch)
+static int fetch_refs(struct transport *transport,
+		      int nr_heads, struct ref **to_fetch)
 {
 	struct helper_data *data = transport->data;
 	int i, count;
@@ -681,7 +681,7 @@ static int fetch(struct transport *transport,
 
 	if (process_connect(transport, 0)) {
 		do_take_over(transport);
-		return transport->vtable->fetch(transport, nr_heads, to_fetch);
+		return transport->vtable->fetch_refs(transport, nr_heads, to_fetch);
 	}
 
 	/*
@@ -845,6 +845,10 @@ static int push_update_ref_status(struct strbuf *buf,
 			forced = 1;
 			FREE_AND_NULL(msg);
 		}
+		else if (!strcmp(msg, "expecting report")) {
+			status = REF_STATUS_EXPECTING_REPORT;
+			FREE_AND_NULL(msg);
+		}
 	}
 
 	if (state->hint)
@@ -1261,12 +1265,12 @@ static struct ref *get_refs_list_using_list(struct transport *transport,
 }
 
 static struct transport_vtable vtable = {
-	set_helper_option,
-	get_refs_list,
-	fetch,
-	push_refs,
-	connect_helper,
-	release_helper
+	.set_option	= set_helper_option,
+	.get_refs_list	= get_refs_list,
+	.fetch_refs	= fetch_refs,
+	.push_refs	= push_refs,
+	.connect	= connect_helper,
+	.disconnect	= release_helper
 };
 
 int transport_helper_init(struct transport *transport, const char *name)
diff --git a/transport-internal.h b/transport-internal.h
index b60f1ba907..c4ca0b733a 100644
--- a/transport-internal.h
+++ b/transport-internal.h
@@ -34,7 +34,7 @@ struct transport_vtable {
 	 * get_refs_list(), it should set the old_sha1 fields in the
 	 * provided refs now.
 	 **/
-	int (*fetch)(struct transport *transport, int refs_nr, struct ref **refs);
+	int (*fetch_refs)(struct transport *transport, int refs_nr, struct ref **refs);
 
 	/**
 	 * Push the objects and refs. Send the necessary objects, and
diff --git a/transport.c b/transport.c
index 17e9629710..253d6671b1 100644
--- a/transport.c
+++ b/transport.c
@@ -1,7 +1,7 @@
 #include "cache.h"
 #include "config.h"
 #include "transport.h"
-#include "run-command.h"
+#include "hook.h"
 #include "pkt-line.h"
 #include "fetch-pack.h"
 #include "remote.h"
@@ -162,12 +162,16 @@ static int fetch_refs_from_bundle(struct transport *transport,
 			       int nr_heads, struct ref **to_fetch)
 {
 	struct bundle_transport_data *data = transport->data;
+	struct strvec extra_index_pack_args = STRVEC_INIT;
 	int ret;
 
+	if (transport->progress)
+		strvec_push(&extra_index_pack_args, "-v");
+
 	if (!data->get_refs_from_bundle_called)
 		get_refs_from_bundle(transport, 0, NULL);
 	ret = unbundle(the_repository, &data->header, data->fd,
-			   transport->progress ? BUNDLE_VERBOSE : 0);
+		       &extra_index_pack_args);
 	transport->hash_algo = data->header.hash_algo;
 	return ret;
 }
@@ -883,12 +887,10 @@ static int disconnect_git(struct transport *transport)
 }
 
 static struct transport_vtable taken_over_vtable = {
-	NULL,
-	get_refs_via_connect,
-	fetch_refs_via_pack,
-	git_transport_push,
-	NULL,
-	disconnect_git
+	.get_refs_list	= get_refs_via_connect,
+	.fetch_refs	= fetch_refs_via_pack,
+	.push_refs	= git_transport_push,
+	.disconnect	= disconnect_git
 };
 
 void transport_take_over(struct transport *transport,
@@ -1032,21 +1034,17 @@ void transport_check_allowed(const char *type)
 }
 
 static struct transport_vtable bundle_vtable = {
-	NULL,
-	get_refs_from_bundle,
-	fetch_refs_from_bundle,
-	NULL,
-	NULL,
-	close_bundle
+	.get_refs_list	= get_refs_from_bundle,
+	.fetch_refs	= fetch_refs_from_bundle,
+	.disconnect	= close_bundle
 };
 
 static struct transport_vtable builtin_smart_vtable = {
-	NULL,
-	get_refs_via_connect,
-	fetch_refs_via_pack,
-	git_transport_push,
-	connect_git,
-	disconnect_git
+	.get_refs_list	= get_refs_via_connect,
+	.fetch_refs	= fetch_refs_via_pack,
+	.push_refs	= git_transport_push,
+	.connect	= connect_git,
+	.disconnect	= disconnect_git
 };
 
 struct transport *transport_get(struct remote *remote, const char *url)
@@ -1206,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";
 
@@ -1295,7 +1292,7 @@ int transport_push(struct repository *r,
 							       &transport_options);
 		trace2_region_leave("transport_push", "get_refs_list", r);
 
-		strvec_clear(&transport_options.ref_prefixes);
+		transport_ls_refs_options_release(&transport_options);
 
 		if (flags & TRANSPORT_PUSH_ALL)
 			match_flags |= MATCH_REFS_ALL;
@@ -1423,6 +1420,12 @@ const struct ref *transport_get_remote_refs(struct transport *transport,
 	return transport->remote_refs;
 }
 
+void transport_ls_refs_options_release(struct transport_ls_refs_options *opts)
+{
+	strvec_clear(&opts->ref_prefixes);
+	free((char *)opts->unborn_head_target);
+}
+
 int transport_fetch_refs(struct transport *transport, struct ref *refs)
 {
 	int rc;
@@ -1453,19 +1456,24 @@ int transport_fetch_refs(struct transport *transport, struct ref *refs)
 			heads[nr_heads++] = rm;
 	}
 
-	rc = transport->vtable->fetch(transport, nr_heads, heads);
+	rc = transport->vtable->fetch_refs(transport, nr_heads, heads);
 
 	free(heads);
 	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 1cbab11373..a0bc6a1e9e 100644
--- a/transport.h
+++ b/transport.h
@@ -257,12 +257,18 @@ struct transport_ls_refs_options {
 	/*
 	 * If unborn_head_target is not NULL, and the remote reports HEAD as
 	 * pointing to an unborn branch, transport_get_remote_refs() stores the
-	 * unborn branch in unborn_head_target. It should be freed by the
-	 * caller.
+	 * unborn branch in unborn_head_target.
 	 */
-	char *unborn_head_target;
+	const char *unborn_head_target;
 };
-#define TRANSPORT_LS_REFS_OPTIONS_INIT { STRVEC_INIT }
+#define TRANSPORT_LS_REFS_OPTIONS_INIT { \
+	.ref_prefixes = STRVEC_INIT, \
+}
+
+/**
+ * Release the "struct transport_ls_refs_options".
+ */
+void transport_ls_refs_options_release(struct transport_ls_refs_options *opts);
 
 /*
  * Retrieve refs from a remote.
@@ -277,7 +283,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 1572615bd9..69031d7cba 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -21,7 +21,9 @@
 		ALLOC_ARRAY((x), nr); \
 } while(0)
 #define FAST_ARRAY_FREE(x, nr) do { \
-	if ((nr) > 2) \
+	if ((nr) <= 2) \
+		xalloca_free((x)); \
+	else \
 		free((x)); \
 } while(0)
 
@@ -601,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/unicode-width.h b/unicode-width.h
index b50e686bae..97c851b27d 100644
--- a/unicode-width.h
+++ b/unicode-width.h
@@ -26,7 +26,9 @@ static const struct interval zero_width[] = {
 { 0x0825, 0x0827 },
 { 0x0829, 0x082D },
 { 0x0859, 0x085B },
-{ 0x08D3, 0x0902 },
+{ 0x0890, 0x0891 },
+{ 0x0898, 0x089F },
+{ 0x08CA, 0x0902 },
 { 0x093A, 0x093A },
 { 0x093C, 0x093C },
 { 0x0941, 0x0948 },
@@ -66,6 +68,7 @@ static const struct interval zero_width[] = {
 { 0x0BCD, 0x0BCD },
 { 0x0C00, 0x0C00 },
 { 0x0C04, 0x0C04 },
+{ 0x0C3C, 0x0C3C },
 { 0x0C3E, 0x0C40 },
 { 0x0C46, 0x0C48 },
 { 0x0C4A, 0x0C4D },
@@ -116,7 +119,7 @@ static const struct interval zero_width[] = {
 { 0x1160, 0x11FF },
 { 0x135D, 0x135F },
 { 0x1712, 0x1714 },
-{ 0x1732, 0x1734 },
+{ 0x1732, 0x1733 },
 { 0x1752, 0x1753 },
 { 0x1772, 0x1773 },
 { 0x17B4, 0x17B5 },
@@ -124,7 +127,7 @@ static const struct interval zero_width[] = {
 { 0x17C6, 0x17C6 },
 { 0x17C9, 0x17D3 },
 { 0x17DD, 0x17DD },
-{ 0x180B, 0x180E },
+{ 0x180B, 0x180F },
 { 0x1885, 0x1886 },
 { 0x18A9, 0x18A9 },
 { 0x1920, 0x1922 },
@@ -140,7 +143,7 @@ static const struct interval zero_width[] = {
 { 0x1A65, 0x1A6C },
 { 0x1A73, 0x1A7C },
 { 0x1A7F, 0x1A7F },
-{ 0x1AB0, 0x1AC0 },
+{ 0x1AB0, 0x1ACE },
 { 0x1B00, 0x1B03 },
 { 0x1B34, 0x1B34 },
 { 0x1B36, 0x1B3A },
@@ -163,8 +166,7 @@ static const struct interval zero_width[] = {
 { 0x1CED, 0x1CED },
 { 0x1CF4, 0x1CF4 },
 { 0x1CF8, 0x1CF9 },
-{ 0x1DC0, 0x1DF9 },
-{ 0x1DFB, 0x1DFF },
+{ 0x1DC0, 0x1DFF },
 { 0x200B, 0x200F },
 { 0x202A, 0x202E },
 { 0x2060, 0x2064 },
@@ -227,12 +229,16 @@ static const struct interval zero_width[] = {
 { 0x10D24, 0x10D27 },
 { 0x10EAB, 0x10EAC },
 { 0x10F46, 0x10F50 },
+{ 0x10F82, 0x10F85 },
 { 0x11001, 0x11001 },
 { 0x11038, 0x11046 },
+{ 0x11070, 0x11070 },
+{ 0x11073, 0x11074 },
 { 0x1107F, 0x11081 },
 { 0x110B3, 0x110B6 },
 { 0x110B9, 0x110BA },
 { 0x110BD, 0x110BD },
+{ 0x110C2, 0x110C2 },
 { 0x110CD, 0x110CD },
 { 0x11100, 0x11102 },
 { 0x11127, 0x1112B },
@@ -315,6 +321,8 @@ static const struct interval zero_width[] = {
 { 0x16FE4, 0x16FE4 },
 { 0x1BC9D, 0x1BC9E },
 { 0x1BCA0, 0x1BCA3 },
+{ 0x1CF00, 0x1CF2D },
+{ 0x1CF30, 0x1CF46 },
 { 0x1D167, 0x1D169 },
 { 0x1D173, 0x1D182 },
 { 0x1D185, 0x1D18B },
@@ -332,6 +340,7 @@ static const struct interval zero_width[] = {
 { 0x1E023, 0x1E024 },
 { 0x1E026, 0x1E02A },
 { 0x1E130, 0x1E136 },
+{ 0x1E2AE, 0x1E2AE },
 { 0x1E2EC, 0x1E2EF },
 { 0x1E8D0, 0x1E8D6 },
 { 0x1E944, 0x1E94A },
@@ -404,7 +413,10 @@ static const struct interval double_width[] = {
 { 0x17000, 0x187F7 },
 { 0x18800, 0x18CD5 },
 { 0x18D00, 0x18D08 },
-{ 0x1B000, 0x1B11E },
+{ 0x1AFF0, 0x1AFF3 },
+{ 0x1AFF5, 0x1AFFB },
+{ 0x1AFFD, 0x1AFFE },
+{ 0x1B000, 0x1B122 },
 { 0x1B150, 0x1B152 },
 { 0x1B164, 0x1B167 },
 { 0x1B170, 0x1B2FB },
@@ -439,21 +451,23 @@ static const struct interval double_width[] = {
 { 0x1F6CC, 0x1F6CC },
 { 0x1F6D0, 0x1F6D2 },
 { 0x1F6D5, 0x1F6D7 },
+{ 0x1F6DD, 0x1F6DF },
 { 0x1F6EB, 0x1F6EC },
 { 0x1F6F4, 0x1F6FC },
 { 0x1F7E0, 0x1F7EB },
+{ 0x1F7F0, 0x1F7F0 },
 { 0x1F90C, 0x1F93A },
 { 0x1F93C, 0x1F945 },
-{ 0x1F947, 0x1F978 },
-{ 0x1F97A, 0x1F9CB },
-{ 0x1F9CD, 0x1F9FF },
+{ 0x1F947, 0x1F9FF },
 { 0x1FA70, 0x1FA74 },
-{ 0x1FA78, 0x1FA7A },
+{ 0x1FA78, 0x1FA7C },
 { 0x1FA80, 0x1FA86 },
-{ 0x1FA90, 0x1FAA8 },
-{ 0x1FAB0, 0x1FAB6 },
-{ 0x1FAC0, 0x1FAC2 },
-{ 0x1FAD0, 0x1FAD6 },
+{ 0x1FA90, 0x1FAAC },
+{ 0x1FAB0, 0x1FABA },
+{ 0x1FAC0, 0x1FAC5 },
+{ 0x1FAD0, 0x1FAD9 },
+{ 0x1FAE0, 0x1FAE7 },
+{ 0x1FAF0, 0x1FAF6 },
 { 0x20000, 0x2FFFD },
 { 0x30000, 0x3FFFD }
 };
diff --git a/unpack-trees.c b/unpack-trees.c
index f88a69f8e7..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.",
 
@@ -111,17 +114,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
 	strvec_init(&opts->msgs_to_free);
 
 	if (!strcmp(cmd, "checkout"))
-		msg = advice_commit_before_merge
+		msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
 		      ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
 			  "Please commit your changes or stash them before you switch branches.")
 		      : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
 	else if (!strcmp(cmd, "merge"))
-		msg = advice_commit_before_merge
+		msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
 		      ? _("Your local changes to the following files would be overwritten by merge:\n%%s"
 			  "Please commit your changes or stash them before you merge.")
 		      : _("Your local changes to the following files would be overwritten by merge:\n%%s");
 	else
-		msg = advice_commit_before_merge
+		msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
 		      ? _("Your local changes to the following files would be overwritten by %s:\n%%s"
 			  "Please commit your changes or stash them before you %s.")
 		      : _("Your local changes to the following files would be overwritten by %s:\n%%s");
@@ -131,18 +134,21 @@ 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_commit_before_merge
+		msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
 		      ? _("The following untracked working tree files would be removed by checkout:\n%%s"
 			  "Please move or remove them before you switch branches.")
 		      : _("The following untracked working tree files would be removed by checkout:\n%%s");
 	else if (!strcmp(cmd, "merge"))
-		msg = advice_commit_before_merge
+		msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
 		      ? _("The following untracked working tree files would be removed by merge:\n%%s"
 			  "Please move or remove them before you merge.")
 		      : _("The following untracked working tree files would be removed by merge:\n%%s");
 	else
-		msg = advice_commit_before_merge
+		msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
 		      ? _("The following untracked working tree files would be removed by %s:\n%%s"
 			  "Please move or remove them before you %s.")
 		      : _("The following untracked working tree files would be removed by %s:\n%%s");
@@ -150,17 +156,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
 		strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd);
 
 	if (!strcmp(cmd, "checkout"))
-		msg = advice_commit_before_merge
+		msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
 		      ? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
 			  "Please move or remove them before you switch branches.")
 		      : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
 	else if (!strcmp(cmd, "merge"))
-		msg = advice_commit_before_merge
+		msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
 		      ? _("The following untracked working tree files would be overwritten by merge:\n%%s"
 			  "Please move or remove them before you merge.")
 		      : _("The following untracked working tree files would be overwritten by merge:\n%%s");
 	else
-		msg = advice_commit_before_merge
+		msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
 		      ? _("The following untracked working tree files would be overwritten by %s:\n%%s"
 			  "Please move or remove them before you %s.")
 		      : _("The following untracked working tree files would be overwritten by %s:\n%%s");
@@ -392,6 +398,11 @@ static void report_collided_checkout(struct index_state *index)
 	string_list_clear(&list, 0);
 }
 
+static int must_checkout(const struct cache_entry *ce)
+{
+	return ce->ce_flags & CE_UPDATE;
+}
+
 static int check_updates(struct unpack_trees_options *o,
 			 struct index_state *index)
 {
@@ -442,28 +453,12 @@ static int check_updates(struct unpack_trees_options *o,
 	if (should_update_submodules())
 		load_gitmodules_file(index, &state);
 
-	if (has_promisor_remote()) {
+	if (has_promisor_remote())
 		/*
 		 * Prefetch the objects that are to be checked out in the loop
 		 * below.
 		 */
-		struct oid_array to_fetch = OID_ARRAY_INIT;
-		for (i = 0; i < index->cache_nr; i++) {
-			struct cache_entry *ce = index->cache[i];
-
-			if (!(ce->ce_flags & CE_UPDATE) ||
-			    S_ISGITLINK(ce->ce_mode))
-				continue;
-			if (!oid_object_info_extended(the_repository, &ce->oid,
-						      NULL,
-						      OBJECT_INFO_FOR_PREFETCH))
-				continue;
-			oid_array_append(&to_fetch, &ce->oid);
-		}
-		promisor_remote_get_direct(the_repository,
-					   to_fetch.oid, to_fetch.nr);
-		oid_array_clear(&to_fetch);
-	}
+		prefetch_cache_entries(index, must_checkout);
 
 	get_parallel_checkout_configs(&pc_workers, &pc_threshold);
 
@@ -473,7 +468,7 @@ static int check_updates(struct unpack_trees_options *o,
 	for (i = 0; i < index->cache_nr; i++) {
 		struct cache_entry *ce = index->cache[i];
 
-		if (ce->ce_flags & CE_UPDATE) {
+		if (must_checkout(ce)) {
 			size_t last_pc_queue_size = pc_queue_size();
 
 			if (ce->ce_flags & CE_WT_REMOVE)
@@ -490,7 +485,7 @@ static int check_updates(struct unpack_trees_options *o,
 		errs |= run_parallel_checkout(&state, pc_workers, pc_threshold,
 					      progress, &cnt);
 	stop_progress(&progress);
-	errs |= finish_delayed_checkout(&state, NULL);
+	errs |= finish_delayed_checkout(&state, NULL, o->verbose_update);
 	git_attr_set_direction(GIT_ATTR_CHECKIN);
 
 	if (o->clone)
@@ -600,6 +595,13 @@ static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o)
 {
 	ce->ce_flags |= CE_UNPACKED;
 
+	/*
+	 * If this is a sparse directory, don't advance cache_bottom.
+	 * That will be advanced later using the cache-tree data.
+	 */
+	if (S_ISSPARSEDIR(ce->ce_mode))
+		return;
+
 	if (o->cache_bottom < o->src_index->cache_nr &&
 	    o->src_index->cache[o->cache_bottom] == ce) {
 		int bottom = o->cache_bottom;
@@ -649,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;
 }
 
@@ -797,7 +806,7 @@ static int traverse_by_cache_tree(int pos, int nr_entries, int nr_names,
 		BUG("We need cache-tree to do this optimization");
 
 	/*
-	 * Do what unpack_callback() and unpack_nondirectories() normally
+	 * Do what unpack_callback() and unpack_single_entry() normally
 	 * do. But we walk all paths in an iterative loop instead.
 	 *
 	 * D/F conflicts and higher stage entries are not a concern
@@ -976,6 +985,7 @@ static int do_compare_entry(const struct cache_entry *ce,
 	int pathlen, ce_len;
 	const char *ce_name;
 	int cmp;
+	unsigned ce_mode;
 
 	/*
 	 * If we have not precomputed the traverse path, it is quicker
@@ -998,7 +1008,8 @@ static int do_compare_entry(const struct cache_entry *ce,
 	ce_len -= pathlen;
 	ce_name = ce->name + pathlen;
 
-	return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode);
+	ce_mode = S_ISSPARSEDIR(ce->ce_mode) ? S_IFDIR : S_IFREG;
+	return df_name_compare(ce_name, ce_len, ce_mode, name, namelen, mode);
 }
 
 static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
@@ -1008,6 +1019,16 @@ static int compare_entry(const struct cache_entry *ce, const struct traverse_inf
 		return cmp;
 
 	/*
+	 * At this point, we know that we have a prefix match. If ce
+	 * is a sparse directory, then allow an exact match. This only
+	 * works when the input name is a directory, since ce->name
+	 * ends in a directory separator.
+	 */
+	if (S_ISSPARSEDIR(ce->ce_mode) &&
+	    ce->ce_namelen == traverse_path_len(info, tree_entry_len(n)) + 1)
+		return 0;
+
+	/*
 	 * Even if the beginning compared identically, the ce should
 	 * compare as bigger than a directory leading up to it!
 	 */
@@ -1033,13 +1054,15 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info,
 	const struct name_entry *n,
 	int stage,
 	struct index_state *istate,
-	int is_transient)
+	int is_transient,
+	int is_sparse_directory)
 {
 	size_t len = traverse_path_len(info, tree_entry_len(n));
+	size_t alloc_len = is_sparse_directory ? len + 1 : len;
 	struct cache_entry *ce =
 		is_transient ?
-		make_empty_transient_cache_entry(len, NULL) :
-		make_empty_cache_entry(istate, len);
+		make_empty_transient_cache_entry(alloc_len, NULL) :
+		make_empty_cache_entry(istate, alloc_len);
 
 	ce->ce_mode = create_ce_mode(n->mode);
 	ce->ce_flags = create_ce_flags(stage);
@@ -1048,6 +1071,13 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info,
 	/* len+1 because the cache_entry allocates space for NUL */
 	make_traverse_path(ce->name, len + 1, info, n->path, n->pathlen);
 
+	if (is_sparse_directory) {
+		ce->name[len] = '/';
+		ce->name[len + 1] = '\0';
+		ce->ce_namelen++;
+		ce->ce_flags |= CE_SKIP_WORKTREE;
+	}
+
 	return ce;
 }
 
@@ -1056,21 +1086,28 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info,
  * without actually calling it. If you change the logic here you may need to
  * check and change there as well.
  */
-static int unpack_nondirectories(int n, unsigned long mask,
-				 unsigned long dirmask,
-				 struct cache_entry **src,
-				 const struct name_entry *names,
-				 const struct traverse_info *info)
+static int unpack_single_entry(int n, unsigned long mask,
+			       unsigned long dirmask,
+			       struct cache_entry **src,
+			       const struct name_entry *names,
+			       const struct traverse_info *info)
 {
 	int i;
 	struct unpack_trees_options *o = info->data;
 	unsigned long conflicts = info->df_conflicts | dirmask;
 
-	/* Do we have *only* directories? Nothing to do */
 	if (mask == dirmask && !src[0])
 		return 0;
 
 	/*
+	 * When we have a sparse directory entry for src[0],
+	 * then this isn't necessarily a directory-file conflict.
+	 */
+	if (mask == dirmask && src[0] &&
+	    S_ISSPARSEDIR(src[0]->ce_mode))
+		conflicts = 0;
+
+	/*
 	 * Ok, we've filled in up to any potential index entry in src[0],
 	 * now do the rest.
 	 */
@@ -1099,7 +1136,9 @@ static int unpack_nondirectories(int n, unsigned long mask,
 		 * not stored in the index.  otherwise construct the
 		 * cache entry from the index aware logic.
 		 */
-		src[i + o->merge] = create_ce_entry(info, names + i, stage, &o->result, o->merge);
+		src[i + o->merge] = create_ce_entry(info, names + i, stage,
+						    &o->result, o->merge,
+						    bit & dirmask);
 	}
 
 	if (o->merge) {
@@ -1203,16 +1242,75 @@ static int find_cache_pos(struct traverse_info *info,
 	return -1;
 }
 
+/*
+ * Given a sparse directory entry 'ce', compare ce->name to
+ * 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.
+ */
+static int sparse_dir_matches_path(const struct cache_entry *ce,
+				   struct traverse_info *info,
+				   const struct name_entry *p)
+{
+	assert(S_ISSPARSEDIR(ce->ce_mode));
+	assert(ce->name[ce->ce_namelen - 1] == '/');
+
+	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);
+}
+
 static struct cache_entry *find_cache_entry(struct traverse_info *info,
 					    const struct name_entry *p)
 {
+	const char *path;
 	int pos = find_cache_pos(info, p->path, p->pathlen);
 	struct unpack_trees_options *o = info->data;
 
 	if (0 <= pos)
 		return o->src_index->cache[pos];
-	else
+
+	/*
+	 * Check for a sparse-directory entry named "path/".
+	 * Due to the input p->path not having a trailing
+	 * slash, the negative 'pos' value overshoots the
+	 * expected position, hence "-2" instead of "-1".
+	 */
+	pos = -pos - 2;
+
+	if (pos < 0 || pos >= o->src_index->cache_nr)
 		return NULL;
+
+	/*
+	 * Due to lexicographic sorting and sparse directory
+	 * entries ending with a trailing slash, our path as a
+	 * sparse directory (e.g "subdir/") and	our path as a
+	 * file (e.g. "subdir") might be separated by other
+	 * paths (e.g. "subdir-").
+	 */
+	while (pos >= 0) {
+		struct cache_entry *ce = o->src_index->cache[pos];
+
+		if (!skip_prefix(ce->name, info->traverse_path, &path) ||
+		    strncmp(path, p->path, p->pathlen) ||
+		    path[p->pathlen] != '/')
+			return NULL;
+
+		if (S_ISSPARSEDIR(ce->ce_mode) &&
+		    sparse_dir_matches_path(ce, info, p))
+			return ce;
+
+		pos--;
+	}
+
+	return NULL;
 }
 
 static void debug_path(struct traverse_info *info)
@@ -1248,6 +1346,21 @@ static void debug_unpack_callback(int n,
 }
 
 /*
+ * Returns true if and only if the given cache_entry is a
+ * sparse-directory entry that matches the given name_entry
+ * from the tree walk at the given traverse_info.
+ */
+static int is_sparse_directory_entry(struct cache_entry *ce,
+				     struct name_entry *name,
+				     struct traverse_info *info)
+{
+	if (!ce || !name || !S_ISSPARSEDIR(ce->ce_mode))
+		return 0;
+
+	return sparse_dir_matches_path(ce, info, name);
+}
+
+/*
  * Note that traverse_by_cache_tree() duplicates some logic in this function
  * without actually calling it. If you change the logic here you may need to
  * check and change there as well.
@@ -1267,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);
 
@@ -1303,7 +1417,7 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str
 		}
 	}
 
-	if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0)
+	if (unpack_single_entry(n, mask, dirmask, src, names, info) < 0)
 		return -1;
 
 	if (o->merge && src[0]) {
@@ -1333,9 +1447,12 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str
 			}
 		}
 
-		if (traverse_trees_recursive(n, dirmask, mask & ~dirmask,
-					     names, info) < 0)
+		if (!is_sparse_directory_entry(src[0], names, info) &&
+		    traverse_trees_recursive(n, dirmask, mask & ~dirmask,
+						    names, info) < 0) {
 			return -1;
+		}
+
 		return mask;
 	}
 
@@ -1589,13 +1706,19 @@ 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;
+	struct dir_struct dir = DIR_INIT;
+
+	if (o->reset == UNPACK_RESET_INVALID)
+		BUG("o->reset had a value of 1; should be UNPACK_TREES_*_UNTRACKED");
 
 	if (len > MAX_UNPACK_TREES)
 		die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
+	if (o->dir)
+		BUG("o->dir is for internal use only");
 
 	trace_performance_enter();
 	trace2_region_enter("unpack_trees", "unpack_trees", the_repository);
@@ -1606,6 +1729,16 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 		ensure_full_index(o->dst_index);
 	}
 
+	if (o->reset == UNPACK_RESET_OVERWRITE_UNTRACKED &&
+	    o->preserve_ignored)
+		BUG("UNPACK_RESET_OVERWRITE_UNTRACKED incompatible with preserved ignored files");
+
+	if (!o->preserve_ignored) {
+		o->dir = &dir;
+		o->dir->flags |= DIR_SHOW_IGNORED;
+		setup_standard_excludes(o->dir);
+	}
+
 	if (!core_apply_sparse_checkout || !o->update)
 		o->skip_sparse_checkout = 1;
 	if (!o->skip_sparse_checkout && !o->pl) {
@@ -1662,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))
@@ -1689,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)
@@ -1767,6 +1903,10 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 done:
 	if (free_pattern_list)
 		clear_pattern_list(&pl);
+	if (o->dir) {
+		dir_clear(o->dir);
+		o->dir = NULL;
+	}
 	trace2_region_leave("unpack_trees", "unpack_trees", the_repository);
 	trace_performance_leave("unpack_trees");
 	return ret;
@@ -2025,19 +2165,23 @@ 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));
 	if (o->dir)
 		d.exclude_per_dir = o->dir->exclude_per_dir;
 	i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL);
+	dir_clear(&d);
+	free(pathbuf);
 	if (i)
 		return add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
-	free(pathbuf);
+
+	/* 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;
 }
 
@@ -2057,9 +2201,15 @@ static int icase_exists(struct unpack_trees_options *o, const char *name, int le
 	return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
 }
 
+enum absent_checking_type {
+	COMPLETELY_ABSENT,
+	ABSENT_ANY_DIRECTORY
+};
+
 static int check_ok_to_remove(const char *name, int len, int dtype,
 			      const struct cache_entry *ce, struct stat *st,
 			      enum unpack_trees_error_types error_type,
+			      enum absent_checking_type absent_type,
 			      struct unpack_trees_options *o)
 {
 	const struct cache_entry *result;
@@ -2094,6 +2244,10 @@ static int check_ok_to_remove(const char *name, int len, int dtype,
 		return 0;
 	}
 
+	/* If we only care about directories, then we can remove */
+	if (absent_type == ABSENT_ANY_DIRECTORY)
+		return 0;
+
 	/*
 	 * The previous round may already have decided to
 	 * delete this path, which is in a subdirectory that
@@ -2114,13 +2268,24 @@ static int check_ok_to_remove(const char *name, int len, int dtype,
  */
 static int verify_absent_1(const struct cache_entry *ce,
 			   enum unpack_trees_error_types error_type,
+			   enum absent_checking_type absent_type,
 			   struct unpack_trees_options *o)
 {
 	int len;
 	struct stat st;
 
-	if (o->index_only || o->reset || !o->update)
+	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)
@@ -2139,7 +2304,8 @@ static int verify_absent_1(const struct cache_entry *ce,
 								NULL, o);
 			else
 				ret = check_ok_to_remove(path, len, DT_UNKNOWN, NULL,
-							 &st, error_type, o);
+							 &st, error_type,
+							 absent_type, o);
 		}
 		free(path);
 		return ret;
@@ -2154,7 +2320,7 @@ static int verify_absent_1(const struct cache_entry *ce,
 
 		return check_ok_to_remove(ce->name, ce_namelen(ce),
 					  ce_to_dtype(ce), ce, &st,
-					  error_type, o);
+					  error_type, absent_type, o);
 	}
 }
 
@@ -2164,14 +2330,23 @@ static int verify_absent(const struct cache_entry *ce,
 {
 	if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
 		return 0;
-	return verify_absent_1(ce, error_type, o);
+	return verify_absent_1(ce, error_type, COMPLETELY_ABSENT, o);
+}
+
+static int verify_absent_if_directory(const struct cache_entry *ce,
+				      enum unpack_trees_error_types error_type,
+				      struct unpack_trees_options *o)
+{
+	if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
+		return 0;
+	return verify_absent_1(ce, error_type, ABSENT_ANY_DIRECTORY, o);
 }
 
 static int verify_absent_sparse(const struct cache_entry *ce,
 				enum unpack_trees_error_types error_type,
 				struct unpack_trees_options *o)
 {
-	return verify_absent_1(ce, error_type, o);
+	return verify_absent_1(ce, error_type, COMPLETELY_ABSENT, o);
 }
 
 static int merged_entry(const struct cache_entry *ce,
@@ -2245,6 +2420,12 @@ static int merged_entry(const struct cache_entry *ce,
 		 * Previously unmerged entry left as an existence
 		 * marker by read_index_unmerged();
 		 */
+		if (verify_absent_if_directory(merge,
+				  ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
+			discard_cache_entry(merge);
+			return -1;
+		}
+
 		invalidate_ce_path(old, o);
 	}
 
@@ -2262,7 +2443,10 @@ static int deleted_entry(const struct cache_entry *ce,
 		if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
 			return -1;
 		return 0;
+	} else if (verify_absent_if_directory(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) {
+		return -1;
 	}
+
 	if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o))
 		return -1;
 	add_entry(o, ce, CE_REMOVE, 0);
@@ -2509,6 +2693,17 @@ int twoway_merge(const struct cache_entry * const *src,
 			 same(current, oldtree) && !same(current, newtree)) {
 			/* 20 or 21 */
 			return merged_entry(newtree, current, o);
+		} else if (current && !oldtree && newtree &&
+			   S_ISSPARSEDIR(current->ce_mode) != S_ISSPARSEDIR(newtree->ce_mode) &&
+			   ce_stage(current) == 0) {
+			/*
+			 * This case is a directory/file conflict across the sparse-index
+			 * boundary. When we are changing from one path to another via
+			 * 'git checkout', then we want to replace one entry with another
+			 * via merged_entry(). If there are staged changes, then we should
+			 * reject the merge instead.
+			 */
+			return merged_entry(newtree, current, o);
 		} else
 			return reject_merge(current, o);
 	}
diff --git a/unpack-trees.h b/unpack-trees.h
index 2d88b19dca..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,
@@ -45,10 +46,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
  */
 void clear_unpack_trees_porcelain(struct unpack_trees_options *opts);
 
+enum unpack_trees_reset_type {
+	UNPACK_RESET_NONE = 0,    /* traditional "false" value; still valid */
+	UNPACK_RESET_INVALID = 1, /* "true" no longer valid; use below values */
+	UNPACK_RESET_PROTECT_UNTRACKED,
+	UNPACK_RESET_OVERWRITE_UNTRACKED
+};
+
 struct unpack_trees_options {
-	unsigned int reset,
-		     merge,
+	unsigned int merge,
 		     update,
+		     preserve_ignored,
 		     clone,
 		     index_only,
 		     nontrivial_merge,
@@ -64,9 +72,9 @@ struct unpack_trees_options {
 		     exiting_early,
 		     show_all_errors,
 		     dry_run;
+	enum unpack_trees_reset_type reset;
 	const char *prefix;
 	int cache_bottom;
-	struct dir_struct *dir;
 	struct pathspec *pathspec;
 	merge_fn_t fn;
 	const char *msgs[NB_UNPACK_TREES_WARNING_TYPES];
@@ -88,6 +96,7 @@ struct unpack_trees_options {
 	struct index_state result;
 
 	struct pattern_list *pl; /* for internal use */
+	struct dir_struct *dir; /* for internal use only */
 	struct checkout_metadata meta;
 };
 
diff --git a/upload-pack.c b/upload-pack.c
index 297b76fcb4..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;
@@ -1207,14 +1211,14 @@ static int send_ref(const char *refname, const struct object_id *oid,
 
 		format_symref_info(&symref_info, &data->symref);
 		format_session_id(&session_id, data);
-		packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s%s object-format=%s agent=%s\n",
+		packet_fwrite_fmt(stdout, "%s %s%c%s%s%s%s%s%s%s object-format=%s agent=%s\n",
 			     oid_to_hex(oid), refname_nons,
 			     0, capabilities,
 			     (data->allow_uor & ALLOW_TIP_SHA1) ?
 				     " allow-tip-sha1-in-want" : "",
 			     (data->allow_uor & ALLOW_REACHABLE_SHA1) ?
 				     " allow-reachable-sha1-in-want" : "",
-			     data->stateless_rpc ? " no-done" : "",
+			     data->no_done ? " no-done" : "",
 			     symref_info.buf,
 			     data->allow_filter ? " filter" : "",
 			     session_id.buf,
@@ -1223,11 +1227,11 @@ static int send_ref(const char *refname, const struct object_id *oid,
 		strbuf_release(&symref_info);
 		strbuf_release(&session_id);
 	} else {
-		packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
+		packet_fwrite_fmt(stdout, "%s %s\n", oid_to_hex(oid), refname_nons);
 	}
 	capabilities = NULL;
 	if (!peel_iterated_oid(oid, &peeled))
-		packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
+		packet_fwrite_fmt(stdout, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
 	return 0;
 }
 
@@ -1329,7 +1333,8 @@ static int upload_pack_config(const char *var, const char *value, void *cb_data)
 	return parse_hide_refs_config(var, value, "uploadpack");
 }
 
-void upload_pack(struct upload_pack_options *options)
+void upload_pack(const int advertise_refs, const int stateless_rpc,
+		 const int timeout)
 {
 	struct packet_reader reader;
 	struct upload_pack_data data;
@@ -1338,16 +1343,24 @@ void upload_pack(struct upload_pack_options *options)
 
 	git_config(upload_pack_config, &data);
 
-	data.stateless_rpc = options->stateless_rpc;
-	data.daemon_mode = options->daemon_mode;
-	data.timeout = options->timeout;
+	data.stateless_rpc = stateless_rpc;
+	data.timeout = timeout;
+	if (data.timeout)
+		data.daemon_mode = 1;
 
 	head_ref_namespaced(find_symref, &data.symref);
 
-	if (options->advertise_refs || !data.stateless_rpc) {
+	if (advertise_refs || !data.stateless_rpc) {
 		reset_timeout(data.timeout);
+		if (advertise_refs)
+			data.no_done = 1;
 		head_ref_namespaced(send_ref, &data);
 		for_each_namespaced_ref(send_ref, &data);
+		/*
+		 * fflush stdout before calling advertise_shallow_grafts because send_ref
+		 * uses stdio.
+		 */
+		fflush_or_die(stdout);
 		advertise_shallow_grafts(1);
 		packet_flush(1);
 	} else {
@@ -1355,7 +1368,7 @@ void upload_pack(struct upload_pack_options *options)
 		for_each_namespaced_ref(check_ref, NULL);
 	}
 
-	if (!options->advertise_refs) {
+	if (!advertise_refs) {
 		packet_reader_init(&reader, 0, NULL, 0,
 				   PACKET_READ_CHOMP_NEWLINE |
 				   PACKET_READ_DIE_ON_ERR_PACKET);
@@ -1417,21 +1430,25 @@ static int parse_want_ref(struct packet_writer *writer, const char *line,
 			  struct string_list *wanted_refs,
 			  struct object_array *want_obj)
 {
-	const char *arg;
-	if (skip_prefix(line, "want-ref ", &arg)) {
+	const char *refname_nons;
+	if (skip_prefix(line, "want-ref ", &refname_nons)) {
 		struct object_id oid;
 		struct string_list_item *item;
 		struct object *o;
+		struct strbuf refname = STRBUF_INIT;
 
-		if (read_ref(arg, &oid)) {
-			packet_writer_error(writer, "unknown ref %s", arg);
-			die("unknown ref %s", arg);
+		strbuf_addf(&refname, "%s%s", get_git_namespace(), refname_nons);
+		if (ref_is_hidden(refname_nons, refname.buf) ||
+		    read_ref(refname.buf, &oid)) {
+			packet_writer_error(writer, "unknown ref %s", refname_nons);
+			die("unknown ref %s", refname_nons);
 		}
+		strbuf_release(&refname);
 
-		item = string_list_append(wanted_refs, arg);
+		item = string_list_append(wanted_refs, refname_nons);
 		item->util = oiddup(&oid);
 
-		o = parse_object_or_die(&oid, arg);
+		o = parse_object_or_die(&oid, refname_nons);
 		if (!(o->flags & WANTED)) {
 			o->flags |= WANTED;
 			add_object_array(o, NULL, want_obj);
@@ -1655,8 +1672,7 @@ enum fetch_state {
 	FETCH_DONE,
 };
 
-int upload_pack_v2(struct repository *r, struct strvec *keys,
-		   struct packet_reader *request)
+int upload_pack_v2(struct repository *r, struct packet_reader *request)
 {
 	enum fetch_state state = FETCH_PROCESS_ARGS;
 	struct upload_pack_data data;
diff --git a/upload-pack.h b/upload-pack.h
index 27ddcdc6cb..d6ee25ea98 100644
--- a/upload-pack.h
+++ b/upload-pack.h
@@ -1,20 +1,12 @@
 #ifndef UPLOAD_PACK_H
 #define UPLOAD_PACK_H
 
-struct upload_pack_options {
-	int stateless_rpc;
-	int advertise_refs;
-	unsigned int timeout;
-	int daemon_mode;
-};
-
-void upload_pack(struct upload_pack_options *options);
+void upload_pack(const int advertise_refs, const int stateless_rpc,
+		 const int timeout);
 
 struct repository;
-struct strvec;
 struct packet_reader;
-int upload_pack_v2(struct repository *r, struct strvec *keys,
-		   struct packet_reader *request);
+int upload_pack_v2(struct repository *r, struct packet_reader *request);
 
 struct strbuf;
 int upload_pack_advertise(struct repository *r,
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/urlmatch.h b/urlmatch.h
index 6ff42f81b0..34a3ba6d19 100644
--- a/urlmatch.h
+++ b/urlmatch.h
@@ -66,6 +66,10 @@ struct urlmatch_config {
 	int (*fallback_match_fn)(const char *url, void *cb);
 };
 
+#define URLMATCH_CONFIG_INIT { \
+	.vars = STRING_LIST_INIT_DUP, \
+}
+
 int urlmatch_config_entry(const char *var, const char *value, void *cb);
 
 #endif /* URL_MATCH_H */
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/userdiff.c b/userdiff.c
index d9b2ba752f..8578cb0d12 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -13,6 +13,16 @@ static int drivers_alloc;
 #define IPATTERN(name, pattern, word_regex)			\
 	{ name, NULL, -1, { pattern, REG_EXTENDED | REG_ICASE }, \
 	  word_regex "|[^[:space:]]|[\xc0-\xff][\x80-\xbf]+" }
+
+/*
+ * Built-in drivers for various languages, sorted by their names
+ * (except that the "default" is left at the end).
+ *
+ * When writing or updating patterns, assume that the contents these
+ * patterns are applied to are syntactically correct.  The patterns
+ * can be simple without implementing all syntactical corner cases, as
+ * long as they are sufficiently permissive.
+ */
 static struct userdiff_driver builtin_drivers[] = {
 IPATTERN("ada",
 	 "!^(.*[ \t])?(is[ \t]+new|renames|is[ \t]+separate)([ \t].*)?$\n"
@@ -54,9 +64,15 @@ PATTERNS("cpp",
 	 /* functions/methods, variables, and compounds at top level */
 	 "^((::[[:space:]]*)?[A-Za-z_].*)$",
 	 /* -- */
+	 /* identifiers and keywords */
 	 "[a-zA-Z_][a-zA-Z0-9_]*"
-	 "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lLuU]*"
-	 "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"),
+	 /* decimal and octal integers as well as floatingpoint numbers */
+	 "|[0-9][0-9.]*([Ee][-+]?[0-9]+)?[fFlLuU]*"
+	 /* hexadecimal and binary integers */
+	 "|0[xXbB][0-9a-fA-F]+[lLuU]*"
+	 /* floatingpoint numbers that begin with a decimal point */
+	 "|\\.[0-9][0-9]*([Ee][-+]?[0-9]+)?[fFlL]?"
+	 "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*|<=>"),
 PATTERNS("csharp",
 	 /* Keywords */
 	 "!^[ \t]*(do|while|for|if|else|instanceof|new|return|switch|case|throw|catch|using)\n"
@@ -142,7 +158,11 @@ PATTERNS("html",
 	 "[^<>= \t]+"),
 PATTERNS("java",
 	 "!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n"
-	 "^[ \t]*(([A-Za-z_][A-Za-z_0-9]*[ \t]+)+[A-Za-z_][A-Za-z_0-9]*[ \t]*\\([^;]*)$",
+	 /* Class, enum, and interface declarations */
+	 "^[ \t]*(([a-z]+[ \t]+)*(class|enum|interface)[ \t]+[A-Za-z][A-Za-z0-9_$]*[ \t]+.*)$\n"
+	 /* Method definitions; note that constructor signatures are not */
+	 /* matched because they are indistinguishable from method calls. */
+	 "^[ \t]*(([A-Za-z_<>&][][?&<>.,A-Za-z_0-9]*[ \t]+)+[A-Za-z_][A-Za-z_0-9]*[ \t]*\\([^;]*)$",
 	 /* -- */
 	 "[a-zA-Z_][a-zA-Z0-9_]*"
 	 "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
@@ -214,7 +234,7 @@ PATTERNS("perl",
 	 "|<<|<>|<=>|>>"),
 PATTERNS("php",
 	 "^[\t ]*(((public|protected|private|static|abstract|final)[\t ]+)*function.*)$\n"
-	 "^[\t ]*((((final|abstract)[\t ]+)?class|interface|trait).*)$",
+	 "^[\t ]*((((final|abstract)[\t ]+)?class|enum|interface|trait).*)$",
 	 /* -- */
 	 "[a-zA-Z_][a-zA-Z0-9_]*"
 	 "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+"
diff --git a/worktree.c b/worktree.c
index 237517baee..90fc085f76 100644
--- a/worktree.c
+++ b/worktree.c
@@ -5,6 +5,7 @@
 #include "worktree.h"
 #include "dir.h"
 #include "wt-status.h"
+#include "config.h"
 
 void free_worktrees(struct worktree **worktrees)
 {
@@ -265,6 +266,7 @@ const char *worktree_prune_reason(struct worktree *wt, timestamp_t expire)
 }
 
 /* convenient wrapper to deal with NULL strbuf */
+__attribute__((format (printf, 2, 3)))
 static void strbuf_addf_gently(struct strbuf *buf, const char *fmt, ...)
 {
 	va_list params;
@@ -401,17 +403,13 @@ 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;
@@ -568,10 +566,10 @@ int other_head_refs(each_ref_fn fn, void *cb_data)
 
 		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))
 			ret = fn(refname.buf, &oid, flag, cb_data);
 		if (ret)
 			break;
@@ -824,3 +822,75 @@ int should_prune_worktree(const char *id, struct strbuf *reason, char **wtpath,
 	*wtpath = path;
 	return 0;
 }
+
+static int move_config_setting(const char *key, const char *value,
+			       const char *from_file, const char *to_file)
+{
+	if (git_config_set_in_file_gently(to_file, key, value))
+		return error(_("unable to set %s in '%s'"), key, to_file);
+	if (git_config_set_in_file_gently(from_file, key, NULL))
+		return error(_("unable to unset %s in '%s'"), key, from_file);
+	return 0;
+}
+
+int init_worktree_config(struct repository *r)
+{
+	int res = 0;
+	int bare = 0;
+	struct config_set cs = { { 0 } };
+	const char *core_worktree;
+	char *common_config_file;
+	char *main_worktree_file;
+
+	/*
+	 * If the extension is already enabled, then we can skip the
+	 * upgrade process.
+	 */
+	if (repository_format_worktree_config)
+		return 0;
+	if ((res = git_config_set_gently("extensions.worktreeConfig", "true")))
+		return error(_("failed to set extensions.worktreeConfig setting"));
+
+	common_config_file = xstrfmt("%s/config", r->commondir);
+	main_worktree_file = xstrfmt("%s/config.worktree", r->commondir);
+
+	git_configset_init(&cs);
+	git_configset_add_file(&cs, common_config_file);
+
+	/*
+	 * If core.bare is true in the common config file, then we need to
+	 * move it to the main worktree's config file or it will break all
+	 * worktrees. If it is false, then leave it in place because it
+	 * _could_ be negating a global core.bare=true.
+	 */
+	if (!git_configset_get_bool(&cs, "core.bare", &bare) && bare) {
+		if ((res = move_config_setting("core.bare", "true",
+					       common_config_file,
+					       main_worktree_file)))
+			goto cleanup;
+	}
+	/*
+	 * If core.worktree is set, then the main worktree is located
+	 * somewhere different than the parent of the common Git dir.
+	 * Relocate that value to avoid breaking all worktrees with this
+	 * upgrade to worktree config.
+	 */
+	if (!git_configset_get_value(&cs, "core.worktree", &core_worktree)) {
+		if ((res = move_config_setting("core.worktree", core_worktree,
+					       common_config_file,
+					       main_worktree_file)))
+			goto cleanup;
+	}
+
+	/*
+	 * Ensure that we use worktree config for the remaining lifetime
+	 * of the current process.
+	 */
+	repository_format_worktree_config = 1;
+
+cleanup:
+	git_configset_clear(&cs);
+	free(common_config_file);
+	free(main_worktree_file);
+	return res;
+}
diff --git a/worktree.h b/worktree.h
index 8b7c408132..e9e839926b 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);
 
 /*
@@ -182,4 +183,25 @@ void strbuf_worktree_ref(const struct worktree *wt,
 			 struct strbuf *sb,
 			 const char *refname);
 
+/**
+ * Enable worktree config for the first time. This will make the following
+ * adjustments:
+ *
+ * 1. Add extensions.worktreeConfig=true in the common config file.
+ *
+ * 2. If the common config file has a core.worktree value, then that value
+ *    is moved to the main worktree's config.worktree file.
+ *
+ * 3. If the common config file has a core.bare enabled, then that value
+ *    is moved to the main worktree's config.worktree file.
+ *
+ * If extensions.worktreeConfig is already true, then this method
+ * terminates early without any of the above steps. The existing config
+ * arrangement is assumed to be intentional.
+ *
+ * Returns 0 on success. Reports an error message and returns non-zero
+ * if any of these steps fail.
+ */
+int init_worktree_config(struct repository *r);
+
 #endif
diff --git a/wrapper.c b/wrapper.c
index 563ad590df..3258cdb171 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -145,6 +145,12 @@ void *xcalloc(size_t nmemb, size_t size)
 	return ret;
 }
 
+void xsetenv(const char *name, const char *value, int overwrite)
+{
+	if (setenv(name, value, overwrite))
+		die_errno(_("could not setenv '%s'"), name ? name : "(null)");
+}
+
 /*
  * Limit size of IO chunks, because huge chunks only cause pain.  OS X
  * 64-bit is buggy, returning EINVAL if len >= INT_MAX; and even in
@@ -193,7 +199,9 @@ int xopen(const char *path, int oflag, ...)
 		if (errno == EINTR)
 			continue;
 
-		if ((oflag & O_RDWR) == O_RDWR)
+		if ((oflag & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
+			die_errno(_("unable to create '%s'"), path);
+		else if ((oflag & O_RDWR) == O_RDWR)
 			die_errno(_("could not open '%s' for reading and writing"), path);
 		else if ((oflag & O_WRONLY) == O_WRONLY)
 			die_errno(_("could not open '%s' for writing"), path);
@@ -455,8 +463,6 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
 	static const int num_letters = ARRAY_SIZE(letters) - 1;
 	static const char x_pattern[] = "XXXXXX";
 	static const int num_x = ARRAY_SIZE(x_pattern) - 1;
-	uint64_t value;
-	struct timeval tv;
 	char *filename_template;
 	size_t len;
 	int fd, count;
@@ -477,12 +483,13 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
 	 * Replace pattern's XXXXXX characters with randomness.
 	 * Try TMP_MAX different filenames.
 	 */
-	gettimeofday(&tv, NULL);
-	value = ((uint64_t)tv.tv_usec << 16) ^ tv.tv_sec ^ getpid();
 	filename_template = &pattern[len - num_x - suffix_len];
 	for (count = 0; count < TMP_MAX; ++count) {
-		uint64_t v = value;
 		int i;
+		uint64_t v;
+		if (csprng_bytes(&v, sizeof(v)) < 0)
+			return error_errno("unable to get random bytes for temporary file");
+
 		/* Fill in the random bits. */
 		for (i = 0; i < num_x; i++) {
 			filename_template[i] = letters[v % num_letters];
@@ -498,12 +505,6 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
 		 */
 		if (errno != EEXIST)
 			break;
-		/*
-		 * This is a random value.  It is only necessary that
-		 * the next TMP_MAX values generated by adding 7777 to
-		 * VALUE are different with (module 2^32).
-		 */
-		value += 7777;
 	}
 	/* We return the null string if we can't find a unique file name.  */
 	pattern[0] = '\0';
@@ -694,3 +695,69 @@ int open_nofollow(const char *path, int flags)
 	return open(path, flags);
 #endif
 }
+
+int csprng_bytes(void *buf, size_t len)
+{
+#if defined(HAVE_ARC4RANDOM) || defined(HAVE_ARC4RANDOM_LIBBSD)
+	/* This function never returns an error. */
+	arc4random_buf(buf, len);
+	return 0;
+#elif defined(HAVE_GETRANDOM)
+	ssize_t res;
+	char *p = buf;
+	while (len) {
+		res = getrandom(p, len, 0);
+		if (res < 0)
+			return -1;
+		len -= res;
+		p += res;
+	}
+	return 0;
+#elif defined(HAVE_GETENTROPY)
+	int res;
+	char *p = buf;
+	while (len) {
+		/* getentropy has a maximum size of 256 bytes. */
+		size_t chunk = len < 256 ? len : 256;
+		res = getentropy(p, chunk);
+		if (res < 0)
+			return -1;
+		len -= chunk;
+		p += chunk;
+	}
+	return 0;
+#elif defined(HAVE_RTLGENRANDOM)
+	if (!RtlGenRandom(buf, len))
+		return -1;
+	return 0;
+#elif defined(HAVE_OPENSSL_CSPRNG)
+	int res = RAND_bytes(buf, len);
+	if (res == 1)
+		return 0;
+	if (res == -1)
+		errno = ENOTSUP;
+	else
+		errno = EIO;
+	return -1;
+#else
+	ssize_t res;
+	char *p = buf;
+	int fd, err;
+	fd = open("/dev/urandom", O_RDONLY);
+	if (fd < 0)
+		return -1;
+	while (len) {
+		res = xread(fd, p, len);
+		if (res < 0) {
+			err = errno;
+			close(fd);
+			errno = err;
+			return -1;
+		}
+		len -= res;
+		p += res;
+	}
+	close(fd);
+	return 0;
+#endif
+}
diff --git a/write-or-die.c b/write-or-die.c
index d33e68f6ab..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);
@@ -70,3 +75,15 @@ void write_or_die(int fd, const void *buf, size_t count)
 		die_errno("write error");
 	}
 }
+
+void fwrite_or_die(FILE *f, const void *buf, size_t count)
+{
+	if (fwrite(buf, 1, count, f) != count)
+		die_errno("fwrite error");
+}
+
+void fflush_or_die(FILE *f)
+{
+	if (fflush(f))
+		die_errno("fflush error");
+}
diff --git a/wt-status.c b/wt-status.c
index c0dbf96749..335e723a71 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -657,6 +657,36 @@ static void wt_status_collect_changes_index(struct wt_status *s)
 	clear_pathspec(&rev.prune_data);
 }
 
+static int add_file_to_list(const struct object_id *oid,
+			    struct strbuf *base, const char *path,
+			    unsigned int mode, void *context)
+{
+	struct string_list_item *it;
+	struct wt_status_change_data *d;
+	struct wt_status *s = context;
+	struct strbuf full_name = STRBUF_INIT;
+
+	if (S_ISDIR(mode))
+		return READ_TREE_RECURSIVE;
+
+	strbuf_add(&full_name, base->buf, base->len);
+	strbuf_addstr(&full_name, path);
+	it = string_list_insert(&s->change, full_name.buf);
+	d = it->util;
+	if (!d) {
+		CALLOC_ARRAY(d, 1);
+		it->util = d;
+	}
+
+	d->index_status = DIFF_STATUS_ADDED;
+	/* Leave {mode,oid}_head zero for adds. */
+	d->mode_index = mode;
+	oidcpy(&d->oid_index, oid);
+	s->committable = 1;
+	strbuf_release(&full_name);
+	return 0;
+}
+
 static void wt_status_collect_changes_initial(struct wt_status *s)
 {
 	struct index_state *istate = s->repo->index;
@@ -671,6 +701,27 @@ static void wt_status_collect_changes_initial(struct wt_status *s)
 			continue;
 		if (ce_intent_to_add(ce))
 			continue;
+		if (S_ISSPARSEDIR(ce->ce_mode)) {
+			/*
+			 * This is a sparse directory entry, so we want to collect all
+			 * of the added files within the tree. This requires recursively
+			 * expanding the trees to find the elements that are new in this
+			 * tree and marking them with DIFF_STATUS_ADDED.
+			 */
+			struct strbuf base = STRBUF_INIT;
+			struct pathspec ps = { 0 };
+			struct tree *tree = lookup_tree(istate->repo, &ce->oid);
+
+			ps.recursive = 1;
+			ps.has_wildcard = 1;
+			ps.max_depth = -1;
+
+			strbuf_add(&base, ce->name, ce->ce_namelen);
+			read_tree_at(istate->repo, tree, &base, &ps,
+				     add_file_to_list, s);
+			continue;
+		}
+
 		it = string_list_insert(&s->change, ce->name);
 		d = it->util;
 		if (!d) {
@@ -736,7 +787,7 @@ static void wt_status_collect_untracked(struct wt_status *s)
 
 	dir_clear(&dir);
 
-	if (advice_status_u_option)
+	if (advice_enabled(ADVICE_STATUS_U_OPTION))
 		s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
 }
 
@@ -897,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",
@@ -1107,7 +1164,7 @@ static void wt_longstatus_print_tracking(struct wt_status *s)
 	if (!format_tracking_info(branch, &sb, s->ahead_behind_flags))
 		return;
 
-	if (advice_status_ahead_behind_warning &&
+	if (advice_enabled(ADVICE_STATUS_AHEAD_BEHIND_WARNING) &&
 	    s->ahead_behind_flags == AHEAD_BEHIND_FULL) {
 		uint64_t t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
 		if (t_delta_in_ms > AB_DELAY_WARNING_IN_MS) {
@@ -1161,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)"));
 	}
@@ -1492,9 +1555,12 @@ static void show_sparse_checkout_in_use(struct wt_status *s,
 	if (s->state.sparse_checkout_percentage == SPARSE_CHECKOUT_DISABLED)
 		return;
 
-	status_printf_ln(s, color,
-			 _("You are in a sparse checkout with %d%% of tracked files present."),
-			 s->state.sparse_checkout_percentage);
+	if (s->state.sparse_checkout_percentage == SPARSE_CHECKOUT_SPARSE_INDEX)
+		status_printf_ln(s, color, _("You are in a sparse checkout."));
+	else
+		status_printf_ln(s, color,
+				_("You are in a sparse checkout with %d%% of tracked files present."),
+				s->state.sparse_checkout_percentage);
 	wt_longstatus_print_trailer(s);
 }
 
@@ -1652,6 +1718,11 @@ static void wt_status_check_sparse_checkout(struct repository *r,
 		return;
 	}
 
+	if (r->index->sparse_index) {
+		state->sparse_checkout_percentage = SPARSE_CHECKOUT_SPARSE_INDEX;
+		return;
+	}
+
 	for (i = 0; i < r->index->cache_nr; i++) {
 		struct cache_entry *ce = r->index->cache[i];
 		if (ce_skip_worktree(ce))
@@ -1786,7 +1857,7 @@ static void wt_longstatus_print(struct wt_status *s)
 		wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
 		if (s->show_ignored_mode)
 			wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
-		if (advice_status_u_option && 2000 < s->untracked_in_ms) {
+		if (advice_enabled(ADVICE_STATUS_U_OPTION) && 2000 < s->untracked_in_ms) {
 			status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
 			status_printf_ln(s, GIT_COLOR_NORMAL,
 					 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -2118,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.
  */
@@ -2378,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/wt-status.h b/wt-status.h
index 0d32799b28..ab9cc9d8f0 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -78,6 +78,7 @@ enum wt_status_format {
 };
 
 #define SPARSE_CHECKOUT_DISABLED -1
+#define SPARSE_CHECKOUT_SPARSE_INDEX -2
 
 struct wt_status_state {
 	int merge_in_progress;
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;
 }